refactor code

RustamovAkrom · Oct 4, 2024 · 8132458 · 8132458
1 parent 0ff596a
commit 8132458
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 74 deletions.
diff --git a/apps/account/forms.py b/apps/account/forms.py
@@ -5,66 +5,102 @@
 
 
 class LoginForm(forms.Form):
-    username = forms.CharField(widget=forms.TextInput(attrs={
-        "type": "text", 
-        "class": "form-control rounded-4",
-        "id": "floatInput",
-        "placeholder": "username..."
-    }))
-    password = forms.CharField(widget=forms.PasswordInput(attrs={
-        "type": "password",
-        "class": "form-control rounded-4",
-        "id": "floatPassword",
-        "placeholder": "password..."
-    }))
+    username = forms.CharField(
+        widget=forms.TextInput(
+            attrs={
+                "type": "text",
+                "class": "form-control rounded-4",
+                "id": "floatInput",
+                "placeholder": "username...",
+            }
+        )
+    )
+    password = forms.CharField(
+        widget=forms.PasswordInput(
+            attrs={
+                "type": "password",
+                "class": "form-control rounded-4",
+                "id": "floatPassword",
+                "placeholder": "password...",
+            }
+        )
+    )
 
     class Meta:
         pass
 
 
 class RegisterForm(forms.ModelForm):
-    first_name = forms.CharField(widget=forms.TextInput(attrs={
-        "type": "text",
-        "class": "form-control rounded-4",
-        "id": "floatInput",
-        "placeholder": "first name",
-    }))
-    last_name = forms.CharField(widget=forms.TextInput(attrs={
-        "type": "text",
-        "class": "form-control rounded-4",
-        "id": "floatInput",
-        "placeholder": "last name",
-    }))
-    username = forms.CharField(widget=forms.TextInput(attrs={
-        "type": "text",
-        "class": "form-control rounded-4",
-        "id": "floatInput",
-        "placeholder": "username",
-    }))
-    email = forms.EmailField(widget=forms.EmailInput(attrs={
-        "type": "email",
-        "class": "form-control rounded-4",
-        "id": "floatInput",
-        "placeholder": "username",
-    }))
-    phone_number = forms.CharField(widget=forms.TextInput(attrs={
-        "type": "tel",
-        "class": "form-control rounded-4",
-        "id": "floatInput",
-        "placeholder": "phone number",
-    }))
-    password = forms.CharField(widget=forms.PasswordInput(attrs={
-        "type": "password",
-        "class": "form-control rounded-4",
-        "id": "floatPassword",
-        "placeholder": "Password"
-    }))
-    password_confirm = forms.CharField(widget=forms.PasswordInput(attrs={
-        "type": "password",
-        "class": "form-control rounded-4",
-        "id": "floatPassword",
-        "placeholder": "Password"
-    }))
+    first_name = forms.CharField(
+        widget=forms.TextInput(
+            attrs={
+                "type": "text",
+                "class": "form-control rounded-4",
+                "id": "floatInput",
+                "placeholder": "first name",
+            }
+        )
+    )
+    last_name = forms.CharField(
+        widget=forms.TextInput(
+            attrs={
+                "type": "text",
+                "class": "form-control rounded-4",
+                "id": "floatInput",
+                "placeholder": "last name",
+            }
+        )
+    )
+    username = forms.CharField(
+        widget=forms.TextInput(
+            attrs={
+                "type": "text",
+                "class": "form-control rounded-4",
+                "id": "floatInput",
+                "placeholder": "username",
+            }
+        )
+    )
+    email = forms.EmailField(
+        widget=forms.EmailInput(
+            attrs={
+                "type": "email",
+                "class": "form-control rounded-4",
+                "id": "floatInput",
+                "placeholder": "username",
+            }
+        )
+    )
+    phone_number = forms.CharField(
+        widget=forms.TextInput(
+            attrs={
+                "type": "tel",
+                "class": "form-control rounded-4",
+                "id": "floatInput",
+                "placeholder": "phone number",
+            }
+        )
+    )
+    password = forms.CharField(
+        widget=forms.PasswordInput(
+            attrs={
+                "type": "password",
+                "class": "form-control rounded-4",
+                "id": "floatPassword",
+                "placeholder": "Password",
+            }
+        )
+    )
+    password_confirm = forms.CharField(
+        widget=forms.PasswordInput(
+            attrs={
+                "type": "password",
+                "class": "form-control rounded-4",
+                "id": "floatPassword",
+                "placeholder": "Password",
+            }
+        )
+    )
 
     class Meta:
         model = CustomUser

diff --git a/apps/cart/context_processors.py b/apps/cart/context_processors.py
@@ -2,6 +2,4 @@
 
 
 def cart(request):
-    return {
-        "cart": Cart(request)
-    }
+    return {"cart": Cart(request)}
diff --git a/apps/orders/forms.py b/apps/orders/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from localflavor.us.forms import USZipCodeField # noqa
+from localflavor.us.forms import USZipCodeField  # noqa
 from .models import Order
 
 

diff --git a/apps/orders/views.py b/apps/orders/views.py
@@ -1,12 +1,12 @@
 from django.contrib.admin.views.decorators import staff_member_required
-from django.contrib.auth.decorators import login_required # noqa 
+from django.contrib.auth.decorators import login_required  # noqa
 from django.shortcuts import get_object_or_404, redirect, render
 from django.contrib import messages
 from apps.cart.cart import Cart
 from apps.coupons.forms import CouponApplyForm
 from .forms import OrderCreateForm
 from .models import Order, OrderItem
-from .tasks import order_created # noqa
+from .tasks import order_created  # noqa
 
 
 def order_create(request):

diff --git a/apps/payment/admin.py b/apps/payment/admin.py
@@ -1 +1 @@
-from django.contrib import admin # noqa
+from django.contrib import admin  # noqa
diff --git a/apps/payment/models.py b/apps/payment/models.py
@@ -1 +1 @@
-from django.db import models # noqa
+from django.db import models  # noqa
diff --git a/apps/payment/tests.py b/apps/payment/tests.py
@@ -1 +1 @@
-from django.test import TestCase # noqa
+from django.test import TestCase  # noqa
diff --git a/core/celery.py b/core/celery.py
@@ -9,6 +9,7 @@
 app.config_from_object("django.conf:settings", namespace="CELERY")
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
 
+
 @app.task(bind=True)
 def debug_task(self):
     print(f"Request: {self.request!r}")
diff --git a/core/config/__init__.py b/core/config/__init__.py
@@ -1,4 +1,4 @@
 from .apps import *  # noqa
-from .celery import * # noqa
-from .email import * # noqa
-from .stripe import * # noqa
+from .celery import *  # noqa
+from .email import *  # noqa
+from .stripe import *  # noqa
diff --git a/core/settings/base.py b/core/settings/base.py
@@ -15,7 +15,7 @@
 
 DEBUG = os.getenv("DEBUG") in ["true", "1", True]
 
-ALLOWED_HOSTS = os.getenv("DJANGO_ALLOWED_HOSTS", 'localhost').split()
+ALLOWED_HOSTS = os.getenv("DJANGO_ALLOWED_HOSTS", "localhost").split()
 
 INSTALLED_APPS = DJANGO_DEFAULT_APPS + PROJECT_APPS + THIRTY_PARTY_APPS
 

diff --git a/core/settings/production.py b/core/settings/production.py
@@ -2,12 +2,12 @@
 
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': os.getenv('POSTGRES_NAME'),
-        'PASSWORD': os.getenv('POSTGRES_PASSWORD'),
-        'USER': os.getenv('POSTGRES_USER', 'postgres'),
-        'HOST': os.getenv('POSTGRES_HOST', 'localhost'),
-        'PORT': os.getenv('POSTGRES_PORT', 5432)
+    "default": {
+        "ENGINE": "django.db.backends.postgresql",
+        "NAME": os.getenv("POSTGRES_NAME"),
+        "PASSWORD": os.getenv("POSTGRES_PASSWORD"),
+        "USER": os.getenv("POSTGRES_USER", "postgres"),
+        "HOST": os.getenv("POSTGRES_HOST", "localhost"),
+        "PORT": os.getenv("POSTGRES_PORT", 5432),
     }
 }