kmitresse/cards-rush
1
0
Fork 0
mirror of https://github.com/kmitresse/Cards-Rush.git synced 2026-07-09 21:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dev-web - fix index display

Browse Source
This commit is contained in:
kmitresse
2024-04-05 18:31:02 +02:00
parent 13828b722b
commit 63830da997
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
S2/DevWeb/Projet/src/main/java/uppa/project/servlet/IndexServlet.java
+1
View File
@@ -25,6 +25,7 @@ public class IndexServlet extends HttpServlet {
return; return;
} }
request.setAttribute("current", "index");
request.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(request, response); request.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(request, response);
} }
S2/DevWeb/Projet/src/main/webapp/WEB-INF/components/navbar.jsp
+1 -1
View File
@@ -18,7 +18,7 @@
if (currentPage.equals("login") || currentPage.equals("forgotten-password") || currentPage.equals("reset-password")) { %> if (currentPage.equals("login") || currentPage.equals("forgotten-password") || currentPage.equals("reset-password")) { %>
<a class="button" href="${pageContext.request.contextPath}/register">S'inscrire</a> <a class="button" href="${pageContext.request.contextPath}/register">S'inscrire</a>
<% } else if (currentPage.equals("main-menu")){ %> <% } else if (currentPage.equals("main-menu")){ %>
<div class="content"> <div class="nav-content">
<% User user = (User) request.getAttribute("user"); %> <% User user = (User) request.getAttribute("user"); %>
<p class="user"> <p class="user">
<%= user != null ? user.getUsername() : "anonyme"%> <br/> <%= user != null ? user.getUsername() : "anonyme"%> <br/>
S2/DevWeb/Projet/src/main/webapp/static/css/index.css
+1 -1
View File
@@ -3,7 +3,7 @@ html{
} }
.content { .content {
display: inline-flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
gap: 30px; gap: 30px;
S2/DevWeb/Projet/src/main/webapp/static/css/navbar.css
+1 -1
View File
@@ -4,7 +4,7 @@ nav {
justify-content: space-between; justify-content: space-between;
padding: 10px; padding: 10px;
} }
.content { .nav-content {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 40px; gap: 40px;