put all css in one file, refactoring code

pwshugar · Aug 7, 2013 · 95680a2 · 95680a2
1 parent 12f5d67
commit 95680a2
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 194 deletions.
diff --git a/css/assassin.css b/css/assassin.css
@@ -0,0 +1,45 @@
+.signIn_fancy {
+  background-image: -webkit-radial-gradient(center center, ellipse contain, rgb(50, 50, 50) 0%, rgb(45, 45, 45) 20%, black 100%);
+}
+
+.logo {
+  margin-top: -1rem;
+  font-family: monospace;
+  font-size: 3rem;
+  color: rgb(150, 150, 150);
+  text-align: center;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.75);
+}
+
+.iOCSS .flex-none {
+  -webkit-box-flex: 0 !important;
+}
+
+#infoarea {
+  color: gray !important;
+}
+
+#nocontract {
+  display: none;
+}
+
+.info {
+  display: none;
+}
+
+#info {
+  display: none;
+}
+
+#killbutton {
+  display: none;
+}
+
+#resetbutton {
+  display: none;
+}
+
+li {
+  list-style-type: none;
+}
+
diff --git a/css/home.css b/css/home.css
@@ -1,4 +1,3 @@
-/*Scheme ID: 3h11Tw0w0w0w0*/
 .signIn_fancy {
   background-image: -webkit-radial-gradient(center center, ellipse contain, rgb(50, 50, 50) 0%, rgb(45, 45, 45) 20%, black 100%);
 }

diff --git a/html/admin.html b/html/admin.html
@@ -2,100 +2,86 @@
 <html>
   <head>
     <link rel="stylesheet" type="text/css" href="./css/io.css">
-    <link rel="stylesheet" type="text/css" href="./css/home.css">
+    <link rel="stylesheet" type="text/css" href="./css/assassin.css">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
     <script src="/socket.io/socket.io.js"></script>
     <script type="text/javascript"></script>
-    <script>
+    <script type="text/javascript">
   	  $(document).ready(function (){
 
-        var checklist = function (){
+        var socket = io.connect('/');
+        socket.on('roomUpdate', function (data){
+          console.log('room update');
+          checklist();
+        });
+        socket.on('gamestart', function (data){
+          console.log('game started');
+        contractUpdate();
+        });
+
+        $("#logout").on('click',function (){
           $.ajax({
-            url:"/checklist",
+            url:"/logout",
             type: "post",
             data: {},
             success: function (data){
-              $('li').remove();
-              for (var i = 0; i < data.length; i++){
-                $('#list').append('<li>' + data[i].username[0].toUpperCase() + data[i].username.slice(1));
-              }
+              socket.emit('roomUpdate');
+              location.reload();
             }
           });
-        };
-
-        checklist();
-
-        var socket = io.connect('/');
-      //var socket = io.connect(); 
-
-          socket.on('news', function (data){
-            console.log(data);
-          });
-
-          socket.on('roomUpdate', function (data){
-            console.log('room update');
-            checklist();
-          });
-
-
-          socket.on('gamestart', function (data){
-            console.log('game started');
-          contractUpdate();
-          });
-
-
-
+        });
 
         $("#startgame").on('click',function (){
           $.ajax({
             url:"/startgame",
             type: "post",
             data: {},
             success: function (data){
-              socket.emit('gamestart');
-              window.location.href = '/';
+              if (data === 'true'){
+                socket.emit('gamestart');
+                location.reload();
+              } else {
+                alert('The game needs at least two people.');
+              }
             }
           });
         });
 
-        $("#logout").on('click',function (){
+        var checklist = function (){
           $.ajax({
-            url:"/logout",
+            url:"/checklist",
             type: "post",
             data: {},
             success: function (data){
-              socket.emit('roomUpdate');
-              window.location.href = '/';
+              $('li').remove();
+              for (var i = 0; i < data.length; i++){
+                $('#list').append('<li>' + data[i].username[0].toUpperCase() + data[i].username.slice(1));
+              }
             }
           });
-        });
-
+        };
 
+        checklist();
 
   	  });
     </script>
   </head>
-
   <body class="iOCSS black">
     <div class="frame signIn_fancy">
-
       <div class="header">
         <h1>Welcome - Admin</h1>
         <div><button class="edit" type="button" id="logout">Log out</button></div>
       </div>
-
       <div class="scrollable">
         <div class="editor flex-none" id="divIn">
           <div class="well-header" id="infoarea">Player List</div>
           <div class="well" id="list">
           </div>
-
           <button  class="black large" id="startgame" >Start Game</button>
         </div>
       </div>
-
     </div>
   </body>
 </html>
diff --git a/html/create.html b/html/create.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <link rel="stylesheet" type="text/css" href="./css/io.css">
-    <link rel="stylesheet" type="text/css" href="./css/login.css">
+    <link rel="stylesheet" type="text/css" href="./css/assassin.css">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>

diff --git a/html/home.html b/html/home.html
@@ -2,7 +2,7 @@
 <html>
   <head>
   	<link rel="stylesheet" type="text/css" href="./css/io.css">
-  	<link rel="stylesheet" type="text/css" href="./css/home.css">
+  	<link rel="stylesheet" type="text/css" href="./css/assassin.css">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>

diff --git a/html/join.html b/html/join.html
@@ -2,14 +2,16 @@
 <html>
   <head>
     <link rel="stylesheet" type="text/css" href="./css/io.css">
-    <link rel="stylesheet" type="text/css" href="./css/login.css">
+    <link rel="stylesheet" type="text/css" href="./css/assassin.css">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
     <script src="/socket.io/socket.io.js"></script>
     <script type="text/javascript">
       $(function (){
 
+        // need to update alerts
+
         var socket = io.connect('/');
 
         $("#logout").on('click',function (){

diff --git a/html/login.html b/html/login.html
@@ -2,7 +2,7 @@
 <html>
   <head>
   	<link rel="stylesheet" type="text/css" href="./css/io.css">
-  	<link rel="stylesheet" type="text/css" href="./css/login.css">
+  	<link rel="stylesheet" type="text/css" href="./css/assassin.css">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>

diff --git a/html/signup.html b/html/signup.html
@@ -2,33 +2,15 @@
 <html>
   <head>
   	<link rel="stylesheet" type="text/css" href="./css/io.css">
-  	<link rel="stylesheet" type="text/css" href="./css/login.css">
+  	<link rel="stylesheet" type="text/css" href="./css/assassin.css">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
     <script src="/socket.io/socket.io.js"></script>
     <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); });
 
         var infoStore = {}
         socket.on('checkUsernameRes', function (data){