spree_frontend 3.1.0 → 4.7.0

data/app/views/spree/products/_filters_desktop.html.erb

@@ -0,0 +1,98 @@
+<% cache filters_cache_key('desktop') do %>
+  <div id="plp-filters-accordion" class="d-none d-lg-block col-lg-3 pr-5 position-sticky h-100 plp-filters" data-hook="taxon_sidebar_navigation">
+    <%= clear_all_filters_link(permitted_params) if product_filters_present?(permitted_params) %>
+
+    <div class="plp-filters-scroller">
+      <% available_option_types.each do |option_type| %>
+        <div class="w-100 card plp-filters-card">
+          <% ot_filter_param = option_type.filter_param %>
+          <% option_type_name = ot_filter_param.titleize %>
+          <% collapsed = params[ot_filter_param].blank? %>
+
+          <button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= ot_filter_param %>" data-toggle="collapse" data-target="#collapseFilter<%= ot_filter_param %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= ot_filter_param %>" role="heading" aria-level="2">
+            <%= option_type.presentation %>
+            <%= icon(name: 'plus',
+                    classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
+                    width: 16,
+                    height: 16) %>
+            <%= icon(name: 'minus',
+                    classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--minus',
+                    width: 16,
+                    height: 16) %>
+          </button>
+          <div id="collapseFilter<%= ot_filter_param %>" class="collapse <%= 'show' unless collapsed %>" aria-labelledby="filters<%= ot_filter_param %>">
+            <div class="card-body px-0 pt-1">
+              <%= render 'spree/shared/option_values',
+                option_type: option_type,
+                permitted_params: permitted_params %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+
+      <% available_properties.each do |property| %>
+        <% if property.uniq_values.present? %>
+          <div class="w-100 card plp-filters-card">
+            <% property_name = property.name %>
+            <% collapsed = params.dig(:properties, property.filter_param).blank? %>
+            <button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= property_name %>" data-toggle="collapse" data-target="#collapseFilter<%= property_name %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= property_name %>" role="heading" aria-level="2">
+              <%= property.presentation %>
+              <%= icon(name: 'plus',
+                      classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
+                      width: 16,
+                      height: 16) %>
+              <%= icon(name: 'minus',
+                      classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--minus',
+                      width: 16,
+                      height: 16) %>
+            </button>
+            <div id="collapseFilter<%= property_name %>" class="collapse <%= 'show' unless collapsed %>" aria-labelledby="filters<%= property_name %>">
+              <div class="card-body px-0 pt-1">
+                <%= render 'spree/shared/properties',
+                  params_property_name: params[property_name],
+                  property: property,
+                  permitted_params: permitted_params,
+                  property_name: property_name
+                %>
+              </div>
+            </div>
+          </div>
+        <% end %>
+      <% end %>
+
+      <% price_collapsed = params[:price].blank? %>
+      <div class="w-100 card plp-filters-card">
+        <button class="card-header text-capitalize <%= 'collapsed' if price_collapsed %> px-1 plp-filters-card-header" id="filtersPrice" data-toggle="collapse" data-target="#collapseFilterPrice" aria-expanded="<% !price_collapsed %>" aria-controls="collapseFilterPrice" role="heading" aria-level="2">
+          <%= Spree.t('plp.price') %>
+          <%= icon(name: 'plus',
+                  classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
+                  width: 16,
+                  height: 16) %>
+          <%= icon(name: 'minus',
+                  classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--minus',
+                  width: 16,
+                  height: 16) %>
+        </button>
+        <div id="collapseFilterPrice" class="collapse <%= 'show' unless price_collapsed %>" aria-labelledby="filtersPrice">
+          <div class="card-body px-0 pt-1">
+            <% price_filters.each do |price_range| %>
+              <%= price_filter_link(price_range, permitted_params) %>
+            <% end %>
+
+            <div id="filterPriceRangeDesktop" class="m-1">
+              <div class="d-inline-flex mb-2">
+                <%= min_price_filter_input class: 'w-50 p-2 mr-1' %>
+                <%= max_price_filter_input class: 'w-50 p-2' %>
+              </div>
+
+              <%= link_to Spree.t('plp.done'), permitted_params, class: 'btn btn-primary spree-btn w-100', data: { params: permitted_params } %>
+            </div>
+          </div>
+        </div>
+      </div>
+      <% additional_filters_partials.each do |partial| %>
+        <%= render "spree/products/filters/#{partial}", permitted_params: permitted_params %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/products/_filters_mobile.html.erb

@@ -0,0 +1,94 @@
+<% is_visible = params[:menu_open] ? 'block' : 'none' %>
+
+<div id="filter-by-overlay" class="d-lg-none plp-overlay" style="display: <%= is_visible %>;">
+  <% cache filters_cache_key('mobile') do %>
+    <div class="plp-scroll">
+      <div class="container">
+        <div class="plp-overlay-header">
+          <%= Spree.t('plp.filter_by') %>
+          <%= inline_svg_tag 'close.svg', id: 'filter-by-overlay-hide-button' %>
+        </div>
+      </div>
+      <div id="filters-accordion">
+        <% available_option_types.each do |option_type| %>
+          <% option_type_name = option_type.filter_param %>
+          <% ot_downcase_name = option_type_name.downcase %>
+
+          <div class="card plp-overlay-card">
+            <div class="card-header text-uppercase <%= 'collapsed' if params[ot_downcase_name].blank? %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= option_type_name %>" data-target="#collapseFilterMobile<%= option_type_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= option_type_name %>" role="heading" aria-level="3">
+              <%= option_type.presentation %>
+              <%= icon(name: 'arrow-right',
+                      classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',
+                      width: 16,
+                      height: 16) %>
+            </div>
+            <div id="collapseFilterMobile<%= option_type_name %>" class="collapse <%= 'show' unless params[ot_downcase_name].blank? %>" aria-labelledby="filtersMobile<%= option_type_name %>" data-parent="#filters-accordion">
+              <div class="card-body pt-1">
+                <%= render 'spree/shared/option_values', params_ot_downcase_name: params[ot_downcase_name], option_type: option_type, permitted_params: permitted_params, ot_downcase_name: ot_downcase_name %>
+              </div>
+            </div>
+          </div>
+        <% end %>
+
+        <% available_properties.each do |property| %>
+          <% if property.uniq_values.present? %>
+            <% property_name = property.name %>
+            <% collapsed = params.dig(:properties, property.filter_param).blank? %>
+            <div class="card plp-overlay-card">
+              <div class="card-header text-uppercase <%= 'collapsed' if collapsed %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= property_name %>" data-target="#collapseFilterMobile<%= property_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= property_name %>" role="heading" aria-level="3">
+                <%= property.presentation %>
+                <%= icon(name: 'arrow-right',
+                         classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',
+                         width: 16,
+                         height: 16) %>
+              </div>
+              <div id="collapseFilterMobile<%= property_name %>" class="collapse <%= 'show' unless collapsed %>" aria-labelledby="filtersMobile<%= property_name %>" data-parent="#filters-accordion">
+                <div class="card-body pt-1">
+                  <%= render 'spree/shared/properties',
+                             params_property_name: params[property_name],
+                             property: property,
+                             permitted_params: permitted_params,
+                             property_name: property_name
+                  %>
+                </div>
+              </div>
+            </div>
+          <% end %>
+        <% end %>
+
+        <div class="card plp-overlay-card">
+          <div class="card-header text-uppercase <%= 'collapsed' if params[:price].blank? %> plp-overlay-card-header" id="headingFour" data-toggle="collapse" data-target="#collapseFour" aria-expanded="true" aria-controls="collapseFour" role="heading" aria-level="3">
+            <%= Spree.t('plp.price') %>
+            <%= icon(name: 'arrow-right',
+                    classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',
+                    width: 16,
+                    height: 16) %>
+          </div>
+          <div id="collapseFour" class="collapse <%= 'show' unless params[:price].blank? %>" aria-labelledby="headingFour" data-parent="#filters-accordion">
+            <div class="card-body pt-1">
+              <% price_filters.each do |price_range| %>
+                <%= price_filter_link(price_range, permitted_params) %>
+              <% end %>
+
+              <div id="filterPriceRangeMobile" class="m-1">
+                <div class="d-inline-flex">
+                  <%= min_price_filter_input class: 'w-50 p-2 mr-1' %>
+                  <%= max_price_filter_input class: 'w-50 p-2' %>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <% additional_filters_partials.each do |partial| %>
+          <%= render "spree/products/filters/mobile/#{partial}", permitted_params: permitted_params %>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+
+  <div class="container position-absolute text-center plp-overlay-buttons pt-3">
+    <%= clear_all_filters_link(permitted_params) %>
+    <%= link_to Spree.t('plp.done'), permitted_params, id: 'filterProductsButtonMobile', class: 'btn btn-primary spree-btn w-100 done-btn', data: { params: permitted_params } %>
+  </div>
+</div>

data/app/views/spree/products/_gallery.html.erb

@@ -0,0 +1,25 @@
+<div class="col-12 col-md-7 col-lg-7" data-hook="product_left_part">
+  <% if @product_images.size > 0 %>
+    <div
+      class="w-100 d-flex align-self-start justify-content-between product-details-images"
+      data-hook="product_left_part_wrap">
+
+      <div class="d-none d-md-block product-details-thumbnails" data-hook="product_thumbnails">
+        <%= render 'spree/shared/carousel/thumbnails',
+                  images: @product_images,
+                  group_id: 'main-product-carousel',
+                  id: 'productThumbnailsCarousel',
+                  trigger_id: 'productCarousel',
+                  per_page: 5 %>
+      </div>
+      <div class="product-details-single" data-hook="product_images">
+        <%= render 'spree/shared/carousel/single',
+                  images: @product_images,
+                  group_id: 'main-product-carousel',
+                  id: 'productCarousel',
+                  trigger_id: 'productCarousel',
+                  zoomed: false %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/products/_gallery_modal.html.erb

@@ -0,0 +1,42 @@
+<% if @product_images.size > 0 %>
+  <div class="modal fade" id="picturesModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog--zoom modal-dialog mw-100 vh-100 mt-0 mb-0" role="document">
+      <div class="modal-content h-100">
+        <div class="modal-body h-100">
+          <button type="button" class="close position-absolute mr-3" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">
+              <%= icon(name: 'close',
+                       classes: 'd-block d-lg-none',
+                       width: 16,
+                       height: 16) %>
+              <%= icon(name: 'close',
+                       classes: 'd-none d-lg-block',
+                       width: 30,
+                       height: 30) %>
+            </span>
+          </button>
+          <div class="d-flex justify-content-center align-items-center product-details-images h-100">
+            <% if @product_images.size > 1 %>
+              <div class="h-100 d-none d-sm-block product-details-thumbnails">
+                <%= render 'spree/shared/carousel/thumbnails',
+                            images: @product_images,
+                            group_id: 'main-product-modal-carousel',
+                            id: 'productModalThumbnailsCarousel',
+                            trigger_id: 'productCarousel',
+                            per_page: 4 %>
+              </div>
+            <% end %>
+            <div class="product-details-single">
+              <%= render 'spree/shared/carousel/single',
+                          images: @product_images,
+                          group_id: 'main-product-modal-carousel',
+                          id: 'productModalCarousel',
+                          trigger_id: 'productCarousel',
+                          zoomed: true %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/products/_no_results.html.erb

@@ -0,0 +1,14 @@
+<div class="container mt-lg-5">
+  <div class="text-center pt-lg-5">
+    <%= icon(name: 'search-no-results',
+             classes: 'plp-not-found-image mb-3',
+             width: 83,
+             height: 75) %>
+    <h6 class="plp-not-found-header mb-3 pb-sm-3 mt-sm-3 pt-sm-3 mt-lg-5 pt-lg-5 pb-lg-0"><%= Spree.t('plp.no_results_found') %></h6>
+    <p class="plp-not-found-text">
+      <%= Spree.t('plp.not_found_text1', keywords: params[:keywords]) %>
+      <br class="d-lg-none">
+      <%= Spree.t('plp.not_found_text2') %>
+    </p>
+  </div>
+</div>

data/app/views/spree/products/_no_results_with_filters.html.erb

@@ -0,0 +1,13 @@
+<%= render 'spree/products/filter_and_sort_mobile_buttons' %>
+<%= render 'spree/products/sort_desktop', permitted_params: permitted_params %>
+<div class="container d-md-flex">
+  <%= render 'spree/products/filters_desktop', permitted_params: permitted_params %>
+  <div class="text-lg-center col-md-12 col-lg-9">
+    <h6 class="plp-not-found-header pt-md-3 mb-3"><%= Spree.t('plp.no_results') %></h6>
+    <p class="plp-not-found-text pt-md-4">
+      <%= Spree.t('plp.not_found_filters1') %>
+      <br class="d-inline d-md-none d-lg-inline">
+      <%= Spree.t('plp.not_found_filters2') %>
+    </p>
+  </div>
+</div>

data/app/views/spree/products/_option_type.html.erb

@@ -0,0 +1,30 @@
+<div class="product-variants-variant" data-option-type-id="<%= option_type[:id] %>">
+  <span class="d-block mb-2 text-center text-md-left text-uppercase product-variants-variant-title">
+    <%= option_type[:presentation] %>
+  </span>
+
+  <div class="d-flex flex-wrap justify-content-center justify-content-md-start">
+    <ol class="d-flex flex-wrap product-variants-variant-values">
+      <% option_type[:option_values].each do |option_value| %>
+        <li>
+          <%= radio_button_tag "variant_option_value_id_#{option_type[:id]}",
+            option_value[:id],
+            option_value[:is_default] && index == 0,
+            class: "product-variants-variant-values-radio",
+            data: {
+              "option-type-index" => index,
+              "presentation" => option_value[:presentation],
+              "variant-id" => option_value[:variant_id]
+            } %>
+
+          <%= label_tag "variant_option_value_id_#{option_type[:id]}_#{option_value[:id]}",
+            class: "m-1 select-label",
+            "aria-label" => option_value[:presentation] do %>
+
+            <span><%= option_value[:presentation] %></span>
+          <% end %>
+        </li>
+      <% end %>
+    </ol>
+  </div>
+</div>

data/app/views/spree/products/_product.html.erb

@@ -0,0 +1,20 @@
+<% url = spree.product_path(product, taxon_id: taxon.try(:id)) %>
+<% price = product.price_in(current_currency).amount %>
+<div id="product_<%= product.id %>" class="d-flex w-100 col-12 col-sm-6 col-lg-4 col-xl-3 product-list-item mb-4" data-hook="products_list_item">
+  <div class="card w-100">
+    <% cache(taxon.present? ? [I18n.locale, current_currency, taxon&.id, product] : cache_key_for_product(product)) do %>
+      <div class="card-body text-center product-body">
+        <%= link_to url, class: 'd-block text-center' do %>
+          <%= small_image(product, class: "d-block mx-auto") %>
+          <%= content_tag(:span, truncate(product.name, length: 50), class: 'info mt-3 d-block', title: product.name) %>
+        <% end %>
+      </div>
+      <div class="card-footer text-center">
+        <span class="price selling lead" content="<%= price.nil? ? 0 : price.to_d %>">
+          <%= display_price(product) %>
+        </span>
+        <span content="<%= current_currency %>"></span>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/products/_promotions.html.erb

@@ -2,19 +2,28 @@
 
 <% if promotions.any? %>
   <div id="promotions">
-    <h3><%= Spree.t(:promotions) %></h3>
+    <h3 class="pt-4 font-weight-bold text-uppercase product-details-subtitle"><%= Spree.t(:promotions) %></h3>
     <% promotions.each do |promotion| %>
-    <div class="well well-sm">
-      <h4><%= promotion.name %></h4>
-      <p><%= promotion.description %></p>
-      <% if promotion.products.any? %>
-        <ul>
-          <% promotion.products.each do |product| %>
-            <li><%= link_to product.name, product_path(product) %></li>
-          <% end %>
-        </ul>
-      <% end %>
-    </div>
+      <div class="row">
+        <div class="col-12 col-md-7 col-lg-6 mb-3">
+          <div class="card">
+            <div class="card-body">
+              <h4><%= promotion.name %></h4>
+              <p><%= promotion.description %></p>
+              <% if promotion.products.any? %>
+                <span><%= Spree.t('pdp.products_included_in_promotion') %>:</span>
+              <% end %>
+            </div>
+            <% if promotion.products.any? %>
+              <div class="list-group list-group-flush">
+                <% promotion.products.each do |product| %>
+                  <%= link_to product.name, spree.product_path(product), class: 'list-group-item list-group-item-action' %>
+                <% end %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      </div>
     <% end %>
   </div>
 <% end %>

data/app/views/spree/products/_properties.html.erb

@@ -1,15 +1,13 @@
-<% unless @product_properties.empty? %>  
-  <h3 class="product-section-title"><%= Spree.t('properties')%></h3>
-  <table id="product-properties" class="table table-striped" data-hook>
-    <tbody>
-      <% @product_properties.each do |product_property| %>
-        <% css_class = cycle('even', 'odd', :name => "properties") %>
-        <tr class="<%= css_class %>">
-          <td><strong><%= product_property.property.presentation %></strong></td>
-          <td><%= product_property.value %></td>
-        </tr>
+<% unless @product_properties.blank? %>
+  <h3 class="pt-4 font-weight-bold text-uppercase product-details-subtitle"><%= Spree.t(:details) %></h3>
+  <ul id="product-properties" class="m-0 list-unstyled product-properies" data-hook>
+    <% @product_properties.each do |product_property| %>
+      <% if product_property.show_property? %>
+        <li>
+          <span class="font-weight-bold text-break"><%= product_property.property.presentation %>:</span>
+          <span class="text-break"><%= product_property.value %></span>
+        </li>
       <% end %>
-      <% reset_cycle('properties') %>
-    </tbody>
-  </table>
+    <% end %>
+  </ul>
 <% end %>

data/app/views/spree/products/_sort_desktop.html.erb

@@ -0,0 +1,36 @@
+<div class="container dropdown d-none d-lg-flex justify-content-end mt-5 pr-4 pb-3 plp-sort">
+  <a data-toggle="dropdown" class="plp-sort-header" href="#" role="button" aria-haspopup="true" aria-expanded="false">
+    <%= Spree.t("plp.#{ params[:sort_by].blank? ? 'sort_by': params[:sort_by].gsub('-', '_') }") %>
+    <%= icon(name: 'arrow-right',
+             classes: 'spree-icon-arrow spree-icon-arrow-up ml-3 plp-sort-header-arrow--up',
+             width: 18,
+             height: 18) %>
+    <%= icon(name: 'arrow-right',
+             classes: 'spree-icon-arrow spree-icon-arrow-down ml-3 plp-sort-header-arrow--down',
+             width: 18,
+             height: 18) %>
+  </a>
+  <div class="dropdown-menu text-right plp-sort-dropdown">
+    <ul class="pt-1 plp-sort-dropdown-ul">
+      <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by].blank? %>">
+        <%= link_to Spree.t('plp.default'), url_for(permitted_params.merge(sort_by: nil)), class: 'dropdown-item' %>
+      </li>
+      <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'name-a-z' %>">
+        <%= link_to Spree.t('plp.name_a_z'), url_for(permitted_params.merge(sort_by: 'name-a-z')), class: 'dropdown-item' %>
+      </li>
+    </li>
+    <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'name-z-a' %>">
+      <%= link_to Spree.t('plp.name_z_a'), url_for(permitted_params.merge(sort_by: 'name-z-a')), class: 'dropdown-item' %>
+    </li>
+    <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'newest-first' %>">
+      <%= link_to Spree.t('plp.newest_first'), url_for(permitted_params.merge(sort_by: 'newest-first')), class: 'dropdown-item' %>
+    </li>
+    <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'price-high-to-low' %>">
+      <%= link_to Spree.t('plp.price_high_to_low'), url_for(permitted_params.merge(sort_by: 'price-high-to-low')), class: 'dropdown-item' %>
+    </li>
+    <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'price-low-to-high' %>">
+      <%= link_to Spree.t('plp.price_low_to_high'), url_for(permitted_params.merge(sort_by: 'price-low-to-high')), class: 'dropdown-item' %>
+    </li>
+  </ul>
+</div>
+</div>

data/app/views/spree/products/_sort_mobile.html.erb

@@ -0,0 +1,59 @@
+<div id="sort-by-overlay" class="plp-overlay" style="display: none;">
+  <div class="container">
+    <div class="plp-overlay-header">
+      <%= Spree.t('plp.sort_by') %>
+      <%= inline_svg_tag 'close.svg', id: 'sort-by-overlay-hide-button' %>
+    </div>
+  </div>
+  <div class="plp-overlay-header-border"></div>
+  <ul class="pt-1 plp-overlay-ul">
+    <li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by].blank? %>">
+      <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: nil)) %>">
+        <div class="plp-empty-dot">
+          <div class="filled-dot"></div>
+        </div>
+        <%= Spree.t('plp.default') %>
+      </a>
+    </li>
+    <li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by] == 'name-a-z' %>">
+      <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'name-a-z')) %>">
+        <div class="plp-empty-dot">
+          <div class="filled-dot"></div>
+        </div>
+        <%= Spree.t('plp.name_a_z') %>
+      </a>
+    </li>
+    <li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by] == 'name-z-a' %>">
+      <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'name-z-a')) %>">
+        <div class="plp-empty-dot">
+          <div class="filled-dot"></div>
+        </div>
+        <%= Spree.t('plp.name_z_a') %>
+      </a>
+    </li>
+    <li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by] == 'newest-first' %>">
+      <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'newest-first')) %>">
+        <div class="plp-empty-dot">
+          <div class="filled-dot"></div>
+        </div>
+        <%= Spree.t('plp.newest_first') %>
+      </a>
+    </li>
+    <li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by] == 'price-high-to-low' %>">
+      <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'price-high-to-low')) %>">
+        <div class="plp-empty-dot">
+          <div class="filled-dot"></div>
+        </div>
+        <%= Spree.t('plp.price_high_to_low') %>
+      </a>
+    </li>
+    <li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by] == 'price-low-to-high' %>">
+      <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'price-low-to-high')) %>">
+        <div class="plp-empty-dot">
+          <div class="filled-dot"></div>
+        </div>
+        <%= Spree.t('plp.price_low_to_high') %>
+      </a>
+    </li>
+  </ul>
+</div>

data/app/views/spree/products/_taxons.html.erb

@@ -1,3 +1,4 @@
+<!-- FIXME: Should be removed if not used? -->
 <% if @product.taxons.present? %>
   <h3 class="product-section-title"><%= Spree.t(:look_for_similar_items) %></h3>
   <ul class="list-group" id="similar_items_by_taxon" data-hook>

data/app/views/spree/products/_thumbnails.html.erb

@@ -1,17 +1,17 @@
 <%# no need for thumbnails unless there is more than one image %>
 <% if (@product.images + @product.variant_images).uniq.size > 1 %>
-  <ul id="product-thumbnails" class="thumbnails list-inline" data-hook>
+  <ul id="product-thumbnails" class="thumbnails d-flex w-100 pl-0 my-4" data-hook>
     <% @product.images.each do |i| %>
-      <li class='tmb-all tmb-<%= i.viewable.id %>'>
-        <%= link_to(image_tag(i.attachment.url(:mini), class: "thumbnail"), i.attachment.url(:product)) %>
+      <li class='tmb-all mr-2 tmb-<%= i.viewable.id %>'>
+        <%= link_to(image_tag(main_app.cdn_image_url(i.url(:mini)), class: "img-thumbnail d-inline-block"), main_app.cdn_image_url(i.url(:product))) %>
       </li>
     <% end %>
 
     <% if @product.has_variants? %>
       <% @product.variant_images.each do |i| %>
         <% next if @product.images.include?(i) %>
-        <li class='vtmb tmb-<%= i.viewable.id %>'>
-          <%= link_to(image_tag(i.attachment.url(:mini), class: "thumbnail"), i.attachment.url(:product)) %>
+        <li class='vtmb mr-2 tmb-<%= i.viewable.id %>'>
+          <%= link_to(image_tag(main_app.cdn_image_url(i.url(:mini)), class: "img-thumbnail"), main_app.cdn_image_url(i.url(:product))) %>
         </li>
       <% end %>
     <% end %>

data/app/views/spree/products/index.html.erb

@@ -1,27 +1,48 @@
-<% if "spree/products" == params[:controller] && @taxon || !@taxonomies.empty? %>
-  <% content_for :sidebar do %>
-    <div data-hook="homepage_sidebar_navigation">
-      <% if "spree/products" == params[:controller] && @taxon %>
-        <%= render :partial => 'spree/shared/filters' %>
-      <% else %>
-        <%= render :partial => 'spree/shared/taxonomies' %>
-      <% end %>
-    </div>
-  <% end %>
-<% end %>
+<% permitted_params = permitted_products_params %>
+<% products_empty = @products.empty? %>
 
-<% if params[:keywords] %>
-  <div data-hook="search_results">
-    <% if @products.empty? %>
-      <h6 class="search-results-title"><%= Spree.t(:no_products_found) %></h6>
+<div data-hook="search_results">
+  <% if products_empty %>
+    <% if permitted_params[:keywords].present? && permitted_params.to_h.one? %>
+      <%= render 'spree/products/no_results' %>
     <% else %>
-      <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+      <%= render 'spree/products/no_results_with_filters', permitted_params: permitted_params %>
     <% end %>
-  </div>
-<% else %>
-  <div data-hook="homepage_products">
-    <% cache(cache_key_for_products) do %>
-      <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+  <% else %>
+    <% if params[:keywords] %>
+      <div class="container d-md-flex pt-md-5">
+        <div class="plp-results-text text-uppercase mx-md-auto py-md-5">
+          <%= "#{@products.total_count} #{Spree.t('plp.results_for')} '#{params[:keywords].upcase}'" %>
+        </div>
+      </div>
+    <% elsif not @taxon %>
+      <div id="no-taxon-banner">
+        <div class="container">
+          <%= lazy_image(
+            src: asset_path('homepage/products.jpg'),
+            alt: 'products-banner',
+            width: 1110,
+            height: 300,
+            class: 'w-100 d-none d-md-block'
+          ) %>
+        </div>
+      </div>
     <% end %>
-  </div>
+
+    <%= render 'spree/products/filter_and_sort_mobile_buttons' %>
+    <%= render 'spree/products/sort_desktop', permitted_params: permitted_params %>
+    <div class="container mb-3 d-md-flex">
+      <%= render 'spree/products/filters_desktop', permitted_params: permitted_params %>
+      <%= render 'spree/shared/products', products: @products %>
+    </div>
+  <% end %>
+</div>
+
+<%= render 'spree/products/filters_mobile', permitted_params: permitted_params %>
+<%= render 'spree/products/sort_mobile', permitted_params: permitted_params %>
+
+<% unless products_empty %>
+  <% cache cache_key_for_products(@products, 'json-ld') do %>
+    <%= products_structured_data(@products) %>
+  <% end %>
 <% end %>

data/app/views/spree/products/related.html.erb

@@ -0,0 +1,14 @@
+<% if product_relation_types.any? %>
+  <div id="related-products">
+    <% product_relation_types.each do |relation_type| %>
+      <% products = product_relations_by_type(relation_type) %>
+
+      <% if products.any? %>
+        <div class="product-details-related" id="product-details-related-<%= relation_type.id %>">
+          <p class="font-weight-bold text-center text-uppercase product-details-carousel-text"><%= relation_type.name %></p>
+          <%= render 'spree/shared/carousel_4_products', id: "related-products-carousel-#{relation_type.id}", products: products %>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>