-
+
+
+
+
+
+ ![\"coeur\"](\"../images/coeur.svg\")
+ ![\"toggle](\"../images/light.svg\")
+ ![\"quizz\"](\"../images/quizz.svg\")
+
+
+
+
+
+ ![\"Logo\"](\"../images/WIKIFANTASY.png\")
+
+
+
+ ![\"user\"](\"../images/user_dark.png\")
+
+
+ ▶ S'inscrazeazeazeire ◀
+ + +"; + yield from []; + } + + /** + * @codeCoverageIgnore + */ + public function getTemplateName(): string + { + return "signin2.html.twig"; + } + + /** + * @codeCoverageIgnore + */ + public function getDebugInfo(): array + { + return array ( 42 => 1,); + } + + public function getSourceContext(): Source + { + return new Source("", "signin.html.twig", "/Users/kiem/Documents/WikiFantasy/WF-Website/vue/templates/signin2.html.twig"); + } +} diff --git a/cache/6d/6de321060ef2387bc16f534fbbd8a0cb.php b/cache/6d/6de321060ef2387bc16f534fbbd8a0cb.php new file mode 100644 index 0000000..6bacc22 --- /dev/null +++ b/cache/6d/6de321060ef2387bc16f534fbbd8a0cb.php @@ -0,0 +1,144 @@ + + */ + private array $macros = []; + + public function __construct(Environment $env) + { + parent::__construct($env); + + $this->source = $this->getSourceContext(); + + $this->parent = false; + + $this->blocks = [ + ]; + } + + protected function doDisplay(array $context, array $blocks = []): iterable + { + $macros = $this->macros; + // line 1 + yield " + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ▶ "; + // line 28 + yield $this->env->getRuntime('Twig\Runtime\EscaperRuntime')->escape(($context["errors"] ?? null), "html", null, true); + yield " ◀
+ + +"; + yield from []; + } + + /** + * @codeCoverageIgnore + */ + public function getTemplateName(): string + { + return "signin4.html.twig"; + } + + /** + * @codeCoverageIgnore + */ + public function isTraitable(): bool + { + return false; + } + + /** + * @codeCoverageIgnore + */ + public function getDebugInfo(): array + { + return array ( 97 => 48, 89 => 43, 71 => 28, 42 => 1,); + } + + public function getSourceContext(): Source + { + return new Source("", "signin4.html.twig", "/Users/kiem/Documents/WikiFantasy/WF-Website/vue/templates/signin4.html.twig"); + } +} diff --git a/cache/b7/b796d974978e55de5fca49741812ff6b.php b/cache/b7/b796d974978e55de5fca49741812ff6b.php new file mode 100644 index 0000000..d34d566 --- /dev/null +++ b/cache/b7/b796d974978e55de5fca49741812ff6b.php @@ -0,0 +1,114 @@ + + */ + private array $macros = []; + + public function __construct(Environment $env) + { + parent::__construct($env); + + $this->source = $this->getSourceContext(); + + $this->parent = false; + + $this->blocks = [ + ]; + } + + protected function doDisplay(array $context, array $blocks = []): iterable + { + $macros = $this->macros; + // line 1 + yield " + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ▶ Connexion ◀
+ + + +"; + yield from []; + } + + /** + * @codeCoverageIgnore + */ + public function getTemplateName(): string + { + return "login.html.twig"; + } + + /** + * @codeCoverageIgnore + */ + public function getDebugInfo(): array + { + return array ( 42 => 1,); + } + + public function getSourceContext(): Source + { + return new Source("", "login.html.twig", "/Users/kiem/Documents/WikiFantasy/WF-Website/vue/templates/login.html.twig"); + } +} diff --git a/cache/b9/b9f06cf0c28af20c02697ea9f4c33b34.php b/cache/b9/b9f06cf0c28af20c02697ea9f4c33b34.php new file mode 100644 index 0000000..9674c2a --- /dev/null +++ b/cache/b9/b9f06cf0c28af20c02697ea9f4c33b34.php @@ -0,0 +1,144 @@ + + */ + private array $macros = []; + + public function __construct(Environment $env) + { + parent::__construct($env); + + $this->source = $this->getSourceContext(); + + $this->parent = false; + + $this->blocks = [ + ]; + } + + protected function doDisplay(array $context, array $blocks = []): iterable + { + $macros = $this->macros; + // line 1 + yield " + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ▶ "; + // line 28 + yield $this->env->getRuntime('Twig\Runtime\EscaperRuntime')->escape(($context["test"] ?? null), "html", null, true); + yield " ◀
+ + +"; + yield from []; + } + + /** + * @codeCoverageIgnore + */ + public function getTemplateName(): string + { + return "signin5.html.twig"; + } + + /** + * @codeCoverageIgnore + */ + public function isTraitable(): bool + { + return false; + } + + /** + * @codeCoverageIgnore + */ + public function getDebugInfo(): array + { + return array ( 97 => 48, 89 => 43, 71 => 28, 42 => 1,); + } + + public function getSourceContext(): Source + { + return new Source("", "signin5.html.twig", "/Users/kiem/Documents/WikiFantasy/WF-Website/vue/templates/signin5.html.twig"); + } +} diff --git a/cache/bb/bb0d1fc28ee0b67e6ef4c12688a04e9a.php b/cache/bb/bb0d1fc28ee0b67e6ef4c12688a04e9a.php new file mode 100644 index 0000000..c19e758 --- /dev/null +++ b/cache/bb/bb0d1fc28ee0b67e6ef4c12688a04e9a.php @@ -0,0 +1,144 @@ + + */ + private array $macros = []; + + public function __construct(Environment $env) + { + parent::__construct($env); + + $this->source = $this->getSourceContext(); + + $this->parent = false; + + $this->blocks = [ + ]; + } + + protected function doDisplay(array $context, array $blocks = []): iterable + { + $macros = $this->macros; + // line 1 + yield " + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ▶ "; + // line 28 + yield $this->env->getRuntime('Twig\Runtime\EscaperRuntime')->escape(($context["test"] ?? null), "html", null, true); + yield " ◀
+ + +"; + yield from []; + } + + /** + * @codeCoverageIgnore + */ + public function getTemplateName(): string + { + return "signin6.html.twig"; + } + + /** + * @codeCoverageIgnore + */ + public function isTraitable(): bool + { + return false; + } + + /** + * @codeCoverageIgnore + */ + public function getDebugInfo(): array + { + return array ( 97 => 48, 89 => 43, 71 => 28, 42 => 1,); + } + + public function getSourceContext(): Source + { + return new Source("", "signin6.html.twig", "/Users/kiem/Documents/WikiFantasy/WF-Website/vue/templates/signin6.html.twig"); + } +} diff --git a/cache/c8/c8a54737c049d7059e9d4f0d28a162e3.php b/cache/c8/c8a54737c049d7059e9d4f0d28a162e3.php new file mode 100644 index 0000000..fc19c20 --- /dev/null +++ b/cache/c8/c8a54737c049d7059e9d4f0d28a162e3.php @@ -0,0 +1,144 @@ + + */ + private array $macros = []; + + public function __construct(Environment $env) + { + parent::__construct($env); + + $this->source = $this->getSourceContext(); + + $this->parent = false; + + $this->blocks = [ + ]; + } + + protected function doDisplay(array $context, array $blocks = []): iterable + { + $macros = $this->macros; + // line 1 + yield " + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ▶ "; + // line 28 + yield $this->env->getRuntime('Twig\Runtime\EscaperRuntime')->escape(($context["test"] ?? null), "html", null, true); + yield " ◀
+ + +"; + yield from []; + } + + /** + * @codeCoverageIgnore + */ + public function getTemplateName(): string + { + return "signin7.html.twig"; + } + + /** + * @codeCoverageIgnore + */ + public function isTraitable(): bool + { + return false; + } + + /** + * @codeCoverageIgnore + */ + public function getDebugInfo(): array + { + return array ( 97 => 48, 89 => 43, 71 => 28, 42 => 1,); + } + + public function getSourceContext(): Source + { + return new Source("", "signin7.html.twig", "/Users/kiem/Documents/WikiFantasy/WF-Website/vue/templates/signin7.html.twig"); + } +} diff --git a/cache/cb/cb360548e4152dd6e9238cff38b4a902.php b/cache/cb/cb360548e4152dd6e9238cff38b4a902.php new file mode 100644 index 0000000..90de806 --- /dev/null +++ b/cache/cb/cb360548e4152dd6e9238cff38b4a902.php @@ -0,0 +1,144 @@ + + */ + private array $macros = []; + + public function __construct(Environment $env) + { + parent::__construct($env); + + $this->source = $this->getSourceContext(); + + $this->parent = false; + + $this->blocks = [ + ]; + } + + protected function doDisplay(array $context, array $blocks = []): iterable + { + $macros = $this->macros; + // line 1 + yield " + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ▶ "; + // line 28 + yield $this->env->getRuntime('Twig\Runtime\EscaperRuntime')->escape(($context["test"] ?? null), "html", null, true); + yield " ◀
+ + +"; + yield from []; + } + + /** + * @codeCoverageIgnore + */ + public function getTemplateName(): string + { + return "signin1.html.twig"; + } + + /** + * @codeCoverageIgnore + */ + public function isTraitable(): bool + { + return false; + } + + /** + * @codeCoverageIgnore + */ + public function getDebugInfo(): array + { + return array ( 97 => 48, 89 => 43, 71 => 28, 42 => 1,); + } + + public function getSourceContext(): Source + { + return new Source("", "signin1.html.twig", "/Users/kiem/Documents/WikiFantasy/WF-Website/vue/templates/signin1.html.twig"); + } +} diff --git a/cache/ee/ee32d9ec220b231a48d39e55d4bc37a0.php b/cache/ee/ee32d9ec220b231a48d39e55d4bc37a0.php new file mode 100644 index 0000000..befba71 --- /dev/null +++ b/cache/ee/ee32d9ec220b231a48d39e55d4bc37a0.php @@ -0,0 +1,127 @@ + + */ + private array $macros = []; + + public function __construct(Environment $env) + { + parent::__construct($env); + + $this->source = $this->getSourceContext(); + + $this->parent = false; + + $this->blocks = [ + ]; + } + + protected function doDisplay(array $context, array $blocks = []): iterable + { + $macros = $this->macros; + // line 1 + yield " + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ▶ S'inscrire ◀
+ + +"; + yield from []; + } + + /** + * @codeCoverageIgnore + */ + public function getTemplateName(): string + { + return "signin.html.twig"; + } + + /** + * @codeCoverageIgnore + */ + public function getDebugInfo(): array + { + return array ( 42 => 1,); + } + + public function getSourceContext(): Source + { + return new Source("", "signin.html.twig", "/Users/kiem/Documents/WikiFantasy/WF-Website/vue/templates/signin.html.twig"); + } +} diff --git a/cache/f2/f21f963662b38a0c5b3c81b499f82bfb.php b/cache/f2/f21f963662b38a0c5b3c81b499f82bfb.php new file mode 100644 index 0000000..a8b3a12 --- /dev/null +++ b/cache/f2/f21f963662b38a0c5b3c81b499f82bfb.php @@ -0,0 +1,141 @@ + + */ + private array $macros = []; + + public function __construct(Environment $env) + { + parent::__construct($env); + + $this->source = $this->getSourceContext(); + + $this->parent = false; + + $this->blocks = [ + ]; + } + + protected function doDisplay(array $context, array $blocks = []): iterable + { + $macros = $this->macros; + // line 1 + yield " + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ▶ lo ◀
+ + +"; + yield from []; + } + + /** + * @codeCoverageIgnore + */ + public function getTemplateName(): string + { + return "signin3.html.twig"; + } + + /** + * @codeCoverageIgnore + */ + public function isTraitable(): bool + { + return false; + } + + /** + * @codeCoverageIgnore + */ + public function getDebugInfo(): array + { + return array ( 94 => 48, 86 => 43, 42 => 1,); + } + + public function getSourceContext(): Source + { + return new Source("", "signin3.html.twig", "/Users/kiem/Documents/WikiFantasy/WF-Website/vue/templates/signin3.html.twig"); + } +} diff --git a/public/styles/styleLogin.css b/public/styles/styleLogin.css index 5f0d309..e0da447 100644 --- a/public/styles/styleLogin.css +++ b/public/styles/styleLogin.css @@ -98,7 +98,7 @@ body.light-mode .createAccount{ font-family: "Lemon", serif; } -body.light-mode .buttonSudmite{ +body.light-mode .buttonSubmit{ background: linear-gradient(180deg, rgba(187,211,249,1) 0%, rgba(199,246,196,1) 100%); font-family: "Lemon", serif; border: none; @@ -123,7 +123,7 @@ body.light-mode .connexion{ /* ====== DEFAULT ====== */ -.buttonSudmiteDiv{ +.buttonSubmitDiv{ text-align: center; } diff --git a/public/styles/styleSignin.css b/public/styles/styleSignin.css index e0a7780..95d2128 100644 --- a/public/styles/styleSignin.css +++ b/public/styles/styleSignin.css @@ -117,4 +117,26 @@ body.light-mode .btn{ body.light-mode .champ{ background-color: #fff1f1; border: 1px solid #000000; -} \ No newline at end of file +} + + +body.dark-mode .connectAccount{ + margin-top: 5%; + margin-bottom: 5%; + font-size: 13px; + text-align: center; + padding-top: 1%; + color: white; + border: 1px solid transparent; + font-family: "Lemon", serif; +} + +body.light-mode .connectAccount{ + margin-top: 5%; + margin-bottom: 5%; + font-size: 13px; + text-align: center; + padding-top: 1%; + color: black; + font-family: "Lemon", serif; +} diff --git a/src/Controleur/QuizControler.php b/src/Controleur/QuizControler.php index 34f33d8..a3e8f58 100644 --- a/src/Controleur/QuizControler.php +++ b/src/Controleur/QuizControler.php @@ -30,7 +30,7 @@ class QuizControler * @throws RuntimeError * @throws LoaderError */ - public function __construct(Connection $co) + public function __construct(Connection $co, ?string $action = null) { $this -> co = $co; $this -> gw = new QuestionGateway($this -> co); diff --git a/src/Controleur/VisitorControler.php b/src/Controleur/VisitorControler.php index 666748a..a2873d6 100644 --- a/src/Controleur/VisitorControler.php +++ b/src/Controleur/VisitorControler.php @@ -1,48 +1,179 @@ qMod = new QuoteModel(new QuoteGateway($co)); - $this->accueilGateway = new AccueilGateway($co); - } + private UserModel $mdl; - public function accueil() { - global $vues; + private array $errors; - // Récupérer la citation du jour via AccueilGateway - $citationDuJour = $this->accueilGateway->getQuoteOfTheDay('fr'); - $suggestions = $this->accueilGateway->getSuggestions(0, 'fr'); + /** + * @throws SyntaxError + * @throws RuntimeError + * @throws LoaderError + */ + public function __construct(Connection $co, string $action) { + $this->co = $co; + $this->gw = new UserGateway($this->co); + $this->mdl = new UserModel($this->gw); + $this -> getAction($action); + } - // Passer les données à la vue + /** + * @throws SyntaxError + * @throws RuntimeError + * @throws LoaderError + */ + public function getAction(string $action): void + { + switch ($action) { + case "login": + $this -> visitorLogIn(); + break; + case "signin": + $this -> visitorSignIn(); + break; + case "validsignin": + $this -> toSignIn(); + break; + case "validlogin": + $this -> toLogIn(); + break; + default: + break; + } + } + + public function accueil(){ + global $vues; require_once $vues['accueil']; } - public function quote(array $arg) { + public function quote(array $arg){ global $vues; + $id=$arg['idQuote'] ?? 1; - $id=$arg['idQuote']; - $q = $this->qMod->searchId($id); + //echo "{$id}"; require_once $vues['quote']; } - public function login() { - global $vues; - require_once $vues['login']; + /** + * @throws SyntaxError + * @throws RuntimeError + * @throws LoaderError + */ + public function visitorLogIn(): void + { + global $twig; + echo $twig->render("login.html.twig"); + + $this -> toLogIn(); } - public function signin() { - global $vues; - require_once $vues['signin']; + public function toLogIn() : void + { + if ($_POST) + { + $pseudo = $_POST['pseudo'] ?? null; + $mdp = $_POST['mdp'] ?? null; + + $user = $this -> mdl -> getUsername($pseudo); + + if ($user) + { + if (password_verify($mdp, $user->getPassword())) + { + $_SESSION['user'] = $pseudo; + $_SESSION['role'] = 'user'; + header("Location: /"); + exit(); + }else + { + global $twig; + $this -> errors = ["Identifiant ou mot de passe incorrect"]; + echo $twig -> render("login.html.twig", ['error' => $this -> errors[0]]); + exit(); + } + } + else + { + global $twig; + $this -> errors = ["Identifiant ou mot de passe incorrect"]; + echo $twig -> render("login.html.twig", ['error' => $this -> errors[0]]); + exit(); + } + } + + } + + /** + * @throws SyntaxError + * @throws RuntimeError + * @throws LoaderError + */ + public function visitorSignIn(): void + { + global $twig; + echo $twig->render("signin.html.twig"); + } + + + /** + * @throws RuntimeError + * @throws SyntaxError + * @throws LoaderError + */ + public function toSignIn() : void + { + global $twig; + + $this -> errors = [null, null, null]; + + if ($_POST) { + $pseudo = $_POST['pseudo'] ?? null; + $email = $_POST['email'] ?? null; + $mdp = $_POST['mdp'] ?? null; + $cmdp = $_POST['cmdp'] ?? null; + + if ($mdp != $cmdp) { + $this->errors[2] = "Mots de passe incorrects"; + //$this->visitorSignIn(); + echo $twig->render("signin.html.twig", ['error' => $this->errors]); + exit(); + } + $option = ['cost' => 12]; + $hmdp = password_hash($mdp, PASSWORD_BCRYPT, $option); + + $isUserAlreadyUsed = $this -> mdl -> getUsername($pseudo); + $isEmailAlreadyUsed = $this -> mdl -> getEmail($email); + + if ($isUserAlreadyUsed and !$isEmailAlreadyUsed) { + $this->errors[0] = "Pseudo déjà utilisé"; + echo $twig->render("signin.html.twig", ['error' => $this->errors]); + exit(); + } + else if ($isEmailAlreadyUsed and !$isUserAlreadyUsed) { + $this->errors[1] = "Email déjà utilisé"; + echo $twig->render("signin.html.twig", ['error' => $this->errors]); + exit(); + } + else echo $this->mdl->insertUser($pseudo, $email, $hmdp); + + $_SESSION["pseudo"] = $pseudo; + + header("Location: /"); + } } } + + diff --git a/src/Entity/userEntity.php b/src/Entity/userEntity.php index f0546be..08abe35 100644 --- a/src/Entity/userEntity.php +++ b/src/Entity/userEntity.php @@ -1,124 +1,107 @@ id = $id; - $this->username = $username; - $this->passwd = $passwd; - $this->hidenPasswd = hidenPasswd($passwd); - $this->img = $img; - $this->email = $email; - } - - /** - * @return string - */ public function getId(): int { return $this->id; } - /** - * @param string $id - */ public function setId(int $id): void { $this->id = $id; } - /** - * @return string - */ - public function getUsername(): string + public function getPseudo(): string { - return $this->username; + return $this->pseudo; } - /** - * @param string $username - */ - public function setUsername(string $username): void + public function setPseudo(string $pseudo): void { - $this->username = $username; + $this->pseudo = $pseudo; } - /** - * @return string - */ - public function getImg(): int + public function getPassword(): string { - return $this->img; + return $this->password; } - /** - * @param string $img - */ - public function setImg(int $img): void + public function setPassword(string $password): void { - $this->img = $img; + $this->password = $password; } - /** - * @return string - */ public function getEmail(): string { return $this->email; } - /** - * @param string $email - */ public function setEmail(string $email): void { $this->email = $email; } - /** - * @return string - */ - public function getPasswd(): string + public function getDate(): string { - return $this->passwd; + return $this->date; } - /** - * @return string - */ - public function getHidenPasswd(): string + public function setDate(string $date): void + { + $this->date = $date; + } + + public function isAdmin(): bool + { + return $this->isAdmin; + } + + public function setIsAdmin(bool $isAdmin): void { - return $this->hidenPasswd; + $this->isAdmin = $isAdmin; + } + + public function getImgPrfl(): int + { + return $this->imgPrfl; + } + + public function setImgPrfl(int $imgPrfl): void + { + $this->imgPrfl = $imgPrfl; } /** - * @param string $passwd + * @param int $id + * @param string $pseudo + * @param string $password + * @param string $email + * @param int $imgPrfl + * @param bool $isAdmin + * @param string $date */ - public function setPasswd(string $passwd): void + public function __construct(int $id, string $pseudo, string $password, string $email, int $imgPrfl, bool $isAdmin, string $date) { - $this->passwd = $passwd; - $this->hidenPassWd = hidenPassWd($passwd); + $this->id = $id; + $this->pseudo = $pseudo; + $this->password = $password; + $this->email = $email; + $this->imgPrfl = $imgPrfl; + $this->isAdmin = $isAdmin; + $this->date = $date; } - } // ============================================ En attente du Model ============================================ /*$dsn = "pgsql:host=londres;dbname=dblebeaulato"; diff --git a/src/Gateway/userGateway.php b/src/Gateway/userGateway.php index 1472485..995a6c7 100644 --- a/src/Gateway/userGateway.php +++ b/src/Gateway/userGateway.php @@ -1,177 +1,124 @@ con=$con; } - public function insert(string $username,string $email,string $passwd):string{ + public function getNumberOfUsers() : array + { + $query = "SELECT Count(*) FROM Users"; + + $this -> con -> executeQuery($query); + + return $this -> con -> getResults(); + } - //crypte passeword - $passwordEncrypted = crypt($passwd); - // insertion user - $query='INSERT INTO Users VALUES (:username,:email,:passwd,CURRENT_DATE,false);'; - $this->con->executeQuery($query,array(':username' => array($u->username,PDO::PARAM_STR),':email' => array($u->email,PDO::PARAM_STR),':passwd' => array($u->passwordEncrypted,PDO::PARAM_STR))); - return $id; + public function insertUser(int $id, string $pseudo, string $email, string $password, bool $isAdmin, int $imgPrfl) : bool { + $query = " + INSERT INTO Users + VALUES (:id, :pseudo, :email, :password, CURRENT_DATE, :isAdmin, :imgPrfl) + "; + return $this -> con -> executeQuery($query, [ + ":id" => [$id, PDO::PARAM_INT], + ":pseudo" => [$pseudo, PDO::PARAM_STR], + ":email" => [$email, PDO::PARAM_STR], + ":password" => [$password, PDO::PARAM_STR], + ":isAdmin" => [$isAdmin, PDO::PARAM_INT], + ":imgPrfl" => [$imgPrfl, PDO::PARAM_STR] + ]); } - + public function delete(string $id) : bool{ - // suppression user + // supretion user $query='DELETE FROM Users WHERE id_user = :id;'; - return $this->con->executeQuery($query,array(':id' => array($id,PDO::PARAM_INT))); + return $this->con->executeQuery($query,array(':id' => array($id,PDO::PARAM_STR))); } - public function getFavorite(string $id):array{ //obtention favoris d'un user - $query='SELECT * FROM Quote WHERE id_quote IN (SELECT id_quote IN Favorite f JOIN User u ON u.id_user = f.user WHERE id_user = :id);'; - $this->con->executeQuery($query,array(':id' => array($id,PDO::PARAM_INT))); + $query='SELECT * FROM Quote WHERE id_quote IN (SELECT id_quote FROM Favorite f JOIN users u ON u.id_user = f.user_f WHERE u.id_user = :id);'; + $this->con->executeQuery($query,array(':id' => array($id,PDO::PARAM_STR))); $result=$this->con->getResults(); return $result; } + //obtenir les information d'un user public function findDataUser(int $id):array{ $query = 'SELECT * FROM Users WHERE id_user=:idUser'; - $con->executeQuery($query, array(':idUser'=>array($id, PDO::PARAM_INT))); - $result = $con->getResults(); + $this->con->executeQuery($query, array(':idUser'=>array($id, PDO::PARAM_STR))); + $result = $this->con->getResults(); return $result; } - public function createQuote(int $id, string $content, string $langue, string $caracter, string $source):array{ - - //recupère id du personnage - $queryCaracter = "SELECT id_caracter FROM Caracter WHERE caracter =:caracter"; - $con->executeQuery($queryCaracter, array( - ':caracter'=>array($caracter, PDO::PARAM_STR) - )); - $resultCaracter = $con->getResult(); - - if($resultCaracter == NULL){ - //ajout creationCaracter - } - - //recupère id de la source - $querySource = "SELECT id_source FROM Source WHERE title =:source"; - $con->executeQuery($querySource, array( - ':source'=>array($source, PDO::PARAM_STR) - )); - $resultSource = $con->getResult(); - - if($resultSource == NULL){ - //ajout creationSource - } - $queryInsert = "INSERT INTO Quote (content, langue, id_caracter, id_source, id_user_verif) VALUES (:content, :langue, :caracter, :source, :idverif)"; - $con->executeQuery($queryInsert, array( - ':content'=>array($content, PDO::PARAM_STR), - ':langue'=>array($langue, PDO::PARAM_STR), - ':caracter'=>array($resultCaracter, PDO::PARAM_STR), - ':source'=>array($resultSource, PDO::PARAM_STR), - ':idverif'=>array($id, PDO::PARAM_INT) - )); + // obtenir les informations d'un user selon son pseudo + public function findUsername(string $username):array{ + $query = 'SELECT * FROM Users WHERE username= :username'; + $this->con->executeQuery($query, array(':username'=>array($username, PDO::PARAM_STR))); + return $this->con->getResults(); } - - - public function createCaracter(string $caracter, string $img):array{ - //creation du personnage - $queryCaracter = "INSERT INTO Caracter(caracter, img_path) VALUES (:caracter, :img)"; - $con->executeQuery($queryCaracter, array( - ':caracter'=>array($caracter, PDO::PARAM_STR), - 'img'=>array($img, PDO::PARAM_STR) - )); - - //récuperation de id caracter - $queryCaracter = "SELECT id_caracter FROM Caracter WHERE caracter =:caracter"; - $con->executeQuery($queryCaracter, array( - ':caracter'=>array($caracter, PDO::PARAM_STR) - )); - $resultCaracter = $con->getResult(); - } - - - - public function createSource(string $title, string $dateS):array{ - //creation du personnage - $querySource = "INSERT INTO Source(title, dateS) VALUES (:title, :dateS)"; - $con->executeQuery($querySource, array( - ':title'=>array($title, PDO::PARAM_STR), - 'dateS'=>array($dateS, PDO::PARAM_STR) - )); - - //recupère id de la source - $querySource = "SELECT id_source FROM Source WHERE title =:source"; - $con->executeQuery($querySource, array( - ':source'=>array($source, PDO::PARAM_STR) - )); - $querySource = $con->getResult(); + public function findEmail(string $email):array{ + $query = 'SELECT * FROM Users WHERE email = :email'; + $this->con->executeQuery($query, array(':email'=>array($email, PDO::PARAM_STR))); + return $this->con->getResults(); } // ===================== UPDATE FUNCTION ===================== - public function updateUsername(int $id, string $newUsername):array{ + public function updateUsername(int $id, string $newUsername):bool{ //Update le nom du user passé en paramètre $queryUpdate = 'UPDATE Users SET username=:newUsername WHERE id_user=:idUser'; - $con->executeQuery($queryUpdate, array(':idUser'=>array($id, PDO::PARAM_INT), ':newUsername'=> array($newUsername, PDO::PARAM_STR))); + $this->con->executeQuery($queryUpdate, array(':idUser'=>array($id, PDO::PARAM_STR), ':newUsername'=> array($newUsername, PDO::PARAM_STR))); //Renvoie le nouveau nom du user $queryReponse = 'SELECT username FROM Users WHERE id_user=:idUser'; - $con->executeQuery($queryReponse, array($id=>array($id, PDO::PARAM_INT))); - return $result; + + return $this->con->executeQuery($queryReponse, array($id=>array($newUsername, PDO::PARAM_STR))); } - public function updateEmail(int $id, string $newEmail):array{ + public function updateEmail(int $id, string $newEmail):bool{ //Update le email du user passé en paramètre $queryUpdate = 'UPDATE Users SET email=:newEmail WHERE id_user=:idUser'; - $con->executeQuery($queryUpdate, array(':idUser'=>array($id, PDO::PARAM_INT), ':newEmail'=> array($newEmail, PDO::PARAM_STR))); + $this->con->executeQuery($queryUpdate, array(':idUser'=>array($id, PDO::PARAM_STR), ':newEmail'=> array($newEmail, PDO::PARAM_STR))); //Renvoie le nouveau email du user - $queryReponse = 'SELECT email FROM Users WHERE id_user=:idUser'; - $con->executeQuery($queryReponse, array(':idUser'=>array($id, PDO::PARAM_INT))); - $result = $con->getResults(); - return $result; + $queryReponse = 'SELECT email FROM Users WHERE id_user=:idUser'; + return $this->con->executeQuery($queryReponse, array(':idUser'=>array($id, PDO::PARAM_STR))); } public function updateImg(int $id, int $newImg):array{ //Update l'image du user passé en paramètre - $query = 'UPDATE Users SET img=:newImg WHERE id_user=:idUser'; - $con->executeQuery($query, array(':idUser'=>array($id, PDO::PARAM_INT), ':newImg'=> array($newImg, PDO::PARAM_STR))); + $query = 'UPDATE Users SET img_prfl=:newImg WHERE id_user=:idUser'; + $this->con->executeQuery($query, array(':idUser'=>array($id, PDO::PARAM_STR), ':newImg'=> array($newImg, PDO::PARAM_STR))); //Renvoie la nouvelle image du user - $queryReponse = 'SELECT img FROM Users WHERE id_user=:idUser'; - $con->executeQuery($queryReponse, array(':idUser'=>array($id, PDO::PARAM_INT))); - $result = $con->getResults(); + $queryReponse = 'SELECT img_prfl FROM Users WHERE id_user=:idUser'; + $this->con->executeQuery($queryReponse, array(':idUser'=>array($id, PDO::PARAM_STR))); + $result = $this->con->getResults(); return $result; } public function updatePasswd(int $id, string $newPassWd):array{ - - //crypte le mot de passe - $passwordEncrypted = crypt($newPassWd); - //Update le passwd du user passé en paramètre - $query = 'UPDATE Users SET password=:newPassWd WHERE id_user=:idUser'; - $con->executeQuery($query, array(':idUser'=>array($id, PDO::PARAM_INT), ':newPassWd'=> array($passwordEncrypted, PDO::PARAM_STR))); - } + $query = 'UPDATE Users SET pssword=:newPassWd WHERE id_user=:idUser'; + $this->con->executeQuery($query, array(':idUser'=>array($id, PDO::PARAM_STR), ':newPassWd'=> array($newPassWd, PDO::PARAM_STR))); - public function getIdUser(string $username):array{ - $query = 'SELECT id_user FROM Users WHERE username=:username'; - $con->executeQuery($query, array(':username'=>array($username, PDO::PARAM_STR))); - $result = $con->getResults(); + //Renvoie le nouveau passwd du user + $queryReponse = 'SELECT pssword FROM Users WHERE id_user=:idUser'; + $this->con->executeQuery($queryReponse, array(':idUser'=>array($id, PDO::PARAM_STR))); + $result = $this->con->getResults(); return $result; } } - - - -$uG = new UserGateway(new Connection("pgsql:host=londres;dbname=dblebeaulato","lebeaulato","")); - ?> diff --git a/src/Model/userModel.php b/src/Model/userModel.php index adc7012..75e3f6c 100644 --- a/src/Model/userModel.php +++ b/src/Model/userModel.php @@ -1,7 +1,8 @@ gateway = $gate; } - public function insertUser(string $username,string $email,string $passwd) : User{ - global $rep,$image; - $id = $this->gateway->insert($username,$email,$passwd); - $u = new User($id,$usename,$passwd,$rep.$image['default'],$email); + public function insertUser(string $username,string $email,string $passwd) : bool{ + /*global $rep,$image;*/ + return $this->gateway->insertUser($this->getNumberOfUsers() + 1, $username, $email, $passwd, false, 0); } - public function deletUser(string $id) : bool{ + public function getNumberOfUsers() : int + { + + return $this->gateway->getNumberOfUsers()[0]['count'] ?? 0; + } + + public function deleteUser(string $id) : bool{ return $this->gateway->delete($id); } // public function getFavoriteUser(string $id) : array{ - // $res = array(); + // $res[0] = array(); // $data = $this->gateway->getFavorite($id); // foreach ($data as $favoris) { - // $res[] = new Quote(); + // $res[0][] = new Quote(); // } // } - public function getDataUser(int $id){ + public function getDataUser(int $id) : ?UserEntity { $res = $this->gateway->findDataUser($id); - foreach($res as $sources){ - $src[] = new User( - $sources['id_user'], - $sources['username'], - $sources['pssword'], - $sources['img'], - $sources['email'] + if ($res) + return new UserEntity( + $res[0]['id_user'], + $res[0]['username'], + $res[0]['pssword'], + $res[0]['email'], + $res[0]['img_prfl'], + $res[0]['is_admin'], + $res[0]['creation'] ); - } - return $src; + return null; } + public function getUsername(string $username) : ?UserEntity + { + $res = $this->gateway->findUsername($username); + if ($res) + return new UserEntity( + $res[0]['id_user'], + $res[0]['username'], + $res[0]['pssword'], + $res[0]['email'], + $res[0]['img_prfl'], + $res[0]['is_admin'], + $res[0]['creation'] + ); + return null; + } + + public function getEmail(string $email) : ?UserEntity + { + $res = $this->gateway->findEmail($email); + if ($res) + return new UserEntity( + $res[0]['id_user'], + $res[0]['username'], + $res[0]['pssword'], + $res[0]['email'], + $res[0]['img_prfl'], + $res[0]['is_admin'], + $res[0]['creation'] + ); + return null; + } public function setUsername(int $id, string $newUsername){ $res = $this->gateway->updateUsername($id,$newUsername); diff --git a/vue/templates/login.html.twig b/vue/templates/login.html.twig new file mode 100644 index 0000000..fb5869e --- /dev/null +++ b/vue/templates/login.html.twig @@ -0,0 +1,52 @@ + + + + + + +
+
+
+
+
+ 
+ 
+ 
+
+
+
+
+
+ 
+
+
+
+ 
+
+
+ ▶ Connexion ◀
+ + + + \ No newline at end of file diff --git a/vue/templates/profil.html b/vue/templates/profil.html.twig similarity index 100% rename from vue/templates/profil.html rename to vue/templates/profil.html.twig diff --git a/vue/templates/quote.html b/vue/templates/quote.html.twig similarity index 100% rename from vue/templates/quote.html rename to vue/templates/quote.html.twig diff --git a/vue/templates/signin.html.twig b/vue/templates/signin.html.twig new file mode 100644 index 0000000..715eda3 --- /dev/null +++ b/vue/templates/signin.html.twig @@ -0,0 +1,74 @@ + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ▶ S'inscrire ◀
+ + + \ No newline at end of file diff --git a/vue/templates/signin2.html.twig b/vue/templates/signin2.html.twig new file mode 100644 index 0000000..87c65a3 --- /dev/null +++ b/vue/templates/signin2.html.twig @@ -0,0 +1,62 @@ + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+