Reformatted code

manuel12 · May 9, 2022 · db35466 · db35466
1 parent ed5f4a2
commit db35466
Show file tree

Hide file tree

Showing 39 changed files with 1,529 additions and 1,331 deletions.
diff --git a/accounts/apps.py b/accounts/apps.py
@@ -2,4 +2,4 @@
 
 
 class AccountsConfig(AppConfig):
-    name = 'accounts'
+    name = "accounts"
diff --git a/accounts/urls.py b/accounts/urls.py
@@ -3,10 +3,10 @@
 
 from accounts import views
 
-app_name = 'accounts'
+app_name = "accounts"
 
 urlpatterns = [
-    path('login/', LoginView.as_view(), name='login'),
-    path('logout/', views.logout_view, name='logout'),
-    path('signup/', views.signup_view, name='signup')
+    path("login/", LoginView.as_view(), name="login"),
+    path("logout/", views.logout_view, name="logout"),
+    path("signup/", views.signup_view, name="signup"),
 ]
diff --git a/accounts/views.py b/accounts/views.py
@@ -14,25 +14,24 @@ def logout_view(request):
     Expense.objects.delete_testuser_budget(request)
 
     logout(request)
-    return redirect('expenses:home')
+    return redirect("expenses:home")
+
 
 def signup_view(request):
-    template = 'signup.html'
+    template = "signup.html"
 
-    if request.method != 'POST':
+    if request.method != "POST":
         form = UserCreationForm()
     else:
         form = UserCreationForm(data=request.POST)
-        username = form.data['username']
-        password = request.POST['password1']
+        username = form.data["username"]
+        password = request.POST["password1"]
 
         if form.is_valid():
             form.save()
-            authenticated_user = authenticate(
-                username=username,
-                password=password)
+            authenticated_user = authenticate(username=username, password=password)
             login(request, authenticated_user)
-            return redirect('expenses:home')
+            return redirect("expenses:home")
         else:
             # Form not valid, gather errors labels.
             error_labels = []
@@ -41,17 +40,18 @@ def signup_view(request):
                 User.objects.get(username=username)
                 # If so add error label.
                 error_labels.append(
-                  "The username you entered has already been taken! Please try another username.")
+                    "The username you entered has already been taken! Please try another username."
+                )
             except:
                 pass
 
             # Check if passwords are not the same.
             if not form.clean_password2():
-              # If they aren't add error label.
-              error_labels.append("The two password fields didn’t match!")
+                # If they aren't add error label.
+                error_labels.append("The two password fields didn’t match!")
 
-            context = {'form': form, 'errors': error_labels}
+            context = {"form": form, "errors": error_labels}
             return render(request, template, context)
 
-    context = {'form': form}
+    context = {"form": form}
     return render(request, template, context)
diff --git a/expense_tracker/asgi.py b/expense_tracker/asgi.py
@@ -11,6 +11,6 @@
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'expense_tracker.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "expense_tracker.settings")
 
 application = get_asgi_application()
diff --git a/expense_tracker/settings.py b/expense_tracker/settings.py
@@ -26,116 +26,120 @@
 # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = env('SECRET_KEY')
+SECRET_KEY = env("SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
 
-DEBUG = env('DEBUG')
+DEBUG = env("DEBUG")
 
 
 ALLOWED_HOSTS = [
-  '192.168.1.44', '127.0.0.1', 'expense-tracker16.herokuapp.com', 'localhost'
+    "192.168.1.44",
+    "127.0.0.1",
+    "expense-tracker16.herokuapp.com",
+    "localhost",
 ]
 
 # Application definition
 
 INSTALLED_APPS = [
-  'django.contrib.admin',
-  'django.contrib.auth',
-  'django.contrib.contenttypes',
-  'django.contrib.sessions',
-  'django.contrib.messages',
-  'whitenoise.runserver_nostatic',
-  'django.contrib.staticfiles',
-
-  'expenses.apps.ExpensesConfig',
-  'accounts.apps.AccountsConfig'
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "whitenoise.runserver_nostatic",
+    "django.contrib.staticfiles",
+    "expenses.apps.ExpensesConfig",
+    "accounts.apps.AccountsConfig",
 ]
 
-CURRENCY = '€'
+CURRENCY = "€"
 
 MIDDLEWARE = [
-  'django.middleware.security.SecurityMiddleware',
-  'django.contrib.sessions.middleware.SessionMiddleware',
-  'whitenoise.middleware.WhiteNoiseMiddleware',
-  'django.middleware.common.CommonMiddleware',
-  'django.middleware.csrf.CsrfViewMiddleware',
-  'django.contrib.auth.middleware.AuthenticationMiddleware',
-  'django.contrib.messages.middleware.MessageMiddleware',
-  'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "whitenoise.middleware.WhiteNoiseMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = 'expense_tracker.urls'
+ROOT_URLCONF = "expense_tracker.urls"
 
 TEMPLATES = [
-  {
-    'BACKEND': 'django.template.backends.django.DjangoTemplates',
-    'DIRS': [os.path.join(BASE_DIR, 'templates')],
-    'APP_DIRS': True,
-    'OPTIONS': {
-      'context_processors': [
-        'django.template.context_processors.debug',
-        'django.template.context_processors.request',
-        'django.contrib.auth.context_processors.auth',
-        'django.contrib.messages.context_processors.messages',
-      ],
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [os.path.join(BASE_DIR, "templates")],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+            ],
+        },
     },
-  },
 ]
 
-WSGI_APPLICATION = 'expense_tracker.wsgi.application'
+WSGI_APPLICATION = "expense_tracker.wsgi.application"
 
 
 # Databases
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 
 
 if env("DEVELOPMENT"):
-  DATABASES = {
-    'default': {
-      'ENGINE': 'django.db.backends.sqlite3',
-      'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.sqlite3",
+            "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+        }
     }
-  }
-  DATABASE_URL = 'sqlite:///' + os.path.join(BASE_DIR, 'db.sqlite3')
-  DATABASES['default'] = dj_database_url.config(default=DATABASE_URL, conn_max_age=600)
+    DATABASE_URL = "sqlite:///" + os.path.join(BASE_DIR, "db.sqlite3")
+    DATABASES["default"] = dj_database_url.config(
+        default=DATABASE_URL, conn_max_age=600
+    )
 else:
-  DATABASES = {
-    'default': {
-      'ENGINE': 'django.db.backends.postgresql_psycopg2',
-      'NAME': env("DB_NAME"),
-      'USER': env("DB_USER"),
-      'PASSWORD': env("DB_PASSWORD"),
-      'HOST': 'localhost',
-      'PORT': 5432
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.postgresql_psycopg2",
+            "NAME": env("DB_NAME"),
+            "USER": env("DB_USER"),
+            "PASSWORD": env("DB_PASSWORD"),
+            "HOST": "localhost",
+            "PORT": 5432,
+        }
     }
-  }
 
 # Password validation
 # https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
-  {
-    'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-  },
-  {
-    'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-  },
-  {
-    'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-  },
-  {
-    'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-  },
+    {
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
+    },
 ]
 
 
 # Internationalization
 # https://docs.djangoproject.com/en/3.0/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"
 
-TIME_ZONE = 'Europe/Warsaw'
+TIME_ZONE = "Europe/Warsaw"
 
 USE_I18N = True
 
@@ -147,19 +151,19 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
 
-STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
+STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")
 
-STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
 
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 
-STATIC_URL = '/static/'
+STATIC_URL = "/static/"
 
-LOGIN_REDIRECT_URL = 'expenses:home'
+LOGIN_REDIRECT_URL = "expenses:home"
 
-LOGOUT_REDIRECT_URL = 'expenses:home'
+LOGOUT_REDIRECT_URL = "expenses:home"
 
-LOGIN_URL = 'accounts:login'
+LOGIN_URL = "accounts:login"
 
 
 # Activate Django-Heroku.

diff --git a/expense_tracker/urls.py b/expense_tracker/urls.py
@@ -16,11 +16,11 @@
 from django.contrib import admin
 from django.urls import include, path
 
-handler404 = 'expenses.views.view_404'
-handler500 = 'expenses.views.view_500'
+handler404 = "expenses.views.view_404"
+handler500 = "expenses.views.view_500"
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
-    path('accounts/', include('accounts.urls')),
-    path('', include('expenses.urls'))
+    path("admin/", admin.site.urls),
+    path("accounts/", include("accounts.urls")),
+    path("", include("expenses.urls")),
 ]
diff --git a/expenses/admin.py b/expenses/admin.py
@@ -7,16 +7,15 @@
 
 
 class ExpenseAdmin(admin.ModelAdmin):
-    list_display = [
-        'pk', 'owner', 'date', 'source', 'category', 'content', 'amount']
+    list_display = ["pk", "owner", "date", "source", "category", "content", "amount"]
 
 
 class BudgetAdmin(admin.ModelAdmin):
-    list_display = ['pk', 'owner', 'amount']
+    list_display = ["pk", "owner", "amount"]
 
 
 class UserAdmin(admin.ModelAdmin):
-  list_display = ['pk', 'username', 'email',  'first_name', 'last_name']
+    list_display = ["pk", "username", "email", "first_name", "last_name"]
 
 
 admin.site.register(Expense, ExpenseAdmin)

diff --git a/expenses/apps.py b/expenses/apps.py
@@ -2,4 +2,4 @@
 
 
 class ExpensesConfig(AppConfig):
-    name = 'expenses'
+    name = "expenses"
diff --git a/expenses/forms.py b/expenses/forms.py
@@ -6,24 +6,22 @@
 class ExpenseForm(forms.ModelForm):
     class Meta:
         model = Expense
-        fields = ('amount', 'content', 'category', 'source', 'date', 'owner')
-        exclude = ['owner']
+        fields = ("amount", "content", "category", "source", "date", "owner")
+        exclude = ["owner"]
 
         widgets = {
-            'amount': forms.NumberInput(attrs={'class': 'form-control'}),
-            'content': forms.TextInput(attrs={'class': 'form-control'}),
-            'category': forms.Select(attrs={'class': 'form-control'}),
-            'source': forms.TextInput(attrs={'class': 'form-control'}),
-            'date': forms.DateInput(attrs={'class': 'form-control'})
+            "amount": forms.NumberInput(attrs={"class": "form-control"}),
+            "content": forms.TextInput(attrs={"class": "form-control"}),
+            "category": forms.Select(attrs={"class": "form-control"}),
+            "source": forms.TextInput(attrs={"class": "form-control"}),
+            "date": forms.DateInput(attrs={"class": "form-control"}),
         }
 
 
 class BudgetForm(forms.ModelForm):
     class Meta:
         model = Budget
-        fields = ('amount', 'owner')
-        exclude = ['owner']
+        fields = ("amount", "owner")
+        exclude = ["owner"]
 
-        widgets = {
-            'amount': forms.NumberInput(attrs={'class': 'form-control'})
-        }
+        widgets = {"amount": forms.NumberInput(attrs={"class": "form-control"})}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		class AccountsConfig(AppConfig):
		name = 'accounts'
		name = "accounts"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		class ExpensesConfig(AppConfig):
		name = 'expenses'
		name = "expenses"