From 03a05b7223cee91ffba7ad731897ec8e6143e384 Mon Sep 17 00:00:00 2001 From: johan Date: Tue, 3 Jan 2023 17:29:40 +0100 Subject: [PATCH 01/21] petites corrections --- WEB/Controller/UserController.php | 4 ++++ WEB/Model/UserModel.php | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index a2c28017..eab6b1cb 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -224,6 +224,10 @@ class UserController $model->launchGame(); require($rep . $vues['partie']); } + catch (Exception $e) { + $error = $e->getMessage(); + require($rep . $vues['erreur']); + } } public function logout() { diff --git a/WEB/Model/UserModel.php b/WEB/Model/UserModel.php index 9ed671a0..db08600e 100644 --- a/WEB/Model/UserModel.php +++ b/WEB/Model/UserModel.php @@ -26,7 +26,10 @@ class UserModel { echo '1'; if ($this->utilisateur_gateway->isAlreadyInqueue($_SESSION['utilisateur'])) { - return; + if($this->utilisateur_gateway->queueFilled()) + { + $_REQUEST['action']='launchGame'; + } } echo '2'; if (!$this->partie_gateway->partieInQueueExists()) { From 1e086fb10c346cb3eec774ff06b2f1f30a3d523d Mon Sep 17 00:00:00 2001 From: nathan boileau Date: Tue, 3 Jan 2023 17:32:05 +0100 Subject: [PATCH 02/21] test link --- WEB/View/src/pages/LogSign/Login.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/WEB/View/src/pages/LogSign/Login.php b/WEB/View/src/pages/LogSign/Login.php index 47e17338..8039d921 100644 --- a/WEB/View/src/pages/LogSign/Login.php +++ b/WEB/View/src/pages/LogSign/Login.php @@ -1,9 +1,9 @@  - - + + Login - - - Login +
From c92d6710645798d641d41aac97d9db5139f94fa0 Mon Sep 17 00:00:00 2001 From: johan Date: Tue, 3 Jan 2023 17:32:54 +0100 Subject: [PATCH 03/21] ajout du lien entre le bouton pour le multi et le multi --- WEB/View/src/pages/Main.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/WEB/View/src/pages/Main.php b/WEB/View/src/pages/Main.php index 43e28604..848385e9 100644 --- a/WEB/View/src/pages/Main.php +++ b/WEB/View/src/pages/Main.php @@ -1,4 +1,4 @@ - + @@ -208,7 +208,16 @@
- + + id="btn-2"> From 397b2f739821fe48d3c1c6513d3e62d7288d4540 Mon Sep 17 00:00:00 2001 From: johan Date: Tue, 3 Jan 2023 17:34:35 +0100 Subject: [PATCH 04/21] ajout qu require de la vue de file d'attente --- WEB/Controller/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index 468be61c..c4482fbc 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -202,7 +202,7 @@ class UserController { try { global $rep, $vues, $error; - //require($rep . $vues['Queue']); + require($rep . $vues['Queue']); $model = new UserModel(); $model->addToQueue(); echo From 7abe0a46cb36c9385286615aafc40be9eab26161 Mon Sep 17 00:00:00 2001 From: johan Date: Tue, 3 Jan 2023 17:37:43 +0100 Subject: [PATCH 05/21] suppression des ajouts du merge --- WEB/Controller/UserController.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index c4482fbc..f19417cb 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -217,7 +217,6 @@ class UserController require($rep . $vues['erreur']); } } -<<<<<<< HEAD public function launchGame(){ try { global $rep, $vues, $error; @@ -230,16 +229,6 @@ class UserController require($rep . $vues['erreur']); } } -======= - // public function launchGame(){ - // try { - // global $rep, $vues, $error; - // $model = new UserModel(); - // $model->launchGame(); - // require($rep . $vues['partie']); - // } - // } ->>>>>>> ec72c626e295121e440c26605682865659b9012b public function logout() { $_SESSION['role'] = 'visitor'; From 0908eab79ac1f5adc1af846b685a3c2eca7674c1 Mon Sep 17 00:00:00 2001 From: johan Date: Tue, 3 Jan 2023 17:43:27 +0100 Subject: [PATCH 06/21] ajout du chemin vers queue --- WEB/Config/Config.php | 1 + WEB/Controller/UserController.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php index 1589095e..15210945 100644 --- a/WEB/Config/Config.php +++ b/WEB/Config/Config.php @@ -27,6 +27,7 @@ $vues['adminSolo'] = 'View/src/pages/Admin/AdminSolo.php'; $vues['seeOrdre'] = 'View/src/pages/Admin/SeeOrdre.php'; $vues['modifOrdre'] = 'View/src/pages/Admin/ModifOrdre.php'; $vues['partie'] = 'View/src/pages/Multijoueur/Partie.php'; +$vues['queue'] = 'View/src/pages/Multijoueur/Queue.php'; // Enigme $vues['enigme'] = 'View/src/pages/Enigme/Palindrome.html'; $vues['enigmePage'] = 'View/src/pages/Enigme/EnigmePage.php'; diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index f19417cb..1fbc508b 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -202,7 +202,7 @@ class UserController { try { global $rep, $vues, $error; - require($rep . $vues['Queue']); + require($rep . $vues['queue']); $model = new UserModel(); $model->addToQueue(); echo From 4dfd67c9d1c4c2c75ccf1b68f38877a8a27b5ba0 Mon Sep 17 00:00:00 2001 From: nathan boileau Date: Tue, 3 Jan 2023 17:43:58 +0100 Subject: [PATCH 07/21] =?UTF-8?q?link=20repar=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WEB/View/src/CSS/{LogSign.css => Login.css} | 1 + WEB/View/src/pages/LogSign/Login.php | 110 ++++----- WEB/View/src/pages/Main.php | 235 +++++++++----------- 3 files changed, 151 insertions(+), 195 deletions(-) rename WEB/View/src/CSS/{LogSign.css => Login.css} (98%) diff --git a/WEB/View/src/CSS/LogSign.css b/WEB/View/src/CSS/Login.css similarity index 98% rename from WEB/View/src/CSS/LogSign.css rename to WEB/View/src/CSS/Login.css index 7d83603f..46c241b9 100644 --- a/WEB/View/src/CSS/LogSign.css +++ b/WEB/View/src/CSS/Login.css @@ -160,6 +160,7 @@ body { background: linear-gradient(270deg, transparent, #6090d1); animation: btn-anim3 1s linear infinite; animation-delay: 0.5s; + -webkit-animation: btn-anim3 1s linear infinite; } @keyframes btn-anim3 { diff --git a/WEB/View/src/pages/LogSign/Login.php b/WEB/View/src/pages/LogSign/Login.php index 8039d921..39a69c03 100644 --- a/WEB/View/src/pages/LogSign/Login.php +++ b/WEB/View/src/pages/LogSign/Login.php @@ -1,68 +1,52 @@  - + + - - Login - - - - - - - - -
-