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 views

Matthew Kennedybf681833551c
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index 434fc869ef..f17c65f765 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -17,6 +17,7 @@ module Spree
scope :visible, -> { where visible: true }
scope :by_store, ->(store) { where(store: store) }
+ scope :by_locale, ->(locale) { where(locale: locale) }
def seo_title
if meta_title.present?
@@ -31,6 +32,10 @@ module Spree
false
end
+ def homepage?
+ type == 'Spree::Cms::Pages::Homepage'
+ end
+
def viewable?
visible
end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index b7f4018ea6..e04dc17aca 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -843,6 +843,7 @@ en:
display: Display
doesnt_track_inventory: It doesn't track inventory
dont_have_account: No account?
+ draft_mode: Draft Mode
edit: Edit
editing_resource: 'Editing %{resource}'
editing_rma_reason: Editing RMA Reason
@@ -1833,7 +1834,8 @@ en:
version: Version
void: Void
we_will_be_back: We'll be back.
- we_are_busy_updating: "We're busy updating the %{store_name} for you."
+ we_are_busy_updating: "We're updating the %{store_name} homepage."
+ we_are_busy_updating_page: "We're busy updating this page."
please_check_back_soon: Please check back soon.
weight: Weight
what_is_a_cvv: What is a (CVV) Credit Card Code?
diff --git a/frontend/app/controllers/spree/cms_pages_controller.rb b/frontend/app/controllers/spree/cms_pages_controller.rb
index e3c4dd324e..80a3b90e4a 100644
--- a/frontend/app/controllers/spree/cms_pages_controller.rb
+++ b/frontend/app/controllers/spree/cms_pages_controller.rb
@@ -5,20 +5,30 @@ module Spree
include Spree::FrontendHelper
include Spree::CacheHelper
- def show; end
+ def show
+ if @cms_page_x.viewable?
+ @cms_page = @cms_page_x
+ elsif spree_current_user&.admin?
+ @cms_page = @cms_page_x
+ @edit_mode = true
+ end
+ end
private
def accurate_title
- if @cms_page
- @cms_page.seo_title
+ if @cms_page_x
+ @cms_page_x.seo_title
else
super
end
end
def load_cms_page
- @cms_page = Spree::CmsPage.visible.by_store(current_store).friendly.find(params[:id])
+ @cms_page_x = Spree::CmsPage.
+ by_store(current_store).
+ by_locale(I18n.locale).
+ friendly.find(params[:id])
end
end
end
diff --git a/frontend/app/helpers/spree/cms_pages_helper.rb b/frontend/app/helpers/spree/cms_pages_helper.rb
index 4c9e303294..17fd565dc0 100644
--- a/frontend/app/helpers/spree/cms_pages_helper.rb
+++ b/frontend/app/helpers/spree/cms_pages_helper.rb
@@ -1,5 +1,9 @@
module Spree
module CmsPagesHelper
+
+ def simple_page?(page)
+ page.content.present? && !page.sections?
+ end
def build_section(section)
preview_type = section.kind.parameterize(separator: '_')
@@ -15,7 +19,7 @@ module Spree
css_width = 'col-12'
end
- render "spree/cms_pages/sections/#{preview_type}", section: section, width: css_width, edge_to_edge: edge_to_edge
+ render "spree/shared/cms/sections/#{preview_type}", section: section, width: css_width, edge_to_edge: edge_to_edge
end
end
end
diff --git a/frontend/app/views/spree/cms_pages/show.html.erb b/frontend/app/views/spree/cms_pages/show.html.erb
index c0ca46a9e1..377193e8bd 100644
--- a/frontend/app/views/spree/cms_pages/show.html.erb
+++ b/frontend/app/views/spree/cms_pages/show.html.erb
@@ -1,17 +1,35 @@
-<% if @cms_page.content.present? && !@cms_page.sections? %>
-<div class="container">
- <div class="row my-5">
- <div class="col-12">
- <%= @cms_page.content.html_safe %>
+<% if @cms_page %>
+ <% if simple_page?(@cms_page) %>
+ <div class="container">
+ <div class="row my-5">
+ <div class="col-12">
+ <%= @cms_page.content.html_safe %>
+ </div>
</div>
</div>
-</div>
-<% else %>
-<div class="container">
- <div class="row">
- <% @cms_page.cms_sections.each do |section| %>
- <%= build_section(section) %>
- <% end %>
+ <% else %>
+ <div class="container">
+ <div class="row">
+ <% @cms_page.cms_sections.each do |section| %>
+ <%= build_section(section) %>
+ <% end %>
+ </div>
</div>
- </div>
+ <% end %>
+<% else %>
+ <div id="missingHomepage" class="container my-5">
+ <div class="row my-5">
+ <div class="col-12">
+ <figure class="logo mx-auto missing-homepage-logo-container">
+ <%= logo %>
+ </figure>
+ </div>
+ <div class="col-12 mb-5 text-center">
+ <h1 class="mb-3"><%= Spree.t('we_will_be_back') %></h1>
+ <h4 class="text-dark"><%= Spree.t('we_are_busy_updating_page', store_name: current_store.name) %></h4>
+ <h4 class="text-dark"><%= Spree.t('please_check_back_soon') %></h4>
+ </div>
+ </div>
+ </div>
<% end %>
+<%= render "spree/shared/cms/pages/edit_mode", edit_mode: @edit_mode %>
diff --git a/frontend/app/views/spree/home/index.html.erb b/frontend/app/views/spree/home/index.html.erb
index 71d0ac7ae9..1214b7e9c2 100644
--- a/frontend/app/views/spree/home/index.html.erb
+++ b/frontend/app/views/spree/home/index.html.erb
@@ -24,13 +24,4 @@
</div>
</div>
<% end %>
-
-<% if @edit_mode %>
-<div class="fixed-bottom text-center">
- <div class="row">
- <div id="draftNotice" class="col-12 d-flex w-100 p-4 justify-content-center align-items-center bg-dark">
- <span class="text-white"><%= Spree.t('spree_pages.draft_mode') %></span>
- </div>
- </div>
-</div>
-<% end %>
+<%= render "spree/shared/cms/pages/edit_mode", edit_mode: @edit_mode %>
diff --git a/frontend/app/views/spree/shared/cms/pages/_edit_mode.html.erb b/frontend/app/views/spree/shared/cms/pages/_edit_mode.html.erb
new file mode 100644
index 0000000000..1d9ed81c63
--- /dev/null
+++ b/frontend/app/views/spree/shared/cms/pages/_edit_mode.html.erb
@@ -0,0 +1,13 @@
+<% if edit_mode %>
+ <div class="fixed-bottom text-center">
+ <div class="row">
+ <div id="draftNotice" class="col-12 d-flex w-100 p-4 justify-content-center align-items-center bg-dark">
+ <span class="text-white">
+ <h5 class="mb-0">
+ <%= Spree.t('spree_pages.draft_mode') %>
+ </h5>
+ </span>
+ </div>
+ </div>
+ </div>
+<% end %>
diff --git a/frontend/app/views/spree/cms_pages/sections/_featured_atricle.html.erb b/frontend/app/views/spree/shared/cms/sections/_featured_atricle.html.erb
similarity index 100%
rename from frontend/app/views/spree/cms_pages/sections/_featured_atricle.html.erb
rename to frontend/app/views/spree/shared/cms/sections/_featured_atricle.html.erb
diff --git a/frontend/app/views/spree/cms_pages/sections/_hero.html.erb b/frontend/app/views/spree/shared/cms/sections/_hero.html.erb
similarity index 100%
rename from frontend/app/views/spree/cms_pages/sections/_hero.html.erb
rename to frontend/app/views/spree/shared/cms/sections/_hero.html.erb
diff --git a/frontend/app/views/spree/cms_pages/sections/_promo.html.erb b/frontend/app/views/spree/shared/cms/sections/_promo.html.erb
similarity index 100%
rename from frontend/app/views/spree/cms_pages/sections/_promo.html.erb
rename to frontend/app/views/spree/shared/cms/sections/_promo.html.erb
diff --git a/frontend/app/views/spree/cms_pages/sections/_text_block.html.erb b/frontend/app/views/spree/shared/cms/sections/_text_block.html.erb
similarity index 100%
rename from frontend/app/views/spree/cms_pages/sections/_text_block.html.erb
rename to frontend/app/views/spree/shared/cms/sections/_text_block.html.erb