From 72f7b9a04727b232c6f9c5f370b68d3f95fd4982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Fri, 23 Sep 2016 00:02:25 +0200
Subject: [PATCH] FIX: fix localization of comments

---
 app/Http/routes.php                           |  2 +-
 app/Providers/SubmodulesManager.php           | 14 ++++++--
 .../Controllers/Admin/CommentsOverview.php    |  2 +-
 modules/Blog/Article/Http/routes.php          | 36 +++++++++----------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index c2660d3b..f5f885c5 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -31,7 +31,7 @@ Route::group([
         }
 
         // display dashboard with some usefull information
-        Route::get('/', 'Dashboard@getIndex')
+        Route::get('/', 'Dashboard\Dashboard@getIndex')
              ->name('admin.dashboard');
 
         // list of all actions
diff --git a/app/Providers/SubmodulesManager.php b/app/Providers/SubmodulesManager.php
index 26408faf..48907798 100644
--- a/app/Providers/SubmodulesManager.php
+++ b/app/Providers/SubmodulesManager.php
@@ -9,11 +9,11 @@ use Pingpong\Modules\Json;
 class SubmodulesManager extends ServiceProvider
 {
     /**
-     * Register the service provider.
+     * Boot submodules
      *
      * @return void
      */
-    public function register()
+    public function boot()
     {
         $enabledModules = \Module::enabled();
 
@@ -52,4 +52,14 @@ class SubmodulesManager extends ServiceProvider
             }
         }
     }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        // TODO: Implement register() method.
+    }
 }
\ No newline at end of file
diff --git a/modules/Blog/Article/Http/Controllers/Admin/CommentsOverview.php b/modules/Blog/Article/Http/Controllers/Admin/CommentsOverview.php
index 8e55b3b9..9293d2b1 100644
--- a/modules/Blog/Article/Http/Controllers/Admin/CommentsOverview.php
+++ b/modules/Blog/Article/Http/Controllers/Admin/CommentsOverview.php
@@ -12,7 +12,7 @@ class CommentsOverview extends Controller
                            ->with('author')
                            ->orderBy('approved')
                            ->orderBy('created_at', 'DESC')
-                           ->paginate(20);
+                           ->paginate(25);
 
         return view('article::admin/comments.overview', ['comments' => $comments]);
     }
diff --git a/modules/Blog/Article/Http/routes.php b/modules/Blog/Article/Http/routes.php
index de6f6be4..9bb13c27 100644
--- a/modules/Blog/Article/Http/routes.php
+++ b/modules/Blog/Article/Http/routes.php
@@ -1,28 +1,28 @@
 <?php
-// routes for comments
-
 Route::group([
-                 'middleware' => ['web', 'auth', 'adminMenu'],
-                 'prefix'     => 'admin/comments',
+                 'prefix'     => LaravelLocalization::setLocale(),
+                 'middleware' => ['localeSessionRedirect', 'localizationRedirect'],
                  'namespace'  => 'Modules\Blog\Article\Http\Controllers\Admin'
              ], function () {
+    Route::group([
+                     'middleware' => ['web', 'auth', 'adminMenu'],
+                     'prefix'     => 'admin/comments',
+                 ], function () {
 
-    Route::get('/', 'CommentsOverview@getOverview')
-         ->name('comments.overview');
+        Route::get('/', 'CommentsOverview@getOverview')
+             ->name('comments.overview');
 
-    Route::get('/delete/{id}', 'EditComment@delete')
-         ->name('comments.delete');
+        Route::get('/delete/{id}', 'EditComment@delete')
+             ->name('comments.delete');
 
-    Route::get('/approve/{id}', 'EditComment@approve')
-         ->name('comments.approve');
-});
+        Route::get('/approve/{id}', 'EditComment@approve')
+             ->name('comments.approve');
+    });
 
-Route::group([
-                 'middleware' => ['web'],
-                 'prefix'     => 'comments',
-                 'namespace'  => 'Modules\Blog\Article\Http\Controllers\Visitor'
-             ], function () {
+    // public routes
+    Route::group(['middleware' => ['web']], function () {
 
-    Route::post('/new/{id}', 'CreateNewComment@postNew')
-         ->name('comments.new');
+        Route::post('comments/new/{id}', 'CreateNewComment@postNew')
+             ->name('comments.new');
+    });
 });
\ No newline at end of file