From 13b1e7f5c850a9801d56a9ef042d03cdf74eda77 Mon Sep 17 00:00:00 2001
From: jleroy2023 <leroyjohan3@gmail.com>
Date: Mon, 25 Nov 2024 12:10:49 +0100
Subject: [PATCH] commit conflit

---
 templates/main/footer.html.twig   |  2 +-
 templates/sortie/create.html.twig | 63 +++++++++++++++++++++----------
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/templates/main/footer.html.twig b/templates/main/footer.html.twig
index 19480b9..37e527b 100644
--- a/templates/main/footer.html.twig
+++ b/templates/main/footer.html.twig
@@ -1,5 +1,5 @@
 <footer class="w-full bg-green-700 text-white py-4">
     <div class="flex justify-center">
-        ENI &copy; Sortie {{ "now"|date("Y") }}
+      git s  ENI &copy; Sortie {{ "now"|date("Y") }}
     </div>
 </footer>
\ No newline at end of file
diff --git a/templates/sortie/create.html.twig b/templates/sortie/create.html.twig
index ef4a9ba..78ebce1 100644
--- a/templates/sortie/create.html.twig
+++ b/templates/sortie/create.html.twig
@@ -6,7 +6,14 @@
         {% 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;
@@ -39,6 +46,10 @@
                 .modern-button svg {
                     margin-right: 0.5rem;
                 }
+                #add-lieu-modal .bg-white {
+                    max-width: 80%;
+                    max-height: 90%;
+                }
             </style>
         {% endblock %}
     </head>
@@ -51,6 +62,7 @@
 
             {{ 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">
@@ -85,30 +97,41 @@
                 </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_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' } }) }}
+                        <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>
                     </div>
 
-                    <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>
+                        <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>
 
-                    <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>
 
@@ -149,6 +172,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('lieu') }}
+        {{ encore_entry_script_tags('show-lieu') }}
     {% endblock %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file