Commit ee9b444

mo <mo.khan@gmail.com>
2018-04-07 19:18:17
load bootstrap from npm.
main
1 parent 96c6929
Changed files (7)
app
assets
javascripts
application.js
stylesheets
application.css
javascript
packs
application.js
vendor.scss
views
layouts
application.html.erb
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
@@ -10,8 +10,9 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require bootstrap
 //= require rails-ujs
 //= require turbolinks
+//= require_self
 //= require_tree .
+
+console.log("Hello World from Proof!")
app/assets/stylesheets/application.css
@@ -10,7 +10,6 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
- *= require bootstrap
  *= require_tree .
  *= require_self
  */
app/javascript/packs/application.js
@@ -9,6 +9,7 @@
 
 console.log('Hello World from Webpacker')
 
+import 'bootstrap/dist/js/bootstrap';
 import { Application } from "stimulus"
 import { definitionsFromContext } from "stimulus/webpack-helpers"
app/javascript/packs/vendor.scss
@@ -0,0 +1,1 @@
+@import '~bootstrap/dist/css/bootstrap';
app/views/layouts/application.html.erb
@@ -7,6 +7,7 @@
 
     <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_pack_tag 'vendor' %>
   </head>
   <body>
     <%= yield %>
Gemfile
@@ -16,8 +16,6 @@ gem 'jbuilder', '~> 2.5'
 gem 'jwt'
 gem 'puma', '~> 3.7'
 gem 'rails', '~> 5.1.4'
-gem 'rails-assets-bootstrap', source: 'https://rails-assets.org'
-gem 'rails-assets-jquery', source: 'https://rails-assets.org'
 gem 'rotp'
 gem 'saml-kit', '~> 1.0'
 gem 'sass-rails', '~> 5.0'
Gemfile.lock
@@ -1,6 +1,5 @@
 GEM
   remote: https://rubygems.org/
-  remote: https://rails-assets.org/
   specs:
     actioncable (5.1.6)
       actionpack (= 5.1.6)
@@ -144,8 +143,6 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.1.6)
       sprockets-rails (>= 2.0.0)
-    rails-assets-bootstrap (4.0.0)
-    rails-assets-jquery (3.3.1)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)
       actionview (~> 5.x, >= 5.0.1)
@@ -294,8 +291,6 @@ DEPENDENCIES
   pg
   puma (~> 3.7)
   rails (~> 5.1.4)
-  rails-assets-bootstrap!
-  rails-assets-jquery!
   rails-controller-testing
   rails_12factor
   rotp