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.

Improve code.

Matthew Kennedyd1d6f779f5fb
diff --git a/backend/app/controllers/spree/admin/cms_pages_controller.rb b/backend/app/controllers/spree/admin/cms_pages_controller.rb
index ea4c4ceb63..adad3982c3 100644
--- a/backend/app/controllers/spree/admin/cms_pages_controller.rb
+++ b/backend/app/controllers/spree/admin/cms_pages_controller.rb
@@ -1,14 +1,9 @@
module Spree
module Admin
class CmsPagesController < ResourceController
- before_action :load_data
private
- def load_data
- @page_types = Spree::CmsPage::PAGE_TYPES
- end
-
def location_after_save
spree.edit_admin_cms_page_path(@cms_page)
end
diff --git a/backend/app/helpers/spree/admin/cms_page_helper.rb b/backend/app/helpers/spree/admin/cms_helper.rb
similarity index 76%
rename from backend/app/helpers/spree/admin/cms_page_helper.rb
rename to backend/app/helpers/spree/admin/cms_helper.rb
index 3ddcc35fa5..c60f081b45 100644
--- a/backend/app/helpers/spree/admin/cms_page_helper.rb
+++ b/backend/app/helpers/spree/admin/cms_helper.rb
@@ -1,6 +1,6 @@
module Spree
module Admin
- module CmsPageHelper
+ module CmsHelper
def build_page_section(section)
css_width = case section.width
when 'Half'
@@ -52,27 +52,20 @@ module Spree
item.parameterize(separator: '_')
end
- def page_types_dropdown_values
+ def humanize_dropdown_values(obj)
formatted_types = []
- Spree::CmsPage::PAGE_TYPES.each do |type|
- last_word = type.split('::', 10).last
- readable_type = last_word.gsub(/(?<=[a-z])(?=[A-Z])/, ' ')
- formatted_types << [readable_type, type]
+ obj.class::TYPES.each do |type|
+ formatted_types << [humanize_cms_type(type), type]
end
formatted_types
end
def humanize_cms_type(obj)
- last_word = obj.type.split('::', 10).last
+ last_word = obj.split('::', 10).last
last_word.gsub(/(?<=[a-z])(?=[A-Z])/, ' ')
end
-
- def parametize_cms_type(obj)
- last_word = obj.type.split('::', 10).last
- last_word.parameterize(separator: '_')
- end
end
end
end
diff --git a/backend/app/helpers/spree/admin/cms_section_helper.rb b/backend/app/helpers/spree/admin/cms_section_helper.rb
deleted file mode 100644
index f1981020ac..0000000000
--- a/backend/app/helpers/spree/admin/cms_section_helper.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Spree
- module Admin
- module CmsSectionHelper
- def section_types_dropdown_values
- formatted_types = []
-
- Spree::CmsSection::TYPES.each do |type|
- last_word = type.split('::', 10).last
- readable_type = last_word.gsub(/(?<=[a-z])(?=[A-Z])/, ' ')
- formatted_types << [readable_type, type]
- end
-
- formatted_types
- end
- end
- end
-end
diff --git a/backend/app/helpers/spree/admin/menu_helper.rb b/backend/app/helpers/spree/admin/menu_helper.rb
index bbd6718e85..76059dd6f0 100644
--- a/backend/app/helpers/spree/admin/menu_helper.rb
+++ b/backend/app/helpers/spree/admin/menu_helper.rb
@@ -17,7 +17,9 @@ module Spree
info_row = menu_item_bar(menu, item)
menu_container = content_tag(:div, raw(decendents.join), class: 'menu-container', data: { parent_id: item.id })
- content_tag(:div, info_row + menu_container, class: 'menu-item menu-container-item dragable removable-dom-element', data: { item_id: item.id })
+ content_tag(:div, info_row + menu_container,
+ class: 'menu-item menu-container-item dragable removable-dom-element',
+ data: { item_id: item.id })
end
def resorce_types_dropdown_values
diff --git a/backend/app/views/spree/admin/cms_pages/_form.html.erb b/backend/app/views/spree/admin/cms_pages/_form.html.erb
index 4926d642c5..8facdacc84 100644
--- a/backend/app/views/spree/admin/cms_pages/_form.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/_form.html.erb
@@ -10,7 +10,7 @@
<div class="row">
<%= f.field_container :type, class: ['form-group col-12 col-md-6'] do %>
<%= f.label :type, Spree.t('admin.cms.page_type') %>
- <%= f.select(:type, page_types_dropdown_values, {include_blank: false}, class: 'select2') %>
+ <%= f.select(:type, humanize_dropdown_values(@cms_page), {include_blank: false}, class: 'select2') %>
<%= f.error_message_on :type %>
<% end %>
diff --git a/backend/app/views/spree/admin/cms_pages/_section_template.html.erb b/backend/app/views/spree/admin/cms_pages/_section_template.html.erb
index fb9772dc39..75d308d246 100644
--- a/backend/app/views/spree/admin/cms_pages/_section_template.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/_section_template.html.erb
@@ -5,7 +5,7 @@
<div class="d-flex align-items-center overflow-hidden w-100">
<div>
<h6 class="mb-0"><small><%= section.name %></small></h6>
- <small class="form-text text-muted mt-0">Type: <%= humanize_cms_type(section) %></small>
+ <small class="form-text text-muted mt-0">Type: <%= humanize_cms_type(section.type) %></small>
</div>
</div>
diff --git a/backend/app/views/spree/admin/cms_pages/index.html.erb b/backend/app/views/spree/admin/cms_pages/index.html.erb
index 1392524e03..9f48e73216 100644
--- a/backend/app/views/spree/admin/cms_pages/index.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/index.html.erb
@@ -27,7 +27,7 @@
<%= active_badge(page.draft_mode?) %>
</td>
<td>
- <%= humanize_cms_type(page) %>
+ <%= humanize_cms_type(page.type) %>
</td>
<td>
<%= page.store.unique_name %>
diff --git a/backend/app/views/spree/admin/cms_sections/_form.html.erb b/backend/app/views/spree/admin/cms_sections/_form.html.erb
index 488ba712c9..bf0f98ed9d 100644
--- a/backend/app/views/spree/admin/cms_sections/_form.html.erb
+++ b/backend/app/views/spree/admin/cms_sections/_form.html.erb
@@ -17,7 +17,7 @@
<div class="col-12 col-md-6">
<%= f.field_container :type, class: ['form-group'] do %>
<%= f.label :type, Spree.t('admin.navigation.section_type') %>
- <%= f.select(:type, section_types_dropdown_values, {include_blank: false}) %>
+ <%= f.select(:type, humanize_dropdown_values(@cms_section), {include_blank: false}) %>
<%= f.error_message_on :type %>
<% end %>
</div>
@@ -50,7 +50,7 @@
<div class="card mb-3">
<div class="card-header">
<h5 class="mb-0">
- <%= Spree.t('admin.cms.settings_for', section: humanize_cms_type(@cms_section)) %>
+ <%= Spree.t('admin.cms.settings_for', section: humanize_cms_type(@cms_section.type)) %>
</h5>
</div>
<div class="card-body">
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index 7f6cb355a9..43afb3ee50 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -2,9 +2,9 @@ module Spree
class CmsPage < Spree::Base
include Spree::DisplayLink
- PAGE_TYPES = ['Spree::Cms::Pages::StandardPage',
- 'Spree::Cms::Pages::FeaturePage',
- 'Spree::Cms::Pages::Homepage']
+ TYPES = ['Spree::Cms::Pages::StandardPage',
+ 'Spree::Cms::Pages::FeaturePage',
+ 'Spree::Cms::Pages::Homepage']
extend FriendlyId
friendly_id :slug, use: [:slugged, :finders, :history]
diff --git a/frontend/app/helpers/spree/cms_pages_helper.rb b/frontend/app/helpers/spree/cms_pages_helper.rb
index fea5193001..7fbd07aaaf 100644
--- a/frontend/app/helpers/spree/cms_pages_helper.rb
+++ b/frontend/app/helpers/spree/cms_pages_helper.rb
@@ -17,13 +17,6 @@ module Spree
element = 'div'
css_width = ''
end
-
- boundary = case section.boundary
- when 'Screen'
- 'full-width '
- else
- ''
- end
else
case section.width
when 'Half'
@@ -36,15 +29,15 @@ module Spree
element = 'div'
css_width = ''
end
-
- boundary = case section.boundary
- when 'Screen'
- 'full-width'
- else
- ''
- end
end
+ boundary = case section.boundary
+ when 'Screen'
+ 'full-width '
+ else
+ ''
+ end
+
render "spree/shared/cms/sections/#{spree_resource_path(section)}", section: section,
width: css_width,
boundary: boundary,