1 files changed, 17 insertions, 3 deletions
diff --git a/server/index.js b/server/index.js
index d08cf2e..1843ae0 100644
--- a/server/index.js
+++ b/server/index.js
@@ -13,8 +13,10 @@ var http = require('http'),
 	ws = require("./ws"),
 	util = require("./util");
 
+var websocket = require('./websocket')
+
 var app = express()
-var server
+var server, io
 
 app.set('port', config.port)
 app.set('view engine', 'ejs')
@@ -26,12 +28,24 @@ app.use(require('cookie-parser')())
 // app.use(require('body-parser')())
 // app.use(require('multer'))
 app.use(express.query())
-// app.use(require('method-override')())
 // app.set('trust proxy', true)
 // if (config.env.development) {
 //   app.use(require('express-error-handler'))
 // }
 
+server = http.createServer(app)
+server.listen(app.get('port'), function () {
+  console.log('asdf-yt server listening on port ' + app.get('port'));
+})
+
+var io = websocket.init(server)
+
+var rooms = {}
+
+app.all('*', function(req, res, next){
+  res.locals.config = config
+  next()
+})
 app.get("/", function(req,res){
   res.render("pages/lobby", {})
 })
@@ -51,4 +65,4 @@ server.listen(app.get('port'), function () {
   console.log('asdf-yt server listening on port ' + app.get('port'));
 })
 
-ws.listen(server)
-\ No newline at end of file
+ws.listen(server)