Merge branch 'feature/registration_failed/html' into 'develop'
Feature/registration failed/html See merge request 2020-2021/online/s101/group-02/access_controller!84
This commit is contained in:
@@ -16,10 +16,11 @@ Including another URLconf
|
||||
from django.contrib import admin
|
||||
from django.urls import path, include
|
||||
|
||||
from main.urls import router
|
||||
from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView, registration_error
|
||||
from main.views import registration_failed
|
||||
from main.views import work_page, work_hand_over, work_become_engineer, work_get_tickets, \
|
||||
AdminPageView, statistic_page
|
||||
from main.urls import router
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
@@ -35,6 +36,7 @@ urlpatterns = [
|
||||
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('registration_failed/', registration_failed, name='registration_failed'),
|
||||
path('control/', AdminPageView.as_view(), name='control'),
|
||||
path('statistic/', statistic_page, name='statistic'),
|
||||
]
|
||||
@@ -42,4 +44,5 @@ urlpatterns = [
|
||||
# Django REST
|
||||
urlpatterns += [
|
||||
path('api/', include(router.urls))
|
||||
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user