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

fix: dev-web - fix layout (title, display connected users,...)

Browse Source
This commit is contained in:
kmitresse
2024-03-25 10:24:58 +01:00
parent 371fdb658e
commit 5ef779b966
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java
+6 -4
View File
@@ -6,14 +6,19 @@
package uppa.project.servlet; package uppa.project.servlet;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import uppa.project.pojo.User; import uppa.project.pojo.User;
@WebServlet(name = "newGameServlet", value = "/new-game") @WebServlet(name = "newGameServlet", value = "/new-game")
public class NewGameServlet extends HttpServlet { public class NewGameServlet extends HttpServlet {
public void init() { public void init() {
@@ -25,15 +30,12 @@ public class NewGameServlet extends HttpServlet {
response.sendRedirect(request.getContextPath() + "/login"); response.sendRedirect(request.getContextPath() + "/login");
return; return;
} }
User[] users = null; User[] users = new User[0];
/*TODO: récuperer la liste des joueurs connectés /*TODO: récuperer la liste des joueurs connectés
penser à retirer l'utilisateur principal de la liste*/ penser à retirer l'utilisateur principal de la liste*/
request.setAttribute("connectedUsers", users); request.setAttribute("connectedUsers", users);
request.getRequestDispatcher("/WEB-INF/views/new-game.jsp").forward(request, response); request.getRequestDispatcher("/WEB-INF/views/new-game.jsp").forward(request, response);
} }
public void destroy() { public void destroy() {
S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/forgotten-password.jsp
+2 -2
View File
@@ -12,7 +12,7 @@
</head> </head>
<body> <body>
<main> <main>
<h1>Forgotten Password</h1> <h1>Mot de passe oublié</h1>
<p>Entrer votre email pour recevoir un lien de récupération</p> <p>Entrer votre email pour recevoir un lien de récupération</p>
<form id="forgottenPasswordForm" action="forgotten-password" method="post"> <form id="forgottenPasswordForm" action="forgotten-password" method="post">
<label for="email">Email</label> <label for="email">Email</label>
@@ -26,5 +26,5 @@
<%}%> <%}%>
</main> </main>
</body> </body>
<script><%@include file="../static/js/forgotten-password.js"%></script> <script defer type="text/javascript"><%@include file="../static/js/forgotten-password.js"%></script>
</html> </html>
S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/login.jsp
+2 -2
View File
@@ -2,13 +2,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Login</title> <title> Cards Rush - Connexion</title>
<style><%@include file="../static/css/login.css" %></style> <style><%@include file="../static/css/login.css" %></style>
</head> </head>
<body> <body>
<main> <main>
<section id="title"> Cards Rush - Connexion </section> <section id="title">Cards Rush</section>
<section id="form"> <section id="form">
<div class="border-left"></div> <div class="border-left"></div>
<div class="flex-column login-gap"> <div class="flex-column login-gap">
S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/register.jsp
+1 -1
View File
@@ -8,7 +8,7 @@
<body> <body>
<main> <main>
<section id="title">Cards Rush - Inscription</section> <section id="title">Inscription</section>
<section id="form"> <section id="form">
<div class="border-left"></div> <div class="border-left"></div>
<div class="flex-column register-gap"> <div class="flex-column register-gap">