From 8539532bf4786cd00db969699aea264b116c390c Mon Sep 17 00:00:00 2001
From: Parsa Nazer <parsa.nazerrr@gmail.com>
Date: Mon, 21 Apr 2025 23:28:17 +0330
Subject: [PATCH 01/18] str for detail product

---
 backend/product/models.py | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/backend/product/models.py b/backend/product/models.py
index 1a1ca6b..f044d5a 100644
--- a/backend/product/models.py
+++ b/backend/product/models.py
@@ -4,6 +4,7 @@ from account.models import User
 from django.urls import reverse
 import requests
 from django.utils.translation import gettext_lazy as _
+from django.core.exceptions import ValidationError
 
 class MainCategoryModel(models.Model):
     name = models.CharField(max_length=50, verbose_name='نام دسته بندی')
@@ -218,8 +219,8 @@ class ProductDetailModel(models.Model):
     class Meta:
         verbose_name = 'جزیات محصول'
         verbose_name_plural = 'جزیات محصول ها'
-    # def __str__(self):
-    #     return f'جزيیات محصول {self.product}'
+    def __str__(self):
+        return f'جزيیات محصول {self.detail_category.title} - {self.detail.title}'
 
 class ProductVariant(models.Model):
     product = models.ForeignKey(ProductModel, on_delete=models.CASCADE, related_name='variants', verbose_name='محصول')
@@ -272,21 +273,3 @@ class ProductVariant(models.Model):
     def save(self, *args, **kwargs):
         self.set_or_update_price()
         super().save(*args, **kwargs)
-
-    def get_toman_price_after_discount(self):
-        return self.price * ((100 - self.discount) / 100)
-    
-    @classmethod
-    def update_all_prices(cls):
-        print('calling the update all prices ')
-        dollor_object, _ = DollorModel.objects.get_or_create(unique_filed='unique')
-        print(dollor_object.price)
-        dollor_object.update_price()
-        dollor_object.save()
-        dollor_price = dollor_object.price
-        print(dollor_object.price)
-        print('classmethod dollor price update ')
-        products = cls.objects.all()
-        for product in products:
-            product.set_or_update_price(dollor_price=dollor_price)
-            product.save()
\ No newline at end of file

From 88c263884dca29a70bdd47caba2e423dff9082c7 Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:28:56 +0330
Subject: [PATCH 02/18] added cart item link

---
 frontend/components/cart/index/CartItem.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/components/cart/index/CartItem.vue b/frontend/components/cart/index/CartItem.vue
index 17ba187..9fee44b 100644
--- a/frontend/components/cart/index/CartItem.vue
+++ b/frontend/components/cart/index/CartItem.vue
@@ -150,9 +150,12 @@ watch(
                     </div>
                 </div>
 
-                <span class="font-semibold typo-sub-h-sm lg:typo-sub-h-xl text-black">
+                <NuxtLink
+                    :to="`product/${data.product.id}`"
+                    class="font-semibold typo-sub-h-sm lg:typo-sub-h-xl text-black underline underline-offset-2"
+                >
                     {{ data.product.title }}
-                </span>
+                </NuxtLink>
 
                 <div class="flex items-center justify-start gap-1.5">
                     <div

From a264d0ff484e56c7c15427d2975ce11f239e0b21 Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:29:11 +0330
Subject: [PATCH 03/18] fixed brands height

---
 frontend/components/global/Brands.vue | 136 ++++++++++++++++++++------
 1 file changed, 106 insertions(+), 30 deletions(-)

diff --git a/frontend/components/global/Brands.vue b/frontend/components/global/Brands.vue
index 569db9a..370b2d5 100644
--- a/frontend/components/global/Brands.vue
+++ b/frontend/components/global/Brands.vue
@@ -12,11 +12,9 @@ const {} = toRefs(props);
 </script>
 
 <template>
-    <div class="relative w-full flex flex-col justify-center min-h-[450px] h-svh">
+    <div class="relative w-full flex flex-col justify-center py-32 lg:py-48">
         <div class="flex-col-center gap-6 mb-24 sm:mb-32 container">
-            <span class="typo-h-6 max-sm:text-xl md:typo-h-5 lg:typo-h-4 text-black">
-                مجله در ستون و سطرآنچ
-            </span>
+            <span class="typo-h-6 max-sm:text-xl md:typo-h-5 lg:typo-h-4 text-black"> مجله در ستون و سطرآنچ </span>
             <p class="text-slate-500 text-center max-w-[750px] typo-p-sm md:typo-p-lg xl:typo-p-xl">
                 لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ و با استفاده از طراحان گرافیک است. چاپگرها و
                 متون بلکه روزنامه و مجله در ستون و سطرآنچنان که
@@ -30,13 +28,19 @@ const {} = toRefs(props);
                     <div class="text-[30px] lg:text-[40px] text-white whitespace-nowrap font-semibold opacity-85">
                         HEYMLZ
                     </div>
-                    <NuxtImg src="/img/heymlz/heymlz-logo.png" class="h-[25px] sm:h-[45px] invert opacity-85" />
+                    <NuxtImg
+                        src="/img/heymlz/heymlz-logo.png"
+                        class="h-[25px] sm:h-[45px] invert opacity-85"
+                    />
                 </template>
                 <template v-for="i in 10">
                     <div class="text-[30px] lg:text-[40px] text-white whitespace-nowrap font-semibold opacity-85">
                         HEYMLZ
                     </div>
-                    <NuxtImg src="/img/heymlz/heymlz-logo.png" class="h-[25px] sm:h-[45px] invert opacity-85" />
+                    <NuxtImg
+                        src="/img/heymlz/heymlz-logo.png"
+                        class="h-[25px] sm:h-[45px] invert opacity-85"
+                    />
                 </template>
             </div>
         </div>
@@ -46,32 +50,104 @@ const {} = toRefs(props);
                 class="bg-slate-100/70 flex items-center pr-20 gap-12 sm:gap-20 w-max animate-marquee h-[90px] sm:h-[140px]"
             >
                 <template v-for="i in 1">
-                    <NuxtImg src="/img/brands/brand-1.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-2.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-3.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-4.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-5.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-6.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-1.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-2.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-3.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-4.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-5.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-6.png" class="h-[25px] sm:h-[45px]" />
+                    <NuxtImg
+                        src="/img/brands/brand-1.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-2.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-3.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-4.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-5.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-6.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-1.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-2.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-3.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-4.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-5.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-6.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
                 </template>
                 <template v-for="i in 1">
-                    <NuxtImg src="/img/brands/brand-1.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-2.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-3.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-4.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-5.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-6.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-1.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-2.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-3.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-4.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-5.png" class="h-[25px] sm:h-[45px]" />
-                    <NuxtImg src="/img/brands/brand-6.png" class="h-[25px] sm:h-[45px]" />
+                    <NuxtImg
+                        src="/img/brands/brand-1.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-2.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-3.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-4.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-5.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-6.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-1.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-2.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-3.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-4.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-5.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
+                    <NuxtImg
+                        src="/img/brands/brand-6.png"
+                        class="h-[25px] sm:h-[45px]"
+                    />
                 </template>
             </div>
         </div>

From 26540826fac17aa0e53ffb7d750be630ae63910e Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:29:23 +0330
Subject: [PATCH 04/18] new changes

---
 frontend/components/global/DataField.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/components/global/DataField.vue b/frontend/components/global/DataField.vue
index 75e8fae..fb13443 100644
--- a/frontend/components/global/DataField.vue
+++ b/frontend/components/global/DataField.vue
@@ -18,10 +18,16 @@ withDefaults(defineProps<Props>(), {
 <template>
     <div class="w-full flex flex-col gap-2">
         <div class="flex items-center gap-1 ps-2">
-            <label :for="id" class="typo-label-xs lg:typo-label-sm">{{
-                label
-            }}</label>
-            <span v-if="!!required && required" class="text-danger-600">*</span>
+            <label
+                :for="id"
+                class="typo-label-xs lg:typo-label-sm"
+                >{{ label }}</label
+            >
+            <span
+                v-if="!!required && required"
+                class="text-danger-600"
+                >*</span
+            >
         </div>
         <slot />
         <div

From 7e5f30d0496dad2fafd61b2604e62f6d49658f63 Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:30:33 +0330
Subject: [PATCH 05/18] resposived modile side drawer

---
 frontend/components/global/SideDrawer.vue | 173 ++++++++++++++++------
 1 file changed, 125 insertions(+), 48 deletions(-)

diff --git a/frontend/components/global/SideDrawer.vue b/frontend/components/global/SideDrawer.vue
index bd434ff..9bb0fae 100644
--- a/frontend/components/global/SideDrawer.vue
+++ b/frontend/components/global/SideDrawer.vue
@@ -20,6 +20,8 @@ defineProps<Props>();
 const { token } = useAuth();
 const { data: account } = useGetAccount();
 
+const route = useRoute();
+
 // emit
 
 const emit = defineEmits(["update:modelValue"]);
@@ -29,13 +31,22 @@ const emit = defineEmits(["update:modelValue"]);
 const closeSideDrawer = () => {
     emit("update:modelValue", false);
 };
+
+// watch
+
+watch(
+    () => route.fullPath,
+    () => {
+        closeSideDrawer();
+    }
+);
 </script>
 
 <template>
     <Transition name="fade">
         <div
             v-if="modelValue"
-            class="md:hidden fixed inset-0 h-svh z-999 size-full bg-black/50 cursor-pointer"
+            class="md:hidden fixed inset-0 min-h-svh z-1001 size-full bg-black/50 cursor-pointer"
             @click="closeSideDrawer"
         />
     </Transition>
@@ -43,61 +54,127 @@ const closeSideDrawer = () => {
     <div
         @click.stop
         :class="modelValue ? 'translate-x-0' : 'translate-x-[100%]'"
-        class="md:hidden cursor-default flex top-0 right-0 fixed z-999 transition-all duration-500 rounded-e-xl flex-col bg-white w-[300px] h-full gap-8 pt-12"
+        class="md:hidden cursor-default flex top-0 right-0 fixed z-1002 transition-all duration-500 flex-col bg-white w-[300px] h-full px-4"
     >
-        <div class="flex items-center flex-col justify-end gap-[1.5rem]">
-            <Tooltip v-if="!!account && !!token" title="حساب کاربری">
-                <NuxtLink
-                    :to="{ name: 'profile' }"
-                    class="flex items-center justify-center"
-                >
-                    <Avatar
-                        class="!size-7"
-                        :src="account.profile_photo"
-                        :alt="
-                            account.first_name && account.last_name
-                                ? `${account.first_name.charAt(
-                                      0
-                                  )} ${account.last_name.charAt(0)}`
-                                : 'بدون نام کاربری'
-                        "
-                    />
-                </NuxtLink>
-            </Tooltip>
-            <Tooltip v-else title="ورود">
-                <NuxtLink to="/signin" class="flex-center">
-                    <Icon
-                        name="ci:profile"
-                        size="24px"
-                        class="**:stroke-black"
-                    />
-                </NuxtLink>
-            </Tooltip>
-            <Tooltip title="محصولات">
-                <NuxtLink to="/products" class="flex-center">
-                    <Icon
-                        name="ci:search"
-                        size="21px"
-                        class="**:stroke-black"
-                    />
-                </NuxtLink>
-            </Tooltip>
-            <Tooltip title="سبد خرید">
-                <NuxtLink to="/cart" class="flex-center">
-                    <Icon name="ci:cart" size="24px" class="**:stroke-black" />
-                </NuxtLink>
-            </Tooltip>
+        <div class="flex items-center flex-col justify-end gap-2 border-b border-slate-200 py-5">
+            <NuxtLink
+                v-if="!!account && !!token"
+                :to="{ name: 'profile' }"
+                class="w-full flex items-center justify-between gap-3 p-2 transition-all"
+                active-class="bg-black rounded-md text-white **:stroke-white"
+            >
+                <div class="flex items-center gap-3">
+                    <div class="size-5 flex-center">
+                        <Avatar
+                            class="!size-5"
+                            :src="account.profile_photo"
+                            :alt="
+                                account.first_name && account.last_name
+                                    ? `${account.first_name.charAt(0)} ${account.last_name.charAt(0)}`
+                                    : 'بدون نام کاربری'
+                            "
+                        />
+                    </div>
+                    <span class="text-xs"> {{ account.first_name }} {{ account.last_name }} </span>
+                </div>
+                <Icon
+                    name="bi:chevron-left"
+                    size="12"
+                    class="**:stroke-black/50 opacity-70"
+                />
+            </NuxtLink>
+
+            <NuxtLink
+                v-else
+                to="/signin"
+                class="w-full flex items-center justify-between gap-4 p-2 transition-all"
+                active-class="bg-black rounded-md text-white **:stroke-white"
+            >
+                <div class="flex items-center gap-3">
+                    <div class="size-5 flex-center">
+                        <Icon
+                            name="ci:profile"
+                            size="18"
+                            class="**:stroke-black"
+                        />
+                    </div>
+
+                    <span class="text-xs"> ورود به حساب </span>
+                </div>
+                <Icon
+                    name="bi:chevron-left"
+                    size="12"
+                    class="**:stroke-black/50 opacity-70"
+                />
+            </NuxtLink>
+            <!-- 
+            <NuxtLink
+                to="/products"
+                class="w-full flex items-center justify-between gap-4 p-2"
+                active-class="bg-black rounded-md text-white **:stroke-white"
+            >
+                <div class="flex items-center gap-3">
+                    <div class="size-5 flex-center">
+                        <Icon
+                            name="ci:search"
+                            size="18"
+                            class="**:stroke-black"
+                        />
+                    </div>
+                    <span class="text-xs"> جست و جو </span>
+                </div>
+                <Icon
+                    name="bi:chevron-left"
+                    size="12"
+                    class="**:stroke-black/50 opacity-70"
+                />
+            </NuxtLink> -->
+            <NuxtLink
+                to="/cart"
+                class="w-full flex items-center justify-between gap-4 p-2 transition-all"
+                active-class="bg-black rounded-md text-white **:stroke-white"
+            >
+                <div class="flex items-center gap-3">
+                    <div class="size-5 flex-center">
+                        <Icon
+                            name="ci:cart"
+                            size="19"
+                            class="**:stroke-black"
+                        />
+                    </div>
+                    <span class="text-xs"> سبد خرید </span>
+                </div>
+                <Icon
+                    name="bi:chevron-left"
+                    size="12"
+                    class="**:stroke-black/50 opacity-70"
+                />
+            </NuxtLink>
         </div>
 
-        <nav
-            class="flex-center flex-col gap-[2.5rem] typo-label-sm font-light text-black/80"
-        >
+        <nav class="flex-center flex-col gap-2 typo-label-sm font-light text-black/80 py-5">
             <NuxtLink
                 v-for="(link, index) in NAV_LINKS"
                 :key="index"
                 :to="link.path"
+                class="w-full flex items-center justify-between gap-3 p-2 transition-all"
+                active-class="bg-black rounded-md text-white **:stroke-white"
             >
-                {{ link.title }}
+                <div class="flex items-center gap-3">
+                    <div class="size-5 flex-center">
+                        <Icon
+                            :name="link.icon"
+                            size="18"
+                            class="**:stroke-black"
+                        />
+                    </div>
+                    <span class="text-xs"> {{ link.title }}</span>
+                </div>
+                <Icon
+                    name="bi:chevron-left"
+                    size="12"
+                    class="**:stroke-black/50 opacity-70"
+                />
             </NuxtLink>
         </nav>
     </div>

From 0874b66a8004b77ee5934d78c10b97f07ae88e8c Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:30:50 +0330
Subject: [PATCH 06/18] fixed height

---
 frontend/components/home/Categories.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/components/home/Categories.vue b/frontend/components/home/Categories.vue
index 858dceb..24d5c33 100644
--- a/frontend/components/home/Categories.vue
+++ b/frontend/components/home/Categories.vue
@@ -20,13 +20,13 @@ const onSwiper = (swiper: SwiperClass) => {
 <template>
     <section
         ref="sectionTarget"
-        class="flex flex-col justify-center gap-4 bg-black h-[110svh] sm:h-[150svh] relative overflow-hidden"
+        class="flex flex-col justify-center gap-4 bg-black sm:min-h-[110svh] relative overflow-hidden shrink-0 py-24 lg:py-32"
     >
-        <div class="w-full relative translate-y-[-55px] sm:translate-y-[-130px] flex-center z-10 container">
+        <div class="w-full relative flex-center z-10 container">
             <span class="text-white typo-h-6 md:typo-h-5 lg:typo-h-4"> دسته بندی ها </span>
         </div>
 
-        <div class="w-full my-20 relative">
+        <div class="w-full mt-44 lg:mt-64 relative">
             <NuxtImg
                 class="aspect-square w-[240px] md:w-[300px] lg:w-[350px] translate-y-[-164px] md:translate-y-[-206px] lg:translate-y-[-240px] absolute left-1/2 -translate-x-1/2 z-10"
                 :style="{
@@ -89,7 +89,7 @@ const onSwiper = (swiper: SwiperClass) => {
             </div>
         </div>
 
-        <div class="w-full flex justify-center items-center">
+        <div class="w-full flex justify-center items-center mt-14">
             <NuxtLink to="/category">
                 <Button
                     variant="primary"

From d1b8c02ff6785f4308bee2da4f180a3fdd173dbe Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:30:55 +0330
Subject: [PATCH 07/18] fixed height

---
 frontend/components/home/LatestStories.vue | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/frontend/components/home/LatestStories.vue b/frontend/components/home/LatestStories.vue
index 85fbeb2..29f8ec2 100644
--- a/frontend/components/home/LatestStories.vue
+++ b/frontend/components/home/LatestStories.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-
 // state
 
 import useGetArticles from "~/composables/api/blog/useGetArticles";
@@ -10,22 +9,24 @@ const { data: articles, suspense } = useGetArticles(page);
 // ssr
 
 await suspense();
-
 </script>
 
 <template>
-    <section class="mt-20 container">
+    <section class="container">
         <div class="flex items-center justify-between mb-12 md:mb-20">
-            <span class="typo-h-6 max-sm:text-xl md:typo-h-5 lg:typo-h-4 text-black">
-                مقالات اخیر سایت
-            </span>
+            <span class="typo-h-6 max-sm:text-xl md:typo-h-5 lg:typo-h-4 text-black"> مقالات اخیر سایت </span>
             <NuxtLink to="/articles">
-                <Button variant="primary" class="rounded-full max-sm:typo-label-sm max-sm:py-2"
-                        end-icon="ci:arrow-left">
+                <Button
+                    variant="primary"
+                    class="rounded-full max-sm:typo-label-sm max-sm:py-2"
+                    end-icon="ci:arrow-left"
+                >
                     نمایش همه
                 </Button>
             </NuxtLink>
         </div>
-        <ArticlesList :articles="[...articles!.results,...articles!.results,...articles!.results,...articles!.results,...articles!.results,...articles!.results]" />
+        <ArticlesList
+            :articles="[...articles!.results,...articles!.results,...articles!.results,...articles!.results,...articles!.results,...articles!.results]"
+        />
     </section>
-</template>
\ No newline at end of file
+</template>

From 9c10239eecfb9409f2e22eb3824da2377708468b Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:31:00 +0330
Subject: [PATCH 08/18] fixed height

---
 frontend/components/home/Preview.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/home/Preview.vue b/frontend/components/home/Preview.vue
index 35f53a8..a244520 100644
--- a/frontend/components/home/Preview.vue
+++ b/frontend/components/home/Preview.vue
@@ -72,7 +72,7 @@ watch(
 </script>
 
 <template>
-    <div class="container mb-40 lg:mb-80 mt-20">
+    <div class="container mb-40 lg:mb-40 max-lg:mt-20 lg:-mt-32">
         <div>
             <div class="flex flex-col items-center gap-3 mb-10 lg:mb-16">
                 <span class="typo-p-sm md:typo-p-md text-slate-500"> مقایسه محصولات </span>

From 62a3bf536244511e1d766fdb6885ffd5742fde79 Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:31:10 +0330
Subject: [PATCH 09/18] fixed height

---
 frontend/components/home/ProductsShowcase.vue | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/frontend/components/home/ProductsShowcase.vue b/frontend/components/home/ProductsShowcase.vue
index e9eaa75..c1ceab7 100644
--- a/frontend/components/home/ProductsShowcase.vue
+++ b/frontend/components/home/ProductsShowcase.vue
@@ -85,14 +85,14 @@ onUnmounted(() => {
 <template>
     <section
         id="products-showcase-container"
-        class="perspective-midrange relative z-[99999]"
+        class="perspective-midrange relative z-[999]"
     >
-        <div class="w-full h-[102svh] bg-black">
+        <div class="w-full min-h-[120svh] lg:min-h-[102svh] bg-black">
             <NuxtLink
                 v-for="slide in homeData!.show_case_slider"
                 :key="slide.id"
                 :to="slide.link"
-                class="showcase-slide origin-bottom absolute size-full bg-transparent flex items-center justify-center"
+                class="showcase-slide origin-bottom absolute size-full bg-transparent flex items-center justify-center max-lg:-mt-16 lg:mt-5"
             >
                 <NuxtImg
                     class="w-[280px] xs:w-[350px] lg:w-[500px] xl:w-[650px] z-20 mb-30 sm:mb-20 lg:mb-30"
@@ -102,12 +102,8 @@ onUnmounted(() => {
                     }"
                     alt=""
                 />
-                <div
-                    class="flex flex-col items-center justify-center gap-6 text-center absolute z-20 mt-20"
-                >
-                    <span
-                        class="text-white typo-h-6 sm:typo-h-5 lg:typo-h-4 xl:typo-h-3"
-                    >
+                <div class="flex flex-col items-center justify-center gap-6 text-center absolute z-20 mt-20">
+                    <span class="text-white typo-h-6 sm:typo-h-5 lg:typo-h-4 xl:typo-h-3">
                         {{ slide.title }}
                     </span>
                     <p
@@ -115,10 +111,13 @@ onUnmounted(() => {
                     >
                         {{ slide.description }}
                     </p>
-                    <NuxtLink :to="slide.link" class="relative">
+                    <NuxtLink
+                        :to="slide.link"
+                        class="relative"
+                    >
                         <NuxtImg
                             src="/img/heymlz/heymlz-falling.gif"
-                            class="absolute top-[106px] sm:top-[105px] lg:top-[117px] left-1/2 -translate-1/2 w-[250px] drop-shadow-md"
+                            class="absolute top-[101px] sm:top-[100px] lg:top-[117px] left-1/2 -translate-1/2 w-[200px] lg:w-[250px] drop-shadow-md"
                         />
                         <Button
                             variant="primary"

From a7b6bd23b624797c0f433c23c979a471782e4619 Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:31:18 +0330
Subject: [PATCH 10/18] added navlinks icons

---
 frontend/constants/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/constants/index.ts b/frontend/constants/index.ts
index 4ac059c..527d3c8 100644
--- a/frontend/constants/index.ts
+++ b/frontend/constants/index.ts
@@ -94,17 +94,21 @@ export const NAV_LINKS = [
     {
         title: "خانه",
         path: "/",
+        icon: "ci:home",
     },
     {
         title: "محصولات",
         path: "/products",
+        icon: "ci:airdrop",
     },
     {
         title: "دسته بندی ها",
         path: "/category",
+        icon: "ci:delivery-boxes",
     },
     {
         title: "ارتباط با ما",
         path: "/contact-us",
+        icon: "ci:call",
     },
 ];

From e73acf9f8c28ff0394725ab059eecffd17c70918 Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:31:52 +0330
Subject: [PATCH 11/18] fixed height

---
 frontend/pages/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index baa68a0..a4883e1 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -33,12 +33,12 @@ onMounted(() => {
         <LoadingOverlay />
         <Hero class="mb-20 max-md:mt-[80px]" />
         <Preview />
-        <ProductsShowcase class="mb-40" />
+        <ProductsShowcase class="lg:mb-12" />
         <ProductsGrid
             title="محصولات پرفروش"
             :products="[...homeData!.products,...homeData!.products]"
         />
-        <Categories class="mt-40" />
+        <Categories class="mt-12" />
         <Brands />
         <LatestStories class="mb-20" />
     </div>

From e2f951581f01e0d58d922e01a8b8b80a71dc3ade Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:32:20 +0330
Subject: [PATCH 12/18] new changes

---
 frontend/pages/products.vue | 50 ++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/frontend/pages/products.vue b/frontend/pages/products.vue
index d0577a3..ff73d9b 100644
--- a/frontend/pages/products.vue
+++ b/frontend/pages/products.vue
@@ -1,9 +1,7 @@
 <script setup lang="ts">
 // import
 
-import useGetProducts, {
-    type GetProductsFilters,
-} from "~/composables/api/products/useGetProducts";
+import useGetProducts, { type GetProductsFilters } from "~/composables/api/products/useGetProducts";
 import { PRODUCT_RANGE } from "~/constants";
 
 // state
@@ -59,12 +57,8 @@ watch(
 
 <template>
     <div class="w-full container flex flex-col">
-        <div
-            class="w-full flex flex-col lg:flex-row justify-end items-end py-[3.5rem] lg:py-[5rem] gap-10 lg:gap-5"
-        >
-            <div
-                class="flex flex-col items-center lg:items-start gap-[1rem] lg:gap-[1.5rem] text-black w-full"
-            >
+        <div class="w-full flex flex-col lg:flex-row justify-end items-end py-[3.5rem] lg:py-[5rem] gap-10 lg:gap-5">
+            <div class="flex flex-col items-center lg:items-start gap-[1rem] lg:gap-[1.5rem] text-black w-full">
                 <!-- <div class="flex-center gap-[.75rem]">
                     <span class="text-xs lg:text-sm">خانه</span>
                     <span class="text-xs lg:text-sm">/</span>
@@ -75,9 +69,7 @@ watch(
                 <h1 class="typo-h-5 lg:typo-h-4">لیست محصولات</h1>
             </div>
 
-            <div
-                class="w-full flex items-center justify-between lg:justify-end gap-4"
-            >
+            <div class="w-full flex items-center justify-between lg:justify-end gap-4">
                 <Input
                     placeholder="جست و جو محصول ..."
                     v-model="search"
@@ -96,9 +88,7 @@ watch(
                 <Suspense>
                     <FilterButton />
                     <template #fallback>
-                        <Skeleton
-                            class="!size-11 lg:!w-[10.35rem] lg:!h-[3.35rem] shrink-0 !rounded-xl"
-                        />
+                        <Skeleton class="!size-11 lg:!w-[10.35rem] lg:!h-[3.35rem] shrink-0 !rounded-xl" />
                     </template>
                 </Suspense>
             </div>
@@ -107,24 +97,35 @@ watch(
             v-if="productsIsLoading"
             class="grid grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-y-8 gap-5 sm:gap-8 w-full"
         >
-            <div class="w-full flex flex-col gap-3" v-for="i in 8" :key="i">
+            <div
+                class="w-full flex flex-col gap-3"
+                v-for="i in 8"
+                :key="i"
+            >
                 <Skeleton
                     v-for="i in 3"
                     :key="i"
                     class="w-full"
                     :class="{
                         '!h-[11.75rem] lg:!h-[22.5rem] !rounded-2xl': i == 1,
-                        '!h-[1.35rem] lg:!h-[1.5rem] !rounded-sm lg:!hidden': [
-                            2, 3,
-                        ].includes(i),
+                        '!h-[1.35rem] lg:!h-[1.5rem] !rounded-sm lg:!hidden': [2, 3].includes(i),
                         '!w-1/2': i == 2,
                     }"
                 />
             </div>
         </ul>
-        <div v-else class="w-full h-max">
-            <div v-if="!products!.length" class="flex flex-grow w-full">
-                <Placeholder title="محصولی یافت نشد :(" icon="bi:search" />
+        <div
+            v-else
+            class="w-full h-max"
+        >
+            <div
+                v-if="!products!.length"
+                class="flex flex-grow w-full"
+            >
+                <Placeholder
+                    title="محصولی یافت نشد :("
+                    icon="bi:search"
+                />
             </div>
             <ProductsGrid
                 :with-header="false"
@@ -135,7 +136,10 @@ watch(
                 v-if="data && paginationData && data.count > 10"
                 class="w-full flex-center py-10"
             >
-                <Pagination :items="paginationData" :total="data.count" />
+                <Pagination
+                    :items="paginationData"
+                    :total="data.count"
+                />
             </div>
         </div>
     </div>

From 28d774892a6829efb33487c99818d47a0726ba3c Mon Sep 17 00:00:00 2001
From: Mamalizz <mohammad.hosein.ghorbani82@gmail.com>
Date: Mon, 21 Apr 2025 23:33:07 +0330
Subject: [PATCH 13/18] changed back to shop button style

---
 frontend/pages/signin.vue | 54 +++++++++++++++------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/frontend/pages/signin.vue b/frontend/pages/signin.vue
index 9e8911b..724e3b1 100644
--- a/frontend/pages/signin.vue
+++ b/frontend/pages/signin.vue
@@ -39,10 +39,7 @@ const formRules = computed(() => {
     return {
         phone: {
             required: helpers.withMessage("Phone is required", required),
-            phoneValidator: helpers.withMessage(
-                "شماره تلفن وارد شده معتبر نمی باشد",
-                helpers.regex(/^[1-9][0-9]{9}$/)
-            ),
+            phoneValidator: helpers.withMessage("شماره تلفن وارد شده معتبر نمی باشد", helpers.regex(/^[1-9][0-9]{9}$/)),
         },
     };
 });
@@ -63,11 +60,7 @@ const {
 });
 
 const { mutateAsync: sendOtp, isPending: sendOtpIsPending } = useOtp();
-const {
-    mutateAsync: signIn,
-    isPending: signInIsPending,
-    status: signInStatus,
-} = useSignIn();
+const { mutateAsync: signIn, isPending: signInIsPending, status: signInStatus } = useSignIn();
 
 // computed
 
@@ -152,9 +145,7 @@ const resetForm = () => {
 <template>
     <div class="w-full flex h-svh items-center relative container">
         <div class="pattern -z-10 size-full fixed inset-0" />
-        <div
-            class="flex items-center justify-center flex-col size-full translate-y-[-100px]"
-        >
+        <div class="flex items-center justify-center flex-col size-full translate-y-[-100px]">
             <img
                 class="aspect-square w-[250px] sm:w-[325px] translate-y-[90px] sm:translate-y-[120px] animate-fade-in"
                 src="/img/heymlz/heymlz-signin.gif"
@@ -166,11 +157,12 @@ const resetForm = () => {
             <div
                 class="max-w-[600px] w-full p-6 h-[350px] sm:h-[400px] flex flex-col items-center bg-white border shadow-black/10 justify-center border-slate-300 rounded-3xl"
             >
-                <h1 class="typo-h-6 sm:typo-h-5 mt-8">
-                    شماره خود را وارد کنید
-                </h1>
+                <h1 class="typo-h-6 sm:typo-h-5 mt-8">شماره خود را وارد کنید</h1>
 
-                <form @submit.prevent class="max-w-[500px] w-full mt-12">
+                <form
+                    @submit.prevent
+                    class="max-w-[500px] w-full mt-12"
+                >
                     <Input
                         v-if="!showOtp"
                         class="w-full tracking-[3px] persian-number"
@@ -186,9 +178,7 @@ const resetForm = () => {
                                     name="twemoji:flag-iran"
                                     size="24"
                                 />
-                                <span class="text-slate-500 typo-label-sm">
-                                    +۹۸
-                                </span>
+                                <span class="text-slate-500 typo-label-sm"> +۹۸ </span>
                             </div>
                         </template>
                     </Input>
@@ -196,13 +186,7 @@ const resetForm = () => {
                     <OtpInput
                         v-else
                         v-model="otpCode"
-                        :status="
-                            signInStatus === 'success'
-                                ? 'success'
-                                : signInStatus === 'error'
-                                ? 'error'
-                                : 'idle'
-                        "
+                        :status="signInStatus === 'success' ? 'success' : signInStatus === 'error' ? 'error' : 'idle'"
                         :disabled="signInIsPending || sendOtpIsPending"
                         :autofocus="true"
                         @complete="handleLogin"
@@ -220,7 +204,10 @@ const resetForm = () => {
                         ارسال کد
                     </Button>
 
-                    <div v-else class="flex items-center w-full gap-4 mt-4">
+                    <div
+                        v-else
+                        class="flex items-center w-full gap-4 mt-4"
+                    >
                         <Button
                             class="rounded-full w-full mt-4 max-sm:h-[45px]"
                             type="button"
@@ -235,11 +222,7 @@ const resetForm = () => {
                             type="submit"
                             @click="resendOtp"
                             :loading="signInIsPending || sendOtpIsPending"
-                            :disabled="
-                                signInIsPending ||
-                                isResendOtpBlocked ||
-                                sendOtpIsPending
-                            "
+                            :disabled="signInIsPending || isResendOtpBlocked || sendOtpIsPending"
                         >
                             ارسال مجدد کد
                             {{ isResendOtpBlocked ? otpBlockerTimePassed : "" }}
@@ -250,8 +233,11 @@ const resetForm = () => {
                         to="/"
                         class="flex items-center gap-2 justify-center mt-6"
                     >
-                        <span> بازگشت به فروشگاه </span>
-                        <Icon name="ci:left-rotation" size="24" />
+                        <Icon
+                            name="ci:left-rotation"
+                            class="lg:text-xl"
+                        />
+                        <span class="text-xs lg:text-sm"> بازگشت به فروشگاه </span>
                     </NuxtLink>
                 </form>
             </div>

From c84e5150f833c6af4827ce14b71358b49d1822fc Mon Sep 17 00:00:00 2001
From: Parsa Nazer <parsa.nazerrr@gmail.com>
Date: Tue, 22 Apr 2025 02:41:11 +0330
Subject: [PATCH 14/18] contact us model view and admin functionality

---
 backend/core/settings/unfold_conf.py          |  6 +++++
 backend/core/views.py                         |  4 +++-
 backend/templates/formula/service.html        | 23 +++++++++++++++++-
 backend/ticket/admin.py                       |  9 +++++++
 .../ticket/migrations/0020_contactusmodel.py  | 24 +++++++++++++++++++
 .../0021_alter_contactusmodel_type.py         | 18 ++++++++++++++
 ...2_alter_contactusmodel_options_and_more.py | 22 +++++++++++++++++
 backend/ticket/models.py                      | 24 ++++++++++++++++++-
 backend/ticket/serializers.py                 | 10 ++++++--
 backend/ticket/urls.py                        |  1 +
 backend/ticket/views.py                       | 17 ++++++++++---
 backend/utils/admin.py                        |  5 +++-
 12 files changed, 154 insertions(+), 9 deletions(-)
 create mode 100644 backend/ticket/migrations/0020_contactusmodel.py
 create mode 100644 backend/ticket/migrations/0021_alter_contactusmodel_type.py
 create mode 100644 backend/ticket/migrations/0022_alter_contactusmodel_options_and_more.py

diff --git a/backend/core/settings/unfold_conf.py b/backend/core/settings/unfold_conf.py
index 23bf662..44f5e63 100644
--- a/backend/core/settings/unfold_conf.py
+++ b/backend/core/settings/unfold_conf.py
@@ -239,6 +239,12 @@ UNFOLD = {
                         "badge": "utils.admin.new_ticket_count",
                     },
 
+                    {
+                        "title": _("ارتباط با ما"),
+                        "icon": "perm_phone_msg",  
+                        "link": reverse_lazy("admin:ticket_contactusmodel_changelist"),
+                        "badge": "utils.admin.new_contact_us_count",
+                    },
                 ],
             },
                 {
diff --git a/backend/core/views.py b/backend/core/views.py
index be623df..9894f4e 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -8,7 +8,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import RedirectView, TemplateView
 from unfold.views import UnfoldModelAdminViewMixin
 from order.models import OrderModel
-from ticket.models import Ticket
+from ticket.models import Ticket, ContactUsModel
 from account.models import SecurityBreachAttemptModel
 import json
 
@@ -19,9 +19,11 @@ def dashboard_callback(request, context):
 
     pending_count = OrderModel.objects.filter(status='ADMIN_PENDING').count()
     open_tickets_count = Ticket.objects.filter(status__in=['open', 'in_progress']).count()
+    open_contact_us_count = ContactUsModel.objects.filter(is_reviewed=False).count()
     context.update(random_data())
     context.update({'pending_count': pending_count})
     context.update({'open_tickets_count': open_tickets_count})
+    context.update({'open_contact_us_count': open_contact_us_count})
     return context
 
 
diff --git a/backend/templates/formula/service.html b/backend/templates/formula/service.html
index 57856a4..ca6cc92 100644
--- a/backend/templates/formula/service.html
+++ b/backend/templates/formula/service.html
@@ -39,4 +39,25 @@
         {% endcomponent %}
     </div>
 </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
+{% if  open_contact_us_count%}
+
+
+<div dir='rtl' class="bg-base-50 border border-base-200 border-dashed flex flex-col gap-4 p-4 rounded dark:bg-white/[.02] dark:border-base-700 lg:flex-row lg:justify-between w-full shrink-0 lg:items-center" style="justify-content: space-between;">
+    <div class="flex flex-col lg:flex-row lg:items-center">
+        <h2 class="font-semibold text-font-important-light text-base dark:text-font-important-dark flex items-center">
+            <span class="material-symbols-outlined md-18 mr-3 w-4.5 align-middle">confirmation_number</span>
+            <span class="align-middle" style="margin-right: 8px;">ارتباط با ما جدید داری</span>
+            <span class="text-white bg-primary-800 py-1 px-2 rounded" style="margin-right: 8px;">{{ open_contact_us_count }} </span>
+        </h2>
+    </div>
+
+    <div class="flex lg:flex-row lg:items-center">
+        {% component "unfold/components/flex.html" with class="flex-col gap-4 lg:flex-row" %}
+            {% component "unfold/components/button.html" with href="/secret-admin/ticket/contactusmodel/" %}
+                نمایش ارتباط با ما ها
+            {% endcomponent %} 
+        {% endcomponent %}
+    </div>
+</div>
+{% endif %}
diff --git a/backend/ticket/admin.py b/backend/ticket/admin.py
index 1426233..bc50d27 100644
--- a/backend/ticket/admin.py
+++ b/backend/ticket/admin.py
@@ -18,6 +18,15 @@ class MessageInline(TabularInline):
     model = Message
     extra = 1
 
+@admin.register(ContactUsModel)
+class ContactUsAdmin(ModelAdmin):
+    list_filter = ['type', 'is_reviewed']
+    list_display = ['full_name', 'phone', 'email', 'message', 'is_reviewed']
+    compressed_fields = True
+    warn_unsaved_form = True
+    readonly_fields = ['full_name', 'email', 'phone', 'type', 'message', ]
+
+
 @admin.register(Ticket)
 class TicketAdmin(ModelAdmin, ImportExportModelAdmin):
     import_form_class = ImportForm
diff --git a/backend/ticket/migrations/0020_contactusmodel.py b/backend/ticket/migrations/0020_contactusmodel.py
new file mode 100644
index 0000000..d2bd2be
--- /dev/null
+++ b/backend/ticket/migrations/0020_contactusmodel.py
@@ -0,0 +1,24 @@
+# Generated by Django 5.1.2 on 2025-04-21 22:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ticket', '0019_alter_attachment_options'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ContactUsModel',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('full_name', models.CharField(max_length=50, verbose_name='نام و نام خانوادگی')),
+                ('email', models.EmailField(max_length=254, verbose_name='ایمیل')),
+                ('phone', models.CharField(max_length=30)),
+                ('type', models.CharField(choices=[('ORDER', 'پیگیری سفارش'), ('SUGGESTION', 'پیشنهادات'), ('COMPLAINT', 'انتقادات')], max_length=20, verbose_name='نوع')),
+                ('message', models.TextField(verbose_name='پیام')),
+            ],
+        ),
+    ]
diff --git a/backend/ticket/migrations/0021_alter_contactusmodel_type.py b/backend/ticket/migrations/0021_alter_contactusmodel_type.py
new file mode 100644
index 0000000..59c5790
--- /dev/null
+++ b/backend/ticket/migrations/0021_alter_contactusmodel_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2025-04-21 22:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ticket', '0020_contactusmodel'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contactusmodel',
+            name='type',
+            field=models.CharField(choices=[('ORDER_FOLLOW_UP', 'پیگیری سفارش'), ('SUGGESTION', 'پیشنهادات'), ('COMPLAINT', 'انتقادات')], max_length=20, verbose_name='نوع'),
+        ),
+    ]
diff --git a/backend/ticket/migrations/0022_alter_contactusmodel_options_and_more.py b/backend/ticket/migrations/0022_alter_contactusmodel_options_and_more.py
new file mode 100644
index 0000000..537844b
--- /dev/null
+++ b/backend/ticket/migrations/0022_alter_contactusmodel_options_and_more.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.1.2 on 2025-04-21 22:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ticket', '0021_alter_contactusmodel_type'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='contactusmodel',
+            options={'verbose_name': 'ارتباط با ما', 'verbose_name_plural': 'ارتباط با ما ها '},
+        ),
+        migrations.AddField(
+            model_name='contactusmodel',
+            name='is_reviewed',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/backend/ticket/models.py b/backend/ticket/models.py
index 0941fe3..a6b89a4 100644
--- a/backend/ticket/models.py
+++ b/backend/ticket/models.py
@@ -73,4 +73,26 @@ class Message(models.Model):
 
     class Meta:
         verbose_name = 'پیام تیکت'
-        verbose_name_plural = 'پیام های تیکت'
\ No newline at end of file
+        verbose_name_plural = 'پیام های تیکت'
+
+
+class ContactUsModel(models.Model):
+    full_name = models.CharField(max_length=50, verbose_name='نام و نام خانوادگی')
+    email = models.EmailField(max_length=254, verbose_name='ایمیل')
+    phone = models.CharField(max_length=30, verbose_name='شماره تماس')
+    FEEDBACK_TYPES = [
+        ('ORDER_FOLLOW_UP', 'پیگیری سفارش'),
+        ('SUGGESTION', 'پیشنهادات'),
+        ('COMPLAINT', 'انتقادات'),
+    ]
+
+    type = models.CharField(max_length=20, choices=FEEDBACK_TYPES, verbose_name='نوع')
+    message = models.TextField(verbose_name='پیام')
+    is_reviewed = models.BooleanField(default=False, verbose_name='بررسی شده')
+
+    def __str__(self):
+        return f'{self.full_name} - {self.message[:15]}...'
+    
+    class Meta:
+        verbose_name = 'ارتباط با ما'
+        verbose_name_plural = 'ارتباط با ما ها '
\ No newline at end of file
diff --git a/backend/ticket/serializers.py b/backend/ticket/serializers.py
index d99a8d2..f4af17d 100644
--- a/backend/ticket/serializers.py
+++ b/backend/ticket/serializers.py
@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from .models import Ticket, Message, Attachment
+from .models import Ticket, Message, Attachment, ContactUsModel
 from django.utils.timezone import localtime
 from order.serializers import OrderListSerializer
 from order.serializers import OrderModel
@@ -88,4 +88,10 @@ class TicketListSerializer(serializers.ModelSerializer):
         return obj.get_status_display()
 
     def get_ticket_category(self, obj):
-        return obj.get_ticket_category_display()
\ No newline at end of file
+        return obj.get_ticket_category_display()
+    
+
+class ContactUsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ContactUsModel
+        fields = ['full_name', 'email', 'phone', 'type', 'message']
\ No newline at end of file
diff --git a/backend/ticket/urls.py b/backend/ticket/urls.py
index c3a47f5..50eed91 100644
--- a/backend/ticket/urls.py
+++ b/backend/ticket/urls.py
@@ -6,6 +6,7 @@ urlpatterns = [
     path('', views.TicketListView.as_view(), name='ticket-list'),
     path('<int:pk>', views.TicketDetailView.as_view(), name='ticket-detail'),
     path('message/create', views.MessageCreateView.as_view(), name='message-create'),
+    path('contact-us/create', views.CreateContactUsView.as_view(), name='contact-us-create'),
     path('attachment/create', views.AttachmentUploadView.as_view(), name='attachment-upload'),
     path('attachment/delete/<int:pk>', views.AttachmentDeleteView.as_view(), name='attachment-upload'),
 ]
\ No newline at end of file
diff --git a/backend/ticket/views.py b/backend/ticket/views.py
index ac6fdae..e669864 100644
--- a/backend/ticket/views.py
+++ b/backend/ticket/views.py
@@ -2,7 +2,7 @@ from rest_framework import generics, permissions
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from .models import Ticket, Message, Attachment
-from .serializers import TicketListSerializer, MessageSerializer, TicketSerializer, AttachmentSerializer
+from .serializers import TicketListSerializer, MessageSerializer, TicketSerializer, AttachmentSerializer, ContactUsSerializer
 from utils.pagination import StructurePagination
 from drf_spectacular.utils import extend_schema, OpenApiParameter, OpenApiTypes
 from rest_framework.permissions import IsAuthenticated
@@ -56,7 +56,6 @@ class TicketCreateView(APIView):
     permission_classes = [permissions.IsAuthenticated]
     def post(self, request):
         new_ticket_ser = self.serializer_class(data=request.data, context={'request': request})
-        message = request.data.get('message', None)
         if new_ticket_ser.is_valid():
             new_ticket_ser.save(customer=request.user)
             return Response(new_ticket_ser.data, status=status.HTTP_201_CREATED)
@@ -159,4 +158,16 @@ class UpdateTicketStatusView(APIView):
             return Response({"error": "Invalid status"}, status=400)
         ticket.status = new_status
         ticket.save()
-        return Response({"message": "Ticket status updated successfully"})
\ No newline at end of file
+        return Response({"message": "Ticket status updated successfully"})
+    
+
+class CreateContactUsView(APIView):
+    serializer_class = ContactUsSerializer
+    permission_classes = [permissions.AllowAny]
+    def post(self, request):
+        contact_us_ser = self.serializer_class(data=request.data, context={'request': request})
+        if contact_us_ser.is_valid():
+            contact_us_ser.save()
+            return Response(contact_us_ser.data, status=status.HTTP_201_CREATED)
+        else:
+            return Response(contact_us_ser.errors, status=status.HTTP_400_BAD_REQUEST)
\ No newline at end of file
diff --git a/backend/utils/admin.py b/backend/utils/admin.py
index 1107fab..82c4d05 100644
--- a/backend/utils/admin.py
+++ b/backend/utils/admin.py
@@ -1,6 +1,6 @@
 from order.models import OrderModel
 from product.models import DollorModel, CommentModel
-from ticket.models import Ticket
+from ticket.models import Ticket, ContactUsModel
 from home.models import LearnVideoModel
 from account.models import SecurityBreachAttemptModel
 
@@ -24,6 +24,9 @@ def new_learn_video_count(request):
 def new_attck_count(request):
     return SecurityBreachAttemptModel.objects.filter(viewd=False).count()
 
+def new_contact_us_count(request):
+    return ContactUsModel.objects.filter(is_reviewed=False).count()
+
 from django.contrib import admin, messages
 from unfold.admin import ModelAdmin
 from home.models import LearnVideoModel

From 500814b610752820294afe9d0f5e6eb6a3f5b204 Mon Sep 17 00:00:00 2001
From: Parsa Nazer <parsa.nazerrr@gmail.com>
Date: Tue, 22 Apr 2025 02:48:35 +0330
Subject: [PATCH 15/18] database comment added

---
 backend/.env.local | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/backend/.env.local b/backend/.env.local
index 4cb8221..2678574 100644
--- a/backend/.env.local
+++ b/backend/.env.local
@@ -28,4 +28,16 @@ SMS_API_KEY = ''
 
 VAPID_PRIVATE_KEY = 'NajogmGTsGsZ_dfURrjUpgsm5fui-s5AzruBQgMh_I4'
 
-OPENAI_API_KEY = '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'
\ No newline at end of file
+OPENAI_API_KEY = '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'
+
+
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.postgresql',
+#         'NAME': 'hshop',
+#         'USER': 'byeto',
+#         'PASSWORD': 'vuhbyq-cypMu0-sirbon',
+#         'HOST': '185.110.189.208',  
+#         'PORT': '5434',
+#     }
+# }
\ No newline at end of file

From 5d17038f9be6b4ba76531960cd7d3400411f616f Mon Sep 17 00:00:00 2001
From: Parsa Nazer <parsa.nazerrr@gmail.com>
Date: Tue, 22 Apr 2025 03:01:04 +0330
Subject: [PATCH 16/18] ProductDetailModel debug and ticket migrations push

---
 ...lter_productdetailmodel_detail_category.py | 20 ++++++++++++++++
 backend/product/models.py                     |  4 ++--
 ...ter_contactusmodel_is_reviewed_and_more.py | 23 +++++++++++++++++++
 3 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 backend/product/migrations/0036_alter_productdetailmodel_detail_category.py
 create mode 100644 backend/ticket/migrations/0023_alter_contactusmodel_is_reviewed_and_more.py

diff --git a/backend/product/migrations/0036_alter_productdetailmodel_detail_category.py b/backend/product/migrations/0036_alter_productdetailmodel_detail_category.py
new file mode 100644
index 0000000..1ae6eb5
--- /dev/null
+++ b/backend/product/migrations/0036_alter_productdetailmodel_detail_category.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.1.2 on 2025-04-21 23:30
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('product', '0035_alter_attributetype_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='productdetailmodel',
+            name='detail_category',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='product.productdetailcategory', verbose_name='دسته بندی جزيات'),
+            preserve_default=False,
+        ),
+    ]
diff --git a/backend/product/models.py b/backend/product/models.py
index f044d5a..e3459e7 100644
--- a/backend/product/models.py
+++ b/backend/product/models.py
@@ -213,14 +213,14 @@ class ProductImageModel(models.Model):
 
 
 class ProductDetailModel(models.Model):
-    detail_category = models.ForeignKey(ProductDetailCategory, on_delete=models.CASCADE, verbose_name='دسته بندی جزيات', blank=True, null=True)
+    detail_category = models.ForeignKey(ProductDetailCategory, on_delete=models.CASCADE, verbose_name='دسته بندی جزيات')
     detail = models.ManyToManyField(DetailModel, verbose_name='جزيات ها')
 
     class Meta:
         verbose_name = 'جزیات محصول'
         verbose_name_plural = 'جزیات محصول ها'
     def __str__(self):
-        return f'جزيیات محصول {self.detail_category.title} - {self.detail.title}'
+        return f'جزيیات محصول {self.detail_category.title}'
 
 class ProductVariant(models.Model):
     product = models.ForeignKey(ProductModel, on_delete=models.CASCADE, related_name='variants', verbose_name='محصول')
diff --git a/backend/ticket/migrations/0023_alter_contactusmodel_is_reviewed_and_more.py b/backend/ticket/migrations/0023_alter_contactusmodel_is_reviewed_and_more.py
new file mode 100644
index 0000000..e798399
--- /dev/null
+++ b/backend/ticket/migrations/0023_alter_contactusmodel_is_reviewed_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.1.2 on 2025-04-21 23:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ticket', '0022_alter_contactusmodel_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contactusmodel',
+            name='is_reviewed',
+            field=models.BooleanField(default=False, verbose_name='بررسی شده'),
+        ),
+        migrations.AlterField(
+            model_name='contactusmodel',
+            name='phone',
+            field=models.CharField(max_length=30, verbose_name='شماره تماس'),
+        ),
+    ]

From 044bed9c00a52448b963ae617afab2c5d9107e16 Mon Sep 17 00:00:00 2001
From: Parsa Nazer <parsa.nazerrr@gmail.com>
Date: Tue, 22 Apr 2025 03:09:07 +0330
Subject: [PATCH 17/18] udpate product detail name filed

---
 backend/core/settings/unfold_conf.py          |  5 +++++
 backend/product/admin.py                      |  6 +++---
 .../0037_productdetailmodel_name.py           | 19 +++++++++++++++++++
 backend/product/models.py                     |  3 ++-
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 backend/product/migrations/0037_productdetailmodel_name.py

diff --git a/backend/core/settings/unfold_conf.py b/backend/core/settings/unfold_conf.py
index 44f5e63..a143954 100644
--- a/backend/core/settings/unfold_conf.py
+++ b/backend/core/settings/unfold_conf.py
@@ -268,6 +268,11 @@ UNFOLD = {
                         "icon": "photo_prints",  
                         "link": reverse_lazy("admin:product_productvariant_changelist"),
                     },
+                    {
+                        "title": _("بخش جزيیات محصول"),
+                        "icon": "subject",  
+                        "link": reverse_lazy("admin:product_productdetailmodel_changelist"),
+                    },
 
                 ],
             },
diff --git a/backend/product/admin.py b/backend/product/admin.py
index a7d6e19..14f7458 100644
--- a/backend/product/admin.py
+++ b/backend/product/admin.py
@@ -1,4 +1,5 @@
 from django.contrib import admin, messages
+from product.tasks import update_prices
 from .models import *
 from unfold.admin import TabularInline, StackedInline
 from home.models import LearnVideoModel
@@ -122,7 +123,7 @@ class DetailModelAdmin(ModelAdmin, ImportExportModelAdmin):
 class ProductDetailModel1Admin(ModelAdmin, ImportExportModelAdmin):
     import_form_class = ImportForm
     export_form_class = ExportForm
-    search_fields = ['detail_category__title']
+    search_fields = ['detail_category__title', 'name']
     compressed_fields = True
     warn_unsaved_form = True
 
@@ -216,8 +217,7 @@ class ProductModelAdmin(ModelAdmin, ImportExportModelAdmin):
 
     @action(description=f"اپدیت قیمت ها")
     def update_products_price(self, request):
-        print('from the button')
-        ProductVariant.update_all_prices()
+        # update_prices()
         messages.success(request, f"قیمت {ProductVariant.objects.all().count()} تنوع محصول اپدیت شد")
         return redirect("admin:product_productmodel_changelist")
 
diff --git a/backend/product/migrations/0037_productdetailmodel_name.py b/backend/product/migrations/0037_productdetailmodel_name.py
new file mode 100644
index 0000000..c93a035
--- /dev/null
+++ b/backend/product/migrations/0037_productdetailmodel_name.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.1.2 on 2025-04-21 23:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('product', '0036_alter_productdetailmodel_detail_category'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='productdetailmodel',
+            name='name',
+            field=models.CharField(default=1, help_text='این متن فقط برای راحتی در استفاده از پنل ادمین میباشد', max_length=50, verbose_name='نام جزيیات'),
+            preserve_default=False,
+        ),
+    ]
diff --git a/backend/product/models.py b/backend/product/models.py
index e3459e7..1a87333 100644
--- a/backend/product/models.py
+++ b/backend/product/models.py
@@ -213,6 +213,7 @@ class ProductImageModel(models.Model):
 
 
 class ProductDetailModel(models.Model):
+    name = models.CharField(max_length=50, verbose_name='نام جزيیات', help_text='این متن فقط برای راحتی در استفاده از پنل ادمین میباشد')
     detail_category = models.ForeignKey(ProductDetailCategory, on_delete=models.CASCADE, verbose_name='دسته بندی جزيات')
     detail = models.ManyToManyField(DetailModel, verbose_name='جزيات ها')
 
@@ -220,7 +221,7 @@ class ProductDetailModel(models.Model):
         verbose_name = 'جزیات محصول'
         verbose_name_plural = 'جزیات محصول ها'
     def __str__(self):
-        return f'جزيیات محصول {self.detail_category.title}'
+        return f'جزيیات محصول {self.detail_category.title} - {self.name}'
 
 class ProductVariant(models.Model):
     product = models.ForeignKey(ProductModel, on_delete=models.CASCADE, related_name='variants', verbose_name='محصول')

From 50f5d19aa346d83817050a18706d15f4fed655db Mon Sep 17 00:00:00 2001
From: Parsa Nazer <parsa.nazerrr@gmail.com>
Date: Tue, 22 Apr 2025 03:11:53 +0330
Subject: [PATCH 18/18] debug import

---
 backend/product/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/product/admin.py b/backend/product/admin.py
index 14f7458..80ac965 100644
--- a/backend/product/admin.py
+++ b/backend/product/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin, messages
-from product.tasks import update_prices
+# from product.tasks import update_prices
 from .models import *
 from unfold.admin import TabularInline, StackedInline
 from home.models import LearnVideoModel