From 1f4955fd49fb02e8a26b5724449d2380e72e9d35 Mon Sep 17 00:00:00 2001
From: Pelayori <31128562+Pelayori@users.noreply.github.com>
Date: Sat, 9 Mar 2024 18:44:35 +0100
Subject: [PATCH] Fix some navbar issues

---
 src/main/resources/messages.properties           | 2 +-
 src/main/resources/messages_en.properties        | 2 +-
 src/main/resources/templates/fragments/nav.html  | 5 -----
 src/main/resources/templates/game/basicGame.html | 1 +
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index a0ce684b..9989c2f6 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -2,7 +2,7 @@
 # -------------------Statements for the nav.html file----------------------
 navbar.home=Inicio
 navbar.play=Jugar
-navbar.game1=Juego 1
+navbar.game1=Jugar
 navbar.game2=Juego 2
 navbar.history=Historial
 navbar.ranking=Ranking
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 2f8bed6c..1e1a22f5 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -2,7 +2,7 @@
 # Navbar
 navbar.home=Home
 navbar.play=Play
-navbar.game1=Game 1
+navbar.game1=Play
 navbar.game2=Game 2
 navbar.history=History
 navbar.ranking=Ranking
diff --git a/src/main/resources/templates/fragments/nav.html b/src/main/resources/templates/fragments/nav.html
index 2a6bdc50..9f15c052 100644
--- a/src/main/resources/templates/fragments/nav.html
+++ b/src/main/resources/templates/fragments/nav.html
@@ -21,11 +21,6 @@
                    aria-haspopup="true" aria-expanded="false">
                     <span th:text="#{navbar.play}"></span>
                 </a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                    <a class="dropdown-item" href="/game" th:text="#{navbar.game1}"></a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/" th:text="#{navbar.history}"></a>
-                </div>
             </li>
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown2" role="button" data-toggle="dropdown"
diff --git a/src/main/resources/templates/game/basicGame.html b/src/main/resources/templates/game/basicGame.html
index 432cc621..05f3196c 100644
--- a/src/main/resources/templates/game/basicGame.html
+++ b/src/main/resources/templates/game/basicGame.html
@@ -10,6 +10,7 @@
     <b id="gamePoints" th:inline="text" th:text="${session.gameSession.score}"></b>
 </p>
 <div id="gameFrame" th:replace="~{/game/fragments/gameFrame}"></div>
+
 <footer th:replace="~{fragments/footer}"></footer>
 <script>
     function updatePoints() {