fixed up some bugs on iohome

pwshugar · Aug 5, 2013 · ed511e2 · ed511e2
1 parent a86344f
commit ed511e2
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 25 deletions.
diff --git a/css/iohome.css b/css/iohome.css
@@ -1,6 +1,23 @@
 /*Scheme ID: 3h11Tw0w0w0w0*/
 
-
+#roomName {
+  font-size: 22px;
+  color: white;
+}
+
+#killbutton {
+  display:none;
+  background:red;
+  width:258px;
+}
+
+#nocontract {
+  display:none;
+}
+
+.info {
+  display:none;
+}
 
 
 

diff --git a/css/iologin.css b/css/iologin.css
@@ -9,7 +9,7 @@
 }
 
 #usernamePassword button {
-  width:250px;
+  width:258px;
 }
 
 #usernamePassword input {
@@ -21,7 +21,7 @@
 }
 
 #info button {
-  width:250px;
+  width:258px;
 }
 
 #info input {

diff --git a/html/iohome.html b/html/iohome.html
@@ -13,26 +13,27 @@
         var roomUsername = '';
         var roomName = '';
 
-        // var logcheck = function (){
-        //   $.ajax({
-        //     url:"/logcheck",
-        //     type: "post",
-        //     data: {},
-        //     success: function (data){
-        //       if (data){
-        //         roomUsername = data.username;
-        //         roomName = data.groupname;
-        //         $('#logout').css("display", "block");
-        //         $('#welcome').text("Welcome, " + data.username[0].toUpperCase() + data.username.slice(1));
-        //         $('#roomname').text(data.groupname[0].toUpperCase() + data.groupname.slice(1));
-        //       } else {
-        //         $('#login').css("display", "block");
-        //       }
-        //     }
-        //   });
-        // };
+        var logcheck = function (){
+          $.ajax({
+            url:"/logcheck",
+            type: "post",
+            data: {},
+            success: function (data){
+              if (data){
+                roomUsername = data.username;
+                roomName = data.groupname;
+              }
+                // $('#logout').css("display", "block");
+                // $('#welcome').text("Welcome, " + data.username[0].toUpperCase() + data.username.slice(1));
+                // $('#roomname').text(data.groupname[0].toUpperCase() + data.groupname.slice(1));
+              // } else {
+              //   $('#login').css("display", "block");
+              // }
+            }
+          });
+        };
 
-        // logcheck();
+        logcheck();
 
 
         var socket = io.connect('/');
@@ -65,7 +66,7 @@
                 if (city.toLowerCase() === data.born || city.toLowerCase() === 'puck'){
                   socket.emit('killPlayer', { username: roomUsername, contract: data.username, groupname: roomName });
                 } else {
-                  console.log('You fail');
+                  alert('Assassination Fail. Wrong information.');
                   // need to do something
                 }
               }
@@ -95,16 +96,19 @@
               if (data){
                 if (data === 'dead'){
                   $('.info').css('display', "none");
+                  $('#killbutton').css('display', "none");
                   $('#nocontract').css('display', 'block');
                   $('#nocontract').text('You were assassinated. Game Over.');
                 } else if (data === 'win'){
                   $('.info').css('display', "none");
+                  $('#killbutton').css('display', "none");
                   $('#nocontract').css('display', 'block');
                   $('#nocontract').text('You Win!');
                   socket.emit('gameover', roomUsername);
                 } else {
                   $('#nocontract').css('display', 'none');
                   $('.info').css('display', "block");
+                  $('#killbutton').css('display', "block");
                   $('#username').text(data.username[0].toUpperCase() + data.username.slice(1));
                   $('#fname').text(data.fname);
                   $('#lname').text(data.lname);
@@ -113,6 +117,7 @@
                   $('#fact').text(data.fact);
                 }
               } else {
+                $('#nocontract').css('display', 'block');
                 $('#nocontract').text("Game hasn't started yet.");
               }
             }
@@ -128,7 +133,7 @@
 	<div class="frame">
     <div class="header">
       <div>
-        <span style="font-size: 25px; color: white;"><b>Hackreactor</b></span>
+        <span id="roomName" ><b>Hackreactor</b></span>
       </div>
       <div>
         <button id="logout" class="button next">Log Out</button>
@@ -145,7 +150,7 @@ <h1>Assassination Target</h1>
           <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">Killed Target</button>
+          <button class="info" id='killbutton' type="button">Kill Target</button>
         </div>
       </div>
     </div>