mirror of
https://github.com/kmitresse/Cards-Rush.git
synced 2026-05-13 17:11:49 +00:00
fix: dev-web - fix layout (title, display connected users,...)
This commit is contained in:
@@ -6,14 +6,19 @@
|
||||
|
||||
package uppa.project.servlet;
|
||||
|
||||
import jakarta.servlet.ServletContext;
|
||||
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 jakarta.servlet.http.HttpSession;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import uppa.project.pojo.User;
|
||||
|
||||
|
||||
@WebServlet(name = "newGameServlet", value = "/new-game")
|
||||
public class NewGameServlet extends HttpServlet {
|
||||
public void init() {
|
||||
@@ -25,15 +30,12 @@ public class NewGameServlet extends HttpServlet {
|
||||
response.sendRedirect(request.getContextPath() + "/login");
|
||||
return;
|
||||
}
|
||||
User[] users = null;
|
||||
User[] users = new User[0];
|
||||
/*TODO: récuperer la liste des joueurs connectés
|
||||
penser à retirer l'utilisateur principal de la liste*/
|
||||
|
||||
request.setAttribute("connectedUsers", users);
|
||||
request.getRequestDispatcher("/WEB-INF/views/new-game.jsp").forward(request, response);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void destroy() {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</head>
|
||||
<body>
|
||||
<main>
|
||||
<h1>Forgotten Password</h1>
|
||||
<h1>Mot de passe oublié</h1>
|
||||
<p>Entrer votre email pour recevoir un lien de récupération</p>
|
||||
<form id="forgottenPasswordForm" action="forgotten-password" method="post">
|
||||
<label for="email">Email</label>
|
||||
@@ -26,5 +26,5 @@
|
||||
<%}%>
|
||||
</main>
|
||||
</body>
|
||||
<script><%@include file="../static/js/forgotten-password.js"%></script>
|
||||
<script defer type="text/javascript"><%@include file="../static/js/forgotten-password.js"%></script>
|
||||
</html>
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Login</title>
|
||||
<title> Cards Rush - Connexion</title>
|
||||
<style><%@include file="../static/css/login.css" %></style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<main>
|
||||
<section id="title"> Cards Rush - Connexion </section>
|
||||
<section id="title">Cards Rush</section>
|
||||
<section id="form">
|
||||
<div class="border-left"></div>
|
||||
<div class="flex-column login-gap">
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<body>
|
||||
|
||||
<main>
|
||||
<section id="title">Cards Rush - Inscription</section>
|
||||
<section id="title">Inscription</section>
|
||||
<section id="form">
|
||||
<div class="border-left"></div>
|
||||
<div class="flex-column register-gap">
|
||||
|
||||
Reference in New Issue
Block a user