Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Improve page builder UI

Damian Legawiecec40938785a3
diff --git a/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scss b/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scss
index 591ed81110..345a5aaa70 100644
--- a/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scss
+++ b/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scss
@@ -1,3 +1,6 @@
+$sidebar-width: 345px;
+$header-height: 43px;
+
#page-builder {
background-color: $gray-100;
@@ -16,9 +19,8 @@
}
.nav-pills {
- border: 1px solid $border-color;
border-radius: $border-radius;
- background-color: $gray-50;
+ background-color: $gray-100;
padding: 0.1rem;
.nav-link {
@@ -41,7 +43,7 @@
#page-builder-header {
z-index: 1031;
border-bottom: 1px solid $border-color;
-
+ height: $header-height;
nav {
width: 100%;
display: flex;
@@ -51,17 +53,20 @@
}
}
#page-builder-sidebar {
- width: 345px;
- top: 43px;
+ position: fixed;
+ width: $sidebar-width;
+ top: $header-height;
left: 0px;
background-color: $body-bg;
border-right: 1px solid $border-color;
-
+ overflow-y: scroll;
+ overflow-x: hidden;
+ height: calc(100vh - $header-height);
.sidebar-header {
height: 48px;
- padding: 0.5rem 1rem;
- background-color: $gray-25;
- border-bottom: 1px solid $gray-50;
+ padding: 0.5rem 0.7rem;
+ background-color: $body-bg;
+ border-bottom: 1px solid $border-color;
display: flex;
align-items: center;
margin-bottom: 0.5rem;
@@ -75,17 +80,24 @@
position: fixed;
bottom: 0;
left: 0;
- width: 345px;
- padding: 0.5rem 1rem;
- background-color: $gray-25;
- border-top: 1px solid $gray-50;
+ width: calc($sidebar-width - 1px);
+ padding: 0.5rem;
+ background-color: $body-bg;
+ box-shadow: 0 0 0 1px $border-color;
z-index: 1031;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+
+ .list-group-item {
+ padding: 0.5rem 0.5rem;
}
}
#page-builder-preview {
border-radius: $border-radius;
border: 1px solid $gray-300;
- margin-top: 60px;
+ margin-top: calc($header-height + 1rem);
}
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.erb
index 0dfc7f19ce..6ea11cb463 100644
--- 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.erb
@@ -1,7 +1,5 @@
-<div class="position-fixed border-top px-3 py-2 d-flex 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>
+<% if @page_block.can_be_deleted? %>
+ <div class="sidebar-footer">
+ <%= link_to_delete(@page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block)) %>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/page_blocks/edit.html.erb b/admin/app/views/spree/admin/page_blocks/edit.html.erb
index 75961df39e..ae5fa59e0b 100644
--- a/admin/app/views/spree/admin/page_blocks/edit.html.erb
+++ b/admin/app/views/spree/admin/page_blocks/edit.html.erb
@@ -9,7 +9,7 @@
<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">
+ <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>
</li>
@@ -36,10 +36,8 @@
<%= 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 class="sidebar-footer">
+ <%= link_to_delete(@page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block)) %>
</div>
</div>
</div>
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.erb
index 6ad72bd2ec..f0a2051bd1 100644
--- a/admin/app/views/spree/admin/page_builder/_add_block.html.erb
+++ b/admin/app/views/spree/admin/page_builder/_add_block.html.erb
@@ -1,4 +1,4 @@
-<%= 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| %>
+<%= form_for section.blocks.new, url: spree.admin_page_section_blocks_path(section), html: { class: 'list-group-item sidebar-page-block px-0 py-1 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">
diff --git a/admin/app/views/spree/admin/page_builder/_header.html.erb b/admin/app/views/spree/admin/page_builder/_header.html.erb
index 946dc6b3e0..e45672b374 100644
--- a/admin/app/views/spree/admin/page_builder/_header.html.erb
+++ b/admin/app/views/spree/admin/page_builder/_header.html.erb
@@ -1,31 +1,38 @@
<header id="page-builder-header" class="fixed-top">
<nav class="navbar navbar-expand-lg">
- <%= link_to spree.admin_themes_path, class: 'btn btn-light with-tip px-2', title: 'Go back to dashboard' do %>
+ <%= link_to spree.admin_themes_path, class: 'btn hover-gray with-tip px-2', title: Spree.t('admin.back_to_dashboard') do %>
<%= icon('x', class: 'mr-0') %>
<% end %>
- <div class="px-3">
- <span class="text-muted mr-1"><%= Spree.t(:theme) %>:</span>
- <strong class="mr-1"><%= @theme.name %></strong>
- &nbsp;
- <% 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' %>
+ <% if @page.custom? %>
+ <div class="px-3">
+ <span class="text-muted mr-1"><%= I18n.t('activerecord.models.spree/page.one') %>:</span>
+ <strong><%= @page.display_name %></strong>
+ </div>
- <ul class="nav nav-pills" role="tablist">
- <% if @page.custom? %>
- <li class="nav-item" 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: 'btn btn-light', data: { turbo_frame: 'dialog_modal' } %>
- </li>
- <% else %>
+ <span data-toggle="modal" data-target="#modal">
+ <%= link_to_with_icon 'settings', Spree.t(:settings), spree.edit_admin_page_path(@page.id), class: 'btn btn-light', data: { turbo_frame: 'dialog_modal' } %>
+ </span>
+ <% else %>
+ <div class="px-3">
+ <span class="text-muted mr-1"><%= Spree.t(:theme) %>:</span>
+ <strong class="mr-1"><%= @theme.name %></strong>
+ &nbsp;
+ <% if @theme.default? %>
+ <span class="badge badge-success">
+ <%= icon('check') %>
+ <%= Spree.t(:live) %>
+ </span>
+ <% else %>
+ <span class="badge badge-warning">
+ <%= Spree.t(:draft) %>
+ </span>
+ <% end %>
+ </div>
+ <%= render 'spree/admin/page_builder/pages_dropdown' %>
+
+ <ul class="nav nav-pills" role="tablist">
<li class="nav-item" role="presentation">
- <button class="nav-link active"
+ <button class="nav-link active with-tip"
title="Page sections"
data-toggle="tab"
data-target="#sections"
@@ -39,8 +46,8 @@
</button>
</li>
<li class="nav-item" role="presentation">
- <button class="nav-link"
- title="Theme"
+ <button class="nav-link with-tip"
+ title="<%= Spree.t(:theme) %>"
data-toggle="tab"
data-target="#colors"
type="button"
@@ -53,7 +60,7 @@
</button>
</li>
<li class="nav-item" role="presentation">
- <button class="nav-link"
+ <button class="nav-link with-tip"
title="Fonts"
type="button"
data-toggle="tab"
@@ -67,8 +74,8 @@
<%= icon 'typography', class: 'mr-0' %>
</button>
</li>
- <% end %>
- </ul>
+ </ul>
+ <% end %>
<ul class="nav nav-pills ml-auto" role="tablist">
<li class="nav-item" role="presentation">
@@ -94,6 +101,6 @@
</ul>
<%= link_to_with_icon 'eye', Spree.t(:preview), @page.preview_url(@theme_preview, @page_preview), class: 'btn btn-light ml-auto', target: '_blank' %>
- <%= turbo_save_button_tag(@theme.default? ? Spree.t('actions.publish') : Spree.t('actions.save')) %>
+ <%= turbo_save_button_tag(@theme.default? ? icon('cloud-up') + Spree.t('actions.publish') : icon('pencil-check') + Spree.t('actions.save')) %>
</nav>
</header>
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.erb
index 294fa2132c..ccbcab481e 100644
--- a/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb
+++ b/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb
@@ -1,23 +1,17 @@
-<% 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 btn-light" 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 %>
+<div class="dropdown h-100" id="pages_dropdown">
+ <button class="btn btn-light" 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 %>
- </div>
+ <% end %>
</div>
-<% end %>
+</div>
diff --git a/admin/app/views/spree/admin/page_builder/_sidebar.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar.html.erb
index e867a691f2..3f0d603c1f 100644
--- a/admin/app/views/spree/admin/page_builder/_sidebar.html.erb
+++ b/admin/app/views/spree/admin/page_builder/_sidebar.html.erb
@@ -1,4 +1,4 @@
-<aside id="page-builder-sidebar" class="fixed-top h-100 overflow-auto pb-5">
+<aside id="page-builder-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' %>
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.erb
index c93787379a..39e971e3b9 100644
--- a/admin/app/views/spree/admin/page_builder/_sidebar_block.html.erb
+++ b/admin/app/views/spree/admin/page_builder/_sidebar_block.html.erb
@@ -19,7 +19,7 @@
</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">
+ <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 px-1 handle-block">
<%= icon('grip-vertical', class: 'mr-0') %>
</button>
<% end %>
diff --git a/admin/app/views/spree/admin/page_links/edit.html.erb b/admin/app/views/spree/admin/page_links/edit.html.erb
index 9530ec5c06..afca2f7770 100644
--- a/admin/app/views/spree/admin/page_links/edit.html.erb
+++ b/admin/app/views/spree/admin/page_links/edit.html.erb
@@ -10,9 +10,7 @@
<%= 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 class="sidebar-footer">
+ <%= link_to_delete(@page_link, url: spree.admin_page_link_path(@page_link)) %>
</div>
<% end %>
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.erb
index e421851fd5..eab43aec38 100644
--- 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.erb
@@ -1,12 +1,8 @@
<div class="sidebar-footer">
- <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>
+ <% if @page_section.can_be_deleted? %>
+ <%= link_to_delete(@page_section, url: spree.admin_page_section_path(@page_section)) %>
+ <% end %>
+ <% 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 btn-sm ml-auto'} %>
+ <% end %>
</div>
diff --git a/admin/app/views/spree/admin/page_sections/new.html.erb b/admin/app/views/spree/admin/page_sections/new.html.erb
index e818b2eb1c..04f38b6044 100644
--- a/admin/app/views/spree/admin/page_sections/new.html.erb
+++ b/admin/app/views/spree/admin/page_sections/new.html.erb
@@ -11,7 +11,7 @@
<%= 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">
+ <ul class="list-group list-group-flush m-2 mx-3 border p-1 rounded-lg bg-white">
<% @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-action text-primary"
data-action="click->section-form#addSection"
diff --git a/admin/app/views/spree/admin/pages/edit.html.erb b/admin/app/views/spree/admin/pages/edit.html.erb
index 4a847b87e8..c238640a95 100644
--- a/admin/app/views/spree/admin/pages/edit.html.erb
+++ b/admin/app/views/spree/admin/pages/edit.html.erb
@@ -1,14 +1,14 @@
<%= 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">
- <%= modal_header(Spree.t(:page_settings)) %>
+ <%= modal_header(@page.display_name) %>
<div class="modal-body">
<%= render 'spree/admin/shared/error_messages', target: @page %>
<%= render 'form', f: f, vertical: true %>
</div>
<div class="modal-footer">
<%= 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' %>
+ <%= 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 ml-auto' %>
</div>
</div>
<% end %>
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index e72d454878..05cbda5f99 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -359,6 +359,18 @@ en:
spree/order:
one: Order
other: Orders
+ spree/page:
+ one: Page
+ other: Pages
+ spree/page_block:
+ one: Page Block
+ other: Page Blocks
+ spree/page_link:
+ one: Page Link
+ other: Page Links
+ spree/page_section:
+ one: Page Section
+ other: Page Sections
spree/payment:
one: Payment
other: Payments
@@ -1484,7 +1496,6 @@ en:
video:
heading_1_default: Why I recommend it?
heading_2_default: There's nothing like a soft hint of blush to add dimension and color to your look.
- page_settings: Page settings
pages: Pages
pages_defaults:
homepage: