REFACTORING: another ugly commit full of refactored code

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
@@ -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()