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
prefix with cms_
Matthew Kennedy082b310bd6bd
diff --git a/backend/app/controllers/spree/admin/cms_pages_controller.rb b/backend/app/controllers/spree/admin/cms_pages_controller.rbnew file mode 100644index 0000000000..1a5bef2373--- /dev/null+++ b/backend/app/controllers/spree/admin/cms_pages_controller.rb@@ -0,0 +1,11 @@+module Spree+ module Admin+ class CmsPagesController < ResourceController+ before_action :load_data++ def load_data+ @page_kinds = Spree::CmsPage::PAGE_KINDS+ end+ end+ end+enddiff --git a/backend/app/controllers/spree/admin/sections_controller.rb b/backend/app/controllers/spree/admin/cms_sections_controller.rbsimilarity index 51%rename from backend/app/controllers/spree/admin/sections_controller.rbrename to backend/app/controllers/spree/admin/cms_sections_controller.rbindex b6d07f367f..ea8fe3a122 100644--- a/backend/app/controllers/spree/admin/sections_controller.rb+++ b/backend/app/controllers/spree/admin/cms_sections_controller.rb@@ -1,22 +1,22 @@module Spreemodule Admin- class SectionsController < ResourceController- belongs_to 'spree/page'+ class CmsSectionsController < ResourceController+ belongs_to 'spree/cms_page'before_action :load_datadef collection_url- spree.edit_admin_page_path(@page)+ spree.edit_admin_cms_page_path(@cms_page)enddef location_after_save- spree.edit_admin_page_section_path(@page, @section)+ spree.edit_admin_cms_page_cms_section_path(@cms_page, @cms_section)enddef remove_icon- if @section.icon&.destroy+ if @cms_section.icon&.destroyflash[:success] = Spree.t('notice_messages.icon_removed')- redirect_to spree.edit_admin_page_section_path(@page, @section)+ redirect_to spree.edit_admin_cms_page_cms_section_path(@cms_page, @cms_section)elseflash[:error] = Spree.t('errors.messages.cannot_remove_icon')render :edit@@ -26,7 +26,7 @@ module Spreeprivatedef load_data- @section_widths = Spree::Section::SECTION_WIDTHS+ @cms_section_widths = Spree::CmsSection::SECTION_WIDTHSendendenddiff --git a/backend/app/controllers/spree/admin/pages_controller.rb b/backend/app/controllers/spree/admin/pages_controller.rbdeleted file mode 100644index 147eb296c1..0000000000--- a/backend/app/controllers/spree/admin/pages_controller.rb+++ /dev/null@@ -1,15 +0,0 @@-module Spree- module Admin- class PagesController < ResourceController- before_action :load_data-- def index; end-- private-- def load_data- @page_kinds = Spree::Page::PAGE_KINDS- end- end- end-enddiff --git a/backend/app/views/spree/admin/pages/_form.html.erb b/backend/app/views/spree/admin/cms_pages/_form.html.erbsimilarity index 83%rename from backend/app/views/spree/admin/pages/_form.html.erbrename to backend/app/views/spree/admin/cms_pages/_form.html.erbindex 064971c011..77596f251b 100644--- a/backend/app/views/spree/admin/pages/_form.html.erb+++ b/backend/app/views/spree/admin/cms_pages/_form.html.erb@@ -32,14 +32,14 @@<%= f.error_message_on :kind %><% end %>- <%= f.field_container :page_stores, class: ['form-group'] do %>- <%= label_tag :page_stores, Spree.t(:stores) %>- <%= collection_select(:page, :store_id, @stores, :id, :unique_name, {}, { class: 'select2' }) %>- <%= f.error_message_on :page_stores %>+ <%= f.field_container :cms_page_stores, class: ['form-group'] do %>+ <%= label_tag :cms_page_stores, Spree.t(:stores) %>+ <%= collection_select(:cms_page, :store_id, @stores, :id, :unique_name, {}, { class: 'select2' }) %>+ <%= f.error_message_on :cms_page_stores %><% end %><%= f.field_container :locale, class: ['form-group'] do %><%= f.label :locale %>- <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @page.locale || I18n.locale), {}, { class: 'select2' } %>+ <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @cms_page.locale || I18n.locale), {}, { class: 'select2' } %><%= f.error_message_on :default_locale %><% end %>diff --git a/backend/app/views/spree/admin/pages/edit.html.erb b/backend/app/views/spree/admin/cms_pages/edit.html.erbsimilarity index 76%rename from backend/app/views/spree/admin/pages/edit.html.erbrename to backend/app/views/spree/admin/cms_pages/edit.html.erbindex a587d588a7..d43d3606b3 100644--- a/backend/app/views/spree/admin/pages/edit.html.erb+++ b/backend/app/views/spree/admin/cms_pages/edit.html.erb@@ -1,5 +1,5 @@<% content_for :page_title do %>- <%= link_to Spree.t('admin.navigation.all_pages'), spree.admin_pages_path %> / <%= @page.title %>+ <%= link_to Spree.t('admin.navigation.all_pages'), spree.admin_cms_pages_path %> / <%= @cms_page.title %><% end %><div class="row">@@ -9,8 +9,8 @@<h5 class="mb-0"><%= Spree.t('settings') %></h5></div><div class="card-body">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @page } %>- <%= form_for [:admin, @page] do |f| %>+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>+ <%= form_for [:admin, @cms_page] do |f| %><%= render partial: 'form', locals: { f: f } %><div class="d-flex "><%= render partial: 'spree/admin/shared/edit_resource_links' %>@@ -31,21 +31,21 @@<h5 class="mb-0 align-self-center"> PAGE<%#= Spree.t('admin.navigation.menu_items', menu_name: @page.title) %></h5></div><div class="col d-flex justify-content-end">- <%= button_link_to 'LL', spree.new_admin_page_section_path(@page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>+ <%= button_link_to 'LL', spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %></div></div></div>- <% if @page.sections.any? %>- <% @page.sections.each do |section| %>+ <% if @cms_page.cms_sections.any? %>+ <% @cms_page.cms_sections.each do |section| %><div><%= section.content %></div><% end %><% else %><div class="alert alert-info no-objects-found">- <%#= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::OptionType)) %>,- <%#= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::OptionType) %>!+ <%#= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::CmsSection)) %>+ <%#= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::CmsSection) %></div><% end %></div>diff --git a/backend/app/views/spree/admin/pages/index.html.erb b/backend/app/views/spree/admin/cms_pages/index.html.erbsimilarity index 89%rename from backend/app/views/spree/admin/pages/index.html.erbrename to backend/app/views/spree/admin/cms_pages/index.html.erbindex c7cdd08ecb..46900cfb10 100644--- a/backend/app/views/spree/admin/pages/index.html.erb+++ b/backend/app/views/spree/admin/cms_pages/index.html.erb@@ -4,9 +4,9 @@<% content_for :page_actions do %><%= button_link_to Spree.t('admin.pages.add_new_page'), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_page' } %>-<% end if can?(:create, Spree::Page) %>+<% end if can?(:create, Spree::CmsPage) %>-<% if @pages.any? %>+<% if @cms_pages.any? %><div class="table-responsive"><table class="table" id="pagesTable"><thead>@@ -17,7 +17,7 @@<th scope="col"></th></thead><tbody>- <% @pages.each do |page| %>+ <% @cms_pages.each do |page| %><tr><td><%= page.title %>@@ -34,7 +34,7 @@<td class="actions" data-hook="admin_pages_index_row_actions"><span class="d-flex justify-content-end"><%= link_to_edit(page, no_text: true) %>- <%= link_to_delete page, no_text: true, url: spree.admin_page_path(page) if can?(:destroy, page) %>+ <%= link_to_delete page, no_text: true, url: spree.admin_cms_page_path(page) if can?(:destroy, page) %></span></td></tr>diff --git a/backend/app/views/spree/admin/pages/new.html.erb b/backend/app/views/spree/admin/cms_pages/new.html.erbsimilarity index 55%rename from backend/app/views/spree/admin/pages/new.html.erbrename to backend/app/views/spree/admin/cms_pages/new.html.erbindex cda0e820ec..89ffc3dd69 100644--- a/backend/app/views/spree/admin/pages/new.html.erb+++ b/backend/app/views/spree/admin/cms_pages/new.html.erb@@ -1,10 +1,10 @@<% content_for :page_title do %>- <%= link_to Spree.t('admin.pages.all_pages'), spree.admin_pages_path %> / <%= Spree.t('admin.pages.new_page') %>+ <%= link_to Spree.t('admin.pages.all_pages'), spree.admin_cms_pages_path %> / <%= Spree.t('admin.pages.new_page') %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @page } %>+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>-<%= form_for [:admin, @page] do |f| %>+<%= form_for [:admin, @cms_page] do |f| %><%= render partial: 'form', locals: { f: f } %><%= render partial: 'spree/admin/shared/new_resource_links' %><% end %>diff --git a/backend/app/views/spree/admin/cms_sections/_form.html.erb b/backend/app/views/spree/admin/cms_sections/_form.html.erbnew file mode 100644index 0000000000..26c8a5ac08--- /dev/null+++ b/backend/app/views/spree/admin/cms_sections/_form.html.erb@@ -0,0 +1,36 @@+<div class="row" data-hook="admin_menu_item_form_fields">+ <div class="col-6">+ <%= f.field_container :name, class: ['form-group'] do %>+ <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>+ <%= f.text_field :name, class: 'form-control', required: true %>+ <%= f.error_message_on :name %>+ <% end %>++ <%= f.field_container :kind, class: ['form-group'] do %>+ <%= f.label :kind, Spree.t('admin.navigation.item_type') %>+ <%= f.select(:kind, @menu_item_types, {include_blank: false}) %>+ <%= f.error_message_on :kind %>+ <% end %>++ <%= f.field_container :content, class: ['form-group'] do %>+ <%= f.text_area :content, { rows: "20", class: 'form-control' } %>+ <%= f.error_message_on :content %>+ <% end %>+ </div>++ <div class="col-6">+ <%= @cms_section.content.html_safe %>+ </div>+</div>++<script type="text/javascript">+ tinymce.init({+ selector: "#cms_section_content",+ plugins: [+ "image table paste code",+ ],+ menubar: false,+ toolbar:+ "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | code ",+ });+</script>diff --git a/backend/app/views/spree/admin/sections/edit.html.erb b/backend/app/views/spree/admin/cms_sections/edit.html.erbsimilarity index 55%rename from backend/app/views/spree/admin/sections/edit.html.erbrename to backend/app/views/spree/admin/cms_sections/edit.html.erbindex 92a20fd946..0ecad53841 100644--- a/backend/app/views/spree/admin/sections/edit.html.erb+++ b/backend/app/views/spree/admin/cms_sections/edit.html.erb@@ -1,10 +1,10 @@<% content_for :page_title do %>- <%= link_to @page.title, spree.edit_admin_page_path(@page) %> /+ <%= link_to @cms_page.title, spree.edit_admin_cms_page_path(@cms_page) %> / <%= @cms_section.name %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @section } %>+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_section } %>-<%= form_for [:admin, @page, @section] do |f| %>+<%= form_for [:admin, @cms_page, @cms_section] do |f| %><%= render partial: 'form', locals: { f: f } %><%= render partial: 'spree/admin/shared/edit_resource_links' %><% end %>diff --git a/backend/app/views/spree/admin/sections/new.html.erb b/backend/app/views/spree/admin/cms_sections/new.html.erbsimilarity index 53%rename from backend/app/views/spree/admin/sections/new.html.erbrename to backend/app/views/spree/admin/cms_sections/new.html.erbindex d0549e1ce6..2a318b1589 100644--- a/backend/app/views/spree/admin/sections/new.html.erb+++ b/backend/app/views/spree/admin/cms_sections/new.html.erb@@ -1,10 +1,10 @@<% content_for :page_title do %>- <%= link_to @page.title, spree.edit_admin_page_path(@page) %> / <%= Spree.t('admin.page.new_section') %>+ <%= link_to @cms_page.title, spree.edit_admin_cms_page_path(@cms_page) %> / <%= Spree.t('admin.page.new_section') %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @section } %>+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_section } %>-<%= form_for [:admin, @page, @section] do |f| %>+<%= form_for [:admin, @cms_page, @cms_section] do |f| %><%= render partial: 'form', locals: { f: f } %><%= render partial: 'spree/admin/shared/new_resource_links' %><% end %>diff --git a/backend/app/views/spree/admin/sections/_form.html.erb b/backend/app/views/spree/admin/sections/_form.html.erbdeleted file mode 100644index e2d5978d1f..0000000000--- a/backend/app/views/spree/admin/sections/_form.html.erb+++ /dev/null@@ -1,25 +0,0 @@-<div class="row" data-hook="admin_menu_item_form_fields">- <div class="col-6">-- <%= f.field_container :content, class: ['form-group'] do %>- <%= f.text_area :content, { rows: "20", class: 'form-control' } %>- <%= f.error_message_on :content %>- <% end %>- </div>-- <div class="col-6">- Example- </div>-</div>--<script type="text/javascript">- tinymce.init({- selector: "#section_content",- plugins: [- "image table paste code",- ],- menubar: false,- toolbar:- "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | code ",- });-</script>diff --git a/backend/app/views/spree/admin/shared/sub_menu/_content.html.erb b/backend/app/views/spree/admin/shared/sub_menu/_content.html.erbindex ea83e4c42e..73c4f3b145 100644--- a/backend/app/views/spree/admin/shared/sub_menu/_content.html.erb+++ b/backend/app/views/spree/admin/shared/sub_menu/_content.html.erb@@ -1,4 +1,4 @@<ul id="sidebar-content" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_content"><%= tab :menus, match_path: '/menus', label: Spree.t('admin.tab.navigation') %>- <%= tab :pages, match_path: '/pages', label: Spree.t('admin.tab.pages') %>+ <%= tab :cms_pages, match_path: '/cms_pages', label: Spree.t('admin.tab.pages') %></ul>diff --git a/backend/config/routes.rb b/backend/config/routes.rbindex 3a27581ac9..d646e284d4 100644--- a/backend/config/routes.rb+++ b/backend/config/routes.rb@@ -188,8 +188,8 @@ Spree::Core::Engine.add_routes doresources :store_creditsend- resources :pages do- resources :sections, except: :index+ resources :cms_pages do+ resources :cms_sections, except: :indexendresources :menus dodiff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rbnew file mode 100644index 0000000000..c98a0affba--- /dev/null+++ b/core/app/models/spree/cms_page.rb@@ -0,0 +1,8 @@+module Spree+ class CmsPage < Spree::Base+ PAGE_KINDS = ['Standard Page','Home Page']++ belongs_to :store, touch: true+ has_many :cms_sections+ end+enddiff --git a/core/app/models/spree/cms_section.rb b/core/app/models/spree/cms_section.rbnew file mode 100644index 0000000000..3ac0cc7ad1--- /dev/null+++ b/core/app/models/spree/cms_section.rb@@ -0,0 +1,8 @@+module Spree+ class CmsSection < Spree::Base+ acts_as_list scope: :cms_page+ belongs_to :cms_page++ SECTION_WIDTHS = ['Full', 'Half']+ end+enddiff --git a/core/app/models/spree/page.rb b/core/app/models/spree/page.rbdeleted file mode 100644index ced7e0b4b4..0000000000--- a/core/app/models/spree/page.rb+++ /dev/null@@ -1,8 +0,0 @@-module Spree- class Page < Spree::Base- PAGE_KINDS = ['Home Page', 'Basic Page', 'Feature Page']-- belongs_to :store, touch: true- has_many :sections- end-enddiff --git a/core/app/models/spree/section.rb b/core/app/models/spree/section.rbdeleted file mode 100644index a167327cc4..0000000000--- a/core/app/models/spree/section.rb+++ /dev/null@@ -1,7 +0,0 @@-module Spree- class Section < Spree::Base- SECTION_WIDTHS = ['Full', 'Half']- acts_as_list scope: :page- belongs_to :page- end-enddiff --git a/core/db/migrate/20210512191732_create_spree_pages.rb b/core/db/migrate/20210512191732_create_spree_cms_pages.rbsimilarity index 70%rename from core/db/migrate/20210512191732_create_spree_pages.rbrename to core/db/migrate/20210512191732_create_spree_cms_pages.rbindex 7148988af8..b458743bab 100644--- a/core/db/migrate/20210512191732_create_spree_pages.rb+++ b/core/db/migrate/20210512191732_create_spree_cms_pages.rb@@ -1,6 +1,6 @@-class CreateSpreePages < ActiveRecord::Migration[6.0]+class CreateSpreeCmsPages < ActiveRecord::Migration[6.0]def change- create_table :spree_pages do |t|+ create_table :spree_cms_pages do |t|t.column :title, :string, null: falset.column :meta_title, :stringt.column :meta_description, :text@@ -9,8 +9,6 @@ class CreateSpreePages < ActiveRecord::Migration[6.0]t.column :kind, :stringt.column :locale, :string- t.references :sections, polymorphic: true-t.belongs_to :storet.timestampsdiff --git a/core/db/migrate/20210514204251_create_spree_cms_sections.rb b/core/db/migrate/20210514204251_create_spree_cms_sections.rbnew file mode 100644index 0000000000..8f7b55c888--- /dev/null+++ b/core/db/migrate/20210514204251_create_spree_cms_sections.rb@@ -0,0 +1,21 @@+class CreateSpreeCmsSections < ActiveRecord::Migration[6.0]+ def change+ create_table :spree_cms_sections do |t|+ t.column :name, :string, null: false+ t.column :title, :string+ t.column :subtitle, :string+ t.column :content, :text+ t.column :width, :string+ t.column :kind, :string+ t.column :position, :integer+ t.column :linked_resource_type, :string, default: 'None'+ t.column :linked_resource_id, :integer++ t.belongs_to :cms_page++ t.timestamps+ end++ add_index :spree_cms_sections, [:linked_resource_type, :linked_resource_id], name: 'index_spree_cms_sections_on_linked_resource'+ end+enddiff --git a/core/db/migrate/20210514204251_create_spree_sections.rb b/core/db/migrate/20210514204251_create_spree_sections.rbdeleted file mode 100644index 5daaee0158..0000000000--- a/core/db/migrate/20210514204251_create_spree_sections.rb+++ /dev/null@@ -1,17 +0,0 @@-class CreateSpreeSections < ActiveRecord::Migration[6.1]- def change- create_table :spree_cms_section_rte do |t|- t.column :content, :text- t.column :width, :text- t.column :position, :integer- t.column :linked_resource_type, :string, default: 'None'- t.column :linked_resource_id, :integer-- t.belongs_to :page-- t.timestamps- end-- add_index :spree_sections, [:linked_resource_type, :linked_resource_id], name: 'index_spree_sections_on_linked_resource'- end-end