Add styles

JaciBrunning · Jul 6, 2019 · 3b31da6 · 3b31da6
1 parent 8e9cdd1
commit 3b31da6
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 29 deletions.
diff --git a/Gemfile b/Gemfile
@@ -40,6 +40,8 @@ group :development do
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
 
+  gem 'foreman'
+
   gem 'sqlite3'
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -88,11 +88,15 @@ GEM
     declarative (0.0.10)
     declarative-option (0.1.0)
     digest-crc (0.4.1)
+    dotenv (0.7.0)
     erubi (1.8.0)
     execjs (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
+    foreman (0.64.0)
+      dotenv (~> 0.7.0)
+      thor (>= 0.13.6)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     goldiloader (3.1.1)
@@ -299,6 +303,7 @@ DEPENDENCIES
   byebug
   capybara (>= 2.15)
   chromedriver-helper
+  foreman
   goldiloader (~> 3.1.1)
   google-cloud-storage
   jbuilder (~> 2.5)

diff --git a/Procfile.dev b/Procfile.dev
@@ -0,0 +1,2 @@
+web: bundle exec rails s
+webpacker: ./bin/webpack-dev-server
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -11,5 +11,4 @@
  * It is generally better to create a new file per style scope.
  *
  *= require_self
- */
-@import "bootstrap";
+ */
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
@@ -15,7 +15,6 @@
 // const images = require.context('../images', true)
 // const imagePath = (name) => images(name, true)
 
-console.log('Hello World from Webpacker')
 // Support component names relative to this directory:
 var componentRequireContext = require.context("components", true);
 var ReactRailsUJS = require("react_ujs");

diff --git a/app/javascript/packs/application.scss b/app/javascript/packs/application.scss
@@ -0,0 +1 @@
+@import '~bootstrap/scss/bootstrap';
diff --git a/app/javascript/packs/hello_react.jsx b/app/javascript/packs/hello_react.jsx
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,6 +8,7 @@
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
     <%= javascript_pack_tag    'application' %>
+    <%= stylesheet_pack_tag    'application' %>
   </head>
 
   <body>

diff --git a/package.json b/package.json
@@ -5,6 +5,9 @@
     "@babel/preset-react": "^7.0.0",
     "@rails/webpacker": "^4.0.7",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
+    "bootstrap": "^4.3.1",
+    "jquery": "^3.4.1",
+    "popper.js": "^1.15.0",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",

diff --git a/serve b/serve
@@ -0,0 +1,2 @@
+#!/bin/bash -i
+bundle exec foreman start -f Procfile.dev
diff --git a/yarn.lock b/yarn.lock
@@ -1340,6 +1340,11 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
+bootstrap@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
+  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3698,6 +3703,11 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
+jquery@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
+  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+
 js-base64@^2.1.8:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
@@ -4857,6 +4867,11 @@ pnp-webpack-plugin@^1.4.3:
   dependencies:
     ts-pnp "^1.1.2"
 
+popper.js@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
+  integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
+
 portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		web: bundle exec rails s
		webpacker: ./bin/webpack-dev-server
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash -i
		bundle exec foreman start -f Procfile.dev