From e557174e96d42102f246ffcc557b803a2f55dd1b Mon Sep 17 00:00:00 2001
From: nox <daniel.leporini@gmail.com>
Date: Sat, 23 Nov 2019 17:18:44 +0100
Subject: [PATCH] Correction des urls

---
 public/js/script.js                           |  4 ++--
 src/Gmarche/views/antenne.twig                |  5 -----
 src/Gmarche/views/index.twig                  |  6 ------
 src/Product/ProductModule.php                 |  5 +----
 src/Product/views/admin/products/index.twig   | 10 +++-------
 src/Product/views/admin/recherches/index.twig |  4 ++--
 6 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/public/js/script.js b/public/js/script.js
index 1f18d02..f344981 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -229,8 +229,8 @@ function UpdateRecherchesDetails(nom_connecte) {
 $(document).ready(function () {
     // On récupère le nom de l'antenne dans l'url pour afficher les biens/services de celle-ci
     var url = document.location.href;
-    var antenne_slug = url.split('/')[4];
-    var affichage_slug = url.split('/')[5];
+    var antenne_slug = url.split('/')[5];
+    var affichage_slug = url.split('/')[6];
     var nom_connecte = $("#nom_connecte").text();
 
     if (affichage_slug == 'produits') {
diff --git a/src/Gmarche/views/antenne.twig b/src/Gmarche/views/antenne.twig
index 5c9d49a..a14e4f5 100644
--- a/src/Gmarche/views/antenne.twig
+++ b/src/Gmarche/views/antenne.twig
@@ -15,8 +15,6 @@
     }
     .main {
        grid-area: main;
-       /*justify-self: start;
-       align-self: start;*/
        grid-column: 1 / 2;
     }
     .sidebar {
@@ -67,9 +65,6 @@
             </ul>
           </div>
           <footer class="footer">
-            <!-- if antennes
-               paginate(antennes, 'gmarche.antenne', {slug: slug})
-             endif -->
           </footer>
       </article>
 
diff --git a/src/Gmarche/views/index.twig b/src/Gmarche/views/index.twig
index 02a7235..37e89a4 100644
--- a/src/Gmarche/views/index.twig
+++ b/src/Gmarche/views/index.twig
@@ -18,13 +18,7 @@
             </ul>
         </div>
     </div>
-    <!-- paginate(regions, 'gmarche.index') -->
-    <!-- "name" : "france_regions_2016",
-     "zoom": {
-     "enabled": true,
-     "maxLevel": 10-->
     <script type="text/javascript">
-
         $(".container").mapael({
             map: {
                 name: 'france_regions_2016',
diff --git a/src/Product/ProductModule.php b/src/Product/ProductModule.php
index 93b5275..17c2bf0 100644
--- a/src/Product/ProductModule.php
+++ b/src/Product/ProductModule.php
@@ -16,14 +16,11 @@ class ProductModule extends Module
 
     public function __construct(ContainerInterface $container)
     {
-        $gmarchePrefix = $container->get('gmarche.prefix');
+        $gmarchePrefix = $container->get('gmarche.prefix').'france/';
 
         $container->get(RendererInterface::class)->addPath('product', __DIR__ . '/views');
         $router = $container->get(Router::class);
         $router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/produits", ProductIndexAction::class, 'product.ville');
         $router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/recherches", RechIndexAction::class, 'product.recherches');
-
-         //  $router->crud("$gmarchePrefix/{region:[a-z\-]+}/{slug:[a-z\-0-9]+}/{antenne:[0-9]{1,}}",[LoggedInMiddleware::class, ProductCrudAction::class],'product.admin');
     }
 }
-// $router->get("$gmarchePrefix/{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/{antenne:[0-9]{1,}}", ProductIndexAction::class, 'product.index');
diff --git a/src/Product/views/admin/products/index.twig b/src/Product/views/admin/products/index.twig
index cf4e4d9..f418154 100644
--- a/src/Product/views/admin/products/index.twig
+++ b/src/Product/views/admin/products/index.twig
@@ -55,7 +55,6 @@
         display: none;
     }
     .toggle_radio label{
-       /* font: 90%/1.618 "Source Sans Pro";*/
         color: rgba(0,0,0,.9);
         z-index: 0;
         display: block;
@@ -93,7 +92,7 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
-                    <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}{{ region_slug }}">{{ region_name }}</a></li>
+                    <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}france/{{ region_slug }}">{{ region_name }}</a></li>
                     <li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
 
                         <div class="toggle_radio">
@@ -102,7 +101,7 @@
                             <label for="first_toggle"><p>PRODUITS</p></label>
                             <label for="second_toggle">
                                 <p>
-                                    <a style="color:black;" href="{{ gmarchePrefix }}{{ region_slug }}/{{ antenne_slug }}/recherches">RECHERCHES</a>
+                                    <a style="color:black;" href="{{ gmarchePrefix }}france/{{ region_slug }}/{{ antenne_slug }}/recherches">RECHERCHES</a>
                                 </p>
                             </label>
                             <div class="toggle_option_slider">
@@ -241,10 +240,7 @@
                   </div>
               </div>
            <!--
-             crochet% set token_input = csrf_input %crochet
-
-             paginate(items, routePrefix ~ '.index', {id: item.id, region: explodeUrl()[2],
-              slug: explodeUrl()[3], antenne: explodeUrl()[4]}) -->
+             crochet% set token_input = csrf_input %crochet-->
       </div>
   </div>
 {% endblock %}
diff --git a/src/Product/views/admin/recherches/index.twig b/src/Product/views/admin/recherches/index.twig
index 0092176..e949319 100644
--- a/src/Product/views/admin/recherches/index.twig
+++ b/src/Product/views/admin/recherches/index.twig
@@ -93,14 +93,14 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
-                    <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}{{ region_slug }}">{{ region_name }}</a></li>
+                    <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}france/{{ region_slug }}">{{ region_name }}</a></li>
                     <li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
 
                         <div class="toggle_radio">
                             <input type="radio" class="toggle_option" id="first_toggle" name="toggle_option">
                             <input style="color:black;" type="radio" checked class="toggle_option" id="second_toggle" name="toggle_option">
                             <label for="first_toggle">
-                                <a style="color:black;" href="{{ gmarchePrefix }}{{ region_slug }}/{{ antenne_slug }}/produits">PRODUITS</a>
+                                <a style="color:black;" href="{{ gmarchePrefix }}france/{{ region_slug }}/{{ antenne_slug }}/produits">PRODUITS</a>
                             </label>
                             <label for="second_toggle">
                                 <p>RECHERCHES</p>