Merge branch 'develop' into feature/docker

access_controller/settings.py

@@ -10,10 +10,10 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.1/ref/settings/
 """
 import os
-
+from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = Path(__file__).resolve().parent.parent
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
@@ -91,7 +91,7 @@ WSGI_APPLICATION = 'access_controller.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(str(BASE_DIR),'db','zd_db.sqlite3'),
+        'NAME': BASE_DIR / 'db' / 'zd_db.sqlite3'
     }
 }
 
@@ -147,41 +147,6 @@ AUTHENTICATION_BACKENDS = [
 
 # Logging system
 # https://docs.djangoproject.com/en/3.1/topics/logging/
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'verbose': {
-            'format': '{levelname} {asctime} {module} {process:d} {thread:d} {message}',
-            'style': '{',
-        },
-        'simple': {
-            'format': '{levelname} {message}',
-            'style': '{',
-        },
-    },
-    'handlers': {
-        'console': {
-            'level': 'INFO',
-            'class': 'logging.StreamHandler',
-            'formatter': 'simple'
-        },
-        'mail_admins': {
-            'level': 'ERROR',
-            'class': 'django.utils.log.AdminEmailHandler',
-        }
-    },
-    'loggers': {
-        'django': {
-            'handlers': ['console'],
-            'propagate': True,
-        },
-        'main.index': {
-            'handlers': ['console'],
-            'level': 'INFO',
-        }
-    }
-}
 
 
 ZENDESK_ROLES = {

access_controller/urls.py

@@ -14,54 +14,30 @@ Including another URLconf
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.contrib.auth import views as auth_views
 from django.urls import path, include
 
-from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView
-from main.views import work_page, work_hand_over, work_become_engineer, \
+from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView, registration_error
+from main.views import work_page, work_hand_over, work_become_engineer, work_get_tickets, \
     AdminPageView, statistic_page
 from main.urls import router
 
-
 urlpatterns = [
     path('admin/', admin.site.urls, name='admin'),
     path('', main_page, name='index'),
     path('accounts/profile/', profile_page, name='profile'),
     path('accounts/register/', CustomRegistrationView.as_view(), name='registration'),
+    path('accounts/register/error/', registration_error, name='registration_email_error'),
     path('accounts/login/', CustomLoginView.as_view(), name='login'),
     path('accounts/', include('django.contrib.auth.urls')),
-    path('accounts/', include('django_registration.backends.one_step.urls')),
     path('work/<int:id>', work_page, name="work"),
     path('work/hand_over/', work_hand_over, name="work_hand_over"),
     path('work/become_engineer/', work_become_engineer, name="work_become_engineer"),
+    path('work/get_tickets', work_get_tickets, name='work_get_tickets'),
     path('accounts/', include('django_registration.backends.activation.urls')),
-    path('accounts/login/', include('django.contrib.auth.urls')),
     path('control/', AdminPageView.as_view(), name='control'),
-    path('statistic/', statistic_page, name='statistic')
+    path('statistic/', statistic_page, name='statistic'),
     ]
 
-urlpatterns += [
-    path(
-        'password_reset/',
-        auth_views.PasswordResetView.as_view(),
-        name='password_reset'
-    ),
-    path(
-        'password-reset/done/',
-        auth_views.PasswordResetDoneView.as_view(),
-        name='password_reset_done'
-    ),
-    path(
-        'reset/<uidb64>/<token>/',
-        auth_views.PasswordResetConfirmView.as_view(),
-        name='password_reset_confirm'
-    ),
-    path(
-        'reset/done/',
-        auth_views.PasswordResetCompleteView.as_view(),
-        name='password_reset_complete'
-    ),
-]
 
 # Django REST
 urlpatterns += [