From 59dede6049435a803a2b187cd41f9da5de718d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Sun, 4 Sep 2016 23:20:07 +0200 Subject: [PATCH 01/36] FEATURE: add comments into articles --- modules/Blog/Article/Handlers/Article.php | 4 + modules/Blog/Article/Http/routes.php | 13 +- .../Blog/Article/Resources/lang/en/module.php | 6 +- .../views/admin/content/basicInfo.blade.php | 126 +++++++++--------- modules/Blog/Article/composer.json | 15 --- modules/Blog/Comments/Config/config.php | 12 -- modules/Blog/Comments/Entities/.gitkeep | 0 modules/Blog/Comments/Handlers/Comments.php | 37 ----- .../Controllers/ArticleListController.php | 12 -- modules/Blog/Comments/Http/routes.php | 6 - .../Providers/CommentsServiceProvider.php | 89 ------------- .../Comments/Resources/lang/en/module.php | 6 - modules/Blog/Comments/start.php | 15 --- 13 files changed, 83 insertions(+), 258 deletions(-) delete mode 100644 modules/Blog/Article/composer.json delete mode 100644 modules/Blog/Comments/Config/config.php delete mode 100644 modules/Blog/Comments/Entities/.gitkeep delete mode 100644 modules/Blog/Comments/Handlers/Comments.php delete mode 100644 modules/Blog/Comments/Http/Controllers/ArticleListController.php delete mode 100644 modules/Blog/Comments/Http/routes.php delete mode 100644 modules/Blog/Comments/Providers/CommentsServiceProvider.php delete mode 100644 modules/Blog/Comments/Resources/lang/en/module.php delete mode 100644 modules/Blog/Comments/start.php diff --git a/modules/Blog/Article/Handlers/Article.php b/modules/Blog/Article/Handlers/Article.php index 90d0f39d..312e4612 100644 --- a/modules/Blog/Article/Handlers/Article.php +++ b/modules/Blog/Article/Handlers/Article.php @@ -93,6 +93,10 @@ class Article extends Handler $sub->route('content.new', trans('article::article.new'), ['id' => self::getModuleId()], 10, ['icon' => 'fa fa-fw fa-pencil']); $sub->route('content.overview', trans('article::article.overview'), ['id' => self::getModuleId()], 30, ['icon' => 'fa fa-fw fa-book']); }, 10, ['icon' => 'fa fa-fw fa-book']); + + $menu->dropdown(trans('article::module.comments'), function ($sub) { + $sub->route('comments.overview', trans('article::module.commentsOverview'), [], 10, ['icon' => 'fa fa-fw fa-commenting-o']); + }, 10, ['icon' => 'fa fa-fw fa-comments-o']); } public static function getModuleId() diff --git a/modules/Blog/Article/Http/routes.php b/modules/Blog/Article/Http/routes.php index b9ad36f4..46c55155 100644 --- a/modules/Blog/Article/Http/routes.php +++ b/modules/Blog/Article/Http/routes.php @@ -1,5 +1,4 @@ 'web', 'prefix' => 'article', @@ -22,4 +21,16 @@ Route::group([ Route::get('/delete/{id}', 'EditCategory@delete') ->name('article.delete'); +}); + +// routes for comments + +Route::group([ + 'middleware' => 'web', + 'prefix' => 'comments', + 'namespace' => 'Modules\Blog\Article\Http\Controllers' + ], function () { + + Route::get('/', 'CommentsOverview@getOverview') + ->name('comments.overview'); }); \ No newline at end of file diff --git a/modules/Blog/Article/Resources/lang/en/module.php b/modules/Blog/Article/Resources/lang/en/module.php index a448c978..e0c10c0e 100644 --- a/modules/Blog/Article/Resources/lang/en/module.php +++ b/modules/Blog/Article/Resources/lang/en/module.php @@ -1,5 +1,7 @@ 'Article', - 'description' => 'Base submodule for blog' + 'name' => 'Article', + 'description' => 'Base submodule for blog', + 'comments' => 'Comments', + 'commentsOverview' => 'All comments' ]; \ No newline at end of file diff --git a/modules/Blog/Article/Resources/views/admin/content/basicInfo.blade.php b/modules/Blog/Article/Resources/views/admin/content/basicInfo.blade.php index e150c58f..ec02b51e 100644 --- a/modules/Blog/Article/Resources/views/admin/content/basicInfo.blade.php +++ b/modules/Blog/Article/Resources/views/admin/content/basicInfo.blade.php @@ -1,89 +1,89 @@
-
-