itube-specs 0.0.269 → 0.0.270

package/composables/use-fetch-models-by-letter.ts

@@ -0,0 +1,41 @@
+import { ELanguage, EAsyncData, getSelectedQuery } from '../runtime';
+import { sortModels } from '../lib';
+import { useRoute } from 'vue-router';
+import type { IModelCard, PaginatedResponse } from '../types';
+
+export const useFetchModelsByLetter = async (
+    apiMethod: (...args: any[]) => Promise<PaginatedResponse<IModelCard>>
+) => {
+    const route = useRoute();
+    const lang = useI18n().locale.value as ELanguage;
+
+    const filters = computed(() => Object.entries(route.query)
+        .filter(([key]) => key.startsWith('filter_'))
+        .map(([key, value]) => ({
+            name: key.replace(/^filter_/, ''),
+            value: Array.isArray(value) ? value[ 0 ] : (value as string),
+        })));
+
+    const slug = useSlug();
+
+    const { data, status, refresh } = await useAsyncData<PaginatedResponse<IModelCard>>(
+        () => `${EAsyncData.Models}-${route.params.slug || ''}`,
+        () => useApiFetcher<PaginatedResponse<IModelCard>>(
+            EAsyncData.Models,
+            apiMethod,
+            lang,
+            {
+                page: Number(route.query.page) || 1,
+                'per-page': 48,
+            },
+            getSelectedQuery(route, sortModels) || '-popularity',
+            unref(filters),
+            unref(slug),
+        )(),
+        {
+            watch: [() => route.query],
+        }
+    );
+
+    return { data, status, refresh };
+};

package/composables/use-fetch-models.ts

@@ -16,10 +16,8 @@ export const useFetchModels = async (
             value: Array.isArray(value) ? value[ 0 ] : (value as string),
         })));
 
-    const slug = route.params['slug'] ? useSlug() : null;
-
     const { data, status, refresh } = await useAsyncData<PaginatedResponse<IModelCard>>(
-        () => `${EAsyncData.Models}-${route.params.slug || ''}`,
+        EAsyncData.Models,
         () => useApiFetcher<PaginatedResponse<IModelCard>>(
             EAsyncData.Models,
             apiMethod,
@@ -30,10 +28,9 @@ export const useFetchModels = async (
             },
             getSelectedQuery(route, sortModels) || '-popularity',
             unref(filters),
-            unref(slug),
         )(),
         {
-            watch: [() => route.params['slug'], () => route.query],
+            watch: [() => route.query],
         }
     );
 

package/package.json

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