From e06b472d62f23a35be46b36abbed08d006adfd2a Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Tue, 18 Mar 2025 11:56:02 +0100
Subject: [PATCH 1/2] Reduce template code duplication

---
 .../frontend/templates/account/login.html     | 78 +++++++++----------
 .../frontend/templates/frontend/base.html     | 11 +++
 .../frontend/organizations/create.html        | 12 +--
 .../frontend/templates/frontend/profile.html  | 64 +++++++--------
 4 files changed, 78 insertions(+), 87 deletions(-)

diff --git a/src/servala/frontend/templates/account/login.html b/src/servala/frontend/templates/account/login.html
index 3100278..6494b6a 100644
--- a/src/servala/frontend/templates/account/login.html
+++ b/src/servala/frontend/templates/account/login.html
@@ -6,48 +6,40 @@
         {% translate "Sign In" %}
     {% endblock page_title %}
 {% endblock html_title %}
-{% block content %}
-    <section class="section">
-        <div class="card">
-            <div class="card-content">
-                <div class="card-body">
-                    {% if SOCIALACCOUNT_ENABLED %}
-                        {% get_providers as socialaccount_providers %}
-                        {% if socialaccount_providers %}
-                            {% for provider in socialaccount_providers %}
-                                {% provider_login_url provider process=process scope=scope auth_params=auth_params as href %}
-                                <form method="post" action="{{ href }}">
-                                    {% csrf_token %}
-                                    <button href="{{ href }}"
-                                            class="btn btn-warning btn-lg icon icon-left"
-                                            title="{{ provider.name }}">
-                                        <img src="{% static 'img/keycloak.svg' %}" style="height: 30px">
-                                        <span class="mx-1">{% translate "Sign in with your" %} {{ provider.name }}</span>
-                                    </button>
-                                </form>
-                            {% endfor %}
-                        {% endif %}
-                    {% endif %}
-                    <div class="mt-2">
-                        <a data-bs-toggle="collapse"
-                           href="#login-form"
-                           role="button"
-                           aria-controls="login-form"
-                           class="d-flex align-items-center">
-                            <i class="bi bi-chevron-right me-2 ms-1 mb-2 collapse-icon"></i>
-                            {% translate "Log in with email and password instead" %}
-                        </a>
-                        <div class="collapse mt-3 ms-3"
-                             id="login-form"
-                             class="form form-vertical"
-                             style="max-width: 400px">
-                            {% url 'account_login' as form_action %}
-                            {% translate "Sign In" as form_submit_label %}
-                            {% include "includes/form.html" %}
-                        </div>
-                    </div>
-                </div>
-            </div>
+{% block card_content %}
+    {% if SOCIALACCOUNT_ENABLED %}
+        {% get_providers as socialaccount_providers %}
+        {% if socialaccount_providers %}
+            {% for provider in socialaccount_providers %}
+                {% provider_login_url provider process=process scope=scope auth_params=auth_params as href %}
+                <form method="post" action="{{ href }}">
+                    {% csrf_token %}
+                    <button href="{{ href }}"
+                            class="btn btn-warning btn-lg icon icon-left"
+                            title="{{ provider.name }}">
+                        <img src="{% static 'img/keycloak.svg' %}" style="height: 30px">
+                        <span class="mx-1">{% translate "Sign in with your" %} {{ provider.name }}</span>
+                    </button>
+                </form>
+            {% endfor %}
+        {% endif %}
+    {% endif %}
+    <div class="mt-2">
+        <a data-bs-toggle="collapse"
+           href="#login-form"
+           role="button"
+           aria-controls="login-form"
+           class="d-flex align-items-center">
+            <i class="bi bi-chevron-right me-2 ms-1 mb-2 collapse-icon"></i>
+            {% translate "Log in with email and password instead" %}
+        </a>
+        <div class="collapse mt-3 ms-3"
+             id="login-form"
+             class="form form-vertical"
+             style="max-width: 400px">
+            {% url 'account_login' as form_action %}
+            {% translate "Sign In" as form_submit_label %}
+            {% include "includes/form.html" %}
         </div>
-    </section>
+    </div>
 {% endblock content %}
diff --git a/src/servala/frontend/templates/frontend/base.html b/src/servala/frontend/templates/frontend/base.html
index ab724f8..80dd44e 100644
--- a/src/servala/frontend/templates/frontend/base.html
+++ b/src/servala/frontend/templates/frontend/base.html
@@ -32,6 +32,17 @@
                     {% include "includes/message.html" %}
                 {% endfor %}
                 {% block content %}
+                    <section class="section">
+                        <div class="card">
+                            {% block card_header %}{% endblock %}
+                            <div class="card-content">
+                                <div class="card-body">
+                                    {% block card_content %}
+                                    {% endblock card_content %}
+                                </div>
+                            </div>
+                        </div>
+                    </section>
                 {% endblock content %}
             </div>
             <footer>
diff --git a/src/servala/frontend/templates/frontend/organizations/create.html b/src/servala/frontend/templates/frontend/organizations/create.html
index ca46190..2d7cfa4 100644
--- a/src/servala/frontend/templates/frontend/organizations/create.html
+++ b/src/servala/frontend/templates/frontend/organizations/create.html
@@ -5,12 +5,6 @@
         {% translate "Create a new organization" %}
     {% endblock page_title %}
 {% endblock html_title %}
-{% block content %}
-    <section class="section">
-        <div class="card">
-            <div class="card-content">
-                <div class="card-body">{% include "includes/form.html" %}</div>
-            </div>
-        </div>
-    </section>
-{% endblock content %}
+{% block card_content %}
+    {% include "includes/form.html" %}
+{% endblock card_content %}
diff --git a/src/servala/frontend/templates/frontend/profile.html b/src/servala/frontend/templates/frontend/profile.html
index a5f0e62..1cbb46f 100644
--- a/src/servala/frontend/templates/frontend/profile.html
+++ b/src/servala/frontend/templates/frontend/profile.html
@@ -5,39 +5,33 @@
         {% translate "Profile" %}
     {% endblock page_title %}
 {% endblock html_title %}
-{% block content %}
-    <section class="section">
-        <div class="card">
-            <div class="card-header">
-                <h4 class="card-title">{% translate "Account" %}</h4>
-            </div>
-            <div class="card-content">
-                <div class="card-body">
-                    <p class="card-text">
-                        {% blocktranslate trimmed %}
-                            You are logged in with your VSHN user account. You will be able to change your password and other settings here in the future.
-                        {% endblocktranslate %}
-                    </p>
-                    <div class="table-responsive">
-                        <table class="table table-lg">
-                            <tbody>
-                                <tr>
-                                    <th>{% translate "E-mail" %}</th>
-                                    <td>{{ request.user.email }}</td>
-                                </tr>
-                                <tr>
-                                    <th>{% translate "First name" %}</th>
-                                    <td>{{ request.user.first_name }}</td>
-                                </tr>
-                                <tr>
-                                    <th>{% translate "Last name" %}</th>
-                                    <td>{{ request.user.last_name }}</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
+{% block card_header %}
+    <div class="card-header">
+        <h4 class="card-title">{% translate "Account" %}</h4>
+    </div>
+{% endblock %}
+{% block card_content %}
+    <p class="card-text">
+        {% blocktranslate trimmed %}
+            You are logged in with your VSHN user account. You will be able to change your password and other settings here in the future.
+        {% endblocktranslate %}
+    </p>
+    <div class="table-responsive">
+        <table class="table table-lg">
+            <tbody>
+                <tr>
+                    <th>{% translate "E-mail" %}</th>
+                    <td>{{ request.user.email }}</td>
+                </tr>
+                <tr>
+                    <th>{% translate "First name" %}</th>
+                    <td>{{ request.user.first_name }}</td>
+                </tr>
+                <tr>
+                    <th>{% translate "Last name" %}</th>
+                    <td>{{ request.user.last_name }}</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
 {% endblock content %}

From 7682dc94c7dd64f69d2c978b863ac5a37af721da Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Tue, 18 Mar 2025 12:53:00 +0100
Subject: [PATCH 2/2] Override signup page

---
 .../frontend/templates/frontend/profile.html     |  2 +-
 .../frontend/templates/socialaccount/signup.html | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 src/servala/frontend/templates/socialaccount/signup.html

diff --git a/src/servala/frontend/templates/frontend/profile.html b/src/servala/frontend/templates/frontend/profile.html
index 1cbb46f..3188a91 100644
--- a/src/servala/frontend/templates/frontend/profile.html
+++ b/src/servala/frontend/templates/frontend/profile.html
@@ -11,7 +11,7 @@
     </div>
 {% endblock %}
 {% block card_content %}
-    <p class="card-text">
+    <p>
         {% blocktranslate trimmed %}
             You are logged in with your VSHN user account. You will be able to change your password and other settings here in the future.
         {% endblocktranslate %}
diff --git a/src/servala/frontend/templates/socialaccount/signup.html b/src/servala/frontend/templates/socialaccount/signup.html
new file mode 100644
index 0000000..ccc0f4c
--- /dev/null
+++ b/src/servala/frontend/templates/socialaccount/signup.html
@@ -0,0 +1,16 @@
+{% extends "frontend/base.html" %}
+{% load i18n %}
+{% block html_title %}
+    {% block page_title %}
+        {% translate "Sign Up" %}
+    {% endblock page_title %}
+{% endblock html_title %}
+{% block card_content %}
+    <p>
+        {% blocktrans with provider_name=account.get_provider.name site_name=site.name %}You are about to use your {{provider_name}} account to login to
+{{site_name}}. As a final step, please complete the following form:{% endblocktrans %}
+    </p>
+    {% url 'socialaccount_signup' as form_action %}
+    {% translate "Sign Up" as form_submit_label %}
+    <div style="max-width: 300px">{% include "includes/form.html" %}</div>
+{% endblock card_content %}