Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Give the login page a face lift as well

Roland Geider07650ec57853
diff --git a/wger/core/templates/account/login.html b/wger/core/templates/account/login.html
index 69b157747..41e6fb455 100644
--- a/wger/core/templates/account/login.html
+++ b/wger/core/templates/account/login.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "template.html" %}
{% load i18n wger_extras %}
{% block title %}{% translate "Login" %}{% endblock %}
@@ -8,66 +8,131 @@
{% endblock %}
-{% block content %}
- <form method="post" class="wger-form" novalidate>
- {% csrf_token %}
- {% if redirect_field_value %}
- <input type="hidden"
- name="{{ redirect_field_name }}"
- value="{{ redirect_field_value }}">
- {% endif %}
-
- {% for error in form.non_field_errors %}
- <div class="alert alert-danger">{{ error }}</div>
- {% endfor %}
-
- <div class="mb-3">
- <label for="{{ form.login.id_for_label }}" class="form-label">
- {{ form.login.label }}
- </label>
- {{ form.login }}
- {% for error in form.login.errors %}
- <div class="invalid-feedback d-block">{{ error }}</div>
- {% endfor %}
- </div>
-
- <div class="mb-3">
- <label for="{{ form.password.id_for_label }}" class="form-label">
- {{ form.password.label }}
- </label>
- {{ form.password }}
- {% for error in form.password.errors %}
- <div class="invalid-feedback d-block">{{ error }}</div>
- {% endfor %}
- </div>
-
- {% if form.remember %}
- <div class="form-check mb-3">
- {{ form.remember }}
- <label for="{{ form.remember.id_for_label }}" class="form-check-label">
- {{ form.remember.label }}
- </label>
+{% block template %}
+ {% if messages %}
+ {% for message in messages %}
+ <div class="alert {% if message.tags == 'error' %}alert-danger{% elif message.tags == 'warning' %}alert-warning{% elif message.tags == 'info' %}alert-info{% elif message.tags == 'success' %}alert-success{% endif %}">
+ <a href="#" class="close extra-bold" data-bs-dismiss="alert">&times;</a>
+ {{ message }}
</div>
- {% endif %}
-
- <button type="submit" class="btn btn-success btn-block">
- {% translate "Login" %}
- </button>
- </form>
-
- {% if PASSKEY_LOGIN_ENABLED %}
- <hr>
- <button type="submit"
- form="mfa_login"
- id="passkey_login"
- class="btn btn-outline-primary btn-block">
- {% translate "Sign in with a passkey" %}
- </button>
+ {% endfor %}
{% endif %}
- {% if use_social_auth %}
- {% include "user/social_login.html" %}
- {% endif %}
+ <div class="row justify-content-center">
+ <div class="col-lg-10">
+ <div class="card my-4">
+ <div class="row g-0">
+
+ {# Credentials login #}
+ <div class="{% if PASSKEY_LOGIN_ENABLED or use_social_auth %}col-md-8{% else %}col-md-12{% endif %}">
+ <div class="card-body p-4">
+ <h2 class="mb-1">{% translate "Login" %}</h2>
+
+ <form method="post" class="wger-form" novalidate>
+ {% csrf_token %}
+ {% if redirect_field_value %}
+ <input type="hidden"
+ name="{{ redirect_field_name }}"
+ value="{{ redirect_field_value }}">
+ {% endif %}
+
+ {% for error in form.non_field_errors %}
+ <div class="alert alert-danger">{{ error }}</div>
+ {% endfor %}
+
+ <div class="mb-3">
+ <label for="{{ form.login.id_for_label }}" class="form-label">
+ {{ form.login.label }}
+ </label>
+ {{ form.login }}
+ {% for error in form.login.errors %}
+ <div class="invalid-feedback d-block">{{ error }}</div>
+ {% endfor %}
+ </div>
+
+ <div class="mb-2">
+ <label for="{{ form.password.id_for_label }}" class="form-label">
+ {{ form.password.label }}
+ </label>
+ {{ form.password }}
+ {% for error in form.password.errors %}
+ <div class="invalid-feedback d-block">{{ error }}</div>
+ {% endfor %}
+ </div>
+
+ <div class="d-flex justify-content-between align-items-center mb-3">
+ {% if form.remember %}
+ <div class="form-check mb-0">
+ {{ form.remember }}
+ <label for="{{ form.remember.id_for_label }}"
+ class="form-check-label">
+ {{ form.remember.label }}
+ </label>
+ </div>
+ {% else %}
+ <span></span>
+ {% endif %}
+ <a href="{% url 'core:user:password_reset' %}">
+ {% translate "Forgot password?" %}
+ </a>
+ </div>
+
+ <button type="submit" class="btn btn-success w-100">
+ {% translate "Login" %}
+ </button>
+ </form>
+
+ {% if allow_registration %}
+ <div class="d-flex align-items-center text-muted mt-5 mb-3">
+ <hr class="flex-grow-1 my-0">
+ <span class="px-3">{% translate "No account?" %}</span>
+ <hr class="flex-grow-1 my-0">
+ </div>
+ <a href="{% url 'core:user:registration' %}"
+ class="btn btn-outline-primary w-100">
+ {% translate "Register" %}
+ </a>
+ {% endif %}
+ </div>
+ </div>
+
+ {# Quick sign-in: only rendered when at least one method is available #}
+ {% if PASSKEY_LOGIN_ENABLED or use_social_auth %}
+ <div class="col-md-4 bg-light">
+ <div class="card-body p-4">
+ <h6 class="text-uppercase text-muted mb-3">
+ {% translate "Faster sign in" %}
+ </h6>
+
+ {% if PASSKEY_LOGIN_ENABLED %}
+ <button type="submit"
+ form="mfa_login"
+ id="passkey_login"
+ class="btn btn-outline-primary w-100 mb-2">
+ <span class="{% fa_class 'key' %} me-1"></span>
+ {% translate "Sign in with a passkey" %}
+ </button>
+ {% endif %}
+
+ {% if PASSKEY_LOGIN_ENABLED and use_social_auth %}
+ <div class="d-flex align-items-center text-muted small my-3">
+ <hr class="flex-grow-1 my-0">
+ <span class="px-2">{% translate "or sign in with" %}</span>
+ <hr class="flex-grow-1 my-0">
+ </div>
+ {% endif %}
+
+ {% if use_social_auth %}
+ {% include "user/social_login.html" %}
+ {% endif %}
+ </div>
+ </div>
+ {% endif %}
+
+ </div>
+ </div>
+ </div>
+ </div>
{% endblock %}
@@ -76,24 +141,3 @@
{% include "mfa/webauthn/snippets/login_script.html" %}
{% endif %}
{% endblock %}
-
-
-{% block sidebar %}
- {% if allow_registration %}
- <h4>{% translate "No account?" %}</h4>
- <p>
- <a href="{% url 'core:user:registration' %}">
- <span class="{% fa_class 'sign-in-alt' %}"></span>
- {% translate "Register" %}
- </a>
- </p>
- {% endif %}
-
- <h4>{% translate "Forgot password?" %}</h4>
- <p>
- <a href="{% url 'core:user:password_reset' %}">
- <span class="{% fa_class 'key' %}"></span>
- {% translate "Reset password" %}
- </a>
- </p>
-{% endblock %}
diff --git a/wger/core/templates/user/social_login.html b/wger/core/templates/user/social_login.html
index 233459a15..e44503a7f 100644
--- a/wger/core/templates/user/social_login.html
+++ b/wger/core/templates/user/social_login.html
@@ -1,19 +1,12 @@
-{% load i18n socialaccount %}
+{% load i18n socialaccount wger_extras %}
{% get_providers as socialaccount_providers %}
-{% if socialaccount_providers %}
-<div class="row mt-3">
- <div class="col-md-12 text-center">
- <h4>&mdash; {% translate "or login with" %} &mdash;</h4>
-
- {% for provider in socialaccount_providers %}
- <form method="post" action="{% provider_login_url provider %}" class="d-inline">
- {% csrf_token %}
- <button type="submit" class="btn btn-outline-primary me-2 mb-2">
- {{ provider.name }}
- </button>
- </form>
- {% endfor %}
- </div>
-</div>
-{% endif %}
+{% for provider in socialaccount_providers %}
+ <form method="post" action="{% provider_login_url provider %}">
+ {% csrf_token %}
+ <button type="submit" class="btn btn-outline-dark w-100 mb-2">
+ <span class="{% fa_class provider.id icon_type='fab' %} me-2"></span>
+ {{ provider.name }}
+ </button>
+ </form>
+{% endfor %}
diff --git a/wger/core/tests/test_user_login.py b/wger/core/tests/test_user_login.py
index 9261d507e..63b99ff0a 100644
--- a/wger/core/tests/test_user_login.py
+++ b/wger/core/tests/test_user_login.py
@@ -3,6 +3,7 @@ from unittest import mock
# Django
from django.contrib.auth.models import User
+from django.test import override_settings
from django.urls import reverse
# wger
@@ -133,3 +134,14 @@ class WebLoginViewTestCase(WgerTestCase):
"""
response = self.client.get(reverse('core:user:login'))
self.assertContains(response, 'id="passkey_login"')
+
+ @override_settings(MFA_PASSKEY_LOGIN_ENABLED=False, WGER_SOCIAL_PROVIDERS=[])
+ def test_login_page_without_quick_sign_in_methods(self):
+ """
+ Without passkey or social providers the page renders just the
+ credentials form, not an empty quick-sign-in panel.
+ """
+ response = self.client.get(reverse('core:user:login'))
+ self.assertEqual(response.status_code, 200)
+ self.assertNotContains(response, 'id="passkey_login"')
+ self.assertNotContains(response, 'Faster sign in')