From 424c267110f1bd60b074e72c72de0529702b4c7c Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Sun, 22 Feb 2026 23:13:14 +0000
Subject: [PATCH] Add global all-events view at / and scope page summary to
 single page

Root / shows all upcoming events across all pages with page badges.
/<slug>/ reverted to show only that page's events.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 app.py                                       |   8 +-
 bp/__init__.py                               |   1 +
 bp/all_events/__init__.py                    |   0
 bp/all_events/routes.py                      | 143 +++++++++++++++++++
 bp/page/routes.py                            |  36 ++---
 templates/_types/all_events/_card.html       |  62 ++++++++
 templates/_types/all_events/_card_tile.html  |  60 ++++++++
 templates/_types/all_events/_cards.html      |  31 ++++
 templates/_types/all_events/_main_panel.html |  54 +++++++
 templates/_types/all_events/index.html       |   7 +
 10 files changed, 377 insertions(+), 25 deletions(-)
 create mode 100644 bp/all_events/__init__.py
 create mode 100644 bp/all_events/routes.py
 create mode 100644 templates/_types/all_events/_card.html
 create mode 100644 templates/_types/all_events/_card_tile.html
 create mode 100644 templates/_types/all_events/_cards.html
 create mode 100644 templates/_types/all_events/_main_panel.html
 create mode 100644 templates/_types/all_events/index.html

diff --git a/app.py b/app.py
index 3eaf330..eb4da88 100644
--- a/app.py
+++ b/app.py
@@ -8,7 +8,7 @@ from jinja2 import FileSystemLoader, ChoiceLoader
 
 from shared.infrastructure.factory import create_base_app
 
-from bp import register_calendars, register_markets, register_payments, register_page
+from bp import register_all_events, register_calendars, register_markets, register_payments, register_page
 
 
 async def events_context() -> dict:
@@ -55,6 +55,12 @@ def create_app() -> "Quart":
         app.jinja_loader,
     ])
 
+    # All events: / — global view across all pages
+    app.register_blueprint(
+        register_all_events(),
+        url_prefix="/",
+    )
+
     # Page summary: /<slug>/ — upcoming events across all calendars
     app.register_blueprint(
         register_page(),
diff --git a/bp/__init__.py b/bp/__init__.py
index 6edd0fd..3d06c7c 100644
--- a/bp/__init__.py
+++ b/bp/__init__.py
@@ -1,3 +1,4 @@
+from .all_events.routes import register as register_all_events
 from .calendars.routes import register as register_calendars
 from .markets.routes import register as register_markets
 from .payments.routes import register as register_payments
diff --git a/bp/all_events/__init__.py b/bp/all_events/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/bp/all_events/routes.py b/bp/all_events/routes.py
new file mode 100644
index 0000000..58732b8
--- /dev/null
+++ b/bp/all_events/routes.py
@@ -0,0 +1,143 @@
+"""
+All-events blueprint — shows upcoming events across ALL pages' calendars.
+
+Mounted at / (root of events app). No slug context — works independently
+of the post/slug machinery.
+
+Routes:
+  GET  /                  — full page with first page of entries
+  GET  /all-entries       — HTMX fragment for infinite scroll
+  POST /all-tickets/adjust — adjust ticket quantity inline
+"""
+from __future__ import annotations
+
+from quart import Blueprint, g, request, render_template, render_template_string, make_response
+
+from shared.browser.app.utils.htmx import is_htmx_request
+from shared.infrastructure.cart_identity import current_cart_identity
+from shared.services.registry import services
+
+
+def register() -> Blueprint:
+    bp = Blueprint("all_events", __name__)
+
+    async def _load_entries(page, per_page=20):
+        """Load all upcoming entries + pending ticket counts + page info."""
+        entries, has_more = await services.calendar.upcoming_entries_for_container(
+            g.s, page=page, per_page=per_page,
+        )
+
+        # Pending ticket counts keyed by entry_id
+        ident = current_cart_identity()
+        pending_tickets = {}
+        if entries:
+            tickets = await services.calendar.pending_tickets(
+                g.s, user_id=ident["user_id"], session_id=ident["session_id"],
+            )
+            for t in tickets:
+                if t.entry_id is not None:
+                    pending_tickets[t.entry_id] = pending_tickets.get(t.entry_id, 0) + 1
+
+        # Batch-load page info for container_ids
+        page_info = {}  # {post_id: {title, slug}}
+        if entries:
+            post_ids = list({
+                e.calendar_container_id
+                for e in entries
+                if e.calendar_container_type == "page" and e.calendar_container_id
+            })
+            if post_ids:
+                posts = await services.blog.get_posts_by_ids(g.s, post_ids)
+                for p in posts:
+                    page_info[p.id] = {"title": p.title, "slug": p.slug}
+
+        return entries, has_more, pending_tickets, page_info
+
+    @bp.get("/")
+    async def index():
+        view = request.args.get("view", "list")
+        page = int(request.args.get("page", 1))
+
+        entries, has_more, pending_tickets, page_info = await _load_entries(page)
+
+        ctx = dict(
+            entries=entries,
+            has_more=has_more,
+            pending_tickets=pending_tickets,
+            page_info=page_info,
+            page=page,
+            view=view,
+        )
+
+        if is_htmx_request():
+            html = await render_template("_types/all_events/_main_panel.html", **ctx)
+        else:
+            html = await render_template("_types/all_events/index.html", **ctx)
+
+        return await make_response(html, 200)
+
+    @bp.get("/all-entries")
+    async def entries_fragment():
+        view = request.args.get("view", "list")
+        page = int(request.args.get("page", 1))
+
+        entries, has_more, pending_tickets, page_info = await _load_entries(page)
+
+        html = await render_template(
+            "_types/all_events/_cards.html",
+            entries=entries,
+            has_more=has_more,
+            pending_tickets=pending_tickets,
+            page_info=page_info,
+            page=page,
+            view=view,
+        )
+        return await make_response(html, 200)
+
+    @bp.post("/all-tickets/adjust")
+    async def adjust_ticket():
+        """Adjust ticket quantity, return updated widget + OOB cart-mini."""
+        ident = current_cart_identity()
+        form = await request.form
+        entry_id = int(form.get("entry_id", 0))
+        count = max(int(form.get("count", 0)), 0)
+        tt_raw = (form.get("ticket_type_id") or "").strip()
+        ticket_type_id = int(tt_raw) if tt_raw else None
+
+        await services.calendar.adjust_ticket_quantity(
+            g.s, entry_id, count,
+            user_id=ident["user_id"],
+            session_id=ident["session_id"],
+            ticket_type_id=ticket_type_id,
+        )
+
+        # Get updated ticket count for this entry
+        tickets = await services.calendar.pending_tickets(
+            g.s, user_id=ident["user_id"], session_id=ident["session_id"],
+        )
+        qty = sum(1 for t in tickets if t.entry_id == entry_id)
+
+        # Load entry DTO for the widget template
+        entry = await services.calendar.entry_by_id(g.s, entry_id)
+
+        # Updated cart count for OOB mini-cart
+        summary = await services.cart.cart_summary(
+            g.s, user_id=ident["user_id"], session_id=ident["session_id"],
+        )
+        cart_count = summary.count + summary.calendar_count + summary.ticket_count
+
+        # Render widget + OOB cart-mini
+        widget_html = await render_template(
+            "_types/page_summary/_ticket_widget.html",
+            entry=entry,
+            qty=qty,
+            ticket_url="/all-tickets/adjust",
+        )
+        mini_html = await render_template_string(
+            '{% from "_types/cart/_mini.html" import mini with context %}'
+            '{{ mini(oob="true") }}',
+            cart_count=cart_count,
+        )
+        return await make_response(widget_html + mini_html, 200)
+
+    return bp
diff --git a/bp/page/routes.py b/bp/page/routes.py
index 5be7143..da4fb74 100644
--- a/bp/page/routes.py
+++ b/bp/page/routes.py
@@ -1,9 +1,8 @@
 """
-Page summary blueprint — shows upcoming events across all calendars
-for all pages.
+Page summary blueprint — shows upcoming events for a single page's calendars.
 
 Routes:
-  GET  /<slug>/              — full page with first page of entries
+  GET  /<slug>/              — full page scoped to this page
   GET  /<slug>/entries       — HTMX fragment for infinite scroll
   POST /<slug>/tickets/adjust — adjust ticket quantity inline
 """
@@ -19,10 +18,10 @@ from shared.services.registry import services
 def register() -> Blueprint:
     bp = Blueprint("page_summary", __name__)
 
-    async def _load_entries(page, per_page=20):
-        """Load all upcoming entries + pending ticket counts + page titles."""
+    async def _load_entries(post_id, page, per_page=20):
+        """Load upcoming entries for this page + pending ticket counts."""
         entries, has_more = await services.calendar.upcoming_entries_for_container(
-            g.s, page=page, per_page=per_page,
+            g.s, "page", post_id, page=page, per_page=per_page,
         )
 
         # Pending ticket counts keyed by entry_id
@@ -36,33 +35,21 @@ def register() -> Blueprint:
                 if t.entry_id is not None:
                     pending_tickets[t.entry_id] = pending_tickets.get(t.entry_id, 0) + 1
 
-        # Batch-load page info for container_ids
-        page_info = {}  # {post_id: {title, slug}}
-        if entries:
-            post_ids = list({
-                e.calendar_container_id
-                for e in entries
-                if e.calendar_container_type == "page" and e.calendar_container_id
-            })
-            if post_ids:
-                posts = await services.blog.get_posts_by_ids(g.s, post_ids)
-                for p in posts:
-                    page_info[p.id] = {"title": p.title, "slug": p.slug}
-
-        return entries, has_more, pending_tickets, page_info
+        return entries, has_more, pending_tickets
 
     @bp.get("/")
     async def index():
+        post = g.post_data["post"]
         view = request.args.get("view", "list")
         page = int(request.args.get("page", 1))
 
-        entries, has_more, pending_tickets, page_info = await _load_entries(page)
+        entries, has_more, pending_tickets = await _load_entries(post["id"], page)
 
         ctx = dict(
             entries=entries,
             has_more=has_more,
             pending_tickets=pending_tickets,
-            page_info=page_info,
+            page_info={},
             page=page,
             view=view,
         )
@@ -76,17 +63,18 @@ def register() -> Blueprint:
 
     @bp.get("/entries")
     async def entries_fragment():
+        post = g.post_data["post"]
         view = request.args.get("view", "list")
         page = int(request.args.get("page", 1))
 
-        entries, has_more, pending_tickets, page_info = await _load_entries(page)
+        entries, has_more, pending_tickets = await _load_entries(post["id"], page)
 
         html = await render_template(
             "_types/page_summary/_cards.html",
             entries=entries,
             has_more=has_more,
             pending_tickets=pending_tickets,
-            page_info=page_info,
+            page_info={},
             page=page,
             view=view,
         )
diff --git a/templates/_types/all_events/_card.html b/templates/_types/all_events/_card.html
new file mode 100644
index 0000000..0005563
--- /dev/null
+++ b/templates/_types/all_events/_card.html
@@ -0,0 +1,62 @@
+{# List card for all events — one entry #}
+{% set pi = page_info.get(entry.calendar_container_id, {}) %}
+{% set page_slug = pi.get('slug', '') %}
+{% set page_title = pi.get('title') %}
+<article class="rounded-xl bg-white shadow-sm border border-stone-200 p-4">
+  <div class="flex flex-col sm:flex-row sm:items-start justify-between gap-3">
+    {# Left: event info #}
+    <div class="flex-1 min-w-0">
+      {% if page_slug %}
+        {% set day_href = events_url('/' ~ page_slug ~ '/calendars/' ~ entry.calendar_slug ~ '/day/' ~ entry.start_at.strftime('%Y/%-m/%-d') ~ '/') %}
+      {% else %}
+        {% set day_href = '' %}
+      {% endif %}
+      {% set entry_href = day_href ~ 'entries/' ~ entry.id ~ '/' if day_href else '' %}
+      {% if entry_href %}
+        <a href="{{ entry_href }}" class="hover:text-emerald-700">
+          <h2 class="text-lg font-semibold text-stone-900">{{ entry.name }}</h2>
+        </a>
+      {% else %}
+        <h2 class="text-lg font-semibold text-stone-900">{{ entry.name }}</h2>
+      {% endif %}
+
+      <div class="flex flex-wrap items-center gap-1.5 mt-1">
+        {% if page_title %}
+          <a href="{{ events_url('/' ~ page_slug ~ '/') }}"
+             class="inline-block px-2 py-0.5 rounded-full text-xs font-medium bg-amber-100 text-amber-800 hover:bg-amber-200">
+            {{ page_title }}
+          </a>
+        {% endif %}
+        {% if entry.calendar_name %}
+          <span class="inline-block px-2 py-0.5 rounded-full text-xs font-medium bg-sky-100 text-sky-700">
+            {{ entry.calendar_name }}
+          </span>
+        {% endif %}
+      </div>
+
+      <div class="mt-1 text-sm text-stone-500">
+        {% if day_href %}
+          <a href="{{ day_href }}" class="hover:text-stone-700">{{ entry.start_at.strftime('%a %-d %b') }}</a> &middot;
+        {% else %}
+          {{ entry.start_at.strftime('%a %-d %b') }} &middot;
+        {% endif %}
+        {{ entry.start_at.strftime('%H:%M') }}{% if entry.end_at %} &ndash; {{ entry.end_at.strftime('%H:%M') }}{% endif %}
+      </div>
+
+      {% if entry.cost %}
+        <div class="mt-1 text-sm font-medium text-green-600">
+          &pound;{{ '%.2f'|format(entry.cost) }}
+        </div>
+      {% endif %}
+    </div>
+
+    {# Right: ticket widget #}
+    {% if entry.ticket_price is not none %}
+      <div class="shrink-0">
+        {% set qty = pending_tickets.get(entry.id, 0) %}
+        {% set ticket_url = url_for('all_events.adjust_ticket') %}
+        {% include '_types/page_summary/_ticket_widget.html' %}
+      </div>
+    {% endif %}
+  </div>
+</article>
diff --git a/templates/_types/all_events/_card_tile.html b/templates/_types/all_events/_card_tile.html
new file mode 100644
index 0000000..3f8855f
--- /dev/null
+++ b/templates/_types/all_events/_card_tile.html
@@ -0,0 +1,60 @@
+{# Tile card for all events — compact event tile #}
+{% set pi = page_info.get(entry.calendar_container_id, {}) %}
+{% set page_slug = pi.get('slug', '') %}
+{% set page_title = pi.get('title') %}
+<article class="rounded-xl bg-white shadow-sm border border-stone-200 overflow-hidden">
+  {% if page_slug %}
+    {% set day_href = events_url('/' ~ page_slug ~ '/calendars/' ~ entry.calendar_slug ~ '/day/' ~ entry.start_at.strftime('%Y/%-m/%-d') ~ '/') %}
+  {% else %}
+    {% set day_href = '' %}
+  {% endif %}
+  {% set entry_href = day_href ~ 'entries/' ~ entry.id ~ '/' if day_href else '' %}
+  <div class="p-3">
+    {% if entry_href %}
+      <a href="{{ entry_href }}" class="hover:text-emerald-700">
+        <h2 class="text-base font-semibold text-stone-900 line-clamp-2">{{ entry.name }}</h2>
+      </a>
+    {% else %}
+      <h2 class="text-base font-semibold text-stone-900 line-clamp-2">{{ entry.name }}</h2>
+    {% endif %}
+
+    <div class="flex flex-wrap items-center gap-1 mt-1">
+      {% if page_title %}
+        <a href="{{ events_url('/' ~ page_slug ~ '/') }}"
+           class="inline-block px-2 py-0.5 rounded-full text-xs font-medium bg-amber-100 text-amber-800 hover:bg-amber-200">
+          {{ page_title }}
+        </a>
+      {% endif %}
+      {% if entry.calendar_name %}
+        <span class="inline-block px-2 py-0.5 rounded-full text-xs font-medium bg-sky-100 text-sky-700">
+          {{ entry.calendar_name }}
+        </span>
+      {% endif %}
+    </div>
+
+    <div class="mt-1 text-xs text-stone-500">
+      {% if day_href %}
+        <a href="{{ day_href }}" class="hover:text-stone-700">{{ entry.start_at.strftime('%a %-d %b') }}</a>
+      {% else %}
+        {{ entry.start_at.strftime('%a %-d %b') }}
+      {% endif %}
+      &middot;
+      {{ entry.start_at.strftime('%H:%M') }}{% if entry.end_at %} &ndash; {{ entry.end_at.strftime('%H:%M') }}{% endif %}
+    </div>
+
+    {% if entry.cost %}
+      <div class="mt-1 text-sm font-medium text-green-600">
+        &pound;{{ '%.2f'|format(entry.cost) }}
+      </div>
+    {% endif %}
+  </div>
+
+  {# Ticket widget below card #}
+  {% if entry.ticket_price is not none %}
+    <div class="border-t border-stone-100 px-3 py-2">
+      {% set qty = pending_tickets.get(entry.id, 0) %}
+      {% set ticket_url = url_for('all_events.adjust_ticket') %}
+      {% include '_types/page_summary/_ticket_widget.html' %}
+    </div>
+  {% endif %}
+</article>
diff --git a/templates/_types/all_events/_cards.html b/templates/_types/all_events/_cards.html
new file mode 100644
index 0000000..0e3c6b8
--- /dev/null
+++ b/templates/_types/all_events/_cards.html
@@ -0,0 +1,31 @@
+{% for entry in entries %}
+  {% if view == 'tile' %}
+    {% include "_types/all_events/_card_tile.html" %}
+  {% else %}
+    {# Date header when date changes (list view only) #}
+    {% set entry_date = entry.start_at.strftime('%A %-d %B %Y') %}
+    {% if loop.first or entry_date != entries[loop.index0 - 1].start_at.strftime('%A %-d %B %Y') %}
+      <div class="pt-2 pb-1">
+        <h3 class="text-sm font-semibold text-stone-500 uppercase tracking-wide">
+          {{ entry_date }}
+        </h3>
+      </div>
+    {% endif %}
+    {% include "_types/all_events/_card.html" %}
+  {% endif %}
+{% endfor %}
+{% if has_more %}
+  {# Infinite scroll sentinel #}
+  {% set entries_url = url_for('all_events.entries_fragment', page=page + 1, view=view if view != 'list' else '')|host %}
+  <div
+    id="sentinel-{{ page }}"
+    class="h-4 opacity-0 pointer-events-none"
+    hx-get="{{ entries_url }}"
+    hx-trigger="intersect once delay:250ms"
+    hx-swap="outerHTML"
+    role="status"
+    aria-hidden="true"
+  >
+    <div class="text-center text-xs text-stone-400">loading...</div>
+  </div>
+{% endif %}
diff --git a/templates/_types/all_events/_main_panel.html b/templates/_types/all_events/_main_panel.html
new file mode 100644
index 0000000..0130973
--- /dev/null
+++ b/templates/_types/all_events/_main_panel.html
@@ -0,0 +1,54 @@
+{# View toggle bar - desktop only #}
+<div class="hidden md:flex justify-end px-3 pt-3 gap-1">
+  {% set list_href = (current_local_href ~ {'view': None}|qs)|host %}
+  {% set tile_href = (current_local_href ~ {'view': 'tile'}|qs)|host %}
+  <a
+    href="{{ list_href }}"
+    hx-get="{{ list_href }}"
+    hx-target="#main-panel"
+    hx-select="{{hx_select_search}}"
+    hx-swap="outerHTML"
+    hx-push-url="true"
+    class="p-1.5 rounded {{ 'bg-stone-200 text-stone-800' if view != 'tile' else 'text-stone-400 hover:text-stone-600' }}"
+    title="List view"
+    _="on click js localStorage.removeItem('events_view') end"
+  >
+    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+      <path stroke-linecap="round" stroke-linejoin="round" d="M4 6h16M4 12h16M4 18h16" />
+    </svg>
+  </a>
+  <a
+    href="{{ tile_href }}"
+    hx-get="{{ tile_href }}"
+    hx-target="#main-panel"
+    hx-select="{{hx_select_search}}"
+    hx-swap="outerHTML"
+    hx-push-url="true"
+    class="p-1.5 rounded {{ 'bg-stone-200 text-stone-800' if view == 'tile' else 'text-stone-400 hover:text-stone-600' }}"
+    title="Tile view"
+    _="on click js localStorage.setItem('events_view','tile') end"
+  >
+    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+      <path stroke-linecap="round" stroke-linejoin="round" d="M4 5a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM14 5a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V5zM4 15a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H5a1 1 0 01-1-1v-4zM14 15a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1v-4z" />
+    </svg>
+  </a>
+</div>
+
+{# Cards container - list or grid based on view #}
+{% if entries %}
+  {% if view == 'tile' %}
+    <div class="max-w-full px-3 py-3 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
+      {% include "_types/all_events/_cards.html" %}
+    </div>
+  {% else %}
+    <div class="max-w-full px-3 py-3 space-y-3">
+      {% include "_types/all_events/_cards.html" %}
+    </div>
+  {% endif %}
+{% else %}
+  <div class="px-3 py-12 text-center text-stone-400">
+    <i class="fa fa-calendar-xmark text-4xl mb-3" aria-hidden="true"></i>
+    <p class="text-lg">No upcoming events</p>
+  </div>
+{% endif %}
+<div class="pb-8"></div>
diff --git a/templates/_types/all_events/index.html b/templates/_types/all_events/index.html
new file mode 100644
index 0000000..00a9696
--- /dev/null
+++ b/templates/_types/all_events/index.html
@@ -0,0 +1,7 @@
+{% extends '_types/root/_index.html' %}
+
+{% block meta %}{% endblock %}
+
+{% block content %}
+  {% include '_types/all_events/_main_panel.html' %}
+{% endblock %}