From 166ee7c91f71d372e029301098d6d041609b43a0 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:17:38 +0330 Subject: [PATCH 01/42] user model meta names --- backend/account/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/account/models.py b/backend/account/models.py index 90cd145..9bc345d 100644 --- a/backend/account/models.py +++ b/backend/account/models.py @@ -1,4 +1,4 @@ -from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin +from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin, Group from django.db import models from django.utils.translation import gettext_lazy as _ import random @@ -55,7 +55,9 @@ class User(AbstractBaseUser, PermissionsMixin): def user_permissions(self): return None - + class Meta: + verbose_name = 'کاربر' + verbose_name_plural = 'کاربران' def _hash_otp(self, otp): return hashlib.sha256(otp.encode()).hexdigest() From 144cd5a74872321c4222d8f3bdcb06fada5e4fdd Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:17:54 +0330 Subject: [PATCH 02/42] unregister group --- backend/account/admin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/account/admin.py b/backend/account/admin.py index 2ee028d..46b49e9 100644 --- a/backend/account/admin.py +++ b/backend/account/admin.py @@ -6,7 +6,7 @@ from import_export.admin import ImportExportModelAdmin from unfold.contrib.import_export.forms import ExportForm, ImportForm, SelectableFieldsExportForm from unfold.contrib.forms.widgets import ArrayWidget, WysiwygWidget from django.contrib.postgres.fields import ArrayField - +from django.contrib.auth.models import Group @admin.register(User) class UserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin): @@ -42,4 +42,6 @@ class UserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin): "widget": ArrayWidget, } } - \ No newline at end of file + + +admin.site.unregister(Group) \ No newline at end of file From fea71955e53db2c8e696153f063cba671c4ba2ce Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:18:08 +0330 Subject: [PATCH 03/42] account app verbose name --- backend/account/apps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/account/apps.py b/backend/account/apps.py index 2b08f1a..bd9c0fd 100644 --- a/backend/account/apps.py +++ b/backend/account/apps.py @@ -4,3 +4,4 @@ from django.apps import AppConfig class AccountConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'account' + verbose_name = 'اکانت' \ No newline at end of file From b8ba3a743c323b332782a3a142a4ff042869238f Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:20:10 +0330 Subject: [PATCH 04/42] blog app verbose name --- backend/blog/apps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/blog/apps.py b/backend/blog/apps.py index 94788a5..9994008 100644 --- a/backend/blog/apps.py +++ b/backend/blog/apps.py @@ -4,3 +4,4 @@ from django.apps import AppConfig class BlogConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'blog' + verbose_name = 'بلاگ' \ No newline at end of file From b48abe9ec436b3001e1f0452b398eddbd21480f8 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:20:19 +0330 Subject: [PATCH 05/42] chat app verbose name --- backend/chat/apps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/chat/apps.py b/backend/chat/apps.py index 2fe899a..5c8406d 100644 --- a/backend/chat/apps.py +++ b/backend/chat/apps.py @@ -4,3 +4,4 @@ from django.apps import AppConfig class ChatConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'chat' + verbose_name = 'چت هوش مصنوعی' From 3f498d0c59720354ed43dcfb2b4e6b6cfb07151d Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:20:27 +0330 Subject: [PATCH 06/42] home app verbose name --- backend/home/apps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/home/apps.py b/backend/home/apps.py index e5ea0af..cf49093 100644 --- a/backend/home/apps.py +++ b/backend/home/apps.py @@ -4,3 +4,4 @@ from django.apps import AppConfig class HomeConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'home' + verbose_name = 'خانه' \ No newline at end of file From 375aea329f49c2cd65133c76d511fc7eb52d1354 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:20:35 +0330 Subject: [PATCH 07/42] order app verbose name --- backend/order/apps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/order/apps.py b/backend/order/apps.py index 42888e4..60f4dff 100644 --- a/backend/order/apps.py +++ b/backend/order/apps.py @@ -4,3 +4,4 @@ from django.apps import AppConfig class OrderConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'order' + verbose_name = 'سفارش' From 6e6258391bf5ef355eb530d489f888cf1b34c859 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:20:45 +0330 Subject: [PATCH 08/42] product app verbose name --- backend/product/apps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/product/apps.py b/backend/product/apps.py index 235a333..512d060 100644 --- a/backend/product/apps.py +++ b/backend/product/apps.py @@ -4,3 +4,4 @@ from django.apps import AppConfig class ProductConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'product' + verbose_name = 'محصول' From 213d0fbc1fec757b59ab6d56de3df9da68e80514 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:20:55 +0330 Subject: [PATCH 09/42] ticket app verbose name --- backend/ticket/apps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/ticket/apps.py b/backend/ticket/apps.py index 1b423f8..2321ea1 100644 --- a/backend/ticket/apps.py +++ b/backend/ticket/apps.py @@ -4,3 +4,4 @@ from django.apps import AppConfig class TicketConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'ticket' + verbose_name = 'تیکت' \ No newline at end of file From 02d4b578880a6fa4d95dd02059001880e48d21c7 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:35:29 +0330 Subject: [PATCH 10/42] remove BlacklistedToken and OutstandingToken from admin --- backend/account/admin.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/account/admin.py b/backend/account/admin.py index 46b49e9..3da5f16 100644 --- a/backend/account/admin.py +++ b/backend/account/admin.py @@ -44,4 +44,9 @@ class UserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin): } -admin.site.unregister(Group) \ No newline at end of file +admin.site.unregister(Group) +from django.contrib import admin +from rest_framework_simplejwt.token_blacklist.models import BlacklistedToken, OutstandingToken +# Unregister the BlacklistedToken and OutstandingToken models +admin.site.unregister(BlacklistedToken) +admin.site.unregister(OutstandingToken) \ No newline at end of file From 44389eaa7ea93f19f798b7eb6ff827c57b142df7 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Thu, 30 Jan 2025 02:38:10 +0330 Subject: [PATCH 11/42] verbose name product model --- backend/product/models.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/product/models.py b/backend/product/models.py index b0a9dd6..0c9af20 100644 --- a/backend/product/models.py +++ b/backend/product/models.py @@ -109,6 +109,7 @@ class ProductModel(models.Model): meta_rating = models.FloatField(default=5, help_text='امتیاز محصول') created_at = models.DateTimeField(auto_now_add=True, verbose_name='زمان ثبت محصول') category = models.ForeignKey(SubCategoryModel, blank=True, null=True, on_delete=models.SET_NULL, related_name='products', verbose_name='دسته بندی محصول') + def format_discount_price(self): discount_price = int(self.price * (100 - self.discount) / 100) formatted_num = "{:,.0f}".format(discount_price) @@ -140,6 +141,10 @@ class ProductModel(models.Model): self.slug = slugify(self.name, allow_unicode=True) super().save(*args, **kwargs) + class Meta: + verbose_name = 'محصول' + verbose_name_plural = 'محصولات' + class CommentModel(models.Model): product = models.ForeignKey(ProductModel, on_delete=models.CASCADE, related_name='comments', verbose_name='محصول') From 1dba7fde5938e74cc2c06a0d3a6cc6ae7f6731ce Mon Sep 17 00:00:00 2001 From: marzban-dev Date: Thu, 30 Jan 2025 02:40:57 +0330 Subject: [PATCH 12/42] Update blog post --- frontend/components/global/BlogPost.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/components/global/BlogPost.vue b/frontend/components/global/BlogPost.vue index acc4f26..485bf58 100644 --- a/frontend/components/global/BlogPost.vue +++ b/frontend/components/global/BlogPost.vue @@ -25,7 +25,7 @@ const {} = toRefs(props);