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
Admin: replace bootstrap tabs with native Stimulus controller (#13209)
Damian Legawiec53bb0f651f9c
diff --git a/admin/app/javascript/spree/admin/application.js b/admin/app/javascript/spree/admin/application.jsindex e3da1b1101..213cdc94bd 100644--- a/admin/app/javascript/spree/admin/application.js+++ b/admin/app/javascript/spree/admin/application.js@@ -49,7 +49,6 @@ import AutocompleteSelectController from 'spree/admin/controllers/autocomplete_simport AutoScrollController from 'spree/admin/controllers/auto_scroll_controller'import BetterSliderController from 'spree/admin/controllers/better_slider_controller'import BlockFormController from 'spree/admin/controllers/block_form_controller'-import BootstrapTabs from 'spree/admin/controllers/bootstrap_tabs_controller'import BulkOperationController from 'spree/admin/controllers/bulk_operation_controller'import CalculatorFieldsController from 'spree/admin/controllers/calculator_fields_controller'import CalendarRangeController from 'spree/admin/controllers/calendar_range_controller'@@ -103,7 +102,6 @@ application.register('auto-submit', AutoSubmit)application.register('autocomplete-select', AutocompleteSelectController)application.register('better-slider', BetterSliderController)application.register('block-form', BlockFormController)-application.register('bootstrap-tabs', BootstrapTabs) // We should merge with tabs controller/remove thisapplication.register('bulk-operation', BulkOperationController)application.register('calculator-fields', CalculatorFieldsController)application.register('calendar-range', CalendarRangeController)diff --git a/admin/app/javascript/spree/admin/controllers/bootstrap_tabs_controller.js b/admin/app/javascript/spree/admin/controllers/bootstrap_tabs_controller.jsdeleted file mode 100644index b9a822f044..0000000000--- a/admin/app/javascript/spree/admin/controllers/bootstrap_tabs_controller.js+++ /dev/null@@ -1,9 +0,0 @@-import { Controller } from '@hotwired/stimulus'--export default class extends Controller {- static targets = ['input']-- change({ params: { tab } }) {- this.inputTarget.value = tab- }-}diff --git a/admin/app/views/layouts/spree/page_builder.html.erb b/admin/app/views/layouts/spree/page_builder.html.erbindex c9dd150a29..764f72a45f 100644--- a/admin/app/views/layouts/spree/page_builder.html.erb+++ b/admin/app/views/layouts/spree/page_builder.html.erb@@ -7,7 +7,7 @@<body class="admin page-builder"id="page-builder"- data-controller="page-builder"+ data-controller="page-builder tabs"data-page-builder-preview-url-value="<%= page_preview_url %>">diff --git a/admin/app/views/spree/admin/page_blocks/edit.html.erb b/admin/app/views/spree/admin/page_blocks/edit.html.erbindex 753b87723a..ff8f348a31 100644--- a/admin/app/views/spree/admin/page_blocks/edit.html.erb+++ b/admin/app/views/spree/admin/page_blocks/edit.html.erb@@ -8,23 +8,20 @@</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">+ <div data-controller="tabs"><ul class="nav nav-pills nav-fill mb-3" 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>+ <button class="btn nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :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>+ <button class="btn nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :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">+ <div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :content %>><%= render "spree/admin/page_blocks/forms/#{@page_block.form_partial_name}", 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">+ <div data-tabs-target="panel" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :design %>><%= 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?(:preferred_text_color) %>diff --git a/admin/app/views/spree/admin/page_builder/_header.html.erb b/admin/app/views/spree/admin/page_builder/_header.html.erbindex 592cf345f2..afd55876d9 100644--- a/admin/app/views/spree/admin/page_builder/_header.html.erb+++ b/admin/app/views/spree/admin/page_builder/_header.html.erb@@ -37,8 +37,8 @@<li class="nav-item" role="presentation"><button class="nav-link active"data-controller="tooltip"- data-toggle="tab"- data-target="#sections"+ data-tabs-target="tab"+ data-action="click->tabs#select"type="button"role="tab"aria-controls="sections"@@ -52,8 +52,8 @@<li class="nav-item" role="presentation"><button class="nav-link"data-controller="tooltip"- data-toggle="tab"- data-target="#colors"+ data-tabs-target="tab"+ data-action="click->tabs#select"type="button"role="tab"aria-controls="theme"@@ -68,8 +68,8 @@<button class="nav-link"data-controller="tooltip"type="button"- data-toggle="tab"- data-target="#fonts"+ data-tabs-target="tab"+ data-action="click->tabs#select"type="button"role="tab"aria-controls="fonts"diff --git a/admin/app/views/spree/admin/page_builder/_sidebar.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar.html.erbindex 655383d2ce..a0cd7890b9 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar.html.erb@@ -1,13 +1,13 @@<aside id="page-builder-sidebar" class="overflow-y-auto">- <div class="tab-content mb5">- <div class="tab-pane fade show active" id="sections" role="tabpanel" aria-labelledby="sidebar-icon-page">+ <div class="mb5">+ <div data-tabs-target="panel" id="sections" role="tabpanel" aria-labelledby="sidebar-icon-page" class="animate__animated animate__fadeIn"><%= 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">+ <div data-tabs-target="panel" role="tabpanel" aria-labelledby="sidebar-icon-colors" id="colors" hidden class="animate__animated animate__fadeIn"><%= render 'spree/admin/page_builder/sidebar_colors' %></div>- <div class="tab-pane fade" role="tabpanel" aria-labelledby="sidebar-icon-fonts" id="fonts">+ <div data-tabs-target="panel" role="tabpanel" aria-labelledby="sidebar-icon-fonts" id="fonts" hidden class="animate__animated animate__fadeIn"><%= render 'spree/admin/page_builder/sidebar_fonts' %></div></div>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.erbindex 77791d6302..f62afaef16 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar_colors.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar_colors.html.erb@@ -4,79 +4,81 @@</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 m-3" 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 %>+ <div data-controller="tabs">+ <ul class="nav nav-pills nav-fill m-3" id="pills-tab" role="tablist">+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100 active" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" 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-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="false">Elements</button>+ </li>+ </ul>+ <div id="pills-tabContent">+ <div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate__animated animate__fadeIn">+ <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" /> %>+ <%# <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' %>+ <%= 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>- <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>+ <div data-tabs-target="panel" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab" hidden class="animate__animated animate__fadeIn">+ <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'- %>+ <%= 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></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.erbindex 4e6f952f3b..0bca8c8e22 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar_fonts.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar_fonts.html.erb@@ -3,70 +3,71 @@</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 m-3" 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 data-controller="tabs">+ <ul class="nav nav-pills nav-fill m-3" id="pills-tab" role="tablist">+ <li class="nav-item" role="presentation">+ <button class="btn nav-link w-100 active" id="pills-standard" data-tabs-target="tab" data-action="click->tabs#select" 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-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-custom" aria-selected="false">+ Custom+ </button>+ </li>+ </ul>+ <div id="pills-tabContent">+ <div data-tabs-target="panel" id="pills-standard-tab" role="tabpanel" aria-labelledby="pills-standard" class="animate__animated animate__fadeIn">+ <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>- <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">- <div class="alert alert-warning">- Using custom fonts can slow down your store.+ <div data-tabs-target="panel" id="pills-custom-tab" role="tabpanel" aria-labelledby="pills-custom" hidden class="animate__animated animate__fadeIn">+ <div class="px-3 py-2">+ <div class="mb-3">+ <div class="alert alert-warning">+ Using custom fonts can slow down your store.+ </div>+ <%= f.spree_text_area :preferred_custom_font_code, style: 'min-height: 6em' %></div>- <%= f.spree_text_area :preferred_custom_font_code, style: 'min-height: 6em' %>- </div>- <%= f.submit Spree.t('actions.update'), class: 'btn btn-primary' %>+ <%= f.submit Spree.t('actions.update'), class: 'btn btn-primary' %>- <hr class="my-4" />+ <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" />+ <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 {@@ -77,7 +78,8 @@font-family: "your font name", sans-serif;}</style>- </textarea>+ </textarea>+ </div></div></div></div>diff --git a/admin/app/views/spree/admin/page_sections/edit.html.erb b/admin/app/views/spree/admin/page_sections/edit.html.erbindex c4ce7743c4..9e4d7caab6 100644--- a/admin/app/views/spree/admin/page_sections/edit.html.erb+++ b/admin/app/views/spree/admin/page_sections/edit.html.erb@@ -8,23 +8,20 @@</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" } %>+ <div data-controller="tabs"><ul class="nav nav-pills nav-fill mb-3" 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>+ <button class="btn nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :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>+ <button class="btn nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :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">+ <div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :content %>><%= 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">+ <div data-tabs-target="panel" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :design %>><%= 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 %>diff --git a/admin/app/views/spree/admin/users/_tabs.html.erb b/admin/app/views/spree/admin/users/_tabs.html.erbindex eb9bf5dddf..38f89c1634 100644--- a/admin/app/views/spree/admin/users/_tabs.html.erb+++ b/admin/app/views/spree/admin/users/_tabs.html.erb@@ -1,41 +1,41 @@-<ul class="nav nav-pills mb-3" id="vendor" role="tablist">- <% if spree.respond_to?(:admin_user_visits_path) %>- <li class="nav-item" role="presentation">- <a class="nav-link active" id="pills-overview-tab" data-toggle="pill" data-target="#pills-overview" role="tab" aria-controls="pills-overview" aria-selected="true">Timeline</a>- </li>- <% end %>+<div data-controller="tabs">+ <ul class="nav nav-pills mb-3" role="tablist">+ <% if spree.respond_to?(:admin_user_visits_path) %>+ <li class="nav-item" role="presentation">+ <a class="nav-link active" id="pills-overview-tab" data-tabs-target="tab" data-action="click->tabs#select" role="tab" aria-controls="pills-overview" aria-selected="true">Timeline</a>+ </li>+ <% end %>- <% if can?(:read, Spree::Order) %>- <li class="nav-item" role="presentation">- <a class="nav-link <%= 'active' unless spree.respond_to?(:admin_user_visits_path) %>" id="pills-orders2-tab" data-toggle="pill" data-target="#pills-orders2" role="tab" aria-controls="pills-orders2" aria-selected="false"><%= Spree.t(:orders) %></a>- </li>- <li class="nav-item" role="presentation">- <a class="nav-link" id="pills-checkouts-tab" data-toggle="pill" data-target="#pills-checkouts" role="tab" aria-controls="pills-checkouts" aria-selected="false"><%= Spree.t(:draft_orders) %></a>- </li>- <% end %>+ <% if can?(:read, Spree::Order) %>+ <li class="nav-item" role="presentation">+ <a class="nav-link <%= 'active' unless spree.respond_to?(:admin_user_visits_path) %>" id="pills-orders2-tab" data-tabs-target="tab" data-action="click->tabs#select" role="tab" aria-controls="pills-orders2" aria-selected="false"><%= Spree.t(:orders) %></a>+ </li>+ <li class="nav-item" role="presentation">+ <a class="nav-link" id="pills-checkouts-tab" data-tabs-target="tab" data-action="click->tabs#select" role="tab" aria-controls="pills-checkouts" aria-selected="false"><%= Spree.t(:draft_orders) %></a>+ </li>+ <% end %>- <% if spree.respond_to?(:admin_user_gift_cards_path) && can?(:read, Spree::GiftCard) %>- <li class="nav-item" role="presentation">- <a class="nav-link" id="pills-gift-cards-tab" data-toggle="pill" data-target="#pills-gift-cards" role="tab" aria-controls="pills-gift-cards" aria-selected="false"><%= Spree.t(:gift_cards) %></a>- </li>- <% end %>+ <% if spree.respond_to?(:admin_user_gift_cards_path) && can?(:read, Spree::GiftCard) %>+ <li class="nav-item" role="presentation">+ <a class="nav-link" id="pills-gift-cards-tab" data-tabs-target="tab" data-action="click->tabs#select" role="tab" aria-controls="pills-gift-cards" aria-selected="false"><%= Spree.t(:gift_cards) %></a>+ </li>+ <% end %>- <% if can?(:read, Spree::StoreCredit) %>- <li class="nav-item" role="presentation">- <a class="nav-link" id="pills-store-credits-tab" data-toggle="pill" data-target="#pills-store-credits" role="tab" aria-controls="pills-store-credits" aria-selected="false"><%= Spree.t(:store_credits) %></a>- </li>- <% end %>-</ul>+ <% if can?(:read, Spree::StoreCredit) %>+ <li class="nav-item" role="presentation">+ <a class="nav-link" id="pills-store-credits-tab" data-tabs-target="tab" data-action="click->tabs#select" role="tab" aria-controls="pills-store-credits" aria-selected="false"><%= Spree.t(:store_credits) %></a>+ </li>+ <% end %>+ </ul>-<div class="tab-content" id="vendorContent"><% if spree.respond_to?(:admin_user_visits_path) %>- <div class="tab-pane fade show active pt-3" id="pills-overview" role="tabpanel" aria-labelledby="pills-overview">+ <div data-tabs-target="panel" id="pills-overview" role="tabpanel" aria-labelledby="pills-overview" class="pt-3 animate__animated animate__fadeIn"><%= turbo_frame_tag :user_visits, src: spree.admin_user_visits_path(@user), target: '_top' %></div><% end %><% if can?(:read, Spree::Order) %>- <div class="tab-pane fade <%= 'show active' unless spree.respond_to?(:admin_user_visits_path) %>" id="pills-orders2" role="tabpanel" aria-labelledby="pills-orders2">+ <div data-tabs-target="panel" id="pills-orders2" role="tabpanel" aria-labelledby="pills-orders2" class="animate__animated animate__fadeIn" <%= 'hidden' if spree.respond_to?(:admin_user_visits_path) %>><div class="card-lg"><%= turbo_frame_tag :orders_list, src: spree.admin_user_orders_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %><%= render 'spree/admin/shared/spinner' %>@@ -43,7 +43,7 @@</div></div>- <div class="tab-pane fade" id="pills-checkouts" role="tabpanel" aria-labelledby="pills-checkouts">+ <div data-tabs-target="panel" id="pills-checkouts" role="tabpanel" aria-labelledby="pills-checkouts" hidden class="animate__animated animate__fadeIn"><div class="card-lg"><%= turbo_frame_tag :orders_list, src: spree.admin_user_checkouts_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %><%= render 'spree/admin/shared/spinner' %>@@ -53,7 +53,7 @@<% end %><% if spree.respond_to?(:admin_user_gift_cards_path) && can?(:read, Spree::GiftCard) %>- <div class="tab-pane fade" id="pills-gift-cards" role="tabpanel" aria-labelledby="pills-gift-cards">+ <div data-tabs-target="panel" id="pills-gift-cards" role="tabpanel" aria-labelledby="pills-gift-cards" hidden class="animate__animated animate__fadeIn"><div class="card-lg"><%= turbo_frame_tag :gift_cards_list, src: spree.admin_user_gift_cards_path(@user, frame_name: :gift_cards_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %><%= render 'spree/admin/shared/spinner' %>@@ -63,7 +63,7 @@<% end %><% if can?(:read, Spree::StoreCredit) %>- <div class="tab-pane fade" id="pills-store-credits" role="tabpanel" aria-labelledby="pills-store-credits">+ <div data-tabs-target="panel" id="pills-store-credits" role="tabpanel" aria-labelledby="pills-store-credits" hidden class="animate__animated animate__fadeIn"><div class="card-lg"><%= turbo_frame_tag :store_credits_list, src: spree.admin_user_store_credits_path(@user, frame_name: :store_credits_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %><%= render 'spree/admin/shared/spinner' %>