diff options
Diffstat (limited to 'Scipy2018')
| -rw-r--r-- | Scipy2018/settings.py | 5 | ||||
| -rw-r--r-- | Scipy2018/urls.py | 23 |
2 files changed, 16 insertions, 12 deletions
diff --git a/Scipy2018/settings.py b/Scipy2018/settings.py index 5fdadf0..0aea718 100644 --- a/Scipy2018/settings.py +++ b/Scipy2018/settings.py @@ -58,7 +58,7 @@ ROOT_URL = ROOT_URL_VAL TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [PROJECT_DIR + '/static/website/templates',], + 'DIRS': [PROJECT_DIR + '/static/website/templates', ], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -81,7 +81,8 @@ WSGI_APPLICATION = 'Scipy2018.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME': DB_NAME_DEFAULT, # Or path to database file if using sqlite3. + # Or path to database file if using sqlite3. + 'NAME': DB_NAME_DEFAULT, 'USER': DB_USER_DEFAULT, 'PASSWORD': DB_PASS_DEFAULT, 'HOST': DB_HOST_DEFAULT, diff --git a/Scipy2018/urls.py b/Scipy2018/urls.py index 871b3d1..053f934 100644 --- a/Scipy2018/urls.py +++ b/Scipy2018/urls.py @@ -20,19 +20,22 @@ from django.contrib.auth import views as auth_views urlpatterns = [ re_path(r'^', include('website.urls', namespace='website')), - re_path(r'^accounts/', include(('django.contrib.auth.urls', 'auth'), namespace='auth')), + re_path(r'^accounts/', + include(('django.contrib.auth.urls', 'auth'), namespace='auth')), path('admin/', admin.site.urls), re_path(r'^', include('social.apps.django_app.urls', namespace='social')), - re_path(r'^forgotpassword/$', auth_views.PasswordResetView.as_view(template_name= 'registration/password_reset_form.html'), name="password_reset"), - re_path(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', auth_views.PasswordResetConfirmView.as_view(template_name = 'registration/password_reset_confirm.html'), name='password_reset_confirm'), - re_path(r'^password_reset/mail_sent/$', auth_views.PasswordResetDoneView.as_view(template_name= 'registration/password_reset_done.html'), - name='password_reset_done'), - re_path(r'^password_reset/complete/$', auth_views.PasswordResetCompleteView.as_view(template_name = 'registration/password_reset_complete.html'), - name='password_reset_complete'), + re_path(r'^forgotpassword/$', auth_views.PasswordResetView.as_view( + template_name='registration/password_reset_form.html'), name="password_reset"), + re_path(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', auth_views.PasswordResetConfirmView.as_view( + template_name='registration/password_reset_confirm.html'), name='password_reset_confirm'), + re_path(r'^password_reset/mail_sent/$', auth_views.PasswordResetDoneView.as_view(template_name='registration/password_reset_done.html'), + name='password_reset_done'), + re_path(r'^password_reset/complete/$', auth_views.PasswordResetCompleteView.as_view(template_name='registration/password_reset_complete.html'), + name='password_reset_complete'), re_path(r'^changepassword/$', auth_views.PasswordChangeView.as_view(template_name='registration/password_change_form.html'), - name='password_change'), - re_path(r'^password_change/done/$', auth_views.PasswordChangeDoneView.as_view(template_name = 'registration/password_change_done.html'), - name='password_change_done'), + name='password_change'), + re_path(r'^password_change/done/$', auth_views.PasswordChangeDoneView.as_view(template_name='registration/password_change_done.html'), + name='password_change_done'), ] |