Merge branch 'feature/base/html' into feature/authorization
# Conflicts: # access_controller/urls.py
This commit is contained in:
@@ -17,9 +17,11 @@ from django.contrib import admin
|
||||
from django.contrib.auth.views import LoginView
|
||||
from django.urls import path, include
|
||||
|
||||
from main.views import main_page
|
||||
|
||||
urlpatterns = [
|
||||
path('admin/', admin.site.urls),
|
||||
path('accounts/login/', LoginView.as_view(extra_context={})), # TODO add extra context
|
||||
path('accounts/', include('django.contrib.auth.urls'))
|
||||
|
||||
path('accounts/', include('django.contrib.auth.urls')),
|
||||
path('', main_page),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user