accrete 0.0.7__tar.gz → 0.0.9__tar.gz

{accrete-0.0.7 → accrete-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accrete
-Version: 0.0.7
+Version: 0.0.9
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek
@@ -34,7 +34,9 @@ Requires-Python: >=3.10
 Requires-Dist: django>=4.2
 Provides-Extra: contrib
 Requires-Dist: celery>=5.3.4; extra == 'contrib'
+Requires-Dist: django-celery-beat; extra == 'contrib'
 Provides-Extra: dev
+Requires-Dist: build; extra == 'dev'
 Requires-Dist: pytest>=7.0; extra == 'dev'
 Requires-Dist: twine>=4.0.2; extra == 'dev'
 Description-Content-Type: text/markdown

accrete-0.0.9/accrete/config.py

@@ -0,0 +1,14 @@
+import logging
+from django.conf import settings
+
+_logger = logging.getLogger(__name__)
+
+ACCRETE_TENANT_NOT_SET_URL = getattr(
+    settings, 'ACCRETE_TENANT_NOT_SET_URL',
+    False
+)
+
+if not ACCRETE_TENANT_NOT_SET_URL:
+    _logger.warning(
+        'Setting ACCRETE_TENANT_NOT_SET_URL missing.'
+    )

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/__init__.py

@@ -1,3 +1,4 @@
+from . import config
 from .filter import Filter
 from .helper import (
     ClientAction,
@@ -8,4 +9,4 @@ from .helper import (
     build_querystring,
     parse_client_actions,
     queryset_from_querystring
-)
+)

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/config.py

@@ -1,6 +1,8 @@
+import logging
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.translation import gettext_lazy as _
+
+_logger = logging.getLogger(__name__)
+
 
 ACCRETE_UI_ACTIONS_TEMPLATE = getattr(
     settings, 'ACCRETE_UI_ACTIONS_TEMPLATE',

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/helper.py

@@ -19,7 +19,9 @@ ACTIONS_TEMPLATE = config.ACCRETE_UI_ACTIONS_TEMPLATE
 class ClientAction:
 
     name: str
-    url: str = None
+    url: str = ''
+    query_params: str = ''
+    attrs: list[str] = field(default_factory=list)
     submit: bool = False
     form_id: str = 'form'
     class_list: list = field(default_factory=list)
@@ -41,7 +43,7 @@ def parse_client_actions(actions: list[ClientAction], actions_template: str = No
 class BreadCrumb:
 
     name: str
-    url:str
+    url: str
 
 
 @dataclass
@@ -348,27 +350,8 @@ def get_related_model(model, path):
     for part in path:
         try:
             related_model = related_model._meta.fields_map[part].related_model
-            continue
         except (AttributeError, KeyError):
-            pass
-        # try:
-        #     related_model = getattr(related_model, part).model
-        #     continue
-        # except AttributeError:
-        #     pass
-        # try:
-        #     related_model = getattr(related_model.rel.related_model, part)
-        #     continue
-        # except AttributeError:
-        #     pass
-        # try:
-        #     related_model = getattr(related_model, part).field.related_model
-        #     continue
-        # except AttributeError:
-        #     pass
-        raise AttributeError(
-            f'Could not resolve relation for model: {model} with path "{path}" at {part}'
-        )
+            continue
     return related_model
 
 

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/static/js/navbar.js

@@ -1,23 +1,12 @@
 document.addEventListener('DOMContentLoaded', () => {
-    const navElements = document.querySelectorAll('.accrete-navbar-menu');
-    const burger = document.getElementById('navbar-burger');
+    const navElements = document.querySelectorAll('.navbar-item, .has-dropdown');
     navElements.forEach(el => {
         el.addEventListener('mousedown', toggleNavDropDown);
         el.addEventListener('blur', deactivateNavDropDown);
-        el.classList.add('is-hoverable');
     })
-    burger.addEventListener('click', toggleHamburger)
 })
 
 
-function toggleHamburger() {
-    const burgerElements = document.querySelectorAll('.accrete-burger');
-    burgerElements.forEach(el => {
-        el.classList.toggle('is-active');
-    })
-}
-
-
 function toggleNavDropDown() {
     const active = this.classList.toggle('is-active');
     if (active) {

accrete-0.0.9/accrete/contrib/ui/templates/ui/layout.html

@@ -0,0 +1,147 @@
+<!doctype html>
+{% load static %}
+{% load i18n %}
+{% load accrete_ui %}
+
+<html lang="en">
+
+<head>
+{% block head %}
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    {% block favicon %}<link rel="icon" type="image/svg" href="{% static 'icons/accrete.svg' %}"/>{% endblock %}
+    {% block bulma %}<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">{% endblock %}
+    {% block style %}
+        <link rel="stylesheet" type="text/css" href="{% static "css/accrete.css" %}">
+        <link rel="stylesheet" type="text/css" href="{% static "css/icons.css" %}">
+    {% endblock %}
+    {% block htmx %}
+        <script src="https://unpkg.com/htmx.org@1.9.6"></script>
+        <script src="https://unpkg.com/hyperscript.org@0.9.11"></script>
+    {% endblock %}
+    {% block script %}
+        <script src="{% static "js/navbar.js" %}" defer type="text/javascript"></script>
+        <script src="{% static "js/utils.js" %}" defer type="text/javascript"></script>
+    {% endblock %}
+    <title>{% block title %}{{ title }}{% endblock %}</title>
+{% endblock %}
+</head>
+
+
+<body {% block body_attrs %}hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'{% endblock %}>
+    {% block navbar %}
+        <nav id="navbar" class="navbar is-success is-fixed-top" role="navigation" aria-label="main navigation">
+            <div class="navbar-brand">
+                {% block navbar_brand %}
+                    <div class="navbar-item is-unselectable">{{ request.tenant.name }}</div>
+                {% endblock %}
+                <a id="navbar-burger" role="button" class="navbar-burger"
+                   aria-label="menu" aria-expanded="false"
+                   _="on click toggle .is-active on me then toggle .is-active on .navbar-menu"
+                >
+                    {# Display hamburger menu on mobile #}
+                    <span aria-hidden="true"></span>
+                    <span aria-hidden="true"></span>
+                    <span aria-hidden="true"></span>
+                </a>
+            </div>
+
+            <div class="navbar-menu is-fixed-top">
+                <div class="navbar-start">
+                    {% block navbar_start %}
+                        {% combine_templates 'accrete_menu.html' %}
+                    {% endblock %}
+                </div>
+
+                <div class="navbar-end">
+                    {% block navbar_end %}
+                    {% endblock %}
+                </div>
+            </div>
+        </nav>
+    {% endblock %}
+
+    <div class="main-columns columns m-0 is-mobile">
+        {% block main_columns %}
+            {% block side_panel %}
+                <div class="side-panel column is-3-widescreen is-2-fullhd is-hidden-touch is-hidden-desktop-only is-hidden-widescreen-only" style="height: 100%">
+                    <nav class="panel is-shadowless pb-5">
+                        {% if list_pagination %}
+                            <div class="panel-block">
+                                {% include 'ui/partials/pagination_list.html' %}
+                            </div>
+                        {% endif %}
+                        {% if detail_pagination %}
+                            <div class="panel-block">
+                                {% include 'ui/partials/pagination_detail.html' %}
+                            </div>
+                        {% endif %}
+                        <div id="panel-actions">
+                            {% block side_panel_items %}{% if actions and actions_template %}{% include actions_template with all=True %}{% endif %}{% endblock %}
+                        </div>
+                        {% if filter_terms %}
+                            <div class="panel-list px-3 has-text-centered">
+                                <span>{% translate 'Filter' %}</span>
+                            </div>
+                            <div class="panel-block" style="position: sticky">
+                                <button id="reset-filter-button"
+                                        class="button is-fullwidth mr-1">{% translate 'Reset' %}
+                                </button>
+                                <button id="apply-filter-button"
+                                        class="button is-fullwidth ml-1">{% translate 'Filter' %}
+                                </button>
+                            </div>
+                            <div id="filter-panel">
+                                {% include 'ui/partials/filter.html' %}
+                            </div>
+                        {% endif %}
+                    </nav>
+                </div>
+            {% endblock %}
+
+            <div id="content" class="column content-column p-0" style="height: 100%; overflow-y: auto">
+                {% block content %}{% endblock %}
+            </div>
+        {% endblock %}
+    </div>
+
+    {% if filter_terms %}
+        <div id="filter-modal" class="modal">
+            <div class="modal-background filter-modal-close"></div>
+            <div class="modal-card" style="height: 100%">
+                <header class="modal-card-head">
+                    <p class="modal-card-title">
+                        {% block search_modal_title %}{% translate 'Filter' %}{% endblock %}</p>
+                    <button class="delete filter-modal-close" aria-label="close"></button>
+                </header>
+                <section id="modal-content" class="modal-card-body">
+                </section>
+                <footer class="modal-card-foot">
+                    <button class="button is-fullwidth mr-1"
+                            onclick="resetFilter()">{% translate 'Reset' %}</button>
+                    <button id="applyFilterFromModalButton"
+                            class="button is-fullwidth is-success ml-1">{% translate 'Filter' %}</button>
+                </footer>
+            </div>
+        </div>
+    {% endif %}
+
+    {% if actions %}
+        <div id="action-modal" class="modal">
+            <div class="modal-background action-modal-close"></div>
+            <div class="modal-card">
+                <header class="modal-card-head">
+                    <p class="modal-card-title">
+                        {% block action_modal_title %}{% translate 'Actions' %}{% endblock %}</p>
+                    <button class="delete action-modal-close" aria-label="close"></button>
+                </header>
+                <section class="modal-card-body">
+                    <div id="modal-actions">
+                        {% block action_modal_body %}{% if actions_template %}{% include actions_template with all=True %}{% endif %}{% endblock %}
+                    </div>
+                </section>
+            </div>
+        </div>
+    {% endif %}
+    <div id="form-modal" class="modal"></div>
+</body>

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/templates/ui/partials/actions.html

@@ -13,7 +13,8 @@
                            {{ action.attrs|join:' ' }}>
                 {% else %}
                 <a class="button is-fullwidth {{ action.class|join:' ' }}"
-                   href="{{ action.url }}{{ querystring }}{% if page %}&page={{ page.number }}{% endif %}" {{ action.attrs }}
+                   href="{{ action.url }}{{ querystring|default_if_none:'?' }}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
+                   {% for attr in action.attrs %}{{ attr }}{% endfor %}
                    style="word-break: break-word">{{ action.name }}
                 </a>
                 {% endif %}

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/templates/ui/partials/filter.html

@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load static %}
+{% load cache %}
 {% load accrete_ui %}
 
 <div id="query-block" class="panel-block pt-0" style="position: relative; display: inline-block; width: 100%">
@@ -36,9 +37,8 @@
 
 
     <div id="query-params-dropdown" class="box mt-1 mx-0 p-1 is-hidden" tabindex="-1" style="z-index: 10; background: white; word-break: break-word; position: inherit">
-        {% for term in filter_terms %}
-
-        {% endfor %}
-        {{ filter_terms|render_query_params|safe }}
+        {% cache 500 filter_params request.path request.GET request.tenant %}
+            {{ filter_terms|render_query_params|safe }}
+        {% endcache %}
     </div>
 </div>

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/templates/ui/partials/form_modal.html

@@ -16,4 +16,4 @@
             <button class="button" hx-get="{% url 'ui:form_modal' %}" hx-swap="outerHTML" hx-target="#form-modal">{% translate 'Discard' %}</button>
         </footer>
     </div>
-</div>
+</div>

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/templates/ui/partials/header.html

@@ -18,7 +18,7 @@
                 <nav class="breadcrumb" aria-label="breadcrumbs" style="white-space: unset; word-break: break-word">
                     <ul>
                         {% for crumb in breadcrumbs %}
-                            <li><a href="{{ crumb.url|default_if_none:'#' }}{{ querystring }}" aria-current="page">{{ crumb.name }}</a></li>
+                            <li><a class="is-underlined" href="{{ crumb.url|default_if_none:'#' }}{{ querystring }}" aria-current="page">{{ crumb.name }}</a></li>
                         {% endfor %}
                         <li class="is-active"><a aria-current="page">{{ title }}</a></li>
                     </ul>

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/templatetags/accrete_ui.py

@@ -1,8 +1,22 @@
 from django import template
+from django.conf import settings
+from django.template.loader import render_to_string
+from django.utils.safestring import mark_safe
 
 register = template.Library()
 
 
+@register.simple_tag(name='combine_templates')
+def combine_templates(template_name):
+    html = ''
+    for app in settings.INSTALLED_APPS:
+        try:
+            html += render_to_string(f'{app.split(".")[-1]}/{template_name}')
+        except template.TemplateDoesNotExist:
+            continue
+    return mark_safe(html)
+
+
 @register.filter(name='render_query_params')
 def query_params_to_html(params):
     html = ''

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/urls.py

@@ -5,5 +5,6 @@ from . import views
 app_name = 'ui'
 
 urlpatterns = [
+    path('', views.home, name='home'),
     path('formmodal/', views.form_modal, name='form_modal'),
 ]

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/ui/views.py

@@ -1,5 +1,9 @@
 from django.shortcuts import render
 
 
+def home(request):
+    return render(request, 'ui/layout.html')
+
+
 def form_modal(request):
     return render(request, 'ui/partials/form_modal.html')

accrete-0.0.9/accrete/contrib/user_registration/config.py

@@ -0,0 +1,31 @@
+import logging
+from django.conf import settings
+from django.utils.translation import gettext_lazy as _
+
+_logger = logging.getLogger(__name__)
+
+ACCRETE_USER_REGISTRATION_MAIL_FROM_NAME = getattr(
+    settings, 'ACCRETE_USER_REGISTRATION_MAIL_FROM_NAME',
+    False
+)
+
+ACCRETE_USER_REGISTRATION_TEMPLATE_NAME = getattr(
+    settings, 'ACCRETE_USER_REGISTRATION_TEMPLATE_NAME',
+    'user_registration/mail_templates/confirmation_mail.html'
+)
+
+ACCRETE_USER_REGISTRATION_MAIL_SUBJECT = getattr(
+    settings, 'ACCRETE_USER_REGISTRATION_MAIL_SUBJECT',
+    _('Registration Confirmation')
+)
+
+ACCRETE_USER_REGISTRATION_ALLOWED = getattr(
+    settings, 'ACCRETE_USER_REGISTRATION_ALLOWED', True
+)
+
+if not ACCRETE_USER_REGISTRATION_MAIL_FROM_NAME:
+    _logger.warning(
+        'Setting "ACCRETE_USER_REGISTRATION_MAIL_FROM_NAME" missing.\n'
+        'User Registration won\'t work. Set it or remove '
+        'the app "accrete.contrib.user_registration".'
+    )

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/user_registration/templates/user_registration/registration.html

@@ -6,7 +6,10 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="{% static "css/bulma.min.css" %}">
+    {% block bulma %}
+            <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
+        {% endblock %}
+{#    <link rel="stylesheet" type="text/css" href="{% static "css/bulma.min.css" %}">#}
     <link rel="shortcut icon" type="image/png" href="{% static 'icons/accrete.svg' %}"/>
     <title>Registration | Accrete</title>
 </head>

{accrete-0.0.7 → accrete-0.0.9}/accrete/contrib/user_registration/views.py

@@ -1,5 +1,5 @@
 import logging
-from django.db import transaction
+
 from django.views.generic import FormView, View
 from django.urls import reverse_lazy, reverse
 from django.contrib.auth import get_user_model
@@ -8,7 +8,7 @@ from django.shortcuts import render
 
 from accrete.contrib.system_mail.forms import SystemMailCreateForm
 from . forms import UserRegistrationForm, ConfirmRegistrationForm, ResendConfirmationMailForm
-from . import settings
+from . import config
 
 _logger = logging.getLogger(__name__)
 User = get_user_model()
@@ -22,14 +22,14 @@ def send_confirmation_mail(user, request):
     confirmation_url = f"{base}{endpoint}"
 
     body = render_to_string(
-        settings.USER_REGISTRATION_TEMPLATE_NAME,
+        config.ACCRETE_USER_REGISTRATION_TEMPLATE_NAME,
         context={'confirmation_url': confirmation_url}
     )
 
     mail = SystemMailCreateForm({
-        'from_name': settings.USER_REGISTRATION_MAIL_FROM_NAME,
+        'from_name': config.ACCRETE_USER_REGISTRATION_MAIL_FROM_NAME,
         'to_addr': user.email,
-        'subject': settings.USER_REGISTRATION_MAIL_SUBJECT,
+        'subject': config.ACCRETE_USER_REGISTRATION_MAIL_SUBJECT,
         'body': body
     })
 
@@ -49,7 +49,7 @@ class RegistrationView(FormView):
     success_url = reverse_lazy('user_registration:registration_mail_sent')
 
     def dispatch(self, request, *args, **kwargs):
-        if not settings.USER_REGISTRATION_ALLOWED:
+        if not config.ACCRETE_USER_REGISTRATION_ALLOWED:
             return self.http_method_not_allowed(request, *args, **kwargs)
         return super().dispatch(request, *args, **kwargs)
 

accrete-0.0.9/accrete/decorators.py

@@ -0,0 +1,24 @@
+from functools import wraps
+
+from django.shortcuts import redirect
+from django.contrib.auth.views import login_required
+from . import config
+
+
+def tenant_required(
+        redirect_field_name: str = None,
+        login_url: str = None
+):
+    def decorator(f):
+        @wraps(f)
+        @login_required(
+            redirect_field_name=redirect_field_name,
+            login_url=login_url
+        )
+        def _wrapped_view(request, *args, **kwargs):
+            tenant = request.tenant
+            if not tenant:
+                return redirect(config.ACCRETE_TENANT_NOT_SET_URL)
+            return f(request, *args, **kwargs)
+        return _wrapped_view
+    return decorator

accrete-0.0.9/pyproject.toml

@@ -0,0 +1,42 @@
+[build-system]
+requires = ['hatchling']
+build-backend = 'hatchling.build'
+
+[project]
+name = 'accrete'
+version = '0.0.9'
+authors = [
+  { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
+]
+description = 'Django Shared Schema Multi Tenant'
+readme = 'README.md'
+license = {file = 'LICENSE'}
+requires-python = '>=3.10'
+classifiers = [
+    'Programming Language :: Python :: 3',
+    'License :: OSI Approved :: MIT License',
+    'Operating System :: OS Independent',
+    'Environment :: Web Environment',
+    'Framework :: Django',
+    'Intended Audience :: Developers',
+    'Topic :: Internet :: WWW/HTTP'
+]
+dependencies = [
+    'django >= 4.2'
+]
+
+[project.optional-dependencies]
+dev = [
+    'twine >= 4.0.2',
+    'pytest >= 7.0',
+    'build'
+]
+contrib = [
+    'celery >= 5.3.4',
+    'django_celery_beat'
+]
+
+[tool.hatch.build]
+exclude = [
+    '.git/'
+]

accrete-0.0.7/accrete/contrib/ui/templates/ui/layout.html

@@ -1,154 +0,0 @@
-<!doctype html>
-{% load static %}
-{% load i18n %}
-{% load cache %}
-
-<html lang="en">
-<head>
-    {% block head %}
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        {% block favicon %}
-            <link rel="icon" type="image/svg" href="{% static 'icons/accrete.svg' %}"/>
-        {% endblock %}
-        {% block bulma %}
-            <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
-        {% endblock %}
-        {% block style %}
-            <link rel="stylesheet" type="text/css" href="{% static "css/accrete.css" %}">
-            <link rel="stylesheet" type="text/css" href="{% static "css/icons.css" %}">
-        {% endblock %}
-        {% block htmx %}
-            <script src="https://unpkg.com/htmx.org@1.9.6"></script>
-            <script src="https://unpkg.com/hyperscript.org@0.9.11"></script>
-        {% endblock %}
-        {% block script %}
-            <script src="{% static "js/navbar.js" %}" defer type="text/javascript"></script>
-            <script src="{% static "js/utils.js" %}" defer type="text/javascript"></script>
-        {% endblock %}
-    {% endblock %}
-    {% block title_tag %}
-        <title>{% block title %}{{ title }}{% endblock %}</title>
-    {% endblock %}
-</head>
-
-<body id="body" {% block body_attrs %}hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'{% endblock %}>
-    <nav id="navbar" class="navbar is-success is-info is-fixed-top" role="navigation" aria-label="main navigation">
-        <div class="navbar-brand">
-            {% block navbar_brand %}
-                {% if request.tenant %}
-                    <p class="navbar-item is-unselectable">
-                        {{ request.tenant.name }}
-                    </p>
-                {% endif %}
-                {% block navbar_brand_inside %}{% endblock %}
-                <a id="navbar-burger" role="button" class="navbar-burger accrete-burger"
-                   aria-label="menu" aria-expanded="false">
-                    {# Display hamburger menu on mobile #}
-                    <span aria-hidden="true"></span>
-                    <span aria-hidden="true"></span>
-                    <span aria-hidden="true"></span>
-                </a>
-            {% endblock %}
-        </div>
-
-        <div class="navbar-menu is-fixed-top accrete-burger">
-            <div class="navbar-start">
-                {% block navbar_start %}
-                {% endblock %}
-            </div>
-
-            <div class="navbar-end">
-                <div class="navbar-item has-dropdown accrete-navbar-menu">
-                    {% block navbar_end %}
-                    {% endblock %}
-                </div>
-            </div>
-        </div>
-    </nav>
-
-    <div class="main-columns columns m-0 is-mobile">
-        {% block main_columns %}
-            <div class="side-panel column is-3-widescreen is-2-fullhd is-hidden-touch is-hidden-desktop-only is-hidden-widescreen-only" style="height: 100%">
-                <nav class="panel is-shadowless pb-5">
-                    {% if list_pagination %}
-                        <div class="panel-block">
-                            {% include 'ui/partials/pagination_list.html' %}
-                        </div>
-                    {% endif %}
-                    {% if detail_pagination %}
-                        <div class="panel-block">
-                            {% include 'ui/partials/pagination_detail.html' %}
-                        </div>
-                    {% endif %}
-                    <div id="panel-actions">
-                        {% block side_panel_items %}{% if actions and actions_template %}{% include actions_template with all=True %}{% endif %}{% endblock %}
-                    </div>
-                    {% if filter_terms %}
-                        <div class="panel-list px-3 has-text-centered">
-                            <span>{% translate 'Filter' %}</span>
-                        </div>
-                        <div class="panel-block" style="position: sticky">
-                            <button id="reset-filter-button"
-                                    class="button is-fullwidth mr-1">{% translate 'Reset' %}
-                            </button>
-                            <button id="apply-filter-button"
-                                    class="button is-fullwidth ml-1">{% translate 'Filter' %}
-                            </button>
-                        </div>
-                        <div id="filter-panel">
-                            {% cache 500 filter_panel request.path request.GET request.tenant %}
-                                {% include 'ui/partials/filter.html' %}
-                            {% endcache %}
-                        </div>
-                    {% endif %}
-                </nav>
-            </div>
-
-
-            <div id="content" class="column content-column p-0" style="height: 100%; overflow-y: auto">
-                {% block content %}{% endblock %}
-            </div>
-        {% endblock %}
-    </div>
-
-    {% if filter_terms %}
-        <div id="filter-modal" class="modal">
-            <div class="modal-background filter-modal-close"></div>
-            <div class="modal-card" style="height: 100%">
-                <header class="modal-card-head">
-                    <p class="modal-card-title">
-                        {% block search_modal_title %}{% translate 'Filter' %}{% endblock %}</p>
-                    <button class="delete filter-modal-close" aria-label="close"></button>
-                </header>
-                <section id="modal-content" class="modal-card-body">
-                </section>
-                <footer class="modal-card-foot">
-                    <button class="button is-fullwidth mr-1"
-                            onclick="resetFilter()">{% translate 'Reset' %}</button>
-                    <button id="applyFilterFromModalButton"
-                            class="button is-fullwidth is-success ml-1">{% translate 'Filter' %}</button>
-                </footer>
-            </div>
-        </div>
-    {% endif %}
-
-    {% if actions %}
-        <div id="action-modal" class="modal">
-            <div class="modal-background action-modal-close"></div>
-            <div class="modal-card">
-                <header class="modal-card-head">
-                    <p class="modal-card-title">
-                        {% block action_modal_title %}{% translate 'Actions' %}{% endblock %}</p>
-                    <button class="delete action-modal-close" aria-label="close"></button>
-                </header>
-                <section class="modal-card-body">
-                    <div id="modal-actions">
-                        {% block action_modal_body %}{% if actions_template %}{% include actions_template with all=True %}{% endif %}{% endblock %}
-                    </div>
-                </section>
-            </div>
-        </div>
-    {% endif %}
-    <div id="form-modal" class="modal"></div>
-</body>

accrete-0.0.7/accrete/contrib/user_registration/settings.py

@@ -1,29 +0,0 @@
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.translation import gettext_lazy as _
-
-USER_REGISTRATION_MAIL_FROM_NAME = getattr(
-    settings, 'USER_REGISTRATION_MAIL_FROM_NAME',
-    False
-)
-
-USER_REGISTRATION_TEMPLATE_NAME = getattr(
-    settings, 'USER_REGISTRATION_TEMPLATE_NAME',
-    'user_registration/mail_templates/confirmation_mail.html'
-)
-
-USER_REGISTRATION_MAIL_SUBJECT = getattr(
-    settings, 'USER_REGISTRATION_MAIL_SUBJECT',
-    _('Registration Confirmation')
-)
-
-USER_REGISTRATION_ALLOWED = getattr(
-    settings, 'USER_REGISTRATION_ALLOWED', False
-)
-
-if not USER_REGISTRATION_MAIL_FROM_NAME:
-    raise ImproperlyConfigured(
-        'Setting "USER_REGISTRATION_MAIL_FROM_NAME" missing.\n'
-        'User Registration won\'t work. Set it or remove '
-        'the app "user_registration" from INSTALLED_APPS and your urls.'
-    )

accrete-0.0.7/accrete/decorators.py

@@ -1,34 +0,0 @@
-from functools import wraps
-
-from django.conf import settings
-from django.shortcuts import redirect
-from django.contrib.auth.views import login_required
-from django.core.exceptions import ImproperlyConfigured
-
-TENANT_NOT_SET_URL = settings.ACCRETE_TENANT_NOT_SET_URL
-
-def tenant_required(
-        tenant_not_set_url: str = None,
-        redirect_field_name: str = None,
-        login_url: str = None
-):
-    def decorator(f):
-        @wraps(f)
-        @login_required(
-            redirect_field_name=redirect_field_name,
-            login_url=login_url
-        )
-        def _wrapped_view(request, *args, **kwargs):
-            tenant = request.tenant
-            if not tenant:
-                url = tenant_not_set_url or TENANT_NOT_SET_URL
-                if not url:
-                    raise ImproperlyConfigured(
-                        f'Redirect URL not set. '
-                        f'Define settings.ACCRETE_TENANT_NOT_SET_URL or pass '
-                        f'the redirect URL to the tenant_required decorator.'
-                    )
-                return redirect(url)
-            return f(request, *args, **kwargs)
-        return _wrapped_view
-    return decorator

accrete-0.0.7/pyproject.toml

@@ -1,43 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "accrete"
-version = "0.0.7"
-authors = [
-  { name="Benedikt Jilek", email="benedikt.jilek@pm.me" },
-]
-description = "Django Shared Schema Multi Tenant"
-readme = "README.md"
-license = {file = "LICENSE"}
-requires-python = ">=3.10"
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
-    "Environment :: Web Environment",
-    "Framework :: Django",
-    "Intended Audience :: Developers",
-    "Topic :: Internet :: WWW/HTTP"
-]
-dependencies = [
-  "django >= 4.2"
-]
-
-[project.optional-dependencies]
-dev = [
-    'twine >= 4.0.2',
-    'pytest >= 7.0'
-]
-contrib = [
-  'celery >= 5.3.4'
-]
-
-[tool.hatch.build]
-exclude = [
-    'project/',
-    '.idea/',
-    'gitignore',
-    'manage.py'
-]