diff --git a/notify.js b/notify.js index d64fd5d..ab2f3df 100644 --- a/notify.js +++ b/notify.js @@ -2,7 +2,7 @@ //HOST = "192.168.1.153", HOST = "localhost", -PORT = "3000" +PORT = "3001" /** CONFIGURATION **/ @@ -36,20 +36,26 @@ app.get('/games/new', function (req, res) { }); app.get('/game/:gameid/:nick', function (req, res) { - if (!DB.sismember('games', req.params.gameid)) - res.send("No such game", 404); - else { - DB.sadd(req.params.gameid, req.params.nick) - params = { HOST: HOST, PORT: PORT, - gameid: req.params.gameid, - nick: req.params.nick, - ts: Date.now() - } - res.render('games/join', params); - } + DB.sismember('games', req.params.gameid, function(err, data) { + + // Game Not found + if (!data) return res.send(404); + + // Strip special characters + nick = req.params.nick.replace(/\W/g, '') + DB.sismember(req.params.gameid, nick, function(err, data) { + // Add the new member to the game + DB.sadd(req.params.gameid, nick); + params = { HOST: HOST, PORT: PORT, + gameid: req.params.gameid, + nick: nick, + ts: Date.now() + } + res.render('games/join', params); + }); + }); }); - io.sockets.on('connection', function(socket) { const subscribe = redis.createClient(); const publish = redis.createClient(); diff --git a/public/images/dancefloor4.jpg b/public/images/dancefloor4.jpg new file mode 100644 index 0000000..402c759 Binary files /dev/null and b/public/images/dancefloor4.jpg differ diff --git a/public/images/fido-clap.jpg b/public/images/fido-clap.jpg new file mode 100644 index 0000000..93aa381 Binary files /dev/null and b/public/images/fido-clap.jpg differ diff --git a/public/images/fido-clap1.jpg b/public/images/fido-clap1.jpg new file mode 100644 index 0000000..09328c0 Binary files /dev/null and b/public/images/fido-clap1.jpg differ diff --git a/public/images/fido-clap1.png b/public/images/fido-clap1.png new file mode 100644 index 0000000..f384056 Binary files /dev/null and b/public/images/fido-clap1.png differ diff --git a/public/images/fido-drums.jpg b/public/images/fido-drums.jpg new file mode 100644 index 0000000..cfeeaa7 Binary files /dev/null and b/public/images/fido-drums.jpg differ diff --git a/public/images/fido-drums1.jpg b/public/images/fido-drums1.jpg new file mode 100644 index 0000000..c3a5128 Binary files /dev/null and b/public/images/fido-drums1.jpg differ diff --git a/public/images/fido-drums1.png b/public/images/fido-drums1.png new file mode 100644 index 0000000..59c67e7 Binary files /dev/null and b/public/images/fido-drums1.png differ diff --git a/public/images/fido-guitar.jpg b/public/images/fido-guitar.jpg new file mode 100644 index 0000000..eb4ff29 Binary files /dev/null and b/public/images/fido-guitar.jpg differ diff --git a/public/images/fido-guitar1.jpg b/public/images/fido-guitar1.jpg new file mode 100644 index 0000000..bcbb9bd Binary files /dev/null and b/public/images/fido-guitar1.jpg differ diff --git a/public/images/fido-guitar1.png b/public/images/fido-guitar1.png new file mode 100644 index 0000000..c4eff65 Binary files /dev/null and b/public/images/fido-guitar1.png differ diff --git a/public/images/fido-up.jpg b/public/images/fido-up.jpg new file mode 100644 index 0000000..9cd441a Binary files /dev/null and b/public/images/fido-up.jpg differ diff --git a/public/images/fido-up1.jpg b/public/images/fido-up1.jpg new file mode 100644 index 0000000..37f04c5 Binary files /dev/null and b/public/images/fido-up1.jpg differ diff --git a/public/images/fido-up1.png b/public/images/fido-up1.png new file mode 100644 index 0000000..6504cb4 Binary files /dev/null and b/public/images/fido-up1.png differ diff --git a/public/images/fido-up2.png b/public/images/fido-up2.png new file mode 100644 index 0000000..1dfc51f Binary files /dev/null and b/public/images/fido-up2.png differ diff --git a/public/stylesheets/game.css b/public/stylesheets/game.css index 9e893da..17eefe0 100644 --- a/public/stylesheets/game.css +++ b/public/stylesheets/game.css @@ -1,31 +1,102 @@ +body { + background: #ffffff url('/images/dancefloor4.jpg') repeat right top; +} + +h1.title { + margin-top: 50px; + color: #ffffff; + text-align: center; +} + #dancefloor { - height: 500px; +} + +.action { + -webkit-box-shadow: rgba(255, 255, 255, 0.199219) 0px 1px 0px 0px inset, rgba(0, 0, 0, 0.046875) 0px 1px 2px 0px; + -webkit-transition-delay: 0s; + -webkit-transition-duration: 0.10000000149011612s; + -webkit-transition-property: background-position; + -webkit-transition-timing-function: linear; + background-color: #05C; + background-image: -webkit-linear-gradient(top, #08C, #05C); + background-position: 0px -15px; + background-repeat: repeat-x; + border-bottom-color: rgba(0, 0, 0, 0.246094); + border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; + border-bottom-style: solid; + border-bottom-width: 1px; + border-left-color: rgba(0, 0, 0, 0.0976563); + border-left-style: solid; + border-left-width: 1px; + border-right-color: rgba(0, 0, 0, 0.0976563); + border-right-style: solid; + border-right-width: 1px; + border-top-color: rgba(0, 0, 0, 0.0976563); + border-top-left-radius: 6px; + border-top-right-radius: 6px; + border-top-style: solid; + border-top-width: 1px; + box-shadow: rgba(255, 255, 255, 0.199219) 0px 1px 0px 0px inset, rgba(0, 0, 0, 0.046875) 0px 1px 2px 0px; + color: white; + cursor: pointer; + display: inline-block; + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-size: 20px; + font-weight: normal; + height: 24px; + line-height: normal; + margin-bottom: 3px; + margin-left: 3px; + margin-right: 10px; + margin-top: 3px; + outline-color: white; + outline-style: none; + outline-width: 0px; + padding-bottom: 14px; + padding-left: 24px; + padding-right: 24px; + padding-top: 14px; + text-align: center; + text-decoration: none; + text-shadow: rgba(0, 0, 0, 0.246094) 0px -1px 0px; + vertical-align: middle; + width: 206px; } .dancer { - width: 120px; + width: 180px; + height: 320px; float: left; + margin: 2px; +} + +.nickname { + font-size: 20px; + text-align: center; + font-weight: bold; + color: #fc0; } .user { background-position: 0 0; background-repeat: no-repeat; - width: 120px; - height: 120px; + height: 320px; + width: 180px; } .left { - background-image: url('/images/left.jpg') + background-image: url('/images/fido-clap1.png') } .up { - background-image: url('/images/up.jpg') + background-image: url('/images/fido-up1.png') } .right { - background-image: url('/images/right.jpg') + background-image: url('/images/fido-guitar1.png') } .hi { - background-image: url('/images/hi.jpg') + background-image: url('/images/fido-drums1.png') } diff --git a/views/games/join.jade b/views/games/join.jade index 965f408..6c5cc2d 100644 --- a/views/games/join.jade +++ b/views/games/join.jade @@ -34,13 +34,9 @@ script }); -h2 Yo mama! Welcome #{nick} - -.action(data-action="left") - input(type='button', value="Point Left!") -.action(data-action="right") - input(type='button', value="Point Right!") -.action(data-action="up") - input(type='button', value="Jump Up!") -.action(data-action="hi") - input(type='button', value="Say Hi!") +h1.title Dance #{nick}, Dance! + +.action(data-action="left") Clap Your Hands +.action(data-action="right") Play the Guitar +.action(data-action="up") Jump! Jump! +.action(data-action="hi") Play the Drums diff --git a/views/games/new.jade b/views/games/new.jade index 22f0812..6280477 100644 --- a/views/games/new.jade +++ b/views/games/new.jade @@ -1,7 +1,8 @@ script function add_user(data) { // TODO: Should use some template here! - $('#dancefloor').prepend("
" + data.nick + "
"); + if (!$("#" + data.nick).length) + $('#dancefloor').prepend("
" + data.nick + "
"); } function process_action(action, data) { @@ -39,9 +40,7 @@ script }); }); -h1 Meet me on the dance floor! -h2 http://#{HOST}:#{PORT}/game/#{gameid}/:nickname -p eg. http://#{HOST}:#{PORT}/game/#{gameid}/robert +h1.title http://#{HOST}:#{PORT}/game/#{gameid}/:nickname #dancefloor diff --git a/views/layout.jade b/views/layout.jade index 02e2e4e..c3570f7 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -1,5 +1,6 @@ html head + script(src='/javascripts/jquery-1.4.3.min.js') script(src='/socket.io/socket.io.js')