diff --git a/WEB-INF/src/controleur/Authent.java b/WEB-INF/src/controleur/Authent.java
index d8ff72e74e4e59257effe5da69d7550cdc09079b..12a6085863bb53d034beaac093e0912cbdee9f44 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 38af53ae826f503d2fe5c50aad2fb4baa0789d98..3ac5088713e1211226569f0e34e63c77820daac2 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 188ef0d6e0e5072ab68e69c7866b4eb23d0cf3aa..be14c35edcbc7ab38d33ab196853cdc268795f2e 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 cd0c1b29c3a4b0d8cd8a5a639073a4ce5ceaf8ca..49133990e4432bdea00a6b86df416c4a25dfe0cf 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 c55042c0a575a7272437e33019ede468bc36adc2..a6e551d68003e8471c27b3cf6de9f034827ee387 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 ae7344dcb7358d53dbfd55e245072aea0821f231..7ae5da5774e6ec4993a998e9eadfb20b2730b9e3 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 3bc50fad6f722c8394ef12cf7a5e5e3dfdd69a14..f58af076f025bb202b476b1a4036b25ada70ebcc 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 f5a2ea1f6b528dad133afb1852c964aff562f014..687fb917b07a017921bc77ca2a14eb2fd38b5ee0 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 c0a1dfb564049738fccf7300081ede2bc29dc41b..51d674c28a5e361eec608896636d6dc073a0b7e2 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 8597b31b9ba7d023d4c61b736b2ea9019de3fcc5..2a1613053586c91e4b0ec03470f163e867c89ba7 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 a0ee740f6516648ac082ce30626765d6e9ccbcfc..f9a92478d1875973c44713b115e74ce5b79a8fca 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 b054b5913003384c8f55f86690600402cf08d9af..37b44ef6345a27aada795d1d6e4975f45e40266c 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 3d5650aafc96217a5b6f0278d879d7345f5b86e7..687fb917b07a017921bc77ca2a14eb2fd38b5ee0 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 c0a1dfb564049738fccf7300081ede2bc29dc41b..51d674c28a5e361eec608896636d6dc073a0b7e2 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 8597b31b9ba7d023d4c61b736b2ea9019de3fcc5..2a1613053586c91e4b0ec03470f163e867c89ba7 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 a0ee740f6516648ac082ce30626765d6e9ccbcfc..f9a92478d1875973c44713b115e74ce5b79a8fca 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 b054b5913003384c8f55f86690600402cf08d9af..37b44ef6345a27aada795d1d6e4975f45e40266c 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>