Merge branch 'master' into BenBack

Reviewed-on: #9

config/database.php

@@ -1,9 +0,0 @@
-<?php
-
-return [
-    'host' => 'localhost',
-    'port' => 3306,
-    'user' => 'benjamin',
-    'pass' => '011235813',
-    'name' => 'siterecette'
-];

config/general.php

@@ -1,8 +1,9 @@
 <?php
 
+// Config
 return [
     'website_url' => 'http://127.0.0.1:8080/',
-    'website_name' => 'Les recettes des Papis',
+    'website_name' => 'Les recettes de Papis',
 
     'website_path' => APP_ROOT,
 ];

public/assets/css/style.css

@@ -31,7 +31,7 @@ html, body{
 
 #logo {
     background-color: aqua;
-    background-image: url("Logo.jpg");
+    background-image: url("../images/Logo.jpg");
     /*background:no-repeat;*/
     height: 103px;
     width: 141px;
@@ -57,7 +57,7 @@ nav {
     padding: 10px;
 }
 
-.nav-list {
+.nav-list{
     list-style-type: none;
     margin: 0;
     padding: 0;
@@ -67,10 +67,20 @@ nav {
     border-radius: 40px;
 }
 
+.nav-list li {
+    /*border: 1px solid black;*/
+    border-radius: 2000px;
+}
+
+.nav-list li:hover {
+    background-color: #00d8a2;
+}
+
 
 .nav-element {
     line-height: 2.5;
     padding: 10px;
+    margin: 4px;
     text-decoration: none;
     color: black;
 }
@@ -84,12 +94,13 @@ nav {
 
 #login {
     border: 1px solid black;
-    border-radius: 6px;
+    border-radius: 2000px;
     background-color: #ffc478;
 }
 
 #login:hover {
     background-color: #0bbd90;
+    box-shadow: 1px 1px 7px black;
 }
 
 /*Body et son contenu */
@@ -120,6 +131,34 @@ body {
     /*display:none;*/
 }
 
+.title-site {
+    text-align: center;
+}
+
+.title {
+    width: 100%;
+    height: 50%;
+    font-size: 100px;
+}
+
+.random-proposition {
+    gap: 5%;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+}
+
+.recommandation img {
+    max-width: calc( 7vh + 7vw );
+    max-height: calc( 7vh + 7vw );
+}
+
+.line-acceuil {
+    color: #03be90;
+    box-shadow: 20px 6px 8px #007054;
+}
+
 .tag-selected-div {
     flex: 4;
 }
@@ -142,6 +181,8 @@ body {
 }
 
 .search-form {
+    margin-top: .5%;
+    padding: .5% 0 .5% .5%;
     border: 1px solid black;
     border-radius: 20px;
     box-shadow: 0px 0px 10px rgb(131, 131, 131);
@@ -190,6 +231,7 @@ nav {
     background-clip: border-box;
     padding-right: 2%;
     padding-left: 2%;
+    padding-bottom: 5px;
     overflow: hidden;
 }
 
@@ -292,9 +334,8 @@ ul {
 /*image*/
 .recette-image {
     background-color: red;
-    aspect-ratio: 1/1;
-    max-height: calc( 30vh + 30vw );
-    max-width: calc( 30vh + 30vw );
+    max-height: calc( 20vh + 20vw );
+    max-width: calc( 20vh + 20vw );
     border: 1px solid white;
     border-radius: 30px;
 }
@@ -304,6 +345,35 @@ ul {
     justify-content: center;
 }
 
+
+.recette-liste-ingr-div {
+    margin-left: 120px;
+    padding-left: 100px;
+    width: 75%;
+    border: 1px solid black;
+    border-radius: 200px;
+    box-shadow: 7px 4px 7px black;
+}
+
+.recette-liste-ingr-elem {
+    display: flex;
+    padding-left: 50px;
+}
+
+.ingr-image-prev {
+    max-height: 50px;
+    max-width: 50px;
+    border: 1px solid black;
+    border-radius: 10px;
+    flex: 1;
+}
+
+.recette-liste-ingr-elem-nom {
+    height: 100%;
+    width: 15%;
+    line-height: 50px;
+}
+
 .recette-div-info {
     display: flex;
     flex-direction: row;
@@ -418,11 +488,23 @@ ul {
     box-shadow: 2px 2px 0px #000000;
 }
 
+.btn {
+    padding: .5% 2%;
+    border: 2px solid black;
+    border-radius: 10px;
+    margin-top: .5%;
+    margin-left: .5%;
+    background-color: #ffd9a0;
+}
+
 .btn:hover {
     background-color: #0bbd90;
+    box-shadow: none;
+    cursor: pointer;
 }
 
 .form-control {
+    padding: 1%;
     border-radius: 10px;
     box-shadow: 3px 4px 5px #8c8c8c;
 }
@@ -437,8 +519,9 @@ ul {
     margin: 10px;
     padding: 10px;
     border: 1px solid black;
-    background: white;
+    background: #fff9f1;
     border-radius: 20px;
+    box-shadow: 2px 2px 3px #a06100;
 }
 
 .recette-form-group {
@@ -448,7 +531,7 @@ ul {
 }
 
 #recette-form-div-desc {
-    height: 300px;
+    height: 220px;
 }
 
 #recette-form-description {
@@ -494,6 +577,13 @@ ul {
     border: 1px solid black;
     border-radius: 10px;
     box-shadow: 1px 1px 1px black;
+    margin-top: .25%;
+    margin-bottom: .25%;
+}
+
+.liste-ingr-elem:hover {
+    border:3px solid #007054;
+    box-shadow: 2px 2px 10px black;
 }
 
 .liste-ingr-elem-text {
@@ -502,6 +592,44 @@ ul {
     flex:12;
     padding-left: 20px;
     line-height: 100px;
+    color: #000000;
+}
+
+.liste-ingr-elem-modif {
+    line-height: 100px;
+    padding-right: 20px;
+}
+
+.liste-tag-elem {
+    display: flex;
+    height: 40px;
+    padding:5px;
+    background-color: #c6fdefe0;
+    color: #000000;
+    border: 1px solid black;
+    border-radius: 10px;
+    box-shadow: 1px 1px 1px black;
+    margin-top: .25%;
+    margin-bottom: .25%;
+}
+
+.liste-tag-elem:hover {
+    border:3px solid #007054;
+    box-shadow: 2px 2px 10px black;
+}
+
+.liste-tag-elem-text {
+    width: 100%;
+    height: 100%;
+    flex:12;
+    padding-left: 20px;
+    line-height: 40px;
+    color: #000000;
+}
+
+.liste-tag-elem-modif {
+    line-height: 40px;
+    padding-right: 20px;
 }
 
 .ingr-image {
@@ -510,6 +638,11 @@ ul {
     border-radius: 10px;
 }
 
+a {
+    text-decoration: none;
+    color: black;
+}
+
 /*Footer et son contenue*/
 footer{
     padding: 25px;
@@ -517,3 +650,10 @@ footer{
     color: white;
     border-top: 1px solid black;
 }
+
+.meta-recettes {
+    text-align: left;
+}
+
+
+

public/assets/js/form.js

@@ -40,7 +40,7 @@ document.addEventListener("DOMContentLoaded", function(){
                     if (data.success) {
                         let new_elem = document.createElement("option");
 
-                        new_elem.setAttribute("value",document.getElementById('recette-form-ingr-nom').value);
+                        new_elem.setAttribute("value",data.id);
                         new_elem.innerText = document.getElementById('recette-form-ingr-nom').value;
 
                         cible.appendChild(new_elem);
@@ -86,7 +86,7 @@ document.addEventListener("DOMContentLoaded", function(){
                     if (data.success) {
                         let new_elem = document.createElement("option");
 
-                        new_elem.setAttribute("value",nomTag.value);
+                        new_elem.setAttribute("value",data.id);
                         new_elem.innerText = nomTag.value;
 
                         cible.appendChild(new_elem);
@@ -146,7 +146,11 @@ document.addEventListener("DOMContentLoaded", function(){
             else {
                 reponse.json().then( data => {
                     if (data.success) {
-                        alert( "Envoyé" );
+                        if( IS_EDIT )
+                            alert( "Votre recette a été ajouté, vous allez être redirigé." );
+                        else
+                            alert( "Votre recette a été ajouté, vous allez être redirigé." );
+                        window.location.href = data.route !== null ? data.route : window.location.origin;
                     } else {
                         alert( data.error || "" );
                     }

public/assets/js/login.js

@@ -49,14 +49,15 @@ document.addEventListener( 'DOMContentLoaded', function(){
         fetch( FORM.action, options ).then( ( response ) => {
             if( response.ok ){
                 response.json().then( ( responseJSON ) => {
-
                     if( responseJSON.success === true ){
                         window.location.href = window.location.origin; // Redirection sur la page d'accueil si succès.
                     } else {
-                        FORM.showError( responseJSON.message || "Mauvais nom d'utilisateur ou mauvais mot de passe." );
+                        FORM.showError( "Mauvais nom d'utilisateur ou mauvais mot de passe." );
                     }
 
                 })
+            } else {
+                FORM.showError( "Mauvais nom d'utilisateur ou mauvais mot de passe." );
             }
         })
 

public/assets/js/manage-ingredients.js

@@ -0,0 +1,62 @@
+document.addEventListener("DOMContentLoaded", function(){
+
+
+    let modifier_button = document.getElementsByClassName("ingr-modifier");
+
+    console.log(modifier_button);
+
+    for (const element of modifier_button) {
+        element.addEventListener('click', function ( e ) {
+            let modif = element.parentElement.previousSibling.previousSibling;
+
+            let data = e.target.getAttribute("data-id");
+
+            let form = document.createElement("form");
+
+            form.setAttribute("method", "POST");
+            form.setAttribute("action", "/ingredients/edit/" + data);
+            form.setAttribute("class","liste-ingr-elem-text")
+
+            let input = document.createElement("input");
+
+            input.setAttribute("type", "text");
+            input.setAttribute("class", "form-control");
+            input.setAttribute("name","modif_ingr");
+            input.setAttribute("placeholder", "modificiation");
+
+            let hidden = document.createElement("input");
+
+            hidden.setAttribute("type","hidden");
+            hidden.setAttribute("name","id");
+            hidden.setAttribute("value", data);
+
+            let button = document.createElement("button");
+
+            button.setAttribute("type", "submit");
+            button.setAttribute("class", "btn btn-primary");
+            button.innerText = "Submit Modification";
+
+            form.append(input)
+            form.append(hidden)
+            form.append(button)
+
+            modif.replaceWith(form);
+
+        });
+    };
+
+    let suppr = document.getElementsByClassName("ingr-suppr");
+
+    for (const element of suppr) {
+        element.addEventListener('click', function ( e ) {
+            let confirm = window.confirm("Voulez vous supprimez ?");
+
+            let data = e.target.getAttribute("data-id");
+
+            if (confirm) {
+                window.location.href = "/ingredients/delete/" + data;
+            }
+        })
+    }
+
+});

public/assets/js/manage-tags.js

@@ -0,0 +1,62 @@
+document.addEventListener("DOMContentLoaded", function(){
+
+
+    let modifier_button = document.getElementsByClassName("tag-modifier");
+
+    console.log(modifier_button);
+
+    for (const element of modifier_button) {
+        element.addEventListener('click', function ( e ) {
+            let modif = element.parentElement.previousSibling.previousSibling;
+
+            let data = e.target.getAttribute("data-id");
+
+            let form = document.createElement("form");
+
+            form.setAttribute("method", "POST");
+            form.setAttribute("action", "/tags/edit/" + data);
+            form.setAttribute("class","liste-tag-elem-text")
+
+            let input = document.createElement("input");
+
+            input.setAttribute("type", "text");
+            input.setAttribute("class", "form-control");
+            input.setAttribute("name","modif_tag");
+            input.setAttribute("placeholder", "modificiation");
+
+            let hidden = document.createElement("input");
+
+            hidden.setAttribute("type","hidden");
+            hidden.setAttribute("name","id");
+            hidden.setAttribute("value", data);
+
+            let button = document.createElement("button");
+
+            button.setAttribute("type", "submit");
+            button.setAttribute("class", "btn btn-primary");
+            button.innerText = "Submit Modification";
+
+            form.append(input)
+            form.append(hidden)
+            form.append(button)
+
+            modif.replaceWith(form);
+
+        });
+    };
+
+    let suppr = document.getElementsByClassName("tag-suppr");
+
+    for (const element of suppr) {
+        element.addEventListener('click', function ( e ) {
+            let confirm = window.confirm("Voulez vous supprimez ?");
+
+            let data = e.target.getAttribute("data-id");
+
+            if (confirm) {
+                window.location.href = "/tags/delete/" + data;
+            }
+        })
+    }
+
+});

src/Domain/Ingredients/IngredientManagementController.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Domain\Ingredients;
+
+use App\Domain\Controller;
+use App\Domain\Ingredients\IngredientRepository;
+use App\Domain\Tags\TagRepository;
+use App\Helpers\Authentification;
+use App\Http\JSONResponse;
+use App\Http\Request;
+use App\Infrastructure\View;
+
+class IngredientManagementController extends Controller {
+
+    public static function defineRoutes(): array
+    {
+        return [
+            self::Route( routeUrl: '/manage/ingredients', routeName: 'manage->ingredients', routeAction: 'index', pageHeadTitle: 'Gestion des ingredients' ),
+            self::Route( routeUrl: '/ingredients/edit/{int}', routeName: 'ingredients->edit', routeAction: 'edit', routeMethods: [ 'POST' ] ),
+            self::Route( routeUrl: '/ingredients/delete/{int}', routeName: 'ingredients->delete', routeAction: 'delete' ),
+        ];
+
+    }
+
+    public function index(){
+
+        if( !Authentification::isLoggedIn() )
+            die( "Not logged in" );
+
+        $tags = new IngredientRepository()->getAll();
+        return new View( 'ingredients/index', [
+            'ingredients' => $tags,
+        ]);
+
+    }
+
+    public function edit( int $idIngredient ): never {
+        if( !Authentification::isLoggedIn() )
+            die( "Not logged in" );
+
+        $ing = new IngredientRepository()->getByID( $idIngredient );
+        if( !$ing )
+            die( "Ingredient not found" );
+
+        $name = Request::post( 'modif_ingr' );
+        if( !$name || $name == "" )
+            JSONResponse::sendError( [ 'error' => 'Name not defined' ] );
+
+        $ing->nom_ingredient = $name;
+
+        if( !new IngredientRepository()->update( $ing ) )
+            JSONResponse::sendError( [ 'error' => 'An error occured while updating ingredient' ] );
+
+        Request::redirectTo( 'manage->ingredients');
+    }
+
+    public function delete( int $idIngredient ): never {
+        if( !Authentification::isLoggedIn() )
+            die( "Not logged in" );
+
+        $ing = new IngredientRepository()->getByID( $idIngredient );
+        if( !$ing )
+            die( "Tag not found" );
+
+        if( !new IngredientRepository()->delete( $ing ) )
+            JSONResponse::sendError( [ 'error' => 'An error occured while deleting ingredient' ] );
+
+        Request::redirectTo( 'manage->ingredients' );
+    }
+}

src/Domain/Ingredients/IngredientsAPIController.php

@@ -6,6 +6,7 @@ use App\Domain\Controller;
 use App\Helpers\UploadFiles;
 use App\Http\JSONResponse;
 use App\Http\Request;
+use App\Kernel;
 
 class IngredientsAPIController extends Controller {
 
@@ -25,7 +26,7 @@ class IngredientsAPIController extends Controller {
         if( !$name || $name == "" )
             JSONResponse::sendError( [ 'error' => 'Name not defined' ] );
 
-        $urlOrError = UploadFiles::uploadFile( $fileNameField );
+        $urlOrError = UploadFiles::uploadFile( $fileNameField, UploadFiles::IMAGE_MIME_TYPES );
         if( is_int( $urlOrError ) ){
             JSONResponse::sendError( [ 'error' => $urlOrError ] );
         }
@@ -39,7 +40,7 @@ class IngredientsAPIController extends Controller {
         if( !new IngredientRepository()->add( $ingredient ) )
             JSONResponse::sendError( [ 'error' => 'An error occured while adding ingredient' ] );
 
-        JSONResponse::sendSuccess( [ 'image_url' => $urlOrError ] );
+        JSONResponse::sendSuccess( [ 'image_url' => $urlOrError, 'id' => Kernel::$DB->pdo->lastInsertId() ] );
 
     }
 

src/Domain/Pages/PagesController.php

@@ -3,6 +3,7 @@
 namespace App\Domain\Pages;
 
 use App\Domain\Controller;
+use App\Domain\Recettes\RecetteRepository;
 use App\Infrastructure\View;
 
 /**
@@ -28,7 +29,7 @@ class PagesController extends Controller {
      * @return void
      */
     public function index(): View {
-        return new View( 'home', [ 'ok' => 'bla' ] );
+        return new View( 'home', [ 'recettes' => new RecetteRepository()->getAllRecettesBrowse(1, 3 ) ] );
     }
 
 }

src/Domain/Recettes/RecettesAPIController.php

@@ -9,6 +9,7 @@ use App\Helpers\UploadFiles;
 use App\Http\JSONResponse;
 use App\Http\Request;
 use App\Http\Router;
+use App\Kernel;
 
 class RecettesAPIController extends Controller {
 
@@ -80,13 +81,14 @@ class RecettesAPIController extends Controller {
             JSONResponse::sendError( [ 'error' => "One required fields is missing" ] );
 
         // Upload & Vérification de l'image.
-        $urlOrError = UploadFiles::uploadFile( $fileField );
+        $urlOrError = UploadFiles::uploadFile( $fileField, UploadFiles::IMAGE_MIME_TYPES );
         if( is_int( $urlOrError ) ){
             JSONResponse::sendError( [ 'error' => $urlOrError ] );
         }
 
         // Vérification d'une entrée qui existerait déjà.
         $slug = strtolower( $name );
+        $slug = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $slug);
         $slug = str_replace( ' ', '', $slug );
 
         $recetteRepo = new RecetteRepository();
@@ -116,7 +118,7 @@ class RecettesAPIController extends Controller {
         }
 
         // Pour actualiser l'ID.
-        $recette = $recetteRepo->getBySlug( $slug );
+        $recette = $recetteRepo->getById( Kernel::$DB->pdo->lastInsertId() );
 
         // Ajout du lien ingrédients recettes.
         foreach( $ingredientsId as $ingredientId ){
@@ -136,7 +138,7 @@ class RecettesAPIController extends Controller {
             }
         }
 
-        JSONResponse::sendSuccess( [ 'recette' => $recette ] );
+        JSONResponse::sendSuccess( [ 'recette' => $recette, 'route' => Router::getRouteURL('recettes->show', $recette->slug ) ] );
     }
 
     public function edit(){
@@ -171,7 +173,7 @@ class RecettesAPIController extends Controller {
         }
 
         // Upload & Vérification de l'image.
-        $urlOrError = UploadFiles::uploadFile( $fileField );
+        $urlOrError = UploadFiles::uploadFile( $fileField, UploadFiles::IMAGE_MIME_TYPES );
         if( is_int( $urlOrError ) ){
             // Ingore image.
         } else {
@@ -180,10 +182,11 @@ class RecettesAPIController extends Controller {
 
         // Vérification d'une entrée qui existerait déjà.
         $slug = strtolower( $name );
+        $slug = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $slug);
         $slug = str_replace( ' ', '', $slug );
 
         $recette->titre_recette = $name;
-        $recette->slug = $slug;
+        // $recette->slug = $slug;
 
         $recette->temps_de_preparation = intval( $temps <= 0 ? 1 : $temps );
         $recette->description_recette = $description;
@@ -273,7 +276,7 @@ class RecettesAPIController extends Controller {
             }
         }
 
-        JSONResponse::sendSuccess( [ 'recette' => $recette ] );
+        JSONResponse::sendSuccess( [ 'recette' => $recette, 'route' => Router::getRouteURL('recettes->show', $recette->slug ) ] );
     }
 
     public function delete(){

src/Domain/Recettes/RecettesManagementController.php

@@ -15,8 +15,8 @@ class RecettesManagementController extends Controller {
     public static function defineRoutes(): array
     {
         return [
-            self::Route( routeUrl: '/recettes/create', routeName: 'recettes->create', routeAction: 'create' ),
-            self::Route( routeUrl: '/recettes/edit/{int}', routeName: 'recettes->edit', routeAction: 'edit' ),
+            self::Route( routeUrl: '/recettes/create', routeName: 'recettes->create', routeAction: 'create', pageHeadTitle: 'Créer une recette' ),
+            self::Route( routeUrl: '/recettes/edit/{int}', routeName: 'recettes->edit', routeAction: 'edit', pageHeadTitle: 'Modifier une recette' ),
             self::Route( routeUrl: '/recettes/delete/{int}', routeName: 'recettes->delete', routeAction: 'delete' ),
         ];
 

src/Domain/Tags/TagManagementController.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Domain\Tags;
+
+use App\Domain\Controller;
+use App\Domain\Ingredients\IngredientRepository;
+use App\Domain\Tags\TagRepository;
+use App\Helpers\Authentification;
+use App\Http\JSONResponse;
+use App\Http\Request;
+use App\Infrastructure\View;
+
+class TagManagementController extends Controller {
+
+    public static function defineRoutes(): array
+    {
+        return [
+            self::Route( routeUrl: '/manage/tags', routeName: 'manage->tags', routeAction: 'index', pageHeadTitle: 'Gestion des tags' ),
+            self::Route( routeUrl: '/tags/edit/{int}', routeName: 'tags->edit', routeAction: 'edit', routeMethods: [ 'POST' ] ),
+            self::Route( routeUrl: '/tags/delete/{int}', routeName: 'tags->delete', routeAction: 'delete' ),
+        ];
+
+    }
+
+    public function index(){
+
+        if( !Authentification::isLoggedIn() )
+            die( "Not logged in" );
+
+        $tags = new TagRepository()->getAll();
+        return new View( 'tags/index', [
+            'tags' => $tags,
+        ]);
+
+    }
+    public function edit( int $idTag ): never {
+        if( !Authentification::isLoggedIn() )
+            die( "Not logged in" );
+
+        $tag = new TagRepository()->getByID( $idTag );
+        if( !$tag )
+            die( "Tag not found" );
+
+        $name = Request::post( 'modif_tag' );
+        if( !$name || $name == "" )
+            JSONResponse::sendError( [ 'error' => 'Name not defined' ] );
+
+        $tag->nom_tag = $name;
+
+        if( !new TagRepository()->update( $tag ) )
+            JSONResponse::sendError( [ 'error' => 'An error occured while updating tag' ] );
+
+        Request::redirectTo( 'manage->tags');
+    }
+
+    public function delete( int $idTag ): never {
+        if( !Authentification::isLoggedIn() )
+            die( "Not logged in" );
+
+        $tag = new \App\Domain\Tags\TagRepository()->getByID( $idTag );
+        if( !$tag )
+            die( "Tag not found" );
+
+        if( !new TagRepository()->delete( $tag ) )
+            JSONResponse::sendError( [ 'error' => 'An error occured while deleting tag' ] );
+
+        Request::redirectTo( 'manage->tags' );
+    }
+}

src/Domain/Tags/TagsAPIController.php

@@ -6,6 +6,7 @@ use App\Domain\Controller;
 use App\Helpers\UploadFiles;
 use App\Http\JSONResponse;
 use App\Http\Request;
+use App\Kernel;
 
 class TagsAPIController extends Controller {
 
@@ -32,7 +33,7 @@ class TagsAPIController extends Controller {
         if( !new TagRepository()->add( $tag ) )
             JSONResponse::sendError( [ 'error' => 'An error occured while adding tag' ] );
 
-        JSONResponse::sendSuccess();
+        JSONResponse::sendSuccess( [ 'id' => Kernel::$DB->pdo->lastInsertId() ] );
 
     }
 

src/Domain/Utilisateurs/AuthentificationController.php

@@ -43,12 +43,14 @@ class AuthentificationController extends Controller {
 
         Request::setCORS();
 
-        $username = Request::get( 'username' );
-        $password = Request::get( 'password' );
+        $username = Request::post( 'username' );
+        $password = Request::post( 'password' );
 
-        // TODO : Récupération de l'utilisateur et verify_password.
+        $userId = new UtilisateurRepository()->login( $username, $password );
+        if( !$userId ) {
+            return JSONResponse::sendError();
+        }
 
-        $userId = 1;
         Authentification::loginUser( $userId );
         return JSONResponse::sendSuccess( [ 'user_id' => $userId ] );
 

src/Domain/Utilisateurs/Utilisateur.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Domain\Utilisateurs;
+
+use App\Domain\Model;
+//use App\Helpers\Markdown;
+
+class Utilisateur extends Model {
+
+    public int $num_user;
+    public string $username;
+    public string $userpassword;
+
+
+    public function getID(): int
+    {
+        return $this->num_user;
+    }
+
+}

src/Domain/Utilisateurs/UtilisateurRepository.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Domain\Utilisateurs;
+
+use App\Domain\Model;
+use App\Domain\Repository;
+
+
+/**
+ * Classe qui permet de faire le lien entre la BDD et le site pour les utilisateurs.
+ */
+class UtilisateurRepository extends Repository {
+
+    public static function getEntity(): string
+    {
+        return Utilisateur::class;
+    }
+
+    public static function getStructure(): array
+    {
+        return [
+            'table' => 'User',
+            'columns' => [
+                'num_user', 'username', 'userpassword'
+            ]
+        ];
+
+    }
+
+    /**
+     * Permet d'obtenir une liste de toutes les recettes objet Utilisateur.
+     *
+     * @return Utilisateur[]|null
+     */
+    public function getAll(): ?array {
+        $sqlQuery = "SELECT * FROM {$this->tableName};";
+        $results = $this->selectGetAll($sqlQuery);
+        if( $results === null )
+            return null;
+        return $results;
+    }
+
+
+    /**
+     * Permet d'avoir un utilisateur par un ID.
+     *
+     * @param int $id
+     * @return Utilisateur|null
+     */
+    public function getByID( int $id ): ?Utilisateur {
+        $sqlQuery = "SELECT * FROM {$this->tableName} WHERE num_user = {$id}";
+        $results = $this->selectGetAll($sqlQuery);
+        if( $results === null || count( $results ) > 1 )
+            return null;
+        return $results[0];
+    }
+
+
+    public function login(string $name, string $pass): int|bool{
+
+        $users = new UtilisateurRepository()->getAll();
+        foreach($users as $user){
+            if((strcmp($name,$user->username)==0) and (strcmp($pass,$user->userpassword)==0))return $user->num_user;
+        }
+        return false;
+    }
+
+    public function add( Model $utilisateurs ): bool {
+        return $this->addEntity( $utilisateurs );
+    }
+
+    public function update( Model $utilisateurs ): bool {
+        return $this->updateEntity( $utilisateurs, 'num_user' );
+    }
+
+    public function delete( Model $utilisateurs ): bool {
+        return $this->deleteEntity( $utilisateurs, 'num_user' );
+    }
+
+}

src/Helpers/UploadFiles.php

@@ -7,6 +7,8 @@ use App\Kernel;
 
 class UploadFiles {
 
+    const array IMAGE_MIME_TYPES = [ 'image/png', 'image/jpeg' ];
+
     public static function uploadFolderPath(){
         return APP_ROOT . 'public/uploads/';
     }
@@ -16,6 +18,7 @@ class UploadFiles {
 
     /**
      * @param string $fileName
+     * @param array $allowedMimeTypes Les mimes types autorisés pour ce fichier. Une liste vide n'a pas de restriction de mime type.
      *
      * @return string|int
      *
@@ -23,8 +26,9 @@ class UploadFiles {
      * 2: Erreur dans le fichier
      * 3: Déjà existant.
      * 4: Erreur dans le déplacement.
+     * 5: Erreur dans le mimetype.
      */
-    public static function uploadFile( string $fileArg ): string|int {
+    public static function uploadFile( string $fileArg, array $allowedMimeTypes = [] ): string|int {
 
         if( !isset( $_FILES[ $fileArg ] ) )
             return 1;
@@ -36,6 +40,11 @@ class UploadFiles {
         $tempFileName = $file['tmp_name'];
         $fileName = $file['name'];
 
+        if( $allowedMimeTypes !== [] ){
+            if( !in_array( $file['type'], $allowedMimeTypes ) )
+                return 5;
+        }
+
         $full_name = self::uploadFolderPath() . $fileName;
         $full_uri = self::uploadFolderUri() . $fileName;
 

views/home.php

@@ -1,2 +1,23 @@
-<h1>Coucou</h1>
-<?php $str = "Markdown **text**\n# SOLONG\n*text*."; $md = \App\Helpers\Markdown::convertToHTML( $str ); echo "<p>$md</p>"; ?>
+<?php use App\Infrastructure\View as V; ?>
+
+<div class="content">
+    <div class="title-site">
+        <h1 class="title">Les Recettes De Papis</h1>
+        <hr class="line-acceuil">
+        <h3>Proposition de recette :</h3>
+    </div>
+    <div class="random-proposition">
+        <?php foreach( V::arg( 'recettes' ) as $recette ): ?>
+            <a class="recette-icone" href="<?php V::routeUrl( 'recettes->show', $recette->slug ); ?>">
+                <img class="recette-preview-image" src="<?php echo $recette->photo; ?>">
+                <div class="recette-icone-content">
+                    <h3><?php echo $recette->titre_recette; ?></h3>
+                    <ul class="meta-recettes">
+                        <li>Temps de préparation : <?php echo $recette->temps_de_preparation; ?> minutes</li>
+                        <li>Nombre d'ingrédients : <?php echo $recette->getNumberOfIngredients(); ?></li>
+                    </ul>
+                </div>
+            </a>
+        <?php endforeach; ?>
+    </div>
+</div>

views/ingredients/index.php

@@ -0,0 +1,18 @@
+<?php use App\Domain\Tags\Tag;
+use App\Infrastructure\View as V; ?>
+
+<div class="content">
+    <?php foreach (V::arg( 'ingredients') as $ing): ?>
+        <div class="liste-ingr-elem">
+            <img class="ingr-image" src="<?php echo $ing->photo_ingredient; ?>">
+            <div class="liste-ingr-elem-text">
+                <?php echo $ing->nom_ingredient; ?>
+            </div>
+            <div class="liste-ingr-elem-modif">
+                <a class="recette-button ingr-modifier" data-id="<?php echo $ing->getId(); ?>">Modifier</a>
+                <a class="recette-button ingr-suppr" data-id="<?php echo $ing->getId(); ?>">Supprimer</a>
+            </div>
+        </div>
+    <?php endforeach; ?>
+</div>
+<script src="<?php V::assetUrl( 'js/manage-ingredients.js' ); ?>" ></script>

views/partials/footer.php

@@ -2,12 +2,12 @@
 
     <footer id="footer">
         <div class="src">
-            <a href="google.com">Une source</a>
+            <a href="https://code.romhackplaza.org/Benjamin/LesRecettesDePapis" target="_blank">Notre Gitea</a>
         </div>
         <div class="Contact">
             Front end : Bousquet Sébastien
             --- Back end : Thorel Benjamin
-            --- Base de donné : Glaudis Jordan
+            --- Base de données : Glaudis Jordan
         </div>
     </footer>
     </body>

views/partials/header.php

@@ -6,11 +6,12 @@
         <title><?php echo V::getHeadTitle(); ?></title>
         <meta charset="UTF-8" />
         <link rel="stylesheet" href="<?php V::assetUrl( 'css/style.css' ); ?>" />
+        <link rel="icon" type="image/x-icon" href="<?php V::assetUrl( 'images/Logo.ico' ); ?>" />
     </head>
     <body>
     <header id="header">
         <div id="logo">
-            <a href="index.php">
+            <a href="<?php V::routeUrl( 'home'); ?>">
                 <img src="<?php V::assetUrl( 'images/Logo.jpg'); ?>" class="logo">
             </a>
         </div>
@@ -21,6 +22,9 @@
                 <?php if( \App\Helpers\Authentification::isLoggedIn() ): ?>
                     <li><a id="login" class= "nav-element" href="<?php V::routeUrl( 'logout'); ?>">Logout</a></li>
                     <li><a id="addBouton" class="nav-element" href="<?php V::routeUrl( 'recettes->create'); ?>">Ajouter une Recette</a></li>
+                    <li><a id="ingrManage" class="nav-element" href="<?php V::routeUrl( 'manage->ingredients'); ?>">Gérer les ingrédients</a></li>
+                    <li><a id="tagManage" class="nav-element" href="<?php V::routeUrl( 'manage->tags'); ?>">Gérer les tags</a></li>
+
                 <?php else: ?>
                     <li><a id="login" class= "nav-element" href="<?php V::routeUrl( 'login'); ?>">Login</a></li>
                 <?php endif; ?>

views/partials/tag-sidebar.php

@@ -7,9 +7,6 @@
             <ul>
             </ul>
         </div>
-        <form class="sidebar-search" action="none">
-            <input type="text" class="search-form search-form-tag" name="search-tag" placeholder="Rechercher..." >
-        </form>
         <div class="tag-unselected-div">
             <ul id="tagsList">
                 <?php foreach( V::arg( 'tagsList') as $tag ): ?>
@@ -25,9 +22,6 @@
             <ul>
             </ul>
         </div>
-        <form class="sidebar-search" action="none">
-            <input type="text" class="search-form search-form-tag" name="search-ingr" placeholder="Rechercher..." >
-        </form>
         <div class="ing-unselected-div">
             <ul id="ingredientsList">
                 <?php foreach( V::arg( 'ingredientsList') as $tag ): ?>

views/recettes/create.php

@@ -5,6 +5,7 @@ use App\Infrastructure\View as V; ?>
     <div class="content">
         <div class="recette-add-form-all">
             <form id="recette-form-complete" class="recette-form recette-form-add" action="/api/recettes/create" method="POST">
+                <legend><h1>Nouvelle Recette : </h1></legend>
                 <div class="recette-form-group form-group">
                     <label for="nom">Titre : </label>
                     <input type="text" class="form-control" id="recette-form-nom" name="nom" placeholder="Titre de votre recette">
@@ -15,7 +16,7 @@ use App\Infrastructure\View as V; ?>
                 </div>
                 <div class="recette-form-group form-group">
                     <label for="image">Photo du plat : </label>
-                    <input type="file" class="form-control" id="recette-form-photo" name="image" placeholder="ajouter votre image">
+                    <input type="file" class="form-control" id="recette-form-photo" name="image" placeholder="ajouter votre image" accept="image/jpeg, image/png">
                 </div>
                 <div class="recette-form-group form-group" id="recette-form-div-ingr">
                     <label for="ingr">Ingredients</label>
@@ -35,13 +36,14 @@ use App\Infrastructure\View as V; ?>
                 </div>
                 <div class="recette-form-group form-group" id="recette-form-div-desc">
                     <label for="description">Description</label>
-                    <textarea type="texte" class="form-control" id="recette-form-description" name="description" placeholder="Description..."></textarea>
+                    <textarea type="texte" class="form-control" id="recette-form-description" name="description" placeholder="Markdown supporté pour les titres de niveau 1,2, le gras ainsi que l'italique"></textarea>
                 </div>
 
-                <button type='submit' class='btn btn-primary'>Confirmer</button>
+                <button type='submit' class='btn btn-primary'>Envoyer la recette</button>
             </form>
             <div class="recette-form-add-additional">
                 <form id="recette-form-ingr-add" class="recette-form recette-form-add-ingr" action="" method="POST">
+                    <legend><h2>Nouvel Ingrédient :</h2></legend>
                     <div class="recette-form-group form-group">
                         <label for="name">Nom de l'Ingrédient</label>
                         <input type="texte" class="form-control" id="recette-form-ingr-nom" name="name" placeholder="Nom de l'ingrédient" value="">
@@ -57,6 +59,7 @@ use App\Infrastructure\View as V; ?>
                     </div>
                 </form>
                 <form id="recette-form-tag-add" class="recette-form recette-form-add-tag" action="" method="POST">
+                    <legend><h2>Nouveau Tag : </h2></legend>
                     <div class="recette-form-group form-group">
                         <label for="tag">Tags</label>
                         <input type="text" class="form-control" id="recette-form-tag-nom" name="name" placeholder="Nom de l'ingrédient">

views/recettes/edit.php

@@ -5,6 +5,7 @@ use App\Infrastructure\View as V; ?>
     <div class="content">
         <div class="recette-add-form-all">
             <form id="recette-form-complete" class="recette-form recette-form-add" action="/api/recettes/edit" method="POST">
+                <legend><h1>Editer une Recette : </h1></legend>
                 <div class="recette-form-group form-group">
                     <label for="nom">Titre : </label>
                     <input type="text" class="form-control" id="recette-form-nom" name="nom" placeholder="Titre de votre recette" value="<?php echo $R->titre_recette; ?>">
@@ -15,7 +16,7 @@ use App\Infrastructure\View as V; ?>
                 </div>
                 <div class="recette-form-group form-group">
                     <label for="image">Photo du plat : </label>
-                    <input type="file" class="form-control" id="recette-form-photo" name="image" placeholder="ajouter votre image">
+                    <input type="file" class="form-control" id="recette-form-photo" name="image" placeholder="ajouter votre image" accept="image/jpeg, image/png">
                 </div>
                 <div class="recette-form-group form-group" id="recette-form-div-ingr">
                     <label for="ingr">Ingredients</label>
@@ -42,6 +43,7 @@ use App\Infrastructure\View as V; ?>
             </form>
             <div class="recette-form-add-additional">
                 <form id="recette-form-ingr-add" class="recette-form recette-form-add-ingr" action="" method="POST">
+                    <legend><h2>Nouvel Ingrédient :</h2></legend>
                     <div class="recette-form-group form-group">
                         <label for="name">Nom de l'Ingrédient</label>
                         <input type="texte" class="form-control" id="recette-form-ingr-nom" name="name" placeholder="Nom de l'ingrédient" value="">
@@ -57,6 +59,7 @@ use App\Infrastructure\View as V; ?>
                     </div>
                 </form>
                 <form id="recette-form-tag-add" class="recette-form recette-form-add-tag" action="" method="POST">
+                    <legend><h2>Nouveau Tag : </h2></legend>
                     <div class="recette-form-group form-group">
                         <label for="tag">Tags</label>
                         <input type="text" class="form-control" id="recette-form-tag-nom" name="name" placeholder="Nom de l'ingrédient">

views/recettes/index.php

@@ -8,8 +8,8 @@
                 <img class="recette-preview-image" src="<?php echo $recette->photo; ?>">
                 <div class="recette-icone-content">
                     <h3><?php echo $recette->titre_recette; ?></h3>
-                    <ul>
-                        <li>Temps de préparation : <?php echo $recette->temps_de_preparation; ?></li>
+                    <ul class="meta-recettes">
+                        <li>Temps de préparation : <?php echo $recette->temps_de_preparation; ?> minutes</li>
                         <li>Nombre d'ingrédients : <?php echo $recette->getNumberOfIngredients(); ?></li>
                     </ul>
                 </div>

views/recettes/show.php

@@ -30,13 +30,15 @@ use App\Infrastructure\View as V; ?>
                 </ul>
             </div>
         </div>
-        <div class = "recette-desc">
-            <h3>Ingrédients :</h3>
-            <ul>
+        <div class="recette-liste-ingr-div">
+            <h3>Liste des ingrédients</h3>
+            <ul class="recette-liste-ingr">
                 <?php foreach( $R->getAllLinkedIngredients() as $ingr ): ?>
-                    <li><?php echo $ingr->nom_ingredient; ?></li>
+                    <li class="recette-liste-ingr-elem"><img class="ingr-image-prev" src="<?php echo $ingr->photo_ingredient; ?>"> <div class="recette-liste-ingr-elem-nom"><?php echo $ingr->nom_ingredient; ?></div></li>
                 <?php endforeach; ?>
             </ul>
+        </div>
+        <div class = "recette-desc">
             <div id="description">
                 <?php echo $R->getHTMLDescription(); ?>
             </div>

views/tags/index.php

@@ -0,0 +1,17 @@
+<?php use App\Domain\Tags\Tag;
+use App\Infrastructure\View as V; ?>
+
+<div class="content">
+    <?php foreach( V::arg( 'tags' ) as $tag ): ?>
+        <div class="liste-tag-elem">
+            <div class="liste-tag-elem-text">
+                <?php echo $tag->nom_tag; ?>
+            </div>
+            <div class="liste-tag-elem-modif">
+                <a class="recette-button tag-modifier" data-id="<?php echo $tag->num_tag; ?>">Modifier</a>
+                <a class="recette-button tag-suppr" data-id="<?php echo $tag->num_tag; ?>">Supprimer</a>
+            </div>
+        </div>
+    <?php endforeach; ?>
+</div>
+<script src="<?php V::assetUrl( 'js/manage-tags.js' ); ?>" ></script>