Merge branch 'front-styles' of ssh://git.ma-al.com:8822/goc_daniel/b2b into test

bo/src/components/admin/PageProducts.vue

@@ -1,15 +1,20 @@
 <template>
     <suspense>
         <component :is="Default || 'div'">
+            <!-- <div class="w-64 h-128">
+                <CategoryMenu />
+            </div> -->
+
+            <CategoryMenuListing />
+            <UTable :data="productsList" :columns="columns" class="flex-1">
+                <template #expanded="{ row }">
+                    <UTable :data="productsList.slice(0, 3)" :columns="columnsChild" :ui="{
+                        thead: 'hidden'
+                    }" />
+                </template>
+            </UTable>
+
             <div class="container mx-auto mt-20">
-                <!-- <UNavigationMenu orientation="vertical" :items="listing" class="data-[orientation=vertical]:w-48">
-                    <template #item="{ item, active }">
-                        <div class="flex items-center gap-2 px-3 py-2">
-                            <UIcon name="i-heroicons-book-open" />
-                            <span>{{ item.name }}</span>
-                        </div>
-                    </template>
-</UNavigationMenu> -->
                 <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
                 <div v-if="loading" class="text-center py-8">
                     <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
@@ -18,16 +23,42 @@
                     {{ error }}
                 </div>
                 <div v-else class="overflow-x-auto">
-                    <div class="flex gap-2">
+                    <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
-                        <CategoryMenuListing />
+                        <thead class="bg-gray-50 dark:bg-gray-800">
-                        <UTable :data="productsList" :columns="columns" class="flex-1">
+                            <tr>
-                            <template #expanded="{ row }">
+                                <th
-                                <UTable :data="productsList.slice(0, 3)" :columns="columnsChild" :ui="{
+                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                                    thead: 'hidden'
+                                    Image</th>
-                                }" />
+                                <th
-                            </template>
+                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                        </UTable>
+                                    Product Code</th>
-                    </div>
+                                <th
+                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                                    Name</th>
+                                <th
+                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                                    Link</th>
+                            </tr>
+                        </thead>
+                        <tbody class="bg-white dark:bg-gray-900 divide-y divide-gray-200 dark:divide-gray-700">
+                            <tr v-for="product in productsList" :key="product.product_id"
+                                class="hover:bg-gray-50 dark:hover:bg-gray-800"
+                                @click="goToProduct(product.product_id)">
+                                <td class="px-6 py-4 whitespace-nowrap">
+                                    <img :src="product.image_link" alt="product image"
+                                        class="w-16 h-16 object-cover rounded" />
+                                </td>
+                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-white">{{
+                                    product.reference }}</td>
+                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-white">{{
+                                    product.name }}
+                                </td>
+                                <td class="px-6 py-4 whitespace-nowrap text-sm text-blue-600 dark:text-blue-400">
+                                    {{ product.link_rewrite }}
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
                     <div class="flex justify-center items-center py-8">
                         <UPagination v-model:page="page" :total="total" :page-size="perPage" />
                     </div>
@@ -168,7 +199,7 @@ async function fetchProductList() {
         if (value) params.append(key, String(value))
     })
 
-    const url = `/api/v1/restricted/list-products/get-listing?${params}`
+    const url = `/api/v1/restricted/list/list-products?${params}`
 
     try {
         const response = await useFetchJson<ApiResponse>(url)

bo/src/components/admin/ProductDetailView.vue

@@ -41,7 +41,9 @@
         <p class="text-red-500">{{ productStore.error }}</p>
       </div>
       <div v-else-if="productStore.productDescription" class="flex items-start gap-30">
-        <img v-if="imageUrl" :src="imageUrl as string" class="w-[60%]" />
+        <div class="w-80 h-80 bg-(--second-light) dark:bg-gray-700 rounded-lg flex items-center justify-center">
+          <span class="text-gray-500 dark:text-gray-400">Product Image</span>
+        </div>
         <div class="flex flex-col gap-2">
           <p class="text-[25px] font-bold text-black dark:text-white">
             {{ productStore.productDescription.name || 'Product Name' }}
@@ -142,7 +144,7 @@ const isEditing = ref(false)
 
 const availableLangs = computed(() => langs)
 
-const selectedLanguage = ref('pl')
+const selectedLanguage = ref('en')
 
 const currentLangId = ref(2)
 const productID = ref<number>(0)
@@ -179,7 +181,7 @@ const translateToSelectedLanguage = async () => {
 }
 
 onMounted(async () => {
-  const id = route.params.id
+  const id = route.params.product_id
   if (id) {
     productID.value = Number(id)
     await fetchForLanguage(selectedLanguage.value)

bo/src/components/customer/PageProducts.vue

@@ -167,7 +167,7 @@ async function fetchProductList() {
         if (value) params.append(key, String(value))
     })
 
-    const url = `/api/v1/restricted/list-products/get-listing?${params}`
+    const url = `/api/v1/restricted/list/list-products?${params}`
 
     try {
         const response = await useFetchJson<ApiResponse>(url)

bo/src/router/menu.ts

@@ -2,11 +2,10 @@ import { useFetchJson } from "@/composable/useFetchJson";
 import type { MenuItem, Route } from "@/types/menu";
 
 export const getMenu = async () => {
-    const resp = await useFetchJson<MenuItem>('/api/v1/restricted/menu/get-menu');
+    const resp = await useFetchJson<MenuItem>('/api/v1/restricted/menu/get-category-tree');
     return resp.items.children
 }
 
-
 export const getRoutes = async () => {
     const resp = await useFetchJson<Route[]>('/api/v1/public/menu/get-routes');
 

bo/src/stores/product.ts

@@ -34,7 +34,7 @@ export const useProductStore = defineStore('product', () => {
 
     try {
       const response = await useFetchJson<ProductDescription>(
-        `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`,
+        `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
       )
       productDescription.value = response.items
       console.log(productDescription, 'dfsfsdf');