Merge pull request #5 from tungleduyxyz/issue_54

Removing the jquery-datatables dependency
killbill · Oct 24, 2023 · f9cb2d8 · f9cb2d8
2 parents cc8679f + 1e30f54
commit f9cb2d8
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 34 deletions.
diff --git a/Gemfile b/Gemfile
@@ -20,7 +20,11 @@ group :development do
   gem 'rake'
   gem 'rubocop'
   gem 'simplecov'
+  gem 'sprockets-rails'
 end
 
 # gem 'killbill-client', :git => 'https://github.com/killbill/killbill-client-ruby.git', :branch => 'work-for-release-0.21.x'
 # gem 'killbill-client', '3.2.0'
+
+gem 'killbill-assets-ui', github: 'killbill/killbill-assets-ui', ref: 'main'
+# gem 'killbill-assets-ui', path: '../killbill-assets-ui'
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -10,7 +10,5 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require dataTables/jquery.dataTables
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
 //= require kenui/kenui
+//= require assets/common
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -11,8 +11,6 @@
  * It is generally better to create a new file per style scope.
  *
  *= require_self
- *= require dataTables/jquery.dataTables
- *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
- *= require font-awesome
  *= require kenui/email_notifications
+ *= require assets/common
  */
diff --git a/app/views/kenui/layouts/kenui_application.html.erb b/app/views/kenui/layouts/kenui_application.html.erb
@@ -1,31 +1,32 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Kenui</title>
-  <%= yield :scripts %>
-  <%= stylesheet_link_tag 'application', :media => 'all' %>
-  <%= javascript_include_tag 'application' %>
-  <%= csrf_meta_tags %>
-</head>
-<div class="container-fluid">
-  <%- # :alert used by devise -%>
-  <% [:error, :alert].each do |key| %>
-      <% if flash[key] %>
+  <head>
+    <title>Kenui</title>
+    <%= yield :scripts %>
+    <%= stylesheet_link_tag 'application', :media => 'all' %>
+    <%= javascript_include_tag 'application' %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <div class="container">
+      <%- # :alert used by devise -%>
+      <% [:error, :alert].each do |key| %>
+          <% if flash[key] %>
+              <div class="row">
+                <div class="col-md-10 col-md-offset-2">
+                  <div class="alert alert-error"><%= flash[key] %></div>
+                </div>
+              </div>
+          <% end %>
+      <% end %>
+      <% if flash[:notice] %>
           <div class="row">
             <div class="col-md-10 col-md-offset-2">
-              <div class="alert alert-error"><%= flash[key] %></div>
+              <div class="alert alert-info"><%= flash[:notice] %></div>
             </div>
           </div>
       <% end %>
-  <% end %>
-  <% if flash[:notice] %>
-      <div class="row">
-        <div class="col-md-10 col-md-offset-2">
-          <div class="alert alert-info"><%= flash[:notice] %></div>
-        </div>
-      </div>
-  <% end %>
-  <%= yield %>
-</div>
-</body>
+      <%= yield %>
+    </div>
+  </body>
 </html>
diff --git a/kenui.gemspec b/kenui.gemspec
@@ -20,10 +20,7 @@ Gem::Specification.new do |s|
 
   s.metadata['rubygems_mfa_required'] = 'true'
 
-  s.add_dependency 'font-awesome-rails'
-  s.add_dependency 'jquery-datatables-rails'
-  s.add_dependency 'jquery-rails', '~> 4.5.1'
+  s.add_dependency 'killbill-assets-ui'
   s.add_dependency 'killbill-client'
   s.add_dependency 'rails', '~> 7.0'
-  s.add_dependency 'sass-rails'
 end
diff --git a/lib/kenui/engine.rb b/lib/kenui/engine.rb
@@ -7,7 +7,7 @@
 #
 # See also https://github.com/carlhuda/bundler/issues/49
 require 'jquery-rails'
-require 'jquery-datatables-rails'
+require 'killbill-assets-ui'
 require 'font-awesome-rails'
 require 'killbill_client'