- <.skip_link />
-
- <%= if @theme_settings.announcement_bar do %>
- <.announcement_bar theme_settings={@theme_settings} />
- <% end %>
-
- <.shop_header
- theme_settings={@theme_settings}
- logo_image={@logo_image}
- header_image={@header_image}
- active_page="about"
- mode={@mode}
- cart_count={@cart_count}
- />
-
-
- <.hero_section
- title="About the studio"
- description="Your story goes here – this is sample content for the demo shop"
- background={:sunken}
- />
-
- <.content_body
- image_src="/mockups/night-sky-blanket-3"
- image_alt="Night sky blanket draped over a chair"
- >
- <.rich_text blocks={SimpleshopTheme.Theme.PreviewData.about_content()} />
-
-
-
- <.shop_footer theme_settings={@theme_settings} mode={@mode} />
-
- <.cart_drawer
- cart_items={@cart_items}
- subtotal={@cart_subtotal}
- cart_count={@cart_count}
- mode={@mode}
- open={assigns[:cart_drawer_open] || false}
- cart_status={assigns[:cart_status]}
- />
-
- <.search_modal hint_text={~s(Try a search – e.g. "mountain" or "notebook")} />
-
- <.mobile_bottom_nav active_page="about" mode={@mode} />
-
diff --git a/lib/simpleshop_theme_web/components/page_templates/content.html.heex b/lib/simpleshop_theme_web/components/page_templates/content.html.heex
new file mode 100644
index 0000000..41c0af2
--- /dev/null
+++ b/lib/simpleshop_theme_web/components/page_templates/content.html.heex
@@ -0,0 +1,71 @@
+
@@ -4205,6 +4225,16 @@ defmodule SimpleshopThemeWeb.ShopComponents do
"""
end
+ defp rich_text_block(%{block: %{type: :list}} = assigns) do
+ ~H"""
+
+ <%= for item <- @block.items do %>
+ - {item}
+ <% end %>
+
+ """
+ end
+
defp rich_text_block(assigns) do
~H"""
diff --git a/lib/simpleshop_theme_web/live/shop_live/about.ex b/lib/simpleshop_theme_web/live/shop_live/about.ex
deleted file mode 100644
index a35839f..0000000
--- a/lib/simpleshop_theme_web/live/shop_live/about.ex
+++ /dev/null
@@ -1,54 +0,0 @@
-defmodule SimpleshopThemeWeb.ShopLive.About do
- use SimpleshopThemeWeb, :live_view
-
- alias SimpleshopTheme.Settings
- alias SimpleshopTheme.Media
- alias SimpleshopTheme.Theme.{CSSCache, CSSGenerator}
-
- @impl true
- def mount(_params, _session, socket) do
- theme_settings = Settings.get_theme_settings()
-
- generated_css =
- case CSSCache.get() do
- {:ok, css} ->
- css
-
- :miss ->
- css = CSSGenerator.generate(theme_settings)
- CSSCache.put(css)
- css
- end
-
- logo_image = Media.get_logo()
- header_image = Media.get_header()
-
- socket =
- socket
- |> assign(:page_title, "About")
- |> assign(:theme_settings, theme_settings)
- |> assign(:generated_css, generated_css)
- |> assign(:logo_image, logo_image)
- |> assign(:header_image, header_image)
- |> assign(:mode, :shop)
-
- {:ok, socket}
- end
-
- @impl true
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/simpleshop_theme_web/live/shop_live/content.ex b/lib/simpleshop_theme_web/live/shop_live/content.ex
new file mode 100644
index 0000000..65e71ea
--- /dev/null
+++ b/lib/simpleshop_theme_web/live/shop_live/content.ex
@@ -0,0 +1,88 @@
+defmodule SimpleshopThemeWeb.ShopLive.Content do
+ use SimpleshopThemeWeb, :live_view
+
+ alias SimpleshopTheme.{Settings, Media}
+ alias SimpleshopTheme.Theme.{CSSCache, CSSGenerator, PreviewData}
+
+ @impl true
+ def mount(_params, _session, socket) do
+ theme_settings = Settings.get_theme_settings()
+
+ generated_css =
+ case CSSCache.get() do
+ {:ok, css} ->
+ css
+
+ :miss ->
+ css = CSSGenerator.generate(theme_settings)
+ CSSCache.put(css)
+ css
+ end
+
+ socket =
+ socket
+ |> assign(:theme_settings, theme_settings)
+ |> assign(:generated_css, generated_css)
+ |> assign(:logo_image, Media.get_logo())
+ |> assign(:header_image, Media.get_header())
+ |> assign(:mode, :shop)
+
+ {:ok, socket}
+ end
+
+ @impl true
+ def handle_params(_params, _uri, socket) do
+ config = page_config(socket.assigns.live_action)
+ {:noreply, assign(socket, config)}
+ end
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+
+ """
+ end
+
+ defp page_config(:about) do
+ %{
+ page_title: "About",
+ active_page: "about",
+ hero_title: "About the studio",
+ hero_description: "Your story goes here – this is sample content for the demo shop",
+ hero_background: :sunken,
+ image_src: "/mockups/night-sky-blanket-3",
+ image_alt: "Night sky blanket draped over a chair",
+ content_blocks: PreviewData.about_content()
+ }
+ end
+
+ defp page_config(:delivery) do
+ %{
+ page_title: "Delivery & returns",
+ active_page: "delivery",
+ hero_title: "Delivery & returns",
+ hero_description: "Everything you need to know about shipping and returns",
+ content_blocks: PreviewData.delivery_content()
+ }
+ end
+
+ defp page_config(:privacy) do
+ %{
+ page_title: "Privacy policy",
+ active_page: "privacy",
+ hero_title: "Privacy policy",
+ hero_description: "How we handle your personal information",
+ content_blocks: PreviewData.privacy_content()
+ }
+ end
+
+ defp page_config(:terms) do
+ %{
+ page_title: "Terms of service",
+ active_page: "terms",
+ hero_title: "Terms of service",
+ hero_description: "The legal bits",
+ content_blocks: PreviewData.terms_content()
+ }
+ end
+end
diff --git a/lib/simpleshop_theme_web/live/theme_live/index.ex b/lib/simpleshop_theme_web/live/theme_live/index.ex
index cbf710d..01dbcff 100644
--- a/lib/simpleshop_theme_web/live/theme_live/index.ex
+++ b/lib/simpleshop_theme_web/live/theme_live/index.ex
@@ -431,11 +431,75 @@ defmodule SimpleshopThemeWeb.ThemeLive.Index do
defp preview_page(%{page: :about} = assigns) do
~H"""
-
+ """
+ end
+
+ defp preview_page(%{page: :delivery} = assigns) do
+ ~H"""
+
+ """
+ end
+
+ defp preview_page(%{page: :privacy} = assigns) do
+ ~H"""
+
+ """
+ end
+
+ defp preview_page(%{page: :terms} = assigns) do
+ ~H"""
+
diff --git a/lib/simpleshop_theme_web/router.ex b/lib/simpleshop_theme_web/router.ex
index 7b96870..7640b2b 100644
--- a/lib/simpleshop_theme_web/router.ex
+++ b/lib/simpleshop_theme_web/router.ex
@@ -34,7 +34,10 @@ defmodule SimpleshopThemeWeb.Router do
layout: {SimpleshopThemeWeb.Layouts, :shop},
on_mount: [{SimpleshopThemeWeb.CartHook, :mount_cart}] do
live "/", ShopLive.Home, :index
- live "/about", ShopLive.About, :index
+ live "/about", ShopLive.Content, :about
+ live "/delivery", ShopLive.Content, :delivery
+ live "/privacy", ShopLive.Content, :privacy
+ live "/terms", ShopLive.Content, :terms
live "/contact", ShopLive.Contact, :index
live "/collections/:slug", ShopLive.Collection, :show
live "/products/:id", ShopLive.ProductShow, :show
diff --git a/test/simpleshop_theme_web/live/shop_live/content_test.exs b/test/simpleshop_theme_web/live/shop_live/content_test.exs
new file mode 100644
index 0000000..984a5fb
--- /dev/null
+++ b/test/simpleshop_theme_web/live/shop_live/content_test.exs
@@ -0,0 +1,89 @@
+defmodule SimpleshopThemeWeb.ShopLive.ContentTest do
+ use SimpleshopThemeWeb.ConnCase, async: false
+
+ import Phoenix.LiveViewTest
+
+ describe "About page" do
+ test "renders about page", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/about")
+
+ assert html =~ "About the studio"
+ assert html =~ "sample about page"
+ end
+
+ test "displays about image", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/about")
+
+ assert html =~ "night-sky-blanket"
+ end
+ end
+
+ describe "Delivery page" do
+ test "renders delivery page", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/delivery")
+
+ assert html =~ "Delivery & returns"
+ assert html =~ "shipping and returns"
+ end
+
+ test "displays delivery content", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/delivery")
+
+ assert html =~ "Shipping"
+ assert html =~ "Returns & exchanges"
+ assert html =~ "Cancellations"
+ end
+
+ test "displays list items", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/delivery")
+
+ assert html =~ "United Kingdom"
+ assert html =~ "5–8 business days"
+ end
+ end
+
+ describe "Privacy page" do
+ test "renders privacy page", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/privacy")
+
+ assert html =~ "Privacy policy"
+ assert html =~ "personal information"
+ end
+
+ test "displays privacy content", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/privacy")
+
+ assert html =~ "What we collect"
+ assert html =~ "Cookies"
+ assert html =~ "Your rights"
+ end
+ end
+
+ describe "Terms page" do
+ test "renders terms page", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/terms")
+
+ assert html =~ "Terms of service"
+ assert html =~ "The legal bits"
+ end
+
+ test "displays terms content", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/terms")
+
+ assert html =~ "Products"
+ assert html =~ "Orders & payment"
+ assert html =~ "Intellectual property"
+ end
+ end
+
+ describe "Footer links" do
+ test "footer contains policy page links", %{conn: conn} do
+ {:ok, _view, html} = live(conn, ~p"/about")
+
+ assert html =~ ~s(href="/delivery")
+ assert html =~ ~s(href="/privacy")
+ assert html =~ ~s(href="/terms")
+ assert html =~ ~s(href="/contact")
+ end
+ end
+end