mergez

1 files changed, 19 insertions, 7 deletions

diff --git a/server/index.js b/server/index.js
index 64965b5..1843ae0 100644
--- a/server/index.js
+++ b/server/index.js
@@ -9,7 +9,9 @@ var http = require('http'),
   express = require('express'),
 	bodyParser = require('body-parser'),
 	multer = require('multer'),
-	path = require('path');
+	path = require('path'),
+	ws = require("./ws"),
+	util = require("./util");
 
 var websocket = require('./websocket')
 
@@ -17,8 +19,8 @@ var app = express()
 var server, io
 
 app.set('port', config.port)
-app.set('views', path.join(__dirname, '../views'))
 app.set('view engine', 'ejs')
+app.set('views', path.join(__dirname, '../views'))
 app.use(express.static(path.join(__dirname, '../public')))
 app.use(require('morgan')("combined", {}))
 app.use(require("express-json")())
@@ -45,12 +47,22 @@ app.all('*', function(req, res, next){
   next()
 })
 app.get("/", function(req,res){
-  res.render("pages/index", {})
+  res.render("pages/lobby", {})
+})
+app.post("/v/:room", function(req,res){
+  var room = util.sanitizeName(req.params.room)
+  ws.add(room)
+  res.render("pages/room")
 })
 app.get("/v/:room", function(req,res){
-  var room = req.params.room
-  if (! (room in rooms)) {
-    rooms[room] = websocket.bind(room)
-  }
+  var room = util.sanitizeName(req.params.room)
+  ws.add(room)
   res.render("pages/room")
 })
+
+server = http.createServer(app)
+server.listen(app.get('port'), function () {
+  console.log('asdf-yt server listening on port ' + app.get('port'));
+})
+
+ws.listen(server)