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
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:
@@ -57,10 +57,15 @@ def register():
|
||||
|
||||
ctx = {"groups": groups, "unassigned_tags": unassigned}
|
||||
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp_components import render_tag_groups_page, render_tag_groups_oob
|
||||
|
||||
tctx = await get_template_context()
|
||||
tctx.update(ctx)
|
||||
if not is_htmx_request():
|
||||
return await render_template("_types/blog/admin/tag_groups/index.html", **ctx)
|
||||
return await make_response(await render_tag_groups_page(tctx))
|
||||
else:
|
||||
return await render_template("_types/blog/admin/tag_groups/_oob_elements.html", **ctx)
|
||||
return await make_response(await render_tag_groups_oob(tctx))
|
||||
|
||||
@bp.post("/")
|
||||
@require_admin
|
||||
@@ -117,10 +122,15 @@ def register():
|
||||
"assigned_tag_ids": assigned_tag_ids,
|
||||
}
|
||||
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp_components import render_tag_group_edit_page, render_tag_group_edit_oob
|
||||
|
||||
tctx = await get_template_context()
|
||||
tctx.update(ctx)
|
||||
if not is_htmx_request():
|
||||
return await render_template("_types/blog/admin/tag_groups/edit.html", **ctx)
|
||||
return await make_response(await render_tag_group_edit_page(tctx))
|
||||
else:
|
||||
return await render_template("_types/blog/admin/tag_groups/_edit_oob.html", **ctx)
|
||||
return await make_response(await render_tag_group_edit_oob(tctx))
|
||||
|
||||
@bp.post("/<int:id>/")
|
||||
@require_admin
|
||||
|
||||
@@ -153,10 +153,15 @@ def register(url_prefix, title):
|
||||
ctx["page_cart_count"] = page_summary.count + page_summary.calendar_count + page_summary.ticket_count
|
||||
ctx["page_cart_total"] = float(page_summary.total + page_summary.calendar_total + page_summary.ticket_total)
|
||||
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp_components import render_home_page, render_home_oob
|
||||
|
||||
tctx = await get_template_context()
|
||||
tctx.update(ctx)
|
||||
if not is_htmx_request():
|
||||
html = await render_template("_types/home/index.html", **ctx)
|
||||
html = await render_home_page(tctx)
|
||||
else:
|
||||
html = await render_template("_types/home/_oob_elements.html", **ctx)
|
||||
html = await render_home_oob(tctx)
|
||||
return await make_response(html)
|
||||
|
||||
@blogs_bp.get("/index")
|
||||
@@ -185,12 +190,17 @@ def register(url_prefix, title):
|
||||
"tag_groups": [],
|
||||
"posts": data.get("pages", []),
|
||||
}
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp_components import render_blog_page, render_blog_oob, render_blog_page_cards
|
||||
|
||||
tctx = await get_template_context()
|
||||
tctx.update(context)
|
||||
if not is_htmx_request():
|
||||
html = await render_template("_types/blog/index.html", **context)
|
||||
html = await render_blog_page(tctx)
|
||||
elif q.page > 1:
|
||||
html = await render_template("_types/blog/_page_cards.html", **context)
|
||||
html = await render_blog_page_cards(tctx)
|
||||
else:
|
||||
html = await render_template("_types/blog/_oob_elements.html", **context)
|
||||
html = await render_blog_oob(tctx)
|
||||
return await make_response(html)
|
||||
|
||||
# Default: posts listing
|
||||
@@ -221,28 +231,33 @@ def register(url_prefix, title):
|
||||
"drafts": q.drafts if show_drafts else None,
|
||||
}
|
||||
|
||||
# Determine which template to use based on request type and pagination
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp_components import render_blog_page, render_blog_oob, render_blog_cards
|
||||
|
||||
tctx = await get_template_context()
|
||||
tctx.update(context)
|
||||
if not is_htmx_request():
|
||||
# Normal browser request: full page with layout
|
||||
html = await render_template("_types/blog/index.html", **context)
|
||||
html = await render_blog_page(tctx)
|
||||
elif q.page > 1:
|
||||
# HTMX pagination: just blog cards + sentinel
|
||||
html = await render_template("_types/blog/_cards.html", **context)
|
||||
html = await render_blog_cards(tctx)
|
||||
else:
|
||||
# HTMX navigation (page 1): main panel + OOB elements
|
||||
#main_panel = await render_template("_types/blog/_main_panel.html", **context)
|
||||
html = await render_template("_types/blog/_oob_elements.html", **context)
|
||||
#html = oob_elements + main_panel
|
||||
html = await render_blog_oob(tctx)
|
||||
|
||||
return await make_response(html)
|
||||
|
||||
@blogs_bp.get("/new/")
|
||||
@require_admin
|
||||
async def new_post():
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp_components import render_new_post_page, render_new_post_oob
|
||||
|
||||
editor_html = await render_template("_types/blog_new/_main_panel.html")
|
||||
tctx = await get_template_context()
|
||||
tctx["editor_html"] = editor_html
|
||||
if not is_htmx_request():
|
||||
html = await render_template("_types/blog_new/index.html")
|
||||
html = await render_new_post_page(tctx)
|
||||
else:
|
||||
html = await render_template("_types/blog_new/_oob_elements.html")
|
||||
html = await render_new_post_oob(tctx)
|
||||
return await make_response(html)
|
||||
|
||||
@blogs_bp.post("/new/")
|
||||
@@ -312,10 +327,17 @@ def register(url_prefix, title):
|
||||
@blogs_bp.get("/new-page/")
|
||||
@require_admin
|
||||
async def new_page():
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp_components import render_new_post_page, render_new_post_oob
|
||||
|
||||
editor_html = await render_template("_types/blog_new/_main_panel.html", is_page=True)
|
||||
tctx = await get_template_context()
|
||||
tctx["editor_html"] = editor_html
|
||||
tctx["is_page"] = True
|
||||
if not is_htmx_request():
|
||||
html = await render_template("_types/blog_new/index.html", is_page=True)
|
||||
html = await render_new_post_page(tctx)
|
||||
else:
|
||||
html = await render_template("_types/blog_new/_oob_elements.html", is_page=True)
|
||||
html = await render_new_post_oob(tctx)
|
||||
return await make_response(html)
|
||||
|
||||
@blogs_bp.post("/new-page/")
|
||||
|
||||
Reference in New Issue
Block a user