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

Rebrand sexp → sx across web platform (173 files)

Browse Source 
Rename all sexp directories, files, identifiers, and references to sx.
artdag/ excluded (separate media processing DSL).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-03-01 11:06:57 +00:00
parent 17cebe07e7
commit e8bc228c7f
174 changed files with 3126 additions and 2952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
events/app.py
View File

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

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

@@ -14,7 +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.sx.helpers import sx_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
@@ -66,13 +66,13 @@ def register() -> Blueprint:
entries, has_more, pending_tickets, page_info = await _load_entries(page)
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_all_events_page, render_all_events_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_all_events_page, render_all_events_oob
ctx = await get_template_context()
if is_htmx_request():
sexp_src = await render_all_events_oob(ctx, entries, has_more, pending_tickets, page_info, page, view)
return sexp_response(sexp_src)
sx_src = await render_all_events_oob(ctx, entries, has_more, pending_tickets, page_info, page, view)
return sx_response(sx_src)
else:
html = await render_all_events_page(ctx, entries, has_more, pending_tickets, page_info, page, view)
return await make_response(html, 200)
@@ -84,9 +84,9 @@ def register() -> Blueprint:
entries, has_more, pending_tickets, page_info = await _load_entries(page)
from sexp.sexp_components import render_all_events_cards
sexp_src = await render_all_events_cards(entries, has_more, pending_tickets, page_info, page, view)
return sexp_response(sexp_src)
from sx.sx_components import render_all_events_cards
sx_src = await render_all_events_cards(entries, has_more, pending_tickets, page_info, page, view)
return sx_response(sx_src)
@bp.post("/all-tickets/adjust")
async def adjust_ticket():
@@ -125,9 +125,9 @@ def register() -> Blueprint:
if ident["session_id"] is not None:
frag_params["session_id"] = ident["session_id"]
from sexp.sexp_components import render_ticket_widget
from sx.sx_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 sexp_response(widget_html + (mini_html or ""))
return sx_response(widget_html + (mini_html or ""))
return bp

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

@@ -7,7 +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
from shared.sx.helpers import sx_response
@@ -20,24 +20,24 @@ def register():
async def admin(calendar_slug: str, **kwargs):
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_calendar_admin_page, render_calendar_admin_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_calendar_admin_page, render_calendar_admin_oob
tctx = await get_template_context()
if not is_htmx_request():
html = await render_calendar_admin_page(tctx)
return await make_response(html)
else:
sexp_src = await render_calendar_admin_oob(tctx)
return sexp_response(sexp_src)
sx_src = await render_calendar_admin_oob(tctx)
return sx_response(sx_src)
@bp.get("/description/")
@require_admin
async def calendar_description_edit(calendar_slug: str, **kwargs):
from sexp.sexp_components import render_calendar_description_edit
from sx.sx_components import render_calendar_description_edit
html = render_calendar_description_edit(g.calendar)
return sexp_response(html)
return sx_response(html)
@bp.post("/description/")
@@ -51,16 +51,16 @@ def register():
g.calendar.description = description
await g.s.flush()
from sexp.sexp_components import render_calendar_description
from sx.sx_components import render_calendar_description
html = render_calendar_description(g.calendar, oob=True)
return sexp_response(html)
return sx_response(html)
@bp.get("/description/view/")
@require_admin
async def calendar_description_view(calendar_slug: str, **kwargs):
from sexp.sexp_components import render_calendar_description
from sx.sx_components import render_calendar_description
html = render_calendar_description(g.calendar)
return sexp_response(html)
return sx_response(html)
return bp

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

@@ -24,7 +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 shared.sx.helpers import sx_response
from ..slots.routes import register as register_slots
@@ -157,8 +157,8 @@ def register():
user_entries = visible.user_entries
confirmed_entries = visible.confirmed_entries
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_calendar_page, render_calendar_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_calendar_page, render_calendar_oob
tctx = await get_template_context()
tctx.update(dict(
@@ -175,8 +175,8 @@ def register():
html = await render_calendar_page(tctx)
return await make_response(html)
else:
sexp_src = await render_calendar_oob(tctx)
return sexp_response(sexp_src)
sx_src = await render_calendar_oob(tctx)
return sx_response(sx_src)
@bp.put("/")
@@ -198,11 +198,11 @@ def register():
description = (form.get("description") or "").strip()
await update_calendar_description(g.calendar, description)
from shared.sexp.page import get_template_context
from sexp.sexp_components import _calendar_admin_main_panel_html
from shared.sx.page import get_template_context
from sx.sx_components import _calendar_admin_main_panel_html
ctx = await get_template_context()
html = _calendar_admin_main_panel_html(ctx)
return sexp_response(html)
return sx_response(html)
@bp.delete("/")
@@ -217,14 +217,14 @@ def register():
# If we have post context (blog-embedded mode), update nav
post_data = getattr(g, "post_data", None)
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_calendars_list_panel
from shared.sx.page import get_template_context
from sx.sx_components import render_calendars_list_panel
ctx = await get_template_context()
html = render_calendars_list_panel(ctx)
if post_data:
from shared.services.entry_associations import get_associated_entries
from sexp.sexp_components import render_post_nav_entries_oob
from sx.sx_components import render_post_nav_entries_oob
post_id = (post_data.get("post") or {}).get("id")
cals = (
@@ -239,7 +239,7 @@ def register():
nav_oob = render_post_nav_entries_oob(associated_entries, cals, post_data["post"])
html = html + nav_oob
return sexp_response(html)
return sx_response(html)
return bp

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

@@ -16,7 +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 shared.sx.helpers import sx_response
from bp.calendar_entry.routes import register as register_calendar_entry
@@ -217,7 +217,7 @@ def register():
if ident["session_id"] is not None:
frag_params["session_id"] = ident["session_id"]
# Re-query day entries for the sexp component
# Re-query day entries for the sx component
from datetime import date as date_cls, timedelta
from bp.calendar.services import get_visible_entries_for_period
from quart import session as qsession
@@ -258,10 +258,10 @@ def register():
"styles": styles,
}
from sexp.sexp_components import render_day_main_panel
from sx.sx_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 sexp_response(html + (mini_html or ""))
return sx_response(html + (mini_html or ""))
@bp.get("/add/")
async def add_form(day: int, month: int, year: int, **kwargs):

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

@@ -28,7 +28,7 @@ import math
import logging
from shared.infrastructure.fragments import fetch_fragment
from shared.sexp.helpers import sexp_response
from shared.sx.helpers import sx_response
from ..ticket_types.routes import register as register_ticket_types
@@ -111,7 +111,7 @@ def register():
)
# Render OOB nav
from sexp.sexp_components import render_day_entries_nav_oob
from sx.sx_components import render_day_entries_nav_oob
return render_day_entries_nav_oob(visible.confirmed_entries, calendar, day_date)
async def get_post_nav_oob(entry_id: int):
@@ -148,7 +148,7 @@ def register():
).scalars().all()
# Render OOB nav for this post
from sexp.sexp_components import render_post_nav_entries_oob
from sx.sx_components import render_post_nav_entries_oob
nav_oob = render_post_nav_entries_oob(associated_entries, calendars, post)
nav_oobs.append(nav_oob)
@@ -242,16 +242,16 @@ def register():
@require_admin
async def get(entry_id: int, **rest):
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_entry_page, render_entry_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_entry_page, render_entry_oob
tctx = await get_template_context()
if not is_htmx_request():
html = await render_entry_page(tctx)
return await make_response(html, 200)
else:
sexp_src = await render_entry_oob(tctx)
return sexp_response(sexp_src)
sx_src = await render_entry_oob(tctx)
return sx_response(sx_src)
@bp.get("/edit/")
@require_admin
@@ -419,12 +419,12 @@ def register():
# Get nav OOB update
nav_oob = await get_day_nav_oob(year, month, day)
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_entry_page
from shared.sx.page import get_template_context
from sx.sx_components import render_entry_page
tctx = await get_template_context()
html = await render_entry_page(tctx)
return sexp_response(html + nav_oob)
return sx_response(html + nav_oob)
@bp.post("/confirm/")
@@ -448,9 +448,9 @@ def register():
# Re-read entry to get updated state
await g.s.refresh(g.entry)
from sexp.sexp_components import render_entry_optioned
from sx.sx_components import render_entry_optioned
html = render_entry_optioned(g.entry, g.calendar, day, month, year)
return sexp_response(html + day_nav_oob + post_nav_oob)
return sx_response(html + day_nav_oob + post_nav_oob)
@bp.post("/decline/")
@require_admin
@@ -473,9 +473,9 @@ def register():
# Re-read entry to get updated state
await g.s.refresh(g.entry)
from sexp.sexp_components import render_entry_optioned
from sx.sx_components import render_entry_optioned
html = render_entry_optioned(g.entry, g.calendar, day, month, year)
return sexp_response(html + day_nav_oob + post_nav_oob)
return sx_response(html + day_nav_oob + post_nav_oob)
@bp.post("/provisional/")
@require_admin
@@ -498,9 +498,9 @@ def register():
# Re-read entry to get updated state
await g.s.refresh(g.entry)
from sexp.sexp_components import render_entry_optioned
from sx.sx_components import render_entry_optioned
html = render_entry_optioned(g.entry, g.calendar, day, month, year)
return sexp_response(html + day_nav_oob + post_nav_oob)
return sx_response(html + day_nav_oob + post_nav_oob)
@bp.post("/tickets/")
@require_admin
@@ -542,9 +542,9 @@ def register():
# Return just the tickets fragment (targeted by hx-target="#entry-tickets-...")
await g.s.refresh(g.entry)
from sexp.sexp_components import render_entry_tickets_config
from sx.sx_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 sexp_response(html)
return sx_response(html)
@bp.get("/posts/search/")
@require_admin
@@ -593,11 +593,11 @@ def register():
entry_posts = await get_entry_posts(g.s, entry_id)
# Return updated posts list + OOB nav update
from sexp.sexp_components import render_entry_posts_panel, render_entry_posts_nav_oob
from sx.sx_components import render_entry_posts_panel, render_entry_posts_nav_oob
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 sexp_response(html + nav_oob)
return sx_response(html + nav_oob)
@bp.delete("/posts/<int:post_id>/")
@require_admin
@@ -615,10 +615,10 @@ def register():
entry_posts = await get_entry_posts(g.s, entry_id)
# Return updated posts list + OOB nav update
from sexp.sexp_components import render_entry_posts_panel, render_entry_posts_nav_oob
from sx.sx_components import render_entry_posts_panel, render_entry_posts_nav_oob
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 sexp_response(html + nav_oob)
return sx_response(html + nav_oob)
return bp

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

@@ -16,7 +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
from shared.sx.helpers import sx_response
def register():
@@ -31,16 +31,16 @@ def register():
@bp.get("/")
@cache_page(tag="calendars")
async def home(**kwargs):
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_calendars_page, render_calendars_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_calendars_page, render_calendars_oob
ctx = await get_template_context()
if not is_htmx_request():
html = await render_calendars_page(ctx)
return await make_response(html)
else:
sexp_src = await render_calendars_oob(ctx)
return sexp_response(sexp_src)
sx_src = await render_calendars_oob(ctx)
return sx_response(sx_src)
@bp.post("/new/")
@@ -63,18 +63,18 @@ def register():
try:
await svc_create_calendar(g.s, post_id, name)
except Exception as e:
from shared.sexp.jinja_bridge import render as render_comp
from shared.sx.jinja_bridge import render as render_comp
return await make_response(render_comp("error-inline", message=str(e)), 422)
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_calendars_list_panel
from shared.sx.page import get_template_context
from sx.sx_components import render_calendars_list_panel
ctx = await get_template_context()
html = render_calendars_list_panel(ctx)
# Blog-embedded mode: also update post nav
if post_data:
from shared.services.entry_associations import get_associated_entries
from sexp.sexp_components import render_post_nav_entries_oob
from sx.sx_components import render_post_nav_entries_oob
cals = (
await g.s.execute(
@@ -88,5 +88,5 @@ def register():
nav_oob = render_post_nav_entries_oob(associated_entries, cals, post_data["post"])
html = html + nav_oob
return sexp_response(html)
return sx_response(html)
return bp

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

@@ -6,7 +6,7 @@ from quart import (
from shared.browser.app.authz import require_admin
from shared.sexp.helpers import sexp_response
from shared.sx.helpers import sx_response
def register():
@@ -18,14 +18,14 @@ def register():
async def admin(year: int, month: int, day: int, **kwargs):
from shared.browser.app.utils.htmx import is_htmx_request
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_day_admin_page, render_day_admin_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_day_admin_page, render_day_admin_oob
tctx = await get_template_context()
if not is_htmx_request():
html = await render_day_admin_page(tctx)
return await make_response(html)
else:
sexp_src = await render_day_admin_oob(tctx)
return sexp_response(sexp_src)
sx_src = await render_day_admin_oob(tctx)
return sx_response(sx_src)
return bp

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

@@ -18,7 +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
from shared.sx.helpers import sx_response
def register():
@@ -122,16 +122,16 @@ def register():
- all confirmed + provisional + ordered entries for that day (all users)
- pending only for current user/session
"""
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_day_page, render_day_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_day_page, render_day_oob
tctx = await get_template_context()
if not is_htmx_request():
html = await render_day_page(tctx)
return await make_response(html)
else:
sexp_src = await render_day_oob(tctx)
return sexp_response(sexp_src)
sx_src = await render_day_oob(tctx)
return sx_response(sx_src)
@bp.get("/w/<widget_domain>/")
async def widget_paginate(widget_domain: str, **kwargs):

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

@@ -1,6 +1,6 @@
"""Events app fragment endpoints.
Exposes sexp fragments at ``/internal/fragments/<type>`` for consumption
Exposes sx fragments at ``/internal/fragments/<type>`` for consumption
by other coop apps via the fragment client.
"""
@@ -31,9 +31,9 @@ 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/sexp")
return Response("", status=200, content_type="text/sx")
result = await handler()
ct = "text/html" if fragment_type in _html_types else "text/sexp"
ct = "text/html" if fragment_type in _html_types else "text/sx"
return Response(result, status=200, content_type=ct)
# --- container-nav fragment: calendar entries + calendar links -----------
@@ -41,7 +41,7 @@ def register():
async def _container_nav_handler():
from quart import current_app
from shared.infrastructure.urls import events_url
from shared.sexp.helpers import sexp_call
from shared.sx.helpers import sx_call
container_type = request.args.get("container_type", "page")
container_id = int(request.args.get("container_id", 0))
@@ -69,11 +69,11 @@ 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')}"
parts.append(sexp_call("calendar-entry-nav",
parts.append(sx_call("calendar-entry-nav",
href=events_url(entry_path), name=entry.name,
date_str=date_str, nav_class=nav_class))
if has_more and paginate_url_base:
parts.append(sexp_call("htmx-sentinel",
parts.append(sx_call("htmx-sentinel",
id=f"entries-load-sentinel-{page}",
hx_get=f"{paginate_url_base}?page={page + 1}",
hx_trigger="intersect once",
@@ -87,7 +87,7 @@ def register():
)
for cal in calendars:
href = events_url(f"/{post_slug}/{cal.slug}/")
parts.append(sexp_call("calendar-link-nav",
parts.append(sx_call("calendar-link-nav",
href=href, name=cal.name, nav_class=nav_class))
if not parts:
@@ -123,7 +123,7 @@ def register():
async def _account_nav_item_handler():
from quart import current_app
from shared.infrastructure.urls import account_url
from shared.sexp.helpers import sexp_call
from shared.sx.helpers import sx_call
styles = current_app.jinja_env.globals.get("styles", {})
nav_class = styles.get("nav_button", "")
@@ -135,7 +135,7 @@ def register():
bookings_url = account_url("/bookings/")
parts = []
for href, label in [(tickets_url, "tickets"), (bookings_url, "bookings")]:
parts.append(sexp_call("nav-group-link",
parts.append(sx_call("nav-group-link",
href=href, hx_select=hx_select, nav_class=nav_class, label=label))
return "(<> " + " ".join(parts) + ")"
@@ -169,13 +169,13 @@ def register():
async def _link_card_handler():
from shared.infrastructure.urls import events_url
from shared.sexp.helpers import sexp_call
from shared.sx.helpers import sx_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",
def _event_link_card_sx(post, cal_names: str) -> str:
return sx_call("link-card",
title=post.title, image=post.feature_image,
subtitle=cal_names,
link=events_url(f"/{post.slug}"))
@@ -193,7 +193,7 @@ def register():
g.s, "page", post.id,
)
cal_names = ", ".join(c.name for c in calendars) if calendars else ""
parts.append(_event_link_card_sexp(post, cal_names))
parts.append(_event_link_card_sx(post, cal_names))
return "\n".join(parts)
# Single mode
@@ -207,7 +207,7 @@ def register():
g.s, "page", post.id,
)
cal_names = ", ".join(c.name for c in calendars) if calendars else ""
return _event_link_card_sexp(post, cal_names)
return _event_link_card_sx(post, cal_names)
_handlers["link-card"] = _link_card_handler

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

@@ -12,7 +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
from shared.sx.helpers import sx_response
def register():
@@ -24,16 +24,16 @@ def register():
@bp.get("/")
async def home(**kwargs):
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_markets_page, render_markets_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_markets_page, render_markets_oob
ctx = await get_template_context()
if not is_htmx_request():
html = await render_markets_page(ctx)
return await make_response(html)
else:
sexp_src = await render_markets_oob(ctx)
return sexp_response(sexp_src)
sx_src = await render_markets_oob(ctx)
return sx_response(sx_src)
@bp.post("/new/")
@require_admin
@@ -52,13 +52,13 @@ def register():
try:
await svc_create_market(g.s, post_id, name)
except Exception as e:
from shared.sexp.jinja_bridge import render as render_comp
from shared.sx.jinja_bridge import render as render_comp
return await make_response(render_comp("error-inline", message=str(e)), 422)
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_markets_list_panel
from shared.sx.page import get_template_context
from sx.sx_components import render_markets_list_panel
ctx = await get_template_context()
return sexp_response(render_markets_list_panel(ctx))
return sx_response(render_markets_list_panel(ctx))
@bp.delete("/<market_slug>/")
@require_admin
@@ -68,9 +68,9 @@ def register():
if not deleted:
return await make_response("Market not found", 404)
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_markets_list_panel
from shared.sx.page import get_template_context
from sx.sx_components import render_markets_list_panel
ctx = await get_template_context()
return sexp_response(render_markets_list_panel(ctx))
return sx_response(render_markets_list_panel(ctx))
return bp

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

@@ -11,7 +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.sx.helpers import sx_response
from shared.infrastructure.cart_identity import current_cart_identity
from shared.services.registry import services
@@ -46,13 +46,13 @@ def register() -> Blueprint:
entries, has_more, pending_tickets = await _load_entries(post["id"], page)
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_page_summary_page, render_page_summary_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_page_summary_page, render_page_summary_oob
ctx = await get_template_context()
if is_htmx_request():
sexp_src = await render_page_summary_oob(ctx, entries, has_more, pending_tickets, {}, page, view)
return sexp_response(sexp_src)
sx_src = await render_page_summary_oob(ctx, entries, has_more, pending_tickets, {}, page, view)
return sx_response(sx_src)
else:
html = await render_page_summary_page(ctx, entries, has_more, pending_tickets, {}, page, view)
return await make_response(html, 200)
@@ -65,9 +65,9 @@ def register() -> Blueprint:
entries, has_more, pending_tickets = await _load_entries(post["id"], page)
from sexp.sexp_components import render_page_summary_cards
sexp_src = await render_page_summary_cards(entries, has_more, pending_tickets, {}, page, view, post)
return sexp_response(sexp_src)
from sx.sx_components import render_page_summary_cards
sx_src = await render_page_summary_cards(entries, has_more, pending_tickets, {}, page, view, post)
return sx_response(sx_src)
@bp.post("/tickets/adjust")
async def adjust_ticket():
@@ -106,9 +106,9 @@ def register() -> Blueprint:
if ident["session_id"] is not None:
frag_params["session_id"] = ident["session_id"]
from sexp.sexp_components import render_ticket_widget
from sx.sx_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 sexp_response(widget_html + (mini_html or ""))
return sx_response(widget_html + (mini_html or ""))
return bp

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

@@ -24,7 +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
from shared.sx.helpers import sx_response
def register():
@@ -75,8 +75,8 @@ def register():
slot = await svc_get_slot(g.s, slot_id)
if not slot:
return await make_response("Not found", 404)
from sexp.sexp_components import render_slot_main_panel
return sexp_response(render_slot_main_panel(slot, g.calendar))
from sx.sx_components import render_slot_main_panel
return sx_response(render_slot_main_panel(slot, g.calendar))
@bp.delete("/")
@require_admin
@@ -84,8 +84,8 @@ def register():
async def slot_delete(slot_id: int, **kwargs):
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
return sexp_response(render_slots_table(slots, g.calendar))
from sx.sx_components import render_slots_table
return sx_response(render_slots_table(slots, g.calendar))
@bp.put("/")
@require_admin
@@ -166,8 +166,8 @@ def register():
}
), 422
from sexp.sexp_components import render_slot_main_panel
return sexp_response(render_slot_main_panel(slot, g.calendar, oob=True))
from sx.sx_components import render_slot_main_panel
return sx_response(render_slot_main_panel(slot, g.calendar, oob=True))

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

@@ -20,7 +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
from shared.sx.helpers import sx_response
def register():
@@ -45,16 +45,16 @@ def register():
@bp.get("/")
async def get(**kwargs):
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_slots_page, render_slots_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_slots_page, render_slots_oob
tctx = await get_template_context()
if not is_htmx_request():
html = await render_slots_page(tctx)
return await make_response(html)
else:
sexp_src = await render_slots_oob(tctx)
return sexp_response(sexp_src)
sx_src = await render_slots_oob(tctx)
return sx_response(sx_src)
@bp.post("/")
@@ -129,8 +129,8 @@ 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
return sexp_response(render_slots_table(slots, g.calendar))
from sx.sx_components import render_slots_table
return sx_response(render_slots_table(slots, g.calendar))
@bp.get("/add")

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

@@ -20,7 +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 shared.sx.helpers import sx_response
from ..tickets.services.tickets import (
get_ticket_by_code,
@@ -71,16 +71,16 @@ def register() -> Blueprint:
"reserved": reserved or 0,
}
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_ticket_admin_page, render_ticket_admin_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_ticket_admin_page, render_ticket_admin_oob
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:
sexp_src = await render_ticket_admin_oob(ctx, tickets, stats)
return sexp_response(sexp_src)
sx_src = await render_ticket_admin_oob(ctx, tickets, stats)
return sx_response(sx_src)
@bp.get("/entry/<int:entry_id>/")
@require_admin
@@ -101,9 +101,9 @@ def register() -> Blueprint:
tickets = await get_tickets_for_entry(g.s, entry_id)
from sexp.sexp_components import render_entry_tickets_admin
from sx.sx_components import render_entry_tickets_admin
html = render_entry_tickets_admin(entry, tickets)
return sexp_response(html)
return sx_response(html)
@bp.get("/lookup/")
@require_admin
@@ -117,11 +117,11 @@ def register() -> Blueprint:
)
ticket = await get_ticket_by_code(g.s, code)
from sexp.sexp_components import render_lookup_result
from sx.sx_components import render_lookup_result
if not ticket:
return sexp_response(render_lookup_result(None, "Ticket not found"))
return sx_response(render_lookup_result(None, "Ticket not found"))
return sexp_response(render_lookup_result(ticket, None))
return sx_response(render_lookup_result(ticket, None))
@bp.post("/<code>/checkin/")
@require_admin
@@ -130,11 +130,11 @@ def register() -> Blueprint:
"""Check in a ticket by its code."""
success, error = await checkin_ticket(g.s, code)
from sexp.sexp_components import render_checkin_result
from sx.sx_components import render_checkin_result
if not success:
return sexp_response(render_checkin_result(False, error, None))
return sx_response(render_checkin_result(False, error, None))
ticket = await get_ticket_by_code(g.s, code)
return sexp_response(render_checkin_result(True, None, ticket))
return sx_response(render_checkin_result(True, None, ticket))
return bp

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

@@ -17,7 +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
from shared.sx.helpers import sx_response
def register():
@@ -67,9 +67,9 @@ def register():
if not ticket_type:
return await make_response("Not found", 404)
from sexp.sexp_components import render_ticket_type_main_panel
from sx.sx_components import render_ticket_type_main_panel
va = request.view_args or {}
return sexp_response(render_ticket_type_main_panel(
return sx_response(render_ticket_type_main_panel(
ticket_type, g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
))
@@ -134,9 +134,9 @@ def register():
return await make_response("Not found", 404)
# Return updated view with OOB flag
from sexp.sexp_components import render_ticket_type_main_panel
from sx.sx_components import render_ticket_type_main_panel
va = request.view_args or {}
return sexp_response(render_ticket_type_main_panel(
return sx_response(render_ticket_type_main_panel(
ticket_type, g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
oob=True,
@@ -153,9 +153,9 @@ def register():
# Re-render the ticket types list
ticket_types = await svc_list_ticket_types(g.s, g.entry.id)
from sexp.sexp_components import render_ticket_types_table
from sx.sx_components import render_ticket_types_table
va = request.view_args or {}
return sexp_response(render_ticket_types_table(
return sx_response(render_ticket_types_table(
ticket_types, g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
))

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

@@ -15,7 +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
from shared.sx.helpers import sx_response
def register():
@@ -110,9 +110,9 @@ def register():
# Success → re-render the ticket types table
ticket_types = await svc_list_ticket_types(g.s, g.entry.id)
from sexp.sexp_components import render_ticket_types_table
from sx.sx_components import render_ticket_types_table
va = request.view_args or {}
return sexp_response(render_ticket_types_table(
return sx_response(render_ticket_types_table(
ticket_types, g.entry, g.calendar,
va.get("day"), va.get("month"), va.get("year"),
))

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

@@ -20,7 +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 shared.sx.helpers import sx_response
from .services.tickets import (
create_ticket,
@@ -51,16 +51,16 @@ def register() -> Blueprint:
session_id=ident["session_id"],
)
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_tickets_page, render_tickets_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_tickets_page, render_tickets_oob
ctx = await get_template_context()
if not is_htmx_request():
html = await render_tickets_page(ctx, tickets)
return await make_response(html, 200)
else:
sexp_src = await render_tickets_oob(ctx, tickets)
return sexp_response(sexp_src)
sx_src = await render_tickets_oob(ctx, tickets)
return sx_response(sx_src)
@bp.get("/<code>/")
async def ticket_detail(code: str):
@@ -82,16 +82,16 @@ def register() -> Blueprint:
else:
return await make_response("Ticket not found", 404)
from shared.sexp.page import get_template_context
from sexp.sexp_components import render_ticket_detail_page, render_ticket_detail_oob
from shared.sx.page import get_template_context
from sx.sx_components import render_ticket_detail_page, render_ticket_detail_oob
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:
sexp_src = await render_ticket_detail_oob(ctx, ticket)
return sexp_response(sexp_src)
sx_src = await render_ticket_detail_oob(ctx, ticket)
return sx_response(sx_src)
@bp.post("/buy/")
@clear_cache(tag="calendars", tag_scope="all")
@@ -182,8 +182,8 @@ def register() -> Blueprint:
summary = dto_from_dict(CartSummaryDTO, raw_summary) if raw_summary else CartSummaryDTO()
cart_count = summary.count + summary.calendar_count + summary.ticket_count
from sexp.sexp_components import render_buy_result
return sexp_response(render_buy_result(entry, created, remaining, cart_count))
from sx.sx_components import render_buy_result
return sx_response(render_buy_result(entry, created, remaining, cart_count))
@bp.post("/adjust/")
@clear_cache(tag="calendars", tag_scope="all")
@@ -305,8 +305,8 @@ def register() -> Blueprint:
summary = dto_from_dict(CartSummaryDTO, raw_summary) if raw_summary else CartSummaryDTO()
cart_count = summary.count + summary.calendar_count + summary.ticket_count
from sexp.sexp_components import render_adjust_response
return sexp_response(render_adjust_response(
from sx.sx_components import render_adjust_response
return sx_response(render_adjust_response(
entry, ticket_remaining, ticket_sold_count,
user_ticket_count, user_ticket_counts_by_type, cart_count,
))

0
events/sexp/__init__.py → events/sx/__init__.py
View File

0
events/sexp/admin.sexpr → events/sx/admin.sx
View File

0
events/sexp/calendar.sexpr → events/sx/calendar.sx
View File

0
events/sexp/day.sexpr → events/sx/day.sx
View File

0
events/sexp/entries.sexpr → events/sx/entries.sx
View File

0
events/sexp/forms.sexpr → events/sx/forms.sx
View File

0
events/sexp/fragments.sexpr → events/sx/fragments.sx
View File

0
events/sexp/header.sexpr → events/sx/header.sx
View File

0
events/sexp/markets.sexpr → events/sx/markets.sx
View File

0
events/sexp/page.sexpr → events/sx/page.sx
View File

0
events/sexp/payments.sexpr → events/sx/payments.sx
View File

940
events/sexp/sexp_components.py → events/sx/sx_components.py
View File

File diff suppressed because it is too large Load Diff

0
events/sexp/tickets.sexpr → events/sx/tickets.sx
View File