From 63830da997837b29aabbd06ca153eee5204d8237 Mon Sep 17 00:00:00 2001
From: kmitresse <kmitresse@etud.univ-pau.fr>
Date: Fri, 5 Apr 2024 18:31:02 +0200
Subject: [PATCH] fix: dev-web - fix index display

---
 .../src/main/java/uppa/project/servlet/IndexServlet.java      | 1 +
 .../Projet/src/main/webapp/WEB-INF/components/navbar.jsp      | 4 ++--
 S2/DevWeb/Projet/src/main/webapp/static/css/index.css         | 2 +-
 S2/DevWeb/Projet/src/main/webapp/static/css/navbar.css        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java
index 9494c86..de9656b 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java
@@ -25,6 +25,7 @@ public class IndexServlet extends HttpServlet {
       return;
     }
 
+    request.setAttribute("current", "index");
     request.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(request, response);
   }
 
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp
index 8dd7f3d..2935bf0 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp
@@ -12,13 +12,13 @@
 <style><%@include file="/static/css/navbar.css"%></style>
 <nav>
     <a href="${pageContext.request.contextPath}/index"><img src="${pageContext.request.contextPath}/static/img/CardsRushLogo.png" alt="Logo CardsRush"> </a>
-    <%  if (currentPage.equals("register") || currentPage.equals("forgotten-password") || currentPage.equals("reset-password")){ %>
+    <%  if (currentPage.equals("register") || currentPage.equals("forgotten-password") || currentPage.equals("reset-password"))  { %>
     <a class="button" href="${pageContext.request.contextPath}/login">Se connecter</a>
     <% }
         if (currentPage.equals("login") || currentPage.equals("forgotten-password") || currentPage.equals("reset-password")) { %>
      <a class="button" href="${pageContext.request.contextPath}/register">S'inscrire</a>
     <% } else if (currentPage.equals("main-menu")){ %>
-        <div class="content">
+        <div class="nav-content">
             <% User user = (User) request.getAttribute("user"); %>
             <p class="user">
                 <%= user != null ? user.getUsername() : "anonyme"%> <br/>
diff --git a/S2/DevWeb/Projet/src/main/webapp/static/css/index.css b/S2/DevWeb/Projet/src/main/webapp/static/css/index.css
index 8c342d1..149fe3d 100644
--- a/S2/DevWeb/Projet/src/main/webapp/static/css/index.css
+++ b/S2/DevWeb/Projet/src/main/webapp/static/css/index.css
@@ -3,7 +3,7 @@ html{
 }
 
 .content {
-    display: inline-flex;
+    display: flex;
     flex-direction: column;
     align-items: flex-start;
     gap: 30px;
diff --git a/S2/DevWeb/Projet/src/main/webapp/static/css/navbar.css b/S2/DevWeb/Projet/src/main/webapp/static/css/navbar.css
index 4384c1e..c04acd8 100644
--- a/S2/DevWeb/Projet/src/main/webapp/static/css/navbar.css
+++ b/S2/DevWeb/Projet/src/main/webapp/static/css/navbar.css
@@ -4,7 +4,7 @@ nav {
     justify-content: space-between;
     padding: 10px;
 }
-.content {
+.nav-content {
     display: flex;
     flex-direction: row;
     gap: 40px;