From 21791ec25b9c8d5e215153b75f1023a613e5b3c8 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Tue, 31 Jan 2017 18:43:14 -0700
Subject: [PATCH] add font-awesome and font loading support

---
 package.json                  | 1 +
 server/config/webpack.base.js | 9 ++++++++-
 src/App.vue                   | 6 +++++-
 yarn.lock                     | 4 ++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 59f0ab5..1f526ae 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "extract-text-webpack-plugin": "^2.0.0-rc.2",
     "favicons-webpack-plugin": "^0.0.7",
     "file-loader": "^0.9.0",
+    "font-awesome": "^4.7.0",
     "html-webpack-plugin": "^2.26.0",
     "json-loader": "^0.5.4",
     "minimist": "^1.2.0",
diff --git a/server/config/webpack.base.js b/server/config/webpack.base.js
index d2a6a8a..8565609 100644
--- a/server/config/webpack.base.js
+++ b/server/config/webpack.base.js
@@ -24,7 +24,14 @@ module.exports = {
         test: /\.(png|jpg|gif|svg)$/,
         loader: 'file-loader',
         options: {
-          name: '[name].[ext]?[hash]',
+          name: 'img/[name].[ext]?[hash]',
+        },
+      },
+      {
+        test: /\.(woff|woff2|eot|ttf|svg)(\?v=\d+\.\d+\.\d+)?$/,
+        loader: 'file-loader',
+        options: {
+          name: 'fonts/[name].[ext]?[hash]',
         },
       },
     ],
diff --git a/src/App.vue b/src/App.vue
index d3e9153..8e36be0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,6 +26,10 @@
 
 <style lang="sass">
   @import './styles/palette'
+
+  // @import '~bulma'
   @import '~bulma/sass/utilities/_all'
   @import '~bulma/sass/base/_all'
-</style>
\ No newline at end of file
+
+  @import '~font-awesome/css/font-awesome.css';
+</style>
diff --git a/yarn.lock b/yarn.lock
index 8ec3cae..ccfbfc3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2227,6 +2227,10 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
+font-awesome@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+
 for-each@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.2.tgz#2c40450b9348e97f281322593ba96704b9abd4d4"