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
Add start of live page preview.
Matthew Kennedyb065e00c073d
diff --git a/backend/app/assets/javascripts/spree/backend/cms/page.es6 b/backend/app/assets/javascripts/spree/backend/cms/page.es6index 186006f0da..7924639fe6 100644--- a/backend/app/assets/javascripts/spree/backend/cms/page.es6+++ b/backend/app/assets/javascripts/spree/backend/cms/page.es6@@ -45,6 +45,10 @@ document.addEventListener('DOMContentLoaded', function() {}})+function reloadPreview () {+ document.getElementById('pageLivePreview').contentWindow.location.reload();+}+function handleSectionReposition(evt) {const data = {section_id: parseInt(evt.item.dataset.sectionId, 10),@@ -60,7 +64,9 @@ function handleSectionReposition(evt) {body: JSON.stringify(data)}).then(response => {- if (response.ok !== true) {+ if (response.ok) {+ reloadPreview()+ } else {handleMenuItemMoveError()}})diff --git a/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss b/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scssindex e9c2a50f6e..c8a5de3c2c 100644--- a/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss+++ b/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss@@ -32,3 +32,35 @@border-left: 1px solid #dee2e6;}}++++@include media-breakpoint-up(sm) {+ #pageLivePreviewWrapper {+ padding: 0;+ overflow: hidden;+ }++ #pageLivePreview {+ margin: auto;+ left: 28px;+ top: 38px;+ width: 282%;+ height: 277%;+ margin-bottom: -151%;+ border: 3px solid grey;+ border-radius: 15px;+ transform: scale(0.3181);+ -webkit-transform: scale(0.3181);+ -o-transform: scale(0.3181);+ -ms-transform: scale(0.3181);+ -moz-transform: scale(0.3181);+ transform-origin: top left;+ -webkit-transform-origin: top left;+ -o-transform-origin: top left;+ -ms-transform-origin: top left;+ -moz-transform-origin: top left;+ }+}+@include media-breakpoint-up(lg) { }+@include media-breakpoint-up(xl) { }diff --git a/backend/app/controllers/spree/admin/cms_sections_controller.rb b/backend/app/controllers/spree/admin/cms_sections_controller.rbindex 09b84ebed7..f508c9d087 100644--- a/backend/app/controllers/spree/admin/cms_sections_controller.rb+++ b/backend/app/controllers/spree/admin/cms_sections_controller.rb@@ -3,8 +3,6 @@ module Spreeclass CmsSectionsController < ResourceControllerbelongs_to 'spree/cms_page'- before_action :load_data-def collection_urlspree.edit_admin_cms_page_path(@cms_page)end@@ -28,11 +26,6 @@ module Spreedef parent@cms_page = CmsPage.friendly.find(params[:cms_page_id])end-- def load_data- @cms_section_widths = Spree::CmsSection::WIDTHS- @cms_section_types = Spree::CmsSection::TYPES- endendendenddiff --git a/backend/app/views/spree/admin/cms_pages/edit.html.erb b/backend/app/views/spree/admin/cms_pages/edit.html.erbindex b4ae1263e3..1ff152a3fc 100644--- a/backend/app/views/spree/admin/cms_pages/edit.html.erb+++ b/backend/app/views/spree/admin/cms_pages/edit.html.erb@@ -13,14 +13,17 @@<% if @cms_page.sections? %><div id="pageSectionsArea" class="col-12">- <div class="row mt-5">+ <div class="row"><div class="col-12">+ <hr class="mb-5">+ <h5 class="mb-0 text-center"> <%= Spree.t('admin.cms.page_sections', page_name: @cms_page.title) %></h5>+ </div>+ </div>+ <div class="row">+ <div class="col-4"><div class="card mb-3"><div class="card-header"><div class="row pb-0">- <div class="d-flex pl-3">- <h5 class="mb-0 align-self-center"> <%= Spree.t('admin.cms.page_sections', page_name: @cms_page.title) %></h5>- </div><div class="col d-flex justify-content-end"><%= button_link_to Spree.t('admin.pages.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %></div>@@ -45,6 +48,24 @@<% end %></div></div>++ <div class="col-8">+ <iframe class="d-flex" id="pageLivePreview" src="http://localhost:3000"></iframe>++ <div class="d-flex justify-content-center">+ <div class="btn-group btn-group-toggle" data-toggle="buttons">+ <label class="btn btn-outline-primary active">+ <input type="radio" name="options" id="option1" autocomplete="off" checked> Mobile+ </label>+ <label class="btn btn-outline-primary">+ <input type="radio" name="options" id="option2" autocomplete="off"> Tablet+ </label>+ <label class="btn btn-outline-primary">+ <input type="radio" name="options" id="option3" autocomplete="off"> Desktop+ </label>+ </div>+ </div>+ </div></div></div><% end %>diff --git a/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_featured_atricle.html.erb b/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_featuredarticle.html.erbsimilarity index 88%rename from backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_featured_atricle.html.erbrename to backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_featuredarticle.html.erbindex 9214b07550..93777cda7a 100644--- a/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_featured_atricle.html.erb+++ b/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_featuredarticle.html.erb@@ -20,7 +20,7 @@<%= f.field_container :width, class: ['form-group'] do %><%= f.label :width, Spree.t('admin.navigation.width') %>- <%= f.select(:width, @cms_section_widths, {include_blank: false}, class: 'select2') %>+ <%= f.select(:width, @cms_section.widths, {include_blank: false}, class: 'select2') %><%= f.error_message_on :width %><% end %></div>@@ -35,11 +35,11 @@<div class="col-12 col-md-6"><%= f.field_container :linked_resource_type, class: ['form-group'] do %><%= f.label :linked_resource_type, Spree.t('admin.navigation.link_to') %>- <%= f.select(:linked_resource_type, @cms_section_links_to, {include_blank: false}, class: 'link_switcher') %>+ <%= f.select(:linked_resource_type, @cms_section.links_to, {include_blank: false}, class: 'link_switcher') %><%= f.error_message_on :linked_resource_type %><% end %></div><div class="col-12 col-md-6">- <%= render "spree/admin/shared/link_switcher", resource: @cms_section, f: f %>+ <%= render "spree/admin/shared/link_fields", resource: @cms_section, f: f %></div></div>diff --git a/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_hero.html.erb b/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_hero.html.erbindex 83a1fba655..515938dfc2 100644--- a/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_hero.html.erb+++ b/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_hero.html.erb@@ -8,7 +8,7 @@<%= f.field_container :width, class: ['form-group'] do %><%= f.label :width, Spree.t('admin.navigation.width') %>- <%= f.select(:width, @cms_section_widths, {include_blank: false}, class: 'select2') %>+ <%= f.select(:width, @cms_section.widths, {include_blank: false}, class: 'select2') %><%= f.error_message_on :width %><% end %>@@ -47,7 +47,7 @@<div class="col-12 col-md-6"><%= f.field_container :linked_resource_type, class: ['form-group'] do %><%= f.label :linked_resource_type, Spree.t('admin.navigation.link_to') %>- <%= f.select(:linked_resource_type, Spree::Cms::Sections::Hero::LINKS_TO, {include_blank: false}, class: 'link_switcher') %>+ <%= f.select(:linked_resource_type, @cms_section.links_to, {include_blank: false}, class: 'link_switcher') %><%= f.error_message_on :linked_resource_type %><% end %></div>diff --git a/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_promo.html.erb b/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_promo.html.erbindex 6d93042703..2766363858 100644--- a/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_promo.html.erb+++ b/backend/app/views/spree/admin/cms_sections/types/_spree_cms_sections_promo.html.erb@@ -14,7 +14,7 @@<%= f.field_container :width, class: ['form-group'] do %><%= f.label :width, Spree.t('admin.navigation.width') %>- <%= f.select(:width, @cms_section_widths, {include_blank: false}, class: 'select2') %>+ <%= f.select(:width, @cms_section.widths, {include_blank: false}, class: 'select2') %><%= f.error_message_on :width %><% end %></div>@@ -47,11 +47,11 @@<div class="col-12 col-md-6"><%= f.field_container :linked_resource_type, class: ['form-group'] do %><%= f.label :linked_resource_type, Spree.t('admin.navigation.link_to') %>- <%= f.select(:linked_resource_type, @cms_section_links_to, {include_blank: false}, class: 'link_switcher') %>+ <%#= f.select(:linked_resource_type, @cms_section_links_to, {include_blank: false}, class: 'link_switcher') %><%= f.error_message_on :linked_resource_type %><% end %></div><div class="col-12 col-md-6">- <%= render "spree/admin/shared/link_switcher", resource: @cms_section, f: f %>+ <%= render "spree/admin/shared/link_fields", resource: @cms_section, f: f %></div></div>diff --git a/core/app/models/spree/cms/sections/featured_article.rb b/core/app/models/spree/cms/sections/featured_article.rbindex ff91b94cc9..e6738b21cc 100644--- a/core/app/models/spree/cms/sections/featured_article.rb+++ b/core/app/models/spree/cms/sections/featured_article.rb@@ -1,4 +1,11 @@module Spree::Cms::Sectionsclass FeaturedArticle < Spree::CmsSection+ def links_to+ ['Spree::Taxon', 'Spree::Product']+ end++ def widths+ ['Edge-to-Edge', 'Full', 'Half']+ endendenddiff --git a/core/app/models/spree/cms/sections/hero.rb b/core/app/models/spree/cms/sections/hero.rbindex 1bde02e758..d0dc472325 100644--- a/core/app/models/spree/cms/sections/hero.rb+++ b/core/app/models/spree/cms/sections/hero.rb@@ -1,5 +1,11 @@module Spree::Cms::Sectionsclass Hero < Spree::CmsSection- LINKS_TO = ['Spree::Taxon', 'Spree::Product']+ def links_to+ ['Spree::Taxon', 'Spree::Product']+ end++ def widths+ ['Edge-to-Edge', 'Full', 'Half']+ endendenddiff --git a/core/app/models/spree/cms/sections/promo.rb b/core/app/models/spree/cms/sections/promo.rbindex b1ad934d90..bc88bef5c7 100644--- a/core/app/models/spree/cms/sections/promo.rb+++ b/core/app/models/spree/cms/sections/promo.rb@@ -1,4 +1,11 @@module Spree::Cms::Sectionsclass Promo < Spree::CmsSection+ def links_to+ ['Spree::Taxon', 'Spree::Product']+ end++ def widths+ ['Half']+ endendenddiff --git a/core/app/models/spree/cms_section.rb b/core/app/models/spree/cms_section.rbindex 82ed6736a7..c503768eaf 100644--- a/core/app/models/spree/cms_section.rb+++ b/core/app/models/spree/cms_section.rb@@ -12,11 +12,16 @@ module Spreehas_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::Icon'accepts_nested_attributes_for :icon, reject_if: :all_blank- WIDTHS = ['Edge-to-Edge', 'Full', 'Half']TYPES = ['Spree::Cms::Sections::Hero',- 'Spree::Cms::Sections::Promo',- 'Spree::Cms::Sections::Featured Atricle']+ 'Spree::Cms::Sections::Promo',+ 'Spree::Cms::Sections::FeaturedArticle']- LINKS_TO = []+ def links_to+ []+ end++ def widths+ []+ endendenddiff --git a/frontend/app/views/spree/shared/cms/sections/_spree_cms_sections_featured_atricle.html.erb b/frontend/app/views/spree/shared/cms/sections/_spree_cms_sections_featuredarticle.html.erbsimilarity index 100%rename from frontend/app/views/spree/shared/cms/sections/_spree_cms_sections_featured_atricle.html.erbrename to frontend/app/views/spree/shared/cms/sections/_spree_cms_sections_featuredarticle.html.erb