Commit 603873ef authored by Julien Sailly's avatar Julien Sailly
Browse files

Merge branch 'master' into filters-display

parents 168148ca 4680a006

public/js/create_div.js

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
document.addEventListener('DOMContentLoaded', function () {

    function checkButtons() {

        var deleteButtons = document.querySelectorAll('.clickableRed');

        var historiqueContainer = document.getElementById('Historique');

        var DiverImage = document.getElementById('imageDiver');



        if (deleteButtons.length > 0) {

            historiqueContainer.style.display = 'block';

            DiverImage.style.display = 'none';

        } else {

            historiqueContainer.style.display = 'none';

            DiverImage.style.display = 'block';

        }

    }



    checkButtons();



    document.addEventListener('click', function (event) {

        if (event.target.classList.contains('clickableRed')) {

            setTimeout(checkButtons, 100);

        }

    });

});
 
 No newline at end of file

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

+4 −0
Original line number Diff line number Diff line 
<p style="font-size: 35px">{{ $slot }}</p>

<hr style="height: 3px;background-color: black;margin-bottom: 70px;margin-top: 5px; width : @if (isset($hrSize)){{$hrSize}}@else 100%@endif">

<script>

    document.title = document.title + " - " + "{{ $slot }}";

</script>
 
 No newline at end of file

resources/views/create_dive.blade.php

+2 −6
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
        <div

            style="width: 50%; margin-right: 50px;display:flex; align-items: center; flex-direction: column;overflow: auto;">

            @if(isset($previousDives))

            {

                <div id="Historique">

                    <p style="font-size: 35px">Historique de plongées crées</p>

                    <hr
@@ -39,7 +38,6 @@ class="fa-solid fa-xmark"></i></button></form> 
                        @endforeach

                    </table>

                </div>

            }

            @else

            <img src="{{ asset('/images/Diver1.png') }}" alt="Diver illustration" id="imageDiver">

            @endif
@@ -49,9 +47,8 @@ class="fa-solid fa-xmark"></i></button></form> 
            @if (isset($error))

                <p>{{ $error }}</p>

            @endif

            <h1 class="text-4xl"

                style="font-family: 'Space Grotesk', sans-serif; font-weight: bold; margin-bottom: 30px;">Création d'une

                plongée</h1>

            

            <x-page-title hrSize="70%">Création d'une plongée</x-page-title>

            <div class="Line">

                <div class="divideFlex Column">

                    <h2>Créneau</h2>
@@ -236,5 +233,4 @@ class="ms-auto -mx-1.5 -my-1.5 bg-white text-gray-400 hover:text-gray-900 rounde 
    </div>



    <script src="https://kit.fontawesome.com/8708952b61.js" crossorigin="anonymous"></script>

    <script src="{{ asset('/js/create_div.js') }}"></script>

</x-layout>

resources/views/dashboard.blade.php

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
            </button>

        </div>

    @else

        <x-page-title>Tableau de bord</x-page-title>

        <x-page-title hrSize="30%">Tableau de bord</x-page-title>

        <h2 class="text-2xl font-semibold text-gray-800">Bonjour

            {{ session('user')->US_FIRST_NAME . ' ' . session('user')->US_NAME . ',' }}</h2>

        <div class="flex flex-row justify-evenly mt-10">
@@ -44,7 +44,7 @@ 
            <h2 class="text-2xl font-semibold text-gray-800">Responsable</h2>

            <div class="flex flex-row justify-evenly mt-6 mb-14">

                <x-square-button bgColor="bg-[#909aef]" textColor="text-black" textSubtitle="Gérer des adhérents"

                    link="{{ route('manage_members') }}">>name('logout')

                    link="{{ route('manage_members') }}">

                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"

                        stroke="currentColor" class="w-12 h-12">

                        <path stroke-linecap="round" stroke-linejoin="round"

resources/views/diveractivities.blade.php

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
    @if(!session()->has('user'))

            Vous devez être connecté pour accéder à cette page.

    @else

    <x-page-title>Historique des plongées de {{ session('user')->US_FIRST_NAME . " " . session('user')->US_NAME }}</x-page-title>

    <x-page-title hrSize="70%">Historique des plongées de {{ session('user')->US_FIRST_NAME . " " . session('user')->US_NAME }}</x-page-title>

    <div class="shadow-md max-w-full w-1/3 rounded-lg overflow-hidden border-2 mx-auto">

        <table class="text-sm text-left text-gray-500 w-full">

            <thead class="text-xs text-gray-700 uppercase bg-gray-50">