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.

Admin: collapsable sidebar (#13299)

Damian Legawiec57b2b9c1a470
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 42d20420b0..d05cb00e40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,15 +12,15 @@ defaults: &defaults
DB_USERNAME: postgres
working_directory: ~/spree
docker:
- - image: &ruby_image cimg/ruby:3.3.0-browsers
+ - image: &ruby_image cimg/ruby:3.4-browsers
commands:
bundle_install:
steps:
- restore_cache:
keys:
- - spree-bundle-v11-ruby-{{ checksum ".ruby-version" }}-{{ .Branch }}
- - spree-bundle-v11-ruby-{{ checksum ".ruby-version" }}
+ - spree-bundle-v12-ruby-{{ .Branch }}
+ - spree-bundle-v12-ruby
- install_libvips
- run:
name: Install global dependencies
@@ -61,7 +61,7 @@ jobs:
- checkout
- bundle_install
- save_cache:
- key: spree-bundle-v11-ruby-{{ checksum ".ruby-version" }}-{{ .Branch }}
+ key: spree-bundle-v12-ruby-{{ .Branch }}
paths:
- ~/spree/vendor/bundle
test: &test
diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index 0fa4ae4890..0000000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-3.3.0
\ No newline at end of file
diff --git a/admin/app/assets/stylesheets/spree/admin/application.scss b/admin/app/assets/stylesheets/spree/admin/application.scss
index 076c1d3a2e..f698649298 100644
--- a/admin/app/assets/stylesheets/spree/admin/application.scss
+++ b/admin/app/assets/stylesheets/spree/admin/application.scss
@@ -15,13 +15,13 @@
@import 'components/navigation';
@import 'components/modals'; // old bootstrap modals
@import 'components/dialogs'; // new native dialogs
-@import 'components/offcanvas';
@import 'components/variants_form';
@import 'components/media_form';
@import 'components/seo_form';
@import 'components/line_items_form';
@import 'components/search_picker';
@import 'components/sortable_tree';
+@import 'components/sidebar';
@import 'components/bulk_panel';
@import 'components/wizard';
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
index 6b863026e0..30ee17e2ff 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
@@ -53,6 +53,7 @@
justify-content: flex-start;
background: transparent;
height: 2rem;
+ padding-right: 2rem;
transition-property: background-color, color;
transition-duration: 0.01s;
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
index 7f7df25a4a..fe81eb1f56 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
@@ -1,7 +1,3 @@
-.sort-handle {
- cursor: grab;
-}
-
#page-header {
height: 80px;
display: flex;
@@ -74,241 +70,14 @@
}
}
-.store-dropdown {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding-left: 0.5rem;
- padding-right: 0.75rem;
- background-color: $sidebar-bg;
- width: $sidebar-width;
- border-right: 1px solid $border-color;
- height: calc($header-height + 1px);
-}
-
-.store-dropdown-button {
- padding: 0.25rem;
- display: flex;
- align-items: center;
- justify-content: space-between;
- text-align: left;
- gap: 0.5rem;
- box-shadow: none !important;
-
- &:hover {
- background-color: $gray-50;
- }
-}
-
-.store-chooser {
- display: flex;
- flex-direction: column;
- gap: 0.25rem;
- padding: 0.25rem;
- margin: 0.25rem;
- border: 1px solid $border-color;
- border-radius: $border-radius-lg;
-
- .store-chooser-item {
- display: flex;
- align-items: center;
- gap: 0.5rem;
- border-radius: $border-radius;
- padding: 0.25rem;
- text-wrap: nowrap;
-
- &:hover {
- text-decoration: none;
- background-color: $dropdown-link-hover-bg;
- }
-
- &.active {
- cursor: not-allowed;
- background-color: $action;
- }
- }
-}
-
-#main-sidebar {
- display: flex;
- flex-direction: column;
- gap: 0.5rem;
- width: $sidebar-width;
- background-color: $sidebar-bg;
- box-shadow: inset -1px 0 0 $border-color;
- height: calc(100vh - $header-height);
- overflow-x: hidden;
- position: fixed;
- top: $header-height;
- padding-top: 0.8rem;
-
- @media (max-width: 992px) {
- display: none;
- }
-
- .nav {
- padding-left: 0.75rem;
- padding-right: 0.75rem;
- gap: 0.25rem;
- display: flex;
- flex-direction: column;
- }
-
- .nav-link {
- border-radius: $border-radius-lg;
- display: flex;
- align-items: center;
- padding-left: 0.25rem;
- padding-right: 0.25rem;
- padding-top: 0.25rem;
- padding-bottom: 0.25rem;
- color: inherit;
-
- transition: background-color 0.1s ease-in-out;
-
- .ti {
- margin-right: 0.5rem;
- border-radius: $border-radius;
- padding: 0.2rem 0.2rem;
- }
-
- &:hover {
- background-color: $gray-50;
-
- .ti {
- color: theme-color('primary');
- }
- }
- &.active {
- color: theme-color('primary');
- background-color: $white;
- box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;
- font-weight: $font-weight-medium;
-
- .ti {
- background-color: theme-color('primary');
- color: $white;
- }
- }
-
- .badge:not(.badge-info) {
- @extend .badge-light;
- border-radius: $border-radius;
- }
- }
-
- .nav-submenu {
- display: flex;
- flex-direction: column;
- list-style: none;
- padding-top: 0.25rem;
- padding-left: 2rem;
- &:before {
- content: '';
- position: absolute;
- left: 1rem;
- top: 0;
- bottom: 0.25rem;
- width: 1px;
- background-color: $gray-200;
- }
- position: relative;
-
- .nav-link {
- font-weight: 400;
- padding-top: 0.25rem;
- padding-bottom: 0.25rem;
-
- &:hover {
- background-color: $gray-50;
- }
- &.active, &:active, &:focus {
- font-weight: 600;
- background-color: transparent !important;
- box-shadow: none;
-
- &:before {
- content: '';
- position: absolute;
- left: calc(-1rem - 1px);
- top: 10%;
- width: 3px;
- height: 80%;
- background-color: theme-color('primary');
- border-radius: $border-radius-sm;
- }
- }
- }
- }
-
- .dropdown {
- padding-left: 0.5rem;
- padding-right: 0.5rem;
-
- .btn {
- padding: 0.25rem 0.25rem;
- border-radius: $border-radius;
- display: flex;
- align-items: center;
-
- &:hover, &:focus, &:active {
- background-color: $gray-50;
- }
- }
-
- .dropdown-menu {
- width: calc(100% - 1rem) !important;
- }
- }
-}
-
#content {
+ transition: margin-left 0.1s ease;
+
@media (min-width: 992px) {
margin-left: $sidebar-width + 1px;
}
}
-#enterprise-edition-notice {
- @extend .alert;
- @extend .alert-info;
-
- background-image: none;
- position: relative;
- font-size: $font-size-sm;
- padding: 0.5rem 1rem;
- margin: 0.75rem;
- border-width: 1px;
- box-shadow: $box-shadow-xs;
- p {
- margin-bottom: 0.5rem;
- }
-
- .btn-close {
- position: absolute;
- right: 0.25rem;
- top: 0.25rem;
- color: inherit !important;
-
- &:hover {
- background-color: transparent !important;
- }
- }
-}
-
-#updater-notice {
- background-color: $white;
- width: 100%;
- display: flex;
- flex-direction: row;
- gap: 1rem;
- justify-content: flex-start;
- align-items: center;
- padding: 0.5rem 0.5rem;
- border: 1px solid $border-color;
- border-radius: $border-radius-lg;
- box-shadow: $box-shadow-xs;
-}
-
.documentation-link-container {
font-size: $font-size-sm;
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_offcanvas.scss b/admin/app/assets/stylesheets/spree/admin/components/_offcanvas.scss
deleted file mode 100644
index cdba1bdbca..0000000000
--- a/admin/app/assets/stylesheets/spree/admin/components/_offcanvas.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.bs-canvas-overlay {
- opacity: $modal-backdrop-opacity;
- z-index: 1100;
-}
-
-.bs-canvas {
- top: 0;
- z-index: 1110;
- overflow-x: hidden;
- overflow-y: auto;
- width: 330px;
- transition: margin .2s ease-out;
- -webkit-transition: margin .2s ease-out;
- -moz-transition: margin .2s ease-out;
- -ms-transition: margin .2s ease-out;
-}
-
-.bs-canvas-left {
- left: 0;
- margin-left: -330px;
-}
-
-.bs-canvas-right {
- right: 0;
- margin-right: -330px;
-}
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_sidebar.scss b/admin/app/assets/stylesheets/spree/admin/components/_sidebar.scss
new file mode 100644
index 0000000000..0d6928f6b5
--- /dev/null
+++ b/admin/app/assets/stylesheets/spree/admin/components/_sidebar.scss
@@ -0,0 +1,685 @@
+.store-dropdown {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding-left: 0.5rem;
+ padding-right: 0.75rem;
+ background-color: $sidebar-bg;
+ width: $sidebar-width;
+ border-right: 1px solid $border-color;
+ height: calc($header-height + 1px);
+ transition: width 0.1s ease;
+}
+
+.store-dropdown-button {
+ padding: 0.25rem;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ text-align: left;
+ gap: 0.5rem;
+ box-shadow: none !important;
+
+ &:hover {
+ background-color: $gray-50;
+ }
+}
+
+.store-chooser {
+ display: flex;
+ flex-direction: column;
+ gap: 0.25rem;
+ padding: 0.25rem;
+ margin: 0.25rem;
+ border: 1px solid $border-color;
+ border-radius: $border-radius-lg;
+
+ .store-chooser-item {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+ border-radius: $border-radius;
+ padding: 0.25rem;
+ text-wrap: nowrap;
+
+ &:hover {
+ text-decoration: none;
+ background-color: $dropdown-link-hover-bg;
+ }
+
+ &.active {
+ cursor: not-allowed;
+ background-color: $action;
+ }
+ }
+}
+
+// User dropdown in sidebar
+.user-dropdown {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ display: none;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0.75rem 0.5rem;
+ background-color: $sidebar-bg;
+ width: $sidebar-width;
+ border-right: 1px solid $border-color;
+ border-top: 1px solid $border-color;
+ transition: width 0.1s ease;
+ z-index: 10;
+
+ @media (min-width: 992px) {
+ display: flex;
+ }
+}
+
+.user-dropdown-button {
+ padding: 0.25rem;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ text-align: left;
+ gap: 0.5rem;
+ box-shadow: none !important;
+ width: 100%;
+
+ &:hover {
+ background-color: $gray-50;
+ }
+
+ .user-name {
+ flex: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 0.875rem;
+ }
+}
+
+// Toggle button
+.sidebar-toggle-btn {
+ width: 32px;
+ height: 32px;
+ padding: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: $border-radius;
+ background-color: transparent;
+ border: none;
+ z-index: 10;
+
+ &:hover {
+ background-color: $gray-50;
+ }
+}
+
+#main-sidebar {
+ display: flex;
+ flex-direction: column;
+ gap: 0.5rem;
+ width: $sidebar-width;
+ background-color: $sidebar-bg;
+ box-shadow: inset -1px 0 0 $border-color;
+ height: calc(100vh - $header-height);
+ overflow-x: hidden;
+ position: fixed;
+ top: $header-height;
+ padding-top: 0.8rem;
+ transition: width 0.1s ease, padding 0.1s ease;
+
+ @media (max-width: 992px) {
+ display: none;
+ }
+
+ // Sidebar content
+ .sidebar-content {
+ opacity: 1;
+ transition: opacity 0.2s ease;
+ }
+
+ .nav {
+ padding-left: 0.75rem;
+ padding-right: 0.75rem;
+ gap: 0.25rem;
+ display: flex;
+ flex-direction: column;
+ }
+
+ .nav-link {
+ border-radius: $border-radius-lg;
+ display: flex;
+ align-items: center;
+ padding-left: 0.25rem;
+ padding-right: 0.25rem;
+ padding-top: 0.25rem;
+ padding-bottom: 0.25rem;
+ color: inherit;
+ white-space: nowrap;
+ transition: background-color 0.1s ease-in-out;
+
+ .ti {
+ margin-right: 0.5rem;
+ border-radius: $border-radius;
+ padding: 0.2rem 0.2rem;
+ flex-shrink: 0;
+ }
+
+ &:hover {
+ background-color: $gray-50;
+
+ .ti {
+ color: theme-color('primary');
+ }
+ }
+ &.active {
+ color: theme-color('primary');
+ background-color: $white;
+ box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;
+ font-weight: $font-weight-medium;
+
+ .ti {
+ background-color: theme-color('primary');
+ color: $white;
+ }
+ }
+
+ .badge:not(.badge-info) {
+ @extend .badge-light;
+ border-radius: $border-radius;
+ }
+ }
+
+ .nav-submenu {
+ display: flex;
+ flex-direction: column;
+ list-style: none;
+ padding-top: 0.25rem;
+ padding-left: 2rem;
+ &:before {
+ content: '';
+ position: absolute;
+ left: 1rem;
+ top: 0;
+ bottom: 0.25rem;
+ width: 1px;
+ background-color: $gray-200;
+ }
+ position: relative;
+
+ .nav-link {
+ font-weight: 400;
+ padding-top: 0.25rem;
+ padding-bottom: 0.25rem;
+
+ &:hover {
+ background-color: $gray-50;
+ }
+ &.active, &:active, &:focus {
+ font-weight: 600;
+ background-color: transparent !important;
+ box-shadow: none;
+
+ &:before {
+ content: '';
+ position: absolute;
+ left: calc(-1rem - 1px);
+ top: 10%;
+ width: 3px;
+ height: 80%;
+ background-color: theme-color('primary');
+ border-radius: $border-radius-sm;
+ }
+ }
+ }
+ }
+
+ .dropdown {
+ padding-left: 0.5rem;
+ padding-right: 0.5rem;
+
+ .btn {
+ padding: 0.25rem 0.25rem;
+ border-radius: $border-radius;
+ display: flex;
+ align-items: center;
+
+ &:hover, &:focus, &:active {
+ background-color: $gray-50;
+ }
+ }
+
+ .dropdown-menu {
+ width: calc(100% - 1rem) !important;
+ }
+ }
+}
+
+// Disable transitions during initial page load to prevent animation flash
+body.sidebar-no-transition {
+ #main-sidebar,
+ .store-dropdown,
+ .user-dropdown,
+ #content,
+ .sidebar-toggle-btn {
+ transition: none !important;
+ }
+}
+
+// Collapsed state
+body.sidebar-collapsed {
+ .sidebar-toggle-btn {
+ transform: rotate(180deg);
+ }
+
+ #main-sidebar {
+ width: $sidebar-width-collapsed;
+ padding-left: 0;
+ padding-right: 0;
+
+ .sidebar-content {
+ // Keep content visible but modify layout
+ opacity: 1;
+ pointer-events: auto;
+
+ .nav > .nav-item > .nav-link {
+ justify-content: center;
+ padding-left: 0;
+ padding-right: 0;
+ width: 40px;
+ height: 40px;
+ margin: 0 auto;
+ overflow: visible;
+ font-size: 0;
+ position: relative;
+
+ .ti {
+ margin-right: 0;
+ font-size: 1.25rem;
+ }
+
+ // Hide text labels (direct text nodes)
+ span:not(.badge) {
+ display: none;
+ }
+
+ // Position badges as notification counters
+ .badge {
+ display: flex;
+ position: absolute;
+ top: 0;
+ right: 0;
+ transform: translate(25%, -25%);
+ min-width: 18px;
+ height: 18px;
+ padding: 0 0.25rem;
+ font-size: 0.625rem;
+ line-height: 18px;
+ border-radius: 9px;
+ justify-content: center;
+ align-items: center;
+ }
+ }
+
+ #nav-link-vendors .badge {
+ display: none !important;
+ }
+
+ .nav-section-header {
+ width: $sidebar-width-collapsed - 20px;
+ span {
+ display: none;
+ }
+ }
+ }
+
+ .nav {
+ padding-left: 0;
+ padding-right: 0;
+ align-items: center;
+ }
+
+ // Hide submenus and dropdowns when collapsed
+ .nav-submenu,
+ .dropdown {
+ display: none;
+ }
+
+ // Hide enterprise edition notice
+ #enterprise-edition-notice {
+ display: none;
+ }
+
+ // Hide any mt-auto sections
+ .mt-auto {
+ display: none;
+ }
+
+ .nav-submenu {
+ gap: 0.25rem !important;
+ }
+ }
+
+ .store-dropdown {
+ width: $sidebar-width-collapsed;
+ overflow: visible;
+ justify-content: center;
+ padding-left: 0;
+ padding-right: 0;
+
+ #new-item-dropdown,
+ .store-name {
+ display: none !important;
+ }
+
+ .store-dropdown-button {
+ width: 44px;
+ height: 44px;
+ padding: 0.25rem;
+ justify-content: center;
+ overflow: hidden;
+
+ // Hide dropdown toggle arrow
+ &::after {
+ display: none;
+ }
+
+ .store-logo, img, .ti {
+ margin: 0;
+ }
+
+ // Keep the icon/logo element visible
+ .rounded-sm, .bg-white, .border, .text-dark, .bg-gray-200,
+ div[class*="rounded"], div[class*="bg-"] {
+ display: flex !important;
+ width: 32px;
+ height: 32px;
+ font-size: 1rem;
+ }
+
+ // Hide all text spans and chevron when collapsed
+ span:not([class*="rounded"]):not([class*="bg-"]),
+ .ti-chevron-down,
+ small,
+ strong {
+ display: none;
+ }
+
+ // Keep only icons/logos visible
+ img, .ti:not(.ti-chevron-down) {
+ display: block;
+ }
+ }
+ }
+
+ .user-dropdown {
+ width: $sidebar-width-collapsed;
+ overflow: visible;
+ justify-content: center;
+ padding-left: 0;
+ padding-right: 0;
+
+ .dropdown {
+ display: block !important;
+ }
+
+ .user-name {
+ display: none !important;
+ }
+
+ .user-dropdown-button {
+ width: 44px;
+ height: 44px;
+ padding: 0.25rem;
+ justify-content: center;
+ overflow: visible;
+
+ // Hide dropdown toggle arrow
+ &::after {
+ display: none;
+ }
+
+ // Keep avatar visible and centered
+ .avatar {
+ display: flex !important;
+ margin: 0;
+ }
+ }
+ }
+
+ #content {
+ @media (min-width: 992px) {
+ margin-left: $sidebar-width-collapsed + 1px;
+ }
+ }
+}
+
+// Mobile Sidebar
+.sidebar-mobile {
+ position: fixed;
+ inset: 0;
+ z-index: 1050;
+ visibility: hidden;
+ pointer-events: none;
+
+ .sidebar-backdrop {
+ position: absolute;
+ inset: 0;
+ background-color: rgba($black, 0.5);
+ opacity: 0;
+ transition: opacity 0.1s ease;
+ }
+
+ .sidebar-panel {
+ position: absolute;
+ left: 0;
+ top: 0;
+ bottom: 0;
+ width: $sidebar-width;
+ background-color: $sidebar-bg;
+ overflow-y: auto;
+ transform: translateX(-100%);
+ transition: transform 0.1s ease;
+ box-shadow: $box-shadow-lg;
+ display: flex;
+ flex-direction: column;
+
+ .sidebar-mobile-header {
+ display: flex;
+ justify-content: flex-end;
+ padding: 0.75rem;
+ border-bottom: 1px solid $border-color;
+ background-color: $sidebar-bg;
+ position: sticky;
+ top: 0;
+ z-index: 1;
+
+ .btn {
+ padding: 0.25rem;
+ width: 32px;
+ height: 32px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+
+ .sidebar-mobile-content {
+ padding-top: 0.5rem;
+ flex: 1;
+ overflow-y: auto;
+
+ // Match desktop expanded sidebar styles
+ .nav {
+ padding-left: 0.75rem;
+ padding-right: 0.75rem;
+ gap: 0.25rem;
+ display: flex;
+ flex-direction: column;
+ }
+
+ .nav-link {
+ border-radius: $border-radius-lg;
+ display: flex;
+ align-items: center;
+ padding-left: 0.25rem;
+ padding-right: 0.25rem;
+ padding-top: 0.25rem;
+ padding-bottom: 0.25rem;
+ color: inherit;
+ white-space: nowrap;
+ transition: background-color 0.1s ease-in-out;
+
+ .ti {
+ margin-right: 0.5rem;
+ border-radius: $border-radius;
+ padding: 0.2rem 0.2rem;
+ flex-shrink: 0;
+ }
+
+ &:hover {
+ background-color: $gray-50;
+
+ .ti {
+ color: theme-color('primary');
+ }
+ }
+
+ &.active {
+ color: theme-color('primary');
+ background-color: $white;
+ box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;
+ font-weight: $font-weight-medium;
+
+ .ti {
+ background-color: theme-color('primary');
+ color: $white;
+ }
+ }
+
+ .badge:not(.badge-info) {
+ @extend .badge-light;
+ border-radius: $border-radius;
+ }
+ }
+
+ .nav-submenu {
+ display: flex;
+ flex-direction: column;
+ list-style: none;
+ padding-top: 0.25rem;
+ padding-left: 2rem;
+ position: relative;
+
+ &:before {
+ content: '';
+ position: absolute;
+ left: 1rem;
+ top: 0;
+ bottom: 0.25rem;
+ width: 1px;
+ background-color: $gray-200;
+ }
+
+ .nav-link {
+ font-weight: 400;
+ padding-top: 0.25rem;
+ padding-bottom: 0.25rem;
+
+ &:hover {
+ background-color: $gray-50;
+ }
+
+ &.active, &:active, &:focus {
+ font-weight: 600;
+ background-color: transparent !important;
+ box-shadow: none;
+
+ &:before {
+ content: '';
+ position: absolute;
+ left: calc(-1rem - 1px);
+ top: 10%;
+ width: 3px;
+ height: 80%;
+ background-color: theme-color('primary');
+ border-radius: $border-radius-sm;
+ }
+ }
+ }
+ }
+
+ .dropdown {
+ padding-left: 0.5rem;
+ padding-right: 0.5rem;
+
+ .btn {
+ padding: 0.25rem 0.25rem;
+ border-radius: $border-radius;
+ display: flex;
+ align-items: center;
+
+ &:hover, &:focus, &:active {
+ background-color: $gray-50;
+ }
+ }
+
+ .dropdown-menu {
+ width: calc(100% - 1rem) !important;
+ }
+ }
+ }
+
+ // User dropdown in mobile sidebar
+ .user-dropdown {
+ position: relative;
+ display: flex;
+ width: 100%;
+ border-right: none;
+ border-top: 1px solid $border-color;
+ margin-top: auto;
+ }
+ }
+
+ &.sidebar-mobile-open {
+ visibility: visible;
+ pointer-events: auto;
+
+ .sidebar-backdrop {
+ opacity: 1;
+ }
+
+ .sidebar-panel {
+ transform: translateX(0);
+ }
+ }
+}
+
+#enterprise-edition-notice {
+ @extend .alert;
+ @extend .alert-info;
+
+ background-image: none;
+ position: relative;
+ font-size: $font-size-sm;
+ padding: 0.5rem 1rem;
+ margin: 0.75rem;
+ border-width: 1px;
+ box-shadow: $box-shadow-xs;
+ p {
+ margin-bottom: 0.5rem;
+ }
+
+ .btn-close {
+ position: absolute;
+ right: 0.25rem;
+ top: 0.25rem;
+ color: inherit !important;
+
+ &:hover {
+ background-color: transparent !important;
+ }
+ }
+}
\ No newline at end of file
diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
index cfb0f49066..07ee6f64fe 100644
--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
@@ -227,6 +227,7 @@ $list-group-item-padding-y: 0.75rem !default;
$header-bg: $body-bg !default;
$header-height: 58px !default;
$sidebar-width: 220px !default;
+$sidebar-width-collapsed: 59px !default;
$sidebar-bg: $light !default;
$progress-bar-bg: rgba($blue, 0.75) !default;
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
index 28e0d9dac2..82ed17c89c 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
@@ -379,6 +379,10 @@ small,
border: 2px dashed $blue !important;
}
+.sort-handle {
+ cursor: grab;
+}
+
.handle {
cursor: grab !important;
}
@@ -702,8 +706,10 @@ div.uppy-Root {
.breadcrumb {
gap: 0.5rem;
align-items: center;
- color: $text-muted;
font-weight: $font-weight-medium;
+ height: 32px;
+ border-left: 1px solid $gray-50;
+ border-radius: 0;
li {
a {
diff --git a/admin/app/assets/stylesheets/spree/admin/views/_dashboard.scss b/admin/app/assets/stylesheets/spree/admin/views/_dashboard.scss
index 78ac7a0be7..f08a34a8c6 100644
--- a/admin/app/assets/stylesheets/spree/admin/views/_dashboard.scss
+++ b/admin/app/assets/stylesheets/spree/admin/views/_dashboard.scss
@@ -31,4 +31,18 @@
display: flex;
}
}
+}
+
+#updater-notice {
+ background-color: $white;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ gap: 1rem;
+ justify-content: flex-start;
+ align-items: center;
+ padding: 0.5rem 0.5rem;
+ border: 1px solid $border-color;
+ border-radius: $border-radius-lg;
+ box-shadow: $box-shadow-xs;
}
\ No newline at end of file
diff --git a/admin/app/helpers/spree/admin/drawer_helper.rb b/admin/app/helpers/spree/admin/drawer_helper.rb
index 2b1636d5b9..489f0550e1 100644
--- a/admin/app/helpers/spree/admin/drawer_helper.rb
+++ b/admin/app/helpers/spree/admin/drawer_helper.rb
@@ -1,18 +1,18 @@
module Spree
module Admin
module DrawerHelper
- def drawer_header(title)
+ def drawer_header(title, action = 'drawer#close')
content_tag(:div, class: 'drawer-header') do
- content_tag(:h5, title, class: 'drawer-title') + drawer_close_button
+ content_tag(:h5, title, class: 'drawer-title') + drawer_close_button(action)
end.html_safe
end
- def drawer_close_button
- button_tag('', type: 'button', class: 'btn-close', data: { action: 'drawer#close', dismiss: 'drawer', aria_label: Spree.t(:close) }).html_safe
+ def drawer_close_button(action = 'drawer#close')
+ button_tag('', type: 'button', class: 'btn-close', data: { action: action, dismiss: 'drawer', aria_label: Spree.t(:close) }).html_safe
end
- def drawer_discard_button
- button_tag(type: 'button', class: 'btn btn-light', data: { action: 'drawer#close', dismiss: 'drawer' }) do
+ def drawer_discard_button(action = 'drawer#close')
+ button_tag(type: 'button', class: 'btn btn-light', data: { action: action, dismiss: 'drawer' }) do
Spree.t('actions.discard')
end.html_safe
end
diff --git a/admin/app/javascript/spree/admin/application.js b/admin/app/javascript/spree/admin/application.js
index 74b5027e60..e3c174a941 100644
--- a/admin/app/javascript/spree/admin/application.js
+++ b/admin/app/javascript/spree/admin/application.js
@@ -15,7 +15,6 @@ import "mapkick/bundle"
// Helpers
import 'spree/admin/helpers/tinymce'
-import 'spree/admin/helpers/canvas'
import 'spree/admin/helpers/trix/video_embed'
import 'spree/admin/helpers/bootstrap'
@@ -76,6 +75,7 @@ import SearchPickerController from 'spree/admin/controllers/search_picker_contro
import SectionFormController from 'spree/admin/controllers/section_form_controller'
import SelectController from 'spree/admin/controllers/select_controller'
import SeoFormController from 'spree/admin/controllers/seo_form_controller'
+import SidebarController from 'spree/admin/controllers/sidebar_controller'
import SlugFormController from 'spree/admin/controllers/slug_form_controller'
import StickyController from 'spree/admin/controllers/sticky_controller'
import SortableAutoSubmit from 'spree/admin/controllers/sortable_auto_submit_controller'
@@ -141,6 +141,7 @@ application.register('search-picker', SearchPickerController)
application.register('section-form', SectionFormController)
application.register('select', SelectController)
application.register('seo-form', SeoFormController)
+application.register('sidebar', SidebarController)
application.register('slug-form', SlugFormController)
application.register('sticky', StickyController)
application.register('sortable', Sortable)
diff --git a/admin/app/javascript/spree/admin/controllers/sidebar_controller.js b/admin/app/javascript/spree/admin/controllers/sidebar_controller.js
new file mode 100644
index 0000000000..a76bb5ea81
--- /dev/null
+++ b/admin/app/javascript/spree/admin/controllers/sidebar_controller.js
@@ -0,0 +1,231 @@
+import { Controller } from "@hotwired/stimulus";
+import {
+ computePosition,
+ flip,
+ shift,
+ offset,
+ autoUpdate,
+} from "@floating-ui/dom";
+
+export default class extends Controller {
+ static targets = ["desktop", "mobile"];
+
+ static values = {
+ storageKey: { type: String, default: "spree_admin_sidebar_open" },
+ };
+
+ connect() {
+ // Initialize dropdown tracking
+ this.activeDropdown = null
+ this.dropdownCleanup = null
+ this.submenuHoverHandlers = new Map()
+ this.hideTimeout = null
+
+ // Disable transitions during initial load to prevent animation flash
+ this.element.classList.add("sidebar-no-transition");
+
+ // Restore saved state for desktop sidebar (default is open/expanded)
+ const savedState = localStorage.getItem(this.storageKeyValue);
+
+ // Only collapse if explicitly saved as false
+ if (savedState === "false") {
+ this.element.classList.add("sidebar-collapsed");
+ this.setupCollapsedSubmenuHandlers();
+ } else {
+ // Explicitly ensure it's not collapsed (default is expanded)
+ this.element.classList.remove("sidebar-collapsed");
+ }
+
+ // Re-enable transitions after initial state is set
+ requestAnimationFrame(() => {
+ this.element.classList.remove("sidebar-no-transition");
+ });
+ }
+
+ disconnect() {
+ // Clear any pending hide timeout
+ if (this.hideTimeout) {
+ clearTimeout(this.hideTimeout);
+ this.hideTimeout = null;
+ }
+
+ this.cleanupSubmenuHandlers();
+ if (this.dropdownCleanup) {
+ this.dropdownCleanup();
+ this.dropdownCleanup = null;
+ }
+ }
+
+ toggle() {
+ this.element.classList.toggle("sidebar-collapsed");
+ const isCollapsed = this.element.classList.contains("sidebar-collapsed");
+ localStorage.setItem(this.storageKeyValue, String(!isCollapsed));
+
+ // Setup or cleanup submenu handlers based on state
+ if (isCollapsed) {
+ this.setupCollapsedSubmenuHandlers();
+ } else {
+ this.cleanupSubmenuHandlers();
+ }
+ }
+
+ openMobile() {
+ if (this.hasMobileTarget) {
+ this.mobileTarget.classList.add("sidebar-mobile-open");
+ }
+ }
+
+ closeMobile() {
+ if (this.hasMobileTarget) {
+ this.mobileTarget.classList.remove("sidebar-mobile-open");
+ }
+ }
+
+ setupCollapsedSubmenuHandlers() {
+ const sidebar = document.querySelector('#main-sidebar');
+ if (!sidebar) return;
+
+ // Find all dropdown submenus
+ const dropdowns = sidebar.querySelectorAll('.nav-submenu-dropdown');
+
+ dropdowns.forEach(dropdown => {
+ // Find the associated nav-item (previous sibling, skipping the regular nav-submenu)
+ let navItem = dropdown.previousElementSibling;
+
+ // Skip over the regular .nav-submenu to get to the .nav-item
+ while (navItem && navItem.classList.contains('nav-submenu')) {
+ navItem = navItem.previousElementSibling;
+ }
+
+ if (!navItem || !navItem.classList.contains('nav-item')) return;
+
+ const showHandler = () => this.showSubmenuFloating(navItem, dropdown);
+ const hideHandler = () => this.scheduleHideSubmenu();
+
+ navItem.addEventListener('mouseenter', showHandler);
+ navItem.addEventListener('mouseleave', hideHandler);
+ dropdown.addEventListener('mouseenter', showHandler);
+ dropdown.addEventListener('mouseleave', hideHandler);
+
+ this.submenuHoverHandlers.set(navItem, { showHandler, hideHandler, dropdown });
+ });
+ }
+
+ cleanupSubmenuHandlers() {
+ this.submenuHoverHandlers.forEach(({ showHandler, hideHandler, dropdown }, navItem) => {
+ navItem.removeEventListener('mouseenter', showHandler);
+ navItem.removeEventListener('mouseleave', hideHandler);
+ dropdown.removeEventListener('mouseenter', showHandler);
+ dropdown.removeEventListener('mouseleave', hideHandler);
+ });
+ this.submenuHoverHandlers.clear();
+
+ // Hide active dropdown if any
+ if (this.activeDropdown) {
+ this.hideSubmenuFloating();
+ }
+ }
+
+ showSubmenuFloating(navItem, dropdown) {
+ // Cancel any pending hide
+ if (this.hideTimeout) {
+ clearTimeout(this.hideTimeout);
+ this.hideTimeout = null;
+ }
+
+ // If showing same dropdown, return
+ if (this.activeDropdown === dropdown) {
+ return;
+ }
+
+ // Hide any currently active dropdown
+ if (this.activeDropdown) {
+ this.hideSubmenuFloating();
+ }
+
+ // Store reference
+ this.activeDropdown = dropdown;
+
+ // Move dropdown to body for proper positioning (to avoid sidebar overflow clipping)
+ if (dropdown.parentNode !== document.body) {
+ dropdown._originalParent = dropdown.parentNode;
+ dropdown._originalNextSibling = dropdown.nextSibling;
+ document.body.appendChild(dropdown);
+ }
+
+ // Show dropdown
+ dropdown.classList.remove('d-none');
+
+ // Style dropdown items
+ dropdown.querySelectorAll('.nav-link').forEach((item, index) => {
+ item.classList.add('dropdown-item');
+ if (index > 0) {
+ item.classList.add('mt-1');
+ }
+ });
+
+ // Position using Floating UI
+ if (this.dropdownCleanup) {
+ this.dropdownCleanup();
+ }
+
+ this.dropdownCleanup = autoUpdate(navItem, dropdown, () => {
+ computePosition(navItem, dropdown, {
+ placement: 'right-start',
+ middleware: [
+ offset(8),
+ flip(),
+ shift({ padding: 8 }),
+ ],
+ }).then(({ x, y }) => {
+ Object.assign(dropdown.style, {
+ left: `${x}px`,
+ top: `${y}px`,
+ });
+ });
+ });
+ }
+
+ scheduleHideSubmenu() {
+ // Clear any existing timeout
+ if (this.hideTimeout) {
+ clearTimeout(this.hideTimeout);
+ }
+
+ // Schedule hide with delay to allow mouse to move to submenu
+ this.hideTimeout = setTimeout(() => {
+ this.hideSubmenuFloating();
+ this.hideTimeout = null;
+ }, 150); // 150ms grace period
+ }
+
+ hideSubmenuFloating() {
+ if (!this.activeDropdown) return;
+
+ // Stop auto-update
+ if (this.dropdownCleanup) {
+ this.dropdownCleanup();
+ this.dropdownCleanup = null;
+ }
+
+ // Hide dropdown
+ this.activeDropdown.classList.add('d-none');
+
+ // Restore dropdown to original position in sidebar
+ if (this.activeDropdown._originalParent) {
+ if (this.activeDropdown._originalNextSibling) {
+ this.activeDropdown._originalParent.insertBefore(
+ this.activeDropdown,
+ this.activeDropdown._originalNextSibling
+ );
+ } else {
+ this.activeDropdown._originalParent.appendChild(this.activeDropdown);
+ }
+ this.activeDropdown._originalParent = null;
+ this.activeDropdown._originalNextSibling = null;
+ }
+
+ // Clear reference
+ this.activeDropdown = null;
+ }
+}
diff --git a/admin/app/javascript/spree/admin/helpers/canvas.js b/admin/app/javascript/spree/admin/helpers/canvas.js
deleted file mode 100644
index a77055bf71..0000000000
--- a/admin/app/javascript/spree/admin/helpers/canvas.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// ugly JS copied from a tutorial :)
-const initOffcanvas = () => {
- document.querySelectorAll('.pull-bs-canvas-right, .pull-bs-canvas-left').forEach((element) => {
- element.addEventListener('click', () => {
- document.body.insertAdjacentHTML('afterbegin', '<div class="bs-canvas-overlay bg-dark position-fixed w-100 h-100"></div>');
- if(element.classList.contains('pull-bs-canvas-right'))
- document.querySelector('.bs-canvas-right').classList.add('mr-0');
- else
- document.querySelector('.bs-canvas-left').classList.add('ml-0');
- })
- })
-
- document.querySelectorAll('.bs-canvas-close, .bs-canvas-overlay').forEach((element) => {
- element.addEventListener('click', () => {
- let elm = element.classList.contains('bs-canvas-close') ? element.closest('.bs-canvas') : document.querySelector('.bs-canvas');
- elm.classList.remove('mr-0', 'ml-0');
- document.querySelector('.bs-canvas-overlay').remove();
- })
- })
-}
-
-const hideOffcanvas = () => {
- document.querySelector('.bs-canvas')?.classList?.remove('mr-0', 'ml-0');
- document.querySelector('.bs-canvas-overlay')?.remove();
-}
-
-document.addEventListener("turbo:load", initOffcanvas)
-document.addEventListener("turbo:click", hideOffcanvas)
-
diff --git a/admin/app/views/layouts/spree/admin.html.erb b/admin/app/views/layouts/spree/admin.html.erb
index fb96a3a322..3e1308abb1 100644
--- a/admin/app/views/layouts/spree/admin.html.erb
+++ b/admin/app/views/layouts/spree/admin.html.erb
@@ -6,7 +6,7 @@
</head>
<body class="admin min-vh-100 <%= controller_name %> <%= action_name %>"
- data-controller="admin"
+ data-controller="admin sidebar"
data-action="keydown.ctrl+s->admin#save keydown.meta+s->admin#save"
>
<%= render_admin_partials(:body_start_partials) %>
diff --git a/admin/app/views/spree/admin/gift_cards/_filters.html.erb b/admin/app/views/spree/admin/gift_cards/_filters.html.erb
index fe67b7cf03..3efc97cee4 100644
--- a/admin/app/views/spree/admin/gift_cards/_filters.html.erb
+++ b/admin/app/views/spree/admin/gift_cards/_filters.html.erb
@@ -5,18 +5,23 @@
url: filter_form_url,
class: "filter-wrap",
data: {
- controller: "filters dropdown",
- filters_url_value: request.url,
- dropdown_placement_value: "bottom-end"
+ controller: "filters dialog",
+ filters_url_value: request.url
} do |f| %>
- <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
+ <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
- <div class="d-flex flex-column flex-lg-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont, label: Spree.t(:code) %>
- <%= render "table_filter_dropdown" %>
- <%= render "spree/admin/shared/filters_button" %>
- </div>
- <div data-dropdown-target="menu" id="table-filter" class="hidden">
+ <div class="d-flex flex-column flex-lg-row gap-2">
+ <%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont, label: Spree.t(:code) %>
+ <%= render "table_filter_dropdown" %>
+ <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+ <%= icon "adjustments", class: "mr-1" %>
+ <%= Spree.t("admin.filters") %>
+ <% end %>
+ </div>
+
+ <dialog class="drawer" data-dialog-target="dialog" id="gift-card-filters-drawer">
+ <%= drawer_header(Spree.t(:filter), 'dialog#close') %>
+ <div class="drawer-body">
<% if params[:user_id].blank? %>
<div class="form-group">
<%= f.label :users_email_eq, Spree.t(:email) %>
@@ -30,16 +35,19 @@
</div>
<%= render_admin_partials(:gift_cards_filters_partials, f: f) %>
-
- <div class="form-actions">
- <%= turbo_save_button_tag Spree.t(:filter_results) do %>
- <%= icon("search") %>
- <%= Spree.t(:filter_results) %>
- <% end %>
</div>
- </div>
+ <div class="drawer-footer">
+ <%= drawer_discard_button('dialog#close') %>
+ <div class="form-actions">
+ <%= turbo_save_button_tag Spree.t(:filter_results) do %>
+ <%= icon("search") %>
+ <%= Spree.t(:filter_results) %>
+ <% end %>
+ </div>
+ </div>
+ </dialog>
- <%= render "spree/admin/shared/filter_badge_template" %>
+ <%= render "spree/admin/shared/filter_badge_template" %>
<div data-filters-target="badgesContainer" class="filter-badges-container"></div>
<% end %>
diff --git a/admin/app/views/spree/admin/orders/_customer.html.erb b/admin/app/views/spree/admin/orders/_customer.html.erb
index f9811ff8f2..25ad2cb292 100644
--- a/admin/app/views/spree/admin/orders/_customer.html.erb
+++ b/admin/app/views/spree/admin/orders/_customer.html.erb
@@ -4,7 +4,7 @@
<%= Spree.t(:customer) %>
</h5>
<% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>
- <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto' do %>
+ <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto', portal: false do %>
<%= dropdown_toggle class: 'btn-light btn-sm px-1', data: { test_id: 'dropdown-toggle' } do %>
<%= icon 'dots-vertical', class: 'mr-0' %>
<% end %>
diff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erb
index 7c50b3563d..8b3faf5eb3 100644
--- a/admin/app/views/spree/admin/orders/_filters.html.erb
+++ b/admin/app/views/spree/admin/orders/_filters.html.erb
@@ -14,33 +14,38 @@
url: search_form_path,
class: "filter-wrap",
data: {
- controller: "filters dropdown",
- filters_url_value: request.url,
- dropdown_placement_value: "bottom-end"
+ controller: "filters dialog",
+ filters_url_value: request.url
} do |f| %>
- <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
+ <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
- <div class="d-flex flex-column flex-lg-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
+ <div class="d-flex flex-column flex-lg-row gap-2">
+ <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
- <% if controller_name == 'checkouts' %>
- <%= render "spree/admin/shared/calendar_range_picker",
- date_from_input_name: "q[created_at_gt]",
- date_to_input_name: "q[created_at_lt]",
- date_from_value: params.dig(:q, :created_at_gt),
- date_to_value: params.dig(:q, :created_at_lt) %>
- <% else %>
- <%= render "spree/admin/shared/calendar_range_picker",
- date_from_input_name: "q[completed_at_gt]",
- date_to_input_name: "q[completed_at_lt]",
- date_from_value: params.dig(:q, :completed_at_gt),
- date_to_value: params.dig(:q, :completed_at_lt) %>
- <% end %>
+ <% if controller_name == 'checkouts' %>
+ <%= render "spree/admin/shared/calendar_range_picker",
+ date_from_input_name: "q[created_at_gt]",
+ date_to_input_name: "q[created_at_lt]",
+ date_from_value: params.dig(:q, :created_at_gt),
+ date_to_value: params.dig(:q, :created_at_lt) %>
+ <% else %>
+ <%= render "spree/admin/shared/calendar_range_picker",
+ date_from_input_name: "q[completed_at_gt]",
+ date_to_input_name: "q[completed_at_lt]",
+ date_from_value: params.dig(:q, :completed_at_gt),
+ date_to_value: params.dig(:q, :completed_at_lt) %>
+ <% end %>
+
+ <%= render "spree/admin/orders/table_filter_dropdown" %>
+ <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+ <%= icon "adjustments", class: "mr-1" %>
+ <%= Spree.t("admin.filters") %>
+ <% end %>
+ </div>
- <%= render "spree/admin/orders/table_filter_dropdown" %>
- <%= render 'spree/admin/shared/filters_button' %>
- </div>
- <div data-dropdown-target="menu" id="table-filter" class="hidden">
+ <dialog class="drawer" data-dialog-target="dialog" id="order-filters-drawer">
+ <%= drawer_header(Spree.t(:filter), 'dialog#close') %>
+ <div class="drawer-body">
<%= f.hidden_field :payment_state_not_eq, value: params.dig(:q, :payment_state_not_eq) %>
<%= f.hidden_field :state_not_eq, value: params.dig(:q, :state_not_eq) %>
<%= f.hidden_field :user_id_eq, value: @user.try(:id) %>
@@ -99,8 +104,12 @@
</div>
<%= render_admin_partials(:orders_filters_partials, f: f) %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
+ </div>
+ <div class="drawer-footer">
+ <%= drawer_discard_button('dialog#close') %>
+ <%= render 'spree/admin/shared/filter_submit' %>
+ </div>
+ </dialog>
<%= render "spree/admin/shared/filter_badge_template" %>
<div data-filters-target="badgesContainer" class="filter-badges-container"></div>
diff --git a/admin/app/views/spree/admin/posts/filters.html.erb b/admin/app/views/spree/admin/posts/filters.html.erb
index ef0398c9e2..f96e2e101d 100644
--- a/admin/app/views/spree/admin/posts/filters.html.erb
+++ b/admin/app/views/spree/admin/posts/filters.html.erb
@@ -1,10 +1,16 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dropdown"} do |f| %>
- <div class="d-flex flex-column flex-lg-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :search_by_title, label: Spree.t(:title) %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
+ <div class="d-flex flex-column flex-lg-row gap-2">
+ <%= render 'spree/admin/shared/filters_search_bar', param: :search_by_title, label: Spree.t(:title) %>
- <%= render 'spree/admin/shared/filters_button' %>
- </div>
- <div data-dropdown-target="menu" id="table-filter" class="hidden">
+ <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+ <%= icon "adjustments", class: "mr-1" %>
+ <%= Spree.t("admin.filters") %>
+ <% end %>
+ </div>
+
+ <dialog class="drawer" data-dialog-target="dialog" id="posts-filters-drawer">
+ <%= drawer_header(Spree.t(:filter), 'dialog#close') %>
+ <div class="drawer-body">
<div class="form-group">
<%= f.label :author_id_eq, Spree.t(:author) %>
<%= f.select :author_id_eq,
@@ -20,8 +26,12 @@
{ data: { filters_target: :input, controller: 'autocomplete-select' } } %>
</div>
<%= render_admin_partials(:posts_filters_partials, f: f) %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
+ </div>
+ <div class="drawer-footer">
+ <%= drawer_discard_button('dialog#close') %>
+ <%= render 'spree/admin/shared/filter_submit' %>
+ </div>
+ </dialog>
<%= render "spree/admin/shared/filter_badge_template" %>
diff --git a/admin/app/views/spree/admin/products/_filters.html.erb b/admin/app/views/spree/admin/products/_filters.html.erb
index 0aab940aa2..3249b6d73e 100644
--- a/admin/app/views/spree/admin/products/_filters.html.erb
+++ b/admin/app/views/spree/admin/products/_filters.html.erb
@@ -1,9 +1,10 @@
<% frame_name ||= nil %>
+
<%= search_form_for product_list_filters_search_form_path,
class: "filter-wrap",
data: {
- controller: "filters dropdown",
+ controller: "filters dialog",
filters_url_value: request.url
} do |f| %>
<%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
@@ -11,9 +12,15 @@
<div class="d-flex flex-column flex-lg-row gap-2">
<%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
<%= render "spree/admin/products/table_filter_dropdown" %>
- <%= render 'spree/admin/shared/filters_button' %>
+ <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+ <%= icon "adjustments", class: "mr-1" %>
+ <%= Spree.t("admin.filters") %>
+ <% end %>
</div>
- <div data-dropdown-target="menu" id="table-filter" class="hidden">
+
+ <dialog class="drawer" data-dialog-target="dialog" id="product-filters-drawer">
+ <%= drawer_header(Spree.t(:filter), 'dialog#close') %>
+ <div class="drawer-body">
<%= f.hidden_field :status_eq, value: params.dig(:q, :status_eq) %>
<div class="form-group">
<%= f.label :taxons_id_in, Spree.t(:taxons) %>
@@ -44,10 +51,14 @@
filters_target: "input",
} %>
</div>
-
+
<%= render_admin_partials(:products_filters_partials, f: f) %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
+ </div>
+ <div class="drawer-footer">
+ <%= drawer_discard_button('dialog#close') %>
+ <%= render 'spree/admin/shared/filter_submit' %>
+ </div>
+ </dialog>
<%= render "spree/admin/shared/filter_badge_template" %>
diff --git a/admin/app/views/spree/admin/promotions/_filters.html.erb b/admin/app/views/spree/admin/promotions/_filters.html.erb
index ad54c50462..f90e550b6a 100644
--- a/admin/app/views/spree/admin/promotions/_filters.html.erb
+++ b/admin/app/views/spree/admin/promotions/_filters.html.erb
@@ -1,17 +1,27 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dropdown"} do |f| %>
- <div class="d-flex flex-column flex-lg-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
- <%= render "spree/admin/promotions/table_filter_dropdown" %>
- <%= render 'spree/admin/shared/filters_button' %>
- </div>
- <div data-dropdown-target="menu" id="table-filter" class="hidden">
- <div class="form-group">
- <%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>
- <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-control", data: { filters_target: :input } %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
+ <div class="d-flex flex-column flex-lg-row gap-2">
+ <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
+ <%= render "spree/admin/promotions/table_filter_dropdown" %>
+ <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+ <%= icon "adjustments", class: "mr-1" %>
+ <%= Spree.t("admin.filters") %>
+ <% end %>
</div>
- <%= render_admin_partials(:promotions_filters_partials, f: f) %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
+
+ <dialog class="drawer" data-dialog-target="dialog" id="promotion-filters-drawer">
+ <%= drawer_header(Spree.t(:filter), 'dialog#close') %>
+ <div class="drawer-body">
+ <div class="form-group">
+ <%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>
+ <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-control", data: { filters_target: :input } %>
+ </div>
+ <%= render_admin_partials(:promotions_filters_partials, f: f) %>
+ </div>
+ <div class="drawer-footer">
+ <%= drawer_discard_button('dialog#close') %>
+ <%= render 'spree/admin/shared/filter_submit' %>
+ </div>
+ </dialog>
<%= render "spree/admin/shared/filter_badge_template" %>
diff --git a/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb
index 9d6ec6e938..a22a113a98 100644
--- a/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb
+++ b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb
@@ -18,7 +18,7 @@
<% end %>
</div>
<% end %>
- <%= dropdown_menu class: "pt-2 px-2 pb-1" do %>
+ <%= dropdown_menu class: "pt-2 px-2 pb-1", style: 'min-width: 29rem' do %>
<div data-calendar-range-target="picker" class="d-none"></div>
<% end %>
diff --git a/admin/app/views/spree/admin/shared/_content_header.html.erb b/admin/app/views/spree/admin/shared/_content_header.html.erb
index 0c50e2f613..57ab1c1c54 100644
--- a/admin/app/views/spree/admin/shared/_content_header.html.erb
+++ b/admin/app/views/spree/admin/shared/_content_header.html.erb
@@ -22,7 +22,7 @@
<% end %>
<% if show_record_subtitle || content_for(:page_actions_dropdown) %>
- <%= dropdown id: 'page_actions_dropdown', class: 'h-100' do %>
+ <%= dropdown id: 'page_actions_dropdown', class: 'h-100', portal: false do %>
<%= dropdown_toggle id: 'more-actions-link', class: 'btn-light h-100 p-2' do %>
<%= icon 'dots-vertical', class: 'mr-0' %>
<% end %>
diff --git a/admin/app/views/spree/admin/shared/_header.html.erb b/admin/app/views/spree/admin/shared/_header.html.erb
index 5507d7b8de..d3613b7d10 100644
--- a/admin/app/views/spree/admin/shared/_header.html.erb
+++ b/admin/app/views/spree/admin/shared/_header.html.erb
@@ -1,11 +1,9 @@
<div id="scroll-header"></div>
-<%= render 'spree/admin/shared/offcanvas_nav' %>
-
<header id="header" class="sticky-top py-0">
<nav class="navbar navbar-expand-lg p-0 d-flex align-items-center pr-3">
<div class="d-lg-none pr-3 border-right">
- <button type="button" class="btn btn-light pull-bs-canvas-left px-2 ml-3 text-decoration-none">
+ <button type="button" class="btn btn-light px-2 ml-3 text-decoration-none" data-action="click->sidebar#openMobile">
<%= icon('menu-2', class: 'mr-0') %>
</button>
</div>
@@ -20,13 +18,13 @@
<% end %>
<% end %>
+ <button type="button" class="sidebar-toggle-btn ml-3 mr-3 d-none d-lg-block" data-action="click->sidebar#toggle" aria-label="<%= Spree.t('admin.expand_sidebar') %>">
+ <%= icon('layout-sidebar-left-collapse') %>
+ </button>
+
<div class="d-none d-lg-block">
<%= render 'spree/admin/shared/breadcrumbs' %>
</div>
-
- <div class="ml-auto d-flex align-items-center">
- <%= render 'spree/admin/shared/user_dropdown' %>
- </div>
</nav>
</header>
diff --git a/admin/app/views/spree/admin/shared/_navigation_item.html.erb b/admin/app/views/spree/admin/shared/_navigation_item.html.erb
index 7b64fbc289..5004fd69e6 100644
--- a/admin/app/views/spree/admin/shared/_navigation_item.html.erb
+++ b/admin/app/views/spree/admin/shared/_navigation_item.html.erb
@@ -16,6 +16,7 @@
# Build additional HTML options (like target)
html_options = {}
html_options[:target] = item.target if item.target.present?
+ html_options[:id] = "nav-link-#{item.key}" if item.key.present?
# Build complete label with badge (like old menu pattern)
complete_label = item_label
@@ -27,25 +28,35 @@
if tooltip_text.present?
complete_label += tooltip(tooltip_text)
end
- complete_label = complete_label.html_safe
+ complete_label = complete_label&.html_safe
%>
<% if item.section? %>
<%# Section header %>
- <li class="nav-item nav-section-header mt-3">
- <span class="text-muted text-uppercase small"><%= item.section_label %></span>
+ <li class="nav-item nav-section-header mt-3 border-top pt-3 pl-2">
+ <span class="text-muted text-uppercase font-weight-light font-size-sm"><%= item.section_label %></span>
</li>
<% else %>
<% if has_children %>
<%# Item with children (submenu shows when parent is active) %>
<%= nav_item(complete_label, item_url, icon: item.icon, active: is_active, data: data_attrs, **html_options) %>
- <% if is_active %>
- <ul class="nav-submenu">
- <% item.children.select { |child| child.visible?(self) }.each do |child_item| %>
- <%= render 'spree/admin/shared/navigation_item', item: child_item, context: context %>
- <% end %>
- </ul>
- <% end %>
+
+ <%# Submenu for expanded sidebar (only shown when active) %>
+ <ul class="nav-submenu <% unless is_active %>d-none<% end %>" id="nav-submenu-<%= item.key %>">
+ <% item.children.select { |child| child.visible?(self) }.each do |child_item| %>
+ <%= render 'spree/admin/shared/navigation_item', item: child_item, context: context %>
+ <% end %>
+ </ul>
+
+ <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+ <ul class="nav-submenu-dropdown d-none dropdown-container" id="nav-submenu-dropdown-<%= item.key %>">
+ <%# Add parent item as first item in dropdown %>
+ <%= nav_item(item_label, item_url, icon: nil) %>
+
+ <% item.children.select { |child| child.visible?(self) }.each do |child_item| %>
+ <%= render 'spree/admin/shared/navigation_item', item: child_item, context: context %>
+ <% end %>
+ </ul>
<% else %>
<%# Regular item without children %>
<%= nav_item(complete_label, item_url, icon: item.icon, active: is_active, data: data_attrs, **html_options) %>
diff --git a/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb b/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb
index 231816e8af..c738e1b62e 100644
--- a/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb
+++ b/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb
@@ -1,4 +1,4 @@
-<%= dropdown do %>
+<%= dropdown id: 'new-item-dropdown' do %>
<%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>
<%= icon 'plus', class: 'mr-0' %>
<% end %>
diff --git a/admin/app/views/spree/admin/shared/_offcanvas_nav.html.erb b/admin/app/views/spree/admin/shared/_offcanvas_nav.html.erb
deleted file mode 100644
index 80ad312617..0000000000
--- a/admin/app/views/spree/admin/shared/_offcanvas_nav.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- Left off-canvas sidebar -->
-<div class="bs-canvas bs-canvas-left position-fixed h-100 bg-light border-right">
- <div class="bs-canvas-content px-2">
- <% if try_spree_current_user.present? %>
- <% if defined?(current_vendor) && current_vendor.present? %>
- <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
- <% elsif defined?(current_store) && current_store&.present? %>
- <%= render 'spree/admin/shared/sidebar/store_nav' %>
- <% end %>
- <% end %>
- </div>
-</div>
diff --git a/admin/app/views/spree/admin/shared/_sidebar.html.erb b/admin/app/views/spree/admin/shared/_sidebar.html.erb
index 1aabb91294..37c3e30aac 100644
--- a/admin/app/views/spree/admin/shared/_sidebar.html.erb
+++ b/admin/app/views/spree/admin/shared/_sidebar.html.erb
@@ -1,7 +1,33 @@
-<aside id="main-sidebar" class="overflow-y-auto">
- <% if defined?(current_vendor) && current_vendor.present? %>
- <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
- <% else %>
- <%= render 'spree/admin/shared/sidebar/store_nav' %>
- <% end %>
-</aside>
\ No newline at end of file
+<%# Desktop Sidebar %>
+<aside id="main-sidebar" class="overflow-y-auto" data-sidebar-target="desktop">
+ <div class="sidebar-content">
+ <% if defined?(current_vendor) && current_vendor.present? %>
+ <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
+ <% else %>
+ <%= render 'spree/admin/shared/sidebar/store_nav' %>
+ <% end %>
+ </div>
+
+ <%= render 'spree/admin/shared/user_dropdown' %>
+</aside>
+
+<%# Mobile Sidebar Overlay %>
+<div class="sidebar-mobile d-lg-none" data-sidebar-target="mobile">
+ <div class="sidebar-backdrop" data-action="click->sidebar#closeMobile"></div>
+ <div class="sidebar-panel">
+ <div class="sidebar-mobile-header">
+ <button type="button" class="btn btn-sm" data-action="click->sidebar#closeMobile" aria-label="<%= Spree.t('admin.close_sidebar') %>">
+ <%= icon('x') %>
+ </button>
+ </div>
+ <div class="sidebar-mobile-content">
+ <% if defined?(current_vendor) && current_vendor.present? %>
+ <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
+ <% else %>
+ <%= render 'spree/admin/shared/sidebar/store_nav' %>
+ <% end %>
+ </div>
+
+ <%= render 'spree/admin/shared/user_dropdown' %>
+ </div>
+</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb b/admin/app/views/spree/admin/shared/_user_dropdown.html.erb
index c1ba348b8e..5aaa96f10f 100644
--- a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb
+++ b/admin/app/views/spree/admin/shared/_user_dropdown.html.erb
@@ -1,20 +1,28 @@
<% if try_spree_current_user.present? %>
- <%= dropdown id: dom_id(try_spree_current_user, 'account-dropdown') do %>
- <%= dropdown_toggle class: 'd-flex align-items-center justify-content-between text-left w-100 pr-0 shadow-none' do %>
- <%= render_avatar(try_spree_current_user, width: 32, height: 32) %>
- <% end %>
- <%= dropdown_menu class: 'dropdown-menu-right', style: 'min-width: 250px;' do %>
- <div class="d-flex align-items-center p-2 bg-light rounded-lg">
- <%= render_avatar(try_spree_current_user, width: 34, height: 34) %>
- <span class="d-none d-lg-inline ml-lg-2">
+ <div class="user-dropdown" id="user-menu">
+ <%= dropdown do %>
+ <%= dropdown_toggle class: 'user-dropdown-button dropdown-toggle' do %>
+ <%= render_avatar(try_spree_current_user, width: 32, height: 32) %>
+ <span class="user-name d-none d-lg-block">
<% if try_spree_current_user.name.present? %>
- <%= try_spree_current_user.name&.full %><br />
- <span class="small text-muted"><%= try_spree_current_user.email %></span>
+ <%= try_spree_current_user.name&.full %>
<% else %>
- <%= try_spree_current_user.email %><br />
+ <%= try_spree_current_user.email %>
<% end %>
</span>
- </div>
+ <% end %>
+ <%= dropdown_menu class: 'ml-2', style: 'min-width: 250px;' do %>
+ <div class="d-flex align-items-center p-2 bg-light rounded-lg">
+ <%= render_avatar(try_spree_current_user, width: 34, height: 34) %>
+ <span class="d-flex flex-column ml-2">
+ <% if try_spree_current_user.name.present? %>
+ <%= try_spree_current_user.name&.full %>
+ <small class="text-muted"><%= try_spree_current_user.email %></small>
+ <% else %>
+ <%= try_spree_current_user.email %>
+ <% end %>
+ </span>
+ </div>
<%= render_admin_partials(:user_dropdown_partials) %>
@@ -36,10 +44,11 @@
<div class="dropdown-divider"></div>
- <%= button_to spree_admin_logout_path, class: 'dropdown-item mb-0 btn-danger', method: :delete do %>
- <%= icon('logout', class: "icon icon-logout") %>
- <%= Spree.t(:logout) %>
- <% end if defined?(spree_admin_logout_path) %>
+ <%= button_to spree_admin_logout_path, class: 'dropdown-item mb-0 btn-danger', method: :delete do %>
+ <%= icon('logout', class: "icon icon-logout") %>
+ <%= Spree.t(:logout) %>
+ <% end if defined?(spree_admin_logout_path) %>
+ <% end %>
<% end %>
- <% end %>
+ </div>
<% end %>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erb
index 40edfab591..531f0456a4 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erb
@@ -2,7 +2,14 @@
<% customers_active = %w[users newsletter_subscribers].include?(controller_name) %>
<%= nav_item(Spree.t(:customers), spree.admin_users_path, icon: 'users', active: customers_active) %>
+ <%# Submenu for expanded sidebar (only shown when active) %>
<ul class="nav-submenu <% unless customers_active %>d-none<% end %>">
<%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %>
</ul>
+
+ <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+ <ul class="nav-submenu-dropdown d-none dropdown-container">
+ <%= nav_item(Spree.t(:customers), spree.admin_users_path) %>
+ <%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %>
+ </ul>
<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb
index dd929bfa95..355dfdd71e 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb
@@ -4,9 +4,10 @@
<% if ready_to_ship_orders_count&.positive? %>
<% orders_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>
<% end %>
-
+
<%= nav_item(orders_label.html_safe, spree.admin_orders_path, icon: 'inbox', active: orders_active) %>
-
+
+ <%# Submenu for expanded sidebar (only shown when active) %>
<% if orders_active && (ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts)) %>
<ul class="nav-submenu">
<% if ready_to_ship_orders_count&.positive? %>
@@ -22,4 +23,23 @@
<%= render_admin_partials(:store_orders_nav_partials) %>
</ul>
<% end %>
+
+ <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+ <% if ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts) %>
+ <ul class="nav-submenu-dropdown d-none dropdown-container">
+ <%= nav_item(Spree.t(:orders), spree.admin_orders_path) %>
+
+ <% if ready_to_ship_orders_count&.positive? %>
+ <% fulfill_label = Spree.t('admin.orders.orders_to_fulfill') %>
+ <% fulfill_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>
+ <%= nav_item(fulfill_label.html_safe, spree.admin_orders_path(q: {shipment_state_not_in: [:shipped, :canceled]})) %>
+ <% end %>
+
+ <% if can?(:manage, :checkouts) %>
+ <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path) %>
+ <% end %>
+
+ <%= render_admin_partials(:store_orders_nav_partials) %>
+ </ul>
+ <% end %>
<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erb
index 6beebf2692..6abc41c248 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erb
@@ -2,6 +2,7 @@
<% if can?(:manage, Spree::Product) %>
<%= nav_item(Spree.t(:products), spree.admin_products_path, icon: 'package', active: products_active) %>
+ <%# Submenu for expanded sidebar (only shown when active) %>
<ul class="nav-submenu <% unless products_active %>d-none<% end %>">
<% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
<%= nav_item(Spree.t(:stock), spree.admin_stock_items_path, active: %w[stock_items stock_transfers].include?(controller_name)) %>
@@ -18,4 +19,24 @@
<%= render_admin_partials(:store_products_nav_partials) %>
</ul>
+
+ <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+ <ul class="nav-submenu-dropdown d-none dropdown-container">
+ <%= nav_item(Spree.t(:products), spree.admin_products_path) %>
+
+ <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
+ <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path) %>
+ <% end %>
+ <% if can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) %>
+ <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>
+ <% end %>
+ <% if can?(:manage, Spree::OptionType) %>
+ <%= nav_item(Spree.t(:options), spree.admin_option_types_path) %>
+ <% end %>
+ <% if can?(:manage, Spree::Property) && Spree::Config[:product_properties_enabled] %>
+ <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>
+ <% end %>
+
+ <%= render_admin_partials(:store_products_nav_partials) %>
+ </ul>
<% end %>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb
index e0f16c12d1..997c603b1a 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb
@@ -1,7 +1,15 @@
<% if can?(:manage, Spree::Promotion) %>
<% discounts_active = %w[promotions gift_cards gift_card_batches coupon_codes].include?(controller_name) && @user.nil? %>
<%= nav_item(Spree.t(:promotions), spree.admin_promotions_path, icon: 'discount', active: discounts_active) %>
+
+ <%# Submenu for expanded sidebar (only shown when active) %>
<ul class="nav-submenu <% unless discounts_active %>d-none<% end %>">
<%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path, active: %w[gift_cards gift_card_batches].include?(controller_name)) %>
</ul>
+
+ <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+ <ul class="nav-submenu-dropdown d-none dropdown-container">
+ <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path) %>
+ <%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path) %>
+ </ul>
<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb
index 691ae3fedd..f68f2102f9 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb
@@ -3,6 +3,7 @@
<% if can?(:manage, Spree::CustomerReturn) || can?(:manage, Spree::ReturnAuthorization) %>
<%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path, icon: 'receipt-refund', active: returns_active) %>
+ <%# Submenu for expanded sidebar (only shown when active) %>
<% if returns_active %>
<ul class="nav-submenu">
<% if can?(:manage, Spree::ReturnAuthorization) %>
@@ -11,4 +12,15 @@
<%= render_admin_partials(:returns_nav_partials) %>
</ul>
<% end %>
+
+ <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+ <% if can?(:manage, Spree::ReturnAuthorization) %>
+ <ul class="nav-submenu-dropdown d-none dropdown-container">
+ <%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path) %>
+
+ <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>
+
+ <%= render_admin_partials(:returns_nav_partials) %>
+ </ul>
+ <% end %>
<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
index 1c671f9140..f1e59f8145 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
@@ -2,7 +2,9 @@
<%= dropdown do %>
<%= dropdown_toggle class: 'store-dropdown-button dropdown-toggle' do %>
<%= store_admin_icon(current_store, height: 32, width: 32) %>
- <%= truncate(current_store.name, length: 10) %>
+ <span class="store-name d-none d-lg-block">
+ <%= truncate(current_store.name, length: 10) %>
+ </span>
<% end %>
<%= dropdown_menu class: 'ml-2' do %>
<%= link_to current_store.formatted_url_or_custom_domain, class: 'dropdown-item', target: '_blank' do %>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb
index 93874793a5..990b8c7a54 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb
@@ -2,19 +2,41 @@
<% storefront_active = %w[themes posts post_categories pages storefront].include?(controller_name) %>
<%= nav_item(Spree.t('admin.storefront'), spree.admin_themes_path, icon: 'building-store', active: storefront_active) %>
+ <%# Submenu for expanded sidebar (only shown when active) %>
<ul class="nav-submenu <% unless storefront_active %>d-none<% end %>">
<% if can?(:manage, Spree::Theme) %>
<%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
<% end %>
-
+
<% if can?(:manage, Spree::Page) %>
<%= nav_item(Spree.t(:pages), spree.admin_pages_path) %>
<% end %>
-
+
<% if can?(:manage, Spree::Post) %>
<%= nav_item(Spree.t(:posts), spree.admin_posts_path, active: %w[posts post_categories].include?(controller_name)) %>
<% end %>
-
+
+ <% if can?(:manage, current_store) %>
+ <%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>
+ <% end %>
+
+ <%= render_admin_partials(:storefront_nav_partials) %>
+ </ul>
+
+ <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+ <ul class="nav-submenu-dropdown d-none dropdown-container">
+ <% if can?(:manage, Spree::Theme) %>
+ <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
+ <% end %>
+
+ <% if can?(:manage, Spree::Page) %>
+ <%= nav_item(Spree.t(:pages), spree.admin_pages_path) %>
+ <% end %>
+
+ <% if can?(:manage, Spree::Post) %>
+ <%= nav_item(Spree.t(:posts), spree.admin_posts_path) %>
+ <% end %>
+
<% if can?(:manage, current_store) %>
<%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>
<% end %>
diff --git a/admin/app/views/spree/admin/stock_items/_filters.html.erb b/admin/app/views/spree/admin/stock_items/_filters.html.erb
index 25c02db9c3..c42c52a38d 100644
--- a/admin/app/views/spree/admin/stock_items/_filters.html.erb
+++ b/admin/app/views/spree/admin/stock_items/_filters.html.erb
@@ -1,10 +1,16 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dropdown" } do |f| %>
- <div class="d-flex flex-column flex-lg-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :variant_product_name_cont, label: Spree.t(:product_name) %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dialog" } do |f| %>
+ <div class="d-flex flex-column flex-lg-row gap-2">
+ <%= render 'spree/admin/shared/filters_search_bar', param: :variant_product_name_cont, label: Spree.t(:product_name) %>
- <%= render 'spree/admin/shared/filters_button' %>
- </div>
- <div data-dropdown-target="menu" id="table-filter" class="hidden">
+ <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+ <%= icon "adjustments", class: "mr-1" %>
+ <%= Spree.t("admin.filters") %>
+ <% end %>
+ </div>
+
+ <dialog class="drawer" data-dialog-target="dialog" id="stock-items-filters-drawer">
+ <%= drawer_header(Spree.t(:filter), 'dialog#close') %>
+ <div class="drawer-body">
<div class="form-group">
<%= f.label :variant_sku_cont, Spree.t(:sku) %>
<%= f.text_field :variant_sku_cont, size: 15, class: "form-control", data: {filters_target: :input} %>
@@ -17,8 +23,12 @@
data: { controller: 'autocomplete-select' } %>
</div>
<%= render_admin_partials(:stock_items_filters_partials, f: f) %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
+ </div>
+ <div class="drawer-footer">
+ <%= drawer_discard_button('dialog#close') %>
+ <%= render 'spree/admin/shared/filter_submit' %>
+ </div>
+ </dialog>
<%= render "spree/admin/shared/filter_badge_template" %>
<div data-filters-target="badgesContainer" class="filter-badges-container"></div>
diff --git a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb b/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
index 67537e3bae..18ecdac296 100644
--- a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
+++ b/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
@@ -1,9 +1,15 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dropdown"} do |f| %>
- <div class="d-flex flex-column flex-lg-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %>
- <%= render 'spree/admin/shared/filters_button' %>
- </div>
- <div data-dropdown-target="menu" id="table-filter" class="hidden">
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
+ <div class="d-flex flex-column flex-lg-row gap-2">
+ <%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %>
+ <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+ <%= icon "adjustments", class: "mr-1" %>
+ <%= Spree.t("admin.filters") %>
+ <% end %>
+ </div>
+
+ <dialog class="drawer" data-dialog-target="dialog" id="stock-transfers-filters-drawer">
+ <%= drawer_header(Spree.t(:filter), 'dialog#close') %>
+ <div class="drawer-body">
<div class="form-group">
<%= f.label :reference_cont, Spree.t(:reference) %>
<%= f.text_field :reference_cont, include_blank: true, size: 15, class: "form-control", data: { filters_target: :input } %>
@@ -29,10 +35,14 @@
} %>
</div>
<%= render_admin_partials(:stock_transfers_filters_partials, f: f) %>
- <div class="form-actions">
- <%= button Spree.t(:search), "search" %>
</div>
- </div>
+ <div class="drawer-footer">
+ <%= drawer_discard_button('dialog#close') %>
+ <div class="form-actions">
+ <%= button Spree.t(:search), "search" %>
+ </div>
+ </div>
+ </dialog>
<%= render "spree/admin/shared/filter_badge_template" %>
<div data-filters-target="badgesContainer" class="filter-badges-container"></div>
diff --git a/admin/app/views/spree/admin/users/_filters.html.erb b/admin/app/views/spree/admin/users/_filters.html.erb
index f9b0e0d9d0..67c757be4e 100644
--- a/admin/app/views/spree/admin/users/_filters.html.erb
+++ b/admin/app/views/spree/admin/users/_filters.html.erb
@@ -1,16 +1,22 @@
-<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap", data: {controller: "filters dropdown"} do |f| %>
- <div class="d-flex flex-column flex-lg-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %>
+<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
+ <div class="d-flex flex-column flex-lg-row gap-2">
+ <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %>
- <%= render "spree/admin/shared/calendar_range_picker",
- date_from_input_name: "q[created_at_gt]",
- date_to_input_name: "q[created_at_lt]",
- date_from_value: params.dig(:q, :created_at_gt),
- date_to_value: params.dig(:q, :created_at_lt) %>
+ <%= render "spree/admin/shared/calendar_range_picker",
+ date_from_input_name: "q[created_at_gt]",
+ date_to_input_name: "q[created_at_lt]",
+ date_from_value: params.dig(:q, :created_at_gt),
+ date_to_value: params.dig(:q, :created_at_lt) %>
- <%= render 'spree/admin/shared/filters_button' %>
- </div>
- <div data-dropdown-target="menu" id="table-filter" class="hidden">
+ <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+ <%= icon "adjustments", class: "mr-1" %>
+ <%= Spree.t("admin.filters") %>
+ <% end %>
+ </div>
+
+ <dialog class="drawer" data-dialog-target="dialog" id="user-filters-drawer">
+ <%= drawer_header(Spree.t(:filter), 'dialog#close') %>
+ <div class="drawer-body">
<div class="form-group">
<%= f.label :bill_address_firstname_i_cont_any, Spree.t(:first_name) %>
<%= f.text_field :bill_address_firstname_i_cont_any, class: "form-control", data: { filters_target: :input } %>
@@ -62,8 +68,12 @@
} %>
</div>
<%= render_admin_partials(:users_filters_partials, f: f) %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
+ </div>
+ <div class="drawer-footer">
+ <%= drawer_discard_button('dialog#close') %>
+ <%= render 'spree/admin/shared/filter_submit' %>
+ </div>
+ </dialog>
<%= render "spree/admin/shared/filter_badge_template" %>
diff --git a/admin/config/initializers/spree_admin_navigation.rb b/admin/config/initializers/spree_admin_navigation.rb
index b206bed379..bb9d227402 100644
--- a/admin/config/initializers/spree_admin_navigation.rb
+++ b/admin/config/initializers/spree_admin_navigation.rb
@@ -172,14 +172,8 @@ Rails.application.config.after_initialize do
url: :admin_themes_path,
icon: 'building-store',
position: 70,
- active: -> { %w[themes posts post_categories pages].include?(controller_name) || (controller_name == 'storefronts' && action_name == 'edit') },
+ active: -> { %w[themes posts post_categories pages storefront].include?(controller_name) || (controller_name == 'storefronts' && action_name == 'edit') },
if: -> { can?(:manage, Spree::Theme) } do |storefront|
- # Themes
- storefront.add :themes,
- label: :themes,
- url: :admin_themes_path,
- position: 10,
- if: -> { can?(:manage, Spree::Theme) }
# Pages
storefront.add :pages,
@@ -212,6 +206,11 @@ Rails.application.config.after_initialize do
position: 80,
if: -> { can?(:manage, Spree::Integration) }
+ # Section divider before settings
+ sidebar_nav.add :settings_section,
+ section_label: 'Settings',
+ position: 90
+
# Settings (bottom of sidebar)
sidebar_nav.add :settings,
label: :settings,
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index ccb1787b21..e2fe8b1a41 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -48,6 +48,7 @@ en:
special_instructions:
description: Allow customers to add special instructions to their order.
label: Display the special instructions field
+ close_sidebar: Close sidebar
copied: Copied!
copy_payment_link: Copy Payment Link
copy_to_clipboard: Copy to clipboard
@@ -75,6 +76,7 @@ en:
edit_theme: Edit theme
errors: Errors
execution_time: Execution Time
+ expand_sidebar: Expand sidebar
export_all: Export all records (can be slow for large datasets)
export_coupons: Export coupons as CSV file
export_created: Your export was started. You will receive an email with a download link when it is ready!
diff --git a/admin/spec/features/spree/admin/products/products_spec.rb b/admin/spec/features/spree/admin/products/products_spec.rb
index 4787656fcf..9233609202 100644
--- a/admin/spec/features/spree/admin/products/products_spec.rb
+++ b/admin/spec/features/spree/admin/products/products_spec.rb
@@ -1176,13 +1176,15 @@ describe 'Products', type: :feature do
it 'renders selected filters' do
visit spree.admin_products_path
+ fill_in 'q_multi_search', with: 'Backpack'
+
within 'main' do
click_on 'Filters'
end
- fill_in 'q_multi_search', with: 'Backpack'
-
- within('main') { click_on 'Filter Results' }
+ within('#product-filters-drawer') do
+ click_on 'Filter Results'
+ end
within('.filter-badges-container') do
expect(page).to have_content('Query: Backpack')
@@ -1201,12 +1203,15 @@ describe 'Products', type: :feature do
it 'filters products with tag only' do
visit spree.admin_products_path
- within('main') { click_on 'Filter' }
- fill_in 'Tags', with: 'some tag'
+ within('main') { click_on 'Filters' }
- find('.ts-dropdown').click
- find('#q_tags_name_in-ts-label').click
- click_on 'Filter Results'
+ within('#product-filters-drawer') do
+ fill_in 'Tags', with: 'some tag'
+
+ find('.ts-dropdown').click
+ find('#q_tags_name_in-ts-label').click
+ click_on 'Filter Results'
+ end
expect(page).to have_content(product.name)
expect(page).not_to have_content(product_without_tag.name)