From 106d4226e6666ae87989268bad9f5db7384eeb07 Mon Sep 17 00:00:00 2001 From: Joshua Date: Thu, 21 Nov 2024 16:21:37 +0100 Subject: [PATCH] Finition Section "Compte" --- public/css/{ => Compte}/GestionUser.css | 0 public/css/{compte => Compte}/index.css | 0 public/css/{Index.css => Index/index.css} | 0 public/css/modal.css | 152 ------------------- public/js/{test.js => Compte/CompteModal.js} | 0 src/Controller/LoginController.php | 2 +- templates/index/admin.html.twig | 7 +- templates/index/cuisinier.html.twig | 4 +- templates/index/serveur.html.twig | 4 +- templates/user/gestion.html.twig | 2 +- 10 files changed, 10 insertions(+), 161 deletions(-) rename public/css/{ => Compte}/GestionUser.css (100%) rename public/css/{compte => Compte}/index.css (100%) rename public/css/{Index.css => Index/index.css} (100%) delete mode 100644 public/css/modal.css rename public/js/{test.js => Compte/CompteModal.js} (100%) diff --git a/public/css/GestionUser.css b/public/css/Compte/GestionUser.css similarity index 100% rename from public/css/GestionUser.css rename to public/css/Compte/GestionUser.css diff --git a/public/css/compte/index.css b/public/css/Compte/index.css similarity index 100% rename from public/css/compte/index.css rename to public/css/Compte/index.css diff --git a/public/css/Index.css b/public/css/Index/index.css similarity index 100% rename from public/css/Index.css rename to public/css/Index/index.css diff --git a/public/css/modal.css b/public/css/modal.css deleted file mode 100644 index f09f4d3..0000000 --- a/public/css/modal.css +++ /dev/null @@ -1,152 +0,0 @@ -.top-bar { - background-color: #db5559; - width: calc(100% - 18%); /*Calcule la totalité de l'écran - le left-background */ - height: 60px; - position: fixed; - top: 0; - left: 18%; /*Evite le chauvechement des 2 bars */ - display: flex; - justify-content: space-between; - align-items: center; - padding: 0 20px; - color: white; - font-size: 18px; - box-sizing: border-box; /* Inclut le padding dans la largeur totale */ -} - - -.user-role { - background-color: white; - color: black; - padding: 10px 15px; - font-weight: bold; - overflow: hidden; -} - - - -.left-background { - background-color: #db5559; - width: 18%; - height: 100%; - position: fixed; - top: 0; - left: 0; - display: flex; - flex-direction: column; - justify-content: space-between; -} - - -.index-title-page { - color: #FFFFFF; - font-size: 60px; - padding-bottom: 10px; - font-family: 'Brittany Signature', sans-serif; -} - -ul { - list-style-type: none; - padding: 0; -} - -li { - padding-bottom: 30px; -} - -.btn-custom { - background-color: #FFFFFF; - color: black; - padding: 15px 40px; - font-size: 16px; - font-weight: bold; - cursor: pointer; - display: inline-block; - - border-right: 5px solid #db5559; - border-left: 5px solid #db5559; -} - - -.btn-custom:hover, .btn-info-compte:hover, .btn-info-exit:hover { - background-color: #f8b5b5; - color: #FFFFFF; -} - -.icon-medium { - width: 25px; - height: 25px; -} - -.icon-container { - display: flex; - align-items: center; - gap: 10px; -} - - -.Information-perso { - display: flex; - justify-content: space-between; - padding: 20px; - margin-top: auto; -} - -.btn-info-compte, .btn-info-exit { - background-color: #FFFFFF; - color: black; - padding: 10px 20px; - font-size: 16px; - font-weight: bold; - cursor: pointer; - border: 1px solid black; -} - -.btn-info-compte { - width: 50%; - height: 30px; -} - -.btn-info-exit { - width: 10%; - height: 30px; -} - -/* Style pour la modal (cachée par défaut) */ -.modal { - display: none; /* Masquée par défaut */ - position: fixed; - z-index: 1; /* Au-dessus du contenu normal */ - left: 18%; /* Commence juste après ton left-background */ - top: 0; - width: 82%; /* Prend le reste de la largeur après le left-background */ - height: 100%; /* Prend toute la hauteur de l'écran */ - background-color: rgba(0, 0, 0, 0.4); /* Couleur d'arrière-plan avec transparence */ - overflow: auto; /* Permet le défilement si le contenu dépasse */ -} - -/* Contenu de la modal */ -.modal-content { - background-color: white; - margin: 5% auto; /* Centrage vertical */ - padding: 20px; - border: 1px solid black; - width: 80%; /* Largeur du contenu de la modal */ - height: 80%; /* Hauteur du contenu de la modal */ - box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2); -} - -/* Bouton de fermeture */ -.close { - color: black; - float: right; - font-size: 28px; - font-weight: bold; -} - -.close:hover, -.close:focus { - color: red; - cursor: pointer; -} - diff --git a/public/js/test.js b/public/js/Compte/CompteModal.js similarity index 100% rename from public/js/test.js rename to public/js/Compte/CompteModal.js diff --git a/src/Controller/LoginController.php b/src/Controller/LoginController.php index c40906c..9b6ac82 100644 --- a/src/Controller/LoginController.php +++ b/src/Controller/LoginController.php @@ -18,7 +18,7 @@ class LoginController extends AbstractController // last username entered by the user $lastUsername = $authenticationUtils->getLastUsername(); - return $this->render('login/gestion.html.twig', ['last_username' => $lastUsername, 'error' => $error]); + return $this->render('login/index.html.twig', ['last_username' => $lastUsername, 'error' => $error]); } diff --git a/templates/index/admin.html.twig b/templates/index/admin.html.twig index 7554c1c..8318f64 100644 --- a/templates/index/admin.html.twig +++ b/templates/index/admin.html.twig @@ -10,8 +10,9 @@ {% endblock %} {% block stylesheets %} - - + + + {% endblock %} {% block body %} @@ -130,5 +131,5 @@ {% endblock %} {% block javascripts %} - + {% endblock %} \ No newline at end of file diff --git a/templates/index/cuisinier.html.twig b/templates/index/cuisinier.html.twig index 93d945c..c3d6c12 100644 --- a/templates/index/cuisinier.html.twig +++ b/templates/index/cuisinier.html.twig @@ -10,7 +10,7 @@ {% endblock %} {% block stylesheets %} - + {% endblock %} @@ -84,7 +84,7 @@ + {% endblock %}