From d4ab358571399088cf362a52aafeae9612561d5c Mon Sep 17 00:00:00 2001 From: marzban-dev Date: Thu, 24 Apr 2025 14:34:32 +0330 Subject: [PATCH 01/20] Fix chat z index --- .../product/ChatBox/ChatBoxContainer.vue | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/frontend/components/product/ChatBox/ChatBoxContainer.vue b/frontend/components/product/ChatBox/ChatBoxContainer.vue index 4c43034..c13bc16 100644 --- a/frontend/components/product/ChatBox/ChatBoxContainer.vue +++ b/frontend/components/product/ChatBox/ChatBoxContainer.vue @@ -10,7 +10,7 @@ import { useAuth } from "~/composables/api/auth/useAuth"; // provide-inject -const { isOpen } = inject("isOpen") as any; +const { isOpen, closeChat } = inject("isOpen") as any; // state @@ -128,7 +128,7 @@ whenever(
@@ -185,7 +185,7 @@ whenever( class="w-full h-full flex items-center justify-center absolute inset-0" > @@ -197,7 +197,7 @@ whenever( v-else > @@ -207,9 +207,22 @@ whenever( من میتونم هر سوالی رو درمورد این محصول جواب بدم اگه میخوای شروع کنیم روی دکمه زیر کلیک کن

- - - +
+ + + + +
From 38f6c759e78e9a4bb3f086db1bb2cbe353a10b2e Mon Sep 17 00:00:00 2001 From: marzban-dev Date: Thu, 24 Apr 2025 14:41:35 +0330 Subject: [PATCH 02/20] Updated --- .../global/product-detail/Slider.vue | 187 +++++++++--------- 1 file changed, 96 insertions(+), 91 deletions(-) diff --git a/frontend/components/global/product-detail/Slider.vue b/frontend/components/global/product-detail/Slider.vue index b033fa7..4613d11 100644 --- a/frontend/components/global/product-detail/Slider.vue +++ b/frontend/components/global/product-detail/Slider.vue @@ -45,106 +45,111 @@ const emptySlidesCount = computed(() => { const changeSlide = (id: number) => { emit("update:selectedSlide", id); }; - From b52d8a5c23362b42ad26e5436d3bf6608e45fde8 Mon Sep 17 00:00:00 2001 From: marzban-dev Date: Thu, 24 Apr 2025 14:41:42 +0330 Subject: [PATCH 03/20] Add link to title --- frontend/components/home/Hero.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/components/home/Hero.vue b/frontend/components/home/Hero.vue index 24b10c7..0eedd68 100644 --- a/frontend/components/home/Hero.vue +++ b/frontend/components/home/Hero.vue @@ -242,9 +242,9 @@ onUnmounted(() => { /> -

+ {{ slide.title }} -

+
From d4cf605cb072fc95f30192147a08d81ffa846be9 Mon Sep 17 00:00:00 2001 From: marzban-dev Date: Thu, 24 Apr 2025 14:50:00 +0330 Subject: [PATCH 04/20] Updated --- frontend/components/home/Categories.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/components/home/Categories.vue b/frontend/components/home/Categories.vue index 24d5c33..72d6419 100644 --- a/frontend/components/home/Categories.vue +++ b/frontend/components/home/Categories.vue @@ -28,7 +28,7 @@ const onSwiper = (swiper: SwiperClass) => {
Date: Thu, 24 Apr 2025 21:54:58 +0330 Subject: [PATCH 05/20] detail model serilizer text list added --- backend/product/serializers.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/product/serializers.py b/backend/product/serializers.py index af7cf93..0190e6e 100644 --- a/backend/product/serializers.py +++ b/backend/product/serializers.py @@ -8,9 +8,17 @@ from django.contrib.auth.models import AnonymousUser class DetailSerializer(serializers.ModelSerializer): + texts = serializers.SerializerMethodField() class Meta: model = DetailModel - exclude = ['detail_model'] + exclude = ['detail_model', 'detail_text1', 'detail_text2', 'detail_text3', 'detail_text4'] + def get_texts(self, obj): + return [ + obj.detail_text1, + obj.detail_text2, + obj.detail_text3, + obj.detail_text4 + ] class ProductDetailSerializer(serializers.ModelSerializer): details = DetailSerializer(many=True, read_only=True) From 5ddbb8865ecb1fdf19abfddaba6fce64e5edfb7b Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 24 Apr 2025 22:00:33 +0330 Subject: [PATCH 06/20] debug get text of detail model serialzier --- backend/product/serializers.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/product/serializers.py b/backend/product/serializers.py index 0190e6e..f7fa8d6 100644 --- a/backend/product/serializers.py +++ b/backend/product/serializers.py @@ -12,13 +12,13 @@ class DetailSerializer(serializers.ModelSerializer): class Meta: model = DetailModel exclude = ['detail_model', 'detail_text1', 'detail_text2', 'detail_text3', 'detail_text4'] - def get_texts(self, obj): - return [ - obj.detail_text1, - obj.detail_text2, - obj.detail_text3, - obj.detail_text4 - ] + def get_texts(self, obj): + return [ + obj.detail_text1, + obj.detail_text2, + obj.detail_text3, + obj.detail_text4 + ] class ProductDetailSerializer(serializers.ModelSerializer): details = DetailSerializer(many=True, read_only=True) From 3489a747e84834c93ee8eb69be0335d2f7f76492 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 24 Apr 2025 22:05:34 +0330 Subject: [PATCH 07/20] fix null of detail model --- backend/product/serializers.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/product/serializers.py b/backend/product/serializers.py index f7fa8d6..4d03b07 100644 --- a/backend/product/serializers.py +++ b/backend/product/serializers.py @@ -14,10 +14,12 @@ class DetailSerializer(serializers.ModelSerializer): exclude = ['detail_model', 'detail_text1', 'detail_text2', 'detail_text3', 'detail_text4'] def get_texts(self, obj): return [ - obj.detail_text1, - obj.detail_text2, - obj.detail_text3, - obj.detail_text4 + text for text in [ + obj.detail_text1, + obj.detail_text2, + obj.detail_text3, + obj.detail_text4, + ] if text ] class ProductDetailSerializer(serializers.ModelSerializer): From eb99cd9c56fac83bc93b7c37dc04f7df41e9ebe6 Mon Sep 17 00:00:00 2001 From: marzban-dev Date: Thu, 24 Apr 2025 22:39:29 +0330 Subject: [PATCH 08/20] Updated --- frontend/components/global/Brands.vue | 52 +-------------------------- 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/frontend/components/global/Brands.vue b/frontend/components/global/Brands.vue index 370b2d5..ca20a1c 100644 --- a/frontend/components/global/Brands.vue +++ b/frontend/components/global/Brands.vue @@ -49,57 +49,7 @@ const {} = toRefs(props);
- -