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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Refactor menu item image
Matthew Kennedyf3d2d2ff493e
diff --git a/backend/app/assets/stylesheets/spree/backend/views/_menus.scss b/backend/app/assets/stylesheets/spree/backend/views/_menus.scssindex 74e9a931e5..a89072cc14 100644--- a/backend/app/assets/stylesheets/spree/backend/views/_menus.scss+++ b/backend/app/assets/stylesheets/spree/backend/views/_menus.scss@@ -1,3 +1,10 @@+#menuItemImgContainer {+ width: 200px;+ img {+ max-width: 100%;+ }+}+#menuArea {.space-buttons {box-shadow: -11px 0 16px 6px white;diff --git a/backend/app/views/spree/admin/menu_items/_form.html.erb b/backend/app/views/spree/admin/menu_items/_form.html.erbindex 8049ad5025..a342b42246 100644--- a/backend/app/views/spree/admin/menu_items/_form.html.erb+++ b/backend/app/views/spree/admin/menu_items/_form.html.erb@@ -58,19 +58,28 @@<%= f.error_message_on :subtitle %><% end %>- <%= f.field_container :image_asset, class: ['form-group'] do %>- <% if @menu_item.image_asset.attached? && @menu_item.image_asset.variable? %>- <%= image_tag main_app.url_for(@menu_item.image_asset.variant(resize: '244x104>')) %>- <% elsif @menu_item.image_asset.attached? && @menu_item.image_asset.image? %>- <%= image_tag main_app.url_for(@menu_item.image_asset) %>+ <% @menu_item.build_menu_item_image unless @menu_item.menu_item_image %>+ <%= f.fields_for :menu_item_image do |menu_item_image_field| %>+ <%= f.field_container :menu_item_image_attachment do %>+ <% unless @menu_item.menu_item_image.new_record? %>+ <div id="menuItemImgContainer" class="my-2">+ <%= image_tag(main_app.url_for(@menu_item.menu_item_image.attachment)) %>+ </div>+ <% end %>+ <div id="<% unless @menu_item.menu_item_image.new_record? %>MenuItemImageButton<% end %>">+ <%= menu_item_image_field.file_field :attachment %>+ </div><% end %>- <%= f.field_container :image_asset, class: ['form-group'] do %>- <%= f.label :image_asset, Spree.t('admin.navigation.image_asset') %><br>- <%= f.file_field :image_asset %>- <%= f.error_message_on :image_asset %>++ <%= f.field_container :menu_item_image_alt do %>+ <% unless @menu_item.menu_item_image.new_record? %>+ <div class="form-group my-3">+ <%= menu_item_image_field.label :alt, Spree.t('admin.navigation.image_alt_text') %>+ <%= menu_item_image_field.text_field :alt, class: 'form-control' %>+ </div>+ <% end %><% end %><% end %>-</div></div></div>diff --git a/backend/app/views/spree/admin/menus/nested_menu_items/_item_bar.html.erb b/backend/app/views/spree/admin/menus/nested_menu_items/_item_bar.html.erbindex 5db3b80301..8357afb58d 100644--- a/backend/app/views/spree/admin/menus/nested_menu_items/_item_bar.html.erb+++ b/backend/app/views/spree/admin/menus/nested_menu_items/_item_bar.html.erb@@ -14,15 +14,13 @@<%= "| #{Spree.t('admin.navigation.code')}: #{item.code}" if item.code.present? %></small></div>- <% if item.has_attached_image %>- <% if item.image_asset.attached? && item.image_asset.image? %>+ <% if item.menu_item_image.present? %><div class="ml-2"><div class="menu_items_image_holder">- <%= image_tag main_app.url_for(item.image_asset) %>+ <%= image_tag main_app.url_for(item.menu_item_image.attachment) %></div></div><% end %>- <% end %></div><div class="d-flex align-items-center space-buttons px-2">diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rbindex ea2e4a7c18..9a6454530d 100644--- a/core/app/models/spree/menu_item.rb+++ b/core/app/models/spree/menu_item.rb@@ -5,10 +5,7 @@ module Spreeacts_as_nested_set dependent: :destroy- before_save :reset_link_attributes, :check_for_image,- :build_path, :paremeterize_code-- has_one_attached :image_asset+ before_save :reset_link_attributes, :build_path, :paremeterize_codeITEM_TYPE = %w[Link Promotion Container]@@ -25,6 +22,9 @@ module Spreevalidates :linked_resource_type, inclusion: { in: LINKED_RESOURCE_TYPE }validate :check_for_root, on: :create+ has_one :menu_item_image, as: :viewable, dependent: :destroy, class_name: "Spree::MenuItemImage"+ accepts_nested_attributes_for :menu_item_image, reject_if: :all_blank+def self.refresh_paths(resorce)where(linked_resource_type: resorce.class.name, linked_resource_id: resorce.id).each(&:save!)end@@ -55,14 +55,6 @@ module Spreeendend- def check_for_image- self.has_attached_image = if image_asset.attached?- true- else- false- end- end-def reset_link_attributesif linked_resource_type_changed? || item_type == 'Container'self.linked_resource_id = nildiff --git a/core/app/models/spree/menu_item_image.rb b/core/app/models/spree/menu_item_image.rbnew file mode 100644index 0000000000..e817571363--- /dev/null+++ b/core/app/models/spree/menu_item_image.rb@@ -0,0 +1,9 @@+# frozen_string_literal: true++module Spree+ class MenuItemImage < Spree::Asset+ has_one_attached :attachment++ validates :attachment, attached: true, content_type: %i[png jpg jpeg gif svg]+ end+enddiff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex bcd4ca2cf3..11b6d424cd 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -585,6 +585,7 @@ en:give_your_menu_a_unique_name: 'Use the unique code to identify your menu: spree-eu-main'link_settings: Link Settingslink_to: Link To+ image_alt_text: Add alt text to your imageimage_asset: Add a Promotion image or Link icon.move_could_not_be_saved: 'ERROR: This move could not be saved.'new_menu_item: New Menu Itemdiff --git a/core/db/migrate/20210408092939_create_spree_menu_items.rb b/core/db/migrate/20210408092939_create_spree_menu_items.rbindex 1739e7b6c7..d943eb343b 100644--- a/core/db/migrate/20210408092939_create_spree_menu_items.rb+++ b/core/db/migrate/20210408092939_create_spree_menu_items.rb@@ -5,7 +5,6 @@ class CreateSpreeMenuItems < ActiveRecord::Migration[6.0]t.column :subtitle, :stringt.column :destination, :stringt.column :new_window, :boolean, default: false- t.column :has_attached_image, :boolean, default: falset.column :item_type, :stringt.column :linked_resource_type, :string, default: 'URL't.column :linked_resource_id, :integerdiff --git a/frontend/app/views/spree/shared/_main_nav_bar.html.erb b/frontend/app/views/spree/shared/_main_nav_bar.html.erbindex d31e039513..9524466e3f 100644--- a/frontend/app/views/spree/shared/_main_nav_bar.html.erb+++ b/frontend/app/views/spree/shared/_main_nav_bar.html.erb@@ -41,8 +41,8 @@<% child.children.each do |promo_banner| %><%= link_to localized_item_link(promo_banner, current_locale), class: "dropdown-item" do %><div class="category-image text-center my-4 mx-3">- <% if promo_banner.has_attached_image %>- <%= image_tag main_app.url_for(promo_banner.image_asset), title: promo_banner.subtitle %>+ <% if promo_banner.menu_item_image.present? %>+ <%= image_tag main_app.url_for(promo_banner.menu_item_image.attachment), alt: promo_banner.menu_item_image.alt ,title: promo_banner.subtitle %><% end %><div class="category-box"><div class="category-box-small-text">