1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-04 00:18:01 +01:00

Fixed placeholder for favicon.ico

This commit is contained in:
Ivar 2016-05-01 15:43:25 +02:00 committed by Ivar Conradi Østhus
parent d781d7c50b
commit 29a7cc0049
3 changed files with 102 additions and 96 deletions

3
app.js
View File

@ -1,4 +1,5 @@
var express = require('express'); var express = require('express');
var favicon = require('serve-favicon');
var bodyParser = require('body-parser'); var bodyParser = require('body-parser');
var cookieParser = require('cookie-parser'); var cookieParser = require('cookie-parser');
var log4js = require('log4js'); var log4js = require('log4js');
@ -24,6 +25,8 @@ if (app.get('env') === 'development') {
app.use(baseUriPath, webpackDevMiddleware(compiler, config)); app.use(baseUriPath, webpackDevMiddleware(compiler, config));
} }
app.use(favicon(__dirname + '/public/favicon.ico'));
app.use(validator([])); app.use(validator([]));
app.set('trust proxy'); app.set('trust proxy');

View File

@ -15,8 +15,8 @@
"bugs": { "bugs": {
"url": "https://github.com/finn-no/unleash/issues" "url": "https://github.com/finn-no/unleash/issues"
}, },
"engines" : { "engines": {
"node" : ">=4.4.3" "node": ">=4.4.3"
}, },
"private": true, "private": true,
"scripts": { "scripts": {
@ -50,18 +50,21 @@
"express": "4.13.4", "express": "4.13.4",
"express-validator": "2.20.3", "express-validator": "2.20.3",
"ini": "1.3.4", "ini": "1.3.4",
"install": "^0.6.1",
"jsx-loader": "0.12.2", "jsx-loader": "0.12.2",
"jsxhint": "0.13.2", "jsxhint": "0.13.2",
"knex": "^0.11.0", "knex": "^0.10.0",
"lodash": "^3.5.0", "lodash": "^3.5.0",
"log4js": "0.6.35", "log4js": "0.6.35",
"moment": "^2.13.0", "moment": "^2.13.0",
"nconf": "0.8.4", "nconf": "0.8.4",
"npm": "^3.8.8",
"pg": "^4.5.5", "pg": "^4.5.5",
"react": "^0.13.1", "react": "^0.13.1",
"react-router": "^0.13.2", "react-router": "^0.13.2",
"reflux": "^0.2.10", "reflux": "^0.2.10",
"reqwest": "^2.0.5", "reqwest": "^2.0.5",
"serve-favicon": "^2.3.0",
"webpack": "^1.13.0", "webpack": "^1.13.0",
"webpack-dev-middleware": "^1.6.1" "webpack-dev-middleware": "^1.6.1"
}, },

BIN
public/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB