From 89690c477e6d16d688110aa093206cbd29121864 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Wed, 26 Jun 2024 16:44:31 -0300 Subject: [PATCH] fix: dont override users' slippers components (#89) https://github.com/danihodovic/django-allauth-ui/issues/76#issuecomment-2191058372 --- README.md | 2 +- allauth_ui/templates/account/account_inactive.html | 2 +- allauth_ui/templates/account/base_reauthenticate.html | 2 +- allauth_ui/templates/account/email.html | 2 +- allauth_ui/templates/account/email_confirm.html | 2 +- allauth_ui/templates/account/login.html | 2 +- allauth_ui/templates/account/logout.html | 2 +- allauth_ui/templates/account/password_change.html | 2 +- allauth_ui/templates/account/password_reset.html | 2 +- allauth_ui/templates/account/password_reset_done.html | 2 +- .../templates/account/password_reset_from_key.html | 2 +- .../account/password_reset_from_key_done.html | 2 +- allauth_ui/templates/account/password_set.html | 2 +- allauth_ui/templates/account/reauthenticate.html | 2 +- allauth_ui/templates/account/signup.html | 2 +- allauth_ui/templates/account/signup_closed.html | 2 +- allauth_ui/templates/account/verification_sent.html | 2 +- allauth_ui/templates/components.yaml | 3 --- allauth_ui/templates/mfa/reauthenticate.html | 2 +- .../templates/socialaccount/authentication_error.html | 2 +- allauth_ui/templates/socialaccount/connections.html | 2 +- allauth_ui/templates/socialaccount/login.html | 2 +- allauth_ui/templates/socialaccount/signup.html | 2 +- allauth_ui/templatetags/allauth_ui.py | 10 ++++++++++ 24 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 allauth_ui/templates/components.yaml diff --git a/README.md b/README.md index 4bcbd61..ea4425e 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ defaults for new projects. ## Features - 📱 Mobile-friendly design -- 💄 Confiugrable themes +- 💄 Configurable themes - 🗣️ Translations - 🇪🇸 Spanish - 🇫🇷 French diff --git a/allauth_ui/templates/account/account_inactive.html b/allauth_ui/templates/account/account_inactive.html index dee8748..5df817a 100644 --- a/allauth_ui/templates/account/account_inactive.html +++ b/allauth_ui/templates/account/account_inactive.html @@ -1,6 +1,6 @@ {% extends "account/account_inactive.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Account Inactive" as heading %} {% trans "This account is inactive." as subheading %} diff --git a/allauth_ui/templates/account/base_reauthenticate.html b/allauth_ui/templates/account/base_reauthenticate.html index 0206e1b..603b507 100644 --- a/allauth_ui/templates/account/base_reauthenticate.html +++ b/allauth_ui/templates/account/base_reauthenticate.html @@ -1,6 +1,6 @@ {% extends "account/base_reauthenticate.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Confirm Access" as heading %} {% blocktranslate asvar subheading %} diff --git a/allauth_ui/templates/account/email.html b/allauth_ui/templates/account/email.html index 4322b6e..708b95b 100644 --- a/allauth_ui/templates/account/email.html +++ b/allauth_ui/templates/account/email.html @@ -1,6 +1,6 @@ {% extends "account/email.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Email Addresses" as heading %} {% #container heading=heading %} diff --git a/allauth_ui/templates/account/email_confirm.html b/allauth_ui/templates/account/email_confirm.html index b18cbef..347f81f 100644 --- a/allauth_ui/templates/account/email_confirm.html +++ b/allauth_ui/templates/account/email_confirm.html @@ -1,7 +1,7 @@ {% extends "account/email_confirm.html" %} {% load i18n %} {% load account %} -{% load slippers %} +{% load allauth_ui %} {% load widget_tweaks %} {% block content %} {% trans "Confirm Email Address" as heading %} diff --git a/allauth_ui/templates/account/login.html b/allauth_ui/templates/account/login.html index 02bcc0f..988b061 100644 --- a/allauth_ui/templates/account/login.html +++ b/allauth_ui/templates/account/login.html @@ -1,6 +1,6 @@ {% extends "account/login.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% load widget_tweaks %} {% block content %} {% trans "Sign In" as heading %} diff --git a/allauth_ui/templates/account/logout.html b/allauth_ui/templates/account/logout.html index c266b62..586ee5d 100644 --- a/allauth_ui/templates/account/logout.html +++ b/allauth_ui/templates/account/logout.html @@ -1,6 +1,6 @@ {% extends "account/logout.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Sign Out" as heading %} {% trans "Are you sure you want to sign out?" as subheading %} diff --git a/allauth_ui/templates/account/password_change.html b/allauth_ui/templates/account/password_change.html index 1c27cba..836a666 100644 --- a/allauth_ui/templates/account/password_change.html +++ b/allauth_ui/templates/account/password_change.html @@ -1,6 +1,6 @@ {% extends "account/password_change.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% load widget_tweaks %} {% block content %} {% trans "Change Password" as heading %} diff --git a/allauth_ui/templates/account/password_reset.html b/allauth_ui/templates/account/password_reset.html index d9df4ea..2386e93 100644 --- a/allauth_ui/templates/account/password_reset.html +++ b/allauth_ui/templates/account/password_reset.html @@ -1,6 +1,6 @@ {% extends "account/password_reset.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Password Reset" as heading %} {% #container heading=heading %} diff --git a/allauth_ui/templates/account/password_reset_done.html b/allauth_ui/templates/account/password_reset_done.html index 7aa6cde..da9f3b9 100644 --- a/allauth_ui/templates/account/password_reset_done.html +++ b/allauth_ui/templates/account/password_reset_done.html @@ -1,6 +1,6 @@ {% extends "account/password_reset_done.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Password Reset" as heading %} {% #container heading=heading %} diff --git a/allauth_ui/templates/account/password_reset_from_key.html b/allauth_ui/templates/account/password_reset_from_key.html index 6b20aec..25897c3 100644 --- a/allauth_ui/templates/account/password_reset_from_key.html +++ b/allauth_ui/templates/account/password_reset_from_key.html @@ -1,6 +1,6 @@ {% extends "account/password_reset_from_key.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% if token_fail %} {% trans "Bad Token" as heading %} diff --git a/allauth_ui/templates/account/password_reset_from_key_done.html b/allauth_ui/templates/account/password_reset_from_key_done.html index 464236c..3004950 100644 --- a/allauth_ui/templates/account/password_reset_from_key_done.html +++ b/allauth_ui/templates/account/password_reset_from_key_done.html @@ -1,6 +1,6 @@ {% extends "account/password_reset_from_key_done.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Change Password" as heading %} {% trans "Your password is now changed." as subheading %} diff --git a/allauth_ui/templates/account/password_set.html b/allauth_ui/templates/account/password_set.html index cfdbde7..203339b 100644 --- a/allauth_ui/templates/account/password_set.html +++ b/allauth_ui/templates/account/password_set.html @@ -1,6 +1,6 @@ {% extends "account/password_set.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% load widget_tweaks %} {% block content %} {% trans "Set Password" as heading %} diff --git a/allauth_ui/templates/account/reauthenticate.html b/allauth_ui/templates/account/reauthenticate.html index 60a9071..9864704 100644 --- a/allauth_ui/templates/account/reauthenticate.html +++ b/allauth_ui/templates/account/reauthenticate.html @@ -1,6 +1,6 @@ {% extends "account/reauthenticate.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block reauthenticate_content %}
{% blocktranslate %}Enter your password:{% endblocktranslate %}
{% url 'account_reauthenticate' as url %} diff --git a/allauth_ui/templates/account/signup.html b/allauth_ui/templates/account/signup.html index 4f71ed5..8071d25 100644 --- a/allauth_ui/templates/account/signup.html +++ b/allauth_ui/templates/account/signup.html @@ -1,6 +1,6 @@ {% extends "account/signup.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% load widget_tweaks %} {% block content %} {% trans "Sign Up" as heading %} diff --git a/allauth_ui/templates/account/signup_closed.html b/allauth_ui/templates/account/signup_closed.html index 3fdc120..c6341f6 100644 --- a/allauth_ui/templates/account/signup_closed.html +++ b/allauth_ui/templates/account/signup_closed.html @@ -1,6 +1,6 @@ {% extends "account/signup_closed.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Sign Up Closed" as heading %} {% trans "We are sorry, but the sign up is currently closed." as subheading %} diff --git a/allauth_ui/templates/account/verification_sent.html b/allauth_ui/templates/account/verification_sent.html index 2c614c3..4ba167d 100644 --- a/allauth_ui/templates/account/verification_sent.html +++ b/allauth_ui/templates/account/verification_sent.html @@ -1,6 +1,6 @@ {% extends "account/verification_sent.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Confirm Email Address" as heading %} {% blocktrans asvar subheading %}We have sent an email to you for verification. Follow the link provided to finalize the signup process. If you do not see the verification email in your main inbox, check your spam folder. Please contact us if you do not receive the verification email within a few minutes.{% endblocktrans %} diff --git a/allauth_ui/templates/components.yaml b/allauth_ui/templates/components.yaml deleted file mode 100644 index 3a2cbc0..0000000 --- a/allauth_ui/templates/components.yaml +++ /dev/null @@ -1,3 +0,0 @@ -components: - container: "components/container.html" - form: "components/form.html" diff --git a/allauth_ui/templates/mfa/reauthenticate.html b/allauth_ui/templates/mfa/reauthenticate.html index c5f7e7e..a431c5f 100644 --- a/allauth_ui/templates/mfa/reauthenticate.html +++ b/allauth_ui/templates/mfa/reauthenticate.html @@ -1,6 +1,6 @@ {% extends "mfa/reauthenticate.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block reauthenticate_content %}
{% blocktranslate %}Enter an authenticator code:{% endblocktranslate %}
{% url 'mfa_reauthenticate' as action_url %} diff --git a/allauth_ui/templates/socialaccount/authentication_error.html b/allauth_ui/templates/socialaccount/authentication_error.html index 010d285..c04232c 100644 --- a/allauth_ui/templates/socialaccount/authentication_error.html +++ b/allauth_ui/templates/socialaccount/authentication_error.html @@ -1,6 +1,6 @@ {% extends "socialaccount/authentication_error.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% block content %} {% trans "Third-Party Login Failure" as heading %} {% trans "An error occurred while attempting to login via your third-party account." as subheading %} diff --git a/allauth_ui/templates/socialaccount/connections.html b/allauth_ui/templates/socialaccount/connections.html index 69389ca..62a1135 100644 --- a/allauth_ui/templates/socialaccount/connections.html +++ b/allauth_ui/templates/socialaccount/connections.html @@ -1,6 +1,6 @@ {% extends "socialaccount/connections.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% load widget_tweaks %} {% block content %} {% trans "Account Connections" as heading %} diff --git a/allauth_ui/templates/socialaccount/login.html b/allauth_ui/templates/socialaccount/login.html index ee0ab47..7d0c6ac 100644 --- a/allauth_ui/templates/socialaccount/login.html +++ b/allauth_ui/templates/socialaccount/login.html @@ -1,6 +1,6 @@ {% extends "socialaccount/login.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% load allauth %} {% block content %} {% if process == "connect" %} diff --git a/allauth_ui/templates/socialaccount/signup.html b/allauth_ui/templates/socialaccount/signup.html index 5184905..d56d4f9 100644 --- a/allauth_ui/templates/socialaccount/signup.html +++ b/allauth_ui/templates/socialaccount/signup.html @@ -1,6 +1,6 @@ {% extends "socialaccount/signup.html" %} {% load i18n %} -{% load slippers %} +{% load allauth_ui %} {% load allauth %} {% block content %} {% trans "Sign Up" as heading %} diff --git a/allauth_ui/templatetags/allauth_ui.py b/allauth_ui/templatetags/allauth_ui.py index 86904b6..61f00e2 100644 --- a/allauth_ui/templatetags/allauth_ui.py +++ b/allauth_ui/templatetags/allauth_ui.py @@ -1,5 +1,6 @@ from django import template from django.conf import settings +from slippers.templatetags.slippers import register_components register = template.Library() @@ -7,3 +8,12 @@ @register.simple_tag def allauth_ui_theme(): return settings.ALLAUTH_UI_THEME + + +register_components( + { + "container": "components/container.html", + "form": "components/form.html", + }, + register, +)