mirror of
https://github.com/kmitresse/Cards-Rush.git
synced 2026-05-13 17:11:49 +00:00
fix: dev-web - fix index display
This commit is contained in:
@@ -25,6 +25,7 @@ public class IndexServlet extends HttpServlet {
|
||||
return;
|
||||
}
|
||||
|
||||
request.setAttribute("current", "index");
|
||||
request.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(request, response);
|
||||
}
|
||||
|
||||
|
||||
@@ -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/>
|
||||
|
||||
@@ -3,7 +3,7 @@ html{
|
||||
}
|
||||
|
||||
.content {
|
||||
display: inline-flex;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
gap: 30px;
|
||||
|
||||
@@ -4,7 +4,7 @@ nav {
|
||||
justify-content: space-between;
|
||||
padding: 10px;
|
||||
}
|
||||
.content {
|
||||
.nav-content {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 40px;
|
||||
|
||||
Reference in New Issue
Block a user