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] feature specs fixes #5253

Merged
merged 3 commits into from
Jul 17, 2023
Merged

[Admin] feature specs fixes #5253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b8c45f
Cleanup unused ui/table component classes
elia Jul 13, 2023
e9eca08
Load hotwire gems when loading solidus_admin
elia Jul 17, 2023
3e0c15f
Use the digest path as the favicon for solidus_admin
elia Jul 17, 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
7 changes: 4 additions & 3 deletions admin/app/components/solidus_admin/ui/table/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<div
class="
<%= stimulus_id %>
rounded-lg
border
border-gray-100
border-gray-100
overflow-hidden
"
data-controller="<%= stimulus_id %>"
Expand Down Expand Up @@ -39,7 +37,10 @@

<% if @rows.empty? && @model_class %>
<tr>
<td colspan="<%= @columns.size %>" class="text-center py-4 text-3.5 line-[150%] text-black bg-white">
<td
colspan="<%= @columns.size %>"
class="text-center py-4 text-3.5 line-[150%] text-black bg-white"
>
<%= t('.no_resources_found', resources: @model_class.model_name.human.pluralize) %>
</td>
</tr>
Expand Down
1 change: 1 addition & 0 deletions admin/app/views/layouts/solidus_admin/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="<%= current_locale %>">
<head>
<%= favicon_link_tag 'favicon.ico' %>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the error here, just for the sake of curiosity? Something related to a11y?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, not accessibility, it's just capybara complaining for the 500 received when trying to fetch the default /favicon.ico.

<title><%= solidus_admin_title %></title>
<%= stylesheet_link_tag "solidus_admin/application.css", "inter-font", "data-turbo-track": "reload" %>
<%= javascript_importmap_tags "solidus_admin/application", shim: false, importmap: SolidusAdmin.importmap %>
Expand Down
2 changes: 2 additions & 0 deletions admin/lib/solidus_admin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

require 'importmap-rails'
require 'tailwindcss-rails'
require 'turbo-rails'
require 'stimulus-rails'

module SolidusAdmin
singleton_class.attr_accessor :importmap
Expand Down
2 changes: 2 additions & 0 deletions admin/solidus_admin.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Gem::Specification.new do |s|
s.add_dependency 'importmap-rails', '~> 1.2', '>= 1.2.1'
s.add_dependency 'solidus_backend', s.version
s.add_dependency 'solidus_core', s.version
s.add_dependency 'stimulus-rails', '~> 1.2'
s.add_dependency 'tailwindcss-rails', '~> 2.0'
s.add_dependency 'turbo-rails', '~> 1.4'
s.add_dependency 'view_component', '~> 3.3'
end