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 468be61c..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 @@ -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'; diff --git a/WEB/View/src/pages/Main.php b/WEB/View/src/pages/Main.php index 73f3c622..72dc8722 100644 --- a/WEB/View/src/pages/Main.php +++ b/WEB/View/src/pages/Main.php @@ -1,4 +1,4 @@ - + @@ -170,32 +170,34 @@ - -
- - - - - - - - - - - - - - - - - - ScriptRush - - + +
+ + id="btn-2"> + + + + + + + + + + + ScriptRush + + +
- - - + \ No newline at end of file