From 417f39005d4ee4cf5d92c2895fecc4c73d8e6d0e Mon Sep 17 00:00:00 2001
From: adplantade <adrien.plantade@etu.uca.fr>
Date: Fri, 17 Jul 2020 18:03:24 +0200
Subject: [PATCH] =?UTF-8?q?Le=20bouton=20jouer=20n=C3=A9cessite=20un=20mod?=
 =?UTF-8?q?e=20et=20une=20difficult=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/button_displayer.js |  29 ++++++++++++++++++++++-------
 code/index.css           |   6 +++---
 code/index.html          |  22 +++++++---------------
 code/ress/purple.png     | Bin 1295 -> 2590 bytes
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/code/button_displayer.js b/code/button_displayer.js
index 57e5540..03b4e1a 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;
-var diffSelected;
+var modeSelected=null;
+var diffSelected=null;
 
 modes.forEach(element => {
     eval("var btn"+element+"= document.getElementById('btn_"+element+"')");
@@ -13,15 +13,29 @@ modes.forEach(element => {
     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){modeSelected= e.currentTarget.id;});
+        tab.item(i).addEventListener("mousedown",function(e)
+        {
+            modeSelected= e.currentTarget.id;
+            if(modeSelected!=null && diffSelected!=null)
+            {
+                document.getElementById("btn_play").disabled = false;
+            }
+        });
     }
 });
 
 diffs.forEach(element => {
-    eval("var btn"+element+"= document.getElementById('btn_"+element+"')");
-    console.log("btn_"+element+".width=size");
+    eval("var btn_"+element+"= document.getElementById('btn_"+element+"')");
     eval("btn_"+element+".width=size");
-    eval("btn_"+element).addEventListener("mousedown",function(e){diffSelected=e.currentTarget.id;});
+    eval("btn_"+element).addEventListener("mousedown",function(e)
+    {
+        diffSelected= e.currentTarget.id;
+        
+        if(modeSelected!=null && diffSelected!=null)
+        {
+            document.getElementById("btn_play").disabled = false;
+        }
+    });
 })
 
 function disp(what)
@@ -36,9 +50,10 @@ function hideAll()
 {
     document.getElementById("temps").style.display="none";
     document.getElementById("points").style.display="none";
+    document.getElementById("survie").style.display="none";
 }
 
 function play()
 {
-    window.location.replace("./game.html?mode="+modeSelected+"&diff=easy");
+    //window.location.replace("./game.html?mode="+modeSelected+"&diff="+diffSelected+"&pseudo="+document.getElementById("field_pseudo"));
 }
\ No newline at end of file
diff --git a/code/index.css b/code/index.css
index 5290bbe..7ac054c 100644
--- a/code/index.css
+++ b/code/index.css
@@ -3,8 +3,8 @@
     
     align-items: baseline;
     width : min-content;
-    /*
-    margin: 20px;
-    */
+    
+    margin: 5px;
+    
 
 }
\ No newline at end of file
diff --git a/code/index.html b/code/index.html
index a132441..814c59a 100644
--- a/code/index.html
+++ b/code/index.html
@@ -21,29 +21,21 @@
                 <img id="5m" src="./ress/button_temps_5.png"/>
                 <img id="10m" src="./ress/button_temps_10.png"/>
             </ul>
+            <ul id="survie" class="all-container">
+                <img id="surv" src="./ress/button_mode_survie.png"/>
+            </ul>
             <ul id="diff" class="all-container">
                 <img id="btn_easy" src="./ress/button_diff_easy.png"/>
                 <img id="btn_med" src="./ress/button_diff_normal.png"/>
                 <img id="btn_hard" src="./ress/button_diff_hard.png"/>
             </ul>
-
-            <button onClick="play()">Jouer ?</button>
             
-            <script src="button_displayer.js"></script>
-            <!--
-            <ul id="survie" class="all-container">
-                <img id="survie" src="./ress/button_sur.png"/>
-            </ul> -->
-            <form action="./game.html" method="GET">
-
             Entrez votre pseudo (optionnel, mais n&eacute;cessaire si vous voulez sauvegarder votre score):
-            <input type="text" name="pseudo" />
-            
+            <input type="text" id="field_pseudo" />
+
+            <button id="btn_play" onClick="play()" disabled>Jouer ?</button>
             
-            <div class="button">
-                <button type="submit">JOUER !</button>
-            </div>
-        </form>
+            <script src="button_displayer.js"></script>
 
         <div>
             Partie en points : la partie finit quand vous obtenez le nombre de points choisi. Mettez le moins de temps possible ! </br>
diff --git a/code/ress/purple.png b/code/ress/purple.png
index 1c1adf633b830c12810e78d182d31dbec93c60fb..7ba116e14b61369b3e413608be691eebc08b68e5 100644
GIT binary patch
delta 10
PcmeC@nkTY>pB0Dz5-0-H

delta 7
OcmbOy($BSlpA`TJ_W}?A