itube-specs 0.0.222 → 0.0.224

package/components/page-components/s-filter-popup.vue

@@ -27,24 +27,15 @@
     </template>
 
     <div class="s-filter-popup__filters">
-      <template
+      <SSelect
           v-for="(item, index) in scheme"
+          :name="item.title"
           :key="`scheme-${index}`"
-      >
-        <SInput
-            v-if="item.type === 'input'"
-            v-model="filterValue[item.name.toLowerCase()]"
-            :label="item?.label"
-        />
-        <SSelect
-            v-if="item.type === 'select'"
-            :name="item.title"
-            v-model="filterValue[item.name.toLowerCase()]"
-            :items="item.items"
-            :label="item?.label"
-            :placeholder="item.placeholder"
-        />
-      </template>
+          v-model="filterValue[item.title.toLowerCase()]"
+          :items="item.items"
+          :label="item?.label"
+          :placeholder="item.placeholder"
+      />
     </div>
 
     <template #footer>
@@ -67,7 +58,7 @@
 </template>
 
 <script setup lang="ts">
-import type { FilterSchemeType, ISelectItem } from '../../types';
+import type { IFilterScheme, ISelectItem } from '../../types';
 
 const { t } = useI18n()
 
@@ -75,7 +66,7 @@ const props = defineProps<{
   addedItems: ISelectItem[]
   durationItems: ISelectItem[]
   modelValue: boolean
-  scheme: FilterSchemeType
+  scheme: IFilterScheme[]
   count: number
 }>()
 
@@ -86,20 +77,20 @@ const filterValue = ref({} as Record<string, string>);
 const route = useRoute();
 
 const categoriesFromQuery = route.query.categories
-  ? (typeof route.query.categories === 'string'
-    ? route.query.categories.split(',')
-    : route.query.categories.flatMap(cat => cat.split(',')))
-  : [];
+    ? (typeof route.query.categories === 'string'
+        ? route.query.categories.split(',')
+        : route.query.categories.flatMap(cat => cat.split(',')))
+    : [];
 
 categoriesFromQuery.forEach(str => {
   const [key, ...rest] = str.split('_');
   if (key && rest.length > 0) {
-    filterValue.value[key] = rest.join('_');
+    filterValue.value[ key ] = rest.join('_');
   }
 });
 
-durationValue.value = route.query['duration'] as string || '';
-addedValue.value = route.query['added'] as string || '';
+durationValue.value = route.query[ 'duration' ] as string || '';
+addedValue.value = route.query[ 'added' ] as string || '';
 
 const emit = defineEmits<{
   (eventName: 'update:modelValue', value: boolean): void
@@ -116,7 +107,7 @@ const router = useRouter();
 
 function saveResult() {
   const oldQuery = { ...route.query };
-  delete oldQuery['page'];
+  delete oldQuery[ 'page' ];
 
   const mainFiltersValue = {
     ...(durationValue.value ? { duration: durationValue.value } : {}),
@@ -130,8 +121,8 @@ function saveResult() {
   };
 
   const categories = Object.entries(filterValue.value)
-    .filter(([, value]) => typeof value === 'string' && value.length > 0)
-    .map(([key, value]) => `${key}_${value}`);
+      .filter(([, value]) => typeof value === 'string' && value.length > 0)
+      .map(([key, value]) => `${key}_${value}`);
 
   const categoriesString = categories.join(',');
 
@@ -162,5 +153,5 @@ const filterTitle = computed(() => {
   return count > 0 ? `${filterText}: ${count}` : t('filter')
 })
 
-const isFiltered = computed(() => !!route.query['categories']);
+const isFiltered = computed(() => !!route.query[ 'categories' ]);
 </script>

package/components/page-components/s-filter.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script setup lang="ts">
-import type { ButtonSizes, ButtonThemes, FilterSchemeType } from '../../types';
+import type { ButtonSizes, ButtonThemes, IFilterScheme } from '../../types';
 import type { LocationQuery } from '#vue-router';
 import type { ISelectItem } from '../../types';
 
@@ -29,7 +29,7 @@ const route = useRoute();
 const filterOpen = ref(false);
 
 defineProps<{
-  scheme: FilterSchemeType
+  scheme: IFilterScheme[]
   addedItems: ISelectItem[]
   durationItems: ISelectItem[]
   buttonSize?: ButtonSizes

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.222",
+  "version": "0.0.224",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {

package/types/filter-scheme.d.ts

@@ -1,37 +1,11 @@
-import type { ISelectItem, ITabItem } from '../types';
+import type { ISelectItem } from '../types';
 
-export type FilterSchemeItemType =
-  | 'select'
-  | 'input'
-  | 'tabs'
-
-interface IFilterSchemeItemBase {
-  type: FilterSchemeItemType
+export interface IFilterScheme {
   title: string
   className?: string
   label?: string
   wide?: boolean
   fixed?: boolean
-}
-
-interface IFilterSchemeItemSelect extends IFilterSchemeItemBase {
-  type: 'select'
   items: ISelectItem[]
   placeholder: string
 }
-
-interface IFilterSchemeItemTabs extends IFilterSchemeItemBase {
-  type: 'tabs'
-  items: ITabItem[]
-}
-
-interface IFilterSchemeItemInput extends IFilterSchemeItemBase {
-  type: 'input'
-}
-
-export type FilterSchemeItem =
-  | IFilterSchemeItemSelect
-  | IFilterSchemeItemInput
-  | IFilterSchemeItemTabs
-
-export type FilterSchemeType = FilterSchemeItem[]

package/composables/use-fetch-videos.ts

@@ -1,77 +0,0 @@
-import { selectDurationItems, sortItemsDefault, selectAddedItems } from '../lib/';
-import { EAsyncData, ELanguage, getSelectedQuery, ApiHelper } from '../runtime';
-import { useRoute } from 'vue-router';
-import type { IVideoCard, PaginatedResponse, RequestPagination, IRequestVideoFilter } from '../types';
-
-async function getListByNiche(
-    pagination: RequestPagination,
-    videosFilter: IRequestVideoFilter,
-    lang: ELanguage,
-    order: string,
-    niche = 'gay',
-): Promise<PaginatedResponse<IVideoCard>> {
-    return await ApiHelper.fetch(
-        '/videos/list-by-niche',
-        {
-            method: 'POST',
-            headers: {
-                'X-Niche': niche,
-                'X-Language': lang,
-                'X-Cache-Time': '259200',
-                'Content-Type': 'application/json',
-            },
-            params: {
-                ...pagination,
-                order,
-            },
-            body: {
-                filter_request: videosFilter,
-                max_limit: 0,
-            }
-        },
-    );
-}
-
-export const useFetchVideos = async () => {
-    const route = useRoute();
-    const { locale } = useI18n();
-    const lang = locale.value as ELanguage;
-    const perPage = 48;
-
-    const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        EAsyncData.Videos,
-        fetchData,
-        {
-            watch: [
-                () => {
-                    if (route.query) {
-                        const currentQuery = route.query;
-                        return JSON.stringify(currentQuery);
-                    }
-                },
-            ],
-        }
-    );
-
-    async function fetchData() {
-        try {
-            return await getListByNiche(
-                {
-                    page: Number(route.query[ 'page' ]) || 1,
-                    [ 'per-page' ]: perPage,
-                },
-                useGetVideosFilterRequest(route, selectDurationItems, selectAddedItems),
-                lang,
-                getSelectedQuery(route, sortItemsDefault) || '-popularity,-primary_thumb_rank'
-            );
-        } catch (err) {
-            throw createError({
-                statusCode: 500,
-                statusMessage: 'Error fetching videos',
-                message: err instanceof Error ? err.message : 'An unknown error occurred',
-            });
-        }
-    }
-
-    return { data, status, error };
-};