spree_storefront 5.0.0.rc1

data/app/views/spree/seo/sitemap.xml.erb

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <% cache current_store.taxons do %>
+    <% current_store.taxons.each do |taxon| %>
+      <url>
+        <loc><%= spree_storefront_resource_url(taxon) %></loc>
+        <lastmod><%= taxon.updated_at.strftime('%Y-%m-%d') %></lastmod>
+        <changefreq>daily</changefreq>
+        <priority>0.5</priority>
+      </url>
+    <% end %>
+  <% end %>
+
+  <% cache [current_store.products, current_currency] do %>
+    <% current_store.products.active(current_currency).find_each do |product| %>
+      <url>
+        <loc><%= spree_storefront_resource_url(product) %></loc>
+        <lastmod><%= product.updated_at.strftime('%Y-%m-%d') %></lastmod>
+        <changefreq>weekly</changefreq>
+        <priority>0.5</priority>
+      </url>
+    <% end %>
+  <% end %>
+</urlset>

data/app/views/spree/shared/_fonts.html.erb

@@ -0,0 +1,14 @@
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+
+<% cache_unless page_builder_enabled?, current_theme do %>
+  <%= google_fonts_link_tag %>
+
+  <style type="text/css">
+    <%= font_styles %>
+  </style>
+
+  <% if current_theme_or_preview.preferred_custom_font_code.present? %>
+    <%= raw(current_theme_or_preview.preferred_custom_font_code) %>
+  <% end %>
+<% end %>

data/app/views/spree/shared/_head.html.erb

@@ -0,0 +1,36 @@
+<meta charset="utf-8">
+<title><%= title %></title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<%= canonical_tag(current_store.url_or_custom_domain) %>
+<%= csrf_meta_tags %>
+
+<% cache current_store do %>
+  <% if current_store.favicon_image.attached? && current_store.favicon_image.variable? %>
+    <link rel="icon" href="<%= main_app.cdn_image_url(current_store.favicon_image.variant(spree_image_variant_options(resize_to_fill: [256, 256]))) %>">
+  <% end %>
+<% end %>
+
+<%= render 'spree/shared/meta_tags' %>
+<%= render 'spree/shared/css_variables' %>
+<%= render 'spree/shared/fonts' %>
+
+<%= javascript_importmap_tags 'application-spree-storefront' %>
+<%= javascript_tag "wishedVariantIds = #{(current_wishlist&.variant_ids&.map(&:to_s) || []).to_json.html_safe};" %>
+
+<%= stylesheet_link_tag "tailwind", defer: true, data: { turbo_track: 'reload' } %>
+<%= stylesheet_link_tag "storefront_page_builder", defer: true, data: { turbo_track: 'reload' } if page_builder_enabled? %>  
+
+<%= yield :head %>
+
+<%= render_storefront_partials(:head_partials) unless page_builder_enabled? %>
+
+<% if Rails.env.test? %>
+  <% # for test environment we need to skip uppercase so we won't get false failures with different text transforms %>
+  <style>
+    .uppercase {
+      text-transform: none !important;
+    }
+  </style>
+<% end %>
+
+<%= render 'spree/shared/google_places_api_loader' %>

data/app/views/spree/shared/_load_more_products.turbo_stream.erb

@@ -0,0 +1,7 @@
+<%= turbo_stream.replace "next_page" do %>
+  <%= render 'spree/products/show_more_button' if storefront_products.any? %>
+<% end %>
+
+<%= turbo_stream.append "products" do %>
+  <%= render 'spree/shared/products', products: storefront_products.records %>
+<% end %>

data/app/views/spree/shared/_product_listing_page.html.erb

@@ -0,0 +1,11 @@
+<% if turbo_frame_request? && current_theme_preview.nil? %>
+  <%= render 'spree/page_sections/product_grid', products: storefront_products.records, section: current_page.sections.find_by(type: 'Spree::PageSections::ProductGrid') %>
+<% else %>
+  <%= render_page(
+    current_page,
+    taxon: @taxon,
+    collection: @collection,
+    products: storefront_products.records,
+  ) %>
+<% end %>
+

data/app/views/spree/shared/_products.html.erb

@@ -0,0 +1 @@
+<%= render partial: 'spree/products/product', collection: products, cached: ->(product) { product_cache_key(product) } %>

data/app/views/spree/taxonomies/show.html.erb

@@ -0,0 +1 @@
+<%= render_page(current_page, taxons: @taxons) %>

data/app/views/spree/taxons/show.html.erb

@@ -0,0 +1 @@
+<%= render 'spree/shared/product_listing_page' %>

data/app/views/spree/taxons/show.turbo_stream.erb

@@ -0,0 +1 @@
+<%= render 'spree/shared/load_more_products' %>

data/app/views/spree/waitlists/create.turbo_stream.erb

@@ -0,0 +1,9 @@
+<%= spree_turbo_update_flashes %>
+
+<% if @waitlist.persisted? %>
+  <%= turbo_stream.append "main-product-#{@waitlist.variant.product.id}" do %>
+    <script>
+      window.dispatchEvent(new CustomEvent('waitlist:created'));
+    </script>
+  <% end %>
+<% end %>

data/app/views/themes/default/kaminari/storefront/_first_page.html.erb

@@ -0,0 +1,8 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>

data/app/views/themes/default/kaminari/storefront/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="w-8 text-center"><%= t('views.pagination.truncate').html_safe %></span>

data/app/views/themes/default/kaminari/storefront/_last_page.html.erb

@@ -0,0 +1,8 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>

data/app/views/themes/default/kaminari/storefront/_next_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% css = "inline-flex justify-center items-center gap-x-1.5 px-4#{' pagination-link--disabled' if current_page.last?}" %>
+
+<%= link_to(url, disabled: current_page.last?, class: css) do %>
+  <%= render 'spree/shared/icons/chevron_right', size: 20, color: current_page.last? ? theme_setting(:neutral_color) : theme_setting(:text_color) %>
+<% end %>

data/app/views/themes/default/kaminari/storefront/_page.html.erb

@@ -0,0 +1,10 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<%= active_link_to page, url, class: 'pagination-link w-8 text-center', active: page.current?, class_active: 'pagination-link--active' %>

data/app/views/themes/default/kaminari/storefront/_paginator.html.erb

@@ -0,0 +1,27 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <nav class="pagination flex items-center justify-center gap-x-1 mt-16" role="navigation" aria-label="pager">
+    <%= prev_page_tag %>
+
+    <div class="flex items-center gap-x-1">
+      <% each_page do |page| -%>
+        <% if page.display_tag? -%>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end -%>
+      <% end -%>
+    </div>
+
+    <% unless current_page.out_of_range? %>
+      <%= next_page_tag %>
+    <% end %>
+  </nav>
+<% end -%>

data/app/views/themes/default/kaminari/storefront/_prev_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% css = "inline-flex justify-center items-center gap-x-1.5 px-4#{' pagination-link--disabled' if current_page.first?}" %>
+
+<%= link_to(url, disabled: current_page.first?, class: css) do %>
+  <%= render 'spree/shared/icons/chevron', size: 20, color: current_page.first? ? theme_setting(:neutral_color) : theme_setting(:text_color) %>
+<% end %>

data/app/views/themes/default/spree/account/_account_nav.html.erb

@@ -0,0 +1,46 @@
+<h1 class="font-semibold uppercase hidden lg:block">
+  <%= Spree.t(:my_account) %>
+</h1>
+<div
+  data-controller="account-nav"
+  class="mt-2 lg:mt-6 font-medium flex overflow-auto no-scrollbar -mx-4 mb-6 lg:mx-0 lg:mb-11 lg:flex-col"
+>
+  <%= link_to "#{Spree.t(:orders)} & #{Spree.t(:returns)}", spree.account_orders_path,
+    data: { active: current == "orders" },
+    class: "shrink-0 block lg:px-4 lg:py-3 px-3 py-4 border-b lg:border-b-0 text-neutral-700 hover:border-accent-100 hover:bg-accent-100 hover:text-black #{current == "orders" ? "lg:bg-accent border-text lg:border-b-0 lg:border-l-[1.5px]" : "border-accrent lg:border-l"}"
+  %>
+  <%= link_to Spree.t(:addresses), spree.account_addresses_path,
+    data: { active: current == "address" },
+    class: "shrink-0 block lg:px-4 lg:py-3 px-3 py-4 border-b lg:border-b-0 text-neutral-700 hover:border-accent-100 hover:bg-accent-100 hover:text-black #{current == "address" ? "lg:bg-accent border-text lg:border-b-0 lg:border-l-[1.5px]" : "border-accrent lg:border-l"}"
+  %>
+  <%= link_to Spree.t(:personal_details), spree.edit_account_profile_path,
+    data: { active: current == "account" },
+    class: "shrink-0 block lg:px-4 lg:py-3 px-3 py-4 border-b lg:border-b-0 text-neutral-700 hover:border-accent-100 hover:bg-accent-100 hover:text-black #{current == "account" ? "lg:bg-accent border-text lg:border-b-0 lg:border-l-[1.5px]" : "border-accrent lg:border-l"}"
+  %>
+  <%= link_to Spree.t(:wishlist), spree.account_wishlist_path,
+    data: { active: current == "wishlist" },
+    class: "shrink-0 block lg:px-4 lg:py-3 px-3 py-4 border-b lg:border-b-0 text-neutral-700 hover:border-accent-100 hover:bg-accent-100 hover:text-black #{current == "wishlist" ? "lg:bg-accent border-text lg:border-b-0 lg:border-l-[1.5px]" : "border-accrent lg:border-l"}"
+  %>
+
+  <% if spree.respond_to?(:account_gift_cards_path) %>
+    <%= link_to Spree.t(:gift_cards), spree.account_gift_cards_path,
+      data: { active: current == "gift_cards" },
+      class: "shrink-0 block lg:px-4 lg:py-3 px-3 py-4 border-b lg:border-b-0 text-neutral-700 hover:border-accent-100 hover:bg-accent-100 hover:text-black #{current == "gift_cards" ? "lg:bg-accent border-text lg:border-b-0 lg:border-l-[1.5px]" : "border-accrent lg:border-l"}"
+    %>
+  <% end %>
+
+  <%= link_to Spree.t(:store_credits), spree.account_store_credits_path,
+    data: { active: current == "gift_cards" },
+    class: "shrink-0 block lg:px-4 lg:py-3 px-3 py-4 border-b lg:border-b-0 text-neutral-700 hover:border-accent-100 hover:bg-accent-100 hover:text-black #{current == "store_credits" ? "lg:bg-accent border-text lg:border-b-0 lg:border-l-[1.5px]" : "border-accrent lg:border-l"}"
+  %>
+
+  <%= link_to Spree.t('storefront.account.newsletter_settings'), spree.edit_account_newsletter_path,
+    data: { active: current == "newsletter" },
+    class: "shrink-0 block lg:px-4 lg:py-3 px-3 py-4 border-b lg:border-b-0 text-neutral-700 hover:border-accent-100 hover:bg-accent-100 hover:text-black #{current == "newsletter" ? "lg:bg-accent border-text lg:border-b-0 lg:border-l-[1.5px]" : "border-accrent lg:border-l"}"
+  %>
+
+  <%= button_to Spree.t(:logout), spree_logout_path,
+    class: "w-full text-left hidden shrink-0 md:block lg:px-4 lg:py-3 px-3 py-4 border-b lg:border-b-0 border-accrent lg:border-l text-neutral-700 hover:border-accent-100 hover:bg-accent-100 hover:text-black",
+    method: :delete,
+    data: { turbo: false } if defined?(spree_logout_path) %>
+</div>

data/app/views/themes/default/spree/account/_order.html.erb

@@ -0,0 +1,39 @@
+<tr class="flex flex-wrap w-full md:table-row md:h-[72px] border border-accent md:border-none mb-4 p-4 md:p-0 hover:bg-accent-100">
+  <td class="mb-4 w-1/2 md:w-auto -order-1 md:px-4 md:border-y border-accent md:border-l font-medium">
+    <%= link_to "##{order.number}", spree.account_order_path(order) %>
+  </td>
+  <td class="mb-4 w-full md:w-auto md:px-4 md:border-y border-accent"><%= local_date(order.completed_at.to_date) %></td>
+  <td class="md:w-auto pr-2 md:px-4 md:border-y border-accent">
+    <% if order.payment_state %>
+      <% if order.payment_state == 'void' %>
+        <% if order.order_refunded? %>
+          <span class="badge-refunded">
+            <%= Spree.t("payment_states.refunded").titleize %>
+          </span>
+        <% else %>
+          <span class="badge-void">
+            <%= Spree.t("payment_states.#{order.payment_state}").titleize %>
+          </span>
+        <% end %>
+      <% else %>
+        <span class="badge-success">
+          <%= Spree.t("payment_states.#{order.payment_state}").titleize %>
+        </span>
+      <% end %>
+    <% end %>
+  </td>
+  <td class="md:w-auto md:px-4 md:border-y border-accent">
+    <% if order.shipment_state %>
+      <% if order.shipment_state == 'shipped' %>
+        <span class="badge-success">
+          <%= Spree.t("shipment_states.#{order.shipment_state}").titleize %>
+        </span>
+      <% else %>
+        <span class="badge-<%= order.shipment_state %>">
+          <%= Spree.t("shipment_states.#{order.shipment_state}").titleize %>
+        </span>
+      <% end %>
+    <% end %>
+  </td>
+  <td class="mb-4 w-1/2 md:w-auto -order-1 md:px-4 md:border-y md:border-r border-accent font-me text-right"><%= order.display_total_minus_store_credits %></td>
+</tr>

data/app/views/themes/default/spree/account/_orders.html.erb

@@ -0,0 +1,16 @@
+
+<table class="inline-table md:table table-auto overflow-scroll w-full text-sm border-separate border-spacing-y-4 mb-24 mt-4">
+  <thead class="hidden md:table-row-group">
+    <tr class="text-left text-neutral text-xs">
+      <th class="font-normal px-4"><%= Spree::Order.human_attribute_name(:number) %></th>
+      <th class="font-normal px-4"><%= Spree.t(:date) %></th>
+      <th class="font-normal px-4"><%= Spree.t(:payment_state) %></th>
+      <th class="font-normal px-4"><%= Spree.t(:shipment_state) %></th>
+      <th class="font-normal px-4 text-right"><%= Spree.t(:total) %></th>
+    </tr>
+  </thead>
+  <tbody class="block md:table-row-group">
+    <%= render collection: orders, partial: 'spree/account/order', cached: spree_base_cache_scope %>
+  </tbody>
+</table>
+

data/app/views/themes/default/spree/account/addresses/_address.html.erb

@@ -0,0 +1,42 @@
+<li class="p-4 my-4 border border-accent lg:flex justify-between relative" id="<%= dom_id(address) %>">
+  <%= render 'spree/shared/address', address: address %>
+  <div class="flex gap-6 h-6 lg:h-10 mt-6 lg:mt-0">
+    <%= link_to spree.edit_address_path(address), class: 'flex gap-2 lg:p-2' do %>
+      <%= render 'spree/shared/icons/edit' %>
+      <span class="uppercase text-sm font-semibold tracking-widest"><%= Spree.t(:edit_address) %></span>
+    <% end %>
+    <div
+                  data-controller="modal"
+                  data-modal-allow-background-close="true"
+                  data-modal-backdrop-color-value="rgba(0,0,0,0.32)"
+                  >
+      <button data-action="click->modal#open" class="flex p-2 max-lg:absolute top-2 right-2" data-test-id="delete_address">
+        <%= render 'spree/shared/icons/delete' %>
+      </button>
+      <div
+                    data-modal-target="container"
+                    data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard"
+        class="hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center z-[9999]"
+        >
+        <div class="w-full lg:w-[424px] relative">
+          <div class="mx-4 lg:mx-0 bg-white">
+            <div class="px-8 py-6">
+              <div class="flex justify-end">
+                <button data-action="click->modal#close">
+                  <%= render 'spree/shared/icons/close' %>
+                  <span class="sr-only"><%= Spree.t(:close) %></span>
+                </button>
+              </div>
+              <h2 class="text-xl lg:text-2xl my-4 uppercase"><%= Spree.t(:delete_address) %></h2>
+              <p class="mb-8"><%= Spree.t(:are_you_sure) %></p>
+              <div class="flex justify-end items-center flex-wrap mt-4 gap-4">
+                <%= button_tag Spree.t(:cancel), class: 'uppercase text-sm font-semibold tracking-widest', data: { action: 'click->modal#close' } %>
+                <%= button_to Spree.t(:delete), spree.address_path(address), method: :delete, class: 'btn-primary !px-6 !py-3 !leading-[1.375rem]', data: { test_id: 'confirm_delete_address' } %>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</li>

data/app/views/themes/default/spree/account/addresses/index.html.erb

@@ -0,0 +1,28 @@
+<div class="page-container grid grid-cols-1 lg:grid-cols-12 lg:gap-6 lg:mt-6">
+  <div class="lg:col-span-3">
+    <%= render 'spree/account/account_nav', current: 'address' %>
+  </div>
+  <div class="lg:col-span-8 lg:col-start-5">
+    <div class="mb-12 lg:mb-24">
+      <div class="font-medium mb-4">
+        <%= Spree.t(:addresses) %>
+      </div>
+      <% if @addresses.any? %>
+        <ul>
+          <%= render partial: 'spree/account/addresses/address', collection: @addresses, cached: ->a {[*spree_base_cache_scope.call(a), try_spree_current_user.ship_address_id, try_spree_current_user.bill_address_id]}, as: :address %>
+        </ul>
+        <div class="flex">
+          <%= link_to Spree.t(:add_address), spree.new_address_path, class: 'btn-primary block w-full lg:w-auto' %>
+        </div>
+      <% else %>
+        <div class="text-center py-6">
+          <p class="mb-2 font-medium uppercase"><%= Spree.t('storefront.account.no_addresses_title') %></p>
+          <p><%= Spree.t('storefront.account.no_addresses_description') %></p>
+          <div class="flex mt-8 justify-center">
+            <%= link_to Spree.t(:add), spree.new_address_path, class: 'btn-primary block' %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/themes/default/spree/account/newsletter/_newsletter_settings.html.erb

@@ -0,0 +1,13 @@
+<%= turbo_frame_tag :newsletter_settings, class: 'flex flex-col gap-4' do %>
+  <div class="flex flex-col gap-1">
+    <h3 class="font-medium uppercase text-lg leading-8"><%= Spree.t(:newsletters) %></h3>
+    <p class="text-base text-neutral-600"><%= Spree.t('storefront.newsletter_subscription.status', status: @user.accepts_email_marketing ? Spree.t(:subscribed) : Spree.t(:not_subscribed)).html_safe %>
+    </p>
+  </div>
+  <%= form_for @user, url: spree.account_newsletter_path, method: :put do |f| %>
+    <%= f.hidden_field :accepts_email_marketing, value: !@user.accepts_email_marketing %>
+    <%= f.button type: :submit, class: 'btn-primary w-full', data: {turbo_submits_with: render('spree/shared/icons/spinner') } do %>
+      <%= @user.accepts_email_marketing? ? :unsubscribe : :subscribe %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/themes/default/spree/account/newsletter/edit.html.erb

@@ -0,0 +1,16 @@
+<div class="page-container grid grid-cols-1 lg:grid-cols-12 lg:gap-6 lg:mt-6">
+  <div class="lg:col-span-3">
+    <%= render 'spree/account/account_nav', current: 'newsletter' %>
+  </div>
+  <div class="lg:col-span-8 lg:col-start-5">
+    <div class="flex flex-col gap-4 max-w-[26.5rem]">
+      <div class="flex flex-col gap-1">
+        <h3 class="font-medium uppercase text-base"><%= Spree.t('storefront.account.newsletter_settings') %></h3>
+        <p class="text-base text-neutral-600">
+          <%= Spree.t('storefront.newsletter_subscription.description') %>
+        </p>
+      </div>
+      <%= render 'newsletter_settings' %>
+    </div>
+  </div>
+</div>

data/app/views/themes/default/spree/account/newsletter/update.html.erb

@@ -0,0 +1 @@
+<%= render 'newsletter_settings' %>

data/app/views/themes/default/spree/account/orders/index.html.erb

@@ -0,0 +1,24 @@
+<div class="page-container grid grid-cols-1 lg:grid-cols-12 lg:gap-6 lg:mt-6">
+  <div class="lg:col-span-3">
+    <%= render 'spree/account/account_nav', current: 'orders' %>
+  </div>
+  <div class="lg:col-span-8 lg:col-start-5">
+    <div class="flex gap-4">
+      <div class="uppercase font-medium font-base pb-4 border-b border-text">
+        <%= Spree.t(:orders) %>
+      </div>
+    </div>
+    <% if @orders.any? %>
+      <%= render 'spree/account/orders', orders: @orders %>
+      <!-- add pagination -->
+    <% else %>
+      <div class="text-center my-16 lg:my14">
+        <p class="mb-2 font-medium uppercase"><%= Spree.t('storefront.account.no_orders_title') %></p>
+        <p><%= Spree.t('storefront.account.no_orders_description') %></p>
+        <div class="flex justify-center mt-8">
+          <%= link_to Spree.t(:shop_all), spree.root_url, class: 'btn-primary flex' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/themes/default/spree/account/orders/show.html.erb

@@ -0,0 +1,22 @@
+<div class="page-container lg:grid lg:grid-cols-12">
+  <div class="py-3 text-sm hidden lg:flex items-center col-span-12 gap-4">
+    <%= link_to spree.account_orders_path, class: "text-neutral" do %>
+      <%= Spree.t(:orders) %> & <%= Spree.t(:returns) %>
+    <% end %>
+    <div class="w-1 h-1 bg-accent"></div>
+    <span>
+      <%= accurate_title %>
+    </span>
+  </div>
+
+  <div class="lg:col-start-3 lg:col-span-8 mt-6">
+    <%= link_to spree.account_orders_path, class: 'text-sm font-semibold uppercase tracking-widest flex gap-2 items-center' do %>
+      <%= render 'spree/shared/icons/chevron' %>
+      <%= Spree.t(:back)%>
+    <% end %>
+    <h1 class="text-xl uppercase font-medium my-4 ">
+      <%= accurate_title %>
+    </h1>
+    <%= render 'spree/shared/order_details', order: @order, shipments: @shipments %>
+  </div>
+</div>

data/app/views/themes/default/spree/account/profile/edit.html.erb

@@ -0,0 +1,36 @@
+<div class="page-container grid grid-cols-1 lg:grid-cols-12 lg:gap-6 lg:mt-6">
+  <div class="lg:col-span-3">
+    <%= render 'spree/account/account_nav', current: 'account' %>
+  </div>
+  <div class="lg:col-span-8 lg:col-start-5 pb-6">
+    <h5 class="uppercase font-medium mb-4"><%= Spree.t('storefront.account.personal_details') %></h5>
+    <div class="flex justify-between">
+      <p class="mb-3 text-neutral-600">
+        <%= Spree.t('storefront.account.please_update_your_contact_details') %>
+      </p>
+      <% if defined?(spree_edit_password_path) %>
+        <%= link_to Spree.t('storefront.account.change_password'), spree_edit_password_path %>
+      <% end %>
+    </div>
+    <%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
+    <%= form_for @user, url: spree.account_profile_path, html: {class: "flex flex-col gap-4"}, method: :put do |f| %>
+      <div>
+        <%= f.label :first_name, Spree.t(:first_name), class: 'text-xs text-neutral-600 block mb-2' %>
+        <%= f.text_field :first_name, class: 'text-input w-full', placeholder: Spree.t(:first_name), required: true %>
+      </div>
+      <div>
+        <%= f.label :last_name, Spree.t(:last_name), class: 'text-xs text-neutral-600 block mb-2' %>
+        <%= f.text_field :last_name, class: 'text-input w-full', placeholder: Spree.t(:last_name), required: true %>
+      </div>
+      <div>
+        <%= f.label :phone, Spree.t(:phone), class: 'text-xs text-neutral-600 block mb-2' %>
+        <%= f.telephone_field :phone, class: 'text-input w-full', placeholder: Spree.t(:phone) %>
+      </div>
+      <div>
+        <%= f.label :email, Spree.t(:email), class: 'text-xs text-neutral-600 block mb-2' %>
+        <%= f.text_field :email, class: 'text-input w-full', placeholder: Spree.t(:email), required: true %>
+      </div>
+      <%= f.submit Spree.t(:update), class: 'btn-primary w-full mb-6' %>
+    <% end %>
+  </div>
+</div>

data/app/views/themes/default/spree/account/store_credits/_store_credit_event.html.erb

@@ -0,0 +1,29 @@
+<tr class="flex flex-wrap w-full md:table-row md:h-[72px] border border-accent md:border-none mb-4 p-4 md:p-0 hover:bg-accent-100" id="<%= dom_id(store_credit_event) %>">
+  <td class="mb-2 w-full md:w-auto md:px-4 md:border-y border-accent md:border-l font-medium">
+    <%= local_date(store_credit_event.created_at) %>
+  </td>
+
+  <td class="w-full md:w-auto md:px-4 md:border-y border-accent">
+    <span class="md:hidden font-medium mr-1"><%= Spree.t(:change) %>:</span>
+
+    <% if store_credit_event.allocation? || store_credit_event.credit? %>
+      <span class="badge-success">+<%= store_credit_event.display_amount %></span>
+    <% else %>
+      <span class="badge-warning">-<%= store_credit_event.display_amount %></span>
+    <% end %>
+  </td>
+
+  <td class="w-full md:w-auto md:px-4 md:border-y border-accent">
+    <span class="md:hidden font-medium mr-1"><%= Spree.t(:action) %>:</span>
+    <%= store_credit_event.display_action %>
+
+    <% if store_credit_event.captured? && store_credit_event.order.present? %>
+      (<%= link_to "#{Spree.t(:order)} ##{store_credit_event.order.number}", spree.account_order_path(store_credit_event.order), class: 'font-medium' %>)
+    <% end %>
+  </td>
+
+  <td class="w-full md:w-auto md:px-4 md:border-y md:border-r border-accent">
+    <span class="md:hidden font-medium mr-1"><%= Spree.t(:new_balance) %>:</span>
+    <%= store_credit_event.display_user_total_amount %>
+  </td>
+</tr>

data/app/views/themes/default/spree/account/store_credits/index.html.erb

@@ -0,0 +1,31 @@
+<div class="page-container grid grid-cols-1 lg:grid-cols-12 lg:gap-6 lg:mt-6">
+  <div class="lg:col-span-3">
+    <%= render 'spree/account/account_nav', current: 'store_credits' %>
+  </div>
+  <div class="lg:col-span-8 lg:col-start-5">
+    <div class="flex gap-4">
+      <div class="uppercase font-medium pb-2">
+       <%= Spree.t(:store_credits) %>
+      </div>
+    </div>
+    <% if @store_credit_events.any? %>
+      <p class="text-neutral-600 mb-3"><%= Spree.t('storefront.account.store_credits_history') %></p>
+
+      <table class="inline-table md:table table-auto overflow-scroll w-full text-sm border-separate border-spacing-y-4 mb-24 mt-4">
+        <thead class="hidden md:table-row-group">
+          <tr class="text-left text-neutral text-xs">
+            <th class="font-normal px-4"><%= Spree.t(:date) %></th>
+            <th class="font-normal px-4"><%= Spree.t(:change) %></th>
+            <th class="font-normal px-4"><%= Spree.t(:action) %></th>
+            <th class="font-normal px-4"><%= Spree.t(:balance) %></th>
+          </tr>
+        </thead>
+        <tbody class="block md:table-row-group">
+          <%= render collection: @store_credit_events, partial: 'spree/account/store_credits/store_credit_event', cached: spree_base_cache_scope %>
+        </tbody>
+      </table>
+    <% else %>
+      <p class="text-neutral-600"><%= Spree.t('storefront.account.no_store_credits') %></p>
+    <% end %>
+  </div>
+</div>

data/app/views/themes/default/spree/checkout/_footer.html.erb

@@ -0,0 +1,10 @@
+<% cache spree_base_cache_scope.call(current_store) do %>
+  <div class="flex flex-col gap-4 text-sm">
+    <ul class="flex justify-center flex-wrap gap-4">
+      <%= link_to Spree.t(:privacy_policy), "/policies/privacy_policy", target: '_blank' if legal_policy('privacy_policy').present? %>
+      <%= link_to Spree.t(:terms_of_service), "/policies/terms_of_service", target: '_blank' if legal_policy('terms_of_service').present? %>
+      <%= link_to Spree.t(:returns_policy), "/policies/returns_policy", target: '_blank' if legal_policy('returns_policy').present? %>
+      <%= link_to Spree.t(:shipping_policy), "/policies/shipping_policy", target: '_blank' if legal_policy('shipping_policy').present? %>
+    </ul>
+  </div>
+<% end %>