feat: render non-field errors block

Author: Antoliny0919

djangosnippets/settings/base.py

@@ -143,6 +143,9 @@ def user_url(user):
 ACCOUNT_DEFAULT_HTTP_PROTOCOL = "https"
 ACCOUNT_LOGOUT_ON_GET = True
 ACCOUNT_USERNAME_MIN_LENGTH = 3
+ACCOUNT_FORMS = {
+    "login": "django.contrib.auth.forms.AuthenticationForm",
+}
 SOCIALACCOUNT_ADAPTER = "djangosnippets.adapters.DjangoSnippetsSocialAccountAdapter"
 SOCIALACCOUNT_AUTO_SIGNUP = False
 SOCIALACCOUNT_LOGIN_ON_GET = True

djangosnippets/templates/account/login.html

@@ -11,15 +11,21 @@ <h3>Sign In</h3>
     {% include "socialaccount/snippets/login_extra.html" %}
     <form class="login flex flex-col items-center w-[80%]" method="POST" action="{% url 'account_login' %}">
         {% csrf_token %}
+        {% if form.non_field_errors %}
+          <ul class="m-0 border-2 rounded-md p-2 border-red-400 text-red-600 font-bold">
+          {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+          </ul>
+        {% endif %}
         {% for field in form %}
-        {% if field.name == 'remember' %}
-        {% else %}
+        <div class="w-full my-1">
             <div class="flex w-full my-2">
                 <label class="text-base text-left">{{ field.label }}</label>
                 <span aria-hidden="true" class="text-4xl text-red-400 h-2 ml-1">*</span>
             </div>
-            {{ field|add_class:"h-12 text-lg rounded-lg border-base-green-400 border-2" }}
-        {% endif %}
+            {{ field|add_class:"h-12 text-lg rounded-lg border-base-green-400 border-2 my-2" }}
+            {% if field.help_text %}<div class="w-full text-left ml-4 font-text">{{ field.help_text|safe }}</div>{% endif %}
+            {% if field.errors %}<ul class="m-0 w-full ml-4 text-left text-red-600 font-text">{% for error in field.errors %}<li>{{ error }}</li>{% endfor %}</ul>{% endif %}
+        </div>
         {% endfor %}
         <button type="submit" class="w-full my-4 h-12 text-lg bg-base-green-600 border-2 rounded-lg border-base-green-800 font-common hover:bg-base-white-400 hover:text-base-green-600">Sign In</button>
     </form>

djangosnippets/templates/account/signup.html

@@ -13,12 +13,21 @@ <h3>Sign Up</h3>
     {% include "socialaccount/snippets/login_extra.html" %}
     <form class="flex flex-col items-center w-[80%]" method="POST" action="{% url 'account_signup' %}">
         {% csrf_token %}
+        {% if form.non_field_errors %}
+          <ul class="m-0 border-2 rounded-md p-2 border-red-400 text-red-600 font-bold">
+          {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+          </ul>
+        {% endif %}
         {% for field in form %}
+        <div class="w-full my-1">
             <div class="flex w-full my-2">
                 <label class="text-base text-left">{{ field.label }}</label>
                 <span aria-hidden="true" class="text-4xl text-red-400 h-2 ml-1">*</span>
             </div>
-            {{ field|add_class:"h-12 text-lg rounded-lg border-base-green-400 border-2" }}
+            {{ field|add_class:"h-12 text-lg rounded-lg border-base-green-400 border-2 my-2" }}
+            {% if field.help_text %}<div class="w-full text-left ml-4 font-text">{{ field.help_text|safe }}</div>{% endif %}
+            {% if field.errors %}<ul class="m-0 w-full ml-4 text-left text-red-600 font-text">{% for error in field.errors %}<li>{{ error }}</li>{% endfor %}</ul>{% endif %}
+        </div>
         {% endfor %}
         <button type="submit" class="w-full my-4 h-12 text-lg bg-base-green-600 border-2 rounded-lg border-base-green-800 font-common hover:bg-base-white-400 hover:text-base-green-600">Sign Up</button>
     </form>