diff --git a/backend/core/settings/unfold_conf.py b/backend/core/settings/unfold_conf.py index 3f4deba..23bf662 100644 --- a/backend/core/settings/unfold_conf.py +++ b/backend/core/settings/unfold_conf.py @@ -32,7 +32,7 @@ UNFOLD = { lambda request: static("rtl.css"), ], - "BORDER_RADIUS": "20px", + "BORDER_RADIUS": "8px", "SHOW_HISTORY": True, "SHOW_VIEW_ON_SITE": True, "ENVIRONMENT": "core.settings.environment_callback", @@ -47,7 +47,7 @@ UNFOLD = { "500": "115 115 115", "600": "82 82 82", "700": "64 64 64", - "800": "38 38 38", + "800": "42 42 42", "900": "23 23 23", "950": "10 10 10" }, diff --git a/backend/core/static/fonts.css b/backend/core/static/fonts.css index be4ee56..0f1458f 100644 --- a/backend/core/static/fonts.css +++ b/backend/core/static/fonts.css @@ -1,88 +1,51 @@ @layer base { @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-Thin.woff2"); - font-weight: 100; - font-style: normal; - font-display: swap; - } - @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-UltraLight.woff2"); - font-weight: 200; - font-style: normal; - font-display: swap; - } - - @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-Light.woff2"); + font-family: "Peyda"; + src: url("./fonts/peyda/300-PeydaWeb-Light-fanum.woff2"); font-weight: 300; font-style: normal; font-display: swap; } @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-Regular.woff2"); + font-family: "Peyda"; + src: url("./fonts/peyda/400-PeydaWeb-Regular-fanum.woff2"); font-weight: 400; font-style: normal; font-display: swap; } @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-Medium.woff2"); + font-family: "Peyda"; + src: url("./fonts/peyda/500-PeydaWeb-Medium-fanum.woff2"); font-weight: 500; font-style: normal; font-display: swap; } @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-DemiBold.woff2"); + font-family: "Peyda"; + src: url("./fonts/peyda/600-PeydaWeb-SemiBold-fanum.woff2"); font-weight: 600; font-style: normal; font-display: swap; } @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-Bold.woff2"); + font-family: "Peyda"; + src: url("./fonts/peyda/700-PeydaWeb-Bold-fanum.woff2"); font-weight: 700; font-style: normal; font-display: swap; } - @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-ExtraBold.woff2"); - font-weight: 800; - font-style: normal; - font-display: swap; - } @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-Black.woff2"); + font-family: "Peyda"; + src: url("./fonts/peyda/900-PeydaWeb-Black-fanum.woff2"); font-weight: 900; font-style: normal; font-display: swap; } - @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-ExtraBlack.woff2"); - font-weight: 950; - font-style: normal; - font-display: swap; - } - - @font-face { - font-family: "IRANYekanXVF"; - src: url("./fonts/IranYekanX/IRANYekanX-Heavy.woff2"); - font-weight: 1000; - font-style: normal; - font-display: swap; - } } \ No newline at end of file diff --git a/backend/core/static/fonts/peyda/300-PeydaWeb-Light-fanum.woff2 b/backend/core/static/fonts/peyda/300-PeydaWeb-Light-fanum.woff2 new file mode 100644 index 0000000..f5b4ab1 Binary files /dev/null and b/backend/core/static/fonts/peyda/300-PeydaWeb-Light-fanum.woff2 differ diff --git a/backend/core/static/fonts/peyda/400-PeydaWeb-Regular-fanum.woff2 b/backend/core/static/fonts/peyda/400-PeydaWeb-Regular-fanum.woff2 new file mode 100644 index 0000000..8f44c17 Binary files /dev/null and b/backend/core/static/fonts/peyda/400-PeydaWeb-Regular-fanum.woff2 differ diff --git a/backend/core/static/fonts/peyda/500-PeydaWeb-Medium-fanum.woff2 b/backend/core/static/fonts/peyda/500-PeydaWeb-Medium-fanum.woff2 new file mode 100644 index 0000000..386406e Binary files /dev/null and b/backend/core/static/fonts/peyda/500-PeydaWeb-Medium-fanum.woff2 differ diff --git a/backend/core/static/fonts/peyda/600-PeydaWeb-SemiBold-fanum.woff2 b/backend/core/static/fonts/peyda/600-PeydaWeb-SemiBold-fanum.woff2 new file mode 100644 index 0000000..e8d4288 Binary files /dev/null and b/backend/core/static/fonts/peyda/600-PeydaWeb-SemiBold-fanum.woff2 differ diff --git a/backend/core/static/fonts/peyda/700-PeydaWeb-Bold-fanum.woff2 b/backend/core/static/fonts/peyda/700-PeydaWeb-Bold-fanum.woff2 new file mode 100644 index 0000000..39401a4 Binary files /dev/null and b/backend/core/static/fonts/peyda/700-PeydaWeb-Bold-fanum.woff2 differ diff --git a/backend/core/static/fonts/peyda/900-PeydaWeb-Black-fanum.woff2 b/backend/core/static/fonts/peyda/900-PeydaWeb-Black-fanum.woff2 new file mode 100644 index 0000000..ffb7859 Binary files /dev/null and b/backend/core/static/fonts/peyda/900-PeydaWeb-Black-fanum.woff2 differ diff --git a/backend/core/static/fonts_iran_yekan_cashe.css b/backend/core/static/fonts_iran_yekan_cashe.css new file mode 100644 index 0000000..be4ee56 --- /dev/null +++ b/backend/core/static/fonts_iran_yekan_cashe.css @@ -0,0 +1,88 @@ +@layer base { + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-Thin.woff2"); + font-weight: 100; + font-style: normal; + font-display: swap; + } + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-UltraLight.woff2"); + font-weight: 200; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-Light.woff2"); + font-weight: 300; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-Regular.woff2"); + font-weight: 400; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-Medium.woff2"); + font-weight: 500; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-DemiBold.woff2"); + font-weight: 600; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-Bold.woff2"); + font-weight: 700; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-ExtraBold.woff2"); + font-weight: 800; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-Black.woff2"); + font-weight: 900; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-ExtraBlack.woff2"); + font-weight: 950; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: "IRANYekanXVF"; + src: url("./fonts/IranYekanX/IRANYekanX-Heavy.woff2"); + font-weight: 1000; + font-style: normal; + font-display: swap; + } +} \ No newline at end of file diff --git a/backend/core/static/override.css b/backend/core/static/override.css index 5b4aa51..1015eac 100644 --- a/backend/core/static/override.css +++ b/backend/core/static/override.css @@ -1,3 +1,3 @@ *:not(span){ - font-family: 'IRANYekanXVF' !important; + font-family: 'Peyda' !important; } \ No newline at end of file diff --git a/backend/product/serializers.py b/backend/product/serializers.py index 135e7da..984b8f0 100644 --- a/backend/product/serializers.py +++ b/backend/product/serializers.py @@ -50,6 +50,7 @@ class ProductVariantSerialzier(serializers.ModelSerializer): images = ProductImageSerailizer(many=True) details = ProductDetailSerializer(many=True, read_only=True) cart_quantity = serializers.SerializerMethodField() + price = serializers.SerializerMethodField() class Meta: model = ProductVariant exclude = ('min_price', 'sell', 'currency', 'product', 'input_price') @@ -72,6 +73,8 @@ class ProductVariantSerialzier(serializers.ModelSerializer): return item['quantity'] return 0 + def get_price(self, obj): + return f'{obj.price:,.0f} تومان' class SubCategorySerializer(serializers.ModelSerializer): diff --git a/frontend/components/cart/delivery/AddressItem.vue b/frontend/components/cart/delivery/AddressItem.vue index 172d3f2..0b28ac7 100644 --- a/frontend/components/cart/delivery/AddressItem.vue +++ b/frontend/components/cart/delivery/AddressItem.vue @@ -112,7 +112,9 @@ const handleDeleteAddress = (id: number) => {
+ لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ، و با + استفاده از طراحان گرافیک است، چاپگرها و متون بلکه روزنامه و مجله + در ستون و سطرآنچنان که لازم است، و برای شرایط فعلی تکنولوژی مورد + نیاز، و کاربردهای متنوع با هدف بهبود ابزارهای کاربردی می باشد، + کتابهای زیادی در شصت. +
+