gulp stuff

This commit is contained in:
Martin Donnelly 2017-08-07 22:21:36 +01:00
parent ca959d8923
commit eb0b076fed
5 changed files with 13 additions and 8 deletions

2
app.js
View File

@ -8,6 +8,7 @@ const base58 = require('./base58.js');
const log4js = require('log4js');
const logger = log4js.getLogger();
const compression = require('compression');
const favicon = require('express-favicon');
logger.level = 'debug';
@ -36,6 +37,7 @@ app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: true }));
app.use(express.static(path.join(__dirname, sitePath)));
app.use(favicon(__dirname + '/live/favicon-16x16.png'));
app.all('/*', function(req, res, next) {
// CORS headers

View File

@ -67,8 +67,8 @@ gulp.task('styles', function() {
gulp.task('migrate', function() {
return gulp.src(['fav/*'])
.pipe(gulp.dest('dist'));
return gulp.src(['fav/favicon-16x16.png'])
.pipe(gulp.dest('live'));
});
gulp.task('index', function() {

8
package-lock.json generated
View File

@ -2529,6 +2529,14 @@
"vary": "1.1.1"
}
},
"express-favicon": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/express-favicon/-/express-favicon-2.0.0.tgz",
"integrity": "sha1-oi2aaZLQVZSTAEXbfmLKeFuTopY=",
"requires": {
"express": "4.15.3"
}
},
"extend": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",

View File

@ -12,6 +12,7 @@
"body-parser": "^1.14.1",
"compression": "^1.7.0",
"express": "^4.13.3",
"express-favicon": "^2.0.0",
"mongoose": "4.2.9"
},
"devDependencies": {

View File

@ -6,12 +6,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>nURL</title>
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/manifest.json">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="theme-color" content="#ffffff">
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet">
<!-- build:css-->
<link rel="stylesheet" href="//cdn.muicss.com/mui-0.9.20/css/mui.min.css">