Merge branch 'master' of https://forge.info.unicaen.fr/git/but-info-sae3-2024-groupe3 (a1d7c2a7) · Commits · Victor Friboulet / nautilus

app/Http/Controllers/DiveSessionCreation.php

+4 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,10 @@ class DiveSessionCreation extends Controller
		public static function add($request)
		{
		$dv = new DivingSession();
		dd('DS'.count(DivingSession::all())+1);
		$dv->DS_CODE = 'DS'.count(DivingSession::all())+1;

		$divingSessionCount = DivingSession::count();

		$dv->DS_CODE = 'DS' . ($divingSessionCount + 1);
		$dv->US_ID = $request->pilot;
		$dv->DL_ID = $request->location;
		$dv->BO_ID = $request->boat;

public/css/app.css

+25 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,31 @@ .clickableRed:hover{
		color: var(--white)
		}


		.clickableBlue{
		background-color: #909aef;
		color: var(--black);
		transition: all 0.4s ease-out;
		}

		.clickableBlue:hover{
		color: var(--white);
		cursor: pointer;
		background-color: #515dcc;
		}

		.clickablePink{
		background-color: #e882e1;
		color: var(--black);
		transition: all 0.4s ease-out;
		}

		.clickablePink:hover{
		color: var(--white);
		cursor: pointer;
		background-color: rgb(207, 96, 199);
		}

		.aligne{
		display: flex;
		align-items: center;

public/js/pop-up-psw-changer.js

+17 −0

Original line number	Diff line number	Diff line
		function openForm() {
		document.getElementById("popupForm").style.display = "block";
		document.getElementById("popupForm").style.zIndex = "100000000";


		if(!document.getElementById('fullPageDiv')){
		const fullPageDiv = document.createElement('div');
		fullPageDiv.id = 'fullPageDiv';
		fullPageDiv.style.width = "100vw";
		fullPageDiv.style.zIndex = "1000001";
		fullPageDiv.style.position = "absolute";
		fullPageDiv.style.height = "100vh";
		fullPageDiv.style.backgroundColor = "rgba(0, 0, 0, 0.4)";
		document.body.appendChild(fullPageDiv);
		}
		}

		function closeForm() {
		if(document.getElementById('fullPageDiv')){
		document.body.removeChild(document.getElementById('fullPageDiv'));
		}

		document.getElementById("popupForm").style.display = "none";
		}
		No newline at end of file

resources/views/components/header.blade.php

+25 −10

Original line number	Diff line number	Diff line
		@@ -2,6 +2,14 @@

		<nav class="border-gray-200 bg-[#002550]">
		<div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
		<a href="javascript:history. back()">
		<button diveId="#"
		style="background-color: transparent;color: var(--yellow);margin-right: 5px;font-size: 35px;"
		class="clickable aligne m-1 bg-gray-400 hover:bg-gray-500
		text-gray-800 font-bold py-2 px-4 rounded inline-flex items-center">
		<i class="fa-solid fa-circle-arrow-left"></i>
		</button>
		</a>
		<a href="{{ route('homepage') }}" class="flex items-center space-x-3 rtl:space-x-reverse">
		<img src="{{ asset("/images/logo_allonge.png") }}" class="h-14" alt="Nautilus Logo"/>
		</a>
		@@ -18,7 +26,7 @@ class="flex text-sm bg-blue-500 rounded-full md:me-0 focus:ring-4 focus:ring-blu
		id="user-menu-button" aria-expanded="false" data-dropdown-toggle="user-dropdown"
		data-dropdown-placement="bottom">
		<span
		class="w-8 h-8 rounded-full py-2 font-bold text-white">{{ substr(session('user')->US_FIRST_NAME, 0, 1) . substr(session('user')->US_NAME, 0, 1) }}</span>
		class="aligne w-8 h-8 rounded-full py-2 font-bold text-white">{{ substr(session('user')->US_FIRST_NAME, 0, 1) . substr(session('user')->US_NAME, 0, 1) }}</span>
		</button>
		<!-- Dropdown menu -->
		<div class="z-50 hidden my-4 text-base list-none divide-y rounded-lg shadow bg-blue-700 divide-blue-500"
		@@ -59,18 +67,18 @@ class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-5
		<ul class="flex flex-col font-medium p-4 md:p-0 mt-4 rounded-lg md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 bg-[#063E7B] md:bg-[#002550]">
		<li class="py-2 @if(request()->routeIs('homepage')) md:border-b md:border-b-[#FFBE55] border-b-0 @endif">
		<a href="{{ route('homepage') }}"
		@if(request()->routeIs('homepage')) class="block py-2 px-3 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-blue-500"
		@if(request()->routeIs('homepage')) class="block py-2 px-3 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-[var(--yellow)]"
		aria-current="page"
		@else class="block py-2 px-3 rounded hover:bg-blue-700 md:p-0 text-white md:hover:text-blue-500 hover:text-white md:hover:bg-transparent border-gray-700" @endif>
		@else class="block py-2 px-3 rounded hover:bg-blue-700 md:p-0 text-white md:hover:text-[var(--yellow)] hover:text-white md:hover:bg-transparent border-gray-700" @endif>
		Tableau de bord
		</a>
		</li>
		@if (session()->has('user'))
		<li class="py-2 @if(request()->routeIs('dives'))border-b border-b-[#FFBE55]@endif">
		<a href="{{ route('dives') }}"
		@if(request()->routeIs('dives')) class="block py-2 px-3 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-blue-500"
		@if(request()->routeIs('dives')) class="block py-2 px-3 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-[var(--yellow)]"
		aria-current="page"
		@else class="block py-2 px-3 rounded hover:bg-blue-700 md:p-0 text-white md:hover:text-blue-500 hover:text-white md:hover:bg-transparent border-gray-700" @endif>Inscription
		@else class="block py-2 px-3 rounded hover:bg-blue-700 md:p-0 text-white md:hover:text-[var(--yellow)] hover:text-white md:hover:bg-transparent border-gray-700" @endif>Inscription
		aux plongées</a>
		</li>
		@endif
		@@ -81,13 +89,20 @@ class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-5


		<link rel="stylesheet" href="/css/pop-up-psw-changer.css">
		<div class="form-popup" id="popupForm">
		<div class="form-popup" id="popupForm" style="border-radius: 15px;overflow: hidden;">
		<form action="/modification/password-changer" class="form-container" method="post">
		@csrf
		<button onclick="closeForm()" type="button" class=" w-full flex items-center justify-center w-1/2 px-5 py-2 text-sm text-gray-700 transition-colors duration-200 border rounded-full gap-x-2 sm:w-auto dark:hover:bg-[#002550] dark:bg-[#002550] hover:bg-[#002550] dark:text-gray-200 dark:border-gray-700">
		<svg xmlns="http://www.w3.org/2000/svg" height="16" width="12" viewBox="0 0 384 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path fill="#ffffff" d="M376.6 84.5c11.3-13.6 9.5-33.8-4.1-45.1s-33.8-9.5-45.1 4.1L192 206 56.6 43.5C45.3 29.9 25.1 28.1 11.5 39.4S-3.9 70.9 7.4 84.5L150.3 256 7.4 427.5c-11.3 13.6-9.5 33.8 4.1 45.1s33.8 9.5 45.1-4.1L192 306 327.4 468.5c11.3 13.6 31.5 15.4 45.1 4.1s15.4-31.5 4.1-45.1L233.7 256 376.6 84.5z"/></svg>
		<div>
		<button onclick="closeForm()" type="button"
		class="clickableRed w-full flex items-center justify-center w-1/2 px-5
		py-2 text-sm text-gray-700 transition-colors duration-200 border rounded-full gap-x-2 sm:w-auto dark:hover:bg-[#002550]
		dark:bg-[#002550] hover:bg-[#002550] dark:text-gray-200 dark:border-gray-700"
		style="border: none;width: 30px;font-size: 20px;left: 94%;position: relative;bottom: 5%;">
		<i class="fa-solid fa-xmark"></i>
		</button>
		<x-page-title >Changement de mot de passe</x-page-title>
		</div>
		<h2 style="font-size: 30px">Changement de mot de passe</h2>
		<hr style="height: 3px;background-color: black;margin-bottom: 15px;margin-top: 5px; width : 100%">
		<label for="OldPassword">
		<h2>votre ancien mot de passe</h2>
		</label>
		@@ -96,7 +111,7 @@ class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-5
		<h2>votre nouveau mot de passe</h2>
		</label>
		<input type="password" value="" id="NewPassword" placeholder="Votre Mot de passe" name="NewPassword" required />
		<button type="submit" class="btn">Changer votre mot de passe</button>
		<button type="submit" class="clickable" style="padding: 10px; width: 100%">Changer votre mot de passe</button>
		</form>
		</div>
		<script type="text/javascript" src="/js/pop-up-psw-changer.js"></script>
		No newline at end of file

resources/views/dives.blade.php

+52 −19

Original line number	Diff line number	Diff line
		@@ -7,14 +7,19 @@
		<div class="container">
		<input type="checkbox" id="toggle" unchecked />
		<label class="button" for="toggle">
		<svg class="change-my-color" xmlns="http://www.w3.org/2000/svg" height="19" width="19" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M3.9 54.9C10.5 40.9 24.5 32 40 32H472c15.5 0 29.5 8.9 36.1 22.9s4.6 30.5-5.2 42.5L320 320.9V448c0 12.1-6.8 23.2-17.7 28.6s-23.8 4.3-33.5-3l-64-48c-8.1-6-12.8-15.5-12.8-25.6V320.9L9 97.3C-.7 85.4-2.8 68.8 3.9 54.9z"/></svg>
		<svg class="change-my-color" xmlns="http://www.w3.org/2000/svg" height="19" width="19"
		viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
		<path
		d="M3.9 54.9C10.5 40.9 24.5 32 40 32H472c15.5 0 29.5 8.9 36.1 22.9s4.6 30.5-5.2 42.5L320 320.9V448c0 12.1-6.8 23.2-17.7 28.6s-23.8 4.3-33.5-3l-64-48c-8.1-6-12.8-15.5-12.8-25.6V320.9L9 97.3C-.7 85.4-2.8 68.8 3.9 54.9z" />
		</svg>
		<div class="nav">
		<form action="{{ route('dives_filter') }}" method="POST">
		@csrf
		<ul>
		<li>
		<label for="location_filter" class="sr-only">Choisir un lieux</label>
		<select id="location_filter" name="location_filter" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer">
		<select id="location_filter" name="location_filter"
		class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer">
		<option selected value="default">Lieux</option>
		@foreach ($locations as $dive)
		<option value="{{ $dive->DL_NAME }}">{{ $dive->DL_NAME }}</option>
		@@ -23,7 +28,8 @@
		</li>
		<li>
		<label for="creneau_filter" class="sr-only">Choisir un créneau</label>
		<select id="creneau_filter" name="creneau_filter" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer">
		<select id="creneau_filter" name="creneau_filter"
		class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer">
		<option selected value="default">Créneau</option>
		<option value="matin">Matin</option>
		<option value="apres-midi">Après-midi</option>
		@@ -32,7 +38,8 @@
		</li>
		<li>
		<label for="level_filter" class="sr-only">Choisir un niveau</label>
		<select id="level_filter" name="level_filter" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer">
		<select id="level_filter" name="level_filter"
		class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer">
		<option selected value="default">Niveau</option>
		@foreach ($levels as $level)
		<option value="{{ $level->PRE_MAX_DEPTH }}">{{ $level->PRE_MAX_DEPTH }}</option>
		@@ -53,7 +60,8 @@
		</select>
		</li>-->
		<li class="hover:bg-transparent bg-transparent">
		<button type="submit" class="w-full py-2.5 px-4 text-sm bg-gray-300 rounded-md focus:outline-none focus:bg-gray-400">
		<button type="submit"
		class="w-full py-2.5 px-4 text-sm bg-gray-300 rounded-md focus:outline-none focus:bg-gray-400">
		Rechercher
		</button>
		</li>
		@@ -75,6 +83,12 @@
		<th scope="col" class="px-12 py-3">Actions</th>
		</tr>
		</thead>
		<tbody>
		@if (count($dives) == 0)
		<tr class="odd:bg-white even:bg-gray-50 border-b">
		<td class="px-6 py-4 text-center" colspan="5">Aucune plongée n'est disponible</td>
		</tr>
		</thead>
		<tbody>
		@if (count($dives) == 0)
		<tr class="odd:bg-white even:bg-gray-50 border-b">
		@@ -99,12 +113,20 @@
		@if (isset($dive->DS_MAX_DIVERS))
		<td class="px-12 py-4 flex">
		{{ $dive->DS_DIVERS_COUNT }}/{{ $dive->DS_MAX_DIVERS }}
		<svg class="ml-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M304 128a80 80 0 1 0 -160 0 80 80 0 1 0 160 0zM96 128a128 128 0 1 1 256 0A128 128 0 1 1 96 128zM49.3 464H398.7c-8.9-63.3-63.3-112-129-112H178.3c-65.7 0-120.1 48.7-129 112zM0 482.3C0 383.8 79.8 304 178.3 304h91.4C368.2 304 448 383.8 448 482.3c0 16.4-13.3 29.7-29.7 29.7H29.7C13.3 512 0 498.7 0 482.3z"/></svg>
		<svg class="ml-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20"
		viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
		<path
		d="M304 128a80 80 0 1 0 -160 0 80 80 0 1 0 160 0zM96 128a128 128 0 1 1 256 0A128 128 0 1 1 96 128zM49.3 464H398.7c-8.9-63.3-63.3-112-129-112H178.3c-65.7 0-120.1 48.7-129 112zM0 482.3C0 383.8 79.8 304 178.3 304h91.4C368.2 304 448 383.8 448 482.3c0 16.4-13.3 29.7-29.7 29.7H29.7C13.3 512 0 498.7 0 482.3z" />
		</svg>
		</td>
		@else
		<td class="px-12 py-4 flex">
		{{ $dive->DS_DIVERS_COUNT }}/?
		<svg class="ml-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M304 128a80 80 0 1 0 -160 0 80 80 0 1 0 160 0zM96 128a128 128 0 1 1 256 0A128 128 0 1 1 96 128zM49.3 464H398.7c-8.9-63.3-63.3-112-129-112H178.3c-65.7 0-120.1 48.7-129 112zM0 482.3C0 383.8 79.8 304 178.3 304h91.4C368.2 304 448 383.8 448 482.3c0 16.4-13.3 29.7-29.7 29.7H29.7C13.3 512 0 498.7 0 482.3z"/></svg>
		<svg class="ml-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20"
		viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
		<path
		d="M304 128a80 80 0 1 0 -160 0 80 80 0 1 0 160 0zM96 128a128 128 0 1 1 256 0A128 128 0 1 1 96 128zM49.3 464H398.7c-8.9-63.3-63.3-112-129-112H178.3c-65.7 0-120.1 48.7-129 112zM0 482.3C0 383.8 79.8 304 178.3 304h91.4C368.2 304 448 383.8 448 482.3c0 16.4-13.3 29.7-29.7 29.7H29.7C13.3 512 0 498.7 0 482.3z" />
		</svg>
		</td>
		@endif

		@@ -132,26 +154,36 @@
		<svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true"
		xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16">
		<path stroke="currentColor" stroke-linecap="round"
		stroke-linejoin="round" stroke-width="2"
		d="M3 3l10 10M13 3L3 13" />
		stroke-linejoin="round" stroke-width="2" d="M3 3l10 10M13 3L3 13" />
		</svg>
		</x-button>
		</a>
		@else
		@if ($userPre->PRE_MAX_DEPTH > $dive->DS_MAX_DEPTH)
		<a href='/dives/{{ $dive->DS_CODE }}'>
		<x-button color="bg-green-700" colorHover="hover:bg-green-800">
		<svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true"
		xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 12">
		<path stroke="currentColor" stroke-linecap="round"
		stroke-linejoin="round" stroke-width="2"
		d="M1 5.917 5.724 10.5 15 1.5" />
		</svg>
		</x-button>
		<a href="/dives/{{ $dive->DS_CODE }}">
		<button diveId="dropdownButton-{{ $dive->DS_CODE }}"
		style="margin-right: 5px;font-size: 35px;"
		class="clickableGreen aligne m-1 bg-gray-400 hover:bg-gray-500
		text-gray-800 font-bold py-2 px-4 rounded inline-flex items-center">
		<i class="fa-solid fa-check"></i>
		</button>
		</a>
		@endif
		@endif
		</a>
		@if ($userPre->PRE_MAX_DEPTH <= $dive->DS_MAX_DEPTH)
		<a href="/dives/{{ $dive->DS_CODE }}">
		<button disabled diveId="dropdownButton-{{ $dive->DS_CODE }}"
		style="background-color: #4fad67;margin-right: 5px;font-size: 35px;"
		class="aligne m-1 bg-gray-400 hover:bg-gray-500
		text-gray-800 font-bold py-2 px-4 rounded inline-flex items-center">
		<i class="fa-solid fa-check"></i>
		</button>
		</a>
		@endif

		</div>

		@if ($userPre->PRE_MAX_DEPTH <= $dive->DS_MAX_DEPTH)
		<div class="text-red-400">
		<p>Vous n'avez pas le niveau requis</p>
		@@ -177,7 +209,8 @@

		<div class="drop-down">
		@foreach ($participants as $user)
		<p class = "drop-down-items">{{ $user->US_NAME }} {{ $user->US_FIRST_NAME }} <span class = "text-gray-500">- {{ $user->PRE_CODE }}</span></p>
		<p class = "drop-down-items">{{ $user->US_NAME }} {{ $user->US_FIRST_NAME }} <span
		class = "text-gray-500">- {{ $user->PRE_CODE }}</span></p>
		@endforeach
		</div>
		</x-drop-down>