minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

REFACTORING: another ugly commit full of refactored code

Browse Source
This commit is contained in:
Michal Kváček
2016-10-19 00:28:44 +02:00
parent 4f6a006ad9
commit 28f67ffe3c
34 changed files with 101 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/Blog/Article/Handlers/Article.php
+2 -3
View File
@@ -2,8 +2,8 @@
namespace Modules\Blog\Article\Handlers;
use App\CMS\Contracts\Content\AdvancedContentModifier;
use App\CMS\Contracts\Content\ContentTitles;
use App\CMS\Contracts\Modules\InstallableModule;
use App\CMS\Handlers\Contracts\ContentTitles;
use App\CMS\Handlers\Handler;
use App\Http\Controllers\Admin\Contents\EditContent;
use App\Http\Controllers\Controller;
@@ -58,8 +58,7 @@ class Article extends Handler implements ContentTitles, AdvancedContentModifier,
* @param Content $content
* @param Request $request
*
* @return mixed
* @internal param Widget $widget
* @return mixed|void
*/
public static function createNew(Content &$content, Request $request)
{
modules/Blog/Article/Listeners/LogCommentApproval.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace Modules\Blog\Article\Listeners;
use App\Listeners\Logger;
use App\Listeners\Loggers\Logger;
use Modules\Blog\Article\Events\ApprovedComment;
class LogCommentApproval extends Logger
modules/Blog/Article/Listeners/LogDeletedComment.php
+1 -2
View File
@@ -2,8 +2,7 @@
namespace Modules\Blog\Article\Listeners;
use App\Listeners\Logger;
use Modules\Blog\Article\Events\ApprovedComment;
use App\Listeners\Loggers\Logger;
use Modules\Blog\Article\Events\DeletedComment;
class LogDeletedComment extends Logger
modules/Blog/Article/Listeners/LogNewComment.php
+3 -2
View File
@@ -2,7 +2,7 @@
namespace Modules\Blog\Article\Listeners;
use App\Listeners\Logger;
use App\Listeners\Loggers\Logger;
use Modules\Blog\Article\Events\CreatedComment;
class LogNewComment extends Logger
@@ -15,8 +15,9 @@ class LogNewComment extends Logger
public function handle(CreatedComment $event)
{
// log only logged-in users
if (!$event->comment->user_id)
if (!$event->comment->user_id) {
return;
}
$parameters = [
'author' => $event->comment->name,
modules/ContactForm/Handlers/ContactForm.php
+1 -1
View File
@@ -2,8 +2,8 @@
namespace Modules\ContactForm\Handlers;
use App\CMS\Contracts\Content\AdvancedContentModifier;
use App\CMS\Contracts\Content\ContentTitles;
use App\CMS\Enumerations\ModulesHandlerToId;
use App\CMS\Handlers\Contracts\ContentTitles;
use App\CMS\Handlers\Handler;
use App\Http\Controllers\Admin\Contents\EditContent;
use App\Http\Requests\Request;
modules/Gallery/Http/Controllers/.gitkeep
View File
modules/Gallery/Http/Controllers/Admin/CreateOrbitSlider.php
-113
View File
@@ -1,113 +0,0 @@
<?php namespace Modules\Gallery\Http\Controllers\Admin;
use App\Models\Content\Content;
use App\Models\Widgets\Widget;
use App\Models\Widgets\WidgetType;
use App\CMS\Widgets\OrbitSlider\OrbitSlider;
use Pingpong\Modules\Routing\Controller;
class CreateOrbitSlider extends Controller
{
/**
* @var Widget
*/
private $widget;
/**
* CreateOrbitSlider constructor.
*
* @param Widget $widget
*/
public function __construct(Widget $widget)
{
$this->widget = $widget;
}
/**
* Load gallery or redirect user back to content edit form
*
* @param $id
*
* @return mixed
*/
protected function getGallery($id)
{
$content = Content::where('module_handler', config('gallery.handler'))
->findOrFail($id);
$content->module_settings = json_decode($content->module_settings);
// check if gallery has assigned some directory id
if (!isset($content->module_settings->directoryId)) {
return redirect()
->route('content.edit', ['id' => $id])
->with('error', trans('gallery::admin/content.invalidGallery'));
}
return $content;
}
/**
* Load widget type for Orbit Slider. In case it does not exist, redirect user back to content edit form.
*
* @param $id
*
* @return mixed
*/
protected function getOrbitSliderWidgetType($id)
{
// try to load widget type for slider
$widgetType = WidgetType::where('handler', OrbitSlider::class)
->first();
// check if widget type exists
if (!$widgetType) {
return redirect()
->route('content.edit', ['id' => $id])
->with('error', trans('gallery::admin/content.orbitSliderMissing'));
}
return $widgetType;
}
/**
* Method for creating slider from photogallery
*
* @param $id
*
* @return mixed
*/
public function createNew($id)
{
// try to find gallery with specified ID
$content = $this->getGallery($id);
// load info about orbit slider widget
$widgetType = $this->getOrbitSliderWidgetType($id);
// create slider basic config
$sliderSettings = (object)[
'name' => $content->title,
'description' => $content->meta_description,
'directoryId' => $content->module_settings->directoryId,
'useExistingDirectory' => true,
];
// try to create the slider
try {
$slider = $this->widget->createNew($widgetType, $sliderSettings);
} catch (\Exception $e) {
return redirect()
->route('content.edit', ['id' => $id])
->with('error', trans('gallery::admin/content.sliderFailed', ['message' => $e->getMessage()]));
}
// update gallery info
$content->module_settings->slider = $slider->id;
$content->module_settings = json_encode($content->module_settings);
$content->save();
return redirect()
->route('content.edit', ['id' => $id])
->with('success', trans('gallery::admin/content.sliderCreated'));
}
}
modules/Gallery/Http/Middleware/.gitkeep
View File
modules/Gallery/Http/Requests/.gitkeep
View File
modules/Gallery/Http/routes.php
-11
View File
@@ -1,11 +0,0 @@
<?php
Route::group([
'middleware' => ['admin'],
'namespace' => 'Modules\Gallery\Http\Controllers\Admin',
'prefix' => LaravelLocalization::setLocale() . 'admin/gallery'
], function () {
// method for creating slider from photogallery
Route::get('makeSlider/{id}', 'CreateOrbitSlider@createNew')
->name('gallery.makeSlider');
});
modules/Gallery/start.php
-13
View File
@@ -1,15 +1,2 @@
<?php
/*
|--------------------------------------------------------------------------
| Register Namespaces And Routes
|--------------------------------------------------------------------------
|
| When a module starting, this file will executed automatically. This helps
| to register some namespaces like translator or view. Also this file
| will load the routes file for each module. You may also modify
| this file as you want.
|
*/
require __DIR__ . '/Http/routes.php';
modules/StaticPages/Database/Migrations/.gitkeep
View File
modules/StaticPages/Database/Seeders/.gitkeep
View File
modules/StaticPages/Database/Seeders/StaticPagesDatabaseSeeder.php
-20
View File
@@ -1,20 +0,0 @@
<?php namespace Modules\Staticpages\Database\Seeders;
use Illuminate\Database\Seeder;
use Illuminate\Database\Eloquent\Model;
class StaticPagesDatabaseSeeder extends Seeder {
/**
* Run the database seeds.
*
* @return void
*/
public function run()
{
Model::unguard();
// $this->call("OthersTableSeeder");
}
}
modules/StaticPages/Handlers/StaticPage.php
+1 -2
View File
@@ -1,8 +1,7 @@
<?php
namespace Modules\StaticPages\Handlers;
use App\CMS\Enumerations\ModulesHandlerToId;
use App\CMS\Handlers\Contracts\ContentTitles;
use App\CMS\Contracts\Content\ContentTitles;
use App\CMS\Handlers\Handler;
use App\Models\Content\Content;
use App\Models\User;
modules/StaticPages/Http/Controllers/.gitkeep
View File
modules/StaticPages/Http/Middleware/.gitkeep
View File
modules/StaticPages/Http/Requests/.gitkeep
View File
modules/StaticPages/Http/routes.php
-1
View File
@@ -1 +0,0 @@
<?php
modules/StaticPages/Resources/views/.gitkeep
View File
modules/StaticPages/start.php
-14
View File
@@ -1,15 +1 @@
<?php
/*
|--------------------------------------------------------------------------
| Register Namespaces And Routes
|--------------------------------------------------------------------------
|
| When a module starting, this file will executed automatically. This helps
| to register some namespaces like translator or view. Also this file
| will load the routes file for each module. You may also modify
| this file as you want.
|
*/
require __DIR__ . '/Http/routes.php';