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 deleted file mode 100644 index 53f8d9b..0000000 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * IndexServlet.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 = "indexServlet", value = "/") -public class IndexServlet 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; - } - - response.sendRedirect(request.getContextPath() + "/login"); - } - - 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 index 5cbb262..224a9aa 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/RegisterServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/RegisterServlet.java @@ -38,43 +38,6 @@ public class RegisterServlet extends HttpServlet { request.getRequestDispatcher("/WEB-INF/views/register.jsp").forward(request, response); } - public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { - String username = request.getParameter("username"); - String email = request.getParameter("email"); - String birthdate = request.getParameter("birthdate"); - System.out.println(birthdate); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - Date birth; - try { - birth = formatter.parse(birthdate); - } catch (ParseException e) { - throw new RuntimeException(e); - } - System.out.println("birth: " + birth); - String gender = request.getParameter("gender"); - String password = request.getParameter("password"); - String confirmPassword = request.getParameter("confirmPassword"); - if (!password.equals(confirmPassword)) { - response.sendRedirect(request.getContextPath() + "/register?error=matching-password"); - return; - } - createAccount(username, email, password, birth, gender); - response.sendRedirect(request.getContextPath() + "/login?success=account-created"); - } - - public static void createAccount(String username, String email, String password, Date birth, String gender){ - em.getTransaction().begin(); - try{ - DAO_JPA_User daoJpaUser = new DAO_JPA_User(); - User user = new User(username, email, password, birth, User.getGender(gender)); - daoJpaUser.create(user); - em.getTransaction().commit(); - } catch (DAOException | IllegalArgumentException e) { - em.getTransaction().rollback(); - throw new RuntimeException(e); - } - } - public void destroy() { } } diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/api/img/ImgGetterServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/api/img/ImgGetterServlet.java deleted file mode 100644 index 38fdab0..0000000 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/api/img/ImgGetterServlet.java +++ /dev/null @@ -1,47 +0,0 @@ -package uppa.project.servlet.api.img; - -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -@WebServlet(name = "imgGetterServlet", value = "/api/imgGet") -public class ImgGetterServlet extends HttpServlet { - public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { - // Récupérer le nom de l'image à partir de la requête - String imgName = request.getParameter("imgName"); - - // Vérifier si le nom de l'image est fourni - if (imgName != null && !imgName.isEmpty()) { - // Récupérer le chemin complet de l'image (remplacez "path_to_your_images_folder" par le chemin réel) - String imagePath = request.getRequestDispatcher("/img/" + imgName).toString(); - - // Ouvrir un flux d'entrée vers le fichier image - try (InputStream inputStream = getServletContext().getResourceAsStream(imagePath)) { - if (inputStream != null) { - // Récupérer le flux de sortie de la réponse HTTP - OutputStream outputStream = response.getOutputStream(); - - // Lire les données de l'image et écrire dans le flux de sortie de la réponse - byte[] buffer = new byte[1024]; - int bytesRead; - while ((bytesRead = inputStream.read(buffer)) != -1) { - outputStream.write(buffer, 0, bytesRead); - } - - // Flusher le flux de sortie - outputStream.flush(); - } else { - // Si l'image n'est pas trouvée, retourner une réponse 404 (non trouvé) - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } - } - } else { - // Si le nom de l'image n'est pas fourni, retourner une réponse 400 (mauvaise requête) - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - } - } -} diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp index 8d41aef..92d2424 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp @@ -7,9 +7,9 @@ --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> - +