Merge pull request #5253 from solidusio/elia/admin/feature-specs

[Admin] feature specs fixes
solidusio · Jul 17, 2023 · bfc3827 · bfc3827
2 parents c06480d + 3e0c15f
commit bfc3827
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/admin/app/components/solidus_admin/ui/table/component.html.erb b/admin/app/components/solidus_admin/ui/table/component.html.erb
@@ -1,10 +1,8 @@
 <div
   class="
-    <%= stimulus_id %>
     rounded-lg
     border
     border-gray-100
-    border-gray-100
     overflow-hidden
   "
   data-controller="<%= stimulus_id %>"
@@ -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>

diff --git a/admin/app/views/layouts/solidus_admin/application.html.erb b/admin/app/views/layouts/solidus_admin/application.html.erb
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="<%= current_locale %>">
   <head>
+    <%= favicon_link_tag '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 %>

diff --git a/admin/lib/solidus_admin.rb b/admin/lib/solidus_admin.rb
@@ -7,6 +7,8 @@
 
 require 'importmap-rails'
 require 'tailwindcss-rails'
+require 'turbo-rails'
+require 'stimulus-rails'
 
 module SolidusAdmin
   singleton_class.attr_accessor :importmap

diff --git a/admin/solidus_admin.gemspec b/admin/solidus_admin.gemspec
@@ -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