From dc303e15eee7d2e8cb2623dfb2d14c9dde29e543 Mon Sep 17 00:00:00 2001
From: Florine Lefebvre <florine.lefebvre.etu@univ-lille.fr>
Date: Fri, 28 Feb 2025 12:52:12 +0100
Subject: [PATCH] correction fautes

---
 WEB-INF/src/controleur/Authent.java |  4 +--
 WEB-INF/vue/compte.jsp              | 48 ++++++++++++++++-------------
 WEB-INF/vue/creerFil.jsp            |  2 +-
 WEB-INF/vue/fils.jsp                |  2 +-
 WEB-INF/vue/filsSuivis.jsp          |  2 +-
 WEB-INF/vue/login.jsp               |  4 +--
 WEB-INF/vue/signin.jsp              |  4 +--
 accueil.html                        |  2 +-
 compte.html                         |  2 +-
 creerFil.html                       |  2 +-
 fils.html                           |  2 +-
 filsSuivis.html                     |  2 +-
 maquette/accueil.html               |  4 +--
 maquette/compte.html                |  2 +-
 maquette/creerFil.html              |  2 +-
 maquette/fils.html                  |  2 +-
 maquette/filsSuivis.html            |  2 +-
 17 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/WEB-INF/src/controleur/Authent.java b/WEB-INF/src/controleur/Authent.java
index d8ff72e..12a6085 100644
--- a/WEB-INF/src/controleur/Authent.java
+++ b/WEB-INF/src/controleur/Authent.java
@@ -45,7 +45,7 @@ public class Authent extends HttpServlet {
                 if (daoUser.checkUser(username, hashedPassword)) {
                     dispatch = false;
                     req.getSession().setAttribute("username", username);
-                    resp.sendRedirect("navigation?page=acceuil");
+                    resp.sendRedirect("navigation?page=accueil");
                 } else {
                     req.setAttribute("error", "Identifiant ou mot de passe incorrect");
                 }
@@ -59,7 +59,7 @@ public class Authent extends HttpServlet {
                     dispatch = false;
                     daoUser.create(new User(username, hashedPassword, firstname, lastname));
                     req.getSession().setAttribute("username", username);
-                    resp.sendRedirect("navigation?page=acceuil");
+                    resp.sendRedirect("navigation?page=accueil");
                 } catch (Exception e) {
                     req.setAttribute("error", "Nom d'utilisateur déjà pris");
                     vue = "WEB-INF/vue/signin.jsp";
diff --git a/WEB-INF/vue/compte.jsp b/WEB-INF/vue/compte.jsp
index 38af53a..3ac5088 100644
--- a/WEB-INF/vue/compte.jsp
+++ b/WEB-INF/vue/compte.jsp
@@ -31,7 +31,7 @@
                                 <img src="<%= request.getContextPath() %>/res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
@@ -60,16 +60,14 @@
                 </div>
                 <div class="col-sm p-3 min-vh-100 d-flex flex-column">
 
-                    <h1>Votre compte !</h1>
-                    <hr />
-                    
-                    <p>Sur cette page, vous pouvez voir et modifier les informations de votre compte, ainsi qu'obtenir la liste des fils que vous avez créé.</p>
-                    <div>
-                        Se déconnecter : 
+                    <h1 class="d-flex justify-content-between align-items-center">Votre compte !
                         <a href="account?action=logout" class="btn btn-outline-danger">
                             Déconnexion
                         </a>
-                    </div>
+                    </h1>
+                    <hr />
+                    
+                    <p>Sur cette page, vous pouvez voir et modifier les informations de votre compte, ainsi qu'obtenir la liste des fils que vous avez créé.</p>
 
                     <div class="d-flex justify-content-center mt-5">
                         <form id="modifyAccountForm" action="account" method="post" class="w-75">
@@ -103,26 +101,34 @@
                         <h4>Mes fils</h4>
                         <hr>
 
-                        <% for(Thread thread : daoThread.findByCreator(username)){ %>
-
-                        <div class="p-2 border border-primary border-3 rounded mb-3">
-                            <div class="d-flex justify-content-between">
-                                <div class="ms-2">
-                                    <p class="fs-3"><%= thread.getName() %></p>
-                                    <span class="text-secondary">Par vous le <%= thread.getDate().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) %></span>
-                                </div>
-                                <div class="d-flex">
-                                    <a class="me-3 align-self-center btn btn-primary" href="?chat=<%= thread.getId_thread() %>">Ouvrir <i class="bi-chat-fill"></i></a>
-                                    <a class="me-3 align-self-center btn btn-danger" href="thread?action=delete&id=<%= thread.getId_thread() %>">Supprimer <i class="bi-x-circle-fill"></i></a>
+                        <%  if (daoThread.findByCreator(username).size() == 0){ %>
+                            <div class="p-2 mb-3">
+                                <div class="d-flex justify-content-center align-items-center">
+                                    <label class="fs-3">Vous n'avez pas de fil !</label>
+                                    <a class="ms-3 align-self-center btn btn-success" href="navigation?page=creerFil">Créer un fil <i class="bi-plus-square-fill"></i></a>
                                 </div>
                             </div>
-                        </div>
+                        <% } else {%> 
 
-                        <% } %>
+                            <% for(Thread thread : daoThread.findByCreator(username)){ %>
 
+                            <div class="p-2 border border-primary border-3 rounded mb-3">
+                                <div class="d-flex justify-content-between">
+                                    <div class="ms-2">
+                                        <p class="fs-3"><%= thread.getName() %></p>
+                                        <span class="text-secondary">Par vous le <%= thread.getDate().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) %></span>
+                                    </div>
+                                    <div class="d-flex">
+                                        <a class="me-3 align-self-center btn btn-primary" href="?chat=<%= thread.getId_thread() %>">Ouvrir <i class="bi-chat-fill"></i></a>
+                                        <a class="me-3 align-self-center btn btn-danger" href="thread?action=delete&id=<%= thread.getId_thread() %>">Supprimer <i class="bi-x-circle-fill"></i></a>
+                                    </div>
+                                </div>
+                            </div>
+                            <% } %>
                         <div class="bg-light p-3 d-flex justify-content-center border-top border-3">
                             <a href="#" class="btn btn-outline-secondary">Remonter <i class="bi-arrow-up"></i></a>
                         </div>
+                        <% } %>
                     </div>
                 </div>
             </div>
diff --git a/WEB-INF/vue/creerFil.jsp b/WEB-INF/vue/creerFil.jsp
index 188ef0d..be14c35 100644
--- a/WEB-INF/vue/creerFil.jsp
+++ b/WEB-INF/vue/creerFil.jsp
@@ -19,7 +19,7 @@
                                 <img src="<%= request.getContextPath() %>/res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/WEB-INF/vue/fils.jsp b/WEB-INF/vue/fils.jsp
index cd0c1b2..4913399 100644
--- a/WEB-INF/vue/fils.jsp
+++ b/WEB-INF/vue/fils.jsp
@@ -34,7 +34,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/WEB-INF/vue/filsSuivis.jsp b/WEB-INF/vue/filsSuivis.jsp
index c55042c..a6e551d 100644
--- a/WEB-INF/vue/filsSuivis.jsp
+++ b/WEB-INF/vue/filsSuivis.jsp
@@ -33,7 +33,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/WEB-INF/vue/login.jsp b/WEB-INF/vue/login.jsp
index ae7344d..7ae5da5 100644
--- a/WEB-INF/vue/login.jsp
+++ b/WEB-INF/vue/login.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%
-    // l'authentification - redirection vers l'acceuil si deja connecté
-    if(request.getSession().getAttribute("username") != null) response.sendRedirect("navigation?page=acceuil");
+    // l'authentification - redirection vers l'accueil si deja connecté
+    if(request.getSession().getAttribute("username") != null) response.sendRedirect("navigation?page=accueil");
 %>
 <!DOCTYPE html>
 <html>
diff --git a/WEB-INF/vue/signin.jsp b/WEB-INF/vue/signin.jsp
index 3bc50fa..f58af07 100644
--- a/WEB-INF/vue/signin.jsp
+++ b/WEB-INF/vue/signin.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%
-    // l'authentification - redirection vers l'acceuil si deja connecté
-    if(request.getSession().getAttribute("username") != null) response.sendRedirect("navigation?page=acceuil");
+    // l'authentification - redirection vers l'accueil si deja connecté
+    if(request.getSession().getAttribute("username") != null) response.sendRedirect("navigation?page=accueil");
 %>
 
 <!DOCTYPE html>
diff --git a/accueil.html b/accueil.html
index f5a2ea1..687fb91 100644
--- a/accueil.html
+++ b/accueil.html
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house-fill fs-1"></i>
                                 </a>
                             </li>
diff --git a/compte.html b/compte.html
index c0a1dfb..51d674c 100644
--- a/compte.html
+++ b/compte.html
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/creerFil.html b/creerFil.html
index 8597b31..2a16130 100644
--- a/creerFil.html
+++ b/creerFil.html
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/fils.html b/fils.html
index a0ee740..f9a9247 100644
--- a/fils.html
+++ b/fils.html
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/filsSuivis.html b/filsSuivis.html
index b054b59..37b44ef 100644
--- a/filsSuivis.html
+++ b/filsSuivis.html
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/maquette/accueil.html b/maquette/accueil.html
index 3d5650a..687fb91 100644
--- a/maquette/accueil.html
+++ b/maquette/accueil.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-        <title>Villeneuve Chat - accueil</title>
+        <title>Villeneuve Chat - Accueil</title>
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css">
         <link href="res/font.css" rel="stylesheet">
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house-fill fs-1"></i>
                                 </a>
                             </li>
diff --git a/maquette/compte.html b/maquette/compte.html
index c0a1dfb..51d674c 100644
--- a/maquette/compte.html
+++ b/maquette/compte.html
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/maquette/creerFil.html b/maquette/creerFil.html
index 8597b31..2a16130 100644
--- a/maquette/creerFil.html
+++ b/maquette/creerFil.html
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/maquette/fils.html b/maquette/fils.html
index a0ee740..f9a9247 100644
--- a/maquette/fils.html
+++ b/maquette/fils.html
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
diff --git a/maquette/filsSuivis.html b/maquette/filsSuivis.html
index b054b59..37b44ef 100644
--- a/maquette/filsSuivis.html
+++ b/maquette/filsSuivis.html
@@ -17,7 +17,7 @@
                                 <img src="res/mini_logo.png" width="45px">
                             </div>
                             <li class="nav-item">
-                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="accueil" data-bs-toggle="tooltip" data-bs-placement="right">
+                                <a href="navigation?page=accueil" class="nav-link py-3 px-2" title="Accueil" data-bs-toggle="tooltip" data-bs-placement="right">
                                     <i class="bi-house fs-1"></i>
                                 </a>
                             </li>
-- 
GitLab