diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php index 87d2da86..07a1fc66 100644 --- a/WEB/Config/Config.php +++ b/WEB/Config/Config.php @@ -37,6 +37,7 @@ $vues['modifOrdre'] = 'View/src/pages/Admin/ModifOrdre.php'; //Mulijoueur $vues['partie'] = 'View/src/pages/Multijoueur/Partie.php'; $vues['queue'] = 'View/src/pages/Multijoueur/FileAttente.php'; +$vues['lobby'] = 'View/src/pages/Multijoueur/Lobby.php'; $vues['lobbyEnd'] = 'View/src/pages/Multijoueur/LobbyEnd.php'; $vues['gameEnd'] = 'View/src/pages/Multijoueur/GameEnd.php'; diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index 897b7d42..33a2cc13 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -37,8 +37,8 @@ class UserController case "enigmeMultiEnded": $this->enigmeMultiEnded(); break; - case "goToQueue": - $this->goToQueue(); + case "goToLobby": + $this->goToLobby(); break; case "waiting": $this->waiting(); @@ -204,11 +204,11 @@ class UserController require($rep . $vues['erreur']); } } - public function goToQueue() + public function goToLobby() { try { global $rep, $vues, $error; - require($rep . $vues['queue']); + require($rep . $vues['lobby']); } catch (Exception $e) { $error = $e->getMessage(); require($rep . $vues['erreur']); @@ -241,6 +241,7 @@ class UserController $utilisateur = $_SESSION['utilisateur']; $idPartie = $model->addToQueue($utilisateur->getEmail()); $_SESSION['idPartie'] = $idPartie; + require($rep . $vues['queue']); } catch (Exception $e) { $error = $e->getMessage(); require($rep . $vues['erreur']); diff --git a/WEB/View/src/pages/Main.php b/WEB/View/src/pages/Main.php index 25a0e733..ee071c0b 100644 --- a/WEB/View/src/pages/Main.php +++ b/WEB/View/src/pages/Main.php @@ -178,7 +178,7 @@ RUSH
-

Ready ?

+

Waiting for Coders...

-
-
- - -
-
diff --git a/WEB/View/src/pages/Multijoueur/Lobby.php b/WEB/View/src/pages/Multijoueur/Lobby.php new file mode 100644 index 00000000..672d948d --- /dev/null +++ b/WEB/View/src/pages/Multijoueur/Lobby.php @@ -0,0 +1,80 @@ + + + + + + Scripted + + + + + + + + +
+
+
+
+

SCRIPT

+

RUSH

+
+
+

Lorem ipsum dolor sit amet consectetur, adipisicing elit. Fuga magni voluptatibus, inventore asperiores reprehenderit laudantium possimus ut distinctio dignissimos laboriosam quia. Natus vero velit ut. Sint commodi perferendis aliquid asperiores.

+
+
+

Ready ?

+
+ +
+ +
+
+
+
+ +