mirror of
https://github.com/kmitresse/Cards-Rush.git
synced 2026-05-14 01:21:49 +00:00
feat(DevWeb): Use inline attribute in tag
This commit is contained in:
Lucàs
@@ -3,9 +3,8 @@
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
|
||||
|
||||
<layout:error>
|
||||
<jsp:attribute name="message">Token expiré</jsp:attribute>
|
||||
<jsp:body>
|
||||
<a href="login" class="button is-primary is-fullwidth has-text-white">Retour à la page de connexion</a>
|
||||
</jsp:body>
|
||||
<layout:error message="Token expiré">
|
||||
<a href="login" class="button is-primary is-fullwidth has-text-white">
|
||||
Retour à la page de connexion
|
||||
</a>
|
||||
</layout:error>
|
||||
|
||||
@@ -2,9 +2,8 @@
|
||||
<%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %>
|
||||
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
|
||||
|
||||
<layout:error>
|
||||
<jsp:attribute name="message">Token invalide</jsp:attribute>
|
||||
<jsp:body>
|
||||
<a href="login" class="button is-primary is-fullwidth has-text-white">Retour à la page de connexion</a>
|
||||
</jsp:body>
|
||||
<layout:error message="Token invalide">
|
||||
<a href="login" class="button is-primary is-fullwidth has-text-white">
|
||||
Retour à la page de connexion
|
||||
</a>
|
||||
</layout:error>
|
||||
@@ -3,50 +3,15 @@
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
|
||||
|
||||
<layout:base>
|
||||
<jsp:attribute name="title">Mot de passe oublié</jsp:attribute>
|
||||
<jsp:body>
|
||||
<div class="hero is-light is-fullheight-with-navbar">
|
||||
<div class="hero-body">
|
||||
<div class="container">
|
||||
<layout:form title="Mot de passe oublié">
|
||||
<component:hero>
|
||||
<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">Mot de passe oublié ?</h1>
|
||||
<p class="content"> Veuillez entrer votre email pour obtenir un lien de récupération</p>
|
||||
<form:forgotten-password/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</jsp:body>
|
||||
</layout:base>
|
||||
|
||||
<%--<%@ page contentType="text/html;charset=UTF-8" language="java" %>--%>
|
||||
<%--<html>--%>
|
||||
<%--<head>--%>
|
||||
<%-- <title>Forgotten Password</title>--%>
|
||||
<%-- <meta charset="UTF-8">--%>
|
||||
<%--<%– <link href="${pageContext.request.contextPath}/static/css/forgotten-password.css" rel="stylesheet">–%>--%>
|
||||
<%-- <script src="${pageContext.request.contextPath}/static/js/forgotten-password.js" defer></script>--%>
|
||||
<%--</head>--%>
|
||||
<%--<body>--%>
|
||||
<%-- <%@include file="../components/navbar.jsp"%>--%>
|
||||
<%-- <main>--%>
|
||||
<%-- <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>--%>
|
||||
<%-- <input type="email" id="email" name="email" required>--%>
|
||||
<%-- <button type="submit">Send</button>--%>
|
||||
<%-- </form>--%>
|
||||
<%-- <%if(request.getParameter("error") != null && request.getParameter("error").equals("1")){%>--%>
|
||||
<%-- <p>L'adresse mail insérée est incorrecte</p>--%>
|
||||
<%-- <%} else if (request.getParameter("success") != null) {%>--%>
|
||||
<%-- <p>Un email vous a été envoyé</p>--%>
|
||||
<%-- <%}%>--%>
|
||||
<%-- </main>--%>
|
||||
<%--</body>--%>
|
||||
<%--</html>--%>
|
||||
</component:hero>
|
||||
</layout:form>
|
||||
@@ -5,12 +5,8 @@
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
|
||||
|
||||
<layout:base>
|
||||
<jsp:attribute name="title">Accueil</jsp:attribute>
|
||||
<jsp:body>
|
||||
<section class="hero is-primary is-fullheight-with-navbar">
|
||||
<div class="hero-body">
|
||||
<div class="container">
|
||||
<layout:base title="Accueil">
|
||||
<component:hero>
|
||||
<p class="title is-2 mb-4 has-text-white">Plongez dans l'excitation de ${Global.APP_NAME}!</p>
|
||||
<p style="max-width: 30em;" class="mb-6 subtitle has-text-white">
|
||||
Défiez votre réactivité et dominez le jeu avec des amis dans cette course effrénée aux cartes !
|
||||
@@ -23,8 +19,5 @@
|
||||
Se connecter
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</jsp:body>
|
||||
</component:hero>
|
||||
</layout:base>
|
||||
@@ -3,22 +3,18 @@
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
|
||||
|
||||
<layout:base>
|
||||
<jsp:attribute name="title">Connexion</jsp:attribute>
|
||||
<jsp:body>
|
||||
<div class="hero is-primary is-fullheight-with-navbar">
|
||||
<div class="hero-body">
|
||||
<div class="container">
|
||||
<layout:form title="Connexion">
|
||||
<component:hero>
|
||||
<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">Se connecter</h1>
|
||||
<form:login/>
|
||||
<hr/>
|
||||
<p class="content has-text-centered">Vous n'avez pas de compte ? <a href="${pageContext.request.contextPath}/register">S'inscrire</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</jsp:body>
|
||||
</layout:base>
|
||||
</component:hero>
|
||||
</layout:form>
|
||||
@@ -3,59 +3,19 @@
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
|
||||
|
||||
<layout:base>
|
||||
<jsp:attribute name="title">Menu principal</jsp:attribute>
|
||||
<jsp:body>
|
||||
<div class="hero is-primary is-fullheight-with-navbar">
|
||||
<div class="hero-body">
|
||||
<div class="container">
|
||||
<layout:base title="Menu principal">
|
||||
<component:hero>
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-5-tablet is-5-desktop is-5-widescreen">
|
||||
<component:card>
|
||||
<jsp:attribute name="card_head">
|
||||
|
||||
</jsp:attribute>
|
||||
<jsp:attribute name="card_content">
|
||||
<form:newGame/>
|
||||
</jsp:attribute>
|
||||
<component:card title="Nouvelle partie">
|
||||
<form:new-game/>
|
||||
</component:card>
|
||||
</div>
|
||||
<div class="column is-6-tablet is-6-desktop is-6-widescreen">
|
||||
<component:connectedUserList/>
|
||||
<component:card title="Utilisateurs connectés">
|
||||
<component:connected-user-list/>
|
||||
</component:card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</jsp:body>
|
||||
</component:hero>
|
||||
</layout:base>
|
||||
|
||||
<%--<!DOCTYPE html>--%>
|
||||
<%--<html>--%>
|
||||
<%--<head>--%>
|
||||
<%-- <title>Cards Rush</title>--%>
|
||||
<%-- <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;700&display=swap">--%>
|
||||
<%-- <link href="${pageContext.request.contextPath}/static/css/global.css" rel="stylesheet">--%>
|
||||
<%-- <link href="${pageContext.request.contextPath}/static/css/main-menu.css" rel="stylesheet">--%>
|
||||
<%-- <link href="${pageContext.request.contextPath}/static/css/new-game.css" rel="stylesheet">--%>
|
||||
<%-- <link href="${pageContext.request.contextPath}/static/css/modal.css" rel="stylesheet">--%>
|
||||
<%-- <script src="${pageContext.request.contextPath}/static/js/modal.js" defer></script>--%>
|
||||
<%-- <script src="${pageContext.request.contextPath}/static/js/new-game.js" defer></script>--%>
|
||||
<%-- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">--%>
|
||||
<%-- <script defer src="${pageContext.request.contextPath}/static/js/main-menu.js"></script>--%>
|
||||
<%--</head>--%>
|
||||
<%--<body>--%>
|
||||
<%--<%@include file="../components/navbar.jsp" %>--%>
|
||||
<%--<main>--%>
|
||||
<%-- <section id="main">--%>
|
||||
<%-- <h1 id="title">Cards Rush!</h1>--%>
|
||||
<%-- <div class="main-button">--%>
|
||||
<%-- <button class="modal-toggle button" data-target="#newGameModal">Nouvelle Partie</button>--%>
|
||||
<%-- <button class="modal-toggle button" data-target="#statisticsModal">Statistiques</button>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </section>--%>
|
||||
<%-- <%@include file="../components/new-game.jsp" %>--%>
|
||||
<%-- <%@include file="../components/statistics.jsp" %>--%>
|
||||
<%--</main>--%>
|
||||
<%--</body>--%>
|
||||
<%--</html>--%>
|
||||
|
||||
@@ -4,52 +4,14 @@
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
|
||||
|
||||
<%
|
||||
User user = (User) session.getAttribute("user");
|
||||
%>
|
||||
<% User user = (User) session.getAttribute("user"); %>
|
||||
|
||||
<layout:base>
|
||||
<jsp:attribute name="title">Profil</jsp:attribute>
|
||||
<jsp:body>
|
||||
<div class="hero is-primary is-fullheight-with-navbar">
|
||||
<div class="hero-body">
|
||||
<div class="container">
|
||||
<layout:base title="Profil">
|
||||
<component:hero>
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-5-tablet is-5-desktop is-5-widescreen">
|
||||
<%-- TODO: Profil--%>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</jsp:body>
|
||||
</component:hero>
|
||||
</layout:base>
|
||||
|
||||
<%--<!DOCTYPE html>--%>
|
||||
<%--<html>--%>
|
||||
<%--<head>--%>
|
||||
<%-- <title>Cards Rush</title>--%>
|
||||
<%-- <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;700&display=swap">--%>
|
||||
<%-- <link href="${pageContext.request.contextPath}/static/css/global.css" rel="stylesheet">--%>
|
||||
<%-- <link href="${pageContext.request.contextPath}/static/css/main-menu.css" rel="stylesheet">--%>
|
||||
<%-- <link href="${pageContext.request.contextPath}/static/css/new-game.css" rel="stylesheet">--%>
|
||||
<%-- <link href="${pageContext.request.contextPath}/static/css/modal.css" rel="stylesheet">--%>
|
||||
<%-- <script src="${pageContext.request.contextPath}/static/js/modal.js" defer></script>--%>
|
||||
<%-- <script src="${pageContext.request.contextPath}/static/js/new-game.js" defer></script>--%>
|
||||
<%-- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">--%>
|
||||
<%-- <script defer src="${pageContext.request.contextPath}/static/js/main-menu.js"></script>--%>
|
||||
<%--</head>--%>
|
||||
<%--<body>--%>
|
||||
<%--<%@include file="../components/navbar.jsp" %>--%>
|
||||
<%--<main>--%>
|
||||
<%-- <section id="main">--%>
|
||||
<%-- <h1 id="title">Cards Rush!</h1>--%>
|
||||
<%-- <div class="main-button">--%>
|
||||
<%-- <button class="modal-toggle button" data-target="#newGameModal">Nouvelle Partie</button>--%>
|
||||
<%-- <button class="modal-toggle button" data-target="#statisticsModal">Statistiques</button>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </section>--%>
|
||||
<%-- <%@include file="../components/new-game.jsp" %>--%>
|
||||
<%-- <%@include file="../components/statistics.jsp" %>--%>
|
||||
<%--</main>--%>
|
||||
<%--</body>--%>
|
||||
<%--</html>--%>
|
||||
|
||||
@@ -3,22 +3,19 @@
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
|
||||
|
||||
<layout:base>
|
||||
<jsp:attribute name="title">Inscription</jsp:attribute>
|
||||
<jsp:body>
|
||||
<div class="hero is-light is-fullheight-with-navbar">
|
||||
<div class="hero-body">
|
||||
<div class="container">
|
||||
<layout:form title="Inscription">
|
||||
<component:hero>
|
||||
<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">S'inscrire</h1>
|
||||
<form:register/>
|
||||
<hr/>
|
||||
<p class="content has-text-centered">
|
||||
Déjà inscrit ? <a href="${pageContext.request.contextPath}/login">Se connecter</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</jsp:body>
|
||||
</layout:base>
|
||||
</component:hero>
|
||||
</layout:form>
|
||||
|
||||
@@ -1,22 +1,21 @@
|
||||
<%@ 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">Récuperation mot de passe</jsp:attribute>
|
||||
<jsp:body>
|
||||
<div class="hero is-light is-fullheight-with-navbar">
|
||||
<div class="hero-body">
|
||||
<div class="container">
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
|
||||
<layout:form title="Récuperation mot de passe">
|
||||
<component:hero>
|
||||
<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">Récupération de mot de passe</h1>
|
||||
<form:reset-password/>
|
||||
<hr/>
|
||||
<p class="content has-text-centered">
|
||||
Déjà inscrit ? <a href="${pageContext.request.contextPath}/login">Se connecter</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</jsp:body>
|
||||
</layout:base>
|
||||
</component:hero>
|
||||
</layout:form>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<%@tag description="layout/base" pageEncoding="UTF-8" %>
|
||||
<%@tag import="uppa.project.Global" %>
|
||||
|
||||
<%@attribute name="title" fragment="true" %>
|
||||
<%@attribute name="title"%>
|
||||
<%@attribute name="head" fragment="true" %>
|
||||
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
@@ -9,7 +9,7 @@
|
||||
<!DOCTYPE html>
|
||||
<html class="has-navbar-fixed-top">
|
||||
<head>
|
||||
<title>${Global.APP_NAME} | <jsp:invoke fragment="title"/></title>
|
||||
<title>${Global.APP_NAME} | ${title}</title>
|
||||
<link rel="icon" type="image/svg" href="${pageContext.request.contextPath}/static/icon.svg">
|
||||
|
||||
<meta charset="UTF-8">
|
||||
|
||||
@@ -3,26 +3,17 @@
|
||||
<%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %>
|
||||
<%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
|
||||
|
||||
<%@attribute name="message" fragment="true" %>
|
||||
<%@attribute name="message"%>
|
||||
|
||||
<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">
|
||||
<layout:base title="Erreur">
|
||||
<component:hero>
|
||||
<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">
|
||||
<jsp:invoke fragment="message"/>
|
||||
</h1>
|
||||
<h1 class="title has-text-centered">${message}</h1>
|
||||
<jsp:doBody/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</jsp:body>
|
||||
</component:hero>
|
||||
</layout:base>
|
||||
|
||||
Reference in New Issue
Block a user