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.

Fix some CC issues.

Matthew Kennedy6b34605c239b
diff --git a/core/app/models/spree/cms_section.rb b/core/app/models/spree/cms_section.rb
index fb10466dd8..ff315b93f7 100644
--- a/core/app/models/spree/cms_section.rb
+++ b/core/app/models/spree/cms_section.rb
@@ -14,8 +14,8 @@ module Spree
SECTION_WIDTHS = ['Edge-to-Edge', 'Full', 'Half']
SECTION_TYPES = ['Spree::Cms::Sections::Hero',
- 'Spree::Cms::Sections::Promo',
- 'Spree::Cms::Sections::Featured Atricle']
+ 'Spree::Cms::Sections::Promo',
+ 'Spree::Cms::Sections::Featured Atricle']
SECTION_LINKS_TO = ['Spree::Taxon', 'Spree::Product']
end
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 0ff59f559c..91c384fa14 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
@@ -1,13 +1,3 @@
-#missingHomepage {
- .missing-homepage-logo-container {
- width: 160px;
-
- img {
- max-width: 100%;
- }
- }
-}
-
.homepage {
&-hero-image {
display: flex;
@@ -304,6 +294,15 @@
}
}
+#missingHomepage {
+ .missing-homepage-logo-container {
+ width: 160px;
+
+ img {
+ max-width: 100%;
+ }
+ }
+}
.full-width {
width: 100vw;
diff --git a/frontend/app/controllers/spree/cms_pages_controller.rb b/frontend/app/controllers/spree/cms_pages_controller.rb
index 7918d9a458..07095f6241 100644
--- a/frontend/app/controllers/spree/cms_pages_controller.rb
+++ b/frontend/app/controllers/spree/cms_pages_controller.rb
@@ -8,7 +8,7 @@ module Spree
def show
if @page&.viewable?
@cms_page = @page
- elsif spree_current_user&.admin?
+ elsif try_spree_current_user&.admin?
@cms_page = @page
@edit_mode = true
end
diff --git a/frontend/app/controllers/spree/home_controller.rb b/frontend/app/controllers/spree/home_controller.rb
index 2a2c0fd4f5..4f0a25bd3a 100644
--- a/frontend/app/controllers/spree/home_controller.rb
+++ b/frontend/app/controllers/spree/home_controller.rb
@@ -9,7 +9,7 @@ module Spree
def index
if @cms_home_page&.viewable?
@homepage = @cms_home_page
- elsif spree_current_user&.admin?
+ elsif try_spree_current_user&.admin?
@homepage = @cms_home_page
@edit_mode = true
end
diff --git a/frontend/app/helpers/spree/cms_pages_helper.rb b/frontend/app/helpers/spree/cms_pages_helper.rb
index aecde8aaf9..9589670c84 100644
--- a/frontend/app/helpers/spree/cms_pages_helper.rb
+++ b/frontend/app/helpers/spree/cms_pages_helper.rb
@@ -3,6 +3,7 @@ module Spree
def simple_page?(page)
page.content.present? && !page.sections?
end
+
def build_section(section)
preview_type = section.type.parameterize(separator: '_')