Skip to content

Commit

Permalink
added reset button for admin at end of game
Browse files Browse the repository at this point in the history
  • Loading branch information
@pwshugar
pwshugar committed Aug 7, 2013
1 parent 8b85553 commit 8e20024
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 42 deletions.
6 changes: 5 additions & 1 deletion css/home.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
display:none;
}

#resetbutton {
display:none;
}

li {
list-style-type: none;
list-style-type: none;
}
53 changes: 16 additions & 37 deletions html/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
// });

$("#killbutton").on('click',function (){
// foundLocation();
$.ajax({
url:"/contractUpdate",
type: "post",
Expand All @@ -113,6 +112,18 @@
});
});

$("#resetbutton").on('click',function (){
$.ajax({
url:"/reset",
type: "post",
data: {},
success: function (data){
socket.emit('roomUpdate');
location.reload();
}
});
});

$("#logout").on('click',function (){
$.ajax({
url:"/logout",
Expand All @@ -134,13 +145,13 @@
data: { flag: false },
success: function (data){
if (data){
if (typeof data === 'string'){
if (data.flag){
$('.info').css('display', "none");
$('#killbutton').css('display', "none");
$('#nocontract').css('display', 'block');
$('#nocontract').text(data);
$('#nocontract').text(data.message);
if (data.flag === 'admin'){ $('#resetbutton').css('display', 'block'); }
} else {
// var dobj = directionCompare(data);
$('#nocontract').css('display', 'none');
$('.info').css('display', "block");
$('#killbutton').css('display', "block");
Expand All @@ -165,36 +176,6 @@
});
</script>
</head>


<!-- <body class="iOCSS">
<div class="frame striped">
<div class="header">
<div>
<span id="roomName" ><b>Hackreactor</b></span>
</div>
<div>
<button id="logout" class="button next">Log Out</button>
</div>
</div>
<div class="scrollable">
<div id="panel-about">
<div class="well">
<h1>Assassination Target</h1>
<p id="nocontract" ></p>
<p class="info" ><b>Assassin Name: </b><span id="username"></span></p>
<p class="info" ><b>First Name: </b><span id="fname"></span></p>
<p class="info" ><b>Last Name: </b><span id="lname"></span></p>
<p class="info" ><b>Age: </b><span id="age"></span></p>
<p class="info" ><b>Weapon of Choice: </b><span id="weapon"></span></p>
<p class="info" ><b>Interesting Fact: </b><span id="fact"></span></p><br>
<button class="info" id='killbutton' type="button">Kill Target</button>
</div>
</div>
</div>
</div>
</body> -->

<body class="iOCSS black">
<div class="frame signIn_fancy">

Expand All @@ -210,14 +191,12 @@ <h1>Welcome</h1>
<h2 class="info" id="name"></h2>
<p id="nocontract" ></p>
<p class="info" ><b>Assassin Name: </b><span id="username"></span></p>
<!-- <p class="info" ><b>First Name: </b><span id="fname"></span></p>
<p class="info" ><b>Last Name: </b><span id="lname"></span></p> -->
<p class="info" ><b>Age: </b><span id="age"></span></p>
<p class="info" ><b>Weapon of Choice: </b><span id="weapon"></span></p>
<p class="info" ><b>Interesting Fact: </b><span id="fact"></span></p><br>
</div>

<button class="red large" id="killbutton" >Kill Target</button>
<button class="black large" id="resetbutton" >Reset Game</button>
</div>
</div>

Expand Down
21 changes: 17 additions & 4 deletions router.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,11 @@ exports.joingroup = function (req, res){
} else if (groupdata.password !== req.body.password){
res.send('badpass');
} else {
console.log(req.session.admin);
UserModel.findOne({ username: req.session.username }, function (err, userdata){
if (userdata.groupname !== groupname && userdata.started){
res.send('ingame');
} else {
if (req.session.username === groupdata.admin && !groupdata.started && !groupdata.winner){
console.log('THIS IS WINNER', groupdata.winner);
req.session.admin = true;
}
userdata.groupname = groupname;
Expand Down Expand Up @@ -299,18 +297,33 @@ exports.startgame = function (req, res){
res.send('true');
};

exports.reset = function (req, res){
req.session.admin = true;
GroupModel.findOne({ groupname: req.session.groupname }, function (err, data){
data.winner = undefined;
data.save();
res.send();
});
};

exports.contractUpdate = function (req, res){
GroupModel.findOne({ groupname: req.session.groupname }, function (err, groupdata){
var messageObj = {};
if (!groupdata.started && !groupdata.winner){
res.send('Game has not started yet.');
messageObj.flag = 'user';
messageObj.message = 'Game has not started yet.'
res.send(messageObj);
} else {
UserModel.findOne({ username: req.session.username }, 'contract', function (err, userdata){
if (userdata === null){
res.send();
} else {
if (groupdata.winner){
UserModel.findOne({ username: groupdata.winner}, function (err, winnerdata){
res.send(winnerdata.fname + " " + winnerdata.lname + " won!")
messageObj.flag = 'user';
if (req.session.username === groupdata.admin){ messageObj.flag = 'admin'; }
messageObj.message = winnerdata.fname + " " + winnerdata.lname + " won!";
res.send(messageObj);
});
} else if (userdata.contract){
UserModel.findOne({ username: userdata.contract }, function (err, contractdata){
Expand Down
4 changes: 4 additions & 0 deletions server.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ app.post('/contractUpdate', function (req, res){
router.contractUpdate(req, res);
});

app.post('/reset', function (req, res){
router.reset(req, res);
});

// get requests

app.get('/io', function (req, res){
Expand Down

0 comments on commit 8e20024

Please sign in to comment.