accrete 0.0.108__tar.gz → 0.0.109__tar.gz

{accrete-0.0.108 → accrete-0.0.109}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.108
+Version: 0.0.109
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek

{accrete-0.0.108 → accrete-0.0.109}/accrete/contrib/ui/static/js/filter.js

@@ -14,6 +14,7 @@ document.addEventListener('alpine:init', () => {
             const queryApplyEvent = new Event('click');
             const query = queryString || JSON.stringify(this.buildJsonQueryFromHtml());
             url.searchParams.set('q', query);
+            url.searchParams.set('page', '1');
             queryApply.setAttribute('hx-get', url.toString());
             htmx.process(queryApply);
             queryApply.dispatchEvent(queryApplyEvent);

{accrete-0.0.108 → accrete-0.0.109}/accrete/contrib/ui/templates/ui/layout.html

@@ -14,7 +14,7 @@
         <link rel="stylesheet" type="text/css" href="{% static "css/accrete.css" %}?v=1">
         <link rel="stylesheet" type="text/css" href="{% static "css/icons.css" %}">
         <link rel="stylesheet" type="text/css" href="{% static "css/fa.css" %}">
-        
+
         <script src="{% static "js/filter.js" %}" type="text/javascript"></script>
         <script src="{% static "js/htmx.min.js" %}" defer type="text/javascript"></script>
         <script src="{% static "js/alpine-sort3.14.1.js" %}" defer type="text/javascript"></script>
@@ -84,7 +84,7 @@
             <div class="navbar-end">
                 {% block navbar_end %}
                     <div class="navbar-item has-dropdown" onclick="this.classList.toggle('is-active');">
-                        <a class="navbar-link is-arrowless">{{ user }}</a>
+                        <a id="navbar-user-name" class="navbar-link is-arrowless">{{ user }}</a>
                         <div id="navbar-end-dropdown" class="navbar-dropdown is-right">
                             <a class="navbar-item" href="{% url 'teams:teams_list' %}">{% translate 'Teams' %}</a>
                             <hr class="navbar-divider">
@@ -105,7 +105,7 @@
         <div x-show="showPanel" >
             <div id="action-panel" x-show="showPanel"
                  @resize.debounce.100.window="openPanel()"
-                 @toggle-panel.window="showPanel = !showPanel" 
+                 @toggle-panel.window="showPanel = !showPanel"
                  x-transition.duration.200ms
             >
                 <nav class="px-1" style="height: 100%; overflow-y: auto; position: sticky; top: 0">
@@ -118,7 +118,7 @@
                             <div class="p-3">
                                 {% include 'ui/filter/filter.html' %}
                             </div>
-                            
+
                         </div>
                     {% endif %}
                 </nav>

{accrete-0.0.108 → accrete-0.0.109}/accrete/contrib/user/forms.py

@@ -18,7 +18,7 @@ class UserForm(ModelForm):
         fields = [
             'username',
             'first_name',
-            'last_name',
+            'last_name'
         ]
 
     def save(self, commit=True):

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

@@ -0,0 +1,24 @@
+{% extends 'ui/modal.html' %}
+{% load i18n %}
+
+{% 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-0.0.109/accrete/contrib/user/templates/user/change_password.html

@@ -0,0 +1,28 @@
+{% extends 'ui/modal.html' %}
+{% load i18n %}
+
+{% block modal_content %}
+    <form id="{{ modal_id }}-form" hx-post="{% url 'user:change_password' %}">
+    {% csrf_token %}
+    <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-0.0.108 → accrete-0.0.109}/accrete/contrib/user/templates/user/login.html

@@ -42,16 +42,17 @@
         <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">
+                    <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">
-                                {{ form.username.label_tag }}
+                                <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">{{ form.password.label_tag }}
+                            <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>

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

@@ -0,0 +1,54 @@
+{% extends 'ui/layout.html' %}
+{% load i18n %}
+
+{% 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 %}
+
+{% 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>
+    </form>
+{% endblock %}

{accrete-0.0.108 → accrete-0.0.109}/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-0.0.108 → accrete-0.0.109}/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-0.0.108 → accrete-0.0.109}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.108'
+version = '0.0.109'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]

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

@@ -1,29 +0,0 @@
-{% extends 'ui/form.html' %}
-
-{% 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>
-{% endblock %}

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

@@ -1,40 +0,0 @@
-{% extends 'ui/form.html' %}
-
-{% 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.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>
-</form>
-{% endblock %}

accrete-0.0.108/accrete/contrib/user/templates/user/user_detail.html

@@ -1,43 +0,0 @@
-{% extends 'ui/detail.html' %}
-{% load i18n %}
-
-{% block detail_content %}
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label is-detail has-field">
-                {% translate 'Username' %}
-                <div class="field">
-                    <p class="control is-expanded">{{ object.username|default_if_none:'' }}</p>
-                </div>
-            </label>
-        </div>
-        <div class="column is-6">
-            <label class="label is-detail has-field">
-                {% translate 'E-Mail' %}
-                <div class="field">
-                    <p class="control is-expanded">{{ object.email }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
-    <div class="columns">
-        <div class="column is-12">
-            <label class="label is-detail has-field">
-                {% translate 'Name' %}
-                <div class="field">
-                    <p class="control is-expanded">{{ object.full_name|default_if_none:'' }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
-    <div class="columns">
-        <div class="column is-6">
-            <label class="label is-detail has-field">
-                {% translate 'Language' %}
-                <div class="field">
-                    <p class="control">{{ object.language_code_display }}</p>
-                </div>
-            </label>
-        </div>
-    </div>
-{% endblock %}

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

@@ -1,56 +0,0 @@
-{% extends 'ui/form.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>
-
-    <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>
-        </div>
-    </div>
-</form>
-{% endblock %}