enable map

src/Controller/PublicController.php

@@ -234,6 +234,25 @@ class PublicController extends AbstractController
     #[Route('/request_email_to_modify/{osm_object_id}', name: 'app_public_request_email')]
     public function request_email($osm_object_id): Response
     {
+        if ($this->getRequest()->isMethod('POST')) {
+            $email = $this->getRequest()->request->get('email');
+            
+            try {
+                // TODO: Implémenter l'envoi réel du mail
+                
+                $this->addFlash(
+                    'success',
+                    'Un email vous a été envoyé avec les instructions pour modifier ce lieu.'
+                );
+            } catch (\Exception $e) {
+                $this->addFlash(
+                    'error', 
+                    'Une erreur est survenue lors de l\'envoi de l\'email. Veuillez réessayer plus tard.'
+                );
+            }
+            
+            return $this->redirectToRoute('app_public_index');
+        }
         // TODO envoyer un email
         return $this->render('public/request_email.html.twig', [
             'controller_name' => 'PublicController',

templates/public/edit.html.twig

@@ -96,16 +96,18 @@
                 </div>
             </div>
         </div>
-        <span class="p-3">
+        <span class="p-4">
             <span class="last-modification">{{ 'display.last_modification'|trans }}: {{ commerce_overpass['@attributes'].timestamp }}</span>, 
-            {{ 'display.days_ago'|trans({'%days%': date(commerce_overpass['@attributes'].timestamp).diff(date()).days}) }} 
+            <strong>
+            {{ 'display.days_ago'|trans({'%days%': date(commerce_overpass['@attributes'].timestamp).diff(date()).days}) }} </strong>
             {{ 'display.by'|trans }} 
             <a href="https://www.openstreetmap.org/user/{{ commerce_overpass['@attributes'].user }}" target="_blank">{{ commerce_overpass['@attributes'].user }}</a>
+            
             <div class="lien-OpenStreetMap">
                 <a href="https://www.openstreetmap.org/node/{{ commerce_overpass['@attributes'].id }}" target="_blank">{{ 'display.view_on_osm'|trans }}</a>
             </div>
 
-            {{ dump(commerce_overpass) }}
+            {# {{ dump(commerce_overpass) }} #}
         </span>
 
         <div class="disclaimer p-3">
@@ -142,8 +144,8 @@
             container: 'map',
             style: 'https://api.maptiler.com/maps/basic-v2/style.json?key={{ maptiler_token }}',
            center: [
-            {# {{ commerce_overpass['@attributes'].lon }}, #}
+            {{ commerce_overpass['@attributes'].lon }},
-             {# {{ commerce_overpass['@attributes'].lat }} #}
+             {{ commerce_overpass['@attributes'].lat }}
              ], 
             
             zoom: 14
@@ -152,8 +154,8 @@
         // Ajout du marqueur
         new mapboxgl.Marker()
             .setLngLat([
-                {# {{ commerce.lon }}, #}
+                {{ commerce_overpass['@attributes'].lon  }},
-                 {# {{ commerce.lat }} #}
+                 {{ commerce_overpass['@attributes'].lat  }}
                  ])
             .setPopup(new mapboxgl.Popup({
                 offset: 25

templates/public/edit/ask_angela.html.twig

@@ -1,15 +1,18 @@
+{% block ask_angela %}
 <div id="ask_angela">
-                                <h2>{{ 'display.ask_angela'|trans }}</h2>
+<fieldset>
-                                <p class="description">{{ 'display.ask_angela_description'|trans }}</p>
+    <h2>{{ 'display.ask_angela'|trans }}</h2>
-                                <p class="more-info">
+    <p class="description">{{ 'display.ask_angela_description'|trans }}</p>
-                                <a href="https://www.openstreetmap.fr/contact/" target="_blank">{{ 'display.ask_angela_more_info'|trans }}</a>
+    <p class="more-info">
-                                </p>
+    <a href="https://www.openstreetmap.fr/contact/" target="_blank">{{ 'display.ask_angela_more_info'|trans }}</a>
-                            
+    </p>
-                                <div class="row mb-3">
-                                    <div class="col-md-5">
-                                        <label for="commerce_tag_value__angela">{{'display.ask_angela'|trans}}</label>
 
-                                        <input type="checkbox" name="commerce_tag_value__angela" value="yes">
+    <div class="row mb-3">
-                                    </div>
+        <div class="col-md-5">
-                                </div>
+        <label for="commerce_tag_value__angela">{{'display.ask_angela'|trans}}</label>
-                            </div>
+
+        <input type="checkbox" name="commerce_tag_value__angela" value="yes">
+        </div>
+    </div>
+</fieldset>
+{% endblock %}

templates/public/edit/request_email.html.twig

@@ -0,0 +1,31 @@
+  {% extends 'base.html.twig' %}
+
+{% block title %}{{ 'display.title'|trans }}{% endblock %}
+
+{% block stylesheets %}
+    {{ parent() }}
+    <link href='https://api.mapbox.com/mapbox-gl-js/v2.15.0/mapbox-gl.css' rel='stylesheet' />
+    <style>
+        .hidden {
+            display: none;
+        }
+    </style>
+{% endblock %}
+
+{% block body %}
+<div class="container mt-4">
+     
+
+    <div class="row">
+        <div class="col-12">
+            <div class="card shadow-sm p-4">
+               Demandez un email pour modifier les informations de ce lieu.
+            </div>
+            <form action="{{ path('app_public_request_email') }}" method="post">
+                <input type="email" name="email" placeholder="Email">
+                <button type="submit">Envoyer</button>
+            </form>
+        </div>
+    </div>
+</div>
+{% endblock %}

templates/public/edit/tags.html.twig

@@ -1,4 +1,5 @@
-{% block tags %}<fieldset>
+{% block tags %}
+<fieldset>
 <div id="tags">
     
         {% for k, v in commerce_overpass.tags_converted %}
@@ -13,5 +14,6 @@
                     </div>
         {% endfor %}
     
-</div></fieldset>
+</div>
+</fieldset>
 {% endblock %}

translations/messages.en.yaml

@@ -46,8 +46,8 @@ display:
     address:street: 'Street'
     address:city: 'City'
     address:postcode: 'Postal code'
-    website: 'Website'
     contact:website: 'Contact website'
+    contact:mastodon: 'Contact mastodon'
     opening_hours: 'Opening hours'
     shop: 'Shop type'
     tourism: 'Tourism'
@@ -61,4 +61,4 @@ display:
     ref:FR:SIRET: 'SIRET'
   disclaimer:
     title: 'Warning'
-    text: 'This site is a work in progress, this is a demonstration on a fictional object using OpenStreetMap API data.'
+    text: 'This site is a work in progress.'

translations/messages.fr.yaml

@@ -48,6 +48,7 @@ display:
     address:postcode: "Code postal"
     website: "Site web"
     contact:website: "Contact du Site web"
+    contact:mastodon: "Contact Mastodon"
     opening_hours: "Horaires d'ouverture"
     shop: "Type de commerce"
     tourism: "Tourisme"