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 controllers/views
Łukasz Adamczyk71861242ab00
diff --git a/admin/app/controllers/concerns/spree/admin/page_builder_concern.rb b/admin/app/controllers/concerns/spree/admin/page_builder_concern.rbnew file mode 100644index 0000000000..a9f5e61dee--- /dev/null+++ b/admin/app/controllers/concerns/spree/admin/page_builder_concern.rb@@ -0,0 +1,51 @@+module Spree+ module Admin+ module PageBuilderConcern+ extend ActiveSupport::Concern++ included do+ before_action :set_variables+ layout :choose_layout+ end++ def choose_layout+ return 'turbo_rails/frame' if turbo_frame_request?++ 'spree/page_builder'+ end++ def set_variables+ @theme_preview = current_store.theme_previews.find(session[:theme_preview_id]) if session[:theme_preview_id].present?+ @theme = @theme_preview.parent if @theme_preview+ if session[:page_preview_id].present?+ @page_preview = @theme.page_previews.find_by(id: session[:page_preview_id]) ||+ current_store.page_previews.find(session[:page_preview_id])+ end+ @page = @page_preview.parent if @page_preview+ end++ def create_turbo_stream_enabled?+ true+ end++ def update_turbo_stream_enabled?+ true+ end++ def default_url_options+ {+ theme_preview_id: session[:theme_preview_id],+ page_preview_id: session[:page_preview_id],+ }+ end++ def location_after_save+ collection_url+ end++ def collection_url+ spree.edit_admin_theme_path(@theme, page_id: @page.id)+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/page_blocks_controller.rb b/admin/app/controllers/spree/admin/page_blocks_controller.rbnew file mode 100644index 0000000000..9ed4db4e0c--- /dev/null+++ b/admin/app/controllers/spree/admin/page_blocks_controller.rb@@ -0,0 +1,35 @@+module Spree+ module Admin+ class PageBlocksController < Spree::Admin::ResourceController+ include Spree::Admin::PageBuilderConcern++ belongs_to 'spree/page_section', find_by: :id++ def destroy+ @page_block.destroy+ end++ def move_higher+ if @page_block.first?+ head :ok+ else+ @page_block.move_higher+ end+ end++ def move_lower+ if @page_block.last?+ head :ok+ else+ @page_block.move_lower+ end+ end++ def create+ @page_block = params[:page_block][:type].constantize.new+ @page_block.section = @page_section+ @page_block.save!+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/page_links_controller.rb b/admin/app/controllers/spree/admin/page_links_controller.rbnew file mode 100644index 0000000000..2e1337b012--- /dev/null+++ b/admin/app/controllers/spree/admin/page_links_controller.rb@@ -0,0 +1,43 @@+module Spree+ module Admin+ class PageLinksController < ResourceController+ include Spree::Admin::PageBuilderConcern++ before_action :load_parent++ create.before :set_defaults++ def destroy+ @page_link.destroy+ end++ private++ def collection_url+ @collection_url ||= if @parent.is_a?(Spree::PageSection)+ spree.edit_admin_page_section_path(@parent)+ elsif @parent.is_a?(Spree::PageBlock)+ spree.edit_admin_page_section_block_path(@parent.section, @parent)+ end+ end++ def load_parent+ @parent ||= if @page_link&.persisted?+ @page_link.parent+ elsif params[:block_id].present?+ Spree::PageBlock.find(params[:block_id])+ elsif params[:page_section_id].present?+ Spree::PageSection.find(params[:page_section_id])+ end+ end++ def set_defaults+ raise ActiveRecord::RecordNotFound unless @parent++ @page_link.parent = @parent+ @page_link.linkable_type ||= @parent.default_linkable_type+ @page_link.linkable ||= @parent.default_linkable_resource+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/page_sections_controller.rb b/admin/app/controllers/spree/admin/page_sections_controller.rbnew file mode 100644index 0000000000..9b9aa0a64c--- /dev/null+++ b/admin/app/controllers/spree/admin/page_sections_controller.rb@@ -0,0 +1,52 @@+module Spree+ module Admin+ class PageSectionsController < ResourceController+ include Spree::Admin::PageBuilderConcern++ before_action :load_pageable, only: %i[new create index]++ def create+ @page_section = params[:page_section][:type].constantize.new(permitted_resource_params)+ @page_section.pageable = @pageable+ @page_section.save!+ end++ def destroy+ @page_section.destroy if @page_section.can_be_deleted?+ end++ def move_higher+ if @page_section.first?+ head :ok+ else+ @page_section.move_higher+ end+ end++ def move_lower+ if @page_section.last?+ head :ok+ else+ @page_section.move_lower+ end+ end++ def restore_design_settings_to_defaults+ @page_section.restore_design_settings_to_defaults+ end++ private++ def load_pageable+ @pageable = if @page_section.present? && @page_section.pageable.present?+ @page_section.pageable+ elsif params[:page_id].present?+ current_store.theme_page_previews.friendly.find_by(id: params[:page_id]) ||+ current_store.page_previews.friendly.find(params[:page_id])+ elsif params[:theme_id].present?+ current_store.theme_previews.find(params[:theme_id])+ end+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/pages_controller.rb b/admin/app/controllers/spree/admin/pages_controller.rbnew file mode 100644index 0000000000..ff159db548--- /dev/null+++ b/admin/app/controllers/spree/admin/pages_controller.rb@@ -0,0 +1,40 @@+module Spree+ module Admin+ class PagesController < Spree::Admin::ResourceController+ create.before :set_page+ update.after :remove_preview_from_session+ destroy.after :remove_preview_from_session+ create.after :remove_preview_from_session++ private++ def remove_preview_from_session+ session.delete(:page_preview_id)+ end++ def flash_message_for(object, event_sym)+ Spree.t(event_sym, resource: "#{Spree.t(:page)} \"#{object.name}\"")+ end++ def set_page+ @object = current_store.pages.custom.new+ end++ def edit_object_url(object, options = {})+ spree.edit_admin_theme_path(current_store.default_theme, page_id: object.id, **options)+ end++ def collection+ return @collection if @collection.present?++ @collection = current_store.pages.custom++ params[:q] ||= {}+ params[:q][:s] ||= 'created_at desc'++ @search = @collection.ransack(params[:q])+ @collection = @search.result.page(params[:page]).per(params[:per_page])+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/post_categories_controller.rb b/admin/app/controllers/spree/admin/post_categories_controller.rbnew file mode 100644index 0000000000..0d8f311f43--- /dev/null+++ b/admin/app/controllers/spree/admin/post_categories_controller.rb@@ -0,0 +1,6 @@+module Spree+ module Admin+ class PostCategoriesController < ResourceController+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/posts_controller.rb b/admin/app/controllers/spree/admin/posts_controller.rbnew file mode 100644index 0000000000..1e714e78da--- /dev/null+++ b/admin/app/controllers/spree/admin/posts_controller.rb@@ -0,0 +1,23 @@+module Spree+ module Admin+ class PostsController < ResourceController+ def select_options+ render json: current_store.posts.published.to_tom_select_json+ end++ private++ def collection+ return @collection if @collection.present?++ @collection = super++ params[:q] ||= {}+ params[:q][:s] ||= 'published_at desc'++ @search = @collection.ransack(params[:q])+ @collection = @search.result.page(params[:page]).per(params[:per_page])+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/themes_controller.rb b/admin/app/controllers/spree/admin/themes_controller.rbnew file mode 100644index 0000000000..5caf87d4b3--- /dev/null+++ b/admin/app/controllers/spree/admin/themes_controller.rb@@ -0,0 +1,75 @@+module Spree+ module Admin+ class ThemesController < ResourceController+ layout :choose_layout++ def edit+ @theme_preview = params[:theme_preview_id].present? ? @theme.previews.find(params[:theme_preview_id]) : @theme.create_preview+ @page = if params[:page_id].present?+ @theme.pages.find_by(id: params[:page_id]) || current_store.pages.find(params[:page_id])+ else+ @theme.pages.find_by(type: 'Spree::Pages::Homepage')+ end+ @page_preview = params[:page_preview_id].present? ? @page.previews.find(params[:page_preview_id]) : @page.create_preview++ session[:theme_preview_id] = @theme_preview.id+ session[:page_preview_id] = @page_preview.id+ end++ def update_with_page+ @theme_preview = @theme.previews.find(params[:theme_preview_id])+ @page_preview = @theme.page_previews.find_by(id: params[:page_preview_id]) || current_store.page_previews.find(params[:page_preview_id])++ ApplicationRecord.transaction do+ @page_preview.promote && @theme_preview.promote+ end+ flash[:success] = Spree.t('changes_published')++ redirect_to spree.edit_admin_theme_path(@theme_preview, page_id: @page_preview.id), status: :see_other+ rescue ActiveRecord::RecordInvalid+ redirect_to spree.edit_admin_theme_path(@theme_preview, page_id: @page_preview.id), alert: Spree.t('something_went_wrong')+ end++ def publish+ @theme = current_store.themes.find(params[:id])++ if @theme.update(default: true)+ flash[:success] = Spree.t('theme_is_now_live')+ else+ flash[:error] = "#{Spree.t('something_went_wrong')}: #{@theme.errors.full_messages.to_sentence}"+ end+ redirect_to spree.admin_themes_path+ end++ def clone+ @new = @theme.duplicate++ if @new.persisted?+ flash[:success] = Spree.t('theme_copied')+ else+ flash[:error] = Spree.t('theme_not_copied', error: @new.errors.full_messages.to_sentence)+ end++ redirect_to spree.admin_themes_path+ end++ private++ def choose_layout+ if action_name == 'index'+ 'spree/admin'+ else+ 'spree/page_builder'+ end+ end++ def update_turbo_stream_enabled?+ true+ end++ def collection+ super.without_previews.order(default: :desc).includes(screenshot_attachment: :blob)+ end+ end+ end+enddiff --git a/admin/app/helpers/spree/admin/page_builder_helper.rb b/admin/app/helpers/spree/admin/page_builder_helper.rbnew file mode 100644index 0000000000..6b5be82436--- /dev/null+++ b/admin/app/helpers/spree/admin/page_builder_helper.rb@@ -0,0 +1,123 @@+module Spree+ module Admin+ module PageBuilderHelper+ def system_fonts_list+ ['Sans-serif', 'Serif', 'Mono']+ end++ def google_fonts_list+ ['Abel', 'Abril Fatface', 'Alegreya', 'Alegreya Sans', 'Alice', 'Amiri', 'Anonymous Pro', 'Arapey', 'Archivo', 'Archivo Narrow',+ 'Arimo', 'Armata', 'Arvo', 'Asap', 'Assistant', 'Asul', 'Bitter', 'Cabin', 'Cardo', 'Catamaran', 'Chivo', 'Cormorant',+ 'Crimson Text', 'DM Sans', 'Domine', 'Dosis', 'Eczar', 'Figtree', 'Fira Sans', 'Fjalla One', 'Glegoo', 'IBM Plex Sans', 'Inconsolata',+ 'Inknut Antiqua', 'Inter', 'Josefin Sans', 'Josefin Slab', 'Kalam', 'Karla', 'Kreon', 'Lato', 'Libre Baskerville',+ 'Libre Franklin', 'Lobster', 'Lobster Two', 'Lora', 'Maven Pro', 'Megrim', 'Merriweather Sans', 'Montserrat',+ 'Mouse Memoirs', 'Muli', 'Neuton', 'News Cycle', 'Nobile', 'Noticia Text', 'Noto Serif', 'Nunito', 'Nunito Sans',+ 'Old Standard TT', 'Open Sans', 'Oswald', 'Ovo', 'Oxygen', 'PT Mono', 'PT Sans', 'PT Sans Narrow', 'PT Serif',+ 'Pacifico', 'Playball', 'Playfair Display', 'Poppins', 'Prata', 'Prompt', 'Quattrocento', 'Quattrocento Sans',+ 'Questrial', 'Quicksand', 'Rajdhani', 'Raleway', 'Righteous', 'Roboto', 'Roboto Condensed', 'Roboto Mono', 'Roboto Slab',+ 'Rubik', 'Shadows Into Light', 'Slabo 13px', 'Slabo 27px', 'Smooch', 'Source Code Pro', 'Source Sans Pro', 'Space Mono',+ 'Syne', 'Tenor Sans', 'Tinos', 'Titillium Web', 'Ubuntu', 'Unica One', 'Unna', 'Varela', 'Varela Round', 'Vidaloka',+ 'Volkhov', 'Vollkorn', 'Work Sans']+ end++ def color_palettes+ [+ {+ primary_color: '#1e4bd1',+ text_color: '#000000',+ border_color: '#d1d5db',+ button_text_color: '#ffffff',+ background_color: '#F9FAFB'+ },+ {+ primary_color: '#e63946',+ text_color: '#1d3557',+ border_color: '#a8dadc',+ button_text_color: '#ffffff',+ background_color: '#f1faee'+ },+ {+ primary_color: '#264653',+ text_color: '#060C0E',+ border_color: '#2a9d8f',+ button_text_color: '#ffffff',+ background_color: '#e9c46a'+ },+ {+ primary_color: '#606c38',+ text_color: '#283618',+ border_color: '#dda15e',+ button_text_color: '#ffffff',+ background_color: '#fefae0'+ },+ {+ primary_color: '#FF961F',+ text_color: '#023047',+ border_color: '#219EBC',+ button_text_color: '#FFEEDA',+ background_color: '#DEF0F7'+ },+ {+ primary_color: '#181CF1',+ text_color: '#011627',+ border_color: '#7678ED',+ button_text_color: '#FFFFFF',+ background_color: '#FFF5D6'+ }+ ]+ end++ def color_palette_active?(color_palette)+ @theme_preview&.primary_color&.downcase == color_palette[:primary_color].downcase &&+ @theme_preview&.text_color&.downcase == color_palette[:text_color].downcase &&+ @theme_preview&.border_color&.downcase == color_palette[:border_color].downcase &&+ @theme_preview&.button_text_color&.downcase == color_palette[:button_text_color].downcase &&+ @theme_preview&.background_color&.downcase == color_palette[:background_color].downcase+ end++ def all_fonts_options+ @all_fonts_options ||= system_fonts_list + google_fonts_list+ end++ def all_linkable_pages+ @all_linkable_pages ||= Spree::Page.+ linkable.+ without_previews.+ where(pageable: [@theme, current_store]).+ map { |page| [page.display_name, page.id] }+ end++ def all_linkable_policies+ @all_linkable_policies = [+ current_store.customer_privacy_policy,+ current_store.customer_terms_of_service,+ current_store.customer_returns_policy,+ current_store.customer_shipping_policy+ ].compact.map { |policy| [policy.name.humanize, policy.id] }+ end++ def refresh_theme_preview(section = nil, block = nil)+ reload_params = section.present? ? "{ frame: 'section-#{section.id}' }" : "{ action: 'replace' }"++ editor_id = if block.present?+ "block-#{block.id}"+ elsif section.present?+ "section-#{section.id}"+ end++ turbo_stream.replace :iframe_preview_scripts do+ turbo_frame_tag :iframe_preview_scripts do+ javascript_tag do+ raw <<~JS+ document.getElementById('pageLivePreview').contentWindow.window.Turbo.visit(+ document.getElementById('page-builder').dataset.pageBuilderPreviewUrlValue + '&editor_id=#{editor_id}',+ #{reload_params}+ )+ JS+ end+ end+ end+ end+ end+ end+enddiff --git a/admin/app/helpers/spree/admin/themes_helper.rb b/admin/app/helpers/spree/admin/themes_helper.rbnew file mode 100644index 0000000000..8a7f3034bd--- /dev/null+++ b/admin/app/helpers/spree/admin/themes_helper.rb@@ -0,0 +1,9 @@+module Spree+ module Admin+ module ThemesHelper+ def available_themes+ @available_themes ||= Spree::Theme.available_themes.sort_by(&:name).reject { |theme_class| current_store.themes.any? { |theme| theme.class.to_s == theme_class.to_s } }+ end+ end+ end+enddiff --git a/admin/app/views/layouts/spree/page_builder.html.erb b/admin/app/views/layouts/spree/page_builder.html.erbnew file mode 100644index 0000000000..35a4dd7e21--- /dev/null+++ b/admin/app/views/layouts/spree/page_builder.html.erb@@ -0,0 +1,62 @@+<!DOCTYPE html>+<html lang="<%= I18n.locale %>">+ <head>+ <%= javascript_importmap_tags 'application-spree-backend' %>+ </head>++ <body class="admin bg-light theme_editor page-builder"+ id="page-builder"+ data-controller="spree page-builder"+ data-page-builder-preview-url-value="<%= @page.preview_url(@theme_preview, @page_preview) + '&page_builder=true' %>"+ >+ <%= render 'spree/admin/shared/alerts' %>++ <%= form_for @theme, as: :theme,url: spree.update_with_page_admin_theme_path(@theme), method: :put do |f| %>+ <%= hidden_field_tag :page_id, @page.id %>+ <%= hidden_field_tag :theme_preview_id, @theme_preview.id %>+ <%= hidden_field_tag :page_preview_id, @page_preview.id %>+ <%= render 'spree/admin/page_builder/header' %>+ <% end %>++ <%#-------------------------------------------------%>+ <%# Main content %>+ <%#-------------------------------------------------%>+ <main id="content" style="margin-top: 53px">+ <%#-------------------------------------------------%>+ <%# Sidebar %>+ <%#-------------------------------------------------%>+ <div class="sidebar">+ <%= render 'spree/admin/page_builder/sidebar' %>+ </div>++ <%#-------------------------------------------------%>+ <%# Content %>+ <%#-------------------------------------------------%>+ <main id="main-part" class="flex-grow-1 pt-2">+ <%#-------------------------------------------------%>+ <%# Main content %>+ <%#-------------------------------------------------%>+ <div class="col bg-transparent">+ <div id="liveViewCont" class="desktopLiveView" data-page-builder-target="previewContainer">+ <div class="embed-responsive embed-responsive-4by3 bg-transparent">+ <iframe class="embed-responsive-item border border-gray-300 p-1 bg-white rounded"+ data-page-builder-target="iframe"+ data-action="load->page-builder#initializeVisualEditor"+ id="pageLivePreview"+ sandbox="allow-same-origin allow-forms allow-popups allow-scripts allow-modals">+ </iframe>+ <button class="editor-add-section btn btn-mint shadow" data-action="click->page-builder#addSection">+ <%= icon("add", height: 22, class: "mr-2") %> Add Section+ </button>+ </div>+ </div>+ </div>++ <%= turbo_frame_tag :iframe_preview_scripts %>+ </main>+ </div>++ <%= render 'spree/admin/shared/modal' %>+ <%= render 'spree/admin/shared/alerts' %>+ </body>+</html>diff --git a/admin/app/views/spree/admin/page_blocks/_form_tab_buttons.html.erb b/admin/app/views/spree/admin/page_blocks/_form_tab_buttons.html.erbnew file mode 100644index 0000000000..d88075e2b5--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/_form_tab_buttons.html.erb@@ -0,0 +1,7 @@+<div class="position-fixed border-top px-3 py-2 d-flex bg-light bottom-bar" style="bottom: 0px; left: 0px; width: 344px; z-index: 9999">+ <% if @page_block.can_be_deleted? %>+ <div data-action="click->page-builder#hideSidebarMobile">+ <%= link_to_delete(@page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block)) %>+ </div>+ <% end %>+</div>diff --git a/admin/app/views/spree/admin/page_blocks/create.turbo_stream.erb b/admin/app/views/spree/admin/page_blocks/create.turbo_stream.erbnew file mode 100644index 0000000000..eb0bd8bfe2--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/create.turbo_stream.erb@@ -0,0 +1,4 @@+<%= turbo_stream.append "blocks_#{@page_block.section_id}" do %>+ <%= render 'spree/admin/page_builder/sidebar_block', block: @page_block %>+<% end %>+<%= refresh_theme_preview %>diff --git a/admin/app/views/spree/admin/page_blocks/destroy.turbo_stream.erb b/admin/app/views/spree/admin/page_blocks/destroy.turbo_stream.erbnew file mode 100644index 0000000000..e9719e627c--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/destroy.turbo_stream.erb@@ -0,0 +1,9 @@+<%= turbo_stream.replace :page_sidebar do %>+ <%= render 'spree/admin/page_builder/sidebar_sections' %>+<% end %>++<%= turbo_stream.replace 'page_sidebar_toolbar' do %>+ <%= render 'spree/admin/page_builder/sidebar_sections_toolbar' %>+<% end %>++<%= refresh_theme_preview(@page_block.section) %>diff --git a/admin/app/views/spree/admin/page_blocks/edit.html.erb b/admin/app/views/spree/admin/page_blocks/edit.html.erbnew file mode 100644index 0000000000..1fa3c0012d--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/edit.html.erb@@ -0,0 +1,48 @@+<%= turbo_frame_tag :page_sidebar do %>+ <% tab_selected ||= :content %>+ <h6 class="p-2 bg-light border-bottom sticky-top d-flex align-items-center mb-3">+ <%= link_to spree.edit_admin_theme_path(@theme, page_id: @page&.id), data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray mr-3 text-center back d-flex align-items-center shadow-none px-2' do %>+ <%= icon 'chevron-left.svg', class: 'mr-0' %>+ <% end %>+ <%= @page_block.display_name %>+ </h6>+ <div class="px-3 pb-5 mb-5 edit-block" style="margin-bottom: 6rem;">+ <%= form_for @page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block), data: { controller: 'auto-submit' }, as: :page_block do |f| %>+ <div data-controller="bootstrap-tabs">+ <ul class="nav nav-pills nav-fill mb-3 px-0" id="pills-tab" role="tablist">+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-toggle="pill" data-target="#pills-home" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>" data-action="bootstrap-tabs#change" data-bootstrap-tabs-tab-param="content">Content</button>+ </li>+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-toggle="pill" data-target="#pills-profile" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>" data-action="bootstrap-tabs#change" data-bootstrap-tabs-tab-param="design">Design</button>+ </li>+ </ul>+ <%= hidden_field_tag :tab_selected, tab_selected, data: { bootstrap_tabs_target: "input" } %>+ </div>+ <div class="tab-content" id="pills-tabContent">+ <div class="tab-pane fade <%= tab_selected == :content ? 'show active' : '' %>" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab">+ <%= render "spree/admin/page_blocks/forms/#{@page_block.type.demodulize.underscore}", f: f %>+ <%= render 'spree/admin/page_blocks/form_tab_buttons', tab: :content %>+ </div>+ <div class="tab-pane fade <%= tab_selected == :design ? 'show active' : '' %>" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab">+ <%= render 'spree/admin/page_sections/fields/top_padding', f: f %>+ <%= render 'spree/admin/page_sections/fields/bottom_padding', f: f %>+ <% if @page_block.respond_to?(:text_color) %>+ <%= render 'spree/admin/page_sections/fields/text_color', f: f %>+ <% end %>+ <% if @page_block.respond_to?(:background_color) %>+ <%= render 'spree/admin/page_sections/fields/background_color', f: f %>+ <% end %>+ <%= render 'spree/admin/page_sections/fields/button', f: f %>+ <%= yield(:design_tab) %>++ <div class="position-fixed border-top bg-light bottom-bar" style="bottom: 0px; width:344px; z-index: 9999">+ <div class="px-3 py-2" data-action="click->page-builder#hideSidebarMobile">+ <%= link_to_delete(@page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block)) %>+ </div>+ </div>+ </div>+ </div>+ <% end %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_brand.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_brand.html.erbnew file mode 100644index 0000000000..49a4375bf8--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_brand.html.erb@@ -0,0 +1,15 @@+<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_text_alignment, Spree.t(:text_alignment) %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <div class="form-group">+ <%= f.label :preferred_container_alignment, Spree.t(:container_alignment) %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%', _label: 'Max text width on desktop'+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_brand_logo.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_brand_logo.html.erbnew file mode 100644index 0000000000..af9bf14429--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_brand_logo.html.erb@@ -0,0 +1,4 @@+<div class="form-group">+ <%= f.label :brand %>+ <%= tom_select_tag 'page_block[brand_id]', active_option: @page_block.brand_id, class: 'w-100', url: spree.admin_brands_select_options_path(format: :json), select_data: {action: 'auto-submit#submit'} %>+</div>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_buttons.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_buttons.html.erbnew file mode 100644index 0000000000..68d22ba30e--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_buttons.html.erb@@ -0,0 +1,13 @@+<%= render 'spree/admin/page_blocks/forms/link', f: f %>++<div class="form-group">+ <%= f.label :preferred_button_style_1 %>+ <%= f.select :preferred_button_style_1, options_for_select(['primary', 'secondary'], @page_block.preferred_button_style_1), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+</div>++<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label "Buttons alignment" %>+ <%= f.select :preferred_buttons_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_buttons_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_buy_buttons.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_buy_buttons.html.erbnew file mode 100644index 0000000000..1ea9c23b97--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_buy_buttons.html.erb@@ -0,0 +1,10 @@+<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_container_alignment %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%', _label: 'Max text width on desktop'+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_heading.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_heading.html.erbnew file mode 100644index 0000000000..29a280e3fc--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_heading.html.erb@@ -0,0 +1,28 @@+<div class="trix-container">+ <%= f.rich_text_area :text, data: {+ action: 'trix-change->auto-submit#submit'+ }, class: 'mb-3' %>+</div>++<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_size %>+ <%= f.select :preferred_size, options_for_select(['small', 'medium', 'large'], @page_block.preferred_size), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <% unless @page_block.section.is_a? Spree::PageSections::Video %>+ <div class="form-group">+ <%= f.label :preferred_text_alignment %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <div class="form-group">+ <%= f.label :preferred_container_alignment %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>+ <% end %>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%', _label: 'Max heading width on desktop'+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_image.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_image.html.erbnew file mode 100644index 0000000000..b6b4d41346--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_image.html.erb@@ -0,0 +1 @@+<%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 512, height: 512, auto_submit: true %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_link.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_link.html.erbnew file mode 100644index 0000000000..3423670700--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_link.html.erb@@ -0,0 +1,19 @@+<%= f.fields_for :link do |lf| %>+ <div class="form-group">+ <%= lf.label :linkable_type, 'Link' %>+ <%= lf.select :linkable_type, @page_block.allowed_linkable_types, { include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>+ <div id="linkable_type_dropdown">+ <%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: lf.object, form_name: 'page_block[link_attributes]' %>+ </div>+ </div>++ <div class="form-group">+ <%= lf.label :label %>+ <%= lf.text_field :label, class: 'form-control', data: { action: 'blur->auto-submit#submit' }, placeholder: 'eg. About us', required: true %>+ </div>++ <div class="custom-control custom-checkbox mb-5">+ <%= lf.check_box :open_in_new_tab, class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>+ <%= lf.label :open_in_new_tab, class: 'custom-control-label' %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_mega_nav.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_mega_nav.html.erbnew file mode 100644index 0000000000..21e64e7d67--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_mega_nav.html.erb@@ -0,0 +1,14 @@+<h5 class="font-weight-bold"><%= Spree.t(:title_link) %></h5>+<%= render 'spree/admin/page_blocks/forms/link', f: f %>++<%= render 'spree/admin/page_links/list', parent: @page_block, show_add_link_button: true %>++<h5 class="font-weight-bold"><%= Spree.t(:featured_taxon) %></h5>+<div class="form-group">+ <%= tom_select_tag 'page_block[preferred_featured_taxon_id]',+ active_option: @page_block.preferred_featured_taxon_id,+ class: 'w-100',+ url: spree.admin_taxons_select_options_path(format: :json),+ select_data: { action: 'auto-submit#submit' },+ include_blank: "" %>+</div>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_mega_nav_with_subcategories.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_mega_nav_with_subcategories.html.erbnew file mode 100644index 0000000000..f4e36cd599--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_mega_nav_with_subcategories.html.erb@@ -0,0 +1,9 @@+<h5 class="font-weight-bold"><%= Spree.t(:category) %></h5>+<div class="form-group">+ <%= tom_select_tag 'page_block[preferred_taxon_id]', active_option: @page_block.preferred_taxon_id, class: 'w-100', url: spree.admin_taxons_select_options_path(format: :json), select_data: { action: 'auto-submit#submit' } %>+</div>++<h5 class="font-weight-bold"><%= Spree.t(:featured_taxon) %></h5>+<div class="form-group">+ <%= tom_select_tag 'page_block[preferred_featured_taxon_id]', active_option: @page_block.preferred_featured_taxon_id, class: 'w-100', url: spree.admin_taxons_select_options_path(format: :json), select_data: { action: 'auto-submit#submit' } %>+</div>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_nav.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_nav.html.erbnew file mode 100644index 0000000000..578c7f5870--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_nav.html.erb@@ -0,0 +1,6 @@+<div class="form-group">+ <%= f.label :preferred_label %>+ <%= f.text_field :preferred_label, data: { action: 'auto-submit#submit' }, class: 'form-control' %>+</div>++<%= render 'spree/admin/page_links/list', parent: @page_block, show_add_link_button: true %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_newsletter_form.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_newsletter_form.html.erbnew file mode 100644index 0000000000..47184d2519--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_newsletter_form.html.erb@@ -0,0 +1,20 @@+<div class="form-group">+ <%= f.label :preferred_button_text %>+ <%= f.text_field :preferred_button_text, data: { action: 'auto-submit#submit' }, class: 'form-control' %>+</div>++<div class="form-group">+ <%= f.label :preferred_placeholder %>+ <%= f.text_field :preferred_placeholder, data: { action: 'auto-submit#submit' }, class: 'form-control' %>+</div>++<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_justify %>+ <%= f.select :preferred_justify, options_for_select(['start', 'center', 'end'], @page_block.preferred_justify), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>+ <div class="form-group">+ <%= f.label :preferred_button_style %>+ <%= f.select :preferred_button_style, options_for_select(['primary', 'secondary'], @page_block.preferred_button_style), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_price.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_price.html.erbnew file mode 100644index 0000000000..d7ed2391f4--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_price.html.erb@@ -0,0 +1,15 @@+<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_text_alignment %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <div class="form-group">+ <%= f.label :preferred_container_alignment %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%', _label: 'Max text width on desktop'+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_quantity_selector.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_quantity_selector.html.erbnew file mode 100644index 0000000000..1ea9c23b97--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_quantity_selector.html.erb@@ -0,0 +1,10 @@+<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_container_alignment %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%', _label: 'Max text width on desktop'+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_share.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_share.html.erbnew file mode 100644index 0000000000..5605ba6c94--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_share.html.erb@@ -0,0 +1,5 @@+<div class="trix-container">+ <%= f.rich_text_area :text, data: {+ action: 'trix-change->auto-submit#submit'+ }, class: 'mb-3' %>+</div>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_subheading.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_subheading.html.erbnew file mode 100644index 0000000000..43df776556--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_subheading.html.erb@@ -0,0 +1,26 @@+<div class="trix-container">+ <%= f.rich_text_area :text, data: {+ action: 'trix-change->auto-submit#submit'+ }, class: 'mb-3' %>+</div>++<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_size %>+ <%= f.select :preferred_size, options_for_select(['small', 'medium', 'large'], @page_block.preferred_size), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <div class="form-group">+ <%= f.label :preferred_text_alignment %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <div class="form-group">+ <%= f.label :preferred_container_alignment %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%', _label: 'Max subheading width on desktop'+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_text.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_text.html.erbnew file mode 100644index 0000000000..dcc5621811--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_text.html.erb@@ -0,0 +1,21 @@+<div class="trix-container">+ <%= f.rich_text_area :text, data: {+ action: 'trix-change->auto-submit#submit'+ }, class: 'mb-3' %>+</div>++<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_text_alignment %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <div class="form-group">+ <%= f.label :preferred_container_alignment %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%', _label: 'Max text width on desktop'+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_title.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_title.html.erbnew file mode 100644index 0000000000..2d7f57e807--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_title.html.erb@@ -0,0 +1,20 @@+<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_size %>+ <%= f.select :preferred_size, options_for_select(['small', 'medium', 'large'], @page_block.preferred_size), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <div class="form-group">+ <%= f.label :preferred_text_alignment %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <div class="form-group">+ <%= f.label :preferred_container_alignment %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%',_label: 'Max heading width on desktop'+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_variant_picker.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_variant_picker.html.erbnew file mode 100644index 0000000000..1ea9c23b97--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/forms/_variant_picker.html.erb@@ -0,0 +1,10 @@+<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_container_alignment %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%', _label: 'Max text width on desktop'+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_blocks/move_higher.turbo_stream.erb b/admin/app/views/spree/admin/page_blocks/move_higher.turbo_stream.erbnew file mode 100644index 0000000000..3b6935d39b--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/move_higher.turbo_stream.erb@@ -0,0 +1,4 @@+<%= turbo_stream.replace dom_id(@page_block.section) do %>+ <%= render 'spree/admin/page_builder/sidebar_section', section: @page_block.section %>+<% end %>+<%= refresh_theme_preview %>diff --git a/admin/app/views/spree/admin/page_blocks/move_lower.turbo_stream.erb b/admin/app/views/spree/admin/page_blocks/move_lower.turbo_stream.erbnew file mode 100644index 0000000000..3b6935d39b--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/move_lower.turbo_stream.erb@@ -0,0 +1,4 @@+<%= turbo_stream.replace dom_id(@page_block.section) do %>+ <%= render 'spree/admin/page_builder/sidebar_section', section: @page_block.section %>+<% end %>+<%= refresh_theme_preview %>diff --git a/admin/app/views/spree/admin/page_blocks/show.html.erb b/admin/app/views/spree/admin/page_blocks/show.html.erbnew file mode 100644index 0000000000..362813ec9c--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/show.html.erb@@ -0,0 +1 @@+<%= render 'spree/admin/page_builder/sidebar_block', block: @page_block %>diff --git a/admin/app/views/spree/admin/page_blocks/update.turbo_stream.erb b/admin/app/views/spree/admin/page_blocks/update.turbo_stream.erbnew file mode 100644index 0000000000..f073f656a9--- /dev/null+++ b/admin/app/views/spree/admin/page_blocks/update.turbo_stream.erb@@ -0,0 +1,6 @@+<%= refresh_theme_preview(@page_block.section, @page_block) %>+<% if @page_block.respond_to?(:link) %>+ <%= turbo_stream.update :linkable_type_dropdown do %>+ <%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: @page_block.link, form_name: 'page_block[link_attributes]' %>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/page_builder/_add_block.html.erb b/admin/app/views/spree/admin/page_builder/_add_block.html.erbnew file mode 100644index 0000000000..6ad72bd2ec--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_add_block.html.erb@@ -0,0 +1,20 @@+<%= form_for section.blocks.new, url: spree.admin_page_section_blocks_path(section), html: { class: 'list-group-item sidebar-page-block px-0 py-0 border-0 rounded'}, data: { controller: 'block-form', block_form_target: :form } do |f| %>+ <%= f.hidden_field :type, data: { block_form_target: 'type' } %>++ <button class="btn btn-sm btn-link d-flex-inline" data-toggle="dropdown">+ <%= icon("circle-plus") %>+ Add block+ </button>+ <div class="dropdown-menu p-1">+ <% section.available_blocks_to_add.each do |block_class| %>+ <a href="#" class="dropdown-item btn-sm"+ data-action="click->block-form#addBlock"+ data-block-form-type-param="<%= block_class %>"+ >+ <% block_instance = block_class.new %>+ <%= icon block_instance.icon_name, height: 18, class: 'mr-2' if block_class.new.icon_name.present? %>+ <%= block_instance.display_name.presence || block_class.to_s.demodulize.titleize %>+ </a>+ <% end %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_builder/_color_palette.html.erb b/admin/app/views/spree/admin/page_builder/_color_palette.html.erbnew file mode 100644index 0000000000..3e24ad2377--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_color_palette.html.erb@@ -0,0 +1,17 @@+<% active ||= false %>+<div+ data-action="click->color-palette#selectPalette"+ data-color-palette-primary-color-param="<%= primary_color %>"+ data-color-palette-text-color-param="<%= text_color %>"+ data-color-palette-button-text-color-param="<%= button_text_color %>"+ data-color-palette-border-color-param="<%= border_color %>"+ data-color-palette-background-color-param="<%= background_color %>"+ class="mb-3 d-block w-100 rounded overflow-hidden border cursor-pointer <% if active %>border-2 border-primary<% end %>" style="height: 40px">+ <div class="row mx-0 h-100">+ <div class="col" style="background-color: <%= primary_color %>"></div>+ <div class="col" style="background-color: <%= text_color %>"></div>+ <div class="col" style="background-color: <%= button_text_color %>"></div>+ <div class="col" style="background-color: <%= border_color %>"></div>+ <div class="col" style="background-color: <%= background_color %>"></div>+ </div>+</div>diff --git a/admin/app/views/spree/admin/page_builder/_color_picker.html.erb b/admin/app/views/spree/admin/page_builder/_color_picker.html.erbnew file mode 100644index 0000000000..edfd4ccc8d--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_color_picker.html.erb@@ -0,0 +1,20 @@+<div data-controller="color-picker" class="mb-4 form-group" data-color-picker-clear-value="<%= defined?(clear) ? clear : false %>">+ <div class="d-flex align-items-center">+ <%= f.hidden_field field, class: 'form-control mr-2', data: {+ 'color-picker-target': 'input',+ 'color-palette-target': field.to_s.camelize(:lower),+ action: action,+ }, value: value %>+ <div>+ <label class="mb-0"><%= label %></label>+ <br />+ <span data-color-picker-target="value" class="text-muted">+ <%= value&.upcase || "Not set" %>+ </span>+ </div>+ <div class="ml-auto d-flex align-items-center" style="width:40px">+ <div data-color-picker-target="picker" class="border d-inline-block rounded-circle <% unless value.present? %>checkered-background<% end %>" style="height: 40px;width: 40px; background-color: <%= value %>;">+ </div>+ </div>+ </div>+</div>diff --git a/admin/app/views/spree/admin/page_builder/_header.html.erb b/admin/app/views/spree/admin/page_builder/_header.html.erbnew file mode 100644index 0000000000..506110e7a0--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_header.html.erb@@ -0,0 +1,101 @@+<header id="page-builder-header" class="fixed-top p-0 bg-light border-bottom" style="z-index: 1031">+ <nav class="navbar navbar-expand-lg w-100 p-0">+ <%= link_to spree.admin_themes_path, class: 'btn hover-gray rounded-0 border-left-0 border-top-0 border-bottom-0 d-none d-lg-flex px-3 border-right', title: 'Go back to dashboard' do %>+ <%= icon('x', class: 'mr-0 text-muted font-size-lg') %>+ <% end %>+ <div class="px-3">+ <span class="text-muted mr-1">Theme:</span>+ <strong class="mr-1"><%= @theme.name %></strong>+ + <% if @theme.default? %>+ <span class="badge badge-success">+ <%= icon('check') %>+ Live+ </span>+ <% else %>+ <span class="badge badge-warning">Draft</span>+ <% end %>+ </div>+ <%= render 'spree/admin/page_builder/pages_dropdown' %>++ <ul class="nav nav-pills p-0 m-0" role="tablist">+ <% if @page.custom? %>+ <li class="nav-item h-100 border-right" role="presentation" data-toggle="modal" data-target="#modal">+ <%= link_to_with_icon 'settings', Spree.t(:page_settings), spree.edit_admin_page_path(@page.id), class: 'h-100 btn hover-gray with-tip rounded-0 border-0 shadow-none px-3', data: { turbo_frame: 'dialog_modal' } %>+ </li>+ <% else %>+ <li class="nav-item h-100 border-right" role="presentation">+ <button class="h-100 btn hover-gray active with-tip rounded-0 border-0 shadow-none px-3"+ title="Page sections"+ data-toggle="tab"+ data-target="#sections"+ type="button"+ role="tab"+ aria-controls="sections"+ aria-selected="true"+ data-trigger="hover"+ id="sidebar-icon-page">+ <%= icon 'section', class: 'mr-0' %>+ </button>+ </li>+ <li class="nav-item h-100 border-right" role="presentation">+ <button class="h-100 btn hover-gray with-tip rounded-0 border-0 shadow-none px-3"+ title="Theme"+ data-toggle="tab"+ data-target="#colors"+ type="button"+ role="tab"+ aria-controls="theme"+ aria-selected="false"+ data-trigger="hover"+ id="sidebar-icon-colors">+ <%= icon 'palette', class: 'mr-0' %>+ </button>+ </li>+ <li class="nav-item h-100 border-right" role="presentation">+ <button class="h-100 btn hover-gray with-tip rounded-0 border-0 shadow-none px-3"+ title="Fonts"+ type="button"+ data-toggle="tab"+ data-target="#fonts"+ type="button"+ role="tab"+ aria-controls="fonts"+ aria-selected="false"+ data-trigger="hover"+ id="sidebar-icon-fonts">+ <%= icon 'typography', class: 'mr-0' %>+ </button>+ </li>+ <% end %>+ </ul>+ <button class="btn with-tip ml-auto border-left px-3 text-black" type="button"+ title="Mobile"+ data-trigger="hover"+ data-action="click->page-builder#setResponsiveBreakpoint"+ data-page-builder-target="mobileButton"+ data-page-builder-breakpoint-param="mobile">+ <%= icon 'device-mobile', class: 'mr-0' %>+ </button>+ <button class="btn active with-tip border-right px-3 text-black" type="button" title="Desktop"+ data-action="click->page-builder#setResponsiveBreakpoint"+ data-page-builder-breakpoint-param="desktop"+ data-trigger="hover"+ data-page-builder-target="desktopButton">+ <%= icon 'device-laptop', class: 'mr-0' %>+ </button>++ <%= link_to_with_icon 'eye.svg', Spree.t(:preview), @page.preview_url(@theme_preview, @page_preview), class: 'btn hover-gray d-none d-lg-flex align-items-center border-left', target: '_blank' %>++ <%= button_tag class: 'btn btn-primary px-3 d-flex justify-content-center shadow-none' do %>+ <span class="show-when-enabled">+ <%= @theme.default? ? Spree.t('actions.publish') : Spree.t('actions.save') %>+ </span>+ <span class="show-when-disabled">+ <div class="spinner-border" role="status" style="width: 18px; height: 18px">+ <span class="sr-only"><%= Spree.t(:loading) %>...</span>+ </div>+ </span>+ <% end %>+ </nav>+</header>diff --git a/admin/app/views/spree/admin/page_builder/_labeled_range_input.html.erb b/admin/app/views/spree/admin/page_builder/_labeled_range_input.html.erbnew file mode 100644index 0000000000..1b650e8047--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_labeled_range_input.html.erb@@ -0,0 +1,10 @@+<div class="mb-4 form-group">+ <div data-controller="better-slider">+ <label><%= _label %>: <span data-better-slider-target="currentValueLabel"></span><%= unit %></label>+ <div class="flex flex-row w-full">+ <span class="mr-2"><%= min %><%= unit %></span>+ <%= f.range_field field, class: "custom-range", min: min, max: max, step: 1, data: {'better-slider-target': 'rangeInput', action: 'change->auto-submit#submit'} %>+ <span class="ml-2"><%= max %><%= unit %></span>+ </div>+ </div>+</div>diff --git a/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb b/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erbnew file mode 100644index 0000000000..68533de5ce--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb@@ -0,0 +1,23 @@+<% if @page.custom? %>+ <div class="d-flex justify-content-center h-100 align-items-center px-3">+ <p class="mb-0 font-weight-bold"><%= truncate(@page.display_name, length: 150) %></p>+ </div>+<% else %>+ <div class="dropdown h-100" id="pages_dropdown">+ <button class="btn hover-gray border-bottom-0 border-top-0 rounded-0 border-left border-right d-flex align-items-center justify-content-between h-100" type="button" data-toggle="dropdown" aria-expanded="false">+ <span class="d-flex align-items-center pr-5">+ <%= icon @page.icon_name, class: 'mr-2' %>+ <%= @page.display_name %>+ </span>+ <%= icon 'selector', class: 'mr-0 ml-2 mb-0 text-muted' %>+ </button>+ <div class="dropdown-menu" style="min-width: 300px">+ <% @theme.pages.standard.order(name: :asc).find_all(&:customizable?).each do |page| %>+ <%= active_link_to spree.edit_admin_theme_path(@theme, theme_preview_id: @theme_preview.id, page_id: page.id), class: 'dropdown-item', active: @page == page do %>+ <%= icon page.icon_name, class: 'mr-2' %>+ <%= page.display_name %>+ <% end %>+ <% end %>+ </div>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_builder/_range_input.html.erb b/admin/app/views/spree/admin/page_builder/_range_input.html.erbnew file mode 100644index 0000000000..a1fcfcdeac--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_range_input.html.erb@@ -0,0 +1,12 @@+<% label ||= nil %>+<% label_for_min_value ||= nil %>+<% action ||= 'change->auto-submit#submit' %>+<div class="mb-4 form-group">+ <div data-controller="better-slider" data-better-slider-label-for-min-value="<%= label_for_min_value %>" data-better-slider-unit-value="<%= unit %>">+ <label><%= label.presence || field.to_s.humanize %></label>+ <div class="flex flex-row w-full">+ <%= f.range_field field, class: "custom-range", min: min, max: max, step: 1, data: {'better-slider-target': 'rangeInput', action: action} %>+ </div>+ <span data-better-slider-target="currentValueLabel"></span>+ </div>+</div>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar.html.erbnew file mode 100644index 0000000000..6e550bc24c--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_sidebar.html.erb@@ -0,0 +1,14 @@+<aside id="page-builder-sidebar" class="border-right fixed-top h-100 overflow-auto pb-5 right-sidebar">+ <div class="tab-content mb5">+ <div class="tab-pane fade show active" id="sections" role="tabpanel" aria-labelledby="sidebar-icon-page">+ <%= render 'spree/admin/page_builder/sidebar_sections' %>+ <%= render 'spree/admin/page_builder/sidebar_sections_toolbar' %>+ </div>+ <div class="tab-pane fade" role="tabpanel" aria-labelledby="sidebar-icon-colors" id="colors">+ <%= render 'spree/admin/page_builder/sidebar_colors' %>+ </div>+ <div class="tab-pane fade" role="tabpanel" aria-labelledby="sidebar-icon-fonts" id="fonts">+ <%= render 'spree/admin/page_builder/sidebar_fonts' %>+ </div>+ </div>+</aside>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_block.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_block.html.erbnew file mode 100644index 0000000000..c93787379a--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_sidebar_block.html.erb@@ -0,0 +1,29 @@+<% if block.persisted? %>+ <%= turbo_frame_tag dom_id(block), class: 'list-group-item sidebar-page-block px-0 py-0 border-0 rounded',+ data: {+ action: 'mouseover->page-builder#toggleHighlightElement mouseout->page-builder#toggleHighlightElement',+ page_builder_editor_id_param: "block-#{block.id}",+ sortable_update_url: spree.admin_page_section_block_path(block.section, block, format: :turbo_stream)+ } do %>+ <div class="d-flex align-items-center justify-content-between sidebar-block-title p-1 rounded-sm">+ <div class="d-flex align-items-center flex-fill">+ <%= icon "#{block.icon_name}", class: 'mr-2' if block.icon_name.present? %>+ <%= link_to block.display_name, edit_admin_page_section_block_path(block.section, block),+ class: 'block-edit-link flex-fill text-dark',+ data: {+ turbo_frame: :page_sidebar,+ action: 'click->page-builder#makeOverlayActive',+ page_builder_editor_id_param: "block-#{block.id}"+ }+ %>+ </div>+ <div class="d-flex align-items-center d-none">+ <% if block.section.can_sort_blocks? %>+ <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1 handle-block">+ <%= icon('grip-vertical', class: 'mr-0') %>+ </button>+ <% end %>+ </div>+ </div>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_colors.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_colors.html.erbnew file mode 100644index 0000000000..caf965485e--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_sidebar_colors.html.erb@@ -0,0 +1,90 @@+<div id="sidebar-colors">+ <h6 class="p-3 border-bottom sticky-top d-flex align-items-center text-uppercase bg-light">+ <span+ class='btn btn-sm btn-light shadow-none reounded-sm mr-3 text-center bg-transparent d-md-none back'+ data-action="click->page-builder#hideSidebarMobile"+ >+ <%= icon 'chevron-left.svg', class: 'mr-0' %>+ </span>+ Theme+ </h6>++ <%= form_for @theme_preview, as: :theme, url: spree.admin_theme_path(@theme_preview), method: :put, data: { 'page-builder-target': 'form' } do |f| %>+ <ul class="nav nav-pills nav-fill mb-3 mx-3 mt-3 px-0" id="pills-tab" role="tablist">+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100 active" id="pills-home-tab" data-toggle="pill" data-target="#pills-home" type="button" role="tab" aria-controls="pills-home" aria-selected="true">Color scheme</button>+ </li>+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100" id="pills-profile-tab" data-toggle="pill" data-target="#pills-profile" type="button" role="tab" aria-controls="pills-profile" aria-selected="false">Elements</button>+ </li>+ </ul>+ <div class="tab-content" id="pills-tabContent">+ <div class="tab-pane fade show active" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab">+ <div class="px-3 py-2" data-controller="color-palette">+ <% color_palettes.each do |color_palette| %>+ <%#= render 'spree/admin/page_builder/color_palette',+ active: color_palette_active?(color_palette),+ primary_color: color_palette[:primary_color],+ text_color: color_palette[:text_color],+ border_color: color_palette[:border_color],+ button_background_color: color_palette[:button_background_color],+ button_text_color: color_palette[:button_text_color],+ background_color: color_palette[:background_color]+ %>+ <% end %>++ <%# <hr class="my-4 bg-light" /> %>++ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_primary_color, label: Spree.t("theme_settings.brand_color"),+ value: @theme_preview.preferred_primary_color, action: 'change->page-builder#refreshPreview' %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_text_color, label: Spree.t("theme_settings.text_color"),+ value: @theme_preview.preferred_text_color, action: 'change->page-builder#refreshPreview' %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_button_text_color, label: Spree.t("theme_settings.button_text_color"),+ value: @theme_preview.preferred_button_text_color, action: 'change->page-builder#refreshPreview' %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_input_text_color, label: Spree.t("theme_settings.input_text_color"),+ value: @theme_preview.preferred_input_text_color, action: 'change->page-builder#refreshPreview' %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_border_color, label: Spree.t("theme_settings.border_color"),+ value: @theme_preview.preferred_border_color, action: 'change->page-builder#refreshPreview' %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_button_border_color, label: Spree.t("theme_settings.button_border_color"),+ value: @theme_preview.preferred_button_border_color, action: 'change->page-builder#refreshPreview', clear: true %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_background_color, label: Spree.t("theme_settings.background_color"),+ value: @theme_preview.preferred_background_color, action: 'change->page-builder#refreshPreview' %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_accent_color, label: Spree.t("theme_settings.accent_color"),+ value: @theme_preview.preferred_accent_color, action: 'change->page-builder#refreshPreview' %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_danger_color, label: Spree.t("theme_settings.danger_color"),+ value: @theme_preview.preferred_danger_color, action: 'change->page-builder#refreshPreview' %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_neutral_color, label: Spree.t("theme_settings.neutral_color"),+ value: @theme_preview.preferred_neutral_color, action: 'change->page-builder#refreshPreview' %>+ <%= render 'spree/admin/page_builder/color_picker', f: f,+ field: :preferred_success_color, label: Spree.t("theme_settings.success_color"),+ value: @theme_preview.preferred_success_color, action: 'change->page-builder#refreshPreview' %>+ </div>+ </div>+ <div class="tab-pane fade" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab">+ <div class="px-3 py-2">+ <%= render 'spree/admin/page_builder/range_input',+ f: f, field: :preferred_button_border_radius, min: 0, max: 100, unit: 'px', action: 'change->page-builder#refreshPreview'+ %>+ <%= render 'spree/admin/page_builder/range_input',+ f: f, field: :preferred_button_border_thickness, min: 0, max: 10, unit: 'px', action: 'change->page-builder#refreshPreview'+ %>+ <hr>++ <%= render 'spree/admin/page_builder/range_input',+ f: f, field: :preferred_input_border_radius, min: 0, max: 100, unit: 'px', action: 'change->page-builder#refreshPreview'+ %>+ </div>+ </div>+ </div>+ <% end %>+</div>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_fonts.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_fonts.html.erbnew file mode 100644index 0000000000..cb305b7139--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_sidebar_fonts.html.erb@@ -0,0 +1,91 @@+<h6 class="p-3 border-bottom sticky-top d-flex align-items-center text-uppercase bg-light">+ <span+ class='btn btn-sm btn-light shadow-none reounded-sm mr-3 text-center bg-transparent d-md-none back'+ data-action="click->page-builder#hideSidebarMobile"+ >+ <%= icon 'chevron-left.svg', class: 'mr-0' %>+ </span>+ <%= Spree.t(:fonts) %>+</h6>++<%= form_for @theme_preview, as: :theme, url: spree.admin_theme_path(@theme_preview), method: :put, data: { 'page-builder-target': 'fontForm' } do |f| %>+ <ul class="nav nav-pills nav-fill mb-3 mx-3 mt-3 px-0" id="pills-tab" role="tablist">+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100 active" id="pills-standard" data-toggle="pill" data-target="#pills-standard-tab" type="button" role="tab" aria-controls="pills-standard" aria-selected="true">+ Standard+ </button>+ </li>+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100" id="pills-custom" data-toggle="pill" data-target="#pills-custom-tab" type="button" role="tab" aria-controls="pills-custom" aria-selected="false">+ Custom+ </button>+ </li>+ </ul>+ <div class="tab-content" id="pills-tabContent">+ <div class="tab-pane fade show active" id="pills-standard-tab" role="tabpanel" aria-labelledby="pills-standard">+ <div class="px-3 py-2">+ <div class="mb-3 form-group">+ <%= f.label :preferred_font_family, Spree.t(:font_family) %>+ <%= f.select :preferred_font_family, options_for_select(all_fonts_options, f.object.preferred_font_family), { include_blank: true }, class: 'd-none', data: { action: 'change->page-builder#refreshFontPreview', controller: 'font-picker', font_picker_fonts_from_google_value: google_fonts_list.to_json } %>+ </div>+ <div class="mb-3 form-group" data-controller="range-input">+ <%= f.label :preferred_font_size_scale, Spree.t(:font_size_scale) %>+ <%= f.range_field :preferred_font_size_scale, class: 'custom-range', min: 100, max: 150, step: 5, data: {+ 'range-input-target': 'input',+ 'action': 'change->range-input#updatePreview change->page-builder#refreshFontPreview'+ } %>+ <span data-range-input-target="preview">+ <%= f.object.preferred_font_size_scale %>+ </span>%+ </div>+ <hr />+ <div class="mb-3 form-group">+ <%= f.label :preferred_header_font_family, Spree.t(:header_font_family) %>+ <%= f.select :preferred_header_font_family, options_for_select(all_fonts_options, f.object.preferred_header_font_family), { include_blank: true }, class: 'd-none', data: { action: 'change->page-builder#refreshFontPreview', controller: 'font-picker', font_picker_fonts_from_google_value: google_fonts_list.to_json } %>+ </div>+ <div class="mb-3 form-group" data-controller="range-input">+ <%= f.label :preferred_header_font_size_scale, Spree.t(:header_font_size_scale) %>+ <%= f.range_field :preferred_header_font_size_scale, class: 'custom-range', min: 100, max: 150, step: 5, data: {+ 'range-input-target': 'input',+ 'action': 'change->range-input#updatePreview change->page-builder#refreshFontPreview'+ } %>+ <span data-range-input-target="preview">+ <%= f.object.preferred_header_font_size_scale %>+ </span>%+ </div>+ <div class="mb-3 custom-control custom-checkbox">+ <%= f.check_box :preferred_headings_uppercase, class: "custom-control-input", data: { action: 'change->page-builder#refreshFontPreview' } %>+ <%= f.label :preferred_headings_uppercase, "Make all headings uppercase", class: "custom-control-label" %>+ </div>+ </div>+ </div>+ <div class="tab-pane fade" id="pills-custom-tab" role="tabpanel" aria-labelledby="pills-custom">+ <div class="px-3 py-2">+ <div class="mb-3 form-group">+ <div class="alert alert-warning">+ Using custom fonts can slow down your store.+ </div>+ <%= f.label :preferred_custom_font_code, Spree.t(:custom_font_code) %>+ <%= f.text_area :preferred_custom_font_code, class: 'form-control', style: 'min-height: 6em', data: { controller: 'textarea-autogrow'} %>+ </div>+ <%= f.submit Spree.t('actions.update'), class: 'btn btn-primary' %>++ <hr class="my-4" />++ <h6>Example how to add custom fonts</h6>+ <textarea class="bg-gray-100 rounded w-100 border-0 p-2 text-muted" style="height: 250px"><link rel="stylesheet" href="https://url.to.your.font.com/font.js" />+<style>+ /* set font for body */+ body {+ font-family: "your font name", sans-serif;+ }+ /* set font for headings */+ h1, h2, h3, h4, h5, h6 {+ font-family: "your font name", sans-serif;+ }+</style>+ </textarea>+ </div>+ </div>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erbnew file mode 100644index 0000000000..e820522f58--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erb@@ -0,0 +1,42 @@+<% if section.persisted? %>+ <%= turbo_frame_tag dom_id(section), class: 'list-group-item py-0 border-0 sidebar-page-section draggable rounded-sm',+ data: { sortable_update_url: spree.admin_page_section_path(section, format: :turbo_stream) } do %>+ <div class="d-flex align-items-center justify-content-between sidebar-section-title py-1 rounded"+ data-action="mouseover->page-builder#toggleHighlightElement mouseout->page-builder#toggleHighlightElement"+ data-page-builder-editor-id-param="section-<%= section.id %>">+ <div class="d-flex align-items-center flex-fill py-1 px-2">+ <%= icon("#{section.icon_name}", height: 18, class: 'mr-2') if section.icon_name.present? %>+ <%= link_to section.display_name, spree.edit_admin_page_section_path(section),+ class: 'section-edit-link flex-fill font-weight-bold text-dark',+ data: {+ turbo_frame: :page_sidebar,+ action: 'click->page-builder#makeOverlayActive',+ page_builder_editor_id_param: "section-#{section.id}"+ }+ %>+ </div>+ <div class="d-flex align-items-center d-none">+ <% if section.can_be_sorted? %>+ <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1 handle-section">+ <%= icon('grip-vertical', class: 'mr-0') %>+ </button>+ <% end %>+ </div>+ </div>+ <% if section.blocks_available? %>+ <div class="d-flex flex-column ml-1 mb-2">+ <%= turbo_frame_tag [:blocks, section.id].join('_'), class: 'list-group-flush collapse show' do %>+ <div data-controller="sortable"+ data-sortable-handle-value=".handle-block"+ data-sortable-resource-name-value="page_block"+ data-sortable-response-kind-value="turbo-stream">+ <%= render partial: 'spree/admin/page_builder/sidebar_block', collection: section.blocks.includes(:rich_text_text), as: :block %>+ </div>+ <% end %>+ <% if section.available_blocks_to_add.any? %>+ <%= render 'spree/admin/page_builder/add_block', section: section %>+ <% end %>+ </div>+ <% end %>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_sections.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_sections.html.erbnew file mode 100644index 0000000000..69d2054bf8--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_sidebar_sections.html.erb@@ -0,0 +1,33 @@+<%= turbo_frame_tag :page_sidebar do %>+<div class="d-none d-md-block">+ <h6 class="p-3 bg-light border-bottom sticky-top border-bottom text-uppercase text-muted">Page sections</h6>+ <% if @page_preview.layout_sections? %>+ <div class="list-group-flush border-bottom mb-1 pb-2">+ <%= render collection: @theme_preview.sections.find_all { |s| s.role == 'header' }, partial: 'spree/admin/page_builder/sidebar_section', as: :section %>+ </div>+ <% end %>+ <div id="page-sections-list" class="list-group-flush py-2">+ <div data-controller="sortable"+ data-sortable-handle-value=".handle-section"+ data-sortable-resource-name-value="page_section"+ data-sortable-response-kind-value="turbo-stream">+ <%= render partial: 'spree/admin/page_builder/sidebar_section',+ collection: @page_preview.sections.includes(:blocks),+ as: :section %>+ </div>+ </div>+ <div class="px-3">+ <%= link_to_with_icon 'new-section', Spree.t(:add_section), spree.new_admin_page_section_path(@page_preview), class: 'btn btn-primary rounded-pill text-uppercase w-100 my-2 py-2' %>+ </div>+ <% if @page_preview.layout_sections? %>+ <div class="list-group-flush border-top py-2">+ <%= render collection: @theme_preview.sections.find_all { |s| s.role == 'footer' }, partial: 'spree/admin/page_builder/sidebar_section', as: :section %>+ </div>+ <% end %>+</div>+<div class="d-flex justify-content-center pt-5 d-md-none align-items-center">+ <div class="spinner-border" role="status">+ </div>+ <p class="ml-2 m-0"><%= Spree.t(:loading) %>...</p>+</div>+<% end if @page_preview.present? %>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_sections_toolbar.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_sections_toolbar.html.erbnew file mode 100644index 0000000000..76a67099a1--- /dev/null+++ b/admin/app/views/spree/admin/page_builder/_sidebar_sections_toolbar.html.erb@@ -0,0 +1,65 @@+<%= turbo_frame_tag :page_sidebar_toolbar do %>+ <div class="d-none">+ <% @page_preview.sections.includes(:blocks).each do |section| %>+ <% next if section.new_record? %>++ <div id="editor-toolbar-section-<%= section.id %>">+ <button class="editor-toolbar-lower">+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down" viewBox="0 0 16 16">+ <path fill-rule="evenodd" d="M8 1a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L7.5 13.293V1.5A.5.5 0 0 1 8 1z"/>+ </svg>+ </button>+ <button class="editor-toolbar-higher">+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-up" viewBox="0 0 16 16">+ <path fill-rule="evenodd" d="M8 15a.5.5 0 0 0 .5-.5V2.707l3.146 3.147a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L7.5 2.707V14.5a.5.5 0 0 0 .5.5z"/>+ </svg>+ </button>+ <button class="editor-toolbar-edit">+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil" viewBox="0 0 16 16">+ <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>+ </svg>+ </button>+ <button class="editor-toolbar-delete">+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">+ <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"/>+ <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"/>+ </svg>+ </button>+ </div>++ <%= button_to Spree.t(:move_up), spree.move_higher_admin_page_section_path(@page_preview, section), method: :patch, id: "editor-toolbar-higher-section-#{section.id}" %>+ <%= button_to Spree.t(:move_down), spree.move_lower_admin_page_section_path(@page_preview, section), method: :patch, id: "editor-toolbar-lower-section-#{section.id}" %>+ <%= link_to Spree.t(:destroy), spree.admin_page_section_path(section), data: { turbo_confirm: Spree.t(:are_you_sure), turbo_method: :delete }, id: "editor-toolbar-delete-section-#{section.id}" %>++ <% section.blocks.each do |block| %>+ <div id="editor-toolbar-block-<%= block.id %>">+ <button class="editor-toolbar-lower">+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down" viewBox="0 0 16 16">+ <path fill-rule="evenodd" d="M8 1a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L7.5 13.293V1.5A.5.5 0 0 1 8 1z"/>+ </svg>+ </button>+ <button class="editor-toolbar-higher">+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-up" viewBox="0 0 16 16">+ <path fill-rule="evenodd" d="M8 15a.5.5 0 0 0 .5-.5V2.707l3.146 3.147a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L7.5 2.707V14.5a.5.5 0 0 0 .5.5z"/>+ </svg>+ </button>+ <button class="editor-toolbar-edit">+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil" viewBox="0 0 16 16">+ <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>+ </svg>+ </button>+ <button class="editor-toolbar-delete">+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">+ <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"/>+ <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"/>+ </svg>+ </button>+ </div>++ <%= button_to Spree.t(:move_up), spree.move_higher_admin_page_section_block_path(section, block), method: :patch, id: "editor-toolbar-higher-block-#{block.id}" %>+ <%= button_to Spree.t(:move_down), spree.move_lower_admin_page_section_block_path(section, block), method: :patch, id: "editor-toolbar-lower-block-#{block.id}" %>+ <%= link_to Spree.t(:destroy), spree.admin_page_section_block_path(section, block), data: { turbo_confirm: Spree.t(:are_you_sure), turbo_method: :delete }, id: "editor-toolbar-delete-block-#{block.id}" %>+ <% end %>+ <% end %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_links/_form.html.erb b/admin/app/views/spree/admin/page_links/_form.html.erbnew file mode 100644index 0000000000..edaa91ad1c--- /dev/null+++ b/admin/app/views/spree/admin/page_links/_form.html.erb@@ -0,0 +1,19 @@+<% data_action = (@page_link.persisted? ? { action: 'blur->auto-submit#submit' } : {}) %>++<div class="form-group">+ <%= f.label :linkable_type, 'Link' %>+ <%= f.select :linkable_type, @page_link.parent.allowed_linkable_types, { include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>+ <%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: @page_link, form_name: 'page_link' %>+</div>++<hr class="my-4" />++<div class="form-group">+ <%= f.label :label, 'Name' %>+ <%= f.text_field :label, class: 'form-control', data: data_action, placeholder: 'eg. About us', required: true %>+</div>++<div class="custom-control custom-checkbox">+ <%= f.check_box :open_in_new_tab, class: 'custom-control-input', data: data_action %>+ <%= f.label :open_in_new_tab, class: 'custom-control-label' %>+</div>diff --git a/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erb b/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erbnew file mode 100644index 0000000000..187f3697cc--- /dev/null+++ b/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erb@@ -0,0 +1,15 @@+<% if page_link.linkable_type == 'Spree::Product' %>+ <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-100', url: spree.select_options_admin_products_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %>+<% elsif page_link.linkable_type == 'Spree::Taxon' %>+ <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-100', url: spree.admin_taxons_select_options_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %>+<% elsif page_link.linkable_type == 'Spree::Post' %>+ <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-100', url: spree.select_options_admin_posts_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %>+<% elsif page_link.linkable_type == 'Spree::Page' %>+ <%= select_tag "#{form_name}[linkable_id]", options_for_select(all_linkable_pages, page_link.linkable_id), { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+<% elsif page_link.linkable_type == 'ActionText::RichText' %>+ <%= select_tag "#{form_name}[linkable_id]", options_for_select(all_linkable_policies, page_link.linkable_id), { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+<% elsif page_link.linkable_type == 'Spree::Vendor' %>+ <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-100', url: spree.select_options_admin_vendors_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %>+<% else %>+ <%= text_field_tag "#{form_name}[url]", page_link.url, class: "form-control", placeholder: 'eg. google.com', data: { action: 'blur->auto-submit#submit' } %>+<% end %>diff --git a/admin/app/views/spree/admin/page_links/_list.html.erb b/admin/app/views/spree/admin/page_links/_list.html.erbnew file mode 100644index 0000000000..8ac61cdf24--- /dev/null+++ b/admin/app/views/spree/admin/page_links/_list.html.erb@@ -0,0 +1,36 @@+<div class="mb-4">+ <h5 class="font-weight-bold">Links</h5>++ <% if parent.links.any? %>+ <ul class="list-group mb-2 px-1 pt-1 pb-0 border border-gray-200 bg-white rounded-lg"+ data-controller="sortable"+ data-sortable-handle-value=".handle"+ data-sortable-resource-name-value="page_link"+ data-sortable-response-kind-value="turbo-stream">+ <% parent.links.each do |link| %>+ <li class="list-group-item list-group-item-action p-0 d-flex align-items-center mb-1 hover-gray"+ data-sortable-update-url="<%= admin_page_link_path(link, sorting_only: true, format: :turbo_stream) %>"+ >+ <%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'd-block py-2 px-3 text-dark flex-fill' %>+ <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1">+ <%= icon 'grip-vertical', class: 'mr-0' %>+ </button>+ </li>+ <% end %>+ </ul>+ <% else %>+ <p class="text-muted text-center p-5">+ No links yet.+ </p>+ <% end %>++ <% if show_add_link_button %>+ <% if parent.is_a?(Spree::PageSection) %>+ <% add_url = admin_page_section_links_path(parent) %>+ <% elsif parent.is_a?(Spree::PageBlock) %>+ <% add_url = admin_page_section_block_links_path(parent.section, parent) %>+ <% end %>++ <%= link_to_with_icon 'plus', 'Add link', add_url, class: 'btn btn-primary w-100', data: { turbo_method: :post } if add_url %>+ <% end %>+</div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/page_links/_refresh_theme_preview.html.erb b/admin/app/views/spree/admin/page_links/_refresh_theme_preview.html.erbnew file mode 100644index 0000000000..2db53e7868--- /dev/null+++ b/admin/app/views/spree/admin/page_links/_refresh_theme_preview.html.erb@@ -0,0 +1,5 @@+<% if @page_link.parent.is_a?(Spree::PageBlock) %>+ <%= refresh_theme_preview(@page_link.parent.section, @page_link.parent) %>+<% else %>+ <%= refresh_theme_preview(@page_link.parent) %>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/page_links/create.turbo_stream.erb b/admin/app/views/spree/admin/page_links/create.turbo_stream.erbnew file mode 100644index 0000000000..be28a87d8e--- /dev/null+++ b/admin/app/views/spree/admin/page_links/create.turbo_stream.erb@@ -0,0 +1,4 @@+<%= turbo_stream.replace :page_sidebar do %>+ <%= render template: 'spree/admin/page_links/edit' %>+<% end %>+<%= render 'spree/admin/page_links/refresh_theme_preview' %>diff --git a/admin/app/views/spree/admin/page_links/destroy.turbo_stream.erb b/admin/app/views/spree/admin/page_links/destroy.turbo_stream.erbnew file mode 100644index 0000000000..5e02a982c2--- /dev/null+++ b/admin/app/views/spree/admin/page_links/destroy.turbo_stream.erb@@ -0,0 +1,11 @@+<%= turbo_stream.replace :page_sidebar do %>+ <% if @page_link.parent.is_a?(Spree::PageSection) %>+ <% @page_section = @page_link.parent %>+ <%= render template: 'spree/admin/page_sections/edit' %>+ <% elsif @page_link.parent.is_a?(Spree::PageBlock) %>+ <% @page_block = @page_link.parent %>+ <%= render template: 'spree/admin/page_blocks/edit' %>+ <% end %>+<% end %>++<%= render 'spree/admin/page_links/refresh_theme_preview' %>diff --git a/admin/app/views/spree/admin/page_links/edit.html.erb b/admin/app/views/spree/admin/page_links/edit.html.erbnew file mode 100644index 0000000000..df506be457--- /dev/null+++ b/admin/app/views/spree/admin/page_links/edit.html.erb@@ -0,0 +1,18 @@+<%= turbo_frame_tag :page_sidebar do %>+ <h6 class="p-2 bg-light border-bottom sticky-top d-flex align-items-center mb-3">+ <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray mr-3 text-center back d-flex align-items-center shadow-none px-2' do %>+ <%= icon 'chevron-left.svg', class: 'mr-0' %>+ <% end %>+ <%= @page_link.label %>+ </h6>+ <div class="px-3 pb-5 mb-5 edit-block">+ <%= form_for @page_link, url: spree.admin_page_link_path(@page_link), data: { controller: 'auto-submit' } do |f| %>+ <%= render 'spree/admin/page_links/form', f: f %>+ <% end %>+ </div>+ <div class="position-fixed border-top bg-light bottom-bar" style="bottom: 0px; width:344px; z-index: 9999">+ <div class="px-3 py-2" data-action="click->page-builder#hideSidebarMobile">+ <%= link_to_delete(@page_link, url: spree.admin_page_link_path(@page_link)) %>+ </div>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_links/update.turbo_stream.erb b/admin/app/views/spree/admin/page_links/update.turbo_stream.erbnew file mode 100644index 0000000000..7cccc575e7--- /dev/null+++ b/admin/app/views/spree/admin/page_links/update.turbo_stream.erb@@ -0,0 +1,6 @@+<% unless params[:sorting_only] %>+ <%= turbo_stream.replace :page_sidebar do %>+ <%= render template: 'spree/admin/page_links/edit' %>+ <% end %>+<% end %>+<%= render 'spree/admin/page_links/refresh_theme_preview' %>diff --git a/admin/app/views/spree/admin/page_sections/_form_tab_buttons.html.erb b/admin/app/views/spree/admin/page_sections/_form_tab_buttons.html.erbnew file mode 100644index 0000000000..a6afb9b12a--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/_form_tab_buttons.html.erb@@ -0,0 +1,12 @@+<div class="position-fixed border-top px-3 py-2 d-flex bg-light bottom-bar" style="bottom: 0px; left: 0px; width: 344px; z-index: 9999">+ <div class="d-flex align-items-center justify-content-end w-100">+ <% if tab == :design %>+ <%= link_to_with_icon "restore", Spree.t(:restore_defaults), spree.restore_design_settings_to_defaults_admin_page_section_path(@page_section), {data: {turbo_confirm: Spree.t(:are_you_sure), turbo_method: :patch }, class: 'btn btn-light'} %>+ <% end %>+ <% if @page_section.can_be_deleted? %>+ <div data-action="click->page-builder#hideSidebarMobile" class="ml-auto">+ <%= link_to_delete(@page_section, url: spree.admin_page_section_path(@page_section)) %>+ </div>+ <% end %>+ </div>+</div>diff --git a/admin/app/views/spree/admin/page_sections/create.turbo_stream.erb b/admin/app/views/spree/admin/page_sections/create.turbo_stream.erbnew file mode 100644index 0000000000..eec2b03ba3--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/create.turbo_stream.erb@@ -0,0 +1,9 @@+<%= turbo_stream.replace :page_sidebar do %>+ <%= render template: 'spree/admin/page_sections/edit' %>+<% end %>++<%= turbo_stream.replace 'page_sidebar_toolbar' do %>+ <%= render 'spree/admin/page_builder/sidebar_sections_toolbar' %>+<% end %>++<%= refresh_theme_preview(@page_section) %>diff --git a/admin/app/views/spree/admin/page_sections/destroy.turbo_stream.erb b/admin/app/views/spree/admin/page_sections/destroy.turbo_stream.erbnew file mode 100644index 0000000000..900995ac12--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/destroy.turbo_stream.erb@@ -0,0 +1,16 @@+<%= turbo_stream.replace :page_sidebar do %>+ <%= render 'spree/admin/page_builder/sidebar_sections' %>+<% end %>++<%= turbo_stream.replace 'page_sidebar_toolbar' do %>+ <%= render 'spree/admin/page_builder/sidebar_sections_toolbar' %>+<% end %>++<%= turbo_stream.replace :iframe_preview_scripts do %>%+ <%= turbo_frame_tag :iframe_preview_scripts do %>+ <script>+ document.getElementById('pageLivePreview').contentDocument.body.querySelector('turbo-frame[id="section-<%= @page_section.id %>"]').remove()+ document.getElementById('delete-callback').click()+ </script>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/edit.html.erb b/admin/app/views/spree/admin/page_sections/edit.html.erbnew file mode 100644index 0000000000..a95ee6b19f--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/edit.html.erb@@ -0,0 +1,42 @@+<%= turbo_frame_tag :page_sidebar do %>+ <% tab_selected ||= :content %>+ <h6 class="p-2 bg-light border-bottom sticky-top d-flex align-items-center mb-3">+ <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray mr-3 text-center back d-flex align-items-center shadow-none px-2' do %>+ <%= icon 'chevron-left.svg', class: 'mr-0 back' %>+ <% end %>+ <%= @page_section.display_name %>+ </h6>+ <div class="px-3 pb-5 mb-5 edit-block" style="margin-bottom: 6rem;">+ <%= form_for @page_section, url: spree.admin_page_section_path(@page_section), data: { controller: 'auto-submit' }, as: :page_section do |f| %>+ <div data-controller="bootstrap-tabs">+ <%= hidden_field_tag :tab_selected, tab_selected, data: { bootstrap_tabs_target: "input" } %>+ <ul class="nav nav-pills nav-fill mb-3 px-0" id="pills-tab" role="tablist">+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-toggle="pill" data-target="#pills-home" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>" data-action="bootstrap-tabs#change" data-bootstrap-tabs-tab-param="content">Content</button>+ </li>+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-toggle="pill" data-target="#pills-profile" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>" data-action="bootstrap-tabs#change" data-bootstrap-tabs-tab-param="design">Design</button>+ </li>+ </ul>+ </div>+ <div class="tab-content" id="pills-tabContent">+ <div class="tab-pane fade <%= tab_selected == :content ? 'show active' : '' %>" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab">+ <%= render "spree/admin/page_sections/forms/#{@page_section.type.demodulize.underscore}", f: f %>+ <%= render 'spree/admin/page_sections/form_tab_buttons', tab: :content %>+ </div>+ <div class="tab-pane fade <%= tab_selected == :design ? 'show active' : '' %>" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab">+ <%= render 'spree/admin/page_sections/fields/top_padding', f: f %>+ <%= render 'spree/admin/page_sections/fields/bottom_padding', f: f %>+ <%= render 'spree/admin/page_sections/fields/background_color', f: f %>+ <%= render 'spree/admin/page_sections/fields/text_color', f: f %>+ <%= render 'spree/admin/page_sections/fields/border_color', f: f %>+ <%= render 'spree/admin/page_sections/fields/border_top_width', f: f %>+ <%= render 'spree/admin/page_sections/fields/border_bottom_width', f: f %>+ <%= render 'spree/admin/page_sections/fields/button', f: f %>+ <%= yield(:design_tab) %>+ <%= render 'spree/admin/page_sections/form_tab_buttons', tab: :design %>+ </div>+ </div>+ <% end %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/fields/_background_color.html.erb b/admin/app/views/spree/admin/page_sections/fields/_background_color.html.erbnew file mode 100644index 0000000000..a0d22a59e4--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_background_color.html.erb@@ -0,0 +1,4 @@+<%= render 'spree/admin/page_builder/color_picker',+ f: f, field: :preferred_background_color, value: f.object.preferred_background_color.presence || @theme_preview.preferred_background_color,+ label: Spree.t('admin.page_builder.background_color'),+ action: 'change->auto-submit#submit' %>diff --git a/admin/app/views/spree/admin/page_sections/fields/_border_bottom_width.html.erb b/admin/app/views/spree/admin/page_sections/fields/_border_bottom_width.html.erbnew file mode 100644index 0000000000..0fc2668088--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_border_bottom_width.html.erb@@ -0,0 +1,5 @@+<%= render 'spree/admin/page_builder/range_input',+ f: f,+ field: :preferred_bottom_border_width, min: 0, max: 100, unit: 'px',+ label: Spree.t('admin.page_builder.border_bottom_width')+%>diff --git a/admin/app/views/spree/admin/page_sections/fields/_border_color.html.erb b/admin/app/views/spree/admin/page_sections/fields/_border_color.html.erbnew file mode 100644index 0000000000..020a0dde8e--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_border_color.html.erb@@ -0,0 +1,5 @@+<%= render 'spree/admin/page_builder/color_picker',+ f: f, field: :preferred_border_color, value: @page_section.preferred_border_color.presence || @theme_preview.preferred_border_color,+ label: Spree.t('admin.page_builder.border_color'),+ action: 'change->auto-submit#submit' %>+diff --git a/admin/app/views/spree/admin/page_sections/fields/_border_top_width.html.erb b/admin/app/views/spree/admin/page_sections/fields/_border_top_width.html.erbnew file mode 100644index 0000000000..7211b71030--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_border_top_width.html.erb@@ -0,0 +1,6 @@+<%= render 'spree/admin/page_builder/range_input',+ f: f,+ field: :preferred_top_border_width,+ min: 0, max: 100, unit: 'px',+ label: Spree.t('admin.page_builder.border_top_width')+%>diff --git a/admin/app/views/spree/admin/page_sections/fields/_bottom_padding.html.erb b/admin/app/views/spree/admin/page_sections/fields/_bottom_padding.html.erbnew file mode 100644index 0000000000..6213c03898--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_bottom_padding.html.erb@@ -0,0 +1,5 @@+<%= render 'spree/admin/page_builder/range_input',+ f: f, field: :preferred_bottom_padding,+ min: 0, max: 100, unit: 'px',+ label: Spree.t('admin.page_builder.bottom_padding')+%>diff --git a/admin/app/views/spree/admin/page_sections/fields/_button.html.erb b/admin/app/views/spree/admin/page_sections/fields/_button.html.erbnew file mode 100644index 0000000000..968b276abe--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_button.html.erb@@ -0,0 +1,15 @@+<% if f.object.respond_to?(:preferred_button_background_color) %>+ <%= render 'spree/admin/page_builder/color_picker',+ f: f, field: :preferred_button_background_color, value: f.object.preferred_button_background_color.presence,+ label: Spree.t('admin.page_builder.button_background_color'),+ clear: true,+ action: 'change->auto-submit#submit' %>+<% end %>++<% if f.object.respond_to?(:preferred_button_text_color) %>+ <%= render 'spree/admin/page_builder/color_picker',+ f: f, field: :preferred_button_text_color, value: f.object.preferred_button_text_color.presence,+ label: Spree.t('admin.page_builder.button_text_color'),+ clear: true,+ action: 'change->auto-submit#submit' %>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/fields/_header_layout.html.erb b/admin/app/views/spree/admin/page_sections/fields/_header_layout.html.erbnew file mode 100644index 0000000000..b03e47d589--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_header_layout.html.erb@@ -0,0 +1,26 @@+<label>Layout (desktop)</label>++<div class="flex mt-2 radio-buttons-header">+ <label>+ <%= f.radio_button :preferred_layout, 'nav-centered', class: 'hidden', data: { action: 'change->auto-submit#submit' } %>+ <p class="btn-light"><%= Spree.t('admin.page_builder.nav_centered') %></p>+ </label>+ <label>+ <%= f.radio_button :preferred_layout, 'logo-centered', class: 'hidden', data: { action: 'change->auto-submit#submit' } %>+ <p class="btn-light"><%= Spree.t('admin.page_builder.logo_centered') %></p>+ </label>+ <label>+ <%= f.radio_button :preferred_layout, 'left', class: 'hidden', data: { action: 'change->auto-submit#submit' } %>+ <p class="btn-light"><%= Spree.t('admin.page_builder.left_aligned') %></p>+ </label>+</div>++<div class="mt-2">+ <%= render 'spree/admin/page_builder/range_input',+ f: f,+ field: :preferred_desktop_logo_height,+ min: 0, max: 120, unit: 'px',+ label: Spree.t('admin.page_builder.desktop_logo_height'),+ label_for_min_value: "auto"+ %>+</div>diff --git a/admin/app/views/spree/admin/page_sections/fields/_height.html.erb b/admin/app/views/spree/admin/page_sections/fields/_height.html.erbnew file mode 100644index 0000000000..cec2bebeac--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_height.html.erb@@ -0,0 +1,6 @@+<%= render 'spree/admin/page_builder/range_input',+ f: f,+ field: :preferred_height,+ min: 192, max: 600, unit: 'px',+ label: Spree.t('admin.page_builder.height')+%>diff --git a/admin/app/views/spree/admin/page_sections/fields/_text_color.html.erb b/admin/app/views/spree/admin/page_sections/fields/_text_color.html.erbnew file mode 100644index 0000000000..25a3eeb845--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_text_color.html.erb@@ -0,0 +1,7 @@+<%= render 'spree/admin/page_builder/color_picker',+ f: f,+ field: :preferred_text_color,+ value: @page_section.preferred_text_color.presence || @theme_preview.preferred_text_color,+ label: Spree.t('admin.page_builder.text_color'),+ action: 'change->auto-submit#submit'+%>diff --git a/admin/app/views/spree/admin/page_sections/fields/_top_padding.html.erb b/admin/app/views/spree/admin/page_sections/fields/_top_padding.html.erbnew file mode 100644index 0000000000..0b3703fe80--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/fields/_top_padding.html.erb@@ -0,0 +1,6 @@+<%= render 'spree/admin/page_builder/range_input',+ f: f,+ field: :preferred_top_padding,+ min: 0, max: 100, unit: 'px',+ label: Spree.t('admin.page_builder.top_padding')+%>diff --git a/admin/app/views/spree/admin/page_sections/forms/_announcement_bar.html.erb b/admin/app/views/spree/admin/page_sections/forms/_announcement_bar.html.erbnew file mode 100644index 0000000000..5605ba6c94--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_announcement_bar.html.erb@@ -0,0 +1,5 @@+<div class="trix-container">+ <%= f.rich_text_area :text, data: {+ action: 'trix-change->auto-submit#submit'+ }, class: 'mb-3' %>+</div>diff --git a/admin/app/views/spree/admin/page_sections/forms/_brand_story.html.erb b/admin/app/views/spree/admin/page_sections/forms/_brand_story.html.erbnew file mode 100644index 0000000000..e69de29bb2diff --git a/admin/app/views/spree/admin/page_sections/forms/_collection_banner.html.erb b/admin/app/views/spree/admin/page_sections/forms/_collection_banner.html.erbnew file mode 100644index 0000000000..e69de29bb2diff --git a/admin/app/views/spree/admin/page_sections/forms/_custom_code.html.erb b/admin/app/views/spree/admin/page_sections/forms/_custom_code.html.erbnew file mode 100644index 0000000000..42805ee910--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_custom_code.html.erb@@ -0,0 +1,4 @@+<p class="text-muted">+ You can use all HTML tags, JavaScript or CSS here+</p>+<%= f.text_area :preferred_custom_code, rows: 10, class: 'mb-3 form-control', data: { action: 'auto-submit#submit' } %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_featured_posts.html.erb b/admin/app/views/spree/admin/page_sections/forms/_featured_posts.html.erbnew file mode 100644index 0000000000..26ea927c22--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_featured_posts.html.erb@@ -0,0 +1,38 @@+<div class="form-group">+ <%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+</div>+<div class="form-group">+ <%= f.label :preferred_heading_size, Spree.t('admin.page_builder.heading_size') %>+ <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<div class="form-group">+ <%= f.label :preferred_heading_alignment, Spree.t('admin.page_builder.heading_alignment') %>+ <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<div class="form-group">+ <%= f.label :description %>+ <div class="trix-container">+ <%= f.rich_text_area :description, data: {action: 'trix-change->auto-submit#submit'}, class: 'mb-3 w-full' %>+ </div>+</div>+<div class="form-group">+ <%= f.label :preferred_description_alignment, Spree.t('admin.page_builder.description_alignment') %>+ <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>++<div class="form-group">+ <%= f.label :preferred_posts_to_show, Spree.t('admin.page_builder.posts_to_show') %>+ <%= f.select :preferred_posts_to_show, options_for_select([["Newest", "newest"], ["Most popular", "most_popular"]], @page_section.preferred_posts_to_show), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>++<div class="form-group">+ <div data-controller="better-slider">+ <label><%= Spree.t('admin.page_builder.maximum_posts_to_show') %>: <span data-better-slider-target="currentValueLabel"></span></label>+ <div class="flex flex-row w-full">+ <span class="mr-2">2</span>+ <%= f.range_field :preferred_max_posts_to_show, class: "custom-range w-full", min: 2, max: 8, data: {'better-slider-target': 'rangeInput', action: 'auto-submit#submit'} %>+ <span class="ml-2">8</span>+ </div>+ </div>+</div>diff --git a/admin/app/views/spree/admin/page_sections/forms/_featured_product.html.erb b/admin/app/views/spree/admin/page_sections/forms/_featured_product.html.erbnew file mode 100644index 0000000000..06356b9397--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_featured_product.html.erb@@ -0,0 +1,4 @@+<div class="form-group">+ <%= f.label :preferred_product, Spree.t(:product) %>+ <%= tom_select_tag 'page_section[preferred_product_id]', active_option: @page_section.preferred_product_id, class: 'w-100', url: spree.select_options_admin_products_path(format: :json), include_blank: false, select_data: {action: 'auto-submit#submit'} %>+</div>diff --git a/admin/app/views/spree/admin/page_sections/forms/_featured_taxon.html.erb b/admin/app/views/spree/admin/page_sections/forms/_featured_taxon.html.erbnew file mode 100644index 0000000000..eced4ced5a--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_featured_taxon.html.erb@@ -0,0 +1,59 @@+<div class="form-group">+ <%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+</div>+<div class="form-group">+ <%= f.label :preferred_heading_size, Spree.t('admin.page_builder.heading_size') %>+ <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<div class="form-group">+ <%= f.label :preferred_heading_alignment, Spree.t('admin.page_builder.heading_alignment') %>+ <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<div class="form-group">+ <%= f.label :description %>+ <div class="trix-container">+ <%= f.rich_text_area :description, data: {action: 'trix-change->auto-submit#submit'}, class: 'mb-3 w-full' %>+ </div>+</div>+<div class="form-group">+ <%= f.label :preferred_description_alignment, Spree.t('admin.page_builder.description_alignment') %>+ <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<div class="form-group">+ <%= f.check_box :preferred_use_description_from_admin, class: "checkbox-input", data: { action: 'auto-submit#submit' } %>+ <%= f.label :preferred_use_description_from_admin, Spree.t('admin.page_builder.use_description_from_admin') %>+ <div class="alert alert-info">If the category description is not set, then the above description will be used.</div>+</div>+<div class="form-group">+ <%= f.label :preferred_button_text, Spree.t('admin.page_builder.button_text') %>+ <%= f.text_field :preferred_button_text, class: 'form-control', data: { action: 'blur->auto-submit#submit' }, placeholder: 'eg. Explore category', required: true %>+</div>+<div class="form-group">+ <%= f.check_box :preferred_show_taxon_image, class: "checkbox-input", data: { action: 'auto-submit#submit' } %>+ <%= f.label :preferred_show_taxon_image, Spree.t('admin.page_builder.show_taxon_image') %>+</div>+<div class="form-group">+ <%= f.label :preferred_taxon, Spree.t('admin.page_builder.category') %>+ <%= tom_select_tag 'page_section[preferred_taxon_id]', active_option: @page_section.preferred_taxon_id, class: 'w-100', url: spree.admin_taxons_select_options_path(format: :json), select_data: {action: 'auto-submit#submit'} %>+</div>+<div class="form-group">+ <%= f.check_box :preferred_show_more_button, class: "checkbox-input", data: { action: 'auto-submit#submit' } %>+ <%= f.label :preferred_show_more_button, Spree.t('admin.page_builder.show_more_button') %>+</div>+<div class="form-group">+ <div data-controller="better-slider">+ <label><%= Spree.t('admin.page_builder.maximum_products_to_show') %>: <span data-better-slider-target="currentValueLabel"></span></label>+ <div class="flex flex-row w-full">+ <span class="mr-2">3</span>+ <%= f.range_field :preferred_max_products_to_show, class: "custom-range w-full", min: 3, max: 20, data: {'better-slider-target': 'rangeInput', action: 'auto-submit#submit'} %>+ <span class="ml-2">20</span>+ </div>+ </div>+</div>+<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_button_style, Spree.t('admin.page_builder.button_style') %>+ <%= f.select :preferred_button_style, options_for_select([['Primary', 'primary'], ['Secondary', 'secondary']], @page_section.preferred_button_style), {}, data: { action: 'auto-submit#submit' }, class: 'custom-select' %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_featured_taxons.html.erb b/admin/app/views/spree/admin/page_sections/forms/_featured_taxons.html.erbnew file mode 100644index 0000000000..67710e0859--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_featured_taxons.html.erb@@ -0,0 +1,13 @@+<div class="form-group">+ <%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+</div>+<div class="form-group">+ <%= f.label :preferred_heading_size, Spree.t('admin.page_builder.heading_size') %>+ <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<div class="form-group">+ <%= f.label :preferred_heading_alignment, Spree.t('admin.page_builder.heading_alignment') %>+ <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<%= render 'spree/admin/page_links/list', parent: @page_section, show_add_link_button: true %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_footer.html.erb b/admin/app/views/spree/admin/page_sections/forms/_footer.html.erbnew file mode 100644index 0000000000..5fc085f0bf--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_footer.html.erb@@ -0,0 +1,20 @@+<div class="alert alert-info mb-3">+ If you don't upload a logo we'll use the one from the header.+</div>++<%= render 'spree/admin/shared/page_section_logo', f: f %>++<p class="text-muted small mt-2">+ We recommend transparent images with a minimum size of 400x128 pixels.+</p>++<% content_for(:design_tab) do %>+ <%= render 'spree/admin/page_builder/color_picker',+ f: f, field: :preferred_copyright_text_color, value: @page_section.preferred_copyright_text_color,+ label: 'Copyright Text color',+ action: 'change->auto-submit#submit' %>+ <%= render 'spree/admin/page_builder/color_picker',+ f: f, field: :preferred_copyright_background_color, value: @page_section.preferred_copyright_background_color,+ label: 'Copyright Background color',+ action: 'change->auto-submit#submit' %>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_header.html.erb b/admin/app/views/spree/admin/page_sections/forms/_header.html.erbnew file mode 100644index 0000000000..4d35b0b01d--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_header.html.erb@@ -0,0 +1,14 @@+<label>Logo image</label>++<%= render 'spree/admin/shared/page_section_logo', f: f %>++<p class="text-muted small mt-2">+ We recommend transparent images with a minimum size of 400x128 pixels.+</p>++<%= render 'spree/admin/page_links/list', parent: @page_section, show_add_link_button: true %>++<% content_for(:design_tab) do %>+ <%= render 'spree/admin/page_sections/fields/header_layout', f: f %>+ <hr />+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_image_banner.html.erb b/admin/app/views/spree/admin/page_sections/forms/_image_banner.html.erbnew file mode 100644index 0000000000..6943fb5ef2--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_image_banner.html.erb@@ -0,0 +1,13 @@+<%= render 'spree/admin/shared/page_section_image', f: f %>++<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_vertical_alignment, Spree.t('admin.page_builder.vertical_alignment') %>+ <%= f.select :preferred_vertical_alignment, options_for_select([:top, :middle, :bottom], @page_section.preferred_vertical_alignment), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/range_input',+ f: f, field: :preferred_overlay_transparency, min: 1, max: 100, unit: '%' %>++ <%= render 'spree/admin/page_sections/fields/height', f: f %>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erb b/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erbnew file mode 100644index 0000000000..5f9167f06b--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erb@@ -0,0 +1,37 @@+<%= render 'spree/admin/shared/page_section_image', f: f %>++<div class="py-2">+ <%= f.fields_for :link do |lf| %>+ <div class="form-group">+ <%= lf.label :linkable_type, 'Link' %>+ <%= lf.select :linkable_type, @page_section.allowed_linkable_types, { include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>+ <div id="linkable_type_dropdown">+ <%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: lf.object, form_name: 'page_section[link_attributes]' %>+ </div>+ </div>++ <div class="form-group">+ <%= lf.label :label, 'Label' %>+ <%= lf.text_field :label, class: 'form-control', data: { action: 'blur->auto-submit#submit' }, placeholder: 'eg. About us', required: true %>+ </div>++ <div class="custom-control custom-checkbox pb-2">+ <%= lf.check_box :open_in_new_tab, class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>+ <%= lf.label :open_in_new_tab, class: 'custom-control-label' %>+ </div>++ <% end %>+ <div class="alert alert-info">Clicking on the image will send the user to the selected page/URL</div>+</div>++<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_desktop_image_alignment, Spree.t('admin.page_builder.desktop_image_alignment') %>+ <%= f.select :preferred_desktop_image_alignment, options_for_select(['left', 'right'], @page_section.preferred_desktop_image_alignment), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>+ <div class="form-group">+ <%= f.label :preferred_vertical_alignment, Spree.t('admin.page_builder.vertical_alignment') %>+ <%= f.select :preferred_vertical_alignment, options_for_select([:top, :middle, :bottom], @page_section.preferred_vertical_alignment), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>+ <hr />+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_main_password_footer.html.erb b/admin/app/views/spree/admin/page_sections/forms/_main_password_footer.html.erbnew file mode 100644index 0000000000..43dd26b946--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_main_password_footer.html.erb@@ -0,0 +1,9 @@+<div class="alert alert-info mb-3">+ If you don't upload a logo we'll use the one from the header.+</div>++<%= render 'spree/admin/shared/page_section_logo', f: f %>++<p class="text-muted small mt-2">+ We recommend transparent images with a minimum size of 400x128 pixels.+</p>diff --git a/admin/app/views/spree/admin/page_sections/forms/_main_password_header.erb b/admin/app/views/spree/admin/page_sections/forms/_main_password_header.erbnew file mode 100644index 0000000000..a513cf3494--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_main_password_header.erb@@ -0,0 +1,13 @@+<label>Logo image</label>+<%= render 'spree/admin/shared/page_section_logo', f: f %>++<p class="text-muted small mt-2">+ We recommend transparent images with a minimum size of 400x128 pixels.+</p>++<% content_for(:design_tab) do %>+ <%= render 'spree/admin/page_builder/range_input',+ f: f, field: :preferred_desktop_logo_height, min: 0, max: 120, unit: 'px', label: "Logo height (desktop)", label_for_min_value: "auto"+ %>+ <hr />+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_newsletter.html.erb b/admin/app/views/spree/admin/page_sections/forms/_newsletter.html.erbnew file mode 100644index 0000000000..043507ae16--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_newsletter.html.erb@@ -0,0 +1,15 @@+<% content_for(:design_tab) do %>++ <%= label_tag :background_image %>+ <br />++ <%= render 'spree/admin/shared/page_section_image', f: f %>++ <br /><br />++ <%= render 'spree/admin/page_builder/range_input',+ f: f, field: :preferred_overlay_transparency, min: 1, max: 100, unit: '%'+ %>++ <hr />+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_page_title.html.erb b/admin/app/views/spree/admin/page_sections/forms/_page_title.html.erbnew file mode 100644index 0000000000..d79a399416--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_page_title.html.erb@@ -0,0 +1,4 @@+<div class="form-group">+ <%= f.label :preferred_title, Spree.t('admin.page_builder.title') %>+ <%= f.text_field :preferred_title, data: { action: 'auto-submit#submit' }, class: "form-control" %>+</div>diff --git a/admin/app/views/spree/admin/page_sections/forms/_post_details.html.erb b/admin/app/views/spree/admin/page_sections/forms/_post_details.html.erbnew file mode 100644index 0000000000..e69de29bb2diff --git a/admin/app/views/spree/admin/page_sections/forms/_post_grid.html.erb b/admin/app/views/spree/admin/page_sections/forms/_post_grid.html.erbnew file mode 100644index 0000000000..e69de29bb2diff --git a/admin/app/views/spree/admin/page_sections/forms/_product_details.html.erb b/admin/app/views/spree/admin/page_sections/forms/_product_details.html.erbnew file mode 100644index 0000000000..8b13789179--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_product_details.html.erb@@ -0,0 +1 @@+diff --git a/admin/app/views/spree/admin/page_sections/forms/_product_grid.html.erb b/admin/app/views/spree/admin/page_sections/forms/_product_grid.html.erbnew file mode 100644index 0000000000..8b13789179--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_product_grid.html.erb@@ -0,0 +1 @@+diff --git a/admin/app/views/spree/admin/page_sections/forms/_related_products.html.erb b/admin/app/views/spree/admin/page_sections/forms/_related_products.html.erbnew file mode 100644index 0000000000..f5d6eb32fc--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_related_products.html.erb@@ -0,0 +1,32 @@+<div class="form-group">+ <%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+</div>+<div class="form-group">+ <%= f.label :preferred_heading_size, Spree.t('admin.page_builder.heading_size') %>+ <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<div class="form-group">+ <%= f.label :preferred_heading_alignment, Spree.t('admin.page_builder.heading_alignment') %>+ <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<div class="form-group">+ <%= f.label :description, Spree.t('admin.page_builder.description') %>+ <div class="trix-container">+ <%= f.rich_text_area :description, data: {action: 'trix-change->auto-submit#submit'}, class: 'mb-3 w-full' %>+ </div>+</div>+<div class="form-group">+ <%= f.label :preferred_description_alignment, Spree.t('admin.page_builder.description_alignment') %>+ <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+</div>+<div class="form-group">+ <div data-controller="better-slider">+ <label><%= Spree.t('admin.page_builder.maximum_products_to_show') %>: <span data-better-slider-target="currentValueLabel"></span></label>+ <div class="flex flex-row w-full">+ <span class="mr-2">2</span>+ <%= f.range_field :preferred_max_products_to_show, class: "custom-range w-full", min: 2, max: 20, data: {'better-slider-target': 'rangeInput', action: 'auto-submit#submit'} %>+ <span class="ml-2">20</span>+ </div>+ </div>+</div>diff --git a/admin/app/views/spree/admin/page_sections/forms/_rich_text.html.erb b/admin/app/views/spree/admin/page_sections/forms/_rich_text.html.erbnew file mode 100644index 0000000000..e69de29bb2diff --git a/admin/app/views/spree/admin/page_sections/forms/_taxon_banner.html.erb b/admin/app/views/spree/admin/page_sections/forms/_taxon_banner.html.erbnew file mode 100644index 0000000000..e69de29bb2diff --git a/admin/app/views/spree/admin/page_sections/forms/_taxon_grid.html.erb b/admin/app/views/spree/admin/page_sections/forms/_taxon_grid.html.erbnew file mode 100644index 0000000000..3ce54fb375--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_taxon_grid.html.erb@@ -0,0 +1,5 @@+<div class="form-group">+ <%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+</div>+diff --git a/admin/app/views/spree/admin/page_sections/forms/_video.html.erb b/admin/app/views/spree/admin/page_sections/forms/_video.html.erbnew file mode 100644index 0000000000..9dfa3a9b02--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/forms/_video.html.erb@@ -0,0 +1,15 @@+<div class="form-group">+ <%= f.label :preferred_youtube_video_url, Spree.t('admin.page_builder.youtube_video_url') %>+ <%= f.url_field :preferred_youtube_video_url, data: { action: 'change->auto-submit#submit' }, class: 'form-control' %>+</div>++<% content_for(:design_tab) do %>+ <div class="form-group">+ <%= f.label :preferred_separated, Spree.t('admin.page_builder.separated') %>+ <%= f.select :preferred_separated, options_for_select(['horizontally', 'vertically'], @page_section.preferred_separated), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ </div>++ <%= render 'spree/admin/page_builder/labeled_range_input',+ f: f, field: :preferred_width_desktop, min: 1, max: 100, unit: '%', _label: Spree.t('admin.page_builder.max_video_width_on_desktop')+ %>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/move_higher.turbo_stream.erb b/admin/app/views/spree/admin/page_sections/move_higher.turbo_stream.erbnew file mode 100644index 0000000000..3556cd05de--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/move_higher.turbo_stream.erb@@ -0,0 +1,7 @@+<%= turbo_stream.replace :page_sidebar do %>+ <%= render 'spree/admin/page_builder/sidebar_sections' %>+<% end %>++<%= turbo_stream.replace 'page_sidebar_toolbar' do %>+ <%= render 'spree/admin/page_builder/sidebar_sections_toolbar' %>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/move_lower.turbo_stream.erb b/admin/app/views/spree/admin/page_sections/move_lower.turbo_stream.erbnew file mode 100644index 0000000000..3556cd05de--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/move_lower.turbo_stream.erb@@ -0,0 +1,7 @@+<%= turbo_stream.replace :page_sidebar do %>+ <%= render 'spree/admin/page_builder/sidebar_sections' %>+<% end %>++<%= turbo_stream.replace 'page_sidebar_toolbar' do %>+ <%= render 'spree/admin/page_builder/sidebar_sections_toolbar' %>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/new.html.erb b/admin/app/views/spree/admin/page_sections/new.html.erbnew file mode 100644index 0000000000..2810cf644d--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/new.html.erb@@ -0,0 +1,28 @@+<%= turbo_frame_tag :page_sidebar do %>+ <h6 class="p-2 bg-light border-bottom sticky-top d-flex align-items-center mb-1">+ <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray mr-3 text-center back d-flex align-items-center shadow-none px-2' do %>+ <%= icon 'chevron-left.svg', class: 'mr-0 back' %>+ <% end %>+ <%= Spree.t(:add_section) %>+ </h6>+ <div class="pb-5 mb-5 edit-block">+ <%= form_for @page_preview.sections.new, url: spree.admin_page_sections_path(@page_preview), data: { controller: 'section-form', section_form_target: :form } do |f| %>+ <%= f.hidden_field :type, data: { section_form_target: 'type' } %>+ <%= f.hidden_field :pageable_id %>+ <%= f.hidden_field :pageable_type %>+ <% cache spree_base_cache_scope.call('new-section-list'), expires_in: 1.hour do %>+ <ul class="list-group list-group-flush m-2 mx-3">+ <% @theme.available_page_sections.each do |section_class| %>+ <li class="list-group-item p-2 list-group-item-action cursor-pointer d-flex align-items-center hover-gray"+ data-action="click->section-form#addSection"+ data-section-form-type-param="<%= section_class %>"+ >+ <%= icon section_class.new.icon_name, class: 'mr-3' if section_class.new.icon_name.present? %>+ <%= section_class.to_s.demodulize.titleize %>+ </li>+ <% end %>+ </ul>+ <% end %>+ <% end %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/remove_attachment.turbo_stream.erb b/admin/app/views/spree/admin/page_sections/remove_attachment.turbo_stream.erbnew file mode 100644index 0000000000..1da7e941b3--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/remove_attachment.turbo_stream.erb@@ -0,0 +1,4 @@+<%= refresh_theme_preview(@page_section) %>+<%= turbo_stream.replace :page_sidebar do %>+ <%= render template: 'spree/admin/page_sections/edit' %>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/restore_design_settings_to_defaults.turbo_stream.erb b/admin/app/views/spree/admin/page_sections/restore_design_settings_to_defaults.turbo_stream.erbnew file mode 100644index 0000000000..e81bad6a3c--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/restore_design_settings_to_defaults.turbo_stream.erb@@ -0,0 +1,4 @@+<%= refresh_theme_preview(@page_section) %>+<%= turbo_stream.replace :page_sidebar do %>+ <%= render template: 'spree/admin/page_sections/edit', locals: {tab_selected: :design} %>+<% end %>diff --git a/admin/app/views/spree/admin/page_sections/show.html.erb b/admin/app/views/spree/admin/page_sections/show.html.erbnew file mode 100644index 0000000000..19925427df--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/show.html.erb@@ -0,0 +1 @@+<%= render 'spree/admin/page_builder/sidebar_section', section: @page_section %>diff --git a/admin/app/views/spree/admin/page_sections/update.turbo_stream.erb b/admin/app/views/spree/admin/page_sections/update.turbo_stream.erbnew file mode 100644index 0000000000..706f127841--- /dev/null+++ b/admin/app/views/spree/admin/page_sections/update.turbo_stream.erb@@ -0,0 +1,10 @@+<% if @page_section.previous_changes.key?('position') %>+ <%= refresh_theme_preview %>+<% else %>+ <%= refresh_theme_preview(@page_section) %>+<% end %>+<% if @page_section.respond_to?(:link) %>+ <%= turbo_stream.update :linkable_type_dropdown do %>+ <%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: @page_section.link, form_name: 'page_section[link_attributes]' %>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/pages/_filters.html.erb b/admin/app/views/spree/admin/pages/_filters.html.erbnew file mode 100644index 0000000000..06703a7b99--- /dev/null+++ b/admin/app/views/spree/admin/pages/_filters.html.erb@@ -0,0 +1,9 @@+<%= search_form_for [:admin, @search], url: spree.admin_pages_path do |f| %>+ <div class="form-group">+ <%= f.label :name_cont, Spree.t(:name) %>+ <%= f.text_field :name_cont, class: 'form-control js-quick-search-target js-filterable' %>+ </div>+ <div class="form-actions">+ <%= button Spree.t(:search), 'search' %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/pages/_form.html.erb b/admin/app/views/spree/admin/pages/_form.html.erbnew file mode 100644index 0000000000..b46fd8dc54--- /dev/null+++ b/admin/app/views/spree/admin/pages/_form.html.erb@@ -0,0 +1,29 @@+<% vertical ||= false %>+<div class="row">+ <div class="<%= vertical ? 'col-lg-12' : 'col-lg-8' %>">+ <div class="card mb-4">+ <div class="card-header d-flex align-items-center justify-content-between">+ <h5 class="card-title">+ <%= Spree.t(:details) %>+ </h5>+ </div>+ <div class="card-body">+ <div class="form-group">+ <%= f.label :name, Spree.t(:name) %>+ <%= f.text_field :name, class: 'form-control', required: true, data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName', seo_form_target: 'sourceTitleInput' } %>+ </div>+ </div>+ </div>+ </div>+ <div class="<%= vertical ? 'col-lg-12' : 'col-lg-4' %>">+ <%= render 'spree/admin/shared/seo',+ f: f,+ title: @page.name,+ meta_title: @page.meta_title,+ description: nil,+ slug_attribute_name: "page[slug]",+ slug: @page.slug,+ slug_path: 'pages',+ placeholder: 'Add a title to see how this page might appear in a search engine listing' %>+ </div>+</div>diff --git a/admin/app/views/spree/admin/pages/_page.erb b/admin/app/views/spree/admin/pages/_page.erbnew file mode 100644index 0000000000..946f98fc9a--- /dev/null+++ b/admin/app/views/spree/admin/pages/_page.erb@@ -0,0 +1,8 @@+<tr id="<%= dom_id page %>" data-controller="row-link" class="cursor-pointer">+ <td scope="row" data-action="click->row-link#openLink">+ <%= link_to page.name, spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), data: { row_link_target: :link } %>+ </td>+ <td data-action="click->row-link#openLink">+ <%= local_time_ago(page.updated_at, class: 'with-tip') %>+ </td>+</tr>diff --git a/admin/app/views/spree/admin/pages/edit.html.erb b/admin/app/views/spree/admin/pages/edit.html.erbnew file mode 100644index 0000000000..146619cf10--- /dev/null+++ b/admin/app/views/spree/admin/pages/edit.html.erb@@ -0,0 +1,18 @@+<%= turbo_frame_tag :dialog_modal do %>+ <%= form_with model: @page, url: spree.admin_page_path(@page), data: { controller: 'slug-form seo-form' }, scope: :page do |f| %>+ <div class="modal-content">+ <div class="modal-header">+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:page_settings) %></h5>+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>+ </div>+ <div class="modal-body">+ <%= render 'spree/admin/shared/error_messages', target: @page %>+ <%= render 'form', f: f, vertical: true %>+ </div>+ <div class="modal-footer d-flex justify-content-between">+ <%= turbo_save_button_tag Spree.t('actions.save'), data: {turbo_frame: :_top} %>+ <%= link_to Spree.t('actions.destroy'), spree.admin_page_path(@page.id), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'btn btn-danger' %>+ </div>+ </div>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/pages/index.html.erb b/admin/app/views/spree/admin/pages/index.html.erbnew file mode 100644index 0000000000..3ab85c4b95--- /dev/null+++ b/admin/app/views/spree/admin/pages/index.html.erb@@ -0,0 +1,29 @@+<% content_for :page_title do %>+ <%= Spree.t(:pages) %>+<% end %>+<% content_for :table_filter do %>+ <%= render 'spree/admin/pages/filters' %>+<% end %>+<% content_for :page_actions do %>+ <%= link_to Spree.t(:add_new_page), spree.new_admin_page_path, class: "btn btn-primary" if can?(:create, Spree::Page.new) %>+<% end %>+<% if @pages.any? %>+ <div class="table-responsive">+ <table class="table">+ <thead class="text-muted">+ <tr>+ <th><%= Spree.t(:name) %></th>+ <th><%= Spree.t(:updated) %></th>+ </tr>+ </thead>+ <tbody>+ <%= render collection: @pages, partial: 'spree/admin/pages/page', cached: spree_base_cache_scope %>+ </tbody>+ </table>+ <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @pages } %>+ </div>+<% else %>+ <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">+ No pages found+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/pages/new.html.erb b/admin/app/views/spree/admin/pages/new.html.erbnew file mode 100644index 0000000000..49da65edf7--- /dev/null+++ b/admin/app/views/spree/admin/pages/new.html.erb@@ -0,0 +1,11 @@+<% content_for :page_title do %>+ <%= page_header_back_button spree.admin_pages_path %>+ <%= Spree.t(:new_page) %>+<% end %>+<% content_for :title do %>+ <%= Spree.t(:new_page) %>+<% end %>+<%= form_with model: @page, url: spree.admin_pages_path, data: { controller: 'slug-form seo-form' }, scope: :page do |f| %>+ <%= render 'form', f: f, vertical: false %>+ <%= render 'spree/admin/shared/new_resource_links', f: f %>+<% end %>diff --git a/admin/app/views/spree/admin/shared/_alerts.html.erb b/admin/app/views/spree/admin/shared/_alerts.html.erbnew file mode 100644index 0000000000..0d74a1fbc1--- /dev/null+++ b/admin/app/views/spree/admin/shared/_alerts.html.erb@@ -0,0 +1,29 @@+<%= turbo_frame_tag :alerts do %>+ <% flash.to_h.each do |msg_type, text| %>+ <div class="alerts-container" style="pointer-events: none;">+ <div class="d-flex justify-content-center px-2">+ <div+ data-controller="notification"+ data-notification-delay-value="5000"+ data-transition-enter-from="opacity-0 translate-x-6"+ data-transition-enter-to="opacity-100 translate-x-0"+ data-transition-leave-from="opacity-100 translate-x-0"+ data-transition-leave-to="opacity-0 translate-x-6"++ class="transition transform duration-200 hidden alert d-flex align-items-center <%= admin_flash_class_for(msg_type) %> align-items-center" style="min-width: 300px; pointer-events: all;">+ <div class="d-flex align-items-center justify-content-between w-100">+ <div class="d-flex align-items-center justify-content-between">+ <span><%= text %></span>+ </div>+ <div class="ml-3">+ <button type="button" class="btn" data-action="notification#hide" aria-label="<%= Spree.t(:close) %>">+ <%= icon('x', height: 20, class: 'mr-0') %>+ </button>+ </div>+ </div>+ </div>+ </div>+ </div>+ <% end %>+ <% flash.clear %>+<% end %>diff --git a/admin/app/views/spree/admin/shared/_modal.html.erb b/admin/app/views/spree/admin/shared/_modal.html.erbnew file mode 100644index 0000000000..de1ee73292--- /dev/null+++ b/admin/app/views/spree/admin/shared/_modal.html.erb@@ -0,0 +1,37 @@+<div class="modal fade" id="modal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">+ <div class="modal-dialog modal-dialog-centered">+ <%= turbo_frame_tag :dialog_modal do %>+ <div class="modal-content">+ <div class="modal-header">+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />+ </div>+ <div class="modal-body text-center" style="min-height: 200px">+ <div class="spinner-border text-light mx-auto my-5" role="status">+ <span class="sr-only"><%= Spree.t(:loading) %>...</span>+ </div>+ </div>+ </div>+ <% end %>+ </div>+</div>++<div class="modal fade" id="modal-lg" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">+ <div class="modal-dialog modal-dialog-centered modal-lg">+ <%= turbo_frame_tag :dialog_modal_lg do %>+ <div class="modal-content">+ <div class="modal-header">+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />+ </div>+ <div class="modal-body text-center" style="min-height: 200px">+ <div class="spinner-border text-light" role="status">+ <span class="sr-only"><%= Spree.t(:loading) %>...</span>+ </div>+ </div>+ </div>+ <% end %>+ </div>+</div>++<%= turbo_frame_tag :modal_scripts %>diff --git a/admin/app/views/spree/admin/shared/_page_section_image.html.erb b/admin/app/views/spree/admin/shared/_page_section_image.html.erbnew file mode 100644index 0000000000..93207b333b--- /dev/null+++ b/admin/app/views/spree/admin/shared/_page_section_image.html.erb@@ -0,0 +1 @@+<%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 400, height: 128, auto_submit: true %>diff --git a/admin/app/views/spree/admin/shared/_page_section_logo.html.erb b/admin/app/views/spree/admin/shared/_page_section_logo.html.erbnew file mode 100644index 0000000000..93207b333b--- /dev/null+++ b/admin/app/views/spree/admin/shared/_page_section_logo.html.erb@@ -0,0 +1 @@+<%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 400, height: 128, auto_submit: true %>diff --git a/admin/app/views/spree/admin/themes/_theme.html.erb b/admin/app/views/spree/admin/themes/_theme.html.erbnew file mode 100644index 0000000000..dcdec980b2--- /dev/null+++ b/admin/app/views/spree/admin/themes/_theme.html.erb@@ -0,0 +1,63 @@+<tr id="<%= spree_dom_id theme %>">+ <td class="w-70 p-0">+ <%= link_to theme.ready? ? spree.edit_admin_theme_path(theme) : '#', class: 'd-flex align-items-top p-3' do %>+ <% if theme.screenshot.attached? && theme.screenshot.variable? %>+ <%= image_tag(+ main_app.cdn_image_url(+ theme.screenshot.variant(+ spree_image_variant_options(resize_to_fill: [240, 144])+ )+ ),+ class: 'img-thumbnail',+ style: 'width: 120px; height: 72px',+ loading: :lazy+ ) %>+ <% else %>+ <%= render 'spree/admin/shared/no_image', width: 120, height: 72 %>+ <% end %>++ <div class="d-flex flex-column ml-3">+ <strong><%= theme.name %></strong>+ <p class="mb-0 mt-1">+ <span class="text-muted">Updated: <%= local_time_ago(theme.updated_at, class: 'with-tip') %></span>+ </p>+ </div>+ <% end %>+ </td>+ <td class="w-10">+ <% if theme.ready? %>+ <% if theme.default? %>+ <span class="badge badge-success">+ <%= icon('check') %>+ <%= Spree.t(:live) %>+ </span>+ <% else %>+ <span class="badge badge-light">+ <%= Spree.t(:draft) %>+ </span>+ <% end %>+ <% else %>+ <span class="badge badge-light">+ <%= Spree.t(:duplicating) %>+ </span>+ <% end %>+ </td>+ <td class="w-20">+ <% if theme.ready? %>+ <div class="d-flex justify-content-end w-100">+ <%= link_to Spree.t(:publish), publish_admin_theme_path(theme), class: 'btn btn-sm btn-light mr-2', data: { turbo_method: :put } unless theme.default? %>+ <div class="dropdown">+ <button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <%= icon('dots', class: 'mr-0') %>+ </button>+ <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">+ <%= link_to_edit theme, class: 'dropdown-item' %>+ <%= link_to_with_icon 'copy', Spree.t(:duplicate), clone_admin_theme_path(theme), class: 'dropdown-item', data: { turbo_method: :post } %>+ <% unless theme.default? %>+ <%= link_to_delete(theme, icon: 'trash', class: 'dropdown-item btn-danger shadow-none') if can?(:delete, theme) %>+ <% end %>+ </div>+ </div>+ <% end %>+ </td>+</tr>diff --git a/admin/app/views/spree/admin/themes/edit.html.erb b/admin/app/views/spree/admin/themes/edit.html.erbnew file mode 100644index 0000000000..fb0ac9f301--- /dev/null+++ b/admin/app/views/spree/admin/themes/edit.html.erb@@ -0,0 +1,14 @@+<div class="d-none d-md-block col bg-transparent">+ <div id="liveViewCont" class="desktopLiveView" data-page-builder-target="previewContainer">+ <div class="embed-responsive embed-responsive-4by3 bg-transparent">+ <iframe class="embed-responsive-item border border-gray bg-transparent rounded"+ data-page-builder-target="iframe"+ data-action="load->page-builder#initializeVisualEditor"+ id="pageLivePreview"+ sandbox="allow-same-origin allow-forms allow-popups allow-scripts allow-modals">+ </iframe>+ </div>+ </div>+</div>++<%= turbo_frame_tag :iframe_preview_scripts %>diff --git a/admin/app/views/spree/admin/themes/index.html.erb b/admin/app/views/spree/admin/themes/index.html.erbnew file mode 100644index 0000000000..f839410716--- /dev/null+++ b/admin/app/views/spree/admin/themes/index.html.erb@@ -0,0 +1,79 @@+<%= content_for :page_title do %>+ <%= Spree.t(:themes) %>+<% end %>++<%= content_for :page_actions do %>+ <%= link_to_with_icon 'eye', Spree.t(:view_your_store), current_store.formatted_url_or_custom_domain, class: 'btn btn-light bg-transparent', target: '_blank' %>+<% end %>++<%= content_for :page_alerts do %>+ <div class="alert alert-info">+ If you wan't to make changes to theme but don't want to go live with them,+ you can make a copy of the theme and make changes to the copy. And later promote that copy+ to the live theme.+ </div>+ <br />++ <% unless current_store.default_custom_domain&.active? %>+ <div class="alert alert-info d-inline-flex align-items-center py-2 pr-2">+ <div class="d-flex align-items-center">+ <span>+ You don't have domain connected to your store+ </span>+ <%= link_to 'Connect your own domain', spree.admin_custom_domains_path, class: 'btn btn-primary ml-3' %>+ </div>+ </div>+ <% end %>+<% end %>++<div class="card-lg p-0">+ <div class="table-responsive rounded-lg">+ <table class="table">+ <thead class="text-muted">+ <tr>+ <th class="bg-transparent"><%= Spree.t(:theme) %></th>+ <th class="bg-transparent"><%= Spree.t(:status) %></th>+ <th class="bg-transparent"></th>+ </tr>+ </thead>+ <tbody>+ <%= render partial: 'spree/admin/themes/theme', collection: @themes, cached: spree_base_cache_scope %>+ </tbody>+ </table>+ </div>+</div>++<% if available_themes.any? %>+ <div class="card-lg p-0">+ <div class="card-header">+ <h5 class="card-title">Add a new theme</h5>+ </div>+ <div class="card-body">+ <p>Pick a theme from the list of available themes</p>++ <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3">+ <% available_themes.each do |theme| %>+ <div class="col mb-4">+ <div class="card">+ <% if theme.preview_image_url.present? %>+ <%= image_tag theme.preview_image_url, class: 'card-img-top' %>+ <% end %>+ <div class="card-body">+ <h5 class="card-title"><%= theme.display_name %></h5>+ <p class="text-muted">+ by <%= link_to theme.authors.join(', '), theme.website, target: '_blank' %>+ </p>+ <p><%= theme.description %></p>++ <%= form_for :theme, url: spree.admin_themes_path do |f| %>+ <%= f.hidden_field :type, value: theme.to_s %>+ <%= f.submit Spree.t(:add), class: 'btn btn-primary' %>+ <% end %>+ </div>+ </div>+ </div>+ <% end %>+ </div>+ </div>+ </div>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/themes/update.turbo_stream.erb b/admin/app/views/spree/admin/themes/update.turbo_stream.erbnew file mode 100644index 0000000000..6d8c984599--- /dev/null+++ b/admin/app/views/spree/admin/themes/update.turbo_stream.erb@@ -0,0 +1 @@+<%= refresh_theme_preview %>diff --git a/admin/config/routes.rb b/admin/config/routes.rbindex 33f4171d92..fe99eace86 100644--- a/admin/config/routes.rb+++ b/admin/config/routes.rb@@ -130,6 +130,53 @@ Spree::Core::Engine.add_routes doendresources :custom_domains, except: :show+ # storefront / page builder+ resource :storefront, only: [:edit, :update], controller: :storefront+ resources :themes, except: [:new, :show] do+ member do+ put :update_with_page+ put :publish+ post :clone+ end+ resources :sections, controller: 'page_sections', only: %i[new create] do+ member do+ patch :move_higher+ patch :move_lower+ end+ end+ end+ resources :pages, except: [:show] do+ resources :sections, controller: 'page_sections', only: %i[new create] do+ member do+ patch :move_higher+ patch :move_lower+ end+ end+ end+ resources :page_sections, only: %i[edit update destroy] do+ member do+ patch :restore_design_settings_to_defaults+ end++ resources :blocks, controller: 'page_blocks' do+ member do+ patch :move_higher+ patch :move_lower+ end++ resources :links, controller: 'page_links', only: [:create]+ end+ resources :links, controller: 'page_links', only: [:create]+ end+ resources :page_links, only: [:edit, :update, :destroy]++ resources :posts do+ collection do+ get :select_options, defaults: { format: :json }+ end+ end+ resources :post_categories+# account managementresources :roles, except: :showdiff --git a/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rbnew file mode 100644index 0000000000..4b7efd37fd--- /dev/null+++ b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb@@ -0,0 +1,65 @@+require 'spec_helper'++RSpec.describe Spree::Admin::PageBlocksController, type: :controller do+ stub_authorization!+ render_views++ let(:page) { create(:page, :preview) }+ let(:theme) { create(:theme, :preview) }++ before do+ page.update!(pageable: theme.parent)++ session[:page_preview_id] = page.id+ session[:theme_preview_id] = theme.id+ end++ describe '#destroy' do+ let(:page_section) { create(:featured_taxon, pageable: page) }+ let!(:page_block) { create(:page_block, :buttons, section: page_section) }++ it 'destroys the page block' do+ delete :destroy, params: { id: page_block.id, page_section_id: page_section.id }, format: :turbo_stream++ expect(page_block.reload).to be_deleted+ end+ end++ describe '#move_higher' do+ let(:page_section) { create(:featured_taxon) }+ let!(:another_page_block) { create(:page_block, :buttons, section: page_section, position: 1) }+ let!(:page_block) { create(:page_block, :buttons, section: page_section, position: 2) }++ it 'moves the page block higher' do+ put :move_higher, params: { id: page_block.id, page_section_id: page_section.id }, format: :turbo_stream++ expect(page_block.reload.position).to eq 1+ end+ end++ describe '#move_lower' do+ let(:page_section) { create(:featured_taxon) }+ let!(:page_block) { create(:page_block, :buttons, section: page_section, position: 1) }+ let!(:another_page_block) { create(:page_block, :buttons, section: page_section, position: 2) }++ it 'moves the page block lower' do+ put :move_lower, params: { id: page_block.id, page_section_id: page_section.id }, format: :turbo_stream++ expect(page_block.reload.position).to eq 2+ end+ end++ describe '#create' do+ let(:page_section) { create(:featured_taxon) }++ it 'creates page block of the given type' do+ create_req = lambda {+ post :create, params: { page_block: { type: 'Spree::PageBlocks::Buttons' }, page_section_id: page_section.id }, format: :turbo_stream+ }++ expect(&create_req).to change(Spree::PageBlock, :count).by(1)++ expect(page_section.page_blocks.last.type).to eq 'Spree::PageBlocks::Buttons'+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/page_links_controller_spec.rb b/admin/spec/controllers/spree/admin/page_links_controller_spec.rbnew file mode 100644index 0000000000..e2f0ac76ff--- /dev/null+++ b/admin/spec/controllers/spree/admin/page_links_controller_spec.rb@@ -0,0 +1,93 @@+require 'spec_helper'++RSpec.describe Spree::Admin::PageLinksController, type: :controller do+ stub_authorization!+ render_views++ let(:store) { Spree::Store.default }++ let(:page) { create(:page, :preview) }+ let(:theme) { create(:theme, :preview) }++ before do+ page.update!(pageable: theme.parent)++ session[:page_preview_id] = page.id+ session[:theme_preview_id] = theme.id+ end++ describe '#create' do+ subject :post_create do+ post :create, params: { page_section_id: page_section.id }, as: :turbo_stream+ end++ before do+ allow(Spree::Theme).to receive(:find).and_return Spree::Theme.new(parent: Spree::Theme.take)+ allow(Spree::Page).to receive(:find).and_return Spree::Page.new(parent: Spree::Page.take)+ end++ context 'for header' do+ let!(:page_section) { Spree::PageSections::Header.take }++ it 'creates a new page link' do+ expect { post_create }.to change { page_section.links.count }.by 1+ expect(page_section.links.last.linkable).to be_a Spree::Pages::Homepage+ end+ end++ context 'for featured taxons' do+ let(:taxonomy) { store.taxonomies.first }+ let!(:taxon) { create(:taxon, taxonomy: taxonomy, parent: taxonomy.root) }+ let!(:page_section) { create(:page_section, :featured_taxons) }++ it 'creates a new page link' do+ expect { post_create }.to change { page_section.links.count }.by 1+ expect(page_section.links.last.linkable).to be_a Spree::Taxon+ end+ end++ context 'for featured taxons' do+ let(:taxonomy) { store.taxonomies.find_by(name: 'Categories') || create(:taxonomy, name: 'Categories') }+ let!(:category) { create(:taxon, taxonomy: taxonomy, parent: taxonomy.root) }+ let!(:page_section) { create(:page_section, :featured_taxons) }++ it 'creates a new page link' do+ expect { post_create }.to change { page_section.links.count }.by 1+ expect(page_section.links.last.linkable).to be_a Spree::Taxon+ end+ end++ context 'for any other page section' do+ let!(:page_section) { Spree::PageSections::Footer.take }++ it 'creates a new page link' do+ expect { post_create }.to change { page_section.links.count }.by 1+ expect(page_section.links.last.linkable).to be_a Spree::Pages::Homepage+ end+ end++ context 'for nav page block' do+ let(:page_section) { create(:page_section, :header) }+ let(:page_block) { create(:page_block, :nav, section: page_section) }++ subject :post_create do+ post :create, params: { page_section_id: page_section.id, block_id: page_block.id }, as: :turbo_stream+ end++ it 'creates a new page link' do+ expect { post_create }.to change { page_block.links.count }.by 1+ expect(page_block.links.last.linkable).to be_a Spree::Pages::Homepage+ end+ end+ end++ describe '#destroy' do+ let(:page_link) { create(:page_link) }++ it 'destroys the page link' do+ delete :destroy, params: { id: page_link.id }, format: :turbo_stream++ expect(Spree::PageLink.find_by(id: page_link.id)).to be_nil+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rbnew file mode 100644index 0000000000..498fef14cc--- /dev/null+++ b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb@@ -0,0 +1,120 @@+require 'spec_helper'++RSpec.describe Spree::Admin::PageSectionsController, type: :controller do+ stub_authorization!+ render_views++ let(:page) { create(:page, :preview) }+ let(:theme) { create(:theme, :preview) }++ before do+ page.update!(pageable: theme.parent)++ session[:page_preview_id] = page.id+ session[:theme_preview_id] = theme.id+ end++ describe '#create' do+ context 'with page' do+ it 'creates a page section inside the page' do+ create_req = lambda {+ post :create, params: { page_section: { type: 'Spree::PageSections::FeaturedTaxon' }, page_id: page.id }, format: :turbo_stream+ }++ expect(&create_req).to change(page.page_sections, :count).by(1)+ expect(page.page_sections.last.type).to eq 'Spree::PageSections::FeaturedTaxon'+ end+ end++ context 'with theme' do+ it 'creates a page section inside the theme' do+ create_req = lambda {+ post :create, params: { page_section: { type: 'Spree::PageSections::FeaturedTaxon' }, theme_id: theme.id }, format: :turbo_stream+ }++ expect(&create_req).to change(theme.layout_sections, :count).by(1)+ expect(theme.layout_sections.last.type).to eq 'Spree::PageSections::FeaturedTaxon'+ end+ end+ end++ describe '#destroy' do+ context 'when page section can be deleted' do+ let!(:page_section) { create(:featured_taxon, pageable: page) }++ it 'deletes the page section' do+ expect { delete :destroy, params: { id: page_section.id }, format: :turbo_stream }.to change(Spree::PageSection, :count).by(-1)+ end+ end++ context 'when page section cannot be deleted' do+ let!(:page_section) { create(:page_section, :header) }++ it 'does not delete the page section' do+ expect { delete :destroy, params: { id: page_section.id }, format: :turbo_stream }.to change(Spree::PageSection, :count).by(0)+ end+ end+ end++ describe '#move_higher' do+ context 'within page' do+ let!(:another_page_section) { create(:featured_taxon, pageable: page, position: 1) }+ let!(:page_section) { create(:featured_taxon, pageable: page, position: 2) }++ it 'moves the page section higher' do+ put :move_higher, params: { id: page_section.id, page_id: page.id }, format: :turbo_stream++ expect(page_section.reload.position).to eq 1+ end+ end++ context 'within theme' do+ let!(:another_page_section) { create(:featured_taxon, pageable: theme, pageable_type: "Spree::Theme", position: 1) }+ let!(:page_section) { create(:featured_taxon, pageable: theme, pageable_type: "Spree::Theme", position: 2) }++ it 'moves the page section higher' do+ old_position = page_section.position+ put :move_higher, params: { id: page_section.id, theme_id: theme.id }, format: :turbo_stream++ expect(page_section.reload.position).to be < old_position+ end+ end+ end++ describe '#move_lower' do+ context 'within page' do+ let!(:page_section) { create(:featured_taxon, pageable: page, position: 1) }+ let!(:another_page_section) { create(:featured_taxon, pageable: page, position: 2) }++ it 'moves the page section lower' do+ put :move_lower, params: { id: page_section.id, page_id: page.id }, format: :turbo_stream++ expect(page_section.reload.position).to eq 2+ end+ end++ context 'within theme' do+ let!(:page_section) { create(:featured_taxon, pageable: theme, pageable_type: "Spree::Theme", position: 1) }+ let!(:another_page_section) { create(:featured_taxon, pageable: theme, pageable_type: "Spree::Theme", position: 2) }++ it 'moves the page section lower' do+ old_position = page_section.position+ put :move_lower, params: { id: page_section.id, theme_id: theme.id }, format: :turbo_stream++ expect(page_section.reload.position).to be > old_position+ end+ end+ end++ describe '#restore_design_settings_to_defaults' do+ let(:page_section) { create(:featured_taxon, preferred_top_padding: 50) }++ it 'restores the design settings to defaults' do+ expect(page_section.preferred_top_padding).to eq 50++ put :restore_design_settings_to_defaults, params: { id: page_section.id }, format: :turbo_stream++ expect(page_section.reload.preferred_top_padding).to eq 40+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/pages_controller_spec.rb b/admin/spec/controllers/spree/admin/pages_controller_spec.rbnew file mode 100644index 0000000000..2a7591ecc9--- /dev/null+++ b/admin/spec/controllers/spree/admin/pages_controller_spec.rb@@ -0,0 +1,111 @@+require 'spec_helper'++RSpec.describe Spree::Admin::PagesController, type: :controller do+ stub_authorization!+ render_views++ let(:store) { Spree::Store.default }+ let(:theme) { create(:theme, store: store) }+ let(:page) { create(:custom_page, pageable: store) }++ describe 'GET #index' do+ it 'renders the index template' do+ get :index+ expect(response).to render_template(:index)+ end+ end++ describe 'GET #new' do+ it 'renders the new template' do+ get :new+ expect(response).to render_template(:new)+ end+ end++ describe 'POST #create' do+ let(:new_page) { Spree::Pages::Custom.last }++ context 'with valid attributes' do+ it 'creates a new page' do+ post :create, params: { page: { name: 'new page', slug: 'new-page' } }++ expect(new_page.pageable).to eq(store)+ expect(new_page.name).to eq('new page')+ expect(new_page.slug).to eq('new-page')+ end++ it 'redirects to page builder' do+ post :create, params: { page: { name: 'new page', slug: 'new-page' } }++ expect(response).to redirect_to(spree.edit_admin_theme_path(store.default_theme, page_id: new_page.id))+ end+ end++ context 'with invalid attributes' do+ it 'does not create a new page' do+ expect do+ post :create, params: { page: { name: '', slug: '' } }+ end.not_to change(Spree::Pages::Custom, :count)+ end++ it 'renders the new template with unprocessable entity status' do+ post :create, params: { page: { name: '', slug: '' } }+ expect(response).to have_http_status(:unprocessable_entity)+ expect(response).to render_template(:new)+ end+ end+ end++ describe 'GET #edit' do+ it 'renders the edit template' do+ get :edit, params: { id: page.id }+ expect(response).to render_template(:edit)+ end+ end++ describe 'PATCH #update' do+ context 'with valid attributes' do+ before do+ post :update, params: { id: page.id, page: { name: 'very new name' } }+ end++ it 'updates a page' do+ page.reload+ expect(page.name).to eq('very new name')+ end++ it 'redirects to page builder' do+ expect(response).to redirect_to(spree.edit_admin_theme_path(store.default_theme, page_id: page.id))+ end+ end++ context 'with invalid attributes' do+ before do+ post :update, params: { id: page.id, page: { name: '', slug: '' } }+ end++ it 'renders the update template with unprocessable entity status' do+ expect(response).to have_http_status(:unprocessable_entity)+ expect(response).to render_template(:edit)+ end+ end+ end++ describe 'DELETE #destroy' do+ it 'destroys the page' do+ delete :destroy, params: { id: page.id }+ expect(Spree::Pages::Custom.exists?(page.id)).to be_falsey+ end++ it 'deletes the page preview from session if it matches the deleted page' do+ session[:page_preview_id] = page.id+ delete :destroy, params: { id: page.id }+ expect(session[:page_preview_id]).to be_nil+ end++ it 'redirects to the pages index' do+ delete :destroy, params: { id: page.id }+ expect(response).to redirect_to(spree.admin_pages_path)+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/themes_controller_spec.rb b/admin/spec/controllers/spree/admin/themes_controller_spec.rbnew file mode 100644index 0000000000..9b6423bd5a--- /dev/null+++ b/admin/spec/controllers/spree/admin/themes_controller_spec.rb@@ -0,0 +1,61 @@+require 'spec_helper'++RSpec.describe Spree::Admin::ThemesController, type: :controller do+ stub_authorization!+ render_views++ let!(:theme) { create(:theme) }+ let(:theme_preview) { theme.create_preview }+ let(:page) { create(:page, pageable: theme) }+ let(:page_preview) { page.create_preview }++ describe 'GET #index' do+ it 'assigns @themes and renders the index template' do+ get :index+ expect(assigns(:themes)).to be_kind_of(ActiveRecord::Relation)+ expect(response).to render_template('index')+ end+ end++ describe 'GET #edit' do+ it 'assigns @theme, @page, and @page_preview' do+ expect { get :edit, params: { id: theme.id } }.to change(Spree::Theme, :count).by(1).and change(Spree::Page, :count).by(1)+ expect(assigns(:page)).to be_a(Spree::Pages::Homepage)+ expect(assigns(:page_preview)).to be_a(Spree::Page)+ end+ end++ describe 'PUT #update_with_page' do+ it 'promotes theme_preview and page_preview' do+ put :update_with_page, params: { id: theme.id, theme_preview_id: theme_preview.id, page_preview_id: page_preview.id }+ expect(flash[:success]).to eq('Changes published!')++ expect(response).to redirect_to(spree.edit_admin_theme_path(theme_preview, page_id: page_preview))+ end+ end++ describe 'PUT #publish' do+ it 'sets the theme as default' do+ put :publish, params: { id: theme.id }, format: :turbo_stream+ expect(flash[:success]).to eq('Theme is now live')+ expect(response).to redirect_to(admin_themes_path)+ end+ end++ describe '#create' do+ it 'creates a new theme' do+ expect { post :create, params: { theme: { type: 'Spree::Themes::Default' } } }.to change(Spree::Theme, :count).by(1)++ expect(flash[:success]).to include('successfully created')+ expect(response).to redirect_to(spree.edit_admin_theme_path(Spree::Theme.last))+ end+ end++ describe 'POST #clone' do+ it 'duplicates the theme' do+ expect { post :clone, params: { id: theme.id } }.to change(Spree::Theme, :count).by(1)+ expect(flash[:success]).to eq(Spree.t('theme_copied'))+ expect(response).to redirect_to(spree.admin_themes_path)+ end+ end+enddiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex d6b0e21c07..a854b8ff09 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -102,6 +102,9 @@ module Spreehas_many :custom_domains, class_name: 'Spree::CustomDomain', dependent: :destroyhas_one :default_custom_domain, -> { where(default: true) }, class_name: 'Spree::CustomDomain'+ has_many :posts+ has_many :post_categories+## Page Builder associations#diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 578b86a02e..f1b011b15b 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -674,6 +674,7 @@ en:jackets_and_coats: JACKET & COASTSnew_collection: NEW COLLECTIONspecial_offers: SPECIAL OFFERS+ changes_published: Changes published!channel: Channelcharged: Chargedcheckout: Checkout@@ -1632,6 +1633,7 @@ en:slug: Slugsource: Sourcesocial: Social+ something_went_wrong: Something went wrongspecial_instructions: Special Instructionssplit: Splitspree_gateway_error_flash_for_checkout: There was a problem with your payment information. Please check your information and try again.@@ -1804,7 +1806,10 @@ en:test_mode: Test Modethis_menu_already_has_a_root_item: This Menu already has a root itemthank_you_for_your_order: Thank you for your business. Please print out a copy of this confirmation page for your records.- there_are_no_items_for_this_order: There are no items for this order. Please add an item to the order to continue.+ theme_copied: Theme has been successfully copied.+ theme_not_copied: "Theme could not be copied with errors: %{error}"+ theme_duplicating: Theme is still duplicating+ theme_is_now_live: Theme is now livethere_were_problems_with_the_following_fields: There were problems with the following fieldsthis_order_has_already_received_a_refund: This order has already received a refundthumbnail: Thumbnail