Remove last references to HybridLearningCardGrid on TopicsPage

learningequality · Jan 28, 2022 · 9fd63b6 · 9fd63b6
1 parent 65a4780
commit 9fd63b6
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/kolibri/plugins/learn/assets/src/views/TopicsPage.vue b/kolibri/plugins/learn/assets/src/views/TopicsPage.vue
@@ -185,12 +185,11 @@
               <KCircularLoader v-if="t.id === subTopicLoading" />
             </div>
             <!-- search results -->
-            <HybridLearningCardGrid
-              v-if="resources.length"
+            <LibraryAndChannelBrowserMainContent
+              v-if="resources && resources.length"
               :contents="resources"
-              :numCols="numCols"
-              :genContentLink="genContentLink"
-              cardViewStyle="card"
+              currentCardViewStyle="card"
+              :gridType="2"
               @toggleInfoPanel="toggleInfoPanel"
             />
             <div v-if="topicMore" class="end-button-block">
@@ -217,12 +216,11 @@
               @clearSearch="clearSearch"
             />
             <!-- search results display -->
-            <HybridLearningCardGrid
-              v-if="results.length"
-              :numCols="numCols"
-              :cardViewStyle="currentViewStyle"
-              :genContentLink="genContentLink"
+            <LibraryAndChannelBrowserMainContent
+              v-if="results && results.length"
               :contents="results"
+              currentCardViewStyle="card"
+              :gridType="2"
               @toggleInfoPanel="toggleInfoPanel"
             />
             <div v-if="more" class="end-button-block">
@@ -380,7 +378,6 @@
   import genContentLink from '../utils/genContentLink';
   import HeaderTabs from '../../../../coach/assets/src/views/common/HeaderTabs';
   import HeaderTab from '../../../../coach/assets/src/views/common/HeaderTabs/HeaderTab';
-  import HybridLearningCardGrid from './HybridLearningCardGrid';
   import EmbeddedSidePanel from './EmbeddedSidePanel';
   import BrowseResourceMetadata from './BrowseResourceMetadata';
   import LearningActivityChip from './LearningActivityChip';
@@ -411,7 +408,6 @@
     components: {
       KBreadcrumbs,
       CardThumbnail,
-      HybridLearningCardGrid,
       LibraryAndChannelBrowserMainContent,
       CustomContentRenderer,
       CategorySearchModal,
@@ -460,7 +456,6 @@
     data: function() {
       return {
         sidePanelStyleOverrides: {},
-        currentViewStyle: 'card',
         currentCategory: null,
         showSearchModal: false,
         sidePanelIsOpen: false,