From 3a92961f412518aa2849229af0b0069a93fef57f Mon Sep 17 00:00:00 2001 From: Stuart Maxwell Date: Thu, 23 Apr 2026 11:22:56 +1200 Subject: [PATCH 1/2] Work on new blog theme --- config/settings.py | 19 +- .../markdown_editor/markdown_editor.html | 168 +++++------------- pyproject.toml | 4 + spf_generator/forms.py | 2 - .../templates/spf_generator/generator.html | 156 ++++++++-------- .../spf_generator/partials/error.html | 18 +- .../spf_generator/partials/result.html | 32 ++-- static/css/styles.css | 142 ++++++++++----- static/img/avatar.jpg | Bin 0 -> 24452 bytes static/js/htmx.min.js | 1 + .../timezone_converter/converted.html | 1 - .../timezone_converter/converter.html | 63 +++---- uv.lock | 39 ++-- 13 files changed, 319 insertions(+), 326 deletions(-) create mode 100644 static/img/avatar.jpg create mode 100644 static/js/htmx.min.js diff --git a/config/settings.py b/config/settings.py index 89835ef..23d7c53 100644 --- a/config/settings.py +++ b/config/settings.py @@ -82,6 +82,7 @@ "contact_form", "home", "debugging_app", + "djpress_blog_theme", ] if DEBUG: @@ -266,7 +267,7 @@ DJPRESS_SETTINGS = { "SITE_TITLE": SITE_TITLE, "POST_PREFIX": POST_PREFIX, - "THEME": "stuartmnz", + "THEME": "djpress_blog_theme", "MARKDOWN_RENDERER": "config.markdown_renderer.mistune_renderer", "PLUGINS": [ "djpress_publish_mastodon", @@ -287,6 +288,22 @@ "post_message": "🚀 I created a new blog post!", }, }, + "THEME_SETTINGS": { + "djpress_blog_theme": { + "bg-sidebar": "#005930", + "dark-bg-sidebar": "#061A10", + "avatar_url": "/static/img/avatar.jpg", + "email_address": "stuart@amanzi.nz", + "mastodon_profile": "https://fosstodon.org/@stuartm", + "github_username": "stuartmaxwell", + "linkedin_username": "smaxwell", + "copyright_message": ( + "Content is " + 'CC BY 4.0. ' + "Share away!" + ), + }, + }, } # Email configuration diff --git a/markdown_editor/templates/markdown_editor/markdown_editor.html b/markdown_editor/templates/markdown_editor/markdown_editor.html index f44525a..44adc0a 100644 --- a/markdown_editor/templates/markdown_editor/markdown_editor.html +++ b/markdown_editor/templates/markdown_editor/markdown_editor.html @@ -1,132 +1,62 @@ -{% extends "_base.html" %} +{% extends "djpress/djpress_blog_theme/base.html" %} {% load static %} -{% block title %}Markdown Editor{% endblock %} -{% block head_close %} +{% block head %} + -{% endblock head_close %} -{% block main_classes %}container-fluid{% endblock %} -{% block main %} -
-
-
-
-
- Markdown Editor (Preview below) -
-
- - - -
-
-
- - -
-
-
- - + + +{% endblock head %} +{% block content %} +
+
+
+
+
Markdown Editor
+
+
+ + + +
+
+
+ + +
+
+
+ + +
+
+
+ + + +
-
- - - -
- +
+
- -
-
-
-
HTML Preview
- +
+
+
+
HTML Preview
+
+ +
-
+ word-wrap: anywhere" + class="content-body">
+
-{% endblock main %} -{% block js_body_close %} - - -{% endblock js_body_close %} +{% endblock content %} diff --git a/pyproject.toml b/pyproject.toml index aa30609..9e532c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,7 @@ dependencies = [ "logfire[asgi,django]>=2.5.0", "djpress-publish-bluesky>=1.1.0", "django-storages[s3]>=1.14.6", + "djpress-blog-theme>=0.3.0", ] [tool.curlylint.rules] @@ -57,3 +58,6 @@ convention = "google" # Accepts: "google", "numpy", or "pep257". [tool.pytest.ini_options] DJANGO_SETTINGS_MODULE = "config.settings_testing" python_files = "tests.py test_*.py *_tests.py" + +[tool.uv.sources] +djpress-blog-theme = { path = "../../DJ_Press/djpress-blog-theme", editable = true } diff --git a/spf_generator/forms.py b/spf_generator/forms.py index d67f189..aa5ba06 100644 --- a/spf_generator/forms.py +++ b/spf_generator/forms.py @@ -53,7 +53,6 @@ class ProviderSelectForm(forms.Form): widget=forms.Select( attrs={ "aria-label": "SPF All Mechanism", - "class": "form-select", }, ), ) @@ -64,7 +63,6 @@ class ProviderSelectForm(forms.Form): help_text="If you have a server that sends email, enter its IP address here", widget=forms.TextInput( attrs={ - "class": "form-control", "placeholder": "e.g., 192.168.1.1 or 2001:db8::1", "aria-label": "Custom IP Address", }, diff --git a/spf_generator/templates/spf_generator/generator.html b/spf_generator/templates/spf_generator/generator.html index 9377e8a..c459a9b 100644 --- a/spf_generator/templates/spf_generator/generator.html +++ b/spf_generator/templates/spf_generator/generator.html @@ -1,88 +1,82 @@ -{% extends "_base.html" %} +{% extends "djpress/djpress_blog_theme/base.html" %} {% load spf_generator_filters static %} +{% block head %} + + +{% endblock head %} {% block content %} -

SPF Record Generator

-

- Please note: I have made best efforts to ensure the information below is correct. But I highly recommend checking and validating the SPF record before updating it in your DNS. Please contact me if you spot any mistakes. -

-

- Select the email services that you use with your domain from the lists below. If you don't see the service you want, please send me a message to let me know. -

-
- {% csrf_token %} -
- {% for category, category_name in categories %} -
-

{{ category_name }}

-
    - {% for field in form %} - {% if field.name|startswith:'provider_' %} - {% with provider=providers|get_provider:field.name %} - {% if provider.category == category %} -
  • - -
    • - {% endif %} - {% endwith %} - {% endif %} - {% endfor %} -
-
- {% endfor %} -
-

Custom Server

-
-
-

- Optionally, you can add the IP address of your own server to your SPF record. This is useful if you have a server that sends emails directly to the internet. -

- {% if form.custom_ip.errors %}{{ form.custom_ip.errors.0 }}{% endif %} -
-
- {{ form.custom_ip }} - {% if form.custom_ip.help_text %}{{ form.custom_ip.help_text }}{% endif %} +
+

SPF Record Generator

+

+ Please note: I have made best efforts to ensure the information below is correct. But I highly recommend checking and validating the SPF record before updating it in your DNS. Please contact me if you spot any mistakes. +

+

+ Select the email services that you use with your domain from the lists below. If you don't see the service you want, please send me a message to let me know. +

+ + {% csrf_token %} +
+ {% for category, category_name in categories %} +
+

{{ category_name }}

+
    + {% for field in form %} + {% if field.name|startswith:'provider_' %} + {% with provider=providers|get_provider:field.name %} + {% if provider.category == category %} +
  • + +
    • + {% endif %} + {% endwith %} + {% endif %} + {% endfor %} +
+
+ {% endfor %}
-
-

Default Policy

-
-
-

- Now select the policy you want to apply with this SPF record. This is an important choice and is explained below. -

- {{ form.all_policy }} - {% if form.all_policy.help_text %}{{ form.all_policy.help_text|safe }}{% endif %} +

Custom Server

+
+
+

+ Optionally, you can add the IP address of your own server to your SPF record. This is useful if you have a server that sends emails directly to the internet. +

+ {% if form.custom_ip.errors %}{{ form.custom_ip.errors.0 }}{% endif %} +
+
+ {{ form.custom_ip }} + {% if form.custom_ip.help_text %}{{ form.custom_ip.help_text }}{% endif %} +
-
- {{ form.all_mechanism }} - {% if form.all_mechanism.help_text %}{{ form.all_mechanism.help_text|safe }}{% endif %} +

Default Policy

+
+
+

+ Now select the policy you want to apply with this SPF record. This is an important choice and is explained below. +

+ {{ form.all_policy }} + {% if form.all_policy.help_text %}{{ form.all_policy.help_text|safe }}{% endif %} +
+
+ {{ form.all_mechanism }} + {% if form.all_mechanism.help_text %}{{ form.all_mechanism.help_text|safe }}{% endif %} +
-
- - -{% endblock content %} -{% block body_close %} - - + + + + -{% endblock body_close %} +{% endblock content %} diff --git a/spf_generator/templates/spf_generator/partials/error.html b/spf_generator/templates/spf_generator/partials/error.html index 13d19e7..e41f444 100644 --- a/spf_generator/templates/spf_generator/partials/error.html +++ b/spf_generator/templates/spf_generator/partials/error.html @@ -1,15 +1,3 @@ -
-
-

Error

- -
-
-

{{ error }}

-
-
- -
-
+

Error

+

{{ error }}

+ diff --git a/spf_generator/templates/spf_generator/partials/result.html b/spf_generator/templates/spf_generator/partials/result.html index 26a32f7..ea267d2 100644 --- a/spf_generator/templates/spf_generator/partials/result.html +++ b/spf_generator/templates/spf_generator/partials/result.html @@ -1,22 +1,10 @@ -
-
-

Your SPF Record

- -
-
- 
"{{ spf_record }}"
-

Add this record as a TXT record in your domain's DNS settings.

-

- Note: This record uses {{ all_mechanism }} as the default policy. -
- {{ all_mechanism_help|safe }} -

-
-
- - -
-
+

Your SPF Record

+
"{{ spf_record }}"
+

Add this record as a TXT record in your domain's DNS settings.

+

+ Note: This record uses {{ all_mechanism }} as the default policy. +
+ {{ all_mechanism_help|safe }} +

+ + diff --git a/static/css/styles.css b/static/css/styles.css index a1faea7..29b97c9 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -5,20 +5,35 @@ body { font-size: 19px; } -/* header has a background color of --bs-green */ -header { - background-color: var(--bs-green); +button { + background-color: #005930; + color: white; + padding: 12px 24px; + border: none; + border-radius: 8px; + cursor: pointer; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); } -header .navbar-brand { - font-weight: 900; - font-style: italic; - font-size: 1.5rem; +dialog { + margin: auto; /* Restores native centering */ + padding: 2rem; /* Restores internal spacing stripped by your reset */ + border-radius: 0.5rem; + border: 0; + max-width: 64rem; +} +dialog::backdrop { + background-color: rgba(0, 0, 0, 0.5); + backdrop-filter: blur(4px); /* Modern blur effect! */ } -header .nav-link { - font-weight: 900; - font-style: italic; +.spf-content { + p { + margin-bottom: 1rem; + } + li { + list-style-type: none; + } } /* code blocks */ @@ -28,44 +43,89 @@ pre { padding: 0.5rem; border-radius: 0.25rem; font-size: 0.8rem; + margin-bottom: 1.5rem; + text-wrap-mode: wrap; } -/* link with hover effect: rounded subtle background */ -a.sidebar-link { - text-decoration: underline; - padding: 0.25rem; - border-radius: 0.25rem; +table.table { + width: 100%; + border-collapse: collapse; /* The magic ingredient */ } - -a.sidebar-link:hover { - background-color: var(--bs-primary-bg-subtle); +table.table th, +table.table td { + border: 1px solid #ccc; + padding: 12px; + text-align: left; } -/* blog styles */ -article { - margin-bottom: 3rem; -} +.markdown-editor { + .toolbar { + display: flex; + /*align-items: center;*/ + justify-content: space-between; + gap: 4px; /* Space between buttons */ + padding: 6px; + background-color: #ffffff; + border: 1px solid #ddd; + border-bottom: none; /* Merges with the text area below */ + border-radius: 8px 8px 0 0; /* Rounds only the top corners */ + } -article footer p { - color: var(--bs-secondary); - margin: 0; -} + .toolbar button { + display: flex; + align-items: center; + justify-content: center; + width: 32px; + height: 32px; + padding: 0; + background: transparent; + border: none; + border-radius: 4px; + color: #444; + cursor: pointer; + transition: background 0.2s; + } -blockquote { - border-left: 0.25rem solid var(--bs-primary); - padding-left: 1rem; - margin-left: 1rem; - font-style: italic; -} + /* Hover effect */ + .toolbar button:hover { + background-color: #f0f0f0; + color: #000; + } -/* Markdown editor */ -textarea#editor { - font-size: 0.8rem; - font-family: var(--bs-font-monospace); -} + /* Visual vertical line to group tools */ + .separator { + width: 1px; + height: 20px; + background-color: #ddd; + margin: 0 4px; + } + .toolbar-title { + font-weight: bold; + color: #666; + } + .button-cluster { + display: flex; + gap: 12px; /* Space between the distinct sub-groups */ + } + .button-group { + display: flex; + border: 1px solid #ddd; + border-radius: 4px; + overflow: hidden; /* Clips the inner button corners */ + } + + .button-group button { + border: none; + border-radius: 0; + border-right: 1px solid #ddd; + } -textarea#editor.form-control:focus { - outline: none; - border-top-color: transparent; - box-shadow: none; + .button-group button:last-child { + border-right: none; + } + #preview { + border: 1px solid #ddd; + border-radius: 0 0 8px 8px; + padding: 0.5em; + } } diff --git a/static/img/avatar.jpg b/static/img/avatar.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2af64ffecb5ba5de71ed7bf816b82331a27997f2 GIT binary patch literal 24452 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
nyB3|-p5_1+{DqM#^Ah(j=ywwty?+3o-zp- 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 literal 0 HcmV?d00001 diff --git a/static/js/htmx.min.js b/static/js/htmx.min.js new file mode 100644 index 0000000..6f3f829 --- /dev/null +++ b/static/js/htmx.min.js @@ -0,0 +1 @@ +var htmx=function(){"use strict";const Q={onLoad:null,process:null,on:null,off:null,trigger:null,ajax:null,find:null,findAll:null,closest:null,values:function(e,t){const n=dn(e,t||"post");return n.values},remove:null,addClass:null,removeClass:null,toggleClass:null,takeClass:null,swap:null,defineExtension:null,removeExtension:null,logAll:null,logNone:null,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",inlineStyleNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",scrollBehavior:"instant",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get","delete"],selfRequestsOnly:true,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null,disableInheritance:false,responseHandling:[{code:"204",swap:false},{code:"[23]..",swap:true},{code:"[45]..",swap:false,error:true}],allowNestedOobSwaps:true,historyRestoreAsHxRequest:true,reportValidityOfForms:false},parseInterval:null,location:location,_:null,version:"2.0.8"};Q.onLoad=V;Q.process=Ft;Q.on=xe;Q.off=be;Q.trigger=ae;Q.ajax=Ln;Q.find=f;Q.findAll=x;Q.closest=g;Q.remove=_;Q.addClass=K;Q.removeClass=G;Q.toggleClass=W;Q.takeClass=Z;Q.swap=ze;Q.defineExtension=_n;Q.removeExtension=zn;Q.logAll=j;Q.logNone=$;Q.parseInterval=d;Q._=e;const n={addTriggerHandler:St,bodyContains:se,canAccessLocalStorage:X,findThisElement:Se,filterValues:yn,swap:ze,hasAttribute:s,getAttributeValue:a,getClosestAttributeValue:ne,getClosestMatch:q,getExpressionVars:Rn,getHeaders:mn,getInputValues:dn,getInternalData:oe,getSwapSpecification:bn,getTriggerSpecs:st,getTarget:Ee,makeFragment:D,mergeObjects:le,makeSettleInfo:Sn,oobSwap:Te,querySelectorExt:ue,settleImmediately:Yt,shouldCancel:ht,triggerEvent:ae,triggerErrorEvent:fe,withExtensions:Vt};const de=["get","post","put","delete","patch"];const R=de.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function ee(e,t){return e instanceof Element&&e.getAttribute(t)}function s(e,t){return!!e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function a(e,t){return ee(e,t)||ee(e,"data-"+t)}function u(e){const t=e.parentElement;if(!t&&e.parentNode instanceof ShadowRoot)return e.parentNode;return t}function te(){return document}function y(e,t){return e.getRootNode?e.getRootNode({composed:t}):te()}function q(e,t){while(e&&!t(e)){e=u(e)}return e||null}function o(e,t,n){const r=a(t,n);const o=a(t,"hx-disinherit");var i=a(t,"hx-inherit");if(e!==t){if(Q.config.disableInheritance){if(i&&(i==="*"||i.split(" ").indexOf(n)>=0)){return r}else{return null}}if(o&&(o==="*"||o.split(" ").indexOf(n)>=0)){return"unset"}}return r}function ne(t,n){let r=null;q(t,function(e){return!!(r=o(t,ce(e),n))});if(r!=="unset"){return r}}function h(e,t){return e instanceof Element&&e.matches(t)}function A(e){const t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;const n=t.exec(e);if(n){return n[1].toLowerCase()}else{return""}}function L(e){if("parseHTMLUnsafe"in Document){return Document.parseHTMLUnsafe(e)}const t=new DOMParser;return t.parseFromString(e,"text/html")}function N(e,t){while(t.childNodes.length>0){e.append(t.childNodes[0])}}function r(e){const t=te().createElement("script");ie(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Q.config.inlineScriptNonce){t.nonce=Q.config.inlineScriptNonce}return t}function i(e){return e.matches("script")&&(e.type==="text/javascript"||e.type==="module"||e.type==="")}function I(e){Array.from(e.querySelectorAll("script")).forEach(e=>{if(i(e)){const t=r(e);const n=e.parentNode;try{n.insertBefore(t,e)}catch(e){H(e)}finally{e.remove()}}})}function D(e){const t=e.replace(/]*)?>[\s\S]*?<\/head>/i,"");const n=A(t);let r;if(n==="html"){r=new DocumentFragment;const i=L(e);N(r,i.body);r.title=i.title}else if(n==="body"){r=new DocumentFragment;const i=L(t);N(r,i.body);r.title=i.title}else{const i=L('");r=i.querySelector("template").content;r.title=i.title;var o=r.querySelector("title");if(o&&o.parentNode===r){o.remove();r.title=o.innerText}}if(r){if(Q.config.allowScriptTags){I(r)}else{r.querySelectorAll("script").forEach(e=>e.remove())}}return r}function re(e){if(e){e()}}function t(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function P(e){return typeof e==="function"}function k(e){return t(e,"Object")}function oe(e){const t="htmx-internal-data";let n=e[t];if(!n){n=e[t]={}}return n}function M(t){const n=[];if(t){for(let e=0;e=0}function se(e){return e.getRootNode({composed:true})===document}function B(e){return e.trim().split(/\s+/)}function le(e,t){for(const n in t){if(t.hasOwnProperty(n)){e[n]=t[n]}}return e}function v(e){try{return JSON.parse(e)}catch(e){H(e);return null}}function X(){const e="htmx:sessionStorageTest";try{sessionStorage.setItem(e,e);sessionStorage.removeItem(e);return true}catch(e){return false}}function U(e){const t=new URL(e,"http://x");if(t){e=t.pathname+t.search}if(e!="/"){e=e.replace(/\/+$/,"")}return e}function e(e){return On(te().body,function(){return eval(e)})}function V(t){const e=Q.on("htmx:load",function(e){t(e.detail.elt)});return e}function j(){Q.logger=function(e,t,n){if(console){console.log(t,e,n)}}}function $(){Q.logger=null}function f(e,t){if(typeof e!=="string"){return e.querySelector(t)}else{return f(te(),e)}}function x(e,t){if(typeof e!=="string"){return e.querySelectorAll(t)}else{return x(te(),e)}}function b(){return window}function _(e,t){e=w(e);if(t){b().setTimeout(function(){_(e);e=null},t)}else{u(e).removeChild(e)}}function ce(e){return e instanceof Element?e:null}function z(e){return e instanceof HTMLElement?e:null}function J(e){return typeof e==="string"?e:null}function p(e){return e instanceof Element||e instanceof Document||e instanceof DocumentFragment?e:null}function K(e,t,n){e=ce(w(e));if(!e){return}if(n){b().setTimeout(function(){K(e,t);e=null},n)}else{e.classList&&e.classList.add(t)}}function G(e,t,n){let r=ce(w(e));if(!r){return}if(n){b().setTimeout(function(){G(r,t);r=null},n)}else{if(r.classList){r.classList.remove(t);if(r.classList.length===0){r.removeAttribute("class")}}}}function W(e,t){e=w(e);e.classList.toggle(t)}function Z(e,t){e=w(e);ie(e.parentElement.children,function(e){G(e,t)});K(ce(e),t)}function g(e,t){e=ce(w(e));if(e){return e.closest(t)}return null}function l(e,t){return e.substring(0,t.length)===t}function Y(e,t){return e.substring(e.length-t.length)===t}function pe(e){const t=e.trim();if(l(t,"<")&&Y(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function m(t,r,n){if(r.indexOf("global ")===0){return m(t,r.slice(7),true)}t=w(t);const o=[];{let t=0;let n=0;for(let e=0;e"){t--}}if(n0){const r=pe(o.shift());let e;if(r.indexOf("closest ")===0){e=g(ce(t),pe(r.slice(8)))}else if(r.indexOf("find ")===0){e=f(p(t),pe(r.slice(5)))}else if(r==="next"||r==="nextElementSibling"){e=ce(t).nextElementSibling}else if(r.indexOf("next ")===0){e=ge(t,pe(r.slice(5)),!!n)}else if(r==="previous"||r==="previousElementSibling"){e=ce(t).previousElementSibling}else if(r.indexOf("previous ")===0){e=me(t,pe(r.slice(9)),!!n)}else if(r==="document"){e=document}else if(r==="window"){e=window}else if(r==="body"){e=document.body}else if(r==="root"){e=y(t,!!n)}else if(r==="host"){e=t.getRootNode().host}else{s.push(r)}if(e){i.push(e)}}if(s.length>0){const e=s.join(",");const c=p(y(t,!!n));i.push(...M(c.querySelectorAll(e)))}return i}var ge=function(t,e,n){const r=p(y(t,n)).querySelectorAll(e);for(let e=0;e=0;e--){const o=r[e];if(o.compareDocumentPosition(t)===Node.DOCUMENT_POSITION_FOLLOWING){return o}}};function ue(e,t){if(typeof e!=="string"){return m(e,t)[0]}else{return m(te().body,e)[0]}}function w(e,t){if(typeof e==="string"){return f(p(t)||document,e)}else{return e}}function ye(e,t,n,r){if(P(t)){return{target:te().body,event:J(e),listener:t,options:n}}else{return{target:w(e),event:J(t),listener:n,options:r}}}function xe(t,n,r,o){Gn(function(){const e=ye(t,n,r,o);e.target.addEventListener(e.event,e.listener,e.options)});const e=P(n);return e?n:r}function be(t,n,r){Gn(function(){const e=ye(t,n,r);e.target.removeEventListener(e.event,e.listener)});return P(n)?n:r}const ve=te().createElement("output");function we(t,n){const e=ne(t,n);if(e){if(e==="this"){return[Se(t,n)]}else{const r=m(t,e);const o=/(^|,)(\s*)inherit(\s*)($|,)/.test(e);if(o){const i=ce(q(t,function(e){return e!==t&&s(ce(e),n)}));if(i){r.push(...we(i,n))}}if(r.length===0){H('The selector "'+e+'" on '+n+" returned no matches!");return[ve]}else{return r}}}}function Se(e,t){return ce(q(e,function(e){return a(ce(e),t)!=null}))}function Ee(e){const t=ne(e,"hx-target");if(t){if(t==="this"){return Se(e,"hx-target")}else{return ue(e,t)}}else{const n=oe(e);if(n.boosted){return te().body}else{return e}}}function Ce(e){return Q.config.attributesToSettle.includes(e)}function Oe(t,n){ie(Array.from(t.attributes),function(e){if(!n.hasAttribute(e.name)&&Ce(e.name)){t.removeAttribute(e.name)}});ie(n.attributes,function(e){if(Ce(e.name)){t.setAttribute(e.name,e.value)}})}function He(t,e){const n=Jn(e);for(let e=0;e0){s=e.substring(0,e.indexOf(":"));n=e.substring(e.indexOf(":")+1)}else{s=e}o.removeAttribute("hx-swap-oob");o.removeAttribute("data-hx-swap-oob");const r=m(t,n,false);if(r.length){ie(r,function(e){let t;const n=o.cloneNode(true);t=te().createDocumentFragment();t.appendChild(n);if(!He(s,e)){t=p(n)}const r={shouldSwap:true,target:e,fragment:t};if(!ae(e,"htmx:oobBeforeSwap",r))return;e=r.target;if(r.shouldSwap){qe(t);$e(s,e,e,t,i);Re()}ie(i.elts,function(e){ae(e,"htmx:oobAfterSwap",r)})});o.parentNode.removeChild(o)}else{o.parentNode.removeChild(o);fe(te().body,"htmx:oobErrorNoTarget",{content:o})}return e}function Re(){const e=f("#--htmx-preserve-pantry--");if(e){for(const t of[...e.children]){const n=f("#"+t.id);n.parentNode.moveBefore(t,n);n.remove()}e.remove()}}function qe(e){ie(x(e,"[hx-preserve], [data-hx-preserve]"),function(e){const t=a(e,"id");const n=te().getElementById(t);if(n!=null){if(e.moveBefore){let e=f("#--htmx-preserve-pantry--");if(e==null){te().body.insertAdjacentHTML("afterend","
");e=f("#--htmx-preserve-pantry--")}e.moveBefore(n,null)}else{e.parentNode.replaceChild(n,e)}}})}function Ae(l,e,c){ie(e.querySelectorAll("[id]"),function(t){const n=ee(t,"id");if(n&&n.length>0){const r=n.replace("'","\\'");const o=t.tagName.replace(":","\\:");const e=p(l);const i=e&&e.querySelector(o+"[id='"+r+"']");if(i&&i!==e){const s=t.cloneNode();Oe(t,i);c.tasks.push(function(){Oe(t,s)})}}})}function Le(e){return function(){G(e,Q.config.addedClass);Ft(ce(e));Ne(p(e));ae(e,"htmx:load")}}function Ne(e){const t="[autofocus]";const n=z(h(e,t)?e:e.querySelector(t));if(n!=null){n.focus()}}function c(e,t,n,r){Ae(e,n,r);while(n.childNodes.length>0){const o=n.firstChild;K(ce(o),Q.config.addedClass);e.insertBefore(o,t);if(o.nodeType!==Node.TEXT_NODE&&o.nodeType!==Node.COMMENT_NODE){r.tasks.push(Le(o))}}}function Ie(e,t){let n=0;while(n0}function ze(h,d,p,g){if(!g){g={}}let m=null;let n=null;let e=function(){re(g.beforeSwapCallback);h=w(h);const r=g.contextElement?y(g.contextElement,false):te();const e=document.activeElement;let t={};t={elt:e,start:e?e.selectionStart:null,end:e?e.selectionEnd:null};const o=Sn(h);if(p.swapStyle==="textContent"){h.textContent=d}else{let n=D(d);o.title=g.title||n.title;if(g.historyRequest){n=n.querySelector("[hx-history-elt],[data-hx-history-elt]")||n}if(g.selectOOB){const i=g.selectOOB.split(",");for(let t=0;t0){b().setTimeout(n,p.settleDelay)}else{n()}};let t=Q.config.globalViewTransitions;if(p.hasOwnProperty("transition")){t=p.transition}const r=g.contextElement||te();if(t&&ae(r,"htmx:beforeTransition",g.eventInfo)&&typeof Promise!=="undefined"&&document.startViewTransition){const o=new Promise(function(e,t){m=e;n=t});const i=e;e=function(){document.startViewTransition(function(){i();return o})}}try{if(p?.swapDelay&&p.swapDelay>0){b().setTimeout(e,p.swapDelay)}else{e()}}catch(e){fe(r,"htmx:swapError",g.eventInfo);re(n);throw e}}function Je(e,t,n){const r=e.getResponseHeader(t);if(r.indexOf("{")===0){const o=v(r);for(const i in o){if(o.hasOwnProperty(i)){let e=o[i];if(k(e)){n=e.target!==undefined?e.target:n}else{e={value:e}}ae(n,i,e)}}}else{const s=r.split(",");for(let e=0;e0){const s=o[0];if(s==="]"){e--;if(e===0){if(n===null){t=t+"true"}o.shift();t+=")})";try{const l=On(r,function(){return Function(t)()},function(){return true});l.source=t;return l}catch(e){fe(te().body,"htmx:syntax:error",{error:e,source:t});return null}}}else if(s==="["){e++}if(tt(s,n,i)){t+="(("+i+"."+s+") ? ("+i+"."+s+") : (window."+s+"))"}else{t=t+s}n=o.shift()}}}function O(e,t){let n="";while(e.length>0&&!t.test(e[0])){n+=e.shift()}return n}function rt(e){let t;if(e.length>0&&Ye.test(e[0])){e.shift();t=O(e,Qe).trim();e.shift()}else{t=O(e,E)}return t}const ot="input, textarea, select";function it(e,t,n){const r=[];const o=et(t);do{O(o,C);const l=o.length;const c=O(o,/[,\[\s]/);if(c!==""){if(c==="every"){const u={trigger:"every"};O(o,C);u.pollInterval=d(O(o,/[,\[\s]/));O(o,C);var i=nt(e,o,"event");if(i){u.eventFilter=i}r.push(u)}else{const f={trigger:c};var i=nt(e,o,"event");if(i){f.eventFilter=i}O(o,C);while(o.length>0&&o[0]!==","){const a=o.shift();if(a==="changed"){f.changed=true}else if(a==="once"){f.once=true}else if(a==="consume"){f.consume=true}else if(a==="delay"&&o[0]===":"){o.shift();f.delay=d(O(o,E))}else if(a==="from"&&o[0]===":"){o.shift();if(Ye.test(o[0])){var s=rt(o)}else{var s=O(o,E);if(s==="closest"||s==="find"||s==="next"||s==="previous"){o.shift();const h=rt(o);if(h.length>0){s+=" "+h}}}f.from=s}else if(a==="target"&&o[0]===":"){o.shift();f.target=rt(o)}else if(a==="throttle"&&o[0]===":"){o.shift();f.throttle=d(O(o,E))}else if(a==="queue"&&o[0]===":"){o.shift();f.queue=O(o,E)}else if(a==="root"&&o[0]===":"){o.shift();f[a]=rt(o)}else if(a==="threshold"&&o[0]===":"){o.shift();f[a]=O(o,E)}else{fe(e,"htmx:syntax:error",{token:o.shift()})}O(o,C)}r.push(f)}}if(o.length===l){fe(e,"htmx:syntax:error",{token:o.shift()})}O(o,C)}while(o[0]===","&&o.shift());if(n){n[t]=r}return r}function st(e){const t=a(e,"hx-trigger");let n=[];if(t){const r=Q.config.triggerSpecsCache;n=r&&r[t]||it(e,t,r)}if(n.length>0){return n}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,ot)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function lt(e){oe(e).cancelled=true}function ct(e,t,n){const r=oe(e);r.timeout=b().setTimeout(function(){if(se(e)&&r.cancelled!==true){if(!pt(n,e,Xt("hx:poll:trigger",{triggerSpec:n,target:e}))){t(e)}ct(e,t,n)}},n.pollInterval)}function ut(e){return location.hostname===e.hostname&&ee(e,"href")&&ee(e,"href").indexOf("#")!==0}function ft(e){return g(e,Q.config.disableSelector)}function at(t,n,e){if(t instanceof HTMLAnchorElement&&ut(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"&&String(ee(t,"method")).toLowerCase()!=="dialog"){n.boosted=true;let r,o;if(t.tagName==="A"){r="get";o=ee(t,"href")}else{const i=ee(t,"method");r=i?i.toLowerCase():"get";o=ee(t,"action");if(o==null||o===""){o=location.href}if(r==="get"&&o.includes("?")){o=o.replace(/\?[^#]+/,"")}}e.forEach(function(e){gt(t,function(e,t){const n=ce(e);if(ft(n)){S(n);return}he(r,o,n,t)},n,e,true)})}}function ht(e,t){if(e.type==="submit"&&t.tagName==="FORM"){return true}else if(e.type==="click"){const n=t.closest('input[type="submit"], button');if(n&&n.form&&n.type==="submit"){return true}const r=t.closest("a");const o=/^#.+/;if(r&&r.href&&!o.test(r.getAttribute("href"))){return true}}return false}function dt(e,t){return oe(e).boosted&&e instanceof HTMLAnchorElement&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function pt(e,t,n){const r=e.eventFilter;if(r){try{return r.call(t,n)!==true}catch(e){const o=r.source;fe(te().body,"htmx:eventFilter:error",{error:e,source:o});return true}}return false}function gt(l,c,e,u,f){const a=oe(l);let t;if(u.from){t=m(l,u.from)}else{t=[l]}if(u.changed){if(!("lastValue"in a)){a.lastValue=new WeakMap}t.forEach(function(e){if(!a.lastValue.has(u)){a.lastValue.set(u,new WeakMap)}a.lastValue.get(u).set(e,e.value)})}ie(t,function(i){const s=function(e){if(!se(l)){i.removeEventListener(u.trigger,s);return}if(dt(l,e)){return}if(f||ht(e,i)){e.preventDefault()}if(pt(u,l,e)){return}const t=oe(e);t.triggerSpec=u;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(l)<0){t.handledFor.push(l);if(u.consume){e.stopPropagation()}if(u.target&&e.target){if(!h(ce(e.target),u.target)){return}}if(u.once){if(a.triggeredOnce){return}else{a.triggeredOnce=true}}if(u.changed){const n=e.target;const r=n.value;const o=a.lastValue.get(u);if(o.has(n)&&o.get(n)===r){return}o.set(n,r)}if(a.delayed){clearTimeout(a.delayed)}if(a.throttle){return}if(u.throttle>0){if(!a.throttle){ae(l,"htmx:trigger");c(l,e);a.throttle=b().setTimeout(function(){a.throttle=null},u.throttle)}}else if(u.delay>0){a.delayed=b().setTimeout(function(){ae(l,"htmx:trigger");c(l,e)},u.delay)}else{ae(l,"htmx:trigger");c(l,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:u.trigger,listener:s,on:i});i.addEventListener(u.trigger,s)})}let mt=false;let yt=null;function xt(){if(!yt){yt=function(){mt=true};window.addEventListener("scroll",yt);window.addEventListener("resize",yt);setInterval(function(){if(mt){mt=false;ie(te().querySelectorAll("[hx-trigger*='revealed'],[data-hx-trigger*='revealed']"),function(e){bt(e)})}},200)}}function bt(e){if(!s(e,"data-hx-revealed")&&F(e)){e.setAttribute("data-hx-revealed","true");const t=oe(e);if(t.initHash){ae(e,"revealed")}else{e.addEventListener("htmx:afterProcessNode",function(){ae(e,"revealed")},{once:true})}}}function vt(e,t,n,r){const o=function(){if(!n.loaded){n.loaded=true;ae(e,"htmx:trigger");t(e)}};if(r>0){b().setTimeout(o,r)}else{o()}}function wt(t,n,e){let i=false;ie(de,function(r){if(s(t,"hx-"+r)){const o=a(t,"hx-"+r);i=true;n.path=o;n.verb=r;e.forEach(function(e){St(t,e,n,function(e,t){const n=ce(e);if(ft(n)){S(n);return}he(r,o,n,t)})})}});return i}function St(r,e,t,n){if(e.trigger==="revealed"){xt();gt(r,n,t,e);bt(ce(r))}else if(e.trigger==="intersect"){const o={};if(e.root){o.root=ue(r,e.root)}if(e.threshold){o.threshold=parseFloat(e.threshold)}const i=new IntersectionObserver(function(t){for(let e=0;e0){t.polling=true;ct(ce(r),n,e)}else{gt(r,n,t,e)}}function Et(e){const t=ce(e);if(!t){return false}const n=t.attributes;for(let e=0;e", "+e).join(""));return o}else{return[]}}function Rt(e){const t=At(e.target);const n=Nt(e);if(n){n.lastButtonClicked=t}}function qt(e){const t=Nt(e);if(t){t.lastButtonClicked=null}}function At(e){return g(ce(e),"button, input[type='submit']")}function Lt(e){return e.form||g(e,"form")}function Nt(e){const t=At(e.target);if(!t){return}const n=Lt(t);if(!n){return}return oe(n)}function It(e){e.addEventListener("click",Rt);e.addEventListener("focusin",Rt);e.addEventListener("focusout",qt)}function Dt(t,e,n){const r=oe(t);if(!Array.isArray(r.onHandlers)){r.onHandlers=[]}let o;const i=function(e){On(t,function(){if(ft(t)){return}if(!o){o=new Function("event",n)}o.call(t,e)})};t.addEventListener(e,i);r.onHandlers.push({event:e,listener:i})}function Pt(t){Pe(t);for(let e=0;eQ.config.historyCacheSize){i.shift()}while(i.length>0){try{sessionStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){fe(te().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Jt(t){if(!X()){return null}t=U(t);const n=v(sessionStorage.getItem("htmx-history-cache"))||[];for(let e=0;e=200&&this.status<400){r.response=this.response;ae(te().body,"htmx:historyCacheMissLoad",r);ze(r.historyElt,r.response,n,{contextElement:r.historyElt,historyRequest:true});$t(r.path);ae(te().body,"htmx:historyRestore",{path:e,cacheMiss:true,serverResponse:r.response})}else{fe(te().body,"htmx:historyCacheMissLoadError",r)}};if(ae(te().body,"htmx:historyCacheMiss",r)){t.send()}}function en(e){Gt();e=e||location.pathname+location.search;const t=Jt(e);if(t){const n={swapStyle:"innerHTML",swapDelay:0,settleDelay:0,scroll:t.scroll};const r={path:e,item:t,historyElt:_t(),swapSpec:n};if(ae(te().body,"htmx:historyCacheHit",r)){ze(r.historyElt,t.content,n,{contextElement:r.historyElt,title:t.title});$t(r.path);ae(te().body,"htmx:historyRestore",r)}}else{if(Q.config.refreshOnHistoryMiss){Q.location.reload(true)}else{Qt(e)}}}function tn(e){let t=we(e,"hx-indicator");if(t==null){t=[e]}ie(t,function(e){const t=oe(e);t.requestCount=(t.requestCount||0)+1;e.classList.add.call(e.classList,Q.config.requestClass)});return t}function nn(e){let t=we(e,"hx-disabled-elt");if(t==null){t=[]}ie(t,function(e){const t=oe(e);t.requestCount=(t.requestCount||0)+1;e.setAttribute("disabled","");e.setAttribute("data-disabled-by-htmx","")});return t}function rn(e,t){ie(e.concat(t),function(e){const t=oe(e);t.requestCount=(t.requestCount||1)-1});ie(e,function(e){const t=oe(e);if(t.requestCount===0){e.classList.remove.call(e.classList,Q.config.requestClass)}});ie(t,function(e){const t=oe(e);if(t.requestCount===0){e.removeAttribute("disabled");e.removeAttribute("data-disabled-by-htmx")}})}function on(t,n){for(let e=0;en.indexOf(e)<0)}else{e=e.filter(e=>e!==n)}r.delete(t);ie(e,e=>r.append(t,e))}}function un(e){if(e instanceof HTMLSelectElement&&e.multiple){return M(e.querySelectorAll("option:checked")).map(function(e){return e.value})}if(e instanceof HTMLInputElement&&e.files){return M(e.files)}return e.value}function fn(t,n,r,e,o){if(e==null||on(t,e)){return}else{t.push(e)}if(sn(e)){const i=ee(e,"name");ln(i,un(e),n);if(o){an(e,r)}}if(e instanceof HTMLFormElement){ie(e.elements,function(e){if(t.indexOf(e)>=0){cn(e.name,un(e),n)}else{t.push(e)}if(o){an(e,r)}});new FormData(e).forEach(function(e,t){if(e instanceof File&&e.name===""){return}ln(t,e,n)})}}function an(e,t){const n=e;if(n.willValidate){ae(n,"htmx:validation:validate");if(!n.checkValidity()){if(ae(n,"htmx:validation:failed",{message:n.validationMessage,validity:n.validity})&&!t.length&&Q.config.reportValidityOfForms){n.reportValidity()}t.push({elt:n,message:n.validationMessage,validity:n.validity})}}}function hn(n,e){for(const t of e.keys()){n.delete(t)}e.forEach(function(e,t){n.append(t,e)});return n}function dn(e,t){const n=[];const r=new FormData;const o=new FormData;const i=[];const s=oe(e);if(s.lastButtonClicked&&!se(s.lastButtonClicked)){s.lastButtonClicked=null}let l=e instanceof HTMLFormElement&&e.noValidate!==true||a(e,"hx-validate")==="true";if(s.lastButtonClicked){l=l&&s.lastButtonClicked.formNoValidate!==true}if(t!=="get"){fn(n,o,i,Lt(e),l)}fn(n,r,i,e,l);if(s.lastButtonClicked||e.tagName==="BUTTON"||e.tagName==="INPUT"&&ee(e,"type")==="submit"){const u=s.lastButtonClicked||e;const f=ee(u,"name");ln(f,u.value,o)}const c=we(e,"hx-include");ie(c,function(e){fn(n,r,i,ce(e),l);if(!h(e,"form")){ie(p(e).querySelectorAll(ot),function(e){fn(n,r,i,e,l)})}});hn(r,o);return{errors:i,formData:r,values:kn(r)}}function pn(e,t,n){if(e!==""){e+="&"}if(String(n)==="[object Object]"){n=JSON.stringify(n)}const r=encodeURIComponent(n);e+=encodeURIComponent(t)+"="+r;return e}function gn(e){e=Dn(e);let n="";e.forEach(function(e,t){n=pn(n,t,e)});return n}function mn(e,t,n){const r={"HX-Request":"true","HX-Trigger":ee(e,"id"),"HX-Trigger-Name":ee(e,"name"),"HX-Target":a(t,"id"),"HX-Current-URL":location.href};Cn(e,"hx-headers",false,r);if(n!==undefined){r["HX-Prompt"]=n}if(oe(e).boosted){r["HX-Boosted"]="true"}return r}function yn(n,e){const t=ne(e,"hx-params");if(t){if(t==="none"){return new FormData}else if(t==="*"){return n}else if(t.indexOf("not ")===0){ie(t.slice(4).split(","),function(e){e=e.trim();n.delete(e)});return n}else{const r=new FormData;ie(t.split(","),function(t){t=t.trim();if(n.has(t)){n.getAll(t).forEach(function(e){r.append(t,e)})}});return r}}else{return n}}function xn(e){return!!ee(e,"href")&&ee(e,"href").indexOf("#")>=0}function bn(e,t){const n=t||ne(e,"hx-swap");const r={swapStyle:oe(e).boosted?"innerHTML":Q.config.defaultSwapStyle,swapDelay:Q.config.defaultSwapDelay,settleDelay:Q.config.defaultSettleDelay};if(Q.config.scrollIntoViewOnBoost&&oe(e).boosted&&!xn(e)){r.show="top"}if(n){const s=B(n);if(s.length>0){for(let e=0;e0?o.join(":"):null;r.scroll=u;r.scrollTarget=i}else if(l.indexOf("show:")===0){const f=l.slice(5);var o=f.split(":");const a=o.pop();var i=o.length>0?o.join(":"):null;r.show=a;r.showTarget=i}else if(l.indexOf("focus-scroll:")===0){const h=l.slice("focus-scroll:".length);r.focusScroll=h=="true"}else if(e==0){r.swapStyle=l}else{H("Unknown modifier in hx-swap: "+l)}}}}return r}function vn(e){return ne(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&ee(e,"enctype")==="multipart/form-data"}function wn(t,n,r){let o=null;Vt(n,function(e){if(o==null){o=e.encodeParameters(t,r,n)}});if(o!=null){return o}else{if(vn(n)){return hn(new FormData,Dn(r))}else{return gn(r)}}}function Sn(e){return{tasks:[],elts:[e]}}function En(e,t){const n=e[0];const r=e[e.length-1];if(t.scroll){var o=null;if(t.scrollTarget){o=ce(ue(n,t.scrollTarget))}if(t.scroll==="top"&&(n||o)){o=o||n;o.scrollTop=0}if(t.scroll==="bottom"&&(r||o)){o=o||r;o.scrollTop=o.scrollHeight}if(typeof t.scroll==="number"){b().setTimeout(function(){window.scrollTo(0,t.scroll)},0)}}if(t.show){var o=null;if(t.showTarget){let e=t.showTarget;if(t.showTarget==="window"){e="body"}o=ce(ue(n,e))}if(t.show==="top"&&(n||o)){o=o||n;o.scrollIntoView({block:"start",behavior:Q.config.scrollBehavior})}if(t.show==="bottom"&&(r||o)){o=o||r;o.scrollIntoView({block:"end",behavior:Q.config.scrollBehavior})}}}function Cn(r,e,o,i,s){if(i==null){i={}}if(r==null){return i}const l=a(r,e);if(l){let e=l.trim();let t=o;if(e==="unset"){return null}if(e.indexOf("javascript:")===0){e=e.slice(11);t=true}else if(e.indexOf("js:")===0){e=e.slice(3);t=true}if(e.indexOf("{")!==0){e="{"+e+"}"}let n;if(t){n=On(r,function(){if(s){return Function("event","return ("+e+")").call(r,s)}else{return Function("return ("+e+")").call(r)}},{})}else{n=v(e)}for(const c in n){if(n.hasOwnProperty(c)){if(i[c]==null){i[c]=n[c]}}}}return Cn(ce(u(r)),e,o,i,s)}function On(e,t,n){if(Q.config.allowEval){return t()}else{fe(e,"htmx:evalDisallowedError");return n}}function Hn(e,t,n){return Cn(e,"hx-vars",true,n,t)}function Tn(e,t,n){return Cn(e,"hx-vals",false,n,t)}function Rn(e,t){return le(Hn(e,t),Tn(e,t))}function qn(t,n,r){if(r!==null){try{t.setRequestHeader(n,r)}catch(e){t.setRequestHeader(n,encodeURIComponent(r));t.setRequestHeader(n+"-URI-AutoEncoded","true")}}}function An(t){if(t.responseURL){try{const e=new URL(t.responseURL);return e.pathname+e.search}catch(e){fe(te().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function T(e,t){return t.test(e.getAllResponseHeaders())}function Ln(t,n,r){t=t.toLowerCase();if(r){if(r instanceof Element||typeof r==="string"){return he(t,n,null,null,{targetOverride:w(r)||ve,returnPromise:true})}else{let e=w(r.target);if(r.target&&!e||r.source&&!e&&!w(r.source)){e=ve}return he(t,n,w(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:e,swapOverride:r.swap,select:r.select,returnPromise:true,push:r.push,replace:r.replace,selectOOB:r.selectOOB})}}else{return he(t,n,null,null,{returnPromise:true})}}function Nn(e){const t=[];while(e){t.push(e);e=e.parentElement}return t}function In(e,t,n){const r=new URL(t,location.protocol!=="about:"?location.href:window.origin);const o=location.protocol!=="about:"?location.origin:window.origin;const i=o===r.origin;if(Q.config.selfRequestsOnly){if(!i){return false}}return ae(e,"htmx:validateUrl",le({url:r,sameHost:i},n))}function Dn(e){if(e instanceof FormData)return e;const t=new FormData;for(const n in e){if(e.hasOwnProperty(n)){if(e[n]&&typeof e[n].forEach==="function"){e[n].forEach(function(e){t.append(n,e)})}else if(typeof e[n]==="object"&&!(e[n]instanceof Blob)){t.append(n,JSON.stringify(e[n]))}else{t.append(n,e[n])}}}return t}function Pn(r,o,e){return new Proxy(e,{get:function(t,e){if(typeof e==="number")return t[e];if(e==="length")return t.length;if(e==="push"){return function(e){t.push(e);r.append(o,e)}}if(typeof t[e]==="function"){return function(){t[e].apply(t,arguments);r.delete(o);t.forEach(function(e){r.append(o,e)})}}if(t[e]&&t[e].length===1){return t[e][0]}else{return t[e]}},set:function(e,t,n){e[t]=n;r.delete(o);e.forEach(function(e){r.append(o,e)});return true}})}function kn(o){return new Proxy(o,{get:function(e,t){if(typeof t==="symbol"){const r=Reflect.get(e,t);if(typeof r==="function"){return function(){return r.apply(o,arguments)}}else{return r}}if(t==="toJSON"){return()=>Object.fromEntries(o)}if(t in e){if(typeof e[t]==="function"){return function(){return o[t].apply(o,arguments)}}}const n=o.getAll(t);if(n.length===0){return undefined}else if(n.length===1){return n[0]}else{return Pn(e,t,n)}},set:function(t,n,e){if(typeof n!=="string"){return false}t.delete(n);if(e&&typeof e.forEach==="function"){e.forEach(function(e){t.append(n,e)})}else if(typeof e==="object"&&!(e instanceof Blob)){t.append(n,JSON.stringify(e))}else{t.append(n,e)}return true},deleteProperty:function(e,t){if(typeof t==="string"){e.delete(t)}return true},ownKeys:function(e){return Reflect.ownKeys(Object.fromEntries(e))},getOwnPropertyDescriptor:function(e,t){return Reflect.getOwnPropertyDescriptor(Object.fromEntries(e),t)}})}function he(t,n,r,o,i,k){let s=null;let l=null;i=i!=null?i:{};if(i.returnPromise&&typeof Promise!=="undefined"){var e=new Promise(function(e,t){s=e;l=t})}if(r==null){r=te().body}const M=i.handler||Vn;const F=i.select||null;if(!se(r)){re(s);return e}const c=i.targetOverride||ce(Ee(r));if(c==null||c==ve){fe(r,"htmx:targetError",{target:ne(r,"hx-target")});re(l);return e}let u=oe(r);const f=u.lastButtonClicked;if(f){const A=ee(f,"formaction");if(A!=null){n=A}const L=ee(f,"formmethod");if(L!=null){if(de.includes(L.toLowerCase())){t=L}else{re(s);return e}}}const a=ne(r,"hx-confirm");if(k===undefined){const K=function(e){return he(t,n,r,o,i,!!e)};const G={target:c,elt:r,path:n,verb:t,triggeringEvent:o,etc:i,issueRequest:K,question:a};if(ae(r,"htmx:confirm",G)===false){re(s);return e}}let h=r;let d=ne(r,"hx-sync");let p=null;let B=false;if(d){const N=d.split(":");const I=N[0].trim();if(I==="this"){h=Se(r,"hx-sync")}else{h=ce(ue(r,I))}d=(N[1]||"drop").trim();u=oe(h);if(d==="drop"&&u.xhr&&u.abortable!==true){re(s);return e}else if(d==="abort"){if(u.xhr){re(s);return e}else{B=true}}else if(d==="replace"){ae(h,"htmx:abort")}else if(d.indexOf("queue")===0){const W=d.split(" ");p=(W[1]||"last").trim()}}if(u.xhr){if(u.abortable){ae(h,"htmx:abort")}else{if(p==null){if(o){const D=oe(o);if(D&&D.triggerSpec&&D.triggerSpec.queue){p=D.triggerSpec.queue}}if(p==null){p="last"}}if(u.queuedRequests==null){u.queuedRequests=[]}if(p==="first"&&u.queuedRequests.length===0){u.queuedRequests.push(function(){he(t,n,r,o,i)})}else if(p==="all"){u.queuedRequests.push(function(){he(t,n,r,o,i)})}else if(p==="last"){u.queuedRequests=[];u.queuedRequests.push(function(){he(t,n,r,o,i)})}re(s);return e}}const g=new XMLHttpRequest;u.xhr=g;u.abortable=B;const m=function(){u.xhr=null;u.abortable=false;if(u.queuedRequests!=null&&u.queuedRequests.length>0){const e=u.queuedRequests.shift();e()}};const X=ne(r,"hx-prompt");if(X){var y=prompt(X);if(y===null||!ae(r,"htmx:prompt",{prompt:y,target:c})){re(s);m();return e}}if(a&&!k){if(!confirm(a)){re(s);m();return e}}let x=mn(r,c,y);if(t!=="get"&&!vn(r)){x["Content-Type"]="application/x-www-form-urlencoded"}if(i.headers){x=le(x,i.headers)}const U=dn(r,t);let b=U.errors;const V=U.formData;if(i.values){hn(V,Dn(i.values))}const j=Dn(Rn(r,o));const v=hn(V,j);let w=yn(v,r);if(Q.config.getCacheBusterParam&&t==="get"){w.set("org.htmx.cache-buster",ee(c,"id")||"true")}if(n==null||n===""){n=location.href}const S=Cn(r,"hx-request");const $=oe(r).boosted;let E=Q.config.methodsThatUseUrlParams.indexOf(t)>=0;const C={boosted:$,useUrlParams:E,formData:w,parameters:kn(w),unfilteredFormData:v,unfilteredParameters:kn(v),headers:x,elt:r,target:c,verb:t,errors:b,withCredentials:i.credentials||S.credentials||Q.config.withCredentials,timeout:i.timeout||S.timeout||Q.config.timeout,path:n,triggeringEvent:o};if(!ae(r,"htmx:configRequest",C)){re(s);m();return e}n=C.path;t=C.verb;x=C.headers;w=Dn(C.parameters);b=C.errors;E=C.useUrlParams;if(b&&b.length>0){ae(r,"htmx:validation:halted",C);re(s);m();return e}const _=n.split("#");const z=_[0];const O=_[1];let H=n;if(E){H=z;const Z=!w.keys().next().done;if(Z){if(H.indexOf("?")<0){H+="?"}else{H+="&"}H+=gn(w);if(O){H+="#"+O}}}if(!In(r,H,C)){fe(r,"htmx:invalidPath",C);re(l);m();return e}g.open(t.toUpperCase(),H,true);g.overrideMimeType("text/html");g.withCredentials=C.withCredentials;g.timeout=C.timeout;if(S.noHeaders){}else{for(const P in x){if(x.hasOwnProperty(P)){const Y=x[P];qn(g,P,Y)}}}const T={xhr:g,target:c,requestConfig:C,etc:i,boosted:$,select:F,pathInfo:{requestPath:n,finalRequestPath:H,responsePath:null,anchor:O}};g.onload=function(){try{const t=Nn(r);T.pathInfo.responsePath=An(g);M(r,T);if(T.keepIndicators!==true){rn(R,q)}ae(r,"htmx:afterRequest",T);ae(r,"htmx:afterOnLoad",T);if(!se(r)){let e=null;while(t.length>0&&e==null){const n=t.shift();if(se(n)){e=n}}if(e){ae(e,"htmx:afterRequest",T);ae(e,"htmx:afterOnLoad",T)}}re(s)}catch(e){fe(r,"htmx:onLoadError",le({error:e},T));throw e}finally{m()}};g.onerror=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:sendError",T);re(l);m()};g.onabort=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:sendAbort",T);re(l);m()};g.ontimeout=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:timeout",T);re(l);m()};if(!ae(r,"htmx:beforeRequest",T)){re(s);m();return e}var R=tn(r);var q=nn(r);ie(["loadstart","loadend","progress","abort"],function(t){ie([g,g.upload],function(e){e.addEventListener(t,function(e){ae(r,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});ae(r,"htmx:beforeSend",T);const J=E?null:wn(g,r,w);g.send(J);return e}function Mn(e,t){const n=t.xhr;let r=null;let o=null;if(T(n,/HX-Push:/i)){r=n.getResponseHeader("HX-Push");o="push"}else if(T(n,/HX-Push-Url:/i)){r=n.getResponseHeader("HX-Push-Url");o="push"}else if(T(n,/HX-Replace-Url:/i)){r=n.getResponseHeader("HX-Replace-Url");o="replace"}if(r){if(r==="false"){return{}}else{return{type:o,path:r}}}const i=t.pathInfo.finalRequestPath;const s=t.pathInfo.responsePath;const l=t.etc.push||ne(e,"hx-push-url");const c=t.etc.replace||ne(e,"hx-replace-url");const u=oe(e).boosted;let f=null;let a=null;if(l){f="push";a=l}else if(c){f="replace";a=c}else if(u){f="push";a=s||i}if(a){if(a==="false"){return{}}if(a==="true"){a=s||i}if(t.pathInfo.anchor&&a.indexOf("#")===-1){a=a+"#"+t.pathInfo.anchor}return{type:f,path:a}}else{return{}}}function Fn(e,t){var n=new RegExp(e.code);return n.test(t.toString(10))}function Bn(e){for(var t=0;t`+`.${t}{opacity:0;visibility: hidden} `+`.${n} .${t}, .${n}.${t}{opacity:1;visibility: visible;transition: opacity 200ms ease-in}`+"")}}function Zn(){const e=te().querySelector('meta[name="htmx-config"]');if(e){return v(e.content)}else{return null}}function Yn(){const e=Zn();if(e){Q.config=le(Q.config,e)}}Gn(function(){Yn();Wn();let e=te().body;Ft(e);const t=te().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.detail.elt||e.target;const n=oe(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){en();ie(t,function(e){ae(e,"htmx:restored",{document:te(),triggerEvent:ae})})}else{if(n){n(e)}}};b().setTimeout(function(){ae(e,"htmx:load",{});e=null},0)});return Q}(); diff --git a/timezone_converter/templates/timezone_converter/converted.html b/timezone_converter/templates/timezone_converter/converted.html index 98870fc..233a454 100644 --- a/timezone_converter/templates/timezone_converter/converted.html +++ b/timezone_converter/templates/timezone_converter/converted.html @@ -3,7 +3,6 @@ {{ error_message }} {% else %} {% timezone timezone %} -

Converted time: {{ timestamp }}

diff --git a/timezone_converter/templates/timezone_converter/converter.html b/timezone_converter/templates/timezone_converter/converter.html index 9f89514..27a7936 100644 --- a/timezone_converter/templates/timezone_converter/converter.html +++ b/timezone_converter/templates/timezone_converter/converter.html @@ -1,39 +1,40 @@ -{% extends "_base.html" %} +{% extends "djpress/djpress_blog_theme/base.html" %} {% load static %} +{% block head %} + + +{% endblock head %} {% block title %}Timezone Converter{% endblock %} {% comment %} This removes the RSS link {% endcomment %} {% block head_close %}{% endblock %} {% block content %}

Timezone Converter

-
-
-
- - - - -
-
- -
+
+
+
+ +
+ +
+
+ +
+ +
+ + +
{% endblock content %} diff --git a/uv.lock b/uv.lock index ff342a3..10807b7 100644 --- a/uv.lock +++ b/uv.lock @@ -34,30 +34,30 @@ wheels = [ [[package]] name = "boto3" -version = "1.42.78" +version = "1.42.79" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "botocore" }, { name = "jmespath" }, { name = "s3transfer" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/a8/2b/ebdad075934cf6bb78bf81fe31d83339bcd804ad6c856f7341376cbc88b6/boto3-1.42.78.tar.gz", hash = "sha256:cef2ebdb9be5c0e96822f8d3941ac4b816c90a5737a7ffb901d664c808964b63", size = 112789, upload-time = "2026-03-27T19:28:07.58Z" } +sdist = { url = "https://files.pythonhosted.org/packages/72/56/3909516140653c389214d01f15660fa76514a9a9e30da1cb9e894f01051e/boto3-1.42.79.tar.gz", hash = "sha256:286c4220785e4fbe46aaea04d005b0dcdd8aaf5b885d92b2609c934d794ec5d9", size = 112818, upload-time = "2026-03-30T19:44:40.497Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/57/bb/1f6dade1f1e86858bef7bd332bc8106c445f2dbabec7b32ab5d7d118c9b6/boto3-1.42.78-py3-none-any.whl", hash = "sha256:480a34a077484a5ca60124dfd150ba3ea6517fc89963a679e45b30c6db614d26", size = 140556, upload-time = "2026-03-27T19:28:06.125Z" }, + { url = "https://files.pythonhosted.org/packages/ce/c0/d018824c2859976753cc4b78c48e1be641cf734b7d84e455b0f7f9b9d66d/boto3-1.42.79-py3-none-any.whl", hash = "sha256:2336d744dfe9017d6b96b8e40fdd445295ca6a67f02f1c8c488edeb92c4b7918", size = 140555, upload-time = "2026-03-30T19:44:37.326Z" }, ] [[package]] name = "botocore" -version = "1.42.78" +version = "1.42.79" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "jmespath" }, { name = "python-dateutil" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/67/8e/cdb34c8ca71216d214e049ada2148ee08bcda12b1ac72af3a720dea300ff/botocore-1.42.78.tar.gz", hash = "sha256:61cbd49728e23f68cfd945406ab40044d49abed143362f7ffa4a4f4bd4311791", size = 15023592, upload-time = "2026-03-27T19:27:57.122Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f3/4b/ec7b3a9acc47a27a3e279d6532f8fcaf16e44c840895718129ca339a0719/botocore-1.42.79.tar.gz", hash = "sha256:1ea98f505a1a65c4b6eed4a6b7452f27613c9aa24532aa71650ec3f3e05fa32c", size = 15064434, upload-time = "2026-03-30T19:44:28.49Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/54/72/94bba1a375d45c685b00e051b56142359547837086a83861d76f6aec26f4/botocore-1.42.78-py3-none-any.whl", hash = "sha256:038ab63c7f898e8b5db58cb6a45e4da56c31dd984e7e995839a3540c735564ea", size = 14701729, upload-time = "2026-03-27T19:27:54.05Z" }, + { url = "https://files.pythonhosted.org/packages/68/d9/289f94219c2ee4b2a38642bb4a6b8c71cf136c0983e25c0c8fe6b29b1c0a/botocore-1.42.79-py3-none-any.whl", hash = "sha256:edea07bb255e812908e783a9da6ee63ba97baa0cc6612adabbad54466281e330", size = 14741875, upload-time = "2026-03-30T19:44:23.959Z" }, ] [[package]] @@ -227,6 +227,17 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/a3/a4/283692c084d068b3f732705e89299052843f85a6ccf97a0c758e828f9712/djpress-0.23.0-py3-none-any.whl", hash = "sha256:a5e17338258f6a5bf17afcb3d3e9d291d3f2a6813a8bda23ba8c1b790b113677", size = 81815, upload-time = "2026-03-29T03:08:15.124Z" }, ] +[[package]] +name = "djpress-blog-theme" +version = "0.3.0" +source = { editable = "../../DJ_Press/djpress-blog-theme" } +dependencies = [ + { name = "djpress" }, +] + +[package.metadata] +requires-dist = [{ name = "djpress", specifier = ">=0.23.0" }] + [[package]] name = "djpress-publish-bluesky" version = "1.1.0" @@ -662,11 +673,11 @@ wheels = [ [[package]] name = "pygments" -version = "2.19.2" +version = "2.20.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/b0/77/a5b8c569bf593b0140bde72ea885a803b82086995367bf2037de0159d924/pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", size = 4968631, upload-time = "2025-06-21T13:39:12.283Z" } +sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" }, + { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" }, ] [[package]] @@ -738,7 +749,7 @@ wheels = [ [[package]] name = "requests" -version = "2.33.0" +version = "2.33.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "certifi" }, @@ -746,9 +757,9 @@ dependencies = [ { name = "idna" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/34/64/8860370b167a9721e8956ae116825caff829224fbca0ca6e7bf8ddef8430/requests-2.33.0.tar.gz", hash = "sha256:c7ebc5e8b0f21837386ad0e1c8fe8b829fa5f544d8df3b2253bff14ef29d7652", size = 134232, upload-time = "2026-03-25T15:10:41.586Z" } +sdist = { url = "https://files.pythonhosted.org/packages/5f/a4/98b9c7c6428a668bf7e42ebb7c79d576a1c3c1e3ae2d47e674b468388871/requests-2.33.1.tar.gz", hash = "sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517", size = 134120, upload-time = "2026-03-30T16:09:15.531Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/56/5d/c814546c2333ceea4ba42262d8c4d55763003e767fa169adc693bd524478/requests-2.33.0-py3-none-any.whl", hash = "sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b", size = 65017, upload-time = "2026-03-25T15:10:40.382Z" }, + { url = "https://files.pythonhosted.org/packages/d7/8e/7540e8a2036f79a125c1d2ebadf69ed7901608859186c856fa0388ef4197/requests-2.33.1-py3-none-any.whl", hash = "sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a", size = 64947, upload-time = "2026-03-30T16:09:13.83Z" }, ] [[package]] @@ -809,13 +820,14 @@ wheels = [ [[package]] name = "stuartm-nz" -version = "0.22.1" +version = "0.23.0" source = { virtual = "." } dependencies = [ { name = "django" }, { name = "django-debug-toolbar" }, { name = "django-storages", extra = ["s3"] }, { name = "djpress" }, + { name = "djpress-blog-theme" }, { name = "djpress-publish-bluesky" }, { name = "djpress-publish-mastodon" }, { name = "environs", extra = ["django"] }, @@ -839,6 +851,7 @@ requires-dist = [ { name = "django-debug-toolbar", specifier = ">=4.4.6" }, { name = "django-storages", extras = ["s3"], specifier = ">=1.14.6" }, { name = "djpress", specifier = "==0.23.*" }, + { name = "djpress-blog-theme", editable = "../../DJ_Press/djpress-blog-theme" }, { name = "djpress-publish-bluesky", specifier = ">=1.1.0" }, { name = "djpress-publish-mastodon", specifier = ">=1.2.0" }, { name = "environs", extras = ["django"], specifier = ">=14.3.0" }, From 0b5e70e0bebde8c14d511edc65ba7f39a149673b Mon Sep 17 00:00:00 2001 From: Stuart Maxwell Date: Tue, 16 Jun 2026 12:46:36 +1200 Subject: [PATCH 2/2] Theme updates --- .pre-commit-config.yaml | 25 +-- config/settings.py | 8 +- .../static/markdown_editor/css/styles.css | 71 +++++++ .../markdown_editor/markdown_editor.html | 128 ++++++----- pdm.lock | 30 ++- pyproject.toml | 1 + .../static/spf_generator/css/styles.css | 17 ++ .../templates/spf_generator/generator.html | 198 +++++++++--------- templates/404.html | 18 +- templates/500.html | 18 +- 10 files changed, 315 insertions(+), 199 deletions(-) create mode 100644 markdown_editor/static/markdown_editor/css/styles.css create mode 100644 spf_generator/static/spf_generator/css/styles.css diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4a73e2f..b4080b3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,30 +16,23 @@ repos: rev: "1.30.0" # replace with latest tag on GitHub hooks: - id: django-upgrade - args: [--target-version, "6.0"] # Replace with Django version + args: [--target-version, "5.1"] # Replace with Django version - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.15.12 + rev: v0.15.17 hooks: - # Run the linter. - - id: ruff-check - types_or: [python, pyi] - args: [--fix] - # Run the formatter. - - id: ruff-format - types_or: [python, pyi] - - repo: https://github.com/djlint/djLint - rev: v1.36.4 - hooks: - - id: djlint-reformat-django - - id: djlint-django + - id: ruff + args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/pre-commit/mirrors-prettier rev: v4.0.0-alpha.8 hooks: - id: prettier types_or: - css - - xml additional_dependencies: - prettier@2.5.1 - - "@prettier/plugin-xml@1.2.0" + - repo: https://github.com/UnknownPlatypus/djangofmt-pre-commit + rev: v0.2.10 + hooks: + - id: djangofmt + - id: djangofmt-svg diff --git a/config/settings.py b/config/settings.py index 401a605..9593e43 100644 --- a/config/settings.py +++ b/config/settings.py @@ -267,7 +267,7 @@ DJPRESS_SETTINGS = { "SITE_TITLE": SITE_TITLE, "POST_PREFIX": POST_PREFIX, - "THEME": "stuartmnz", + "THEME": "djpress_blog_theme", "DATABASE_SETTINGS_ENABLED": True, "AUTHOR_ENABLED": True, "MARKDOWN_RENDERER": "config.markdown_renderer.mistune_renderer", @@ -277,6 +277,7 @@ ], "PLUGIN_SETTINGS": { "djpress_publish_mastodon": { + "enabled": True, "instance_url": "https://fosstodon.org", "access_token": MASTODON_ACCESS_TOKEN, "status_message": "🚀 I created a new blog post!\n\n", @@ -284,6 +285,7 @@ "microblog_category": "microblog", }, "djpress_publish_bluesky": { + "enabled": True, "handle": "stuartm.nz", "app_password": BLUESKY_APP_PASSWORD, "site_url": "https://stuartm.nz/", @@ -292,8 +294,8 @@ }, "THEME_SETTINGS": { "djpress_blog_theme": { - "bg-sidebar": "#005930", - "dark-bg-sidebar": "#061A10", + "bg_sidebar": "#0C4B33", + "dark_bg_sidebar": "#041e14", "avatar_url": "/static/img/avatar.jpg", "email_address": "stuart@amanzi.nz", "mastodon_profile": "https://fosstodon.org/@stuartm", diff --git a/markdown_editor/static/markdown_editor/css/styles.css b/markdown_editor/static/markdown_editor/css/styles.css new file mode 100644 index 0000000..9d9d946 --- /dev/null +++ b/markdown_editor/static/markdown_editor/css/styles.css @@ -0,0 +1,71 @@ +.markdown-editor { + .toolbar { + display: flex; + /*align-items: center;*/ + justify-content: space-between; + gap: 4px; /* Space between buttons */ + padding: 6px; + background-color: #ffffff; + border: 1px solid #ddd; + border-bottom: none; /* Merges with the text area below */ + border-radius: 8px 8px 0 0; /* Rounds only the top corners */ + } + + .toolbar button { + display: flex; + align-items: center; + justify-content: center; + width: 32px; + height: 32px; + padding: 0; + background: transparent; + border: none; + border-radius: 4px; + color: #444; + cursor: pointer; + transition: background 0.2s; + } + + /* Hover effect */ + .toolbar button:hover { + background-color: #f0f0f0; + color: #000; + } + + /* Visual vertical line to group tools */ + .separator { + width: 1px; + height: 20px; + background-color: #ddd; + margin: 0 4px; + } + .toolbar-title { + font-weight: bold; + color: #666; + } + .button-cluster { + display: flex; + gap: 12px; /* Space between the distinct sub-groups */ + } + .button-group { + display: flex; + border: 1px solid #ddd; + border-radius: 4px; + overflow: hidden; /* Clips the inner button corners */ + } + + .button-group button { + border: none; + border-radius: 0; + border-right: 1px solid #ddd; + } + + .button-group button:last-child { + border-right: none; + } + #preview { + border: 1px solid #ddd; + border-radius: 0 0 8px 8px; + padding: 0.5em; + } +} diff --git a/markdown_editor/templates/markdown_editor/markdown_editor.html b/markdown_editor/templates/markdown_editor/markdown_editor.html index 44adc0a..95f3277 100644 --- a/markdown_editor/templates/markdown_editor/markdown_editor.html +++ b/markdown_editor/templates/markdown_editor/markdown_editor.html @@ -1,62 +1,80 @@ {% extends "djpress/djpress_blog_theme/base.html" %} {% load static %} {% block head %} - - - - + + + + {% endblock head %} {% block content %} -
-
-
-
-
Markdown Editor
-
-
- - - -
-
-
- - -
-
-
- - -
-
-
- - - -
-
-
- -
+
+
+
+
+
Markdown Editor
+
+
+ + + +
+
+
+ + +
+
+
+ + +
+
+
+ + + +
+
+
+ +
+
+ +
+
+
+
HTML Preview
+
+ +
+
+
+
- -
-
-
-
HTML Preview
-
- -
-
-
-
-
-
+ {% endblock content %} diff --git a/pdm.lock b/pdm.lock index 0d598be..73b6b4f 100644 --- a/pdm.lock +++ b/pdm.lock @@ -2,10 +2,10 @@ # It is not intended for manual editing. [metadata] -groups = ["default"] +groups = ["default", "dev"] strategy = ["inherit_metadata"] lock_version = "4.5.0" -content_hash = "sha256:57e06d5f108549f6155b630ba46f9db141df994afb8062fa8c46ae6fccd2427d" +content_hash = "sha256:e56d852b23327d30d0bfbe19c1394211bfc5b4e20c36fb525d83be847eef1eab" [[metadata.targets]] requires_python = "==3.14.*" @@ -273,9 +273,23 @@ files = [ {file = "djpress-0.29.1.tar.gz", hash = "sha256:21d1b971def96b790730b91f35953525684db09f5dce86da6ee66bebcc964c0f"}, ] +[[package]] +name = "djpress-blog-theme" +version = "0.4.0" +requires_python = ">=3.10" +summary = "A simple but modern blog theme for DJ Press." +groups = ["default"] +dependencies = [ + "djpress>=0.23.0", +] +files = [ + {file = "djpress_blog_theme-0.4.0-py3-none-any.whl", hash = "sha256:5111d826368b9efe776c00ec9adb6e502b119b889133427592bd9928a8ad0eed"}, + {file = "djpress_blog_theme-0.4.0.tar.gz", hash = "sha256:fbe5a019e592202e68e239f8a65ca80cfd4f87c6102545e98d62a38fca58808c"}, +] + [[package]] name = "djpress-publish-bluesky" -version = "1.1.0" +version = "1.2.0" requires_python = ">=3.10" summary = "A plugin for DJ Press that publishes new posts to Bluesky." groups = ["default"] @@ -284,13 +298,13 @@ dependencies = [ "httpx>=0.28.0", ] files = [ - {file = "djpress_publish_bluesky-1.1.0-py3-none-any.whl", hash = "sha256:fb22a822b0e720b3251a6f5c983a0308a138355da497a383749028f0b988bfd8"}, - {file = "djpress_publish_bluesky-1.1.0.tar.gz", hash = "sha256:86a20107a17d65ceadd9f52908e6f8f9a60e7f36c58a3ee55c41409e0253cf12"}, + {file = "djpress_publish_bluesky-1.2.0-py3-none-any.whl", hash = "sha256:c97618f942a15fe352f70136478ec54b948b9d53f82b185ed3a76aa7b7ab6d0d"}, + {file = "djpress_publish_bluesky-1.2.0.tar.gz", hash = "sha256:1887f528d9a56f979050d452d89bffd6fde3b01f9a70004c2d83a51581c0310c"}, ] [[package]] name = "djpress-publish-mastodon" -version = "1.3.0" +version = "1.4.0" requires_python = ">=3.10" summary = "A plugin for DJ Press that publishes new posts to Mastodon." groups = ["default"] @@ -299,8 +313,8 @@ dependencies = [ "mastodon-py>=1.8.1", ] files = [ - {file = "djpress_publish_mastodon-1.3.0-py3-none-any.whl", hash = "sha256:69f33e08bcbbfcd9d2d4c8aa260870d70ab1bdc1f5f853456923a0af3556ca21"}, - {file = "djpress_publish_mastodon-1.3.0.tar.gz", hash = "sha256:cda054006c2fa1eae5e4353476b4334e973435cfd38fa51a6325332297c753f4"}, + {file = "djpress_publish_mastodon-1.4.0-py3-none-any.whl", hash = "sha256:847387ed7d893e2925b4b5bb619b6f7838aa0c74fa852d40288c894c94dad2b1"}, + {file = "djpress_publish_mastodon-1.4.0.tar.gz", hash = "sha256:b3cfb532bfe20eea947f3c4c77ddde0b3e4dcbb4a28c7af53441eb703ddc0e4e"}, ] [[package]] diff --git a/pyproject.toml b/pyproject.toml index e0bf8a9..677e439 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,6 +23,7 @@ dependencies = [ "djpress-publish-bluesky~=1.1", "django-storages[s3]~=1.14", "uvicorn[standard]~=0.49", + "djpress-blog-theme~=0.4", ] authors = [ {name = "Stuart Maxwell", email = "stuart@amanzi.nz"}, diff --git a/spf_generator/static/spf_generator/css/styles.css b/spf_generator/static/spf_generator/css/styles.css new file mode 100644 index 0000000..31d3832 --- /dev/null +++ b/spf_generator/static/spf_generator/css/styles.css @@ -0,0 +1,17 @@ +.spf-content { + p { + margin-bottom: 1rem; + } + li { + list-style-type: none; + } + button { + background-color: #0c4b33; + color: white; + padding: 12px 24px; + border: none; + border-radius: 8px; + cursor: pointer; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); + } +} diff --git a/spf_generator/templates/spf_generator/generator.html b/spf_generator/templates/spf_generator/generator.html index c459a9b..7124e20 100644 --- a/spf_generator/templates/spf_generator/generator.html +++ b/spf_generator/templates/spf_generator/generator.html @@ -1,107 +1,111 @@ {% extends "djpress/djpress_blog_theme/base.html" %} {% load spf_generator_filters static %} {% block head %} - - + + {% endblock head %} {% block content %} -
-

SPF Record Generator

-

- Please note: I have made best efforts to ensure the information below is correct. But I highly recommend checking and validating the SPF record before updating it in your DNS. Please contact me if you spot any mistakes. -

-

- Select the email services that you use with your domain from the lists below. If you don't see the service you want, please send me a message to let me know. -

-
- {% csrf_token %} -
- {% for category, category_name in categories %} -
-

{{ category_name }}

-
    - {% for field in form %} - {% if field.name|startswith:'provider_' %} - {% with provider=providers|get_provider:field.name %} - {% if provider.category == category %} -
  • - -
    • - {% endif %} - {% endwith %} - {% endif %} - {% endfor %} -
-
- {% endfor %} -
-

Custom Server

-
-
-

- Optionally, you can add the IP address of your own server to your SPF record. This is useful if you have a server that sends emails directly to the internet. -

- {% if form.custom_ip.errors %}{{ form.custom_ip.errors.0 }}{% endif %} -
-
- {{ form.custom_ip }} - {% if form.custom_ip.help_text %}{{ form.custom_ip.help_text }}{% endif %} -
-
-

Default Policy

-
-
-

- Now select the policy you want to apply with this SPF record. This is an important choice and is explained below. -

- {{ form.all_policy }} - {% if form.all_policy.help_text %}{{ form.all_policy.help_text|safe }}{% endif %} -
-
- {{ form.all_mechanism }} - {% if form.all_mechanism.help_text %}{{ form.all_mechanism.help_text|safe }}{% endif %} -
-
- - - -
- + setTimeout(() => { + button.textContent = originalText; + }, 2000); + } + } + } + {% endblock content %} diff --git a/templates/404.html b/templates/404.html index 351a56f..b594fb0 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,13 +1,11 @@ -{% extends "_base.html" %} +{% extends "djpress/djpress_blog_theme/base.html" %} {% load static %} {% block content %} -

An error occurred

-

- Sorry, that page cannot be found. The error has already been reported and will be investigated soon. -

-

- {# djlint:off D018 #}{# djlint:on #} - {% include "svg/house-fill.svg" %} - Return to home -

+

An error occurred

+

+ Sorry, that page cannot be found. The error has already been reported and will be investigated soon. +

+

+ Return to home +

{% endblock content %} diff --git a/templates/500.html b/templates/500.html index ad11d8b..53d645c 100644 --- a/templates/500.html +++ b/templates/500.html @@ -1,13 +1,11 @@ -{% extends "_base.html" %} +{% extends "djpress/djpress_blog_theme/base.html" %} {% load static %} {% block content %} -

An error occurred

-

- Sorry, a server error has occurred. The error has already been reported and will be investigated soon. -

-

- {# djlint:off D018 #}{# djlint:on #} - {% include "svg/house-fill.svg" %} - Return to home -

+

An error occurred

+

+ Sorry, a server error has occurred. The error has already been reported and will be investigated soon. +

+

+ Return to home +

{% endblock content %}