Merge branch 'dev' into binarity.cz

modules/Blog/Article/Entities/Article.php

@@ -0,0 +1,15 @@
+<?php
+namespace Modules\Blog\Article\Entities;
+
+use App\Models\Content;
+
+class Article extends Content
+{
+    protected $table = 'contents';
+
+    public function comments()
+    {
+        return $this->hasMany(Comment::class, 'content_id')
+                    ->where('approved', true);
+    }
+}

modules/Blog/Article/Http/routes.php

@@ -2,11 +2,12 @@
 Route::group([
                  'prefix'     => LaravelLocalization::setLocale(),
                  'middleware' => ['localeSessionRedirect', 'localizationRedirect'],
-                 'namespace'  => 'Modules\Blog\Article\Http\Controllers\Admin'
+                 'namespace'  => 'Modules\Blog\Article\Http\Controllers'
              ], function () {
     Route::group([
                      'middleware' => ['web', 'auth', 'adminMenu'],
                      'prefix'     => 'admin/comments',
+                     'namespace'  => 'Admin'
                  ], function () {
 
         Route::get('/', 'CommentsOverview@getOverview')
@@ -20,7 +21,7 @@ Route::group([
     });
 
     // public routes
-    Route::group(['middleware' => ['web']], function () {
+    Route::group(['middleware' => ['web'], 'namespace' => 'Visitor'], function () {
 
         Route::post('comments/new/{id}', 'CreateNewComment@postNew')
              ->name('comments.new');

modules/Blog/Article/Providers/ArticleEventServiceProvider.php

@@ -9,6 +9,7 @@ use Modules\Blog\Article\Events\CreatedComment;
 use Modules\Blog\Article\Events\DeletedComment;
 use Modules\Blog\Article\Listeners\LogCommentApproval;
 use Modules\Blog\Article\Listeners\LogDeletedComment;
+use Modules\Blog\Article\Listeners\LogNewComment;
 
 class ArticleEventServiceProvider extends ServiceProvider
 {

modules/Blog/ArticleList/Handlers/ArticleList.php

@@ -10,6 +10,7 @@ use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Input;
+use Modules\Blog\Article\Entities\Article as ArticleModel;
 use Modules\Blog\Article\Handlers\Article;
 use Modules\Categories\Entities\Category;
 
@@ -40,7 +41,9 @@ class ArticleList extends Handler
      */
     public function render(Content $content, $parameters)
     {
-        $articles = Content::where('module_handler', Article::class);
+        $articles = ArticleModel::where('module_handler', Article::class)
+                                ->with('comments')
+                                ->with('category');
 
         // selected category?
 
@@ -98,7 +101,11 @@ class ArticleList extends Handler
         $articles = $articles->orderBy('created_at', 'DESC')
                              ->paginate(20);
 
-        return Controller::VisitorsView($content->template, ['page' => $content, 'articles' => $articles, 'extra' => $parameters]);
+        return Controller::VisitorsView($content->template, [
+            'page'     => $content,
+            'articles' => $articles,
+            'extra'    => $parameters
+        ]);
     }
 
     public static function getModuleId()