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
Open source Page Builder models
Łukasz Adamczyk4257abfdd0f3
diff --git a/core/app/jobs/spree/themes/duplicate_components_job.rb b/core/app/jobs/spree/themes/duplicate_components_job.rbnew file mode 100644index 0000000000..514755fb31--- /dev/null+++ b/core/app/jobs/spree/themes/duplicate_components_job.rb@@ -0,0 +1,61 @@+module Spree+ module Themes+ class DuplicateComponentsJob < Spree::BaseJob+ queue_as Spree.queues.themes++ # We need to duplicate:+ # 1. Theme files + sections with pageable_type Spree::Theme.+ # 2. Duplicate pages + sections.+ # 3. Adjust linkable on page links for Spree::PageSection and Spree::PageBlock parents and Spree::Page linkable.++ def perform(theme_id, duplicated_theme_id)+ theme = Spree::Theme.find(theme_id)+ duplicated_theme = Spree::Theme.find(duplicated_theme_id)++ ActsAsTenant.with_tenant(duplicated_theme.project) do+ ApplicationRecord.transaction do+ duplicated_pages = duplicate_pages(theme, duplicated_theme)++ # Duplicated links on pages and blocks have references to pages from the previous theme+ # We need to look for a duplicated page and update the link with it+ duplicate_layout_sections(theme, duplicated_theme)+ adjust_page_links(theme, duplicated_theme, duplicated_pages)++ duplicated_theme.update!(ready: true)+ end+ end+ end++ private++ def duplicate_layout_sections(theme, duplicated_theme)+ theme.layout_sections.each { |section| section.deep_clone(duplicated_theme) }+ end++ def duplicate_pages(theme, duplicated_theme)+ theme.pages.map { |page| page.duplicate(duplicated_theme) }+ end++ def adjust_page_links(theme, duplicated_theme, duplicated_pages)+ page_sections = Spree::PageSection.where(pageable: duplicated_pages)+ layout_sections = duplicated_theme.layout_sections+ all_section_ids = page_sections.ids + layout_sections.ids++ all_page_blocks = Spree::PageBlock.where(section_id: all_section_ids)++ all_parent_ids = all_section_ids + all_page_blocks.ids+ all_page_links = Spree::PageLink.+ includes(:linkable, parent: :pageable).+ where(linkable_type: 'Spree::Page').+ where(parent_id: all_parent_ids, linkable_id: theme.pages)++ all_page_links.each do |page_link|+ linkable_type = page_link.linkable.type+ duplicated_page = duplicated_theme.pages.find_by(type: linkable_type)++ page_link.update!(linkable: duplicated_page)+ end+ end+ end+ end+enddiff --git a/core/app/jobs/spree/themes/screenshot_job.rb b/core/app/jobs/spree/themes/screenshot_job.rbnew file mode 100644index 0000000000..5e16da3afe--- /dev/null+++ b/core/app/jobs/spree/themes/screenshot_job.rb@@ -0,0 +1,29 @@+module Spree+ module Themes+ class ScreenshotJob < Spree::BaseJob+ queue_as Spree.queues.themes++ def perform(theme_id)+ theme = Spree::Theme.find(theme_id)++ browser = Ferrum::Browser.new+ browser.go_to(theme.store.formatted_url)++ Tempfile.create(['screenshot', '.png']) do |tempfile|+ browser.screenshot(path: tempfile.path)++ theme.skip_screenshot_update = true+ theme.screenshot.attach(+ io: File.open(tempfile.path),+ filename: "#{theme.store.name}-#{theme.name}-#{theme.updated_at}.png",+ content_type: 'image/png'+ )+ theme.save!+ theme.skip_screenshot_update = false+ end+ ensure+ browser&.quit+ end+ end+ end+enddiff --git a/core/app/models/concerns/spree/has_one_link.rb b/core/app/models/concerns/spree/has_one_link.rbnew file mode 100644index 0000000000..270b9a5fc6--- /dev/null+++ b/core/app/models/concerns/spree/has_one_link.rb@@ -0,0 +1,42 @@+module Spree+ module HasOneLink+ extend ActiveSupport::Concern++ included do+ has_one :link, ->(ps) { ps.links.where(position: 1) }, class_name: 'Spree::PageLink', as: :parent, dependent: :destroy, inverse_of: :parent+ accepts_nested_attributes_for :link++ def allowed_linkable_types+ [+ [Spree.t(:page), 'Spree::Page'],+ [Spree.t(:product), 'Spree::Product'],+ [Spree.t(:post), 'Spree::Post'],+ [Spree.t(:taxon), 'Spree::Taxon'],+ [Spree.t(:policy), 'ActionText::RichText'],+ [Spree.t(:url), nil]+ ]+ end++ def default_linkable_type+ 'Spree::Page'+ end++ def default_linkable_resource+ @default_linkable_resource ||= theme_or_parent.pages.find_by(type: 'Spree::Pages::Homepage')+ end++ def default_links+ @default_links.presence || [+ Spree::PageLink.new(+ label: Spree.t(:shop_all),+ linkable: theme_or_parent.pages.find_by(type: 'Spree::Pages::ShopAll')+ )+ ]+ end++ def theme_or_parent+ theme.preview? ? theme.parent : theme+ end+ end+ end+enddiff --git a/core/app/models/concerns/spree/has_page_links.rb b/core/app/models/concerns/spree/has_page_links.rbnew file mode 100644index 0000000000..5c4c356064--- /dev/null+++ b/core/app/models/concerns/spree/has_page_links.rb@@ -0,0 +1,53 @@+module Spree+ module HasPageLinks+ extend ActiveSupport::Concern++ included do+ has_many :links, -> { order(:position).includes(:linkable) }, class_name: 'Spree::PageLink', as: :parent, dependent: :destroy, inverse_of: :parent+ alias page_links links++ after_create :create_default_links, unless: :do_not_create_links++ attribute :do_not_create_links, :boolean, default: false+ attr_accessor :default_links++ def allowed_linkable_types+ [+ [Spree.t(:page), 'Spree::Page'],+ [Spree.t(:product), 'Spree::Product'],+ [Spree.t(:post), 'Spree::Post'],+ [Spree.t(:taxon), 'Spree::Taxon'],+ [Spree.t(:policy), 'ActionText::RichText'],+ [Spree.t(:url), nil]+ ]+ end++ def default_linkable_type+ 'Spree::Page'+ end++ def theme_or_parent+ theme.preview? ? theme.parent : theme+ end++ def default_linkable_resource+ @default_linkable_resource ||= theme_or_parent.pages.find_by(type: 'Spree::Pages::Homepage')+ end++ def default_links+ @default_links.presence || []+ end++ def links_available?+ true+ end++ def create_default_links+ default_links.each do |link|+ link.parent = self+ link.save!+ end+ end+ end+ end+enddiff --git a/core/app/models/concerns/spree/previewable.rb b/core/app/models/concerns/spree/previewable.rbnew file mode 100644index 0000000000..c12cfca5eb--- /dev/null+++ b/core/app/models/concerns/spree/previewable.rb@@ -0,0 +1,17 @@+module Spree+ module Previewable+ extend ActiveSupport::Concern++ included do |base|+ belongs_to :parent, class_name: base.name, optional: true, foreign_key: :parent_id+ has_many :previews, class_name: base.name, dependent: :destroy_async, foreign_key: :parent_id++ scope :without_previews, -> { where(parent_id: nil) }+ scope :only_previews, -> { where.not(parent_id: nil) }+ end++ def preview?+ parent.present?+ end+ end+enddiff --git a/core/app/models/spree/base.rb b/core/app/models/spree/base.rbindex a861f4ec56..2ac7795c11 100644--- a/core/app/models/spree/base.rb+++ b/core/app/models/spree/base.rb@@ -85,4 +85,23 @@ class Spree::Base < ApplicationRecord}end.as_jsonend++ def uuid_for_friendly_id+ SecureRandom.uuid+ end++ # Try building a slug based on the following fields in increasing order of specificity.+ def slug_candidates+ if defined?(:deleted_at) && deleted_at.present?+ [+ ['deleted', :name],+ ['deleted', :name, :uuid_for_friendly_id]+ ]+ else+ [+ [:name],+ [:name, :uuid_for_friendly_id]+ ]+ end+ endenddiff --git a/core/app/models/spree/page.rb b/core/app/models/spree/page.rbnew file mode 100644index 0000000000..9d24880ee5--- /dev/null+++ b/core/app/models/spree/page.rb@@ -0,0 +1,178 @@+module Spree+ class Page < Spree.base_class+ include Spree::Previewable++ #+ # Magic methods+ #+ extend FriendlyId+ friendly_id :slug_candidates, use: [:slugged, :scoped, :history], scope: :pageable+ acts_as_paranoid++ #+ # Associations+ #+ belongs_to :pageable, polymorphic: true # this can be either Store or Theme+ has_many :sections, -> { order(position: :asc) }, class_name: 'Spree::PageSection', dependent: :destroy_async, as: :pageable+ has_many :page_links, as: :linkable, class_name: 'Spree::PageLink', dependent: :destroy+ alias page_sections sections++ #+ # Validations+ #+ validates :name, presence: true+ validates :pageable, presence: true++ #+ # Callbacks+ #+ before_validation :set_name+ after_create :create_default_sections, unless: :duplicating++ #+ # Scopes+ #+ scope :linkable, lambda {+ where(type: [+ 'Spree::Pages::Homepage',+ 'Spree::Pages::ShopAll',+ 'Spree::Pages::TaxonList',+ 'Spree::Pages::PostList',+ 'Spree::Pages::Custom',+ 'Spree::Pages::Account',+ 'Spree::Pages::Login'+ ])+ }+ scope :product_details, -> { where(type: 'Spree::Pages::ProductDetails') }+ scope :standard, -> { where.not(type: 'Spree::Pages::Custom') }+ scope :custom, -> { where(type: 'Spree::Pages::Custom') }++ #+ # Virtual attributes+ #+ attribute :duplicating, :boolean, default: false++ def icon_name+ 'file-earmark-richtext'+ end++ def store+ if pageable.is_a?(Spree::Store)+ pageable+ else+ pageable.store+ end+ end++ def create_preview+ return self if preview? # no need to create a preview for the preview++ ActiveRecord::Base.connected_to(role: :writing) do+ ApplicationRecord.transaction do+ new_preview = dup+ new_preview.parent = self+ new_preview.duplicating = true+ new_preview.save!++ sections.includes(:links, { asset_attachment: :blob }, { blocks: [:rich_text_text, :links] }).each do |section|+ section.deep_clone(new_preview)+ end++ new_preview+ end+ end+ end++ # Promotes the page preview to the main page+ def promote+ return unless preview?++ ApplicationRecord.transaction do+ old_page = parent+ old_page.page_links.update_all(linkable_id: id)+ update(parent: nil) # clear reference to the old page+ Spree::Page.find(old_page.id).destroy # destroy the old page with their other previews, etc.+ end+ end++ def default_sections+ []+ end++ def customizable?+ false+ end++ def layout_sections?+ true+ end++ def preview_url(theme_preview = nil, page_preview = nil)+ "#{url}?#{url_query_params(theme_preview, page_preview).to_query}"+ end++ def display_name+ if custom?+ name+ else+ name.titleize+ end+ end++ def custom?+ type == 'Spree::Pages::Custom'+ end++ def duplicate(target_pageable)+ duplicated_page = dup+ duplicated_page.duplicating = true+ duplicated_page.pageable = target_pageable+ duplicated_page.save!++ sections_scope = sections.includes(:links, :blocks, { asset_attachment: :blob },+ { blocks: [:rich_text_text, :links, { asset_attachment: :blob }] })+ sections_scope.each { |section| section.deep_clone(duplicated_page) }++ duplicated_page+ end++ def theme+ @theme ||= if pageable.is_a?(Spree::Theme)+ pageable+ else+ pageable.default_theme+ end+ end++ private++ def create_default_sections+ default_sections.each do |section|+ section.pageable = self+ section.save!+ end+ end++ def url_query_params(theme_preview, page_preview)+ theme_preview_cache = theme_preview.updated_at.to_i.to_s + rand(999_999).to_s if theme_preview++ {+ theme_id: theme.id,+ page_preview_id: page_preview&.id,+ theme_preview_id: theme_preview&.id,+ theme_preview_cache: theme_preview_cache+ }+ end++ def set_name+ return if custom?+ return if name.present?++ self.name = self.class.name.demodulize+ end++ def should_generate_new_friendly_id?+ name_changed? && custom?+ end+ end+enddiff --git a/core/app/models/spree/page_block.rb b/core/app/models/spree/page_block.rbnew file mode 100644index 0000000000..ac48ba132b--- /dev/null+++ b/core/app/models/spree/page_block.rb@@ -0,0 +1,69 @@+module Spree+ class PageBlock < Spree.base_class+ include Spree::HasPageLinks++ #+ # Magic methods+ #+ acts_as_paranoid+ acts_as_list scope: :section++ #+ # Associations+ #+ belongs_to :section, class_name: 'Spree::PageSection', inverse_of: :blocks, touch: true+ delegate :theme, to: :section++ #+ # Rich Text+ #+ has_rich_text :text++ #+ # Attachments+ #+ has_one_attached :asset, service: Spree.public_storage_service_name++ #+ # Validations+ #+ validates :section, :type, :name, presence: true+ validates :asset, content_type: Rails.application.config.active_storage.web_image_content_types++ #+ # Callbacks+ #+ before_validation :set_name_from_type, on: :create++ #+ # Preferences+ #+ TEXT_ALIGNMENT_DEFAULT = 'left'+ CONTAINER_ALIGNMENT_DEFAULT = 'left'+ SIZE_DEFAULT = 'medium'+ WIDTH_DESKTOP_DEFAULT = 100+ TOP_PADDING_DEFAULT = 0+ BOTTOM_PADDING_DEFAULT = 0++ preference :text_alignment, :string, default: -> { self.class::TEXT_ALIGNMENT_DEFAULT if defined?(self.class::TEXT_ALIGNMENT_DEFAULT) }+ preference :container_alignment, :string, default: -> { self.class::CONTAINER_ALIGNMENT_DEFAULT if defined?(self.class::CONTAINER_ALIGNMENT_DEFAULT) }+ preference :size, :string, default: -> { self.class::SIZE_DEFAULT if defined?(self.class::SIZE_DEFAULT) }+ preference :width_desktop, :integer, default: -> { self.class::WIDTH_DESKTOP_DEFAULT if defined?(self.class::WIDTH_DESKTOP_DEFAULT) }+ preference :top_padding, :integer, default: -> { self.class::TOP_PADDING_DEFAULT if defined?(self.class::TOP_PADDING_DEFAULT) }+ preference :bottom_padding, :integer, default: -> { self.class::BOTTOM_PADDING_DEFAULT if defined?(self.class::BOTTOM_PADDING_DEFAULT) }++ def display_name+ name+ end++ def icon_name+ 'fullscreen'+ end++ private++ def set_name_from_type+ self.name ||= type.demodulize.titleize+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/buttons.rb b/core/app/models/spree/page_blocks/buttons.rbnew file mode 100644index 0000000000..5bb125bf39--- /dev/null+++ b/core/app/models/spree/page_blocks/buttons.rb@@ -0,0 +1,29 @@+module Spree+ module PageBlocks+ class Buttons < Spree::PageBlock+ include Spree::HasOneLink++ TEXT_ALIGNMENT_DEFAULT = 'center'++ preference :button_style_1, :string, default: 'primary'+ preference :background_color, :string+ preference :button_background_color, :string+ preference :button_text_color, :string++ # Without link there is no purpose of the button.+ def link_destroyed(_link)+ return unless page_links_count.zero?++ destroy+ end++ def display_name+ Spree.t('page_blocks.buttons.display_name')+ end++ def icon_name+ 'click'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/heading.rb b/core/app/models/spree/page_blocks/heading.rbnew file mode 100644index 0000000000..92f9a5177c--- /dev/null+++ b/core/app/models/spree/page_blocks/heading.rb@@ -0,0 +1,18 @@+module Spree+ module PageBlocks+ class Heading < Spree::PageBlock+ SIZE_DEFAULT = 'large'++ preference :text_color, :string+ preference :background_color, :string++ def icon_name+ 'heading'+ end++ def display_name+ text.to_plain_text.truncate(30)+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/image.rb b/core/app/models/spree/page_blocks/image.rbnew file mode 100644index 0000000000..3b134fa7a8--- /dev/null+++ b/core/app/models/spree/page_blocks/image.rb@@ -0,0 +1,17 @@+module Spree+ module PageBlocks+ class Image < Spree::PageBlock+ alias image asset++ TOP_PADDING_DEFAULT = 20+ BOTTOM_PADDING_DEFAULT = 20++ preference :height, :integer, default: 64+ preference :mobile_height, :integer, default: 32++ def icon_name+ 'photo'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/link.rb b/core/app/models/spree/page_blocks/link.rbnew file mode 100644index 0000000000..be6f085ef9--- /dev/null+++ b/core/app/models/spree/page_blocks/link.rb@@ -0,0 +1,21 @@+module Spree+ module PageBlocks+ class Link < Spree::PageBlock+ include Spree::HasOneLink++ def icon_name+ 'menu-2'+ end++ def display_name+ link&.label || Spree.t('page_blocks.link.display_name')+ end++ def link_destroyed(_link)+ return unless page_links_count.zero?++ destroy+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/mega_nav.rb b/core/app/models/spree/page_blocks/mega_nav.rbnew file mode 100644index 0000000000..fccc28ac0a--- /dev/null+++ b/core/app/models/spree/page_blocks/mega_nav.rb@@ -0,0 +1,33 @@+module Spree+ module PageBlocks+ class MegaNav < Spree::PageBlock+ include Spree::HasPageLinks++ has_one :link, ->(ps) { ps.links.where(position: 1) }, class_name: 'Spree::PageLink', as: :parent, dependent: :destroy, inverse_of: :parent+ accepts_nested_attributes_for :link++ preference :featured_taxon_id, :string, default: ''++ def featured_taxon+ store.taxons.find_by(id: preferred_featured_taxon_id) if preferred_featured_taxon_id.present?+ end++ def icon_name+ 'layout-navbar-expand'+ end++ def display_name+ link&.label || Spree.t(:mega_nav)+ end++ def default_links+ @default_links.presence || [+ Spree::PageLink.new(+ label: Spree.t(:shop_all),+ linkable: theme_or_parent.pages.find_by(type: 'Spree::Pages::ShopAll')+ ),+ ]+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/mega_nav_with_subcategories.rb b/core/app/models/spree/page_blocks/mega_nav_with_subcategories.rbnew file mode 100644index 0000000000..8d603ca434--- /dev/null+++ b/core/app/models/spree/page_blocks/mega_nav_with_subcategories.rb@@ -0,0 +1,32 @@+module Spree+ module PageBlocks+ class MegaNavWithSubcategories < Spree::PageBlock+ preference :taxon_id, :string, default: ''+ preference :featured_taxon_id, :string, default: ''++ before_validation :make_taxon_id_valid++ def taxon+ store.taxons.find_by(id: preferred_taxon_id) if preferred_taxon_id.present?+ end++ def featured_taxon+ store.taxons.find_by(id: preferred_featured_taxon_id) if preferred_featured_taxon_id.present?+ end++ def icon_name+ 'category'+ end++ def display_name+ taxon&.name || Spree.t(:mega_nav_with_subcategories)+ end++ private++ def make_taxon_id_valid+ self.preferred_taxon_id = preferred_taxon_id.presence || store.taxons.where(depth: 1).first&.id+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/nav.rb b/core/app/models/spree/page_blocks/nav.rbnew file mode 100644index 0000000000..736a4ec090--- /dev/null+++ b/core/app/models/spree/page_blocks/nav.rb@@ -0,0 +1,15 @@+module Spree+ module PageBlocks+ class Nav < Spree::PageBlock+ preference :label, :string, default: Spree.t('page_blocks.nav.label_default')++ def icon_name+ 'menu-2'+ end++ def display_name+ preferred_label+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/newsletter_form.rb b/core/app/models/spree/page_blocks/newsletter_form.rbnew file mode 100644index 0000000000..21215f75b7--- /dev/null+++ b/core/app/models/spree/page_blocks/newsletter_form.rb@@ -0,0 +1,18 @@+module Spree+ module PageBlocks+ class NewsletterForm < Spree::PageBlock+ preference :button_text, :string, default: Spree.t('page_blocks.newsletter_form.button_text_default')+ preference :button_text_color, :string+ preference :button_background_color, :string+ preference :button_style, :string, default: 'primary'+ preference :placeholder, :string, default: Spree.t('page_blocks.newsletter_form.placeholder_default')+ preference :justify, :string, default: 'center'++ validates :preferred_button_style, inclusion: { in: ['primary', 'secondary'] }++ def icon_name+ 'forms'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/products/brand.rb b/core/app/models/spree/page_blocks/products/brand.rbnew file mode 100644index 0000000000..75cde8b5e3--- /dev/null+++ b/core/app/models/spree/page_blocks/products/brand.rb@@ -0,0 +1,12 @@+module Spree+ module PageBlocks+ module Products+ class Brand < Spree::PageBlocks::Text++ def display_name+ section.vendor_name.presence || 'Brand'+ end+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/products/buy_buttons.rb b/core/app/models/spree/page_blocks/products/buy_buttons.rbnew file mode 100644index 0000000000..48f4ed861d--- /dev/null+++ b/core/app/models/spree/page_blocks/products/buy_buttons.rb@@ -0,0 +1,12 @@+module Spree+ module PageBlocks+ module Products+ class BuyButtons < Spree::PageBlock+ TOP_PADDING_DEFAULT = 20+ BOTTOM_PADDING_DEFAULT = 20++ preference :text_color, :string+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/products/price.rb b/core/app/models/spree/page_blocks/products/price.rbnew file mode 100644index 0000000000..1ed28be30c--- /dev/null+++ b/core/app/models/spree/page_blocks/products/price.rb@@ -0,0 +1,18 @@+module Spree+ module PageBlocks+ module Products+ class Price < Spree::PageBlocks::Text+ TOP_PADDING_DEFAULT = 16+ BOTTOM_PADDING_DEFAULT = 16++ def icon_name+ 'cash'+ end++ def display_name+ 'Price'+ end+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/products/quantity_selector.rb b/core/app/models/spree/page_blocks/products/quantity_selector.rbnew file mode 100644index 0000000000..5e02bb5dc8--- /dev/null+++ b/core/app/models/spree/page_blocks/products/quantity_selector.rb@@ -0,0 +1,12 @@+module Spree+ module PageBlocks+ module Products+ class QuantitySelector < Spree::PageBlock+ TOP_PADDING_DEFAULT = 20+ BOTTOM_PADDING_DEFAULT = 20++ preference :text_color, :string+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/products/share.rb b/core/app/models/spree/page_blocks/products/share.rbnew file mode 100644index 0000000000..b2fd12a95b--- /dev/null+++ b/core/app/models/spree/page_blocks/products/share.rb@@ -0,0 +1,8 @@+module Spree+ module PageBlocks+ module Products+ class Share < Spree::PageBlocks::Text+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/products/title.rb b/core/app/models/spree/page_blocks/products/title.rbnew file mode 100644index 0000000000..5ea8fa5710--- /dev/null+++ b/core/app/models/spree/page_blocks/products/title.rb@@ -0,0 +1,15 @@+module Spree+ module PageBlocks+ module Products+ class Title < Spree::PageBlocks::Heading+ TOP_PADDING_DEFAULT = 16++ preference :text_color, :string++ def display_name+ section.product_name.presence || 'Title'+ end+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/products/variant_picker.rb b/core/app/models/spree/page_blocks/products/variant_picker.rbnew file mode 100644index 0000000000..d62ccfcda2--- /dev/null+++ b/core/app/models/spree/page_blocks/products/variant_picker.rb@@ -0,0 +1,9 @@+module Spree+ module PageBlocks+ module Products+ class VariantPicker < Spree::PageBlock+ preference :text_color, :string+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/subheading.rb b/core/app/models/spree/page_blocks/subheading.rbnew file mode 100644index 0000000000..2817fcd645--- /dev/null+++ b/core/app/models/spree/page_blocks/subheading.rb@@ -0,0 +1,17 @@+module Spree+ module PageBlocks+ class Subheading < Spree::PageBlock+ SIZE_DEFAULT = 'small'++ preference :text_color, :string++ def icon_name+ 'h2'+ end++ def display_name+ text.to_plain_text.truncate(30)+ end+ end+ end+enddiff --git a/core/app/models/spree/page_blocks/text.rb b/core/app/models/spree/page_blocks/text.rbnew file mode 100644index 0000000000..1c584ef551--- /dev/null+++ b/core/app/models/spree/page_blocks/text.rb@@ -0,0 +1,16 @@+module Spree+ module PageBlocks+ class Text < Spree::PageBlock+ preference :text_color, :string+ preference :background_color, :string++ def icon_name+ 'align-justified'+ end++ def display_name+ text.to_plain_text.truncate(30)+ end+ end+ end+enddiff --git a/core/app/models/spree/page_link.rb b/core/app/models/spree/page_link.rbnew file mode 100644index 0000000000..fd5497759f--- /dev/null+++ b/core/app/models/spree/page_link.rb@@ -0,0 +1,59 @@+module Spree+ class PageLink < Spree.base_class+ #+ # Magic methods+ #+ acts_as_list scope: :parent++ #+ # Associations+ #+ belongs_to :parent, polymorphic: true, touch: true, counter_cache: true # Block or Section+ belongs_to :linkable, polymorphic: true, optional: true # Page, Product, etc.+ has_one :theme, through: :parent++ #+ # Validations+ #+ validates :label, :parent, presence: true+ validates :url, presence: true, unless: :linkable++ #+ # Callbacks+ #+ after_destroy :notify_parent+ before_validation :set_label, on: [:create, :update]++ def linkable_url+ @linkable_url ||= linkable&.url || formatted_url+ end++ def formatted_url+ return if url.blank?++ @formatted_url ||= url.match(/http:\/\/|https:\/\//) ? url : "http://#{url}"+ end++ private++ def notify_parent+ return unless parent.present?+ return unless parent.respond_to?(:link_destroyed)++ parent.link_destroyed(self)+ end++ def set_label+ return if label.present? && new_record?+ return unless linkable_id_changed?++ if linkable.respond_to?(:title)+ self.label = linkable.title+ elsif linkable.respond_to?(:display_name)+ self.label = linkable.display_name+ elsif linkable.respond_to?(:name)+ self.label = linkable.name+ end+ end+ end+enddiff --git a/core/app/models/spree/page_section.rb b/core/app/models/spree/page_section.rbnew file mode 100644index 0000000000..a48f5e53df--- /dev/null+++ b/core/app/models/spree/page_section.rb@@ -0,0 +1,215 @@+module Spree+ class PageSection < Spree.base_class+ include Spree::HasPageLinks+ #+ # Magic methods+ #+ acts_as_paranoid+ acts_as_list scope: [:pageable_id, { deleted_at: nil }]++ #+ # Associations+ #+ belongs_to :pageable, polymorphic: true, touch: true # this can be either Page or Theme+ has_many :blocks, lambda {+ order(position: :asc)+ }, class_name: 'Spree::PageBlock', dependent: :destroy, inverse_of: :section, foreign_key: :section_id+ alias page_blocks blocks+ delegate :store, to: :pageable++ #+ # Attachments+ #+ has_one_attached :asset, service: Spree.public_storage_service_name+ alias image asset++ #+ # Validations+ #+ validates :name, :pageable, presence: true+ validates :asset, content_type: Rails.application.config.active_storage.web_image_content_types+ #+ # Callbacks+ #+ before_validation :set_name, on: :create+ after_create :create_blocks, unless: :do_not_create_blocks++ #+ # Scopes+ #+ scope :published, -> { where(pageable_type: 'Spree::Page') }+ scope :related_products, -> { where(type: 'Spree::PageSections::RelatedProducts') }++ #+ # Preferences+ #+ TEXT_COLOR_DEFAULT = nil+ BACKGROUND_COLOR_DEFAULT = nil+ BORDER_COLOR_DEFAULT = nil+ TOP_PADDING_DEFAULT = 40+ BOTTOM_PADDING_DEFAULT = 40+ TOP_BORDER_WIDTH_DEFAULT = 1+ BOTTOM_BORDER_WIDTH_DEFAULT = 0++ preference :text_color, :string, default: -> { self.class::TEXT_COLOR_DEFAULT if defined?(self.class::TEXT_COLOR_DEFAULT) }+ preference :background_color, :string, default: -> { self.class::BACKGROUND_COLOR_DEFAULT if defined?(self.class::BACKGROUND_COLOR_DEFAULT) }+ preference :border_color, :string, default: -> { self.class::BORDER_COLOR_DEFAULT if defined?(self.class::BORDER_COLOR_DEFAULT) }+ preference :top_padding, :integer, default: -> { self.class::TOP_PADDING_DEFAULT if defined?(self.class::TOP_PADDING_DEFAULT) }+ preference :bottom_padding, :integer, default: -> { self.class::BOTTOM_PADDING_DEFAULT if defined?(self.class::BOTTOM_PADDING_DEFAULT) }+ preference :top_border_width, :integer, default: -> { self.class::TOP_BORDER_WIDTH_DEFAULT if defined?(self.class::TOP_BORDER_WIDTH_DEFAULT) }+ preference :bottom_border_width, :integer, default: -> { self.class::BOTTOM_BORDER_WIDTH_DEFAULT if defined?(self.class::BOTTOM_BORDER_WIDTH_DEFAULT) }++ #+ # Virtual attributes+ #+ attribute :do_not_create_blocks, :boolean, default: false+ attr_accessor :default_blocks++ def to_partial_path+ "spree/page_sections/#{type.to_s.demodulize.underscore}"+ end++ # this should be overridden in subclasses+ def default_blocks+ @default_blocks.presence || []+ end++ def blocks_available?+ false+ end++ def available_blocks_to_add+ []+ end++ def can_sort_blocks?+ false+ end++ # this should be overridden in subclasses+ # content - can be managed by the user+ # system - main parts of the page eg. product details, login form+ # header - header section+ # footer - footer section+ def self.role+ 'content'+ end++ def role+ self.class.role+ end++ def theme+ @theme ||= if pageable.is_a?(Spree::Theme)+ pageable+ else+ pageable.theme+ end+ end++ def icon_name+ 'text-caption'+ end++ def can_be_deleted?+ role == 'content'+ end++ def can_be_sorted?+ role == 'content'+ end++ def lazy?+ false+ end++ def lazy_path(variables)+ url_options = variables[:url_options] || {}++ Spree::Core::Engine.routes.url_helpers.page_section_path(self, **url_options)+ end++ def rich_text_fields+ self.class.rich_text_association_names.map { |rt| rt.to_s.sub('rich_text_', '') }+ end++ def copy_rich_text_fields_from(other)+ rich_text_fields.each do |field|+ send(field).body = other.send(field).body+ end+ end++ def deep_clone(target)+ new_section = type.constantize.new(+ preferences: preferences,+ position: position,+ pageable: target+ )+ new_section.copy_rich_text_fields_from(self)+ new_section.do_not_create_blocks = true+ new_section.do_not_create_links = true+ new_section.save!++ new_section.asset.attach(asset.blob) if asset.attached?++ blocks.includes(:links, asset_attachment: :blob).each do |block|+ new_block = block.type.constantize.new(+ preferences: block.preferences,+ position: block.position,+ section: new_section+ )+ new_block.do_not_create_links = true+ new_block.text = block.text if block.respond_to?(:text) # we need to copy ActionText content+ new_block.save!++ new_block.asset.attach(block.asset.blob) if block.asset.attached?++ deep_clone_links(block, new_block)+ end++ deep_clone_links(self, new_section)+ end++ def deep_clone_links(section_or_block, new_section_or_block)+ section_or_block.links.each do |link|+ new_link = link.dup+ new_link.parent = new_section_or_block+ new_link.save!+ end+ end++ # Turns out #dup doesn't not copy rich text content to the new record.+ # https://github.com/rails/rails/issues/36683+ def dup+ super.tap do |object|+ object.copy_rich_text_fields_from(self)+ end+ end++ def restore_design_settings_to_defaults+ clear_preferences_for(design_settings_to_restore)+ save+ end++ def display_name+ name+ end++ private++ def design_settings_to_restore+ [:text_color, :background_color, :border_color, :top_padding, :bottom_padding, :top_border_width, :bottom_border_width]+ end++ def create_blocks+ default_blocks.each do |block|+ block.section = self+ block.save!+ end+ end++ def set_name+ self.name ||= type.to_s.demodulize.titleize+ end+ end+enddiff --git a/core/app/models/spree/page_sections/announcement_bar.rb b/core/app/models/spree/page_sections/announcement_bar.rbnew file mode 100644index 0000000000..7c2abbca16--- /dev/null+++ b/core/app/models/spree/page_sections/announcement_bar.rb@@ -0,0 +1,31 @@+module Spree+ module PageSections+ class AnnouncementBar < Spree::PageSection+ has_rich_text :text++ before_validation :set_default_text, on: :create++ TEXT_COLOR_DEFAULT = '#000000'+ BACKGROUND_COLOR_DEFAULT = '#F5F5F4'+ TOP_PADDING_DEFAULT = 8+ BOTTOM_PADDING_DEFAULT = 8+ TOP_BORDER_WIDTH_DEFAULT = 0++ def self.role+ 'header'+ end++ def icon_name+ 'speakerphone'+ end++ private++ def set_default_text+ return unless text.blank?++ self.text = Spree.t('page_sections.announcement_bar.default_text')+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/brand_story.rb b/core/app/models/spree/page_sections/brand_story.rbnew file mode 100644index 0000000000..88c21c809f--- /dev/null+++ b/core/app/models/spree/page_sections/brand_story.rb@@ -0,0 +1,16 @@+module Spree+ module PageSections+ class BrandStory < Spree::PageSection+ BACKGROUND_COLOR_DEFAULT = '#E9E7DC'+ TOP_BORDER_WIDTH_DEFAULT = 0++ def icon_name+ 'quote'+ end++ def self.role+ 'system'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/collection_banner.rb b/core/app/models/spree/page_sections/collection_banner.rbnew file mode 100644index 0000000000..027b711796--- /dev/null+++ b/core/app/models/spree/page_sections/collection_banner.rb@@ -0,0 +1,18 @@+module Spree+ module PageSections+ class CollectionBanner < Spree::PageSection+ TOP_PADDING_DEFAULT = 20+ BOTTOM_PADDING_DEFAULT = 20+ TOP_BORDER_WIDTH_DEFAULT = 0+ BOTTOM_BORDER_WIDTH_DEFAULT = 1++ def icon_name+ 'heading'+ end++ def self.role+ 'system'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/custom_code.rb b/core/app/models/spree/page_sections/custom_code.rbnew file mode 100644index 0000000000..f399c220f3--- /dev/null+++ b/core/app/models/spree/page_sections/custom_code.rb@@ -0,0 +1,11 @@+module Spree+ module PageSections+ class CustomCode < Spree::PageSection+ preference :custom_code, :string, default: ''++ def icon_name+ 'code'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/featured_posts.rb b/core/app/models/spree/page_sections/featured_posts.rbnew file mode 100644index 0000000000..a7e740344a--- /dev/null+++ b/core/app/models/spree/page_sections/featured_posts.rb@@ -0,0 +1,43 @@+module Spree+ module PageSections+ class FeaturedPosts < Spree::PageSection+ has_rich_text :description++ before_validation :make_heading_size_valid+ before_validation :make_max_posts_to_show_valid+ before_validation :make_alignment_valid+ before_validation :make_posts_to_show_valid++ preference :heading, :string, default: ''+ preference :heading_size, :string, default: 'large'+ preference :heading_alignment, :string, default: 'left'+ preference :description_alignment, :string, default: 'left'+ preference :posts_to_show, :string, default: 'newest'+ preference :max_posts_to_show, :integer, default: 4++ def icon_name+ 'news'+ end++ private++ def make_posts_to_show_valid+ self.preferred_posts_to_show = 'newest' unless %w[newest most_popular].include?(preferred_posts_to_show)+ end++ def make_alignment_valid+ self.preferred_heading_alignment = 'left' unless %w[left center right].include?(preferred_heading_alignment)+ self.preferred_description_alignment = 'left' unless %w[left center right].include?(preferred_description_alignment)+ end++ def make_max_posts_to_show_valid+ self.preferred_max_posts_to_show = 2 if preferred_max_posts_to_show < 2+ self.preferred_max_posts_to_show = 8 if preferred_max_posts_to_show > 8+ end++ def make_heading_size_valid+ self.preferred_heading_size = 'small' unless %w[small medium large].include?(preferred_heading_size)+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/featured_product.rb b/core/app/models/spree/page_sections/featured_product.rbnew file mode 100644index 0000000000..08ec5562d3--- /dev/null+++ b/core/app/models/spree/page_sections/featured_product.rb@@ -0,0 +1,47 @@+module Spree+ module PageSections+ class FeaturedProduct < Spree::PageSection+ preference :product_id, :string, default: ''++ def icon_name+ 'star'+ end++ def product+ return @product if defined?(@product)++ includes = [+ { variants: { images: [], prices: [], stock_items: [], stock_locations: [], option_values: :option_type } },+ ]++ @product ||= store.products.includes(includes).find_by(id: preferred_product_id)+ end++ def vendor_name+ return unless defined?(Spree::Vendor)++ @vendor_name ||= product&.vendor&.display_name || 'Brand'+ end++ def product_name+ product&.name+ end++ def default_blocks+ [+ Spree::PageBlocks::Products::Brand.new,+ Spree::PageBlocks::Products::Title.new,+ Spree::PageBlocks::Products::Price.new(text: 'Price', preferred_text_alignment: 'left'),+ Spree::PageBlocks::Products::VariantPicker.new,+ Spree::PageBlocks::Products::QuantitySelector.new,+ Spree::PageBlocks::Products::BuyButtons.new,+ Spree::PageBlocks::Products::Share.new(text: 'Share')+ ]+ end++ def blocks_available?+ true+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/featured_taxon.rb b/core/app/models/spree/page_sections/featured_taxon.rbnew file mode 100644index 0000000000..26692eaa0f--- /dev/null+++ b/core/app/models/spree/page_sections/featured_taxon.rb@@ -0,0 +1,87 @@+module Spree+ module PageSections+ class FeaturedTaxon < Spree::PageSection+ scope :by_taxon_id, lambda { |taxon_ids|+ regexp = [*taxon_ids].map { |taxon_id| "taxon_id: #{taxon_id}" }.join('|')+ where("#{Spree::PageSections::FeaturedTaxon.table_name}.preferences ~ ?", regexp)+ }++ has_rich_text :description++ before_validation :make_heading_size_valid+ before_validation :make_alignment_valid+ before_validation :make_taxon_id_valid++ preference :heading, :string, default: Spree.t('page_sections.featured_taxon.heading_default')+ preference :heading_size, :string, default: 'large'+ preference :heading_alignment, :string, default: 'left'+ preference :description_alignment, :string, default: 'left'+ preference :use_description_from_admin, :boolean, default: true+ preference :show_taxon_image, :boolean, default: true+ preference :show_more_button, :boolean, default: true+ preference :taxon_id, :string, default: ''+ preference :max_products_to_show, :integer, default: 20+ preference :button_style, :string, default: 'primary'+ preference :button_text_color, :string, default: nil+ preference :button_background_color, :string, default: nil+ preference :button_text, :string, default: Spree.t('page_sections.featured_taxon.button_text_default')++ def icon_name+ 'tags'+ end++ def lazy?+ !Rails.env.test?+ end++ def taxon+ @taxon ||= store.taxons.find_by(id: preferred_taxon_id) if preferred_taxon_id.present?+ end++ def description_to_use+ @description_to_use ||= preferred_use_description_from_admin ? taxon&.description : description+ end++ def display_name+ @display_name ||= preferred_heading.present? ? "#{preferred_heading} - #{name}" : name+ end++ def products(currency)+ @products ||= begin+ finder_params = {+ store: store,+ filter: { taxons: preferred_taxon_id },+ currency: currency,+ sort_by: 'default'+ }++ products_finder = Spree::Dependencies.products_finder.constantize+ products = products_finder.new(scope: store.products, params: finder_params).execute++ GearedPagination::Recordset.new(products, per_page: max_products_to_show).page(1).records+ end+ end++ private++ def make_taxon_id_valid+ self.preferred_taxon_id = preferred_taxon_id.presence || store.taxons.where(depth: 1).first&.id+ end++ def set_heading+ return unless collection_id_changed?++ self.heading = collection&.title+ end++ def make_alignment_valid+ self.preferred_heading_alignment = 'left' unless %w[left center right].include?(preferred_heading_alignment)+ self.preferred_description_alignment = 'left' unless %w[left center right].include?(preferred_description_alignment)+ end++ def make_heading_size_valid+ self.preferred_heading_size = 'small' unless %w[small medium large].include?(preferred_heading_size)+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/featured_taxons.rb b/core/app/models/spree/page_sections/featured_taxons.rbnew file mode 100644index 0000000000..2dc3638122--- /dev/null+++ b/core/app/models/spree/page_sections/featured_taxons.rb@@ -0,0 +1,45 @@+module Spree+ module PageSections+ class FeaturedTaxons < Spree::PageSection+ before_validation :make_heading_size_valid+ before_validation :make_alignment_valid++ preference :heading, :string, default: Spree.t('page_sections.featured_taxons.heading_default')+ preference :heading_size, :string, default: 'large'+ preference :heading_alignment, :string, default: 'left'++ def icon_name+ 'layout-grid'+ end++ def links_available?+ true+ end++ def allowed_linkable_types+ [+ [Spree.t(:taxon), 'Spree::Taxon']+ ]+ end++ def default_linkable_type+ default_linkable_resource.class.to_s+ end++ def default_linkable_resource+ @default_linkable_resource ||= Spree::Taxon.where(parent: store.taxonomies.first.root).first ||+ store.theme_pages.find_by(type: 'Spree::Pages::Homepage')+ end++ private++ def make_heading_size_valid+ self.preferred_heading_size = 'small' unless %w[small medium large].include?(preferred_heading_size)+ end++ def make_alignment_valid+ self.preferred_heading_alignment = 'left' unless %w[left center right].include?(preferred_heading_alignment)+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/footer.rb b/core/app/models/spree/page_sections/footer.rbnew file mode 100644index 0000000000..194f7d0b6e--- /dev/null+++ b/core/app/models/spree/page_sections/footer.rb@@ -0,0 +1,97 @@+module Spree+ module PageSections+ class Footer < Spree::PageSection+ alias logo asset++ BACKGROUND_COLOR_DEFAULT = '#F5F5F4'+ TOP_PADDING_DEFAULT = 32+ BOTTOM_PADDING_DEFAULT = 32+ TOP_BORDER_WIDTH_DEFAULT = 0++ preference :copyright_text_color, :string, default: '#FFFFFF'+ preference :copyright_background_color, :string, default: '#000000'++ def self.role+ 'footer'+ end++ def icon_name+ 'layout-bottombar'+ end++ def can_sort_blocks?+ true+ end++ def blocks_available?+ true+ end++ def available_blocks_to_add+ [Spree::PageBlocks::Nav]+ end++ def default_blocks+ shop_default_links = [+ Spree::PageLink.new(+ linkable: pages.find_by(type: 'Spree::Pages::ShopAll')+ ),+ Spree::PageLink.new(+ linkable: pages.find_by(type: 'Spree::Pages::TaxonList')+ )+ ]++ collections_taxonomy = store.taxonomies.find_by(name: Spree.t(:taxonomy_collections_name))++ if collections_taxonomy.present?+ on_sale_collection = collections_taxonomy.taxons.automatic.find_by(name: Spree.t('automatic_taxon_names.on_sale'))+ new_arrivals_collection = collections_taxonomy.taxons.automatic.find_by(name: Spree.t('automatic_taxon_names.new_arrivals'))++ shop_default_links << Spree::PageLink.new(linkable: on_sale_collection) if on_sale_collection.present?+ shop_default_links << Spree::PageLink.new(linkable: new_arrivals_collection) if new_arrivals_collection.present?+ end++ [+ Spree::PageBlocks::Nav.new(+ preferred_label: 'Shop',+ default_links: shop_default_links+ ),+ Spree::PageBlocks::Nav.new(+ preferred_label: 'Account',+ default_links: [+ Spree::PageLink.new(+ label: 'My Account',+ linkable: pages.find_by(type: 'Spree::Pages::Account')+ ),+ Spree::PageLink.new(+ label: 'Favorites',+ linkable: pages.find_by(type: 'Spree::Pages::Wishlist')+ )+ ]+ ),+ Spree::PageBlocks::Nav.new(+ preferred_label: 'Company',+ default_links: []+ ),+ Spree::PageBlocks::Nav.new(+ preferred_label: 'Info',+ default_links: [+ Spree::PageLink.new(+ label: 'Privacy Policy',+ linkable: store.customer_privacy_policy+ ),+ Spree::PageLink.new(+ label: 'Terms of Service',+ linkable: store.customer_terms_of_service+ ),+ ]+ ),+ ]+ end++ def pages+ @pages ||= theme.pages+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/header.rb b/core/app/models/spree/page_sections/header.rbnew file mode 100644index 0000000000..85914cefc6--- /dev/null+++ b/core/app/models/spree/page_sections/header.rb@@ -0,0 +1,65 @@+module Spree+ module PageSections+ class Header < Spree::PageSection+ alias logo asset++ TEXT_COLOR_DEFAULT = '#000000'+ BACKGROUND_COLOR_DEFAULT = '#FFFFFF'+ TOP_PADDING_DEFAULT = 15+ BOTTOM_PADDING_DEFAULT = 15+ TOP_BORDER_WIDTH_DEFAULT = 0++ preference :layout, :string, default: 'logo-centered'+ preference :desktop_logo_height, :integer, default: 0++ def self.role+ 'header'+ end++ def can_sort_blocks?+ true+ end++ def blocks_available?+ true+ end++ def available_blocks_to_add+ [Spree::PageBlocks::MegaNavWithSubcategories, Spree::PageBlocks::MegaNav, Spree::PageBlocks::Link]+ end++ def icon_name+ 'layout-navbar'+ end++ def links_available?+ true+ end++ def default_links+ links = [+ Spree::PageLink.new(linkable: pages.find_by(type: 'Spree::Pages::ShopAll')),+ Spree::PageLink.new(linkable: pages.find_by(type: 'Spree::Pages::TaxonList'))+ ]++ collections_taxonomy = store.taxonomies.find_by(name: Spree.t(:taxonomy_collections_name))++ if collections_taxonomy.present?+ on_sale_collection = collections_taxonomy.taxons.automatic.find_by(name: Spree.t('automatic_taxon_names.on_sale'))+ new_arrivals_collection = collections_taxonomy.taxons.automatic.find_by(name: Spree.t('automatic_taxon_names.new_arrivals'))++ links << Spree::PageLink.new(linkable: on_sale_collection) if on_sale_collection.present?+ links << Spree::PageLink.new(linkable: new_arrivals_collection) if new_arrivals_collection.present?+ end++ links << Spree::PageLink.new(linkable: pages.find_by(type: 'Spree::Pages::PostList'))++ links+ end++ def pages+ @pages ||= theme.pages+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/image_banner.rb b/core/app/models/spree/page_sections/image_banner.rbnew file mode 100644index 0000000000..5598681566--- /dev/null+++ b/core/app/models/spree/page_sections/image_banner.rb@@ -0,0 +1,38 @@+module Spree+ module PageSections+ class ImageBanner < Spree::PageSection+ TOP_PADDING_DEFAULT = 0+ BOTTOM_PADDING_DEFAULT = 0++ preference :overlay_transparency, :integer, default: 40+ preference :height, :integer, default: 384+ preference :vertical_alignment, :string, default: :middle++ def default_blocks+ [+ Spree::PageBlocks::Heading.new(+ text: Spree.t('page_sections.image_banner.heading_default'),+ text_alignment: 'center',+ container_alignment: 'center',+ width_desktop: 50+ ),+ Spree::PageBlocks::Text.new(+ text: Spree.t('page_sections.image_banner.text_default'),+ text_alignment: 'center',+ container_alignment: 'center',+ width_desktop: 50+ ),+ Spree::PageBlocks::Buttons.new+ ]+ end++ def blocks_available?+ true+ end++ def icon_name+ 'slideshow'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/image_with_text.rb b/core/app/models/spree/page_sections/image_with_text.rbnew file mode 100644index 0000000000..88e12ae7f9--- /dev/null+++ b/core/app/models/spree/page_sections/image_with_text.rb@@ -0,0 +1,48 @@+module Spree+ module PageSections+ class ImageWithText < Spree::PageSection+ TOP_PADDING_DEFAULT = 16+ BOTTOM_PADDING_DEFAULT = 16++ preference :desktop_image_alignment, :string, default: 'right'+ preference :vertical_alignment, :string, default: :middle++ has_one :link, ->(ps) { ps.links.where(position: 1) }, class_name: 'Spree::PageLink', as: :parent, dependent: :destroy, inverse_of: :parent+ accepts_nested_attributes_for :link++ def default_blocks+ @default_blocks.presence || [+ Spree::PageBlocks::Heading.new(+ text: Spree.t('page_sections.image_with_text.heading_default'),+ preferred_text_alignment: 'left',+ preferred_bottom_padding: 8,+ preferred_top_padding: 24+ ),+ Spree::PageBlocks::Text.new(+ text: Spree.t('page_sections.image_with_text.text_default', store_name: store.name),+ preferred_text_alignment: 'left',+ preferred_bottom_padding: 16+ ),+ Spree::PageBlocks::Buttons.new(preferred_text_alignment: 'left')+ ]+ end++ def default_links+ @default_links.presence || [+ Spree::PageLink.new(+ label: Spree.t(:shop_all),+ linkable: theme.pages.find_by(type: 'Spree::Pages::ShopAll')+ )+ ]+ end++ def blocks_available?+ true+ end++ def icon_name+ 'photo'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/main_password_footer.rb b/core/app/models/spree/page_sections/main_password_footer.rbnew file mode 100644index 0000000000..39cf5fdd17--- /dev/null+++ b/core/app/models/spree/page_sections/main_password_footer.rb@@ -0,0 +1,19 @@+module Spree+ module PageSections+ class MainPasswordFooter < Spree::PageSection+ alias logo asset++ BACKGROUND_COLOR_DEFAULT = '#F5F5F4'+ TOP_PADDING_DEFAULT = 32+ BOTTOM_PADDING_DEFAULT = 32++ def self.role+ 'footer'+ end++ def icon_name+ 'layout-bottombar'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/main_password_header.rb b/core/app/models/spree/page_sections/main_password_header.rbnew file mode 100644index 0000000000..2965568e46--- /dev/null+++ b/core/app/models/spree/page_sections/main_password_header.rb@@ -0,0 +1,22 @@+module Spree+ module PageSections+ class MainPasswordHeader < Spree::PageSection+ alias logo asset++ TEXT_COLOR_DEFAULT = '#000000'+ BACKGROUND_COLOR_DEFAULT = '#FFFFFF'+ TOP_PADDING_DEFAULT = 15+ BOTTOM_PADDING_DEFAULT = 15++ preference :desktop_logo_height, :integer, default: 0++ def self.role+ 'header'+ end++ def icon_name+ 'layout-navbar'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/newsletter.rb b/core/app/models/spree/page_sections/newsletter.rbnew file mode 100644index 0000000000..79e455a91b--- /dev/null+++ b/core/app/models/spree/page_sections/newsletter.rb@@ -0,0 +1,51 @@+module Spree+ module PageSections+ class Newsletter < Spree::PageSection+ preference :overlay_transparency, :integer, default: 40++ def default_blocks+ @default_blocks.presence || [+ Spree::PageBlocks::Heading.new(+ text: Spree.t('page_sections.newsletter.heading_default'),+ preferred_width_desktop: 50, # in %+ preferred_text_alignment: 'center',+ preferred_container_alignment: 'center',+ preferred_bottom_padding: 8+ ),+ Spree::PageBlocks::Text.new(+ text: Spree.t('page_sections.newsletter.text_default'),+ preferred_text_alignment: 'center',+ preferred_bottom_padding: 32,+ preferred_width_desktop: 50,+ preferred_container_alignment: 'center'+ ),+ Spree::PageBlocks::NewsletterForm.new+ ]+ end++ def self.role+ 'footer'+ end++ def blocks_available?+ true+ end++ def available_blocks_to_add+ [Spree::PageBlocks::Image]+ end++ def can_sort_blocks?+ true+ end++ def icon_name+ 'mail'+ end++ def lazy?+ true+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/page_title.rb b/core/app/models/spree/page_sections/page_title.rbnew file mode 100644index 0000000000..7d9ec85aae--- /dev/null+++ b/core/app/models/spree/page_sections/page_title.rb@@ -0,0 +1,19 @@+module Spree+ module PageSections+ class PageTitle < Spree::PageSection+ preference :title, :string++ def icon_name+ 'heading'+ end++ def display_name+ if pageable.is_a?(Spree::Page) && pageable.custom?+ pageable.name+ else+ Spree.t('page_sections.page_title.display_name')+ end+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/post_details.rb b/core/app/models/spree/page_sections/post_details.rbnew file mode 100644index 0000000000..e4cc395cbd--- /dev/null+++ b/core/app/models/spree/page_sections/post_details.rb@@ -0,0 +1,19 @@+module Spree+ module PageSections+ class PostDetails < Spree::PageSection+ DISPLAY_NAME = Spree.t(:post).freeze++ def icon_name+ 'article'+ end++ def self.role+ 'system'+ end++ def display_name+ DISPLAY_NAME+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/post_grid.rb b/core/app/models/spree/page_sections/post_grid.rbnew file mode 100644index 0000000000..38d25011c7--- /dev/null+++ b/core/app/models/spree/page_sections/post_grid.rb@@ -0,0 +1,19 @@+module Spree+ module PageSections+ class PostGrid < Spree::PageSection+ DISPLAY_NAME = Spree.t(:posts).freeze++ def icon_name+ 'news'+ end++ def self.role+ 'system'+ end++ def display_name+ DISPLAY_NAME+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/product_details.rb b/core/app/models/spree/page_sections/product_details.rbnew file mode 100644index 0000000000..fcd6135819--- /dev/null+++ b/core/app/models/spree/page_sections/product_details.rb@@ -0,0 +1,16 @@+module Spree+ module PageSections+ class ProductDetails < Spree::PageSection+ TOP_PADDING_DEFAULT = 20+ BOTTOM_PADDING_DEFAULT = 40++ def icon_name+ 'list-details'+ end++ def self.role+ 'system'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/product_grid.rb b/core/app/models/spree/page_sections/product_grid.rbnew file mode 100644index 0000000000..6a0ca406c0--- /dev/null+++ b/core/app/models/spree/page_sections/product_grid.rb@@ -0,0 +1,13 @@+module Spree+ module PageSections+ class ProductGrid < Spree::PageSection+ def icon_name+ 'layout-grid'+ end++ def self.role+ 'system'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/related_products.rb b/core/app/models/spree/page_sections/related_products.rbnew file mode 100644index 0000000000..28f2f51d10--- /dev/null+++ b/core/app/models/spree/page_sections/related_products.rb@@ -0,0 +1,60 @@+module Spree+ module PageSections+ class RelatedProducts < Spree::PageSection+ has_rich_text :description++ before_validation :make_heading_size_valid+ before_validation :make_alignment_valid++ preference :heading, :string, default: Spree.t('page_sections.related_products.heading_default')+ preference :heading_size, :string, default: 'medium'+ preference :heading_alignment, :string, default: 'left'+ preference :description_alignment, :string, default: 'left'+ preference :max_products_to_show, :integer, default: 10++ def icon_name+ 'tags'+ end++ def lazy?+ true+ end++ def layout+ 'swiper'+ end++ def lazy_path(variables)+ section_id = variables[:section].id+ url_options = variables[:url_options] || {}++ if variables[:product].present?+ product_id = variables[:product].id+ Spree::Core::Engine.routes.url_helpers.related_product_path(+ product_id,+ section_id: section_id,+ **url_options+ )+ elsif variables[:post].present?+ post_id = variables[:post].id+ Spree::Core::Engine.routes.url_helpers.related_products_post_path(+ post_id,+ section_id: section_id,+ **url_options+ )+ end+ end++ private++ def make_alignment_valid+ self.preferred_heading_alignment = 'left' unless %w[left center right].include?(preferred_heading_alignment)+ self.preferred_description_alignment = 'left' unless %w[left center right].include?(preferred_description_alignment)+ end++ def make_heading_size_valid+ self.preferred_heading_size = 'small' unless %w[small medium large].include?(preferred_heading_size)+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/rich_text.rb b/core/app/models/spree/page_sections/rich_text.rbnew file mode 100644index 0000000000..6e6fffc9a2--- /dev/null+++ b/core/app/models/spree/page_sections/rich_text.rb@@ -0,0 +1,20 @@+module Spree+ module PageSections+ class RichText < Spree::PageSection+ def default_blocks+ [+ Spree::PageBlocks::Heading.new(text: Spree.t('page_sections.rich_text.heading_default')),+ Spree::PageBlocks::Text.new(text: Spree.t('page_sections.rich_text.text_default'))+ ]+ end++ def blocks_available?+ true+ end++ def icon_name+ 'text-caption'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/taxon_banner.rb b/core/app/models/spree/page_sections/taxon_banner.rbnew file mode 100644index 0000000000..ac0b780412--- /dev/null+++ b/core/app/models/spree/page_sections/taxon_banner.rb@@ -0,0 +1,18 @@+module Spree+ module PageSections+ class TaxonBanner < Spree::PageSection+ TOP_PADDING_DEFAULT = 20+ BOTTOM_PADDING_DEFAULT = 20+ TOP_BORDER_WIDTH_DEFAULT = 0+ BOTTOM_BORDER_WIDTH_DEFAULT = 1++ def icon_name+ 'heading'+ end++ def self.role+ 'system'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/taxon_grid.rb b/core/app/models/spree/page_sections/taxon_grid.rbnew file mode 100644index 0000000000..d7f6ae4fbb--- /dev/null+++ b/core/app/models/spree/page_sections/taxon_grid.rb@@ -0,0 +1,17 @@+module Spree+ module PageSections+ class TaxonGrid < Spree::PageSection+ TOP_BORDER_WIDTH_DEFAULT = 0++ preference :heading, :string, default: Spree.t('page_sections.taxon_grid.heading_default')++ def icon_name+ 'layout-grid'+ end++ def self.role+ 'system'+ end+ end+ end+enddiff --git a/core/app/models/spree/page_sections/video.rb b/core/app/models/spree/page_sections/video.rbnew file mode 100644index 0000000000..76b78426b5--- /dev/null+++ b/core/app/models/spree/page_sections/video.rb@@ -0,0 +1,92 @@+module Spree+ module PageSections+ class Video < Spree::PageSection+ alias video asset++ after_create :create_video_embed, if: -> { youtube_video_url.present? }+ after_update :update_video_embed, if: -> { saved_change_to_youtube_video_url? || video_embed.nil? }+ after_destroy :destroy_video_embed++ preference :youtube_video_url, :string+ preference :youtube_video_embed_id, :string+ preference :width_desktop, :integer, default: 70+ preference :separated, :string, default: 'horizontally'++ def default_blocks+ @default_blocks.presence || [+ Spree::PageBlocks::Heading.new(+ text: Spree.t('page_sections.video.heading_1_default'),+ text_alignment: nil,+ container_alignment: nil,+ bottom_padding: 8,+ top_padding: 24,+ size: 'small'+ ),+ Spree::PageBlocks::Heading.new(+ text: Spree.t('page_sections.video.heading_2_default'),+ text_alignment: nil,+ container_alignment: nil,+ bottom_padding: 8,+ top_padding: 24,+ size: 'large'+ ),+ Spree::PageBlocks::Heading.new(+ text: store.name,+ text_alignment: nil,+ container_alignment: nil,+ bottom_padding: 8,+ top_padding: 24,+ size: 'small'+ )+ ]+ end++ def icon_name+ 'movie'+ end++ def blocks_available?+ true+ end++ def video_embed+ @video_embed ||= ::ActionText::VideoEmbed.find_by(id: preferred_youtube_video_embed_id) if preferred_youtube_video_embed_id.present?+ end++ private++ def create_video_embed+ oembed_response = oembed_cached_response(preferred_youtube_video_url)++ if oembed_response.present?+ embed = ::ActionText::VideoEmbed.new+ embed.url = preferred_youtube_video_url+ embed.raw_html = oembed_response.html+ embed.thumbnail_url = oembed_response.thumbnail_url+ embed.raw_data = oembed_response.fields++ embed.save+ update(preferred_youtube_video_embed_id: embed.id) if embed.persisted?+ end+ end++ def update_video_embed+ destroy_video_embed+ create_video_embed+ end++ def destroy_video_embed+ video_embed.destroy if video_embed.present?+ end++ def oembed_cached_response(url)+ return nil if url.blank?++ raw_response = Rails.cache.fetch(['oembed', url]) { ::OEmbed::Providers.get(url).fields.to_json }+ OEmbed::Response.create_for(raw_response, OEmbed::Providers::Youtube, url, 'json')+ rescue OEmbed::Error+ nil+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/account.rb b/core/app/models/spree/pages/account.rbnew file mode 100644index 0000000000..987e15452a--- /dev/null+++ b/core/app/models/spree/pages/account.rb@@ -0,0 +1,13 @@+module Spree+ module Pages+ class Account < Spree::Page+ def url+ Spree::Core::Engine.routes.url_helpers.account_path(locale: I18n.locale)+ end++ def icon_name+ 'user'+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/cart.rb b/core/app/models/spree/pages/cart.rbnew file mode 100644index 0000000000..b1bbbe09a1--- /dev/null+++ b/core/app/models/spree/pages/cart.rb@@ -0,0 +1,9 @@+module Spree+ module Pages+ class Cart < Spree::Page+ def icon_name+ 'shopping-cart'+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/checkout.rb b/core/app/models/spree/pages/checkout.rbnew file mode 100644index 0000000000..d22ada541b--- /dev/null+++ b/core/app/models/spree/pages/checkout.rb@@ -0,0 +1,9 @@+module Spree+ module Pages+ class Checkout < Spree::Page+ def icon_name+ 'credit-card'+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/custom.rb b/core/app/models/spree/pages/custom.rbnew file mode 100644index 0000000000..3dc2748032--- /dev/null+++ b/core/app/models/spree/pages/custom.rb@@ -0,0 +1,32 @@+module Spree+ module Pages+ class Custom < Spree::Page+ def customizable?+ true+ end++ def url+ Spree::Core::Engine.routes.url_helpers.page_path(self, locale: I18n.locale)+ end++ def default_sections+ [+ Spree::PageSections::PageTitle.new,+ Spree::PageSections::RichText.new+ ]+ end++ def promote+ return unless preview?++ ApplicationRecord.transaction do+ old_page = parent+ old_page.page_links.update_all(linkable_id: id)+ update(parent: nil) # clear reference to the old page+ Spree::Page.find(old_page.id).destroy # destroy the old page with their other previews, etc.+ update_columns(slug: old_page.slug)+ end+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/homepage.rb b/core/app/models/spree/pages/homepage.rbnew file mode 100644index 0000000000..fcb2137054--- /dev/null+++ b/core/app/models/spree/pages/homepage.rb@@ -0,0 +1,66 @@+module Spree+ module Pages+ class Homepage < Spree::Page+ def url+ Spree::Core::Engine.routes.url_helpers.root_path(locale: I18n.locale)+ end++ def icon_name+ 'home'+ end++ def default_sections+ sections = [+ Spree::PageSections::ImageWithText.new(+ preferred_top_padding: 0,+ preferred_bottom_padding: 26+ )+ ]++ collections_taxonomy = store.taxonomies.find_by(name: Spree.t(:taxonomy_collections_name))++ if collections_taxonomy.present?+ on_sale_collection = collections_taxonomy.taxons.automatic.find_by(name: Spree.t('automatic_taxon_names.on_sale'))+ new_arrivals_collection = collections_taxonomy.taxons.automatic.find_by(name: Spree.t('automatic_taxon_names.new_arrivals'))++ if on_sale_collection.present?+ sections << Spree::PageSections::FeaturedTaxon.new(+ preferred_heading: Spree.t('pages.homepage.featured_taxon_heading_on_sale'),+ preferred_use_description_from_admin: true,+ preferred_taxon_id: on_sale_collection.id+ )+ end++ if new_arrivals_collection.present?+ sections << Spree::PageSections::FeaturedTaxon.new(+ preferred_heading: Spree.t('pages.homepage.featured_taxon_heading_new_arrivals'),+ preferred_use_description_from_admin: true,+ preferred_taxon_id: new_arrivals_collection.id+ )+ end+ end++ sections << Spree::PageSections::ImageWithText.new(+ preferred_background_color: '#F0EFE9', # accent color,+ default_blocks: [+ Spree::PageBlocks::Heading.new(+ text: Spree.t('pages.homepage.image_with_text_heading'),+ preferred_text_alignment: 'left',+ preferred_bottom_padding: 8,+ preferred_top_padding: 24+ ),+ Spree::PageBlocks::Text.new(+ text: Spree.t('pages.homepage.image_with_text_text'),+ preferred_text_alignment: 'left',+ preferred_bottom_padding: 16+ )+ ]+ )+ end++ def customizable?+ true+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/login.rb b/core/app/models/spree/pages/login.rbnew file mode 100644index 0000000000..c8a32f6bd1--- /dev/null+++ b/core/app/models/spree/pages/login.rb@@ -0,0 +1,13 @@+module Spree+ module Pages+ class Login < Spree::Page+ def icon_name+ 'key'+ end++ def url+ Spree::Core::Engine.routes.url_helpers.login_path(locale: I18n.locale)+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/password.rb b/core/app/models/spree/pages/password.rbnew file mode 100644index 0000000000..069862e54f--- /dev/null+++ b/core/app/models/spree/pages/password.rb@@ -0,0 +1,52 @@+module Spree+ module Pages+ class Password < Spree::Page+ def url+ Spree::Core::Engine.routes.url_helpers.password_path(locale: I18n.locale)+ end++ def preview_url(theme_preview = nil, page_preview = nil)+ Spree::Core::Engine.routes.url_helpers.password_path(theme_id: theme.id, page_preview_id: page_preview&.id,+ theme_preview_id: theme_preview&.id)+ end++ def icon_name+ 'key'+ end++ def customizable?+ true+ end++ def layout_sections?+ false+ end++ def default_sections+ [+ Spree::PageSections::MainPasswordHeader.new,+ Spree::PageSections::Newsletter.new(+ default_blocks: [+ Spree::PageBlocks::Heading.new(+ text: Spree.t('pages.password.newsletter_heading'),+ preferred_width_desktop: 50, # in %+ preferred_text_alignment: 'center',+ preferred_container_alignment: 'center',+ preferred_bottom_padding: 8+ ),+ Spree::PageBlocks::Text.new(+ text: Spree.t('pages.password.newsletter_text'),+ preferred_text_alignment: 'center',+ preferred_bottom_padding: 32,+ preferred_width_desktop: 50,+ preferred_container_alignment: 'center'+ ),+ Spree::PageBlocks::NewsletterForm.new+ ]+ ),+ Spree::PageSections::MainPasswordFooter.new,+ ]+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/post.rb b/core/app/models/spree/pages/post.rbnew file mode 100644index 0000000000..fd5ab531a0--- /dev/null+++ b/core/app/models/spree/pages/post.rb@@ -0,0 +1,25 @@+module Spree+ module Pages+ class Post < Spree::Page+ def url+ post = store.posts.published.last || store.posts.last++ Spree::Core::Engine.routes.url_helpers.post_path(post, locale: I18n.locale)+ end++ def icon_name+ 'article'+ end++ def default_sections+ [+ Spree::PageSections::PostDetails.new,+ ]+ end++ def customizable?+ true+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/post_list.rb b/core/app/models/spree/pages/post_list.rbnew file mode 100644index 0000000000..52ffd705e5--- /dev/null+++ b/core/app/models/spree/pages/post_list.rb@@ -0,0 +1,30 @@+module Spree+ module Pages+ class PostList < Spree::Page+ DISPLAY_NAME = Spree.t(:blog).freeze++ def url+ Spree::Core::Engine.routes.url_helpers.posts_path(locale: I18n.locale)+ end++ def icon_name+ 'news'+ end++ def default_sections+ [+ Spree::PageSections::PageTitle.new,+ Spree::PageSections::PostGrid.new+ ]+ end++ def display_name+ DISPLAY_NAME+ end++ def customizable?+ true+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/product_details.rb b/core/app/models/spree/pages/product_details.rbnew file mode 100644index 0000000000..8ba68ac018--- /dev/null+++ b/core/app/models/spree/pages/product_details.rb@@ -0,0 +1,27 @@+module Spree+ module Pages+ class ProductDetails < Spree::Page+ def url+ product = store.products.active.first || store.products.first++ Spree::Core::Engine.routes.url_helpers.product_path(product, locale: I18n.locale)+ end++ def icon_name+ 'tag'+ end++ def default_sections+ [+ Spree::PageSections::ProductDetails.new,+ Spree::PageSections::BrandStory.new,+ Spree::PageSections::RelatedProducts.new+ ]+ end++ def customizable?+ true+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/search_results.rb b/core/app/models/spree/pages/search_results.rbnew file mode 100644index 0000000000..8445a816c0--- /dev/null+++ b/core/app/models/spree/pages/search_results.rb@@ -0,0 +1,36 @@+module Spree+ module Pages+ class SearchResults < Spree::Page+ def icon_name+ 'search'+ end++ def url+ query = 'test'+ Spree::Core::Engine.routes.url_helpers.search_path(+ q: query,+ theme_id: theme.id,+ page_preview_id: page_preview&.id,+ theme_preview_id: theme_preview&.id,+ locale: I18n.locale+ )+ end++ def preview_url(theme_preview = nil, page_preview = nil)+ query = 'test'+ Spree::Core::Engine.routes.url_helpers.search_path(q: query, theme_id: theme.id, page_preview_id: page_preview&.id, theme_preview_id: theme_preview&.id)+ end++ def default_sections+ [+ Spree::PageSections::PageTitle.new,+ Spree::PageSections::ProductGrid.new+ ]+ end++ def customizable?+ true+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/shop_all.rb b/core/app/models/spree/pages/shop_all.rbnew file mode 100644index 0000000000..a2b32cb213--- /dev/null+++ b/core/app/models/spree/pages/shop_all.rb@@ -0,0 +1,32 @@+module Spree+ module Pages+ class ShopAll < Spree::Page+ def icon_name+ 'shopping-bag'+ end++ def url+ Spree::Core::Engine.routes.url_helpers.products_path(locale: I18n.locale)+ end++ def preview_url(theme_preview = nil, page_preview = nil)+ Spree::Core::Engine.routes.url_helpers.products_path(+ theme_id: theme.id,+ page_preview_id: page_preview&.id,+ theme_preview_id: theme_preview&.id+ )+ end++ def default_sections+ [+ Spree::PageSections::PageTitle.new,+ Spree::PageSections::ProductGrid.new+ ]+ end++ def customizable?+ true+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/taxon.rb b/core/app/models/spree/pages/taxon.rbnew file mode 100644index 0000000000..1c115bc69d--- /dev/null+++ b/core/app/models/spree/pages/taxon.rb@@ -0,0 +1,26 @@+module Spree+ module Pages+ class Taxon < Spree::Page+ def icon_name+ 'bookmark'+ end++ def url+ category = Spree::Taxon.first++ Spree::Core::Engine.routes.url_helpers.nested_taxons_path(category, locale: I18n.locale)+ end++ def default_sections+ [+ Spree::PageSections::TaxonBanner.new,+ Spree::PageSections::ProductGrid.new,+ ]+ end++ def customizable?+ true+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/taxon_list.rb b/core/app/models/spree/pages/taxon_list.rbnew file mode 100644index 0000000000..09a59b07fa--- /dev/null+++ b/core/app/models/spree/pages/taxon_list.rb@@ -0,0 +1,37 @@+module Spree+ module Pages+ class TaxonList < Spree::Page+ DISPLAY_NAME = Spree.t(:taxonomy_brands_name).freeze++ def url+ Spree::Core::Engine.routes.url_helpers.taxonomy_path(taxonomy.id, locale: I18n.locale)+ end++ def icon_name+ 'sort-a-z'+ end++ def default_sections+ [+ Spree::PageSections::TaxonGrid.new,+ ]+ end++ def customizable?+ true+ end++ def display_name+ DISPLAY_NAME+ end++ def taxonomy_id+ settings['taxonomy_id'].presence || store.taxonomies.first&.id+ end++ def taxonomy+ @taxonomy ||= store.taxonomies.find(taxonomy_id)+ end+ end+ end+enddiff --git a/core/app/models/spree/pages/wishlist.rb b/core/app/models/spree/pages/wishlist.rbnew file mode 100644index 0000000000..acc8a68fb4--- /dev/null+++ b/core/app/models/spree/pages/wishlist.rb@@ -0,0 +1,9 @@+module Spree+ module Pages+ class Wishlist < Spree::Page+ def url+ Spree::Core::Engine.routes.url_helpers.account_wishlist_path(locale: I18n.locale)+ end+ end+ end+enddiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex 43b952ed78..803351473a 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -102,6 +102,23 @@ module Spreehas_many :custom_domains, class_name: 'Spree::CustomDomain', dependent: :destroyhas_one :default_custom_domain, -> { where(default: true) }, class_name: 'Spree::CustomDomain'+ #+ # Page Builder associations+ #+ has_many :themes, -> { without_previews }, class_name: 'Spree::Theme', dependent: :destroy, inverse_of: :store+ has_many :theme_previews,+ -> { only_previews },+ class_name: 'Spree::Theme',+ through: :themes,+ source: :previews,+ inverse_of: :store,+ dependent: :destroy+ has_one :default_theme, -> { without_previews.where(default: true) }, class_name: 'Spree::Theme', inverse_of: :store+ has_many :theme_pages, class_name: 'Spree::Page', through: :themes, source: :pages+ has_many :theme_page_previews, class_name: 'Spree::Page', through: :theme_pages, source: :previews+ has_many :pages, -> { without_previews.custom }, class_name: 'Spree::Pages::Custom', dependent: :destroy, as: :pageable+ has_many :page_previews, class_name: 'Spree::Pages::Custom', through: :pages, as: :pageable, source: :previews+## ActionText#@@ -157,6 +174,7 @@ module Spreeafter_create :ensure_default_automatic_taxonsafter_create :import_products_from_store, if: -> { import_products_from_store_id.present? }after_create :import_payment_methods_from_store, if: -> { import_payment_methods_from_store_id.present? }+ after_create :create_default_themebefore_destroy :validate_not_last, unless: :skip_validate_not_lastbefore_destroy :pass_default_flag_to_other_storeafter_commit :clear_cache@@ -479,5 +497,12 @@ module Spreeself.url = [code, Spree.root_domain].join('.')end++ def create_default_theme+ themes.find_or_initialize_by(default: true) do |theme|+ theme.name = Spree.t(:default_theme_name)+ theme.save!+ end+ endendenddiff --git a/core/app/models/spree/theme.rb b/core/app/models/spree/theme.rbnew file mode 100644index 0000000000..6b71ec7565--- /dev/null+++ b/core/app/models/spree/theme.rb@@ -0,0 +1,229 @@+module Spree+ class Theme < Spree.base_class+ include Spree::SingleStoreResource+ include Spree::Previewable++ #+ # Magic methods+ #+ acts_as_paranoid++ #+ # Validations+ #+ validates :name, :store, presence: true++ #+ # Associations+ #+ belongs_to :store, class_name: 'Spree::Store', touch: true+ belongs_to :parent, class_name: 'Spree::Theme', optional: true, foreign_key: :parent_id+ has_many :previews, class_name: 'Spree::Theme', foreign_key: :parent_id, dependent: :destroy_async+ has_many :pages, -> { without_previews }, class_name: 'Spree::Page', dependent: :destroy, as: :pageable+ has_many :page_previews, -> { only_previews }, class_name: 'Spree::Page', dependent: :destroy_async, as: :pageable+ has_many :layout_sections, class_name: 'Spree::PageSection', dependent: :destroy, as: :pageable+ alias sections layout_sections++ #+ # Attachments+ #+ has_one_attached :screenshot, service: Spree.public_storage_service_name++ #+ #+ # Callbacks+ #+ before_validation :set_name, on: :create+ before_save :ensure_default_exists_and_is_unique+ after_create :create_default_pages, :create_layout_sections, unless: :duplicating?+ before_destroy :change_name_to_archived+ after_commit :take_screenshot, on: [:create, :update]++ #+ # Virtual attributes+ #+ attribute :duplicating, :boolean, default: false+ attribute :skip_screenshot_update, :boolean, default: false++ #+ # Class methods+ #+ def self.to_param+ Spree::Theme.to_s+ end++ # Returns an array of available themes, sorted by display name+ #+ # We need to load the theme classes to get the display name, so we also load the page classes at the same time+ #+ # @return [Array<Spree::Theme>]+ def self.available_themes+ @available_themes ||= begin+ # we need to load Page subclasses (not loaded in dev environment!)+ Dir.open(Rails.root.join('app', 'models', 'spree', 'themes')).each do |file|+ next if ['.', '..'].include?(file)++ require_dependency Rails.root.join('app', 'models', 'spree', 'themes', file).to_s+ end++ Spree::Theme.descendants.sort_by(&:display_name)+ end+ end++ def self.metadata+ {+ authors: [], # eg. ['Spree Commerce']+ website: '', # eg. 'https://spreecommerce.org'+ license: '', # eg. 'MIT', https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository#searching-github-by-license-type+ description: '', # eg. 'A theme for Spree Commerce'+ preview_image_url: '' # eg. 'https://example.com/screenshot.png'+ }+ end++ def self.display_name+ metadata[:name].presence || name.demodulize.titleize+ end++ def self.authors+ metadata[:authors]+ end++ def self.license+ metadata[:license]+ end++ def self.description+ metadata[:description]+ end++ def self.preview_image_url+ metadata[:preview_image_url]+ end++ def self.website+ metadata[:website]+ end++ def duplicate+ Themes::Duplicator.new(self).duplicate+ end++ def create_default_pages+ # we need to load Page subclasses (not loaded in dev environment!)+ Dir.open(Spree::Core::Engine.root.join('app', 'models', 'spree', 'pages')).each do |file|+ next if ['.', '..'].include?(file)++ require_dependency Spree::Core::Engine.root.join('app', 'models', 'spree', 'pages', file).to_s+ end++ Spree::Page.descendants.each do |page_class|+ next if page_class == Spree::Pages::Custom++ page_class.where(pageable: self).first_or_create!+ end+ end++ def create_layout_sections+ ApplicationRecord.transaction do+ available_layout_sections.each do |section_class|+ section_class.where(pageable: self).first_or_create!+ end+ end+ end++ def create_preview+ ActiveRecord::Base.connected_to(role: :writing) do+ ApplicationRecord.transaction do+ new_preview = dup+ new_preview.parent = self+ new_preview.duplicating = true+ new_preview.default = false++ # we need to deep clone layout sections and their assets+ sections.includes(:links, { asset_attachment: :blob }, { blocks: [:rich_text_text, :links] }).each do |section|+ section.deep_clone(new_preview)+ end++ new_preview.save!+ new_preview+ end+ end+ end++ # Promotes the preview to the main theme+ def promote+ return unless preview?++ ApplicationRecord.transaction do+ old_theme = parent++ # clear reference to the old theme and set default to the old theme's default+ update!(parent: nil, default: old_theme.default)++ # move pages to the new theme+ old_theme.pages.update_all(pageable_id: id)++ # destroy the old theme with their other previews, etc.+ store.themes.find(old_theme.id).destroy+ end+ end++ def available_layout_sections+ [+ Spree::PageSections::AnnouncementBar,+ Spree::PageSections::Header,+ Spree::PageSections::Newsletter,+ Spree::PageSections::Footer+ ]+ end++ def available_page_sections+ return @available_page_sections if @available_page_sections++ Dir.open(Rails.root.join('app', 'models', 'spree', 'page_sections')).each do |file|+ next if ['.', '..'].include?(file)++ require_dependency Rails.root.join('app', 'models', 'spree', 'page_sections', file).to_s+ end++ @available_page_sections ||= Spree::PageSection.descendants.find_all do |section_class|+ section_class.role == 'content'+ end.sort_by(&:name)+ end++ def restore_defaults!+ self.preferences = {}+ save!+ end++ protected++ def set_name+ self.name = type.demodulize.titleize if name.blank?+ end++ private++ def ensure_default_exists_and_is_unique+ if default+ store.themes.where.not(id: id).update_all(default: false, updated_at: Time.current)+ elsif store.themes.where(default: true).count.zero?+ self.default = true+ end+ end++ def change_name_to_archived+ update_columns(name: "#{name} (Archived)")+ end++ def take_screenshot+ return # Return for now, we will enable this after we move to Docker+ return if Rails.env.test? # skip in tests+ return if skip_screenshot_update+ # Skip if screenshot is already attached and was created less than a minute ago+ return if screenshot.attached? && screenshot.blob.created_at > 1.minute.ago++ Spree::Themes::ScreenshotJob.perform_later(id)+ end+ end+enddiff --git a/core/app/models/spree/themes/b2b.rb b/core/app/models/spree/themes/b2b.rbnew file mode 100644index 0000000000..dd7a293046--- /dev/null+++ b/core/app/models/spree/themes/b2b.rb@@ -0,0 +1,96 @@+module Spree+ module Themes+ class B2B < Spree::Theme+ def self.metadata+ {+ authors: ['Spree Commerce'],+ license: 'MIT',+ description: 'A starter theme for B2B stores',+ preview_image_url: 'https://cdn.prod.website-files.com/652fd14a69d606ee5f6fc37f/66d08d0c64bc6065146b9db0_Multiple-Store%20Multi-tenant%20eCommerce.png',+ website: 'https://spreecommerce.org'+ }+ end++ # COLORS+ # main colors+ preference :primary_color, :string, default: '#000000'+ preference :accent_color, :string, default: '#F0EFE9'+ preference :danger_color, :string, default: '#C73528'+ preference :neutral_color, :string, default: '#999999'+ preference :background_color, :string, default: '#FFFFFF'+ preference :text_color, :string, default: '#000000'+ preference :success_color, :string, default: '#00C773'++ # buttons+ preference :button_background_color, :string+ preference :button_text_color, :string, default: '#ffffff'+ preference :button_hover_background_color, :string+ preference :button_hover_text_color, :string+ preference :button_border_color, :string++ # borders+ preference :border_color, :string, default: '#E9E7DC'+ preference :sidebar_border_color, :string++ preference :secondary_button_background_color, :string+ preference :secondary_button_text_color, :string+ preference :secondary_button_hover_background_color, :string+ preference :secondary_button_hover_text_color, :string++ # inputs+ preference :input_text_color, :string, default: '#6b7280'+ preference :input_background_color, :string, default: '#ffffff'+ preference :input_border_color, :string+ preference :input_focus_border_color, :string+ preference :input_focus_background_color, :string+ preference :input_focus_text_color, :string++ # sidebar (checkout)+ preference :checkout_sidebar_background_color, :string, default: '#f3f4f6'+ preference :checkout_divider_background_color, :string+ preference :checkout_sidebar_text_color, :string++ # TYPOGRAPHY+ preference :custom_font_code, :string, default: nil+ # body+ preference :font_family, :string, default: 'Inter'+ preference :font_size_scale, :integer, default: 100+ # headers+ preference :header_font_family, :string, default: 'Inter'+ preference :header_font_size_scale, :integer, default: 100+ preference :headings_uppercase, :boolean, default: true++ # BUTTONS+ preference :button_border_thickness, :integer, default: 1+ preference :button_border_opacity, :integer, default: 100+ preference :button_border_radius, :integer, default: 100+ preference :button_shadow_opacity, :integer, default: 0+ preference :button_shadow_horizontal_offset, :integer, default: 0+ preference :button_shadow_vertical_offset, :integer, default: 4+ preference :button_shadow_blur, :integer, default: 5++ # INPUTS+ preference :input_border_thickness, :integer, default: 1+ preference :input_border_opacity, :integer, default: 100+ preference :input_border_radius, :integer, default: 8+ preference :input_shadow_opacity, :integer, default: 0+ preference :input_shadow_horizontal_offset, :integer, default: 0+ preference :input_shadow_vertical_offset, :integer, default: 4+ preference :input_shadow_blur, :integer, default: 5++ # BORDERS+ preference :border_width, :integer, default: 1+ preference :border_radius, :integer, default: 6+ preference :border_shadow_opacity, :integer, default: 0+ preference :border_shadow_horizontal_offset, :integer, default: 0+ preference :border_shadow_vertical_offset, :integer, default: 4+ preference :border_shadow_blur, :integer, default: 5++ # PRODUCT IMAGES+ preference :product_listing_image_height, :integer, default: 200+ preference :product_listing_image_width, :integer, default: 200+ preference :product_listing_image_height_mobile, :integer, default: 150+ preference :product_listing_image_width_mobile, :integer, default: 150+ end+ end+enddiff --git a/core/app/models/spree/themes/default.rb b/core/app/models/spree/themes/default.rbnew file mode 100644index 0000000000..909db24533--- /dev/null+++ b/core/app/models/spree/themes/default.rb@@ -0,0 +1,93 @@+module Spree+ module Themes+ class Default < Spree::Theme+ def self.metadata+ {+ authors: ['Spree Commerce'],+ license: 'MIT'+ }+ end++ # COLORS+ # main colors+ preference :primary_color, :string, default: '#000000'+ preference :accent_color, :string, default: '#F0EFE9'+ preference :danger_color, :string, default: '#C73528'+ preference :neutral_color, :string, default: '#999999'+ preference :background_color, :string, default: '#FFFFFF'+ preference :text_color, :string, default: '#000000'+ preference :success_color, :string, default: '#00C773'++ # buttons+ preference :button_background_color, :string+ preference :button_text_color, :string, default: '#ffffff'+ preference :button_hover_background_color, :string+ preference :button_hover_text_color, :string+ preference :button_border_color, :string++ # borders+ preference :border_color, :string, default: '#E9E7DC'+ preference :sidebar_border_color, :string++ preference :secondary_button_background_color, :string+ preference :secondary_button_text_color, :string+ preference :secondary_button_hover_background_color, :string+ preference :secondary_button_hover_text_color, :string++ # inputs+ preference :input_text_color, :string, default: '#6b7280'+ preference :input_background_color, :string, default: '#ffffff'+ preference :input_border_color, :string+ preference :input_focus_border_color, :string+ preference :input_focus_background_color, :string+ preference :input_focus_text_color, :string++ # sidebar (checkout)+ preference :checkout_sidebar_background_color, :string, default: '#f3f4f6'+ preference :checkout_divider_background_color, :string+ preference :checkout_sidebar_text_color, :string++ # TYPOGRAPHY+ preference :custom_font_code, :string, default: nil+ # body+ preference :font_family, :string, default: 'Inter'+ preference :font_size_scale, :integer, default: 100+ # headers+ preference :header_font_family, :string, default: 'Inter'+ preference :header_font_size_scale, :integer, default: 100+ preference :headings_uppercase, :boolean, default: true++ # BUTTONS+ preference :button_border_thickness, :integer, default: 1+ preference :button_border_opacity, :integer, default: 100+ preference :button_border_radius, :integer, default: 100+ preference :button_shadow_opacity, :integer, default: 0+ preference :button_shadow_horizontal_offset, :integer, default: 0+ preference :button_shadow_vertical_offset, :integer, default: 4+ preference :button_shadow_blur, :integer, default: 5++ # INPUTS+ preference :input_border_thickness, :integer, default: 1+ preference :input_border_opacity, :integer, default: 100+ preference :input_border_radius, :integer, default: 8+ preference :input_shadow_opacity, :integer, default: 0+ preference :input_shadow_horizontal_offset, :integer, default: 0+ preference :input_shadow_vertical_offset, :integer, default: 4+ preference :input_shadow_blur, :integer, default: 5++ # BORDERS+ preference :border_width, :integer, default: 1+ preference :border_radius, :integer, default: 6+ preference :border_shadow_opacity, :integer, default: 0+ preference :border_shadow_horizontal_offset, :integer, default: 0+ preference :border_shadow_vertical_offset, :integer, default: 4+ preference :border_shadow_blur, :integer, default: 5++ # PRODUCT IMAGES+ preference :product_listing_image_height, :integer, default: 300+ preference :product_listing_image_width, :integer, default: 300+ preference :product_listing_image_height_mobile, :integer, default: 190+ preference :product_listing_image_width_mobile, :integer, default: 190+ end+ end+enddiff --git a/core/app/services/spree/themes/duplicator.rb b/core/app/services/spree/themes/duplicator.rbnew file mode 100644index 0000000000..7cf8a53ffe--- /dev/null+++ b/core/app/services/spree/themes/duplicator.rb@@ -0,0 +1,40 @@+module Spree+ module Themes+ class Duplicator+ def initialize(theme)+ @theme = theme+ end++ def duplicate+ duplicated_theme = @theme.dup+ duplicated_theme.duplicating = true+ duplicated_theme.default = false+ duplicated_theme.ready = false+ duplicated_theme.name = generate_new_name(@theme.name)+ duplicated_theme.save!++ # We need to duplicate files, pages and sections in the background+ Spree::Themes::DuplicateComponentsJob.set(wait: 5.seconds).perform_later(@theme.id, duplicated_theme.id)++ duplicated_theme+ end++ protected++ def generate_new_name(name)+ depth_of_name = name.count('#')+ highest_number_for_each_depth = Spree::Theme.where('spree_themes.name LIKE ?', "%#{name}").+ pluck(:name).+ group_by { |theme_name| theme_name.count('#') }.+ transform_values do |names|+ # ['Copy #3 of Theme', 'Copy #2 of Theme', Copy #1 of Theme'] => '3'+ names.map{ |n| n.split.select { |s| s.starts_with?('#') }.first&.delete('#') }.max+ end++ next_usable_number = highest_number_for_each_depth[depth_of_name + 1].to_i + 1++ "Copy ##{next_usable_number} of #{name}"+ end+ end+ end+enddiff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 8b4be82897..10a663ce4e 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -621,6 +621,7 @@ en:bill_address: Bill Addressbilling: Billingbilling_address: Billing Address+ blog: Blogboth: Bothbreadcrumbs: Breadcrumbscalculated_reimbursements: Calculated Reimbursements@@ -1244,6 +1245,54 @@ en:package_from: package frompage: Pagepage_not_found: Sorry! Page you are looking can’t be found.+ page_blocks:+ buttons:+ display_name: Button+ link:+ display_name: Link+ nav:+ label_default: Menu+ newsletter_form:+ button_text_default: Submit+ placeholder_default: Enter your email+ page_sections:+ announcement_bar:+ default_text: Welcome to my Store!+ featured_taxon:+ heading_default: Beloved products+ button_text_default: Explore category+ featured_taxons:+ heading_default: Shop by category+ image_banner:+ heading_default: Welcome to your website+ text_default: This is the place to tell people about your business and what you do.+ image_with_text:+ heading_default: Welcome to my online store!+ text_default: "Hi, I'm %{store_name}. I enjoy life and love to share our experiences and energy with you and the world! And here we can share some of our favorite things as well."+ newsletter:+ heading_default: Subscribe for more feel good content+ text_default: Thank you for choosing us as your trusted online shopping destination.+ page_title:+ display_name: Page Title+ related_products:+ heading_default: You might also like+ rich_text:+ heading_default: This is a heading+ text_default: This is a paragraph of text+ taxon_grid:+ heading_default: Brands we work with+ video:+ heading_1_default: Why I recommend it?+ heading_2_default: There's nothing like a soft hint of blush to add dimension and color to your look.+ pages:+ homepage:+ featured_taxon_heading_on_sale: On sale+ featured_taxon_heading_new_arrivals: New arrivals+ image_with_text_heading: About me+ image_with_text_text: "I'm always looking for new and exciting projects to work on. Let's make something great together!"+ password:+ newsletter_heading: Opening soon+ newsletter_text: Be the first one to know when we launch.pagination:next_page: next page »previous_page: ! '« previous page'diff --git a/core/db/migrate/20250120094216_create_page_builder_models.rb b/core/db/migrate/20250120094216_create_page_builder_models.rbnew file mode 100644index 0000000000..280388d69a--- /dev/null+++ b/core/db/migrate/20250120094216_create_page_builder_models.rb@@ -0,0 +1,90 @@+class CreatePageBuilderModels < ActiveRecord::Migration[6.1]+ def change+ if !table_exists?(:spree_themes)+ create_table :spree_themes do |t|+ t.string :name+ t.references :store, null: false, index: true+ t.boolean :default, default: false, null: false+ t.boolean :ready, default: true+ t.string :type, default: 'Spree::Themes::Default', null: false+ t.references :parent+ t.text :preferences++ t.timestamps+ t.datetime :deleted_at++ t.index ['deleted_at'], name: 'index_spree_themes_on_deleted_at'+ t.index ['store_id', 'default'], name: 'index_spree_themes_on_store_id_and_default', unique: true, where: "((deleted_at IS NULL) AND (\"default\" = true))"+ end+ end++ if !table_exists?(:spree_pages)+ create_table :spree_pages do |t|+ t.references :pageable, polymorphic: true, null: false+ t.string :type, null: false+ t.string :slug+ t.string :name, null: false+ t.string :meta_title+ t.string :meta_description+ t.string :meta_keywords+ t.references :parent+ t.text :preferences++ t.timestamps+ t.datetime :deleted_at++ t.index ['pageable_id', 'name'], name: 'index_spree_pages_on_pageable_id_and_name'+ t.index ['pageable_id', 'pageable_type', 'slug'], name: 'index_spree_pages_on_pageable_id_and_pageable_type_and_slug', unique: true, where: '((deleted_at IS NULL) AND (slug IS NOT NULL))'+ t.index ['pageable_id', 'pageable_type', 'type'], name: 'index_spree_pages_on_pageable_id_and_pageable_type_and_type'+ t.index ['pageable_id', 'pageable_type'], name: 'index_spree_pages_on_pageable_id_and_pageable_type'+ end+ end++ if !table_exists?(:spree_page_sections)+ create_table :spree_page_sections do |t|+ t.references :pageable, polymorphic: true, null: false, index: true+ t.string :type, null: false+ t.string :name, null: false+ t.integer :position, default: 1, null: false+ t.integer :page_links_count, default: 0+ t.text :preferences++ t.timestamps+ t.datetime :deleted_at++ t.index ['pageable_id', 'pageable_type', 'position'], name: 'index_spree_page_sections_on_pageable_w_position'+ end+ end++ if !table_exists?(:spree_page_blocks)+ create_table :spree_page_blocks do |t|+ t.references :section, null: false, index: true+ t.string :name, null: false+ t.integer :position, default: 1, null: false+ t.string :type, null: false+ t.integer :page_links_count, default: 0+ t.text :preferences++ t.timestamps+ t.datetime :deleted_at++ t.index ['section_id', 'position'], name: 'index_spree_page_blocks_on_section_w_position'+ end+ end++ if !table_exists?(:spree_page_links)+ create_table :spree_page_links do |t|+ t.references :parent, polymorphic: true, index: true+ t.references :linkable, polymorphic: true, index: true+ t.string :label+ t.string :url+ t.boolean :open_in_new_tab, default: false+ t.integer :position, default: 1, null: false++ t.timestamps++ t.index ['parent_id'], name: 'index_spree_page_links_on_parent_id'+ end+ end+ end+enddiff --git a/core/db/migrate/20250120152208_add_default_locale_to_action_text_rich_texts.rb b/core/db/migrate/20250120152208_add_default_locale_to_action_text_rich_texts.rbnew file mode 100644index 0000000000..23dc101f57--- /dev/null+++ b/core/db/migrate/20250120152208_add_default_locale_to_action_text_rich_texts.rb@@ -0,0 +1,7 @@+class AddDefaultLocaleToActionTextRichTexts < ActiveRecord::Migration[7.2]+ def change+ if ActionText::RichText.column_defaults['locale'].nil?+ change_column_default :action_text_rich_texts, :locale, from: nil, to: :en+ end+ end+enddiff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rbindex ebdebb3f35..f023bc5c71 100644--- a/core/lib/spree/core.rb+++ b/core/lib/spree/core.rb@@ -29,6 +29,7 @@ require 'active_storage_validations'require 'activerecord-typedstore'require 'request_store'require 'wannabe_bool'+require 'geared_pagination'# This is required because ActiveModel::Validations#invalid? conflicts with the# invalid state of a Payment. In the future this should be removed.@@ -98,7 +99,8 @@ module Spreetaxons: :default,stock_location_stock_items: :default,coupon_codes: :default,- webhooks: :default+ webhooks: :default,+ themes: :default)enddiff --git a/core/lib/spree/core/preferences/preferable.rb b/core/lib/spree/core/preferences/preferable.rbindex 2d69cdfb21..7e1f4d56b2 100644--- a/core/lib/spree/core/preferences/preferable.rb+++ b/core/lib/spree/core/preferences/preferable.rb@@ -103,6 +103,10 @@ module Spree::Preferences::Preferablepreferences.keys.each { |pref| preferences.delete pref }end+ def clear_preferences_for(preference_keys)+ preference_keys.each { |pref| preferences.delete pref }+ end+privatedef convert_preference_value(value, type, nullable: false)diff --git a/core/lib/spree/testing_support/factories/page_block_factory.rb b/core/lib/spree/testing_support/factories/page_block_factory.rbnew file mode 100644index 0000000000..1b06f849ac--- /dev/null+++ b/core/lib/spree/testing_support/factories/page_block_factory.rb@@ -0,0 +1,19 @@+FactoryBot.define do+ factory :page_block, class: Spree::PageBlock do+ section { create(:page_section) }++ trait :buttons do+ type { 'Spree::PageBlocks::Buttons' }+ end++ trait :nav do+ section { create(:page_section, :header) }++ type { 'Spree::PageBlocks::Nav' }+ end++ trait :heading do+ type { 'Spree::PageBlocks::Heading' }+ end+ end+enddiff --git a/core/lib/spree/testing_support/factories/page_factory.rb b/core/lib/spree/testing_support/factories/page_factory.rbnew file mode 100644index 0000000000..8b4189aa4f--- /dev/null+++ b/core/lib/spree/testing_support/factories/page_factory.rb@@ -0,0 +1,33 @@+FactoryBot.define do+ factory :page, class: Spree::Page do+ type { 'Spree::Page' }+ pageable { Spree::Theme.first || create(:theme) }+ sequence(:name) { |n| "Page #{n}" }+ meta_description { 'Page Description' }++ trait :homepage do+ name { 'Homepage' }+ type { 'Spree::Pages::Homepage' }+ end++ trait :account do+ type { 'Spree::Pages::Account' }+ name { 'Account' }+ end++ trait :preview do+ parent { create(:page) }+ end++ trait :for_store do+ pageable { Spree::Store.default }+ end+ end++ factory :custom_page, class: Spree::Pages::Custom do+ type { 'Spree::Pages::Custom' }+ pageable { Spree::Store.default }+ sequence(:name) { |n| "Custom Page #{n}" }+ meta_description { 'Page Description' }+ end+enddiff --git a/core/lib/spree/testing_support/factories/page_link_factory.rb b/core/lib/spree/testing_support/factories/page_link_factory.rbnew file mode 100644index 0000000000..055259683e--- /dev/null+++ b/core/lib/spree/testing_support/factories/page_link_factory.rb@@ -0,0 +1,7 @@+FactoryBot.define do+ factory :page_link, class: Spree::PageLink do+ parent { Spree::PageSections::Header.first }+ linkable { Spree::Page.first }+ sequence(:label) { |n| "Page Link #{n}" }+ end+enddiff --git a/core/lib/spree/testing_support/factories/page_section_factory.rb b/core/lib/spree/testing_support/factories/page_section_factory.rbnew file mode 100644index 0000000000..96ce9120c1--- /dev/null+++ b/core/lib/spree/testing_support/factories/page_section_factory.rb@@ -0,0 +1,24 @@+FactoryBot.define do+ factory :page_section, class: Spree::PageSection do+ pageable { Spree::Page.find_by!(name: 'Homepage') }+ pageable_type { 'Spree::Page' }++ trait :featured_taxons do+ type { 'Spree::PageSections::FeaturedTaxons' }+ end++ factory :featured_taxon, class: Spree::PageSections::FeaturedTaxon++ trait :header do+ type { 'Spree::PageSections::Header' }+ end++ trait :announcement_bar do+ type { 'Spree::PageSections::AnnouncementBar' }+ end++ trait :rich_text do+ type { 'Spree::PageSections::RichText' }+ end+ end+enddiff --git a/core/lib/spree/testing_support/factories/theme_factory.rb b/core/lib/spree/testing_support/factories/theme_factory.rbnew file mode 100644index 0000000000..4aad754fc3--- /dev/null+++ b/core/lib/spree/testing_support/factories/theme_factory.rb@@ -0,0 +1,14 @@+FactoryBot.define do+ factory :theme, class: Spree::Theme do+ sequence(:name) { |n| "Theme #{n}#{Kernel.rand(9999)}" }+ store { Spree::Store.default || create(:store, default: true) }++ trait :blank do+ duplicating { true }+ end++ trait :preview do+ parent { create(:theme) }+ end+ end+enddiff --git a/core/spec/fixtures/files/example.json b/core/spec/fixtures/files/example.jsonnew file mode 100644index 0000000000..23f4b61775--- /dev/null+++ b/core/spec/fixtures/files/example.json@@ -0,0 +1,4 @@+{+ "id": 1,+ "name": "Example"+}diff --git a/core/spec/models/spree/page_block_spec.rb b/core/spec/models/spree/page_block_spec.rbnew file mode 100644index 0000000000..3dfa7c2c8a--- /dev/null+++ b/core/spec/models/spree/page_block_spec.rb@@ -0,0 +1,23 @@+require 'spec_helper'++RSpec.describe Spree::PageBlock, type: :model do+ let(:page_block) { create(:page_block, :nav) }++ describe 'validations' do+ describe 'asset' do+ it 'validates content type' do+ page_block.asset.attach(+ io: File.open(Spree::Core::Engine.root.join('spec/fixtures/files/icon_256x256.png')), filename: 'icon_256x256.png',+ content_type: 'image/png'+ )+ expect(page_block).to be_valid++ page_block.asset.attach(+ io: File.open(Spree::Core::Engine.root.join('spec/fixtures/files/example.json')), filename: 'example.json',+ content_type: 'application/json'+ )+ expect(page_block).not_to be_valid+ end+ end+ end+enddiff --git a/core/spec/models/spree/page_link_spec.rb b/core/spec/models/spree/page_link_spec.rbnew file mode 100644index 0000000000..65dd4218a7--- /dev/null+++ b/core/spec/models/spree/page_link_spec.rb@@ -0,0 +1,38 @@+require 'spec_helper'++RSpec.describe Spree::PageLink, type: :model do+ context 'when linkable is deleted' do+ describe 'Spree::Taxon' do+ it 'deletes the page link' do+ category = create(:taxon)+ page_link = create(:page_link, linkable: category)++ expect(Spree::PageLink.exists?(page_link.id)).to be true+ category.destroy+ expect(Spree::PageLink.exists?(page_link.id)).to be false+ end+ end++ describe 'Spree::Page' do+ it 'deletes the page link' do+ page = Spree::Page.first+ page_link = create(:page_link, linkable: page)++ expect(Spree::PageLink.exists?(page_link.id)).to be true+ page.destroy+ expect(Spree::PageLink.exists?(page_link.id)).to be false+ end+ end++ describe 'Spree::Product' do+ it 'deletes the page link' do+ product = create(:product)+ page_link = create(:page_link, linkable: product)++ expect(Spree::PageLink.exists?(page_link.id)).to be true+ product.destroy+ expect(Spree::PageLink.exists?(page_link.id)).to be false+ end+ end+ end+enddiff --git a/core/spec/models/spree/page_section_spec.rb b/core/spec/models/spree/page_section_spec.rbnew file mode 100644index 0000000000..f10262790e--- /dev/null+++ b/core/spec/models/spree/page_section_spec.rb@@ -0,0 +1,142 @@+require 'spec_helper'++RSpec.describe Spree::PageSection, type: :model do+ let(:homepage) { Spree::Page.find_by!(name: 'Homepage') }++ describe 'position' do+ it 'assigns position number in scope of non-deleted page sections' do+ expect(homepage.sections.pluck(:position)).to match_array([1, 2, 3, 4])+ homepage.sections.destroy_all+ expect(homepage.sections).to be_blank+ expect(homepage.sections.with_deleted).to be_present++ create_list(:featured_taxon, 4, pageable: homepage)+ expect(homepage.reload.sections.pluck(:position)).to match_array([1, 2, 3, 4])+ end+ end++ describe '#deep_clone' do+ let(:theme) { create(:theme) }++ shared_examples 'deep clone' do+ it 'creates a deep clone of the page section' do+ expect {+ section.deep_clone(new_preview)+ }.to change { Spree::PageSection.count }.by(1)+ .and change { Spree::PageBlock.count }.by(page_blocks_count)+ .and change { Spree::PageLink.count }.by(page_links_count)+++ new_section = Spree::PageSection.last++ expect(new_section.preferences).to eq(section.preferences)+ expect(new_section.preferences).to eq(section.preferences)+ expect(new_section.position).to eq(section.position)+ expect(new_section.pageable).to eq(new_preview)++ expect(new_section.blocks.count).to eq(section.blocks.count)+ expect(new_section.links.count).to eq(section.links.count)++ new_section.blocks.order(position: :asc).each do |block|+ old_block = section.blocks.find_by(position: block.position)++ expect(block.name).to eq(old_block.name)+ expect(block.preferences).to eq(old_block.preferences)+ expect(block.preferences).to eq(old_block.preferences)+ expect(block.link.linkable).to eq(old_block.link.linkable) if old_block.respond_to?(:link)+ expect(block.asset.attachment).to eq(old_block.asset.attachment)++ next unless block.respond_to?(:links)++ expect(block.links.count).to eq(old_block.links.count)+ expect(block.page_links_count).to eq(old_block.page_links_count)++ block.links.each do |link|+ old_link = old_block.links.find_by(position: link.position)++ expect(link.label).to eq(old_link.label)+ expect(link.linkable).to eq(old_link.linkable)+ expect(link.position).to eq(old_link.position)+ end+ end++ new_section.links.each do |link|+ expect(link.linkable).to eq(new_section.links.find_by(label: link.label).linkable)+ end+ end+ end++ context 'for page preview' do+ let(:page) { theme.pages.find_by(type: 'Spree::Pages::Homepage') }+ let!(:new_preview) { page.create_preview }+ let!(:section) { Spree::PageSections::ImageWithText.create!(pageable: page) }++ let(:page_blocks_count) { 3 }+ let(:page_links_count) { 2 }++ it_behaves_like 'deep clone'+ end++ context 'for theme preview' do+ let!(:new_preview) { theme.create_preview }+ let!(:section) { Spree::PageSections::Footer.create!(pageable: theme) }++ let(:page_blocks_count) { 4 }+ let(:page_links_count) { 8 }++ it_behaves_like 'deep clone'+ end++ context 'newsletter section' do+ let!(:new_preview) { theme.create_preview }+ let!(:section) { theme.sections.find_by!(name: "Newsletter") }++ let(:page_blocks_count) { 4 }+ let(:page_links_count) { 0 }++ before do+ Spree::PageBlocks::Image.create!(section: section)+ end++ it_behaves_like 'deep clone'+ end+ end++ describe 'validations' do+ describe 'asset' do+ let(:page_section) { create(:page_section, :header) }++ it 'validates content type' do+ page_section.asset.attach(+ io: File.open(Spree::Core::Engine.root.join('spec/fixtures/files/icon_256x256.png')), filename: 'icon_256x256.png',+ content_type: 'image/png'+ )+ expect(page_section).to be_valid++ page_section.asset.attach(+ io: File.open(Spree::Core::Engine.root.join('spec/fixtures/files/example.json')), filename: 'example.json',+ content_type: 'application/json'+ )+ expect(page_section).not_to be_valid+ end+ end+ end++ describe '#restore_design_settings_to_defaults' do+ let(:page_section) do+ create(+ :page_section,+ :header,+ preferences: { text_color: '#000000', background_color: '#FFFFFF', border_color: '#000000' }+ )+ end++ it 'restores design settings to defaults' do+ page_section.restore_design_settings_to_defaults++ expect(page_section.preferred_text_color).to be_nil+ expect(page_section.preferred_background_color).to be_nil+ expect(page_section.preferred_border_color).to be_nil+ end+ end+enddiff --git a/core/spec/models/spree/page_sections/header_spec.rb b/core/spec/models/spree/page_sections/header_spec.rbnew file mode 100644index 0000000000..67eb61e466--- /dev/null+++ b/core/spec/models/spree/page_sections/header_spec.rb@@ -0,0 +1,12 @@+require 'spec_helper'++describe Spree::PageSections::Header do+ describe '#create' do+ let(:section) { Spree::PageSections::Header.first }++ it 'should be created with default links' do+ expect(section.links.count).to eq(5)+ expect(section.links.map(&:label)).to contain_exactly('Shop All', 'Brands', 'On sale', 'New arrivals', 'Blog')+ end+ end+enddiff --git a/core/spec/models/spree/page_spec.rb b/core/spec/models/spree/page_spec.rbnew file mode 100644index 0000000000..15772e3e88--- /dev/null+++ b/core/spec/models/spree/page_spec.rb@@ -0,0 +1,40 @@+require 'spec_helper'++describe Spree::Page, type: :model do+ let(:store) { create(:store) }+ let(:theme) { create(:theme, store: store) }+ let(:page) { theme.pages.first }++ context 'slugs' do+ let(:custom_page) { create(:page, pageable: theme, type: 'Spree::Pages::Custom', name: 'Landing Page') }++ it 'should only generate slugs for custom pages' do+ expect(page.slug).to be_nil++ expect(custom_page.slug).not_to be_nil+ expect(custom_page.slug).to eq('landing-page')+ end+ end++ describe '#create_preview' do+ it 'should create a preview' do+ expect { page.create_preview }.to change { page.previews.count }.by(1)++ new_preview = page.previews.last+ expect(new_preview.parent).to eq(page)++ expect(new_preview.sections.count).to eq(page.sections.count)+ expect(new_preview.sections.map(&:display_name)).to contain_exactly(*page.sections.map(&:display_name))+ end+ end++ describe '#promote' do+ let!(:page_preview) { page.create_preview }++ it 'should promote the preview to the main page' do+ expect { page_preview.promote }.to change { page_preview.parent }.from(page).to(nil).and change { Spree::Page.count }.by(-1)++ expect(page_preview.reload.preview?).to be(false)+ end+ end+enddiff --git a/core/spec/models/spree/pages/custom_spec.rb b/core/spec/models/spree/pages/custom_spec.rbnew file mode 100644index 0000000000..2d491f892c--- /dev/null+++ b/core/spec/models/spree/pages/custom_spec.rb@@ -0,0 +1,34 @@+require 'spec_helper'++describe Spree::Pages::Custom do+ describe '#create' do+ let(:page) { create(:custom_page, name: 'Custom Page Title') }++ it 'should be created with default sections' do+ expect(page.sections.count).to eq 2+ expect(page.sections.map(&:display_name)).to contain_exactly(+ 'Custom Page Title', 'Rich Text'+ )+ end+ end++ describe '#promote', job: true do+ let!(:custom_page) { create(:custom_page, name: 'Custom Page Title') }+ let!(:page_preview) { custom_page.create_preview }++ before do+ page_preview.update(slug: 'some-other-slug')+ end++ it 'should promote the preview to the main page' do+ expect do+ perform_enqueued_jobs { page_preview.promote }+ end.to change { page_preview.parent }.from(custom_page).to(nil).and change { Spree::Page.count }.by(-1)++ expect(page_preview.reload.preview?).to be(false)+ expect(page_preview.slug).to eq(custom_page.slug)+ expect(page_preview).not_to be_deleted+ expect(custom_page.reload).to be_deleted+ end+ end+enddiff --git a/core/spec/models/spree/pages/homepage_spec.rb b/core/spec/models/spree/pages/homepage_spec.rbnew file mode 100644index 0000000000..2379372083--- /dev/null+++ b/core/spec/models/spree/pages/homepage_spec.rb@@ -0,0 +1,17 @@+require 'spec_helper'++describe Spree::Pages::Homepage do+ describe '#create' do+ let(:page) { Spree::Pages::Homepage.first }++ it 'should be created with default sections' do+ expect(page.sections.count).to eq(4)+ expect(page.sections.map(&:display_name)).to contain_exactly(+ 'Image With Text',+ 'On sale - Featured Taxon',+ 'New arrivals - Featured Taxon',+ 'Image With Text'+ )+ end+ end+enddiff --git a/core/spec/models/spree/theme_spec.rb b/core/spec/models/spree/theme_spec.rbnew file mode 100644index 0000000000..ee867cdb97--- /dev/null+++ b/core/spec/models/spree/theme_spec.rb@@ -0,0 +1,94 @@+require 'spec_helper'++describe Spree::Theme, type: :model do+ let(:store) { create(:store) }+ let(:theme) { create(:theme, store: store) }++ context 'Callbacks' do+ describe '#touch' do+ it 'touches store' do+ expect { theme.update!(name: 'New Name') }.to change { store.reload.updated_at }+ end+ end++ describe '#ensure_default_exists_and_is_unique' do+ context 'when default is true' do+ let!(:default_theme) { create(:theme, store: store, default: true) }++ it 'should set default to false for other themes' do+ expect { theme.update!(default: true) }.to change { default_theme.reload.default }.from(true).to(false)+ end++ it 'should touch cache for other themes' do+ expect { theme.update!(default: true) }.to change { default_theme.reload.cache_key_with_version }+ end+ end++ context 'when default is false' do+ let!(:default_theme) { create(:theme, store: store, default: true) }++ it 'should not change default to false for other themes' do+ expect { theme.update!(name: 'New Name') }.not_to change { default_theme.reload.default }+ end++ it 'should not touch cache for other themes' do+ expect { theme.update!(name: 'New Name') }.not_to change { default_theme.reload.cache_key_with_version }+ end+ end+ end++ xdescribe 'after update' do # Enable after installing Chrome+ before do+ allow(Rails.env).to receive(:test?).and_return(false)+ end++ it 'should queue a job to take screenshot' do+ theme+ expect { theme.update!(name: 'New Name') }.to have_enqueued_job(Spree::Themes::ScreenshotJob)+ end++ it 'should not queue job when last screenshot was taken less than minute ago' do+ theme.screenshot.attach(+ io: File.open(Spree::Core::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg')),+ filename: 'thinking-cat.jpg'+ )++ expect { theme.update!(name: 'New Name') }.not_to have_enqueued_job(Spree::Themes::ScreenshotJob)+ end++ it 'should not queue job when skip_screenshot_update is true' do+ theme.skip_screenshot_update = true+ expect { theme.update!(name: 'New Name') }.not_to have_enqueued_job(Spree::Themes::ScreenshotJob)+ end+ end+ end++ describe '#create_preview' do+ it 'should create a preview' do+ expect { theme.create_preview }.to change { theme.previews.count }.by(1)++ new_preview = theme.previews.last+ expect(new_preview).to be_present+ expect(new_preview.parent).to eq(theme)++ expect(new_preview.name).to eq(theme.name)+ expect(new_preview.preferences).to eq(theme.preferences)+ expect(new_preview.preferences.count).to eq(theme.preferences.count)+ end+ end++ describe '#promote' do+ let!(:theme_preview) { theme.create_preview }++ it 'should promote the preview to the main theme' do+ page_ids = theme.pages.pluck(:id)++ expect { theme_preview.promote }.to change { theme_preview.parent }.from(theme).to(nil).and change { Spree::Theme.count }.by(-1)++ expect(theme_preview.reload.preview?).to be(false)+ expect(theme_preview.parent).to be_nil++ expect(theme_preview.page_ids).to contain_exactly(*page_ids)+ end+ end+enddiff --git a/core/spree_core.gemspec b/core/spree_core.gemspecindex 8a31c1f80b..1e4c1d498f 100644--- a/core/spree_core.gemspec+++ b/core/spree_core.gemspec@@ -59,4 +59,5 @@ Gem::Specification.new do |s|s.add_dependency 'friendly_id-mobility', '~> 1.0's.add_dependency 'request_store', '~> 1.7's.add_dependency 'wannabe_bool'+ s.add_dependency 'geared_pagination'enddiff --git a/storefront/lib/spree/storefront.rb b/storefront/lib/spree/storefront.rbindex 963e76f580..f49d1c3213 100644--- a/storefront/lib/spree/storefront.rb+++ b/storefront/lib/spree/storefront.rb@@ -6,7 +6,6 @@ require 'sprockets/railtie'require 'active_link_to'require 'canonical-rails'require 'heroicon'-require 'geared_pagination'require 'importmap-rails'require 'inline_svg'require 'local_time'diff --git a/storefront/spree_storefront.gemspec b/storefront/spree_storefront.gemspecindex 965a761eeb..f72aa7d9ae 100644--- a/storefront/spree_storefront.gemspec+++ b/storefront/spree_storefront.gemspec@@ -31,7 +31,6 @@ Gem::Specification.new do |s|s.add_dependency 'active_link_to's.add_dependency 'canonical-rails', '~> 0.2.14'- s.add_dependency 'geared_pagination's.add_dependency 'heroicon's.add_dependency 'importmap-rails's.add_dependency 'inline_svg', '~> 1.5'