From 55f5d14db8093eae3c614d4e3baae4ee610d68ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=A0s?= <vabrelucas@gmail.com>
Date: Sat, 20 Apr 2024 10:40:31 +0200
Subject: [PATCH] feat(DevWeb): Create error layout for error pages

---
 .../pages/errors/expired-token-password.jsp   | 21 +++-----------
 .../pages/errors/invalid-token-password.jsp   | 21 +++-----------
 .../webapp/WEB-INF/tags/layouts/error.tag     | 28 +++++++++++++++++++
 3 files changed, 36 insertions(+), 34 deletions(-)
 create mode 100644 S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/error.tag

diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp
index 31b116b..2b17264 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp
@@ -3,22 +3,9 @@
 <%@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>
+<layout:error>
+    <jsp:attribute name="message">Token expiré</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>
+        <a href="login" class="button is-primary is-fullwidth has-text-white">Retour à la page de connexion</a>
     </jsp:body>
-</layout:base>
+</layout:error>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp
index 13f1b66..22d6cf2 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp
@@ -2,22 +2,9 @@
 <%@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>
+<layout:error>
+    <jsp:attribute name="message">Token invalide</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>
+        <a href="login" class="button is-primary is-fullwidth has-text-white">Retour à la page de connexion</a>
     </jsp:body>
-</layout:base>
+</layout:error>
\ No newline at end of file
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/error.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/error.tag
new file mode 100644
index 0000000..8da2492
--- /dev/null
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/error.tag
@@ -0,0 +1,28 @@
+<%@tag description="layout/error" 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" %>
+
+<%@attribute name="message" fragment="true" %>
+
+<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">
+                                    <jsp:invoke fragment="message"/>
+                                </h1>
+                                <jsp:doBody/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </jsp:body>
+</layout:base>