diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java index 6cdc4cb..ca1832f 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java @@ -6,14 +6,19 @@ package uppa.project.servlet; +import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import uppa.project.pojo.User; + @WebServlet(name = "newGameServlet", value = "/new-game") public class NewGameServlet extends HttpServlet { public void init() { @@ -25,15 +30,12 @@ public class NewGameServlet extends HttpServlet { response.sendRedirect(request.getContextPath() + "/login"); return; } - User[] users = null; + User[] users = new User[0]; /*TODO: récuperer la liste des joueurs connectés penser à retirer l'utilisateur principal de la liste*/ request.setAttribute("connectedUsers", users); request.getRequestDispatcher("/WEB-INF/views/new-game.jsp").forward(request, response); - - - } public void destroy() { diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/forgotten-password.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/forgotten-password.jsp index 5bd49e3..514b7d1 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/forgotten-password.jsp +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/forgotten-password.jsp @@ -12,7 +12,7 @@
-

Forgotten Password

+

Mot de passe oublié

Entrer votre email pour recevoir un lien de récupération

@@ -26,5 +26,5 @@ <%}%>
- + diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/login.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/login.jsp index 37a1ee0..a6a240b 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/login.jsp +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/login.jsp @@ -2,13 +2,13 @@ - Login + Cards Rush - Connexion
-
Cards Rush - Connexion
+
Cards Rush