From cf2e2ba1db3011f686de7b8f11dfaa7d928c0d1e Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Tue, 24 Feb 2026 17:28:09 +0000
Subject: [PATCH] Remove cross-domain template dependencies from shared
 infrastructure

- macros/search.html: shared search input macros (mobile + desktop)
- macros/cart_icon.html: shared cart icon/badge macro (count param, no DB)
- macros/layout.html: inline hamburger icon, use shared search macro
- _oob.html: use cart_mini_html fragment slot instead of cart template import
- db/session.py: guard teardown rollback against committed/dead sessions

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../templates/_types/root/header/_oob.html    |  7 +-
 browser/templates/macros/cart_icon.html       | 31 +++++++
 browser/templates/macros/layout.html          | 16 +++-
 browser/templates/macros/search.html          | 83 +++++++++++++++++++
 db/session.py                                 | 12 ++-
 5 files changed, 140 insertions(+), 9 deletions(-)
 create mode 100644 browser/templates/macros/cart_icon.html
 create mode 100644 browser/templates/macros/search.html

diff --git a/browser/templates/_types/root/header/_oob.html b/browser/templates/_types/root/header/_oob.html
index d0e50b2..45b7240 100644
--- a/browser/templates/_types/root/header/_oob.html
+++ b/browser/templates/_types/root/header/_oob.html
@@ -23,9 +23,10 @@
 {% endif %}
   <div class="flex flex-col items-center flex-1">
     <div class="flex w-full justify-center md:justify-start">
-      {# Cart mini #}
-      {% from '_types/cart/_mini.html' import mini with context %}
-      {{mini()}}
+      {# Cart mini — rendered via fragment #}
+      {% if cart_mini_html %}
+        {{ cart_mini_html | safe }}
+      {% endif %}
 
       {# Site title #}
       <div class="font-bold text-5xl flex-1">
diff --git a/browser/templates/macros/cart_icon.html b/browser/templates/macros/cart_icon.html
new file mode 100644
index 0000000..7b8a958
--- /dev/null
+++ b/browser/templates/macros/cart_icon.html
@@ -0,0 +1,31 @@
+{# Cart icon/badge — shows logo when empty, cart icon with count when items present #}
+
+{% macro cart_icon(count=0, oob=False) %}
+<div id="cart-mini" {% if oob %}hx-swap-oob="{{oob}}"{% endif %}>
+  {% if count == 0 %}
+  <div class="h-12 w-12 rounded-full overflow-hidden border border-stone-300 flex-shrink-0">
+    <a
+      href="{{ blog_url('/') }}"
+      class="h-full w-full font-bold text-5xl flex-shrink-0 flex flex-row items-center gap-1"
+    >
+      <img
+        src="{{ site().logo }}"
+        class="h-full w-full rounded-full object-cover border border-stone-300 flex-shrink-0"
+      >
+    </a>
+  </div>
+  {% else %}
+    <a
+      href="{{ cart_url('/') }}"
+      class="relative inline-flex items-center justify-center text-stone-700 hover:text-emerald-700"
+    >
+      <i class="fa fa-shopping-cart text-5xl" aria-hidden="true"></i>
+      <span
+        class="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 inline-flex items-center justify-center rounded-full bg-emerald-600 text-white text-sm w-5 h-5"
+      >
+        {{ count }}
+      </span>
+    </a>
+  {% endif %}
+</div>
+{% endmacro %}
diff --git a/browser/templates/macros/layout.html b/browser/templates/macros/layout.html
index 9fe3b57..fc648e8 100644
--- a/browser/templates/macros/layout.html
+++ b/browser/templates/macros/layout.html
@@ -26,7 +26,17 @@
   <summary class="bg-white/90">
     <div class="flex flex-row items-start">
       <div>
-        {% include '_types/blog/mobile/_filter/_hamburger.html' %}
+        <div class="md:hidden mx-2 bg-stone-200 rounded">
+          <span class="flex items-center justify-center text-stone-600 text-lg h-12 w-12 transition-transform group-open/filter:hidden self-start">
+            <i class="fa-solid fa-filter"></i>
+          </span>
+          <span>
+            <svg aria-hidden="true" viewBox="0 0 24 24"
+                  class="w-12 h-12 rotate-180 transition-transform group-open/filter:block hidden self-start">
+              <path d="M6 9l6 6 6-6" fill="currentColor"/>
+            </svg>
+          </span>
+        </div>
       </div>
       <div
         id="{{id}}"
@@ -37,8 +47,8 @@
 
         </div>
       </div>
-      {% import '_types/browse/mobile/_filter/search.html' as s %}
-      {{ s.search(current_local_href, search, search_count, hx_select) }}
+      {% from 'macros/search.html' import search_mobile %}
+      {{ search_mobile(current_local_href, search, search_count, hx_select) }}
     </div>
   </summary>
 {%- endmacro %}
diff --git a/browser/templates/macros/search.html b/browser/templates/macros/search.html
new file mode 100644
index 0000000..98c0cde
--- /dev/null
+++ b/browser/templates/macros/search.html
@@ -0,0 +1,83 @@
+{# Shared search input macros for filter UIs #}
+
+{% macro search_mobile(current_local_href, search, search_count, hx_select) -%}
+    <div
+      id="search-mobile-wrapper"
+      class="flex flex-row gap-2 items-center flex-1 min-w-0 pr-2"
+    >
+      <input
+        id="search-mobile"
+        type="text"
+        name="search"
+        aria-label="search"
+        class="text-base md:text-sm col-span-5 rounded-md px-3 py-2 mb-2 w-full min-w-0 max-w-full border-2 border-stone-200 placeholder-shown:border-stone-200 [&:not(:placeholder-shown)]:border-yellow-200"
+        hx-preserve
+        value="{{ search|default('', true) }}"
+        placeholder="search"
+        hx-trigger="input changed delay:300ms"
+        hx-target="#main-panel"
+
+        hx-select="{{hx_select}}, #search-mobile-wrapper, #search-desktop-wrapper"
+        hx-get="{{ (current_local_href ~ {'search': None}|qs)|host }}"
+        hx-swap="outerHTML"
+        hx-push-url="true"
+        hx-headers='{"X-Origin":"search-mobile",  "X-Search":"true"}'
+        hx-sync="this:replace"
+        autocomplete="off"
+      >
+
+        <div
+          id="search-count-mobile"
+          aria-label="search count"
+          {% if not search_count %}
+            class="text-xl text-red-500"
+          {% endif %}
+        >
+          {% if search %}
+            {{search_count}}
+          {% endif %}
+        </div>
+    </div>
+{%- endmacro %}
+
+{% macro search_desktop(current_local_href, search, search_count, hx_select) -%}
+  <div
+    id="search-desktop-wrapper"
+    class="flex flex-row gap-2 items-center"
+  >
+    <input
+      id="search-desktop"
+      type="text"
+      name="search"
+      aria-label="search"
+      class="w-full mx-1 my-3 px-3 py-2 text-md rounded-xl border-2 shadow-sm border-white placeholder-shown:border-white [&:not(:placeholder-shown)]:border-yellow-200"
+      hx-preserve
+      value="{{ search|default('', true) }}"
+      placeholder="search"
+      hx-trigger="input changed delay:300ms"
+      hx-target="#main-panel"
+
+      hx-select="{{hx_select}}, #search-mobile-wrapper, #search-desktop-wrapper"
+      hx-get="{{ (current_local_href ~ {'search': None}|qs)|host}}"
+      hx-swap="outerHTML"
+      hx-push-url="true"
+      hx-headers='{"X-Origin":"search-desktop", "X-Search":"true"}'
+      hx-sync="this:replace"
+
+      autocomplete="off"
+    >
+
+    <div
+        id="search-count-desktop"
+        aria-label="search count"
+        {% if not search_count %}
+          class="text-xl text-red-500"
+        {% endif %}
+      >
+        {% if search %}
+          {{search_count}}
+        {% endif %}
+        {{zap_filter}}
+      </div>
+  </div>
+{%- endmacro %}
diff --git a/db/session.py b/db/session.py
index 87fd776..bff449c 100644
--- a/db/session.py
+++ b/db/session.py
@@ -64,11 +64,17 @@ def register_db(app: Quart):
             # If an exception occurred OR we didn't commit (still in txn), roll back.
             if hasattr(g, "s"):
                 if exc is not None or g.s.in_transaction():
-                    if hasattr(g, "tx"):
-                        await g.tx.rollback()
+                    if hasattr(g, "tx") and g.tx.is_active:
+                        try:
+                            await g.tx.rollback()
+                        except Exception:
+                            pass
         finally:
             if hasattr(g, "s"):
-                await g.s.close()
+                try:
+                    await g.s.close()
+                except Exception:
+                    pass
 
     @app.errorhandler(Exception)
     async def mark_error(e):