From 5bacc3b93b56505db2afb5f5e7a8cdf4755bde78 Mon Sep 17 00:00:00 2001 From: "Michael A. Gonzalez" Date: Sat, 13 Jan 2018 09:25:16 -0500 Subject: [PATCH] update to meet flake8 on resulting project --- {{cookiecutter.project_slug}}/config/settings/base.py | 3 +-- {{cookiecutter.project_slug}}/config/settings/local.py | 3 --- {{cookiecutter.project_slug}}/config/urls.py | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index fd914d574..18289b703 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -274,7 +274,6 @@ AUTHENTICATION_BACKENDS = [ 'django.contrib.auth.backends.ModelBackend', 'allauth.account.auth_backends.AuthenticationBackend', ] - {% if cookiecutter.js_task_runner != 'CreateReactApp' %} # Some really nice defaults ACCOUNT_AUTHENTICATION_METHOD = 'username' @@ -286,10 +285,10 @@ ACCOUNT_ADAPTER = '{{cookiecutter.project_slug}}.users.adapters.AccountAdapter' SOCIALACCOUNT_ADAPTER = '{{cookiecutter.project_slug}}.users.adapters.SocialAccountAdapter' {% endif %} -# Custom user app defaults # Select the correct user model AUTH_USER_MODEL = 'users.User' {% if cookiecutter.js_task_runner != 'CreateReactApp' %} +# Custom user app defaults LOGIN_REDIRECT_URL = 'users:redirect' LOGIN_URL = 'account_login' {% endif %} diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index 03aee7144..fa3a595c5 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -84,7 +84,6 @@ TEST_RUNNER = 'django.test.runner.DiscoverRunner' CELERY_ALWAYS_EAGER = True ########## END CELERY {% endif %} - {% if cookiecutter.js_task_runner == 'CreateReactApp' %} # Integrate React with Django WEBPACK_LOADER = { @@ -94,7 +93,5 @@ WEBPACK_LOADER = { } } {% endif %} - - # Your local stuff: Below this line define 3rd party library settings # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py index 32e20652f..817f65596 100644 --- a/{{cookiecutter.project_slug}}/config/urls.py +++ b/{{cookiecutter.project_slug}}/config/urls.py @@ -22,6 +22,7 @@ urlpatterns = [ url(r'^accounts/', include('allauth.urls')), {% endif %}{% if cookiecutter.js_task_runner == 'CreateReactApp' %} + url(settings.ADMIN_URL, admin.site.urls), url(r'^app/', TemplateView.as_view(template_name="index.html")), # REST framework