sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

passing checks with django 2.1.7

Browse Source
This commit is contained in:
Sander Roosendaal
2019-03-22 10:59:49 +01:00
parent bec008d429
commit da0842fc8b
16 changed files with 570 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowsandall_app/settings.py
View File

@@ -58,7 +58,7 @@ INSTALLED_APPS = [
'suit_rq',
'leaflet',
'django_rq',
'django_rq_dashboard',
# 'django_rq_dashboard',
# 'translation_manager',
'django_mailbox',
'rest_framework',
@@ -80,7 +80,7 @@ AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend',
)
MIDDLEWARE_CLASSES = [
MIDDLEWARE = [
# 'django.middleware.cache.UpdateCacheMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.common.BrokenLinkEmailsMiddleware',
@@ -94,10 +94,9 @@ MIDDLEWARE_CLASSES = [
'corsheaders.middleware.CorsMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'oauth2_provider.middleware.OAuth2TokenMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'async_messages.middleware.AsyncMiddleware',
# 'async_messages.middleware.AsyncMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'tz_detect.middleware.TimezoneMiddleware',
'rowers.middleware.GDPRMiddleWare',
@@ -389,8 +388,7 @@ REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.BasicAuthentication',
'rest_framework.authentication.SessionAuthentication',
'oauth2_provider.ext.rest_framework.OAuth2Authentication',
# 'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
),
'PAGE_SIZE': 20,
'DEFAULT_PAGINATION_CLASS':'rest_framework.pagination.LimitOffsetPagination',

89
rowsandall_app/urls.py
View File

@@ -5,15 +5,16 @@ The `urlpatterns` list routes URLs to views. For more information please see:
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
2. Add a URL to urlpatterns: re_path(r'^$', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
2. Add a URL to urlpatterns: re_path(r'^$', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
2. Add a URL to urlpatterns: re_path(r'^blog/', include('blog.urls'))
"""
from django.conf.urls import url,include
from django.urls import path, re_path
from django.conf import settings
from django.conf.urls.static import static
from django.contrib import admin
@@ -35,61 +36,53 @@ handler500 = 'rowers.views.error500_view'
urlpatterns = [
url('^', include('django.contrib.auth.urls')),
url(r'^django-rq/',include('django_rq.urls')),
url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),
# url(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'),
url(r'^password_change/$',auth_views.password_change),
# url(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'),
url(r'^password_reset/$',
auth_views.password_reset,
# auth_views.PasswordResetView,
re_path('^', include('django.contrib.auth.urls')),
re_path(r'^django-rq/',include('django_rq.urls')),
re_path(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'),
re_path(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'),
re_path(r'^password_reset/$',
auth_views.PasswordResetView,
{'template_name': 'rowers/templates/registration/password_reset.html'},
name='password_reset'),
url(r'^password_reset/done/$',
auth_views.password_reset_done,
# auth_views.PasswordResetDoneView,
re_path(r'^password_reset/done/$',
auth_views.PasswordResetDoneView,
name='password_reset_done'),
url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
auth_views.password_reset_confirm,
# auth_views.PasswordResetConfirmView,
re_path(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
auth_views.PasswordResetConfirmView,
name='password_reset_confirm'),
url(r'^reset/done/$',
auth_views.password_reset_complete,
# auth_views.PasswordResetCompleteView,
re_path(r'^reset/done/$',
auth_views.PasswordResetCompleteView,
name='password_reset_complete'),
]
urlpatterns += [
url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt',
re_path(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt',
content_type='text/plain')),
url(r'^admin/', admin.site.urls),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')),
url(r'^$',rootview),
url(r'^getblogs/$',rowersviews.get_blog_posts),
url(r'^login/',
auth_views.login,
# auth_views.LoginView,
re_path(r'^admin/', admin.site.urls),
re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')),
re_path(r'^$',rootview),
re_path(r'^getblogs/$',rowersviews.get_blog_posts),
re_path(r'^login/',
auth_views.LoginView,
name='login'),
url(r'^logout/$',
auth_views.logout,
# auth_views.LogoutView,
re_path(r'^logout/$',
auth_views.LogoutView,
{'next_page': '/'},
name='logout',),
url(r'^rowers/',include('rowers.urls')),
# url(r'^cvkbrno/',include('cvkbrno.urls')),
url(r'^admin/rq/',include('django_rq_dashboard.urls')),
url(r'^call\_back',rowersviews.rower_process_callback),
url(r'^stravacall\_back',rowersviews.rower_process_stravacallback),
url(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback),
url(r'^underarmour\_callback',rowersviews.rower_process_underarmourcallback),
url(r'^polarflowcallback',rowersviews.rower_process_polarcallback),
url(r'^runkeeper\_callback',rowersviews.rower_process_runkeepercallback),
url(r'^tp\_callback',rowersviews.rower_process_tpcallback),
url(r'^twitter\_callback',rowersviews.rower_process_twittercallback),
url(r'^i18n/', include('django.conf.urls.i18n')),
url(r'^tz_detect/', include('tz_detect.urls')),
url(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'),
re_path(r'^rowers/',include('rowers.urls')),
# re_path(r'^cvkbrno/',include('cvkbrno.urls')),
# re_path(r'^admin/rq/',include('django_rq_dashboard.urls')),
re_path(r'^call\_back',rowersviews.rower_process_callback),
re_path(r'^stravacall\_back',rowersviews.rower_process_stravacallback),
re_path(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback),
re_path(r'^underarmour\_callback',rowersviews.rower_process_underarmourcallback),
re_path(r'^polarflowcallback',rowersviews.rower_process_polarcallback),
re_path(r'^runkeeper\_callback',rowersviews.rower_process_runkeepercallback),
re_path(r'^tp\_callback',rowersviews.rower_process_tpcallback),
re_path(r'^twitter\_callback',rowersviews.rower_process_twittercallback),
re_path(r'^i18n/', include('django.conf.urls.i18n')),
re_path(r'^tz_detect/', include('tz_detect.urls')),
# re_path(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'),
]
@@ -97,8 +90,8 @@ if settings.DEBUG:
import debug_toolbar
import django
urlpatterns += [
# url(r'^__debug__/','debug_toolbar.urls'),
url(r'^static/(?P<path>.*)$',
# re_path(r'^__debug__/','debug_toolbar.urls'),
re_path(r'^static/(?P<path>.*)$',
django.views.static.serve,
kwargs={'document_root': settings.STATIC_ROOT,}
)

3
rowsandall_app/views.py
View File

@@ -1,5 +1,4 @@
from django.shortcuts import render, redirect, render_to_response
from django.template.loader import render_to_string
from django.shortcuts import render, redirect
from django.template import RequestContext
from django.conf import settings
from rowers.forms import LoginForm