diff options
author | Matthew Lemon <lemon@matthewlemon.com> | 2020-05-24 16:01:17 +0100 |
---|---|---|
committer | Matthew Lemon <lemon@matthewlemon.com> | 2020-05-24 16:01:17 +0100 |
commit | 84e5076fa235be060f99f38dec59ddd0f9ca4dbc (patch) | |
tree | d72aa64c4cd8920caa00c5d6146b6f2e67aec0a1 | |
parent | 84716c8af63f03f4e380a3febf3e38ac66d67b39 (diff) |
removed email verification for now
-rw-r--r-- | config/settings/base.py | 18 | ||||
-rw-r--r-- | ctrack/templates/account/login.html | 33 |
2 files changed, 7 insertions, 44 deletions
diff --git a/config/settings/base.py b/config/settings/base.py index 57028a8..c1702d7 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -4,9 +4,7 @@ Base settings to build other settings files upon. import environ -ROOT_DIR = ( - environ.Path(__file__) - 3 -) # (ctrack/config/settings/base.py - 3 = ctrack/) +ROOT_DIR = environ.Path(__file__) - 3 # (ctrack/config/settings/base.py - 3 = ctrack/) APPS_DIR = ROOT_DIR.path("ctrack") env = environ.Env() @@ -42,9 +40,7 @@ LOCALE_PATHS = [ROOT_DIR.path("locale")] # ------------------------------------------------------------------------------ # https://docs.djangoproject.com/en/dev/ref/settings/#databases -DATABASES = { - "default": env.db("DATABASE_URL", default="postgres:///ctrack") -} +DATABASES = {"default": env.db("DATABASE_URL", default="postgres:///ctrack")} DATABASES["default"]["ATOMIC_REQUESTS"] = True # URLS @@ -58,9 +54,9 @@ WSGI_APPLICATION = "config.wsgi.application" # We're going to use the database here CACHES = { - 'default': { - 'BACKEND': 'django.core.cache.backends.db.DatabaseCache', - 'LOCATION': 'ctrack_cache_table', + "default": { + "BACKEND": "django.core.cache.backends.db.DatabaseCache", + "LOCATION": "ctrack_cache_table", } } @@ -264,13 +260,13 @@ LOGGING = { # django-allauth # ------------------------------------------------------------------------------ -ACCOUNT_ALLOW_REGISTRATION = env.bool("DJANGO_ACCOUNT_ALLOW_REGISTRATION", True) +ACCOUNT_ALLOW_REGISTRATION = env.bool("DJANGO_ACCOUNT_ALLOW_REGISTRATION", False) # https://django-allauth.readthedocs.io/en/latest/configuration.html ACCOUNT_AUTHENTICATION_METHOD = "username" # https://django-allauth.readthedocs.io/en/latest/configuration.html ACCOUNT_EMAIL_REQUIRED = True # https://django-allauth.readthedocs.io/en/latest/configuration.html -ACCOUNT_EMAIL_VERIFICATION = "mandatory" +ACCOUNT_EMAIL_VERIFICATION = "none" # https://django-allauth.readthedocs.io/en/latest/configuration.html ACCOUNT_ADAPTER = "ctrack.users.adapters.AccountAdapter" # https://django-allauth.readthedocs.io/en/latest/configuration.html diff --git a/ctrack/templates/account/login.html b/ctrack/templates/account/login.html index fbaa171..bb261f4 100644 --- a/ctrack/templates/account/login.html +++ b/ctrack/templates/account/login.html @@ -29,9 +29,6 @@ for a {{ site_name }} account and sign in below:{% endblocktrans %}</p> {% include "socialaccount/snippets/login_extra.html" %} -{% else %} -<p>{% blocktrans %}If you have not created an account yet, then please -<a href="{{ signup_url }}">sign up</a> first.{% endblocktrans %}</p> {% endif %} <form class="login" method="POST" action="{% url 'account_login' %}"> @@ -44,35 +41,5 @@ for a {{ site_name }} account and sign in below:{% endblocktrans %}</p> <button class="primaryAction btn btn-primary" type="submit">{% trans "Sign In" %}</button> </form> -<table class="table table-sm table-bordered"> - <thead> - <tr> - <th scope="col">#</th> - <th scope="col">First</th> - <th scope="col">Last</th> - <th scope="col">Handle</th> - </tr> - </thead> - <tbody> - <tr> - <th scope="row">1</th> - <td>Mark</td> - <td>Otto</td> - <td>@mdo</td> - </tr> - <tr> - <th scope="row">2</th> - <td>Jacob</td> - <td>Thornton</td> - <td>@fat</td> - </tr> - <tr> - <th scope="row">3</th> - <td>Larry</td> - <td>the Bird</td> - <td>@twitter</td> - </tr> - </tbody> -</table> {% endblock %} |