From 915e3356fc3bfd87d3c4ee88fe8275e08da01150 Mon Sep 17 00:00:00 2001 From: mepiphana2023 Date: Wed, 24 Apr 2024 10:08:22 +0200 Subject: [PATCH] fichier langue / bootstrap --- .../fr/eni/enchere/controllers/LoginController.java | 5 +++++ .../fr/eni/enchere/security/WebSecurityConfig.java | 2 +- src/main/resources/i18n/messages_fr.properties | 4 +++- src/main/resources/templates/accueil.html | 9 +++------ src/main/resources/templates/editProfil.html | 5 ++++- src/main/resources/templates/modele-page.html | 11 +++++------ 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main/java/fr/eni/enchere/controllers/LoginController.java b/src/main/java/fr/eni/enchere/controllers/LoginController.java index dcd0ce7..b81fb7f 100644 --- a/src/main/java/fr/eni/enchere/controllers/LoginController.java +++ b/src/main/java/fr/eni/enchere/controllers/LoginController.java @@ -34,4 +34,9 @@ public class LoginController { return "redirect:/security/login?error"; } } + + @GetMapping("/logout") + public String logout(Model modele) { + return "security/logout"; + } } diff --git a/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java b/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java index 076a4fd..e1cedbd 100644 --- a/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java +++ b/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java @@ -18,7 +18,7 @@ public class WebSecurityConfig{ http.authorizeHttpRequests((requests) -> requests .requestMatchers("/", "/accueil").permitAll() .requestMatchers("/accueil", "/login", "/inscription/**", "/searchArticle", "/article/**", "/change-language", "/profile/**").permitAll() - .requestMatchers("/css/**", "/images/**", "/assets/**", "/img/**", "/js/**").permitAll() + .requestMatchers("/css/**", "/images/**", "/assets/**", "/img/**", "/js/**", "/assets/**").permitAll() .requestMatchers("/profile/**").authenticated() .requestMatchers("/admin").hasRole("ADMIN") .anyRequest().authenticated()) diff --git a/src/main/resources/i18n/messages_fr.properties b/src/main/resources/i18n/messages_fr.properties index 6f897e7..de19788 100644 --- a/src/main/resources/i18n/messages_fr.properties +++ b/src/main/resources/i18n/messages_fr.properties @@ -1 +1,3 @@ -accueil.search.title = Rechercher un article par nom... \ No newline at end of file +accueil.search.title = Rechercher un article par nom... +accueil.search.cat = Toutes les catégories +accueil.search.button = Recherche \ No newline at end of file diff --git a/src/main/resources/templates/accueil.html b/src/main/resources/templates/accueil.html index 6f5c451..8b0f2b1 100644 --- a/src/main/resources/templates/accueil.html +++ b/src/main/resources/templates/accueil.html @@ -1,9 +1,7 @@ - + - -
@@ -18,11 +16,11 @@
- + @@ -55,6 +53,5 @@ - \ No newline at end of file diff --git a/src/main/resources/templates/editProfil.html b/src/main/resources/templates/editProfil.html index ca6c711..e72cea2 100644 --- a/src/main/resources/templates/editProfil.html +++ b/src/main/resources/templates/editProfil.html @@ -1,7 +1,9 @@ - + + +
@@ -144,5 +146,6 @@
+ diff --git a/src/main/resources/templates/modele-page.html b/src/main/resources/templates/modele-page.html index 5bbc9d2..5d4572f 100644 --- a/src/main/resources/templates/modele-page.html +++ b/src/main/resources/templates/modele-page.html @@ -3,15 +3,15 @@ [[${title}]] - - - + + +