diff --git a/PROGRESS.md b/PROGRESS.md index 0cca7c7..f95ade7 100644 --- a/PROGRESS.md +++ b/PROGRESS.md @@ -458,7 +458,7 @@ See: [plan](docs/plans/shipping-sync.md) for implementation details See: [docs/plans/analytics-v2.md](docs/plans/analytics-v2.md) for v2 plan ### Page Editor -**Status:** In progress — Stage 4 of 9 complete, 1284 tests +**Status:** In progress — Stage 5 of 9 complete, 1284 tests Database-driven page builder. Every page is a flat list of blocks stored as JSON — add, remove, reorder, and edit blocks on any page. One generic renderer for all pages (no page-specific render functions). Portable blocks (hero, featured_products, image_text, etc.) work on any page. Page-specific blocks (product_hero, cart_items, etc.) are restricted to their native page. Block data loaders dynamically load data based on which blocks are on the page. ETS-cached page definitions. Mobile-first admin editor with live preview, undo/redo, accessible reordering (no drag-and-drop), inline settings forms, and "reset to defaults". CSS-driven page layout (not renderer-driven). @@ -467,8 +467,8 @@ Database-driven page builder. Every page is a flat list of blocks stored as JSON 2. ~~Page renderer — generic renderer tested in isolation~~ ✅ (`32f54c7`) 3. ~~Wire simple pages — Home, Content (x4), Contact, Error~~ ✅ 4. ~~Wire shop pages — Collection, PDP, Cart, Search~~ ✅ -5. **Next →** Wire order pages + theme preview — CheckoutSuccess, Orders, OrderDetail, theme editor -6. Admin editor — page list + block management (reorder, add, remove, duplicate, save) +5. ~~Wire order pages + theme preview — CheckoutSuccess, Orders, OrderDetail, theme editor~~ ✅ +6. **Next →** Admin editor — page list + block management (reorder, add, remove, duplicate, save) 7. Admin editor — inline block settings editing 8. Live preview — split layout with real-time preview 9. Undo/redo + polish — history stacks, keyboard shortcuts, animations diff --git a/docs/plans/page-builder.md b/docs/plans/page-builder.md index a944d7d..78251a8 100644 --- a/docs/plans/page-builder.md +++ b/docs/plans/page-builder.md @@ -1,6 +1,6 @@ # Page builder plan -Status: In progress (Stage 4 complete) +Status: In progress (Stage 5 complete) ## Context @@ -651,21 +651,17 @@ Each stage is a commit point. Tests pass, all pages work, nothing is broken. Pic --- -### Stage 5: Wire up order pages + theme preview +### Stage 5: Wire up order pages + theme preview ✅ -**Goal:** remaining pages switch over. Theme editor uses PageRenderer. All old page templates are now unused. +**Status:** Complete -- [ ] Update `Shop.CheckoutSuccess` — `Pages.get_page("checkout_success")`, keep PubSub subscription -- [ ] Update `Shop.Orders` — `Pages.get_page("orders")` -- [ ] Update `Shop.OrderDetail` — `Pages.get_page("order_detail")` -- [ ] Update theme editor — replace 10 `preview_page/1` clauses with `Pages.get_page(slug)` + `load_block_data/2` + PageRenderer -- [ ] Verify theme preview still works: page switching, CSS injection, mode: :preview -- [ ] Remove old page templates (the `.heex` files) if no longer referenced -- [ ] Move `layout_assigns/1` and any shared helpers to PageRenderer or a shared module - -**Commit:** `wire order pages and theme preview to page renderer, remove old templates` - -**Verify:** `mix test` passes, theme editor preview works for all 10 pages, checkout flow works end to end +- [x] Update `Shop.CheckoutSuccess` — `Pages.get_page("checkout_success")`, keep PubSub subscription +- [x] Update `Shop.Orders` — `Pages.get_page("orders")` +- [x] Update `Shop.OrderDetail` — `Pages.get_page("order_detail")` +- [x] Update theme editor — unified `preview_page/1` with `Pages.get_page(slug)` + `load_block_data/2` + PageRenderer (10 clauses → 1 + page-context helpers) +- [x] Removed `PageTemplates` module + 10 `.heex` template files (zero references remain) +- [x] `layout_assigns/1` already lives in `ShopComponents.Layout` — no move needed +- [x] 1284 tests pass, `mix precommit` clean --- diff --git a/lib/berrypod_web/components/page_templates.ex b/lib/berrypod_web/components/page_templates.ex index 2b75b27..e69de29 100644 --- a/lib/berrypod_web/components/page_templates.ex +++ b/lib/berrypod_web/components/page_templates.ex @@ -1,30 +0,0 @@ -defmodule BerrypodWeb.PageTemplates do - @moduledoc """ - Shared page templates used by both the public shop and theme preview. - - These templates accept a `mode` parameter to control navigation behavior: - - `:shop` - Links navigate normally (real shop pages) - - `:preview` - Links send events to parent LiveView (theme editor) - - All templates expect these common assigns: - - `theme_settings` - Current theme configuration - - `logo_image` - Logo image struct or nil - - `header_image` - Header image struct or nil - - `mode` - `:shop` or `:preview` - - `cart_items` - List of cart items (can be empty) - - `cart_count` - Number of items in cart - """ - use Phoenix.Component - use BerrypodWeb.ShopComponents - - embed_templates "page_templates/*" - - def format_order_status("unfulfilled"), do: "Being prepared" - def format_order_status("submitted"), do: "Sent to printer" - def format_order_status("processing"), do: "In production" - def format_order_status("shipped"), do: "On its way" - def format_order_status("delivered"), do: "Delivered" - def format_order_status("failed"), do: "Issue — contact us" - def format_order_status("cancelled"), do: "Cancelled" - def format_order_status(status), do: status -end diff --git a/lib/berrypod_web/components/page_templates/cart.html.heex b/lib/berrypod_web/components/page_templates/cart.html.heex deleted file mode 100644 index 8f01965..0000000 --- a/lib/berrypod_web/components/page_templates/cart.html.heex +++ /dev/null @@ -1,37 +0,0 @@ -<.shop_layout {layout_assigns(assigns)} active_page="cart"> -
- <.page_title text="Your basket" /> - - <%= if @cart_items == [] do %> - <.cart_empty_state mode={@mode} /> - <% else %> -
-
-
    - <%= for item <- @cart_items do %> -
  • - <.shop_card class="cart-page-card"> - <.cart_item_row item={item} size={:default} show_quantity_controls mode={@mode} /> - -
    • - <% end %> -
-
- -
- <.order_summary - subtotal={@cart_page_subtotal} - shipping_estimate={assigns[:shipping_estimate]} - country_code={assigns[:country_code] || "GB"} - available_countries={assigns[:available_countries] || []} - mode={@mode} - /> -
-
- <% end %> -
- diff --git a/lib/berrypod_web/components/page_templates/checkout_success.html.heex b/lib/berrypod_web/components/page_templates/checkout_success.html.heex deleted file mode 100644 index 741c0d0..0000000 --- a/lib/berrypod_web/components/page_templates/checkout_success.html.heex +++ /dev/null @@ -1,134 +0,0 @@ -<.shop_layout {layout_assigns(assigns)} active_page="checkout"> -
- <%= if @order && @order.payment_status == "paid" do %> -
-
- - - -
- -

- Thank you for your order -

- -

- Order {@order.order_number} -

- - <%= if @order.customer_email do %> -

- A confirmation will be sent to {@order.customer_email} -

- <% end %> -
- - <.shop_card class="checkout-card"> -

- Order details -

- - - -
-
- Total - - {Berrypod.Cart.format_price(@order.total)} - -
-
- - - <%= if @order.shipping_address != %{} do %> - <.shop_card class="checkout-card"> -

- Shipping to -

-
-

{@order.shipping_address["name"]}

-

{@order.shipping_address["line1"]}

- <%= if @order.shipping_address["line2"] do %> -

{@order.shipping_address["line2"]}

- <% end %> -

- {@order.shipping_address["city"]}, {@order.shipping_address["postal_code"]} -

-

{@order.shipping_address["country"]}

-
- - <% end %> - -
- <.shop_link_button href="/collections/all" class="checkout-cta"> - Continue shopping - -
- <% else %> - <%!-- Payment pending or order not found --%> -
-
- -
- -

- Processing your payment -

- -

- Please wait while we confirm your payment. This usually takes a few seconds. -

- -

- If this page doesn't update, please <.link - navigate="/contact" - class="checkout-contact-link" - >contact us. -

-
- <% end %> -
- diff --git a/lib/berrypod_web/components/page_templates/collection.html.heex b/lib/berrypod_web/components/page_templates/collection.html.heex deleted file mode 100644 index 3d3ebc7..0000000 --- a/lib/berrypod_web/components/page_templates/collection.html.heex +++ /dev/null @@ -1,21 +0,0 @@ -<.shop_layout {layout_assigns(assigns)} active_page="collection"> -
- <.collection_header title="All Products" product_count={length(assigns[:products] || [])} /> - -
- <.filter_bar categories={assigns[:categories] || []} /> - - <.product_grid theme_settings={@theme_settings}> - <%= for product <- assigns[:products] || [] do %> - <.product_card - product={product} - theme_settings={@theme_settings} - mode={@mode} - variant={:default} - show_category={true} - /> - <% end %> - -
-
- diff --git a/lib/berrypod_web/components/page_templates/contact.html.heex b/lib/berrypod_web/components/page_templates/contact.html.heex deleted file mode 100644 index 9fb2ffa..0000000 --- a/lib/berrypod_web/components/page_templates/contact.html.heex +++ /dev/null @@ -1,30 +0,0 @@ -<.shop_layout {layout_assigns(assigns)} active_page="contact"> -
- <.hero_section - variant={:page} - title="Get in touch" - description="Sample contact page for the demo store. Add your own message here – something friendly about how customers can reach you." - /> - -
- <.contact_form email="hello@example.com" /> - -
- <.order_tracking_card tracking_state={assigns[:tracking_state] || :idle} /> - - <.info_card - title="Handy to know" - items={[ - %{label: "Printing", value: "Example: 2-5 business days"}, - %{label: "Delivery", value: "Example: 3-7 business days after printing"}, - %{label: "Issues", value: "Example: Reprints for any defects"} - ]} - /> - - <.newsletter_card /> - - <.social_links_card /> -
-
-
- diff --git a/lib/berrypod_web/components/page_templates/content.html.heex b/lib/berrypod_web/components/page_templates/content.html.heex deleted file mode 100644 index 6f62480..0000000 --- a/lib/berrypod_web/components/page_templates/content.html.heex +++ /dev/null @@ -1,33 +0,0 @@ -<.shop_layout {layout_assigns(assigns)}> -
- <%= if assigns[:hero_background] do %> - <.hero_section - title={@hero_title} - description={@hero_description} - background={@hero_background} - /> - <% else %> - <.hero_section - variant={:page} - title={@hero_title} - description={@hero_description} - /> - <% end %> - -
- <%= if assigns[:image_src] do %> -
- <.responsive_image - src={@image_src} - source_width={1200} - alt={@image_alt} - sizes="(max-width: 800px) 100vw, 800px" - class="content-hero-image" - /> -
- <% end %> - - <.rich_text blocks={@content_blocks} /> -
-
- diff --git a/lib/berrypod_web/components/page_templates/error.html.heex b/lib/berrypod_web/components/page_templates/error.html.heex deleted file mode 100644 index 434cde8..0000000 --- a/lib/berrypod_web/components/page_templates/error.html.heex +++ /dev/null @@ -1,33 +0,0 @@ -<.shop_layout {layout_assigns(assigns)} active_page="error" error_page> -
-
- <.hero_section - variant={:error} - pre_title={@error_code} - title={@error_title} - description={@error_description} - cta_text="Go to Homepage" - cta_page="home" - cta_href="/" - secondary_cta_text="Browse Products" - secondary_cta_page="collection" - secondary_cta_href="/collections/all" - mode={@mode} - /> - - <.product_grid columns={:fixed_4}> - <%= for product <- Enum.take(assigns[:products] || [], 4) do %> - <.product_card - product={product} - theme_settings={@theme_settings} - mode={@mode} - variant={:minimal} - /> - <% end %> - -
-
- diff --git a/lib/berrypod_web/components/page_templates/home.html.heex b/lib/berrypod_web/components/page_templates/home.html.heex deleted file mode 100644 index 3e215b2..0000000 --- a/lib/berrypod_web/components/page_templates/home.html.heex +++ /dev/null @@ -1,31 +0,0 @@ -<.shop_layout {layout_assigns(assigns)} active_page="home"> -
- <.hero_section - title="Original designs, printed on demand" - description="Welcome to the Berrypod demo store. This is where your hero text goes – something short and punchy about what makes your shop worth a browse." - cta_text="Shop the collection" - cta_page="collection" - cta_href="/collections/all" - mode={@mode} - /> - - <.category_nav categories={assigns[:categories] || []} mode={@mode} /> - - <.featured_products_section - title="Featured products" - products={assigns[:products] || []} - theme_settings={@theme_settings} - mode={@mode} - /> - - <.image_text_section - title="Made with passion, printed with care" - description="This is an example content section. Use it to share your story, highlight what makes your products special, or link to your about page." - image_url="/mockups/mountain-sunrise-print-3-800.webp" - link_text="Learn more about the studio →" - link_page="about" - link_href="/about" - mode={@mode} - /> -
- diff --git a/lib/berrypod_web/components/page_templates/order_detail.html.heex b/lib/berrypod_web/components/page_templates/order_detail.html.heex deleted file mode 100644 index caf0bc9..0000000 --- a/lib/berrypod_web/components/page_templates/order_detail.html.heex +++ /dev/null @@ -1,120 +0,0 @@ -<.shop_layout {layout_assigns(assigns)} active_page="contact"> -
- <%= if @order do %> -
- <.link navigate="/orders" class="order-detail-back"> - ← Back to orders - -

{@order.order_number}

-

- {Calendar.strftime(@order.inserted_at, "%-d %B %Y")} -

- - {format_order_status(@order.fulfilment_status)} - -
- - <%= if @order.tracking_number || @order.tracking_url do %> - <.shop_card class="order-detail-tracking-card"> -
- - - -
-

Shipment tracking

- <%= if @order.tracking_number do %> -

{@order.tracking_number}

- <% end %> -
- <%= if @order.tracking_url do %> - - Track parcel - - <% end %> -
- - <% end %> - - <.shop_card class="checkout-card"> -

Items ordered

- - -
-
- Total - - {Berrypod.Cart.format_price(@order.total)} - -
-
- - - <%= if @order.shipping_address != %{} do %> - <.shop_card class="checkout-card"> -

Shipping to

-
-

{@order.shipping_address["name"]}

-

{@order.shipping_address["line1"]}

- <%= if @order.shipping_address["line2"] do %> -

{@order.shipping_address["line2"]}

- <% end %> -

- {@order.shipping_address["city"]}, {@order.shipping_address["postal_code"]} -

-

{@order.shipping_address["country"]}

-
- - <% end %> - -
- <.shop_link_button href="/collections/all"> - Continue shopping - -
- <% end %> -
- diff --git a/lib/berrypod_web/components/page_templates/orders.html.heex b/lib/berrypod_web/components/page_templates/orders.html.heex deleted file mode 100644 index e1d1b40..0000000 --- a/lib/berrypod_web/components/page_templates/orders.html.heex +++ /dev/null @@ -1,71 +0,0 @@ -<.shop_layout {layout_assigns(assigns)} active_page="contact"> -
-
-

Your orders

- - <%= if @lookup_email do %> -

- Orders for {@lookup_email} -

- <% end %> -
- - <%= cond do %> - <% is_nil(@orders) -> %> -
-

This link has expired or is invalid.

-

- Head back to the <.link navigate="/contact">contact page to request a new one. -

-
- <% @orders == [] -> %> -
-

No orders found for that email address.

-

- If something doesn't look right, <.link navigate="/contact">get in touch. -

-
- <% true -> %> -
- <%= for order <- @orders do %> - <.link navigate={"/orders/#{order.order_number}"} class="order-summary-card"> -
-
-

{order.order_number}

-

- {Calendar.strftime(order.inserted_at, "%-d %B %Y")} -

-
- - {format_order_status(order.fulfilment_status)} - -
- - - -
- - {Berrypod.Cart.format_price(order.total)} - - → -
- - <% end %> -
- <% end %> -
- diff --git a/lib/berrypod_web/components/page_templates/pdp.html.heex b/lib/berrypod_web/components/page_templates/pdp.html.heex deleted file mode 100644 index 59475c0..0000000 --- a/lib/berrypod_web/components/page_templates/pdp.html.heex +++ /dev/null @@ -1,78 +0,0 @@ -<.shop_layout {layout_assigns(assigns)} active_page="pdp"> -
- <.breadcrumb - items={ - if @product.category do - [ - %{ - label: @product.category, - page: "collection", - href: - "/collections/#{@product.category |> String.downcase() |> String.replace(" ", "-")}" - } - ] - else - [] - end ++ - [%{label: @product.title, current: true}] - } - mode={@mode} - /> - -
- <.product_gallery images={@gallery_images} product_name={@product.title} /> - -
- <.product_info product={@product} display_price={@display_price} /> - -
- - - <%!-- quantity is provided by the quantity_selector input below --%> - - <%!-- Dynamic variant selectors --%> - <%= for option_type <- @option_types do %> - <.variant_selector - option_type={option_type} - selected={@selected_options[option_type.name]} - available={@available_options[option_type.name] || []} - mode={@mode} - option_urls={(@option_urls || %{})[option_type.name] || %{}} - /> - <% end %> - - <%!-- Fallback for products with no variant options --%> -
- One size -
- - <.quantity_selector quantity={@quantity} in_stock={@product.in_stock} /> - <.add_to_cart_button mode={@mode} /> -
- <.trust_badges :if={@theme_settings.pdp_trust_badges} /> - <.product_details product={@product} /> -
-
- - <.reviews_section - :if={@theme_settings.pdp_reviews} - reviews={Berrypod.Theme.PreviewData.reviews()} - average_rating={5} - total_count={24} - /> - - <.related_products_section - :if={@theme_settings.pdp_related_products} - products={@related_products} - theme_settings={@theme_settings} - mode={@mode} - /> -
- diff --git a/lib/berrypod_web/live/admin/theme/index.ex b/lib/berrypod_web/live/admin/theme/index.ex index d11fd92..6af1512 100644 --- a/lib/berrypod_web/live/admin/theme/index.ex +++ b/lib/berrypod_web/live/admin/theme/index.ex @@ -1,7 +1,7 @@ defmodule BerrypodWeb.Admin.Theme.Index do use BerrypodWeb, :live_view - alias Berrypod.Settings + alias Berrypod.{Pages, Settings} alias Berrypod.Media alias Berrypod.Theme.{CSSGenerator, Presets, PreviewData} alias Berrypod.Workers.FaviconGeneratorWorker @@ -403,7 +403,7 @@ defmodule BerrypodWeb.Admin.Theme.Index do }) end - # Preview page component — delegates to shared PageTemplates with preview-specific assigns + # Unified preview — loads page definition, applies context, renders via PageRenderer attr :page, :atom, required: true attr :preview_data, :map, required: true attr :theme_settings, :map, required: true @@ -411,17 +411,24 @@ defmodule BerrypodWeb.Admin.Theme.Index do attr :header_image, :any, required: true attr :cart_drawer_open, :boolean, default: false - defp preview_page(%{page: :home} = assigns) do - assigns = preview_assigns(assigns) - ~H"" + defp preview_page(assigns) do + slug = to_string(assigns.page) + page = Pages.get_page(slug) + + assigns = + assigns + |> preview_assigns() + |> assign(:page, page) + |> preview_page_context(slug) + + extra = Pages.load_block_data(page.blocks, assigns) + assigns = assign(assigns, extra) + + ~H"" end - defp preview_page(%{page: :collection} = assigns) do - assigns = preview_assigns(assigns) - ~H"" - end - - defp preview_page(%{page: :pdp} = assigns) do + # Page-context data needed by specific page types in preview mode + defp preview_page_context(assigns, "pdp") do product = List.first(assigns.preview_data.products) option_types = Map.get(product, :option_types) || [] variants = Map.get(product, :variants) || [] @@ -441,23 +448,18 @@ defmodule BerrypodWeb.Admin.Theme.Index do display_price = if selected_variant, do: selected_variant.price, else: product.cheapest_price - assigns = - assigns - |> preview_assigns() - |> assign(:product, product) - |> assign(:gallery_images, build_gallery_images(product)) - |> assign(:related_products, Enum.slice(assigns.preview_data.products, 1, 4)) - |> assign(:option_types, option_types) - |> assign(:selected_options, selected_options) - |> assign(:available_options, available_options) - |> assign(:display_price, display_price) - |> assign(:quantity, 1) - |> assign(:option_urls, %{}) - - ~H"" + assigns + |> assign(:product, product) + |> assign(:gallery_images, build_gallery_images(product)) + |> assign(:option_types, option_types) + |> assign(:selected_options, selected_options) + |> assign(:available_options, available_options) + |> assign(:display_price, display_price) + |> assign(:quantity, 1) + |> assign(:option_urls, %{}) end - defp preview_page(%{page: :cart} = assigns) do + defp preview_page_context(assigns, "cart") do cart_items = assigns.preview_data.cart_items subtotal = @@ -465,92 +467,37 @@ defmodule BerrypodWeb.Admin.Theme.Index do acc + item.product.cheapest_price * item.quantity end) - assigns = - assigns - |> preview_assigns() - |> assign(:cart_page_items, cart_items) - |> assign(:cart_page_subtotal, subtotal) - - ~H"" + assigns + |> assign(:cart_page_items, cart_items) + |> assign(:cart_page_subtotal, subtotal) end - defp preview_page(%{page: :about} = assigns) do - assigns = - assigns - |> preview_assigns() - |> assign(%{ - 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() - }) - - ~H"" + defp preview_page_context(assigns, "about") do + assign(assigns, :content_blocks, PreviewData.about_content()) end - defp preview_page(%{page: :delivery} = assigns) do - assigns = - assigns - |> preview_assigns() - |> assign(%{ - active_page: "delivery", - hero_title: "Delivery & returns", - hero_description: "Everything you need to know about shipping and returns", - content_blocks: PreviewData.delivery_content() - }) - - ~H"" + defp preview_page_context(assigns, "delivery") do + assign(assigns, :content_blocks, PreviewData.delivery_content()) end - defp preview_page(%{page: :privacy} = assigns) do - assigns = - assigns - |> preview_assigns() - |> assign(%{ - active_page: "privacy", - hero_title: "Privacy policy", - hero_description: "How we handle your personal information", - content_blocks: PreviewData.privacy_content() - }) - - ~H"" + defp preview_page_context(assigns, "privacy") do + assign(assigns, :content_blocks, PreviewData.privacy_content()) end - defp preview_page(%{page: :terms} = assigns) do - assigns = - assigns - |> preview_assigns() - |> assign(%{ - active_page: "terms", - hero_title: "Terms of service", - hero_description: "The legal bits", - content_blocks: PreviewData.terms_content() - }) - - ~H"" + defp preview_page_context(assigns, "terms") do + assign(assigns, :content_blocks, PreviewData.terms_content()) end - defp preview_page(%{page: :contact} = assigns) do - assigns = preview_assigns(assigns) - ~H"" + defp preview_page_context(assigns, "error") do + assign(assigns, %{ + error_code: "404", + error_title: "Page Not Found", + error_description: + "Sorry, we couldn't find the page you're looking for. Perhaps you've mistyped the URL or the page has been moved." + }) end - defp preview_page(%{page: :error} = assigns) do - assigns = - assigns - |> preview_assigns() - |> assign(%{ - error_code: "404", - error_title: "Page Not Found", - error_description: - "Sorry, we couldn't find the page you're looking for. Perhaps you've mistyped the URL or the page has been moved." - }) - - ~H"" - end + defp preview_page_context(assigns, _slug), do: assigns defp build_gallery_images(product) do alias Berrypod.Products.ProductImage diff --git a/lib/berrypod_web/live/shop/checkout_success.ex b/lib/berrypod_web/live/shop/checkout_success.ex index 1317cb7..fe9aeb1 100644 --- a/lib/berrypod_web/live/shop/checkout_success.ex +++ b/lib/berrypod_web/live/shop/checkout_success.ex @@ -1,7 +1,7 @@ defmodule BerrypodWeb.Shop.CheckoutSuccess do use BerrypodWeb, :live_view - alias Berrypod.{Analytics, Orders} + alias Berrypod.{Analytics, Orders, Pages} @impl true def mount(%{"session_id" => session_id}, _session, socket) do @@ -29,10 +29,13 @@ defmodule BerrypodWeb.Shop.CheckoutSuccess do socket end + page = Pages.get_page("checkout_success") + socket = socket |> assign(:page_title, "Order confirmed") |> assign(:order, order) + |> assign(:page, page) {:ok, socket} end @@ -49,7 +52,7 @@ defmodule BerrypodWeb.Shop.CheckoutSuccess do @impl true def render(assigns) do ~H""" - + """ end end diff --git a/lib/berrypod_web/live/shop/order_detail.ex b/lib/berrypod_web/live/shop/order_detail.ex index d530e04..ca8eb9b 100644 --- a/lib/berrypod_web/live/shop/order_detail.ex +++ b/lib/berrypod_web/live/shop/order_detail.ex @@ -1,13 +1,20 @@ defmodule BerrypodWeb.Shop.OrderDetail do use BerrypodWeb, :live_view - alias Berrypod.Orders + alias Berrypod.{Orders, Pages} alias Berrypod.Products alias Berrypod.Products.ProductImage @impl true def mount(_params, session, socket) do - {:ok, assign(socket, :lookup_email, session["order_lookup_email"])} + page = Pages.get_page("order_detail") + + socket = + socket + |> assign(:lookup_email, session["order_lookup_email"]) + |> assign(:page, page) + + {:ok, socket} end @impl true @@ -49,7 +56,7 @@ defmodule BerrypodWeb.Shop.OrderDetail do @impl true def render(assigns) do ~H""" - + """ end end diff --git a/lib/berrypod_web/live/shop/orders.ex b/lib/berrypod_web/live/shop/orders.ex index aff0116..1ceafd0 100644 --- a/lib/berrypod_web/live/shop/orders.ex +++ b/lib/berrypod_web/live/shop/orders.ex @@ -1,16 +1,18 @@ defmodule BerrypodWeb.Shop.Orders do use BerrypodWeb, :live_view - alias Berrypod.Orders + alias Berrypod.{Orders, Pages} @impl true def mount(_params, session, socket) do email = session["order_lookup_email"] + page = Pages.get_page("orders") socket = socket |> assign(:page_title, "Your orders") |> assign(:lookup_email, email) + |> assign(:page, page) socket = if email do @@ -28,7 +30,7 @@ defmodule BerrypodWeb.Shop.Orders do @impl true def render(assigns) do ~H""" - + """ end end diff --git a/lib/berrypod_web/page_renderer.ex b/lib/berrypod_web/page_renderer.ex index ceadb7e..e596436 100644 --- a/lib/berrypod_web/page_renderer.ex +++ b/lib/berrypod_web/page_renderer.ex @@ -856,7 +856,6 @@ defmodule BerrypodWeb.PageRenderer do defp collection_path(slug, "featured"), do: ~p"/collections/#{slug}" defp collection_path(slug, sort), do: ~p"/collections/#{slug}?sort=#{sort}" - # Reuse from PageTemplates def format_order_status("unfulfilled"), do: "Being prepared" def format_order_status("submitted"), do: "Sent to printer" def format_order_status("processing"), do: "In production"