tanner
/
Notica
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move all static files to public/ folder and fix paths

Browse Source
master
Tanner Collin 7 years ago
parent 83161dc7e0
commit 0ba89c8d9c
18 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .gitignore
  2. 0
      public/css/font-awesome.min.css
  3. 0
      public/css/normalize.css
  4. 0
      public/css/simplegrid.css
  5. 0
      public/css/style.css
  6. 0
      public/img/icon.png
  7. 0
      public/img/logo.svg
  8. 10
      public/index.html
  9. 0
      public/js/es5-sham.min.js
  10. 0
      public/js/es5-shim.min.js
  11. 0
      public/js/html5shiv.min.js
  12. 0
      public/js/sw.js
  13. 5
      server.js
  14. 2
      serverdev.js
  15. 6
      src/ui/NotifPage.js
  16. 2
      src/ui/Site.js
  17. 4
      webpack.config.js
  18. 4
      webpack.production.config.js

3
.gitignore vendored
Unescape View File

@ -1,4 +1,5 @@
dist public/bundle.js
public/bundle.js.map
node_modules node_modules
npm-debug.log npm-debug.log
*.swp *.swp

0
assets/css/font-awesome.min.css → public/css/font-awesome.min.css vendored
Unescape View File

0
assets/css/normalize.css → public/css/normalize.css vendored
Unescape View File

0
assets/css/simplegrid.css → public/css/simplegrid.css
Unescape View File

0
assets/css/style.css → public/css/style.css
Unescape View File

0
assets/img/icon.png → public/img/icon.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 178 KiB

After

Width:  |  Height:  |  Size: 178 KiB

0
assets/img/logo.svg → public/img/logo.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

10
index.html → public/index.html
Unescape View File

@ -6,9 +6,9 @@
<title>Notica - Notifications from Your Terminal</title> <title>Notica - Notifications from Your Terminal</title>
<![if lt IE 10]> <![if lt IE 10]>
<script async src="/assets/js/es5-shim.min.js"></script> <script async src="/js/es5-shim.min.js"></script>
<script async src="/assets/js/es5-sham.min.js"></script> <script async src="/js/es5-sham.min.js"></script>
<script async src="/assets/js/html5shiv.min.js"></script> <script async src="/js/html5shiv.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
// Fake console to test in IE<9 // Fake console to test in IE<9
if( typeof console == 'undefined' ) 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 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 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> </head>
<body> <body>
<div id='root'> <div id='root'>
</div> </div>
<script src="/static/bundle.js"></script> <script src="/bundle.js"></script>
</body> </body>
</html> </html>

0
assets/js/es5-sham.min.js → public/js/es5-sham.min.js vendored
Unescape View File

0
assets/js/es5-shim.min.js → public/js/es5-shim.min.js vendored
Unescape View File

0
assets/js/html5shiv.min.js → public/js/html5shiv.min.js vendored
Unescape View File

0
assets/js/sw.js → public/js/sw.js
Unescape View File

5
server.js
Unescape View File

@ -9,10 +9,9 @@ const port = 3000;
app.use(bodyParser.urlencoded({ extended: false })); app.use(bodyParser.urlencoded({ extended: false }));
app.use('/static', express.static(path.join(__dirname, 'dist'))); app.use('/', express.static(path.join(__dirname, 'public')));
app.use('/assets', express.static(path.join(__dirname, 'assets')));
app.get('/*', (req, res) => { app.get('/*', (req, res) => {
res.sendFile(path.join(__dirname, 'index.html')); res.sendFile(path.join(__dirname, 'public/index.html'));
}); });
app.post('*', (req, res) => { app.post('*', (req, res) => {

2
serverdev.js
Unescape View File

@ -3,7 +3,7 @@ var WebpackDevServer = require('webpack-dev-server');
var config = require('./webpack.config'); var config = require('./webpack.config');
new WebpackDevServer(webpack(config), { new WebpackDevServer(webpack(config), {
publicPath: config.output.publicPath, contentBase: './public',
hot: true, hot: true,
historyApiFallback: true, historyApiFallback: true,
noInfo: true noInfo: true

6
src/ui/NotifPage.js
Unescape View File

@ -50,13 +50,13 @@ export default class NotifPage extends React.Component {
let options = { let options = {
body: 'Notification from Notica', body: 'Notification from Notica',
icon: 'assets/img/icon.png', icon: 'img/icon.png',
iconUrl: 'assets/img/icon.png', iconUrl: 'img/icon.png',
vibrate: [200, 100, 200] vibrate: [200, 100, 200]
}; };
try { try {
navigator.serviceWorker.register('/assets/js/sw.js').then((reg) => { navigator.serviceWorker.register('/js/sw.js').then((reg) => {
reg.showNotification(title, options); reg.showNotification(title, options);
}); });
} catch (e) { // If we are on a browser without serviceWorker } catch (e) { // If we are on a browser without serviceWorker

2
src/ui/Site.js
Unescape View File

@ -32,7 +32,7 @@ export default class Site extends React.Component {
<div className="hero"> <div className="hero">
<div className="title"> <div className="title">
<Link to={'/home/' + id}> <Link to={'/home/' + id}>
<img src="/assets/img/logo.svg" /> <img src="/img/logo.svg" />
<span className="name">Notica</span> <span className="name">Notica</span>
</Link> </Link>
</div> </div>

4
webpack.config.js
Unescape View File

@ -9,9 +9,9 @@ module.exports = {
'./src/index' './src/index'
], ],
output: { output: {
path: path.join(__dirname, 'dist'), path: path.join(__dirname, 'public'),
filename: 'bundle.js', filename: 'bundle.js',
publicPath: '/static/' publicPath: ''
}, },
plugins: [ plugins: [
new webpack.HotModuleReplacementPlugin(), new webpack.HotModuleReplacementPlugin(),

4
webpack.production.config.js
Unescape View File

@ -7,9 +7,9 @@ module.exports = {
'./src/index' './src/index'
], ],
output: { output: {
path: path.join(__dirname, 'dist'), path: path.join(__dirname, 'public'),
filename: 'bundle.js', filename: 'bundle.js',
publicPath: '/static/' publicPath: ''
}, },
plugins: [ plugins: [
new webpack.HotModuleReplacementPlugin(), new webpack.HotModuleReplacementPlugin(),

Write Preview
Loading…
Cancel
Save