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

Merge branch 'main' into 'page-sauveteur' 

# Conflicts:
#   routes/web.php
parents c88c6af1 a6995116
Branches main
1 merge request!20Base de données établie et affichage effectué, affichage de la liste des sauveurs
Hide whitespace changes
Inline Side-by-side
public/css/app.css
+ 4
− 0
View file @ 2cc6a70c
......@@ -716,6 +716,10 @@ video {
padding-left: 10rem;
padding-right: 10rem;
}
.py-10 {
padding-top: 2.5rem;
padding-bottom: 2.5rem;
}
.text-center {
text-align: center;
}
......
resources/views/boat.blade.php
+ 18
− 2
View file @ 2cc6a70c
@extends('layouts.app')
@section('title', 'Sauveteurs')
@section('title', 'Bateaux')
@section('content')
<body>
<h1>Bateaux précis</h1>
<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">
<div class="px-40 flex flex-col justify-center">
<h1>Nom du bateau</h1>
<p class="text-gray-400 my-2">Type</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>
</div>
</body>
@endsection
resources/views/home.blade.php
+ 2
− 2
View file @ 2cc6a70c
......@@ -14,9 +14,9 @@
</form>
</div>
<div class="grid-cols-2 gap-5 py-5">
<div class="grid-cols-2 gap-5 py-10">
<div class="grid gap-3">
<div class="grid gap-3 text-center">
<h2>Qui sommes nous ?</h2>
<p>
Bienvenue sur le site des sauveteurs du dunkerquois. Ce site rend hommage aux femmes, hommes et enfants qui ont réalisé des actes de sauvetages en milieu aquatique.
......
resources/views/saved.blade.php deleted 100644 → 0
+ 0
− 7
View file @ c88c6af1
@extends('layouts.app')
@section('title', 'Sauveteurs')
@section('content')
<body>
<h1>Sauvés</h1>
</body>
@endsection
resources/views/savedList.blade.php
+ 1
− 3
View file @ 2cc6a70c
@extends('layouts.app')
@section('title', 'Sauveteurs')
@section('content')
<body>
<h1>Listes des Sauvés</h1>
</body>
<h1>Listes des Sauvés</h1>
@endsection
resources/views/shared/nav-bar.blade.php
+ 1
− 1
View file @ 2cc6a70c
......@@ -8,7 +8,7 @@
<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('saved')}}">Sauvés</a></li>
<li><a href="{{route('savedList')}}">Sauvés</a></li>
<li><a href="{{route('boat')}}">Bateaux</a></li>
</ul>
</div>
......
resources/views/trips.blade.php
+ 16
− 17
View file @ 2cc6a70c
@extends('layouts.app')
@section('title', 'Sauveteurs')
@section('title', 'Sorties en mer')
@section('content')
<body>
<h1>Sortie en mer précis</h1>
<div class="">
<div class="">
<p>15 sorties</p>
</div>
<div class="">
<p>
42 personnes et
8 équipages sauvés
</p>
</div>
<div class="">
<p>26 morts</p>
</div>
<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>
</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>
</div>
</body>
@endsection
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