spree_frontend 4.2.0.rc3 → 4.2.2

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

@@ -6,7 +6,7 @@
       <%= Spree.t(:ending_in) %> <%= source.last_digits %>
     <% end %>
   </span>
-  <br />
+  <br>
   <span class="full-name"><%= source.name %></span>
 <% else %>
   <%= content_tag(:span, payment.payment_method.name) %>
@@ -14,4 +14,4 @@
 
 <span class="payment-amount">(<%= payment.display_amount %>)</span>
 
-<br />
+<br>

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

@@ -1,8 +1,8 @@
 <td>
   <% payment_sources.each do |payment_source| %>
     <%= payment_source.class.to_s.underscore.split('/').second.humanize.titleize %>
-    <br/>
+    <br>
     <%= payment_source.last_digits.rjust(16, '*') %>
-    <br/>
+    <br>
   <% end %>
 </td>

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

@@ -1,5 +1,5 @@
 <div class="modal product-added-modal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog modal-lg" role="document" >
+  <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header pb-0 px-4 pt-4 border-0">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -34,7 +34,7 @@
           </div>
           <div class="row pt-5 justify-content-center align-items-center product-added-modal-product">
             <div class="col-4 col-sm-2 product-added-modal-product-image-container">
-              <img class="product-added-modal-product-image-container-image" src="data:," alt="<%= @product.name %>">
+              <img class="product-added-modal-product-image-container-image" src="data:," alt="<%= @product&.name %>">
             </div>
             <div class="col-8 col-sm-6 col-lg-4 py-1 product-added-modal-product-details">
               <div class="product-added-modal-product-details-name"></div>
@@ -48,7 +48,7 @@
           <div class="row pb-4 justify-content-center">
             <div class="col-12 col-lg-8">
               <%= link_to spree.checkout_path, class: 'btn btn-primary w-100 font-weight-bold text-uppercase product-added-modal-button', method: :get do %>
-                <%= Spree.t('pdp.checkout') %>
+                <%= Spree.t(:checkout) %>
               <% end %>
             </div>
           </div>

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

@@ -5,8 +5,7 @@
                        title: Spree.t(:search),
                        autofocus: true,
                        'aria-label': Spree.t(:search),
-                       class: " border-0 p-3"
-  %>
+                       class: " border-0 p-3" %>
   <button type="submit" class="btn border-0 p-0" aria-label="Submit">
     <%= icon(name: 'search',
             classes: 'd-inline',

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

@@ -1,11 +1,11 @@
 <script>
   window.addEventListener('turbolinks:load', function() {
       Spree.translations = <%==
-    {
-      coupon_code_applied: Spree.t(:coupon_code_applied),
-      coupon_code_removed: Spree.t(:coupon_code_removed),
-      coupon_code_error_icon: image_path('error.svg')
-    }.to_json
-  %>
+        {
+          coupon_code_applied: Spree.t(:coupon_code_applied),
+          coupon_code_removed: Spree.t(:coupon_code_removed),
+          coupon_code_error_icon: image_path('error.svg')
+        }.to_json
+                           %>
   });
 </script>

data/app/views/spree/shared/carousel/_single.html.erb

@@ -4,15 +4,13 @@
   data-product-carousel-group-identifier="<%= group_id %>"
   data-variant-change-trigger-identifier="<%= trigger_id %>"
   data-interval="false"
-  data-hook
->
+  data-hook>
   <% if images.length > 1 %>
     <a
       class="d-none d-md-flex h-100 justify-content-center align-items-center product-carousel-control position-absolute product-carousel-control--previous"
       href="#<%= id %>"
       role="button"
-      data-slide="prev"
-    >
+      data-slide="prev">
       <span class="d-flex justify-content-center align-items-center product-carousel-control-rounded" aria-hidden="true">
         <%= icon(name: 'arrow-right',
                 classes: 'spree-icon-arrow spree-icon-arrow-left',
@@ -26,8 +24,7 @@
       class="d-none d-md-flex h-100 justify-content-center align-items-center product-carousel-control position-absolute product-carousel-control--next"
       href="#<%= id %>"
       role="button"
-      data-slide="next"
-    >
+      data-slide="next">
       <span class="d-flex justify-content-center align-items-center product-carousel-control-rounded" aria-hidden="true">
         <%= icon(name: 'arrow-right',
                 classes: 'spree-icon-arrow spree-icon-arrow-right',
@@ -47,8 +44,7 @@
       <div
         class="carousel-item product-carousel-item<%= ' active' if imageIndex == 0 %>"
         data-variant-is-master="<%= image.viewable_id == @product.master_id %>"
-        data-variant-id="<%= image.viewable_id %>"
-      >
+        data-variant-id="<%= image.viewable_id %>">
         <div class="product-carousel-item-squared <%= 'product-carousel-item-squared-only' if images.length == 1 %>">
           <% image_attrs = {
             src: main_app.url_for(image.url(zoomed ? :zoomed : :large)),
@@ -57,7 +53,7 @@
             width: zoomed ? 650 : 475,
             height: zoomed ? 870 : 594
           } %>
-          <%= imageIndex.zero? ? image_tag(image_attrs.delete(:src), image_attrs) : lazy_image(image_attrs) %>
+          <%= imageIndex.zero? ? image_tag(image_attrs.delete(:src), image_attrs) : lazy_image(**image_attrs) %>
         </div>
       </div>
     <% end %>
@@ -68,8 +64,7 @@
       <li
         data-target="#<%= id %>"
         data-slide-to="<%= imageIndex %>"
-        class="product-carousel-indicators-indicator product-carousel-indicators-indicator--visible<%= ' active' if imageIndex == 0 %>"
-      >
+        class="product-carousel-indicators-indicator product-carousel-indicators-indicator--visible<%= ' active' if imageIndex == 0 %>">
         <%= lazy_image(
           src: main_app.url_for(image.url(:pdp_thumbnail)),
           class: 'd-block w-100',

data/app/views/spree/shared/carousel/_thumbnails.html.erb

@@ -6,8 +6,7 @@
   data-product-carousel-per-page="<%= per_page %>"
   data-product-carousel-is-slave="true"
   data-interval="false"
-  data-hook
->
+  data-hook>
   <div class="carousel-inner order-1 h-100">
   <% images.each_with_index do |image, image_index| %>
       <% if image_index % per_page == 0 %>
@@ -19,16 +18,13 @@
                 class="product-thumbnails-carousel-item-single product-thumbnails-carousel-item-single--visible"
                 data-product-carousel-to-slide="<%= image_index %>"
                 data-variant-is-master="<%= image.viewable_id == @product.master_id %>"
-                data-variant-id="<%= image.viewable_id %>"
-              >
+                data-variant-id="<%= image.viewable_id %>">
                 <%= lazy_image(
                   src: main_app.url_for(image.url(:pdp_thumbnail)),
                   class: 'd-block w-100',
                   alt: image.alt || @product.name,
                   width: 57,
-                  height: 70
-                )
-                %>
+                  height: 70) %>
               </div>
       <% if (image_index + 1) % per_page == 0 || (image_index + 1) == images.length %>
             </div>
@@ -42,8 +38,7 @@
       class="d-none d-sm-flex order-0 justify-content-center w-100 product-thumbnails-carousel-previous"
       href="#<%= id %>"
       role="button"
-      data-slide="prev"
-    >
+      data-slide="prev">
       <span aria-hidden="true">
         <%= icon(name: 'arrow-right',
                 classes: 'spree-icon-arrow spree-icon-arrow-up',
@@ -56,8 +51,7 @@
       class="d-none d-sm-flex order-2 justify-content-center w-100 product-thumbnails-carousel-next"
       href="#<%= id %>"
       role="button"
-      data-slide="next"
-    >
+      data-slide="next">
       <span aria-hidden="true">
         <%= icon(name: 'arrow-right',
                 classes: 'spree-icon-arrow spree-icon-arrow-down',

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

@@ -6,6 +6,5 @@
     <%= icon(name: 'garbage_2',
              classes: '',
              width: 24,
-             height: 24)
-    %>
+             height: 24) %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <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">
@@ -41,7 +41,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">
@@ -57,7 +57,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>
@@ -73,7 +73,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/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.allowed_parameters = [:keywords, :page, :search, :taxon]
+  config.allowed_parameters = [:keywords, :search, :taxon]
 end

data/config/routes.rb

@@ -1,40 +1,36 @@
 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]
+    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'
 
-  get '/locale/set', to: 'locale#set'
+    # 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
+    resources :orders, except: [:index, :new, :create, :destroy]
 
-  get '/orders/populate', to: 'orders#populate_redirect'
+    resources :addresses, except: [:show]
 
-  resources :orders, except: [:index, :new, :create, :destroy] do
-    post :populate, on: :collection
-  end
-
-  resources :addresses, except: [: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
+    get '/cart', to: 'orders#edit', as: :cart
+    patch '/cart', to: 'orders#update', as: :update_cart
+    put '/cart/empty', to: 'orders#empty', as: :empty_cart
 
-  # 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 '/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 '/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 '/locales', to: 'locale#index', as: :locales
+    get '/locale/set', to: 'locale#set', as: :set_locale
+    get '/currency/set', to: 'currency#set', as: :set_currency
 
-  get '/api_tokens', to: 'store#api_tokens'
-  post '/ensure_cart', to: 'store#ensure_cart'
-  get '/products/:id/related', to: 'products#related'
-
-  get '/currency/set', to: 'currency#set', defaults: { format: :json }, as: :set_currency
+    get '/api_tokens', to: 'store#api_tokens'
+    post '/ensure_cart', to: 'store#ensure_cart'
+  end
 end

data/lib/generators/spree/frontend/copy_storefront/copy_storefront_generator.rb

@@ -1,24 +1,18 @@
 module Spree
   module Frontend
     class CopyStorefrontGenerator < Rails::Generators::Base
-      desc 'Copies storefront from spree frontend to your application'
+      desc 'Copies all storefront views and stylesheets from spree frontend to your application'
 
       def self.source_paths
         [
           File.expand_path('../../../../../app', __dir__),
-          File.expand_path('../../../../../app/assets/images', __dir__),
           File.expand_path('../../../../../app/assets/stylesheets/spree/frontend', __dir__),
-          File.expand_path('../../../../../app/assets/stylesheets/spree/frontend/variables', __dir__)
         ]
       end
 
       def copy_storefront
         directory 'views', './app/views'
-        directory 'noimage', './app/assets/images/noimage'
-        directory 'homepage', './app/assets/images/homepage'
-        directory 'meganav', './app/assets/images/meganav'
         template 'application.scss', './app/assets/stylesheets/spree/frontend/application.scss'
-        template 'variables.scss', './app/assets/stylesheets/spree/frontend/variables/variables.scss'
       end
     end
   end

data/lib/generators/spree/frontend/install/install_generator.rb

@@ -0,0 +1,34 @@
+module Spree
+  module Frontend
+    module Generators
+      class InstallGenerator < Rails::Generators::Base
+        desc 'Copies storefront configuration files for easy customization'
+
+        def self.source_paths
+          [
+            File.expand_path('templates', __dir__),
+            File.expand_path('../templates', "../#{__FILE__}"),
+            File.expand_path('../templates', "../../#{__FILE__}"),
+            File.expand_path('../../../../../app/views/spree', __dir__),
+            File.expand_path('../../../../../app/assets/images', __dir__),
+            File.expand_path('../../../../../app/assets/stylesheets/spree/frontend/variables', __dir__)
+          ]
+        end
+
+        def install
+          # main navigation configuration
+          template 'config/initializers/spree_storefront.rb', 'config/initializers/spree_storefront.rb'
+          template 'config/spree_storefront.yml', 'config/spree_storefront.yml'
+          # static images
+          directory 'noimage', './app/assets/images/noimage'
+          directory 'homepage', './app/assets/images/homepage'
+          directory 'meganav', './app/assets/images/meganav'
+          # SCSS theming
+          template 'variables.scss', './app/assets/stylesheets/spree/frontend/variables/variables.scss'
+          # home page template
+          directory 'home', './app/views/spree/home'
+        end
+      end
+    end
+  end
+end

data/lib/generators/spree/frontend/install/templates/config/initializers/spree_storefront.rb

@@ -0,0 +1 @@
+SpreeStorefrontConfig = YAML.load_file(Rails.root.join('config', 'spree_storefront.yml')).with_indifferent_access

data/lib/generators/spree/frontend/install/templates/config/spree_storefront.yml

@@ -0,0 +1,99 @@
+default:
+  navigation:
+    - title: Women
+      subtitle: Categories
+      url: /t/women
+      items:
+        - :title: Skirts
+          :url: /t/women/skirts
+        - :title: Dresses
+          :url: /t/women/dresses
+        - :title: Shirts and Blouses
+          :url: /t/women/shirts-and-blouses
+        - :title: Sweaters
+          :url: /t/women/sweaters
+        - :title: Tops and T-shirts
+          :url: /t/women/tops-and-t-shirts
+        - :title: Jackets and Coats
+          :url: /t/women/jackets-and-coats
+      promo_banners:
+        - subtitle: New collection
+          title: Summer 2021
+          url: /t/new-collection/summer-2021
+          image: 'meganav/promo_banner_left-first-category.jpg'
+        - subtitle: Special Offers
+          title: Get up to 30% off
+          url: /t/special-offers/30-percent-off
+          image: 'meganav/promo_banner_right-first-category.jpg'
+    - title: Men
+      subtitle: Categories
+      url: /t/men
+      items:
+        - :title: Shirts
+          :url: /t/men/shirts
+        - :title: T-shirts
+          :url: /t/men/t-shirts
+        - :title: Sweaters
+          :url: /t/men/sweaters
+        - :title: Jackets and Coats
+          :url: /t/men/jackets-and-coats
+      promo_banners:
+        - subtitle: New collection
+          title: Summer 2021
+          url: /t/new-collection/summer-2021
+          image: 'meganav/promo_banner_left-second-category.jpg'
+        - subtitle: Special Offers
+          title: Get up to 30% off
+          url: /t/special-offers/30-percent-off
+          image: 'meganav/promo_banner_right-second-category.jpg'
+    - title: Sportswear
+      subtitle: Categories
+      url: /t/sportswear
+      items:
+        - :title: Tops
+          :url: /t/sportswear/tops
+        - :title: Sweatshirts
+          :url: /t/sportswear/sweatshirts
+        - :title: Pants
+          :url: /t/sportswear/pants
+      promo_banners:
+        - subtitle: New collection
+          title: Summer 2021
+          url: /t/new-collection/summer-2021
+          image: 'meganav/promo_banner_left-third-category.jpg'
+        - subtitle: Special Offers
+          title: Get up to 30% off
+          url: /t/special-offers/30-percent-off
+          image: 'meganav/promo_banner_right-third-category.jpg'
+fr:
+  navigation:
+    - title: Femmes
+      url: /fr/t/women
+      promo_banners:
+        - subtitle: Nouvelle collection
+          title: Été 2021
+          url: /fr/t/new-collection/summer-2021
+          image: 'meganav/promo_banner_left-first-category.jpg'
+        - subtitle: Offres spéciales
+          url: /fr/t/special-offers/30-percent-off
+          image: 'meganav/promo_banner_right-first-category.jpg'
+    - title: Hommes
+      url: /fr/t/men
+      promo_banners:
+        - subtitle: Nouvelle collection
+          title: Été 2021
+          url: /fr/t/new-collection/summer-2021
+          image: 'meganav/promo_banner_left-second-category.jpg'
+        - subtitle: Offres spéciales
+          url: /fr/t/special-offers/30-percent-off
+          image: 'meganav/promo_banner_right-second-category.jpg'
+    - title: Vêtements de sport
+      url: /fr/t/sportswear
+      promo_banners:
+        - subtitle: Nouvelle collection
+          title: Été 2021
+          url: /fr/t/new-collection/summer-2021
+          image: 'meganav/promo_banner_left-third-category.jpg'
+        - subtitle: Offres spéciales
+          url: /fr/t/special-offers/30-percent-off
+          image: 'meganav/promo_banner_right-third-category.jpg'