giles
293f7713d6
Some checks failed
Build and Deploy / build-and-deploy (push) Failing after 16s
Defpages are now declared with absolute paths in .sx files and auto-mounted directly on the Quart app, removing ~850 lines of blueprint mount_pages calls, before_request hooks, and g.* wrapper boilerplate. A new page = one defpage declaration, nothing else. Infrastructure: - async_eval awaits coroutine results from callable dispatch - auto_mount_pages() mounts all registered defpages on the app - g._defpage_ctx pattern passes helper data to layout context Migrated: sx, account, orders, federation, cart, market, events, blog Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
118 lines
4.2 KiB
Python
118 lines
4.2 KiB
Python
from __future__ import annotations
|
|
import path_setup # noqa: F401 # adds shared/ to sys.path
|
|
import sx.sx_components as sx_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, auth_menu, nav_tree = 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"] = cart_mini
|
|
ctx["auth_menu"] = auth_menu
|
|
ctx["nav_tree"] = nav_tree
|
|
|
|
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,
|
|
])
|
|
|
|
# Setup defpage routes
|
|
import sx.sx_components # noqa: F811 — ensure components loaded
|
|
from sxc.pages import setup_account_pages
|
|
setup_account_pages()
|
|
|
|
# --- blueprints ---
|
|
app.register_blueprint(register_auth_bp())
|
|
|
|
account_bp = register_account_bp()
|
|
app.register_blueprint(account_bp)
|
|
|
|
from shared.sx.pages import auto_mount_pages
|
|
auto_mount_pages(app, "account")
|
|
|
|
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()
|