resolve merge conflicts

access_controller/settings.py

@@ -122,3 +122,6 @@ STATICFILES_DIRS = [
 
 MEDIA_ROOT = BASE_DIR / 'media'
 MEDIA_URL = '/media/'
+LOGIN_REDIRECT_URL = '/'
+LOGOUT_REDIRECT_URL = '/'
+

access_controller/urls.py

@@ -15,15 +15,24 @@ Including another URLconf
 """
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.urls import path, include
 
+from django.urls import path, include
+from django.contrib.auth.views import LoginView
+from django.urls import path, include
 from access_controller import settings
 from main.views import *
 
 urlpatterns = [
     path('admin/', admin.site.urls, name='admin'),
+    path('', main_page),
     path('register/', CustomRegistrationView.as_view(), name='registration'),
-    path('', include('django_registration.backends.one_step.urls')),
+    #path('', include('django_registration.backends.one_step.urls')),
     path('profile/', profile_page, name='profile'),
-]
+    path('accounts/login/', LoginView.as_view(extra_context={})),  # TODO add extra context
+    path('accounts/', include('django.contrib.auth.urls'))
+    ]
+
+
+
+
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)