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.

Use generated menu_items

Matthew Kennedy35e3ceabfa81
diff --git a/backend/app/assets/javascripts/spree/backend/navigation/menu.es6 b/backend/app/assets/javascripts/spree/backend/navigation/menu.es6
index f4a7b394db..4c3d09ae20 100644
--- a/backend/app/assets/javascripts/spree/backend/navigation/menu.es6
+++ b/backend/app/assets/javascripts/spree/backend/navigation/menu.es6
@@ -11,7 +11,7 @@ document.addEventListener('DOMContentLoaded', function() {
dragClass: 'menu-item-dragged',
draggable: '.dragable',
animation: 350,
- forceFallback: false
+ forceFallback: true
};
let containers = null;
diff --git a/backend/app/assets/stylesheets/spree/backend/components/_tables.scss b/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
index 2b98b9e776..c3d8dca866 100644
--- a/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
+++ b/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
@@ -1,10 +1,6 @@
table.table {
font-size: $font-size-sm;
- .move-handle {
- cursor: grab;
- }
-
th {
padding: 0.5rem;
@@ -138,3 +134,7 @@ div.table-responsive table.table-bordered {
}
}
}
+
+.move-handle {
+ cursor: grab;
+}
diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss b/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss
index 9ab75f2b58..921d4fda57 100644
--- a/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss
+++ b/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss
@@ -1,6 +1,10 @@
-$item-padding: 14px;
+$item-padding: 0;
+$nestable-background-color: rgb(214, 214, 214);
#menuArea {
+ .space-buttons a {
+ margin: 2px;
+ }
.menu-item {
background-color: white;
padding: $item-padding;
@@ -11,10 +15,10 @@ $item-padding: 14px;
}
.container-info-row {
- border: 1px solid var(--gray);
+ border: 1px solid $nestable-background-color;
border-right: none;
padding: $item-padding;
- background-color: var(--gray);
+ background-color:$nestable-background-color;
}
.menu-container {
@@ -30,11 +34,6 @@ $item-padding: 14px;
border: none;
padding: 0;
margin-left: 0;
- .container-info-row {
- .move-handle {
- color: white;
- }
- }
}
#primaryMenuContainer > div.menu-item {
diff --git a/backend/app/helpers/spree/admin/menu_helper.rb b/backend/app/helpers/spree/admin/menu_helper.rb
index 79804d919f..3b3cb88dfa 100644
--- a/backend/app/helpers/spree/admin/menu_helper.rb
+++ b/backend/app/helpers/spree/admin/menu_helper.rb
@@ -1,6 +1,38 @@
module Spree
module Admin
module MenuHelper
+ def build_menu_item(menu, item)
+ if item.container
+ dragable = nil
+ klazz = 'container-info-row'
+ menu_item_that_accepts_nested_items(menu, item, klazz, dragable)
+ else
+ dragable = 'dragable'
+ klazz = 'menu-item'
+ standard_menu_item(menu, item, klazz, dragable)
+ end
+ end
+
+ def standard_menu_item(menu, item, klazz, dragable)
+ edit_button = link_to_edit(item, no_text: true, class: 'btn btn-outline-secondary btn-sm', url: spree.edit_admin_menu_menu_item_path(menu, item))
+ delete_button = link_to_delete(item, no_text: true, url: spree.admin_menu_menu_item_path(menu, item)) if can?(:destroy, item)
+
+ move_handle = content_tag(:div, svg_icon(name: 'sort.svg', width: '20', height: '20'), class: 'move-handle d-flex align-items-center p-3')
+ description_area = content_tag(:div, item.name, class: 'd-flex align-items-center w-100')
+ buttons_area = content_tag(:div, edit_button + delete_button, class: 'd-flex align-items-center space-buttons px-2')
+
+ content_tag(:div, move_handle + description_area + buttons_area, class: "#{klazz} #{dragable} d-flex flex-nowrap")
+ end
+
+ def menu_item_that_accepts_nested_items(menu, item, klazz, dragable)
+ info_row = standard_menu_item(menu, item, klazz, dragable)
+ sub_menu_container = content_tag(:div, nil, class: 'menu-container')
+
+ content_tag(:div, info_row + sub_menu_container, class: 'menu-container-item dragable')
+ end
+
+ # this is not used at the moment
+ # Remove this if it never gets used.
def humanize_class_name(object)
if object.is_a? Array
object.map do |obj|
diff --git a/backend/app/helpers/spree/admin/navigation_helper.rb b/backend/app/helpers/spree/admin/navigation_helper.rb
index b256fd765d..59ab21fba0 100644
--- a/backend/app/helpers/spree/admin/navigation_helper.rb
+++ b/backend/app/helpers/spree/admin/navigation_helper.rb
@@ -147,7 +147,7 @@ module Spree
def link_to_edit(resource, options = {})
url = options[:url] || edit_object_url(resource)
options[:data] = { action: 'edit' }
- options[:class] = 'btn btn-primary btn-sm'
+ options[:class] ||= 'btn btn-primary btn-sm'
link_to_with_icon('edit.svg', Spree.t(:edit), url, options)
end
@@ -160,7 +160,7 @@ module Spree
def link_to_delete(resource, options = {})
url = options[:url] || object_url(resource)
name = options[:name] || Spree.t(:delete)
- options[:class] = 'btn btn-danger btn-sm delete-resource'
+ options[:class] ||= 'btn btn-danger btn-sm delete-resource'
options[:data] = { confirm: Spree.t(:are_you_sure), action: 'remove' }
link_to_with_icon 'delete.svg', name, url, options
end
diff --git a/backend/app/views/spree/admin/menus/edit.html.erb b/backend/app/views/spree/admin/menus/edit.html.erb
index 1f40df7285..6cefa2ad90 100644
--- a/backend/app/views/spree/admin/menus/edit.html.erb
+++ b/backend/app/views/spree/admin/menus/edit.html.erb
@@ -2,10 +2,6 @@
<%= link_to Spree.t('admin.navigation.menus'), spree.admin_menus_url %> / <%= @menu.name %>
<% end %>
-<% content_for :page_actions do %>
- <%#= button_link_to Spree.t('admin.navigation.back_to_all_menus', menu: @menu.name), spree.admin_menus_url, icon: 'chevron-left.svg' %>
-<% end %>
-
<div class="row">
<div class="col-12">
<div class="card mb-3">
@@ -25,11 +21,10 @@
</div>
</div>
-<hr>
<div id="menuArea">
<div class="row mt-5">
<div class="col-12">
- <div class="card mb-3" >
+ <div class="card mb-3">
<div class="card-header">
<div class="row pb-0">
<div class="col d-flex">
@@ -41,130 +36,11 @@
</div>
</div>
<div class="card-body" style="padding: 0;">
-
<div id="primaryMenuContainer" class="menu-container">
-
- <div class="menu-container-item dragable">
- <div class="d-flex container-info-row">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> WOMEN</span>
- </div>
- <div class="menu-container">
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> SKIRTS</span>
- </div>
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> DRESSES</span>
- </div>
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> SHIRTS & BLOUSES</span>
- </div>
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> SWEATERS</span>
- </div>
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> TOPS & T-SHIRTS</span>
- </div>
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> JACKETS & COATS</span>
- </div>
-
-
- <div class="menu-container-item dragable">
- <div class="d-flex container-info-row">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> Promotions</span>
- </div>
- <div class="menu-container">
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> New Collection</span>
- </div>
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> Special Offer</span>
- </div>
- </div>
- </div>
- </div>
- </div>
-
-
- <div class="menu-container-item dragable">
- <div class="d-flex container-info-row">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> MEN</span>
- </div>
- <div class="menu-container">
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> SHIRTS</span>
- </div>
-
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> T-SHIRTS</span>
- </div>
-
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> SWEATERS</span>
- </div>
-
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> JACKETS & COATS</span>
- </div>
-
-
- <div class="menu-container-item dragable">
- <div class="d-flex container-info-row">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> Promotions</span>
- </div>
- <div class="menu-container">
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> New Collection</span>
- </div>
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> Special Offer</span>
- </div>
- </div>
- </div>
- </div>
- </div>
-
-
- <div class="menu-container-item dragable">
- <div class="d-flex container-info-row">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> SPORTSWARE</span>
- </div>
- <div class="menu-container">
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> SHIRTS</span>
- </div>
-
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> T-SHIRTS</span>
- </div>
-
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> SWEATERS</span>
- </div>
-
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> JACKETS & COATS</span>
- </div>
-
-
- <div class="menu-container-item dragable">
- <div class="d-flex container-info-row">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> Promotions</span>
- </div>
- <div class="menu-container">
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> New Collection</span>
- </div>
- <div class="menu-item dragable">
- <span class="move-handle"><%= svg_icon name: "sort.svg", width: '20', height: '20' %> Special Offer</span>
- </div>
- </div>
- </div>
- </div>
- </div>
-
+ <% @menu.menu_items.each do |menu_item| %>
+ <%= build_menu_item(@menu, menu_item) %>
+ <% end %>
</div>
-
</div>
</div>
</div>
diff --git a/backend/app/views/spree/admin/option_types/_referance.html.erb b/backend/app/views/spree/admin/option_types/_referance.html.erb
deleted file mode 100644
index 8fa24dadfb..0000000000
--- a/backend/app/views/spree/admin/option_types/_referance.html.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-
-<div class="row mt-5">
- <div class="col-12">
- <div class="card mb-3">
- <div class="card-header">
- <div class="row pb-0">
- <div class="col d-flex">
- <h5 class="mb-0 align-self-center"><%= Spree.t('admin.navigation.menu_items') %></h5>
- </div>
- <div class="col d-flex justify-content-end">
- <%= button_link_to Spree.t('admin.navigation.add_new_item', menu: @menu.name), spree.new_admin_menu_menu_item_path(@menu), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
- </div>
- </div>
- </div>
- <div class="card-body">
- <% if @menu.menu_items.any? %>
- <div class="table-responsive">
- <table class="table">
- <thead>
- <th><%= Spree.t(:name) %></th>
- <th data-hook="admin_menus_index_header_actions" class="actions"></th>
- <thead>
- <tbody>
- <% @menu.menu_items.each do |menu_item| %>
- <tr>
- <td><%= menu_item.name %></td>
- <td class="actions" data-hook="admin_menus_index_row_actions">
- <span class="d-flex justify-content-end">
- <%= link_to_edit(menu_item, no_text: true, url: spree.edit_admin_menu_menu_item_path(@menu, menu_item)) %>
- <%= link_to_delete(menu_item, no_text: true, url: spree.admin_menu_menu_item_path(@menu, menu_item)) if can?(:destroy, menu_item) %>
- </span>
- </td>
- </tr>
- <% end %>
- </tbody>
- </table>
- </div>
- <% else %>
- <div class="alert alert-info no-objects-found">
- <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::MenuItem)) %>
- </div>
- <% end %>
- </div>
- </div>
- </div>
-</div>
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 8249099e49..a1b3808c7f 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -575,7 +575,7 @@ en:
available_store_credit: User has %{amount} in Store Credit available.
navigation:
add_new_item: 'Add New Item'
- allow_this_menu_item_to_contain_nested_menu_items: Allow this Menu Item to contain nested Menu Items
+ allow_this_menu_item_to_contain_nested_menu_items: Allow this Menu Item to contain nested items
back_to_all_menus: Back To All Menus
menu_item_type: Menu Item Type
menu_item_basic_details: Basic Details