Move all static files to public/ folder and fix paths

7 years ago · 0ba89c8d9c
parent 83161dc7e0
commit 0ba89c8d9c
18 changed files with 18 additions and 18 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,5 @@
-dist
+public/bundle.js
+public/bundle.js.map
 node_modules
 npm-debug.log
 *.swp
--- a/public/css/font-awesome.min.css
+++ b/public/css/font-awesome.min.css
--- a/public/css/normalize.css
+++ b/public/css/normalize.css
--- a/public/css/simplegrid.css
+++ b/public/css/simplegrid.css
--- a/public/css/style.css
+++ b/public/css/style.css
--- a/public/img/icon.png
+++ b/public/img/icon.png
--- a/public/img/logo.svg
+++ b/public/img/logo.svg
--- a/public/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>
--- a/public/js/es5-sham.min.js
+++ b/public/js/es5-sham.min.js
--- a/public/js/es5-shim.min.js
+++ b/public/js/es5-shim.min.js
--- a/public/js/html5shiv.min.js
+++ b/public/js/html5shiv.min.js
--- a/public/js/sw.js
+++ b/public/js/sw.js
--- 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) => {
--- 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
--- 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
--- 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>
--- 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(),
--- 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(),