Merge pull request #67 from HE-Arc/simon-plumey-66-naviguation-issue

Minor nav bug fix
HE-Arc · Nov 22, 2023 · 08611a4 · 08611a4
2 parents d33f97a + 6d5f93c
commit 08611a4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/resources/css/app.scss b/resources/css/app.scss
@@ -14,9 +14,10 @@ body {
     background-size: 100%;
     position: absolute;
     top: 0;
-    left: 0;
+    right: 0;
     width: 100%;
     z-index: -2;
+    transition: right 0.5s ease-in-out;
 
     .bg-gradient {
         position: fixed;
@@ -141,7 +142,7 @@ header {
     background-color: $background;
     overflow-x: hidden;
     padding-top: 60px;
-    transition: 0.5s;
+    transition: 0.5s ease-in-out;
 
     a {
         padding: 8px 8px 8px 32px;
@@ -159,14 +160,11 @@ header {
     }
 }
 
-#body {
-    transition: margin-right .5s;
-}
-
-.openNavBtn {
+#openNavBtn {
     position: absolute;
     top: 20px;
     right: 20px;
+    transition: opacity .5s ease-in-out;
 
     &:hover {
         cursor: pointer;

diff --git a/resources/views/layout/nav.blade.php b/resources/views/layout/nav.blade.php
@@ -6,7 +6,7 @@
     <a href="/">Inscription</a>
 </nav>
 
-<span onclick="openNav()" class="openNavBtn">
+<span onclick="openNav()" id="openNavBtn">
     <div class="icon-burger">
         <div></div>
         <div></div>
@@ -17,11 +17,17 @@
 <script>
     function openNav() {
         document.getElementById("sideBarNav").style.width = "250px";
-        document.getElementById("body").style.marginRight = "250px";
+        document.getElementById("bg-bricks").style.right = "250px";
+        let openNavBtn = document.getElementById("openNavBtn");
+        openNavBtn.style.opacity = "0";
+        openNavBtn.style.cursor = "default";
     }
 
     function closeNav() {
         document.getElementById("sideBarNav").style.width = "0";
-        document.getElementById("body").style.marginRight = "0";
+        document.getElementById("bg-bricks").style.right = "0";
+        let openNavBtn = document.getElementById("openNavBtn");
+        openNavBtn.style.opacity = "1";
+        openNavBtn.style.cursor = "pointer";
     }
 </script>
diff --git a/routes/web.php b/routes/web.php
@@ -19,8 +19,8 @@
 
 Route::get('/success', function () {
     return view('game.success')->with([
-        'title' => request('title'),
-        'artist' => request('artist'),
+        'title'      => request('title'),
+        'artist'     => request('artist'),
         'spotify_id' => request('spotify_id'),
     ]);
 })->name('success');