Commit 80101c6d authored by plmorisse's avatar plmorisse
Browse files

Merge remote-tracking branch 'origin/main' into supression

parents cff7952e 46e3c3d5

assets/js/menuRecherche.js

0 → 100644
+14 −0
Original line number Diff line number Diff line 
document.getElementById('tag').addEventListener("click", () => {

    document.getElementById("searchbar").classList.remove('visually-hidden');

    document.getElementById('filtre').setAttribute('value','tag')

    document.getElementById("info_recherche").classList.remove('visually-hidden');

})

document.getElementById('titre').addEventListener("click", () => {

    document.getElementById("searchbar").classList.remove('visually-hidden');

    document.getElementById('filtre').setAttribute('value','titre')

})

document.getElementById('ingredients').addEventListener("click", () => {

    document.getElementById("searchbar").classList.remove('visually-hidden');

    document.getElementById('filtre').setAttribute('value','ingredient')

    document.getElementById("info_recherche").classList.remove('visually-hidden');

})
 
 No newline at end of file

index.php

+24 −1
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ require_once 'src/controllers/accueil.php'; 
require_once 'src/controllers/pageRecette.php';

require_once 'src/controllers/pageConnexion.php';

require_once 'src/controllers/connexion.php';

require_once 'src/controllers/ListeRecettesFiltreesControleur.php';

require_once 'src/controllers/recettesAdmin.php';

require_once 'src/controllers/validationRecette.php';

require_once 'src/controllers/pageModifierEdito.php';

require_once 'src/controllers/supprimer.php';
@@ -53,10 +56,23 @@ try{ 


        case 'detail-recette':

            $idRecette = getVariable_GET('idRecette');



            $controleur = new PageRecetteControleur($idRecette);

            break;



        case 'recettesAdmin':

            $controleur = new RecettesAdminControleur();

            break;



        case 'examenRecette':

            $idRecette = getVariable_GET('idRecette');

            $controleur = new PageRecetteControleur($idRecette, true);

            break;



        case 'validerRecette':

            $idRecette = getVariable_GET('idRecette');

            $controleur = new ValidationRecetteControleur($idRecette);

            break;



        case 'modifier-edito':

            $controleur = new ModifierEditoControleur();

            break;
@@ -65,6 +81,13 @@ try{ 
            $idRecette = getVariable_GET('idRecette');

            $controleur = new SupprimerRecetteControleur($idRecette);

            break;



        case 'recette-filtre':

            $filtre = getVariable_GET('filtre');

            $search = getVariable_GET('search');

            $controleur = new ListeRecettesFiltreesControleur($filtre,$search);

            break;

            

        default:

            throw new Exception("la page demandée n'a pas été trouvée");

    }

sql/insertions.sql

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,13 @@ VALUES 
'$2y$10$KdMnkhAn385H2QYaQy.DvOa8zTpq0X.RigK3uLKY9k60bwHPUJhGC', 

'test@test.fr', 'Test', 'Jean', '2023-11-05 12:18:13', 'E', 'A');



INSERT INTO CUI_UTILISATEUR (UTIL_PSEUDO, UTIL_MDP, UTIL_EMAIL, UTIL_NOM, UTIL_PRENOM, UTIL_DATE_INSCRIPTION, UTIL_TYPE, UTIL_STATUT)

VALUES

('admin',

'$2y$10$0yFsSedzqaLmYWom8Dwo1.6UGXZGe5s1Jvw3/0T/BVOl.SmPgd6HK',

'admin@admin.fr', 'Admin', 'Gilbert', NOW(), 'A', 'A'

);



-- -------TAG------------- --



INSERT INTO CUI_TAG(TAG_INTITULE, TAG_DESCRIPTION)

src/controllers/ListeRecettesFiltreesControleur.php

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?php

require_once 'src/model/recetteManager.php';

require_once 'src/controllers/controleur.php';



require_once 'templates/carteRecette.php';

require_once 'templates/nosRecettes.php';





class ListeRecettesFiltreesControleur extends Controleur

{

    private String $Filtre;

    private String $ID;

    public function __construct($Filtre , $ID)

    {

        $this->Filtre=$Filtre;

        $this->ID=$ID;

    }



    /**

     * @throws Exception

     */

    public function executer()

    {

        $recettes = (new RecetteManager)->getRecettesFiltre($this->Filtre,$this->ID);

        afficherListeRecettes($recettes);

    }

}
 
 No newline at end of file

src/controllers/pageRecette.php

+15 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
declare(strict_types=1);



require_once 'src/controllers/controleur.php';

require_once 'src/controllers/connexion.php';



require_once 'src/model/recette.php';

require_once 'src/model/recetteManager.php';
@@ -11,15 +12,27 @@ require_once 'templates/pageRecette.php'; 


class PageRecetteControleur extends Controleur {

    private Recette $recette;

    private bool $admin;



    public function __construct(string $idRecette, bool $admin = false){

        $this->admin = $admin;



    public function __construct(string $idRecette){

        $this->recette = (new RecetteManager)->getRecette($idRecette);

        if(! $this->recette){

            throw new Exception("cette recette n'existe pas");

        }



        if(! $admin){

            return;

        }



        $utilisateur = ConnexionController::estConnecte();

        if(! $utilisateur || ! $utilisateur->estAdministrateur()){

            throw new Exception('accès refusé');

        }

    }



    public function executer() {

        afficherPageRecette($this->recette);

        afficherPageRecette($this->recette, $this->admin);

    }

}
 
 No newline at end of file