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.

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.rb
index 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 Spree
end
def resource
- @resource ||= scope.find_by!(title: params[:title])
+ @resource ||= scope.find_by!(slug: params[:slug])
end
def resource_serializer
diff --git a/api/app/serializers/spree/api/v2/platform/cms_section_serializer.rb b/api/app/serializers/spree/api/v2/platform/cms_section_serializer.rb
new file mode 100644
index 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
+end
diff --git a/api/app/serializers/spree/v2/storefront/cms_page_serializer.rb b/api/app/serializers/spree/v2/storefront/cms_page_serializer.rb
index 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 Spree
class CmsPageSerializer < BaseSerializer
set_type :cms_page
- attributes :title, :type, :locale
+ attributes :title, :content, :locale, :meta_description, :meta_title,
+ :slug, :type
+
+ belongs_to :store
+ has_many :cms_sections
end
end
end
diff --git a/api/app/serializers/spree/v2/storefront/cms_section_serializer.rb b/api/app/serializers/spree/v2/storefront/cms_section_serializer.rb
new file mode 100644
index 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
+end
diff --git a/api/app/serializers/spree/v2/storefront/store_serializer.rb b/api/app/serializers/spree/v2/storefront/store_serializer.rb
index 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_pages
has_one :default_country, serializer: :country, record_type: :country, id_method_name: :default_country_id
attribute :favicon_path do |store|
diff --git a/api/config/routes.rb b/api/config/routes.rb
index 0c081edbe3..1795be6334 100644
--- a/api/config/routes.rb
+++ b/api/config/routes.rb
@@ -167,8 +167,8 @@ Spree::Core::Engine.add_routes do
resources :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: :page
end
namespace :platform do
diff --git a/core/db/migrate/20210514204251_create_spree_cms_sections.rb b/core/db/migrate/20210514204251_create_spree_cms_sections.rb
index 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: false
t.column :boundary, :string
t.column :type, :string
- t.column :destination, :string
t.column :position, :integer
t.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.scss
index 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.erb
index 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">