Skip to content

Commit 46f6c90

Browse files
committed
Refactor code formatting and imports
1 parent ec3902d commit 46f6c90

File tree

6 files changed

+48
-41
lines changed

6 files changed

+48
-41
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,14 @@ python source/manage.py collectstatic
9898

9999
#### Check & format code
100100

101+
This following commands sort imports and format the code:
102+
101103
```bash
102-
ruff check
104+
ruff check --select I --fix
103105
ruff format
104106
```
105107

106-
### Format templates
108+
Format templates:
107109

108110
```bash
109111
git ls-files -z -- '*.html' | xargs -0 djade --target-version '5.1'

source/accounts/forms.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from datetime import timedelta
22

33
from django import forms
4-
from django.forms import ValidationError
54
from django.conf import settings
6-
from django.contrib.auth.models import User
75
from django.contrib.auth.forms import UserCreationForm
8-
from django.utils import timezone
6+
from django.contrib.auth.models import User
97
from django.db.models import Q
8+
from django.forms import ValidationError
9+
from django.utils import timezone
1010
from django.utils.translation import gettext_lazy as _
1111

1212

source/accounts/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from django.db import models
21
from django.contrib.auth.models import User
2+
from django.db import models
33

44

55
class Activation(models.Model):

source/accounts/urls.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
from django.urls import path
22

33
from .views import (
4-
LogInView,
5-
ResendActivationCodeView,
6-
RemindUsernameView,
7-
SignUpView,
84
ActivateView,
9-
LogOutView,
10-
ChangeEmailView,
115
ChangeEmailActivateView,
12-
ChangeProfileView,
6+
ChangeEmailView,
137
ChangePasswordView,
14-
RestorePasswordView,
15-
RestorePasswordDoneView,
16-
RestorePasswordConfirmView,
8+
ChangeProfileView,
9+
LogInView,
1710
LogOutConfirmView,
11+
LogOutView,
12+
RemindUsernameView,
13+
ResendActivationCodeView,
14+
RestorePasswordConfirmView,
15+
RestorePasswordDoneView,
16+
RestorePasswordView,
17+
SignUpView,
1818
)
1919

2020
app_name = "accounts"

source/accounts/views.py

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,53 @@
1+
from django.conf import settings
12
from django.contrib import messages
2-
from django.contrib.auth import login, authenticate, REDIRECT_FIELD_NAME
3-
from django.contrib.auth.tokens import default_token_generator
3+
from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login
44
from django.contrib.auth.mixins import LoginRequiredMixin
5+
from django.contrib.auth.tokens import default_token_generator
56
from django.contrib.auth.views import (
67
LogoutView as BaseLogoutView,
8+
)
9+
from django.contrib.auth.views import (
710
PasswordChangeView as BasePasswordChangeView,
8-
PasswordResetDoneView as BasePasswordResetDoneView,
11+
)
12+
from django.contrib.auth.views import (
913
PasswordResetConfirmView as BasePasswordResetConfirmView,
1014
)
11-
from django.views.generic.base import TemplateView
15+
from django.contrib.auth.views import (
16+
PasswordResetDoneView as BasePasswordResetDoneView,
17+
)
1218
from django.shortcuts import get_object_or_404, redirect
1319
from django.utils.crypto import get_random_string
1420
from django.utils.decorators import method_decorator
15-
from django.utils.http import url_has_allowed_host_and_scheme as is_safe_url
1621
from django.utils.encoding import force_bytes
22+
from django.utils.http import url_has_allowed_host_and_scheme as is_safe_url
1723
from django.utils.http import urlsafe_base64_encode
1824
from django.utils.translation import gettext_lazy as _
1925
from django.views.decorators.cache import never_cache
2026
from django.views.decorators.csrf import csrf_protect
2127
from django.views.decorators.debug import sensitive_post_parameters
22-
from django.views.generic import View, FormView
23-
from django.conf import settings
28+
from django.views.generic import FormView, View
29+
from django.views.generic.base import TemplateView
2430

25-
from .utils import (
26-
send_activation_email,
27-
send_reset_password_email,
28-
send_forgotten_username_email,
29-
send_activation_change_email,
30-
)
3131
from .forms import (
32-
SignInViaUsernameForm,
33-
SignInViaEmailForm,
34-
SignInViaEmailOrUsernameForm,
35-
SignUpForm,
36-
RestorePasswordForm,
37-
RestorePasswordViaEmailOrUsernameForm,
32+
ChangeEmailForm,
33+
ChangeProfileForm,
3834
RemindUsernameForm,
3935
ResendActivationCodeForm,
4036
ResendActivationCodeViaEmailForm,
41-
ChangeProfileForm,
42-
ChangeEmailForm,
37+
RestorePasswordForm,
38+
RestorePasswordViaEmailOrUsernameForm,
39+
SignInViaEmailForm,
40+
SignInViaEmailOrUsernameForm,
41+
SignInViaUsernameForm,
42+
SignUpForm,
4343
)
4444
from .models import Activation
45+
from .utils import (
46+
send_activation_change_email,
47+
send_activation_email,
48+
send_forgotten_username_email,
49+
send_reset_password_email,
50+
)
4551

4652

4753
class GuestOnlyView(View):

source/app/urls.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from django.contrib import admin
21
from django.conf import settings
3-
from django.urls import path, include
42
from django.conf.urls.static import static
5-
6-
from main.views import IndexPageView, ChangeLanguageView
3+
from django.contrib import admin
4+
from django.urls import include, path
5+
from main.views import ChangeLanguageView, IndexPageView
76

87
urlpatterns = [
98
path("admin/", admin.site.urls),

0 commit comments

Comments
 (0)