art-dag/mono
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'worktree-macros-essays' into macros

Browse Source
This commit is contained in:
giles
2026-03-04 16:14:29 +00:00
parent 9a9999d2e1 03d7b29745
commit 992a9e1731
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
events/sxc/pages/__init__.py
View File

@@ -26,8 +26,9 @@ def _load_events_page_files() -> None:
import os import os
from shared.sx.pages import load_page_dir from shared.sx.pages import load_page_dir
from shared.sx.jinja_bridge import load_service_components from shared.sx.jinja_bridge import load_service_components
base = os.path.dirname(os.path.dirname(__file__)) sxc_dir = os.path.dirname(os.path.dirname(__file__)) # events/sxc/
load_service_components(base, service_name="events") service_root = os.path.dirname(sxc_dir) # events/
load_service_components(service_root, service_name="events")
load_page_dir(os.path.dirname(__file__), "events") load_page_dir(os.path.dirname(__file__), "events")

7
market/sxc/pages/__init__.py
View File

@@ -26,8 +26,9 @@ def _load_market_page_files() -> None:
import os import os
from shared.sx.pages import load_page_dir from shared.sx.pages import load_page_dir
from shared.sx.jinja_bridge import load_service_components from shared.sx.jinja_bridge import load_service_components
base = os.path.dirname(os.path.dirname(__file__)) sxc_dir = os.path.dirname(os.path.dirname(__file__)) # market/sxc/
load_service_components(base, service_name="market") service_root = os.path.dirname(sxc_dir) # market/
load_service_components(service_root, service_name="market")
load_page_dir(os.path.dirname(__file__), "market") load_page_dir(os.path.dirname(__file__), "market")
@@ -163,7 +164,7 @@ async def _desktop_category_nav_sx(ctx: dict, categories: dict, qs: str,
admin_sx = "" admin_sx = ""
if rights and rights.get("admin"): if rights and rights.get("admin"):
admin_href = prefix + url_for("market.admin.defpage_market_admin") admin_href = prefix + url_for("defpage_market_admin")
admin_sx = await render_to_sx("market-admin-link", href=admin_href, hx_select=hx_select) admin_sx = await render_to_sx("market-admin-link", href=admin_href, hx_select=hx_select)
return await render_to_sx("market-desktop-category-nav", return await render_to_sx("market-desktop-category-nav",

6
sx/sxc/pages/__init__.py
View File

@@ -22,9 +22,9 @@ def _load_sx_page_files() -> None:
"""Load defpage definitions from sx/sxc/pages/*.sx.""" """Load defpage definitions from sx/sxc/pages/*.sx."""
from shared.sx.pages import load_page_dir from shared.sx.pages import load_page_dir
from shared.sx.jinja_bridge import load_service_components from shared.sx.jinja_bridge import load_service_components
base = os.path.dirname(os.path.dirname(__file__)) _sxc_dir = os.path.dirname(os.path.dirname(__file__)) # sx/sxc/
load_service_components(base, service_name="sx") service_root = os.path.dirname(_sxc_dir) # sx/
_sxc_dir = os.path.dirname(os.path.dirname(__file__)) load_service_components(service_root, service_name="sx")
load_sx_dir(_sxc_dir) load_sx_dir(_sxc_dir)
watch_sx_dir(_sxc_dir) watch_sx_dir(_sxc_dir)
load_page_dir(os.path.dirname(__file__), "sx") load_page_dir(os.path.dirname(__file__), "sx")