art-dag/mono
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Phase 7: Replace render_template() with s-expression rendering in all POST/PUT/DELETE routes

Browse Source 
Eliminates all render_template() calls from POST/PUT/DELETE handlers across
all 7 services. Moves sexp_components.py into sexp/ packages per service.

- Blog: like toggle, snippets, cache clear, features/sumup/entry panels,
  create/delete market, WYSIWYG editor panel (render_editor_panel)
- Federation: like/unlike/boost/unboost, follow/unfollow, actor card,
  interaction buttons
- Events: ticket widget, checkin, confirm/decline/provisional, tickets
  config, posts CRUD, description edit/save, calendar/slot/ticket_type
  CRUD, payments, buy tickets, day main panel, entry page
- Market: like toggle, cart add response
- Account: newsletter toggle
- Cart: checkout error pages (3 handlers)
- Orders: checkout error page (1 handler)

Remaining render_template() calls are exclusively in GET handlers and
internal services (email templates, fragment endpoints).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-02-28 01:15:29 +00:00
parent e65232761b
commit 838ec982eb
64 changed files with 2920 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
market/app.py
View File

@@ -1,6 +1,6 @@
from __future__ import annotations
import path_setup # noqa: F401 # adds shared/ to sys.path
import sexp_components # noqa: F401 # ensure Hypercorn --reload watches this file
import sexp.sexp_components as sexp_components # noqa: F401 # ensure Hypercorn --reload watches this file
from pathlib import Path

4
market/bp/all_markets/routes.py
View File

@@ -56,7 +56,7 @@ def register() -> Blueprint:
)
from shared.sexp.page import get_template_context
from sexp_components import render_all_markets_page, render_all_markets_oob
from sexp.sexp_components import render_all_markets_page, render_all_markets_oob
tctx = await get_template_context()
if is_htmx_request():
@@ -71,7 +71,7 @@ def register() -> Blueprint:
page = int(request.args.get("page", 1))
markets, has_more, page_info = await _load_markets(page)
from sexp_components import render_all_markets_cards
from sexp.sexp_components import render_all_markets_cards
html = await render_all_markets_cards(markets, has_more, page_info, page)
return await make_response(html, 200)

8
market/bp/browse/routes.py
View File

@@ -43,7 +43,7 @@ def register():
# Determine which template to use based on request type
from shared.sexp.page import get_template_context
from sexp_components import render_market_home_page, render_market_home_oob
from sexp.sexp_components import render_market_home_page, render_market_home_oob
ctx = await get_template_context()
ctx.update(p_data)
@@ -74,7 +74,7 @@ def register():
full_context = {**product_info, **ctx}
from shared.sexp.page import get_template_context
from sexp_components import render_browse_page, render_browse_oob, render_browse_cards
from sexp.sexp_components import render_browse_page, render_browse_oob, render_browse_cards
tctx = await get_template_context()
tctx.update(full_context)
@@ -113,7 +113,7 @@ def register():
full_context = {**product_info, **ctx}
from shared.sexp.page import get_template_context
from sexp_components import render_browse_page, render_browse_oob, render_browse_cards
from sexp.sexp_components import render_browse_page, render_browse_oob, render_browse_cards
tctx = await get_template_context()
tctx.update(full_context)
@@ -152,7 +152,7 @@ def register():
full_context = {**product_info, **ctx}
from shared.sexp.page import get_template_context
from sexp_components import render_browse_page, render_browse_oob, render_browse_cards
from sexp.sexp_components import render_browse_page, render_browse_oob, render_browse_cards
tctx = await get_template_context()
tctx.update(full_context)

2
market/bp/market/admin/routes.py
View File

@@ -18,7 +18,7 @@ def register():
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.page import get_template_context
from sexp_components import render_market_admin_page, render_market_admin_oob
from sexp.sexp_components import render_market_admin_page, render_market_admin_oob
tctx = await get_template_context()
if not is_htmx_request():

4
market/bp/page_markets/routes.py
View File

@@ -40,7 +40,7 @@ def register() -> Blueprint:
)
from shared.sexp.page import get_template_context
from sexp_components import render_page_markets_page, render_page_markets_oob
from sexp.sexp_components import render_page_markets_page, render_page_markets_oob
tctx = await get_template_context()
tctx["post"] = post
@@ -58,7 +58,7 @@ def register() -> Blueprint:
markets, has_more = await _load_markets(post["id"], page)
from sexp_components import render_page_markets_cards
from sexp.sexp_components import render_page_markets_cards
post_slug = post.get("slug", "")
html = await render_page_markets_cards(markets, has_more, page, post_slug)
return await make_response(html, 200)

29
market/bp/product/routes.py
View File

@@ -5,7 +5,6 @@ from quart import (
Blueprint,
abort,
redirect,
render_template,
make_response,
)
from sqlalchemy import select, func, update
@@ -108,7 +107,7 @@ def register():
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.page import get_template_context
from sexp_components import render_product_page, render_product_oob
from sexp.sexp_components import render_product_page, render_product_oob
tctx = await get_template_context()
item_data = getattr(g, "item_data", {})
@@ -126,12 +125,10 @@ def register():
async def like_toggle():
product_slug = g.product_slug
from sexp.sexp_components import render_like_toggle_button
if not g.user:
html = await render_template(
"_types/browse/like/button.html",
slug=product_slug,
liked=False,
)
html = render_like_toggle_button(product_slug, False)
resp = make_response(html, 403)
return resp
@@ -142,12 +139,7 @@ def register():
})
liked = result["liked"]
html = await render_template(
"_types/browse/like/button.html",
slug=product_slug,
liked=liked,
)
return html
return render_like_toggle_button(product_slug, liked)
@@ -156,7 +148,7 @@ def register():
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.page import get_template_context
from sexp_components import render_product_admin_page, render_product_admin_oob
from sexp.sexp_components import render_product_admin_page, render_product_admin_oob
tctx = await get_template_context()
item_data = getattr(g, "item_data", {})
@@ -263,11 +255,10 @@ def register():
# htmx response: OOB-swap mini cart + product buttons
if request.headers.get("HX-Request") == "true":
return await render_template(
"_types/product/_added.html",
cart=g.cart,
item=ci_ns,
)
from sexp.sexp_components import render_cart_added_response
item_data = getattr(g, "item_data", {})
d = item_data.get("d", {})
return render_cart_added_response(g.cart, ci_ns, d)
# normal POST: go to cart page
from shared.infrastructure.urls import cart_url

0
market/sexp/__init__.py Normal file
View File

85
market/sexp_components.py → market/sexp/sexp_components.py
View File

@@ -1579,3 +1579,88 @@ def _market_admin_header_html(ctx: dict, *, oob: bool = False) -> str:
lh=link_href,
oob=oob,
)
# ---------------------------------------------------------------------------
# Public API: POST handler fragment renderers
# ---------------------------------------------------------------------------
def render_like_toggle_button(slug: str, liked: bool, *,
like_url: str | None = None,
item_type: str = "product") -> str:
"""Render a standalone like toggle button for HTMX POST response.
Used by both market and blog like_toggle handlers.
"""
from shared.browser.app.csrf import generate_csrf_token
from quart import url_for
from shared.utils import host_url
csrf = generate_csrf_token()
if not like_url:
like_url = host_url(url_for("market.browse.product.like_toggle", product_slug=slug))
if liked:
colour = "text-red-600"
icon = "fa-solid fa-heart"
label = f"Unlike this {item_type}"
else:
colour = "text-stone-300"
icon = "fa-regular fa-heart"
label = f"Like this {item_type}"
return (
f'<button class="flex items-center gap-1 {colour} hover:text-red-600 transition-colors w-[1em] h-[1em]"'
f' hx-post="{like_url}" hx-target="this" hx-swap="outerHTML" hx-push-url="false"'
f' hx-headers=\'{{\"X-CSRFToken\": \"{csrf}\"}}\''
f' hx-swap-settle="0ms" aria-label="{label}">'
f'<i aria-hidden="true" class="{icon}"></i></button>'
)
def render_cart_added_response(cart: list, item: Any, d: dict) -> str:
"""Render the HTMX response after add-to-cart.
Returns OOB fragments: cart-mini icon + product add/remove buttons + cart item row.
"""
from shared.browser.app.csrf import generate_csrf_token
from quart import url_for, g
from shared.infrastructure.urls import cart_url as _cart_url
csrf = generate_csrf_token()
slug = d.get("slug", "")
count = sum(getattr(ci, "quantity", 0) for ci in cart)
# 1. Cart mini icon OOB
if count > 0:
cart_href = _cart_url("/")
cart_mini = (
f'<div id="cart-mini" hx-swap-oob="outerHTML">'
f'<a href="{cart_href}" class="relative inline-flex items-center justify-center">'
f'<span class="relative inline-flex items-center justify-center">'
f'<i class="fa-solid fa-shopping-cart text-xl" aria-hidden="true"></i>'
f'<span class="absolute -top-1.5 -right-2 pointer-events-none">'
f'<span class="flex items-center justify-center bg-emerald-500 text-white rounded-full min-w-[1.25rem] h-5 text-xs font-bold px-1">'
f'{count}</span></span></span></a></div>'
)
else:
from shared.config import config
blog_href = config().get("blog_url", "/")
logo = config().get("logo", "")
cart_mini = (
f'<div id="cart-mini" hx-swap-oob="outerHTML">'
f'<a href="{blog_href}" class="relative inline-flex items-center justify-center">'
f'<img src="{logo}" class="h-8 w-8 rounded-full object-cover border border-stone-300" alt="">'
f'</a></div>'
)
# 2. Add/remove buttons OOB
action = url_for("market.browse.product.cart", product_slug=slug)
quantity = getattr(item, "quantity", 0) if item else 0
add_html = (
f'<div id="cart-add-{slug}" hx-swap-oob="outerHTML">'
+ _cart_add_html(slug, quantity, action, csrf, cart_url_fn=_cart_url)
+ '</div>'
)
return cart_mini + add_html