From 85e4296e607236454cc2b34254e06dda71027ff4 Mon Sep 17 00:00:00 2001
From: marzban-dev <marzban.dev@gmail.com>
Date: Tue, 28 Jan 2025 22:09:53 +0330
Subject: [PATCH] Updated

---
 frontend/components/global/Header.vue         | 18 ++--
 .../global/product-detail/ProductsSlider.vue  | 20 ++--
 .../global/product-detail/Slider.vue          | 10 +-
 .../components/global/product/ProductCard.vue | 92 ++++++++++++-------
 .../global/products/FilterProducts.vue        | 16 +---
 .../components/product/ProductComments.vue    |  2 +-
 frontend/components/product/ProductHero.vue   | 32 ++++---
 frontend/components/product/ProductVideo.vue  |  4 +-
 frontend/pages/category.vue                   | 58 +++++++-----
 frontend/types/global.d.ts                    |  6 +-
 10 files changed, 145 insertions(+), 113 deletions(-)

diff --git a/frontend/components/global/Header.vue b/frontend/components/global/Header.vue
index 45e1d1e..5e0c1c6 100644
--- a/frontend/components/global/Header.vue
+++ b/frontend/components/global/Header.vue
@@ -18,16 +18,16 @@ const { logout } = useAuth();
 
 const nav_links = ref<NavLink[]>([
     {
-        title: "فروشگاه",
-        path: "#"
+        title: "خانه",
+        path: "/"
+    },
+    {
+        title: "محصولات",
+        path: "/products"
     },
     {
         title: "دسته بندی ها",
-        path: "#"
-    },
-    {
-        title: "جستجو",
-        path: "#"
+        path: "/category"
     },
     {
         title: "ارتباط با ما",
@@ -62,9 +62,9 @@ const nav_links = ref<NavLink[]>([
                     <NuxtLink to="/signin" v-else class="flex-center">
                         <Icon name="ci:profile" size="24px" class="**:stroke-black" />
                     </NuxtLink>
-                    <button class="flex-center">
+                    <NuxtLink to="/products" class="flex-center">
                         <Icon name="ci:search" size="21px" class="**:stroke-black" />
-                    </button>
+                    </NuxtLink>
                     <button class="flex-center">
                         <Icon name="ci:cart" size="24px" class="**:stroke-black" />
                     </button>
diff --git a/frontend/components/global/product-detail/ProductsSlider.vue b/frontend/components/global/product-detail/ProductsSlider.vue
index 3e07923..23b0e3f 100644
--- a/frontend/components/global/product-detail/ProductsSlider.vue
+++ b/frontend/components/global/product-detail/ProductsSlider.vue
@@ -3,6 +3,7 @@
 
 import { Swiper, SwiperSlide } from "swiper/vue";
 import type { SwiperClass } from "swiper/react";
+import useHomeData from "~/composables/api/home/useHomeData";
 
 // types
 
@@ -16,6 +17,8 @@ defineProps<Props>();
 
 // state
 
+const { data : homeData } = useHomeData();
+
 const swiper_instance = ref<SwiperClass | null>(null);
 
 // methods
@@ -76,15 +79,16 @@ const onSwiper = (swiper: SwiperClass) => {
         </div>
         <div class="w-full">
             <Swiper :slides-per-view="3" :space-between="24" @swiper="onSwiper">
-                <SwiperSlide v-for="i in 4" :key="i">
+                <SwiperSlide v-for="product in homeData!.products" :key="product.id">
                     <ProductCard
-                        brand="Samsung"
-                        title="Galaxy S20 Ultra"
-                        picture="/assets/img/product-1.jpg"
-                        :colors="['#0000ff', '#00ff00', 'red']"
-                        :price="599"
-                        :rate="2.4"
-                        tag="New"
+                        :id="product.id"
+                        brand="برند محصول"
+                        :title="product.name"
+                        :picture="product.image1"
+                        :colors="['white', 'black']"
+                        :price="product.price"
+                        :rate="product.rating"
+                        :dark-layer="true"
                     />
                 </SwiperSlide>
             </Swiper>
diff --git a/frontend/components/global/product-detail/Slider.vue b/frontend/components/global/product-detail/Slider.vue
index 65c4fcb..4e16223 100644
--- a/frontend/components/global/product-detail/Slider.vue
+++ b/frontend/components/global/product-detail/Slider.vue
@@ -35,20 +35,20 @@ const changeSlide = (id: number) => {
 </script>
 
 <template>
-    <div class="flex flex-col relative gap-4">
-        <div class="bg-red-300 w-full relative aspect-square overflow-hidden rounded-200">
+    <div class="flex flex-col relative gap-6">
+        <div class="bg-white brightness-[97%] w-full relative aspect-square overflow-hidden rounded-200">
             <img
-                class="size-full absolute object-cover"
+                class="size-full absolute object-contain"
                 :src="selectedSlideDetail.picture"
                 :alt="String(selectedSlideDetail.id)"
             />
         </div>
-        <div class="flex items-center justify-between gap-4">
+        <div class="flex items-center justify-between gap-6">
             <div
                 @click="changeSlide(slide.id)"
                 v-for="slide in slides"
                 :class="selectedSlide === slide.id ? 'ring-black' : 'ring-transparent'"
-                class="cursor-pointer aspect-square w-[108px] ring-2 ring-offset-4 rounded-200 w-full overflow-hidden relative"
+                class="cursor-pointer brightness-[97%] bg-white aspect-square ring-2 ring-offset-4 rounded-200 w-full overflow-hidden relative"
                 :key="slide.id"
             >
                 <img class="absolute object-cover size-full" :src="slide.picture" :alt="String(slide.id)" />
diff --git a/frontend/components/global/product/ProductCard.vue b/frontend/components/global/product/ProductCard.vue
index d4e18ab..ddfa8f2 100644
--- a/frontend/components/global/product/ProductCard.vue
+++ b/frontend/components/global/product/ProductCard.vue
@@ -4,62 +4,88 @@
 import Tag from "~/components/global/Tag.vue";
 import Rate from "~/components/global/Rate.vue";
 import ColorCircle from "~/components/global/ColorCircle.vue";
+import { useImageColor } from "~/composables/global/useImageColor";
 
 // types
 
 type Props = {
+    id: number,
     brand: string;
     title: string;
     colors: string[];
-    price: number;
+    price: string;
     picture: string;
     tag?: string;
     rate?: number;
+    darkLayer?: boolean;
 };
 
 // props
 
-defineProps<Props>();
+const props = defineProps<Props>();
+const { id } = toRefs(props);
+
+// state
+
+const { colorObject } = useImageColor(`#product-image-${id.value}`);
+
 </script>
 
 <template>
-    <div
-        class="relative size-full min-h-[31.25rem] rounded-2xl bg-black/10 overflow-hidden p-6"
-    >
-        <img
-            src="~/assets/img/product-2.jpg"
-            class="size-full object-cover absolute inset-0"
-            alt="product-background"
-        />
+    <NuxtLink :to="'/product/' + id">
         <div
-            class="flex justify-between items-center absolute px-6 pt-6 top-0 w-full inset-x-0"
+            class="relative size-full min-h-[31.25rem] rounded-2xl bg-white brightness-[98%] overflow-hidden p-6"
         >
-            <Rate v-if="rate">
-                {{ rate }}
-            </Rate>
-            <Tag v-if="tag">
-                {{ tag }}
-            </Tag>
-        </div>
-        <div
-            class="absolute inset-x-0 bottom-0 pb-6 px-6 flex flex-row-reverse justify-between items-end"
-        >
-            <span class="typo-p-md"> {{ price }} </span>
-            <div class="flex flex-col gap-2 items-start">
-                <span class="typo-p-md">
+            <img
+                :id="`product-image-${id}`"
+                :src="picture"
+                class="size-full object-contain absolute inset-0"
+                alt="product-background"
+            />
+
+            <div
+                v-if="darkLayer"
+                class="bg-linear-to-t inset-0 from-black/50 to-transparent to-40% absolute z-10 size-full"
+            />
+
+            <div
+                class="flex justify-between items-center absolute px-6 pt-6 top-0 w-full inset-x-0"
+            >
+                <Rate v-if="rate" :rate="rate"/>
+                <Tag v-if="tag">
+                    {{ tag }}
+                </Tag>
+            </div>
+            <div
+                :class="
+                colorObject?.isLight && !darkLayer
+                    ? 'text-black'
+                    : 'text-white'
+            "
+                class="absolute inset-x-0 bottom-0 pb-6 px-6 flex flex-row-reverse justify-between items-end z-10"
+            >
+
+                <div class="flex flex-col gap-2 items-start w-full">
+                <span class="typo-p-md font-medium">
                     {{ brand }}
                 </span>
-                <span class="typo-sub-h-md">
+                    <span class="typo-sub-h-lg">
                     {{ title }}
                 </span>
-                <!-- <div class="flex items-center gap-2 mt-1">
-                    <ColorCircle
-                        v-for="color in colors"
-                        :key="color"
-                        :style="{ backgroundColor: color }"
-                    />
-                </div> -->
+                    <div class="flex items-center justify-between w-full mt-1">
+                        <div class="flex items-center gap-2 mt-1">
+                            <ColorCircle
+                                v-for="color in colors"
+                                :key="color"
+                                :style="{ backgroundColor: color }"
+                            />
+                        </div>
+                        <span class="typo-p-md font-medium whitespace-nowrap">
+                        {{ price }}
+                    </span>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>
+    </NuxtLink>
 </template>
diff --git a/frontend/components/global/products/FilterProducts.vue b/frontend/components/global/products/FilterProducts.vue
index 148d182..2ce7268 100644
--- a/frontend/components/global/products/FilterProducts.vue
+++ b/frontend/components/global/products/FilterProducts.vue
@@ -131,16 +131,6 @@ watch(
                     دسته بندی
                 </div>
                 <ComboBox :options="options" v-model="params.category" />
-                <div
-                    v-if="params.category"
-                    class="w-full flex flex-wrap gap-2 px-[1rem]"
-                >
-                    <span
-                        class="py-1 px-3 cursor-pointer text-nowrap bg-slate-100 rounded-full text-sm"
-                    >
-                        {{ params.category }}
-                    </span>
-                </div>
             </div>
 
             <div class="flex flex-col w-full gap-5">
@@ -177,7 +167,7 @@ watch(
                         <span class="text-sm text-black">
                             {{
                                 "price_gte" in params
-                                    ? params.price_gte.toLocaleString()
+                                    ? sliderValue[0].toLocaleString()
                                     : PRODUCT_RANGE.min
                             }}
                         </span>
@@ -187,7 +177,7 @@ watch(
                         <span class="text-sm text-black">
                             {{
                                 "price_lte" in params
-                                    ? params.price_lte.toLocaleString()
+                                    ? sliderValue[1].toLocaleString()
                                     : PRODUCT_RANGE.max
                             }}
                         </span>
@@ -240,5 +230,3 @@ watch(
         </Button>
     </div>
 </template>
-
-<style scoped></style>
diff --git a/frontend/components/product/ProductComments.vue b/frontend/components/product/ProductComments.vue
index 15c2611..4bc9a08 100644
--- a/frontend/components/product/ProductComments.vue
+++ b/frontend/components/product/ProductComments.vue
@@ -3,7 +3,7 @@
 </script>
 
 <template>
-    <section class="bg-slate-50 p-20">
+    <section class="bg-slate-50">
         <div class="flex gap-12 my-42 container">
             <div class="flex flex-col gap-6 min-w-fit">
                 <h3 class="typo-h-3">
diff --git a/frontend/components/product/ProductHero.vue b/frontend/components/product/ProductHero.vue
index a25ecc1..b49cb48 100644
--- a/frontend/components/product/ProductHero.vue
+++ b/frontend/components/product/ProductHero.vue
@@ -14,20 +14,22 @@ const { data: product } = useGetProduct(id);
 const quantity = ref(1);
 
 const selectedSlide = ref(0);
-const slides = [
-    {
-        id: 0,
-        picture: "/img/product-1.jpg",
-    },
-    {
-        id: 1,
-        picture: "/img/product-2.jpg",
-    },
-    {
-        id: 2,
-        picture: "/img/product-3.jpg",
-    },
-];
+const slides = computed(() => {
+    return [
+        {
+            id: 0,
+            picture: product.value!.image1
+        },
+        {
+            id: 1,
+            picture: product.value!.image2
+        },
+        {
+            id: 2,
+            picture: product.value!.image3
+        }
+    ];
+});
 </script>
 
 <template>
@@ -45,7 +47,7 @@ const slides = [
                 <Rating />
             </div>
             <p class="typo-p-md text-slate-500 text-justify">
-                {{product!.description}}
+                {{ product!.description }}
             </p>
             <div class="w-full flex flex-col gap-6 mt-4">
                 <RemainQuantity
diff --git a/frontend/components/product/ProductVideo.vue b/frontend/components/product/ProductVideo.vue
index 00e6a89..003f6bf 100644
--- a/frontend/components/product/ProductVideo.vue
+++ b/frontend/components/product/ProductVideo.vue
@@ -15,9 +15,9 @@ const { data: product } = useGetProduct(id);
 </script>
 
 <template>
-    <section class="h-[110svh] w-full relative bg-black mt-[5rem]">
+    <section v-if="product?.video" class="h-[110svh] w-full relative bg-black mt-[5rem]">
         <video
-            src="/video/product-video.mp4"
+            :src="product.video"
             class="object-cover absolute size-full"
             muted
             autoplay
diff --git a/frontend/pages/category.vue b/frontend/pages/category.vue
index 56ffa91..34cb535 100644
--- a/frontend/pages/category.vue
+++ b/frontend/pages/category.vue
@@ -14,13 +14,18 @@ const debouncedSearch = refDebounced(search, 300);
 // computed
 
 const filteredCategories = computed(() => {
+
     if (debouncedSearch.value.length > 0) {
-        return categories.value?.filter((cat) =>
-            cat.name.includes(debouncedSearch.value)
-        );
+        return categories.value!.map((cat) => {
+            cat.subcategorys = cat.subcategorys.filter((subcat) => {
+                return subcat.name.includes(debouncedSearch.value);
+            });
+
+            return cat;
+        });
     }
 
-    return categories.value;
+    return categories.value!;
 });
 
 // ssr
@@ -32,10 +37,10 @@ await useAsyncData(async () => {
     if (response.isError) {
         throw createError({
             statusCode: 500,
-            statusMessage: `Error in categories page prefetch`,
+            statusMessage: `Error in categories page prefetch`
         });
     }
-})
+});
 
 </script>
 
@@ -61,21 +66,32 @@ await useAsyncData(async () => {
             </Input>
         </div>
         <Transition name="fade" mode="out-in">
-            <div
-                v-if="filteredCategories?.length !== 0"
-                v-auto-animate
-                class="grid grid-cols-3 gap-4 w-full mt-12"
-            >
-                <CategoryCard
-                    v-for="category in filteredCategories"
-                    :key="category.id"
-                    :id="category.id"
-                    :category="category.name"
-                    :picture="category.icon"
-                    :count="20"
-                    description="یک دسته بندی تستasdasd"
-                    dark-layer
-                />
+            <div v-if="filteredCategories">
+                <div
+                    class="flex flex-col gap-6"
+                    v-for="mainCategory in filteredCategories"
+                >
+                    <div class="w-full flex items-center justify-between">
+                        <span>
+                            {{ mainCategory.name }}
+                        </span>
+                    </div>
+                    <div
+                        v-auto-animate
+                        class="grid grid-cols-3 gap-4 w-full mt-12"
+                    >
+                        <CategoryCard
+                            v-for="category in mainCategory.subcategorys"
+                            :key="category.id"
+                            :id="category.id"
+                            :category="category.name"
+                            :picture="category.icon"
+                            :count="20"
+                            description="یک دسته بندی تستasdasd"
+                            dark-layer
+                        />
+                    </div>
+                </div>
             </div>
 
             <div v-else class="flex w-full mt-12">
diff --git a/frontend/types/global.d.ts b/frontend/types/global.d.ts
index 3100cff..6ee21e3 100644
--- a/frontend/types/global.d.ts
+++ b/frontend/types/global.d.ts
@@ -48,9 +48,6 @@ declare global {
         name: string;
         slug: string;
         icon: string;
-        meta_title: string;
-        meta_description: string;
-        parent: number;
         "product_count": string,
         "subcategorys": SubCategory[]
     };
@@ -60,9 +57,8 @@ declare global {
         "name": string,
         "slug": string,
         "icon": string,
-        "meta_title": string,
-        "meta_description": string,
         "product_count": string,
+        "parent": string,
         "show": boolean
     }