diff options
| -rw-r--r-- | protoype/app.js | 28 | ||||
| -rw-r--r-- | protoype/views/index.jade | 2 |
2 files changed, 24 insertions, 6 deletions
diff --git a/protoype/app.js b/protoype/app.js index 2b6828c..15556eb 100644 --- a/protoype/app.js +++ b/protoype/app.js @@ -69,7 +69,9 @@ app.post('/login', function(req, res) { }); }); -/* /sys/do?get=activelist [list of active users] +/* /sys/do?get=activelist [list of active users] + * /sys/do?get=entermatch&master=foo&slave=bar [enter master's match] + * /sys/do?post=creatematch&master=foo&slave=bar [create match] * */ app.get('/sys/:id([a-z]+)', function(req, res, next) { @@ -78,7 +80,7 @@ app.get('/sys/:id([a-z]+)', function(req, res, next) { util.log('[sys] route id aka action: ' + req.params.id); if (req.params.id === 'do') { var data = ''; - if (req.query.get != 'undefined') { + if (req.query.get != undefined) { util.log('[sys] get value: ' + req.query.get); if (req.query.get === 'activelist') { db.users.find({status: 'online'}, function(err, result) { @@ -92,10 +94,26 @@ app.get('/sys/:id([a-z]+)', function(req, res, next) { } }); } + else if (req.query.get === 'entermatch' && req.query.master != undefined && req.query.master.length > 0 && + req.query.slave != undefined && req.query.slave.length > 0) { + util.log('[sys] get: ' + req.query.slave + ' entered ' + req.query.master + '\'s match'); + res.send('entered match\n'); + } + else + next(); } - else if (req.query.fetch != 'undefined') { - util.log('[sys] fetch value: ' + req.query.fetch); - res.send(data); + else if (req.query.post != undefined) { + util.log('[sys] post value: ' + req.query.post); + if (req.query.post === 'creatematch' && req.query.master != undefined && req.query.master.length > 0 && + req.query.slave != undefined && req.query.slave.length > 0) { /* master creates a match */ + /* how the fuck do I get a hold of slave? */ + // invite slave, wait for reply, if accepted, keep that state! + // respond to master + util.log('[sys] post: ' + req.query.slave + ' accepted match'); + res.send('match accepted\n'); + } + else + next(); } else next(); } diff --git a/protoype/views/index.jade b/protoype/views/index.jade index cd300f5..2f92c52 100644 --- a/protoype/views/index.jade +++ b/protoype/views/index.jade @@ -3,7 +3,7 @@ p Welcome to #{title}. Find your opponent, and get ready! h3 User List - each user in users - #listentry <u>#{user.tag}</u> + #listentry <u>#{user.tag}</u> >> #{user.location.loc} | - if (user.status == 'online') span(style='color: green; font-weight: bold')= user.status - else |