diff --git a/config/.htaccess b/config/.htaccess new file mode 100644 index 0000000..7ded04e --- /dev/null +++ b/config/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine on +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule . index.php [L] \ No newline at end of file diff --git a/config/config.php b/config/config.php index cd389e1..70ce410 100644 --- a/config/config.php +++ b/config/config.php @@ -9,7 +9,7 @@ $rep = __DIR__ . '/../'; //BD -$base = 'dbkemondejar'; +$base = ''; $login = ''; $mdp = ''; @@ -18,6 +18,10 @@ $vues['erreur'] = 'vue/erreur.php'; $vues['accueil'] = 'vue/accueil.php'; $vues['quote'] = 'vue/quote.php'; $vues['login'] = 'vue/login.html'; +$vues['signin'] = 'vue/signin.html'; +$vues['quiz'] = 'vue/quiz.html'; + + //Style css $style['accueil'] = 'public/styles/styleAccueil.css'; diff --git a/index.php b/index.php index 83401b2..21d30c8 100644 --- a/index.php +++ b/index.php @@ -11,6 +11,7 @@ require_once __DIR__ . '/config/config.php'; require __DIR__ . '/vendor/autoload.php'; + $co = new \Gateway\Connection('pgsql:host=localhost;dbname=dbkekentin;', 'kekentin', 'Chocolat-77'); //twig @@ -20,10 +21,10 @@ $twig = new \Twig\Environment($loader, [ ]); -$cont = new Controleur\FrontControler($co); +$cont = new Controleur\FrontControler(/*$co*/); session_unset(); session_destroy(); $_SESSION = array(); -?> \ No newline at end of file +?> diff --git a/src/Controleur/FrontControler.php b/src/Controleur/FrontControler.php index e671d6e..b14a6b4 100644 --- a/src/Controleur/FrontControler.php +++ b/src/Controleur/FrontControler.php @@ -1,14 +1,20 @@ listAction = ['visitor' => array('accueil','search','quote','login','signin'), 'user' => array('quiz','commentary','favorite','logout'), @@ -32,14 +38,17 @@ Class FrontControler{ $router->map('GET|POST', '/quote/[i:idQuote]?', 'VisitorControler'); $router->map('GET|POST', '/login', 'VisitorControler'); $router->map('GET|POST', '/signin', 'VisitorControler'); + $router->map('GET|POST', '/quiz', 'UserControler'); + $router->map('GET|POST', '/quiz/[i:id]?', 'QuizControler'); + $match = $router->match(); $action = NULL; if(!$match){ - $dVueEreur[] = "Requette introuvable"; + $dVueEreur[] = "Requête introuvable"; $this->vueErreur($dVueEreur); } else{ diff --git a/src/Controleur/UserControler.php b/src/Controleur/UserControler.php index e69de29..2cc513a 100644 --- a/src/Controleur/UserControler.php +++ b/src/Controleur/UserControler.php @@ -0,0 +1,10 @@ +setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); } diff --git a/src/Gateway/quoteGateway.php b/src/Gateway/quoteGateway.php index 6c34a59..527bcdf 100644 --- a/src/Gateway/quoteGateway.php +++ b/src/Gateway/quoteGateway.php @@ -36,11 +36,11 @@ Class QuoteGateway{ return $result; } - public function getComment(int $id):array{ - - //obtention des commentaire d'une citation - $query="SELECT c.id_comment u.username, u.imgPath, c.comment, c.date FROM Commentary c JOIN Quote q ON c.quote = q.id_quote JOIN User u ON u.id_user = c.user JOIN Image i ON i.id_img = u.img WHERE id_quote = :id;"; - $this->con->executeQuery($query,array(':id' => array($id,PDO::PARAM_INT))); + public function searchId(string $id):array{ + + //recherche par id + $query="SELECT q.id_quote, q.content, c.caracter, c.img_path, s.title, s.date, q.like, q.language FROM Quote q JOIN Caracter c ON c.id_caracter = q.id_caracter JOIN Source s ON s.id_source = q.id_source WHERE q.id_quote = '%:id%' AND q.isValid = true;"; + $this->con->executeQuery($query,array(':id' => array($id,PDO::PARAM_STR))); $result=$this->con->getResults(); return $result; } @@ -64,7 +64,7 @@ Class QuoteGateway{ $this->con->executeQuery($query,array(':id' => array($id,PDO::PARAM_INT))); } - public function validQuote(int $id){ + public function invalidQuote(int $id){ //Invalide la quote par l'admin (suppression) $query ='DELETE FROM Quote WHERE id_Quote=:id'; $this->con->executeQuery($query,array(':id' => array($id,PDO::PARAM_INT))); diff --git a/src/Model/quoteModel.php b/src/Model/quoteModel.php index e16622c..95867a1 100644 --- a/src/Model/quoteModel.php +++ b/src/Model/quoteModel.php @@ -11,9 +11,9 @@ $this->gateway = $gate; } - public function searchQuote(string $quote,int $numpage,string $language) : Quote{ - $res = $this->gateway->searchQuote($quote,$numpage,$language); - return new Quote($res[0]['']); + public function searchId(int $id): Quote{ + $res = $this->gate->searchId($id)[0]; + return new Quote($res["q.id_quote"],$res["q.content"],$res["c.caracter"],$res["c.img_path"],$res["s.title"],$res["s.date"],$res["q.like"],$res["q.language"]); } } diff --git a/vue/login.html b/vue/login.html index 47002d3..74328f6 100644 --- a/vue/login.html +++ b/vue/login.html @@ -36,7 +36,7 @@

Vous n'avez pas de compte?

- S'incrire + S'incrire
diff --git a/vue/quote.php b/vue/quote.php index f2269f8..809a8c1 100644 --- a/vue/quote.php +++ b/vue/quote.php @@ -1,14 +1,6 @@ false, - ]); - - //global $twig; + global $twig; echo $twig->render('head.html.twig', array( 'title' => "Quote", diff --git a/vue/templates/bandeau.html.twig b/vue/templates/bandeau.html.twig index aa84323..4be6013 100644 --- a/vue/templates/bandeau.html.twig +++ b/vue/templates/bandeau.html.twig @@ -2,12 +2,13 @@
- user + user
\ No newline at end of file