From 6c3064f3ea8c358db1567196baa89462f58c0b05 Mon Sep 17 00:00:00 2001
From: "R. Miles McCain" <x1-key@sendmiles.email>
Date: Fri, 10 Apr 2020 15:20:14 -0400
Subject: [PATCH] Add base auth & a17t support

---
 shynet/a17t/__init__.py                       |  0
 shynet/a17t/apps.py                           |  5 +
 shynet/a17t/migrations/__init__.py            |  0
 shynet/a17t/templates/a17t/head.html          |  2 +
 .../a17t/templates/a17t/includes/field.html   | 43 +++++++++
 shynet/a17t/templates/a17t/includes/form.html | 15 +++
 .../a17t/templates/a17t/includes/formset.html |  4 +
 shynet/a17t/templatetags/__init__.py          |  0
 shynet/a17t/templatetags/a17t_tags.py         | 96 +++++++++++++++++++
 .../templates/account/account_inactive.html   | 11 +++
 shynet/core/templates/account/base.html       |  1 +
 shynet/core/templates/account/email.html      | 80 ++++++++++++++++
 .../email/email_confirmation_message.txt      |  9 ++
 .../email_confirmation_signup_message.txt     |  1 +
 .../email_confirmation_signup_subject.txt     |  1 +
 .../email/email_confirmation_subject.txt      |  4 +
 .../email/password_reset_key_message.txt      | 12 +++
 .../email/password_reset_key_subject.txt      |  4 +
 .../core/templates/account/email_confirm.html | 34 +++++++
 shynet/core/templates/account/login.html      | 23 +++++
 shynet/core/templates/account/logout.html     | 19 ++++
 .../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    | 15 +++
 .../templates/account/password_reset.html     | 23 +++++
 .../account/password_reset_done.html          | 16 ++++
 .../account/password_reset_from_key.html      | 23 +++++
 .../account/password_reset_from_key_done.html |  9 ++
 .../core/templates/account/password_set.html  | 15 +++
 shynet/core/templates/account/signup.html     | 21 ++++
 .../core/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 +++++
 shynet/core/templates/base.html               |  7 +-
 shynet/shynet/settings.py                     | 10 ++
 44 files changed, 572 insertions(+), 4 deletions(-)
 create mode 100644 shynet/a17t/__init__.py
 create mode 100644 shynet/a17t/apps.py
 create mode 100644 shynet/a17t/migrations/__init__.py
 create mode 100644 shynet/a17t/templates/a17t/head.html
 create mode 100644 shynet/a17t/templates/a17t/includes/field.html
 create mode 100644 shynet/a17t/templates/a17t/includes/form.html
 create mode 100644 shynet/a17t/templates/a17t/includes/formset.html
 create mode 100644 shynet/a17t/templatetags/__init__.py
 create mode 100644 shynet/a17t/templatetags/a17t_tags.py
 create mode 100644 shynet/core/templates/account/account_inactive.html
 create mode 100644 shynet/core/templates/account/base.html
 create mode 100644 shynet/core/templates/account/email.html
 create mode 100644 shynet/core/templates/account/email/email_confirmation_message.txt
 create mode 100644 shynet/core/templates/account/email/email_confirmation_signup_message.txt
 create mode 100644 shynet/core/templates/account/email/email_confirmation_signup_subject.txt
 create mode 100644 shynet/core/templates/account/email/email_confirmation_subject.txt
 create mode 100644 shynet/core/templates/account/email/password_reset_key_message.txt
 create mode 100644 shynet/core/templates/account/email/password_reset_key_subject.txt
 create mode 100644 shynet/core/templates/account/email_confirm.html
 create mode 100644 shynet/core/templates/account/login.html
 create mode 100644 shynet/core/templates/account/logout.html
 create mode 100644 shynet/core/templates/account/messages/cannot_delete_primary_email.txt
 create mode 100644 shynet/core/templates/account/messages/email_confirmation_sent.txt
 create mode 100644 shynet/core/templates/account/messages/email_confirmed.txt
 create mode 100644 shynet/core/templates/account/messages/email_deleted.txt
 create mode 100644 shynet/core/templates/account/messages/logged_in.txt
 create mode 100644 shynet/core/templates/account/messages/logged_out.txt
 create mode 100644 shynet/core/templates/account/messages/password_changed.txt
 create mode 100644 shynet/core/templates/account/messages/password_set.txt
 create mode 100644 shynet/core/templates/account/messages/primary_email_set.txt
 create mode 100644 shynet/core/templates/account/messages/unverified_primary_email.txt
 create mode 100644 shynet/core/templates/account/password_change.html
 create mode 100644 shynet/core/templates/account/password_reset.html
 create mode 100644 shynet/core/templates/account/password_reset_done.html
 create mode 100644 shynet/core/templates/account/password_reset_from_key.html
 create mode 100644 shynet/core/templates/account/password_reset_from_key_done.html
 create mode 100644 shynet/core/templates/account/password_set.html
 create mode 100644 shynet/core/templates/account/signup.html
 create mode 100644 shynet/core/templates/account/signup_closed.html
 create mode 100644 shynet/core/templates/account/snippets/already_logged_in.html
 create mode 100644 shynet/core/templates/account/verification_sent.html
 create mode 100644 shynet/core/templates/account/verified_email_required.html

diff --git a/shynet/a17t/__init__.py b/shynet/a17t/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/shynet/a17t/apps.py b/shynet/a17t/apps.py
new file mode 100644
index 0000000..5a88f82
--- /dev/null
+++ b/shynet/a17t/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class A17TConfig(AppConfig):
+    name = 'a17t'
diff --git a/shynet/a17t/migrations/__init__.py b/shynet/a17t/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/shynet/a17t/templates/a17t/head.html b/shynet/a17t/templates/a17t/head.html
new file mode 100644
index 0000000..690893f
--- /dev/null
+++ b/shynet/a17t/templates/a17t/head.html
@@ -0,0 +1,2 @@
+<link href="https://cdn.jsdelivr.net/npm/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/a17t@latest/dist/a17t.css">
\ No newline at end of file
diff --git a/shynet/a17t/templates/a17t/includes/field.html b/shynet/a17t/templates/a17t/includes/field.html
new file mode 100644
index 0000000..1f57247
--- /dev/null
+++ b/shynet/a17t/templates/a17t/includes/field.html
@@ -0,0 +1,43 @@
+{% load a17t_tags %}
+
+<field role="field" class="block mb-2">
+
+    {% if field|is_checkbox %}
+    <label class="switch {{ classes.label }}">
+        {{ field }}
+        <span>{{ field.label }}</span>
+    </label>
+    {% elif field|is_radio %}
+    {% if field.auto_id %}
+    <label class="label my-1" for="{{field.auto_id}}">{{ field.label }}</label>
+    {% endif %}
+    {% for choice in field %}
+    <label class="switch">
+        {{ choice.tag }}
+        <span>{{ choice.choice_label }}</span>
+    </label>
+    {% endfor %}
+    {% elif field|is_input %}
+    <label class="label" for="{{field.auto_id}}">{{ field.label }}</label>
+    {{field|add_class:"input"}}
+    {% elif field|is_textarea %}
+    <label class="label" for="{{field.auto_id}}">{{ field.label }}</label>
+    {{ field|add_class:'textarea' }}
+    {% elif field|is_select %}
+    <label class="label" for="{{field.auto_id}}">{{ field.label }}</label>
+    <div class="select {% if field.errors|length > 0 %}~critical{% endif %}">
+        {{field}}
+    </div>
+    {% else %}
+    <label class="label" for="{{field.auto_id}}">{{ field.label }}</label>
+    {{field|add_class:"field"}}
+    {% endif %}
+
+    {% for error in field.errors %}
+    <p class="support ~critical">{{ error }}</p>
+    {% endfor %}
+    {% if field.help_text %}
+    <p class="support">{{field.help_text|safe}}</p>
+    {% endif %}
+
+</field>
\ No newline at end of file
diff --git a/shynet/a17t/templates/a17t/includes/form.html b/shynet/a17t/templates/a17t/includes/form.html
new file mode 100644
index 0000000..c22a808
--- /dev/null
+++ b/shynet/a17t/templates/a17t/includes/form.html
@@ -0,0 +1,15 @@
+{% if form.non_field_errors %}
+<aside class="aside ~critical content">
+    {% for non_field_error in form.non_field_errors %}
+    <p>{{ non_field_error }}</p>
+    {% endfor %}
+</aside>
+{% endif %}
+
+{% for field in form.hidden_fields %}
+  {{ field }}
+{% endfor %}
+
+{% for field in form.visible_fields %}
+  {% include 'a17t/includes/field.html' %}
+{% endfor %}
\ No newline at end of file
diff --git a/shynet/a17t/templates/a17t/includes/formset.html b/shynet/a17t/templates/a17t/includes/formset.html
new file mode 100644
index 0000000..1627c59
--- /dev/null
+++ b/shynet/a17t/templates/a17t/includes/formset.html
@@ -0,0 +1,4 @@
+{{ formset.management_form }}
+{% for form in formset %}
+  {% include "a17t/includes/form.html" with form=form %}
+{% endfor %}
diff --git a/shynet/a17t/templatetags/__init__.py b/shynet/a17t/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/shynet/a17t/templatetags/a17t_tags.py b/shynet/a17t/templatetags/a17t_tags.py
new file mode 100644
index 0000000..ed6a3b3
--- /dev/null
+++ b/shynet/a17t/templatetags/a17t_tags.py
@@ -0,0 +1,96 @@
+from django import forms
+from django import template
+from django.forms import BoundField
+from django.template.loader import get_template
+from django.utils.safestring import mark_safe
+
+register = template.Library()
+
+
+@register.filter
+def a17t(element):
+    markup_classes = {"label": "", "value": "", "single_value": ""}
+    return render(element, markup_classes)
+
+
+@register.filter
+def a17t_inline(element):
+    markup_classes = {"label": "", "value": "", "single_value": ""}
+    return render(element, markup_classes)
+
+
+def render(element, markup_classes):
+    if isinstance(element, BoundField):
+        template = get_template("a17t/includes/field.html")
+        context = {"field": element, "classes": markup_classes, "form": element.form}
+    else:
+        has_management = getattr(element, "management_form", None)
+        if has_management:
+            template = get_template("a17t/includes/formset.html")
+            context = {"formset": element, "classes": markup_classes}
+        else:
+            template = get_template("a17t/includes/form.html")
+            context = {"form": element, "classes": markup_classes}
+
+    return template.render(context)
+
+
+@register.filter
+def widget_type(field):
+    return field.field.widget
+
+
+@register.filter
+def is_select(field):
+    return isinstance(field.field.widget, forms.Select)
+
+
+@register.filter
+def is_multiple_select(field):
+    return isinstance(field.field.widget, forms.SelectMultiple)
+
+
+@register.filter
+def is_textarea(field):
+    return isinstance(field.field.widget, forms.Textarea)
+
+
+@register.filter
+def is_input(field):
+    return isinstance(
+        field.field.widget,
+        (
+            forms.TextInput,
+            forms.NumberInput,
+            forms.EmailInput,
+            forms.PasswordInput,
+            forms.URLInput,
+        ),
+    )
+
+
+@register.filter
+def is_checkbox(field):
+    return isinstance(field.field.widget, forms.CheckboxInput)
+
+
+@register.filter
+def is_multiple_checkbox(field):
+    return isinstance(field.field.widget, forms.CheckboxSelectMultiple)
+
+
+@register.filter
+def is_radio(field):
+    return isinstance(field.field.widget, forms.RadioSelect)
+
+
+@register.filter
+def is_file(field):
+    return isinstance(field.field.widget, forms.FileInput)
+
+
+@register.filter
+def add_class(field, css_class):
+    if len(field.errors) > 0:
+        css_class += " ~critical"
+    return field.as_widget(attrs={"class": css_class})
diff --git a/shynet/core/templates/account/account_inactive.html b/shynet/core/templates/account/account_inactive.html
new file mode 100644
index 0000000..3347f4f
--- /dev/null
+++ b/shynet/core/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/shynet/core/templates/account/base.html b/shynet/core/templates/account/base.html
new file mode 100644
index 0000000..94d9808
--- /dev/null
+++ b/shynet/core/templates/account/base.html
@@ -0,0 +1 @@
+{% extends "base.html" %}
diff --git a/shynet/core/templates/account/email.html b/shynet/core/templates/account/email.html
new file mode 100644
index 0000000..fa8ce30
--- /dev/null
+++ b/shynet/core/templates/account/email.html
@@ -0,0 +1,80 @@
+{% extends "account/base.html" %}
+
+{% load i18n a17t_tags %}
+
+{% block head_title %}{% trans "Email Addresses" %}{% endblock %}
+
+{% block content %}
+<h1 class="heading">{% trans "Email Addresses" %}</h1>
+
+<hr class="sep">
+
+<div class="card ~neutral !low">
+
+  {% if user.emailaddress_set.all %}
+  <p>{% trans 'The following email addresses are associated with your account:' %}</p>
+  <form action="{% url 'account_email' %}" class="email_list" method="post">
+    {% csrf_token %}
+    <fieldset class="blockLabels">
+      {% for emailaddress in user.emailaddress_set.all %}
+      <div class="ctrlHolder my-2">
+        <label for="email_radio_{{forloop.counter}}" class="switch">
+
+          <input id="email_radio_{{forloop.counter}}" type="radio" name="email"
+            {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked" {%endif %}
+            value="{{emailaddress.email}}" />
+
+          {{ emailaddress.email }}
+          {% if emailaddress.verified %}
+          <span class="support ~positive">({% trans "Verified" %})</span>
+          {% else %}
+          <span class="support ~warning">({% trans "Unverified" %})</span>
+          {% endif %}
+          {% if emailaddress.primary %}<span class="support ~urge">({% trans "Primary" %})</span>{% endif %}
+        </label>
+      </div>
+      {% endfor %}
+
+      <div class="block">
+        <button class="button ~urge mb-1" type="submit" name="action_primary">{% trans 'Make Primary' %}</button>
+        <button class="button ~info mb-1" type="submit" name="action_send">{% trans 'Re-send Verification' %}</button>
+        <button class="button ~critical mb-1" type="submit" name="action_remove">{% trans 'Remove' %}</button>
+      </div>
+    </fieldset>
+  </form>
+
+  {% else %}
+  <aside class="aside ~warning">
+    <p>
+      {% trans "You currently do not have an email address associated with your account. Without one, you won't be able to reset your password, receive notifications, etc." %}
+    </p>
+  </aside>
+  {% endif %}
+</div>
+
+<hr class="sep">
+
+<form method="post" action="{% url 'account_email' %}" class="add_email max-w-lg">
+  {% csrf_token %}
+  {{ form|a17t }}
+  <button name="button ~neutral !high" type="submit">{% trans "Add Email" %}</button>
+</form>
+
+{% endblock %}
+
+
+{% block extra_body %}
+<script type="text/javascript">
+  (function () {
+    var message = "{% trans 'Do you really want to remove the selected email address?' %}";
+    var 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/shynet/core/templates/account/email/email_confirmation_message.txt b/shynet/core/templates/account/email/email_confirmation_message.txt
new file mode 100644
index 0000000..0588600
--- /dev/null
+++ b/shynet/core/templates/account/email/email_confirmation_message.txt
@@ -0,0 +1,9 @@
+{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Hello from {{ site_name }}!
+
+You're receiving this email because user {{ user_display }} has given yours as an email address to connect their account.
+
+To confirm this is correct, go to {{ activate_url }}
+{% endblocktrans %}
+{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Thank you from {{ site_name }}!
+{{ site_domain }}{% endblocktrans %}
+{% endautoescape %}
diff --git a/shynet/core/templates/account/email/email_confirmation_signup_message.txt b/shynet/core/templates/account/email/email_confirmation_signup_message.txt
new file mode 100644
index 0000000..9996f7e
--- /dev/null
+++ b/shynet/core/templates/account/email/email_confirmation_signup_message.txt
@@ -0,0 +1 @@
+{% include "account/email/email_confirmation_message.txt" %}
diff --git a/shynet/core/templates/account/email/email_confirmation_signup_subject.txt b/shynet/core/templates/account/email/email_confirmation_signup_subject.txt
new file mode 100644
index 0000000..4c85ebb
--- /dev/null
+++ b/shynet/core/templates/account/email/email_confirmation_signup_subject.txt
@@ -0,0 +1 @@
+{% include "account/email/email_confirmation_subject.txt" %}
diff --git a/shynet/core/templates/account/email/email_confirmation_subject.txt b/shynet/core/templates/account/email/email_confirmation_subject.txt
new file mode 100644
index 0000000..2e2c052
--- /dev/null
+++ b/shynet/core/templates/account/email/email_confirmation_subject.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Please Confirm Your Email Address{% endblocktrans %}
+{% endautoescape %}
diff --git a/shynet/core/templates/account/email/password_reset_key_message.txt b/shynet/core/templates/account/email/password_reset_key_message.txt
new file mode 100644
index 0000000..2344236
--- /dev/null
+++ b/shynet/core/templates/account/email/password_reset_key_message.txt
@@ -0,0 +1,12 @@
+{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Hello from {{ site_name }}!
+
+You're receiving this email 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 %}{% 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/shynet/core/templates/account/email/password_reset_key_subject.txt b/shynet/core/templates/account/email/password_reset_key_subject.txt
new file mode 100644
index 0000000..f0fd6b5
--- /dev/null
+++ b/shynet/core/templates/account/email/password_reset_key_subject.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Password Reset Email{% endblocktrans %}
+{% endautoescape %}
diff --git a/shynet/core/templates/account/email_confirm.html b/shynet/core/templates/account/email_confirm.html
new file mode 100644
index 0000000..5b4087b
--- /dev/null
+++ b/shynet/core/templates/account/email_confirm.html
@@ -0,0 +1,34 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% load account %}
+
+{% block head_title %}{% trans "Confirm Email Address" %}{% endblock %}
+
+
+{% block content %}
+<h1>{% trans "Confirm Email 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 a valid email where we can reach you.{% endblocktrans %}
+</p>
+
+<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
+    {% csrf_token %}
+    <button type="submit" class="button ~positive !high">{% trans 'Confirm' %}</button>
+</form>
+
+{% else %}
+
+{% url 'account_email' as email_url %}
+
+<p>{% blocktrans %}This email confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new
+        email confirmation request</a>.{% endblocktrans %}</p>
+
+{% endif %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/shynet/core/templates/account/login.html b/shynet/core/templates/account/login.html
new file mode 100644
index 0000000..e6b29da
--- /dev/null
+++ b/shynet/core/templates/account/login.html
@@ -0,0 +1,23 @@
+{% extends "account/base.html" %}
+
+{% load i18n a17t_tags %}
+{% load account socialaccount %}
+
+{% block head_title %}{% trans "Sign In" %}{% endblock %}
+
+{% block content %}
+<div class="card ~neutral !low max-w-lg">
+  <h1 class="heading mb-3">{% trans "Sign In" %}</h1>
+  <form class="login" method="POST" action="{% url 'account_login' %} max-w-lg">
+    {% csrf_token %}
+    {{ form|a17t }}
+    {% if redirect_field_value %}
+    <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+    {% endif %}
+    <br>
+    <button class="button ~urge !high mr-2" type="submit">{% trans "Sign In" %}</button>
+    <a href="{% url 'account_reset_password' %}" class="button ~neutral mr-2">{% trans "Reset Password" %}</a>
+    <a href="{{ signup_url }}" class="button ~neutral">Sign Up</a>
+  </form>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/shynet/core/templates/account/logout.html b/shynet/core/templates/account/logout.html
new file mode 100644
index 0000000..b9d84cd
--- /dev/null
+++ b/shynet/core/templates/account/logout.html
@@ -0,0 +1,19 @@
+{% extends "account/base.html" %}
+
+{% load i18n a17t_tags %}
+
+{% 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' %}" class="max-w-lg">
+  {% csrf_token %}
+  {% if redirect_field_value %}
+  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
+  {% endif %}
+  <button type="submit" class="button ~urge !high">{% trans 'Sign Out' %}</button>
+</form>
+{% endblock %}
diff --git a/shynet/core/templates/account/messages/cannot_delete_primary_email.txt b/shynet/core/templates/account/messages/cannot_delete_primary_email.txt
new file mode 100644
index 0000000..9c17574
--- /dev/null
+++ b/shynet/core/templates/account/messages/cannot_delete_primary_email.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}You cannot remove your primary email address ({{email}}).{% endblocktrans %}
diff --git a/shynet/core/templates/account/messages/email_confirmation_sent.txt b/shynet/core/templates/account/messages/email_confirmation_sent.txt
new file mode 100644
index 0000000..fb30b31
--- /dev/null
+++ b/shynet/core/templates/account/messages/email_confirmation_sent.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Confirmation email sent to {{email}}.{% endblocktrans %}
diff --git a/shynet/core/templates/account/messages/email_confirmed.txt b/shynet/core/templates/account/messages/email_confirmed.txt
new file mode 100644
index 0000000..3427a4d
--- /dev/null
+++ b/shynet/core/templates/account/messages/email_confirmed.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}You have confirmed {{email}}.{% endblocktrans %}
diff --git a/shynet/core/templates/account/messages/email_deleted.txt b/shynet/core/templates/account/messages/email_deleted.txt
new file mode 100644
index 0000000..27bb630
--- /dev/null
+++ b/shynet/core/templates/account/messages/email_deleted.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Removed email address {{email}}.{% endblocktrans %}
diff --git a/shynet/core/templates/account/messages/logged_in.txt b/shynet/core/templates/account/messages/logged_in.txt
new file mode 100644
index 0000000..f49248a
--- /dev/null
+++ b/shynet/core/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/shynet/core/templates/account/messages/logged_out.txt b/shynet/core/templates/account/messages/logged_out.txt
new file mode 100644
index 0000000..2cd4627
--- /dev/null
+++ b/shynet/core/templates/account/messages/logged_out.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}You have signed out.{% endblocktrans %}
diff --git a/shynet/core/templates/account/messages/password_changed.txt b/shynet/core/templates/account/messages/password_changed.txt
new file mode 100644
index 0000000..bd5801c
--- /dev/null
+++ b/shynet/core/templates/account/messages/password_changed.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Password successfully changed.{% endblocktrans %}
diff --git a/shynet/core/templates/account/messages/password_set.txt b/shynet/core/templates/account/messages/password_set.txt
new file mode 100644
index 0000000..9d224ee
--- /dev/null
+++ b/shynet/core/templates/account/messages/password_set.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Password successfully set.{% endblocktrans %}
diff --git a/shynet/core/templates/account/messages/primary_email_set.txt b/shynet/core/templates/account/messages/primary_email_set.txt
new file mode 100644
index 0000000..3ef8561
--- /dev/null
+++ b/shynet/core/templates/account/messages/primary_email_set.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Primary email address set.{% endblocktrans %}
diff --git a/shynet/core/templates/account/messages/unverified_primary_email.txt b/shynet/core/templates/account/messages/unverified_primary_email.txt
new file mode 100644
index 0000000..7d0ef9c
--- /dev/null
+++ b/shynet/core/templates/account/messages/unverified_primary_email.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Your primary email address must be verified.{% endblocktrans %}
diff --git a/shynet/core/templates/account/password_change.html b/shynet/core/templates/account/password_change.html
new file mode 100644
index 0000000..72d7672
--- /dev/null
+++ b/shynet/core/templates/account/password_change.html
@@ -0,0 +1,15 @@
+{% extends "account/base.html" %}
+
+{% load i18n a17t_tags %}
+
+{% 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 max-w-lg">
+        {% csrf_token %}
+        {{ form|a17t }}
+        <button type="submit" name="action">{% trans "Change Password" %}</button>
+    </form>
+{% endblock %}
diff --git a/shynet/core/templates/account/password_reset.html b/shynet/core/templates/account/password_reset.html
new file mode 100644
index 0000000..75af52e
--- /dev/null
+++ b/shynet/core/templates/account/password_reset.html
@@ -0,0 +1,23 @@
+{% extends "account/base.html" %}
+
+{% load i18n a17t_tags %}
+{% 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 email address below, and we'll send you an email to reset it." %}
+</p>
+
+<form method="POST" action="{% url 'account_reset_password' %}" class="password_reset max-w-lg">
+    {% csrf_token %}
+    {{ form|a17t }}
+    <button type="submit" class="button ~urge !high">{% trans 'Reset Password' %}</button>
+</form>
+{% endblock %}
\ No newline at end of file
diff --git a/shynet/core/templates/account/password_reset_done.html b/shynet/core/templates/account/password_reset_done.html
new file mode 100644
index 0000000..5d15a9a
--- /dev/null
+++ b/shynet/core/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 email. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
+{% endblock %}
diff --git a/shynet/core/templates/account/password_reset_from_key.html b/shynet/core/templates/account/password_reset_from_key.html
new file mode 100644
index 0000000..26a5fc2
--- /dev/null
+++ b/shynet/core/templates/account/password_reset_from_key.html
@@ -0,0 +1,23 @@
+{% extends "account/base.html" %}
+
+{% load i18n a17t_tags %}
+{% 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 }}" class="max-w-lg">
+                {% csrf_token %}
+                {{ form|a17t }}
+                <button type="submit" name="action" class="button ~urge !high">{% trans 'Change Password'}</button>
+            </form>
+        {% else %}
+            <p>{% trans 'Your password is now changed.' %}</p>
+        {% endif %}
+    {% endif %}
+{% endblock %}
diff --git a/shynet/core/templates/account/password_reset_from_key_done.html b/shynet/core/templates/account/password_reset_from_key_done.html
new file mode 100644
index 0000000..85641c2
--- /dev/null
+++ b/shynet/core/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/shynet/core/templates/account/password_set.html b/shynet/core/templates/account/password_set.html
new file mode 100644
index 0000000..0632c47
--- /dev/null
+++ b/shynet/core/templates/account/password_set.html
@@ -0,0 +1,15 @@
+{% extends "account/base.html" %}
+
+{% load i18n a17t_tags %}
+
+{% 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 max-w-lg">
+    {% csrf_token %}
+    {{ form|a17t }}
+    <button type="submit" name="action" class="button ~urge !high">{% trans 'Set Password' %}</button>
+</form>
+{% endblock %}
\ No newline at end of file
diff --git a/shynet/core/templates/account/signup.html b/shynet/core/templates/account/signup.html
new file mode 100644
index 0000000..bca3017
--- /dev/null
+++ b/shynet/core/templates/account/signup.html
@@ -0,0 +1,21 @@
+{% extends "account/base.html" %}
+
+{% load i18n a17t_tags %}
+
+{% block head_title %}{% trans "Signup" %}{% endblock %}
+
+{% block content %}
+<h1>{% trans "Sign Up" %}</h1>
+
+<p>{% blocktrans %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktrans %}</p>
+
+<form class="signup max-w-lg" id="signup_form" method="post" action="{% url 'account_signup' %}">
+  {% csrf_token %}
+  {{ form|a17t }}
+  {% if redirect_field_value %}
+  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+  {% endif %}
+  <button type="submit" class="button ~urge !high">{% trans "Sign Up" %} &raquo;</button>
+</form>
+
+{% endblock %}
diff --git a/shynet/core/templates/account/signup_closed.html b/shynet/core/templates/account/signup_closed.html
new file mode 100644
index 0000000..c71ca8d
--- /dev/null
+++ b/shynet/core/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 "Public sign-ups are not allowed at this time." %}</p>
+{% endblock %}
diff --git a/shynet/core/templates/account/snippets/already_logged_in.html b/shynet/core/templates/account/snippets/already_logged_in.html
new file mode 100644
index 0000000..00799f0
--- /dev/null
+++ b/shynet/core/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/shynet/core/templates/account/verification_sent.html b/shynet/core/templates/account/verification_sent.html
new file mode 100644
index 0000000..ebbe5c1
--- /dev/null
+++ b/shynet/core/templates/account/verification_sent.html
@@ -0,0 +1,12 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Verify Your Email Address" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Verify Your Email Address" %}</h1>
+
+    <p>{% blocktrans %}We have sent an email 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/shynet/core/templates/account/verified_email_required.html b/shynet/core/templates/account/verified_email_required.html
new file mode 100644
index 0000000..b2244d8
--- /dev/null
+++ b/shynet/core/templates/account/verified_email_required.html
@@ -0,0 +1,23 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Verify Your Email Address" %}{% endblock %}
+
+{% block content %}
+<h1>{% trans "Verify Your Email 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 email address. {% endblocktrans %}</p>
+
+<p>{% blocktrans %}We have sent an email to you for
+verification. Please click on the link inside this email. 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 email address</a>.{% endblocktrans %}</p>
+
+
+{% endblock %}
diff --git a/shynet/core/templates/base.html b/shynet/core/templates/base.html
index b551b37..30f99d8 100644
--- a/shynet/core/templates/base.html
+++ b/shynet/core/templates/base.html
@@ -6,8 +6,7 @@
   <title>{% block head_title %}Privacy-oriented analytics{% endblock %} | Shynet</title>
   <meta name="robots" content="noindex">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/a17t@latest/dist/a17t.css">
+  {% include 'a17t/head.html' %}
   {% block extra_head %}
   {% endblock %}
 </head>
@@ -19,7 +18,7 @@
     {% if messages %}
     <div>
       {% for message in messages %}
-      <article class="card {{message.tags}} mb-2 w-full">{{message}}</article>
+      <article class="card {{message.tags}} !high mb-2 w-full">{{message}}</article>
       {% endfor %}
       </ul>
     </div>
@@ -29,7 +28,7 @@
       <strong>Menu:</strong>
       <ul>
         {% if user.is_authenticated %}
-        <li><a href="{% url 'account_email' %}">Change E-mail</a></li>
+        <li><a href="{% url 'account_email' %}">Change Email</a></li>
         <li><a href="{% url 'account_logout' %}">Sign Out</a></li>
         {% else %}
         <li><a href="{% url 'account_login' %}">Sign In</a></li>
diff --git a/shynet/shynet/settings.py b/shynet/shynet/settings.py
index 371ec7b..7e883a3 100644
--- a/shynet/shynet/settings.py
+++ b/shynet/shynet/settings.py
@@ -38,6 +38,7 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "django.contrib.sites",
+    "a17t",
     "core",
     "analytics",
     "allauth",
@@ -148,3 +149,12 @@ CELERY_REDIS_SOCKET_TIMEOUT = 15
 
 MAXMIND_CITY_DB = os.getenv("MAXMIND_CITY_DB")
 MAXMIND_ASN_DB = os.getenv("MAXMIND_ASN_DB")
+
+# Messages
+from django.contrib.messages import constants as messages
+MESSAGE_TAGS = {
+    messages.INFO: '~info',
+    messages.WARNING: "~warning",
+    messages.ERROR: "~critical",
+    messages.SUCCESS: "~positive",
+}