From 129fe541f7f3da01437d7e904a6593accfa14a19 Mon Sep 17 00:00:00 2001
From: mepiphana2023 <marvin.eph@gmail.com>
Date: Thu, 25 Apr 2024 10:44:59 +0200
Subject: [PATCH] user detail

---
 .../java/fr/eni/enchere/controllers/AccueilController.java    | 4 +++-
 src/main/resources/templates/inscription.html                 | 4 ++--
 src/main/resources/templates/security/login.html              | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/fr/eni/enchere/controllers/AccueilController.java b/src/main/java/fr/eni/enchere/controllers/AccueilController.java
index e8a1ac2..d00e519 100644
--- a/src/main/java/fr/eni/enchere/controllers/AccueilController.java
+++ b/src/main/java/fr/eni/enchere/controllers/AccueilController.java
@@ -50,7 +50,9 @@ public class AccueilController {
         SearchArticleCritere critere = new SearchArticleCritere();
         critere.setNoCategorie(searchCategory);
         critere.setTitle(searchTitle);
-        critere.setNoVendeur(userService.utilisateurByName(userDetails.getUsername()).getId());
+        if(userDetails != null) {
+            critere.setNoVendeur(userService.utilisateurByName(userDetails.getUsername()).getId());
+        }
         critere.setVenteOptions(venteOptions);
         critere.setAchatOptions(venteOptions);
         model.addAttribute("articles", articleService.searchArticle(critere));
diff --git a/src/main/resources/templates/inscription.html b/src/main/resources/templates/inscription.html
index abe53e1..af30f07 100644
--- a/src/main/resources/templates/inscription.html
+++ b/src/main/resources/templates/inscription.html
@@ -107,7 +107,7 @@
                 </span>
             </div>
             <div class="champ-saisie">
-                <label for="password" th:text="#{re}">Mot de passe: </label>
+                <label for="password">Mot de passe: </label>
                 <div>
                     <input type="password" th:field="*{password}" id="password" />
                 </div>
@@ -118,7 +118,7 @@
                 </span>
             </div>
             <div class="champ-saisie">
-                <label for="confirmPassword" th:text="#{}">Confirmation du mot de passe: </label>
+                <label for="confirmPassword">Confirmation du mot de passe: </label>
                 <div>
                     <input type="password" id="confirmPassword" />
                 </div>
diff --git a/src/main/resources/templates/security/login.html b/src/main/resources/templates/security/login.html
index 20b4228..0fcca71 100644
--- a/src/main/resources/templates/security/login.html
+++ b/src/main/resources/templates/security/login.html
@@ -26,7 +26,7 @@
                 </div>
                 <div class="mb-3">
                     <button type="submit" class="btn btn-primary">Connexion</button>
-                    <button type="button" class="btn btn-warning text-light" href="/inscription">Créer un compte </button>
+                    <button class="btn btn-warning text-light" href="/inscription">Créer un compte </button>
                 </div>
             </form>
             <div th:if="${param.error}" class="text-danger">