spree_frontend 4.2.0.beta → 4.2.0.rc5

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">

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.html.erb

@@ -1,21 +1,17 @@
-<div class="d-flex align-items-start justify-content-between">
-  <div class="row">
-    <address class="mb-0 col-12">
-      <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>
+<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 class="d-flex ml-2">
-    <div role="button" class="bg-transparent border-0 px-1 mr-1 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>
-    <%= link_to spree.edit_address_path(address), method: :get, class: 'address-button px-1', role: 'button', data: { hook: 'edit_address' } do %>
-      <%= inline_svg_tag 'edit.svg', class: "delete-address-img" %>
-    <% end %>
+  <div>
+    <%= "#{address.city}, #{address.state_text} #{address.zipcode}" %>,
   </div>
-</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: { turbolinks: 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,12 +1,12 @@
 <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(:account_info) %>
-        <%= 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" %>
+          <%= 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>
@@ -18,18 +18,21 @@
       </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 +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">
@@ -71,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.whitelisted_parameters = [:keywords, :page, :search, :taxon]
+  config.allowed_parameters = [:keywords, :page, :search, :taxon]
 end

data/config/routes.rb

@@ -26,7 +26,6 @@ Spree::Core::Engine.add_routes do
   get '/t/*id', to: 'taxons#show', as: :nested_taxons
   get '/product_carousel/:id', to: 'taxons#product_carousel'
 
-  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

data/spree_frontend.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_api', s.version
   s.add_dependency 'spree_core', s.version
 
-  s.add_dependency 'bootstrap',       '>= 4.3.1', '< 4.6.0'
+  s.add_dependency 'bootstrap',       '>= 4.3.1', '< 4.7.0'
   s.add_dependency 'glyphicons',      '~> 1.0.2'
-  s.add_dependency 'canonical-rails', '~> 0.2.5'
+  s.add_dependency 'canonical-rails', '~> 0.2.10'
   s.add_dependency 'inline_svg',      '~> 1.5'
   s.add_dependency 'jquery-rails',    '~> 4.3'
   s.add_dependency 'turbolinks',      '~> 5.2.0'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta
+  version: 4.2.0.rc5
 platform: ruby
 authors:
 - Sean Schofield
 - Spark Solutions
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc5
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc5
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -48,7 +48,7 @@ dependencies:
         version: 4.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
         version: 4.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: glyphicons
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.10
 - !ruby/object:Gem::Dependency
   name: inline_svg
   requirement: !ruby/object:Gem::Requirement
@@ -487,6 +487,7 @@ files:
 - app/assets/images/homepage/promo_banner_right_mobile.jpg
 - app/assets/images/homepage/promo_banner_right_tablet_landscape.jpg
 - app/assets/images/homepage/promo_banner_right_tablet_portrait.jpg
+- app/assets/images/info.svg
 - app/assets/images/instagram.svg
 - app/assets/images/logo-spree.png
 - app/assets/images/logo.png
@@ -570,7 +571,6 @@ files:
 - app/assets/javascripts/spree/frontend/views/spree/shared/variant_select.js
 - app/assets/javascripts/spree/lazysizes.config.js
 - app/assets/stylesheets/spree/frontend.css
-- app/assets/stylesheets/spree/frontend/address_book.scss
 - app/assets/stylesheets/spree/frontend/application.scss
 - app/assets/stylesheets/spree/frontend/bootstrap-patches.scss
 - app/assets/stylesheets/spree/frontend/components-bootstrap/.gitkeep
@@ -648,6 +648,7 @@ files:
 - app/controllers/spree/store_controller.rb
 - app/controllers/spree/taxons_controller.rb
 - app/helpers/spree/addresses_helper.rb
+- app/helpers/spree/cache_helper.rb
 - app/helpers/spree/frontend_helper.rb
 - app/helpers/spree/navigation_helper.rb
 - app/helpers/spree/orders_helper.rb
@@ -672,6 +673,7 @@ files:
 - app/views/spree/checkout/_delivery.html.erb
 - app/views/spree/checkout/_delivery_informations.html.erb
 - app/views/spree/checkout/_payment.html.erb
+- app/views/spree/checkout/_payment_sources.html.erb
 - app/views/spree/checkout/_summary.html.erb
 - app/views/spree/checkout/edit.html.erb
 - app/views/spree/checkout/payment/_check.html.erb
@@ -711,7 +713,6 @@ files:
 - app/views/spree/products/_sort_mobile.html.erb
 - app/views/spree/products/_taxons.html.erb
 - app/views/spree/products/_thumbnails.html.erb
-- app/views/spree/products/_vendor_info.html.erb
 - app/views/spree/products/index.html.erb
 - app/views/spree/products/related.html.erb
 - app/views/spree/products/show.html.erb
@@ -755,13 +756,12 @@ files:
 - app/views/spree/shared/_user_form.html.erb
 - app/views/spree/shared/carousel/_single.html.erb
 - app/views/spree/shared/carousel/_thumbnails.html.erb
-- app/views/spree/shared/forbidden.html.erb
-- app/views/spree/shared/unauthorized.html.erb
 - app/views/spree/taxons/_header.html.erb
 - app/views/spree/taxons/_subcategories.html.erb
 - app/views/spree/taxons/product_carousel.html.erb
 - app/views/spree/taxons/show.html.erb
 - app/views/spree/users/_address.html.erb
+- app/views/spree/users/_address_controls.html.erb
 - app/views/spree/users/edit.html.erb
 - app/views/spree/users/show.html.erb
 - config/initializers/assets.rb
@@ -782,10 +782,10 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.beta
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc5
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.beta
-post_install_message: 
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc5
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -801,8 +801,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.
 test_files: []