Commit 40fa178e authored by Julien Sailly's avatar Julien Sailly
Browse files

Squashed commit of the following: 

commit 96096154
Author: Julien Sailly <juliensailly76@gmail.com>
Date:   Tue Jan 9 23:41:47 2024 +0100

    feat: nav-bar working + user infos added

commit 1bd13688
Author: Julien Sailly <juliensailly76@gmail.com>
Date:   Tue Jan 9 23:23:28 2024 +0100

    feat: logged userid stored in the session and customizing navbar accordingly

commit b340b2fb
Author: Julien Sailly <juliensailly76@gmail.com>
Date:   Tue Jan 9 22:22:57 2024 +0100

    feat: major navbar improvements

commit 5aa57f5d
Author: Julien Sailly <juliensailly76@gmail.com>
Date:   Tue Jan 9 21:24:44 2024 +0100

    feat: nav-bar improved

commit c9022d39
Author: Julien Sailly <juliensailly76@gmail.com>
Date:   Tue Jan 9 20:41:18 2024 +0100

    fix: bug with the dive list
parent fb3c506e

app/Http/Controllers/DivingSignUpController.php

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 
class DivingSignUpController extends Controller

{

    public function show(){

        $userid = session()->get('userid');

        if(!preg_match('/[0-9]+/', $userid))

            return DivingSignUpController::error();

        $divesList = new DivesList();

        return $divesList->index();

    }

resources/views/components/footer.blade.php

+3 −2
Original line number Diff line number Diff line 
<footer class="w-full flex flex-row sm:grid sm:grid-cols-3 bg-[#002550] h-36 items-center">

  <div class='w-full bg-[#2A4192]  h-full flex flex-row items-center px-4'>

  <div class='w-full bg-blue-700  h-full flex flex-row items-center px-4'>

    <img src='../../img/logo.png' class="h-[90%] w-full" alt=''>

  </div>

  <div class='text-white bg-[#2A4192] h-full w-1/2 justify-end'

  <div class='text-white bg-blue-700 h-full w-1/2 justify-end'

      style="clip-path: ellipse(75% 75% at 0 33%);">

    </div>

  <div class='md:flex md:flex-col items-start w-full md:px-12 '>
@@ -13,3 +13,4 @@ 
    </ul>

  </div>

</footer>

<script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.2.1/flowbite.min.js"></script>

resources/views/components/header.blade.php

+42 −65

File changed.

Preview size limit exceeded, changes collapsed.

resources/views/components/nav-link.blade.php

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


@php

    $classes = ($active ?? false)

                ? 'inline-flex items-center px-1 pt-1 border-b-2 border-[#FFBE55] hover:text-[#FFBE55] text-sm font-medium leading-5 text-[#EBEBEB] focus:outline-none focus:border-[#FFBE55] transition duration-150 ease-in-out'

                : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent hover:text-[#FFBE55] text-sm font-medium leading-5 text-[#EBEBEB] hover:border-[#FFBE55] focus:outline-none focus:text-[#FFBE55] focus:border-[#FFBE55] transition duration-150 ease-in-out';

                ? 'inline-flex items-center px-1 pt-1 border-b-[3px] border-[#FFBE55] hover:text-[#FFBE55] text-sm font-medium leading-5 text-[#EBEBEB] focus:outline-none focus:border-[#FFBE55] transition duration-150 ease-in-out'

                : 'inline-flex items-center px-1 pt-1 border-b-[3px] border-transparent hover:text-[#FFBE55] text-sm font-medium leading-5 text-[#EBEBEB] hover:border-[#FFBE55] focus:outline-none focus:text-[#FFBE55] focus:border-[#FFBE55] transition duration-150 ease-in-out';

@endphp



<a {{ $attributes->merge(['class' => $classes]) }}>

resources/views/components/page-title.blade.php

+1 −1
Original line number Diff line number Diff line 
<h1 class="mb-12 font-bold md:text-5xl lg:text-4xl underline underline-offset-4">{{ $slot }}</h1>
 
<h1 class="mb-8 font-bold md:text-3xl lg:text-4xl underline underline-offset-4">{{ $slot }}</h1>