Phase 6: Replace render_template() with s-expression rendering in all GET routes
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m15s

Migrate ~52 GET route handlers across all 7 services from Jinja
render_template() to s-expression component rendering. Each service
gets a sexp_components.py with page/oob/cards render functions.

- Add per-service sexp_components.py (account, blog, cart, events,
  federation, market, orders) with full page, OOB, and pagination
  card rendering
- Add shared/sexp/helpers.py with call_url, root_header_html,
  full_page, oob_page utilities
- Update all GET routes to use get_template_context() + render fns
- Fix get_template_context() to inject Jinja globals (URL helpers)
- Add qs_filter to base_context for sexp filter URL building
- Mount sexp_components.py in docker-compose.dev.yml for all services
- Import sexp_components in app.py for Hypercorn --reload watching
- Fix route_prefix import (shared.utils not shared.infrastructure.urls)
- Fix federation choose-username missing actor in context
- Fix market page_markets missing post in context

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-02-27 23:19:33 +00:00
parent 8013317b41
commit d53b9648a9
53 changed files with 8690 additions and 463 deletions

View File

@@ -1,5 +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
from pathlib import Path

View File

@@ -55,10 +55,14 @@ def register() -> Blueprint:
page=page,
)
from shared.sexp.page import get_template_context
from sexp_components import render_all_markets_page, render_all_markets_oob
tctx = await get_template_context()
if is_htmx_request():
html = await render_template("_types/all_markets/_main_panel.html", **ctx)
html = await render_all_markets_oob(tctx, markets, has_more, page_info, page)
else:
html = await render_template("_types/all_markets/index.html", **ctx)
html = await render_all_markets_page(tctx, markets, has_more, page_info, page)
return await make_response(html, 200)
@@ -67,13 +71,8 @@ def register() -> Blueprint:
page = int(request.args.get("page", 1))
markets, has_more, page_info = await _load_markets(page)
html = await render_template(
"_types/all_markets/_cards.html",
markets=markets,
has_more=has_more,
page_info=page_info,
page=page,
)
from 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)
return bp

View File

@@ -42,12 +42,15 @@ def register():
p_data = getattr(g, "post_data", None) or {}
# 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
ctx = await get_template_context()
ctx.update(p_data)
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template("_types/market/index.html", **p_data)
html = await render_market_home_page(ctx)
else:
# HTMX request: main panel + OOB elements
html = await render_template("_types/market/_oob_elements.html", **p_data)
html = await render_market_home_oob(ctx)
return await make_response(html)
@@ -70,16 +73,18 @@ def register():
product_info = await _productInfo()
full_context = {**product_info, **ctx}
# Determine which template to use based on request type and pagination
from shared.sexp.page import get_template_context
from sexp_components import render_browse_page, render_browse_oob, render_browse_cards
tctx = await get_template_context()
tctx.update(full_context)
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template("_types/browse/index.html", **full_context)
html = await render_browse_page(tctx)
elif product_info["page"] > 1:
# HTMX pagination: just product cards + sentinel
html = await render_template("_types/browse/_product_cards.html", **product_info)
tctx.update(product_info)
html = await render_browse_cards(tctx)
else:
# HTMX navigation (page 1): main panel + OOB elements
html = await render_template("_types/browse/_oob_elements.html", **full_context)
html = await render_browse_oob(tctx)
resp = await make_response(html)
resp.headers["Hx-Push-Url"] = _current_url_without_page()
@@ -107,15 +112,18 @@ def register():
product_info = await _productInfo(top_slug)
full_context = {**product_info, **ctx}
# Determine which template to use based on request type and pagination
from shared.sexp.page import get_template_context
from sexp_components import render_browse_page, render_browse_oob, render_browse_cards
tctx = await get_template_context()
tctx.update(full_context)
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template("_types/browse/index.html", **full_context)
html = await render_browse_page(tctx)
elif product_info["page"] > 1:
# HTMX pagination: just product cards + sentinel
html = await render_template("_types/browse/_product_cards.html", **product_info)
tctx.update(product_info)
html = await render_browse_cards(tctx)
else:
html = await render_template("_types/browse/_oob_elements.html", **full_context)
html = await render_browse_oob(tctx)
resp = await make_response(html)
resp.headers["Hx-Push-Url"] = _current_url_without_page()
@@ -143,16 +151,18 @@ def register():
product_info = await _productInfo(top_slug, sub_slug)
full_context = {**product_info, **ctx}
# Determine which template to use based on request type and pagination
from shared.sexp.page import get_template_context
from sexp_components import render_browse_page, render_browse_oob, render_browse_cards
tctx = await get_template_context()
tctx.update(full_context)
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template("_types/browse/index.html", **full_context)
html = await render_browse_page(tctx)
elif product_info["page"] > 1:
# HTMX pagination: just product cards + sentinel
html = await render_template("_types/browse/_product_cards.html", **product_info)
tctx.update(product_info)
html = await render_browse_cards(tctx)
else:
# HTMX navigation (page 1): main panel + OOB elements
html = await render_template("_types/browse/_oob_elements.html", **full_context)
html = await render_browse_oob(tctx)
resp = await make_response(html)
resp.headers["Hx-Push-Url"] = _current_url_without_page()

View File

@@ -17,12 +17,14 @@ def register():
async def admin():
from shared.browser.app.utils.htmx import is_htmx_request
# Determine which template to use based on request type
from shared.sexp.page import get_template_context
from sexp_components import render_market_admin_page, render_market_admin_oob
tctx = await get_template_context()
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template("_types/market/admin/index.html")
html = await render_market_admin_page(tctx)
else:
html = await render_template("_types/market/admin/_oob_elements.html")
html = await render_market_admin_oob(tctx)
return await make_response(html)
return bp

View File

@@ -39,10 +39,15 @@ def register() -> Blueprint:
page=page,
)
from shared.sexp.page import get_template_context
from sexp_components import render_page_markets_page, render_page_markets_oob
tctx = await get_template_context()
tctx["post"] = post
if is_htmx_request():
html = await render_template("_types/page_markets/_main_panel.html", **ctx)
html = await render_page_markets_oob(tctx, markets, has_more, page)
else:
html = await render_template("_types/page_markets/index.html", **ctx)
html = await render_page_markets_page(tctx, markets, has_more, page)
return await make_response(html, 200)
@@ -53,13 +58,9 @@ def register() -> Blueprint:
markets, has_more = await _load_markets(post["id"], page)
html = await render_template(
"_types/page_markets/_cards.html",
markets=markets,
has_more=has_more,
page_info={},
page=page,
)
from 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)
return bp

View File

@@ -107,13 +107,17 @@ def register():
async def product_detail():
from shared.browser.app.utils.htmx import is_htmx_request
# Determine which template to use based on request type
from shared.sexp.page import get_template_context
from sexp_components import render_product_page, render_product_oob
tctx = await get_template_context()
item_data = getattr(g, "item_data", {})
d = item_data.get("d", {})
tctx["liked_by_current_user"] = item_data.get("liked", False)
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template("_types/product/index.html")
html = await render_product_page(tctx, d)
else:
# HTMX request: main panel + OOB elements
html = await render_template("_types/product/_oob_elements.html")
html = await render_product_oob(tctx, d)
return html
@@ -151,12 +155,17 @@ def register():
async def admin():
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
tctx = await get_template_context()
item_data = getattr(g, "item_data", {})
d = item_data.get("d", {})
tctx["liked_by_current_user"] = item_data.get("liked", False)
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template("_types/product/admin/index.html")
html = await render_product_admin_page(tctx, d)
else:
# HTMX request: main panel + OOB elements
html = await render_template("_types/product/admin/_oob_elements.html")
html = await render_product_admin_oob(tctx, d)
return await make_response(html)

1584
market/sexp_components.py Normal file

File diff suppressed because it is too large Load Diff