From 0ba89c8d9c15d96e3c052c2c7e45df8fc7c0b0da Mon Sep 17 00:00:00 2001
From: Tanner Collin <git@tannercollin.com>
Date: Wed, 28 Dec 2016 00:50:58 -0800
Subject: [PATCH] Move all static files to public/ folder and fix paths

---
 .gitignore                                  |   3 ++-
 {assets => public}/css/font-awesome.min.css |   0
 {assets => public}/css/normalize.css        |   0
 {assets => public}/css/simplegrid.css       |   0
 {assets => public}/css/style.css            |   0
 {assets => public}/img/icon.png             | Bin
 {assets => public}/img/logo.svg             |   0
 index.html => public/index.html             |  10 +++++-----
 {assets => public}/js/es5-sham.min.js       |   0
 {assets => public}/js/es5-shim.min.js       |   0
 {assets => public}/js/html5shiv.min.js      |   0
 {assets => public}/js/sw.js                 |   0
 server.js                                   |   5 ++---
 serverdev.js                                |   2 +-
 src/ui/NotifPage.js                         |   6 +++---
 src/ui/Site.js                              |   2 +-
 webpack.config.js                           |   4 ++--
 webpack.production.config.js                |   4 ++--
 18 files changed, 18 insertions(+), 18 deletions(-)
 rename {assets => public}/css/font-awesome.min.css (100%)
 rename {assets => public}/css/normalize.css (100%)
 rename {assets => public}/css/simplegrid.css (100%)
 rename {assets => public}/css/style.css (100%)
 rename {assets => public}/img/icon.png (100%)
 rename {assets => public}/img/logo.svg (100%)
 rename index.html => public/index.html (81%)
 rename {assets => public}/js/es5-sham.min.js (100%)
 rename {assets => public}/js/es5-shim.min.js (100%)
 rename {assets => public}/js/html5shiv.min.js (100%)
 rename {assets => public}/js/sw.js (100%)

diff --git a/.gitignore b/.gitignore
index 1930627..3b279fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-dist
+public/bundle.js
+public/bundle.js.map
 node_modules
 npm-debug.log
 *.swp
diff --git a/assets/css/font-awesome.min.css b/public/css/font-awesome.min.css
similarity index 100%
rename from assets/css/font-awesome.min.css
rename to public/css/font-awesome.min.css
diff --git a/assets/css/normalize.css b/public/css/normalize.css
similarity index 100%
rename from assets/css/normalize.css
rename to public/css/normalize.css
diff --git a/assets/css/simplegrid.css b/public/css/simplegrid.css
similarity index 100%
rename from assets/css/simplegrid.css
rename to public/css/simplegrid.css
diff --git a/assets/css/style.css b/public/css/style.css
similarity index 100%
rename from assets/css/style.css
rename to public/css/style.css
diff --git a/assets/img/icon.png b/public/img/icon.png
similarity index 100%
rename from assets/img/icon.png
rename to public/img/icon.png
diff --git a/assets/img/logo.svg b/public/img/logo.svg
similarity index 100%
rename from assets/img/logo.svg
rename to public/img/logo.svg
diff --git a/index.html b/public/index.html
similarity index 81%
rename from index.html
rename to public/index.html
index 30ed1a0..71e6794 100644
--- a/index.html
+++ b/public/index.html
@@ -6,9 +6,9 @@
 	<title>Notica - Notifications from Your Terminal</title>
 
 	<![if lt IE 10]>
-		<script async src="/assets/js/es5-shim.min.js"></script>
-		<script async src="/assets/js/es5-sham.min.js"></script>
-		<script async src="/assets/js/html5shiv.min.js"></script>
+		<script async src="/js/es5-shim.min.js"></script>
+		<script async src="/js/es5-sham.min.js"></script>
+		<script async src="/js/html5shiv.min.js"></script>
 		<script type="text/javascript">
 			// Fake console to test in IE<9
 			if( typeof console == 'undefined' )
@@ -23,11 +23,11 @@
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css" integrity="sha256-t2/7smZfgrST4FS1DT0bs/KotCM74XlcqZN5Vu7xlrw=" crossorigin="anonymous" media="none" onload="if(media!='all')media='all'" />
 	<link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet" media="none" onload="if(media!='all')media='all'" />
 
-	<link rel="stylesheet" href="/assets/css/style.css" type="text/css" media="all" />
+	<link rel="stylesheet" href="/css/style.css" type="text/css" media="all" />
   </head>
   <body>
     <div id='root'>
     </div>
-    <script src="/static/bundle.js"></script>
+    <script src="/bundle.js"></script>
   </body>
 </html>
diff --git a/assets/js/es5-sham.min.js b/public/js/es5-sham.min.js
similarity index 100%
rename from assets/js/es5-sham.min.js
rename to public/js/es5-sham.min.js
diff --git a/assets/js/es5-shim.min.js b/public/js/es5-shim.min.js
similarity index 100%
rename from assets/js/es5-shim.min.js
rename to public/js/es5-shim.min.js
diff --git a/assets/js/html5shiv.min.js b/public/js/html5shiv.min.js
similarity index 100%
rename from assets/js/html5shiv.min.js
rename to public/js/html5shiv.min.js
diff --git a/assets/js/sw.js b/public/js/sw.js
similarity index 100%
rename from assets/js/sw.js
rename to public/js/sw.js
diff --git a/server.js b/server.js
index b722391..cc100d7 100644
--- a/server.js
+++ b/server.js
@@ -9,10 +9,9 @@ const port = 3000;
 
 app.use(bodyParser.urlencoded({ extended: false }));
 
-app.use('/static', express.static(path.join(__dirname, 'dist')));
-app.use('/assets', express.static(path.join(__dirname, 'assets')));
+app.use('/', express.static(path.join(__dirname, 'public')));
 app.get('/*', (req, res) => {
-	res.sendFile(path.join(__dirname, 'index.html'));
+	res.sendFile(path.join(__dirname, 'public/index.html'));
 });
 
 app.post('*', (req, res) => {
diff --git a/serverdev.js b/serverdev.js
index 28220e1..c4e2afa 100644
--- a/serverdev.js
+++ b/serverdev.js
@@ -3,7 +3,7 @@ var WebpackDevServer = require('webpack-dev-server');
 var config = require('./webpack.config');
 
 new WebpackDevServer(webpack(config), {
-  publicPath: config.output.publicPath,
+  contentBase: './public',
   hot: true,
   historyApiFallback: true,
   noInfo: true
diff --git a/src/ui/NotifPage.js b/src/ui/NotifPage.js
index 745833c..3f1c161 100644
--- a/src/ui/NotifPage.js
+++ b/src/ui/NotifPage.js
@@ -50,13 +50,13 @@ export default class NotifPage extends React.Component {
 
 		let options = {
 			body: 'Notification from Notica',
-			icon: 'assets/img/icon.png',
-			iconUrl: 'assets/img/icon.png',
+			icon: 'img/icon.png',
+			iconUrl: 'img/icon.png',
 			vibrate: [200, 100, 200]
 		};
 
 		try {
-			navigator.serviceWorker.register('/assets/js/sw.js').then((reg) => {
+			navigator.serviceWorker.register('/js/sw.js').then((reg) => {
 				reg.showNotification(title, options);
 			});
 		} catch (e) { // If we are on a browser without serviceWorker
diff --git a/src/ui/Site.js b/src/ui/Site.js
index 1940005..2f79d9a 100644
--- a/src/ui/Site.js
+++ b/src/ui/Site.js
@@ -32,7 +32,7 @@ export default class Site extends React.Component {
 				<div className="hero">
 					<div className="title">
 						<Link to={'/home/' + id}>
-							<img src="/assets/img/logo.svg" />
+							<img src="/img/logo.svg" />
 							<span className="name">Notica</span>
 						</Link>
 					</div>
diff --git a/webpack.config.js b/webpack.config.js
index 72dc0b7..ffc2eb7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,9 +9,9 @@ module.exports = {
     './src/index'
   ],
   output: {
-    path: path.join(__dirname, 'dist'),
+    path: path.join(__dirname, 'public'),
     filename: 'bundle.js',
-    publicPath: '/static/'
+    publicPath: ''
   },
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
diff --git a/webpack.production.config.js b/webpack.production.config.js
index f7f92fe..f2be7fb 100644
--- a/webpack.production.config.js
+++ b/webpack.production.config.js
@@ -7,9 +7,9 @@ module.exports = {
     './src/index'
   ],
   output: {
-    path: path.join(__dirname, 'dist'),
+    path: path.join(__dirname, 'public'),
     filename: 'bundle.js',
-    publicPath: '/static/'
+    publicPath: ''
   },
   plugins: [
     new webpack.HotModuleReplacementPlugin(),