From accfb2a54ef9dfa500de9eb47c1a9342dba358b9 Mon Sep 17 00:00:00 2001
From: adplantade <adrien.plantade@etu.uca.fr>
Date: Mon, 10 Aug 2020 17:52:11 +0200
Subject: [PATCH] =?UTF-8?q?page=20de=20scores=20pr=C3=A9sentable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/game.css         | 15 +++++++++++++++
 code/game.html        |  6 +++++-
 code/index.css        |  5 +++++
 code/infoDisplayer.js | 18 +++++++++++-------
 code/score.php        | 16 +++++++++++-----
 5 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/code/game.css b/code/game.css
index 97fffcf..1335b0d 100644
--- a/code/game.css
+++ b/code/game.css
@@ -117,4 +117,19 @@
     -webkit-box-shadow:inset 0px 0px 0px 5px lime;
     -moz-box-shadow:inset 0px 0px 0px 5px lime;
     box-shadow:inset 0px 0px 0px 5px lime;
+  }
+
+  .player {
+    position: absolute;
+    left: 5px;
+  }
+
+  .logo {
+    text-align: center;
+  }
+
+  .texteG {
+    font-size: xx-large;
+    font-weight: bold;
+    font-family: 'Segoe print';
   }
\ No newline at end of file
diff --git a/code/game.html b/code/game.html
index 63ce4b7..fef2a57 100644
--- a/code/game.html
+++ b/code/game.html
@@ -7,7 +7,11 @@
     <script>var tutoMode=false;</script>
 </head>
 <body>
-    <img src="ress/light" id="light" class="lightButton" onClick="switchLight()"/>
+    <div class="logo">
+        <img src="ress/light" id="light" class="lightButton" onClick="switchLight()"/>
+        <span class="player texteG" id="player"></span>
+    </div>
+
     <ul id="all-container" class="all-container"> 
         
         <ul class="vitraux stats">
diff --git a/code/index.css b/code/index.css
index 77ed732..cfc61b1 100644
--- a/code/index.css
+++ b/code/index.css
@@ -140,4 +140,9 @@
 
   ul {
     padding-inline-start: 0px;
+  }
+
+  .player {
+    position: absolute;
+    left: 5px;
   }
\ No newline at end of file
diff --git a/code/infoDisplayer.js b/code/infoDisplayer.js
index d828876..7e1be6a 100644
--- a/code/infoDisplayer.js
+++ b/code/infoDisplayer.js
@@ -2,15 +2,19 @@ var player = document.getElementById("player");
 var mode = document.getElementById("mode");
 var modeString;
 
-if(get['pseudo']=="")
+if(player!=null)
 {
-    player.style.display="none";
-}
-else
-{
-    player.innerHTML = get['pseudo'];
+    if(get['pseudo']=="")
+    {
+        player.style.display="none";
+    }
+    else
+    {
+        player.innerHTML = get['pseudo'];
+    }
 }
 
+
 if (get['mode'].includes('p'))
 {
     modeString = get['mode'].substring(0,get['mode'].length-1) + " points";
@@ -24,4 +28,4 @@ else if(get['mode'].includes('s'))
     modeString = "Survie, +" + get['mode'];
 }
 
-mode.innerHTML = modeString + ", " + (get["diff"]=="easy" ? "facile" : (get["diff"]=="med" ? "moyen" : "difficile")) + "\n" + (getCookie("pause")==0 ? "pas de pause" : "pause");
\ No newline at end of file
+mode.innerHTML += modeString + ", " + (get["diff"]=="easy" ? "facile" : (get["diff"]=="med" ? "moyen" : "difficile")) + "\n" + (getCookie("pause")==0 ? "pas de pause" : "pause");
\ No newline at end of file
diff --git a/code/score.php b/code/score.php
index c18760b..3879979 100644
--- a/code/score.php
+++ b/code/score.php
@@ -7,11 +7,14 @@
     <div class="logo">
         <img src="ress/logo_dark.png" id="logo"/>
         <img src="ress/light" id="light" class="lightButton" onClick="switchLight()"/>
+        <span class="player texteG" id="player"></span>
         
     </div>
 
 <script src="selecteur.js"></script>
-Votre score est : <h1 id="points"></h1>
+<p class="texteG" id="mode">Mode de jeu : </p>
+<p class="texteG" id="points"> Votre score est  </p>
+
 </br>
 <?php
 $database = new SQLite3("data.db");
@@ -29,11 +32,11 @@ $a=$result->fetchArray();
 
 if($a==false)
 {
-    echo "Vous avez le premier score de ce mode de jeu.";
+    echo "<p class='texteG'>Vous avez le premier score de ce mode de jeu.</p>";
 }
 else
 {
-    $phrase="Le record est ".$a[0].", tenu par ".$a["player"];
+    $phrase="<p class='texteG'>Le record est ".$a[0].", tenu par ".$a["player"]."</p>";
     while ($row = $result->fetchArray()) {
         $phrase=$phrase.", ".$row["player"];
     }
@@ -82,16 +85,18 @@ if($_GET['pseudo']!="")
             $result=$data;
             
         }
-        echo "Votre record est ".$result;
+        echo "<input type='hidden' id='rec' value='".$result."'/>";
     }
 }
 ?>
 <img id="btn_index" src="ress/button_index.png" onClick="index()"/>
 <script>
 size=screen.height/6;
-document.getElementById("points").innerHTML = get['pts'];
+document.getElementById("points").innerHTML += get['pts'] + " et votre record est "+ document.getElementById("rec").value;
 document.getElementById("btn_index").width=size;
 
+//docuemnt.getElementById("recap").innerHTML = 
+
 function index()
 {
     window.location.replace("./");
@@ -100,5 +105,6 @@ function index()
 
 <script src="bakery.js"></script>
 <script src="themeSwitcher.js"></script>
+<script src="infoDisplayer.js"></script>
 </body>
 </html>
