Commit da9cca84 authored by Julien Sailly's avatar Julien Sailly
Browse files

Merge avec master

parents 39a0d1e2 6cdd791b

app/Http/Controllers/DiveSessionUpdate.php

+3 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ class DiveSessionUpdate extends Controller 
    //Update a diving session

    public static function update($request, $id)

    {

        $dv = DivingSession::where('DS_CODE', $id);

        $dv = DivingSession::where('DS_CODE', $id)->first();



        $dv->US_ID = $request->pilot;

        $dv->DL_ID = $request->location;
@@ -26,3 +26,5 @@ public static function update($request, $id) 
        $dv->save();

    }

}



?>

app/Http/Controllers/DivingNumberController.php

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ public function index(): View 


        $dateDives = DivingNumberModel::join('car_registration', 'car_user.us_id', '=', 'car_registration.us_id')

        ->join('car_diving_session','car_registration.ds_code','=','car_diving_session.ds_code')

        ->join('car_diving_location','car_diving_session.dl_id','=','car_diving_location.dl_id')

        ->join('car_role_attribution','car_user.us_id','=','car_role_attribution.Us_id')

        ->join('car_role','car_role_attribution.rol_code','=','car_role.rol_code')



        ->where('car_user.US_ID',3)

        ->get();
@@ -30,6 +34,8 @@ public function index(): View 
                $dg->on('car_registration.ds_code', '=', 'car_diving_group.ds_code')

                    ->on('car_registration.dg_number', '=', 'car_diving_group.dg_number');

            })

            ->join('car_diving_session','car_registration.ds_code','=','car_diving_session.ds_code')

            ->where('car_diving_session.ds_date','>=',date("Y").'-00-00')

            ->where('car_user.US_ID', $userId)

            ->count();

        $usersCount = 99 - $usersCount;

public/css/homepage.css

0 → 100644
+46 −0
Original line number Diff line number Diff line 
@import url('https://fonts.googleapis.com/css2?family=Space+Grotesk&display=swap');

@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@300&display=swap');





html{

    background-image: url("/images/background-homepage.jpg");

}



.background-image{

    filter: blur(5px);

}



.center-box{

    padding: 30px;

    background-color: rgba(255, 255, 255, 0.22);

    width: 60em;

    height: 25em;

    border-radius: 30px;

    margin: auto;

    margin-top: 7em ;

    display: block;

    text-align: center;

    backdrop-filter: blur(5px);

}



h1{

    font-family: 'Space Grotesk', sans-serif;

    font-size: 55px;

    color: white;

    font-weight: bold;

}



p{

    font-family: 'Montserrat', sans-serif;

    margin-top: 30px;

    font-size: 30px;

    color: white;

}



button{

    margin-top: 50px;

    background-color: #f7c36f;

    border-radius: 10px;

    width: 300px;

    height: 40px;

}
 
 No newline at end of file

public/images/background-homepage.jpg

0 → 100644
+193 KiB
Loading image diff...

resources/views/components/header.blade.php

+1 −3
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ class="block text-sm text-white">{{ session('user')->US_FIRST_NAME . " " . sessi 
                    </div>

                    <ul class="py-2" aria-labelledby="user-menu-button">

                        <li>

                            <a href="#"

                               class="block px-4 py-2 text-sm hover:bg-gray-600 text-gray-200 hover:text-white">Historique

                                de mes plongées</a>

                            <a href="{{route('divings')}}" class="block px-4 py-2 text-sm hover:bg-gray-600 text-gray-200 hover:text-white">Historique de mes plongées</a>

                        </li>

                        <li>

                            <a href="{{ route('logout') }}"