updated support to django 2.0

update recaptcha to django-recaptcha2
This commit is contained in:
2018-04-06 14:52:57 +01:00
parent eeaf0d37a3
commit 341385dadb
7 changed files with 39 additions and 29 deletions

View File

@@ -38,22 +38,32 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
'silk',
'captcha',
'snowpenguin.django.recaptcha2',
'comic',
'comic_auth',
)
MIDDLEWARE_CLASSES = (
# MIDDLEWARE_CLASSES = (
# 'django.contrib.sessions.middleware.SessionMiddleware',
# 'django.middleware.common.CommonMiddleware',
# 'django.middleware.csrf.CsrfViewMiddleware',
# 'django.contrib.auth.middleware.AuthenticationMiddleware',
# 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
# 'django.contrib.messages.middleware.MessageMiddleware',
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
# 'django.middleware.security.SecurityMiddleware',
# 'silk.middleware.SilkyMiddleware',
# )
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware',
'silk.middleware.SilkyMiddleware',
)
]
ROOT_URLCONF = 'cbreader.urls'
@@ -106,8 +116,11 @@ USE_TZ = True
STATIC_URL = '/static/'
LOGIN_REDIRECT_URL = '/comic/'
LOGIN_REDIRECT_URL = '/comic/'
LOGIN_URL = '/login/'
UNRAR_TOOL = 'C:/Program Files/WinRAR/unrar'
UNRAR_TOOL = 'C:/Program Files/WinRAR/unrar'
RECAPTCHA_PRIVATE_KEY = '6Ld50TUUAAAAAD6tQ4pR7HoBZ80EW_Mp2TyoS8Dz'
RECAPTCHA_PUBLIC_KEY = '6Ld50TUUAAAAANJmBFM0lUVqwuFyyCdoejfpdema'

View File

@@ -14,7 +14,6 @@ Including another URLconf
2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls))
"""
from django.conf.urls import include, url
from django.contrib import admin
import comic.views
import comic_auth.views
@@ -25,6 +24,6 @@ urlpatterns = [
url(r'^logout/', comic_auth.views.comic_logout),
url(r'^setup/', comic.views.initial_setup),
url(r'^comic/', include('comic.urls')),
url(r'^admin/', include(admin.site.urls)),
# url(r'^admin/', include(admin.site.urls)),
url(r'^silk/', include('silk.urls', namespace='silk'))
]