From 462690d6964a28dbaa50e1b7e1930d1d68ac8ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=A0s?= <vabrelucas@gmail.com>
Date: Sat, 20 Apr 2024 10:44:41 +0200
Subject: [PATCH] feat(DevWeb): Make website title adaptative using global
 variable

---
 .../src/main/java/uppa/project/Global.java    |  1 +
 .../WEB-INF/pages/forgotten-password.jsp      |  2 +-
 .../src/main/webapp/WEB-INF/pages/index.jsp   | 15 ++++--
 .../src/main/webapp/WEB-INF/pages/login.jsp   |  2 +-
 .../main/webapp/WEB-INF/pages/register.jsp    | 54 +------------------
 .../webapp/WEB-INF/pages/reset-password.jsp   |  2 +-
 .../main/webapp/WEB-INF/tags/layouts/base.tag |  6 ++-
 7 files changed, 20 insertions(+), 62 deletions(-)

diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/Global.java b/S2/DevWeb/Projet/src/main/java/uppa/project/Global.java
index 6c34b29..d926446 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/Global.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/Global.java
@@ -2,6 +2,7 @@ package uppa.project;
 
 public final class Global {
 
+  public static final String APP_NAME = "Cards Rush";
   public static final String PERSISTENCE_UNIT_NAME = "prod";
   public static final String PERSISTENCE_UNIT_NAME_TEST = "test";
   public static final String TOMCAT_PORT = "8088";
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/forgotten-password.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/forgotten-password.jsp
index 512756c..ca86493 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/forgotten-password.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/forgotten-password.jsp
@@ -4,7 +4,7 @@
 <%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
 
 <layout:base>
-    <jsp:attribute name="title">CardRush - Mot de passe oublié</jsp:attribute>
+    <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">
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/index.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/index.jsp
index 70e2724..3d62b57 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/index.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/index.jsp
@@ -1,20 +1,27 @@
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ page import="uppa.project.Global" %>
+
 <%@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">Card Rush</jsp:attribute>
+    <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">
-                    <p class="title is-2 mb-4 has-text-white">Plongez dans l'excitation de CardRush!</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 ! Rejoignez maintenant pour vivre l'adrénaline.</p>
+                    <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 !
+                        Rejoignez maintenant pour vivre l'adrénaline.
+                    </p>
 
                     <div class="buttons">
                         <a class="button is-light is-primary is-large" href="${pageContext.request.contextPath}/register">S'inscrire</a>
-                        <a class="button is-primary is-large has-text-white" href="${pageContext.request.contextPath}/login">Se connecter</a>
+                        <a class="button is-primary is-large has-text-white" href="${pageContext.request.contextPath}/login">
+                            Se connecter
+                        </a>
                     </div>
                 </div>
             </div>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp
index f093459..533a033 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp
@@ -4,7 +4,7 @@
 <%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
 
 <layout:base>
-    <jsp:attribute name="title">Cards Rush - Connexion</jsp:attribute>
+    <jsp:attribute name="title">Connexion</jsp:attribute>
     <jsp:body>
         <div class="hero is-primary is-fullheight-with-navbar">
             <div class="hero-body">
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/register.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/register.jsp
index 4708510..72889f2 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/register.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/register.jsp
@@ -4,7 +4,7 @@
 <%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
 
 <layout:base>
-  <jsp:attribute name="title">Cards Rush - Inscription</jsp:attribute>
+  <jsp:attribute name="title">Inscription</jsp:attribute>
   <jsp:body>
     <div class="hero is-light is-fullheight-with-navbar">
       <div class="hero-body">
@@ -22,55 +22,3 @@
     </div>
   </jsp:body>
 </layout:base>
-
-<%--<!DOCTYPE html>--%>
-<%--<html>--%>
-<%--<head>--%>
-<%--  <title>Register</title>--%>
-<%--  <link href="${pageContext.request.contextPath}/static/css/global.css" rel="stylesheet">--%>
-<%--  <link href="${pageContext.request.contextPath}/static/css/login.css" rel="stylesheet">--%>
-<%--  <script src="${pageContext.request.contextPath}/static/js/register.js" defer></script>--%>
-<%--</head>--%>
-<%--<body>--%>
-<%--<%@include file="../components/navbar.jsp"%>--%>
-<%--<main>--%>
-<%--    <div class="flex-column register-gap">--%>
-<%--      <div>--%>
-<%--        <h1>S'inscrire</h1>--%>
-<%--        <form id="register-form" action="${pageContext.request.contextPath}/api/auth/register" method="POST">--%>
-
-<%--          <label for="email">Email :</label>--%>
-<%--          <input type="email" id="email" name="email" required>--%>
-
-<%--          <label for="username">Nom d'utilisateur :</label>--%>
-<%--          <input type="text" id="username" name="username" required>--%>
-
-<%--          <label for="password">Mot de passe :</label>--%>
-<%--          <input type="password" id="password" name="password" required>--%>
-
-<%--          <label for="confirmPassword">Confirmez le mot de passe :</label>--%>
-<%--          <input type="password" id="confirmPassword" name="confirmPassword" required>--%>
-
-<%--          <label for="birthdate">Date de naissance :</label>--%>
-<%--          <input type="date" id="birthdate" name="birthdate" required>--%>
-
-<%--          <label for="gender">Genre :</label>--%>
-<%--          <select name="gender" id="gender" required>--%>
-<%--            <option value="">--Choisissez une option--</option>--%>
-<%--            <option value="MALE">Homme</option>--%>
-<%--            <option value="FEMALE">Femme</option>--%>
-<%--            <option value="OTHER">Autre</option>--%>
-<%--          </select>--%>
-
-<%--          <input class="button" id="register-submit" type="submit" value="Register">--%>
-<%--        </form>--%>
-<%--      </div>--%>
-<%--      <div>--%>
-<%--        <hr>--%>
-<%--        <p>Déjà un compte ? <a href="${pageContext.request.contextPath}/login">Se connecter</a></p>--%>
-<%--      </div>--%>
-<%--    </div>--%>
-<%--</main>--%>
-
-<%--</body>--%>
-<%--</html>--%>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/reset-password.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/reset-password.jsp
index 3b60588..a9c10a6 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/reset-password.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/reset-password.jsp
@@ -2,7 +2,7 @@
 <%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %>
 <%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %>
 <layout:base>
-    <jsp:attribute name="title">Cards Rush - Récuperation mot de passe</jsp:attribute>
+    <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">
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/base.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/base.tag
index 594c709..c0535de 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/base.tag
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/base.tag
@@ -1,4 +1,6 @@
-<%@tag description="Base page layout" pageEncoding="UTF-8" %>
+<%@tag description="layout/base" pageEncoding="UTF-8" %>
+<%@tag import="uppa.project.Global" %>
+
 <%@attribute name="title" fragment="true" %>
 <%@attribute name="head" fragment="true" %>
 
@@ -7,7 +9,7 @@
 <!DOCTYPE html>
 <html class="has-navbar-fixed-top">
 <head>
-    <title><jsp:invoke fragment="title"/></title>
+    <title>${Global.APP_NAME} | <jsp:invoke fragment="title"/></title>
     <link rel="icon" type="image/svg" href="${pageContext.request.contextPath}/static/icon.svg">
 
     <meta charset="UTF-8">