From aac3de1bb3e33d0a08d5c464e30b6b89790df045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Sat, 27 Feb 2021 23:18:27 +0100
Subject: [PATCH] Starting allauth template work.

---
 src/project/settings.py                       |  10 +-
 .../templates/account/account_inactive.html   |  11 ++
 src/project/templates/account/base.html       |   1 +
 src/project/templates/account/email.html      | 130 ++++++++++++++++++
 .../templates/account/email/base_message.txt  |   7 +
 .../email/email_confirmation_message.txt      |   7 +
 .../email_confirmation_signup_message.txt     |   1 +
 .../email_confirmation_signup_subject.txt     |   1 +
 .../email/email_confirmation_subject.txt      |   4 +
 .../email/password_reset_key_message.txt      |   9 ++
 .../email/password_reset_key_subject.txt      |   4 +
 .../templates/account/email_confirm.html      |  31 +++++
 src/project/templates/account/login.html      |  90 ++----------
 src/project/templates/account/logout.html     |  21 +++
 .../messages/cannot_delete_primary_email.txt  |   2 +
 .../messages/email_confirmation_sent.txt      |   2 +
 .../account/messages/email_confirmed.txt      |   2 +
 .../account/messages/email_deleted.txt        |   2 +
 .../templates/account/messages/logged_in.txt  |   4 +
 .../templates/account/messages/logged_out.txt |   2 +
 .../account/messages/password_changed.txt     |   2 +
 .../account/messages/password_set.txt         |   2 +
 .../account/messages/primary_email_set.txt    |   2 +
 .../messages/unverified_primary_email.txt     |   2 +
 .../templates/account/password_change.html    |  16 +++
 .../templates/account/password_reset.html     |  24 ++++
 .../account/password_reset_done.html          |  16 +++
 .../account/password_reset_from_key.html      |  23 ++++
 .../account/password_reset_from_key_done.html |   9 ++
 .../templates/account/password_set.html       |  15 ++
 .../templates/account/pre_login_base.html     |  84 +++++++++++
 src/project/templates/account/signup.html     |  75 ++++++++++
 .../templates/account/signup_closed.html      |  11 ++
 .../account/snippets/already_logged_in.html   |   5 +
 .../templates/account/verification_sent.html  |  12 ++
 .../account/verified_email_required.html      |  23 ++++
 src/project/templates/baseold.html            |  49 -------
 37 files changed, 577 insertions(+), 134 deletions(-)
 create mode 100644 src/project/templates/account/account_inactive.html
 create mode 100644 src/project/templates/account/base.html
 create mode 100644 src/project/templates/account/email.html
 create mode 100644 src/project/templates/account/email/base_message.txt
 create mode 100644 src/project/templates/account/email/email_confirmation_message.txt
 create mode 100644 src/project/templates/account/email/email_confirmation_signup_message.txt
 create mode 100644 src/project/templates/account/email/email_confirmation_signup_subject.txt
 create mode 100644 src/project/templates/account/email/email_confirmation_subject.txt
 create mode 100644 src/project/templates/account/email/password_reset_key_message.txt
 create mode 100644 src/project/templates/account/email/password_reset_key_subject.txt
 create mode 100644 src/project/templates/account/email_confirm.html
 create mode 100644 src/project/templates/account/logout.html
 create mode 100644 src/project/templates/account/messages/cannot_delete_primary_email.txt
 create mode 100644 src/project/templates/account/messages/email_confirmation_sent.txt
 create mode 100644 src/project/templates/account/messages/email_confirmed.txt
 create mode 100644 src/project/templates/account/messages/email_deleted.txt
 create mode 100644 src/project/templates/account/messages/logged_in.txt
 create mode 100644 src/project/templates/account/messages/logged_out.txt
 create mode 100644 src/project/templates/account/messages/password_changed.txt
 create mode 100644 src/project/templates/account/messages/password_set.txt
 create mode 100644 src/project/templates/account/messages/primary_email_set.txt
 create mode 100644 src/project/templates/account/messages/unverified_primary_email.txt
 create mode 100644 src/project/templates/account/password_change.html
 create mode 100644 src/project/templates/account/password_reset.html
 create mode 100644 src/project/templates/account/password_reset_done.html
 create mode 100644 src/project/templates/account/password_reset_from_key.html
 create mode 100644 src/project/templates/account/password_reset_from_key_done.html
 create mode 100644 src/project/templates/account/password_set.html
 create mode 100644 src/project/templates/account/pre_login_base.html
 create mode 100644 src/project/templates/account/signup.html
 create mode 100644 src/project/templates/account/signup_closed.html
 create mode 100644 src/project/templates/account/snippets/already_logged_in.html
 create mode 100644 src/project/templates/account/verification_sent.html
 create mode 100644 src/project/templates/account/verified_email_required.html
 delete mode 100644 src/project/templates/baseold.html

diff --git a/src/project/settings.py b/src/project/settings.py
index e20967a..6ba6764 100644
--- a/src/project/settings.py
+++ b/src/project/settings.py
@@ -78,9 +78,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
     {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},  # noqa
     {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},  # noqa
-    {
-        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"  # noqa
-    },
 ]
 
 LANGUAGE_CODE = "da-dk"
@@ -112,3 +109,10 @@ DEBUG_TOOLBAR_CONFIG = {
 
 CURRENCIES = ("DKK",)
 CURRENCY_CHOICES = [("DKK", "DKK")]
+
+
+# Allauth configuration
+ACCOUNT_AUTHENTICATION_METHOD = "email"
+ACCOUNT_EMAIL_REQUIRED = True
+ACCOUNT_SIGNUP_PASSWORD_ENTER_TWICE = False
+ACCOUNT_USERNAME_REQUIRED = False
\ No newline at end of file
diff --git a/src/project/templates/account/account_inactive.html b/src/project/templates/account/account_inactive.html
new file mode 100644
index 0000000..3347f4f
--- /dev/null
+++ b/src/project/templates/account/account_inactive.html
@@ -0,0 +1,11 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Account Inactive" %}{% endblock %}
+
+{% block content %}
+<h1>{% trans "Account Inactive" %}</h1>
+
+<p>{% trans "This account is inactive." %}</p>
+{% endblock %}
diff --git a/src/project/templates/account/base.html b/src/project/templates/account/base.html
new file mode 100644
index 0000000..94d9808
--- /dev/null
+++ b/src/project/templates/account/base.html
@@ -0,0 +1 @@
+{% extends "base.html" %}
diff --git a/src/project/templates/account/email.html b/src/project/templates/account/email.html
new file mode 100644
index 0000000..602096b
--- /dev/null
+++ b/src/project/templates/account/email.html
@@ -0,0 +1,130 @@
+{% extends 'account/base.html' %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "E-mail Addresses" %}{% endblock %}
+
+
+
+{% block content %}
+
+    <div class="row">
+        <div class="col-md-12">
+
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4>{% trans "E-mail Addresses" %}</h4>
+                </div>
+                <div class="panel-body">
+
+                    {% if user.emailaddress_set.all %}
+                        <p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
+                        <form action="{% url 'account_email' %}" class="email_list"
+                              method="post">
+                            {% csrf_token %}
+                            <fieldset class="blockLabels">
+
+                                <table class="table">
+                                    <thead>
+                                    <tr>
+                                        <th></th>
+                                        <th>{% trans "Address" %}</th>
+                                        <th>{% trans "Status" %}</th>
+                                        <th>{% trans "Primary" %}</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+
+                                    {% for emailaddress in user.emailaddress_set.all %}
+                                        <tr class="ctrlHolder">
+                                            <label for="email_radio_{{ forloop.counter }}"
+                                                   class="{% if emailaddress.primary %}primary_email{% endif %}">
+                                                <td>
+                                                    <input
+                                                            id="email_radio_{{ forloop.counter }}"
+                                                            type="radio"
+                                                            name="email"
+                                                            value="{{ emailaddress.email }}"
+                                                            {% if emailaddress.primary or user.emailaddress_set.count == 1 %}
+                                                            checked="checked"
+                                                            {% endif %}
+                                                    />
+                                                </td>
+                                                <td>
+                                                    {{ emailaddress.email }}
+                                                </td>
+                                                <td>
+                                                    {% if emailaddress.verified %}
+                                                        <span class="label label-success">Verified</span>
+                                                    {% else %}
+                                                        <span class="label label-danger">Unverified</span>
+                                                    {% endif %}
+                                                </td>
+                                                <td>
+                                                    {% if emailaddress.primary %}
+                                                        <span class="label label-primary">Primary</span>{% endif %}
+                                                </td>
+                                            </label>
+                                        </tr>
+                                    {% endfor %}
+
+                                    </tbody>
+                                </table>
+
+                                <div class="buttonHolder">
+                                    <button class="btn btn-success" type="submit"
+                                            name="action_primary">Make Primary
+                                    </button>
+                                    <button class="btn btn-primary" type="submit"
+                                            name="action_send">Re-send Verification
+                                    </button>
+                                    <button class="btn btn-danger" type="submit"
+                                            name="action_remove">Remove
+                                    </button>
+                                </div>
+
+                            </fieldset>
+                        </form>
+                    {% else %}
+                        <p>
+                            <strong>{% trans 'Warning:' %}</strong>
+                            {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}
+                        </p>
+                    {% endif %}
+                </div>
+            </div>
+
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4>{% trans "Add E-mail Address" %}</h4>
+                </div>
+                <div class="panel-body">
+                    <form method="post" action="{% url 'account_email' %}"
+                          class="add_email">
+                        {% csrf_token %}
+                        {{ form.as_p }}
+                        <button name="action_add" class="btn btn-success" type="submit">
+                            {% trans "Add E-mail" %}
+                        </button>
+                    </form>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <script type="text/javascript">
+        (function () {
+            let message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
+            let actions = document.getElementsByName('action_remove');
+            if (actions.length) {
+                actions[0].addEventListener("click", function (e) {
+                    if (!confirm(message)) {
+                        e.preventDefault();
+                    }
+                });
+            }
+        })();
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/project/templates/account/email/base_message.txt b/src/project/templates/account/email/base_message.txt
new file mode 100644
index 0000000..46f04f3
--- /dev/null
+++ b/src/project/templates/account/email/base_message.txt
@@ -0,0 +1,7 @@
+{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name %}Hello from {{ site_name }}!{% endblocktrans %}
+
+{% block content %}{% endblock %}
+
+{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Thank you for using {{ site_name }}!
+{{ site_domain }}{% endblocktrans %}
+{% endautoescape %}
diff --git a/src/project/templates/account/email/email_confirmation_message.txt b/src/project/templates/account/email/email_confirmation_message.txt
new file mode 100644
index 0000000..7f922d8
--- /dev/null
+++ b/src/project/templates/account/email/email_confirmation_message.txt
@@ -0,0 +1,7 @@
+{% extends "account/email/base_message.txt" %}
+{% load account %}
+{% load i18n %}
+
+{% block content %}{% autoescape off %}{% user_display user as user_display %}{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}You're receiving this e-mail because user {{ user_display }} has given your e-mail address to register an account on {{ site_domain }}.
+
+To confirm this is correct, go to {{ activate_url }}{% endblocktrans %}{% endautoescape %}{% endblock %}
diff --git a/src/project/templates/account/email/email_confirmation_signup_message.txt b/src/project/templates/account/email/email_confirmation_signup_message.txt
new file mode 100644
index 0000000..9996f7e
--- /dev/null
+++ b/src/project/templates/account/email/email_confirmation_signup_message.txt
@@ -0,0 +1 @@
+{% include "account/email/email_confirmation_message.txt" %}
diff --git a/src/project/templates/account/email/email_confirmation_signup_subject.txt b/src/project/templates/account/email/email_confirmation_signup_subject.txt
new file mode 100644
index 0000000..4c85ebb
--- /dev/null
+++ b/src/project/templates/account/email/email_confirmation_signup_subject.txt
@@ -0,0 +1 @@
+{% include "account/email/email_confirmation_subject.txt" %}
diff --git a/src/project/templates/account/email/email_confirmation_subject.txt b/src/project/templates/account/email/email_confirmation_subject.txt
new file mode 100644
index 0000000..b0a876f
--- /dev/null
+++ b/src/project/templates/account/email/email_confirmation_subject.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Please Confirm Your E-mail Address{% endblocktrans %}
+{% endautoescape %}
diff --git a/src/project/templates/account/email/password_reset_key_message.txt b/src/project/templates/account/email/password_reset_key_message.txt
new file mode 100644
index 0000000..5871c1e
--- /dev/null
+++ b/src/project/templates/account/email/password_reset_key_message.txt
@@ -0,0 +1,9 @@
+{% extends "account/email/base_message.txt" %}
+{% load i18n %}
+
+{% block content %}{% autoescape off %}{% blocktrans %}You're receiving this e-mail because you or someone else has requested a password for your user account.
+It can be safely ignored if you did not request a password reset. Click the link below to reset your password.{% endblocktrans %}
+
+{{ password_reset_url }}{% if username %}
+
+{% blocktrans %}In case you forgot, your username is {{ username }}.{% endblocktrans %}{% endif %}{% endautoescape %}{% endblock %}
diff --git a/src/project/templates/account/email/password_reset_key_subject.txt b/src/project/templates/account/email/password_reset_key_subject.txt
new file mode 100644
index 0000000..6840c40
--- /dev/null
+++ b/src/project/templates/account/email/password_reset_key_subject.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Password Reset E-mail{% endblocktrans %}
+{% endautoescape %}
diff --git a/src/project/templates/account/email_confirm.html b/src/project/templates/account/email_confirm.html
new file mode 100644
index 0000000..ac0891b
--- /dev/null
+++ b/src/project/templates/account/email_confirm.html
@@ -0,0 +1,31 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% load account %}
+
+{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %}
+
+
+{% block content %}
+<h1>{% trans "Confirm E-mail Address" %}</h1>
+
+{% if confirmation %}
+
+{% user_display confirmation.email_address.user as user_display %}
+
+<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
+
+<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
+{% csrf_token %}
+    <button type="submit">{% trans 'Confirm' %}</button>
+</form>
+
+{% else %}
+
+{% url 'account_email' as email_url %}
+
+<p>{% blocktrans %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p>
+
+{% endif %}
+
+{% endblock %}
diff --git a/src/project/templates/account/login.html b/src/project/templates/account/login.html
index c847778..55f4c82 100644
--- a/src/project/templates/account/login.html
+++ b/src/project/templates/account/login.html
@@ -1,84 +1,11 @@
+{% extends "account/pre_login_base.html" %}
 {% load i18n %}
 {% load static %}
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <title>Login – {{ site.name }}</title>
-
-    <link href="{% static "/css/bootstrap.min.css" %}" rel="stylesheet"
-          integrity="sha384-BmbxuPwQa2lc/FVzBcNJ7UAyJxM6wuqIj61tLrc4wSX0szH/Ev+nYRRuWlolflfl"
-          crossorigin="anonymous">
-
-    <style>
-        html,
-        body {
-            height: 100%;
-        }
-
-        body {
-            display: flex;
-            align-items: center;
-            padding-top: 40px;
-            padding-bottom: 40px;
-            background-color: #a8f3f4;
-        }
-
-        .form-signin {
-            width: 100%;
-            max-width: 330px;
-            padding: 15px;
-            margin: auto;
-        }
-
-        .form-signin .checkbox {
-            font-weight: 400;
-        }
-
-        .form-signin .form-control {
-            position: relative;
-            box-sizing: border-box;
-            height: auto;
-            padding: 10px;
-            font-size: 16px;
-        }
-
-        .form-signin .form-control:focus {
-            z-index: 2;
-        }
-
-        .form-signin input[type="email"] {
-            margin-bottom: -1px;
-            border-bottom-right-radius: 0;
-            border-bottom-left-radius: 0;
-        }
-
-        .form-signin input[type="password"] {
-            margin-bottom: 10px;
-            border-top-left-radius: 0;
-            border-top-right-radius: 0;
-        }
-
-        .hr-text:after {
-            content: attr(data-content);
-            padding: 0 4px;
-            position: relative;
-            top: -13px;
-            background-color: #a8f3f4;
-        }
-
-    </style>
-
-</head>
-<body class="text-center">
-
-<main class="form-signin">
 
+{% block non_login_content %}
     <img class="mb-4" src="https://new.data.coop/static/img/logo_da.svg" alt=""
          width="260" height="160">
-    <h1 class="h3 mb-3 fw-normal">{% trans "Members only" %}</h1>
+{#    <h1 class="h3 mb-3 fw-normal">{% trans "" %}</h1>#}
 
     {% if form.non_field_errors %}
         {% for error in form.non_field_errors %}
@@ -120,9 +47,8 @@
     <hr class="hr-text" data-content="OR">
 
     <a class="w-100 btn btn-lg btn-outline-success"
-       type="submit">{% trans "Become a member" %}</a>
-</main>
-
-
-</body>
-</html>
+       type="submit"
+       href="{% url "account_signup" %}">
+        {% trans "Become a member" %}
+    </a>
+{% endblock %}
\ No newline at end of file
diff --git a/src/project/templates/account/logout.html b/src/project/templates/account/logout.html
new file mode 100644
index 0000000..2549a90
--- /dev/null
+++ b/src/project/templates/account/logout.html
@@ -0,0 +1,21 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Sign Out" %}{% endblock %}
+
+{% block content %}
+<h1>{% trans "Sign Out" %}</h1>
+
+<p>{% trans 'Are you sure you want to sign out?' %}</p>
+
+<form method="post" action="{% url 'account_logout' %}">
+  {% csrf_token %}
+  {% if redirect_field_value %}
+  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
+  {% endif %}
+  <button type="submit">{% trans 'Sign Out' %}</button>
+</form>
+
+
+{% endblock %}
diff --git a/src/project/templates/account/messages/cannot_delete_primary_email.txt b/src/project/templates/account/messages/cannot_delete_primary_email.txt
new file mode 100644
index 0000000..de55571
--- /dev/null
+++ b/src/project/templates/account/messages/cannot_delete_primary_email.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}You cannot remove your primary e-mail address ({{email}}).{% endblocktrans %}
diff --git a/src/project/templates/account/messages/email_confirmation_sent.txt b/src/project/templates/account/messages/email_confirmation_sent.txt
new file mode 100644
index 0000000..7a526f8
--- /dev/null
+++ b/src/project/templates/account/messages/email_confirmation_sent.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Confirmation e-mail sent to {{email}}.{% endblocktrans %}
diff --git a/src/project/templates/account/messages/email_confirmed.txt b/src/project/templates/account/messages/email_confirmed.txt
new file mode 100644
index 0000000..3427a4d
--- /dev/null
+++ b/src/project/templates/account/messages/email_confirmed.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}You have confirmed {{email}}.{% endblocktrans %}
diff --git a/src/project/templates/account/messages/email_deleted.txt b/src/project/templates/account/messages/email_deleted.txt
new file mode 100644
index 0000000..5cf7cf9
--- /dev/null
+++ b/src/project/templates/account/messages/email_deleted.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Removed e-mail address {{email}}.{% endblocktrans %}
diff --git a/src/project/templates/account/messages/logged_in.txt b/src/project/templates/account/messages/logged_in.txt
new file mode 100644
index 0000000..f49248a
--- /dev/null
+++ b/src/project/templates/account/messages/logged_in.txt
@@ -0,0 +1,4 @@
+{% load account %}
+{% load i18n %}
+{% user_display user as name %}
+{% blocktrans %}Successfully signed in as {{name}}.{% endblocktrans %}
diff --git a/src/project/templates/account/messages/logged_out.txt b/src/project/templates/account/messages/logged_out.txt
new file mode 100644
index 0000000..2cd4627
--- /dev/null
+++ b/src/project/templates/account/messages/logged_out.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}You have signed out.{% endblocktrans %}
diff --git a/src/project/templates/account/messages/password_changed.txt b/src/project/templates/account/messages/password_changed.txt
new file mode 100644
index 0000000..bd5801c
--- /dev/null
+++ b/src/project/templates/account/messages/password_changed.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Password successfully changed.{% endblocktrans %}
diff --git a/src/project/templates/account/messages/password_set.txt b/src/project/templates/account/messages/password_set.txt
new file mode 100644
index 0000000..9d224ee
--- /dev/null
+++ b/src/project/templates/account/messages/password_set.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Password successfully set.{% endblocktrans %}
diff --git a/src/project/templates/account/messages/primary_email_set.txt b/src/project/templates/account/messages/primary_email_set.txt
new file mode 100644
index 0000000..b6a70dd
--- /dev/null
+++ b/src/project/templates/account/messages/primary_email_set.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Primary e-mail address set.{% endblocktrans %}
diff --git a/src/project/templates/account/messages/unverified_primary_email.txt b/src/project/templates/account/messages/unverified_primary_email.txt
new file mode 100644
index 0000000..9c9d0d8
--- /dev/null
+++ b/src/project/templates/account/messages/unverified_primary_email.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Your primary e-mail address must be verified.{% endblocktrans %}
diff --git a/src/project/templates/account/password_change.html b/src/project/templates/account/password_change.html
new file mode 100644
index 0000000..108cced
--- /dev/null
+++ b/src/project/templates/account/password_change.html
@@ -0,0 +1,16 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Change Password" %}</h1>
+
+    <form method="POST" action="{% url 'account_change_password' %}" class="password_change">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit" name="action">{% trans "Change Password" %}</button>
+        <a href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
+    </form>
+{% endblock %}
diff --git a/src/project/templates/account/password_reset.html b/src/project/templates/account/password_reset.html
new file mode 100644
index 0000000..de23d9e
--- /dev/null
+++ b/src/project/templates/account/password_reset.html
@@ -0,0 +1,24 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% load account %}
+
+{% block head_title %}{% trans "Password Reset" %}{% endblock %}
+
+{% block content %}
+
+    <h1>{% trans "Password Reset" %}</h1>
+    {% if user.is_authenticated %}
+    {% include "account/snippets/already_logged_in.html" %}
+    {% endif %}
+
+    <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
+
+    <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit" value="{% trans 'Reset My Password' %}" />
+    </form>
+
+    <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
+{% endblock %}
diff --git a/src/project/templates/account/password_reset_done.html b/src/project/templates/account/password_reset_done.html
new file mode 100644
index 0000000..e90504f
--- /dev/null
+++ b/src/project/templates/account/password_reset_done.html
@@ -0,0 +1,16 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% load account %}
+
+{% block head_title %}{% trans "Password Reset" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Password Reset" %}</h1>
+    
+    {% if user.is_authenticated %}
+    {% include "account/snippets/already_logged_in.html" %}
+    {% endif %}
+    
+    <p>{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
+{% endblock %}
diff --git a/src/project/templates/account/password_reset_from_key.html b/src/project/templates/account/password_reset_from_key.html
new file mode 100644
index 0000000..16f27e9
--- /dev/null
+++ b/src/project/templates/account/password_reset_from_key.html
@@ -0,0 +1,23 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% block head_title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+    <h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
+
+    {% if token_fail %}
+        {% url 'account_reset_password' as passwd_reset_url %}
+        <p>{% blocktrans %}The password reset link was invalid, possibly because it has already been used.  Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktrans %}</p>
+    {% else %}
+        {% if form %}
+            <form method="POST" action="{{ action_url }}">
+                {% csrf_token %}
+                {{ form.as_p }}
+                <input type="submit" name="action" value="{% trans 'change password' %}"/>
+            </form>
+        {% else %}
+            <p>{% trans 'Your password is now changed.' %}</p>
+        {% endif %}
+    {% endif %}
+{% endblock %}
diff --git a/src/project/templates/account/password_reset_from_key_done.html b/src/project/templates/account/password_reset_from_key_done.html
new file mode 100644
index 0000000..85641c2
--- /dev/null
+++ b/src/project/templates/account/password_reset_from_key_done.html
@@ -0,0 +1,9 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% block head_title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Change Password" %}</h1>
+    <p>{% trans 'Your password is now changed.' %}</p>
+{% endblock %}
diff --git a/src/project/templates/account/password_set.html b/src/project/templates/account/password_set.html
new file mode 100644
index 0000000..f561572
--- /dev/null
+++ b/src/project/templates/account/password_set.html
@@ -0,0 +1,15 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Set Password" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Set Password" %}</h1>
+
+    <form method="POST" action="{% url 'account_set_password' %}" class="password_set">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit" name="action" value="{% trans 'Set Password' %}"/>
+    </form>
+{% endblock %}
diff --git a/src/project/templates/account/pre_login_base.html b/src/project/templates/account/pre_login_base.html
new file mode 100644
index 0000000..7253150
--- /dev/null
+++ b/src/project/templates/account/pre_login_base.html
@@ -0,0 +1,84 @@
+{% load i18n %}
+{% load static %}
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <title>Login – {{ site.name }}</title>
+
+    <link href="{% static "/css/bootstrap.min.css" %}" rel="stylesheet"
+          integrity="sha384-BmbxuPwQa2lc/FVzBcNJ7UAyJxM6wuqIj61tLrc4wSX0szH/Ev+nYRRuWlolflfl"
+          crossorigin="anonymous">
+
+    <style>
+        html,
+        body {
+            height: 100%;
+        }
+
+        body {
+            display: flex;
+            align-items: center;
+            padding-top: 40px;
+            padding-bottom: 40px;
+            background-color: #a8f3f4;
+        }
+
+        .form-signin {
+            width: 100%;
+            max-width: 330px;
+            padding: 15px;
+            margin: auto;
+        }
+
+        .form-signin .checkbox {
+            font-weight: 400;
+        }
+
+        .form-signin .form-control {
+            position: relative;
+            box-sizing: border-box;
+            height: auto;
+            padding: 10px;
+            font-size: 16px;
+        }
+
+        .form-signin .form-control:focus {
+            z-index: 2;
+        }
+
+        .form-signin input[type="email"] {
+            margin-bottom: -1px;
+            border-bottom-right-radius: 0;
+            border-bottom-left-radius: 0;
+        }
+
+        .form-signin input[type="password"] {
+            margin-bottom: 10px;
+            border-top-left-radius: 0;
+            border-top-right-radius: 0;
+        }
+
+        .hr-text:after {
+            content: attr(data-content);
+            padding: 0 4px;
+            position: relative;
+            top: -13px;
+            background-color: #a8f3f4;
+        }
+
+    </style>
+
+</head>
+<body class="text-center">
+
+<main class="form-signin">
+    {% block non_login_content %}
+    {% endblock %}
+</main>
+
+
+</body>
+</html>
diff --git a/src/project/templates/account/signup.html b/src/project/templates/account/signup.html
new file mode 100644
index 0000000..4b22462
--- /dev/null
+++ b/src/project/templates/account/signup.html
@@ -0,0 +1,75 @@
+{% extends "account/pre_login_base.html" %}
+{% load i18n %}
+{% load static %}
+
+{% block non_login_content %}
+    <img class="mb-4" src="https://new.data.coop/static/img/logo_da.svg" alt=""
+         width="260" height="160">
+    <h1 class="h3 mb-3 fw-normal">{% trans "Become a member" %}</h1>
+
+    {% if form.non_field_errors %}
+        {% for error in form.non_field_errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+        {% endfor %}
+    {% endif %}
+
+    {{ form.email.errors }}
+    {{ form.password1.errors }}
+
+    <form method="post" action="">
+        {% csrf_token %}
+
+        <label for="id_email"
+               class="visually-hidden">
+            {% trans "E-mail" %}
+        </label>
+        <input type="email"
+               id="id_email"
+               name="email"
+               class="form-control {% if form.password1.errors %}is-invalid{% elif form.is_bound %}is-valid{% endif %}"
+               placeholder="{% trans "E-mail" %}"
+               required
+               autofocus>
+        {% if form.email.errors %}
+            {% for error in form.email.errors %}
+                <div class="invalid-feedback">
+                    {{ error }}
+                </div>
+            {% endfor %}
+        {% endif %}
+
+        <label for="id_password" class="visually-hidden">
+            {% trans "Password" %}
+        </label>
+        <input type="password"
+               id="id_password"
+               name="password1"
+               class="form-control {% if form.password1.errors %}is-invalid{% elif form.is_bound %}is-valid{% endif %}"
+               placeholder="{% trans "Password" %}"
+               required>
+        {% if form.password1.errors %}
+            {% for error in form.password1.errors %}
+                <div class="invalid-feedback">
+                    {{ error }}
+                </div>
+            {% endfor %}
+        {% endif %}
+
+        {% if redirect_field_value %}
+            <input type="hidden" name="{{ redirect_field_name }}"
+                   value="{{ redirect_field_value }}"/>
+        {% endif %}
+
+        <button class="w-100 btn btn-lg btn-primary"
+                type="submit">{% trans "Sign up" %}</button>
+    </form>
+    <hr>
+    <a class="w-100"
+       type="submit"
+       href="{% url "account_login" %}">
+        {% trans "Back to login" %}
+    </a>
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/project/templates/account/signup_closed.html b/src/project/templates/account/signup_closed.html
new file mode 100644
index 0000000..bc83950
--- /dev/null
+++ b/src/project/templates/account/signup_closed.html
@@ -0,0 +1,11 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %}
+
+{% block content %}
+<h1>{% trans "Sign Up Closed" %}</h1>
+
+<p>{% trans "We are sorry, but the sign up is currently closed." %}</p>
+{% endblock %}
diff --git a/src/project/templates/account/snippets/already_logged_in.html b/src/project/templates/account/snippets/already_logged_in.html
new file mode 100644
index 0000000..00799f0
--- /dev/null
+++ b/src/project/templates/account/snippets/already_logged_in.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% load account %}
+
+{% user_display user as user_display %}
+<p><strong>{% trans "Note" %}:</strong> {% blocktrans %}you are already logged in as {{ user_display }}.{% endblocktrans %}</p>
diff --git a/src/project/templates/account/verification_sent.html b/src/project/templates/account/verification_sent.html
new file mode 100644
index 0000000..5f71331
--- /dev/null
+++ b/src/project/templates/account/verification_sent.html
@@ -0,0 +1,12 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Verify Your E-mail Address" %}</h1>
+
+    <p>{% blocktrans %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
+
+{% endblock %}
diff --git a/src/project/templates/account/verified_email_required.html b/src/project/templates/account/verified_email_required.html
new file mode 100644
index 0000000..8115c48
--- /dev/null
+++ b/src/project/templates/account/verified_email_required.html
@@ -0,0 +1,23 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %}
+
+{% block content %}
+<h1>{% trans "Verify Your E-mail Address" %}</h1>
+
+{% url 'account_email' as email_url %}
+
+<p>{% blocktrans %}This part of the site requires us to verify that
+you are who you claim to be. For this purpose, we require that you
+verify ownership of your e-mail address. {% endblocktrans %}</p>
+
+<p>{% blocktrans %}We have sent an e-mail to you for
+verification. Please click on the link inside this e-mail. Please
+contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
+
+<p>{% blocktrans %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktrans %}</p>
+
+
+{% endblock %}
diff --git a/src/project/templates/baseold.html b/src/project/templates/baseold.html
deleted file mode 100644
index 23ba8d3..0000000
--- a/src/project/templates/baseold.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% load static %}
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>{% block head_title %}{% endblock %} – {{ site.name }}</title>
-        {% block extra_head %}{% endblock %}
-        <link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css" />
-    </head>
-    <body>
-        <header>
-            <h1>
-                <a href="/">{{ site.name }}</a>
-            </h1>
-            <ul>
-                {% if user.is_authenticated %}
-                    <li><a href="{% url 'users:password_change' %}">Change password</a></li>
-                    <li><a href="{% url 'users:logout' %}">Sign out</a></li>
-                {% else %}
-                    <li><a href="{% url 'users:login' %}">Sign in</a></li>
-                    <li><a href="{% url 'users:signup' %}">Sign up</a></li>
-                {% endif %}
-            </ul>
-        </header>
-        {% block body %}
-            {% if messages %}
-                <ul id="messages">
-                    {% for message in messages %}
-                        <li>{{message}}</li>
-                    {% endfor %}
-                </ul>
-            {% endif %}
-
-            {% block content %}
-            {% endblock %}
-        {% endblock %}
-        {% block extra_body %}
-        {% endblock %}
-        <footer>
-            <ul>
-                <li>
-                    <a href="https://data.coop">data.coop</a>
-                </li>
-                <li>
-                    <a href="https://git.data.coop/data.coop/membersystem">source code</a>
-                </li>
-            </ul>
-        </footer>
-    </body>
-</html>