From 29a7cc00492955ad3875bbdda9e471db56fbca31 Mon Sep 17 00:00:00 2001 From: Ivar Date: Sun, 1 May 2016 15:43:25 +0200 Subject: [PATCH] Fixed placeholder for favicon.ico --- app.js | 3 + package.json | 195 +++++++++++++++++++++++---------------------- public/favicon.ico | Bin 0 -> 34494 bytes 3 files changed, 102 insertions(+), 96 deletions(-) create mode 100644 public/favicon.ico diff --git a/app.js b/app.js index 05ee760d8e..3f236aeed8 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,5 @@ var express = require('express'); +var favicon = require('serve-favicon'); var bodyParser = require('body-parser'); var cookieParser = require('cookie-parser'); var log4js = require('log4js'); @@ -24,6 +25,8 @@ if (app.get('env') === 'development') { app.use(baseUriPath, webpackDevMiddleware(compiler, config)); } +app.use(favicon(__dirname + '/public/favicon.ico')); + app.use(validator([])); app.set('trust proxy'); diff --git a/package.json b/package.json index ff15b2371c..c61aae42cf 100644 --- a/package.json +++ b/package.json @@ -1,99 +1,102 @@ { - "name": "unleash-server", - "description": "unleash your features", - "version": "0.1.0", - "keywords": [ - "unleash", - "feature toggle", - "feature", - "toggle" - ], - "repository": { - "type": "git", - "url": "ssh://git@github.com:finn-no/unleash.git" - }, - "bugs": { - "url": "https://github.com/finn-no/unleash/issues" - }, - "engines" : { - "node" : ">=4.4.3" - }, - "private": true, - "scripts": { - "db-migrate-and-start": "npm run db-migrate && npm run start", - "start": "NODE_ENV=production node server.js", - "build": "./node_modules/.bin/webpack -p", - "dev": "NODE_ENV=development supervisor --ignore ./node_modules/,./public/js server.js", - "start-pg": "pg_virtualenv npm run start-pg-chain", - "start-pg-chain": "export DATABASE_URL=postgres://$PGUSER:$PGPASSWORD@localhost:$PGPORT/postgres ; db-migrate up && npm run dev", - "test": "export PORT=4243 ; jest && npm run lint && mocha test test/*.js && npm run coverage", - "docker-test": "export PORT=4243 ; ./scripts/docker-postgres.sh", - "pg-virtualenv-test": "pg_virtualenv npm run pg-virtualenv-chain", - "pg-virtualenv-chain": "export TEST_DATABASE_URL=postgres://$PGUSER:$PGPASSWORD@localhost:$PGPORT/postgres ; npm run db-migrate-testdb && npm test", - "db-migrate": "node_modules/.bin/db-migrate up", - "db-migrate-testdb": "DATABASE_URL=$TEST_DATABASE_URL ./node_modules/.bin/db-migrate up", - "tdd": "mocha --watch test test/*", - "test-bamboo-ci": "mocha test test/*", - "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec", - "coverage-report": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage", - "postinstall": "npm run build", - "jest": "jest", - "lint": "eslint . --ignore-path .gitignore" - }, - "dependencies": { - "bluebird": "2.9.14", - "body-parser": "1.15.0", - "cookie-parser": "^1.4.1", - "db-migrate": "0.9.23", - "deep-diff": "^0.3.3", - "errorhandler": "1.3.5", - "express": "4.13.4", - "express-validator": "2.20.3", - "ini": "1.3.4", - "jsx-loader": "0.12.2", - "jsxhint": "0.13.2", - "knex": "^0.11.0", - "lodash": "^3.5.0", - "log4js": "0.6.35", - "moment": "^2.13.0", - "nconf": "0.8.4", - "pg": "^4.5.5", - "react": "^0.13.1", - "react-router": "^0.13.2", - "reflux": "^0.2.10", - "reqwest": "^2.0.5", - "webpack": "^1.13.0", - "webpack-dev-middleware": "^1.6.1" - }, - "devDependencies": { - "chai": "3.5.0", - "coveralls": "^2.11.9", - "eslint": "^2.9.0", - "eslint-config-spt": "^2.0.0", - "eslint-plugin-react": "^4.3.0", - "istanbul": "^0.4.3", - "jest-cli": "0.5.4", - "mocha": "^2.4.5", - "mocha-lcov-reporter": "1.2.0", - "nsp": "^2.3.2", - "pre-commit": "^1.0.2", - "react-tools": "^0.13.1", - "supertest": "^1.2.0", - "supervisor": "^0.10.0", - "xmlbuilder": "^8.2.2" - }, - "jest": { - "scriptPreprocessor": "/jest-preprocessor.js", - "unmockedModulePathPatterns": [ - "/node_modules/react", - "/node_modules/reflux" - ], - "moduleFileExtensions": [ - "jsx", - "js" - ] - }, - "pre-commit": [ - "lint" + "name": "unleash-server", + "description": "unleash your features", + "version": "0.1.0", + "keywords": [ + "unleash", + "feature toggle", + "feature", + "toggle" + ], + "repository": { + "type": "git", + "url": "ssh://git@github.com:finn-no/unleash.git" + }, + "bugs": { + "url": "https://github.com/finn-no/unleash/issues" + }, + "engines": { + "node": ">=4.4.3" + }, + "private": true, + "scripts": { + "db-migrate-and-start": "npm run db-migrate && npm run start", + "start": "NODE_ENV=production node server.js", + "build": "./node_modules/.bin/webpack -p", + "dev": "NODE_ENV=development supervisor --ignore ./node_modules/,./public/js server.js", + "start-pg": "pg_virtualenv npm run start-pg-chain", + "start-pg-chain": "export DATABASE_URL=postgres://$PGUSER:$PGPASSWORD@localhost:$PGPORT/postgres ; db-migrate up && npm run dev", + "test": "export PORT=4243 ; jest && npm run lint && mocha test test/*.js && npm run coverage", + "docker-test": "export PORT=4243 ; ./scripts/docker-postgres.sh", + "pg-virtualenv-test": "pg_virtualenv npm run pg-virtualenv-chain", + "pg-virtualenv-chain": "export TEST_DATABASE_URL=postgres://$PGUSER:$PGPASSWORD@localhost:$PGPORT/postgres ; npm run db-migrate-testdb && npm test", + "db-migrate": "node_modules/.bin/db-migrate up", + "db-migrate-testdb": "DATABASE_URL=$TEST_DATABASE_URL ./node_modules/.bin/db-migrate up", + "tdd": "mocha --watch test test/*", + "test-bamboo-ci": "mocha test test/*", + "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec", + "coverage-report": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage", + "postinstall": "npm run build", + "jest": "jest", + "lint": "eslint . --ignore-path .gitignore" + }, + "dependencies": { + "bluebird": "2.9.14", + "body-parser": "1.15.0", + "cookie-parser": "^1.4.1", + "db-migrate": "0.9.23", + "deep-diff": "^0.3.3", + "errorhandler": "1.3.5", + "express": "4.13.4", + "express-validator": "2.20.3", + "ini": "1.3.4", + "install": "^0.6.1", + "jsx-loader": "0.12.2", + "jsxhint": "0.13.2", + "knex": "^0.10.0", + "lodash": "^3.5.0", + "log4js": "0.6.35", + "moment": "^2.13.0", + "nconf": "0.8.4", + "npm": "^3.8.8", + "pg": "^4.5.5", + "react": "^0.13.1", + "react-router": "^0.13.2", + "reflux": "^0.2.10", + "reqwest": "^2.0.5", + "serve-favicon": "^2.3.0", + "webpack": "^1.13.0", + "webpack-dev-middleware": "^1.6.1" + }, + "devDependencies": { + "chai": "3.5.0", + "coveralls": "^2.11.9", + "eslint": "^2.9.0", + "eslint-config-spt": "^2.0.0", + "eslint-plugin-react": "^4.3.0", + "istanbul": "^0.4.3", + "jest-cli": "0.5.4", + "mocha": "^2.4.5", + "mocha-lcov-reporter": "1.2.0", + "nsp": "^2.3.2", + "pre-commit": "^1.0.2", + "react-tools": "^0.13.1", + "supertest": "^1.2.0", + "supervisor": "^0.10.0", + "xmlbuilder": "^8.2.2" + }, + "jest": { + "scriptPreprocessor": "/jest-preprocessor.js", + "unmockedModulePathPatterns": [ + "/node_modules/react", + "/node_modules/reflux" + ], + "moduleFileExtensions": [ + "jsx", + "js" ] + }, + "pre-commit": [ + "lint" + ] } diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a2bc43c660a81140395e12f5df4370fb45408120 GIT binary patch literal 34494 zcmeHQTWl3Y7#<1~K_bLxL<87V&|;$UVvGj05`!^bAH2l)f)us*fCe#Wz)Mnz7+)xe z0UiJ)3gRsh6%zzSDG4nt_i_^fk#ZAg3zX8`+41{#&m8vb**&)9?CIIF|DSwkW@l&q z`Tv=3XJ=>UoFhap(N_!}ED)B6%05CoBZL?-#5tbTUx>9xD=Be~mm}Y}tArRmI&nNw zh||M`C@*)8%f<@v$%8_aK?kxzqmzz62VkP*5V9fFgw{zTicG><~DW_0YYRvKn!?u7oJ{Hdj#Bg#uQF}Mw~$^q{@ zDe#yc<}k?$;vmh#N`P`8IS->U9tkSX>3nT72V%j2+34q<5~{mR&3-6lF5sRQWQxl} zKiGDg+n(<9+(6GosEl1VJ~Gvj>6~nsW7n^Bb~UsMbN$h6|LqHM(*GS3gz|$tw6f>w zujqw2I!*mMKQH%QA9i6XAFy7k)BSums>kT!UB33U9a@2|Cn)r*UmkSYo^)t^T@AZi zzq#Z|rOfkG{B8Q^YP~u?l_d%CTc^AIH)h_ZRL2=A_7e2a{4;0u8}lB(v+}=GV93dK9{p7*%cOc&0e86T*7aZJ{V&t~pVrH1 z@%}o`V}pH&bn5@_fbI&_9rz5x=eTW{1EF&uf*5-*~N*Sw#|<1$~v;M-n|x*t+;Ay`4jc1jy1(uhjp&8o^+E~ zf7RAz%VxKpQ0;H2t97hr``vBsj&u75UpE%>$M@Yq3V$xN?x$-kl<_AQ?QgUM7EHm^mLKjzX`wi9igFLlb2&9IN;0PvLCZXHK@c8^k_qMsNZFYw^_nDp9II}mz^#{HFL-qt=BhLK{(8i=m!0m23gW||{b)pP{tcza% z;WfqlTT|pd;XYvwFb9|e%z=F80464SFH!cxpt(`cr57ct)}fw$;>SL0xi1mE4}(r&SKT2PF4tQG!RPlNj6v%mL;AbAUO(9AFMG2bcrQ0p~+8(1}+%aRrEv>o1 zs1|wrE4>HH_MPl7s_txZ@39O!PHmj@AHIjN7bZxjQFo8M|5De_{&W8`|M~h4d(3m| z=kbrne|`U<`+m^9DvWf#|K-8`f5xq+V%`6HNP63*CR?{kxj*eJH)&xgLJ^iHrZn z%)5^$X`W8>_1_5T@0MuKWx@Bqx$ybD=y$!weiA;9(%Vl9+W*P{(%Q1p{as^v)}t-C zNhwJG@qJT#Kfe**$vX=FwETgH&H1GBh#;+C_-{6Pd lqJ5y(KL#e;7@7#jB*Ga^*voXne$Ed-h#T!NtzmMM@E-=Q5N7}Y literal 0 HcmV?d00001