From a68b9766f23d966086c6610a2dba8acfd07a4fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Tue, 14 May 2019 19:51:40 -0400
Subject: [PATCH] Require email verification

---
 notaso/settings.py                       |  2 +-
 templates/account/login.html             | 16 +++++++---------
 templates/account/verification_sent.html | 13 +++++++------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/notaso/settings.py b/notaso/settings.py
index c5629fe..c4e72c5 100644
--- a/notaso/settings.py
+++ b/notaso/settings.py
@@ -144,7 +144,7 @@ class Common(Configuration):
     # auth and allauth settings
     LOGIN_REDIRECT_URL = "/"
     LOGIN_URL = "/accounts/login/"
-    ACCOUNT_EMAIL_VERIFICATION = "none"
+    ACCOUNT_EMAIL_VERIFICATION = "mandatory"
     ACCOUNT_EMAIL_SUBJECT_PREFIX = "[Notaso] "
     ACCOUNT_LOGOUT_ON_GET = True
     ACCOUNT_EMAIL_REQUIRED = True
diff --git a/templates/account/login.html b/templates/account/login.html
index db294fc..89494f3 100644
--- a/templates/account/login.html
+++ b/templates/account/login.html
@@ -10,7 +10,7 @@ <h1>Login</h1>
         </div>
     </div>
 </div>
-{% endblock %} 
+{% endblock %}
 {% block content %}
 <div class="container">
     <div class="row">
@@ -18,7 +18,7 @@ <h1>Login</h1>
             <ul class="col-md-10 col-md-offset-2 col-xs-12">
             {% if socialaccount.providers  %}
             <div class = "col-md-5 col-xs-12">
-                
+
                 <p class="text-center lead">Favor de hacer login con algunas de sus cuentas existentes
                 de Facebook o Twitter. También se puede registrar <a href="{{ signup_url }}">aqui.</a></p>
 
@@ -32,7 +32,7 @@ <h1>Login</h1>
                     </div>
                     <br>
                 </div>
-            {% else %}    
+            {% else %}
                 <p>If you have not created an account yet, then please
                 <a href="{{ signup_url }}">sign up</a> first.</p>
             {% endif %}
@@ -42,12 +42,10 @@ <h1>Login</h1>
             <p class="text-center lead">Si tiene una cuenta de {{site.name}}, puede hacer login:</p>
                 <form method="POST" action="" class="horizontal-form" role="form">{% csrf_token %}
                     <div>
-                        {% if form.login.errors %}
+                        {% if form.non_field_errors %}
                             <div class = "alert alert-danger alert-dismissable">
-                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                            {{form.login.errors}}</div>
-                        </div>
-
+                                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>{{form.non_field_errors}}</div>
+                            </div>
                         {% endif %}
                         <div class="form-group">
                                 <label for="id_login">Email:</label>
@@ -72,7 +70,7 @@ <h1>Login</h1>
                                   <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
                                   {% endif %}
                                   <button class="btn btn-primary btn-lg pull-right" type="submit">Login</button>
-                            </div>  
+                            </div>
                         </div>
                     </div>
                 </form>
diff --git a/templates/account/verification_sent.html b/templates/account/verification_sent.html
index 2389cf6..7aacfb3 100755
--- a/templates/account/verification_sent.html
+++ b/templates/account/verification_sent.html
@@ -1,24 +1,25 @@
 {% extends "account/base.html" %}
+
+{% load i18n %}
+
 {% block title %} Verificación Enviada| Notaso {% endblock %}
 {% block header %}
 <div class="jumbotron heading-style">
     <div class="container">
         <div class="row">
-            <h2>{% trans Verificación enviada %}</h2>
+            <h2>{% trans "Verificación enviada" %}</h2>
         </div>
     </div>
 </div>
 {% endblock %}
 
-{% load i18n %}
-
 {% block content %}
 <div class = "container">
 	<div class = "row">
 		<div class = "col-md-10 col-md-offset-2">
-    		<p>{% blocktrans %}Hemos enviado un e-mail para la verificación. Entre al ensalace provisto en el e-mail para finalizar el proceso de registracion. Favor contactenos si no recibe el e-mail en los proximos minutos.{% endblocktrans %}</p>
-	
-		</div>	
+    		<p>{% blocktrans %}Hemos enviado un e-mail para la verificación. Entre al enlace provisto en el e-mail para finalizar el proceso de registración. Favor contáctenos si no recibe el e-mail en los proximos minutos.{% endblocktrans %}</p>
+
+		</div>
 	</div>
 </div>