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>
100 lines
3.0 KiB
Python
100 lines
3.0 KiB
Python
from __future__ import annotations
|
|
|
|
from quart import (
|
|
request, render_template, make_response, Blueprint, g
|
|
)
|
|
from sqlalchemy import select
|
|
|
|
from models.calendars import Calendar
|
|
|
|
|
|
from .services.calendars import (
|
|
create_calendar as svc_create_calendar,
|
|
)
|
|
|
|
from ..calendar.routes import register as register_calendar
|
|
|
|
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
|
|
|
|
|
|
def register():
|
|
bp = Blueprint("calendars", __name__, url_prefix='/calendars')
|
|
bp.register_blueprint(
|
|
register_calendar(),
|
|
)
|
|
@bp.context_processor
|
|
async def inject_root():
|
|
# Must always return a dict
|
|
return {}
|
|
|
|
# ---------- Pages ----------
|
|
|
|
@bp.get("/")
|
|
@cache_page(tag="calendars")
|
|
async def home(**kwargs):
|
|
from shared.sexp.page import get_template_context
|
|
from sexp_components import render_calendars_page, render_calendars_oob
|
|
|
|
ctx = await get_template_context()
|
|
if not is_htmx_request():
|
|
html = await render_calendars_page(ctx)
|
|
else:
|
|
html = await render_calendars_oob(ctx)
|
|
return await make_response(html)
|
|
|
|
|
|
@bp.post("/new/")
|
|
@require_admin
|
|
@clear_cache(tag="calendars", tag_scope="all")
|
|
async def create_calendar(**kwargs):
|
|
form = await request.form
|
|
name = (form.get("name") or "").strip()
|
|
|
|
# Get post_id from context if available (blog-embedded mode)
|
|
post_data = getattr(g, "post_data", None)
|
|
post_id = (post_data.get("post") or {}).get("id") if post_data else None
|
|
|
|
if not post_id:
|
|
# Standalone mode: post_id from form (or None — calendar without post)
|
|
post_id = form.get("post_id")
|
|
if post_id:
|
|
post_id = int(post_id)
|
|
|
|
try:
|
|
await svc_create_calendar(g.s, post_id, name)
|
|
except Exception as e:
|
|
return await make_response(f'<div class="text-red-600 text-sm">{e}</div>', 422)
|
|
|
|
html = await render_template(
|
|
"_types/calendars/index.html",
|
|
)
|
|
|
|
# Blog-embedded mode: also update post nav
|
|
if post_data:
|
|
from shared.services.entry_associations import get_associated_entries
|
|
|
|
cals = (
|
|
await g.s.execute(
|
|
select(Calendar)
|
|
.where(Calendar.container_type == "page", Calendar.container_id == post_id, Calendar.deleted_at.is_(None))
|
|
.order_by(Calendar.name.asc())
|
|
)
|
|
).scalars().all()
|
|
|
|
associated_entries = await get_associated_entries(g.s, post_id)
|
|
|
|
nav_oob = await render_template(
|
|
"_types/post/admin/_nav_entries_oob.html",
|
|
associated_entries=associated_entries,
|
|
calendars=cals,
|
|
post=post_data["post"],
|
|
)
|
|
|
|
html = html + nav_oob
|
|
|
|
return await make_response(html)
|
|
return bp
|