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 @@ Notica - Notifications from Your Terminal - - - + + + + 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 {
- + Notica
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(),