Rebrand sexp → sx across web platform (173 files)
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 11m37s
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 11m37s
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:
@@ -150,8 +150,8 @@ def register(url_prefix: str) -> Blueprint:
|
||||
try:
|
||||
page_config = await resolve_page_config(g.s, cart, calendar_entries, tickets)
|
||||
except ValueError as e:
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_checkout_error_page
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_checkout_error_page
|
||||
tctx = await get_template_context()
|
||||
html = await render_checkout_error_page(tctx, error=str(e))
|
||||
return await make_response(html, 400)
|
||||
@@ -207,8 +207,8 @@ def register(url_prefix: str) -> Blueprint:
|
||||
hosted_url = result.get("sumup_hosted_url")
|
||||
|
||||
if not hosted_url:
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_checkout_error_page
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_checkout_error_page
|
||||
tctx = await get_template_context()
|
||||
html = await render_checkout_error_page(tctx, error="No hosted checkout URL returned from SumUp.")
|
||||
return await make_response(html, 500)
|
||||
|
||||
@@ -5,7 +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 shared.sx.helpers import sx_response
|
||||
from .services import get_cart_grouped_by_page
|
||||
|
||||
|
||||
@@ -15,8 +15,8 @@ def register(url_prefix: str) -> Blueprint:
|
||||
@bp.get("/")
|
||||
async def overview():
|
||||
from quart import g
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_overview_page, render_overview_oob
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_overview_page, render_overview_oob
|
||||
|
||||
page_groups = await get_cart_grouped_by_page(g.s)
|
||||
ctx = await get_template_context()
|
||||
@@ -25,7 +25,7 @@ def register(url_prefix: str) -> Blueprint:
|
||||
html = await render_overview_page(ctx, page_groups)
|
||||
return await make_response(html)
|
||||
else:
|
||||
sexp_src = await render_overview_oob(ctx, page_groups)
|
||||
return sexp_response(sexp_src)
|
||||
sx_src = await render_overview_oob(ctx, page_groups)
|
||||
return sx_response(sx_src)
|
||||
|
||||
return bp
|
||||
|
||||
@@ -5,7 +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.sx.helpers import sx_response
|
||||
from shared.infrastructure.actions import call_action
|
||||
from .services import (
|
||||
total,
|
||||
@@ -41,8 +41,8 @@ def register(url_prefix: str) -> Blueprint:
|
||||
ticket_total=ticket_total,
|
||||
)
|
||||
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_page_cart_page, render_page_cart_oob
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_page_cart_page, render_page_cart_oob
|
||||
|
||||
ctx = await get_template_context()
|
||||
if not is_htmx_request():
|
||||
@@ -52,11 +52,11 @@ def register(url_prefix: str) -> Blueprint:
|
||||
)
|
||||
return await make_response(html)
|
||||
else:
|
||||
sexp_src = await render_page_cart_oob(
|
||||
sx_src = await render_page_cart_oob(
|
||||
ctx, post, cart, cal_entries, page_tickets,
|
||||
ticket_groups, total, calendar_total, ticket_total,
|
||||
)
|
||||
return sexp_response(sexp_src)
|
||||
return sx_response(sx_src)
|
||||
|
||||
@bp.post("/checkout/")
|
||||
async def page_checkout():
|
||||
@@ -111,8 +111,8 @@ def register(url_prefix: str) -> Blueprint:
|
||||
hosted_url = result.get("sumup_hosted_url")
|
||||
|
||||
if not hosted_url:
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_checkout_error_page
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_checkout_error_page
|
||||
tctx = await get_template_context()
|
||||
html = await render_checkout_error_page(tctx, error="No hosted checkout URL returned from SumUp.")
|
||||
return await make_response(html, 500)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"""Cart 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.
|
||||
|
||||
Fragments:
|
||||
@@ -19,13 +19,13 @@ def register():
|
||||
bp = Blueprint("fragments", __name__, url_prefix="/internal/fragments")
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# Fragment handlers — return sexp source text
|
||||
# Fragment handlers — return sx source text
|
||||
# ---------------------------------------------------------------
|
||||
|
||||
async def _cart_mini():
|
||||
from shared.services.registry import services
|
||||
from shared.infrastructure.urls import blog_url, cart_url
|
||||
from shared.sexp.helpers import sexp_call
|
||||
from shared.sx.helpers import sx_call
|
||||
|
||||
user_id = request.args.get("user_id", type=int)
|
||||
session_id = request.args.get("session_id")
|
||||
@@ -35,7 +35,7 @@ def register():
|
||||
)
|
||||
count = summary.count + summary.calendar_count + summary.ticket_count
|
||||
oob = request.args.get("oob", "")
|
||||
return sexp_call("cart-mini",
|
||||
return sx_call("cart-mini",
|
||||
cart_count=count,
|
||||
blog_url=blog_url(""),
|
||||
cart_url=cart_url(""),
|
||||
@@ -43,9 +43,9 @@ def register():
|
||||
|
||||
async def _account_nav_item():
|
||||
from shared.infrastructure.urls import cart_url
|
||||
from shared.sexp.helpers import sexp_call
|
||||
from shared.sx.helpers import sx_call
|
||||
|
||||
return sexp_call("account-nav-item",
|
||||
return sx_call("account-nav-item",
|
||||
href=cart_url("/orders/"),
|
||||
label="orders")
|
||||
|
||||
@@ -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/sexp")
|
||||
return Response("", status=200, content_type="text/sx")
|
||||
src = await handler()
|
||||
return Response(src, status=200, content_type="text/sexp")
|
||||
return Response(src, status=200, content_type="text/sx")
|
||||
|
||||
return bp
|
||||
|
||||
@@ -13,7 +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 shared.sx.helpers import sx_response
|
||||
|
||||
from .filters.qs import makeqs_factory, decode
|
||||
|
||||
@@ -56,8 +56,8 @@ def register() -> Blueprint:
|
||||
order = result.scalar_one_or_none()
|
||||
if not order:
|
||||
return await make_response("Order not found", 404)
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_order_page, render_order_oob
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_order_page, render_order_oob
|
||||
|
||||
ctx = await get_template_context()
|
||||
calendar_entries = ctx.get("calendar_entries")
|
||||
@@ -66,8 +66,8 @@ def register() -> Blueprint:
|
||||
html = await render_order_page(ctx, order, calendar_entries, url_for)
|
||||
return await make_response(html)
|
||||
else:
|
||||
sexp_src = await render_order_oob(ctx, order, calendar_entries, url_for)
|
||||
return sexp_response(sexp_src)
|
||||
sx_src = await render_order_oob(ctx, order, calendar_entries, url_for)
|
||||
return sx_response(sx_src)
|
||||
|
||||
@bp.get("/pay/")
|
||||
async def order_pay(order_id: int):
|
||||
@@ -121,8 +121,8 @@ def register() -> Blueprint:
|
||||
await g.s.flush()
|
||||
|
||||
if not hosted_url:
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_checkout_error_page
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_checkout_error_page
|
||||
tctx = await get_template_context()
|
||||
html = await render_checkout_error_page(tctx, error="No hosted checkout URL returned from SumUp when trying to reopen payment.", order=order)
|
||||
return await make_response(html, 500)
|
||||
|
||||
@@ -13,7 +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 shared.sx.helpers import sx_response
|
||||
from bp import register_order
|
||||
|
||||
from .filters.qs import makeqs_factory, decode
|
||||
@@ -137,8 +137,8 @@ def register(url_prefix: str) -> Blueprint:
|
||||
result = await g.s.execute(stmt)
|
||||
orders = result.scalars().all()
|
||||
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import (
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import (
|
||||
render_orders_page,
|
||||
render_orders_rows,
|
||||
render_orders_oob,
|
||||
@@ -154,16 +154,16 @@ def register(url_prefix: str) -> Blueprint:
|
||||
)
|
||||
resp = await make_response(html)
|
||||
elif page > 1:
|
||||
sexp_src = await render_orders_rows(
|
||||
sx_src = await render_orders_rows(
|
||||
ctx, orders, page, total_pages, url_for, qs_fn,
|
||||
)
|
||||
resp = sexp_response(sexp_src)
|
||||
resp = sx_response(sx_src)
|
||||
else:
|
||||
sexp_src = await render_orders_oob(
|
||||
sx_src = await render_orders_oob(
|
||||
ctx, orders, page, total_pages, search, total_count,
|
||||
url_for, qs_fn,
|
||||
)
|
||||
resp = sexp_response(sexp_src)
|
||||
resp = sx_response(sx_src)
|
||||
resp.headers["Hx-Push-Url"] = _current_url_without_page()
|
||||
return _vary(resp)
|
||||
|
||||
|
||||
@@ -8,7 +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
|
||||
from shared.sx.helpers import sx_response
|
||||
|
||||
|
||||
def register():
|
||||
@@ -17,8 +17,8 @@ def register():
|
||||
@bp.get("/")
|
||||
@require_admin
|
||||
async def admin(**kwargs):
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_cart_admin_page, render_cart_admin_oob
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_cart_admin_page, render_cart_admin_oob
|
||||
|
||||
ctx = await get_template_context()
|
||||
page_post = getattr(g, "page_post", None)
|
||||
@@ -26,14 +26,14 @@ def register():
|
||||
html = await render_cart_admin_page(ctx, page_post)
|
||||
return await make_response(html)
|
||||
else:
|
||||
sexp_src = await render_cart_admin_oob(ctx, page_post)
|
||||
return sexp_response(sexp_src)
|
||||
sx_src = await render_cart_admin_oob(ctx, page_post)
|
||||
return sx_response(sx_src)
|
||||
|
||||
@bp.get("/payments/")
|
||||
@require_admin
|
||||
async def payments(**kwargs):
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_cart_payments_page, render_cart_payments_oob
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_cart_payments_page, render_cart_payments_oob
|
||||
|
||||
ctx = await get_template_context()
|
||||
page_post = getattr(g, "page_post", None)
|
||||
@@ -41,8 +41,8 @@ def register():
|
||||
html = await render_cart_payments_page(ctx, page_post)
|
||||
return await make_response(html)
|
||||
else:
|
||||
sexp_src = await render_cart_payments_oob(ctx, page_post)
|
||||
return sexp_response(sexp_src)
|
||||
sx_src = await render_cart_payments_oob(ctx, page_post)
|
||||
return sx_response(sx_src)
|
||||
|
||||
@bp.put("/payments/")
|
||||
@require_admin
|
||||
@@ -77,10 +77,10 @@ def register():
|
||||
)
|
||||
g.page_config = SimpleNamespace(**raw_pc) if raw_pc else None
|
||||
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_cart_payments_panel
|
||||
from shared.sx.page import get_template_context
|
||||
from sx.sx_components import render_cart_payments_panel
|
||||
ctx = await get_template_context()
|
||||
html = render_cart_payments_panel(ctx)
|
||||
return sexp_response(html)
|
||||
return sx_response(html)
|
||||
|
||||
return bp
|
||||
|
||||
Reference in New Issue
Block a user