django-spire 0.25.1__py3-none-any.whl → 0.26.0__py3-none-any.whl

django_spire/core/management/commands/spire_startapp_pkg/template/templates/form/${list_filter_form_template_name}.html.template

@@ -0,0 +1,30 @@
+{% extends 'django_spire/filtering/form/base_session_filter_form.html' %}
+
+{% load session_tags %}
+
+{% block session_filter_key %}{{ filter_session.session_key }}{% endblock %}
+
+{% block filter_content %}
+    <div
+        class="row g-2 mb-2"
+        x-data="{
+            async init() {
+                this.search_field.set_attribute('placeholder', 'Search...')
+            },
+
+            session_controller: new SessionController('{% session_controller_to_json filter_session.session_key %}'),
+            search_field: new GlueCharField(
+                'search',
+                {
+                    value: '{{ filter_session.search|default:"" }}',
+                    label: 'Search',
+                    name: 'search',
+                }
+            ),
+        }"
+    >
+        <div class="col-3">
+            {% include 'django_glue/form/field/char_field.html' with glue_field='search_field' %}
+        </div>
+    </div>
+{% endblock %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/item/${item_template_name}.html.template

@@ -1,24 +1,36 @@
-{% extends 'django_spire/item/item.html' %}
+{% extends 'django_spire/item/infinite_scroll_item.html' %}
 
-{% block item_title %}
-    {% url '${url_reverse_path}:page:detail' pk=${context_single_var}.pk as ${context_single_var}_view_url %}
-    {% include 'django_spire/element/attribute_element.html' with attribute_title='${model_verbose_name}' attribute_value=${context_single_var}.name attribute_href=${context_single_var}_view_url %}
-{% endblock %}
+{% block item_content %}
+    <div class="row justify-content-center align-items-center position-relative">
+        <div class="col">
+            <div class="row justify-content-between align-items-center {% block item_row_content_outer_class %}{% endblock %}">
+                <div class="col">
+                    <div class="row align-items-center {% block item_content_gutter %}g-2{% endblock %}">
+                        <div class="row mt-3">
+                            <div class="col-6">
+                                {% url '${url_reverse_path}:page:detail' pk=${context_single_var}.pk as ${context_single_var}_view_url %}
+                                {% include 'django_spire/element/attribute_element.html' with attribute_title='${model_verbose_name}' attribute_value=${context_single_var}.name attribute_href=${context_single_var}_view_url %}
+                            </div>
+                            <div class="col-6">
+                                {% include 'django_spire/element/attribute_element.html' with attribute_title='Description' attribute_value=${context_single_var}.description %}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto top-0 end-0 position-absolute position-lg-static pt-2 pt-lg-0">
+                    {% url '${url_reverse_path}:page:detail' pk=${context_single_var}.pk as ${context_single_var}_view_url %}
 
-{% block item_row_content %}
-    {% include 'django_spire/element/attribute_element.html' with attribute_title='Description' attribute_value=${context_single_var}.description %}
-{% endblock %}
+                    {% if perms.${permission_prefix}.change_${model_instance_name} %}
+                        {% url '${url_reverse_path}:form:update' pk=${context_single_var}.pk as ${context_single_var}_edit_url %}
+                    {% endif %}
 
-{% block item_button %}
-    {% url '${url_reverse_path}:page:detail' pk=${context_single_var}.pk as ${context_single_var}_view_url %}
+                    {% if perms.${permission_prefix}.delete_${model_instance_name} %}
+                        {% url '${url_reverse_path}:form:delete' pk=${context_single_var}.pk as ${context_single_var}_delete_url %}
+                    {% endif %}
 
-    {% if perms.${permission_prefix}.change_${model_instance_name} %}
-        {% url '${url_reverse_path}:form:update' pk=${context_single_var}.pk as ${context_single_var}_edit_url %}
-    {% endif %}
-
-    {% if perms.${permission_prefix}.delete_${model_instance_name} %}
-        {% url '${url_reverse_path}:form:delete' pk=${context_single_var}.pk as ${context_single_var}_delete_url %}
-    {% endif %}
-
-    {% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url=${context_single_var}_view_url edit_url=${context_single_var}_edit_url delete_url=${context_single_var}_delete_url %}
-{% endblock %}
+                    {% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url=${context_single_var}_view_url edit_url=${context_single_var}_edit_url delete_url=${context_single_var}_delete_url %}
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/item/${list_items_template_name}.html.template

@@ -0,0 +1,3 @@
+{% for ${context_single_var} in ${context_plural_var} %}
+    {% include '${template_directory_path}/item/${item_template_name}.html' %}
+{% endfor %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/page/${detail_page_template_name}.html.template

@@ -1,13 +1,13 @@
 {% extends 'django_spire/page/full_page.html' %}
 
-{% block page_content %}
+{% block full_page_content %}
     <div class="row g-3">
         <div class="col-12">
-            {% include '${template_directory_path}/card/${detail_card_template_name}' %}
+            {% include '${template_directory_path}/card/${detail_card_template_name}.html' %}
         </div>
 
         <div class="col-4">
-            {% include 'history/card/activity_list_card.html' with activity_log=${context_single_var}.activity_log.prefetch_user %}
+            {% include 'django_spire/activity/card/list_card.html' with activity_log=${context_single_var}.activity_log.prefetch_user %}
         </div>
     </div>
 {% endblock %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/page/${form_page_template_name}.html.template

@@ -1,12 +1,12 @@
 {% extends 'django_spire/page/form_full_page.html' %}
 
-{% block page_content %}
+{% block full_page_content %}
     <form method="post">
         {% csrf_token %}
 
         <div class="row g-3">
             <div class="col-12">
-                {% include '${template_directory_path}/card/${form_card_template_name}' %}
+                {% include '${template_directory_path}/card/${form_card_template_name}.html' %}
             </div>
         </div>
     </form>

django_spire/core/management/commands/spire_startapp_pkg/template/templates/page/${list_page_template_name}.html.template

@@ -1,9 +1,9 @@
 {% extends 'django_spire/page/full_page.html' %}
 
-{% block page_content %}
+{% block full_page_content %}
     <div class="row">
         <div class="col-12">
-            {% include '${template_directory_path}/card/${list_card_template_name}' %}
+            {% include '${template_directory_path}/card/${list_card_template_name}.html' %}
         </div>
     </div>
 {% endblock %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/table/${table_row_template_name}.html.template

@@ -0,0 +1,6 @@
+{% extends 'django_spire/table/element/row.html' %}
+
+{% block table_cell %}
+    {#    Add a td element for each column header defined in your table.html, e.g. #}
+    {#    <td>{{ ${context_single_var}.name }}</td> #}
+{% endblock %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/table/${table_rows_template_name}.html.template

@@ -0,0 +1,3 @@
+{% for ${context_single_var} in ${context_plural_var} %}
+    {% include '${template_directory_path}/table/${table_row_template_name}.html' with row=${context_single_var} %}
+{% endfor %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/table/${table_template_name}.html.template

@@ -0,0 +1,6 @@
+{% extends 'django_spire/table/base.html' %}
+
+{% block table_header %}
+    {#    Add your table's column headers here #}
+    {#    e.g. {% include 'django_spire/table/element/header.html' with sort_key='name' label='${model_verbose_name} Name' %}#}
+{% endblock %}

django_spire/core/management/commands/spire_startapp_pkg/user_input.py

@@ -2,10 +2,13 @@ from __future__ import annotations
 
 import re
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Tuple
 
 from django.core.management.base import CommandError
 
+from django_spire.core.management.commands.spire_startapp_pkg.exceptions import \
+    AppExistsError
+
 if TYPE_CHECKING:
     from django_spire.core.management.commands.spire_startapp_pkg.reporter import Reporter
     from django_spire.core.management.commands.spire_startapp_pkg.validator import AppValidator
@@ -30,6 +33,8 @@ class UserInputCollector:
         self.reporter = reporter
         self.validator = validator
 
+        self.skip_app_creation = False
+
     def collect_all_inputs(self) -> dict[str, str]:
         """
         Collects all required user inputs for app creation.
@@ -52,13 +57,19 @@ class UserInputCollector:
         db_table_name = self._collect_db_table_name(components, app_name)  # Changed from app_label to components, app_name
         model_permission_path = self._collect_model_permission_path(app_path, model_name)
 
-        permission_data = self._collect_permission_inheritance(components)
+        if not self.skip_app_creation:
+            permission_data = self._collect_permission_inheritance(components)
+        else:
+            permission_data = {}
+
+        template_options = self._collect_template_generation_options(components)
 
         verbose_name, verbose_name_plural = self._derive_verbose_names(model_name, model_name_plural)
 
         return {
             'app_path': app_path,
             'app_name': app_name,
+            'skip_app_generation': self.skip_app_creation,
             'model_name': model_name,
             'model_name_plural': model_name_plural,
             'app_label': app_label,
@@ -67,6 +78,7 @@ class UserInputCollector:
             'verbose_name': verbose_name,
             'verbose_name_plural': verbose_name_plural,
             **permission_data,
+            **template_options
         }
 
     def _collect_app_label(self, components: list[str], app_name: str) -> str:
@@ -79,8 +91,12 @@ class UserInputCollector:
         """
 
         immediate_parent = components[-2] if len(components) > 2 else None
+
         default = immediate_parent.lower() + '_' + app_name.lower() if immediate_parent else app_name.lower()
-        return self._collect_input('Enter the app label', default, '3/8')
+        if self.skip_app_creation:
+            return default
+        else:
+            return self._collect_input('Enter the app label', default, '3/8')
 
     def _collect_app_name(self, components: list[str]) -> str:
         """
@@ -91,7 +107,10 @@ class UserInputCollector:
         """
 
         default = components[-1]
-        return self._collect_input('Enter the app name', default, '2/8')
+        if self.skip_app_creation:
+            return default
+        else:
+            return self._collect_input('Enter the app name', default, '2/8')
 
     def _collect_app_path(self) -> str:
         """
@@ -110,7 +129,12 @@ class UserInputCollector:
             raise CommandError(message)
 
         components = app_path.split('.')
-        self.validator.validate_app_path(components)
+
+        try:
+            self.validator.validate_app_path(components)
+        except AppExistsError as exc:
+            self.reporter.write('\nSkipping app creation.', self.reporter.style_notice)
+            self.skip_app_creation = True
 
         return app_path
 
@@ -125,7 +149,10 @@ class UserInputCollector:
 
         parent_parts = components[1:-1] if len(components) > 1 else []
         default = '_'.join(parent_parts).lower() + '_' + app_name.lower() if parent_parts else app_name.lower()
-        return self._collect_input('Enter the database table name', default, '6/8')
+        if self.skip_app_creation:
+            return default
+        else:
+            return self._collect_input('Enter the database table name', default, '6/8')
 
     def _collect_input(self, prompt: str, default: str, step_number: str) -> str:
         """
@@ -150,7 +177,10 @@ class UserInputCollector:
         """
 
         default = ''.join(word.title() for word in app_name.split('_'))
-        return self._collect_input('Enter the model name', default, '4/8')
+        if self.skip_app_creation:
+            return default
+        else:
+            return self._collect_input('Enter the model name', default, '4/8')
 
     def _collect_model_name_plural(self, model_name: str) -> str:
         """
@@ -161,7 +191,10 @@ class UserInputCollector:
         """
 
         default = model_name + 's'
-        return self._collect_input('Enter the model name plural', default, '5/8')
+        if self.skip_app_creation:
+            return default
+        else:
+            return self._collect_input('Enter the model name plural', default, '5/8')
 
     def _collect_model_permission_path(self, app_path: str, model_name: str) -> str:
         """
@@ -173,7 +206,11 @@ class UserInputCollector:
         """
 
         default = f'{app_path}.models.{model_name}'
-        return self._collect_input('Enter the model permission path', default, '7/8')
+        if self.skip_app_creation:
+            return default
+        else:
+            return self._collect_input('Enter the model permission path', default,
+                                       '7/8')
 
     def _collect_permission_inheritance(self, components: list[str]) -> dict[str, str]:
         """
@@ -253,3 +290,39 @@ class UserInputCollector:
         self.reporter.write('\n[8/8]: Do you want this app to inherit permissions from its parent? (y/n)', self.reporter.style_notice)
         user_input = input('Default is "n": ').strip().lower()
         return user_input == 'y'
+
+    def _collect_template_generation_options(self, components):
+        user_input = {}
+
+        try:
+            self.validator.validate_template_path(components)
+        except AppExistsError:
+            user_input['skip_template_generation'] = True
+            return user_input
+
+        self.reporter.write('\n[Template Creation Wizard]\n\n',
+                            self.reporter.style_success)
+
+        user_input[
+            'skip_template_generation'] = self._collect_skip_template_generation()
+
+        if not user_input['skip_template_generation']:
+            user_input['list_display_type'] = self._collect_input(
+                'How do you want to display items on the list page? (items/table)',
+                'items',
+                '2/2')
+
+        return user_input
+
+    def _collect_skip_template_generation(self):
+        """
+        Prompts the user to generate templates.
+
+        :return: True if user wants to skip template generation, False otherwise.
+        """
+
+        user_input = self._collect_input(
+            'Do you want to generate templates for this app? (y/n)', 'n',
+            '1/2')
+
+        return user_input == 'n'

django_spire/core/management/commands/spire_startapp_pkg/validator.py

@@ -4,6 +4,9 @@ from typing import TYPE_CHECKING
 
 from django.core.management.base import CommandError
 
+from django_spire.core.management.commands.spire_startapp_pkg.exceptions import \
+    AppExistsError
+
 if TYPE_CHECKING:
     from django_spire.core.management.commands.spire_startapp_pkg.filesystem import FileSystem
     from django_spire.core.management.commands.spire_startapp_pkg.registry import AppRegistry
@@ -65,14 +68,24 @@ class AppValidator:
         destination = self._path_resolver.get_app_destination(components)
 
         if self._filesystem.has_content(destination):
-            self._reporter.write('\n', self._reporter.style_notice)
+            message = f'The app already exists at {destination}.'
+            self._reporter.write(f'\n{message}', self._reporter.style_notice)
+            raise AppExistsError(message)
 
-            message = (
-                f'The app already exists at {destination}. '
-                'Please remove the existing app or choose a different name.'
-            )
+    def validate_template_path(self, components: list[str]) -> None:
+        """
+        Validates that an app's template path doesn't already exist.
 
-            raise CommandError(message)
+        :param components: List of app path components.
+        :raises CommandError: If an app already exists at the destination path.
+        """
+
+        destination = self._path_resolver.get_template_destination(components)
+
+        if self._filesystem.has_content(destination):
+            message = f'App templates already exists at {destination}.'
+            self._reporter.write(f'\n{message}', self._reporter.style_notice)
+            raise AppExistsError(message)
 
     def validate_root_app(self, components: list[str]) -> None:
         """

django_spire/core/middleware.py

@@ -7,9 +7,8 @@ from typing import TYPE_CHECKING, Callable
 
 # from django_spire.consts import MAINTENANCE_MODE_SETTINGS_NAME
 
-if TYPE_CHECKING:
-    from django.core.handlers.wsgi import WSGIRequest
-    from django.http import HttpResponse
+from django.core.handlers.wsgi import WSGIRequest
+from django.http import HttpResponse
 
 
 class MaintenanceMiddleware:

django_spire/core/querysets.py

@@ -0,0 +1,19 @@
+from django.db.models import QuerySet, Q
+
+
+class SearchQuerySetMixin:
+    def search(self, search_value: str) -> QuerySet:
+        words = search_value.split(' ')
+
+        filtered_query = self
+
+        char_fields = [
+            field.name for field in self.model._meta.fields
+            if field.get_internal_type() == 'CharField'
+        ]
+
+        for word in words:
+            or_conditions = Q()
+            for field in char_fields:
+                or_conditions |= Q(**{f"{field}__icontains": word})
+            filtered_query = filtered_query.filter(or_conditions)

django_spire/core/static/django_spire/js/theme.js

@@ -247,16 +247,19 @@ window.get_echarts_theme = function() {
     let is_dark = document.documentElement.getAttribute('data-theme') === 'dark';
 
     return {
-        text: styles.getPropertyValue('--app-default-text-color').trim(),
-        primary: styles.getPropertyValue('--app-primary').trim(),
-        primary_dark: styles.getPropertyValue('--app-primary-dark').trim(),
-        secondary: styles.getPropertyValue('--app-secondary').trim(),
-        secondary_dark: styles.getPropertyValue('--app-secondary-dark').trim(),
-        border: styles.getPropertyValue('--bs-border-color').trim(),
         bg: styles.getPropertyValue('--app-layer-one').trim(),
+        border: styles.getPropertyValue('--bs-border-color').trim(),
+        danger: styles.getPropertyValue('--app-danger').trim(),
+        is_dark: is_dark,
         layer_two: styles.getPropertyValue('--app-layer-two').trim(),
         layer_three: styles.getPropertyValue('--app-layer-three').trim(),
         layer_four: styles.getPropertyValue('--app-layer-four').trim(),
-        is_dark: is_dark,
+        primary: styles.getPropertyValue('--app-primary').trim(),
+        primary_dark: styles.getPropertyValue('--app-primary-dark').trim(),
+        secondary: styles.getPropertyValue('--app-secondary').trim(),
+        secondary_dark: styles.getPropertyValue('--app-secondary-dark').trim(),
+        success: styles.getPropertyValue('--app-success').trim(),
+        text: styles.getPropertyValue('--app-default-text-color').trim(),
+        warning: styles.getPropertyValue('--app-warning').trim(),
     };
 };

django_spire/core/templates/django_spire/badge/base_badge.html

@@ -4,9 +4,8 @@
         {{ badge_class|default:'fs--1' }}
     "
 >
-    {% if badge_text %}
-        {{ badge_text }}
-    {% endif %}
+    {% block badge_text %}{% endblock %}
+    {{ badge_text }}
 
     {% if x_badge_text %}
         <span x-text="{{ x_badge_text }}"></span>

django_spire/core/templates/django_spire/base/base.html

@@ -42,6 +42,7 @@
                     path: '{{ DJANGO_SPIRE_THEME_PATH|escapejs }}'
                 };
             </script>
+            <link rel="manifest" href="{% static 'django_spire/favicons/manifest.json' %}">
 
             <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
             <script src="https://cdn.jsdelivr.net/npm/echarts@5.4.x/dist/echarts.min.js"></script>

django_spire/core/templates/django_spire/button/base_button.html

@@ -1,8 +1,9 @@
 <a
     class="btn shadow-sm {% block button_class %}{% endblock %} {{ button_class|default:'btn-sm' }}"
     {% block button_attributes %}{% endblock %}
+        {{ button_attributes }}
     {% if button_href %}href="{{ button_href }}{{ button_url_params }}"{% endif %}
-    {% if x_button_click %}@click="{{ x_button_click }}"{% endif %}
+    {% if x_button_click or button_modal_href %}@click="{% if button_modal_href %}dispatch_modal_view('{{ button_modal_href }}'){% else %}{{ x_button_click }}{% endif %}"{% endif %}
 >
     {% if button_icon %}
         <i class="{{ button_icon }}"></i>

django_spire/core/templates/django_spire/card/title_card.html

@@ -7,7 +7,8 @@
 {% block card_body_style %}display: flex; flex-direction: column; min-height: 0;{% endblock %}
 
 {% block card_content %}
-    <div
+    <{% block card_title_content_container_element_type %}div{% endblock %}
+            {% block card_title_content_container_attributes %}{% endblock %}
         class="d-flex flex-column flex-grow-1"
         style="min-height: 0;"
         x-data="{
@@ -17,17 +18,19 @@
             }
         }"
     >
-        <div class="row justify-content-between align-items-center mb-2 pb-2 border-bottom flex-shrink-0" style="min-height: 38px;">
-            <div class="col d-flex align-items-center">
-                <div class="card-title text-uppercase mb-0">
-                    {% block card_title %}
-                    {% endblock %}
+        {% block card_title_header_content %}
+            <div class="row justify-content-between align-items-center mb-2 pb-2 border-bottom flex-shrink-0" style="min-height: 38px;">
+                <div class="col d-flex align-items-center">
+                    <div class="card-title text-uppercase mb-0">
+                        {% block card_title %}
+                        {% endblock %}
+                    </div>
+                </div>
+                <div class="{% block card_button_col_class %}col-auto{% endblock %} d-flex">
+                    {% block card_button %}{% endblock %}
                 </div>
             </div>
-            <div class="col-auto d-flex">
-                {% block card_button %}{% endblock %}
-            </div>
-        </div>
+        {% endblock %}
         <div x-show="card_title_dropdown" x-cloak x-collapse class="flex-shrink-0">
             {% block card_dropdown_content %}
             {% endblock %}

django_spire/core/templates/django_spire/container/container.html

@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="row justify-content-between align-items-end px-md-3 py-2">
             <div class="col">
-                <h1 class="fs-1 fw-semi-bold">
+                <h1 class="{% block container_title_class %}fs-1 fw-semi-bold{% endblock %}">
                     {% block container_title %}
                     {% endblock %}
                 </h1>

django_spire/core/templates/django_spire/filtering/form/base_session_filter_form.html

@@ -1,7 +1,7 @@
 <form
     method="get"
     action="{% block session_filter_url %}{% endblock %}"
-    class="row border-bottom"
+    class="{% block form_class %}row border-bottom{% endblock %}"
 >
     <div class="col-12">
         <input type="text" hidden value="{% block session_filter_key %}{% endblock %}" name="session_filter_key">