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
Update pages for front end
Matthew Kennedy10703d5ff1f6
diff --git a/backend/app/controllers/spree/admin/cms_pages_controller.rb b/backend/app/controllers/spree/admin/cms_pages_controller.rbindex 1a5bef2373..14179fe930 100644--- a/backend/app/controllers/spree/admin/cms_pages_controller.rb+++ b/backend/app/controllers/spree/admin/cms_pages_controller.rb@@ -3,9 +3,15 @@ module Spreeclass CmsPagesController < ResourceControllerbefore_action :load_data+ private+def load_data@page_kinds = Spree::CmsPage::PAGE_KINDSend++ def location_after_save+ spree.edit_admin_cms_page_path(@cms_page)+ endendendenddiff --git a/backend/app/views/spree/admin/cms_pages/_form.html.erb b/backend/app/views/spree/admin/cms_pages/_form.html.erbindex 77596f251b..4215a44467 100644--- a/backend/app/views/spree/admin/cms_pages/_form.html.erb+++ b/backend/app/views/spree/admin/cms_pages/_form.html.erb@@ -1,33 +1,21 @@<div data-hook="admin_page_form_fields" class="row">- <div class="col-12 col-md-6">+ <div class="col-12 col-md-8">+ <%= f.field_container :content, class: ['form-group'] do %>+ <%= f.label :content, Spree.t(:content) %>+ <%= f.text_area :content, { rows: 26} %>+ <%= f.error_message_on :content %>+ <% end %>+ </div>++ <div class="col-12 col-md-4"><%= f.field_container :title, class: ['form-group'] do %>- <%= f.label :title, raw(Spree.t(:title) + required_span_tag) %>+ <%= f.label :title, raw(Spree.t('admin.cms.page_title') + required_span_tag) %><%= f.text_field :title, class: 'form-control', required: true %><%= f.error_message_on :title %><% end %>- <%= f.field_container :meta_title, class: ['form-group'] do %>- <%= f.label :meta_title, Spree.t('admin.pages.meta_title') %>- <%= f.text_field :meta_title, class: 'form-control' %>- <%= f.error_message_on :meta_title %>- <% end %>-- <%= f.field_container :meta_description, class: ['form-group'] do %>- <%= f.label :meta_description, Spree.t('admin.pages.meta_description') %>- <%= f.text_field :meta_description, class: 'form-control' %>- <%= f.error_message_on :meta_description %>- <% end %>-- <%= f.field_container :slug, class: ['form-group'] do %>- <%= f.label :slug, Spree.t('admin.pages.slug') %>- <%= f.text_field :slug, class: 'form-control' %>- <%= f.error_message_on :slug %>- <% end %>- </div>-- <div class="col-12 col-md-6"><%= f.field_container :kind, class: ['form-group'] do %>- <%= f.label :kind, Spree.t('admin.pages.kind') %>+ <%= f.label :kind, Spree.t('admin.cms.page_type') %><%= f.select(:kind, @page_kinds, {include_blank: false}, class: 'select2') %><%= f.error_message_on :kind %><% end %>@@ -50,5 +38,36 @@<%= f.error_message_on :visible %></div><% end %>++ <h5 class="mt-4">SEO</h5>+ <%= f.field_container :meta_title, class: ['form-group'] do %>+ <%= f.label :meta_title, Spree.t('admin.pages.meta_title') %>+ <%= f.text_field :meta_title, class: 'form-control' %>+ <%= f.error_message_on :meta_title %>+ <% end %>++ <%= f.field_container :meta_description, class: ['form-group'] do %>+ <%= f.label :meta_description, Spree.t('admin.pages.meta_description') %>+ <%= f.text_area :meta_description, { rows: 3, class: 'form-control' } %>+ <%= f.error_message_on :meta_description %>+ <% end %>++ <%= f.field_container :slug, class: ['form-group'] do %>+ <%= f.label :slug, Spree.t('admin.pages.slug') %>+ <%= f.text_field :slug, class: 'form-control' %>+ <%= f.error_message_on :slug %>+ <% end %></div></div>++<script type="text/javascript">+ tinymce.init({+ selector: "#cms_page_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/cms_pages/edit.html.erb b/backend/app/views/spree/admin/cms_pages/edit.html.erbindex 030278df85..2d086bead5 100644--- a/backend/app/views/spree/admin/cms_pages/edit.html.erb+++ b/backend/app/views/spree/admin/cms_pages/edit.html.erb@@ -2,56 +2,47 @@<%= link_to Spree.t('admin.navigation.all_pages'), spree.admin_cms_pages_path %> / <%= @cms_page.title %><% end %>-<div class="row">- <div class="col-12">- <div class="card mb-3">- <div class="card-header">- <h5 class="mb-0"><%= Spree.t('settings') %></h5>- </div>- <div class="card-body">- <%= 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' %>- </div>- <% end %>- </div>- </div>+<%= 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' %></div>-</div>+<% end %>-<div id="pageSectionsArea">- <div class="row mt-2">- <div class="col-12">- <div class="card mb-3">- <div class="card-header">- <div class="row pb-0">- <div class="col">- <h5 class="mb-0 align-self-center"> <%= Spree.t('admin.cms.page_sections', page_name: @cms_page.title) %></h5>- <small><%= Spree.t('admin.cms.page_sections_info') %></small>- </div>- <div class="col d-flex justify-content-end">- <%= button_link_to Spree.t('admin.pages.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>+<% unless @cms_page.kind == "Standard Page" %>+ <div id="pageSectionsArea">+ <div class="row mt-2">+ <div class="col-12">+ <div class="card mb-3">+ <div class="card-header">+ <div class="row pb-0">+ <div class="col">+ <h5 class="mb-0 align-self-center"> <%= Spree.t('admin.cms.page_sections', page_name: @cms_page.title) %></h5>+ <small><%= Spree.t('admin.cms.page_sections_info') %></small>+ </div>+ <div class="col d-flex justify-content-end">+ <%= button_link_to Spree.t('admin.pages.add_new_section'), 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>- </div>- <% if @cms_page.cms_sections.any? %>- <div class="card-body p-0">- <div class="row pb-0 no-gutters">- <% @cms_page.cms_sections.each do |section| %>- <%= build_page_section(section) %>- <% end %>+ <% if @cms_page.cms_sections.any? %>+ <div class="card-body p-0">+ <div class="row pb-0 no-gutters">+ <% @cms_page.cms_sections.each do |section| %>+ <%= build_page_section(section) %>+ <% end %>+ </div></div>- </div>- <% else %>- <div class="alert alert-info no-objects-found">- <%= 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 %>+ <% else %>+ <div class="alert alert-info no-objects-found">+ <%= 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></div></div></div>-</div>+<% end %>diff --git a/backend/app/views/spree/admin/cms_pages/new.html.erb b/backend/app/views/spree/admin/cms_pages/new.html.erbindex 89ffc3dd69..093f5d26a7 100644--- a/backend/app/views/spree/admin/cms_pages/new.html.erb+++ b/backend/app/views/spree/admin/cms_pages/new.html.erb@@ -3,8 +3,9 @@<% end %><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>-<%= form_for [:admin, @cms_page] do |f| %>- <%= render partial: 'form', locals: { f: f } %>+ <%= render partial: 'form', locals: { f: f } %>+ <div class="d-flex "><%= render partial: 'spree/admin/shared/new_resource_links' %>+ </div><% end %>diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rbindex c98a0affba..287d8dcb0a 100644--- a/core/app/models/spree/cms_page.rb+++ b/core/app/models/spree/cms_page.rb@@ -1,8 +1,33 @@module Spreeclass CmsPage < Spree::Base- PAGE_KINDS = ['Standard Page','Home Page']+ PAGE_KINDS = ['Standard Page','Feature Page', 'Home Page']++ extend FriendlyId+ friendly_id :slug, use: [:slugged, :finders, :history]belongs_to :store, touch: truehas_many :cms_sections++ before_save :create_slug++ validates :title, presence: true++ def seo_title+ if meta_title.present?+ meta_title+ else+ title+ end+ end++ private++ def create_slug+ self.slug = if slug.blank?+ title.to_url+ else+ slug.to_url+ end+ endendenddiff --git a/core/db/migrate/20210512191732_create_spree_cms_pages.rb b/core/db/migrate/20210512191732_create_spree_cms_pages.rbindex b458743bab..b68d4b96cc 100644--- a/core/db/migrate/20210512191732_create_spree_cms_pages.rb+++ b/core/db/migrate/20210512191732_create_spree_cms_pages.rb@@ -3,10 +3,11 @@ class CreateSpreeCmsPages < ActiveRecord::Migration[6.0]create_table :spree_cms_pages do |t|t.column :title, :string, null: falset.column :meta_title, :string+ t.column :content, :textt.column :meta_description, :textt.column :visible, :boolean, default: falset.column :slug, :string- t.column :kind, :string+ t.column :kind, :string, default: 'Standard Page't.column :locale, :stringt.belongs_to :storediff --git a/core/db/migrate/20210514204251_create_spree_cms_sections.rb b/core/db/migrate/20210514204251_create_spree_cms_sections.rbindex b695377f94..538b2e7f22 100644--- a/core/db/migrate/20210514204251_create_spree_cms_sections.rb+++ b/core/db/migrate/20210514204251_create_spree_cms_sections.rb@@ -5,10 +5,10 @@ class CreateSpreeCmsSections < ActiveRecord::Migration[6.0]t.column :title, :stringt.column :subtitle, :stringt.column :content, :text- t.column :width, :string- t.column :kind, :string+ t.column :width, :string, default: 'Full'+ t.column :kind, :string, default: 'Text Block't.column :position, :integer- t.column :linked_resource_type, :string, default: 'Text Block'+ t.column :linked_resource_type, :string, default: 'none't.column :linked_resource_id, :integert.belongs_to :cms_pagediff --git a/frontend/app/controllers/spree/cms_pages_controller.rb b/frontend/app/controllers/spree/cms_pages_controller.rbnew file mode 100644index 0000000000..de1599a865--- /dev/null+++ b/frontend/app/controllers/spree/cms_pages_controller.rb@@ -0,0 +1,15 @@+module Spree+ class CmsPagesController < Spree::StoreController+ before_action :load_cms_page, only: [:show]++ def show+ @title = @cms_page.seo_title+ end++ private++ def load_cms_page+ @cms_page = Spree::CmsPage.friendly.find(params[:id])+ end+ end+enddiff --git a/frontend/app/views/spree/cms_pages/show.html.erb b/frontend/app/views/spree/cms_pages/show.html.erbnew file mode 100644index 0000000000..a19038d015--- /dev/null+++ b/frontend/app/views/spree/cms_pages/show.html.erb@@ -0,0 +1,9 @@+<div class="container">+ <% if @cms_page.content.present? %>+ <div class="row my-5">+ <div class="col-12">+ <%= @cms_page.content.html_safe %>+ </div>+ </div>+ <% end %>+</div>diff --git a/frontend/config/routes.rb b/frontend/config/routes.rbindex 195670e10c..8eb5856b62 100644--- a/frontend/config/routes.rb+++ b/frontend/config/routes.rb@@ -32,5 +32,7 @@ Spree::Core::Engine.add_routes doget '/api_tokens', to: 'store#api_tokens'post '/ensure_cart', to: 'store#ensure_cart'++ get '/pages/:id', to: 'cms_pages#show', as: :pageendend