From c26c17ac46c659e151291bbead64adff8cf95197 Mon Sep 17 00:00:00 2001 From: Noe GARNIER Date: Wed, 16 Nov 2022 09:58:50 +0100 Subject: [PATCH] =?UTF-8?q?Finalisation=20du=20syst=C3=A8me=20d'inscriptio?= =?UTF-8?q?n=20et=20de=20connexion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bd/bd.sql | 39 ------------- {Bd => Documentation}/MCD&MLD.drawio.pdf | Bin WEB/Config/Config.php | 3 +- WEB/Controller/Controller.php | 64 +++++++++++++++++---- WEB/Controller/EnigmeGateway.php | 2 - WEB/Controller/JoueurGateway.php | 3 - WEB/Controller/Traitement.php | 6 -- WEB/View/Error/Erreur.php | 4 +- WEB/View/Error/Erreur404.php | 9 +++ WEB/View/src/pages/LogSign/Login.php | 6 +- WEB/View/src/pages/LogSign/SignUp.php | 4 +- WEB/View/src/pages/{Main.html => Main.php} | 22 ++++--- WEB/View/src/pages/Presentation.html | 8 +-- WEB/index.php | 24 ++++++++ WEB/php/.idea/.gitignore | 8 --- WEB/php/.idea/modules.xml | 8 --- WEB/php/.idea/php.iml | 8 --- WEB/php/.idea/php.xml | 6 -- WEB/php/.idea/vcs.xml | 6 -- 19 files changed, 114 insertions(+), 116 deletions(-) delete mode 100644 Bd/bd.sql rename {Bd => Documentation}/MCD&MLD.drawio.pdf (100%) delete mode 100644 WEB/Controller/Traitement.php create mode 100644 WEB/View/Error/Erreur404.php rename WEB/View/src/pages/{Main.html => Main.php} (75%) create mode 100644 WEB/index.php delete mode 100644 WEB/php/.idea/.gitignore delete mode 100644 WEB/php/.idea/modules.xml delete mode 100644 WEB/php/.idea/php.iml delete mode 100644 WEB/php/.idea/php.xml delete mode 100644 WEB/php/.idea/vcs.xml diff --git a/Bd/bd.sql b/Bd/bd.sql deleted file mode 100644 index 2c961fa7..00000000 --- a/Bd/bd.sql +++ /dev/null @@ -1,39 +0,0 @@ -CREATE TABLE Admin( -email varchar(50) PRIMARY KEY, -pseudo varchar(50), -mdp varchar(50) -); - -CREATE TABLE Enigme( -idEnigme char(5) PRIMARY KEY, -admin varchar(50) REFERENCES Admin(email), -enonce varchar(250) NOT NULL, -aide varchar(250), -rappel varchar(250), -solution varchar(250) NOT NULL, -test varchar(250) NOT NULL, -tempsDeResolution numeric CHECK (tempsDeResolution >0) -); - -CREATE TABLE Joueur( -email varchar(50) PRIMARY KEY, -enigmeEnCours varchar(50) REFERENCES Enigme(idEnigme), -pseudo varchar(50), -mdp varchar(50) -); - -CREATE TABLE Partie( -idPartie char(5) NOT NULL, -joueur varchar(50) REFERENCES Joueur(email), -enigme char(5) REFERENCES Enigme(idEnigme), -points numeric CHECK (points >0), -PRIMARY KEY(idGame, joueur, enigme) -); - -CREATE TABLE DetailPartie( -idPartie char(5) NOT NULL, -joueur varchar(50) REFERENCES Joueur(email), -enigme char(5) REFERENCES Enigme(idEnigme), -points numeric CHECK (points >0), -PRIMARY KEY(idGame, joueur, enigme) -); \ No newline at end of file diff --git a/Bd/MCD&MLD.drawio.pdf b/Documentation/MCD&MLD.drawio.pdf similarity index 100% rename from Bd/MCD&MLD.drawio.pdf rename to Documentation/MCD&MLD.drawio.pdf diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php index 9ffee740..ce30a946 100644 --- a/WEB/Config/Config.php +++ b/WEB/Config/Config.php @@ -12,4 +12,5 @@ $vues['erreurSignUp']='View/Error/ErreurSignUp.php'; $vues['erreur']='View/Error/Erreur.php'; $vues['erreurBd']='View/Error/ErreurBd.php'; $vues['erreurLoginEmail']='View/Error/ErreurLoginEmail.php'; -$vues['erreurLoginMdp']='View/Error/ErreurLoginMdp.php'; \ No newline at end of file +$vues['erreurLoginMdp']='View/Error/ErreurLoginMdp.php'; +$vues['erreur404']='View/Error/Erreur404.php'; \ No newline at end of file diff --git a/WEB/Controller/Controller.php b/WEB/Controller/Controller.php index 7ced25bf..9a1fe47f 100644 --- a/WEB/Controller/Controller.php +++ b/WEB/Controller/Controller.php @@ -1,10 +1,5 @@ signUp(); @@ -29,6 +24,18 @@ class Controller case "login": $this->login(); break; + case "goToPresentation": + $this->goToPresentation(); + break; + case "goToHome": + $this->goToHome(); + break; + case "goToLogin": + $this->goToLogin(); + break; + case "goToSignUp": + $this->goToSignUp(); + break; } } catch (PDOException $e) { @@ -46,8 +53,8 @@ class Controller } $joueur = new Joueur($_REQUEST['email'], $_REQUEST['username'], $_REQUEST['password']); $gateway->insert($joueur); - //$gateway->showAll(); - header('Location: http://londres.uca.local/~nogarnier1/Scripted/WEB/View/src/pages/Main.html'); + $_SESSION['connected'] = 'true'; + require ('./View/src/pages/Main.php'); }catch (Exception $e){ require($rep.$vues['erreurSignUp']); } @@ -64,11 +71,48 @@ class Controller if ($mdp != $_REQUEST['password']){ throw new InvalidMdpException("Mot de passe invalide"); } - header('Location: http://londres.uca.local/~nogarnier1/Scripted/WEB/View/src/pages/Main.html'); + $_SESSION['connected'] = 'true'; + require ('./View/src/pages/Main.php'); }catch (JoueurNotFoundException $e){ require($rep.$vues['erreurLoginEmail']); }catch (InvalidMdpException $m) { require($rep . $vues['erreurLoginMdp']); } } + + private function goToPresentation() { + global $rep, $vues; + try { + require ('./View/src/pages/Presentation.html'); + }catch (Exception $e){ + require($rep.$vues['erreur404']); + } + } + + private function goToHome() { + global $rep, $vues; + try { + require ('./View/src/pages/Main.php'); + }catch (Exception $e){ + require($rep.$vues['erreur404']); + } + } + + private function goToLogin() { + global $rep, $vues; + try { + require ('./View/src/pages/LogSign/Login.php'); + }catch (Exception $e){ + require($rep.$vues['erreur404']); + } + } + + private function goToSignUp() { + global $rep, $vues; + try { + require ('./View/src/pages/LogSign/SignUp.php'); + }catch (Exception $e){ + require($rep.$vues['erreur404']); + } + } } \ No newline at end of file diff --git a/WEB/Controller/EnigmeGateway.php b/WEB/Controller/EnigmeGateway.php index 03a33c31..6f15131b 100644 --- a/WEB/Controller/EnigmeGateway.php +++ b/WEB/Controller/EnigmeGateway.php @@ -1,6 +1,4 @@ - - - \ No newline at end of file diff --git a/WEB/View/Error/Erreur404.php b/WEB/View/Error/Erreur404.php new file mode 100644 index 00000000..84b9c616 --- /dev/null +++ b/WEB/View/Error/Erreur404.php @@ -0,0 +1,9 @@ + + +

ERREUR

+

Page introuvable

+ + + diff --git a/WEB/View/src/pages/LogSign/Login.php b/WEB/View/src/pages/LogSign/Login.php index f99615f6..a969d3bf 100644 --- a/WEB/View/src/pages/LogSign/Login.php +++ b/WEB/View/src/pages/LogSign/Login.php @@ -4,7 +4,7 @@ - + Login @@ -15,7 +15,7 @@

Sign up

-
+
@@ -32,7 +32,7 @@ Submit - + diff --git a/WEB/View/src/pages/LogSign/SignUp.php b/WEB/View/src/pages/LogSign/SignUp.php index 1f8c3592..a700b15e 100644 --- a/WEB/View/src/pages/LogSign/SignUp.php +++ b/WEB/View/src/pages/LogSign/SignUp.php @@ -4,7 +4,7 @@ - + Login @@ -15,7 +15,7 @@

Sign up

- +
diff --git a/WEB/View/src/pages/Main.html b/WEB/View/src/pages/Main.php similarity index 75% rename from WEB/View/src/pages/Main.html rename to WEB/View/src/pages/Main.php index 4115417a..2355ce52 100644 --- a/WEB/View/src/pages/Main.html +++ b/WEB/View/src/pages/Main.php @@ -16,7 +16,7 @@ integrity="sha384-F3w7mX95PdgyTmZZMECAngseQB83DfGTowi0iMjiWaeVhAn4FJkqJByhZMI3AhiU" crossorigin="anonymous" /> - + @@ -34,12 +34,20 @@
- + + > + diff --git a/WEB/View/src/pages/Presentation.html b/WEB/View/src/pages/Presentation.html index 5f65195b..54d25512 100644 --- a/WEB/View/src/pages/Presentation.html +++ b/WEB/View/src/pages/Presentation.html @@ -4,9 +4,9 @@ - - - + + + Presentation @@ -14,7 +14,7 @@
- home + home

diff --git a/WEB/index.php b/WEB/index.php new file mode 100644 index 00000000..e72b326e --- /dev/null +++ b/WEB/index.php @@ -0,0 +1,24 @@ + - - - - - - - \ No newline at end of file diff --git a/WEB/php/.idea/php.iml b/WEB/php/.idea/php.iml deleted file mode 100644 index c956989b..00000000 --- a/WEB/php/.idea/php.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/WEB/php/.idea/php.xml b/WEB/php/.idea/php.xml deleted file mode 100644 index 35715888..00000000 --- a/WEB/php/.idea/php.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/WEB/php/.idea/vcs.xml b/WEB/php/.idea/vcs.xml deleted file mode 100644 index b2bdec2d..00000000 --- a/WEB/php/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file