Merge branch 'next' of github.com:traderfour/trader4.net into next

traderfour · Jun 6, 2023 · c44ee06 · c44ee06
2 parents 8643ddb + af7eb8e
commit c44ee06
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 32 deletions.
diff --git a/pages/index.vue b/pages/index.vue
@@ -19,7 +19,7 @@
         </button>
 
         <li
-          v-for="(tag, index) in tags"
+          v-for="(tag, index) in categories"
           :key="index"
           class="px-3 py-1 min-w-fit rounded my-auto bg-white text-gray-600 cursor-pointer dark:bg-gray-800 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 transition duration-300 ease-in-out transform"
         >
@@ -104,30 +104,15 @@
   </div>
 </template>
 <script lang="ts" setup>
-const tags = ref<ICategory[]>();
-const loading = ref(true);
-const posts = ref();
-
-onMounted(() => {
-  loading.value = true;
-  store
-    .getPosts()
-    .then((res: any) => {
-      loading.value = false;
-      posts.value = res.data.results;
-    })
-    .catch((err) => {
-      loading.value = false;
-    });
-});
-const { data }: { data: any } = await useApi("/v1/categories");
-
-if (data) {
-  tags.value = data.results as ICategory[];
-}
 const tagBox = ref<Ref | null>(null);
+const {
+  categories,
+  fetchCategories,
+}: { categories: Ref<ICategory[]>; fetchCategories: any } = useMarketStore();
+fetchCategories();
 
-const store = usePostsStore();
+const { getPosts, posts, loading } = usePostsStore();
+getPosts("/v1/posts");
 
 const { locale } = useI18n();
 const rtlLangList = [

diff --git a/store/my.ts b/store/my.ts
@@ -1,7 +1,7 @@
 export const useMyStore = () => {
   const { $toast } = useNuxtApp();
-  const list = ref<IPosts>();
-  const loading = ref<boolean>(false);
+  const list = ref();
+  const loading = ref(true);
 
   const createItem = async (route: string, payload: any) => {
     return await useApi(route, {
@@ -12,17 +12,15 @@ export const useMyStore = () => {
     });
   };
 
-  const getList = async (route: string) => {
-    loading.value = true;
-    await useApi(route)
+  const getList = (route: string) => {
+    useApi(route)
       .then((res) => {
         const response = res.data as IApiResponse;
         loading.value = false;
         list.value = response.results;
       })
       .catch((err) => {
         loading.value = false;
-        console.log(err.data.message, "err");
         $toast.error(err.data.message, { position: "top-right" });
       });
   };

diff --git a/store/posts.ts b/store/posts.ts
@@ -1,6 +1,7 @@
 export const usePostsStore = () => {
+  const { $toast } = useNuxtApp();
   const loading = ref(true);
-  const posts = ref([]);
+  const posts = ref<IPosts[]>([]);
   let post = ref<IPosts>({} as IPosts);
   const metas = ref({});
 
@@ -22,8 +23,17 @@ export const usePostsStore = () => {
     });
   };
 
-  const getPosts = async () => {
-    return await useApi("/v1/posts");
+  const getPosts = (route: string) => {
+    useApi(route)
+      .then((res) => {
+        const response = res.data as IApiResponse;
+        loading.value = false;
+        posts.value = response.results;
+      })
+      .catch((err) => {
+        loading.value = false;
+        $toast.error(err.data.message, { position: "top-right" });
+      });
   };
 
   const getPost = async (slogan: string) => {