From 7fc748caf3981365b442ae2fab8b580805ec5245 Mon Sep 17 00:00:00 2001 From: Parpaillax Date: Thu, 25 Apr 2024 10:45:02 +0200 Subject: [PATCH] test --- .../controllers/ArticleController.java | 7 ++-- .../enchere/dal/CategorieRepositoryImpl.java | 2 +- .../enchere/security/WebSecurityConfig.java | 3 +- src/main/resources/templates/accueil.html | 34 ++++++++++--------- src/main/resources/templates/article.html | 12 +++++-- .../resources/templates/security/login.html | 2 +- 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/src/main/java/fr/eni/enchere/controllers/ArticleController.java b/src/main/java/fr/eni/enchere/controllers/ArticleController.java index 3485233..491a289 100644 --- a/src/main/java/fr/eni/enchere/controllers/ArticleController.java +++ b/src/main/java/fr/eni/enchere/controllers/ArticleController.java @@ -5,6 +5,7 @@ import fr.eni.enchere.bll.CategorieService; import fr.eni.enchere.bll.RetraitService; import fr.eni.enchere.bll.UserService; import fr.eni.enchere.bo.Article; +import fr.eni.enchere.bo.Categorie; import fr.eni.enchere.bo.Retrait; import fr.eni.enchere.bo.UserProfil; import org.springframework.beans.factory.annotation.Autowired; @@ -49,10 +50,10 @@ public class ArticleController { if (!authentication.getName().equals("anonymousUser")) { Article article = articleService.findArticleById(id); UserProfil user = userService.utilisateurById(article.getUtilisateur()); - System.out.println(article); - System.out.println(user); + Categorie cate = categorieService.findCategorieById(article.getNumCategorie()); model.addAttribute("article", article); - model.addAttribute("user", user); + model.addAttribute("username", user.getPseudo()); + model.addAttribute("cate", cate.getLibelle()); return "article"; } else { return "redirect:/accueil"; diff --git a/src/main/java/fr/eni/enchere/dal/CategorieRepositoryImpl.java b/src/main/java/fr/eni/enchere/dal/CategorieRepositoryImpl.java index 6d8a90a..478e802 100644 --- a/src/main/java/fr/eni/enchere/dal/CategorieRepositoryImpl.java +++ b/src/main/java/fr/eni/enchere/dal/CategorieRepositoryImpl.java @@ -42,7 +42,7 @@ public class CategorieRepositoryImpl implements CategorieRepository { @Override public Categorie findCategorieById(int id) { - String sql = "SELECT * FROM CATEGORIES WHERE no_categorie = :id"; + String sql = "SELECT * FROM CATEGORIES WHERE no_categorie = ?"; Categorie categorie = jdbcTemplate.queryForObject(sql, new CategorieRowMapper(), id); return categorie; } diff --git a/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java b/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java index 5b907f5..49acdb4 100644 --- a/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java +++ b/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java @@ -16,8 +16,7 @@ public class WebSecurityConfig{ @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http.authorizeHttpRequests((requests) -> requests - .requestMatchers("/", "/accueil").permitAll() - .requestMatchers("/accueil", "/login", "/inscription/**", "/searchArticle", "/article/show", "/change-language").permitAll() + .requestMatchers("/","/accueil", "/login", "/inscription/**", "/searchArticle", "/article/show", "/change-language").permitAll() .requestMatchers("/css/**", "/images/**", "/assets/**", "/img/**", "/js/**", "/assets/**", "/i18n/**").permitAll() .requestMatchers("/profil/**", "/article/new/**", "/article/update", "/article/delete").authenticated() .requestMatchers("/admin").hasRole("ADMIN") diff --git a/src/main/resources/templates/accueil.html b/src/main/resources/templates/accueil.html index 0e03048..bc94a0a 100644 --- a/src/main/resources/templates/accueil.html +++ b/src/main/resources/templates/accueil.html @@ -95,27 +95,29 @@
-
-
-
- Image de l'article -
-
-
-
Nom de l'article
-

Description

-
- +
diff --git a/src/main/resources/templates/article.html b/src/main/resources/templates/article.html index 0a58ec1..a554252 100644 --- a/src/main/resources/templates/article.html +++ b/src/main/resources/templates/article.html @@ -16,9 +16,15 @@
    • - - - +
  • + +
    • +
  • + +
    • +
  • + +
    • diff --git a/src/main/resources/templates/security/login.html b/src/main/resources/templates/security/login.html index 20b4228..cb7dec2 100644 --- a/src/main/resources/templates/security/login.html +++ b/src/main/resources/templates/security/login.html @@ -26,7 +26,7 @@
    - +