diff --git a/Project/php/controller/StudentController.php b/Project/php/controller/StudentController.php index 1db5439..f955aa5 100755 --- a/Project/php/controller/StudentController.php +++ b/Project/php/controller/StudentController.php @@ -22,7 +22,7 @@ class StudentController extends UserController { global $twig; global $user; - $jeu = $_POST['jeu']; + $jeu = Validation::filter_str_nospecialchar($_GET['jeu'] ?? null); $model = new MdlStudent(); $voc = $model->getVocByGroup($user->getGroup()); echo $twig->render('vocabList.html', ['jeu' => $jeu, diff --git a/Project/php/controller/VisitorController.php b/Project/php/controller/VisitorController.php index f196478..0c635ab 100755 --- a/Project/php/controller/VisitorController.php +++ b/Project/php/controller/VisitorController.php @@ -18,7 +18,7 @@ class VisitorController global $user; try { - $idVoc = Validation::filter_int($_POST['idVoc'] ?? 4); + $idVoc = Validation::filter_int($_GET['idVoc'] ?? 4); $wordList = (new MdlTeacher())->findByIdVoc($idVoc); $name = ((new MdlStudent())->getVocabById($idVoc))->getName(); $wordShuffle = array(); @@ -63,7 +63,7 @@ class VisitorController global $user; try { - $vocabId = Validation::filter_int($_POST['idVoc'] ?? 4); + $vocabId = Validation::filter_int($_GET['idVoc'] ?? 4); $vocabList = (new VocabularyListGateway())->findById($vocabId) ?? null; if ($vocabList == null) { diff --git a/Project/php/css/styles.css b/Project/php/css/styles.css index 5a9b4c2..4ff8a0b 100755 --- a/Project/php/css/styles.css +++ b/Project/php/css/styles.css @@ -2846,7 +2846,7 @@ textarea.form-control-lg { --bs-btn-bg: #a840a3; --bs-btn-border-color: #a840a3; --bs-btn-hover-color: #fff; - --bs-btn-hover-bg: #cf51c9; + --bs-btn-hover-bg: #6e176a; --bs-btn-hover-border-color: #cf51c9; --bs-btn-focus-shadow-rgb: 123, 175, 172; --bs-btn-active-color: #fff; @@ -8177,6 +8177,12 @@ textarea.form-control-lg { .text-capitalize { text-transform: capitalize !important; } +.text-capitalize-first-letter::first-letter { + text-transform: uppercase; +} +.text-capitalize-first-letter { + text-transform: lowercase; +} .text-wrap { white-space: normal !important; @@ -11147,9 +11153,9 @@ body { padding: 1.25rem 2rem; font-family: "Varela Round", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-size: 80%; - text-transform: uppercase; - letter-spacing: 0.15rem; + letter-spacing: 0.1rem; border: 0; + text-align: center; } .masthead { diff --git a/Project/php/templates/gamesList.html b/Project/php/templates/gamesList.html index a11f675..17be99c 100755 --- a/Project/php/templates/gamesList.html +++ b/Project/php/templates/gamesList.html @@ -5,48 +5,17 @@ Games list - - + {% include 'navBar.twig' %} -
-
- - - - - - - -
-
- - -
-
-
- - -
-
-
+
+ + + + + +
diff --git a/Project/php/templates/home.html b/Project/php/templates/home.html index 72093f6..ceb41af 100755 --- a/Project/php/templates/home.html +++ b/Project/php/templates/home.html @@ -54,7 +54,12 @@