coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace 21 Jinja render_template() calls with sx render functions

Browse Source 
Phase 1: Wire 16 events routes to existing sx render functions
- slot, slots, ticket_types, ticket_type, calendar_entries,
  calendar_entry, calendar_entry/admin

Phase 2: Orders checkout return (2 calls)
- New orders/sx/checkout.sx with return page components
- New render_checkout_return_page() in orders/sx/sx_components.py

Phase 3: Blog menu items (3 calls)
- New blog/sx/menu_items.sx with search result components
- New render_menu_item_form() and render_page_search_results()
  in blog/sx/sx_components.py

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-03-03 08:52:32 +00:00
parent 5dd1161816
commit 3bd4f4b661
13 changed files with 395 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
events/bp/calendar_entries/routes.py
View File

@@ -265,18 +265,27 @@ def register():
@bp.get("/add/")
async def add_form(day: int, month: int, year: int, **kwargs):
html = await render_template(
"_types/day/_add.html",
)
return await make_response(html)
from datetime import date as date_cls
from sqlalchemy import select as sa_select
from models.calendars import CalendarSlot as _CS
day_date = date_cls(year, month, day)
weekday_attr = ["mon","tue","wed","thu","fri","sat","sun"][day_date.weekday()]
stmt = sa_select(_CS).where(
_CS.calendar_id == g.calendar.id,
getattr(_CS, weekday_attr) == True,
_CS.deleted_at.is_(None),
).order_by(_CS.time_start.asc(), _CS.id.asc())
result = await g.s.execute(stmt)
day_slots = list(result.scalars())
from sx.sx_components import render_entry_add_form
return sx_response(render_entry_add_form(g.calendar, day, month, year, day_slots))
@bp.get("/add-button/")
async def add_button(day: int, month: int, year: int, **kwargs):
html = await render_template(
"_types/day/_add_button.html",
)
return await make_response(html)
from sx.sx_components import render_entry_add_button
return sx_response(render_entry_add_button(g.calendar, day, month, year))

21
events/bp/calendar_entry/admin/routes.py
View File

@@ -1,28 +1,29 @@
from __future__ import annotations
from quart import (
render_template, make_response, Blueprint
make_response, Blueprint
)
from shared.browser.app.authz import require_admin
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sx.helpers import sx_response
def register():
bp = Blueprint("admin", __name__, url_prefix='/admin')
# ---------- Pages ----------
@bp.get("/")
@require_admin
async def admin(entry_id: int, **kwargs):
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sx.page import get_template_context
from sx.sx_components import render_entry_admin_page, render_entry_admin_oob
# Determine which template to use based on request type
tctx = await get_template_context()
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template("_types/entry/admin/index.html")
html = await render_entry_admin_page(tctx)
return await make_response(html)
else:
html = await render_template("_types/entry/admin/_oob_elements.html")
return await make_response(html)
sx_src = await render_entry_admin_oob(tctx)
return sx_response(sx_src)
return bp

34
events/bp/calendar_entry/routes.py
View File

@@ -256,8 +256,23 @@ def register():
@bp.get("/edit/")
@require_admin
async def get_edit(entry_id: int, **rest):
html = await render_template("_types/entry/_edit.html")
return await make_response(html, 200)
from datetime import date as date_cls
va = request.view_args or {}
day, month, year = va.get("day"), va.get("month"), va.get("year")
# Query day slots for this weekday
day_date = date_cls(year, month, day)
weekday_attr = ["mon","tue","wed","thu","fri","sat","sun"][day_date.weekday()]
stmt = select(CalendarSlot).where(
CalendarSlot.calendar_id == g.calendar.id,
getattr(CalendarSlot, weekday_attr) == True,
CalendarSlot.deleted_at.is_(None),
).order_by(CalendarSlot.time_start.asc(), CalendarSlot.id.asc())
result = await g.s.execute(stmt)
day_slots = list(result.scalars())
from sx.sx_components import render_entry_edit_form
return sx_response(render_entry_edit_form(g.entry, g.calendar, day, month, year, day_slots))
@bp.put("/")
@require_admin
@@ -557,14 +572,13 @@ def register():
search_posts, total = await svc_search_posts(g.s, query, page, per_page)
total_pages = math.ceil(total / per_page) if total > 0 else 0
html = await render_template(
"_types/entry/_post_search_results.html",
search_posts=search_posts,
search_query=query,
page=page,
total_pages=total_pages,
)
return await make_response(html, 200)
va = request.view_args or {}
from sx.sx_components import render_post_search_results
return sx_response(render_post_search_results(
search_posts, query, page, total_pages,
g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
))
@bp.post("/posts/")
@require_admin

29
events/bp/slot/routes.py
View File

@@ -39,20 +39,16 @@ def register():
if not slot:
return await make_response("Not found", 404)
from shared.sx.page import get_template_context
from sx.sx_components import render_slot_page, render_slot_oob
tctx = await get_template_context()
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template(
"_types/slot/index.html",
slot=slot,
)
html = await render_slot_page(tctx)
return await make_response(html)
else:
html = await render_template(
"_types/slot/_oob_elements.html",
slot=slot,
)
return await make_response(html)
sx_src = await render_slot_oob(tctx)
return sx_response(sx_src)
@bp.get("/edit/")
@@ -61,13 +57,8 @@ def register():
slot = await svc_get_slot(g.s, slot_id)
if not slot:
return await make_response("Not found", 404)
html = await render_template(
"_types/slot/_edit.html",
slot=slot,
#post=g.post_data['post'],
#calendar=g.calendar,
)
return await make_response(html)
from sx.sx_components import render_slot_edit_form
return sx_response(render_slot_edit_form(slot, g.calendar))
@bp.get("/view/")
@require_admin

13
events/bp/slots/routes.py
View File

@@ -136,18 +136,13 @@ def register():
@bp.get("/add")
@require_admin
async def add_form(**kwargs):
html = await render_template(
"_types/slots/_add.html",
)
return await make_response(html)
from sx.sx_components import render_slot_add_form
return sx_response(render_slot_add_form(g.calendar))
@bp.get("/add-button")
@require_admin
async def add_button(**kwargs):
html = await render_template(
"_types/slots/_add_button.html",
)
return await make_response(html)
from sx.sx_components import render_slot_add_button
return sx_response(render_slot_add_button(g.calendar))
return bp

31
events/bp/ticket_type/routes.py
View File

@@ -30,20 +30,16 @@ def register():
ticket_type = await svc_get_ticket_type(g.s, ticket_type_id)
if not ticket_type:
return await make_response("Not found", 404)
from shared.sx.page import get_template_context
from sx.sx_components import render_ticket_type_page, render_ticket_type_oob
tctx = await get_template_context()
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template(
"_types/ticket_type/index.html",
ticket_type=ticket_type,
)
html = await render_ticket_type_page(tctx)
return await make_response(html)
else:
html = await render_template(
"_types/ticket_type/_oob_elements.html",
ticket_type=ticket_type,
)
return await make_response(html)
sx_src = await render_ticket_type_oob(tctx)
return sx_response(sx_src)
@bp.get("/edit/")
@require_admin
@@ -53,11 +49,12 @@ def register():
if not ticket_type:
return await make_response("Not found", 404)
html = await render_template(
"_types/ticket_type/_edit.html",
ticket_type=ticket_type,
)
return await make_response(html)
from sx.sx_components import render_ticket_type_edit_form
va = request.view_args or {}
return sx_response(render_ticket_type_edit_form(
ticket_type, g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
))
@bp.get("/view/")
@require_admin

38
events/bp/ticket_types/routes.py
View File

@@ -39,18 +39,16 @@ def register():
@bp.get("/")
async def get(**kwargs):
"""List all ticket types for the current entry."""
from shared.sx.page import get_template_context
from sx.sx_components import render_ticket_types_page, render_ticket_types_oob
tctx = await get_template_context()
if not is_htmx_request():
# Normal browser request: full page with layout
html = await render_template(
"_types/ticket_types/index.html",
)
html = await render_ticket_types_page(tctx)
return await make_response(html)
else:
html = await render_template(
"_types/ticket_types/_oob_elements.html",
)
return await make_response(html)
sx_src = await render_ticket_types_oob(tctx)
return sx_response(sx_src)
@bp.post("/")
@require_admin
@@ -121,18 +119,22 @@ def register():
@require_admin
async def add_form(**kwargs):
"""Show the add ticket type form."""
html = await render_template(
"_types/ticket_types/_add.html",
)
return await make_response(html)
from sx.sx_components import render_ticket_type_add_form
va = request.view_args or {}
return sx_response(render_ticket_type_add_form(
g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
))
@bp.get("/add-button")
@require_admin
async def add_button(**kwargs):
"""Show the add ticket type button."""
html = await render_template(
"_types/ticket_types/_add_button.html",
)
return await make_response(html)
from sx.sx_components import render_ticket_type_add_button
va = request.view_args or {}
return sx_response(render_ticket_type_add_button(
g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
))
return bp