From 3713edd3fa9d834a11b79fc418ed325edd7dcb86 Mon Sep 17 00:00:00 2001
From: Parpaillax <parpaillax@orange.fr>
Date: Wed, 24 Apr 2024 14:46:02 +0200
Subject: [PATCH] better UI/UX

---
 .../java/fr/eni/enchere/interceptor/UserInterceptor.java   | 1 -
 src/main/resources/i18n/messages_fr.properties             | 7 ++++---
 src/main/resources/templates/editProfil.html               | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java b/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java
index f7f33bf..a7c2b6e 100644
--- a/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java
+++ b/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java
@@ -27,7 +27,6 @@ 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());
-                System.out.println(user);
                 modelAndView.getModelMap().addAttribute("user", user.getCredit());
             }
         }
diff --git a/src/main/resources/i18n/messages_fr.properties b/src/main/resources/i18n/messages_fr.properties
index 9f3a9ce..04d8eb9 100644
--- a/src/main/resources/i18n/messages_fr.properties
+++ b/src/main/resources/i18n/messages_fr.properties
@@ -2,7 +2,7 @@ accueil.search.title = Rechercher un article par nom...
 accueil.search.cat = Toutes les cat\u00e9gories
 accueil.search.button = Recherche
 
-profil.title = Mon profil
+profil.title = Mon profile
 profil.button = Modifier
 profil.pseudo = Pseudo:
 profil.surname = Pr\u00e9nom:
@@ -17,8 +17,9 @@ profil.credit = Cr\u00e9dits:
 edit.profil.currentpassword = Mot de passe actuel:
 edit.profil.newpassword = Nouveau mot de passe:
 edit.profil.confirmnewpassword = Confirmation du nouveau mot de passe:
-edit.profil.title = Modifier mon profil
+edit.profil.title = Modifier mon profile
 edit.profil.button.edit = Enregistrer les modifications
+edit.profil.button.cancel = Annuler les modifications
 edit.profil.button.del = Supprimer mon compte
 
 login.title = Pour se Connecter :
@@ -29,7 +30,7 @@ login.forgotpassword = Mot de passe oubli\u00e9
 login.connection = Connexion
 login.makecompte = Cr\u00e9er un compte
 
-register.title = Mon profil
+register.title = Mon profile
 register.button = Modifier
 register.pseudo = Pseudo:
 register.surname = Pr\u00e9nom:
diff --git a/src/main/resources/templates/editProfil.html b/src/main/resources/templates/editProfil.html
index a6f2ba4..32a8301 100644
--- a/src/main/resources/templates/editProfil.html
+++ b/src/main/resources/templates/editProfil.html
@@ -110,7 +110,10 @@
                     <span th:text="#{profil.credit}"></span> <span th:text="${userProfile.credit}"></span>
                 </div>
                 <input type="hidden" th:field="*{id}" id="userId" th:value="${userProfile.id}">
-                <button type="submit" class="btn btn-primary" th:text="#{edit.profil.button.edit}"></button>
+                <div class="d-flex justify-content-end align-items-center">
+                    <a class="btn btn-secondary" href="/accueil" th:text="#{edit.profil.button.cancel}"></a>
+                    <button type="submit" class="btn btn-primary ml-2" th:text="#{edit.profil.button.edit}"></button>
+                </div>
             </div>
         </div>
     </form>