From 291ba7e67807ff65e374c6f36794d046c92312e8 Mon Sep 17 00:00:00 2001
From: nquidox <nquidox@gmail.com>
Date: Thu, 18 Sep 2025 21:05:19 +0300
Subject: [PATCH] request list

---
 src/views/CollectionView.vue                  | 59 ++++++++++++-------
 .../CollectionView/CollectionMerchCard.vue    | 12 +++-
 2 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/src/views/CollectionView.vue b/src/views/CollectionView.vue
index 69af4bc..dc32197 100644
--- a/src/views/CollectionView.vue
+++ b/src/views/CollectionView.vue
@@ -1,31 +1,39 @@
 <script setup>
-
 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'
+
+const merchList = ref(null)
+const loading = ref(true)
+const error = ref(null)
+
+const fetchMerch = async () => {
+  try {
+    const response = await apiClient.get('/merch/')
+    if (!response.ok) throw new Error('Network error')
+    merchList.value = await response.data
+  } catch (err) {
+    error.value = err.message
+  } finally {
+    loading.value = false
+  }
+}
+
+onMounted(() => {
+  fetchMerch()
+})
 </script>
 
 <template>
- <CollectionToolbar />
-  <n-grid
-    responsive="screen"
-    cols="2 s:3 m:4 l:5 xl:6 2xl:7"
-    class="grid-main"
-  >
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
-    <n-gi class="grid-item"><CollectionMerchCard /></n-gi>
+  <CollectionToolbar />
+  <n-grid responsive="screen" cols="2 s:3 m:4 l:5 xl:6 2xl:7" class="grid-main">
+    <n-gi class="grid-item" v-for="item in merchList" :key="item.merch_uuid">
+      <router-link :to="`/details/${item.merch_uuid}`" class="card-link">
+        <CollectionMerchCard :merch="item" />
+      </router-link>
+    </n-gi>
   </n-grid>
-
-
 </template>
 
 <style scoped>
@@ -36,4 +44,13 @@ import CollectionMerchCard from '@/views/CollectionView/CollectionMerchCard.vue'
 .grid-main {
   margin: 10px auto;
 }
+
+.card-link {
+  display: block;
+  text-decoration: none;
+  color: inherit;
+}
+.card-link:hover {
+  text-decoration: none;
+}
 </style>
diff --git a/src/views/CollectionView/CollectionMerchCard.vue b/src/views/CollectionView/CollectionMerchCard.vue
index 058b395..c528455 100644
--- a/src/views/CollectionView/CollectionMerchCard.vue
+++ b/src/views/CollectionView/CollectionMerchCard.vue
@@ -1,9 +1,16 @@
-<script setup lang="ts">
+<script setup>
 import BoxIcon from '@/components/icons/BoxIcon.vue'
+
+defineProps({
+  merch: {
+    type: Object,
+    required: true,
+  }
+})
 </script>
 
 <template>
-  <n-card title="Card template" class="responsive-card">
+  <n-card :title="merch.name" class="responsive-card">
     <template #cover>
       <div class="cover-wrapper">
         <BoxIcon />
@@ -33,4 +40,5 @@ import BoxIcon from '@/components/icons/BoxIcon.vue'
   height: auto;
   max-width: 80%;
 }
+
 </style>