Merge branch 'master' of https://github.com/wonderdogone/socketio-jwt into wonderdogone-master

This commit is contained in:
José F. Romaniello 2015-08-31 11:05:43 -03:00
commit 4fdb4e62f0
2 changed files with 8 additions and 6 deletions

View File

@ -9,10 +9,11 @@ var jwt_secret = 'foo bar big secret';
var app = express();
app.configure(function(){
this.use(express.json());
this.use(express.static(__dirname + '/public'));
});
var serveStatic = require('serve-static')
var bodyParser = require('body-parser');
app.use(serveStatic('public', {'index': ['index.html']}))
app.use(bodyParser.json());
app.post('/login', function (req, res) {
var profile = {

View File

@ -26,8 +26,9 @@
"xtend": "~2.1.2"
},
"devDependencies": {
"connect": "~2.7.11",
"express": "~3.1.2",
"express": "~4.10.6",
"body-parser": "^1.10.0",
"serve-static": "^1.7.1",
"mocha": "~1.17.0",
"passport-local": "~0.1.6",
"request": "~2.19.0",