accrete 0.0.130__tar.gz → 0.0.132__tar.gz

{accrete-0.0.130 → accrete-0.0.132}/PKG-INFO

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

{accrete-0.0.130 → accrete-0.0.132}/accrete/contrib/ui/__init__.py

@@ -8,3 +8,4 @@ from . context import (
     TableRowContext,
     ModalContext
 )
+from .utils import update_modal

{accrete-0.0.130 → accrete-0.0.132}/accrete/contrib/ui/static/css/accrete.css

@@ -8,8 +8,7 @@
   --bulma-input-icon-focus-color: var(--bulma-success);
   --bulma-input-arrow: var(--bulma-success);
   --bulma-arrow-color: var(--bulma-success);
-  --bulma-navbar-burger-color: var(--bulma-success);
-}
+  --bulma-navbar-burger-color: var(--bulma-success); }
 
 html[data-theme='light'] :root {
   --bulma-menu-item-h: var(--bulma-success-h);
@@ -18,53 +17,39 @@ html[data-theme='light'] :root {
   --bulma-menu-item-background-l: 50%;
   --bulma-menu-item-color-l: 10%;
   --bulma-navbar-burger-color: var(--bulma-success);
-  --accrete-hover-color: #F0F2F4;
-}
-
-html[data-theme='dark'] {
-  :root {
-    --bulma-navbar-burger-color: var(--bulma-success);
-    --accrete-hover-color: var(--bulma-grey-darker);
-  }
-
-  .button.is-light {
-    --bulma-button-h: var(--bulma-dark-h);
-    --bulma-button-s: var(--bulma-dark-s);
-    --bulma-button-l: var(--bulma-dark-l);
-    --bulma-button-background-l: var(--bulma-dark-l);
-    --bulma-button-border-l: var(--bulma-dark-l);
-    --bulma-button-border-width: 0px;
-    --bulma-button-color-l: var(--bulma-dark-invert-l);
-    --bulma-button-outer-shadow-a: 0;
-  }
-
-  .button.is-danger.is-light {
-    --bulma-button-background-l: var(--bulma-dark-l);
-    --bulma-button-color-l: var(--bulma-danger-dark-invert-l);
-  }
-
-  .tag > .button.is-light {
-    --bulma-button-background-l: var(--bulma-background-l);
-  }
-}
+  --accrete-hover-color: #F0F2F4; }
+
+html[data-theme='dark'] :root {
+  --bulma-navbar-burger-color: var(--bulma-success);
+  --accrete-hover-color: var(--bulma-grey-darker); }
+html[data-theme='dark'] .button.is-light {
+  --bulma-button-h: var(--bulma-dark-h);
+  --bulma-button-s: var(--bulma-dark-s);
+  --bulma-button-l: var(--bulma-dark-l);
+  --bulma-button-background-l: var(--bulma-dark-l);
+  --bulma-button-border-l: var(--bulma-dark-l);
+  --bulma-button-border-width: 0px;
+  --bulma-button-color-l: var(--bulma-dark-invert-l);
+  --bulma-button-outer-shadow-a: 0; }
+html[data-theme='dark'] .button.is-danger.is-light {
+  --bulma-button-background-l: var(--bulma-dark-l);
+  --bulma-button-color-l: var(--bulma-danger-dark-invert-l); }
+html[data-theme='dark'] .tag > .button.is-light {
+  --bulma-button-background-l: var(--bulma-background-l); }
 
 [x-cloak] {
-  display: none !important;
-}
+  display: none !important; }
 
 a {
   color: inherit;
-  text-decoration: inherit;
-}
+  text-decoration: inherit; }
 
 .navbar-burger {
-  color: black;
-}
+  color: black; }
 
 .button.is-subtle {
   box-shadow: none;
-  border: none;
-}
+  border: none; }
 
 .input {
   border-top: none;
@@ -74,54 +59,45 @@ a {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
-  box-shadow: none;
-}
+  box-shadow: none; }
 
 .input:focus, .input:focus-within {
   box-shadow: none;
-  border-bottom: 1px solid var(--bulma-success);
-}
+  border-bottom: 1px solid var(--bulma-success); }
 
 textarea {
   border-top: transparent !important;
   border-right: transparent !important;
   border-left: transparent !important;
   border-radius: 0 !important;
-  box-shadow: none !important;
-}
+  box-shadow: none !important; }
 
 textarea:focus {
-  border-color: var(--bulma-success) !important;
-}
+  border-color: var(--bulma-success) !important; }
 
 .is-small.textarea, .is-small.input {
   border-radius: 0;
-  font-size: var(--bulma-size-small);
-}
+  font-size: var(--bulma-size-small); }
 
 td > .input, td * .input, td * select, td * .select {
   border-top: none !important;
   border-right: none !important;
   border-bottom: none !important;
-  border-left: none !important;
-}
+  border-left: none !important; }
 
 td:has(.input:focus) {
-  border-bottom: 1px solid var(--bulma-success) !important;
-}
+  border-bottom: 1px solid var(--bulma-success) !important; }
 
 select {
   border-top: transparent !important;
   border-right: transparent !important;
   border-left: transparent !important;
   border-radius: 0 !important;
-  box-shadow: none !important;
-}
+  box-shadow: none !important; }
 
 select:focus {
   box-shadow: none;
-  border-bottom: 1px solid var(--bulma-success) !important;
-}
+  border-bottom: 1px solid var(--bulma-success) !important; }
 
 #content-right-container {
   flex-shrink: 0;
@@ -129,29 +105,23 @@ select:focus {
   border-top-left-radius: var(--bulma-radius-medium);
   border-bottom-left-radius: var(--bulma-radius-medium);
   box-shadow: -2px 0 20px 0 var(--bulma-grey-light);
-  z-index: 20;
-}
+  z-index: 20; }
 
 .responsive-heading {
-  display: none;
-}
+  display: none; }
 
 #content-left-container {
   container-name: content-left-container;
-  container-type: inline-size;
-}
+  container-type: inline-size; }
 
 .htmx-indicator {
-  transition: opacity 200ms ease-in;
-}
+  transition: opacity 200ms ease-in; }
 
 .modal-request-overlay {
-  pointer-events: none;
-}
+  pointer-events: none; }
 
 .modal-request-overlay.htmx-request {
-  pointer-events: auto;
-}
+  pointer-events: auto; }
 
 @container content-left-container (max-width: 600px) {
   table.can-compact * td {
@@ -160,104 +130,82 @@ select:focus {
     text-align: left !important;
     border: transparent !important;
     font-size: 1em;
-    padding-left: 1rem !important;
-  }
+    padding-left: 1rem !important; }
 
   table.can-compact * tr {
     display: inline-block;
     width: 100%;
     padding-top: 8px;
     padding-bottom: 12px;
-    border-bottom: 1px solid var(--bulma-grey-light);
-  }
+    border-bottom: 1px solid var(--bulma-grey-light); }
 
   table.can-compact * tr:first-child {
-    border-top: 1px solid var(--bulma-grey-light);
-  }
+    border-top: 1px solid var(--bulma-grey-light); }
 
   table.can-compact * tr.is-success {
-    background-color: var(--bulma-success);
-  }
+    background-color: var(--bulma-success); }
 
   table.can-compact * tr.is-success:hover {
-    background-color: var(--bulma-success) !important;
-  }
+    background-color: var(--bulma-success) !important; }
 
   table.can-compact > thead {
-    display: none;
-  }
+    display: none; }
 
   .responsive-heading {
-    display: inline-block;
-  }
+    display: inline-block; }
 
   .list-entry {
-    height: fit-content !important;
-  }
-}
+    height: fit-content !important; } }
 @media screen and (max-width: 768px) {
   #content-right-container {
     flex-grow: 1;
     flex-shrink: 1;
     width: auto;
     border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-}
+    border-bottom-left-radius: 0; } }
 #action-panel {
   max-width: var(--accrete-action-panel-width);
   min-width: var(--accrete-action-panel-width);
   height: 100%;
-  overflow-y: auto;
-}
+  overflow-y: auto; }
 
 @media screen and (max-width: 1215px) {
   #action-panel {
     position: absolute;
     background: var(--bulma-scheme-main);
     z-index: 999;
-    box-shadow: 2px 0 20px 0 var(--bulma-grey-light);
-  }
-}
+    box-shadow: 2px 0 20px 0 var(--bulma-grey-light); } }
 .menu-list a.is-active, .menu-list a.is-selected, .menu-list button.is-active, .menu-list button.is-selected, .menu-list .menu-item.is-active, .menu-list .menu-item.is-selected {
   --bulma-menu-item-h: var(--bulma-success-h);
   --bulma-menu-item-s: var(--bulma-success-s);
   --bulma-menu-item-l: var(--bulma-success-l);
   --bulma-menu-item-background-l: var(--bulma-success-l);
-  --bulma-menu-item-color-l: var(--bulma-success-invert-l);
-}
+  --bulma-menu-item-color-l: var(--bulma-success-invert-l); }
 
 .hoverable *:hover {
-  background-color: var(--accrete-hover-color);
-}
+  background-color: var(--accrete-hover-color); }
 
 /* Chrome, Safari, Edge, Opera */
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
   -webkit-appearance: none;
-  margin: 0;
-}
+  margin: 0; }
 
 /* Firefox */
 input[type=number] {
-  -moz-appearance: textfield;
-}
+  -moz-appearance: textfield; }
 
 .query-group-container .query-tag-container:first-child .query-operator {
-  display: none;
-}
+  display: none; }
 
 .query-group-container .query-tag-container:first-child .query-operator-group {
-  display: none !important;
-}
+  display: none !important; }
 
 #query-tags > .query-group-container > .query-operator:first-child {
-  display: none;
-}
+  display: none; }
 
 #query-tags > .query-group-container > .query-operator-group:first-child {
-  display: none !important;
-}
+  display: none !important; }
 
 .query-group {
   padding-left: 4px;
@@ -266,13 +214,10 @@ input[type=number] {
   border-right: none;
   border-bottom: none;
   border-radius: 0;
-  margin-bottom: 5px;
-}
+  margin-bottom: 5px; }
 
 #query-tags > .query-group-container > .query-group {
   padding-left: 0;
-  border-left: none !important;
-}
-
+  border-left: none !important; }
 
 /*# sourceMappingURL=accrete.css.map */

{accrete-0.0.130 → accrete-0.0.132}/accrete/contrib/ui/templates/ui/layout.html

@@ -11,7 +11,7 @@
         <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/Logo.svg' %}"/>{% endblock %}
-        <link rel="stylesheet" type="text/css" href="{% static "css/accrete.css" %}?v=3">
+        <link rel="stylesheet" type="text/css" href="{% static "css/accrete.css" %}?v=4">
         <link rel="stylesheet" type="text/css" href="{% static "css/icons.css" %}">
         <link rel="stylesheet" type="text/css" href="{% static "css/fa.css" %}">
 

{accrete-0.0.130 → accrete-0.0.132}/accrete/contrib/ui/templates/ui/list.html

@@ -10,13 +10,14 @@
                 <div id="list-entry-{{ object.pk }}" class="list-entry cell pb-0" style="height: {{ column_height }}{{ column_height_unit }}">
                     <div class="box is-hoverable p-3"
                          style="word-break: break-word; height: 100%; border: var(--accrete-box-border); overflow-y: auto; {% if object.get_absolute_url %}cursor:pointer;{% endif %}"
-                         {% if object.get_absolute_url %}hx-get="{{ object.get_absolute_url }}{% querystring %}" hx-target="#content-right-header" hx-select="#content-right-header" hx-select-oob="#content-right" hx-swap="outerHTML"{% endif %}
-                         x-data=""
-                         {% if detail_enabled %}
-                         x-on:click="showContentRight = true; $nextTick(() => { $el.scrollIntoView( {block: 'nearest'} ) });"
+                         {% if object.get_absolute_url %}
+                             hx-get="{{ object.get_absolute_url }}{% querystring %}" hx-target="#content-right-header" hx-select="#content-right-header" hx-select-oob="#content-right" hx-swap="outerHTML"
+                             {% if detail_enabled %}
+                                x-on:click="showContentRight = true; $nextTick(() => { $el.scrollIntoView( {block: 'nearest'} ) });"
+                             {% endif %}
                          {% endif %}
+                         x-data=""
                     >
-
                         <div id="list-data-{{ object.pk }}">
                             {% block data %}
                                 {{ object }}

accrete-0.0.132/accrete/contrib/ui/utils.py

@@ -0,0 +1,17 @@
+from django.http import HttpRequest, HttpResponse
+from django.shortcuts import render
+from .context import ModalContext
+
+
+def update_modal(
+    request: HttpRequest,
+    template: str,
+    context: ModalContext | dict
+) -> HttpResponse:
+
+    if isinstance(context, ModalContext):
+        context = context.dict()
+    res = render(request, template, context)
+    res.headers['HX-Retarget'] = f'#{context["modal_id"]}'
+    res.headers['HX-Reswap'] = 'outerHTML'
+    return res

{accrete-0.0.130 → accrete-0.0.132}/accrete/contrib/user/views.py

@@ -77,10 +77,7 @@ def user_change_password(request):
                 + f'?{request.GET.urlencode()}'
             )
         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 ui.update_modal(request, 'user/change_password.html', ctx)
     return render(request, 'user/change_password.html', ctx)
 
 
@@ -101,8 +98,5 @@ def user_change_email(request):
         if form.is_saved:
             return redirect('user:detail')
         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 ui.update_modal(request, 'user/change_email.html', ctx)
     return render(request, 'user/change_email.html', ctx)

{accrete-0.0.130 → accrete-0.0.132}/pyproject.toml

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