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.

Added global keybindings for admin (ESC/Save)

Damian Legawiec273713d4f7ac
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
index f241bcb6e0..6549551182 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
@@ -720,4 +720,11 @@ code {
background-color: $code-bg;
border-radius: $border-radius-sm;
padding: 0.25rem 0.5rem;
+}
+
+kbd {
+ @extend .badge;
+ @extend .badge-light;
+ text-transform: lowercase;
+ box-shadow: $box-shadow-xs;
}
\ No newline at end of file
diff --git a/admin/app/javascript/spree/admin/controllers/admin_controller.js b/admin/app/javascript/spree/admin/controllers/admin_controller.js
new file mode 100644
index 0000000000..309a6da72a
--- /dev/null
+++ b/admin/app/javascript/spree/admin/controllers/admin_controller.js
@@ -0,0 +1,18 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+ static targets = ['close', 'save']
+
+ close() {
+ if (this.hasCloseTarget) {
+ window.Turbo.visit(this.closeTarget.href)
+ }
+ }
+
+ save(event) {
+ if (this.hasSaveTarget) {
+ event.preventDefault()
+ this.saveTarget.click()
+ }
+ }
+}
\ No newline at end of file
diff --git a/admin/app/views/layouts/spree/admin.html.erb b/admin/app/views/layouts/spree/admin.html.erb
index c843fbe42a..fd1b423144 100644
--- a/admin/app/views/layouts/spree/admin.html.erb
+++ b/admin/app/views/layouts/spree/admin.html.erb
@@ -5,7 +5,10 @@
<%= render "spree/admin/shared/custom_head" %>
</head>
- <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>">
+ <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>"
+ data-controller="admin"
+ data-action="keydown.esc->admin#close keydown.ctrl+s->admin#save keydown.meta+s->admin#save"
+ >
<%= render_admin_partials(:body_start_partials) %>
<%= render "spree/admin/shared/header" %>
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 fea74e9d53..9ed9f36ea7 100644
--- a/admin/app/views/spree/admin/shared/_content_header.html.erb
+++ b/admin/app/views/spree/admin/shared/_content_header.html.erb
@@ -25,7 +25,7 @@
<% if action_name == 'edit' && @object %>
<% class_name = defined?(model_class) ? model_class.to_s : @object.class.name %>
- <%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_#{class_name.demodulize.underscore}_#{@object.id}" %>
+ <%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_#{class_name.demodulize.underscore}_#{@object.id}", data: { admin_target: 'save' } %>
<% end %>
<% if show_record_subtitle || content_for(:page_actions_dropdown) %>
diff --git a/admin/app/views/spree/admin/shared/_edit_resource_links.html.erb b/admin/app/views/spree/admin/shared/_edit_resource_links.html.erb
index bd96f9dc04..5fa7851912 100644
--- a/admin/app/views/spree/admin/shared/_edit_resource_links.html.erb
+++ b/admin/app/views/spree/admin/shared/_edit_resource_links.html.erb
@@ -1,7 +1,7 @@
<% destroy_url = defined?(destroy_url) && destroy_url ? destroy_url : object_url(f.object) %>
<div class="form-actions">
- <%= turbo_save_button_tag Spree.t('actions.update') %>
+ <%= turbo_save_button_tag Spree.t('actions.update'), data: { admin_target: 'save' } %>
<% if f.object.can_be_deleted? && can?(:delete, f.object) %>
<%= link_to Spree.t('actions.destroy'), destroy_url, data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: defined?(turbo_frame) ? turbo_frame : '_top' }, class: 'btn btn-danger ml-auto' %>
<% end %>
diff --git a/admin/app/views/spree/admin/shared/_header.html.erb b/admin/app/views/spree/admin/shared/_header.html.erb
index f241226b48..971e5a8a90 100644
--- a/admin/app/views/spree/admin/shared/_header.html.erb
+++ b/admin/app/views/spree/admin/shared/_header.html.erb
@@ -11,9 +11,10 @@
</div>
<% if settings_active? %>
- <div class="store-dropdown px-2">
- <%= active_link_to_with_icon('arrow-left', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn store-dropdown-button w-100 justify-content-start mx-1 py-2') %>
- </div>
+ <%= link_to spree.admin_path, class: 'store-dropdown text-decoration-none px-2 justify-content-start with-tip', title: Spree.t('admin.back_to_dashboard'), data: { admin_target: 'close' } do %>
+ <%= icon 'x', class: 'mx-2' %>
+ <kbd>ESC</kbd>
+ <% end %>
<% else %>
<% if defined?(current_vendor) && current_vendor.present? %>
<%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>
diff --git a/admin/app/views/spree/admin/shared/_new_resource_links.html.erb b/admin/app/views/spree/admin/shared/_new_resource_links.html.erb
index 7c074b0bcb..f6c97b797c 100644
--- a/admin/app/views/spree/admin/shared/_new_resource_links.html.erb
+++ b/admin/app/views/spree/admin/shared/_new_resource_links.html.erb
@@ -1,3 +1,3 @@
<div class="form-actions">
- <%= turbo_save_button_tag Spree.t('actions.create') %>
+ <%= turbo_save_button_tag Spree.t('actions.create'), data: { admin_target: 'save' } %>
</div>