Add cart + auth fragment pre-fetching to blog context
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m1s
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m1s
Phase 2 of fragment composition: blog_context() now concurrently fetches cart-mini and auth-menu HTML fragments from cart and account apps via fetch_fragments(). Updates shared submodule. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
19
app.py
19
app.py
@@ -25,11 +25,13 @@ async def blog_context() -> dict:
|
|||||||
|
|
||||||
- menu_items: via shared.services.navigation
|
- menu_items: via shared.services.navigation
|
||||||
- cart_count/cart_total: via cart service (shared DB)
|
- cart_count/cart_total: via cart service (shared DB)
|
||||||
|
- cart_mini_html / auth_menu_html: pre-fetched fragments
|
||||||
"""
|
"""
|
||||||
from shared.infrastructure.context import base_context
|
from shared.infrastructure.context import base_context
|
||||||
from shared.services.navigation import get_navigation_tree
|
from shared.services.navigation import get_navigation_tree
|
||||||
from shared.services.registry import services
|
from shared.services.registry import services
|
||||||
from shared.infrastructure.cart_identity import current_cart_identity
|
from shared.infrastructure.cart_identity import current_cart_identity
|
||||||
|
from shared.infrastructure.fragments import fetch_fragments
|
||||||
|
|
||||||
ctx = await base_context()
|
ctx = await base_context()
|
||||||
|
|
||||||
@@ -43,6 +45,23 @@ async def blog_context() -> dict:
|
|||||||
ctx["cart_count"] = summary.count + summary.calendar_count + summary.ticket_count
|
ctx["cart_count"] = summary.count + summary.calendar_count + summary.ticket_count
|
||||||
ctx["cart_total"] = float(summary.total + summary.calendar_total + summary.ticket_total)
|
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"]
|
||||||
|
|
||||||
|
auth_params = {"email": user.email} if user else {}
|
||||||
|
|
||||||
|
cart_mini_html, auth_menu_html = await fetch_fragments([
|
||||||
|
("cart", "cart-mini", cart_params or None),
|
||||||
|
("account", "auth-menu", auth_params or None),
|
||||||
|
])
|
||||||
|
ctx["cart_mini_html"] = cart_mini_html
|
||||||
|
ctx["auth_menu_html"] = auth_menu_html
|
||||||
|
|
||||||
return ctx
|
return ctx
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
shared
2
shared
Submodule shared updated: b882770828...2a9dfaa749
54
templates/_types/root/header/_header.html
Normal file
54
templates/_types/root/header/_header.html
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
{% set select_colours = "
|
||||||
|
[.hover-capable_&]:hover:bg-yellow-300
|
||||||
|
aria-selected:bg-stone-500 aria-selected:text-white
|
||||||
|
[.hover-capable_&[aria-selected=true]:hover]:bg-orange-500
|
||||||
|
"%}
|
||||||
|
{% import 'macros/links.html' as links %}
|
||||||
|
|
||||||
|
{% macro header_row(oob=False) %}
|
||||||
|
{% call links.menu_row(id='root-row', oob=oob) %}
|
||||||
|
<div class="w-full flex flex-row items-top">
|
||||||
|
{# Cart mini — fetched from cart app as fragment #}
|
||||||
|
{% if cart_mini_html %}
|
||||||
|
{{ cart_mini_html | safe }}
|
||||||
|
{% else %}
|
||||||
|
{% from '_types/cart/_mini.html' import mini with context %}
|
||||||
|
{{mini()}}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{# Site title #}
|
||||||
|
<div class="font-bold text-5xl flex-1">
|
||||||
|
{% from 'macros/title.html' import title with context %}
|
||||||
|
{{ title('flex justify-center md:justify-start')}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{# Desktop nav #}
|
||||||
|
<nav class="hidden md:flex gap-4 text-sm ml-2 justify-end items-center flex-0">
|
||||||
|
{% include '_types/root/_nav.html' %}
|
||||||
|
{# Auth menu — fetched from account app as fragment #}
|
||||||
|
{% if auth_menu_html %}
|
||||||
|
{{ auth_menu_html | safe }}
|
||||||
|
{% else %}
|
||||||
|
{% if not g.user %}
|
||||||
|
{% include '_types/root/_sign_in.html' %}
|
||||||
|
{% else %}
|
||||||
|
{% include '_types/root/_full_user.html' %}
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
{% include "_types/root/_nav_panel.html"%}
|
||||||
|
</nav>
|
||||||
|
{% include '_types/root/_hamburger.html' %}
|
||||||
|
</div>
|
||||||
|
{% endcall %}
|
||||||
|
{# Mobile user info #}
|
||||||
|
<div class="block md:hidden text-md font-bold">
|
||||||
|
{# Auth menu mobile — part of auth-menu fragment (id=auth-menu-mobile) #}
|
||||||
|
{% if not auth_menu_html %}
|
||||||
|
{% if g.user %}
|
||||||
|
{% include '_types/root/mobile/_full_user.html' %}
|
||||||
|
{% else %}
|
||||||
|
{% include '_types/root/mobile/_sign_in.html' %}
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endmacro %}
|
||||||
Reference in New Issue
Block a user