Merge pull request #29 from ttecho/master

Adding a favicon
joeattardi · Jan 2, 2019 · 66fd66d · 66fd66d
2 parents 7c4f16a + 5ffa966
commit 66fd66d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/src/images/favicon.ico b/src/images/favicon.ico
diff --git a/src/index.ejs b/src/index.ejs
@@ -6,6 +6,7 @@
     <script src="https://use.fontawesome.com/94153e2ba1.js"></script>
     <!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/emojione/2.2.6/assets/css/emojione.min.css"/> -->
     <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
+    <link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
   </head>
   <body>
     <div id="app"></div>

diff --git a/src/js/app.js b/src/js/app.js
@@ -12,6 +12,7 @@ import { loadPullRequests } from './actions';
 import configureStore from './store';
 
 import '../css/main.scss';
+import '../images/favicon.ico';
 
 const store = configureStore();
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -51,7 +51,7 @@ module.exports = {
         loader: 'babel-loader'
       },
       {
-        test: /\.svg$/,
+        test: /\.svg|\.ico$/,
         loader: 'file-loader?name=[name].[ext]&outputPath=images/'
       }
     ]