summaryrefslogtreecommitdiff
path: root/server/index.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-08-05 00:51:32 -0400
committerJules Laplace <jules@okfoc.us>2015-08-05 00:51:32 -0400
commitd0b4cd4f7e6364a35a420f2f3b0fcdbb502d8a9a (patch)
treeb05b32e1f283946346e96c9ded24f0966ce584ed /server/index.js
parent18648921f75a7c458cf0c951c249b28a48f08a6b (diff)
basic routing
Diffstat (limited to 'server/index.js')
-rw-r--r--server/index.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/server/index.js b/server/index.js
index d375351..657cdc8 100644
--- a/server/index.js
+++ b/server/index.js
@@ -9,7 +9,8 @@ var http = require('http'),
express = require('express'),
bodyParser = require('body-parser'),
multer = require('multer'),
- path = require('path');
+ path = require('path'),
+ ws = require("./ws");
var app = express()
var server
@@ -31,7 +32,7 @@ app.use(express.query())
// }
app.get("/", function(req,res){
- res.render("pages/index", {})
+ res.render("pages/lobby", {})
})
app.get("/v/:room", function(req,res){
res.render("pages/room")
@@ -42,3 +43,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