diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java new file mode 100644 index 0000000..8012827 --- /dev/null +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java @@ -0,0 +1,33 @@ +/* + * LoginServlet.java, 20/03/2024 + * UPPA M1 TI 2023-2024 + * Pas de copyright, aucun droits + */ + +package uppa.project.servlet; + +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 java.io.IOException; + +@WebServlet(name = "forgottenPasswordServlet", value = "/forgotten-password") +public class ForgottenPasswordServlet extends HttpServlet { + public void init() { + } + + public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + + if (request.getSession().getAttribute("user") != null) { + response.sendRedirect(request.getContextPath() + "/main-menu"); + return; + } + + request.getRequestDispatcher("/WEB-INF/views/forgotten-password.jsp").forward(request, response); + } + + public void destroy() { + } +} \ No newline at end of file diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java index ff5be4b..56c976d 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java @@ -6,7 +6,6 @@ package uppa.project.servlet; -import com.google.gson.Gson; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; @@ -17,15 +16,13 @@ import java.io.IOException; @WebServlet(name = "indexServlet", value = "/") public class IndexServlet extends HttpServlet { - private final Gson gson = new Gson(); - public void init() { } public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getSession().getAttribute("user") != null) { - response.sendRedirect(request.getContextPath() + "/dashboard"); + response.sendRedirect(request.getContextPath() + "/main-menu"); return; } diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LoginServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LoginServlet.java index 009fcdf..d13b978 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LoginServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LoginServlet.java @@ -33,7 +33,12 @@ public class LoginServlet extends HttpServlet { } public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - request.getRequestDispatcher("/WEB-INF/login.jsp").forward(request, response); + if (request.getSession().getAttribute("user") != null) { + response.sendRedirect(request.getContextPath() + "/main-menu"); + return; + } + + request.getRequestDispatcher("/WEB-INF/views/login.jsp").forward(request, response); } public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/MainMenuServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/MainMenuServlet.java index af8e62a..371803c 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/MainMenuServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/MainMenuServlet.java @@ -6,7 +6,6 @@ package uppa.project.servlet; -import com.google.gson.Gson; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; @@ -14,22 +13,20 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet(name = "indexServlet", value = "/") +@WebServlet(name = "mainMenuServlet", value = "/main-menu") public class MainMenuServlet extends HttpServlet { - private final Gson gson = new Gson(); - public void init() { } public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - if (request.getSession().getAttribute("user") != null) { - request.getRequestDispatcher("/WEB-INF/mainMenu.jsp").forward(request, response); + if (request.getSession().getAttribute("user") == null) { + request.getRequestDispatcher("/WEB-INF/views/login.jsp").forward(request, response); return; } - response.sendRedirect(request.getContextPath() + "/login"); + response.sendRedirect(request.getContextPath() + "/main-menu"); } public void destroy() { 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 new file mode 100644 index 0000000..8ecb0c3 --- /dev/null +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java @@ -0,0 +1,33 @@ +/* + * LoginServlet.java, 20/03/2024 + * UPPA M1 TI 2023-2024 + * Pas de copyright, aucun droits + */ + +package uppa.project.servlet; + +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 java.io.IOException; + +@WebServlet(name = "newGameServlet", value = "/new-game") +public class NewGameServlet extends HttpServlet { + public void init() { + } + + public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + + if (request.getSession().getAttribute("user") == null) { + response.sendRedirect(request.getContextPath() + "/login"); + return; + } + + request.getRequestDispatcher("/WEB-INF/views/new-game.jsp").forward(request, response); + } + + public void destroy() { + } +} \ No newline at end of file diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/RegisterServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/RegisterServlet.java new file mode 100644 index 0000000..c5787bb --- /dev/null +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/RegisterServlet.java @@ -0,0 +1,37 @@ +/* + * LoginServlet.java, 20/03/2024 + * UPPA M1 TI 2023-2024 + * Pas de copyright, aucun droits + */ + +package uppa.project.servlet; + +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 java.io.IOException; + +@WebServlet(name = "registerServlet", value = "/register") +public class RegisterServlet extends HttpServlet { + + public void init() { + } + + public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + if (request.getSession().getAttribute("user") != null) { + response.sendRedirect(request.getContextPath() + "/main-menu"); + return; + } + + request.getRequestDispatcher("/WEB-INF/views/register.jsp").forward(request, response); + } + + public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { + // TODO : Implement the registration process + } + + public void destroy() { + } +} \ No newline at end of file diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/navBar.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp similarity index 85% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/navBar.jsp rename to S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp index bdbb3d8..5f909a7 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/navBar.jsp +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp @@ -6,6 +6,8 @@ To change this template use File | Settings | File Templates. --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> + +