From 60241d2ed71ade55cc03a7b9728901ce2841f47d Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Tue, 9 Jan 2018 22:21:59 -0500
Subject: [PATCH] Use npm for fontawesome, include jquery in npm for the public
 site, and fix popper -> popper.js

---
 bower.json                           | 1 -
 gulpfile.js                          | 6 +++---
 package.json                         | 4 +++-
 resources/assets/sass/app.scss       | 1 +
 resources/assets/sass/dashboard.scss | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bower.json b/bower.json
index 847770b..969ded3 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,6 @@
   "license": "MIT",
   "dependencies": {
     "jquery": "~3.2.1",
-    "fontawesome": "~4.7.0",
     "awesome-bootstrap-checkbox": "~0.3.7",
     "Sortable": "~1.6.0",
     "simplemde": "~1.11.2",
diff --git a/gulpfile.js b/gulpfile.js
index f2d8bd1..91f0a6d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -44,7 +44,7 @@ const jsPublic = [
 
 // Javascript libraries for the public site
 const jsPublicLibs = [
-    "bower_components/jquery/dist/jquery.js",
+    "node_modules/jquery/dist/jquery.js",
     "node_modules/popper.js/dist/umd/popper.js",
     "node_modules/bootstrap/dist/js/bootstrap.js",
     "node_modules/gsap/src/uncompressed/TweenMax.js",
@@ -69,8 +69,8 @@ const jsDashboardLibs = [
 // Paths to folders containing fonts that should be copied to public/fonts/
 const fontPaths = [
     "resources/assets/fonts/**",
-    "bower_components/bootstrap-sass/assets/fonts/**/*",
-    "bower_components/fontawesome/fonts/**"
+    "node_modules/font-awesome/fonts/**",
+    "bower_components/bootstrap-sass/assets/fonts/**/*"
 ];
 
 // Handle errors
diff --git a/package.json b/package.json
index 07e1701..f999bbd 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "bootstrap": "^4.0.0-beta.3",
     "browserify": "^15.0.0",
     "es6-promise": "^4.2.2",
+    "font-awesome": "^4.7.0",
     "gsap": "^1.20.3",
     "gulp": "^3.9.1",
     "gulp-babel": "^7.0.0",
@@ -27,7 +28,8 @@
     "gulp-strip-debug": "^2.0.0",
     "gulp-uglify": "^3.0.0",
     "gulp-util": "^3.0.8",
-    "popper": "^1.0.1",
+    "jquery": "^3.2.1",
+    "popper.js": "^1.12.9",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
     "vue": "^2.5.13",
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
index 8cdb139..ad3c98c 100644
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -4,6 +4,7 @@
 
 // Libraries
 @import "bootstrap/scss/bootstrap.scss";
+@import "font-awesome/scss/font-awesome.scss";
 
 // Supplementary
 @import "sections/**/*.scss";
diff --git a/resources/assets/sass/dashboard.scss b/resources/assets/sass/dashboard.scss
index 879f377..56a4f0c 100644
--- a/resources/assets/sass/dashboard.scss
+++ b/resources/assets/sass/dashboard.scss
@@ -1,6 +1,6 @@
 // Libraries
 @import "bootstrap-sass/assets/stylesheets/_bootstrap.scss";
-@import "fontawesome/scss/font-awesome.scss";
+@import "font-awesome/scss/font-awesome.scss";
 @import "awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.scss";
 @import "datetimepicker/jquery.datetimepicker";
 @import "simplemde/dist/simplemde.min";