fix: dont override users' slippers components (#89)

#76 (comment)
danihodovic · Jun 26, 2024 · 89690c4 · 89690c4
1 parent 4f1735d
commit 89690c4
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 {% extends "account/reauthenticate.html" %}
 {% load i18n %}
-{% load slippers %}
+{% load allauth_ui %}
 {% block reauthenticate_content %}
     <div class="mt-5">{% blocktranslate %}Enter your password:{% endblocktranslate %}</div>
     {% url 'account_reauthenticate' as url %}

diff --git 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
@@ -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
@@ -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
diff --git 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 %}
     <div class="mt-5">{% blocktranslate %}Enter an authenticator code:{% endblocktranslate %}</div>
     {% url 'mfa_reauthenticate' as action_url %}

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,9 +1,19 @@
 from django import template
 from django.conf import settings
+from slippers.templatetags.slippers import register_components
 
 register = template.Library()
 
 
 @register.simple_tag
 def allauth_ui_theme():
     return settings.ALLAUTH_UI_THEME
+
+
+register_components(
+    {
+        "container": "components/container.html",
+        "form": "components/form.html",
+    },
+    register,
+)