Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Adjust main_nav_bar to allow creation of multiple categories.

Matthew Kennedya13915c5b7c6
diff --git a/backend/app/assets/javascripts/spree/backend/menus/menu.es6 b/backend/app/assets/javascripts/spree/backend/menus/menu.es6
index 3d71188c89..0e1f55eb2e 100644
--- a/backend/app/assets/javascripts/spree/backend/menus/menu.es6
+++ b/backend/app/assets/javascripts/spree/backend/menus/menu.es6
@@ -3,7 +3,7 @@
document.addEventListener('DOMContentLoaded', function() {
const menuItemSortable = {
group: {
- name: 'sortable-menu-sub',
+ name: 'sortable-menu',
pull: true,
put: true
},
diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rb
index 36f9b8f7eb..979e81ee66 100644
--- a/core/app/models/spree/menu_item.rb
+++ b/core/app/models/spree/menu_item.rb
@@ -9,9 +9,6 @@ module Spree
before_save :reset_link_attributes
- after_save :touch_ancestors
- after_touch :touch_ancestors
-
has_one_attached :image_asset
ITEM_TYPE = %w[Link Promotion Container]
@@ -38,9 +35,5 @@ module Spree
self.url = nil
end
end
-
- def touch_ancestors
- ancestors.update_all(updated_at: Time.current)
- end
end
end
diff --git a/core/db/migrate/20210408092939_create_spree_menu_items.rb b/core/db/migrate/20210408092939_create_spree_menu_items.rb
index 72a00e983d..5c3b87221f 100644
--- a/core/db/migrate/20210408092939_create_spree_menu_items.rb
+++ b/core/db/migrate/20210408092939_create_spree_menu_items.rb
@@ -22,6 +22,7 @@ class CreateSpreeMenuItems < ActiveRecord::Migration[6.0]
add_index :spree_menu_items, :lft
add_index :spree_menu_items, :rgt
+ add_index :spree_menu_items, :depth
add_index :spree_menu_items, :parent_id
add_index :spree_menu_items, :item_type
add_index :spree_menu_items, :code
diff --git a/frontend/app/assets/stylesheets/spree/frontend/views/spree/shared/category_nav_bar.scss b/frontend/app/assets/stylesheets/spree/frontend/views/spree/shared/category_nav_bar.scss
index f13e86e84a..b320f723ad 100644
--- a/frontend/app/assets/stylesheets/spree/frontend/views/spree/shared/category_nav_bar.scss
+++ b/frontend/app/assets/stylesheets/spree/frontend/views/spree/shared/category_nav_bar.scss
@@ -1,7 +1,7 @@
.category {
&-links {
- width: 176px;
- min-width: 176px;
+ width: 170px;
+ min-width: 170px;
&-header {
color: $meganav-font-color;
@@ -12,7 +12,7 @@
ul {
list-style-type: none;
- padding-top: 27px;
+ padding-top: 15px;
}
li {
diff --git a/frontend/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss b/frontend/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss
index 9f967c8321..663d57a53f 100644
--- a/frontend/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss
+++ b/frontend/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss
@@ -60,7 +60,6 @@
}
&-dropdown {
- padding: 51px 0px 51px 0px;
min-height: 341px;
left: 0;
right: 0;
diff --git a/frontend/app/views/spree/shared/_main_nav_bar.html.erb b/frontend/app/views/spree/shared/_main_nav_bar.html.erb
index e92d4a698b..faed48ba26 100644
--- a/frontend/app/views/spree/shared/_main_nav_bar.html.erb
+++ b/frontend/app/views/spree/shared/_main_nav_bar.html.erb
@@ -14,12 +14,12 @@
<% if has_dropdown %>
<div class="dropdown-menu w-100 shadow main-nav-bar-category-dropdown">
<div class="container p-0 d-flex justify-content-xl-around mx-auto">
- <div class="row">
+ <div class="row px-5">
<% root.children.each do |child| %>
<!-- Categories -->
<% if child.code == 'category' && child.item_type == 'Container' %>
- <div class="category-links">
+ <div class="category-links my-4 mx-2">
<div class="category-links-header text-uppercase">
<%= child.name %>
</div>
@@ -27,7 +27,7 @@
<ul class="pl-0">
<% child.children.each do |category_link| %>
<li>
- <%= link_to category_link.name, menu_item_link_to(category_link), class: "text-uppercase main-nav-bar-category-links dropdown-item" %>
+ <%= link_to category_link.name, menu_item_link_to(category_link), class: "text-uppercase main-nav-bar-category-links dropdown-item truncate" %>
</li>
<% end %>
</ul>
@@ -40,7 +40,7 @@
<% if child.children.present? %>
<% child.children.each do |promo_banner| %>
<%= link_to menu_item_link_to(promo_banner), class: "dropdown-item" do %>
- <div class="category-image text-center mx-3">
+ <div class="category-image text-center my-4 mx-3">
<% if promo_banner.image_asset.attached? && promo_banner.image_asset.image? %>
<%= image_tag main_app.url_for(promo_banner.image_asset), title: promo_banner.subtitle %>
<% end %>