Loading app/Http/Controllers/DivesList.php +1 −1 Original line number Diff line number Diff line Loading @@ -9,7 +9,7 @@ class DivesList extends Controller { function index(): View { $dives = DivingSession::select('car_diving_session.DL_ID', 'DS_DATE', 'DL_DEPTH', 'CAR_SCHEDULE', 'DL_NAME') $dives = DivingSession::select('DS_CODE', 'car_diving_session.DL_ID', 'DS_DATE', 'DL_DEPTH', 'CAR_SCHEDULE', 'DL_NAME') ->join('car_diving_location', 'car_diving_session.DL_ID', '=', 'car_diving_location.DL_ID') ->get(); return view('dives', ['dives' => $dives]); Loading resources/img/logo.png 0 → 100644 +48.6 KiB Loading image diff... resources/views/components/header.blade.php +72 −3 Original line number Diff line number Diff line <header> header </header> No newline at end of file <nav x-data="{ open: false }" class="bg-white border-b border-gray-100"> <!-- Primary Navigation Menu --> <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8"> <div class="flex justify-between h-16"> <div class="flex"> <!-- Logo --> <div class="shrink-0 flex items-center"> <a href="{{ route('homepage') }}"> <img class="block h-9 w-auto fill-current text-gray-800" src="resources/img/logo.png" alt="Nautilus logo"/> </a> </div> <!-- Navigation Links --> <div class="hidden space-x-8 sm:-my-px sm:ms-10 sm:flex"> <x-nav-link :href="route('homepage')" :active="request()->routeIs('homepage')"> {{ __('Page d\'accueil') }} </x-nav-link> <x-nav-link :href="route('dives')" :active="request()->routeIs('dives')"> {{ __('Plongées') }} </x-nav-link> </div> </div> <!-- Hamburger --> <div class="-me-2 flex items-center sm:hidden"> <button @click="open = ! open" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out"> <svg class="h-6 w-6" stroke="currentColor" fill="none" viewBox="0 0 24 24"> <path :class="{'hidden': open, 'inline-flex': ! open }" class="inline-flex" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" /> <path :class="{'hidden': ! open, 'inline-flex': open }" class="hidden" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" /> </svg> </button> </div> </div> </div> <!-- Responsive Navigation Menu --> <div :class="{'block': open, 'hidden': ! open}" class="hidden sm:hidden"> <div class="pt-2 pb-3 space-y-1"> <x-responsive-nav-link :href="route('homepage')" :active="request()->routeIs('homepage')"> {{ __('Page d\'accueil') }} </x-responsive-nav-link> <x-responsive-nav-link :href="route('dives')" :active="request()->routeIs('dives')"> {{ __('Plongées') }} </x-responsive-nav-link> </div> <!-- Responsive Settings Options --> <div class="pt-4 pb-1 border-t border-gray-200"> <div class="px-4"> <!--<div class="font-medium text-base text-gray-800"> //Auth::user()->name </div> <div class="font-medium text-sm text-gray-500"> //Auth::user()->email </div>--> </div> <div class="mt-3 space-y-1"> <x-responsive-nav-link :href="route('dives')"> {{ __('Profil') }} </x-responsive-nav-link> <!-- Authentication --> <form method="POST" action="{{ route('dives') }}"> @csrf <x-responsive-nav-link :href="route('dives')" onclick="event.preventDefault(); this.closest('form').submit();"> {{ __('Log Out') }} </x-responsive-nav-link> </form> </div> </div> </div> </nav> resources/views/components/nav-link.blade.php 0 → 100644 +11 −0 Original line number Diff line number Diff line @props(['active']) @php $classes = ($active ?? false) ? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 text-sm font-medium leading-5 text-gray-900 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out' : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:outline-none focus:text-gray-700 focus:border-gray-300 transition duration-150 ease-in-out'; @endphp <a {{ $attributes->merge(['class' => $classes]) }}> {{ $slot }} </a> resources/views/components/page-title.blade.php +1 −1 Original line number Diff line number Diff line <h1 class="mb-6 font-bold md:text-5xl lg:text-6xl underline underline-offset-8">{{ $slot }}</h1> <h1 class="mb-12 font-bold md:text-5xl lg:text-6xl underline underline-offset-8">{{ $slot }}</h1> Loading
app/Http/Controllers/DivesList.php +1 −1 Original line number Diff line number Diff line Loading @@ -9,7 +9,7 @@ class DivesList extends Controller { function index(): View { $dives = DivingSession::select('car_diving_session.DL_ID', 'DS_DATE', 'DL_DEPTH', 'CAR_SCHEDULE', 'DL_NAME') $dives = DivingSession::select('DS_CODE', 'car_diving_session.DL_ID', 'DS_DATE', 'DL_DEPTH', 'CAR_SCHEDULE', 'DL_NAME') ->join('car_diving_location', 'car_diving_session.DL_ID', '=', 'car_diving_location.DL_ID') ->get(); return view('dives', ['dives' => $dives]); Loading
resources/views/components/header.blade.php +72 −3 Original line number Diff line number Diff line <header> header </header> No newline at end of file <nav x-data="{ open: false }" class="bg-white border-b border-gray-100"> <!-- Primary Navigation Menu --> <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8"> <div class="flex justify-between h-16"> <div class="flex"> <!-- Logo --> <div class="shrink-0 flex items-center"> <a href="{{ route('homepage') }}"> <img class="block h-9 w-auto fill-current text-gray-800" src="resources/img/logo.png" alt="Nautilus logo"/> </a> </div> <!-- Navigation Links --> <div class="hidden space-x-8 sm:-my-px sm:ms-10 sm:flex"> <x-nav-link :href="route('homepage')" :active="request()->routeIs('homepage')"> {{ __('Page d\'accueil') }} </x-nav-link> <x-nav-link :href="route('dives')" :active="request()->routeIs('dives')"> {{ __('Plongées') }} </x-nav-link> </div> </div> <!-- Hamburger --> <div class="-me-2 flex items-center sm:hidden"> <button @click="open = ! open" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out"> <svg class="h-6 w-6" stroke="currentColor" fill="none" viewBox="0 0 24 24"> <path :class="{'hidden': open, 'inline-flex': ! open }" class="inline-flex" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" /> <path :class="{'hidden': ! open, 'inline-flex': open }" class="hidden" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" /> </svg> </button> </div> </div> </div> <!-- Responsive Navigation Menu --> <div :class="{'block': open, 'hidden': ! open}" class="hidden sm:hidden"> <div class="pt-2 pb-3 space-y-1"> <x-responsive-nav-link :href="route('homepage')" :active="request()->routeIs('homepage')"> {{ __('Page d\'accueil') }} </x-responsive-nav-link> <x-responsive-nav-link :href="route('dives')" :active="request()->routeIs('dives')"> {{ __('Plongées') }} </x-responsive-nav-link> </div> <!-- Responsive Settings Options --> <div class="pt-4 pb-1 border-t border-gray-200"> <div class="px-4"> <!--<div class="font-medium text-base text-gray-800"> //Auth::user()->name </div> <div class="font-medium text-sm text-gray-500"> //Auth::user()->email </div>--> </div> <div class="mt-3 space-y-1"> <x-responsive-nav-link :href="route('dives')"> {{ __('Profil') }} </x-responsive-nav-link> <!-- Authentication --> <form method="POST" action="{{ route('dives') }}"> @csrf <x-responsive-nav-link :href="route('dives')" onclick="event.preventDefault(); this.closest('form').submit();"> {{ __('Log Out') }} </x-responsive-nav-link> </form> </div> </div> </div> </nav>
resources/views/components/nav-link.blade.php 0 → 100644 +11 −0 Original line number Diff line number Diff line @props(['active']) @php $classes = ($active ?? false) ? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 text-sm font-medium leading-5 text-gray-900 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out' : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:outline-none focus:text-gray-700 focus:border-gray-300 transition duration-150 ease-in-out'; @endphp <a {{ $attributes->merge(['class' => $classes]) }}> {{ $slot }} </a>
resources/views/components/page-title.blade.php +1 −1 Original line number Diff line number Diff line <h1 class="mb-6 font-bold md:text-5xl lg:text-6xl underline underline-offset-8">{{ $slot }}</h1> <h1 class="mb-12 font-bold md:text-5xl lg:text-6xl underline underline-offset-8">{{ $slot }}</h1>