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
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 5m35s
- 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:
@@ -54,7 +54,7 @@ def register(url_prefix: str) -> Blueprint:
|
||||
if not cart_item:
|
||||
return await make_response("Product not found", 404)
|
||||
|
||||
if request.headers.get("HX-Request") == "true":
|
||||
if request.headers.get("SX-Request") == "true" or request.headers.get("HX-Request") == "true":
|
||||
# Redirect to overview for HTMX
|
||||
return redirect(url_for("cart_overview.overview"))
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ from __future__ import annotations
|
||||
from quart import Blueprint, render_template, make_response
|
||||
|
||||
from shared.browser.app.utils.htmx import is_htmx_request
|
||||
from shared.sexp.helpers import sexp_response
|
||||
from .services import get_cart_grouped_by_page
|
||||
|
||||
|
||||
@@ -22,8 +23,9 @@ def register(url_prefix: str) -> Blueprint:
|
||||
|
||||
if not is_htmx_request():
|
||||
html = await render_overview_page(ctx, page_groups)
|
||||
return await make_response(html)
|
||||
else:
|
||||
html = await render_overview_oob(ctx, page_groups)
|
||||
return await make_response(html)
|
||||
sexp_src = await render_overview_oob(ctx, page_groups)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
return bp
|
||||
|
||||
@@ -5,6 +5,7 @@ from __future__ import annotations
|
||||
from quart import Blueprint, g, redirect, make_response, url_for
|
||||
|
||||
from shared.browser.app.utils.htmx import is_htmx_request
|
||||
from shared.sexp.helpers import sexp_response
|
||||
from shared.infrastructure.actions import call_action
|
||||
from .services import (
|
||||
total,
|
||||
@@ -49,12 +50,13 @@ def register(url_prefix: str) -> Blueprint:
|
||||
ctx, post, cart, cal_entries, page_tickets,
|
||||
ticket_groups, total, calendar_total, ticket_total,
|
||||
)
|
||||
return await make_response(html)
|
||||
else:
|
||||
html = await render_page_cart_oob(
|
||||
sexp_src = await render_page_cart_oob(
|
||||
ctx, post, cart, cal_entries, page_tickets,
|
||||
ticket_groups, total, calendar_total, ticket_total,
|
||||
)
|
||||
return await make_response(html)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
@bp.post("/checkout/")
|
||||
async def page_checkout():
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"""Cart 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.
|
||||
|
||||
Fragments:
|
||||
@@ -19,13 +19,13 @@ def register():
|
||||
bp = Blueprint("fragments", __name__, url_prefix="/internal/fragments")
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# Fragment handlers
|
||||
# Fragment handlers — return sexp source text
|
||||
# ---------------------------------------------------------------
|
||||
|
||||
async def _cart_mini():
|
||||
from shared.services.registry import services
|
||||
from shared.infrastructure.urls import blog_url, cart_url
|
||||
from shared.sexp.jinja_bridge import sexp as render_sexp
|
||||
from shared.sexp.helpers import sexp_call
|
||||
|
||||
user_id = request.args.get("user_id", type=int)
|
||||
session_id = request.args.get("session_id")
|
||||
@@ -35,19 +35,19 @@ def register():
|
||||
)
|
||||
count = summary.count + summary.calendar_count + summary.ticket_count
|
||||
oob = request.args.get("oob", "")
|
||||
return render_sexp(
|
||||
'(~cart-mini :cart-count cart-count :blog-url blog-url :cart-url cart-url :oob oob)',
|
||||
**{"cart-count": count, "blog-url": blog_url(""), "cart-url": cart_url(""), "oob": oob or None},
|
||||
)
|
||||
return sexp_call("cart-mini",
|
||||
cart_count=count,
|
||||
blog_url=blog_url(""),
|
||||
cart_url=cart_url(""),
|
||||
oob=oob or None)
|
||||
|
||||
async def _account_nav_item():
|
||||
from shared.infrastructure.urls import cart_url
|
||||
from shared.sexp.jinja_bridge import sexp as render_sexp
|
||||
from shared.sexp.helpers import sexp_call
|
||||
|
||||
return render_sexp(
|
||||
'(~account-nav-item :href href :label "orders")',
|
||||
href=cart_url("/orders/"),
|
||||
)
|
||||
return sexp_call("account-nav-item",
|
||||
href=cart_url("/orders/"),
|
||||
label="orders")
|
||||
|
||||
_handlers = {
|
||||
"cart-mini": _cart_mini,
|
||||
@@ -67,8 +67,8 @@ 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")
|
||||
src = await handler()
|
||||
return Response(src, status=200, content_type="text/sexp")
|
||||
|
||||
return bp
|
||||
|
||||
@@ -13,6 +13,7 @@ from shared.infrastructure.http_utils import vary as _vary, current_url_without_
|
||||
from shared.infrastructure.cart_identity import current_cart_identity
|
||||
from bp.cart.services import check_sumup_status
|
||||
from shared.browser.app.utils.htmx import is_htmx_request
|
||||
from shared.sexp.helpers import sexp_response
|
||||
|
||||
from .filters.qs import makeqs_factory, decode
|
||||
|
||||
@@ -63,10 +64,10 @@ def register() -> Blueprint:
|
||||
|
||||
if not is_htmx_request():
|
||||
html = await render_order_page(ctx, order, calendar_entries, url_for)
|
||||
return await make_response(html)
|
||||
else:
|
||||
html = await render_order_oob(ctx, order, calendar_entries, url_for)
|
||||
|
||||
return await make_response(html)
|
||||
sexp_src = await render_order_oob(ctx, order, calendar_entries, url_for)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
@bp.get("/pay/")
|
||||
async def order_pay(order_id: int):
|
||||
|
||||
@@ -13,6 +13,7 @@ from shared.infrastructure.http_utils import vary as _vary, current_url_without_
|
||||
from shared.infrastructure.cart_identity import current_cart_identity
|
||||
from bp.cart.services import check_sumup_status
|
||||
from shared.browser.app.utils.htmx import is_htmx_request
|
||||
from shared.sexp.helpers import sexp_response
|
||||
from bp import register_order
|
||||
|
||||
from .filters.qs import makeqs_factory, decode
|
||||
@@ -151,17 +152,18 @@ def register(url_prefix: str) -> Blueprint:
|
||||
ctx, orders, page, total_pages, search, total_count,
|
||||
url_for, qs_fn,
|
||||
)
|
||||
resp = await make_response(html)
|
||||
elif page > 1:
|
||||
html = await render_orders_rows(
|
||||
sexp_src = await render_orders_rows(
|
||||
ctx, orders, page, total_pages, url_for, qs_fn,
|
||||
)
|
||||
resp = sexp_response(sexp_src)
|
||||
else:
|
||||
html = await render_orders_oob(
|
||||
sexp_src = await render_orders_oob(
|
||||
ctx, orders, page, total_pages, search, total_count,
|
||||
url_for, qs_fn,
|
||||
)
|
||||
|
||||
resp = await make_response(html)
|
||||
resp = sexp_response(sexp_src)
|
||||
resp.headers["Hx-Push-Url"] = _current_url_without_page()
|
||||
return _vary(resp)
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ from shared.infrastructure.actions import call_action
|
||||
from shared.infrastructure.data_client import fetch_data
|
||||
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():
|
||||
@@ -23,9 +24,10 @@ def register():
|
||||
page_post = getattr(g, "page_post", None)
|
||||
if not is_htmx_request():
|
||||
html = await render_cart_admin_page(ctx, page_post)
|
||||
return await make_response(html)
|
||||
else:
|
||||
html = await render_cart_admin_oob(ctx, page_post)
|
||||
return await make_response(html)
|
||||
sexp_src = await render_cart_admin_oob(ctx, page_post)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
@bp.get("/payments/")
|
||||
@require_admin
|
||||
@@ -37,9 +39,10 @@ def register():
|
||||
page_post = getattr(g, "page_post", None)
|
||||
if not is_htmx_request():
|
||||
html = await render_cart_payments_page(ctx, page_post)
|
||||
return await make_response(html)
|
||||
else:
|
||||
html = await render_cart_payments_oob(ctx, page_post)
|
||||
return await make_response(html)
|
||||
sexp_src = await render_cart_payments_oob(ctx, page_post)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
@bp.put("/payments/")
|
||||
@require_admin
|
||||
@@ -78,6 +81,6 @@ def register():
|
||||
from sexp.sexp_components import render_cart_payments_panel
|
||||
ctx = await get_template_context()
|
||||
html = render_cart_payments_panel(ctx)
|
||||
return await make_response(html)
|
||||
return sexp_response(html)
|
||||
|
||||
return bp
|
||||
|
||||
Reference in New Issue
Block a user