fix(DevWeb): Import static files

2026-05-16 17:11:48 +00:00 · 2024-04-05 12:39:01 +02:00
parent c438395a1a
commit 61603ddac6
26 changed files with 36 additions and 170 deletions
@@ -7,9 +7,9 @@
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>

-<style><%@include file="../static/css/navbar.css"%></style>
+<style><%@include file="/static/css/navbar.css"%></style>
 <nav>
-    <a href="index"><img src="${pageContext.request.contextPath}/api/imgGet?imgName=CardRushLogo.png" alt="Logo CardsRush"> </a>
+    <a href="index"><img src="${pageContext.request.contextPath}/static/img/CardsRushLogo.png" alt="Logo CardsRush"> </a>
    <p>
        username: <!-- Récuperer le nom utilisateur --> <br/>
        best score: <!-- Récuperer le meilleur score -->
@@ -1,16 +1,8 @@
-<%@ page import="uppa.project.pojo.User" %>
+s<%@ page import="uppa.project.pojo.User" %>
 <%@ page import="uppa.project.pojo.Game" %>
 <%@ page import="uppa.project.pojo.Deck" %>
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>

-<%--
-  Created by IntelliJ IDEA.
-  User: kmitr
-  Date: 19/03/2024
-  Time: 15:47
-  To change this template use File | Settings | File Templates.
--%>
-
 <div id="newGameModal" class="modal-wrapper" style="display: none">
    <div class="modal">
        <a href="#close" title="Close" class="close">&times;</a>
@@ -5,13 +5,7 @@
 <%@ page import="java.util.Date" %>
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>

-<%--
-  Created by IntelliJ IDEA.
-  User: kmitr
-  Date: 26/03/2024
-  Time: 11:05
-  To change this template use File | Settings | File Templates.
--%>
+
 <%--TODO: adapter les deux lignes suivante pour ne pas vérifier la valeur nulle--%>
 <% User user = (User) session.getAttribute("user") != null ? (User) session.getAttribute("user") : new User("toto", "toto@gmail.com", "totopassword", new Date(), User.Gender.MALE); %>
 <% ArrayList<Game> games = (ArrayList<Game>) request.getAttribute("games") != null ? (ArrayList<Game>) request.getAttribute("games") : new ArrayList<Game>() ; %>
@@ -1,16 +0,0 @@
-var cb = document.querySelectorAll(".close");
-for (i = 0; i < cb.length; i++) {
-  cb[i].addEventListener("click", function() {
-    var dia = this.parentNode.parentNode; /* You need to update this part if you change level of close button */
-    dia.style.display = "none";
-  });
-}
-
-var mt = document.querySelectorAll(".modal-toggle");
-for (i = 0; i < mt.length; i++) {
-  mt[i].addEventListener("click", function() {
-    var targetId = this.getAttribute("data-target");
-    var target = document.querySelector(targetId);
-    target.style.display = "block";
-  });
-}
@@ -9,6 +9,9 @@
 <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>
    <main>
@@ -26,5 +29,4 @@
        <%}%>
    </main>
 </body>
-<script defer type="module"><%@include file="../static/js/forgotten-password.js"%></script>
 </html>
@@ -3,7 +3,8 @@
 <html>
 <head>
    <title> Cards Rush - Connexion</title>
-    <style><%@include file="../static/css/login.css" %></style>
+    <link href="${pageContext.request.contextPath}/static/css/login.css" rel="stylesheet">
+    <script src="${pageContext.request.contextPath}/static/js/login.js" defer></script>
    <meta charset="utf-8">
 </head>
 <body>
@@ -35,8 +36,5 @@
        </div>
    </section>
 </main>
-
-<script defer type="module"><%@include file="../static/js/login.js" %></script>
-
 </body>
 </html>
@@ -5,6 +5,9 @@
 <html>
 <head>
  <title>Cards Rush</title>
+<%--  <link href="${pageContext.request.contextPath}/static/css/main-menu.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 charset="utf-8">
 </head>
 <body>
@@ -21,6 +24,4 @@
  <%@include file="../components/new-game.jsp"%>
  <%@include file="../components/statistics.jsp"%>
 </body>
-<script defer type="text/javascript"><%@include file="../static/js/modal.js"%></script>
-<script defer type="text/javascript"><%@include file="../static/js/new-game.js"%></script>
 </html>
@@ -3,7 +3,8 @@
 <html>
 <head>
  <title>Register</title>
-  <style><%@include file="../static/css/login.css"%></style>
+  <link href="${pageContext.request.contextPath}/static/css/login.css" rel="stylesheet">
+  <script src="${pageContext.request.contextPath}/static/js/register.js" defer></script>
 </head>
 <body>

@@ -51,5 +52,4 @@
 </main>

 </body>
-<script defer type="module"><%@include file="../static/js/register.js"%></script>
 </html>
@@ -1,29 +1,26 @@
 <%@ page import="uppa.project.dao.jpa.DAO_JPA_RecoveryPasswordToken" %>
 <%@ page import="uppa.project.pojo.RecoveryPasswordToken" %>
 <%@ page import="uppa.project.dao.DAOException" %>
-<%--
-  Created by IntelliJ IDEA.
-  User: kmitr
-  Date: 22/03/2024
-  Time: 13:48
-  To change this template use File | Settings | File Templates.
--%>
+
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
    <title>Récupération du mot de passe</title>
+    <meta charset="UTF-8">
+<%--      <link href="${pageContext.request.contextPath}/static/css/reset-password.css" rel="stylesheet">--%>
+    <script src="${pageContext.request.contextPath}/static/js/reset-password.js" defer></script>
 </head>
 <body>
    <main>
        <jsp:include page="../components/navbar.jsp"/>
        <h1>Récupération du mot de passe</h1>
-        <form id="resetPasswordForm" action="reset-password" method="post">
+        <form id="resetPasswordForm" action="${pageContext.request.contextPath}/reset-password" method="post">
            <label for="newPassword">Nouveau mot de passe</label>
            <input type="password" id="newPassword" name="newPassword" required>
            <label for="confirmPassword">Confirmer le mot de passe</label>
            <input type="password" id="confirmPassword" name="confirmPassword" required>
            <% if (request.getParameter("error") != null && request.getParameter("error").equals("matching-password")) {%>
-            <p>Les mots de passe ne correspondent pas</p>
+                <p>Les mots de passe ne correspondent pas</p>
            <% } %>
            <input type="hidden" name="token" value="${param.token}">
            <input type="submit" value="Valider">
@@ -0,0 +1,16 @@
+let cb = document.querySelectorAll(".close");
+for (let i = 0; i < cb.length; i++) {
+  cb[i].addEventListener("click", function() {
+    const dia = this.parentNode.parentNode; /* You need to update this part if you change level of close button */
+    dia.style.display = "none";
+  });
+}
+
+let mt = document.querySelectorAll(".modal-toggle");
+for (let i = 0; i < mt.length; i++) {
+  mt[i].addEventListener("click", function() {
+    const targetId = this.getAttribute("data-target");
+    const target = document.querySelector(targetId);
+    target.style.display = "block";
+  });
+}