mirror of
https://github.com/kmitresse/Cards-Rush.git
synced 2026-05-15 17:11:48 +00:00
feat(DevWeb): Remove Main menu and change routing in navbar
This commit is contained in:
@@ -1,21 +0,0 @@
|
||||
<%@ page contentType="text/html; charset=UTF-8" 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" %>
|
||||
|
||||
<layout:base title="Menu principal">
|
||||
<component:hero>
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-5-tablet is-5-desktop is-5-widescreen">
|
||||
<component:card title="Nouvelle partie">
|
||||
<form:new-game/>
|
||||
</component:card>
|
||||
</div>
|
||||
<div class="column is-6-tablet is-6-desktop is-6-widescreen">
|
||||
<component:card title="Utilisateurs connectés">
|
||||
<component:connected-user-list/>
|
||||
</component:card>
|
||||
</div>
|
||||
</div>
|
||||
</component:hero>
|
||||
</layout:base>
|
||||
@@ -3,10 +3,22 @@
|
||||
|
||||
<nav class="navbar is-fixed-top" role="navigation" aria-label="main navigation">
|
||||
<div class="navbar-brand">
|
||||
<% if (session.getAttribute("user") != null) { %>
|
||||
|
||||
<a class="navbar-item" href="${pageContext.request.contextPath}/lobby">
|
||||
<img src="${pageContext.request.contextPath}/static/img/CardsRushLogoBlack.svg" height="260">
|
||||
</a>
|
||||
|
||||
<% } else { %>
|
||||
|
||||
<a class="navbar-item" href="${pageContext.request.contextPath}/">
|
||||
<img src="${pageContext.request.contextPath}/static/img/CardsRushLogoBlack.svg" height="260">
|
||||
</a>
|
||||
|
||||
<% } %>
|
||||
|
||||
|
||||
|
||||
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarMenu">
|
||||
<span aria-hidden="true"></span>
|
||||
<span aria-hidden="true"></span>
|
||||
|
||||
@@ -15,8 +15,11 @@
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>AuthenticationFilter</filter-name>
|
||||
<url-pattern>/main-menu</url-pattern>
|
||||
<!-- <url-pattern>/main-menu</url-pattern>-->
|
||||
<url-pattern>/lobby</url-pattern>
|
||||
<url-pattern>/profile</url-pattern>
|
||||
<url-pattern>/new</url-pattern>
|
||||
<url-pattern>/join</url-pattern>
|
||||
<url-pattern>/game</url-pattern>
|
||||
<url-pattern>/logout</url-pattern>
|
||||
</filter-mapping>
|
||||
|
||||
Reference in New Issue
Block a user