From 1121569d94164d459e255a7e24f9ea2fac6af7a7 Mon Sep 17 00:00:00 2001
From: boris <boris+gitea@ntbx.io>
Date: Mon, 19 Jan 2026 16:40:02 +0000
Subject: [PATCH] Fixed JS errors, moved app list below dashboard tabs for
 consistency

---
 app/keywarden/settings/base.py             |  3 +-
 app/templates/admin/base_site.html         |  1 +
 app/templates/admin/index.html             |  2 -
 app/templates/unfold/helpers/app_list.html | 81 ++++++++++++++++++++++
 4 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 app/templates/admin/base_site.html
 create mode 100644 app/templates/unfold/helpers/app_list.html

diff --git a/app/keywarden/settings/base.py b/app/keywarden/settings/base.py
index 1eb8b12..c6faed0 100644
--- a/app/keywarden/settings/base.py
+++ b/app/keywarden/settings/base.py
@@ -143,7 +143,6 @@ UNFOLD = {
     ],
     "SCRIPTS": [
         "/static/unfold/js/simplebar.js",
-        "/static/unfold/js/alpine.js",
     ],
     "SITE_DROPDOWN": [
         {
@@ -229,4 +228,4 @@ LOGIN_REDIRECT_URL = "/"
 LOGOUT_REDIRECT_URL = "/"
 
 def permission_callback(request):
-    return request.user.has_perm("keywarden.change_model")
\ No newline at end of file
+    return request.user.has_perm("keywarden.change_model")
diff --git a/app/templates/admin/base_site.html b/app/templates/admin/base_site.html
new file mode 100644
index 0000000..55c57af
--- /dev/null
+++ b/app/templates/admin/base_site.html
@@ -0,0 +1 @@
+{% extends "admin/base.html" %}
diff --git a/app/templates/admin/index.html b/app/templates/admin/index.html
index 2f44ef1..2fc9093 100644
--- a/app/templates/admin/index.html
+++ b/app/templates/admin/index.html
@@ -35,5 +35,3 @@
     </div>
   </div>
 {% endblock %}
-
-
diff --git a/app/templates/unfold/helpers/app_list.html b/app/templates/unfold/helpers/app_list.html
new file mode 100644
index 0000000..270b294
--- /dev/null
+++ b/app/templates/unfold/helpers/app_list.html
@@ -0,0 +1,81 @@
+{% load i18n unfold %}
+
+{% if sidebar_navigation %}
+    <div id="nav-sidebar-apps" class="h-0 grow overflow-auto" data-simplebar>
+        {% for group in sidebar_navigation %}
+            {% if group.items %}
+                {% has_nav_item_active group.items as has_active %}
+
+                <div class="hidden mb-2 has-[ol]:has-[li]:block" {% if group.collapsible %}x-data="{navigationOpen: {% if has_active %}true{% else %}false{% endif %}}"{% endif %}>
+                    {% if group.separator %}
+                        <hr class="border-t border-base-200 mx-6 my-2 dark:border-base-800" />
+                    {% endif %}
+
+                    {% if group.title %}
+                        <h2 class="font-semibold flex flex-row group items-center mb-1 mx-3 py-1.5 px-3 select-none text-font-important-light text-sm dark:text-font-important-dark {% if group.collapsible %}cursor-pointer hover:text-primary-600 dark:hover:text-primary-500{% endif %}" {% if group.collapsible %}x-on:click="navigationOpen = !navigationOpen"{% endif %}>
+                            {{ group.title }}
+
+                            {% include "unfold/helpers/app_list_badge.html" with item=group %}
+
+                            {% if group.collapsible %}
+                                <span class="material-symbols-outlined ml-auto transition-all group-hover:text-primary-600 dark:group-hover:text-primary-500" x-bind:class="{'rotate-90': navigationOpen}">
+                                    chevron_right
+                                </span>
+                            {% endif %}
+                        </h2>
+                    {% endif %}
+
+                    <ol class="flex flex-col gap-1 px-6" {% if group.collapsible %}x-show="navigationOpen"{% endif %}>
+                        {% for item in group.items %}
+                            {% if item.has_permission %}
+                                <li>
+                                    <a href="{% if item.link_callback %}{{ item.link_callback }}{% else %}{{ item.link }}{% endif %}" class="flex h-[38px] items-center -mx-3 px-3 rounded-default hover:text-primary-600 dark:hover:text-primary-500 {% if item.active %}bg-base-100 font-semibold text-primary-600 dark:bg-white/[.06] dark:text-primary-500 active{% endif %}">
+                                        {% if item.icon %}
+                                            <span class="material-symbols-outlined md-18 mr-3 w-[18px]">
+                                                {{ item.icon }}
+                                            </span>
+                                        {% endif %}
+
+                                        <span>{{ item.title|safe }}</span>
+
+                                        {% include "unfold/helpers/app_list_badge.html" with item=item %}
+                                    </a>
+                                </li>
+                            {% endif %}
+                        {% endfor %}
+                    </ol>
+                </div>
+            {% endif %}
+        {% endfor %}
+
+        {% if sidebar_show_all_applications and app_list|length > 0 %}
+            <div class="mb-4 mt-3">
+                <hr class="border-t border-base-200 mx-6 my-2 dark:border-base-800" />
+                    <div class="mb-3"><h3 class="mb-1 mx-3 py-1.5 px-3 font-bold text-font-important-light text-sm dark:text-font-important-dark">Applications</h3></div>
+                {% for app in app_list %}
+                    <div class="mb-3 last:mb-0">
+                        <h3 class="mb-1 mx-3 py-1.5 px-3 font-semibold text-font-important-light text-sm dark:text-font-important-dark">
+                            {{ app.name }}
+                        </h3>
+
+                        <ol class="flex flex-col gap-1 px-6">
+                            {% for model in app.models %}
+                                <li>
+                                    <a href="{{ model.admin_url }}" class="flex h-[38px] items-center -mx-3 px-3 rounded-default hover:text-primary-600 dark:hover:text-primary-500">
+                                        <span>{{ model.name }}</span>
+                                    </a>
+                                </li>
+                            {% endfor %}
+                        </ol>
+                    </div>
+                    <hr class="border-t border-base-200 mx-6 my-2 dark:border-base-800">
+                {% endfor %}
+            </div>
+        {% endif %}
+    </div>
+{% else %}
+    <p>
+        {% trans "You don't have permission to view or edit anything." as error_message %}
+        {% include "unfold/helpers/messages/error.html" with error=error_message %}
+    </p>
+{% endif %}