Skip to content
Snippets Groups Projects
Commit b0baea06 authored by CEYLAN EREN's avatar CEYLAN EREN
Browse files

Merge branch 'datas_page' into 'main' 

Ajout de toutes les fonctionnalités avec les données

See merge request !23
parents 72a840ad dbe5214b
Branches
1 merge request!23Ajout de toutes les fonctionnalités avec les données
Hide whitespace changes
Inline Side-by-side
Showing
with 143 additions and 117 deletions
public/css/app.css
+ 50
− 45
View file @ b0baea06
......@@ -607,10 +607,6 @@ video {
max-width: 1536px;
}
}
.my-2 {
margin-top: 0.5rem;
margin-bottom: 0.5rem;
}
.mx-auto {
margin-left: auto;
margin-right: auto;
......@@ -623,6 +619,10 @@ video {
margin-left: 0.5rem;
margin-right: 0.5rem;
}
.my-2 {
margin-top: 0.5rem;
margin-bottom: 0.5rem;
}
.my-5 {
margin-top: 1.25rem;
margin-bottom: 1.25rem;
......@@ -631,12 +631,16 @@ video {
margin-top: 0.25rem;
margin-bottom: 0.25rem;
}
.ml-40 {
margin-left: 10rem;
.my-8 {
margin-top: 2rem;
margin-bottom: 2rem;
}
.mt-3 {
margin-top: 0.75rem;
}
.ml-40 {
margin-left: 10rem;
}
.ml-4 {
margin-left: 1rem;
}
......@@ -646,18 +650,24 @@ video {
.grid {
display: grid;
}
.w-56 {
width: 14rem;
}
.w-12 {
width: 3rem;
}
.w-16 {
width: 4rem;
.w-56 {
width: 14rem;
}
.w-40 {
width: 10rem;
}
.w-28 {
width: 7rem;
}
.w-10 {
width: 2.5rem;
}
.w-16 {
width: 4rem;
}
.flex-grow {
flex-grow: 1;
}
......@@ -685,12 +695,12 @@ video {
.gap-3 {
gap: 0.75rem;
}
.rounded-full {
border-radius: 9999px;
}
.rounded-2xl {
border-radius: 1rem;
}
.rounded-full {
border-radius: 9999px;
}
.rounded-lg {
border-radius: 0.5rem;
}
......@@ -705,28 +715,25 @@ video {
--tw-bg-opacity: 1;
background-color: rgba(229, 231, 235, var(--tw-bg-opacity));
}
.p-2 {
padding: 0.5rem;
}
.p-4 {
padding: 1rem;
}
.px-40 {
padding-left: 10rem;
padding-right: 10rem;
}
.px-5 {
padding-left: 1.25rem;
padding-right: 1.25rem;
}
.py-10 {
padding-top: 2.5rem;
padding-bottom: 2.5rem;
}
.py-5 {
padding-top: 1.25rem;
padding-bottom: 1.25rem;
}
.px-40 {
padding-left: 10rem;
padding-right: 10rem;
}
.py-10 {
padding-top: 2.5rem;
padding-bottom: 2.5rem;
}
.text-center {
text-align: center;
}
......@@ -745,13 +752,17 @@ video {
font-size: 1.25rem;
line-height: 1.75rem;
}
.text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.text-5xl {
font-size: 3rem;
line-height: 1;
}
.text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
.text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.font-bold {
font-weight: 700;
......@@ -759,10 +770,6 @@ video {
.font-medium {
font-weight: 500;
}
.text-gray-400 {
--tw-text-opacity: 1;
color: rgba(156, 163, 175, var(--tw-text-opacity));
}
.text-white {
--tw-text-opacity: 1;
color: rgba(255, 255, 255, var(--tw-text-opacity));
......@@ -771,6 +778,10 @@ video {
--tw-text-opacity: 1;
color: rgba(209, 213, 219, var(--tw-text-opacity));
}
.text-gray-400 {
--tw-text-opacity: 1;
color: rgba(156, 163, 175, var(--tw-text-opacity));
}
.text-gray-800 {
--tw-text-opacity: 1;
color: rgba(31, 41, 55, var(--tw-text-opacity));
......@@ -779,14 +790,18 @@ video {
--tw-text-opacity: 1;
color: rgba(30, 64, 175, var(--tw-text-opacity));
}
.shadow-2xl {
--tw-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
.text-blue-600 {
--tw-text-opacity: 1;
color: rgba(37, 99, 235, var(--tw-text-opacity));
}
.shadow-lg {
--tw-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
}
.shadow-2xl {
--tw-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
}
.shadow-md {
--tw-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
......@@ -1058,11 +1073,6 @@ h2 {
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
}
.hover\:bg-gray-200:hover {
--tw-bg-opacity: 1;
background-color: rgba(229, 231, 235, var(--tw-bg-opacity));
}
.hover\:bg-gray-50:hover {
--tw-bg-opacity: 1;
background-color: rgba(249, 250, 251, var(--tw-bg-opacity));
......@@ -1078,11 +1088,6 @@ h2 {
color: rgba(59, 130, 246, var(--tw-text-opacity));
}
.active\:bg-gray-400:active {
--tw-bg-opacity: 1;
background-color: rgba(156, 163, 175, var(--tw-bg-opacity));
}
.active\:bg-gray-100:active {
--tw-bg-opacity: 1;
background-color: rgba(243, 244, 246, var(--tw-bg-opacity));
......
resources/views/boat.blade.php
+ 4
− 7
View file @ b0baea06
......@@ -3,19 +3,16 @@
@section('content')
<body>
<div class="resquer">
<img class="ml-40 rounded-full w-56 shadow-2xl" src="https://histoire-image.org/sites/default/styles/galerie_principale/public/portrait-de_gaulle-1940.jpg?itok=jqhrqo-N" alt="sauveur image">
<img class="ml-40 rounded-full w-56 shadow-2xl" src="{{$bateau->url_image}}" alt="sauveur image">
<div class="px-40 flex flex-col justify-center">
<h1>Nom du bateau</h1>
<p class="text-gray-400 my-2">Type</p>
<h1>{{$bateau->nom}}</h1>
<p class="text-gray-400 my-2">Type : {{$bateau->type->nom}}</p>
</div>
</div>
<div class="resquerTopic">
<h2>Description</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit,<br>
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.<br>
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi<br>
ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit </p>
<p>{{$bateau->description}}</p>
</div>
......
resources/views/boatList.blade.php
+ 15
− 1
View file @ b0baea06
......@@ -2,6 +2,20 @@
@section('title', 'Sauveteurs')
@section('content')
<body>
<h1>Listes des bateaux</h1>
<h1 class="font-bold text-5xl text-blue-800 my-5">Listes des Bateaux</h1>
<div class="flex flex-col gap-3">
@foreach ($bateaux as $bateau)
<a href="{{$bateau->id}}" class="rounded-lg bg-white p-4 shadow-md flex gap-3 hover:bg-gray-50 transition ease-in-out duration-200 active:bg-gray-100">
<img class="ml-40 rounded-full w-16 shadow-2xl" src="{{$bateau->url_image}}" alt="sauveur image">
<div>
<h2>{{$bateau->nom}}</h2>
<p class="text-gray-400 my-1"></p>
</div>
</a>
@endforeach
</div>
</body>
@endsection
resources/views/resquer.blade.php
+ 10
− 34
View file @ b0baea06
......@@ -7,7 +7,8 @@
<div class="px-40 flex flex-col justify-center">
<h1>{{$sauveteurs->prenom}} {{$sauveteurs->nom}}</h1>
<p class="text-gray-400 my-2">{{$sauveteurs->date_naissaince}} / {{$sauveteurs->date_mort}}</p>
<p>Commandant...</p>
<p>{{$sauveteurs->grades->Nom}}</p>
<p>Au moins 5678 personnes lui doivent la vie</p>
</div>
</div>
......@@ -36,43 +37,18 @@
<div class="resquerTopic">
<h2>Sauvetages et sorties en mer</h2>
<div class="flex my-5">
<p class=" text-gray-800 text-xl">1900</p>
<div class="flex flex-col ml-4">
<div class="saveItem" >
<h3>Sauvetage de l'allège SPECULANT</h3>
<p>12 septembres - 4 homme sauvés</p>
</div>
<div class="saveItem">
<h3>Sauvetage de l'allège SPECULANT</h3>
<p>12 septembres - 4 homme sauvés</p>
</div>
<div class="saveItem">
<h3>Sauvetage de l'allège SPECULANT</h3>
<p>12 septembres - 4 homme sauvés</p>
</div>
@foreach ($sauveteurs->sauvetages as $sauvetage)
<a href="{{route('trips', $sauvetage->id)}}" class="rounded-lg bg-white my-8 p-4 shadow-md flex gap-3 hover:bg-gray-50 transition ease-in-out duration-200 active:bg-gray-100">
<div class=" ">
<h3>{{$sauvetage->nom}}</h3>
<p class="text-gray-400 my-2">{{$sauvetage->date}}</p>
<p>{{$sauvetage->nb_sauve}} hommes sauvés</p>
</div>
</div>
</a>
<div class="flex my-5">
<p class=" text-gray-800 text-xl">1900</p>
@endforeach
<div class="flex flex-col ml-4">
<div class="saveItem" >
<h3>Sauvetage de l'allège SPECULANT</h3>
<p>12 septembres - 4 homme sauvés</p>
</div>
<div class="saveItem">
<h3>Sauvetage de l'allège SPECULANT</h3>
<p>12 septembres - 4 homme sauvés</p>
</div>
<div class="saveItem">
<h3>Sauvetage de l'allège SPECULANT</h3>
<p>12 septembres - 4 homme sauvés</p>
</div>
</div>
</div>
</div>
......
resources/views/shared/nav-bar.blade.php
+ 2
− 2
View file @ b0baea06
......@@ -7,9 +7,9 @@
<ul class="flex flex-grow items-center justify-end gap-5 navLinks">
<li><a href="{{route('resquerList')}}">Sauveteur</a></li>
<li><a href="{{route('trips')}}">Sorties en mer</a></li>
<li><a href="{{route('tripsList')}}">Sorties en mer</a></li>
<li><a href="{{route('savedList')}}">Sauvés</a></li>
<li><a href="{{route('boat')}}">Bateaux</a></li>
<li><a href="{{route('boatList')}}">Bateaux</a></li>
</ul>
</div>
......
resources/views/trips.blade.php
+ 27
− 9
View file @ b0baea06
......@@ -3,19 +3,37 @@
@section('content')
<div class="resquer">
<div class="px-40 flex flex-col justify-center">
<h1>Nom de la sortie</h1>
<p class="text-gray-400 my-2">Date</p>
<p>Bateau...</p>
<p>5678 vies sauvées</p>
<h1>{{$trips->nom}}</h1>
<p class="text-gray-400 my-2">{{$trips->date}}</p>
<p>Nom du bateau : {{$trips->bateau->nom}}</p>
<p>{{$trips->nb_sauve}} vies sauvées</p>
</div>
</div>
<div class="resquerTopic">
<h2>Description</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit,<br>
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.<br>
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi<br>
ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit </p>
<p>{{$trips->description}}</p>
</div>
<div class="container mx-auto resquer flex flex-col">
<h1 class="font-bold text-xl text-blue-600 my-5">Listes des Sauveteurs</h1>
<div class="flex flex-col gap-3">
@foreach ($trips->sauveteurs as $sauveteur)
<a href="{{route('resquer', $sauveteur->id)}}" class="rounded-lg bg-white p-4 shadow-md flex gap-3 hover:bg-gray-50 transition ease-in-out duration-200 active:bg-gray-100">
<img class="ml-40 rounded-full w-16 shadow-2xl" src="{{$sauveteur->urlImg}}" alt="sauveur image">
<div>
<h2>{{$sauveteur->prenom}} {{$sauveteur->nom}}</h2>
<p class="text-gray-400 my-1">{{$sauveteur->date_naissaince}} / {{$sauveteur->date_mort}}</p>
</div>
</a>
@endforeach
</div>
</div>
@endsection
resources/views/tripsList.blade.php
+ 20
− 1
View file @ b0baea06
......@@ -2,6 +2,25 @@
@section('title', 'Sauveteurs')
@section('content')
<body>
<h1>Listes des Sorties en mer</h1>
<div class="container mx-auto resquer flex flex-col">
<h1 class="font-bold text-5xl text-blue-800 my-5">Listes des Sorties en mer</h1>
<div class="flex flex-col gap-3">
@foreach ($trips as $trip)
<a href="{{$trip->id}}" class="rounded-lg bg-white p-4 shadow-md flex gap-3 hover:bg-gray-50 transition ease-in-out duration-200 active:bg-gray-100">
<div>
<h2>{{$trip->nom}}</h2>
<p class="text-gray-400 my-1">{{$trip->date}}</p>
</div>
</a>
@endforeach
</div>
</div>
</body>
@endsection
routes/web.php
+ 15
− 18
View file @ b0baea06
......@@ -21,15 +21,17 @@ Route::get('/home', function () {
return view('home');
})->name('home');
Route::get('/boat', function () {
return view('boat');
})->name('boat');
Route::get('/boat/list', function () {
return view('boatList');
return view('boatList', ['bateaux' => App\Models\Bateau::get()]);
})->name('boatList');
Route::get('/boat/{id}', function ($id) {
return view('boat', ['bateau' => App\Models\Bateau::find($id)]);
})->name('boat');
Route::get('/resquer/list', function () {
return view('resquerList', ['sauveteurs' => App\Models\Sauveteur::get()]);
......@@ -38,31 +40,26 @@ Route::get('/resquer/list', function () {
Route::get('/resquer/{id}', function ($id) {
return view('resquer', ['sauveteurs' => App\Models\Sauveteur::find($id)]);
});
Route::get('/saved', function () {
return view('saved');
})->name('saved');
})->name('resquer');
Route::get('/saved/list', function () {
return view('savedList');
})->name('savedList');
Route::get('/trips', function () {
return view('trips');
})->name('trips');
Route::get('/saved/{id}', function ($id) {
return view('saved', ['sauvetages' => App\Models\Sauveteur::find($id)]);
})->name('saved');
Route::get('/trips/list', function () {
return view('tripsList');
return view('tripsList', ['trips' => App\Models\Sauvetage::get()]);
})->name('tripsList');
Route::get('/trips/{id}', function ($id) {
return view('trips', ['trips' => App\Models\Sauvetage::find($id)]);
})->name('trips');
Route::get('/community/boat', function () {
return view('community.boat');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment