Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[admin] dark mode #5511

Merged
merged 9 commits into from
Nov 15, 2023
Merged

[admin] dark mode #5511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dbae91f
Add missing closed parenthesis
elia Nov 10, 2023
04c4cf3
Add a missing translation to the `orders/show` component
elia Nov 14, 2023
9296111
Let clicks go through the `ui/toast` component container
elia Nov 13, 2023
b3ea5e9
Fallback to the default locale if the selected one is unsupported
elia Nov 13, 2023
5a22b14
Add a stimulus controller for closing details when clicking outside
elia Nov 14, 2023
0b6faea
Extract a locales helper in the nav account component
elia Nov 10, 2023
fe6da39
Extract the SolidusAdmin locale change autoselect
elia Nov 13, 2023
74efa66
Keep the account navigation menu open when changing the locale
elia Nov 13, 2023
b94c635
Add theme support to the SolidusAdmin UI with dark and dimmed variants
elia Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Keep the account navigation menu open when changing the locale
  • Loading branch information
@elia
elia committed Nov 15, 2023
commit 74efa667f106d99833ceaef3e4b3e4218e93465f
1 change: 1 addition & 0 deletions admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
data-controller="details-click-outside"
class="relative w-full"
aria-label="<%= t('.account') %>"
<%= :open if params[:account_menu_open] %>
>
<summary
class="
Expand Down
2 changes: 1 addition & 1 deletion admin/app/controllers/solidus_admin/controller_helpers/locale.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def update_user_locale
session[set_user_language_locale_key] = requested_locale

flash[:notice] = t('spree.locale_changed')
redirect_to url_for(request.params.except(:switch_to_locale))
redirect_to params.except(:switch_to_locale).permit!.to_h.merge(account_menu_open: true)
end
end

Expand Down
18 changes: 18 additions & 0 deletions admin/spec/features/accounts_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,22 @@
expect(page).to have_content(user.email)
expect(current_path).to eq("/admin/users/#{user.id}/edit")
end

it "can change locale", :js do
I18n.config.available_locales_set << :"en-UK"
I18n.config.available_locales_set << "en-UK"
I18n.backend.store_translations('en-UK', spree: { i18n: { this_file_language: "English (UK)" } })

user = create(:admin_user, email: '[email protected]')
stub_authorization! user
sign_in user

visit "/admin/products"
find('summary', text: user.email).click
expect(page).to have_content("English (US)")
select "English (UK)", from: "switch_to_locale"
expect(page).to have_content("English (UK)")
select "English (US)", from: 'switch_to_locale'
expect(page).to have_content("English (US)")
end
end