Merge branch 'develop' of https://github.com/Emmanuel289/Travit into …

…develop
Emmanuel289 · Jul 27, 2023 · c30f803 · c30f803
2 parents 20e3fe9 + df2d7c6
commit c30f803
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/travit_service/travit_service/settings.py b/travit_service/travit_service/settings.py
@@ -29,7 +29,7 @@
 SERVER_ADDRESS = os.getenv("SERVER_ADDRESS", "")
 SERVER_URL = os.getenv("SERVER_URL", "")
 
-ALLOWED_HOSTS = ['127.0.0.1']
+ALLOWED_HOSTS = ["127.0.0.1"]
 
 if SERVER_ADDRESS:
  ALLOWED_HOSTS += [SERVER_ADDRESS]
@@ -133,10 +133,10 @@
 }
 
 DJOSER = {
- 'SERIALIZERS': {
- 'user_create': 'users.serializers.UserCreatePasswordRetypeSerializer',
+ "SERIALIZERS": {
+ "user_create": "users.serializers.UserCreatePasswordRetypeSerializer",
  },
- 'LOGIN_FIELD': 'email'
+ "LOGIN_FIELD": "email",
 }
 
 

diff --git a/travit_service/travit_service/urls.py b/travit_service/travit_service/urls.py
@@ -42,8 +42,7 @@
  schema_view.with_ui("swagger", cache_timeout=0),
  name="schema-swagger-ui",
  ),
- path("redoc/", schema_view.with_ui("redoc",
- cache_timeout=0), name="schema-redoc"),
+ path("redoc/", schema_view.with_ui("redoc", cache_timeout=0), name="schema-redoc"),
  path("admin/", admin.site.urls),
  path("auth/", include("djoser.urls")),
  path("auth/", include("djoser.urls.authtoken")),

diff --git a/travit_service/users/models.py b/travit_service/users/models.py
@@ -4,13 +4,13 @@
 
 class User(AbstractUser):
  first_name = models.CharField(
- verbose_name='first_name', blank=False, max_length=150)
- last_name = models.CharField(
- verbose_name='last_name', blank=False, max_length=150)
- email = models.EmailField(
- verbose_name="email_address", blank=False, unique=True)
+ verbose_name="first_name", blank=False, max_length=150
+ )
+ last_name = models.CharField(verbose_name="last_name", blank=False, max_length=150)
+ email = models.EmailField(verbose_name="email_address", blank=False, unique=True)
  re_password = models.CharField(
- verbose_name="Retype Password", blank=False, max_length=255, default='')
+ verbose_name="Retype Password", blank=False, max_length=255, default=""
+ )
 
  class Meta:
  ordering = ["id"]

diff --git a/travit_service/users/serializers.py b/travit_service/users/serializers.py
@@ -1,8 +1,16 @@
 # from rest_framework import serializers
-from djoser.serializers import UserCreatePasswordRetypeSerializer as BaseUserCreatePasswordRetypeSerializer
+from djoser.serializers import \
+ UserCreatePasswordRetypeSerializer as BaseUserCreatePasswordRetypeSerializer
 
 
 class UserCreatePasswordRetypeSerializer(BaseUserCreatePasswordRetypeSerializer):
  class Meta(BaseUserCreatePasswordRetypeSerializer.Meta):
- fields = ["id", "first_name", "last_name", "username",
- "email", "password", "re_password"]
+ fields = [
+ "id",
+ "first_name",
+ "last_name",
+ "username",
+ "email",
+ "password",
+ "re_password",
+ ]