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 URL and start on pages API.

Matthew Kennedy83176c961336
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
new file mode 100644
index 0000000000..bab403a928
--- /dev/null
+++ b/api/app/controllers/spree/api/v2/storefront/cms_pages_controller.rb
@@ -0,0 +1,10 @@
+module Spree
+ module Api
+ module V2
+ module Storefront
+ class CmsPagesController < ::Spree::Api::V2::ResourceController
+ end
+ end
+ end
+ end
+end
diff --git a/api/app/serializers/spree/api/v2/platform/cms_page_serializer.rb b/api/app/serializers/spree/api/v2/platform/cms_page_serializer.rb
new file mode 100644
index 0000000000..a5b0610713
--- /dev/null
+++ b/api/app/serializers/spree/api/v2/platform/cms_page_serializer.rb
@@ -0,0 +1,11 @@
+module Spree
+ module Api
+ module V2
+ module Platform
+ class CountrySerializer < 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
new file mode 100644
index 0000000000..7d93c3583f
--- /dev/null
+++ b/api/app/serializers/spree/v2/storefront/cms_page_serializer.rb
@@ -0,0 +1,12 @@
+module Spree
+ module V2
+ module Storefront
+ class CmsPageSerializer < BaseSerializer
+ set_type :cms_page
+
+ attributes :title, :type, :locale
+
+ end
+ end
+ end
+end
diff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.js
index d494adcf2f..1da191a7ec 100644
--- a/backend/app/assets/javascripts/spree/backend.js
+++ b/backend/app/assets/javascripts/spree/backend.js
@@ -97,6 +97,7 @@ Spree.routes.menus_api_v2 = Spree.pathFor('api/v2/platform/menus')
Spree.routes.menus_items_api_v2 = Spree.pathFor('api/v2/platform/menu_items')
Spree.routes.option_types_api_v2 = Spree.pathFor('api/v2/platform/option_types')
Spree.routes.option_values_api_v2 = Spree.pathFor('api/v2/platform/option_values')
+Spree.routes.pages_api_v2 = Spree.pathFor('api/v2/platform/cms_pages')
Spree.routes.products_api_v2 = Spree.pathFor('/api/v2/platform/products')
Spree.routes.taxons_api_v2 = Spree.pathFor('/api/v2/platform/taxons')
Spree.routes.users_api_v2 = Spree.pathFor('api/v2/platform/users')
diff --git a/backend/app/helpers/spree/admin/cms_page_helper.rb b/backend/app/helpers/spree/admin/cms_page_helper.rb
index b027b8756a..f373f8c13e 100644
--- a/backend/app/helpers/spree/admin/cms_page_helper.rb
+++ b/backend/app/helpers/spree/admin/cms_page_helper.rb
@@ -26,9 +26,9 @@ module Spree
return unless frontend_available?
url = if page.homepage?
- spree.root_url + "#{page.locale}/"
+ spree.root_url + page.locale
else
- spree.page_url(page.slug) + "#{page.locale}/"
+ spree.page_url(page.slug)
end
button_link_to(
@@ -42,9 +42,9 @@ module Spree
return unless frontend_available?
if page.homepage?
- spree.root_path + "#{page.locale}/"
+ spree.root_path + page.locale
else
- spree.page_path(page.slug) + "#{page.locale}/"
+ spree.page_path(page.slug)
end
end
diff --git a/backend/app/helpers/spree/admin/menu_helper.rb b/backend/app/helpers/spree/admin/menu_helper.rb
index 03bf4eeef0..911775cd0f 100644
--- a/backend/app/helpers/spree/admin/menu_helper.rb
+++ b/backend/app/helpers/spree/admin/menu_helper.rb
@@ -25,7 +25,12 @@ module Spree
Spree::MenuItem::LINKED_RESOURCE_TYPE.each do |resource_type|
formatted = if Spree::MenuItem::DYNAMIC_RESOURCE_TYPE.include? resource_type
- resource_type.split('::', 3).last
+ str = resource_type.split('::', 3).last
+ if str.starts_with?('Cms')
+ str.slice(3, 100)
+ else
+ str
+ end
else
resource_type
end
diff --git a/backend/app/views/spree/admin/shared/linkables/_spree_cmspage.html.erb b/backend/app/views/spree/admin/shared/linkables/_spree_cmspage.html.erb
new file mode 100644
index 0000000000..f00042768d
--- /dev/null
+++ b/backend/app/views/spree/admin/shared/linkables/_spree_cmspage.html.erb
@@ -0,0 +1,21 @@
+<% if resource.linked_resource %>
+ <% resorce_holder = [resource.linked_resource] %>
+ <% id_holder = :id %>
+ <% name_holder = :name %>
+ <% active_id_holder = resource.linked_resource.id %>
+ <% end %>
+ <%= f.field_container :linked_resource_id, class: ['form-group'] do %>
+ <%= f.label :linked_resource_id, Spree.t('page') %>
+ <%= f.select :linked_resource_id,
+ options_from_collection_for_select(resorce_holder || [],
+ id_holder, name_holder, active_id_holder || nil),
+ { include_blank: true },
+ class: 'select2autocomplete',
+ data: { autocomplete_name_value: 'cms_pages',
+ autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_page'),
+ autocomplete_clear_value: true,
+ autocomplete_url_value: 'pages_api_v2' } %>
+
+ <%= f.error_message_on :linked_resource_id %>
+ <small class="form-text text-muted"><%= resource.link %></small>
+<% end %>
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index 4a23db1a9c..f96aa62147 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -9,6 +9,7 @@ module Spree
belongs_to :store, touch: true
has_many :cms_sections, dependent: :destroy
+
has_many :menu_items, as: :linked_resource
before_validation :handle_slug