From 0222bac963809c3c597ad85bdcf050c5fe511a32 Mon Sep 17 00:00:00 2001
From: nox <daniel.leporini@gmail.com>
Date: Fri, 25 Oct 2019 00:44:54 +0200
Subject: [PATCH] Nouvelles url - Modif Fil d'Ariane

---
 public/index.php                            | 3 +--
 src/Gmarche/Actions/AntenneShowAction.php   | 2 --
 src/Gmarche/GmarcheModule.php               | 4 ++--
 src/Gmarche/config.php                      | 2 +-
 src/Gmarche/views/antenne.twig              | 2 --
 src/Product/Actions/ProductIndexAction.php  | 4 +---
 src/Product/ProductModule.php               | 4 ----
 src/Product/views/admin/products/index.twig | 4 +---
 views/layout.twig                           | 6 +-----
 9 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/public/index.php b/public/index.php
index 1ba2bf9..a30e5bb 100644
--- a/public/index.php
+++ b/public/index.php
@@ -32,10 +32,9 @@ $app = (new \Framework\App( $chemin_new .'/config/config.php'))
     ->addModule(AuthModule::class)
     ->addModule(AccountModule::class);
 
-
 $container = $app->getContainer();
 
-// Pose problème
+// Pose un problème
 //$container->get(\Framework\Router::class)->get('/', \App\Gmarche\Actions\RegionIndexAction::class, 'home');
 
 $app->pipe(Whoops::class);
diff --git a/src/Gmarche/Actions/AntenneShowAction.php b/src/Gmarche/Actions/AntenneShowAction.php
index f4fcf0d..e576a3e 100644
--- a/src/Gmarche/Actions/AntenneShowAction.php
+++ b/src/Gmarche/Actions/AntenneShowAction.php
@@ -37,7 +37,6 @@ class AntenneShowAction
         AntenneTable $antenneTable,
         ContainerInterface $container
     ) {
-    
         $this->renderer = $renderer;
         $this->regionTable = $regionTable;
         $this->antenneTable = $antenneTable;
@@ -55,7 +54,6 @@ class AntenneShowAction
         $antennes = $this->antenneTable->findAllbyRegion($region_id)->paginate(25, $page);
 
         $region=$this->regionTable->findBy('slug', $request->getAttribute('slug'));
-        //$antenne = 1;
         /*if ($region->slug !== $slug) {
             return $this->redirect('gmarche.show', [
                 'slug' => $region->slug,
diff --git a/src/Gmarche/GmarcheModule.php b/src/Gmarche/GmarcheModule.php
index 47e55da..ad076b9 100644
--- a/src/Gmarche/GmarcheModule.php
+++ b/src/Gmarche/GmarcheModule.php
@@ -20,7 +20,7 @@ class GmarcheModule extends Module
         $gmarchePrefix = $container->get('gmarche.prefix');
         $container->get(RendererInterface::class)->addPath('gmarche', __DIR__ . '/views');
         $router = $container->get(Router::class);
-        $router->get( '/france', RegionIndexAction::class, 'gmarche.index');
-        $router->get("/france/{slug:[a-z\-0-9]+}", AntenneShowAction::class, 'gmarche.antenne');
+        $router->get( "$gmarchePrefix", RegionIndexAction::class, 'gmarche.index');
+        $router->get("$gmarchePrefix/{slug:[a-z\-0-9]+}", AntenneShowAction::class, 'gmarche.antenne');
     }
 }
diff --git a/src/Gmarche/config.php b/src/Gmarche/config.php
index a0473f6..20f652a 100644
--- a/src/Gmarche/config.php
+++ b/src/Gmarche/config.php
@@ -3,7 +3,7 @@
 use App\Gmarche\GmarcheModule;
 use function \Di\object;
 use function \Di\get;
-
+/* Chemin */
 return [
     'gmarche.prefix' => '/france'
 ];
diff --git a/src/Gmarche/views/antenne.twig b/src/Gmarche/views/antenne.twig
index 5f9bf1e..5c9d49a 100644
--- a/src/Gmarche/views/antenne.twig
+++ b/src/Gmarche/views/antenne.twig
@@ -26,8 +26,6 @@
        grid-area: footer;
     }
   </style>
-
-
       <!-- Fil d'Ariane -->
       <div class="breadcrumbs" >
         <nav aria-label="breadcrumb">
diff --git a/src/Product/Actions/ProductIndexAction.php b/src/Product/Actions/ProductIndexAction.php
index 95c1ee8..0dbed93 100644
--- a/src/Product/Actions/ProductIndexAction.php
+++ b/src/Product/Actions/ProductIndexAction.php
@@ -55,9 +55,7 @@ class  ProductIndexAction
         //$routePrefix = 'product.index';
         $viewPath = '@product/admin/products';
         $items = $this->productTable->findByAntenneId('antenne_id', $antenne_id)->paginate(20, $page);
-//echo "antenne_ici";
-//var_dump($items);
-//die();
+
         return $this->renderer->render($viewPath.'/index', compact('antenne_slug','gmarchePrefix','region_name','region_slug','antenne_id','antenne_name','viewPath', 'items' ));
    }
 }
diff --git a/src/Product/ProductModule.php b/src/Product/ProductModule.php
index b5b2886..e9e0209 100644
--- a/src/Product/ProductModule.php
+++ b/src/Product/ProductModule.php
@@ -10,17 +10,13 @@ use Framework\Module;
 use Framework\Renderer\RendererInterface;
 use Framework\Renderer\TwigRenderer;
 use Framework\Router;
-//use Grpc\Server;
 use GuzzleHttp\Psr7\ServerRequest;
 use Psr\Container\ContainerInterface;
 
 class ProductModule extends Module
 {
-
     const DEFINITIONS = __DIR__ . '/config.php';
-
     const MIGRATIONS =  __DIR__ . '/db/migrations';
-
     const SEEDS =  __DIR__ . '/db/seeds';
 
     public function __construct(ContainerInterface $container)
diff --git a/src/Product/views/admin/products/index.twig b/src/Product/views/admin/products/index.twig
index f81e717..e5f0654 100644
--- a/src/Product/views/admin/products/index.twig
+++ b/src/Product/views/admin/products/index.twig
@@ -131,7 +131,6 @@
            $('.fond').css('background-image', "url('/images/toureiffel.jpeg')");
         </script>
     {%  endif %}
-
     <div class="container">
 
       <div class="row">
@@ -143,8 +142,7 @@
                 {{ annonce_ligne2 }}
                 {{ annonce_ligne3 }}
                 <p></p>
-                Consultez, rajoutez, modifiez vos propositions dans la liste du mois.<br /><br />
-
+                Consultez, rajoutez, modifiez vos propositions dans la liste du mois.
                 Mettez bien le pseudo, la clé publique, le bien ou service, et le prix en june.
             </div>
             <p>
diff --git a/views/layout.twig b/views/layout.twig
index f022eb0..8aacae3 100644
--- a/views/layout.twig
+++ b/views/layout.twig
@@ -64,8 +64,6 @@
                 {% endif %}
             </div>
         </nav>
-
-      <!--  <div class="container">-->
             {% if flash('success') %}
                 <div class="alert alert-success">
                     {{ flash('success') }}
@@ -74,9 +72,7 @@
 
            <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
 
-          {% block body %}{% endblock %}
-
-        <!--</div>-->
+        {% block body %}{% endblock %}
 
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"></script>
         <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js"></script>