johanleroy/ENI-sortir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitlab.com/marvin.epip/sortir

Browse Source
This commit is contained in:
Olivier PARPAILLON
2024-11-25 11:00:51 +01:00
parent 4561cea8d4 5593939a16
commit 1ff8eb7c16
17 changed files with 52 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
templates/main/header.html.twig
View File

@@ -17,7 +17,6 @@
<img src="{{ asset('img/logo.svg') }}" alt="Logo" class="h-10">
</div>
</a>
<!-- Liens de navigation -->
<div class="relative">
{% if app.user %}
<div id="menu-button" class="w-full flex justify-center">

8
templates/main/index.html.twig
View File

@@ -13,10 +13,8 @@
<div class="container mx-auto p-6 bg-gray-50 rounded-lg shadow-lg mt-6">
<h1 class="text-3xl font-bold text-center text-gray-800 mb-8">🎉 Liste des sorties</h1>
<!-- Section de filtre -->
<form method="GET" action="{{ path('home') }}" class="bg-white rounded-lg shadow-md p-4 mb-6">
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
<!-- Filtre par nom -->
<div>
<label for="search" class="block text-sm font-medium text-gray-700">🔍 Recherche</label>
<input type="text" name="search" id="search" value="{{ app.request.query.get('search', '') }}"
@@ -24,7 +22,6 @@
placeholder="Nom de la sortie">
</div>
<!-- Filtre par site -->
<div>
<label for="site" class="block text-sm font-medium text-gray-700">📍 Site</label>
<select name="site" id="site" class="block w-full mt-2 rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
@@ -37,14 +34,12 @@
</select>
</div>
<!-- Filtre par date de début -->
<div>
<label for="start_date" class="block text-sm font-medium text-gray-700">📅 Date de début</label>
<input type="date" name="start_date" id="start_date" value="{{ app.request.query.get('start_date', '') }}"
class="block w-full mt-2 rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
</div>
<!-- Filtre par date de fin -->
<div>
<label for="end_date" class="block text-sm font-medium text-gray-700">📅 Date de fin</label>
<input type="date" name="end_date" id="end_date" value="{{ app.request.query.get('end_date', '') }}"
@@ -52,7 +47,6 @@
</div>
</div>
<!-- Cases à cocher -->
<div class="mt-4 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
<div class="flex items-center">
<input type="checkbox" name="organisateur" id="organisateur" value="1"
@@ -83,7 +77,6 @@
</div>
</div>
<!-- Bouton soumettre -->
<div class="mt-6 flex justify-end">
<button type="submit" class="px-6 py-2 bg-blue-500 text-white rounded-md shadow hover:bg-blue-600">
🔎 Filtrer
@@ -91,7 +84,6 @@
</div>
</form>
<!-- Affichage des sorties -->
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-6 gap-6">
<a href="/sortie/creates">
<div class="bg-white rounded-lg shadow-md p-4 text-center">

79
templates/sortie/create.html.twig
View File

@@ -6,14 +6,7 @@
{% block title %}&#128227; Sortie.com Nouvelle sortie &#128266;{% endblock %}
{% block stylesheets %}
{{ encore_entry_link_tags('app') }}
<link rel="stylesheet" href="https://unpkg.com/leaflet/dist/leaflet.css" />
<link rel="stylesheet" href="https://unpkg.com/leaflet-geosearch/dist/geosearch.css" />
<style>
#map {
width: 100%;
height: 500px;
}
.form-group {
display: flex;
flex-direction: column;
@@ -46,10 +39,6 @@
.modern-button svg {
margin-right: 0.5rem;
}
#add-lieu-modal .bg-white {
max-width: 80%;
max-height: 90%;
}
</style>
{% endblock %}
</head>
@@ -62,7 +51,6 @@
{{ form_start(form, { 'attr': { 'class': 'space-y-6' } }) }}
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
<div class="space-y-4">
<div class="form-group">
@@ -98,38 +86,28 @@
<div class="space-y-4">
<div class="form-group">
<label for="sortie_ville">Ville organisatrice</label>
{{ form_widget(form.ville, { 'attr': { 'class': 'block w-full p-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500', 'id': 'ville-select' } }) }}
<label for="sortie_ville">Ville</label>
{{ form_widget(form.ville, { 'attr': { 'class': 'block w-full p-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500' } }) }}
</div>
<div class="form-group">
<label for="sortie_lieu">Lieu</label>
<div class="flex items-center space-x-2">
{{ form_widget(form.lieu, { 'attr': { 'class': 'block w-full p-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500', 'id': 'lieu-select' } }) }}
<button type="button" id="add-lieu-button" class="modern-button">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
</svg>
Ajouter
</button>
</div>
<label for="sortie_codePostal">Code postal</label>
{{ form_widget(form.codePostal, { 'attr': { 'class': 'block w-full p-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500' } }) }}
</div>
<div>
<label class="block text-sm font-medium text-gray-700">Rue :</label>
<span id="rue-value" class="block w-full p-3 border border-gray-300 rounded-lg bg-gray-100">Renseigner avec le lieu</span>
<div class="form-group">
<label for="sortie_rue">Rue</label>
{{ form_widget(form.rue, { 'attr': { 'class': 'block w-full p-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500' } }) }}
</div>
<div>
<label class="block text-sm font-medium text-gray-700">Code postal :</label>
<span id="codePostal-value" class="block w-full p-3 border border-gray-300 rounded-lg bg-gray-100">Renseigner avec le lieu</span>
<div class="form-group">
<label for="sortie_latitude">Latitude</label>
{{ form_widget(form.latitude, { 'attr': { 'class': 'block w-full p-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500' } }) }}
</div>
<div>
<label class="block text-sm font-medium text-gray-700">Latitude :</label>
<span id="latitude-value" class="block w-full p-3 border border-gray-300 rounded-lg bg-gray-100">Renseigner avec le lieu</span>
</div>
<div>
<label class="block text-sm font-medium text-gray-700">Longitude :</label>
<span id="longitude-value" class="block w-full p-3 border border-gray-300 rounded-lg bg-gray-100">Renseigner avec le lieu</span>
<div class="form-group">
<label for="sortie_longitude">Longitude</label>
{{ form_widget(form.longitude, { 'attr': { 'class': 'block w-full p-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500' } }) }}
</div>
</div>
</div>
@@ -146,31 +124,4 @@
{{ form_end(form, { 'render_rest': false }) }}
</div>
</div>
<div id="add-lieu-modal" class="fixed inset-0 flex items-center justify-center bg-gray-800 bg-opacity-50 hidden">
<div class="bg-white p-6 rounded-lg shadow-lg w-full max-w-4xl">
<h2 class="text-xl font-bold mb-4">Ajouter un lieu</h2>
<div class="form-group mb-4">
<label for="lieu-nom" class="block text-sm font-medium text-gray-700">Nom du lieu</label>
<input type="text" id="lieu-nom" class="block w-full p-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500" placeholder="Nom du lieu" />
<div id="lieu-nom-error" class="text-sm text-red-500 mt-1 hidden"></div>
</div>
<div id="map" class="w-full h-96 mb-4 rounded-lg"></div>
<div class="flex justify-end space-x-4">
<button type="button" id="cancel-add-lieu" class="px-4 py-2 bg-gray-500 text-white rounded-lg hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-300">Annuler</button>
<button type="button" id="save-lieu" class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600 focus:outline-none focus:ring-2 focus:ring-blue-300">Enregistrer</button>
</div>
</div>
</div>
{% block javascripts %}
<script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
<script src="https://unpkg.com/leaflet-geosearch/dist/geosearch.umd.js"></script>
{{ encore_entry_script_tags('add-lieu') }}
{{ encore_entry_script_tags('lieu') }}
{% endblock %}
{% endblock %}

5
templates/sortie/edit.html.twig
View File

@@ -16,7 +16,6 @@
{{ form_start(form, { 'attr': { 'class': 'space-y-8' } }) }}
<!-- Informations principales -->
<div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
<div>
<label for="nom" class="block text-sm font-semibold text-gray-700 mb-2">
@@ -32,7 +31,6 @@
</div>
</div>
<!-- Durée et date limite d'inscription -->
<div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
<div>
<label for="duree" class="block text-sm font-semibold text-gray-700 mb-2">
@@ -48,7 +46,6 @@
</div>
</div>
<!-- Nombre maximum et informations complémentaires -->
<div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
<div>
<label for="nbInscriptionsMax" class="block text-sm font-semibold text-gray-700 mb-2">
@@ -64,7 +61,6 @@
</div>
</div>
<!-- Ville et lieu -->
<div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
<div>
<label for="ville" class="block text-sm font-semibold text-gray-700 mb-2">
@@ -80,7 +76,6 @@
</div>
</div>
<!-- Boutons -->
<div class="flex justify-end mt-8 space-x-4">
<a href="{{ path('sortie_view', { id: sortie.getIdSortie() }) }}" class="px-6 py-3 bg-gray-500 text-white rounded-lg shadow-md hover:bg-gray-600">
❌ Annuler

6
templates/sortie/view.html.twig
View File

@@ -16,7 +16,6 @@
<h1 class="text-4xl font-bold text-center text-gray-800 mb-8">🎉 Détails de la sortie</h1>
<div class="grid grid-cols-1 lg:grid-cols-12 gap-8">
<!-- Informations principales -->
<div class="lg:col-span-7 bg-white rounded-lg shadow p-6">
<h2 class="text-2xl font-bold text-gray-700 border-b pb-4 mb-6">📋 Informations principales</h2>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
@@ -46,7 +45,6 @@
</p>
</div>
<!-- Description -->
<div class="bg-gray-100 rounded-lg p-4 mt-6">
<h3 class="text-xl font-semibold text-gray-700">📝 Description</h3>
<p class="text-gray-800 text-lg mt-2">
@@ -54,7 +52,6 @@
</p>
</div>
<!-- Participants -->
<div class="bg-gray-100 rounded-lg p-4 mt-6">
<h3 class="text-xl font-semibold text-gray-700">👥 Participants inscrits</h3>
{% if sortie.participants is not empty %}
@@ -68,7 +65,6 @@
{% endif %}
</div>
<!-- Bouton S'inscrire -->
{% if app.user and sortie.etat.libelle == 'Ouverte' and not sortie.participants.contains(app.user) %}
<form action="{{ path('sortie_inscription', { id: sortie.idSortie }) }}" method="post" class="mt-6">
<button type="submit" class="px-6 py-3 bg-green-500 text-white rounded-md shadow hover:bg-green-600">
@@ -81,7 +77,6 @@
</div>
{% endif %}
<!-- Modifier (visible uniquement pour l'organisateur) -->
{% if app.user and app.user.idParticipant == sortie.organisateur.idParticipant %}
<div class="mt-6 flex justify-end">
<a href="{{ path('sortie_edit', { id: sortie.idSortie }) }}"
@@ -92,7 +87,6 @@
{% endif %}
</div>
<!-- Carte -->
<div class="lg:col-span-5 bg-white rounded-lg shadow p-6">
<h2 class="text-2xl font-bold text-gray-700 border-b pb-4 mb-6">📍 Localisation</h2>
<div id="map" class="w-full h-96 rounded-lg shadow"></div>