giles
d53b9648a9
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m15s
Migrate ~52 GET route handlers across all 7 services from Jinja render_template() to s-expression component rendering. Each service gets a sexp_components.py with page/oob/cards render functions. - Add per-service sexp_components.py (account, blog, cart, events, federation, market, orders) with full page, OOB, and pagination card rendering - Add shared/sexp/helpers.py with call_url, root_header_html, full_page, oob_page utilities - Update all GET routes to use get_template_context() + render fns - Fix get_template_context() to inject Jinja globals (URL helpers) - Add qs_filter to base_context for sexp filter URL building - Mount sexp_components.py in docker-compose.dev.yml for all services - Import sexp_components in app.py for Hypercorn --reload watching - Fix route_prefix import (shared.utils not shared.infrastructure.urls) - Fix federation choose-username missing actor in context - Fix market page_markets missing post in context Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
107 lines
3.9 KiB
Python
107 lines
3.9 KiB
Python
from __future__ import annotations
|
|
import path_setup # noqa: F401 # adds shared/ to sys.path
|
|
import sexp_components # noqa: F401 # ensure Hypercorn --reload watches this file
|
|
from pathlib import Path
|
|
|
|
from quart import g, request
|
|
from jinja2 import FileSystemLoader, ChoiceLoader
|
|
|
|
from shared.infrastructure.factory import create_base_app
|
|
|
|
from bp import register_account_bp, register_auth_bp, register_fragments
|
|
|
|
|
|
async def account_context() -> dict:
|
|
"""Account app context processor."""
|
|
from shared.infrastructure.context import base_context
|
|
from shared.infrastructure.cart_identity import current_cart_identity
|
|
from shared.infrastructure.fragments import fetch_fragments
|
|
from shared.infrastructure.data_client import fetch_data
|
|
from shared.contracts.dtos import CartSummaryDTO, dto_from_dict
|
|
|
|
ctx = await base_context()
|
|
|
|
# menu_nodes lives in db_blog; nav-tree fragment provides the real nav
|
|
ctx["menu_items"] = []
|
|
|
|
# Cart data via internal data endpoint
|
|
ident = current_cart_identity()
|
|
summary_params = {}
|
|
if ident["user_id"] is not None:
|
|
summary_params["user_id"] = ident["user_id"]
|
|
if ident["session_id"] is not None:
|
|
summary_params["session_id"] = ident["session_id"]
|
|
raw = await fetch_data("cart", "cart-summary", params=summary_params, required=False)
|
|
summary = dto_from_dict(CartSummaryDTO, raw) if raw else CartSummaryDTO()
|
|
ctx["cart_count"] = summary.count + summary.calendar_count + summary.ticket_count
|
|
ctx["cart_total"] = float(summary.total + summary.calendar_total + summary.ticket_total)
|
|
|
|
# Pre-fetch cross-app HTML fragments concurrently
|
|
user = getattr(g, "user", None)
|
|
cart_params = {}
|
|
if ident["user_id"] is not None:
|
|
cart_params["user_id"] = ident["user_id"]
|
|
if ident["session_id"] is not None:
|
|
cart_params["session_id"] = ident["session_id"]
|
|
|
|
cart_mini_html, auth_menu_html, nav_tree_html = await fetch_fragments([
|
|
("cart", "cart-mini", cart_params or None),
|
|
("account", "auth-menu", {"email": user.email} if user else None),
|
|
("blog", "nav-tree", {"app_name": "account", "path": request.path}),
|
|
])
|
|
ctx["cart_mini_html"] = cart_mini_html
|
|
ctx["auth_menu_html"] = auth_menu_html
|
|
ctx["nav_tree_html"] = nav_tree_html
|
|
|
|
return ctx
|
|
|
|
|
|
def create_app() -> "Quart":
|
|
from services import register_domain_services
|
|
|
|
app = create_base_app(
|
|
"account",
|
|
context_fn=account_context,
|
|
domain_services_fn=register_domain_services,
|
|
)
|
|
|
|
# App-specific templates override shared templates
|
|
app_templates = str(Path(__file__).resolve().parent / "templates")
|
|
app.jinja_loader = ChoiceLoader([
|
|
FileSystemLoader(app_templates),
|
|
app.jinja_loader,
|
|
])
|
|
|
|
# --- blueprints ---
|
|
app.register_blueprint(register_auth_bp())
|
|
app.register_blueprint(register_account_bp())
|
|
app.register_blueprint(register_fragments())
|
|
|
|
from bp.actions.routes import register as register_actions
|
|
app.register_blueprint(register_actions())
|
|
|
|
from bp.data.routes import register as register_data
|
|
app.register_blueprint(register_data())
|
|
|
|
# --- Ghost membership sync at startup (background) ---
|
|
# Runs as a background task to avoid blocking Hypercorn's startup timeout.
|
|
@app.before_serving
|
|
async def _schedule_ghost_membership_sync():
|
|
import asyncio
|
|
async def _sync():
|
|
from services.ghost_membership import sync_all_membership_from_ghost
|
|
from shared.db.session import get_session
|
|
try:
|
|
async with get_session() as s:
|
|
await sync_all_membership_from_ghost(s)
|
|
await s.commit()
|
|
print("[account] Ghost membership sync complete")
|
|
except Exception as e:
|
|
print(f"[account] Ghost membership sync failed (non-fatal): {e}")
|
|
asyncio.get_event_loop().create_task(_sync())
|
|
|
|
return app
|
|
|
|
|
|
app = create_app()
|