From 13828b722b429b6e392607b749bc52b504f5239c Mon Sep 17 00:00:00 2001
From: kmitresse <kmitresse@etud.univ-pau.fr>
Date: Fri, 5 Apr 2024 18:10:18 +0200
Subject: [PATCH] fix: dev-web - fix some warning

---
 .../uppa/project/servlet/ForgottenPasswordServlet.java     | 1 -
 .../src/main/java/uppa/project/servlet/LoginServlet.java   | 1 -
 .../src/main/java/uppa/project/servlet/LogoutServlet.java  | 1 -
 .../main/java/uppa/project/servlet/MainMenuServlet.java    | 2 +-
 .../main/java/uppa/project/servlet/RegisterServlet.java    | 7 -------
 .../java/uppa/project/servlet/ResetPasswordServlet.java    | 1 +
 .../Projet/src/main/webapp/WEB-INF/components/navbar.jsp   | 6 +++---
 .../src/main/webapp/WEB-INF/components/statistics.jsp      | 2 +-
 .../src/main/webapp/WEB-INF/views/reset-password.jsp       | 4 ----
 S2/DevWeb/Projet/src/main/webapp/static/css/login.css      | 2 +-
 S2/DevWeb/Projet/src/main/webapp/static/css/modal.css      | 6 ++++--
 11 files changed, 11 insertions(+), 22 deletions(-)

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
index 5690c1c..150726c 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java
@@ -18,7 +18,6 @@ import javax.mail.Message;
 import uppa.project.Global;
 import uppa.project.dao.DAO;
 import uppa.project.dao.DAOException;
-import uppa.project.dao.jpa.DAO_JPA_RecoveryPasswordToken;
 import uppa.project.dao.jpa.DAO_JPA_User;
 import uppa.project.dao.jpa.Game_JPA_DAO_Factory;
 import uppa.project.pojo.RecoveryPasswordToken;
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 9c76428..e08fbf4 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
@@ -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;
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LogoutServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LogoutServlet.java
index e463d73..27ceff6 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LogoutServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LogoutServlet.java
@@ -7,7 +7,6 @@
 package uppa.project.servlet;
 
 import com.google.gson.Gson;
-import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
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 5c0b42c..5acc460 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
@@ -42,7 +42,7 @@ public class MainMenuServlet extends HttpServlet {
   }
 
   private void manageNewGame(HttpServletRequest request, HttpServletResponse response, User sessionUser) throws IOException, ServletException {
-    List<User> connectedUsers = new ArrayList<User>();
+    List<User> connectedUsers = new ArrayList<>();
     Set<HttpSession> loginsSessions = (Set<HttpSession>) request.getServletContext().getAttribute("loginSession");
     if (loginsSessions == null) {
       throw new RuntimeException("No login sessions found");
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 97d2cde..4b1011f 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
@@ -13,13 +13,6 @@ import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import uppa.project.dao.DAOException;
-import uppa.project.dao.jpa.DAO_JPA_User;
-import uppa.project.pojo.User;
 import uppa.project.provider.EntityManagerProvider;
 
 @WebServlet(name = "registerServlet", value = "/register")
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java
index c1ab77e..782298d 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java
@@ -40,6 +40,7 @@ public class ResetPasswordServlet extends HttpServlet {
      */
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
       RecoveryPasswordToken recoveryPasswordToken = findRecoveryToken(request.getParameter("token"));
+
       User user = recoveryPasswordToken.getUser();
       String newPassword = request.getParameter("newPassword");
       String confirmPassword = request.getParameter("confirmPassword");
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 5df2fca..8dd7f3d 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
@@ -12,12 +12,12 @@
 <style><%@include file="/static/css/navbar.css"%></style>
 <nav>
     <a href="${pageContext.request.contextPath}/index"><img src="${pageContext.request.contextPath}/static/img/CardsRushLogo.png" alt="Logo CardsRush"> </a>
-    <%  if (currentPage == "register" || currentPage == "forgotten-password" || currentPage == "reset-password"){ %>
+    <%  if (currentPage.equals("register") || currentPage.equals("forgotten-password") || currentPage.equals("reset-password")){ %>
     <a class="button" href="${pageContext.request.contextPath}/login">Se connecter</a>
     <% }
-        if (currentPage == "login" || currentPage == "forgotten-password" || currentPage == "reset-password") { %>
+        if (currentPage.equals("login") || currentPage.equals("forgotten-password") || currentPage.equals("reset-password")) { %>
      <a class="button" href="${pageContext.request.contextPath}/register">S'inscrire</a>
-    <% } else if (currentPage == "main-menu"){ %>
+    <% } else if (currentPage.equals("main-menu")){ %>
         <div class="content">
             <% User user = (User) request.getAttribute("user"); %>
             <p class="user">
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/statistics.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/statistics.jsp
index 18f0c4f..dd61c13 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/statistics.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/statistics.jsp
@@ -8,7 +8,7 @@
 
 <%--TODO: adapter les deux lignes suivante pour ne pas vérifier la valeur nulle--%>
 <% User user = (User) session.getAttribute("user") != null ? (User) session.getAttribute("user") : new User("toto", "toto@gmail.com", "totopassword", new Date(), User.Gender.MALE); %>
-<% ArrayList<Game> games = (ArrayList<Game>) request.getAttribute("games") != null ? (ArrayList<Game>) request.getAttribute("games") : new ArrayList<Game>() ; %>
+<% ArrayList<Game> games = (ArrayList<Game>) request.getAttribute("games") != null ? (ArrayList<Game>) request.getAttribute("games") : new ArrayList<>() ; %>
 <div id="statisticsModal" class="modal-wrapper" style="display: none">
     <div class="modal">
         <a href="#close" title="Close" class="close">&times;</a>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/reset-password.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/reset-password.jsp
index 112675b..0d76490 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/reset-password.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/reset-password.jsp
@@ -1,7 +1,3 @@
-<%@ page import="uppa.project.dao.jpa.DAO_JPA_RecoveryPasswordToken" %>
-<%@ page import="uppa.project.pojo.RecoveryPasswordToken" %>
-<%@ page import="uppa.project.dao.DAOException" %>
-
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
diff --git a/S2/DevWeb/Projet/src/main/webapp/static/css/login.css b/S2/DevWeb/Projet/src/main/webapp/static/css/login.css
index 83883ab..13036b9 100644
--- a/S2/DevWeb/Projet/src/main/webapp/static/css/login.css
+++ b/S2/DevWeb/Projet/src/main/webapp/static/css/login.css
@@ -66,5 +66,5 @@ input {
 
 a {
     color: #ffffff;
-    bold: true;
+    font-weight: bold;
 }
diff --git a/S2/DevWeb/Projet/src/main/webapp/static/css/modal.css b/S2/DevWeb/Projet/src/main/webapp/static/css/modal.css
index 0c6ce38..a1fe1df 100644
--- a/S2/DevWeb/Projet/src/main/webapp/static/css/modal.css
+++ b/S2/DevWeb/Projet/src/main/webapp/static/css/modal.css
@@ -8,8 +8,10 @@
     right: 0;
     bottom: 0;
     left: 0;
-
-    background: rgba(0, 0, 0, 0.8);
+    border-radius: 20px;
+    border: 1px solid rgba(208, 73, 73, 0.83);
+    background: rgba(208, 73, 73, 0.38);
+    backdrop-filter: blur(14.399999618530273px);
     display: none;
 
     -webkit-transition: opacity 0.2s ease-in;