learningequality
diff --git a/‎contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue‎
Lines changed: 61 additions & 233 deletions b/‎contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue‎
Lines changed: 61 additions & 233 deletions
@@ -1,268 +1,96 @@
 <template>
 
-  <div>
+  <div class="catalog-filters-wrapper">
     <KButton
-      v-if="$vuetify.breakpoint.xsOnly"
-      class="drawer-btn"
-      :text="$tr('searchText')"
-      :primary="true"
-      appearance="flat-button"
-      @click.stop="drawer = true"
+      v-if="windowIsSmall"
+      class="filter-button"
+      :text="$tr('filterLabel')"
+      appearance="raised-button"
+      icon="filter"
+      @click="openSidePanel"
     />
-    <CatalogFilterBar />
-    <VNavigationDrawer
-      v-model="drawer"
-      :permanent="$vuetify.breakpoint.smAndUp"
-      app
-      disable-route-watcher
-      :clipped="$vuetify.breakpoint.smAndUp"
-      :right="isRTL"
+    <div
+      v-if="!windowIsSmall"
+      class="filter-panel"
+      :style="asideStyles"
     >
-      <VContainer class="filters pa-3">
-        <VToolbar
-          v-if="$vuetify.breakpoint.xsOnly"
-          color="transparent"
-          flat
-          dense
-        >
-          <VSpacer />
-          <VBtn
-            icon
-            flat
-            style="text-align: right"
-            @click="drawer = false"
-          >
-            <Icon icon="clear" />
-          </VBtn>
-        </VToolbar>
-
-        <!-- Keyword search -->
-        <VTextField
-          v-model="keywordInput"
-          color="primary"
-          :label="$tr('searchLabel')"
-          box
-          clearable
-          data-test="keywords"
-          autofocus
-          @input="setKeywords"
-        />
-
-        <!-- Language -->
-        <LanguageFilter
-          v-model="languages"
-          :menu-props="menuProps"
-        />
-
-        <!-- License (attach to self to keep in notranslate class) -->
-        <MultiSelect
-          v-if="!libraryMode"
-          v-model="licenses"
-          :items="licenseOptions"
-          :label="$tr('licenseLabel')"
-        />
-
-        <!-- Formats (attach to self to keep in notranslate class) -->
-        <MultiSelect
-          v-model="kinds"
-          :items="kindOptions"
-          :label="$tr('formatLabel')"
-        />
-
-        <!-- Starred -->
-        <Checkbox
-          v-if="loggedIn"
-          v-model="bookmark"
-          :label="$tr('starredLabel')"
-        />
-
-        <!-- Includes -->
-        <div class="subheading">
-          {{ $tr('includesLabel') }}
-        </div>
-
-        <div :style="{ display: 'flex', alignItems: 'center' }">
-          <Checkbox
-            v-model="coach"
-            aria-describedby="tooltip-coach"
-            :label="$tr('coachLabel')"
-          />
-          <HelpTooltip
-            :text="$tr('coachDescription')"
-            maxWidth="250px"
-            tooltipId="tooltip-coach"
-          />
-        </div>
-
-        <Checkbox
-          v-model="subtitles"
-          :label="$tr('subtitlesLabel')"
-        />
-        <KRouterLink
-          class="qa-link"
-          :to="faqLink"
-          :text="$tr('frequentlyAskedQuestionsLink')"
-          appearance="basic-link"
-          iconAfter="openNewTab"
-          target="_blank"
-        />
-      </VContainer>
-      <VFooter
-        class="pb-3 pt-2 px-4"
-        color="transparent"
-        height="100"
-      >
-        <div>
-          <VImg
-            height="60"
-            width="90"
-            class="mb-1 mr-2"
-            contain
-            :src="require('shared/images/le-logo.svg')"
-          />
-          <KExternalLink
-            href="https://learningequality.org/"
-            :text="$tr('copyright', { year: new Date().getFullYear() })"
-            openInNewTab
-          />
-        </div>
-      </VFooter>
-    </VNavigationDrawer>
+      <CatalogFilterPanelContent />
+    </div>
+    <SidePanelModal
+      v-if="windowIsSmall && showCatalogFiltersSidePanel"
+      alignment="left"
+      @closePanel="closeSidePanel"
+    >
+      <CatalogFilterPanelContent />
+    </SidePanelModal>
   </div>
 
 </template>
 
 
 <script>
 
-  import { mapGetters } from 'vuex';
-  import debounce from 'lodash/debounce';
-  import { RouteNames } from '../../constants';
-  import CatalogFilterBar from './CatalogFilterBar';
-  import { catalogFilterMixin } from './mixins';
-  import LanguageFilter from './components/LanguageFilter';
-  import MultiSelect from 'shared/views/form/MultiSelect';
-  import { constantsTranslationMixin } from 'shared/mixins';
-  import Checkbox from 'shared/views/form/Checkbox';
-  import HelpTooltip from 'shared/views/HelpTooltip';
-  import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+  import { ref, computed, defineComponent } from 'vue';
+  import { themeTokens } from 'kolibri-design-system/lib/styles/theme';
+  import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
+  import CatalogFilterPanelContent from './components/CatalogFilterPanelContent.vue';
+  import SidePanelModal from 'shared/views/SidePanelModal';
 
-  const excludedKinds = new Set([ContentKindsNames.TOPIC, ContentKindsNames.H5P]);
-
-  export default {
+  export default defineComponent({
     name: 'CatalogFilters',
     components: {
-      LanguageFilter,
-      Checkbox,
-      HelpTooltip,
-      MultiSelect,
-      CatalogFilterBar,
+      CatalogFilterPanelContent,
+      SidePanelModal,
     },
-    mixins: [constantsTranslationMixin, catalogFilterMixin],
-    data() {
+    setup() {
+      const { windowIsSmall } = useKResponsiveWindow();
+      const tokensTheme = themeTokens();
+
+      const showCatalogFiltersSidePanel = ref(false);
+
+      const asideStyles = computed(() => ({
+        backgroundColor: tokensTheme.surface,
+        borderRight: `2px solid ${tokensTheme.fineLine}`,
+      }));
+
+      const openSidePanel = () => {
+        showCatalogFiltersSidePanel.value = true;
+      };
+
+      const closeSidePanel = () => {
+        showCatalogFiltersSidePanel.value = false;
+      };
+
       return {
-        drawer: false,
-        keywordInput: '',
+        windowIsSmall,
+        showCatalogFiltersSidePanel,
+        asideStyles,
+        openSidePanel,
+        closeSidePanel,
       };
     },
-    computed: {
-      ...mapGetters(['loggedIn']),
-      isRTL() {
-        return window.isRTL;
-      },
-      libraryMode() {
-        return window.libraryMode;
-      },
-      faqLink() {
-        return { name: RouteNames.CATALOG_FAQ };
-      },
-      menuProps() {
-        return { offsetY: true, maxHeight: 270 };
-      },
-      kindOptions() {
-        return (window.publicKinds || [])
-          .map(kind => {
-            if (!excludedKinds.has(kind)) {
-              return {
-                value: kind,
-                text: this.translateConstant(kind),
-              };
-            }
-          })
-          .filter(Boolean);
-      },
-      licenseOptions() {
-        return (window.publicLicenses || []).map(id => {
-          return {
-            value: Number(id),
-            text: this.translateLicense(Number(id)),
-          };
-        });
-      },
-      setKeywords() {
-        return debounce(this.updateKeywords, 500);
-      },
-    },
-    watch: {
-      keywords() {
-        this.keywordInput = this.keywords;
-      },
-    },
-    beforeMount() {
-      this.keywordInput = this.$route.query.keywords;
-    },
-    methods: {
-      updateKeywords() {
-        this.keywords = this.keywordInput;
-      },
-    },
     $trs: {
-      searchLabel: 'Keywords',
-      coachLabel: 'Resources for coaches',
-      subtitlesLabel: 'Captions or subtitles',
-      starredLabel: 'Starred',
-      licenseLabel: 'Licenses',
-      formatLabel: 'Formats',
-      includesLabel: 'Display only channels with',
-      searchText: 'Search',
-      coachDescription: 'Resources for coaches are only visible to coaches in Kolibri',
-      frequentlyAskedQuestionsLink: 'Frequently asked questions',
-      copyright: '© {year} Learning Equality',
+      filterLabel: 'Filter',
     },
-  };
+  });
 
 </script>
 
 
 <style lang="scss" scoped>
 
-  .v-input--checkbox {
-    margin: 0;
-  }
-
-  ::v-deep .v-messages {
-    display: none;
-  }
-
-  .subheading {
-    margin-top: 20px;
-    margin-bottom: 5px;
-    font-weight: bold;
-    color: gray;
-  }
-
-  .filters {
+  .catalog-filters-wrapper {
     width: 100%;
-    height: calc(100% - 100px);
-    overflow: auto;
+    height: 100%;
   }
 
-  .qa-link {
-    margin-top: 24px;
+  .filter-button {
+    margin: 16px;
   }
 
-  .drawer-btn {
-    margin-top: 10px;
+  .filter-panel {
+    width: 100%;
+    height: 100%;
   }
 
 </style>