jamey/berrypod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

wire simple pages to PageRenderer (stage 3)

Browse Source 
Home, Content (about/delivery/privacy/terms), Contact, and ErrorHTML
now render through the generic PageRenderer instead of hardcoded
templates. Block wrapper divs enable CSS grid targeting. Featured
products block supports layout/card_variant/columns settings for
different page contexts. Contact page uses CSS grid on data-block-type
attributes for two-column layout.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
jamey
2026-02-26 18:29:20 +00:00
parent ca9f32fa42
commit c69e51051f
12 changed files with 147 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/berrypod_web/controllers/error_html.ex
View File

@@ -6,6 +6,8 @@ defmodule BerrypodWeb.ErrorHTML do
"""
use BerrypodWeb, :html
alias Berrypod.Pages
alias Berrypod.Pages.Defaults
alias Berrypod.Settings
alias Berrypod.Settings.ThemeSettings
alias Berrypod.Media
@@ -76,22 +78,26 @@ defmodule BerrypodWeb.ErrorHTML do
{theme_settings, generated_css} = load_theme_data()
logo_image = safe_load(&Media.get_logo/0)
header_image = safe_load(&Media.get_header/0)
products = safe_load(fn -> Products.list_visible_products(limit: 4) end) || []
categories = safe_load(fn -> Products.list_categories() end) || []
page = safe_load(fn -> Pages.get_page("error") end) || Defaults.for_slug("error")
assigns =
assigns
|> Map.put(:theme_settings, theme_settings)
|> Map.put(:generated_css, generated_css)
|> Map.put(:logo_image, logo_image)
|> Map.put(:header_image, header_image)
|> Map.put(:products, products)
|> Map.put(:categories, categories)
|> Map.put(:mode, :shop)
|> Map.put(:cart_items, [])
|> Map.put(:cart_count, 0)
|> Map.put(:cart_subtotal, "£0.00")
|> Map.put(:page, page)
# Load block data (e.g. products for featured_products block)
extra = safe_load(fn -> Pages.load_block_data(page.blocks, assigns) end) || %{}
assigns = Map.merge(assigns, extra)
~H"""
<!DOCTYPE html>
@@ -118,20 +124,7 @@ defmodule BerrypodWeb.ErrorHTML do
data-layout={@theme_settings.layout_width}
data-shadow={@theme_settings.card_shadow}
>
<BerrypodWeb.PageTemplates.error
theme_settings={@theme_settings}
logo_image={@logo_image}
header_image={@header_image}
products={@products}
categories={@categories}
error_code={@error_code}
error_title={@error_title}
error_description={@error_description}
mode={@mode}
cart_items={@cart_items}
cart_count={@cart_count}
cart_subtotal={@cart_subtotal}
/>
<BerrypodWeb.PageRenderer.render_page {assigns} />
</div>
</body>
</html>