Skip to content

Commit c02d09d

Browse files
danyeric123danyeric123
committed
format by black
1 parent 53e1ffc commit c02d09d

18 files changed

Lines changed: 221 additions & 168 deletions

‎blog/asgi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212
from django.core.asgi import get_asgi_application
1313

14-
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'blog.settings')
14+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "blog.settings")
1515

1616
application = get_asgi_application()

‎blog/settings.py‎

Lines changed: 62 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
2222

2323
# SECURITY WARNING: keep the secret key used in production secret!
24-
SECRET_KEY = 'django-insecure-$m!=ol!ylq@0j#^fg66^%3+blyo*_fyog01ax3vhj_c4#abykz'
24+
SECRET_KEY = "django-insecure-$m!=ol!ylq@0j#^fg66^%3+blyo*_fyog01ax3vhj_c4#abykz"
2525

2626
# SECURITY WARNING: don't run with debug turned on in production!
2727
DEBUG = True
@@ -32,58 +32,58 @@
3232
# Application definition
3333

3434
INSTALLED_APPS = [
35-
'django.contrib.admin',
36-
'django.contrib.auth',
37-
'django.contrib.contenttypes',
38-
'django.contrib.sessions',
39-
'django.contrib.messages',
40-
'django.contrib.staticfiles',
41-
'blog_api',
42-
'rest_framework',
43-
'corsheaders',
44-
'users',
45-
'rest_framework_simplejwt.token_blacklist',
35+
"django.contrib.admin",
36+
"django.contrib.auth",
37+
"django.contrib.contenttypes",
38+
"django.contrib.sessions",
39+
"django.contrib.messages",
40+
"django.contrib.staticfiles",
41+
"blog_api",
42+
"rest_framework",
43+
"corsheaders",
44+
"users",
45+
"rest_framework_simplejwt.token_blacklist",
4646
]
4747

4848
MIDDLEWARE = [
49-
'django.middleware.security.SecurityMiddleware',
50-
'django.contrib.sessions.middleware.SessionMiddleware',
51-
'corsheaders.middleware.CorsMiddleware',
52-
'django.middleware.common.CommonMiddleware',
53-
'django.middleware.csrf.CsrfViewMiddleware',
54-
'django.contrib.auth.middleware.AuthenticationMiddleware',
55-
'django.contrib.messages.middleware.MessageMiddleware',
56-
'django.middleware.clickjacking.XFrameOptionsMiddleware',
49+
"django.middleware.security.SecurityMiddleware",
50+
"django.contrib.sessions.middleware.SessionMiddleware",
51+
"corsheaders.middleware.CorsMiddleware",
52+
"django.middleware.common.CommonMiddleware",
53+
"django.middleware.csrf.CsrfViewMiddleware",
54+
"django.contrib.auth.middleware.AuthenticationMiddleware",
55+
"django.contrib.messages.middleware.MessageMiddleware",
56+
"django.middleware.clickjacking.XFrameOptionsMiddleware",
5757
]
5858

59-
ROOT_URLCONF = 'blog.urls'
59+
ROOT_URLCONF = "blog.urls"
6060

6161
TEMPLATES = [
6262
{
63-
'BACKEND': 'django.template.backends.django.DjangoTemplates',
64-
'DIRS': [],
65-
'APP_DIRS': True,
66-
'OPTIONS': {
67-
'context_processors': [
68-
'django.template.context_processors.debug',
69-
'django.template.context_processors.request',
70-
'django.contrib.auth.context_processors.auth',
71-
'django.contrib.messages.context_processors.messages',
63+
"BACKEND": "django.template.backends.django.DjangoTemplates",
64+
"DIRS": [],
65+
"APP_DIRS": True,
66+
"OPTIONS": {
67+
"context_processors": [
68+
"django.template.context_processors.debug",
69+
"django.template.context_processors.request",
70+
"django.contrib.auth.context_processors.auth",
71+
"django.contrib.messages.context_processors.messages",
7272
],
7373
},
7474
},
7575
]
7676

77-
WSGI_APPLICATION = 'blog.wsgi.application'
77+
WSGI_APPLICATION = "blog.wsgi.application"
7878

7979

8080
# Database
8181
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
8282

8383
DATABASES = {
84-
'default': {
85-
'ENGINE': 'django.db.backends.sqlite3',
86-
'NAME': BASE_DIR / 'db.sqlite3',
84+
"default": {
85+
"ENGINE": "django.db.backends.sqlite3",
86+
"NAME": BASE_DIR / "db.sqlite3",
8787
}
8888
}
8989

@@ -93,26 +93,26 @@
9393

9494
AUTH_PASSWORD_VALIDATORS = [
9595
{
96-
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
96+
"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
9797
},
9898
{
99-
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
99+
"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
100100
},
101101
{
102-
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
102+
"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
103103
},
104104
{
105-
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
105+
"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
106106
},
107107
]
108108

109109

110110
# Internationalization
111111
# https://docs.djangoproject.com/en/3.2/topics/i18n/
112112

113-
LANGUAGE_CODE = 'en-us'
113+
LANGUAGE_CODE = "en-us"
114114

115-
TIME_ZONE = 'UTC'
115+
TIME_ZONE = "UTC"
116116

117117
USE_I18N = True
118118

@@ -124,40 +124,36 @@
124124
# Static files (CSS, JavaScript, Images)
125125
# https://docs.djangoproject.com/en/3.2/howto/static-files/
126126

127-
STATIC_URL = '/static/'
127+
STATIC_URL = "/static/"
128128

129129
# Default primary key field type
130130
# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
131131

132-
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
132+
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
133133

134-
CORS_ALLOWED_ORIGINS =[
135-
'http://127.0.0.1:8000',
136-
'http://localhost:3000'
137-
]
134+
CORS_ALLOWED_ORIGINS = ["http://127.0.0.1:8000", "http://localhost:3000"]
138135

139136
REST_FRAMEWORK = {
140-
'DEFAULT_PERMISSION_CLASSES': [
141-
'rest_framework.permissions.IsAuthenticatedOrReadOnly',
137+
"DEFAULT_PERMISSION_CLASSES": [
138+
"rest_framework.permissions.IsAuthenticatedOrReadOnly",
142139
],
143-
144-
'DEFAULT_AUTHENTICATION_CLASSES': (
145-
'rest_framework_simplejwt.authentication.JWTAuthentication',
146-
'rest_framework.authentication.SessionAuthentication',
147-
)
140+
"DEFAULT_AUTHENTICATION_CLASSES": (
141+
"rest_framework_simplejwt.authentication.JWTAuthentication",
142+
"rest_framework.authentication.SessionAuthentication",
143+
),
148144
}
149145

150146
SIMPLE_JWT = {
151-
'ACCESS_TOKEN_LIFETIME': timedelta(minutes=1),
152-
'REFRESH_TOKEN_LIFETIME': timedelta(days=10),
153-
'ROTATE_REFRESH_TOKENS': True,
154-
'BLACKLIST_AFTER_ROTATION': True,
155-
'ALGORITHM': 'HS256',
156-
'SIGNING_KEY': SECRET_KEY,
157-
'VERIFYING_KEY': None,
158-
'AUTH_HEADER_TYPES': ('JWT',),
159-
'USER_ID_FIELD': 'username',
160-
'USER_ID_CLAIM': 'user_username',
161-
'AUTH_TOKEN_CLASSES': ('rest_framework_simplejwt.tokens.AccessToken',),
162-
'TOKEN_TYPE_CLAIM': 'token_type',
163-
}
147+
"ACCESS_TOKEN_LIFETIME": timedelta(minutes=1),
148+
"REFRESH_TOKEN_LIFETIME": timedelta(days=10),
149+
"ROTATE_REFRESH_TOKENS": True,
150+
"BLACKLIST_AFTER_ROTATION": True,
151+
"ALGORITHM": "HS256",
152+
"SIGNING_KEY": SECRET_KEY,
153+
"VERIFYING_KEY": None,
154+
"AUTH_HEADER_TYPES": ("JWT",),
155+
"USER_ID_FIELD": "username",
156+
"USER_ID_CLAIM": "user_username",
157+
"AUTH_TOKEN_CLASSES": ("rest_framework_simplejwt.tokens.AccessToken",),
158+
"TOKEN_TYPE_CLAIM": "token_type",
159+
}

‎blog/urls.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView
1919

2020
urlpatterns = [
21-
path('admin/', admin.site.urls),
22-
path('api/posts/', include('blog_api.urls')),
23-
path('api/user/', include('users.urls')),
24-
path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),
25-
path('api/token/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
26-
path('api/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
21+
path("admin/", admin.site.urls),
22+
path("api/posts/", include("blog_api.urls")),
23+
path("api/user/", include("users.urls")),
24+
path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
25+
path("api/token/", TokenObtainPairView.as_view(), name="token_obtain_pair"),
26+
path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
2727
]

‎blog/wsgi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212
from django.core.wsgi import get_wsgi_application
1313

14-
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'blog.settings')
14+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "blog.settings")
1515

1616
application = get_wsgi_application()

‎blog_api/admin.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
@admin.register(models.Post)
66
class AuthorAdmin(admin.ModelAdmin):
7-
list_display = ('title', 'id', 'status', 'slug', 'author')
8-
prepopulated_fields = {'slug': ('title',), }
7+
list_display = ("title", "id", "status", "slug", "author")
8+
prepopulated_fields = {
9+
"slug": ("title",),
10+
}
911

1012

11-
admin.site.register(models.Category)
13+
admin.site.register(models.Category)

‎blog_api/apps.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33

44
class BlogAPIConfig(AppConfig):
5-
default_auto_field = 'django.db.models.BigAutoField'
6-
name = 'blog_api'
5+
default_auto_field = "django.db.models.BigAutoField"
6+
name = "blog_api"

‎blog_api/migrations/0001_initial.py‎

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,64 @@ class Migration(migrations.Migration):
1616

1717
operations = [
1818
migrations.CreateModel(
19-
name='Category',
19+
name="Category",
2020
fields=[
21-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
22-
('name', models.CharField(max_length=100)),
21+
(
22+
"id",
23+
models.BigAutoField(
24+
auto_created=True,
25+
primary_key=True,
26+
serialize=False,
27+
verbose_name="ID",
28+
),
29+
),
30+
("name", models.CharField(max_length=100)),
2331
],
2432
),
2533
migrations.CreateModel(
26-
name='Post',
34+
name="Post",
2735
fields=[
28-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
29-
('title', models.CharField(max_length=250)),
30-
('excerpt', models.TextField(null=True)),
31-
('content', models.TextField()),
32-
('slug', models.SlugField(max_length=250, unique_for_date='published')),
33-
('published', models.DateTimeField(default=django.utils.timezone.now)),
34-
('status', models.CharField(choices=[('draft', 'Draft'), ('published', 'Published')], default='published', max_length=10)),
35-
('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blog_posts', to=settings.AUTH_USER_MODEL)),
36-
('category', models.ForeignKey(default=1, on_delete=django.db.models.deletion.PROTECT, to='blog_api.category')),
36+
(
37+
"id",
38+
models.BigAutoField(
39+
auto_created=True,
40+
primary_key=True,
41+
serialize=False,
42+
verbose_name="ID",
43+
),
44+
),
45+
("title", models.CharField(max_length=250)),
46+
("excerpt", models.TextField(null=True)),
47+
("content", models.TextField()),
48+
("slug", models.SlugField(max_length=250, unique_for_date="published")),
49+
("published", models.DateTimeField(default=django.utils.timezone.now)),
50+
(
51+
"status",
52+
models.CharField(
53+
choices=[("draft", "Draft"), ("published", "Published")],
54+
default="published",
55+
max_length=10,
56+
),
57+
),
58+
(
59+
"author",
60+
models.ForeignKey(
61+
on_delete=django.db.models.deletion.CASCADE,
62+
related_name="blog_posts",
63+
to=settings.AUTH_USER_MODEL,
64+
),
65+
),
66+
(
67+
"category",
68+
models.ForeignKey(
69+
default=1,
70+
on_delete=django.db.models.deletion.PROTECT,
71+
to="blog_api.category",
72+
),
73+
),
3774
],
3875
options={
39-
'ordering': ('-published',),
76+
"ordering": ("-published",),
4077
},
4178
),
4279
]

‎blog_api/migrations/0002_alter_post_category.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('blog_api', '0001_initial'),
10+
("blog_api", "0001_initial"),
1111
]
1212

1313
operations = [
1414
migrations.AlterField(
15-
model_name='post',
16-
name='category',
17-
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='blog_api.category'),
15+
model_name="post",
16+
name="category",
17+
field=models.ForeignKey(
18+
blank=True,
19+
on_delete=django.db.models.deletion.CASCADE,
20+
to="blog_api.category",
21+
),
1822
),
1923
]

‎blog_api/migrations/0003_auto_20210906_1530.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('blog_api', '0002_alter_post_category'),
9+
("blog_api", "0002_alter_post_category"),
1010
]
1111

1212
operations = [
1313
migrations.RemoveField(
14-
model_name='post',
15-
name='category',
14+
model_name="post",
15+
name="category",
1616
),
1717
migrations.AddField(
18-
model_name='post',
19-
name='category',
20-
field=models.ManyToManyField(to='blog_api.Category'),
18+
model_name="post",
19+
name="category",
20+
field=models.ManyToManyField(to="blog_api.Category"),
2121
),
2222
]

0 commit comments

Comments
 (0)