From d60fa01d3d4d9f76505b117ecaf8062429bf95e7 Mon Sep 17 00:00:00 2001 From: mepiphana2023 Date: Wed, 24 Apr 2024 16:52:38 +0200 Subject: [PATCH 1/2] accueil / login bootstrap --- .../controllers/ArticleController.java | 2 +- src/main/resources/templates/accueil.html | 23 +++++++++- .../resources/templates/security/login.html | 44 ++++++++++++------- 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/main/java/fr/eni/enchere/controllers/ArticleController.java b/src/main/java/fr/eni/enchere/controllers/ArticleController.java index d52051f..f5aac1b 100644 --- a/src/main/java/fr/eni/enchere/controllers/ArticleController.java +++ b/src/main/java/fr/eni/enchere/controllers/ArticleController.java @@ -76,7 +76,7 @@ public class ArticleController { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); String username = authentication.getName(); UserProfil userProfile = userService.utilisateurByName(username); - article.setUtilisateur(userProfile.getId()); + article.setNoUtilisateur(userProfile.getId()); //Récupérer le lieu de retrait Retrait retrait = new Retrait(); retrait.setRue(rue); diff --git a/src/main/resources/templates/accueil.html b/src/main/resources/templates/accueil.html index 6d6f6c4..64a6ec7 100644 --- a/src/main/resources/templates/accueil.html +++ b/src/main/resources/templates/accueil.html @@ -17,17 +17,38 @@
+
+
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+
diff --git a/src/main/resources/templates/security/login.html b/src/main/resources/templates/security/login.html index 9fdbcb1..20b4228 100644 --- a/src/main/resources/templates/security/login.html +++ b/src/main/resources/templates/security/login.html @@ -3,30 +3,40 @@ - -
-

Pour se Connecter :

-
+ +
+
+
+

Pour se Connecter :

-
- - +
+ +
-
- - +
+ + +
+
+ + +
+
+ Mot de passe oublié +
+
+ +
-
- -
-
+
Identifiant ou mot de passe incorrect
-
+
Vous avez été déconnecté
-
- +
+
+ \ No newline at end of file From 119c45b3ec13a6c6874decf1023f30268dd74f18 Mon Sep 17 00:00:00 2001 From: Parpaillax Date: Wed, 24 Apr 2024 16:53:04 +0200 Subject: [PATCH 2/2] aled --- .../controllers/ArticleController.java | 13 +++++-- .../enchere/dal/ArticleRepositoryImpl.java | 4 ++- .../enchere/interceptor/UserInterceptor.java | 4 ++- .../UserServiceInterceptorAppConfig.java | 13 ------- src/main/resources/templates/accueil.html | 34 ++++++++++--------- src/main/resources/templates/article.html | 17 +++++++++- 6 files changed, 50 insertions(+), 35 deletions(-) delete mode 100644 src/main/java/fr/eni/enchere/interceptor/UserServiceInterceptorAppConfig.java diff --git a/src/main/java/fr/eni/enchere/controllers/ArticleController.java b/src/main/java/fr/eni/enchere/controllers/ArticleController.java index f5aac1b..f2a56f9 100644 --- a/src/main/java/fr/eni/enchere/controllers/ArticleController.java +++ b/src/main/java/fr/eni/enchere/controllers/ArticleController.java @@ -43,9 +43,16 @@ public class ArticleController { //Affichage d'un article @GetMapping("/show") - public String showArticle(@RequestParam(name = "slug")int id, Model model) { - Article article = articleService.findArticleById(id); - return "article"; + public String showArticle(@RequestParam()int id, Model model) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (!authentication.getName().equals("anonymousUser")) { + Article article = articleService.findArticleById(id); + System.out.println(article); + model.addAttribute("article", article); + return "article"; + } else { + return "redirect:/accueil"; + } } @GetMapping("/{slug}") diff --git a/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java b/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java index bc68018..e198782 100644 --- a/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java +++ b/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java @@ -80,7 +80,9 @@ public class ArticleRepositoryImpl implements ArticleRepository { @Override public Article findArticleById(int id) { - return null; + String sql = "SELECT * FROM ARTICLES_VENDUS a WHERE no_article = ?"; + Article article = jdbcTemplate.queryForObject(sql, new ArticleRowMapper(), id); + return article; } @Override diff --git a/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java b/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java index a7c2b6e..b58d0ed 100644 --- a/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java +++ b/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java @@ -27,7 +27,9 @@ public class UserInterceptor implements HandlerInterceptor { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication != null && authentication.isAuthenticated() && !authentication.getName().equals("anonymousUser")) { UserProfil user = this.userService.utilisateurByName(authentication.getName()); - modelAndView.getModelMap().addAttribute("user", user.getCredit()); + if (modelAndView != null && modelAndView.getViewName() != null && !modelAndView.getViewName().startsWith("redirect:")) { + modelAndView.addObject("user", user.getCredit()); + } } } } diff --git a/src/main/java/fr/eni/enchere/interceptor/UserServiceInterceptorAppConfig.java b/src/main/java/fr/eni/enchere/interceptor/UserServiceInterceptorAppConfig.java deleted file mode 100644 index b6fb169..0000000 --- a/src/main/java/fr/eni/enchere/interceptor/UserServiceInterceptorAppConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -//package fr.eni.enchere.interceptor; -// -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -// -//public class UserServiceInterceptorAppConfig implements WebMvcConfigurer { -// -// @Override -// public void addInterceptors(InterceptorRegistry registry) { -// registry.addInterceptor(new UserInterceptor()); -// } -//} diff --git a/src/main/resources/templates/accueil.html b/src/main/resources/templates/accueil.html index 6d6f6c4..c5b5bb7 100644 --- a/src/main/resources/templates/accueil.html +++ b/src/main/resources/templates/accueil.html @@ -30,28 +30,30 @@
-
-
-
- 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 119c949..654c85a 100644 --- a/src/main/resources/templates/article.html +++ b/src/main/resources/templates/article.html @@ -5,7 +5,22 @@
- +
+
+
+
+

Article

+
+
+
    +
  • + +
    • +
+
+
+
+