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

conflic reslved

Browse Source
This commit is contained in:
jleroy2023
2024-11-25 11:59:39 +01:00
parent dc1d002261 1ff8eb7c16
commit 10020aa703
9 changed files with 38 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/profile/view.html.twig
View File

@@ -28,13 +28,19 @@
<i class="fas fa-map-marker-alt mr-2 text-slate-400 opacity-75"></i>{{ profile.telephone }} - {{ profile.email }}
</div>
</div>
{% if isActiveUser %}
<div class="mt-6 py-6 border-t border-slate-200 text-center">
<div class="flex flex-wrap justify-center">
<div class="w-full px-4">
<a href="{{ path('profile_edit', {'uuid': app.user.idParticipant}) }}" class="text-slate-700 hover:text-slate-400">Modifier</a>
<a href="{{ path('profile_edit', {'uuid': app.user.idParticipant}) }}" class="text-slate-700 hover:text-slate-400">
<button class="bg-green-500 px-4 py-2 rounded hover:bg-green-700">
Modifier
</button>
</a>
</div>
</div>
</div>
{% endif %}
</div>
</div>
{% endblock %}

61
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">
@@ -97,41 +85,30 @@
</div>
<div class="space-y-4">
<div class="form-group">
<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>
<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>
<div>
<label class="block text-sm font-medium text-gray-700">Ville :</label>
<span id="ville-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">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_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 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 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>
@@ -172,6 +149,6 @@
<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('show-lieu') }}
{{ encore_entry_script_tags('lieu') }}
{% endblock %}
{% endblock %}