Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate

2026-04-01 09:36:56 +02:00
parent b829bf2185 cf4d14a3cb
commit 980fb1543b
13 changed files with 87 additions and 234 deletions
--- a/app/model/productDescription.go
+++ b/app/model/productDescription.go
@@ -20,7 +20,7 @@ type ProductDescription struct {
 	DeliveryOutStock string `gorm:"column:delivery_out_stock;type:varchar(255)" json:"delivery_out_stock" form:"delivery_out_stock"`
 	Usage            string `gorm:"column:usage;type:text" json:"usage" form:"usage"`

-	ExistsInDatabse bool `gorm:"-" json:"exists_in_database"`
+	ExistsInDatabase bool `gorm:"-" json:"exists_in_database"`
 }

 type ProductRow struct {
--- a/app/repos/listRepo/listRepo.go
+++ b/app/repos/listRepo/listRepo.go
@@ -32,7 +32,7 @@ func (repo *ListRepo) ListProducts(id_lang uint, p find.Paging, filt *filters.Fi
            ps.id_product AS product_id,
            pl.name AS name,
            pl.link_rewrite AS link_rewrite,
-            CONCAT(?, ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
+            CONCAT(?, '/', ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
            cl.name AS category_name,
            p.reference AS reference,
            COALESCE(v.variants_number, 0) AS variants_number,
--- a/app/repos/productDescriptionRepo/productDescriptionRepo.go
+++ b/app/repos/productDescriptionRepo/productDescriptionRepo.go
@@ -40,11 +40,11 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productid

 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		// handle "not found" case only
-		ProductDescription.ExistsInDatabse = false
+		ProductDescription.ExistsInDatabase = false
 	} else if err != nil {
 		return nil, fmt.Errorf("database error: %w", err)
 	} else {
-		ProductDescription.ExistsInDatabse = true
+		ProductDescription.ExistsInDatabase = true
 	}

 	return &ProductDescription, nil
--- a/bo/src/components/admin/PageProducts.vue
+++ b/bo/src/components/admin/PageProducts.vue
@@ -1,70 +1,11 @@
 <template>
    <suspense>
        <component :is="Default || 'div'">
-            <!-- <div class="w-64 h-128">
+            <div class="flex gap-10">
                <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">
-                <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>
-                </div>
-                <div v-else-if="error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
-                    {{ error }}
-                </div>
-                <div v-else class="overflow-x-auto">
-                    <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
-                        <thead class="bg-gray-50 dark:bg-gray-800">
-                            <tr>
-                                <th
-                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                                    Image</th>
-                                <th
-                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                                    Product Code</th>
-                                <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>
-                    <div v-if="productsList.length === 0" class="text-center py-8 text-gray-500 dark:text-gray-400">
-                        No products found
-                    </div>
+                <div class="w-full flex flex-col items-center gap-4">
+                    <UTable :data="productsList" :columns="columns" class="flex-1 w-full" />
+                    <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
                </div>
            </div> -->
        </component>
@@ -77,26 +18,20 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
-import CategoryMenuListing from '../inner/categoryMenuListing.vue'
-
-interface Product {
-    reference: number
-    product_id: number
-    name: string
-    image_link: string
-    link_rewrite: string
-}
+import CategoryMenu from '../inner/categoryMenu.vue'
+import type { Product } from '@/types/product'

 const router = useRouter()
 const route = useRoute()

+const perPage = ref(15)
 const page = computed({
-    get: () => Number(route.query.page) || 1,
+    get: () => Number(route.query.p) || 1,
    set: (val: number) => {
        router.push({
            query: {
                ...route.query,
-                page: val
+                p: val
            }
        })
    }
@@ -132,7 +67,6 @@ const sortField = computed({
    }
 })

-const perPage = ref(15)
 const total = ref(0)

 interface ApiResponse {
@@ -193,17 +127,25 @@ async function fetchProductList() {
    error.value = null

    const params = new URLSearchParams()
-
    Object.entries(route.query).forEach(([key, value]) => {
-        if (value) params.append(key, String(value))
+        if (value === undefined || value === null) return
+
+        if (Array.isArray(value)) {
+            value.forEach(v => params.append(key, String(v)))
+        } else {
+            params.append(key, String(value))
+        }
+
    })

-    const url = `/api/v1/restricted/list/list-products?${params}`
+    if (route.params.category_id)
+        params.append('category_id', String(route.params.category_id))

+    const url = `/api/v1/restricted/list/list-products?elems=${perPage.value}&${params.toString()}`
    try {
        const response = await useFetchJson<ApiResponse>(url)
        productsList.value = response.items || []
-        total.value = response.count || 0
+        total.value = Number(response.count) || 0
    } catch (e: unknown) {
        error.value = e instanceof Error ? e.message : 'Failed to load products'
    } finally {
@@ -218,11 +160,6 @@ function goToProduct(productId: number) {
    })
 }

-const selectedCount = ref({
-    product_id: null,
-    count: 0
-})
-
 function getIcon(name: string) {
    if (sortField.value[0] === name) {
        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
@@ -236,25 +173,7 @@ const UInput = resolveComponent('UInput')
 const UButton = resolveComponent('UButton')
 const UIcon = resolveComponent('UIcon')

-const columns: TableColumn<Payment>[] = [
-    {
-        id: 'expand',
-        cell: ({ row }) =>
-            h(UButton, {
-                color: 'neutral',
-                variant: 'ghost',
-                icon: 'i-lucide-chevron-down',
-                square: true,
-                'aria-label': 'Expand',
-                ui: {
-                    leadingIcon: [
-                        'transition-transform',
-                        row.getIsExpanded() ? 'duration-200 rotate-180' : ''
-                    ]
-                },
-                onClick: () => row.toggleExpanded()
-            })
-    },
+const columns: TableColumn<Product>[] = [
    {
        accessorKey: 'product_id',
        header: ({ column }) => {
@@ -351,78 +270,11 @@ const columns: TableColumn<Payment>[] = [
        cell: ({ row }) => {
            return h(UButton, {
                onClick: () => {
-                    console.log('Clicked', row.original)
                    goToProduct(row.original.product_id)
                },
                color: 'primary',
                variant: 'solid'
-            }, 'Show product')
-        },
-    }
-]
-
-const columnsChild: TableColumn<Payment>[] = [
-    {
-        accessorKey: 'product_id',
-        header: '',
-        cell: ({ row }) => `#${row.getValue('product_id') as number}`
-    },
-    {
-        accessorKey: 'image_link',
-        header: '',
-        cell: ({ row }) => {
-            return h('img', {
-                src: row.getValue('image_link') as string,
-                style: 'width:40px;height:40px;object-fit:cover;'
-            })
-        }
-    },
-    {
-        accessorKey: 'name',
-        header: '',
-        cell: ({ row }) => row.getValue('name') as string
-    },
-    {
-        accessorKey: 'quantity',
-        header: '',
-        cell: ({ row }) => row.getValue('quantity') as number
-    },
-    {
-        accessorKey: 'count',
-        header: '',
-        cell: ({ row }) => {
-            return h(UInputNumber, {
-                modelValue: selectedCount.value.product_id === row.original.product_id ? selectedCount.value.count : 0,
-                'onUpdate:modelValue': (val: number) => {
-                    if (val)
-                        selectedCount.value = {
-                            product_id: row.original.product_id,
-                            count: val
-                        }
-                    else {
-                        selectedCount.value = {
-                            product_id: null,
-                            count: 0
-                        }
-                    }
-                },
-                min: 0,
-                max: row.original.quantity
-            })
-        }
-    },
-    {
-        accessorKey: 'count',
-        header: '',
-        cell: ({ row }) => {
-            return h(UButton, {
-                onClick: () => {
-                    console.log('Clicked', row.original)
-                },
-                color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
-                disabled: selectedCount.value.product_id !== row.original.product_id,
-                variant: 'solid'
-            }, 'Add to cart')
+            }, () => 'Show product')
        },
    }
 ]
--- a/bo/src/components/customer/PageProducts.vue
+++ b/bo/src/components/customer/PageProducts.vue
@@ -19,7 +19,7 @@
                </div>
                <div v-else class="overflow-x-auto">
                    <div class="flex gap-2">
-                        <CategoryMenuListing />
+                        <CategoryMenu />
                        <UTable :data="productsList" :columns="columns" class="flex-1">
                            <template #expanded="{ row }">
                                <UTable :data="productsList.slice(0, 3)" :columns="columnsChild" :ui="{
@@ -46,7 +46,7 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
-import CategoryMenuListing from '../inner/categoryMenuListing.vue'
+import CategoryMenu from '../inner/categoryMenu.vue'

 interface Product {
    reference: number
--- a/bo/src/components/inner/categoryMenu.vue
+++ b/bo/src/components/inner/categoryMenu.vue
@@ -1,20 +1,57 @@
+<template>
+  <UNavigationMenu orientation="vertical" type="single" :items="items" class="data-[orientation=vertical]:w-72" />
+</template>
+
 <script setup lang="ts">
 import { getMenu } from '@/router/menu'
 import type { NavigationMenuItem } from '@nuxt/ui';
 import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+
 let menu = await getMenu() as NavigationMenuItem[]
-
 const openAll = ref(false)
+const route = useRoute()

+let categoryId = ref(route.params.category_id)
+function findPath(tree: NavigationMenuItem[], id: number, path: Array<number> = []): Array<number> | null {
+  for (let item of tree) {
+    let newPath: Array<number> = [...path, item.category_id]
+    if (item.category_id === id) {
+      return newPath
+    }
+    if (item.children) {
+      const result: Array<number> | null = findPath(item.children, id, newPath)
+
+      if (result) {
+        return result
+      }
+    }
+  }
+
+  return null
+}
+
+let path = findPath(menu, Number(categoryId.value))
 function adaptMenu(menu: NavigationMenuItem[]) {
  for (const item of menu) {
    if (item.children && item.children.length > 0) {
-      console.log(item);
+      item.open = path && path.includes(item.category_id) ? true : openAll.value
      adaptMenu(item.children);
-      item.open = openAll.value
-      item.children.unshift({ label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: { name: 'category', params: item.params } })
+      item.children.unshift({
+        label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: {
+          name: 'customer-products-category', params: {
+            category_id: item.params.category_id,
+            link_rewrite: item.params.link_rewrite
+          }
+        }
+      })
    } else {
-      item.to = { name: 'category', params: item.params };
+      item.to = {
+        name: 'customer-products-category', params: {
+          category_id: item.params.category_id,
+          link_rewrite: item.params.link_rewrite
+        }
+      };
      item.icon = 'i-lucide-file-text'
    }
  }
@@ -22,7 +59,6 @@ function adaptMenu(menu: NavigationMenuItem[]) {
 }

 menu = adaptMenu(menu)
-
 const items = ref<NavigationMenuItem[][]>([
  [
    ...menu as NavigationMenuItem[]
@@ -30,7 +66,3 @@ const items = ref<NavigationMenuItem[][]>([

 ])
 </script>
-
-<template>
-  <UNavigationMenu orientation="vertical" type="single" :items="items" class="p-4" />
-</template>
--- a/bo/src/components/inner/categoryMenuListing.vue
+++ b/bo/src/components/inner/categoryMenuListing.vue
@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import { getMenu } from '@/router/menu'
-import type { NavigationMenuItem } from '@nuxt/ui';
-import { ref } from 'vue';
-let menu = await getMenu() as NavigationMenuItem[]
-
-const openAll = ref(false)
-
-function adaptMenu(menu: NavigationMenuItem[]) {
-  for (const item of menu) {
-    if (item.children && item.children.length > 0) {
-      adaptMenu(item.children);
-      item.open = openAll.value
-      item.children.unshift({ label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: { name: 'category', params: item.params } })
-    } else {
-      item.to = { name: 'category', params: item.params };
-      item.icon = 'i-lucide-file-text'
-    }
-  }
-  return menu;
-}
-
-menu = adaptMenu(menu)
-
-const items = ref<NavigationMenuItem[][]>([
-  [
-    ...menu as NavigationMenuItem[]
-  ],
-
-])
-</script>
-
-<template>
-  <UNavigationMenu orientation="vertical" type="single" :items="items" class="p-4" />
-</template>
--- a/bo/src/router/index.ts
+++ b/bo/src/router/index.ts
@@ -59,7 +59,6 @@ async function setRoutes() {
    const componentName = item.component
    const [, folder] = componentName.split('/')
    const componentPath = `/src${componentName}`
-    console.log(componentPath);
    

    let modules =
--- a/bo/src/router/menu.ts
+++ b/bo/src/router/menu.ts
@@ -5,7 +5,6 @@ import { settings } from "./settings";


 const categoryId = ref()
-
 export const getMenu = async () => {
    if(!categoryId.value){
        categoryId.value = settings['app'].category_tree_root_id
--- a/bo/src/router/settings.ts
+++ b/bo/src/router/settings.ts
@@ -8,6 +8,4 @@ export const settings = reactive({} as Settings)
 export async function getSettings() {
    const { items } = await useFetchJson<Resp<Settings>>('/api/v1/settings',)
    Object.assign(settings, items)
-
-    console.log(settings['app'])
 }
--- a/bo/src/stores/category.ts
+++ b/bo/src/stores/category.ts
@@ -13,24 +13,24 @@ const products = [
 // type CategoryProducts = {}

 export const useCategoryStore = defineStore('category', () => {
-    const id_category = ref(0)
+    const idCategory = ref(0)
    const categoryProducts = ref(products)


    function setCategoryID(id: number) {
-        id_category.value = id
+        idCategory.value = id
    }

    async function getCategoryProducts() {
        return new Promise<typeof products>((resolve) => {
            setTimeout(() => {
-                console.log('Fetching products from category id: ', id_category.value);
+                // console.log('Fetching products from category id: ', idCategory.value);
                resolve(categoryProducts.value)
            }, 2000 * Math.random())
        })
    }
    return {
-        id_category,
+        idCategory,
        getCategoryProducts,
        setCategoryID
    }
--- a/bo/src/types/product.d.ts
+++ b/bo/src/types/product.d.ts
@@ -1,4 +1,4 @@
-  export interface ProductDescription {
+export interface ProductDescription {
  id?: number
  name?: string
  description: string
@@ -8,3 +8,11 @@
  delivery_in_stock?: string
  usage: string
 }
+
+export interface Product {
+  reference: number
+  product_id: number
+  name: string
+  image_link: string
+  link_rewrite: string
+}
--- a/bruno/b2b-daniel/get-product-description.yml
+++ b/bruno/b2b-daniel/get-product-description.yml
@@ -5,13 +5,13 @@ info:

 http:
  method: GET
-  url: http://localhost:3000/api/v1/restricted/product-translation/get-product-description?productID=51&productLangID=4
+  url: http://localhost:3000/api/v1/restricted/product-translation/get-product-description?productID=51&productLangID=1
  params:
    - name: productID
      value: "51"
      type: query
    - name: productLangID
-      value: "4"
+      value: "1"
      type: query
  auth: inherit