Skip to content

Commit

Permalink
lint code dev
Browse files Browse the repository at this point in the history
  • Loading branch information
RustamovAkrom committed Nov 19, 2024
1 parent 289d559 commit a020808
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 30 deletions.
3 changes: 1 addition & 2 deletions apps/blog/tests.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
from datetime import datetime

from django.test import TestCase
from django.core.files.uploadedfile import UploadedFile

from apps.users.models import User
from apps.blog.models import Post
from django.urls import reverse
from .forms import PostCreateUpdateForm, SettingsUserForm, SettingsUserProfileForm
from .forms import PostCreateUpdateForm, SettingsUserForm
from .choices import StatusChoice


Expand Down
5 changes: 1 addition & 4 deletions apps/blog/views.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import datetime
from functools import wraps
from typing import Any

from django.shortcuts import render, redirect, get_object_or_404
from django.contrib.auth.mixins import LoginRequiredMixin
from django.views.generic import TemplateView, DeleteView
from django.contrib import messages
from django.http import HttpRequest
from django.views import View
from django.urls import reverse

from apps.users.models import User
from apps.shared.mixins import CustomHtmxMixin, render_htmx_or_default
from apps.shared.mixins import CustomHtmxMixin
from .models import Post
from .forms import (
PostCreateUpdateForm,
Expand Down
9 changes: 5 additions & 4 deletions apps/shared/management/commands/createadmin.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import os

from dotenv import load_dotenv
from django.contrib.auth import get_user_model
from django.core.management import BaseCommand

from dotenv import load_dotenv
load_dotenv()

from django.contrib.auth import get_user_model
from django.core.management.base import BaseCommand


ADMIN_USERNAME = str(os.getenv("ADMIN_USERNAME"))
ADMIN_PASSWORD = str(os.getenv("ADMIN_PASSWORD"))
ADMIN_EMAIL = str(os.getenv("ADMIN_PASSWORD"))


class Command(BaseCommand):
help = "Create superuser"

def handle(self, *args, **options):
User = get_user_model()
self.create_superuser(User, ADMIN_USERNAME, ADMIN_EMAIL, ADMIN_PASSWORD)
Expand Down
1 change: 0 additions & 1 deletion apps/users/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from django.urls import reverse

from .models import User, UserProfile
from .services import generate_jwt_tokens
from .forms import RegisterForm, LoginForm

from rest_framework_simplejwt.tokens import RefreshToken, AccessToken
Expand Down
5 changes: 2 additions & 3 deletions core/config/apps.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
DEFAULT_APPS = [
# Default apps
"django.contrib.admin",
"django.contrib.auth",
"django.contrib.contenttypes",
Expand All @@ -10,14 +9,14 @@
"django.contrib.staticfiles",
"django.contrib.postgres",
]

PROJECT_APPS = [
# Project apps
"apps.shared.apps.SharedConfig",
"apps.blog.apps.BlogConfig",
"apps.users.apps.UsersConfig",
]

THIRD_PARTY_APPS = [
# Third party apps
"rest_framework",
"rest_framework_simplejwt",
"rest_framework_simplejwt.token_blacklist",
Expand Down
16 changes: 11 additions & 5 deletions core/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ALLOWED_HOSTS = str(os.getenv("ALLOWED_HOSTS")).split(",")


INSTALLED_APPS = DEFAULT_APPS + PROJECT_APPS + THIRD_PARTY_APPS
INSTALLED_APPS = DEFAULT_APPS + PROJECT_APPS + THIRD_PARTY_APPS # NOQA


MIDDLEWARE = [
Expand All @@ -34,7 +34,7 @@
ROOT_URLCONF = "core.urls"


TEMPLATES_DIRS = [os.path.join(BASE_DIR, "templates")]
TEMPLATES_DIRS = [BASE_DIR.joinpath("templates")]

TEMPLATES = [
{
Expand All @@ -52,6 +52,12 @@
},
]

DATABASES = {
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": BASE_DIR.joinpath("db.sqlite3"),
},
}

WSGI_APPLICATION = "core.wsgi.application"

Expand Down Expand Up @@ -83,16 +89,16 @@
LOGIN_REDIRECT_URL = "/"

STATIC_URL = "static/"
STATIC_ROOT = BASE_DIR / "staticfiles"
STATICFILES_DIRS = [BASE_DIR / "static"]
STATIC_ROOT = BASE_DIR.joinpath("staticfiles")
STATICFILES_DIRS = [BASE_DIR.joinpath("static")]

# AUTHENTICATION_BACKENDS = (
# 'apps.users.authentication.JWTAdminAuthentication',
# 'django.contrib.auth.backends.ModelBackend',
# )

MEDIA_URL = "media/"
MEDIA_ROOT = BASE_DIR / "media/"
MEDIA_ROOT = BASE_DIR.joinpath("media/")

DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

Expand Down
7 changes: 0 additions & 7 deletions core/settings/development.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
from .base import * # noqa

EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"

DATABASES = {
"default": {
"ENGINE": f"django.db.backends.sqlite3",
"NAME": BASE_DIR / "db.sqlite3",
}
}
2 changes: 1 addition & 1 deletion core/settings/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

DATABASES = {
"default": {
"ENGINE": f"django.db.backends.postgresql",
"ENGINE": "django.db.backends.postgresql",
"NAME": str(os.getenv("DATABASE_NAME")),
"USER": str(os.getenv("DATABASE_USER")),
"PASSWORD": str(os.getenv("DATABASE_PASSWORD")),
Expand Down
5 changes: 2 additions & 3 deletions core/wsgi.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import os

from dotenv import load_dotenv
from django.core.wsgi import get_wsgi_application

from dotenv import load_dotenv
load_dotenv()

from django.core.wsgi import get_wsgi_application

os.environ.setdefault(
"DJANGO_SETTINGS_MODULE",
os.getenv("DJANGO_SETTINGS_MODULE", "core.settings.development"),
Expand Down

0 comments on commit a020808

Please sign in to comment.