Merge branch 'master' of https://codefirst.iut.uca.fr/git/jade.van_brabandt/3.01-QCM_MuscuMaths

Website/controllers/ControllerAdminAdministrators.php

@@ -52,6 +52,7 @@ class ControllerAdminAdministrators
     {
         if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
             $_SESSION["error"] = "Méthode non autorisée.";
+            header("Location:/admin/administrators");
         } else {
             $username = $_POST['username'];
             $password = $_POST['password'];
@@ -59,6 +60,7 @@ class ControllerAdminAdministrators
             $password = trim($_POST['password']);
             if (!isset($username) || !isset($password) || empty($username) || empty($password)) {
                 $_SESSION["error"] = "Veuillez remplir tous les champs.";
+                header("Location:/admin/administrators");
             } else {
                 $Admin = [
                     'username' => $username,
@@ -66,6 +68,7 @@ class ControllerAdminAdministrators
                 ];
                 if ($this->mdAdministrator->verifyAdministratorByName($Admin) != null) {
                     $_SESSION["error"] = "Cet admin existe déjà.";
+                    header("Location:/admin/administrators");
                 } else {
                     $this->mdAdministrator->addAdministrator($Admin);
                     header("Location:/admin/administrators");
@@ -76,28 +79,48 @@ class ControllerAdminAdministrators
 
     function updatemodal($param)
     {
-
-        $administrator = $this->mdAdministrator->getAdministratorByID($param["id"]);
-
+        if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
+            $_SESSION["error"] = "Méthode non autorisée.";
+            header("Location:/admin/administrators");
+        } else {
+            $administrator = $this->mdAdministrator->getAdministratorByID($param["id"]) ?? null;
+            if ($administrator == null) {
+                $_SESSION["error"] = "Cet admin n'existe pas.";
+                header("Location:/admin/administrators");
+            } else {
                 echo $this->twig->render($this->vues["adminAdministratorsModal"], [
                     'administrator' => $administrator,
                 ]);
             }
+        }
+    }
 
     function update($param)
     {
-
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+            $_SESSION["error"] = "Méthode non autorisée.";
+            header("Location:/admin/administrators");
+        } else {
             $id = $_POST['id'];
             $username = $_POST['username'];
             $password = $_POST['password'];
-
+            $username = trim($_POST['username']);
+            $password = trim($_POST['password']);
+            if (!isset($username) || !isset($password) || empty($username) || empty($password)) {
+                $_SESSION["error"] = "Veuillez remplir tous les champs.";
+                header("Location:/admin/administrators");
+            } else {
                 $Admin = [
                     'username' => $username,
                     'password' => $password,
                 ];
-
+                if ($this->mdAdministrator->verifyAdministratorByName($Admin) != null) {
+                    $_SESSION["error"] = "Cet admin existe déjà.";
+                } else {
                     $this->mdAdministrator->updateAdministrator($id, $Admin);
-
                     header("Location:/admin/administrators");
                 }
             }
+        }
+    }
+}

Website/controllers/ControllerAdminChapters.php

@@ -28,9 +28,10 @@ class ControllerAdminChapters
 
                 echo $twig->render($vues["adminChapters"], [
                     'chapters' => $chapters,
+                    'error' => $_SESSION["error"],
                 ]);
-                }
-                else {
+                $_SESSION["error"] = null;
+            } else {
                 header("Location:/loginAdmin");
             }
         } catch (PDOException $e) {
@@ -40,44 +41,74 @@ class ControllerAdminChapters
         }
     }
 
-    function delete($param) {
+    function delete($param)
+    {
         $this->mdChapter->deleteChapter($param["id"]);
         header("Location:/admin/chapters");
     }
 
-    function add($param) {
-
+    function add($param)
+    {
+        $trimmedName = trim($_POST['name']);
+        if (isset($_POST['name']) && !empty($_POST['name']) && !empty($trimmedName)) {
             $name = $_POST['name'];
-
             $Chapter = [
                 'name' => $name,
             ];
-
             $this->mdChapter->addChapter($Chapter);
-
             header("Location:/admin/chapters");
+        } else {
+            $_SESSION["error"] = "Veuillez remplir le champ";
+            header("Location:/admin/chapters");
+            return;
+        }
     }
 
-    function updatemodal($param) {
-
-        $chapter = $this->mdChapter->getChapterByID($param["id"]);
-
+    function updatemodal($param)
+    {
+        if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
+            $_SESSION["error"] = "Méthode non autorisée.";
+            header("Location:/admin/chapters");
+        } else {
+            $chapter = $this->mdChapter->getChapterByID($param["id"]) ?? null;
+            if ($chapter == null) {
+                $_SESSION["error"] = "Chapitre introuvable.";
+                header("Location:/admin/chapters");
+            } else {
                 echo $this->twig->render($this->vues["adminChaptersModal"], [
                     'chapter' => $chapter,
                 ]);
             }
+        }
+    }
 
-    function update($param) {
-
+    function update($param)
+    {
+        var_dump($_SESSION["error"]);
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+            $_SESSION["error"] = "Méthode non autorisée.";
+            header("Location:/admin/chapters");
+        } else {
             $id = $_POST['id'];
             $name = $_POST['name'];
-
+            $trimmedName = trim($_POST['name']);
+            if (!isset($name) || empty($name) || empty($trimmedName)) {
+                $_SESSION["error"] = "Veuillez remplir le champ.";
+                header("Location:/admin/chapters");
+            } else {
+                $chapter = $this->mdChapter->verifyChapterByName($name) ?? null;
+                if ($chapter != null) {
+                    $_SESSION["error"] = "Ce chapitre existe déjà.";
+                    header("Location:/admin/chapters");
+                } else {
                     $Chapter = [
                         'name' => $name,
                     ];
 
                     $this->mdChapter->updateChapter($id, $Chapter);
-
                     header("Location:/admin/chapters");
                 }
             }
+        }
+    }
+}

Website/controllers/ControllerAdminQuestions.php

@@ -36,7 +36,9 @@ class ControllerAdminQuestions
                 echo $twig->render($vues["adminQuestions"], [
                     'questions' => $questions,
                     'chapters' => $chapters,
+                    'error' => $_SESSION["error"],
                 ]);
+                $_SESSION["error"] = null;
             } else {
                 header("Location:/loginAdmin");
             }
@@ -55,6 +57,22 @@ class ControllerAdminQuestions
 
     function add($param)
     {
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+            $_SESSION["error"] = "Méthode non autorisée.";
+            header("Location:/admin/questions");
+        } else {
+            $trimmedContent = trim($_POST['content']);
+            $trimmedAnswer1 = trim($_POST['answer1']);
+            $trimmedAnswer2 = trim($_POST['answer2']);
+            $trimmedAnswer3 = trim($_POST['answer3']);
+            $trimmedAnswer4 = trim($_POST['answer4']);
+            if (
+                isset($_POST['content']) && !empty($_POST['content']) && !empty($trimmedContent)
+                && isset($_POST['answer1']) && !empty($_POST['answer1']) && !empty($trimmedAnswer1)
+                && isset($_POST['answer2']) && !empty($_POST['answer2']) && !empty($trimmedAnswer2)
+                && isset($_POST['answer3']) && !empty($_POST['answer3']) && !empty($trimmedAnswer3)
+                && isset($_POST['answer4']) && !empty($_POST['answer4']) && !empty($trimmedAnswer4)
+            ) {
                 $content = $_POST['content'];
                 $idChapter = intval($_POST['idChapter']);
                 $AnswersPost = array();
@@ -81,7 +99,6 @@ class ControllerAdminQuestions
                     ];
                 }
 
-
                 $answersId = array();
                 for ($i = 0; $i <= 3; $i++) {
                     $answersId[$i] = $this->mdAnswer->addAnswer($Answers[$i]);
@@ -97,16 +114,27 @@ class ControllerAdminQuestions
 
                 $this->mdQuestion->updateQuestion($idquestion, $Question);
 
+                header("Location:/admin/questions");
+            } else {
+                $_SESSION["error"] = "Veuillez remplir tous les champs";
                 header("Location:/admin/questions");
             }
+        }
+    }
 
     function updatemodal($param)
     {
-        $question = $this->mdQuestion->getQuestionByID($param["id"]);
 
-        $answers = $this->mdAnswer->getAnswersByIDQuestions($param["id"]);
+        $question = $this->mdQuestion->getQuestionByID($param["id"]) ?? null;
 
-        $chapters = $this->mdChapter->getChapters();
+        $answers = $this->mdAnswer->getAnswersByIDQuestions($param["id"]) ?? null;
+
+        $chapters = $this->mdChapter->getChapters() ?? null;
+
+        if ($question == null || $answers == null || $chapters == null) {
+            $_SESSION["error"] = "Erreur lors de la récupération des données";
+            header("Location:/admin/questions");
+        } else {
 
             echo $this->twig->render($this->vues["adminQuestionsModal"], [
                 'question' => $question,
@@ -114,10 +142,20 @@ class ControllerAdminQuestions
                 'answers' => $answers,
             ]);
         }
+    }
 
     function update($param)
     {
-
+        if (
+            isset($_POST['content'], $_POST['answer1'], $_POST['answer2'], $_POST['answer3'], $_POST['answer4'], $_POST['idChapter'], $_POST['correctAnswer']) &&
+            !empty($_POST['content']) && !empty(trim($_POST['content'])) &&
+            !empty($_POST['answer1']) && !empty(trim($_POST['answer1'])) &&
+            !empty($_POST['answer2']) && !empty(trim($_POST['answer2'])) &&
+            !empty($_POST['answer3']) && !empty(trim($_POST['answer3'])) &&
+            !empty($_POST['answer4']) && !empty(trim($_POST['answer4'])) &&
+            !empty($_POST['idChapter']) &&
+            is_numeric($_POST['correctAnswer']) && $_POST['correctAnswer'] >= 0 && $_POST['correctAnswer'] <= 3
+        ) {
             $id = intval($_POST['id']);
             $content = $_POST['content'];
             $idChapter = intval($_POST['idChapter']);
@@ -156,5 +194,10 @@ class ControllerAdminQuestions
             }
 
             header("Location:/admin/questions");
+
+        } else {
+            $_SESSION["error"] = "Veuillez remplir tous les champs";
+            header("Location:/admin/questions");
+        }
     }
 }

Website/controllers/ControllerUser.php

@@ -109,7 +109,7 @@ class ControllerUser
             $this->mdPlayer = new ModelPlayer();
             $player = $this->mdPlayer->getPlayerByID($_SESSION["idPlayerConnected"]);
             $maxscores = $this->mdPlayer->getMaxScoresWithChapter($player);
-            foreach ($maxscores as $maxscore) {
+            foreach ($maxscores as &$maxscore) {
                 $maxscore["chapter"]=$this->mdChapter->getChapterByID($maxscore["idchapter"])->getName();
             }
             echo $this->twig->render($this->vues["userStatus"],
@@ -228,6 +228,16 @@ class ControllerUser
                 $_SESSION["Score"] = $_SESSION["Score"] + 80 + 40 * ((30 - $time->s) / 100 * 10 / 3);
             } else {
                 $_SESSION["Questions"][$numQuestion]->setNbFails($_SESSION["Questions"][$numQuestion]->getNbFails() + 1);
+                $this->mdQuestion->updateNbFails($_SESSION["Questions"][$numQuestion]);
+            }
+
+            if($_SESSION["Questions"][$numQuestion]->getNbFails() >= 25){
+                if($_SESSION["Questions"][$numQuestion]->getDifficulty() < 3){
+                    $_SESSION["Questions"][$numQuestion]->setDifficulty($_SESSION["Questions"][$numQuestion]->getDifficulty() + 1);
+                }
+                $_SESSION["Questions"][$numQuestion]->setNbFails(0);
+                $this->mdQuestion->updateDifficulty($_SESSION["Questions"][$numQuestion]);
+                $this->mdQuestion->updateNbFails($_SESSION["Questions"][$numQuestion]);
             }
 
             if ($numQuestion <= 8) {
@@ -264,17 +274,17 @@ class ControllerUser
                     'idplayer' => $_SESSION["idPlayerConnected"],
                     'maxscore' => $_SESSION["Score"]
                 ];
+                // var_dump($jouer);
                 // var_dump($this->mdPlayer->verifyJouer($jouer));
-                // var_dump($jouer['idchapter']);
-                // var_dump($jouer['idplayer']);
                 // var_dump($this->mdPlayer->getMaxScoreByPlayerAndChapter($jouer));
-                var_dump($jouer);
-                var_dump($this->mdPlayer->verifyJouer($jouer));
+                // var_dump($jouer['maxscore']);
+                // var_dump($jouer['maxscore'] <= $this->mdPlayer->getMaxScoreByPlayerAndChapter($jouer));
+                // var_dump($jouer['maxscore'] >= $this->mdPlayer->getMaxScoreByPlayerAndChapter($jouer));
 
                 if($this->mdPlayer->verifyJouer($jouer) == null){
                     $this->mdPlayer->addJouer($jouer);
                 }
-                else if($_SESSION["Score"] >= $this->mdPlayer->getMaxScoreByPlayerAndChapter($jouer))
+                else if($jouer['maxscore'] <= $this->mdPlayer->getMaxScoreByPlayerAndChapter($jouer))
                 {
                     $this->mdPlayer->updateJouer($jouer);
                 }
@@ -321,6 +331,21 @@ class ControllerUser
                 $c = $c + 1;
             }
             $_SESSION["Score"] = (int)$_SESSION["Score"];
+
+            $jouer = [
+                'idchapter' => $_SESSION["idChapter"],
+                'idplayer' => $_SESSION["idPlayerConnected"],
+                'maxscore' => $_SESSION["Score"]
+            ];
+            
+            if($this->mdPlayer->verifyJouer($jouer) == null){
+                $this->mdPlayer->addJouer($jouer);
+            }
+            else if($jouer['maxscore'] <= $this->mdPlayer->getMaxScoreByPlayerAndChapter($jouer))
+            {
+                $this->mdPlayer->updateJouer($jouer);
+            }
+
             echo $this->twig->render($this->vues["viewScore"], [
                 'score' => $_SESSION["Score"],
                 'Final' => $Final,

Website/controllers/ControllerUserPlayers.php

@@ -60,7 +60,7 @@ class ControllerUserPlayers
         $player = $this->mdPlayer->getPlayerByID($param["id"]);
 
         echo $this->twig->render($this->vues["adminAdministratorsModal"], [
-            'administrator' => $administrator,
+            'player' => $player,
         ]);
     }
 

Website/gateways/GatewayChapter.php

@@ -62,7 +62,7 @@ class GatewayChapter
         $this->con->executeQuery($query, array(':id' => array($id, PDO::PARAM_INT)));
     }
 
-    public function verifyChapter($id)
+    public function verifyChapterByID($id)
     {
         $query = "SELECT chapters.id FROM chapters WHERE id = :id;";
         $this->con->executeQuery(
@@ -74,4 +74,17 @@ class GatewayChapter
         $results = $this->con->getResults();
         return $results[0];
     }
+    public function verifyChapterByName($name)
+    {
+        $query = "SELECT * FROM chapters WHERE name = :name;";
+        $this->con->executeQuery(
+            $query,
+            array(
+                ':name' => array($name, PDO::PARAM_STR)
+            )
+        );
+        $results = $this->con->getResults();
+
+        return $results[0];
+    }
 }

Website/gateways/GatewayJouer.php

@@ -17,7 +17,6 @@ class GatewayJouer
 
     public function addJouer($jouer)
     {
-        var_dump($jouer);
         $query = "INSERT into jouer(idchapter,idplayer,maxscore) values (:idchapter,:idplayer,:maxscore);";
         $this->con->executeQuery(
             $query,
@@ -27,7 +26,6 @@ class GatewayJouer
                 'maxscore' => array($jouer['maxscore'], PDO::PARAM_INT)
             )
         );
-        var_dump('toto1');
     }
 
     public function getMaxScoreByPlayerAndChapter($jouer)
@@ -47,7 +45,7 @@ class GatewayJouer
 
     public function updateJouer($jouer)
     {
-        $query = "UPDATE jouer SET maxscore = :maxscore WHERE jouer.idplayer = :idplayer AND jouer.idchapter = :idchapter;";
+        $query = "UPDATE jouer SET jouer.maxscore = :maxscore WHERE jouer.idplayer = :idplayer AND jouer.idchapter = :idchapter AND jouer.maxscore <= :maxscore;";
         $this->con->executeQuery(
             $query,
             array(

Website/gateways/GatewayQuestion.php

@@ -62,6 +62,29 @@ class GatewayQuestion
         );
     }
 
+    public function updateNbFails($question){
+        var_dump($question);
+        $query = "UPDATE questions SET nbfails = :nbfails WHERE id = :id;";
+        $this->con->executeQuery(
+            $query,
+            array(
+                ':nbfails' => array($question->getNbFails(), PDO::PARAM_INT),
+                ':id' => array($question->getId(), PDO::PARAM_INT),
+            )
+        );
+    }
+
+    public function updateDifficulty($question){
+        $query = "UPDATE questions SET difficulty = :difficulty WHERE id = :id;";
+        $this->con->executeQuery(
+            $query,
+            array(
+                ':difficulty' => array($question->getDifficulty(), PDO::PARAM_INT),
+                ':id' => array($question->getId(), PDO::PARAM_INT),
+            )
+        );
+    }
+
     public function deleteQuestionByID($id)
     {
         $query = "DELETE FROM questions WHERE id = :id;";

Website/models/ModelAdministrator.php

@@ -22,9 +22,13 @@ class ModelAdministrator
     public function getAdministratorByID($id)
     {
         $administratorDataArray = $this->gwAdministrator->getAdministratorByID($id);
+        if ($administratorDataArray == null) {
+            return null;
+        } else {
             $administrator = new Administrator($administratorDataArray["id"], $administratorDataArray["username"], $administratorDataArray["password"]);
             return $administrator;
         }
+    }
 
     public function getAdministrators()
     {

Website/models/ModelAnswer.php

@@ -30,6 +30,9 @@ class ModelAnswer
     function getAnswersByIDQuestions($idQuestion)
     {
         $answersDataArray = $this->gwAnswer->getAnswersByIDQuestions($idQuestion);
+        if ($answersDataArray == null) {
+            return null;
+        } else {
             $answers = array();
             foreach ($answersDataArray as $answerDataArray) {
                 $answer = new Answer($answerDataArray['id'], $answerDataArray['content'], $idQuestion);
@@ -37,6 +40,7 @@ class ModelAnswer
             }
             return $answers;
         }
+    }
 
     function updateAnswer($answersId, $answer)
     {

Website/models/ModelChapter.php

@@ -17,6 +17,9 @@ class ModelChapter
     function getChapters()
     {
         $chaptersDataArray = $this->gwChapter->getChapters();
+        if ($chaptersDataArray == null) {
+            return null;
+        } else {
             $chapters = array();
             foreach ($chaptersDataArray as $chapterDataArray) {
                 $chapter = new Chapter($chapterDataArray['id'], $chapterDataArray["name"]);
@@ -24,6 +27,7 @@ class ModelChapter
             }
             return $chapters;
         }
+    }
 
     function deleteChapter($id)
     {
@@ -38,9 +42,13 @@ class ModelChapter
     function getChapterByID($id)
     {
         $chapterDataArray = $this->gwChapter->getChapterByID($id);
+        if ($chapterDataArray == null) {
+            return null;
+        } else {
             $chapter = new Chapter($chapterDataArray['id'], $chapterDataArray['name']);
             return $chapter;
         }
+    }
 
     function updateChapter($id, $chapter)
     {
@@ -48,7 +56,15 @@ class ModelChapter
     }
     public function verifyChapter($chapter)
     {
-        $id = $this->gwChapter->verifyChapter($chapter);
+        $id = $this->gwChapter->verifyChapterByID($chapter);
+        return $id;
+    }
+    public function verifyChapterByName($name)
+    {
+        $id = $this->gwChapter->verifyChapterByName($name);
+        if ($id == null) {
+            return null;
+        }
         return $id;
     }
 }

Website/models/ModelQuestion.php

@@ -50,6 +50,9 @@ class ModelQuestion
     function getQuestionByID($id)
     {
         $questionDataArray = $this->gwQuestion->getQuestionByID($id);
+        if ($questionDataArray == null) {
+            return null;
+        } else {
             $question = new Question(
                 intval($questionDataArray['id']),
                 $questionDataArray['content'],
@@ -60,12 +63,21 @@ class ModelQuestion
             );
             return $question;
         }
+    }
 
     function updateQuestion($id, $questionDataArray)
     {
         $this->gwQuestion->updateQuestion($id, $questionDataArray);
     }
 
+    function updateNbFails($question){
+        $this->gwQuestion->updateNbFails($question);
+    }
+
+    function updateDifficulty($question){
+        $this->gwQuestion->updateDifficulty($question);
+    }
+
     function getQuestionsByChapterAndDifficulty($chapter, $difficulty)
     {
         $questionsDataArray = $this->gwQuestion->getQuestionsByChapterAndDifficulty($chapter, $difficulty);

Website/templates/addquestions.twig

@@ -2,14 +2,14 @@
 <html lang="fr">
 
 <head>
-    <meta charset=utf-8>
+    <meta charset="UTF-8">
     <title>Math'Educ</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
         integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-    <link rel="stylesheet" href="css/global.css">
+    <link rel="stylesheet" href="../css/global.css">
 </head>
 
-<body style="color:white;">
+<body id="bodyStyle">
     <div class="container-fluid text-center pt-5" style="height:85vh;">
         <form class="row g-3 needs-validation w-100" action="traitementAjout.php" method="post" novalidate>
             <div class="container fs-2">

Website/templates/adminAdministrators.twig

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title>Maths'Educ</title>
+        <title>Math'Educ</title>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
@@ -16,6 +16,7 @@
         </div>
         <div class="container mt-5 text-light fs-4">
             <h1>Liste des administrators</h1> 
+            <p class="text-center bg-danger"> {{ error }} </p>
             <ul class="list-group">
                 {% for admin in administrators %}
                     <li class="list-group-item d-flex justify-content-between align-items-center border-dark text-light bg-secondary">

Website/templates/adminAdministratorsModal.twig

@@ -1,15 +1,14 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title>Maths'Educ</title>
+        <title>Math'Educ</title>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-        </script>
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../../../css/global.css">
     </head>
 
-    <body>
+    <body id="bodyStyle">
         <div class="modal fade" id="modalUpdateAdministrators">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">

Website/templates/adminChapters.twig

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title>Maths'Educ</title>
+        <title>Math'Educ</title>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
@@ -17,6 +17,7 @@
         </div>
         <div class="container mt-5 text-light fs-4">
             <h1>Liste des chapitres</h1>
+            <p class="text-center bg-danger"> {{ error }} </p>
             <ul class="list-group">
                 {% for chapter in chapters %}
                     <li class="list-group-item d-flex justify-content-between align-items-center border-dark text-light bg-secondary">

Website/templates/adminChaptersModal.twig

@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title>Maths'Educ</title>
+        <title>Math'Educ</title>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
         </script>
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../../../css/global.css">
     </head>
 
-    <body>
+    <body id="bodyStyle">
         <div class="modal fade" id="modalUpdateChapters">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">

Website/templates/adminQuestions.twig

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title>Maths'Educ</title>
+        <title>Math'Educ</title>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
@@ -17,6 +17,7 @@
         </div>
         <div class="container mt-5 text-light fs-4">
             <h1>Liste des questions</h1>
+            <p class="text-center bg-danger"> {{ error }} </p>
             <ul class="list-group">
                 {% for question in questions %}
                     <li class="list-group-item d-flex justify-content-between align-items-center border-dark text-light bg-secondary">
@@ -31,7 +32,7 @@
         </div>
         <div class="container mt-3 d-flex justify-content-between">
             <a type="button" href="/admin/chapters" class="btn btn-secondary fs-5"> ← Chapitres</a>
-            <button type="button" class="btn btn-primary fs-5" data-bs-toggle="modal" data-bs-target="#modalquestions">Ajouter un chapitre</button>
+            <button type="button" class="btn btn-primary fs-5" data-bs-toggle="modal" data-bs-target="#modalquestions">Ajouter une question</button>
             <a type="button" href="/admin/administrators" class="btn btn-secondary fs-5">Administrateurs →</a>
         </div>
 

Website/templates/adminQuestionsModal.twig

@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title>Maths'Educ</title>
+        <title>Math'Educ</title>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
         </script>
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../../../css/global.css">
     </head>
 
-    <body>
+    <body id="bodyStyle">
         <div class="modal fade" id="modalUpdateQuestions">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">

Website/templates/error.twig

@@ -2,9 +2,9 @@
 <html lang="fr">
     <head>
         <meta charset="UTF-8">
-        <title>Maths'Educ</title>
+        <title>Math'Educ</title>
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../css/global.css">
     </head>
     <body id="bodyStyle">
         <div class="fs-1 text-light text-center mt-5">

Website/templates/home.twig

@@ -3,9 +3,9 @@
 
 <head>
     <meta charset=utf-8>
-    <title>Maths'Educ</title>
+    <title>Math'Educ</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-    <link rel="stylesheet" href="css/global.css">
+    <link rel="stylesheet" href="../css/global.css">
 </head>
 
 <body id="bodyStyle">

Website/templates/lobby.twig

@@ -2,7 +2,7 @@
 <html lang="fr">
     <head>
         <meta charset=utf-8>
-        <title>Maths'Educ</title>
+        <title>Math'Educ</title>
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
         <link rel="stylesheet" href="/css/global.css">
     </head>

Website/templates/loginAdmin.twig

@@ -2,9 +2,9 @@
 <html lang="fr">
     <head>
         <meta charset="utf-8">
-        <title>Maths'Educ - Connexion</title>
+        <title>Math'Educ - Connexion</title>
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../css/global.css">
     </head>
     <body id="bodyStyle">
         <div>

Website/templates/loginPlayer.twig

@@ -2,9 +2,9 @@
 <html lang="fr">
     <head>
         <meta charset="utf-8">
-        <title>Maths'Educ - Connexion</title>
+        <title>Math'Educ - Connexion</title>
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../css/global.css">
     </head>
     <body id="bodyStyle">
         <div>

Website/templates/multiplayer.twig

@@ -3,8 +3,8 @@
 
 <head>
     <meta charset=utf-8>
-    <title>Maths'Educ</title>
-    <link rel="stylesheet" href="css/global.css">
+    <title>Math'Educ</title>
+    <link rel="stylesheet" href="../css/global.css">
     <link rel="stylesheet" href="css/chrono.css">
     <link rel="stylesheet" href="css/progressBar.css">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">

Website/templates/singleplayer.twig

@@ -3,8 +3,8 @@
 
 <head>
     <meta charset=utf-8>
-    <title>Maths'Educ</title>
-    <link rel="stylesheet" href="css/global.css">
+    <title>Math'Educ</title>
+    <link rel="stylesheet" href="../css/global.css">
     <link rel="stylesheet" href="css/chrono.css">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>

Website/templates/themeChoice.twig

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title>Maths'Educ</title>
+        <title>Math'Educ</title>
         <meta charset="UTF-8">
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../css/global.css">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>

Website/templates/userPlayerModal.twig

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title>Maths Educ</title>
+        <title>Math'Educ</title>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../../../css/global.css">
     </head>
 
-    <body>
+    <body id="bodyStyle">
         <div class="modal fade" id="modalUpdateAdministrators">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">

Website/templates/userStatus.twig

@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <title>Maths Educ</title>
+        <title>Math'Educ</title>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../css/global.css">
     </head>
 
     <body id="bodyStyle">
@@ -14,16 +14,21 @@
                 Retour
             </a>
         </div>
-        <div class="container mt-5">
-            <div class="col-5 bg-light border border-warning rounded">
+        <div class="container mt-5 fs-4 text-light text-center">
+            <div class="row gy-2 mt-0 justify-content-center">
+                <div class="col-3 bg-secondary border rounded">
                     <p> Player Nickname : </p>
                     <p>{{ player.nickname }} </p>
                 </div>
+            </div>
             {% for maxscore in maxscores %}
-                <div class="col-5 bg-light border border-warning rounded">
+                <div class="row gy-2 mt-0 justify-content-center">
+                    <div class="col-3 bg-secondary border rounded">
                         <p> Maxscore pour le chapitre {{ maxscore["chapter"] }} : </p>
                         <p>{{ maxscore["maxscore"] }} </p>
                     </div>
+                </div>
             {% endfor %}
+        </div>
     </body>
 </html>

Website/templates/viewScore.twig

@@ -2,9 +2,9 @@
 <html lang="fr">
 
 <head>
-    <title>Maths'Educ</title>
+    <title>Math'Educ</title>
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="css/global.css">
+    <link rel="stylesheet" href="../css/global.css">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="css/confetti.css">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">