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

Send all responses as sexp wire format with client-side rendering
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 5m35s
Details

Browse Source 
- Server sends sexp source text, client (sexp.js) renders everything
- SexpExpr marker class for nested sexp composition in serialize()
- sexp_page() HTML shell with data-mount="body" for full page loads
- sexp_response() returns text/sexp for OOB/partial responses
- ~app-body layout component replaces ~app-layout (no raw!)
- ~rich-text is the only component using raw! (for CMS HTML content)
- Fragment endpoints return text/sexp, auto-wrapped in SexpExpr
- All _*_html() helpers converted to _*_sexp() returning sexp source
- Head auto-hoist: sexp.js moves meta/title/link/script[ld+json]
  from rendered body to document.head automatically
- Unknown components render warning box instead of crashing page
- Component kwargs preserve AST for lazy rendering (fixes <> in kwargs)
- Fix unterminated paren in events/sexp/tickets.sexpr

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-03-01 09:45:07 +00:00
parent 0d48fd22ee
commit 22802bd36b
270 changed files with 7153 additions and 5382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ from __future__ import annotations
from quart import Blueprint, g, request, render_template, make_response
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
from shared.infrastructure.cart_identity import current_cart_identity
from shared.infrastructure.data_client import fetch_data
from shared.contracts.dtos import PostDTO, dto_from_dict
@@ -70,11 +71,11 @@ def register() -> Blueprint:
ctx = await get_template_context()
if is_htmx_request():
html = await render_all_events_oob(ctx, entries, has_more, pending_tickets, page_info, page, view)
sexp_src = await render_all_events_oob(ctx, entries, has_more, pending_tickets, page_info, page, view)
return sexp_response(sexp_src)
else:
html = await render_all_events_page(ctx, entries, has_more, pending_tickets, page_info, page, view)
return await make_response(html, 200)
return await make_response(html, 200)
@bp.get("/all-entries")
async def entries_fragment():
@@ -84,8 +85,8 @@ def register() -> Blueprint:
entries, has_more, pending_tickets, page_info = await _load_entries(page)
from sexp.sexp_components import render_all_events_cards
html = await render_all_events_cards(entries, has_more, pending_tickets, page_info, page, view)
return await make_response(html, 200)
sexp_src = await render_all_events_cards(entries, has_more, pending_tickets, page_info, page, view)
return sexp_response(sexp_src)
@bp.post("/all-tickets/adjust")
async def adjust_ticket():
@@ -127,6 +128,6 @@ def register() -> Blueprint:
from sexp.sexp_components import render_ticket_widget
widget_html = render_ticket_widget(entry, qty, "/all-tickets/adjust")
mini_html = await fetch_fragment("cart", "cart-mini", params=frag_params, required=False)
return await make_response(widget_html + mini_html, 200)
return sexp_response(widget_html + (mini_html or ""))
return bp

13
events/bp/calendar/admin/routes.py
View File

@@ -7,6 +7,7 @@ from quart import (
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from shared.sexp.helpers import sexp_response
@@ -25,10 +26,10 @@ def register():
tctx = await get_template_context()
if not is_htmx_request():
html = await render_calendar_admin_page(tctx)
return await make_response(html)
else:
html = await render_calendar_admin_oob(tctx)
return await make_response(html)
sexp_src = await render_calendar_admin_oob(tctx)
return sexp_response(sexp_src)
@bp.get("/description/")
@@ -36,7 +37,7 @@ def register():
async def calendar_description_edit(calendar_slug: str, **kwargs):
from sexp.sexp_components import render_calendar_description_edit
html = render_calendar_description_edit(g.calendar)
return await make_response(html)
return sexp_response(html)
@bp.post("/description/")
@@ -52,7 +53,7 @@ def register():
from sexp.sexp_components import render_calendar_description
html = render_calendar_description(g.calendar, oob=True)
return await make_response(html)
return sexp_response(html)
@bp.get("/description/view/")
@@ -60,6 +61,6 @@ def register():
async def calendar_description_view(calendar_slug: str, **kwargs):
from sexp.sexp_components import render_calendar_description
html = render_calendar_description(g.calendar)
return await make_response(html)
return sexp_response(html)
return bp

17
events/bp/calendar/routes.py
View File

@@ -24,6 +24,7 @@ from .services.calendar_view import (
update_calendar_description,
)
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
from ..slots.routes import register as register_slots
@@ -79,12 +80,12 @@ def register():
async def inject_root():
from shared.infrastructure.fragments import fetch_fragment
container_nav_html = ""
container_nav = ""
post_data = getattr(g, "post_data", None)
if post_data:
post_id = post_data["post"]["id"]
post_slug = post_data["post"]["slug"]
container_nav_html = await fetch_fragment("relations", "container-nav", params={
container_nav = await fetch_fragment("relations", "container-nav", params={
"container_type": "page",
"container_id": str(post_id),
"post_slug": post_slug,
@@ -93,7 +94,7 @@ def register():
return {
"calendar": getattr(g, "calendar", None),
"container_nav_html": container_nav_html,
"container_nav": container_nav,
}
# ---------- Pages ----------
@@ -172,10 +173,10 @@ def register():
))
if not is_htmx_request():
html = await render_calendar_page(tctx)
return await make_response(html)
else:
html = await render_calendar_oob(tctx)
return await make_response(html)
sexp_src = await render_calendar_oob(tctx)
return sexp_response(sexp_src)
@bp.put("/")
@@ -201,7 +202,7 @@ def register():
from sexp.sexp_components import _calendar_admin_main_panel_html
ctx = await get_template_context()
html = _calendar_admin_main_panel_html(ctx)
return await make_response(html, 200)
return sexp_response(html)
@bp.delete("/")
@@ -238,7 +239,7 @@ def register():
nav_oob = render_post_nav_entries_oob(associated_entries, cals, post_data["post"])
html = html + nav_oob
return await make_response(html, 200)
return sexp_response(html)
return bp

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

@@ -16,6 +16,7 @@ from .services.entries import (
)
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from shared.sexp.helpers import sexp_response
from bp.calendar_entry.routes import register as register_calendar_entry
@@ -260,7 +261,7 @@ def register():
from sexp.sexp_components import render_day_main_panel
html = render_day_main_panel(ctx)
mini_html = await fetch_fragment("cart", "cart-mini", params=frag_params, required=False)
return await make_response(html + mini_html, 200)
return sexp_response(html + (mini_html or ""))
@bp.get("/add/")
async def add_form(day: int, month: int, year: int, **kwargs):

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

@@ -28,6 +28,7 @@ import math
import logging
from shared.infrastructure.fragments import fetch_fragment
from shared.sexp.helpers import sexp_response
from ..ticket_types.routes import register as register_ticket_types
@@ -216,12 +217,12 @@ def register():
)
# Fetch container nav from relations (exclude calendar — we're on a calendar page)
container_nav_html = ""
container_nav = ""
post_data = getattr(g, "post_data", None)
if post_data:
post_id = post_data["post"]["id"]
post_slug = post_data["post"]["slug"]
container_nav_html = await fetch_fragment("relations", "container-nav", params={
container_nav = await fetch_fragment("relations", "container-nav", params={
"container_type": "page",
"container_id": str(post_id),
"post_slug": post_slug,
@@ -235,7 +236,7 @@ def register():
"ticket_sold_count": ticket_sold_count,
"user_ticket_count": user_ticket_count,
"user_ticket_counts_by_type": user_ticket_counts_by_type,
"container_nav_html": container_nav_html,
"container_nav": container_nav,
}
@bp.get("/")
@require_admin
@@ -247,10 +248,10 @@ def register():
tctx = await get_template_context()
if not is_htmx_request():
html = await render_entry_page(tctx)
return await make_response(html, 200)
else:
html = await render_entry_oob(tctx)
return await make_response(html, 200)
sexp_src = await render_entry_oob(tctx)
return sexp_response(sexp_src)
@bp.get("/edit/")
@require_admin
@@ -423,7 +424,7 @@ def register():
tctx = await get_template_context()
html = await render_entry_page(tctx)
return await make_response(html + nav_oob, 200)
return sexp_response(html + nav_oob)
@bp.post("/confirm/")
@@ -449,7 +450,7 @@ def register():
await g.s.refresh(g.entry)
from sexp.sexp_components import render_entry_optioned
html = render_entry_optioned(g.entry, g.calendar, day, month, year)
return await make_response(html + day_nav_oob + post_nav_oob, 200)
return sexp_response(html + day_nav_oob + post_nav_oob)
@bp.post("/decline/")
@require_admin
@@ -474,7 +475,7 @@ def register():
await g.s.refresh(g.entry)
from sexp.sexp_components import render_entry_optioned
html = render_entry_optioned(g.entry, g.calendar, day, month, year)
return await make_response(html + day_nav_oob + post_nav_oob, 200)
return sexp_response(html + day_nav_oob + post_nav_oob)
@bp.post("/provisional/")
@require_admin
@@ -499,7 +500,7 @@ def register():
await g.s.refresh(g.entry)
from sexp.sexp_components import render_entry_optioned
html = render_entry_optioned(g.entry, g.calendar, day, month, year)
return await make_response(html + day_nav_oob + post_nav_oob, 200)
return sexp_response(html + day_nav_oob + post_nav_oob)
@bp.post("/tickets/")
@require_admin
@@ -543,7 +544,7 @@ def register():
await g.s.refresh(g.entry)
from sexp.sexp_components import render_entry_tickets_config
html = render_entry_tickets_config(g.entry, g.calendar, request.view_args.get("day"), request.view_args.get("month"), request.view_args.get("year"))
return await make_response(html, 200)
return sexp_response(html)
@bp.get("/posts/search/")
@require_admin
@@ -596,7 +597,7 @@ def register():
va = request.view_args or {}
html = render_entry_posts_panel(entry_posts, g.entry, g.calendar, va.get("day"), va.get("month"), va.get("year"))
nav_oob = render_entry_posts_nav_oob(entry_posts)
return await make_response(html + nav_oob, 200)
return sexp_response(html + nav_oob)
@bp.delete("/posts/<int:post_id>/")
@require_admin
@@ -618,6 +619,6 @@ def register():
va = request.view_args or {}
html = render_entry_posts_panel(entry_posts, g.entry, g.calendar, va.get("day"), va.get("month"), va.get("year"))
nav_oob = render_entry_posts_nav_oob(entry_posts)
return await make_response(html + nav_oob, 200)
return sexp_response(html + nav_oob)
return bp

8
events/bp/calendars/routes.py
View File

@@ -16,6 +16,7 @@ from shared.browser.app.redis_cacher import cache_page, clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
def register():
@@ -36,9 +37,10 @@ def register():
ctx = await get_template_context()
if not is_htmx_request():
html = await render_calendars_page(ctx)
return await make_response(html)
else:
html = await render_calendars_oob(ctx)
return await make_response(html)
sexp_src = await render_calendars_oob(ctx)
return sexp_response(sexp_src)
@bp.post("/new/")
@@ -86,5 +88,5 @@ def register():
nav_oob = render_post_nav_entries_oob(associated_entries, cals, post_data["post"])
html = html + nav_oob
return await make_response(html)
return sexp_response(html)
return bp

7
events/bp/day/admin/routes.py
View File

@@ -6,6 +6,7 @@ from quart import (
from shared.browser.app.authz import require_admin
from shared.sexp.helpers import sexp_response
def register():
@@ -23,8 +24,8 @@ def register():
tctx = await get_template_context()
if not is_htmx_request():
html = await render_day_admin_page(tctx)
return await make_response(html)
else:
html = await render_day_admin_oob(tctx)
return await make_response(html)
sexp_src = await render_day_admin_oob(tctx)
return sexp_response(sexp_src)
return bp

12
events/bp/day/routes.py
View File

@@ -18,6 +18,7 @@ from models.calendars import CalendarSlot # add this import
from sqlalchemy import select
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
def register():
@@ -79,12 +80,12 @@ def register():
day_slots = list(result.scalars())
# Fetch container nav from relations (exclude calendar — we're on a calendar page)
container_nav_html = ""
container_nav = ""
post_data = getattr(g, "post_data", None)
if post_data:
post_id = post_data["post"]["id"]
post_slug = post_data["post"]["slug"]
container_nav_html = await fetch_fragment("relations", "container-nav", params={
container_nav = await fetch_fragment("relations", "container-nav", params={
"container_type": "page",
"container_id": str(post_id),
"post_slug": post_slug,
@@ -101,7 +102,7 @@ def register():
"user_entries": visible.user_entries,
"confirmed_entries": visible.confirmed_entries,
"day_slots": day_slots,
"container_nav_html": container_nav_html,
"container_nav": container_nav,
}
@@ -127,9 +128,10 @@ def register():
tctx = await get_template_context()
if not is_htmx_request():
html = await render_day_page(tctx)
return await make_response(html)
else:
html = await render_day_oob(tctx)
return await make_response(html)
sexp_src = await render_day_oob(tctx)
return sexp_response(sexp_src)
@bp.get("/w/<widget_domain>/")
async def widget_paginate(widget_domain: str, **kwargs):

80
events/bp/fragments/routes.py
View File

@@ -1,6 +1,6 @@
"""Events app fragment endpoints.
Exposes HTML fragments at ``/internal/fragments/<type>`` for consumption
Exposes sexp fragments at ``/internal/fragments/<type>`` for consumption
by other coop apps via the fragment client.
"""
@@ -19,6 +19,9 @@ def register():
_handlers: dict[str, object] = {}
# Fragment types that still return HTML (Jinja templates)
_html_types = {"container-cards", "account-page"}
@bp.before_request
async def _require_fragment_header():
if not request.headers.get(FRAGMENT_HEADER):
@@ -28,16 +31,17 @@ def register():
async def get_fragment(fragment_type: str):
handler = _handlers.get(fragment_type)
if handler is None:
return Response("", status=200, content_type="text/html")
html = await handler()
return Response(html, status=200, content_type="text/html")
return Response("", status=200, content_type="text/sexp")
result = await handler()
ct = "text/html" if fragment_type in _html_types else "text/sexp"
return Response(result, status=200, content_type=ct)
# --- container-nav fragment: calendar entries + calendar links -----------
async def _container_nav_handler():
from quart import current_app
from shared.infrastructure.urls import events_url
from shared.sexp.jinja_bridge import render as render_comp
from shared.sexp.helpers import sexp_call
container_type = request.args.get("container_type", "page")
container_id = int(request.args.get("container_id", 0))
@@ -49,7 +53,7 @@ def register():
styles = current_app.jinja_env.globals.get("styles", {})
nav_class = styles.get("nav_button_less_pad", "")
html_parts = []
parts = []
# Calendar entries nav
if not any(e.startswith("calendar") for e in excludes):
@@ -65,21 +69,16 @@ def register():
date_str = entry.start_at.strftime("%b %d, %Y at %H:%M")
if entry.end_at:
date_str += f" – {entry.end_at.strftime('%H:%M')}"
html_parts.append(render_comp(
"calendar-entry-nav",
parts.append(sexp_call("calendar-entry-nav",
href=events_url(entry_path), name=entry.name,
date_str=date_str, nav_class=nav_class,
))
# Infinite scroll sentinel (kept as raw HTML — HTMX-specific)
date_str=date_str, nav_class=nav_class))
if has_more and paginate_url_base:
html_parts.append(render_comp(
"htmx-sentinel",
parts.append(sexp_call("htmx-sentinel",
id=f"entries-load-sentinel-{page}",
hx_get=f"{paginate_url_base}?page={page + 1}",
hx_trigger="intersect once",
hx_swap="beforebegin",
**{"class": "flex-shrink-0 w-1"},
))
**{"class": "flex-shrink-0 w-1"}))
# Calendar links nav
if not any(e.startswith("calendar") for e in excludes):
@@ -88,16 +87,16 @@ def register():
)
for cal in calendars:
href = events_url(f"/{post_slug}/{cal.slug}/")
html_parts.append(render_comp(
"calendar-link-nav",
href=href, name=cal.name, nav_class=nav_class,
))
parts.append(sexp_call("calendar-link-nav",
href=href, name=cal.name, nav_class=nav_class))
return "\n".join(html_parts)
if not parts:
return ""
return "(<> " + " ".join(parts) + ")"
_handlers["container-nav"] = _container_nav_handler
# --- container-cards fragment: entries for blog listing cards ------------
# --- container-cards fragment: entries for blog listing cards (still Jinja) --
async def _container_cards_handler():
post_ids_raw = request.args.get("post_ids", "")
@@ -107,7 +106,6 @@ def register():
if not post_ids:
return ""
# Build post_id -> slug mapping
slug_map = {}
for i, pid in enumerate(post_ids):
slug_map[pid] = post_slugs[i] if i < len(post_slugs) else ""
@@ -120,12 +118,12 @@ def register():
_handlers["container-cards"] = _container_cards_handler
# --- account-nav-item fragment: tickets + bookings links for account nav -
# --- account-nav-item fragment: tickets + bookings links -----------------
async def _account_nav_item_handler():
from quart import current_app
from shared.infrastructure.urls import account_url
from shared.sexp.jinja_bridge import render as render_comp
from shared.sexp.helpers import sexp_call
styles = current_app.jinja_env.globals.get("styles", {})
nav_class = styles.get("nav_button", "")
@@ -135,19 +133,15 @@ def register():
)
tickets_url = account_url("/tickets/")
bookings_url = account_url("/bookings/")
# These two links use HTMX navigation — kept as raw HTML for the
# hx-* attributes that don't map neatly to a reusable component.
parts = []
for href, label in [(tickets_url, "tickets"), (bookings_url, "bookings")]:
parts.append(render_comp(
"nav-group-link",
href=href, hx_select=hx_select, nav_class=nav_class, label=label,
))
return "\n".join(parts)
parts.append(sexp_call("nav-group-link",
href=href, hx_select=hx_select, nav_class=nav_class, label=label))
return "(<> " + " ".join(parts) + ")"
_handlers["account-nav-item"] = _account_nav_item_handler
# --- account-page fragment: tickets or bookings panel --------------------
# --- account-page fragment: tickets or bookings panel (still Jinja) ------
async def _account_page_handler():
slug = request.args.get("slug", "")
@@ -171,15 +165,21 @@ def register():
_handlers["account-page"] = _account_page_handler
# --- link-card fragment: event page preview card ----------------------------
# --- link-card fragment: event page preview card -------------------------
async def _link_card_handler():
from shared.infrastructure.urls import events_url
from shared.sexp.jinja_bridge import render as render_comp
from shared.sexp.helpers import sexp_call
slug = request.args.get("slug", "")
keys_raw = request.args.get("keys", "")
def _event_link_card_sexp(post, cal_names: str) -> str:
return sexp_call("link-card",
title=post.title, image=post.feature_image,
subtitle=cal_names,
link=events_url(f"/{post.slug}"))
# Batch mode
if keys_raw:
slugs = [k.strip() for k in keys_raw.split(",") if k.strip()]
@@ -193,11 +193,7 @@ def register():
g.s, "page", post.id,
)
cal_names = ", ".join(c.name for c in calendars) if calendars else ""
parts.append(render_comp(
"link-card",
title=post.title, image=post.feature_image,
subtitle=cal_names, link=events_url(f"/{post.slug}"),
))
parts.append(_event_link_card_sexp(post, cal_names))
return "\n".join(parts)
# Single mode
@@ -211,11 +207,7 @@ def register():
g.s, "page", post.id,
)
cal_names = ", ".join(c.name for c in calendars) if calendars else ""
return render_comp(
"link-card",
title=post.title, image=post.feature_image,
subtitle=cal_names, link=events_url(f"/{post.slug}"),
)
return _event_link_card_sexp(post, cal_names)
_handlers["link-card"] = _link_card_handler

12
events/bp/markets/routes.py
View File

@@ -12,6 +12,7 @@ from .services.markets import (
from shared.browser.app.redis_cacher import cache_page, clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
def register():
@@ -29,9 +30,10 @@ def register():
ctx = await get_template_context()
if not is_htmx_request():
html = await render_markets_page(ctx)
return await make_response(html)
else:
html = await render_markets_oob(ctx)
return await make_response(html)
sexp_src = await render_markets_oob(ctx)
return sexp_response(sexp_src)
@bp.post("/new/")
@require_admin
@@ -56,8 +58,7 @@ def register():
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_markets_list_panel
ctx = await get_template_context()
html = render_markets_list_panel(ctx)
return await make_response(html)
return sexp_response(render_markets_list_panel(ctx))
@bp.delete("/<market_slug>/")
@require_admin
@@ -70,7 +71,6 @@ def register():
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_markets_list_panel
ctx = await get_template_context()
html = render_markets_list_panel(ctx)
return await make_response(html)
return sexp_response(render_markets_list_panel(ctx))
return bp

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

@@ -11,6 +11,7 @@ from __future__ import annotations
from quart import Blueprint, g, request, render_template, make_response
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
from shared.infrastructure.cart_identity import current_cart_identity
from shared.services.registry import services
@@ -50,11 +51,11 @@ def register() -> Blueprint:
ctx = await get_template_context()
if is_htmx_request():
html = await render_page_summary_oob(ctx, entries, has_more, pending_tickets, {}, page, view)
sexp_src = await render_page_summary_oob(ctx, entries, has_more, pending_tickets, {}, page, view)
return sexp_response(sexp_src)
else:
html = await render_page_summary_page(ctx, entries, has_more, pending_tickets, {}, page, view)
return await make_response(html, 200)
return await make_response(html, 200)
@bp.get("/entries")
async def entries_fragment():
@@ -65,8 +66,8 @@ def register() -> Blueprint:
entries, has_more, pending_tickets = await _load_entries(post["id"], page)
from sexp.sexp_components import render_page_summary_cards
html = await render_page_summary_cards(entries, has_more, pending_tickets, {}, page, view, post)
return await make_response(html, 200)
sexp_src = await render_page_summary_cards(entries, has_more, pending_tickets, {}, page, view, post)
return sexp_response(sexp_src)
@bp.post("/tickets/adjust")
async def adjust_ticket():
@@ -108,6 +109,6 @@ def register() -> Blueprint:
from sexp.sexp_components import render_ticket_widget
widget_html = render_ticket_widget(entry, qty, f"/{g.post_slug}/tickets/adjust")
mini_html = await fetch_fragment("cart", "cart-mini", params=frag_params, required=False)
return await make_response(widget_html + mini_html, 200)
return sexp_response(widget_html + (mini_html or ""))
return bp

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

@@ -24,6 +24,7 @@ from shared.browser.app.utils import (
parse_cost
)
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
def register():
@@ -75,8 +76,7 @@ def register():
if not slot:
return await make_response("Not found", 404)
from sexp.sexp_components import render_slot_main_panel
html = render_slot_main_panel(slot, g.calendar)
return await make_response(html)
return sexp_response(render_slot_main_panel(slot, g.calendar))
@bp.delete("/")
@require_admin
@@ -85,8 +85,7 @@ def register():
await svc_delete_slot(g.s, slot_id)
slots = await svc_list_slots(g.s, g.calendar.id)
from sexp.sexp_components import render_slots_table
html = render_slots_table(slots, g.calendar)
return await make_response(html)
return sexp_response(render_slots_table(slots, g.calendar))
@bp.put("/")
@require_admin
@@ -168,8 +167,7 @@ def register():
), 422
from sexp.sexp_components import render_slot_main_panel
html = render_slot_main_panel(slot, g.calendar, oob=True)
return await make_response(html)
return sexp_response(render_slot_main_panel(slot, g.calendar, oob=True))

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

@@ -20,6 +20,7 @@ from shared.browser.app.utils import (
parse_cost
)
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
def register():
@@ -50,9 +51,10 @@ def register():
tctx = await get_template_context()
if not is_htmx_request():
html = await render_slots_page(tctx)
return await make_response(html)
else:
html = await render_slots_oob(tctx)
return await make_response(html)
sexp_src = await render_slots_oob(tctx)
return sexp_response(sexp_src)
@bp.post("/")
@@ -128,8 +130,7 @@ def register():
# Success → re-render the slots table
slots = await svc_list_slots(g.s, g.calendar.id)
from sexp.sexp_components import render_slots_table
html = render_slots_table(slots, g.calendar)
return await make_response(html)
return sexp_response(render_slots_table(slots, g.calendar))
@bp.get("/add")

21
events/bp/ticket_admin/routes.py
View File

@@ -20,6 +20,7 @@ from sqlalchemy.orm import selectinload
from models.calendars import CalendarEntry, Ticket, TicketType
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from shared.sexp.helpers import sexp_response
from ..tickets.services.tickets import (
get_ticket_by_code,
@@ -76,10 +77,10 @@ def register() -> Blueprint:
ctx = await get_template_context()
if not is_htmx_request():
html = await render_ticket_admin_page(ctx, tickets, stats)
return await make_response(html, 200)
else:
html = await render_ticket_admin_oob(ctx, tickets, stats)
return await make_response(html, 200)
sexp_src = await render_ticket_admin_oob(ctx, tickets, stats)
return sexp_response(sexp_src)
@bp.get("/entry/<int:entry_id>/")
@require_admin
@@ -102,7 +103,7 @@ def register() -> Blueprint:
from sexp.sexp_components import render_entry_tickets_admin
html = render_entry_tickets_admin(entry, tickets)
return await make_response(html, 200)
return sexp_response(html)
@bp.get("/lookup/")
@require_admin
@@ -118,11 +119,9 @@ def register() -> Blueprint:
ticket = await get_ticket_by_code(g.s, code)
from sexp.sexp_components import render_lookup_result
if not ticket:
html = render_lookup_result(None, "Ticket not found")
return await make_response(html, 200)
return sexp_response(render_lookup_result(None, "Ticket not found"))
html = render_lookup_result(ticket, None)
return await make_response(html, 200)
return sexp_response(render_lookup_result(ticket, None))
@bp.post("/<code>/checkin/")
@require_admin
@@ -133,11 +132,9 @@ def register() -> Blueprint:
from sexp.sexp_components import render_checkin_result
if not success:
html = render_checkin_result(False, error, None)
return await make_response(html, 200)
return sexp_response(render_checkin_result(False, error, None))
ticket = await get_ticket_by_code(g.s, code)
html = render_checkin_result(True, None, ticket)
return await make_response(html, 200)
return sexp_response(render_checkin_result(True, None, ticket))
return bp

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

@@ -17,6 +17,7 @@ from ..ticket_types.services.tickets import (
list_ticket_types as svc_list_ticket_types,
)
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
def register():
@@ -68,11 +69,10 @@ def register():
from sexp.sexp_components import render_ticket_type_main_panel
va = request.view_args or {}
html = render_ticket_type_main_panel(
return sexp_response(render_ticket_type_main_panel(
ticket_type, g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
)
return await make_response(html)
))
@bp.put("/")
@require_admin
@@ -136,12 +136,11 @@ def register():
# Return updated view with OOB flag
from sexp.sexp_components import render_ticket_type_main_panel
va = request.view_args or {}
html = render_ticket_type_main_panel(
return sexp_response(render_ticket_type_main_panel(
ticket_type, g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
oob=True,
)
return await make_response(html)
))
@bp.delete("/")
@require_admin
@@ -156,10 +155,9 @@ def register():
ticket_types = await svc_list_ticket_types(g.s, g.entry.id)
from sexp.sexp_components import render_ticket_types_table
va = request.view_args or {}
html = render_ticket_types_table(
return sexp_response(render_ticket_types_table(
ticket_types, g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
)
return await make_response(html)
))
return bp

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

@@ -15,6 +15,7 @@ from .services.tickets import (
from ..ticket_type.routes import register as register_ticket_type
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.helpers import sexp_response
def register():
@@ -111,11 +112,10 @@ def register():
ticket_types = await svc_list_ticket_types(g.s, g.entry.id)
from sexp.sexp_components import render_ticket_types_table
va = request.view_args or {}
html = render_ticket_types_table(
return sexp_response(render_ticket_types_table(
ticket_types, g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
)
return await make_response(html)
))
@bp.get("/add")
@require_admin

22
events/bp/tickets/routes.py
View File

@@ -20,6 +20,7 @@ from sqlalchemy.orm import selectinload
from models.calendars import CalendarEntry
from shared.infrastructure.cart_identity import current_cart_identity
from shared.browser.app.redis_cacher import clear_cache
from shared.sexp.helpers import sexp_response
from .services.tickets import (
create_ticket,
@@ -56,10 +57,10 @@ def register() -> Blueprint:
ctx = await get_template_context()
if not is_htmx_request():
html = await render_tickets_page(ctx, tickets)
return await make_response(html, 200)
else:
html = await render_tickets_oob(ctx, tickets)
return await make_response(html, 200)
sexp_src = await render_tickets_oob(ctx, tickets)
return sexp_response(sexp_src)
@bp.get("/<code>/")
async def ticket_detail(code: str):
@@ -87,10 +88,10 @@ def register() -> Blueprint:
ctx = await get_template_context()
if not is_htmx_request():
html = await render_ticket_detail_page(ctx, ticket)
return await make_response(html, 200)
else:
html = await render_ticket_detail_oob(ctx, ticket)
return await make_response(html, 200)
sexp_src = await render_ticket_detail_oob(ctx, ticket)
return sexp_response(sexp_src)
@bp.post("/buy/")
@clear_cache(tag="calendars", tag_scope="all")
@@ -182,8 +183,7 @@ def register() -> Blueprint:
cart_count = summary.count + summary.calendar_count + summary.ticket_count
from sexp.sexp_components import render_buy_result
html = render_buy_result(entry, created, remaining, cart_count)
return await make_response(html, 200)
return sexp_response(render_buy_result(entry, created, remaining, cart_count))
@bp.post("/adjust/")
@clear_cache(tag="calendars", tag_scope="all")
@@ -306,11 +306,9 @@ def register() -> Blueprint:
cart_count = summary.count + summary.calendar_count + summary.ticket_count
from sexp.sexp_components import render_adjust_response
html = render_adjust_response(
return sexp_response(render_adjust_response(
entry, ticket_remaining, ticket_sold_count,
user_ticket_count, user_ticket_counts_by_type, cart_count,
)
return await make_response(html, 200)
))
return bp