diff --git a/config/config.php b/config/config.php index 671ef53..f437b34 100644 --- a/config/config.php +++ b/config/config.php @@ -12,8 +12,8 @@ $base = ''; $login = ''; $mdp = ''; -//$racine='/~kemondejar/WF-Website'; // /~kekentin/WF/WF-Website /~lebeaulato/WF-Website /~kemondejar/WF-Website -$racine='/WF-Website'; +$racine='/~kemondejar/WF-Website'; // /~kekentin/WF/WF-Website /~lebeaulato/WF-Website /~kemondejar/WF-Website +//$racine='/WF-Website'; //$repImg='/home/UCA/kemondejar/public_html/WF-Website/public/images/'; $repImg='/'; diff --git a/public/styles/style.css b/public/styles/style.css index 473067e..63472e3 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -13,6 +13,8 @@ /*--main-light-gradient : linear-gradient(90deg, #AAB9CF, #BDD4E7);*/ --main-light-gradient : #84e4a9; --main-light-other-color : #46BE73; + /* --main-light-gradient : #94d3ac; + --main-light-other-color : #75b48d; */ } @@ -23,7 +25,7 @@ /* Général */ body{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; margin : 0%; } diff --git a/public/styles/styleEndQuiz.css b/public/styles/styleEndQuiz.css index b1de2e1..c504692 100644 --- a/public/styles/styleEndQuiz.css +++ b/public/styles/styleEndQuiz.css @@ -27,7 +27,7 @@ body.light-mode .resultat { /* ====== ECRAN DEFAUT ====== */ h1 { - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; text-align: center; } diff --git a/public/styles/styleLogin.css b/public/styles/styleLogin.css index b950a71..cb91fd4 100644 --- a/public/styles/styleLogin.css +++ b/public/styles/styleLogin.css @@ -61,7 +61,7 @@ body.light-mode a{ } h1{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; text-align: center; font-size: 32px; margin-top: 10%; @@ -71,7 +71,7 @@ p{ margin-top: 6%; margin-bottom: 2%; font-size: 20px; - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; } .login{ @@ -88,11 +88,11 @@ p{ font-size: 1em; text-align: center; padding-top: 1%; - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; } .buttonSudmite{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; border: none; padding: 2%; border-radius: 25px; diff --git a/public/styles/styleProfil.css b/public/styles/styleProfil.css index b459c22..bda2dee 100644 --- a/public/styles/styleProfil.css +++ b/public/styles/styleProfil.css @@ -33,7 +33,7 @@ body.dark-mode .imgModify{ body.light-mode .inputPasswd{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; margin-top: 2%; color: black; } @@ -75,7 +75,7 @@ body.light-mode .login{ body.light-mode .inputPasswd{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; margin-top: 2%; color: black; } @@ -88,7 +88,7 @@ body.light-mode .saveButtonPasswd { /* ====== ECRAN DEFAUT ====== */ h1{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; text-align: center; font-size: 35px; } @@ -97,7 +97,7 @@ p{ margin-top: 4%; margin-bottom: 2%; font-size: 20px; - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; } ::backdrop { @@ -108,12 +108,12 @@ p{ height: 60%; font-size: 15px; text-align: center; - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; } .buttonSudmite{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; border: none; padding: 2%; border-radius: 25px; @@ -127,7 +127,7 @@ p{ font-size: 15px; text-align: center; padding-top: 1%; - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; } .login{ @@ -153,7 +153,7 @@ p{ border-radius: 25px; border: none; font-size: 15px; - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; } diff --git a/public/styles/styleQuiz.css b/public/styles/styleQuiz.css index 8b837e3..6a50a68 100644 --- a/public/styles/styleQuiz.css +++ b/public/styles/styleQuiz.css @@ -22,7 +22,7 @@ body.dark-mode .submit-button { body.dark-mode .buttonSudmite { background: linear-gradient(90deg, #6100ff 0%, #1b0048 100%); - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; border: none; color: white; padding: 10px 20px; @@ -50,7 +50,7 @@ body.light-mode .answer { /* ====== ECRAN DEFAUT ====== */ h1, h2, p { - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; text-align: center; } diff --git a/public/styles/styleQuote.css b/public/styles/styleQuote.css index cdb801c..d1ad16e 100644 --- a/public/styles/styleQuote.css +++ b/public/styles/styleQuote.css @@ -160,7 +160,7 @@ body.light-mode .like-icon-none img { background-color: #fff; color: black; display: flex; - font-family: "Lemon", sans-serif; + font-family: "roboto condensed", sans-serif; flex-direction: column; margin-bottom: 1vh; border-radius: 20px; diff --git a/public/styles/styleSignin.css b/public/styles/styleSignin.css index 1fc6221..4d0ef16 100644 --- a/public/styles/styleSignin.css +++ b/public/styles/styleSignin.css @@ -50,7 +50,7 @@ body.light-mode a{ /* ====== ECRAN DEFAULT ====== */ h1{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; text-align: center; font-size: 32px; margin-top: 10%; @@ -68,7 +68,7 @@ p{ margin-top: 4%; margin-bottom: 2%; font-size: 20px; - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; } .confirmer{ @@ -87,7 +87,7 @@ p{ } .btn{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; border: none; padding: 2%; border-radius: 25px; @@ -101,7 +101,7 @@ p{ font-size: 1em; text-align: center; padding-top: 1%; - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; } .createAccount{ diff --git a/public/styles/styleSubmitQuote.css b/public/styles/styleSubmitQuote.css index b99085b..1686902 100644 --- a/public/styles/styleSubmitQuote.css +++ b/public/styles/styleSubmitQuote.css @@ -25,7 +25,7 @@ body.light-mode #box{ /* ====== ECRAN DEFAULT ====== */ h1, h2{ - font-family: "Lemon", serif; + font-family: "roboto condensed", sans-serif; text-align: center; } diff --git a/src/Entity/Quote.php b/src/Entity/Quote.php index f5eb1ab..fff3141 100644 --- a/src/Entity/Quote.php +++ b/src/Entity/Quote.php @@ -1,6 +1,8 @@ id = $id; $this->content = $content; @@ -32,6 +35,7 @@ $this->dateSrc = $dateSrc; $this->like = $like; $this->langue = $langue; + $this->type = $type; } /** @@ -162,7 +166,13 @@ $this->langue = $langue; } + public function getType(): TypeSourceEnum{ + return $this->type; + } + public function setType(TypeSourceEnum $type){ + $this->type = $type; + } } ?> diff --git a/src/Model/QuoteModel.php b/src/Model/QuoteModel.php index e2f5946..0c70fb5 100644 --- a/src/Model/QuoteModel.php +++ b/src/Model/QuoteModel.php @@ -3,6 +3,7 @@ use Entity\Quote; use Gateway\QuoteGateway; use Gateway\Gateway; + use Enum\TypeSourceEnum; class QuoteModel extends Model { @@ -12,7 +13,7 @@ if( count($res) == 0) return new Quote(-1,"NULL","NULL","NULL","NULL","NULL",0,"Default"); else - return new Quote($res[0]["id_quote"],$res[0]["content"],$res[0]["caracter"],$res[0]["imgpath"],$res[0]["title"],$res[0]["dates"],$res[0]["likes"],$res[0]["langue"]); + return new Quote($res[0]["id_quote"],$res[0]["content"],$res[0]["caracter"],$res[0]["imgpath"],$res[0]["title"],$res[0]["dates"],$res[0]["likes"],$res[0]["langue"],TypeSourceEnum::Movie); } public function getSuggest(int $numpage, string $language):array{ @@ -21,7 +22,7 @@ foreach($res as $q ){ $q["content"] = (strlen($q["content"]) > 153) ? substr($q["content"],0,150).'...' : $q["content"]; - $tabQ[]= new Quote($q["id_quote"],$q["content"],$q["caracter"],$q["imgpath"],$q["title"],$q["dates"],$q["likes"],$q["langue"]) ; + $tabQ[]= new Quote($q["id_quote"],$q["content"],$q["caracter"],$q["imgpath"],$q["title"],$q["dates"],$q["likes"],$q["langue"],TypeSourceEnum::Movie) ; } return $tabQ; } @@ -29,10 +30,10 @@ public function getQuoteOfTheDay(string $language):Quote{ $res = $this->gateway->getQuoteOfTheDay($language); if( count($res) == 0) - return new Quote(-1,"NULL","NULL","NULL","NULL","NULL",0,"Default"); + return new Quote(-1,"NULL","NULL","NULL","NULL","NULL",0,"Default",TypeSourceEnum::Movie); else $res["content"] = (strlen($res["content"]) > 153) ? substr($res["content"],0,150).'...' : $res["content"]; - return new Quote($res["id_quote"],$res["content"],$res["caracter"],$res["imgpath"],$res["title"],$res["dates"],$res["likes"],$res["langue"]) ; + return new Quote($res["id_quote"],$res["content"],$res["caracter"],$res["imgpath"],$res["title"],$res["dates"],$res["likes"],$res["langue"],TypeSourceEnum::Movie) ; } public function getFavorites(string $userId): array { @@ -41,7 +42,7 @@ foreach($res as $q ){ $q["content"] = (strlen($q["content"]) > 153) ? substr($q["content"],0,150).'...' : $q["content"]; - $tabQ[]= new Quote($q["id_quote"],$q["content"],$q["caracter"],$q["imgpath"],$q["title"],$q["dates"],$q["likes"],$q["langue"]) ; + $tabQ[]= new Quote($q["id_quote"],$q["content"],$q["caracter"],$q["imgpath"],$q["title"],$q["dates"],$q["likes"],$q["langue"],TypeSourceEnum::Movie) ; } return $tabQ; } diff --git a/src/Model/SearchModel.php b/src/Model/SearchModel.php index 48bd1f6..0762bf0 100644 --- a/src/Model/SearchModel.php +++ b/src/Model/SearchModel.php @@ -3,6 +3,7 @@ use Entity\Quote; use Gateway\QuoteGateway; use Gateway\Gateway; + use Enum\TypeSourceEnum; class SearchModel extends Model { @@ -14,7 +15,7 @@ foreach($res as $q ){ $q["content"] = (strlen($q["content"]) > 153) ? substr($q["content"],0,150).'...' : $q["content"]; - $tabQ[]= new Quote($q["id_quote"],$q["content"],$q["caracter"],$q["imgpath"],$q["title"],$q["dates"],$q["likes"],$q["langue"]) ; + $tabQ[]= new Quote($q["id_quote"],$q["content"],$q["caracter"],$q["imgpath"],$q["title"],$q["dates"],$q["likes"],$q["langue"],TypeSourceEnum::Movie) ; } return $tabQ; } diff --git a/vue/quote.php b/vue/quote.php index 30ec5be..27b515e 100644 --- a/vue/quote.php +++ b/vue/quote.php @@ -1,4 +1,5 @@ $q->getLike(), 'idQuote' => $q->getId(), 'com' => $c, + 'type' => $q->getType()->name, 'fav' => $f)); ?> \ No newline at end of file diff --git a/vue/templates/quote.html.twig b/vue/templates/quote.html.twig index ffc43f9..0e3de03 100644 --- a/vue/templates/quote.html.twig +++ b/vue/templates/quote.html.twig @@ -19,7 +19,7 @@
diff --git a/vue/templates/recapSubmitQuote.html.twig b/vue/templates/recapSubmitQuote.html.twig index 0211f18..eef4834 100644 --- a/vue/templates/recapSubmitQuote.html.twig +++ b/vue/templates/recapSubmitQuote.html.twig @@ -1,4 +1,4 @@ -

▶ Your quote has been submitted successfully ◀

+

Votre citation a corectement été envoyé