diff --git a/bp/market/routes.py b/bp/market/routes.py index 8f928a8..561d770 100644 --- a/bp/market/routes.py +++ b/bp/market/routes.py @@ -25,7 +25,7 @@ def register(url_prefix, title): market = getattr(g, "market", None) market_id = market.id if market else None return { - "coop_title": title, + "coop_title": market.name if market else title, "categories": (await get_nav(g.s, market_id=market_id))["cats"], "qs": makeqs_factory()(), "market": market, diff --git a/bp/product/routes.py b/bp/product/routes.py index b20df96..0ae0014 100644 --- a/bp/product/routes.py +++ b/bp/product/routes.py @@ -157,7 +157,7 @@ def register(): from models.market import CartItem from quart import request, url_for - @bp.post("/cart") + @bp.post("/cart/") @clear_cache(tag="browse", tag_scope="user") async def cart(slug: str): # make sure product exists (we *allow* deleted_at != None later if you want) diff --git a/shared_lib b/shared_lib index 0c9b8d6..37ceb37 160000 --- a/shared_lib +++ b/shared_lib @@ -1 +1 @@ -Subproject commit 0c9b8d6aa2b8f48c30091e0ab57170eb52040cc9 +Subproject commit 37ceb37b82d0f5285b6240f1152ed10d1dbfe35d diff --git a/templates/_types/browse/_oob_elements.html b/templates/_types/browse/_oob_elements.html index d32fd78..dac5626 100644 --- a/templates/_types/browse/_oob_elements.html +++ b/templates/_types/browse/_oob_elements.html @@ -11,9 +11,9 @@ {% block oobs %} {% from '_types/root/_n/macros.html' import oob_header with context %} - {{oob_header('root-header-child', 'market-header-child', '_types/market/header/_header.html')}} + {{oob_header('post-header-child', 'market-header-child', '_types/market/header/_header.html')}} - {% from '_types/root/header/_header.html' import header_row with context %} + {% from '_types/post/header/_header.html' import header_row with context %} {{ header_row(oob=True) }} {% endblock %} diff --git a/templates/_types/market/_oob_elements.html b/templates/_types/market/_oob_elements.html index b37eea0..075c166 100644 --- a/templates/_types/market/_oob_elements.html +++ b/templates/_types/market/_oob_elements.html @@ -11,9 +11,9 @@ {% block oobs %} {% from '_types/root/_n/macros.html' import oob_header with context %} - {{oob_header('root-header-child', 'market-header-child', '_types/market/header/_header.html')}} + {{oob_header('post-header-child', 'market-header-child', '_types/market/header/_header.html')}} - {% from '_types/root/header/_header.html' import header_row with context %} + {% from '_types/post/header/_header.html' import header_row with context %} {{ header_row(oob=True) }} {% endblock %} diff --git a/templates/_types/market/index.html b/templates/_types/market/index.html index df1ec4c..4da7f68 100644 --- a/templates/_types/market/index.html +++ b/templates/_types/market/index.html @@ -3,9 +3,11 @@ {% block root_header_child %} {% from '_types/root/_n/macros.html' import index_row with context %} - {% call index_row('market-header-child', '_types/market/header/_header.html') %} - {% block market_header_child %} - {% endblock %} + {% call index_row('post-header-child', '_types/post/header/_header.html') %} + {% call index_row('market-header-child', '_types/market/header/_header.html') %} + {% block market_header_child %} + {% endblock %} + {% endcall %} {% endcall %} {% endblock %} diff --git a/templates/_types/product/_cart.html b/templates/_types/product/_cart.html index dfdb6c1..0351de7 100644 --- a/templates/_types/product/_cart.html +++ b/templates/_types/product/_cart.html @@ -7,9 +7,9 @@ {% if not quantity %}