Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Many hybrid learning things #8548

Merged
merged 63 commits into from
Oct 29, 2021
Merged

Many hybrid learning things #8548

merged 63 commits into from
Oct 29, 2021

Commits on Oct 29, 2021

  1. Refactor bookmarks card view, update responsiveness and layout

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    beefdfe View commit details
    Browse the repository at this point in the history

  2. Re-add 'remove from bookmarks' and finish mobile styling

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    a082ba1 View commit details
    Browse the repository at this point in the history

  3. Use theme tokens instead of hex values

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    05333ec View commit details
    Browse the repository at this point in the history

  4. Add basic tests for Bookmark Page

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    905c125 View commit details
    Browse the repository at this point in the history

  5. Refactor bookmarks and library to use new HybridLearningCardGrid and … 

    …cards, rather than modify existing components, to prevent regressions
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    4bf3d1f View commit details
    Browse the repository at this point in the history

  6. Attempt to fix tests

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    eda3df3 View commit details
    Browse the repository at this point in the history

  7. Switch from created to updated lifecycle method for displaying curren… 

    …t content bookmark status in LearningActivityBar
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    67bd526 View commit details
    Browse the repository at this point in the history

  8. Fix button styling and bookmark removal front end

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    b42abca View commit details
    Browse the repository at this point in the history

  9. Resolve merge error - add HybridLearningCardGrid back to LibraryPage … 

    …instead of ContentCardGroupGrid
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    87c9812 View commit details
    Browse the repository at this point in the history

  10. Refactor bookmarks card view, update responsiveness and layout

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    83359cf View commit details
    Browse the repository at this point in the history

  11. Re-add 'remove from bookmarks' and finish mobile styling

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    586511b View commit details
    Browse the repository at this point in the history

  12. Refactor bookmarks and library to use new HybridLearningCardGrid and … 

    …cards, rather than modify existing components, to prevent regressions
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    66753bd View commit details
    Browse the repository at this point in the history

  13. Responsiveness adjustments to library page card layout - updating whi… 

    …ch cards are used and grid at different sizes
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    445c84e View commit details
    Browse the repository at this point in the history

  14. (WIP) refactor library page layout

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    e5cedb5 View commit details
    Browse the repository at this point in the history

  15. Resolving merge conflicts, continued

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    bf6f132 View commit details
    Browse the repository at this point in the history

  16. Conditional rendering of side panel filters based on available metadata

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    7eeec14 View commit details
    Browse the repository at this point in the history

  17. Card styling adjustments

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    2857383 View commit details
    Browse the repository at this point in the history

  18. Refine responsive sidebar functionality for smallest mobile devices (… 

    …WIP)
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    0c548ab View commit details
    Browse the repository at this point in the history

  19. Finalize responsive filtering

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    855c4b0 View commit details
    Browse the repository at this point in the history

  20. Fix cursor on search modal

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    05d6797 View commit details
    Browse the repository at this point in the history

  21. (WIP) Chips matching search query and basic clearing functionality wo… 

    …rking. No translations/string mapping - using ids
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    82be484 View commit details
    Browse the repository at this point in the history

  22. Swap out header labeled icon for LearningActivityLabel component

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    2e702ea View commit details
    Browse the repository at this point in the history

  23. Update results header buttons. Code cleanup

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    fda0c95 View commit details
    Browse the repository at this point in the history

  24. CSS tweaks to modal and filter button

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    747f943 View commit details
    Browse the repository at this point in the history

  25. Resolve merge conflicts in FullScreenSidePanel, and fix merge errors

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    3df294f View commit details
    Browse the repository at this point in the history

  26. Fix linting errors from rebase

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    06af437 View commit details
    Browse the repository at this point in the history

  27. Remove stray logs. Re-add accidental code deletions

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    2a28d84 View commit details
    Browse the repository at this point in the history

  28. Fix CategorySearchModal file structure and naming confusion

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    f409f2b View commit details
    Browse the repository at this point in the history

  29. Switch page breadcrumbs from a negative to a positive conditional sta… 

    …tement
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    5ef9df7 View commit details
    Browse the repository at this point in the history

  30. Remove unused content card view file

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    89f37c4 View commit details
    Browse the repository at this point in the history

  31. Add list/filter toggle option to search results

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    cf7ffc9 View commit details
    Browse the repository at this point in the history

  32. Conditionalize duration display in LearningActivityLabel for flexibil… 

    …ity of use and better card alignment
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    6c381c3 View commit details
    Browse the repository at this point in the history

  33. Fix KSelect alignments to match Figma

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    a00ba52 View commit details
    Browse the repository at this point in the history

  34. Add channel title and thumbnail data to normalizeContentNode.

    @rtibbles @marcellamaki
    rtibbles authored and marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    e51372b View commit details
    Browse the repository at this point in the history

  35. Fix reference to TextTruncator which was unintentionally deleted

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    6d90ec9 View commit details
    Browse the repository at this point in the history

  36. Fix channel logo placement

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    3da206d View commit details
    Browse the repository at this point in the history

  37. Add new lesson playlist card

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    f1b7a55 View commit details
    Browse the repository at this point in the history

  38. Fix clickable area to be entire card

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    35ef487 View commit details
    Browse the repository at this point in the history

  39. fix card width and header layout

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    130abc2 View commit details
    Browse the repository at this point in the history

  40. Refactor in-channel-browsing

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    dd3016b View commit details
    Browse the repository at this point in the history

  41. CSS fixes for mobile side panel overlay spacing and position

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    41a0af6 View commit details
    Browse the repository at this point in the history

  42. (WIP) Mobile header tabs and layout updates

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    522bfc9 View commit details
    Browse the repository at this point in the history

  43. Add ability to select folder from dropdown, or navigate back using br… 

    …eadcrumbs
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    7e85441 View commit details
    Browse the repository at this point in the history

  44. Update mobile carousel limit

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    baef012 View commit details
    Browse the repository at this point in the history

  45. Add content thumbnails with normalizeContentNode on Topics Page

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    16665b6 View commit details
    Browse the repository at this point in the history

  46. Add folders header

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    5db19ef View commit details
    Browse the repository at this point in the history

  47. Fix conditional display of side panel on medium screens

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    57344c6 View commit details
    Browse the repository at this point in the history

  48. Fix bookmark page regression for mobile size

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    90621b1 View commit details
    Browse the repository at this point in the history

  49. Fix conditional rendering of Library Page mobile cards

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    ccf9586 View commit details
    Browse the repository at this point in the history

  50. Fix conditional rendering on Library and Topics pages

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    eb01249 View commit details
    Browse the repository at this point in the history

  51. Fix error in Folder topic rendering

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    344d36e View commit details
    Browse the repository at this point in the history

  52. Fix issues with normalizeContentNode preventing loading more results

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    3ece8d4 View commit details
    Browse the repository at this point in the history

  53. Mock channel plugin data in tests

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    6edc5fd View commit details
    Browse the repository at this point in the history

  54. Add comments

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    de8da4d View commit details
    Browse the repository at this point in the history

  55. Revert accidentally commented out KeenUI toolbar code

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    7960cea View commit details
    Browse the repository at this point in the history

  56. Add explanitory comments for atypical styles

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    aa01f9a View commit details
    Browse the repository at this point in the history

  57. Throttle scrolling on Topics page

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    4071bbe View commit details
    Browse the repository at this point in the history

  58. Make searchTerms and chip filter code more consistent

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    4012536 View commit details
    Browse the repository at this point in the history

  59. Remove 'level-0' conditions from CategorySearchModal

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    902a65a View commit details
    Browse the repository at this point in the history

  60. Various code cleanup - deleting stale code, uncommenting necessary co… 

    …de, styles
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    e4f08ca View commit details
    Browse the repository at this point in the history

  61. Begin bringing in side panel work - working on Library and content re… 

    …nderer pages
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    c670e37 View commit details
    Browse the repository at this point in the history

  62. Remove extra request in Library page labels - not needed to filter

    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    4c1bf44 View commit details
    Browse the repository at this point in the history

  63. Revert "Remove ContentCard components and sub components as it is no … 

    …longer being used"

This reverts commit e01c6c2.
    @marcellamaki
    marcellamaki committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    6001c09 View commit details
    Browse the repository at this point in the history