Merge branch 'master' of https://kod.pardus.org.tr/tugbaficici/mangala

assets/gameArea.css

@@ -136,8 +136,7 @@ body {
   background-color: #ed664c;
   border-bottom-left-radius: 40px;
   margin: 0;
-  box-shadow: rgba(50, 50, 93, 0.25) 0px 2px 5px -1px,
-    rgba(0, 0, 0, 0.3) 0px 1px 3px -1px;
+  box-shadow: rgba(6, 24, 44, 0.4) 0px 0px 0px 2px, rgba(6, 24, 44, 0.65) 0px 4px 6px -1px, rgba(255, 255, 255, 0.08) 0px 1px 0px inset;
   margin-bottom: 20px;
   color: #334443;
   font-family: "Itim";
@@ -150,8 +149,7 @@ body {
 
   background-color: #ffe268;
   border-top-right-radius: 40px;
-  box-shadow: rgba(50, 50, 93, 0.25) 0px 2px 5px -1px,
-    rgba(0, 0, 0, 0.3) 0px 1px 3px -1px;
+  box-shadow: rgba(6, 24, 44, 0.4) 0px 0px 0px 2px, rgba(6, 24, 44, 0.65) 0px 4px 6px -1px, rgba(255, 255, 255, 0.08) 0px 1px 0px inset;
   margin: 0;
   margin-top: 20px;
   color: #334443;

pages/clientGameArea.js

@@ -25,6 +25,8 @@ user2hole.push(treasure2);
 var player = 2;
 waitcolor = "#ed664c"; //// Kırmızı renk beklesin
 playercolor = "#ffe268"; // Sarı renk oynasın
+waitvisible="visible";
+playervisible="hidden";
 
 function tikla(id) {
   // ekranda bulunan kuyulardaki kuyulara tıklama ile tetiklenen fonk.
@@ -39,6 +41,8 @@ function tikla(id) {
       if (player == 2) {
         document.getElementById("user1").style.backgroundColor = waitcolor;
         document.getElementById("user2").style.backgroundColor = playercolor;
+        document.getElementById("clock1").style.visibility=playervisible;
+        document.getElementById("clock2").style.visibility=waitvisible;
       }
       //sendMessage(Number(id[9]));
     }
@@ -52,6 +56,8 @@ function tikla(id) {
       if (player == 1) {
         document.getElementById("user1").style.backgroundColor = playercolor;
         document.getElementById("user2").style.backgroundColor = waitcolor;
+        document.getElementById("clock1").style.visibility=waitvisible;
+        document.getElementById("clock2").style.visibility=playervisible;
       }
       sendMessage(Number(id[9]));
     }

pages/gameArea.html

@@ -12,19 +12,28 @@
 
   <div class="container-fluid">
     <div id="overlay">
-      <div><p id="text"></p></div>
+      <div>
+        <p id="text"></p>
+      </div>
       <div style="position: absolute;
       top: 50%;
-      left: 40%;"><button class="big-button" onclick="yenidenOyna()" style="font-size: 11px;width: 150px;">Yeniden Oyna</button></div>
+      left: 40%;"><button class="big-button" onclick="yenidenOyna()" style="font-size: 11px;width: 150px;">Yeniden
+          Oyna</button></div>
     </div>
 
     <div class="row" style="margin: 0;">
-      <div class="col-4"><div class="geriButonu"><a href="turnBackMain.html" onclick="window.open(this.href, 'Anasayfaya Dön',
-        'left=20,top=20,width=405,height=350,toolbar=1,resizable=0'); return false;"><img width="60" height="60" src="../assets/image/geri.png" alt="geri"></a></div></div> 
-      <div class="col-4"><div class="bos"><button class="btn-primary" onclick="overlay()">overlay</button></div></div>
+      <div class="col-4">
+        <div class="geriButonu"><a href="turnBackMain.html" onclick="window.open(this.href, 'Anasayfaya Dön',
+        'left=20,top=20,width=405,height=350,toolbar=1,resizable=0'); return false;" ><img width="60" height="60"
+              src="../assets/image/geri.png" alt="geri" ></a></div>
+      </div>
+      <div class="col-4">
+        <div class="bos"></div>
+      </div>
       <div class="col-4 text-right" id="user1">
         <div id="user2card">
           <b>Oyuncu 1</b>
+          <img src="../assets/image/clock.gif" width="70" height="70" id="clock1" style="visibility: hidden;">
         </div>
       </div>
     </div>
@@ -36,7 +45,9 @@
         <div id="tahtaCerceve">
           <div id="tahtaGorunum">
             <div class="a">
-                    <div class="hazine1" style="float: left;"><div id="user1hole7" class="rectangle"></div></div>
+              <div class="hazine1" style="float: left;">
+                <div id="user1hole7" class="rectangle"></div>
+              </div>
               <div class="boncuklar" style="float: left;">
                 <div class="boncuklar1">
                   <div class="cirlce" onclick="tikla(this.id)" id="user1hole6">
@@ -77,7 +88,8 @@
                   </div>
                   <div class="clear"></div>
                 </div>
-                      <div class="boncuklar2"><div class="cirlce" onclick="tikla(this.id)" id="user2hole1">
+                <div class="boncuklar2">
+                  <div class="cirlce" onclick="tikla(this.id)" id="user2hole1">
                     <span class="dot_black" id="drag1" draggable="true" ondragstart="drag(event)"></span>
                     <span class="dot_black" id="drag2" draggable="true" ondragstart="drag(event)"></span>
                     <span class="dot_black" id="drag3" draggable="true" ondragstart="drag(event)"></span>
@@ -117,7 +129,9 @@
                 </div>
               </div>
               <dic class="clear"></dic>
-                    <div class="hazine2" style="float: left;"><div id="user2hole7" class="rectangle"></div></div>
+              <div class="hazine2" style="float: left;">
+                <div id="user2hole7" class="rectangle"></div>
+              </div>
             </div>
           </div>
         </div>
@@ -130,11 +144,15 @@
       <div class="col-4 text-left" id="user2">
             <div id="user2card">
               <b>Oyuncu 2</b>
+              <img src="../assets/image/clock.gif" width="70" height="70" id="clock2" style="visibility: visible;">
         </div>
+
       </div>
       <!-- toast js fonksiyonu eklenecek-->
-          <div class="col-4 text-center "><div class="toast"></div></div> 
-          <div class="col-4 text-right"><div class="oda"></div></div>  
+      <div class="col-4 text-center "></div>
+      <div class="col-4 text-right">
+        <div class="oda"></div>
+      </div>
     </div>
 
 

pages/gameArea.js

@@ -25,7 +25,8 @@ user2hole.push(treasure2);
 var player=2;
 waitcolor="#ed664c";//// Kırmızı renk beklesin
 playercolor="#ffe268";// Sarı renk oynasın
-
+waitvisible="visible";
+playervisible="hidden";
 
 function tikla(id){
     // ekranda bulunan kuyulardaki kuyulara tıklama ile tetiklenen fonk.
@@ -41,6 +42,8 @@ function tikla(id){
             if(player==2){
                 document.getElementById("user1").style.backgroundColor=waitcolor;
                 document.getElementById("user2").style.backgroundColor=playercolor;
+                document.getElementById("clock1").style.visibility=playervisible;
+                document.getElementById("clock2").style.visibility=waitvisible;
             }
         }
  
@@ -53,6 +56,8 @@ function tikla(id){
             if(player==1){
                 document.getElementById("user1").style.backgroundColor=playercolor;
                 document.getElementById("user2").style.backgroundColor=waitcolor;
+                document.getElementById("clock1").style.visibility=waitvisible;
+                document.getElementById("clock2").style.visibility=playervisible;
             }
         }
 

pages/robotGameArea.html

@@ -32,12 +32,13 @@
       </div>
       <div class="col-4">
         <div class="bos">
-          <button class="btn-primary" onclick="overlay()">overlay</button>
+          
         </div>
       </div>
       <div class="col-4 text-right" id="user1">
         <div id="user2card">
           <b>Cengaver</b>
+          <img src="../assets/image/clock.gif" width="70" height="70" id="clock1" style="visibility: hidden;">
         </div>
       </div>
 
@@ -146,11 +147,12 @@
       <div class="col-4 text-left" id="user2">
         <div id="user2card">
           <b>Ben</b>
+          <img src="../assets/image/clock.gif" width="70" height="70" id="clock2" style="visibility: visible;">
         </div>
       </div>
       <!-- toast js fonksiyonu eklenecek-->
       <div class="col-4 text-center">
-        <div class="toast"></div>
+        
       </div>
       <div class="col-4 text-right">
         <div class="oda"></div>

pages/robotGameArea.js

@@ -70,7 +70,8 @@ user2hole.push(treasure2);
 var player=2;
 playercolor="#ed664c";
 waitcolor="#ffe268";
-
+waitvisible="visible";
+playervisible="hidden";
 
 
 function tikla(id){
@@ -87,6 +88,8 @@ function tikla(id){
             if(player==2){
                 document.getElementById("user1").style.backgroundColor=waitcolor;
                 document.getElementById("user2").style.backgroundColor=playercolor;
+                document.getElementById("clock1").style.visibility=playervisible;
+                document.getElementById("clock2").style.visibility=waitvisible;
             }
         }
         
@@ -97,6 +100,8 @@ function tikla(id){
                 
                 document.getElementById("user1").style.backgroundColor=playercolor;
                 document.getElementById("user2").style.backgroundColor=waitcolor;
+                document.getElementById("clock1").style.visibility=waitvisible;
+                document.getElementById("clock2").style.visibility=playervisible;
             }
             boncukCiz();
             if(player == 1 && state){

pages/turnBackMain.html

@@ -145,6 +145,7 @@
       .getElementById("anasayfayaDon")
       .addEventListener("click", function (e) {
         // ODADAN AYRIL
+        /*
         const odadanAyrilBtn = document.getElementById("odadanAyrilBtn");
         odadanAyrilBtn.onclick = () => {
           let roomKey = odayaKatilInput.value;
@@ -156,7 +157,7 @@
           });
           odayaKatilContainer.appendChild(elemt);
         };
-
+        */
         console.log(window.opener.location.href);
         var dosyaYolu = __dirname;
         dosyaYolu = dosyaYolu.toString().substring(0, dosyaYolu.length - 5);