Merge remote-tracking branch 'origin/translate' into front-styles

bo/src/components/customer/PageCart.vue

@@ -0,0 +1,17 @@
+<template>
+  <component :is="Default || 'div'">
+    <div class="flex flex-col gap-5 md:gap-10">
+      <h1 class="text-2xl font-bold text-black dark:text-white">
+        Shopping Cart
+      </h1>
+    </div>
+  </component>
+</template>
+
+<script setup lang="ts">
+import Default from '@/layouts/default.vue';
+import { useCartStore } from '@/stores/customer/cart';
+
+const cartStore =useCartStore()
+
+</script>

bo/src/components/customer/PageCarts.vue

@@ -17,128 +17,61 @@
                   <img v-if="item.image" :src="item.image" :alt="item.name" class="w-full h-full object-cover" />
                   <UIcon v-else name="mdi:package-variant" class="text-2xl text-gray-400" />
                 </div>
-                <p class="text-black dark:text-white text-sm font-medium">{{ item.name }}</p>
-                <p class="text-black dark:text-white">${{ item.price.toFixed(2) }}</p>
-                <p class="text-black dark:text-white font-medium">${{ (item.price * item.quantity).toFixed(2)
-                  }}</p>
+            </div>
 
-                <div class="flex items-center justify-end gap-10">
-                  <UInputNumber v-model="item.quantity" :min="1"
-                    @update:model-value="(val: number) => cartStore.updateQuantity(item.id, val)" />
-                  <div class="flex justify-center">
-                    <button @click="removeItem(item.id)"
-                      class="p-2 text-red-500 bg-red-100 dark:bg-(--main-dark)  rounded transition-colors"
-                      :title="t('Remove')">
-                      <UIcon name="material-symbols:delete" class="text-[20px]" />
-                    </button>
-                  </div>
+            <div class="w-full">
+                <div
+                    class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
+                    <h2
+                        class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
+                        {{ t('Your Carts') }}
+                    </h2>
+                    <div v-if="cartStore.carts?.length > 0"
+                        class="divide-y divide-(--border-light) dark:divide-(--border-dark)">
+                        <div v-for="cart in cartStore.carts" :key="cart.cart_id"
+                            @click="cartStore.setActiveCart(cart.cart_id)"
+                            class="p-4 cursor-pointer flex gap-2 items-center justify-between" :class="cartStore.activeCartId === cart.cart_id
+                                ? 'bg-blue-50 dark:bg-blue-900/20'
+                                : 'hover:bg-gray-50 dark:hover:bg-gray-800 border-l-4 border-transparent'">
+                            <div class="flex-1 min-w-0">
+                                <div class="flex items-center gap-2">
+                                    <p class="text-red-600 font-medium truncate">{{ cart.cart_id }}</p>
+                                    <p class="text-black dark:text-white font-medium truncate cursor-pointer"
+                                        @click="openCart(cart)">{{
+                                            cart.name }}</p>
+                                </div>
+                            </div>
+                            <input type="checkbox" :checked="cartStore.activeCartId === cart.cart_id"
+                                @change="toggleCart(cart.cart_id)" />
+                        </div>
+                    </div>
+                    <div v-else class="p-8 text-center">
+                        <UIcon name="mdi:cart-outline" class="text-4xl text-gray-300 dark:text-gray-600 mb-2" />
+                        <p class="text-gray-500 dark:text-gray-400">{{ t('No carts yet') }}</p>
+                    </div>
                 </div>
-              </div>
             </div>
-            <div v-else class="p-8 text-center">
-              <UIcon name="mdi:cart-outline" class="text-6xl text-gray-300 dark:text-gray-600 mb-4" />
-              <p class="text-gray-500 dark:text-gray-400">{{ t('Your cart is empty') }}</p>
-              <RouterLink :to="{
-                name: 'customer-product', params: {
-                  product_id: '51'
-                }
-              }" class="inline-block mt-4 text-(--text-sky-light) dark:text-(--text-sky-dark) hover:underline">
-                {{ t('Continue Shopping') }}
-              </RouterLink>
-            </div>
-          </div>
         </div>
-        <div class="lg:w-80">
-          <div
-            class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6 sticky top-24">
-            <h2 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Order Summary') }}</h2>
-            <div class="space-y-3 border-b border-(--border-light) dark:border-(--border-dark) pb-4 mb-4">
-              <div class="flex justify-between">
-                <span class="text-gray-600 dark:text-gray-400">{{ t('Products total') }}</span>
-                <span class="text-black dark:text-white">${{ cartStore.productsTotal.toFixed(2) }}</span>
-              </div>
-              <div class="flex justify-between">
-                <span class="text-gray-600 dark:text-gray-400">{{ t('Shipping') }}</span>
-                <span class="text-black dark:text-white">
-                  {{ cartStore.shippingCost > 0 ? `$${cartStore.shippingCost.toFixed(2)}` : t('Free') }}
-                </span>
-              </div>
-              <div class="flex justify-between">
-                <span class="text-gray-600 dark:text-gray-400">{{ t('VAT') }} ({{ (cartStore.vatRate * 100).toFixed(0)
-                  }}%)</span>
-                <span class="text-black dark:text-white">${{ cartStore.vatAmount.toFixed(2) }}</span>
-              </div>
-            </div>
-            <div class="flex justify-between mb-6">
-              <span class="text-black dark:text-white font-semibold text-lg">{{ t('Total') }}</span>
-              <span class="text-(--text-sky-light) dark:text-(--text-sky-dark) font-bold text-lg">${{
-                cartStore.orderTotal.toFixed(2) }}</span>
-            </div>
-            <div class="flex flex-col gap-3">
-              <UButton block color="primary" @click="placeOrder" :disabled="!canPlaceOrder"
-                class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light) disabled:opacity-50 disabled:cursor-not-allowed">
-                {{ t('Place Order') }}
-              </UButton>
-              <UButton block variant="outline" color="neutral" @click="cancelOrder"
-                class="text-black dark:text-white border-(--border-light) dark:border-(--border-dark) hover:bg-gray-100 dark:hover:bg-gray-700">
-                {{ t('Cancel') }}
-              </UButton>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="grid grid-cols-1 md:grid-cols-2 gap-5 md:gap-10">
-        <div class="flex-1">
-          <div
-            class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6">
-            <h2 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Select Delivery Address') }}</h2>
-            <div class="mb-4">
-              <UInput v-model="addressSearchQuery" type="text" :placeholder="t('Search address')"
-                class="w-full bg-white dark:bg-gray-800 text-black dark:text-white" />
-            </div>
-            <div v-if="addressStore.filteredAddresses.length > 0" class="space-y-3">
-              <label v-for="address in addressStore.filteredAddresses" :key="address.id"
-                class="flex items-start gap-3 p-4 border rounded-lg cursor-pointer transition-colors" :class="cartStore.selectedAddressId === address.id
-                  ? 'border-(--accent-blue-light) dark:border-(--accent-blue-dark) bg-blue-50 dark:bg-blue-900/20'
-                  : 'border-(--border-light) dark:border-(--border-dark) hover:border-gray-400'">
-                <input type="radio" :value="address.id" v-model="selectedAddress"
-                  class="mt-1 w-4 h-4 text-(--text-sky-light) dark:text-(--text-sky-dark)" />
-                <div class="flex-1">
-                  <p class="text-black dark:text-white font-medium">{{ address.street }}</p>
-                  <p class="text-gray-600 dark:text-gray-400 text-sm">{{ address.zipCode }}, {{ address.city }}</p>
-                  <p class="text-gray-600 dark:text-gray-400 text-sm">{{ address.country }}</p>
+
+        <UModal v-model:open="showCreateModal">
+            <template #header>
+                <h3 class="text-lg font-semibold text-black dark:text-white">{{ t('Create New Cart') }}</h3>
+            </template>
+            <template #body>
+                <div class="flex flex-col gap-4">
+                    <UInput v-model="newCartName" :placeholder="t('Cart name')"
+                        class="w-full bg-white dark:bg-gray-800 text-black dark:text-white" />
                 </div>
-              </label>
-            </div>
-            <div v-else class="text-center py-6">
-              <UIcon name="mdi:map-marker-outline" class="text-4xl text-gray-400 mb-2" />
-              <p class="text-gray-500 dark:text-gray-400">{{ t('No addresses found') }}</p>
-              <RouterLink :to="{ name: 'addresses' }"
-                class="inline-block mt-2 text-(--text-sky-light) dark:text-(--text-sky-dark) hover:underline">
-                {{ t('Add Address') }}
-              </RouterLink>
-            </div>
-          </div>
-        </div>
-        <div class="flex-1">
-          <div
-            class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6">
-            <h2 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Delivery Method') }}</h2>
-            <div class="space-y-3">
-              <label v-for="method in cartStore.deliveryMethods" :key="method.id"
-                class="flex items-center gap-3 p-4 border rounded-lg cursor-pointer transition-colors" :class="cartStore.selectedDeliveryMethodId === method.id
-                  ? 'border-(--accent-blue-light) dark:border-(--accent-blue-dark) bg-blue-50 dark:bg-blue-900/20'
-                  : 'border-(--border-light) dark:border-(--border-dark) hover:border-gray-400'">
-                <input type="radio" :value="method.id" v-model="selectedDeliveryMethod"
-                  class="w-4 h-4 text-(--text-sky-light) dark:text-(--text-sky-dark)" />
-                <div class="flex-1">
-                  <div class="flex justify-between items-center">
-                    <span class="text-black dark:text-white font-medium">{{ method.name }}</span>
-                    <span class="text-(--text-sky-light) dark:text-(--text-sky-dark) font-medium">
-                      {{ method.price > 0 ? `$${method.price.toFixed(2)}` : t('Free') }}
-                    </span>
-                  </div>
-                  <p class="text-gray-500 dark:text-gray-400 text-sm">{{ method.description }}</p>
+            </template>
+            <template #footer>
+                <div class="flex justify-end gap-2">
+                    <UButton variant="outline" color="neutral" @click="showCreateModal = false">
+                        {{ t('Cancel') }}
+                    </UButton>
+                    <UButton color="primary" @click="createCart" :disabled="!newCartName.trim()"
+                        class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white">
+                        {{ t('Create') }}
+                    </UButton>
                 </div>
               </label>
             </div>
@@ -149,9 +82,8 @@
   </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, onMounted } from 'vue'
 import { useCartStore } from '@/stores/customer/cart'
-import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
 const cartStore = useCartStore()
@@ -159,43 +91,33 @@ const addressStore = useAddressStore()
 const { t } = useI18n()
 const router = useRouter()
 
-const selectedAddress = ref<number | null>(cartStore.selectedAddressId)
-const selectedDeliveryMethod = ref<number | null>(cartStore.selectedDeliveryMethodId)
-const addressSearchQuery = ref('')
+const cartStore = useCartStore()
+const { t } = useI18n()
 
-watch(addressSearchQuery, (val) => {
-  addressStore.setSearchQuery(val)
-})
+const showCreateModal = ref(false)
+const newCartName = ref('')
 
-watch(selectedAddress, (newValue) => {
-  cartStore.setSelectedAddress(newValue)
-})
-
-watch(selectedDeliveryMethod, (newValue) => {
-  if (newValue) {
-    cartStore.setDeliveryMethod(newValue)
-  }
-})
-
-const canPlaceOrder = computed(() => {
-  return cartStore.items.length > 0 &&
-    cartStore.selectedAddressId !== null &&
-    cartStore.selectedDeliveryMethodId !== null
-})
-function removeItem(itemId: number) {
-  cartStore.removeItem(itemId)
+async function createCart() {
+    await cartStore.addNewCart(newCartName.value)
+    newCartName.value = ''
+    showCreateModal.value = false
 }
 
-function placeOrder() {
-  if (canPlaceOrder.value) {
-    console.log('Placing order...')
-    alert(t('Order placed successfully!'))
-    cartStore.clearCart()
-    router.push({ name: 'home' })
-  }
+
+onMounted(() => {
+    cartStore.fetchCarts()
+})
+
+
+function openCart(cart) {
+    router.push({ name: 'customer-cart', params: { id: cart.cart_id } });
 }
 
-function cancelOrder() {
-  router.back()
+function toggleCart(cartId: number) {
+    if (cartStore.activeCartId === cartId) {
+        cartStore.setActiveCart(null)
+    } else {
+        cartStore.setActiveCart(cartId)
+    }
 }
-</script>
+</script>

bo/src/components/customer/PageProduct.vue

@@ -169,21 +169,21 @@ if (productData.colors.length > 0) {
 
 const route = useRoute()
 
-async function toggleFavorite() {
-    const url = `/api/v1/restricted/product/favorite/${route.params.product_id}`
+// async function toggleFavorite() {
+//     const url = `/api/v1/restricted/product/favorite/${route.params.product_id}`
 
-    try {
-        if (!productData.is_favorite) {
-            await useFetchJson(url, { method: 'POST' })
-        } else {
-            await useFetchJson(url, { method: 'DELETE' })
-        }
+//     try {
+//         if (!productData.is_favorite) {
+//             await useFetchJson(url, { method: 'POST' })
+//         } else {
+//             await useFetchJson(url, { method: 'DELETE' })
+//         }
 
-        productData.is_favorite = !productData.is_favorite
-    } catch (e: unknown) {
-        console.error(e)
-    }
-}
+//         productData.is_favorite = !productData.is_favorite
+//     } catch (e: unknown) {
+//         console.error(e)
+//     }
+// }
 </script>
 
 <style scoped>

bo/src/components/customer/PageProducts.vue

@@ -48,6 +48,8 @@ import type { TableColumn } from '@nuxt/ui'
 import CategoryMenu from '../inner/CategoryMenu.vue'
 import { useCustomerProductStore } from '@/stores/customer/customer-product'
 import type { Product } from '@/stores/customer/customer-product'
+import { useCartStore } from '@/stores/customer/cart'
+import { useToast } from '@nuxt/ui/runtime/composables/useToast.js'
 
 
 const customerProductStore = useCustomerProductStore()
@@ -307,10 +309,9 @@ const columns: TableColumn<Product>[] = [
         cell: ({ row }) => {
             return h(UButton, {
                 onClick: () => {
-                    console.log('Clicked', row.original)
+                    addToCart(row.original.product_id)
                 },
                 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')
         },
@@ -346,7 +347,7 @@ const columns: TableColumn<Product>[] = [
     }
 ]
 
-const columnsChild: TableColumn<Payment>[] = [
+const columnsChild: TableColumn<Product>[] = [
     {
         accessorKey: 'product_id',
         header: '',
@@ -402,7 +403,7 @@ const columnsChild: TableColumn<Payment>[] = [
         cell: ({ row }) => {
             return h(UButton, {
                 onClick: () => {
-                    console.log('Clicked', row.original)
+                    addToCart(row.original.product_id)
                 },
                 color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
                 disabled: selectedCount.value.product_id !== row.original.product_id,
@@ -423,9 +424,47 @@ const columnsChild: TableColumn<Payment>[] = [
                 variant: 'soft'
             }, () => 'Show product')
         },
+    },
+    {
+        accessorKey: 'counta',
+        header: '',
+        cell: ({ row }) => {
+            return h(UIcon, {
+                onClick: () => customerProductStore.toggleFavorite(row.original),
+                class: [
+                    'cursor-pointer text-[20px] transition-transform duration-200 hover:scale-125',
+                    row.original.is_favorite ? 'text-red-500' : 'text-blue-500'
+                ],
+                name: 'material-symbols:favorite',
+                variant: 'soft',
+            })
+        }
     }
 ]
 
+const cartStore = useCartStore()
+const toast = useToast()
+async function addToCart(product_id: number) {
+    if (!cartStore.activeCartId) {
+        toast.add({
+            title: "No cart selected",
+            description: "Please select a cart before adding products",
+            icon: "i-heroicons-exclamation-triangle",
+            duration: 5000
+        })
+        return
+    }
+
+    const count = selectedCount.value.count || 1
+    await cartStore.addProduct(product_id, count)
+
+    toast.add({
+        title: "Product added to cart",
+        description: `Quantity: ${count}`,
+        icon: "i-heroicons-check-circle",
+        duration: 5000
+    })
+}
 watch(
     () => route.query,
     () => {

bo/src/components/customer/PageSearchProducts.vue

@@ -0,0 +1,180 @@
+<template>
+    <component :is="Default">
+        <div class="pt-70! flex flex-col items-center justify-center bg-gray-50 dark:bg-(--main-dark)">
+            <h1 class="text-6xl font-bold text-black dark:text-white mb-14">Search Products</h1>
+
+            <div class="w-full max-w-4xl">
+                <UInput icon="i-lucide-search" type="text" placeholder="Type product name or ID..."
+                    v-model="searchQuery" class="w-full!" :ui="{ base: 'py-4! rounded-full!' }" />
+            </div>
+            <div v-if="products.length" class="mt-6">
+                    <UTable :data="products" :columns="columns" class="flex-1 w-full" :ui="{
+                        root: 'max-w-100wv overflow-auto!'
+                    }" />
+            </div>
+
+            <p v-else-if="searchQuery">
+                No products found
+            </p>
+        </div>
+    </component>
+</template>
+
+<script setup lang="ts">
+import { useFetchJson } from '@/composable/useFetchJson';
+import Default from '@/layouts/default.vue';
+import { watch } from 'vue';
+import { ref } from 'vue';
+
+const searchQuery = ref('')
+const products = ref([])
+const loading = ref(false)
+const error = ref<string | null>(null)
+
+async function fetchProducts() {
+    loading.value = true
+    error.value = null
+
+    try {
+        const query = searchQuery.value
+            ? `name=~${searchQuery.value}`
+            : ''
+
+        const result = await useFetchJson(
+            `/api/v1/restricted/list-products/get-listing?${query}`
+        )
+
+        products.value = result.items || result
+    } catch (e) {
+        error.value = 'Failed to load products'
+    } finally {
+        loading.value = false
+    }
+}
+
+
+watch(searchQuery, () => {
+    fetchProducts()
+})
+
+
+import errorImg from '@/assets/error.svg'
+import type { TableColumn } from '@nuxt/ui';
+import type { Product } from '@/types/product';
+// const columns: TableColumn<Product>[] = [
+//     {
+//         accessorKey: 'product_id',
+//         header: ({ column }) => {
+//             return h('div', { class: 'flex flex-col gap-1' }, [
+//                 h('div', {
+//                     class: 'flex items-center gap-2 cursor-pointer',
+//                     onClick: () => {
+//                         sortField.value = ['product_id', 'asc']
+//                     }
+//                 }, [
+//                     h('span', 'ID'),
+//                     h(UIcon, {
+//                         name: getIcon('product_id')
+//                     })
+//                 ]),
+
+//                 h(UInput, {
+//                     placeholder: 'Search...',
+//                     modelValue: filters.value[column.id] ?? '',
+//                     'onUpdate:modelValue': (val: string) => {
+//                         updateFilter(column.id, val)
+//                     },
+//                     size: 'xs'
+//                 })
+//             ])
+//         },
+//         // header: '#',
+//         cell: ({ row }) => `#${row.getValue('product_id') as number}`
+//     },
+//     {
+//         accessorKey: 'image_link',
+//         header: 'Image',
+//         cell: ({ row }) => {
+//             return h('img', {
+//                 src: row.getValue('image_link') as string,
+//                 style: 'width:40px;height:40px;object-fit:cover;',
+//                 onError: (e: Event) => {
+//                     const target = e.target as HTMLImageElement
+//                     target.src = errorImg
+//                 }
+//             })
+//         },
+//     },
+//     {
+//         accessorKey: 'name',
+//         header: ({ column }) => {
+//             return h('div', { class: 'flex flex-col gap-1' }, [
+//                 h('div', {
+//                     class: 'flex items-center gap-2 cursor-pointer',
+//                     onClick: () => {
+//                         sortField.value = ['name', 'asc']
+//                     }
+//                 }, [
+//                     h('span', 'Name'),
+//                     h(UIcon, {
+//                         name: getIcon('name')
+//                     })
+//                 ]),
+
+//                 h(UInput, {
+//                     placeholder: 'Search...',
+//                     modelValue: filters.value[column.id] ?? '',
+//                     'onUpdate:modelValue': (val: string) => {
+//                         updateFilter(column.id, val)
+//                     },
+//                     size: 'xs'
+//                 })
+//             ])
+//         },
+//         cell: ({ row }) => row.getValue('name') as string,
+//         filterFn: (row, columnId, value) => {
+//             const name = row.getValue(columnId) as string
+//             return name.toLowerCase().includes(value.toLowerCase())
+//         }
+//     },
+//     {
+//         accessorKey: 'quantity',
+//         header: ({ }) => {
+//             return h('div', { class: 'flex flex-col gap-1' }, [
+//                 h('div', {
+//                     class: 'flex items-center gap-2 cursor-pointer',
+//                     onClick: () => {
+//                         sortField.value = ['quantity', 'asc']
+//                     }
+//                 }, [
+//                     h('span', 'In stock'),
+//                     h(UIcon, {
+//                         name: getIcon('quantity')
+//                     })
+//                 ]),
+//             ])
+//         },
+//         cell: ({ row }) => row.getValue('quantity') as number
+//     },
+//     {
+//         accessorKey: 'count',
+//         header: '',
+//         cell: ({ row }) => {
+//             return h(UButton, {
+//                 onClick: () => {
+//                     goToProduct(row.original.product_id, row.original.link_rewrite)
+//                 },
+//                 class: 'cursor-pointer',
+//                 color: 'info',
+//                 variant: 'soft'
+//             }, () => 'Show product')
+//         },
+//     }
+// ]
+</script>
+
+<style scoped>
+input::placeholder {
+    color: #9ca3af;
+}
+</style>