From 8b747f0a1e344ba14047cb71f60160e46ac7779c Mon Sep 17 00:00:00 2001 From: nquidox Date: Mon, 22 Sep 2025 19:59:51 +0300 Subject: [PATCH] moved get merch list method --- src/api/merch.js | 12 ++++++++++++ src/views/CollectionView.vue | 6 ++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/api/merch.js b/src/api/merch.js index 04835fd..56a5962 100644 --- a/src/api/merch.js +++ b/src/api/merch.js @@ -21,6 +21,17 @@ export const useMerchApi = () => { } } + const getMerchList = async () => { + try { + const response = await apiClient.get('/merch/') + if (response.status === 200) { + return response + } + } catch (error) { + return error + } + } + const deleteMerch = async (uuid) => { try { const response = await apiClient.delete(`/merch/${uuid}`) @@ -33,6 +44,7 @@ export const useMerchApi = () => { return { addMerch, getMerchDetails, + getMerchList, deleteMerch, } } diff --git a/src/views/CollectionView.vue b/src/views/CollectionView.vue index dc32197..f5ec6fc 100644 --- a/src/views/CollectionView.vue +++ b/src/views/CollectionView.vue @@ -2,15 +2,17 @@ import CollectionToolbar from '@/views/CollectionView/CollectionToolbar.vue' import CollectionMerchCard from '@/views/CollectionView/CollectionMerchCard.vue' import { onMounted, ref } from 'vue' -import { apiClient } from '@/services/apiClient.js' +import { useMerchApi } from '@/api/merch.js' const merchList = ref(null) const loading = ref(true) const error = ref(null) +const { getMerchList } = useMerchApi() + const fetchMerch = async () => { try { - const response = await apiClient.get('/merch/') + const response = await getMerchList() if (!response.ok) throw new Error('Network error') merchList.value = await response.data } catch (err) {