From ea5dbedbdfc3233afdeb7b57c92a6c67962a4851 Mon Sep 17 00:00:00 2001
From: adplantade <adrien.plantade@etu.uca.fr>
Date: Tue, 11 Aug 2020 12:32:58 +0200
Subject: [PATCH] =?UTF-8?q?index=20fusionn=C3=A9=20avec=20highscores?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/button_displayer.js | 124 ++++++++++++++++++++++++++++-----------
 code/index.php           |  24 +-------
 code/options.js          |   5 --
 3 files changed, 92 insertions(+), 61 deletions(-)

diff --git a/code/button_displayer.js b/code/button_displayer.js
index 42c66be..e2f5c0a 100644
--- a/code/button_displayer.js
+++ b/code/button_displayer.js
@@ -3,8 +3,8 @@ var diffs=["easy","med","hard"];
 var div=document.getElementById('buttons');
 size=screen.height/6;
 hideAll();
-var modeSelected="5p";
-var diffSelected="easy";
+var modeSelected;
+var diffSelected;
 
 var btn_options=document.getElementById("btn_options");
 btn_options.width=size/2;
@@ -14,62 +14,61 @@ document.getElementById("btn_play").style.display="inline";
 
 
 modes.forEach(element => {
-    eval("var btn"+element+"= document.getElementById('btn_"+element+"')");
-    eval("btn_"+element+".width=size");
-    eval("btn_"+element).addEventListener("mousedown",function(e){
+
+    eval("var img_"+element+"= document.getElementById('img_"+element+"')");
+    eval("img_"+element+".width=size");
+    eval("img_"+element).addEventListener("mousedown",function(e)
+    {
         disp(e);
         modes.forEach(element => {
-            document.getElementById("btn_"+element).classList.remove("selected");
+            document.getElementById("img_"+element).classList.remove("selected");
         })
         document.getElementById(e.currentTarget.id).classList.add("selected");
     });
+
     var tab=document.getElementById(element).children;
-    for(var i=0;i<tab.length;i++){
-        tab.item(i).width=size;
-        tab.item(i).addEventListener("mousedown",function(e)
+    for(var i=1;i<tab.length;i+=2){
+        tab.item(i).children[0].width=size;
+        tab.item(i).children[0].addEventListener("mousedown",function(e)
         {
             var tab=document.getElementById("modeSelection").children;
             for(var cpt=1;cpt<tab.length;cpt++)
             {
                 var tabChilds=document.getElementById(tab.item(cpt).id).children;
-                for(var cptChild=0;cptChild<tabChilds.length;cptChild++)
+                for(var cptChild=1;cptChild<tabChilds.length;cptChild+=2)
                 {
-                    if(!tabChilds.item(cptChild).id.includes("btn_"))
-                    {
-                        tabChilds.item(cptChild).classList.remove("selected");
-                    }
+                    tabChilds.item(cptChild).children[0].classList.remove("selected");
                 }
             }
+            modeSelected= e.currentTarget.id.substring(4,e.currentTarget.id.length);
 
             document.getElementById(e.currentTarget.id).classList.add("selected");
-            modeSelected= e.currentTarget.id;
-            setCookie("modeSelected",modeSelected,30);
-            if(modeSelected!=null && diffSelected!=null)
+            if(diffSelected!="" && modeSelected!="")
             {
-                document.getElementById("btn_play").style.display="inline";
-            document.getElementById("btn_play_des").style.display="none";
+                document.getElementById(modeSelected).checked=true;
+
+                document.getElementById("high_form").submit();
             }
         });
     }
 });
 
 diffs.forEach(element => {
-    eval("var btn_"+element+"= document.getElementById('btn_"+element+"')");
-    eval("btn_"+element+".width=size");
-    eval("btn_"+element).addEventListener("mousedown",function(e)
+    eval("var img_"+element+"= document.getElementById('img_"+element+"')");
+    eval("img_"+element+".width=size");
+    eval("img_"+element).addEventListener("mousedown",function(e)
     {
         diffSelected= e.currentTarget.id.substring(4);
-        //setCookie("diffSelected",diffSelected,30);
         var tab=document.getElementById("diff").children;
-        for(var cpt=0;cpt<tab.length;cpt++)
+        for(var cpt=1;cpt<tab.length;cpt+=2)
         {
-            tab.item(cpt).classList.remove("selected");
+            tab.item(cpt).children[0].classList.remove("selected");
         }
         document.getElementById(e.currentTarget.id).classList.add("selected");
-        if(modeSelected!=null && diffSelected!=null)
+        if(diffSelected!="" && modeSelected!="")
         {
-            document.getElementById("btn_play").style.display="inline";
-            document.getElementById("btn_play_des").style.display="none";
+            document.getElementById(diffSelected).checked=true;
+            document.getElementById("high_form").submit();
         }
     });
 })
@@ -82,7 +81,40 @@ function disp(what, short=false)
     })
 }
 
+// Dots amount
+
+var output = document.getElementById("dotsNumber");
+var outputHi = document.getElementById("amountHi");
+var amount = (getCookie("dotsAmount")=="" ? 4 : getCookie("dotsAmount"));
+output.innerHTML = amount;
+outputHi.value= amount;
 
+document.getElementById("+").width=size/4;
+document.getElementById("-").width=size/4;
+
+function less()
+{
+  if(amount > 2)
+  {
+    amount--;
+  }
+  output.innerHTML = amount;
+  outputHi.value=amount;
+}
+
+function more()
+{
+  if(amount<8)
+  {
+    amount++;
+  }
+  output.innerHTML = amount;
+  outputHi.value=amount;
+}
+
+// pause oui/non
+
+document.getElementById("pause"+ (getCookie("pause")!="" ? getCookie("pause") : 0)).checked=true;
     
 
 function hideAll()
@@ -98,12 +130,34 @@ function play()
     window.location.replace("./game.html?mode="+modeSelected+"&diff="+diffSelected+"&pseudo="+ (pseudo==null ? "" : pseudo));
 }
 
-function goHigh()
+if(document.getElementById("diffSel")!=null)
 {
-    window.location.replace("./highscores.php");
-}
+    diffSelected=document.getElementById("diffSel").value;
+    modeSelected=document.getElementById("modeSel").value;
+    amount=document.getElementById("dotsAmountSel").value;
+    gameSelected = (modeSelected.includes("s") ? "survie" : (modeSelected.includes("p") ? "points" : "temps"));
+
+    disp(gameSelected, true);
+    document.getElementById("img_"+diffSelected).classList.add("selected");
+    document.getElementById("img_"+gameSelected).classList.add("selected");
+    document.getElementById("img_"+modeSelected).classList.add("selected");
+    document.getElementById("pause"+ document.getElementById("pauseSel").value).checked=true;
 
-disp("points",true);
-document.getElementById("btn_points").classList.add("selected");
-document.getElementById("5p").classList.add("selected");
-document.getElementById("btn_easy").classList.add("selected");
\ No newline at end of file
+    document.getElementById(diffSelected).checked=true;
+    document.getElementById(modeSelected).checked=true;
+
+    output.innerHTML = amount;
+    outputHi.value= amount;
+}
+else
+{
+    diffSelected="easy";
+    modeSelected="5p";
+    disp("points",true);
+    document.getElementById(diffSelected).checked=true;
+    document.getElementById(modeSelected).checked=true;
+    document.getElementById("img_points").classList.add("selected");
+    document.getElementById("img_5p").classList.add("selected");
+    document.getElementById("img_easy").classList.add("selected");
+    document.getElementById("pause0").checked=true;
+}
diff --git a/code/index.php b/code/index.php
index 785a75c..cb9114d 100644
--- a/code/index.php
+++ b/code/index.php
@@ -101,7 +101,7 @@
 
 $database = new SQLite3("data.db");
 
-
+// echo isset($_POST["game_mode"])." ".isset($_POST["difficulty"])." ".isset($_POST["dotsAmount"])." ".isset($_POST["pause"]);
 
 if(isset($_POST["game_mode"]) && $_POST["game_mode"]!="" && $_POST["difficulty"]!="" && $_POST["dotsAmount"]!="" && $_POST["pause"]!="")
 {
@@ -149,14 +149,7 @@ if(isset($_POST["game_mode"]) && $_POST["game_mode"]!="" && $_POST["difficulty"]
 <div class="modal-content" id="modal">
     <span class="close">&times;</span>
     <p class="texte ad">Options</p>
-    <div class="slidecontainer">
-        <div>
-            <p class="texte">Nombre de dots
-            <img src="ress/-" onClick="less()" id="-"/>
-            <span id="dotsNumber" class="texteG"></span>
-            <img src="ress/+" onClick="more()" id="+"/></p>
-        </div>
-        
+    <div class="slidecontainer">        
             <div id="displays">
             <p class="texte">
             Mode d'affichage 
@@ -165,17 +158,7 @@ if(isset($_POST["game_mode"]) && $_POST["game_mode"]!="" && $_POST["difficulty"]
             <span id="both_di" class="dot both" onClick="selectDisplay('both')"></span>
         </p>
         </div>
-        
-        <p class="texte"> 
-            Pause après avoir gagné un point 
-            
-        <input type="radio" id="yes_pause" value="1" name="pause">
-        <label for="no_pause" class="texte">Oui</label>
-        <input type="radio" id="no_pause" value="0" name="pause">
-        <label for="no_pause" class="texte">Non</label>
-        </p>
-
-        
+                
         <div id="color_pickers" class="color-pickers">
             <div class="texte"> Couleurs des dots  
                 <span id="col1" class="dot col1 pickr"></span>
@@ -219,7 +202,6 @@ if(isset($_POST["game_mode"]) && $_POST["game_mode"]!="" && $_POST["difficulty"]
 </div>
 <script src="bakery.js"></script>
 <script src="button_displayer.js"></script>
-    <script src="highscore_button_displayer.js"></script>
 <script src="options.js"></script>
 <script src="themeSwitcher.js"></script>
 </body>
diff --git a/code/options.js b/code/options.js
index 71441bf..ef01312 100644
--- a/code/options.js
+++ b/code/options.js
@@ -74,11 +74,6 @@ document.getElementById("both_di").style.width=size/6;
 document.getElementById("both_di").style.backgroundSize=size/8+"px";
 document.getElementById("btn_confirm").width=size/4;
 
-if(getCookie("pause")!=1)
-document.getElementById("no_pause").checked=true;
-else
-document.getElementById("yes_pause").checked=true;
-
 var displ=getCookie("displayMode");
 
 function selectDisplay(e)