deleted old files, cleaned and refactored server and router

pwshugar · Aug 8, 2013 · 3282313 · 3282313
1 parent b436c9d
commit 3282313
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 992 deletions.
diff --git a/css/create.css b/css/create.css
diff --git a/css/home.css b/css/home.css
diff --git a/css/login.css b/css/login.css
diff --git a/css/oldhome.css b/css/oldhome.css
diff --git a/css/oldlogin.css b/css/oldlogin.css
diff --git a/html/admin.html b/html/admin.html
@@ -23,7 +23,7 @@
             data: {},
             success: function (data){
               socket.emit('roomUpdate');
-              location.reload();
+              location.href = '/login';
             }
           });
         });

diff --git a/html/home.html b/html/home.html
@@ -76,7 +76,7 @@
             data: {},
             success: function (data){
               socket.emit('roomUpdate');
-              location.reload();
+              location.href = '/login';
             }
           });
         });

diff --git a/html/join.html b/html/join.html
@@ -43,14 +43,14 @@
                 if (data === 'nogame'){
                   $('#groupname')[0].value = '';
                   $('#password')[0].value = '';
-                  console.log(data);
+                  alert('This group has not been created.');
                 } else if (data === 'badpass'){
                   $('#password')[0].value = '';
-                  console.log(data);
+                  alert('Incorrect password.');
                 } else if (data === 'ingame'){
                   $('#groupname')[0].value = '';
                   $('#password')[0].value = '';
-                  console.log(data);
+                  alert("You cannot join another game until you finish the game in progress.");
                 } else {
                   socket.emit('roomUpdate');
                   location.reload();
@@ -65,14 +65,12 @@
   </head>
   <body class="iOCSS black">
     <div class="frame signIn_fancy">
-
       <div class="header">
         <h1>Welcome</h1>
         <div class="right">
           <button type="button" class="button" id="logout">Log out</a>
         </div>
       </div>
-
       <div class="scrollable box-vertical box-center-main" id="joinDiv">
         <div class="editor flex-none" id="joinDiv">
           <div class="well-header" id="infoarea">Join a Game</div>
@@ -91,7 +89,6 @@ <h1>Welcome</h1>
         <div class="well-header" id="infoarea">Need to create a new game?</div><br>
         <a href="/create" type="button" class="button black large">Create a Game</a>
       </div>
-
     </div>
   </body>
 </html>
diff --git a/html/login.html b/html/login.html
@@ -10,26 +10,7 @@
     <script type="text/javascript">
       $(function (){
 
-        // var locObj = {
-        //   lat: 0,
-        //   long: 0,
-        //   minutes: 0
-        // };
-
-        // var foundLocation = function(){
-        //   navigator.geolocation.getCurrentPosition(foundLocation);
-        //   function locfind (position){
-        //     locObj.lat = position.coords.latitude;
-        //     locObj.long = position.coords.longitude;
-        //     locObj.minutes = new Date().getTime() / 60000;
-        //     console.log(locObj);
-        //   };
-        // };
-
-        // foundLocation();
-
         var socket = io.connect('/');
-        socket.on('news', function (data){ console.log(data); });
 
         $("#usernamePassword input").on('keypress', function (e){
           if(e.which === 13) { $('#gobutton').click(); }
@@ -42,9 +23,6 @@
             data: {
               username: $('#username')[0].value.toLowerCase(),
               password: $('#password')[0].value
-              // lat: locObj.lat,
-              // long: locObj.long,
-              // minutes: locObj.minutes
             },
             success: function(data){
               if (data === 'false'){
@@ -67,18 +45,14 @@
   </head>
   <body class="iOCSS black">
     <div class="frame signIn_fancy">
-
       <div class="header">
         <h1>Sign In</h1>
         <div class="right">
           <a href="/signup" class="button">Sign Up</a>
         </div>
       </div>
-
       <div class="scrollable box-vertical box-center-main">
-        <div class="logo">
-          Assassins
-        </div>
+        <div class="logo">Assassins</div>
         <div class="editor flex-none" id="usernamePassword">
           <div class="fields well">
             <div class="field">
@@ -93,7 +67,6 @@ <h1>Sign In</h1>
         </div>
         <button id="gobutton" class="black large">Sign In</button>
       </div>
-
     </div>
   </body>
 <html>