Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Admin: Move Profile into Settings Area
Damian Legawiec5a486c104aea
diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scssindex 8635649aeb..aaf82c5199 100644--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss@@ -1,6 +1,6 @@// https://github.com/twbs/bootstrap/blob/v4.6.2/scss/_variables.scss-$gray-25: #FAFAFB;+$gray-25: #FAFAFA;$gray-50: #F3F3F3;$gray-100: #E3E3E3 !default;$gray-200: #D5D5D5 !default;@@ -92,7 +92,7 @@ $component-active-bg: $blue !default;$input-placeholder-color: $gray-500;$input-padding-y: .55rem !default;$input-disabled-bg: $gray-25 !default;-$input-focus-border-color: rgba($blue, 0.75) !default;+$input-focus-border-color: $blue !default;$custom-select-disabled-bg: $gray-50 !default;$text-muted: $gray-600 !default;@@ -107,7 +107,7 @@ $nav-link-padding-y: .5rem !default;$nav-link-padding-x: .6rem !default;$box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1),0 2px 4px -1px rgba(0, 0, 0, 0.06) !default;-$box-shadow-xs: rgba(43, 34, 51, 0.02) 0px 1px 2px !default;+$box-shadow-xs: rgba(43, 34, 51, 0.03) 0px 1px 1px !default;$box-shadow-lg: rgba(0, 5, 13, 0.5) 0px 4px 8px 2px;$input-box-shadow: $box-shadow-xs !default;$btn-box-shadow: $input-box-shadow !default;@@ -167,7 +167,7 @@ $dropdown-border-width: 0px !default;$dropdown-border-radius: 1rem !default;$dropdown-inner-border-radius: 0.75rem !default;$dropdown-link-hover-bg: rgba($gray-100, 0.5) !default;-$dropdown-box-shadow: 0px 0px 0px 1px $gray-200, 0px 6px 12px -3px $gray-200, 0px 6px 18px 0px $gray-200 !default;+$dropdown-box-shadow: 0px 0px 0px 1px $gray-200, 0px 6px 12px -3px rgba($gray-300, 0.35), 0px 6px 18px 0px rgba($gray-300, 0.35) !default;$dropdown-padding-x: 0.25rem !default;$dropdown-padding-y: 0.25rem !default;$dropdown-divider-bg: $gray-50 !default;diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scssindex 20ad9915ba..2718863fbb 100644--- a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss+++ b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss@@ -30,7 +30,7 @@ label {.form-control, .text-input, .trix-container, .ts-control, trix-toolbar .trix-dialog .trix-input, .custom-select, .input-group-text, .custom-file-label {box-shadow: $input-box-shadow;transition-property: box-shadow, border-color;- transition-duration: 0.25s;+ transition-duration: 0.15s;transition-timing-function: ease;&:disabled, &[readonly] {diff --git a/admin/app/controllers/spree/admin/profile_controller.rb b/admin/app/controllers/spree/admin/profile_controller.rbindex 7cf8efbe65..507f8a1ec6 100644--- a/admin/app/controllers/spree/admin/profile_controller.rb+++ b/admin/app/controllers/spree/admin/profile_controller.rb@@ -1,6 +1,8 @@module Spreemodule Adminclass ProfileController < BaseController+ include Spree::Admin::SettingsConcern+def edit@user = try_spree_current_userenddiff --git a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erbindex e54a83b20e..16d0501cf0 100644--- a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb@@ -67,6 +67,8 @@<%= nav_item(Spree.t(:developers), spree.admin_oauth_applications_path, icon: 'terminal', active: %w[oauth_applications webhooks_subscribers].include?(controller_name)) %><% end %>+ <%= nav_item(Spree.t('admin.edit_profile'), spree.edit_admin_profile_path, icon: 'user-scan') %>+<%= render_admin_partials(:settings_nav_partials) %></ul><% else %>