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: devWeb - othographe

Browse Source
This commit is contained in:
kmitresse
2024-04-17 19:08:27 +02:00
parent 44627e12fa
commit d874cb6516
6 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ResetPasswordServlet.java
+2 -2
View File
@@ -26,11 +26,11 @@ public class ResetPasswordServlet extends HttpServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
RecoveryPasswordToken token = findRecoveryToken(request.getParameter("token"));
if (token == null) {
request.getRequestDispatcher("/WEB-INF/pages/invalid-token-password.jsp").forward(request, response);
request.getRequestDispatcher("/WEB-INF/pages/errors/invalid-token-password.jsp").forward(request, response);
return;
}
if (token.getExpirationDate().compareTo(new java.util.Date()) < 0){
request.getRequestDispatcher("/WEB-INF/pages/expired-token-password.jsp").forward(request, response);
request.getRequestDispatcher("/WEB-INF/pages/errors/expired-token-password.jsp").forward(request, response);
return;
}
request.setAttribute("current", "reset-password");
S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp
+24
View File
@@ -0,0 +1,24 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %>
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
<layout:base>
<jsp:attribute name="title">Cards Rush - Erreur</jsp:attribute>
<jsp:body>
<div class="hero is-primary is-fullheight-with-navbar">
<div class="hero-body">
<div class="container">
<div class="columns is-centered">
<div class="column is-5-tablet is-5-desktop is-5-widescreen">
<div class="box">
<h1 class="title has-text-centered">Token expiré</h1>
<a href="login" class="button is-primary is-fullwidth has-text-white">Retour à la page de connexion</a>
</div>
</div>
</div>
</div>
</div>
</div>
</jsp:body>
</layout:base>
S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp
+23
View File
@@ -0,0 +1,23 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %>
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
<layout:base>
<jsp:attribute name="title">Cards Rush - Erreur</jsp:attribute>
<jsp:body>
<div class="hero is-primary is-fullheight-with-navbar">
<div class="hero-body">
<div class="container">
<div class="columns is-centered">
<div class="column is-5-tablet is-5-desktop is-5-widescreen">
<div class="box">
<h1 class="title has-text-centered">Token invalide</h1>
<a href="login" class="button is-primary is-fullwidth has-text-white">Retour à la page de connexion</a>
</div>
</div>
</div>
</div>
</div>
</div>
</jsp:body>
</layout:base>
S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/main-menu.jsp
+1 -1
View File
@@ -20,7 +20,7 @@
</jsp:attribute>
</component:card>
</div>
<div class="column is-5-tablet is-5-desktop is-5-widescreen">
<div class="column is-6-tablet is-6-desktop is-6-widescreen">
<component:connectedUserList/>
</div>
</div>
S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connectedUserList.tag
+4 -4
View File
@@ -12,10 +12,10 @@
<thead>
<tr>
<th>Utilisateur</th>
<th>Nombre parties jouées</th>
<th>Nombre de victoires</th>
<th>Clics corrects</th>
<th>Clics rapides</th>
<th>Nombre de parties</th>
<th>Victoires (%)</th>
<th>Clics corrects (%)</th>
<th>Clics rapides (%)</th>
<th>Action</th>
</tr>
</thead>
S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/newGame.tag
+3 -3
View File
@@ -31,7 +31,7 @@
<div class="columns">
<div class="column">
<div class="field">
<label class="label" for="nbRounds">Nombre de manche</label>
<label class="label" for="nbRounds">Nombre de manches</label>
<input class="input" type="number" id="nbRounds" name="nbRounds" value="<%= Deck.NB_COLORS_MAX * Deck.NB_VALUES_PER_COLOR_MAX %>" min="<%= Deck.NB_COLORS_MIN * Deck.NB_VALUES_PER_COLOR_MIN %>" max="<%= Deck.NB_COLORS_MAX * Deck.NB_VALUES_PER_COLOR_MAX %>">
</div>
</div>
@@ -50,7 +50,7 @@
<div class="columns">
<div class="column">
<div class="field">
<label class="label" for="nbValues">Nombre de valeur <span id="tootltip-values"> <%= Deck.NB_VALUES_PER_COLOR_MAX %></span> </label>
<label class="label" for="nbValues">Nombre de valeurs <span id="tootltip-values"> <%= Deck.NB_VALUES_PER_COLOR_MAX %></span> </label>
<div class="range-field">
<div class="value left"><%= Deck.NB_VALUES_PER_COLOR_MIN %></div>
<input type="range" id="nbValues" name="nbValues" value="<%= Deck.NB_VALUES_PER_COLOR_MAX %>" min="<%= Deck.NB_VALUES_PER_COLOR_MIN %>" max="<%= Deck.NB_VALUES_PER_COLOR_MAX %>">
@@ -60,7 +60,7 @@
</div>
<div class="column">
<div class="field">
<label class="label" for="nbColors">Nombre de couleur <span id="tootltip-colors"> <%= Deck.NB_COLORS_MAX %></span> </label>
<label class="label" for="nbColors">Nombre de couleurs <span id="tootltip-colors"> <%= Deck.NB_COLORS_MAX %></span> </label>
<div class="range-field">
<div class="value left"><%= Deck.NB_COLORS_MIN %></div>
<input type="range" id="nbColors" name="nbColors" value="<%= Deck.NB_COLORS_MAX %>" min="<%= Deck.NB_COLORS_MIN %>" max="<%= Deck.NB_COLORS_MAX %>">