Skip to content

Commit

Permalink
updated express
Browse files Browse the repository at this point in the history
  • Loading branch information
chrismatthieu committed Feb 3, 2014
1 parent 0677cd6 commit e8f79a2
Show file tree
Hide file tree
Showing 785 changed files with 56,622 additions and 29,526 deletions.
Binary file modified .DS_Store
Binary file not shown.
55 changes: 39 additions & 16 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,46 @@
var express = require('express')
, routes = require('./routes');

var users = [];

var app = module.exports = express.createServer();

, routes = require('./routes')
, http = require('http');

var app = express();
var server = app.listen(process.env.PORT || 3000);
var io = require('socket.io').listen(server);

app.configure(function(){
app.set('views', __dirname + '/views');
app.set('view engine', 'jade');
app.use(express.favicon());
app.use(express.logger('dev'));
app.use(express.static(__dirname + '/public'));
app.use(express.bodyParser());
app.use(express.methodOverride());
app.use(app.router);
app.use(express.static(__dirname + '/public'));
});

app.configure('development', function(){
app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
});

app.configure('production', function(){
app.use(express.errorHandler());
});


var users = [];

// app.configure(function(){
// app.set('views', __dirname + '/views');
// app.set('view engine', 'jade');
// app.use(express.bodyParser());
// app.use(express.methodOverride());
// app.use(app.router);
// app.use(express.static(__dirname + '/public'));
// });

// app.configure('development', function(){
// app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
// });

// app.configure('production', function(){
// app.use(express.errorHandler());
// });

app.get('/', routes.index);

app.get('/getNext/:socket', function(req, res){
Expand Down Expand Up @@ -52,12 +71,16 @@ app.get('/available', function(req, res){
});


app.listen(process.env.PORT || 3000, function(){
console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);
});
// app.listen(process.env.PORT || 3000, function(){
// app.listen(process.env.PORT || 3000, function(){
// console.log("Express server listening on port %d in %s mode", process.env.PORT, app.settings.env);
// });

// server.listen(process.env.PORT || 3000);



var io = require('socket.io').listen(app);
var io = require('socket.io').listen(server);

io.configure(function() {
io.enable("browser client minification");
Expand Down
2 changes: 1 addition & 1 deletion node_modules/.bin/jade

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions node_modules/express/.npmignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e8f79a2

Please sign in to comment.