spree_frontend 4.1.0 → 4.7.0

data/app/views/spree/shared/cms/sections/_hero_image.html.erb

@@ -0,0 +1,60 @@
+<% if section.fullscreen? %>
+  <% if section.gutters? %>
+    <% section_padding = 'px-3' %>
+  <% else %>
+    <% section_padding = 'px-0' %>
+  <% end %>
+<% else %>
+  <% section_padding = 'px-2' %>
+<% end %>
+<div class="col-12 homepage-hero-image position-relative p-0 <%= section_padding %>">
+
+  <div class="bg-light" style="--aspect-ratio:12/5;">
+    <% if section.image_one&.attachment&.attached? %>
+
+        <!-- SM to MD -->
+        <img class="d-block d-md-none lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_one_sm) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_sm) %>"
+          alt="<%= section&.title %>">
+
+        <!-- MD to LG -->
+        <img class="d-none d-md-block d-lg-none lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_one_md) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_md) %>"
+          alt="<%= section&.title %>">
+
+        <!-- LG to XL -->
+        <img class="d-none d-lg-block d-xl-none lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_one_lg) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_lg) %>"
+          alt="<%= section&.title %>">
+
+        <!-- XL UP -->
+        <img class="d-none d-xl-block lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_one_xl) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_xl) %>"
+          alt="<%= section&.title %>">
+
+     <% else %>
+       <%= icon( name: 'card-image',
+                 classes: 'text-black-50',
+                 width: 26,
+                 height: 26) %>
+     <% end %>
+
+    <div class="hero-content position-absolute-y-center">
+      <% if section.title.present? %>
+        <div class="homepage-hero-image-text mx-auto pb-0 pb-sm-2 pb-md-3">
+          <%= section.title %>
+        </div>
+      <% end %>
+
+      <% if section.link.present? && section.button_text.present? %>
+        <div>
+          <%= link_to section.button_text, spree_localized_link(section), class: 'btn btn-primary spree-btn px-5' %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/spree/shared/cms/sections/_image_gallery.html.erb

@@ -0,0 +1,171 @@
+<% if section.fullscreen? %>
+  <% if section.default_layout? %>
+    <% section_one_padding = 'pl-3' %>
+    <% section_two_padding = 'pr-3' %>
+  <% else %>
+    <% section_one_padding = 'pr-3 order-2' %>
+    <% section_two_padding = 'pl-3 order-1' %>
+  <% end %>
+<% else %>
+  <% if section.default_layout? %>
+    <% section_one_padding = '' %>
+    <% section_two_padding = '' %>
+  <% else %>
+    <% section_one_padding = 'order-2' %>
+    <% section_two_padding = 'order-1' %>
+  <% end %>
+<% end %>
+
+<% if section.show_labels? %>
+  <% labels_class = 'homepage-taxon-box-text' %>
+<% else %>
+  <% labels_class = 'd-none' %>
+<% end %>
+
+<% if section.link_one.present? && section.link_type_one == 'Spree::Taxon' %>
+  <% link_one = spree.nested_taxons_path(section.link_one) %>
+  <% link_one_classes = 'homepage-taxon-box bg-light' %>
+<% elsif section.link_one.present? && section.link_type_one == 'Spree::Product' %>
+  <% link_one = spree.product_path(section.link_one) %>
+  <% link_one_classes = 'homepage-taxon-box bg-light' %>
+<% else %>
+  <% link_one = nil %>
+  <% link_one_classes = 'homepage-taxon-box bg-light pointer-events-none cursor-default' %>
+<% end %>
+
+<% if section.link_two.present? && section.link_type_two == 'Spree::Taxon' %>
+  <% link_two = spree.nested_taxons_path(section.link_two) %>
+  <% link_two_classes = 'homepage-taxon-box bg-light' %>
+<% elsif section.link_two.present? && section.link_type_two == 'Spree::Product' %>
+  <% link_two = spree.product_path(section.link_two) %>
+  <% link_two_classes = 'homepage-taxon-box bg-light' %>
+<% else %>
+  <% link_two = nil %>
+  <% link_two_classes = 'homepage-taxon-box bg-light pointer-events-none cursor-default' %>
+<% end %>
+
+<% if section.link_three.present? && section.link_type_three == 'Spree::Taxon' %>
+  <% link_three = spree.nested_taxons_path(section.link_three) %>
+  <% link_three_classes = 'homepage-taxon-box bg-light' %>
+<% elsif section.link_three.present? && section.link_type_three == 'Spree::Product' %>
+  <% link_three = spree.product_path(section.link_three) %>
+  <% link_three_classes = 'homepage-taxon-box bg-light' %>
+<% else %>
+  <% link_three = nil %>
+  <% link_three_classes = 'homepage-taxon-box bg-light pointer-events-none cursor-default' %>
+<% end %>
+
+<!-- Left Block -->
+<div class="col-6 <%= section_one_padding %>">
+
+  <!-- Top Left Block SQUARE -->
+  <!-- margin-bottom: 3.7% is important for keeping the bottom of the sections aligned -->
+  <div class="row" style="margin-bottom: 3.7%;">
+    <div class="col-12">
+
+      <%= link_to link_one, class: link_one_classes, style: '--aspect-ratio:18/13;' do %>
+        <% if section.image_one&.attachment&.attached? && section.image_one&.attachment&.variable? %>
+
+            <!-- XS to MD -->
+            <img class="d-md-none lazyload"
+              data-src="<%= main_app.cdn_image_url(section.img_one_md) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_one_md) %>"
+              alt="<%= section&.title_one %>">
+
+            <!-- MD to XL -->
+            <img class="d-none d-md-block d-xl-none lazyload"
+              data-src="<%= main_app.cdn_image_url(section.img_one_lg) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_one_lg) %>"
+              alt="<%= section&.title_one %>">
+
+            <!-- XL UP -->
+            <img class="d-none d-xl-block lazyload"
+              data-src="<%= main_app.cdn_image_url(section.img_one_xl) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_one_xl) %>"
+              alt="<%= section&.title_one %>">
+        <% else %>
+          <%= icon( name: 'card-image',
+                    classes: 'homepage-taxon-box text-black-50',
+                    width: 26,
+                    height: 26) %>
+        <% end %>
+        <div class="<%= labels_class %>" aria-label="<%= section&.title_one %>">
+          <h3 class="homepage-hpb"><%= section&.title_one %></h3>
+        </div>
+      <% end %>
+
+    </div>
+  </div>
+
+  <!-- Bottom Left Block SQUARE -->
+  <div class="row">
+    <div class="col-12">
+
+      <%= link_to link_three, class: link_three_classes, style: '--aspect-ratio:18/13;' do %>
+        <% if section.image_three&.attachment&.attached? && section.image_three&.attachment&.variable? %>
+
+            <!-- XS to MD -->
+            <img class="d-md-none lazyload"
+              data-src="<%= main_app.cdn_image_url(section.img_three_md) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_three_md) %>"
+              alt="<%= section&.title_three %>">
+
+            <!-- MD to XL -->
+            <img class="d-none d-md-block d-xl-none lazyload"
+              data-src="<%= main_app.cdn_image_url(section.img_three_lg) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_three_lg) %>"
+              alt="<%= section&.title_three %>">
+
+            <!-- XL UP -->
+            <img class="d-none d-xl-block lazyload"
+              data-src="<%= main_app.cdn_image_url(section.img_three_xl) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_three_xl) %>"
+              alt="<%= section&.title_three %>">
+        <% else %>
+          <%= icon( name: 'card-image',
+                    classes: 'homepage-taxon-box text-black-50',
+                    width: 26,
+                    height: 26) %>
+        <% end %>
+        <div class="<%= labels_class %>" aria-label="<%= section&.title_three %>">
+          <h3 class="homepage-hpb"><%= section&.title_three %></h3>
+        </div>
+      <% end %>
+
+    </div>
+  </div>
+</div>
+
+<!-- Right Block TALL -->
+<div class="col-6 <%= section_two_padding %>">
+  <%= link_to link_two, class: link_two_classes, style: '--aspect-ratio:27/40;' do %>
+    <% if section.image_two&.attachment&.attached? && section.image_two&.attachment&.variable? %>
+
+        <!-- XS to MD -->
+        <img class="d-md-none lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_two_md) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_two_md) %>"
+          alt="<%= section&.title_two %>">
+
+        <!-- MD to XL -->
+        <img class="d-none d-md-block d-xl-none lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_two_lg) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_two_lg) %>"
+          alt="<%= section&.title_two %>">
+
+        <!-- XL UP -->
+        <img class="d-none d-xl-block lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_two_xl) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_two_xl) %>"
+          alt="<%= section&.title_two %>">
+    <% else %>
+      <%= icon( name: 'file-image',
+                classes: 'homepage-taxon-box text-black-50',
+                width: 26,
+                height: 26) %>
+    <% end %>
+    <div class="<%= labels_class %>" aria-label="<%= section&.title_two %>">
+      <h3 class="homepage-hpb"><%= section&.title_two %></h3>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/shared/cms/sections/_product_carousel.html.erb

@@ -0,0 +1,5 @@
+<div class="col-12">
+  <% if section.linked_resource %>
+    <div data-product-carousel-taxon-id='<%= section.linked_resource.id %>' class="my-3"></div>
+  <% end %>
+</div>

data/app/views/spree/shared/cms/sections/_rich_text_content.html.erb

@@ -0,0 +1,3 @@
+<div class="col-12">
+  <%= raw section.rte_content %>
+</div>

data/app/views/spree/shared/cms/sections/_side_by_side_images.html.erb

@@ -0,0 +1,118 @@
+<% if section.gutters? %>
+  <% section_one_padding = 'pr-md-2' %>
+  <% section_two_padding = 'pl-md-2' %>
+  <% if section.fullscreen? %>
+    <% section_one_padding = 'px-3 pr-md-2' %>
+    <% section_two_padding = 'px-3 pl-md-2' %>
+  <% end %>
+<% else %>
+  <% if section.fullscreen? %>
+    <% section_one_padding = 'px-0' %>
+    <% section_two_padding = 'px-0' %>
+  <% else %>
+    <% section_one_padding = 'pr-md-0' %>
+    <% section_two_padding = 'pl-md-0' %>
+  <% end %>
+<% end %>
+
+<% if section.link_one.present? && section.link_type_one == 'Spree::Taxon' %>
+  <% link_one = spree.nested_taxons_path(section.link_one) %>
+<% elsif section.link_one.present? && section.link_type_one == 'Spree::Product' %>
+  <% link_one = spree.product_path(section.link_one) %>
+<% else %>
+  <% link_one = nil %>
+<% end %>
+
+<% if section.link_two.present? && section.link_type_two == 'Spree::Taxon' %>
+  <% link_two = spree.nested_taxons_path(section.link_two) %>
+<% elsif section.link_two.present? && section.link_type_two == 'Spree::Product' %>
+  <% link_two = spree.product_path(section.link_two) %>
+<% else %>
+  <% link_two = nil %>
+<% end %>
+
+<div class="col-12 col-md-6 mb-3 mb-md-0 <%= section_one_padding %>">
+  <%= link_to link_one,
+              class: "d-flex align-items-end justify-content-center bg-light text-center overflow-hidden homepage-bottom-box #{'pointer-events-none cursor-default' unless link_one}",
+              style: '--aspect-ratio:54/35;' do %>
+
+      <% if section.image_one&.attachment&.attached? %>
+        <!-- XS to MD -->
+        <img class="d-md-none lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_one_md) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_md) %>"
+          alt="<%= section&.title_one %>">
+
+        <!-- MD to XL -->
+        <img class="d-none d-md-block d-xl-none lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_one_lg) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_lg) %>"
+          alt="<%= section&.title_one %>">
+
+        <!-- XL UP -->
+        <img class="d-none d-xl-block lazyload"
+          data-src="<%= main_app.cdn_image_url(section.img_one_xl) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_xl) %>"
+          alt="<%= section&.title_one %>">
+       <% else %>
+        <%= icon( name: 'card-image',
+                  classes: 'text-black-50',
+                  width: 26,
+                  height: 26) %>
+       <% end %>
+
+       <% if section.title_one.present? || section.subtitle_one.present? %>
+        <div class="homepage-bottom-box-inner p-1 p-sm-2 p-md-4 homepage-hpb" role="img" aria-label="New Collection">
+          <div class="homepage-bottom-box-inner-small-text">
+            <%= section&.title_one %>
+          </div>
+          <div class="homepage-bottom-box-inner-big-text">
+            <%= section.subtitle_one %>
+          </div>
+        </div>
+      <% end %>
+  <% end %>
+</div>
+
+<div class="col-12 col-md-6 <%= section_two_padding %>">
+  <%= link_to link_two,
+              class: "d-flex align-items-end justify-content-center bg-light text-center overflow-hidden homepage-bottom-box #{'pointer-events-none cursor-default' unless link_two}",
+              style: '--aspect-ratio:54/35;' do %>
+
+      <% if section.image_two&.attachment&.attached? %>
+        <!-- XS to MD -->
+          <img class="d-md-none lazyload"
+            data-src="<%= main_app.cdn_image_url(section.img_two_md) %>"
+            data-srcset="<%= main_app.cdn_image_url(section.img_two_md) %>"
+            alt="<%= section&.title_two %>">
+
+        <!-- MD to XL -->
+          <img class="d-none d-md-block d-xl-none lazyload"
+            data-src="<%= main_app.cdn_image_url(section.img_two_lg) %>"
+            data-srcset="<%= main_app.cdn_image_url(section.img_two_lg) %>"
+            alt="<%= section&.title_two %>">
+
+        <!-- XL UP -->
+          <img class="d-none d-xl-block lazyload"
+            data-src="<%= main_app.cdn_image_url(section.img_two_xl) %>"
+            data-srcset="<%= main_app.cdn_image_url(section.img_two_xl) %>"
+            alt="<%= section&.title_two %>">
+       <% else %>
+        <%= icon( name: 'card-image',
+                  classes: 'text-black-50',
+                  width: 26,
+                  height: 26) %>
+       <% end %>
+
+       <% if section.title_two.present? || section.subtitle_two.present? %>
+        <div class="homepage-bottom-box-inner p-1 p-sm-2 p-md-4 homepage-hpb" role="img" aria-label="New Collection">
+          <div class="homepage-bottom-box-inner-small-text">
+            <%= section&.title_two %>
+          </div>
+          <div class="homepage-bottom-box-inner-big-text">
+            <%= section.subtitle_two %>
+          </div>
+        </div>
+      <% end %>
+  <% end %>
+</div>

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

@@ -3,12 +3,17 @@
     <%= @taxon.name %>
   </div>
   <% unless @taxon.description.blank? %>
-    <div class="py-3 py-md-0 taxon-description"><%= @taxon.description %></div>
+    <div class="py-3 py-md-0 taxon-description">
+      <% if taxon_wysiwyg_editor_enabled? %>
+        <%= raw @taxon.description %>
+      <% else %>
+        <%= @taxon.description %>
+      <% end %>
   <% end %>
   <% if @taxon.icon&.attachment %>
     <div class="d-none d-md-block pt-4 taxon-icon">
       <%= lazy_image(
-        src: main_app.url_for(@taxon.icon.attachment),
+        src: main_app.cdn_image_url(@taxon.icon.attachment),
         alt: @taxon.description || Spree.t('taxon_missing_alt'),
         width: 1110,
         height: 300,

data/app/views/spree/users/_address.html.erb

@@ -1,25 +1,17 @@
-<div class="row">
-  <address class="mb-0 col-10">
-    <span class="account-page-user-full-name">
-      <%= address.full_name %>
-    </span>
-
-    <div><%= "#{address.address1} #{address.address2}" %>,</div>
-    <div><%= "#{address.city}, #{address.state&.abbr} #{address.zipcode}" %>,</div>
-    <div><%= address.country.name %></div>
-  </address>
-  <div class="col-2">
-    <div class="row">
-      <div class="col-5 offset-md-2 order-1">
-        <%= link_to spree.edit_address_path(address), method: :get, class: 'address-button', data: { hook: 'edit_address' } do %>
-          <%= inline_svg_tag 'edit.svg', class: "delete-address-img" %>
-        <% end %>
-      </div>
-      <div class="col-5 offset-2 offset-md-0 order-0">
-        <div class="bg-transparent border-0 p-0 m-0 address-button delete-button js-delete-address-link" data-address="<%= spree.address_path(address) %>">
-          <%= inline_svg_tag 'garbage_2.svg', class: "delete-address-img" %>
-        </div>
-      </div>
-    </div>
+<address class="mb-0 col-12">
+  <% if address.label&.present? %>
+    <h4 class="m-0 truncate"><%= address.label %></h4>
+  <% end %>
+  <span class="account-page-user-full-name">
+    <%= address.full_name %>
+  </span>
+  <div>
+    <%= "#{address.address1} #{address.address2}" %>,
   </div>
-</div>
+  <div>
+    <%= "#{address.city}, #{address.state_text} #{address.zipcode}" %>,
+  </div>
+  <div>
+    <%= address.country.name %>
+  </div>
+</address>

data/app/views/spree/users/_address_controls.html.erb

@@ -0,0 +1,10 @@
+<%= link_to(spree.edit_address_path(address), method: :get, class: 'ml-1 d-inline-block', data: { hook: 'edit_address' }) do %>
+  <%= inline_svg_tag('edit.svg', width: 24, height: 24) %>
+<% end %>
+
+<%= link_to '#', class: 'js-delete-address-link ml-3', data: { turbo: false, hook: 'remove_address', address: spree.address_path(address) }, aria: { label: Spree.t('address_book.remove_address') } do %>
+    <%= icon(name: 'garbage_2',
+             classes: '',
+             width: 24,
+             height: 24) %>
+<% end %>

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

@@ -1,35 +1,41 @@
 <div class="container account-page">
-  <h3 class="text-uppercase spree-mb-large spree-mt-large spree-header" ><%= accurate_title %></h3>
+  <h3 class="text-uppercase spree-mb-large spree-mt-large spree-header"><%= accurate_title %></h3>
 
   <div class="row">
     <div class="col-xs-12 col-lg-4">
       <dt class="text-uppercase account-page-user-info-item-title">
-        <%= Spree.t(:email) %>
-        <%= link_to spree.edit_user_path(@user), class: "account-page-user-info-item-title-edit" do %>
-          <%= inline_svg_tag 'edit.svg', class: "account-page-user-info-item-title-edit-img" %>
+        <%= Spree.t(:account_info) %>
+          <%= link_to spree.edit_user_path(@user), class: "account-page-user-info-item-title-edit" do %>
+          <%= inline_svg_tag('edit.svg', width: 27.6, height: 24) %>
         <% end %>
       </dt>
       <dd class="account-page-user-info-item-definition"><%= @user.email %></dd>
 
       <div class="d-lg-inline-block account-page-user-info-item-store-credits">
         <p class="my-0 text-uppercase text-center">
-          <%= Spree.t(:store_credit_name) %>: <b class="account-page-user-info-item-store-credits-amount"><%= Spree::Money.new(@user.total_available_store_credit).to_s.gsub('.00', '') %></b>
+          <%= Spree.t(:store_credit_name) %>
+          <% @user.available_store_credits(current_store).each do |value| %>
+            <br><b class="account-page-user-info-item-store-credits-amount"><%= value %></b>
+          <% end %>
         </p>
       </div>
     </div>
     <div class="col-xs-12 col-lg-8 mt-sm-5 mt-lg-0">
-      <%= link_to Spree.t(:add_new_address), spree.new_address_path, class: 'account-page-new-address-link', method: :get %>
-
+      <h4 class="mb-3"><%= link_to Spree.t(:add_new_address), spree.new_address_path, method: :get %></h4>
       <div class="row">
         <% @user.addresses.each_with_index do |address, index| %>
-          <div class="col-xs-12 col-lg-6">
+          <div class="col-12 col-sm-6 mb-3">
             <% index += 1 %>
             <% if index % 3 == 0 %>
-              <div class="account-page-user-info-item">
-              </div>
+              <div class="account-page-user-info-item my-4"></div>
             <% end %>
-            <div class="account-page-user-info-item">
-              <%= render "spree/users/address", address: address %>
+            <div class="row">
+              <div class="col-8 col-lg-6">
+                <%= render "spree/users/address", address: address %>
+              </div>
+              <div class="col">
+                <%= render "spree/users/address_controls", address: address %>
+              </div>
             </div>
           </div>
         <% end %>
@@ -38,8 +44,7 @@
   </div>
 
   <div data-hook="account_my_orders" class="account-page-orders" id="account-my-orders">
-
-    <h3 class="text-uppercase spree-mb-medium spree-mt-medium spree-header" ><%= Spree.t(:my_orders) %></h3>
+    <h3 class="text-uppercase spree-mb-medium spree-mt-medium spree-header"><%= Spree.t(:my_orders) %></h3>
     <% if @orders.present? %>
       <table>
         <thead class="active">
@@ -55,7 +60,7 @@
         <tbody>
           <% @orders.each do |order| %>
             <tr>
-              <td class="account-page-order-number"><%= link_to order.number, order_url(order), class: "text-primary" %></td>
+              <td class="account-page-order-number"><%= link_to order.number, spree.order_path(order), class: "text-primary" %></td>
               <td class="account-page-order-date"><%= l order.completed_at.to_date %></td>
               <td class="account-page-order-status"><%= Spree.t("order_state.#{order.state}").titleize %></td>
               <td class="account-page-order-payment-state"><%= Spree.t("payment_states.#{order.payment_state}").titleize if order.payment_state %></td>
@@ -71,7 +76,7 @@
     <% else %>
       <p class="text-center"><%= Spree.t(:you_have_no_orders_yet) %></p>
     <% end %>
-    <br />
+    <br>
   </div>
   <div id="delete-address-popup" class="delete-address-popup-dropdown hide-on-esc">
     <%= render 'spree/shared/delete_address_popup' %>

data/config/initializers/admin_actions.rb

@@ -0,0 +1,18 @@
+Rails.application.config.after_initialize do
+  if Spree::Core::Engine.backend_available?
+    action = ::Spree::Admin::Actions::ActionBuilder.new('preview', ->(resource) { "/products/#{resource.slug}" }).
+              with_icon_key('view.svg').
+              with_label_translation_key('admin.utilities.preview').
+              with_id('adminPreviewProduct').
+              with_target(:blank).
+              with_data_attributes({ turbo: false }).
+              build
+
+    Rails.application.config.spree_backend.actions[:product].add(action)
+    Rails.application.config.spree_backend.actions[:images].add(action)
+    Rails.application.config.spree_backend.actions[:variants].add(action)
+    Rails.application.config.spree_backend.actions[:prices].add(action)
+    Rails.application.config.spree_backend.actions[:stock].add(action)
+    Rails.application.config.spree_backend.actions[:product_properties].add(action)
+  end
+end

data/config/initializers/assets.rb

@@ -1,13 +1,4 @@
-Rails.application.config.assets.precompile += %w(
-  favicon.ico
-  credit_cards/*
-  spree/frontend/checkout/shipment
-  homepage/*
-  meganav/*
-  noimage/*
-  logo@3x.png
-  spark-logo@3x.png
-  arrow.svg
-  check-mark-circle.svg
-  error.svg
-)
+Rails.application.config.assets.precompile << 'spree_frontend_manifest.js'
+Rails.application.config.assets.configure do |env|
+  env.export_concurrent = false
+end

data/config/initializers/canonical_rails.rb

@@ -10,5 +10,5 @@ CanonicalRails.setup do |config|
   # Parameter spamming can cause index dilution by creating seemingly different URLs with identical or near-identical content.
   # Unless whitelisted, these parameters will be omitted
 
-  config.whitelisted_parameters = [:keywords, :page, :search, :taxon]
+  config.allowed_parameters = [:keywords, :search, :taxon]
 end

data/config/routes.rb

@@ -1,38 +1,42 @@
 Spree::Core::Engine.add_routes do
-  root to: 'home#index'
+  scope '(:locale)', locale: /#{Spree.available_locales.join('|')}/, defaults: { locale: nil } do
+    root to: 'home#index'
 
-  resources :products, only: [:index, :show]
+    resources :products, only: [:index, :show], path: '/products'
 
-  get '/locale/set', to: 'locale#set'
+    get '/products/:id/related', to: 'products#related'
+    # route globbing for pretty nested taxon and product paths
+    get '/t/*id', to: 'taxons#show', as: :nested_taxons
+    get '/product_carousel/:id', to: 'taxons#product_carousel'
 
-  # non-restful checkout stuff
-  patch '/checkout/update/:state', to: 'checkout#update', as: :update_checkout
-  get '/checkout/:state', to: 'checkout#edit', as: :checkout_state
-  get '/checkout', to: 'checkout#edit', as: :checkout
+    # non-restful checkout stuff
+    patch '/checkout/update/:state', to: 'checkout#update', as: :update_checkout
+    get '/checkout/:state', to: 'checkout#edit', as: :checkout_state
+    get '/checkout', to: 'checkout#edit', as: :checkout
 
-  get '/orders/populate', to: 'orders#populate_redirect'
+    resources :orders, except: [:index, :new, :create, :destroy]
 
-  resources :orders, except: [:index, :new, :create, :destroy] do
-    post :populate, on: :collection
-  end
+    resources :addresses, except: [:index, :show]
+
+    get '/cart', to: 'orders#edit', as: :cart
+    patch '/cart', to: 'orders#update', as: :update_cart
+    put '/cart/empty', to: 'orders#empty', as: :empty_cart
 
-  resources :addresses, except: [:show]
+    get '/content/cvv', to: 'content#cvv', as: :cvv
+    get '/content/test', to: 'content#test'
+    get '/cart_link', to: 'store#cart_link', as: :cart_link
+    get '/account_link', to: 'store#account_link', as: :account_link
 
-  get '/cart', to: 'orders#edit', as: :cart
-  patch '/cart', to: 'orders#update', as: :update_cart
-  put '/cart/empty', to: 'orders#empty', as: :empty_cart
+    get '/locales', to: 'locale#index', as: :locales
+    get '/locale/set', to: 'locale#set', as: :set_locale
+    get '/currency/set', to: 'currency#set', as: :set_currency
 
-  # route globbing for pretty nested taxon and product paths
-  get '/t/*id', to: 'taxons#show', as: :nested_taxons
-  get '/product_carousel/:id', to: 'taxons#product_carousel'
+    get '/api_tokens', to: 'store#api_tokens'
+    post '/ensure_cart', to: 'store#ensure_cart'
 
-  get '/unauthorized', to: 'home#unauthorized', as: :unauthorized
-  get '/content/cvv', to: 'content#cvv', as: :cvv
-  get '/content/test', to: 'content#test'
-  get '/cart_link', to: 'store#cart_link', as: :cart_link
-  get '/account_link', to: 'store#account_link', as: :account_link
+    get '/pages/:slug', to: 'cms_pages#show', as: :page
 
-  get '/api_tokens', to: 'store#api_tokens'
-  post '/ensure_cart', to: 'store#ensure_cart'
-  get '/products/:id/related', to: 'products#related'
+    get '/forbidden', to: 'errors#forbidden', as: :forbidden
+    get '/unauthorized', to: 'errors#unauthorized', as: :unauthorized
+  end
 end