lucasvbr/Cards-Rush
1
0
Fork 0
mirror of https://github.com/kmitresse/Cards-Rush.git synced 2026-05-13 17:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dev-web - fix some warning

Browse Source
This commit is contained in:
kmitresse
2024-04-05 18:10:18 +02:00
parent a541ba929a
commit 13828b722b
11 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ForgottenPasswordServlet.java
-1
View File
@@ -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;
S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LoginServlet.java
-1
View File
@@ -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;
S2/DevWeb/Projet/src/main/java/uppa/project/servlet/LogoutServlet.java
-1
View File
@@ -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;
S2/DevWeb/Projet/src/main/java/uppa/project/servlet/MainMenuServlet.java
+1 -1
View File
@@ -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");
S2/DevWeb/Projet/src/main/java/uppa/project/servlet/RegisterServlet.java
-7
View File
@@ -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")
S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java
+1
View File
@@ -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");
S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp
+3 -3
View File
@@ -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">
S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/statistics.jsp
+1 -1
View File
@@ -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>
S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/reset-password.jsp
-4
View File
@@ -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>
S2/DevWeb/Projet/src/main/webapp/static/css/login.css
+1 -1
View File
@@ -66,5 +66,5 @@ input {
a {
color: #ffffff;
bold: true;
font-weight: bold;
}
S2/DevWeb/Projet/src/main/webapp/static/css/modal.css
+4 -2
View File
@@ -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;