From 8cacabf1c9aa04a66adb6ded1b498bbc17c3e9c6 Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Wed, 6 Nov 2019 23:16:44 -0600
Subject: [PATCH] rearranged navbar

---
 resources/views/layouts/navbar.blade.php | 64 ++++++++++++------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php
index e7ffae9a2..a12b7acea 100644
--- a/resources/views/layouts/navbar.blade.php
+++ b/resources/views/layouts/navbar.blade.php
@@ -5,6 +5,7 @@
         </button>
         <a class="navbar-brand" href="/dashboard">W4RP</a>
         <ul class="navbar-nav mr-auto">
+            @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Renter') || auth()->user()->hasRole('Admin'))
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Moons</a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
@@ -23,37 +24,6 @@
                     @endif
                 </div>
             </li>
-            @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin') || auth()->user()->hasRole('Renter'))
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Wiki</a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
-                    <a class="dropdown-item" href="https://www.w4rp.space">Wiki</a>
-                    <a class="dropdown-item" href="/wiki/register">Registration</a>
-                    <a class="dropdown-item" href="/wiki/changepassword">Change Password</a>
-                </div>
-            </li>
-            @endif
-            @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Others</a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
-                    <a class="dropdown-item" href="https://buyback.w4rp.space">Buyback Program</a>
-                </div>
-            </li>
-            @endif
-            @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Contracts</a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
-                    <a class="dropdown-item" href="/contracts/display/all">Display All Contracts</a>
-                    <a class="dropdown-item" href="/contracts/display/public">Display Public Contracts</a>
-                    <a class="dropdown-item" href="/contracts/display/private">Display Private Contracts</a>
-                    @if(auth()->user()->hasPermission('contract.admin'))
-                    <a class="dropdown-item" href="/contracts/admin/display">Admin Dashboard</a>
-                    <a class="dropdown-item" href="/contracts/admin/new">New Contract</a>
-                    @endif
-                </div>
-            </li>
             @endif
             @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
             <li class="nav-item dropdown">
@@ -70,6 +40,20 @@
             </li>
             @endif
             @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Contracts</a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
+                    <a class="dropdown-item" href="/contracts/display/all">Display All Contracts</a>
+                    <a class="dropdown-item" href="/contracts/display/public">Display Public Contracts</a>
+                    <a class="dropdown-item" href="/contracts/display/private">Display Private Contracts</a>
+                    @if(auth()->user()->hasPermission('contract.admin'))
+                    <a class="dropdown-item" href="/contracts/admin/display">Admin Dashboard</a>
+                    <a class="dropdown-item" href="/contracts/admin/new">New Contract</a>
+                    @endif
+                </div>
+            </li>
+            @endif
+            @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Structures</a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
@@ -83,6 +67,24 @@
             @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
                 <a class="nav-link" href="/logistics/fuel/structures">Jump Gate Fuel</a>
             @endif
+            @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin') || auth()->user()->hasRole('Renter'))
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Wiki</a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
+                    <a class="dropdown-item" href="https://www.w4rp.space">Wiki</a>
+                    <a class="dropdown-item" href="/wiki/register">Registration</a>
+                    <a class="dropdown-item" href="/wiki/changepassword">Change Password</a>
+                </div>
+            </li>
+            @endif
+            @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Others</a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
+                    <a class="dropdown-item" href="https://buyback.w4rp.space">Buyback Program</a>
+                </div>
+            </li>
+            @endif
         </ul>
         <ul class="navbar-nav m1-auto">
             <li class="nav-item">