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
templates/Base/OnePage/Handlers/OnePage.php
+6 -4
View File
@@ -3,6 +3,7 @@ namespace Templates\Base\OnePage\Handlers;
use App\CMS\Contracts\Modules\InstallableModule;
use App\CMS\Contracts\Modules\TemplateHandler;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Helpers\CurrentTemplate;
use App\CMS\Helpers\PageRenderer;
use App\CMS\Helpers\Settings;
@@ -60,17 +61,18 @@ abstract class OnePage implements TemplateHandler, InstallableModule
$pages = Content::whereIn('id', $pageIds);
if (Auth::user()) {
$pages = $pages->where('status', '!=', Content::STATUS_DRAFT);
$pages = $pages->where('status', '!=', IContent::STATUS_DRAFT);
} else {
$pages = $pages->where('status', Content::STATUS_PUBLIC);
$pages = $pages->where('status', IContent::STATUS_PUBLIC);
}
$homepagePages = $pages->get()
->getDictionary();
->getDictionary();
foreach ($pageIds as $pageId) {
if (!isset($homepagePages[$pageId]))
if (!isset($homepagePages[$pageId])) {
continue;
}
self::$homepagePages[] = $homepagePages[$pageId];
}
templates/Base/OnePage/Http/Controllers/Admin/SetHomepage.php
+6 -7
View File
@@ -3,7 +3,7 @@ namespace Templates\Base\OnePage\Http\Controllers\Admin;
use App\CMS\Helpers\Settings;
use App\Http\Controllers\Admin\Controller;
use App\Models\Content\Content;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\Models\Settings as SettingsModel;
use Illuminate\Support\Facades\Event;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
@@ -14,7 +14,7 @@ use Templates\Base\OnePage\Handlers\OnePage;
class SetHomepage extends Controller
{
/**
* @var Content
* @var IContent
*/
private $content;
@@ -23,7 +23,7 @@ class SetHomepage extends Controller
*
* @param Content $content
*/
public function __construct(Content $content)
public function __construct(IContent $content)
{
parent::__construct();
@@ -41,8 +41,7 @@ class SetHomepage extends Controller
$usedPagesIds = (array)Settings::getJson(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY);
// get all pages - they will be separated for used and not used on next lines
$allPages = $this->content->getOverview()
->get();
$allPages = $this->content->getOverview();
// separate pages to used and not used - with help of $usedPAgesIds array defined above
$pages = $used = $notUsed = [];
@@ -81,7 +80,7 @@ class SetHomepage extends Controller
*/
public function addPage($id)
{
$page = Content::findOrFail($id);
$page = $this->content->getOne($id);
if ($page->is_homepage) {
return redirect()
@@ -130,7 +129,7 @@ class SetHomepage extends Controller
{
$pages = (array)Settings::getJson(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY);
$page = Content::findOrFail($id);
$page = $this->content->getOne($id);
if (!in_array($id, $pages)) {
return redirect()
templates/Base/OnePage/Resources/views/admin/homepage/set.blade.php
+2 -2
View File
@@ -17,7 +17,7 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
'title' => $homepage->title.' <small>'.trans($homepage->module_name).'</small>',
'body' => '<p>'.str_limit(strip_tags($homepage->content), 200).'</p>',
'footerClass' => 'text-right',
'footer' => '<a href="'.route('content.edit', ['id' => $homepage->id]).'" class="btn btn-secondary btn-sm"><i class="fa fa-fw fa-pencil"></i></a>'
'footer' => '<a href="'.route('content.edit', ['url' => $homepage->url]).'" class="btn btn-secondary btn-sm"><i class="fa fa-fw fa-pencil"></i></a>'
])
@else
<div class="alert alert-warning">@lang('template::admin/setHomepage.noHomepageSet')</div>
@@ -38,7 +38,7 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
'body' => '<p>'.str_limit(strip_tags($allPages[$pageId]->content), 200).'</p>',
'footerClass' => 'text-right',
'footer' => '
<a href="'.route('content.edit', ['id' => $allPages[$pageId]->id]).'" class="btn btn-secondary btn-sm"><i class="fa fa-fw fa-pencil"></i></a>
<a href="'.route('content.edit', ['url' => $allPages[$pageId]->url]).'" class="btn btn-secondary btn-sm"><i class="fa fa-fw fa-pencil"></i></a>
<a href="'.route('template.homepage.removePage', ['id' => $allPages[$pageId]->id]).'" class="btn btn-warning confirm btn-sm" data-message="'.trans('template::admin/setHomepage.reallyRemovePage').'"><i class="fa fa-fw fa-trash confirm"></i></a>
'
])