From 819731ca7b595892a071a90275d5a4798755885c Mon Sep 17 00:00:00 2001
From: antux18 <antux18@gmail.com>
Date: Fri, 1 Sep 2023 20:36:37 -0400
Subject: [PATCH] =?UTF-8?q?Remplacement=20de=20la=20liste=20des=20=C3=A9qu?=
 =?UTF-8?q?ipes=20par=20un=20input.=20V=C3=A9rification=20du=20num=C3=A9ro?=
 =?UTF-8?q?=20d'=C3=A9quipe=20avant=20d'envoyer=20=C3=A0=20la=20page=20tea?=
 =?UTF-8?q?m=5Fconfirm.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.php              | 26 ++++++++++++++++++--------
 require/database.php   |  7 +++++++
 require/locales/en.php |  5 +++--
 require/locales/fr.php |  5 +++--
 style.css              |  2 +-
 team_confirm.php       | 16 ++++++----------
 todo.md                |  4 ++--
 7 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/index.php b/index.php
index 5e45407..33c18fe 100644
--- a/index.php
+++ b/index.php
@@ -1,15 +1,26 @@
 <?php
     require_once "require/base.php";
 
+    $database = new Database();
+
     // Si l'appareil a déjà choisi une équipe, on le redirige vers la bonne page :
     if (isset($_COOKIE["team"])) {
-        header("Location: puzzles.php?team=" . htmlspecialchars($_COOKIE["team"]));
-        die();
+        $team_id = htmlspecialchars($_COOKIE["team"]);
+
+        if ($database->checkTeamExists($team_id)) {
+            header("Location: puzzles.php?team=" . $team_id);
+            die();
+        }
+
+        else {
+            $stmt = $database->pdo_teams->prepare("SELECT * FROM teams");
+            $stmt->execute();
+            $teams = $stmt->fetchAll();
+        }
     }
 
     // Sinon, on affiche la liste des équipes :
     else {
-        $database = new Database();
         $stmt = $database->pdo_teams->prepare("SELECT * FROM teams");
         $stmt->execute();
         $teams = $stmt->fetchAll();
@@ -37,11 +48,10 @@
                 <p><?= $tr["home"]["message"]?></p>
             </header>
             <article>
-                <ul>
-                    <?php foreach ($teams as $team) : ?>
-                        <li><a href="team_confirm.php?team=<?= $team["id"] ?>"><?= $tr["home"]["team"] . $team["id"] ?></a></li>
-                    <?php endforeach; ?>
-                </ul>
+                <form action="team_confirm.php" method="get">
+                    <input type="number" name="team" placeholder="<?= $tr['home']['team'] ?>">
+                    <button type="submit"><?= $tr["home"]["button"] ?></button>
+                </form>
             </article>
         </main>
         <footer>
diff --git a/require/database.php b/require/database.php
index 7c1d848..0b294f7 100644
--- a/require/database.php
+++ b/require/database.php
@@ -45,6 +45,13 @@
             }
         }
 
+        public function checkTeamExists(int $id) {
+            $stmt = $this->pdo_teams->prepare("SELECT * FROM teams WHERE id == :id");
+            $stmt->bindValue(":id", $id);
+            $stmt->execute();
+            return !empty($stmt->fetch());
+        }
+
         // public function getArticleNb() {
         //     $query = $this->pdo_article->query("SELECT COUNT(*) FROM puzzles");
         //     return $query->fetch()["COUNT(*)"];
diff --git a/require/locales/en.php b/require/locales/en.php
index 894141d..1832e63 100644
--- a/require/locales/en.php
+++ b/require/locales/en.php
@@ -14,8 +14,9 @@
         ],
         "home" => [
             "subtitle" => "Welcome to the code hunt of Lycée Jean de Pange of Sarreguemines !",
-            "message" => "Select your team to begin :",
-            "team" => "Team n°"
+            "message" => "Enter your team number to begin :",
+            "team" => "Team number...",
+            "button" => "OK"
         ],
         "team_confirm" => [
             "subtitle" => "Please make sure you selected the right team.",
diff --git a/require/locales/fr.php b/require/locales/fr.php
index dd252de..0e5759b 100644
--- a/require/locales/fr.php
+++ b/require/locales/fr.php
@@ -14,8 +14,9 @@
         ],
         "home" => [
             "subtitle" => "Bienvenue à la chasse au code du Lycée Jean de Pange de Sarreguemines !",
-            "message" => "Pour commencer, veuillez choisir votre groupe :",
-            "team" => "Équipe n°"
+            "message" => "Pour commencer, veuillez entrer le numéro de votre équipe :",
+            "team" => "Numéro d'équipe...",
+            "button" => "Valider"
         ],
         "team_confirm" => [
             "subtitle" => "Assurez-vous d'avoir sélectionné la bonne équipe.",
diff --git a/style.css b/style.css
index fd062b9..c8bbb4f 100644
--- a/style.css
+++ b/style.css
@@ -92,7 +92,7 @@ input[type="time"], input[type="date"] {
     color: var(--fg);
 }
 
-input[type="text"], input[type="email"], textarea {
+input[type="text"], input[type="email"], input[type="number"], textarea {
     font: inherit;
     background: var(--bg-dark);
     border-style: solid;
diff --git a/team_confirm.php b/team_confirm.php
index 5d76b32..c2f06d8 100644
--- a/team_confirm.php
+++ b/team_confirm.php
@@ -9,22 +9,18 @@
         $team_id = htmlspecialchars($_GET["team"]);
 
         // Vérification de l'existence du groupe :
-        $stmt = $database->pdo_teams->prepare("SELECT * FROM teams WHERE id == :id");
-        $stmt->bindValue(":id", $team_id);
-        $stmt->execute();
-
-        if (empty($stmt->fetch())) {
-            header("Location: index.php");
-            die();
-        }
-
-        else {
+        if ($database->checkTeamExists($team_id)) {
             // Recherche des membres du groupe :
             $stmt = $database->pdo_teams->prepare("SELECT * FROM members WHERE team_id == :id");
             $stmt->bindValue(":id", $team_id);
             $stmt->execute();
             $members = $stmt->fetchAll();
         }
+
+        else {
+            header("Location: index.php");
+            die();
+        }
     }
 
     else {
diff --git a/todo.md b/todo.md
index 31c8272..1b6ade5 100644
--- a/todo.md
+++ b/todo.md
@@ -1,8 +1,8 @@
 # TODO
 
-[ ] Ajouter pages avec nom des membres équipe
+[x] Ajouter pages avec nom des membres équipe
 [x] Empêcher retour à la liste d'équipe une fois sélectionnée
-[ ] Input au lieu de liste équipe
+[x] Input au lieu de liste équipe
 [ ] Bouton retour aux énigmes
 [ ] Bouton énigme suivante
 [ ] Carte avec toutes les énigmes