Skip to content
Snippets Groups Projects
Commit dc303e15 authored by Florine Lefebvre's avatar Florine Lefebvre :stuck_out_tongue_closed_eyes:
Browse files

correction fautes

parent 2aad1cad
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 41 deletions
WEB-INF/src/controleur/Authent.java
+ 2
− 2
View file @ dc303e15
...@@ -45,7 +45,7 @@ public class Authent extends HttpServlet { ...@@ -45,7 +45,7 @@ public class Authent extends HttpServlet {
if (daoUser.checkUser(username, hashedPassword)) { if (daoUser.checkUser(username, hashedPassword)) {
dispatch = false; dispatch = false;
req.getSession().setAttribute("username", username); req.getSession().setAttribute("username", username);
resp.sendRedirect("navigation?page=acceuil"); resp.sendRedirect("navigation?page=accueil");
} else { } else {
req.setAttribute("error", "Identifiant ou mot de passe incorrect"); req.setAttribute("error", "Identifiant ou mot de passe incorrect");
} }
...@@ -59,7 +59,7 @@ public class Authent extends HttpServlet { ...@@ -59,7 +59,7 @@ public class Authent extends HttpServlet {
dispatch = false; dispatch = false;
daoUser.create(new User(username, hashedPassword, firstname, lastname)); daoUser.create(new User(username, hashedPassword, firstname, lastname));
req.getSession().setAttribute("username", username); req.getSession().setAttribute("username", username);
resp.sendRedirect("navigation?page=acceuil"); resp.sendRedirect("navigation?page=accueil");
} catch (Exception e) { } catch (Exception e) {
req.setAttribute("error", "Nom d'utilisateur déjà pris"); req.setAttribute("error", "Nom d'utilisateur déjà pris");
vue = "WEB-INF/vue/signin.jsp"; vue = "WEB-INF/vue/signin.jsp";
......
WEB-INF/vue/compte.jsp
+ 27
− 21
View file @ dc303e15
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<img src="<%= request.getContextPath() %>/res/mini_logo.png" width="45px"> <img src="<%= request.getContextPath() %>/res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
...@@ -60,16 +60,14 @@ ...@@ -60,16 +60,14 @@
</div> </div>
<div class="col-sm p-3 min-vh-100 d-flex flex-column"> <div class="col-sm p-3 min-vh-100 d-flex flex-column">
<h1>Votre compte !</h1> <h1 class="d-flex justify-content-between align-items-center">Votre compte !
<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 :
<a href="account?action=logout" class="btn btn-outline-danger"> <a href="account?action=logout" class="btn btn-outline-danger">
Déconnexion Déconnexion
</a> </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"> <div class="d-flex justify-content-center mt-5">
<form id="modifyAccountForm" action="account" method="post" class="w-75"> <form id="modifyAccountForm" action="account" method="post" class="w-75">
...@@ -103,26 +101,34 @@ ...@@ -103,26 +101,34 @@
<h4>Mes fils</h4> <h4>Mes fils</h4>
<hr> <hr>
<% for(Thread thread : daoThread.findByCreator(username)){ %> <% if (daoThread.findByCreator(username).size() == 0){ %>
<div class="p-2 mb-3">
<div class="p-2 border border-primary border-3 rounded mb-3"> <div class="d-flex justify-content-center align-items-center">
<div class="d-flex justify-content-between"> <label class="fs-3">Vous n'avez pas de fil !</label>
<div class="ms-2"> <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>
<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>
</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"> <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> <a href="#" class="btn btn-outline-secondary">Remonter <i class="bi-arrow-up"></i></a>
</div> </div>
<% } %>
</div> </div>
</div> </div>
</div> </div>
......
WEB-INF/vue/creerFil.jsp
+ 1
− 1
View file @ dc303e15
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<img src="<%= request.getContextPath() %>/res/mini_logo.png" width="45px"> <img src="<%= request.getContextPath() %>/res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
WEB-INF/vue/fils.jsp
+ 1
− 1
View file @ dc303e15
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
WEB-INF/vue/filsSuivis.jsp
+ 1
− 1
View file @ dc303e15
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
WEB-INF/vue/login.jsp
+ 2
− 2
View file @ dc303e15
<%@ page contentType="text/html; charset=UTF-8"%> <%@ page contentType="text/html; charset=UTF-8"%>
<% <%
// l'authentification - redirection vers l'acceuil si deja connecté // l'authentification - redirection vers l'accueil si deja connecté
if(request.getSession().getAttribute("username") != null) response.sendRedirect("navigation?page=acceuil"); if(request.getSession().getAttribute("username") != null) response.sendRedirect("navigation?page=accueil");
%> %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
......
WEB-INF/vue/signin.jsp
+ 2
− 2
View file @ dc303e15
<%@ page contentType="text/html; charset=UTF-8"%> <%@ page contentType="text/html; charset=UTF-8"%>
<% <%
// l'authentification - redirection vers l'acceuil si deja connecté // l'authentification - redirection vers l'accueil si deja connecté
if(request.getSession().getAttribute("username") != null) response.sendRedirect("navigation?page=acceuil"); if(request.getSession().getAttribute("username") != null) response.sendRedirect("navigation?page=accueil");
%> %>
<!DOCTYPE html> <!DOCTYPE html>
......
accueil.html
+ 1
− 1
View file @ dc303e15
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house-fill fs-1"></i>
</a> </a>
</li> </li>
......
compte.html
+ 1
− 1
View file @ dc303e15
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
creerFil.html
+ 1
− 1
View file @ dc303e15
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
fils.html
+ 1
− 1
View file @ dc303e15
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
filsSuivis.html
+ 1
− 1
View file @ dc303e15
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
maquette/accueil.html
+ 2
− 2
View file @ dc303e15
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <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 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 rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css">
<link href="res/font.css" rel="stylesheet"> <link href="res/font.css" rel="stylesheet">
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house-fill fs-1"></i>
</a> </a>
</li> </li>
......
maquette/compte.html
+ 1
− 1
View file @ dc303e15
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
maquette/creerFil.html
+ 1
− 1
View file @ dc303e15
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
maquette/fils.html
+ 1
− 1
View file @ dc303e15
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
maquette/filsSuivis.html
+ 1
− 1
View file @ dc303e15
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<img src="res/mini_logo.png" width="45px"> <img src="res/mini_logo.png" width="45px">
</div> </div>
<li class="nav-item"> <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> <i class="bi-house fs-1"></i>
</a> </a>
</li> </li>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment