Code

Many hybrid learning things#8548

Code

Merged

rtibbles merged 63 commits intolearningequality:release-v0.15.xlearningequality/kolibri:release-v0.15.xfrom marcellamaki:many-hybrid-learning-thingsmarcellamaki/kolibri:many-hybrid-learning-thingsCopy head branch name to clipboardOct 29, 2021

+3,399-923

Commits

Commits on Oct 29, 2021

• Refactor bookmarks card view, update responsiveness and layout

  marcellamaki

  committed
  beefdfe

• Re-add 'remove from bookmarks' and finish mobile styling

  marcellamaki

  committed
  a082ba1

• Use theme tokens instead of hex values

  marcellamaki

  committed
  05333ec

• Add basic tests for Bookmark Page

  marcellamaki

  committed
  905c125

• Refactor bookmarks and library to use new HybridLearningCardGrid and cards, rather than modify existing components, to prevent regressions

  marcellamaki

  committed
  4bf3d1f

• Attempt to fix tests

  marcellamaki

  committed
  eda3df3

• Switch from created to updated lifecycle method for displaying current content bookmark status in LearningActivityBar

  marcellamaki

  committed
  67bd526

• Fix button styling and bookmark removal front end

  marcellamaki

  committed
  b42abca

• Resolve merge error - add HybridLearningCardGrid back to LibraryPage instead of ContentCardGroupGrid

  marcellamaki

  committed
  87c9812

• Refactor bookmarks card view, update responsiveness and layout

  marcellamaki

  committed
  83359cf

• Re-add 'remove from bookmarks' and finish mobile styling

  marcellamaki

  committed
  586511b

• Refactor bookmarks and library to use new HybridLearningCardGrid and cards, rather than modify existing components, to prevent regressions

  marcellamaki

  committed
  66753bd

• Responsiveness adjustments to library page card layout - updating which cards are used and grid at different sizes

  marcellamaki

  committed
  445c84e

• (WIP) refactor library page layout

  marcellamaki

  committed
  e5cedb5

• Resolving merge conflicts, continued

  marcellamaki

  committed
  bf6f132

• Conditional rendering of side panel filters based on available metadata

  marcellamaki

  committed
  7eeec14

• Card styling adjustments

  marcellamaki

  committed
  2857383

• Refine responsive sidebar functionality for smallest mobile devices (WIP)

  marcellamaki

  committed
  0c548ab

• Finalize responsive filtering

  marcellamaki

  committed
  855c4b0

• Fix cursor on search modal

  marcellamaki

  committed
  05d6797

• (WIP) Chips matching search query and basic clearing functionality working. No translations/string mapping - using ids

  marcellamaki

  committed
  82be484

• Swap out header labeled icon for LearningActivityLabel component

  marcellamaki

  committed
  2e702ea

• Update results header buttons. Code cleanup

  marcellamaki

  committed
  fda0c95

• CSS tweaks to modal and filter button

  marcellamaki

  committed
  747f943

• Resolve merge conflicts in FullScreenSidePanel, and fix merge errors

  marcellamaki

  committed
  3df294f

• Fix linting errors from rebase

  marcellamaki

  committed
  06af437

• Remove stray logs. Re-add accidental code deletions

  marcellamaki

  committed
  2a28d84

• Fix CategorySearchModal file structure and naming confusion

  marcellamaki

  committed
  f409f2b

• Switch page breadcrumbs from a negative to a positive conditional statement

  marcellamaki

  committed
  5ef9df7

• Remove unused content card view file

  marcellamaki

  committed
  89f37c4

• Add list/filter toggle option to search results

  marcellamaki

  committed
  cf7ffc9

• Conditionalize duration display in LearningActivityLabel for flexibility of use and better card alignment

  marcellamaki

  committed
  6c381c3

• Fix KSelect alignments to match Figma

  marcellamaki

  committed
  a00ba52

• Add channel title and thumbnail data to normalizeContentNode.

  

  rtibbles

  authored and

  marcellamaki

  committed
  e51372b

• Fix reference to TextTruncator which was unintentionally deleted

  marcellamaki

  committed
  6d90ec9

• Fix channel logo placement

  marcellamaki

  committed
  3da206d

• Add new lesson playlist card

  marcellamaki

  committed
  f1b7a55

• Fix clickable area to be entire card

  marcellamaki

  committed
  35ef487

• fix card width and header layout

  marcellamaki

  committed
  130abc2

• Refactor in-channel-browsing

  marcellamaki

  committed
  dd3016b

• CSS fixes for mobile side panel overlay spacing and position

  marcellamaki

  committed
  41a0af6

• (WIP) Mobile header tabs and layout updates

  marcellamaki

  committed
  522bfc9

• Add ability to select folder from dropdown, or navigate back using breadcrumbs

  marcellamaki

  committed
  7e85441

• Update mobile carousel limit

  marcellamaki

  committed
  baef012

• Add content thumbnails with normalizeContentNode on Topics Page

  marcellamaki

  committed
  16665b6

• Add folders header

  marcellamaki

  committed
  5db19ef

• Fix conditional display of side panel on medium screens

  marcellamaki

  committed
  57344c6

• Fix bookmark page regression for mobile size

  marcellamaki

  committed
  90621b1

• Fix conditional rendering of Library Page mobile cards

  marcellamaki

  committed
  ccf9586

• Fix conditional rendering on Library and Topics pages

  marcellamaki

  committed
  eb01249

• Fix error in Folder topic rendering

  marcellamaki

  committed
  344d36e

• Fix issues with normalizeContentNode preventing loading more results

  marcellamaki

  committed
  3ece8d4

• Mock channel plugin data in tests

  marcellamaki

  committed
  6edc5fd

• Add comments

  marcellamaki

  committed
  de8da4d

• Revert accidentally commented out KeenUI toolbar code

  marcellamaki

  committed
  7960cea

• Add explanitory comments for atypical styles

  marcellamaki

  committed
  aa01f9a

• Throttle scrolling on Topics page

  marcellamaki

  committed
  4071bbe

• Make searchTerms and chip filter code more consistent

  marcellamaki

  committed
  4012536

• Remove 'level-0' conditions from CategorySearchModal

  marcellamaki

  committed
  902a65a

• Various code cleanup - deleting stale code, uncommenting necessary code, styles

  marcellamaki

  committed
  e4f08ca

• Begin bringing in side panel work - working on Library and content renderer pages

  marcellamaki

  committed
  c670e37

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

  marcellamaki

  committed
  4c1bf44

• Revert "Remove ContentCard components and sub components as it is no longer being used"

  Show description for 6001c09
  marcellamaki

  committed
  6001c09