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

FEATURE: add another repositories

Browse Source
This commit is contained in:
Michal Kváček
2016-10-18 22:35:06 +02:00
parent 662700b4f2
commit 4f6a006ad9
47 changed files with 410 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/Contents/CreateNewContent.php
+29 -44
View File
@@ -3,17 +3,14 @@ namespace App\Http\Controllers\Admin\Contents;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Repositories\Module as IModuleRepository;
use App\CMS\Contracts\Repositories\Template as ITemplate;
use Modules\Categories\Contracts\Repositories\Category as ICategory;
use App\CMS\Enumerations\ContentStatuses;
use App\Cms\Handlers\Interactions\Interaction;
use App\Cms\Interactions\Admin\Content\NewContent;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\CreateNewContentRequest;
use App\Http\Requests\Request;
use App\Models\FileManager\File;
use App\Models\Module;
use App\Models\Templates\Template;
use Modules\Categories\Entities\Category;
use Pingpong\Modules\Facades\Module as ModuleInstance;
/**
* Class CreateNewContent
@@ -24,10 +21,6 @@ use Pingpong\Modules\Facades\Module as ModuleInstance;
*/
class CreateNewContent extends Controller
{
/**
* @var File
*/
private $file;
/**
* @var IContent
*/
@@ -36,71 +29,63 @@ class CreateNewContent extends Controller
* @var IModuleRepository
*/
private $module;
/**
* @var ICategory
*/
private $category;
/**
* @var ITemplate
*/
private $template;
/**
* CreateNewContent constructor.
*
* Sets File and Content models into class variables
*
* @param File $file
* @param Content $content
* @param IContent|Content $content
* @param IModuleRepository $module
* @param ICategory $category
*
* @param ITemplate $template
*
* @internal param File $file
*/
public function __construct(File $file, IContent $content, IModuleRepository $module)
public function __construct(IContent $content, IModuleRepository $module, ICategory $category, ITemplate $template)
{
parent::__construct();
$this->file = $file;
$this->content = $content;
$this->module = $module;
$this->category = $category;
$this->template = $template;
}
/**
* Display form for new content page
*
* @param $moduleId
* @param $module
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function create($moduleId)
public function create($module)
{
$module = Module::findOrFail($moduleId);
$module = $this->module->getOne($module);
$statuses = ContentStatuses::getWithTranslations();
$pageHeading = $this->module->getCreateContentTitle($module);
$templates = $this->template->getForModule($module);
$categories = $this->category->getForModule($module);
// set default page title
$pageHeading = trans('admin/contents.new', ['name' => trans($module->name)]);
if (is_callable([$module->handler, 'getCreateNewTitle'])) {
$pageHeading = call_user_func([$module->handler, 'getCreateNewTitle']);
}
// get list of usable templates
$templates = Template::where('module_id', $moduleId)
->select(['template_name', 'name', 'description'])
->get();
// add categories, if supported
$categoryModule = ModuleInstance::get('categories');
$categories = [];
if ($module->support_categories && !is_null($categoryModule) && $categoryModule->enabled()) {
$categories = Category::where('module_id', $moduleId)
->get();
}
// create default content object
$this->content->status = IContent::STATUS_DRAFT;
$page = $this->content->getOne();
// render view
return view('admin.content.new', [
'pageHeading' => $pageHeading,
'contentStatuses' => $statuses,
'templates' => $templates,
'moduleId' => $moduleId,
'module' => $module,
'categories' => $categories,
'page' => $this->content,
'rootPages' => $this->content->getOverview()
->get(),
'moduleName' => trans($module->name),
'extraData' => call_user_func([$module->handler, 'loadExtraData'], $this->content),
'page' => $page,
'rootPages' => $this->content->getOverview(),
'formSectionNames' => call_user_func([$module->handler, 'getExtendedFormSections']),
'formSections' => call_user_func([$module->handler, 'getExtendedFormInputsCreate']),
]);
@@ -116,7 +101,7 @@ class CreateNewContent extends Controller
*/
public function store(Request $request, $moduleId)
{
$module = Module::findOrFail($moduleId);
$module = $this->module->getOne($moduleId);
// create new page
Interaction::handle($request, new NewContent(), $module->handler);
app/Http/Controllers/Admin/Contents/EditContent.php
+39 -34
View File
@@ -18,6 +18,10 @@ use Illuminate\Support\Facades\Event;
use Modules\Categories\Entities\Category;
use Pingpong\Modules\Facades\Module as ModuleInstance;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Repositories\Module as IModuleRepository;
use App\CMS\Contracts\Repositories\Template as ITemplate;
use Modules\Categories\Contracts\Repositories\Category as ICategory;
class EditContent extends Controller
{
@@ -29,66 +33,70 @@ class EditContent extends Controller
* @var File
*/
private $file;
/**
* @var IContent
*/
private $content;
/**
* @var IModuleRepository
*/
private $module;
/**
* @var ICategory
*/
private $category;
/**
* @var ITemplate
*/
private $template;
/**
* EditContent constructor.
*
* Load ContentHistory and File into this controller
*
* @param ContentHistory $history
* @param File $file
* @param ContentHistory $history
* @param File $file
* @param IContent $content
* @param IModuleRepository $module
* @param ICategory $category
* @param ITemplate $template
*/
public function __construct(ContentHistory $history, File $file)
public function __construct(ContentHistory $history, File $file, IContent $content, IModuleRepository $module, ICategory $category, ITemplate $template)
{
$this->history = $history;
$this->file = $file;
$this->content = $content;
$this->module = $module;
$this->category = $category;
$this->template = $template;
}
/**
* Display form for editing static page
*
* @param $id
* @param $url
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function edit($id)
public function edit($url)
{
// select all content statuses
$statuses = ContentStatuses::getWithTranslations();
// try to find requested page
$page = Content::findOrFail($id);
$page->module_settings = json_decode($page->module_settings);
$page = $this->content->getOne($url);
// get module ID
$module = Module::where('handler', $page->module_handler)
->firstOrFail();
$pageHeading = trans('admin/contents.edit', ['name' => e($page->title)]);
if (is_callable([$module->handler, 'getEditTitle'])) {
$pageHeading = call_user_func([$module->handler, 'getEditTitle'], $page);
}
$pageHeading = $this->module->getUpdateContentTitle($module);
$templates = $this->template->getForModule($module);
$categories = $this->category->getForModule($module);
$history = $this->history->getStructuredHistoryOf($page);
// get all Blade templates for rendering page
$templates = Template::where('module_id', $module->id)
->select(['template_name', 'name', 'description'])
->get();
// get module for Categories - PingPong module
$categoryModule = ModuleInstance::get('categories');
// add categories, if supported
$categories = [];
if ($module->support_categories && !is_null($categoryModule) && $categoryModule->enabled()) {
$categories = Category::where('module_id', $module->id)
->get();
}
// modify data for edit form according to installed template
call_user_func_array([CurrentTemplate::handler(), 'beforePopulatingEditForm'], [&$page]);
$history = $this->history->getStructuredHistoryOf($page);
// render view
return view('admin.content.edit', [
'pageHeading' => $pageHeading,
@@ -96,11 +104,8 @@ class EditContent extends Controller
'page' => $page,
'module' => $module,
'categories' => $categories,
'rootPages' => $page->getOverview()
->where('contents.id', '!=', $page->id)
->get(),
'rootPages' => $this->content->getOverview(),
'templates' => $templates,
'extraData' => call_user_func([$page->module_handler, 'loadExtraData'], $page),
'formSectionNames' => call_user_func([$page->module_handler, 'getExtendedFormSections']),
'formSections' => call_user_func([$page->module_handler, 'getExtendedFormInputsEdit']),
'historySize' => count($history['changesets'])
app/Http/routes/admin/contents.php
+3 -3
View File
@@ -1,15 +1,15 @@
<?php
Route::group(['namespace' => 'Contents'], function () {
// list of all static pages
Route::get('content/overview/{moduleId?}/{status?}', 'ContentOverview@index')
Route::get('content/overview/{module?}', 'ContentOverview@index')
->name('content.overview');
// form for creating new static page
Route::get('content/new/{moduleId}', 'CreateNewContent@create')
Route::get('content/new/{module}', 'CreateNewContent@create')
->name('content.new');
// form for editing existing static page
Route::get('content/edit/{id}', 'EditContent@edit')
Route::get('content/edit/{url}', 'EditContent@edit')
->name('content.edit');
// post method for creating new static page