django-spire 0.16.3__tar.gz → 0.16.5__tar.gz

{django_spire-0.16.3 → django_spire-0.16.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.16.3
+Version: 0.16.5
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2024 Stratus Advanced Technologies and Contributors.

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/auth/mfa/views/page_views.py

@@ -18,7 +18,7 @@ def mfa_form_view(request):
         if form.is_valid():
             mfa_code.set_expired()
             profile.set_mfa_grace_period()
-            return HttpResponseRedirect(reverse('home:home'))
+            return HttpResponseRedirect(reverse('home:page:home'))
 
         if 'mfa_code' in form.errors:
             messages.error(request, form.errors['mfa_code'][0])
@@ -33,4 +33,3 @@ def mfa_form_view(request):
         context=context_data,
         template='django_spire/auth/mfa/mfa_form.html'
     )
-

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/auth/templates/django_spire/auth/page/password_change_done_page.html

@@ -7,5 +7,5 @@
 {% block authentication_page_content %}
     <h3>Password Reset</h3>
     <div class="py-2">You have successfully changed your password!</div>
-    <a class="w-100 btn btn-app-primary bg-app-primary mt-2" href="{% url 'home:home' %}">Home</a>
-{% endblock %}
+    <a class="w-100 btn btn-app-primary bg-app-primary mt-2" href="{% url 'home:page:home' %}">Home</a>
+{% endblock %}

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/auth/templates/django_spire/auth/page/password_change_page.html

@@ -4,9 +4,16 @@
     <h5 class="mb-2">Change Password</h5>
     <div>
         <form x-data="{
+            passwords_match: false,
             old_password: new GlueCharField('old_password', {required: true}),
-            new_password1: new GlueCharField('new_password1', {required: true}),
-            new_password2: new GlueCharField('new_password2', {required: true})
+            new_password1: new GlueCharField('new_password1', {required: true, label: 'New Password'}),
+            new_password2: new GlueCharField('new_password2', {required: true, label: 'Confirm New Password'}),
+
+            init() {
+                $watch(() => [this.new_password1, this.new_password2], () => {
+                    this.passwords_match = this.new_password1.value === this.new_password2.value
+                })
+            }
         }" method="post" class="text-app-secondary">
             {% csrf_token %}
             <div class="row">
@@ -26,7 +33,16 @@
             </div>
             <div class="row mt-2">
                 <div class="col">
-                    <button type="submit" class="w-100 btn btn-app-primary bg-app-primary mt-2">Submit</button>
+                    <span x-show="!passwords_match" class="text-app-danger">
+                        Password confirmation does not match new password.
+                    </span>
+                    <button
+                        type="submit"
+                        class="w-100 btn btn-app-primary bg-app-primary mt-2"
+                        :disabled="!passwords_match"
+                    >
+                        Submit
+                    </button>
                 </div>
             </div>
         </form>

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/auth/views/admin_views.py

@@ -18,6 +18,10 @@ class PasswordChangeView(auth_views.PasswordChangeView):
     template_name = 'django_spire/auth/page/password_change_page.html'
     success_url = reverse_lazy('django_spire:auth:admin:password_change_done')
 
+    def form_invalid(self, form):
+        show_form_errors(self.request, form)
+        return super().form_invalid(form)
+
 
 class PasswordChangeDone(auth_views.PasswordChangeDoneView):
     template_name = 'django_spire/auth/page/password_change_done_page.html'
@@ -28,6 +32,10 @@ class PasswordResetView(auth_views.PasswordResetView):
     success_url = reverse_lazy('django_spire:auth:admin:password_reset_done')
     template_name = 'django_spire/auth/page/password_reset_page.html'
 
+    def form_invalid(self, form):
+        show_form_errors(self.request, form)
+        return super().form_invalid(form)
+
 
 class PasswordResetComplete(auth_views.PasswordResetCompleteView):
     template_name = 'django_spire/auth/page/password_reset_complete_page.html'
@@ -45,6 +53,10 @@ class PasswordResetDone(auth_views.PasswordResetDoneView):
 class PasswordResetKeyForm(auth_views.PasswordResetView):
     template_name = 'django_spire/auth/page/password_reset_key_form_page.html'
 
+    def form_invalid(self, form):
+        show_form_errors(self.request, form)
+        return super().form_invalid(form)
+
 
 class PasswordResetKeyFormDone(auth_views.PasswordResetView):
     template_name = 'django_spire/auth/page/password_reset_key_done_page.html'
@@ -52,3 +64,7 @@ class PasswordResetKeyFormDone(auth_views.PasswordResetView):
 
 class PasswordSetForm(auth_views.PasswordResetView):
     template_name = 'django_spire/auth/page/password_set_form_page.html'
+
+    def form_invalid(self, form):
+        show_form_errors(self.request, form)
+        return super().form_invalid(form)

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.16.3'
+__VERSION__ = '0.16.5'
 
 
 AI_CHAT_WORKFLOW_SENDER_SETTINGS_NAME = 'AI_CHAT_WORKFLOW_NAME'

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/core/redirect/generic_redirect.py

@@ -35,4 +35,4 @@ def reverse_generic_relation(content_object: Any, **kwargs) -> HttpResponse | No
     if url_path is not None:
         return reverse(url_path, kwargs=kwargs)
 
-    return HttpResponse('home:home')
+    return HttpResponse('home:page:home')

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/core/static/django_spire/js/theme.js

@@ -14,7 +14,7 @@ document.addEventListener('alpine:init', () => {
             try {
                 let response = await ajax_request(
                     'GET',
-                    '/theme/ajax/get_config/'
+                    '/django_spire/theme/json/get_config/'
                 );
 
                 if (response && response.data) {
@@ -142,7 +142,7 @@ document.addEventListener('alpine:init', () => {
         async persist_to_server(value) {
             await ajax_request(
                 'POST',
-                '/theme/ajax/set_theme/',
+                '/django_spire/theme/json/set_theme/',
                 { theme: value }
             );
         },

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/core/templates/django_spire/dropdown/element/dropdown_link_element.html

@@ -1,5 +1,5 @@
 <a
-    class="fs--1 p-0 cursor-pointer text-decoration-none border-bottom bg-app-layer-three bg-app-layer-two-hover text-app-default-text-color"
+    class="fs--1 p-0 cursor-pointer text-decoration-none border-bottom bg-app-layer-one bg-app-layer-three-hover text-app-default-text-color"
     {% if link_url %}href="{{ link_url }}"{% endif %}
     {% if x_link_url %}
         x-show="{{ x_link_url }} ? true : false"

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/core/templates/django_spire/dropdown/element/ellipsis_dropdown_modal_link_element.html

@@ -1,6 +1,6 @@
 <a
     @click="dispatch_modal_view('{{ view_url }}'); toggle_dropdown();"
-    class="border-bottom fs--1 p-0 cursor-pointer text-decoration-none border-bottom bg-app-layer-three bg-app-layer-two-hover text-app-default-text-color"
+    class="border-bottom fs--1 p-0 cursor-pointer text-decoration-none border-bottom bg-app-layer-one bg-app-layer-three-hover text-app-default-text-color"
 >
     <div class="px-3 py-1 text-nowrap {{ link_css }}">
         {{ link_text }}

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/core/templates/django_spire/dropdown/ellipsis_dropdown.html

@@ -4,7 +4,7 @@
 
 {% block dropdown_trigger %}
     <span
-        class="bi bi-three-dots-vertical"
+        class="bi bi-three-dots-vertical px-1"
         x-bind="trigger"
     >
     </span>

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/core/templates/django_spire/dropdown/ellipsis_modal_dropdown.html

@@ -4,7 +4,7 @@
 
 {% block dropdown_trigger %}
     <span
-        class="bi bi-three-dots-vertical {% block ellipsis_class %}{% endblock %}"
+        class="bi bi-three-dots-vertical px-1 {% block ellipsis_class %}{% endblock %}"
         x-bind="trigger"
     >
     </span>

django_spire-0.16.5/django_spire/core/templates/django_spire/navigation/top_navigation.html

@@ -0,0 +1,71 @@
+{% load static %}
+
+<div class="top-navigation row justify-content-between align-items-center p-1 p-md-2 mb-3 border-bottom shadow-sm">
+    {% block top_navigation_content %}
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <a href="/" class="d-block mb-3">
+                    <span class="fs-5 fs-md-1 fw-bold d-none d-lg-block float-start">
+                        {% block top_navigation_title %}
+                            Django Spire
+                        {% endblock %}
+                    </span>
+                    </a>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col">
+                    {% include 'django_spire/element/breadcrumb_element.html' %}
+                </div>
+            </div>
+        </div>
+
+        <div class="col-auto d-flex">
+            {% block top_navigation_icons %}
+                {% block theme_selector %}
+                    <div>
+                        {% include 'django_spire/theme/element/theme_selector.html' with icon_size='fs-2' %}
+                    </div>
+                {% endblock %}
+
+                <div class="dropdown">
+                    <i
+                        class="bi bi-person-circle fs-2 mx-2 cursor-pointer"
+                        id="dropdownMenuButton1"
+                        data-bs-toggle="dropdown"
+                        aria-expanded="false"
+                    >
+                    </i>
+                    <ul class="dropdown-menu py-0 bg-app-layer-one" aria-labelledby="dropdownMenuButton1">
+                        {% if request.user.is_superuser %}
+                            <li class="py-0  ">
+                                <a class="dropdown-item fs--1 bg-app-layer-three-hover"
+                                   href="{% url 'admin:index' %}" target="_blank">
+                                    Admin Panel
+                                </a>
+                            </li>
+                        {% endif %}
+                        <li class="py-0">
+                            <a href="{% url 'django_spire:auth:admin:password_change' %}"
+                               class="dropdown-item fs--1 bg-app-layer-three-hover">
+                                Change Password
+                            </a>
+                        </li>
+                        <li class="py-0">
+                            <a href="{% url 'django_spire:auth:redirect:logout' %}"
+                               class="dropdown-item fs--1 bg-app-layer-three-hover">
+                                Logout
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+
+                <div class="col-auto d-lg-none">
+                    {% include 'django_spire/navigation/mobile_navigation.html' %}
+                </div>
+            {% endblock %}
+        </div>
+    {% endblock %}
+</div>

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/core/templates/django_spire/page/full_page.html

@@ -8,7 +8,7 @@
             {% endblock %}
         </div>
 
-        <div class="full-page-content container-fluid">
+        <div class="d-flex flex-column container-fluid">
             <div class="row sticky-top">
                 <div class="col-12 sticky-top">
                     {% block full_page_top_navigation %}
@@ -17,7 +17,7 @@
                 </div>
             </div>
 
-            <div class="row">
+            <div class="row flex-grow-1">
                 <div class="col-12">
                     {% block full_page_content %}
                     {% endblock %}

django_spire-0.16.5/django_spire/core/templatetags/json.py

@@ -0,0 +1,14 @@
+from typing import Sequence
+
+from django import template
+import json
+
+register = template.Library()
+
+
+@register.filter(name='to_json')
+def to_json(value: dict | Sequence) -> str:
+    try:
+        return json.dumps(value)
+    except (TypeError, ValueError) as e:
+        return ''

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/theme/templates/django_spire/theme/element/theme_selector.html

@@ -6,13 +6,13 @@
         aria-expanded="false"
     ></i>
 
-    <ul class="bg-app-layer-two dropdown-menu py-0" aria-labelledby="theme_dropdown_button">
+    <ul class="bg-app-layer-one dropdown-menu py-0" aria-labelledby="theme_dropdown_button">
         <li>
             <small><p class="dropdown-header fs--1" x-text="$store.theme.get_current_display_name()"></p></small>
         </li>
 
         <li>
-            <a class="dropdown-item fs--1" href="#" @click.prevent="$store.theme.toggle()">
+            <a class="dropdown-item fs--1 bg-app-layer-three-hover" href="#" @click.prevent="$store.theme.toggle()">
                 Toggle Mode
             </a>
         </li>
@@ -22,7 +22,7 @@
         <template x-for="family in families" :key="family.value">
             <li>
                 <a
-                    class="dropdown-item fs--1"
+                    class="dropdown-item fs--1 bg-app-layer-three-hover"
                     href="#"
                     @click.prevent="$store.theme.set_family(family.value)"
                     x-text="family.name"

django_spire-0.16.3/django_spire/theme/tests/test_views.py → django_spire-0.16.5/django_spire/theme/tests/test_views/test_json_views.py

@@ -11,7 +11,7 @@ from django.http import JsonResponse
 from django_spire.core.tests.test_cases import BaseTestCase
 from django_spire.theme.enums import ThemeFamily
 from django_spire.theme.utils import get_theme_cookie_name
-from django_spire.theme.views import ajax_views
+from django_spire.theme.views import json_views
 
 
 class ThemeViewTests(TestCase):
@@ -19,8 +19,8 @@ class ThemeViewTests(TestCase):
         self.factory = RequestFactory()
 
     def test_get_config_success(self) -> None:
-        request = self.factory.get('/theme/ajax/get_config/')
-        response = ajax_views.get_config(request)
+        request = self.factory.get('/django_spire/theme/json/get_config/')
+        response = json_views.get_config(request)
 
         self.assertIsInstance(response, JsonResponse)
         self.assertEqual(response.status_code, HTTPStatus.OK)
@@ -42,18 +42,18 @@ class ThemeViewTests(TestCase):
             self.assertEqual(set(family_config['modes']), {'dark', 'light'})
 
     def test_get_config_cache_header(self) -> None:
-        _ = self.factory.get('/theme/ajax/get_config/')
+        _ = self.factory.get('/django_spire/theme/json/get_config/')
 
-        with patch('django_spire.theme.views.ajax_views.cache_page') as _:
-            self.assertTrue(hasattr(ajax_views.get_config, '__wrapped__'))
+        with patch('django_spire.theme.views.json_views.cache_page') as _:
+            self.assertTrue(hasattr(json_views.get_config, '__wrapped__'))
 
     def test_set_theme_success(self) -> None:
         request = self.factory.post(
-            '/theme/ajax/set_theme/',
+            '/django_spire/theme/json/set_theme/',
             data=json.dumps({'theme': 'dracula-dark'}),
             content_type='application/json'
         )
-        response = ajax_views.set_theme(request)
+        response = json_views.set_theme(request)
 
         self.assertIsInstance(response, JsonResponse)
         self.assertEqual(response.status_code, HTTPStatus.OK)
@@ -72,11 +72,11 @@ class ThemeViewTests(TestCase):
 
     def test_set_theme_missing_theme(self) -> None:
         request = self.factory.post(
-            '/theme/ajax/set_theme/',
+            '/django_spire/theme/json/set_theme/',
             data=json.dumps({}),
             content_type='application/json'
         )
-        response = ajax_views.set_theme(request)
+        response = json_views.set_theme(request)
 
         self.assertEqual(response.status_code, HTTPStatus.BAD_REQUEST)
         data = json.loads(response.content)
@@ -86,11 +86,11 @@ class ThemeViewTests(TestCase):
 
     def test_set_theme_invalid_theme(self) -> None:
         request = self.factory.post(
-            '/theme/ajax/set_theme/',
+            '/django_spire/theme/json/set_theme/',
             data=json.dumps({'theme': 'invalid-theme'}),
             content_type='application/json'
         )
-        response = ajax_views.set_theme(request)
+        response = json_views.set_theme(request)
 
         self.assertEqual(response.status_code, HTTPStatus.BAD_REQUEST)
         data = json.loads(response.content)
@@ -102,7 +102,7 @@ class ThemeViewTests(TestCase):
 class ThemeViewIntegrationTests(BaseTestCase):
     def test_set_theme_with_authenticated_client(self) -> None:
         response = self.client.post(
-            '/theme/ajax/set_theme/',
+            '/django_spire/theme/json/set_theme/',
             data=json.dumps({'theme': 'dracula-dark'}),
             content_type='application/json'
         )
@@ -112,7 +112,7 @@ class ThemeViewIntegrationTests(BaseTestCase):
         self.assertTrue(data['success'])
 
     def test_get_config_with_authenticated_client(self) -> None:
-        response = self.client.get('/theme/ajax/get_config/')
+        response = self.client.get('/django_spire/theme/json/get_config/')
         self.assertEqual(response.status_code, HTTPStatus.OK)
 
         data = json.loads(response.content)

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire/theme/urls/__init__.py

@@ -4,6 +4,6 @@ from django.urls.conf import path, include
 app_name = 'theme'
 
 urlpatterns = [
-    path('ajax/', include('django_spire.theme.urls.ajax_urls', namespace='ajax')),
+    path('json/', include('django_spire.theme.urls.json_urls', namespace='json')),
     path('page/', include('django_spire.theme.urls.page_urls', namespace='page')),
 ]

django_spire-0.16.5/django_spire/theme/urls/json_urls.py

@@ -0,0 +1,10 @@
+from django.urls import path
+
+from django_spire.theme.views import json_views
+
+app_name = 'json'
+
+urlpatterns = [
+    path('get_config/', json_views.get_config, name='get_config'),
+    path('set_theme/', json_views.set_theme, name='set_theme'),
+]

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.16.3
+Version: 0.16.5
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2024 Stratus Advanced Technologies and Contributors.

{django_spire-0.16.3 → django_spire-0.16.5}/django_spire.egg-info/SOURCES.txt

@@ -1079,10 +1079,11 @@ django_spire/theme/tests/test_enums.py
 django_spire/theme/tests/test_filesystem.py
 django_spire/theme/tests/test_integration.py
 django_spire/theme/tests/test_model.py
-django_spire/theme/tests/test_views.py
+django_spire/theme/tests/test_views/__init__.py
+django_spire/theme/tests/test_views/test_json_views.py
 django_spire/theme/urls/__init__.py
-django_spire/theme/urls/ajax_urls.py
+django_spire/theme/urls/json_urls.py
 django_spire/theme/urls/page_urls.py
 django_spire/theme/views/__init__.py
-django_spire/theme/views/ajax_views.py
+django_spire/theme/views/json_views.py
 django_spire/theme/views/page_views.py

django_spire-0.16.3/django_spire/core/templates/django_spire/navigation/top_navigation.html

@@ -1,70 +0,0 @@
-{% load static %}
-
-<div class="top-navigation row justify-content-between align-items-center p-1 p-md-2 mb-3 border-bottom shadow-sm">
-    {% block top_navigation_content %}
-        <div class="col">
-            <div class="row">
-                <div class="col">
-                    <a href="/" class="d-block mb-3">
-                    <span class="fs-5 fs-md-1 fw-bold d-none d-lg-block float-start">
-                        {% block top_navigation_title %}
-                            Django Spire
-                        {% endblock %}
-                    </span>
-                    </a>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col">
-                    {% include 'django_spire/element/breadcrumb_element.html' %}
-                </div>
-            </div>
-        </div>
-
-        <div class="col-auto d-flex">
-            <div class="dropdown">
-                <i
-                    class="bi bi bi-gear-fill fs-2 mx-2 cursor-pointer"
-                    id="dropdownMenuButton1"
-                    data-bs-toggle="dropdown"
-                    aria-expanded="false"
-                >
-                </i>
-            </div>
-
-            <div class="dropdown">
-                <i
-                    class="bi bi-person-circle fs-2 mx-2 cursor-pointer"
-                    id="dropdownMenuButton1"
-                    data-bs-toggle="dropdown"
-                    aria-expanded="false"
-                >
-                </i>
-                <ul class="dropdown-menu py-0" aria-labelledby="dropdownMenuButton1">
-                    {% if request.user.is_superuser %}
-                        <li>
-                            <a class="dropdown-item fs--1" href="{% url 'admin:index' %}" target="_blank">
-                                Admin Panel
-                            </a>
-                        </li>
-                    {% endif %}
-                    <li>
-                        <a class="dropdown-item fs--1">
-                            Change Password
-                        </a>
-                    </li>
-                    <li>
-                        <a class="dropdown-item fs--1">
-                            Logout
-                        </a>
-                    </li>
-                </ul>
-            </div>
-
-            <div class="col-auto d-lg-none">
-                {% include 'django_spire/navigation/mobile_navigation.html' %}
-            </div>
-        </div>
-    {% endblock %}
-</div>

django_spire-0.16.3/django_spire/core/templatetags/json.py

@@ -1,11 +0,0 @@
-from django import template
-import json
-
-register = template.Library()
-
-@register.filter(name='json_loads')
-def json_loads(value):
-    try:
-        return json.loads(value)
-    except (TypeError, ValueError) as e:
-        return {}

django_spire-0.16.3/django_spire/theme/urls/ajax_urls.py

@@ -1,10 +0,0 @@
-from django.urls import path
-
-from django_spire.theme.views import ajax_views
-
-app_name = 'ajax'
-
-urlpatterns = [
-    path('get_config/', ajax_views.get_config, name='get_config'),
-    path('set_theme/', ajax_views.set_theme, name='set_theme'),
-]