From 2c3946959235056eacaa14102a2bd42c600a02d6 Mon Sep 17 00:00:00 2001
From: Matt Young <matt@mattyoung.us>
Date: Thu, 8 Aug 2024 11:51:50 -0500
Subject: [PATCH] Move nav bar options to My Auditions menu to free space

---
 .../layout/navbar/menus/admin.blade.php         | 10 +++++-----
 .../layout/navbar/menus/my_audition.blade.php   | 17 ++++++++++-------
 .../components/layout/navbar/navbar.blade.php   | 17 +++++++++--------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/resources/views/components/layout/navbar/menus/admin.blade.php b/resources/views/components/layout/navbar/menus/admin.blade.php
index 2931e0b..f70c668 100644
--- a/resources/views/components/layout/navbar/menus/admin.blade.php
+++ b/resources/views/components/layout/navbar/menus/admin.blade.php
@@ -20,11 +20,11 @@
     -->
     <div class="absolute left-1/2 z-10 mt-5 flex w-screen max-w-min -translate-x-1/2 px-4" x-show="open" x-cloak>
         <div class="w-56 shrink rounded-xl bg-white p-4 text-sm font-semibold leading-6 text-gray-900 shadow-lg ring-1 ring-gray-900/5">
-            <a href="/admin" class="block p-2 hover:text-indigo-600">Admin Dashboard</a>
-            <a href="/admin/users" class="block p-2 hover:text-indigo-600">Users</a>
-            <a href="/admin/schools" class="block p-2 hover:text-indigo-600">Schools</a>
-            <a href="/admin/students" class="block p-2 hover:text-indigo-600">Students</a>
-            <a href="/admin/entries" class="block p-2 hover:text-indigo-600">Entries</a>
+            <a href="{{route('admin.dashboard')}}" class="block p-2 hover:text-indigo-600">Admin Dashboard</a>
+            <a href="{{route('admin.users.index')}}" class="block p-2 hover:text-indigo-600">Users</a>
+            <a href="{{route('admin.schools.index')}}" class="block p-2 hover:text-indigo-600">Schools</a>
+            <a href="{{route('admin.students.index')}}" class="block p-2 hover:text-indigo-600">Students</a>
+            <a href="{{route('admin.entries.index')}}" class="block p-2 hover:text-indigo-600">Entries</a>
             <a href="{{route('admin.view_logs')}}" class="block p-2 hover:text-indigo-600">View Logs</a>
         </div>
     </div>
diff --git a/resources/views/components/layout/navbar/menus/my_audition.blade.php b/resources/views/components/layout/navbar/menus/my_audition.blade.php
index c457f28..12fc177 100644
--- a/resources/views/components/layout/navbar/menus/my_audition.blade.php
+++ b/resources/views/components/layout/navbar/menus/my_audition.blade.php
@@ -1,7 +1,7 @@
-<div x-data="{ open: false }">
+<div x-data="{ open: false }" class="relative">
 {{--  <button type="button" class="inline-flex items-center gap-x-1 text-sm font-semibold leading-6 text-gray-900" aria-expanded="false" @on:click=" open = ! open">--}}
 
-  <button type="button" class="inline-flex items-center gap-x-1 text-white rounded-md px-3 py-2 text-sm font-medium hover:bg-indigo-500 hover:bg-opacity-75" aria-expanded="false" @click=" open = ! open">
+  <button type="button" class="inline-flex items-center gap-x-1 text-white rounded-md px-3 py-2 text-sm font-medium hover:bg-indigo-500 hover:bg-opacity-75" aria-expanded="false" @click=" open = ! open"  @click.outside=" open = false">
     <span>My Auditions</span>
     <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
       <path fill-rule="evenodd" d="M5.23 7.21a.75.75 0 011.06.02L10 11.168l3.71-3.938a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z" clip-rule="evenodd" />
@@ -20,14 +20,17 @@
   -->
   <div class="absolute left-1/2 z-10 mt-5 flex w-screen max-w-min -translate-x-1/2 px-4" x-show="open" x-cloak>
     <div class="w-56 shrink rounded-xl bg-white p-4 text-sm font-semibold leading-6 text-gray-900 shadow-lg ring-1 ring-gray-900/5">
-      <a href="/students" class="block p-2 hover:text-indigo-600">My Students</a>
-      <a href="/entries" class="block p-2 hover:text-indigo-600">My Entries</a>
-      <a href="my_school" class="block p-2 hover:text-indigo-600">My School</a>
-      <a href="/profile" class="block p-2 hover:text-indigo-600">My Profile</a>
+      <a href="{{route('dashboard')}}" class="block p-2 hover:text-indigo-600">Dashboard</a>
+        @if(Auth::user()->school_id)
+          <a href="{{route('students.index')}}" class="block p-2 hover:text-indigo-600">My Students</a>
+          <a href="{{route('entries.index')}}" class="block p-2 hover:text-indigo-600">My Entries</a>
+          <a href="{{route('my_school')}}" class="block p-2 hover:text-indigo-600">My School</a>
+        @endif
+      <a href="{{route('my_profile')}}" class="block p-2 hover:text-indigo-600">My Profile</a>
         <form method="POST" action="/logout">
             @csrf
             <button
-                class="block p-2 hover:text-indigo-600""
+                class="block p-2 hover:text-indigo-600"
                 role="menuitem"
                 tabindex="-1"
                 id="user-menu-item-2">
diff --git a/resources/views/components/layout/navbar/navbar.blade.php b/resources/views/components/layout/navbar/navbar.blade.php
index 72b5e1c..102fb11 100644
--- a/resources/views/components/layout/navbar/navbar.blade.php
+++ b/resources/views/components/layout/navbar/navbar.blade.php
@@ -14,14 +14,15 @@
                 </div>
                 <div class="hidden md:block">
                     <div class="ml-10 flex items-baseline space-x-4">
-                        <x-layout.navbar.nav-link href="{{ route('dashboard') }}" :active="request()->is('dashboard')">Dashboard
-                        </x-layout.navbar.nav-link>
-                        @if(Auth::user()->school_id)
-                            <x-layout.navbar.nav-link href="{{ route('students.index') }}" :active="request()->is('students')">Students
-                            </x-layout.navbar.nav-link>
-                            <x-layout.navbar.nav-link href="{{ route('entries.index') }}" :active="request()->is('entries')">Entries
-                            </x-layout.navbar.nav-link>
-                        @endif
+                        @include('components.layout.navbar.menus.my_audition')
+{{--                        <x-layout.navbar.nav-link href="{{ route('dashboard') }}" :active="request()->is('dashboard')">Dashboard--}}
+{{--                        </x-layout.navbar.nav-link>--}}
+{{--                        @if(Auth::user()->school_id)--}}
+{{--                            <x-layout.navbar.nav-link href="{{ route('students.index') }}" :active="request()->is('students')">Students--}}
+{{--                            </x-layout.navbar.nav-link>--}}
+{{--                            <x-layout.navbar.nav-link href="{{ route('entries.index') }}" :active="request()->is('entries')">Entries--}}
+{{--                            </x-layout.navbar.nav-link>--}}
+{{--                        @endif--}}
                         @if(Auth::user()->isJudge() AND Settings::get('judging_enabled'))
                             <x-layout.navbar.nav-link href="{{ route('judging.index') }}" :active="request()->is('judging')">Judging
                             </x-layout.navbar.nav-link>