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 cms_pages and cms_sections API.
Matthew Kennedy1016579ee5f9
diff --git a/api/app/controllers/spree/api/v2/storefront/cms_pages_controller.rb b/api/app/controllers/spree/api/v2/storefront/cms_pages_controller.rbindex ed5707c484..5c96488f64 100644--- a/api/app/controllers/spree/api/v2/storefront/cms_pages_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/cms_pages_controller.rb@@ -10,7 +10,7 @@ module Spreeenddef resource- @resource ||= scope.find_by!(title: params[:title])+ @resource ||= scope.find_by!(slug: params[:slug])enddef resource_serializerdiff --git a/api/app/serializers/spree/api/v2/platform/cms_section_serializer.rb b/api/app/serializers/spree/api/v2/platform/cms_section_serializer.rbnew file mode 100644index 0000000000..9ec56c2177--- /dev/null+++ b/api/app/serializers/spree/api/v2/platform/cms_section_serializer.rb@@ -0,0 +1,11 @@+module Spree+ module Api+ module V2+ module Platform+ class CmsSectionSerializer < BaseSerializer+ include ::Spree::Api::V2::ResourceSerializerConcern+ end+ end+ end+ end+enddiff --git a/api/app/serializers/spree/v2/storefront/cms_page_serializer.rb b/api/app/serializers/spree/v2/storefront/cms_page_serializer.rbindex 04f138cd49..72e8d2b0b3 100644--- a/api/app/serializers/spree/v2/storefront/cms_page_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/cms_page_serializer.rb@@ -4,7 +4,11 @@ module Spreeclass CmsPageSerializer < BaseSerializerset_type :cms_page- attributes :title, :type, :locale+ attributes :title, :content, :locale, :meta_description, :meta_title,+ :slug, :type++ belongs_to :store+ has_many :cms_sectionsendendenddiff --git a/api/app/serializers/spree/v2/storefront/cms_section_serializer.rb b/api/app/serializers/spree/v2/storefront/cms_section_serializer.rbnew file mode 100644index 0000000000..cc1a93bf56--- /dev/null+++ b/api/app/serializers/spree/v2/storefront/cms_section_serializer.rb@@ -0,0 +1,14 @@+module Spree+ module V2+ module Storefront+ class CmsSectionSerializer < BaseSerializer+ set_type :cms_section++ attributes :name, :title, :subtitle, :button_text, :content, :width,+ :full_width_on_small, :boundary, :type, :position++ belongs_to :cms_page+ end+ end+ end+enddiff --git a/api/app/serializers/spree/v2/storefront/store_serializer.rb b/api/app/serializers/spree/v2/storefront/store_serializer.rbindex 468da22ba2..ee1510aa3e 100644--- a/api/app/serializers/spree/v2/storefront/store_serializer.rb+++ b/api/app/serializers/spree/v2/storefront/store_serializer.rb@@ -8,7 +8,7 @@ module Spree:twitter, :instagram, :default_locale, :customer_support_email, :default_country_id, :description,:address, :contact_phone, :supported_locales- has_many :menus+ has_many :menus, :cms_pageshas_one :default_country, serializer: :country, record_type: :country, id_method_name: :default_country_idattribute :favicon_path do |store|diff --git a/api/config/routes.rb b/api/config/routes.rbindex 0c081edbe3..1795be6334 100644--- a/api/config/routes.rb+++ b/api/config/routes.rb@@ -167,8 +167,8 @@ Spree::Core::Engine.add_routes doresources :menus, only: %i[index]get '/menus/:location', to: 'menus#show', as: :menu- resources :cms_pages, only: %i[index]- get '/cms_pages/:title', to: 'cms_page#show', as: :page+ resources :cms_pages, only: %i[index], path: '/pages'+ get '/pages/:slug', to: 'cms_page#show', as: :pageendnamespace :platform dodiff --git a/core/db/migrate/20210514204251_create_spree_cms_sections.rb b/core/db/migrate/20210514204251_create_spree_cms_sections.rbindex 23660add6b..dd2888cee6 100644--- a/core/db/migrate/20210514204251_create_spree_cms_sections.rb+++ b/core/db/migrate/20210514204251_create_spree_cms_sections.rb@@ -10,7 +10,6 @@ class CreateSpreeCmsSections < ActiveRecord::Migration[5.2]t.column :full_width_on_small, :boolean, default: falset.column :boundary, :stringt.column :type, :string- t.column :destination, :stringt.column :position, :integert.references :linked_resource, polymorphic: true, index: { name: 'index_spree_cms_sections_on_linked_resource' }diff --git a/frontend/app/assets/stylesheets/spree/frontend/views/spree/home/index.scss b/frontend/app/assets/stylesheets/spree/frontend/views/spree/home/index.scssindex 3c016fd600..a0511ff32d 100644--- a/frontend/app/assets/stylesheets/spree/frontend/views/spree/home/index.scss+++ b/frontend/app/assets/stylesheets/spree/frontend/views/spree/home/index.scss@@ -253,13 +253,13 @@text-decoration: none !important;}&-text {- font-size: 12px;+ font-size: font-px-to-rem(12px);@include media-breakpoint-up(md) {- font-size: 22px;+ font-size: font-px-to-rem(22px);}@include media-breakpoint-up(lg) {- font-size: 24px;+ font-size: font-px-to-rem(24px);}}}diff --git a/frontend/app/views/spree/cms_pages/show.html.erb b/frontend/app/views/spree/cms_pages/show.html.erbindex 8d19495040..e48423db99 100644--- a/frontend/app/views/spree/cms_pages/show.html.erb+++ b/frontend/app/views/spree/cms_pages/show.html.erb@@ -1,3 +1,5 @@+<% @body_id = 'page' %>+<% if @cms_page %><% if simple_page?(@cms_page) %><div class="container">