accrete 0.0.99__py3-none-any.whl → 0.0.109__py3-none-any.whl

accrete/contrib/user/templates/user/change_email.html

@@ -1,29 +1,24 @@
-{% extends 'ui/form.html' %}
+{% extends 'ui/modal.html' %}
+{% load i18n %}
 
-{% block form %}
-    <form id="form" method="post" action="">
-    {% csrf_token %}
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label has-field is-required">
-                {{ form.email.label_tag }}
-                <span class="has-text-danger is-size-7">{{ form.email.errors }}</span>
-                <div class="field">
-                    <p class="control is-fullwidth">{{ form.email }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label has-field is-required">
-                {{ form.password.label_tag }}
-                <span class="has-text-danger is-size-7">{{ form.password.errors }}</span>
-                <div class="field">
-                    <p class="control is-fullwidth">{{ form.password }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
-</form>
+{% block modal_content %}
+    <form id="{{ modal_id }}-form" hx-post="{% url 'user:change_email' %}">
+        {% csrf_token %}
+        <label class="label has-field is-required">
+            {{ form.email.label }}
+            {{ form.email }}
+            <span class="has-text-danger is-size-7">{{ form.email.errors }}</span>
+        </label>
+        <label class="label has-field is-required">
+            {{ form.password.label }}
+            {{ form.password }}
+            <span class="has-text-danger is-size-7">{{ form.password.errors }}</span>
+        </label>
+    </form>
 {% endblock %}
+
+{% block modal_buttons %}
+	<button type="submit" form="{{ modal_id }}-form" class="button is-success">{% translate 'Save' %}</button>
+    {{ block.super }}
+{% endblock %}
+

accrete/contrib/user/templates/user/change_password.html

@@ -1,40 +1,28 @@
-{% extends 'ui/form.html' %}
+{% extends 'ui/modal.html' %}
+{% load i18n %}
 
-{% block form %}
-    <form id="form" method="post" action="">
+{% block modal_content %}
+    <form id="{{ modal_id }}-form" hx-post="{% url 'user:change_password' %}">
     {% csrf_token %}
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label has-field is-required">
-                {{ form.old_password.label_tag }}
-                <span class="has-text-danger is-size-7">{{ form.old_password.errors }}</span>
-                <div class="field">
-                    <p class="control is-fullwidth">{{ form.old_password }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label has-field is-required">
-                {{ form.new_password.label_tag }}
-                <span class="has-text-danger is-size-7">{{ form.new_password.errors }}</span>
-                <div class="field">
-                    <p class="control is-fullwidth">{{ form.new_password }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label has-field is-required">
-                {{ form.new_password_confirm.label_tag }}
-                <span class="has-text-danger is-size-7">{{ form.new_password_confirm.errors }}</span>
-                <div class="field">
-                    <p class="control is-fullwidth">{{ form.new_password_confirm }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
+    <label class="label">
+        {{ form.old_password.label }}
+        {{ form.old_password }}
+        <span class="has-text-danger is-size-7">{{ form.old_password.errors }}</span>
+    </label>
+    <label class="label has-field is-required">
+        {{ form.new_password.label }}
+        {{ form.new_password }}
+        <span class="has-text-danger is-size-7">{{ form.new_password.errors }}</span>
+    </label>
+    <label class="label has-field is-required">
+        {{ form.new_password_confirm.label }}
+        {{ form.new_password_confirm }}
+        <span class="has-text-danger is-size-7">{{ form.new_password_confirm.errors }}</span>
+    </label>
 </form>
 {% endblock %}
+
+{% block modal_buttons %}
+	<button type="submit" form="{{ modal_id }}-form" class="button is-success">{% translate 'Save' %}</button>
+    {{ block.super }}
+{% endblock %}

accrete/contrib/user/templates/user/login.html

@@ -2,33 +2,82 @@
 {% load static %}
 {% load i18n %}
 
-{% block title %}Login | Accrete{% endblock %}
+{% block title %}Login{% endblock %}
 
 {% block body %}
-    <section class="hero is-primary is-medium is-bold is-fullheight">
-    <div class="hero-body">
-        <div class="container">
-            <div class="columns">
-                <div class="column box is-8-tablet is-offset-2-tablet is-6-desktop is-offset-3-desktop is-4-fullhd is-offset-4-fullhd p-3">
-                    <form method="POST" action="" hx-boost="false">
-                        {% csrf_token %}
-                        <span class="has-text-danger is-size-7">{{ form.non_field_errors }}</span>
-
-                        <label class="label">{{ form.username.label_tag }}
-                            {{ form.username }}
-                            <span class="has-text-danger is-size-7">{{ form.username.errors }}</span>
-                        </label>
-
-                        <label class="label">{{ form.password.label_tag }}
-                            {{form.password}}
-                            <span class="has-text-danger is-size-7">{{ form.password.errors }}</span>
-                        </label>
+    <section class="hero is-success is-fullheight">
+        <!-- Hero head: will stick at the top -->
+        <div class="hero-head">
+            <header class="navbar">
+                <div class="container">
+                    <div class="navbar-brand">
+                        <p class="title navbar-item">HRP</p>
+                        <span class="navbar-burger" data-target="navbarMenuHeroC">
+                            <span></span>
+                            <span></span>
+                            <span></span>
+                            <span></span>
+                        </span>
+                    </div>
+{#                    <div id="navbarMenuHeroC" class="navbar-menu">#}
+{#                        <div class="navbar-end">#}
+{#                            <a class="navbar-item is-active"> Home </a>#}
+{#                            <a class="navbar-item"> Examples </a>#}
+{#                            <a class="navbar-item"> Documentation </a>#}
+{#                            <span class="navbar-item">#}
+{#                                <a class="button is-success is-inverted">#}
+{#                                    <span class="icon">#}
+{#                                        <i class="fab fa-github"></i>#}
+{#                                    </span>#}
+{#                                    <span>Download</span>#}
+{#                                </a>#}
+{#                            </span>#}
+{#                        </div>#}
+{#                    </div>#}
+                </div>
+            </header>
+        </div>
 
-                        <input type="submit" class="button is-fullwidth is-success is-medium" value="{% translate 'Login' %}">
-                    </form>
+        <!-- Hero content: will be in the middle -->
+        <div class="hero-body">
+            <div class="container">
+                <div class="columns">
+                    <div class="column box is-8-tablet is-offset-2-tablet is-6-desktop is-offset-3-desktop is-4-fullhd is-offset-4-fullhd p-3" data-theme="light">
+                        <form method="POST" action="" hx-boost="false">
+                            {% csrf_token %}
+                            <span class="has-text-danger is-size-7">{{ form.non_field_errors }}</span>
+                            <label class="label">
+                                <span class="has-text-black">{{ form.username.label_tag }}</span>
+                                {{ form.username }}
+                                <span class="has-text-danger is-size-7">{{ form.username.errors }}</span>
+                            </label>
+                            <label class="label">
+                                <span class="has-text-black">{{ form.password.label_tag }}</span>
+                                {{ form.password }}
+                                <span class="has-text-danger is-size-7">{{ form.password.errors }}</span>
+                            </label>
+                            <input type="submit" class="button is-fullwidth is-success is-medium"
+                                   value="{% translate 'Login' %}">
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-</section>
+
+        <!-- Hero footer: will stick at the bottom -->
+        <div class="hero-foot">
+            <nav class="tabs is-boxed is-fullwidth">
+                <div class="container">
+                    <ul>
+{#                        <li class="is-active"><a>Overview</a></li>#}
+{#                        <li><a>Modifiers</a></li>#}
+{#                        <li><a>Grid</a></li>#}
+{#                        <li><a>Elements</a></li>#}
+{#                        <li><a>Components</a></li>#}
+{#                        <li><a>Layout</a></li>#}
+                    </ul>
+                </div>
+            </nav>
+        </div>
+    </section>
 {% endblock %}

accrete/contrib/user/templates/user/user_form.html

@@ -1,56 +1,54 @@
-{% extends 'ui/form.html' %}
+{% extends 'ui/layout.html' %}
 {% load i18n %}
 
-{% block form %}
-<form id="form" method="post" action="">
-    {% csrf_token %}
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label has-field">
-                {{ form.username.label }}
-                <span class="has-text-danger is-size-7">{{ form.username.errors }}</span>
-                <div class="field">
-                    <p class="control is-expanded">{{ form.username }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
-
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label has-field">
-                {{ form.first_name.label }}
-                <span class="has-text-danger is-size-7">{{ form.first_name.errors }}</span>
-                <div class="field">
-                    <p class="control is-fullwidth is-expanded">{{ form.first_name }}</p>
-                </div>
-
-            </label>
-        </div>
-    </div>
-
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label has-field">
-                {{ form.last_name.label }}
-                <span class="has-text-danger is-size-7">{{ form.last_name.errors }}</span>
-                <div class="field">
-                    <p class="control is-fullwidth is-expanded">{{ form.last_name }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
+{% block header_left %}
+    {{ block.super }}
+    <button class="button p-2 my-1 mr-1 is-light" hx-get="{% url 'user:change_password' %}" hx-target="body" hx-swap="beforeend">
+        <span>{% translate 'Change Password' %}</span>
+    </button>
+    <button class="button p-2 my-1 mr-1 is-light" hx-get="{% url 'user:change_email' %}" hx-target="body" hx-swap="beforeend">
+        <span>{% translate 'Change E-Mail' %}</span>
+    </button>
+{% endblock %}
 
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label has-field is-required">
-                {{ form.language_code.label }}
-                <span class="has-text-danger is-size-7">{{ form.language_code.errors }}</span>
-                <div class="field">
-                    <p class="control is-fullwidth is-expanded"><span class="select is-fullwidth">{{ form.language_code }}</span></p>
-                </div>
-            </label>
+{% block content_left %}
+    <form id="user-form" hx-post="{% url 'user:detail' %}" hx-trigger="change changed" hx-select="#user-form" hx-swap="outerHTML" hx-select-oob="#navbar-user-name">
+        {% csrf_token %}
+        <div class="columns m-0">
+            <div class="column is-6">
+                {% if form.save_error or form.non_field_errors %}
+                    <div class="notification is-danger is-light">
+                        {{ form.save_error|default_if_none:'' }}
+                        {{ form.non_field_errors|default_if_none:'' }}
+                    </div>
+                {% endif %}
+                <label class="label">
+                    {{ form.username.label }}
+                    {{ form.username }}
+                    <span class="has-text-danger is-size-7">{{ form.username.errors }}</span>
+                </label>
+                <label class="label">
+                    {{ form.first_name.label }}
+                    {{ form.first_name }}
+                    <span class="has-text-danger is-size-7">{{ form.first_name.errors }}</span>
+                </label>
+                <label class="label">
+                    {{ form.last_name.label }}
+                    {{ form.last_name }}
+                    <span class="has-text-danger is-size-7">{{ form.last_name.errors }}</span>
+                </label>
+                <label class="label">
+                    {{ form.language_code.label }}
+                    {{ form.language_code }}
+                    <span class="has-text-danger is-size-7">{{ form.language_code.errors }}</span>
+                </label>
+                <label class="label">
+                    {% translate 'E-Mail' %}
+                    <div class="field has-addons">
+                        <p class="control input has-text-weight-normal">{{ user.email }}</p>
+                    </div>
+                </label>
+            </div>
         </div>
-    </div>
-</form>
-{% endblock %}
+    </form>
+{% endblock %}

accrete/contrib/user/urls.py

@@ -7,7 +7,6 @@ urlpatterns = [
     path('login/', views.LoginView.as_view(), name='login'),
     path('logout/', views.LogoutView.as_view(), name='logout'),
     path('detail/', views.user_detail, name='detail'),
-    path('edit/', views.user_edit, name='edit'),
-    path('edit/password', views.user_change_password, name='edit_password'),
-    path('edit/email', views.user_change_email, name='edit_email')
+    path('password/', views.user_change_password, name='change_password'),
+    path('email/', views.user_change_email, name='change_email')
 ]

accrete/contrib/user/views.py

@@ -1,8 +1,7 @@
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth import views, update_session_auth_hash
 from django.contrib.auth.decorators import login_required
-from django.contrib import messages
-from django.shortcuts import redirect, render, reverse, resolve_url
+from django.shortcuts import redirect, render, resolve_url
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
@@ -36,21 +35,6 @@ class LogoutView(views.LogoutView):
 
 @login_required()
 def user_detail(request):
-    ctx = ui.DetailContext(
-        title=_('Preferences'),
-        object=request.user,
-        breadcrumbs=[],
-        actions=[
-            ui.ClientAction(_('Edit'), url=reverse('user:edit')),
-            ui.ClientAction(_('Change E-Mail'), url=reverse('user:edit_email')),
-            ui.ClientAction(_('Change Password'), url=reverse('user:edit_password'))
-        ]
-    ).dict()
-    return render(request, 'user/user_detail.html', ctx)
-
-
-@login_required()
-def user_edit(request):
     form = UserForm(
         initial={'language_code': request.user.language_code},
         instance=request.user
@@ -58,12 +42,13 @@ def user_edit(request):
     if request.method == 'POST':
         form = save_form(UserForm(request.POST, instance=request.user))
         if form.is_saved:
-            return redirect('user:detail')
-    ctx = ui.FormContext(
-        title=_('Preferences'),
-        form=form,
-        form_id='form',
-        actions=ui.form_actions(reverse('user:detail'))
+            return redirect(resolve_url('user:detail') + f'?{request.GET.urlencode()}')
+    ctx = ui.Context(
+        title=_('User Preferences'),
+        extra=dict(
+            user=request.user,
+            form=form
+        )
     ).dict()
     return render(request, 'user/user_form.html', ctx)
 
@@ -71,42 +56,50 @@ def user_edit(request):
 @login_required()
 def user_change_password(request):
     form = ChangePasswordForm(instance=request.user)
+    ctx = ui.ModalContext(
+        title=_('Change Password'),
+        modal_id='change-password',
+        blocking=True,
+        extra=dict(
+            form=form,
+            user=request.user
+        )
+    ).dict()
     if request.method == 'POST':
         form = save_form(ChangePasswordForm(request.POST, instance=request.user))
         if form.is_saved:
             update_session_auth_hash(request, form.instance)
-            messages.add_message(
-                request, messages.SUCCESS,
-                str(_('Your password has been changed.')),
-                fail_silently=True
+            return redirect(
+                resolve_url('user:detail')
+                + f'?{request.GET.urlencode()}'
             )
-            return redirect('user:detail')
-    ctx = ui.FormContext(
-        title=_('Change Password'),
-        form=form,
-        form_id='form',
-        actions=ui.form_actions(reverse('user:detail'))
-    ).dict()
+        ctx.update(form=form)
+        res = render(request, 'user/change_password.html', ctx)
+        res.headers['HX-Retarget'] = f'#{ctx["modal_id"]}'
+        res.headers['HX-Reswap'] = 'outerHTML'
+        return res
     return render(request, 'user/change_password.html', ctx)
 
 
 @login_required()
 def user_change_email(request):
     form = ChangeEmailForm(instance=request.user)
+    ctx = ui.ModalContext(
+        title=_('Change E-Mail'),
+        modal_id='change-email',
+        blocking=True,
+        extra=dict(
+            form=form,
+            user=request.user
+        )
+    ).dict()
     if request.method == 'POST':
         form = save_form(ChangeEmailForm(request.POST, instance=request.user))
         if form.is_saved:
-            messages.add_message(
-                request, messages.SUCCESS,
-                str(_('Your email address has been changed.')),
-                fail_silently=True
-            )
             return redirect('user:detail')
-
-    ctx = ui.FormContext(
-        title=_('Change Email'),
-        form=form,
-        form_id='form',
-        actions=ui.form_actions(reverse('user:detail'))
-    ).dict()
+        ctx.update(form=form)
+        res = render(request, 'user/change_email.html', ctx)
+        res.headers['HX-Retarget'] = f'#{ctx["modal_id"]}'
+        res.headers['HX-Reswap'] = 'outerHTML'
+        return res
     return render(request, 'user/change_email.html', ctx)

accrete/forms.py

@@ -1,10 +1,8 @@
 import logging
 from django import forms
-from django.contrib.auth import get_user_model
 from accrete.tenant import get_tenant
 
 _logger = logging.getLogger(__name__)
-User = get_user_model()
 
 
 class TenantForm(forms.Form):

accrete/managers.py

@@ -1,15 +1,15 @@
 from django.db import models
 from accrete.tenant import get_tenant
-from accrete.annotation import AnnotationManagerMixin
 
 
-class TenantManager(models.Manager, AnnotationManagerMixin):
+class TenantManager(models.Manager):
 
     def get_queryset(self):
         queryset = super().get_queryset()
-        if tenant := get_tenant():
+        tenant = get_tenant()
+        if tenant:
             queryset = queryset.filter(tenant=tenant)
-        return queryset.annotate(**self.get_annotations(queryset))
+        return queryset
 
     def bulk_create(
             self,

accrete/middleware.py

@@ -1,94 +1,69 @@
+import logging
+
 from django.utils.deprecation import MiddlewareMixin
-from django.conf import settings
-from django.http.response import HttpResponseRedirect, HttpResponsePermanentRedirect
-from accrete.tenant import set_tenant, set_member, unscoped
+from accrete.tenant import set_tenant, set_member, get_tenant
+
+from .models import Tenant, Member
 
-from .models import Tenant
+_logger = logging.getLogger(__name__)
 
 
 class TenantMiddleware(MiddlewareMixin):
     @staticmethod
     def get_tenant_id_from_request(request):
-        if tenant := request.POST.get('tenant'):
-            tenant_id = tenant
-        elif tenant := request.META.get('X_TENANT_ID'):
-            tenant_id = tenant
-        elif tenant_id := request.GET.get('tenant_id'):
-            tenant_id = tenant_id
-        elif tenant := request.COOKIES.get('tenant_id'):
-            tenant_id = tenant
-        else:
-            tenant_id = None
-
+        tenant_id = (
+            request.GET.get('tenant_id')
+            or request.META.get('HTTP_X_TENANT_ID')
+        )
         try:
             tenant_id = int(tenant_id)
-        except (ValueError, TypeError):
+            assert tenant_id > 0
+        except (ValueError, TypeError, AssertionError):
             tenant_id = None
-
         return tenant_id
 
     def process_request(self, request):
         request.tenant = None
         request.member = None
+        set_member(False)
         if request.path.startswith('/admin'):
+            return
+        if not request.user.is_authenticated:
             set_member(None)
             return
+        tenant_id = self.get_tenant_id_from_request(request)
+        tenant = Tenant.objects.none()
+        memberships = Member.objects.filter(
+            user=request.user, is_active=True, tenant__is_active=True
+        ).prefetch_related('tenant', 'user').order_by('pk')
+        if tenant_id:
+            tenant = Tenant.objects.get(pk=tenant_id)
+            memberships = memberships.filter(tenant=tenant)
+        if memberships.count() == 1:
+            request.member = memberships.first()
+            request.tenant = request.member.tenant
+            set_member(request.member)
+            self.update_post_data(request)
+            return
+        if memberships.count() > 1:
+            set_member(None)
+            return
+        if request.user.is_staff and tenant:
+            set_member(None)
+            set_tenant(tenant)
+            request.tenant = tenant
+            return
+        set_member(None)
+        return
 
-        if request.user.is_authenticated:
-            with unscoped():
-                memberships = request.user.memberships.filter(
-                    is_active=True,
-                    tenant__is_active=True
-                )
-
-            if request.user.is_staff:
-                tenant_id = self.get_tenant_id_from_request(request)
-                if not tenant_id:
-                    tenant_id = memberships and memberships.first().tenant.pk
-                request.tenant = tenant_id and Tenant.objects.filter(pk=tenant_id).first()
-                request.member = request.tenant.members.filter(user=request.user).first()
-
-            elif memberships and len(memberships) == 1:
-                request.member = memberships.first()
-                request.tenant = request.member.tenant
-            elif memberships and len(memberships) > 1:
-                tenant_id = self.get_tenant_id_from_request(request)
-                if not tenant_id:
-                    tenant_id = memberships.first().tenant.pk
-                request.member = memberships.filter(tenant_id=tenant_id).first()
-                request.tenant = request.member.tenant
-
-        set_member(request.member)
-        if request.user.is_staff:
-            set_tenant(request.tenant)
-
+    @staticmethod
+    def update_post_data(request):
         if request.POST and not request.POST.get('tenant') and request.tenant:
             request.POST = request.POST.copy()
             request.POST['tenant'] = request.tenant.pk
 
     @staticmethod
     def process_response(request, response):
-        if request.tenant:
-            response.set_cookie(
-                'tenant_id',
-                request.tenant.pk,
-                samesite=settings.SESSION_COOKIE_SAMESITE,
-                max_age=31536000
-            )
-        return response
-
-
-class HtmxRedirectMiddleware(MiddlewareMixin):
-
-    @staticmethod
-    def process_response(request, response):
-        is_htmx = request.headers.get('HX-Request', 'false') == 'true'
-        if not is_htmx:
-            return response
-        is_redirect = isinstance(response, HttpResponseRedirect)
-        is_permanent_redirect = isinstance(response, HttpResponsePermanentRedirect)
-        if is_redirect or is_permanent_redirect:
-            response.status_code = 200
-            header = 'HX-Location' if is_redirect else 'HX-Redirect'
-            response[header] = response['Location']
+        tenant = get_tenant()
+        response['X-TENANT-ID'] = tenant and tenant.id or 0
         return response