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

Merge branch 'dev' into module_profiler

Browse Source
This commit is contained in:
Michal Kváček
2017-03-23 23:18:01 +01:00
parent 9c90e844b0 74f1501af6
commit 52e02d67c6
85 changed files with 1325 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CMS/Contracts/Content/AdvancedContentModifier.php
-21
View File
@@ -5,27 +5,6 @@ use App\Http\Requests\Request;
use App\Models\Content\Content;
interface AdvancedContentModifier {
/**
* Save module-specific values into database
*
* @param Content $content
* @param array $inputData
*
* @return mixed
*/
public static function createNew(Content &$content, array $inputData);
/**
* Method used for editing existing content page.
*
* Reason why it is separated from createNew() method is simple - we need to save history of changes.
*
* @param Content $content
* @param $request
*
* @return mixed
*/
public static function edit(Content $content, $request);
/**
* Method called right after content page is marked as deleted
*
app/CMS/Contracts/Content/DisplayPipeline/Pipeline.php
+16
View File
@@ -0,0 +1,16 @@
<?php
namespace App\CMS\Contracts\Content\DisplayPipeline;
use App\Models\Content\Content;
interface Pipeline {
/**
* Add new process into pipeline
*
* @param string $process
*
* @return void
*/
function add($process);
function run(Content $page);
}
app/CMS/Contracts/Content/DisplayPipeline/Process.php
+15
View File
@@ -0,0 +1,15 @@
<?php
namespace App\CMS\Contracts\Content\DisplayPipeline;
use App\Models\Content\Content;
interface Process {
/**
* Process and modify given page
*
* @param Content $page
*
* @return mixed
*/
function handle(Content & $page);
}
app/CMS/Contracts/Content/SavePipeline/Pipeline.php
+25
View File
@@ -0,0 +1,25 @@
<?php
namespace App\CMS\Contracts\Content\SavePipeline;
use App\Models\Content\Content;
interface Pipeline {
/**
* Add new process into pipeline
*
* @param string $process
*
* @return void
*/
function add($process);
/**
* Save content page
*
* @param Content $page
* @param array $input
*
* @return Content
*/
function run(Content & $page, array $input);
}
app/CMS/Contracts/Content/SavePipeline/Process.php
+16
View File
@@ -0,0 +1,16 @@
<?php
namespace App\CMS\Contracts\Content\SavePipeline;
use App\Models\Content\Content;
interface Process {
/**
* Process and modify given page
*
* @param Content $page
* @param array $input
*
* @return mixed
*/
function handle(Content & $page, array & $input);
}
app/CMS/Contracts/Modules/AppHandler.php
-10
View File
@@ -6,16 +6,6 @@ use App\Models\Content\Content;
interface AppHandler extends BaseModuleHandler
{
/**
* Render given module into visitor area.
*
* @param Content $content DB model from table contents
* @param array $parameters parameters used for modifications/custom settings of given model
*
* @return mixed
*/
public function render(Content $content, $parameters);
public static function getHistoryHandler();
/**
app/CMS/Contracts/Modules/TemplateHandler.php
-24
View File
@@ -27,28 +27,4 @@ interface TemplateHandler extends BaseModuleHandler
* @return array
*/
public static function getPublicTemplatePaths();
/**
* Prepare Content object to be rendered using Blade template
*
* @param Content $content
*/
public static function beforeRender(Content & $content);
/**
* Modify input data into format which can be understood by edit template
*
* @param Content $content
*/
public static function beforePopulatingEditForm(Content & $content);
/**
* Slightly modify Content object before saving into database.
*
* This way we can do almost whatever we want - even in template
*
* @param Content $content
* @param $request
*/
public static function beforeSave(Content & $content, $request);
}
app/CMS/Contracts/Repositories/Template.php
+1 -1
View File
@@ -15,7 +15,7 @@ interface Template
public function setModel(TemplateModel $model);
public function getPathToTemplate();
public function getPathToTemplate($mode = null);
public function getForModule(ModuleModel $module);
}
app/CMS/Handlers/Handler.php
-13
View File
@@ -20,19 +20,6 @@ abstract class Handler extends BaseHandler implements AppHandler
return History::class;
}
/**
* Render given module into visitor area.
*
* @param Content $content DB model from table contents
* @param array $parameters parameters used for modifications/custom settings of given model
*
* @return mixed
*/
public function render(Content $content, $parameters)
{
return Controller::VisitorsView($content->template, ['page' => $content, 'extra' => $parameters]);
}
public static function getExtendedFormSections()
{
return [
app/CMS/Helpers/CurrentTemplate.php
-33
View File
@@ -96,37 +96,4 @@ class CurrentTemplate implements TemplateHandler
{
return call_user_func([self::handler(), 'getPublicTemplatePaths']);
}
/**
* Prepare Content object to be rendered using Blade template
*
* @param Content $content
*/
public static function beforeRender(Content & $content)
{
call_user_func_array([self::handler(), 'beforeRender'], [&$content]);
}
/**
* Modify input data into format which can be understood by edit template
*
* @param Content $content
*/
public static function beforePopulatingEditForm(Content & $content)
{
call_user_func_array([self::handler(), 'beforePopulatingEditForm'], [&$content]);
}
/**
* Slightly modify Content object before saving into database.
*
* This way we can do almost whatever we want - even in template
*
* @param Content $content
* @param $request
*/
public static function beforeSave(Content & $content, $request)
{
call_user_func_array([self::handler(), 'beforeSave'], [&$content, $request]);
}
}
app/CMS/Helpers/PageRenderer.php
-3
View File
@@ -29,11 +29,8 @@ class PageRenderer
/**
* @var $handler AppHandler
*/
// get handler
$handler = new $page->moduleHandler;
$page->content = Shortcode::compile($page->content);
// render page
return $handler->render($page, $parameters);
}
app/CMS/Interactions/Admin/Content/EditContent.php
+4 -18
View File
@@ -37,32 +37,18 @@ class EditContent implements Interaction
* @param array $data
* @param array $parameters
*
* @return mixed|void
* @return mixed
*/
public function handle($data, $parameters)
{
/**
* @var $page Content
*/
list($page, $titlePhoto, $relatedFiles) = $parameters;
list($page) = $parameters;
// let template to modify request and content page
CurrentTemplate::beforeSave($page, $data);
app('saveContentPipeline')->run($page, $data);
// upload file - if provided
$data['titlePhoto'] = isset($data['existingTitlePhoto']) ? $data['existingTitlePhoto'] : null;
if (!is_null($titlePhoto)) {
$file = $this->file->upload($titlePhoto);
$data['titlePhoto'] = $file ? $file['filename'] : null;
}
$page->update($data);
$this->module->callOnString($page->moduleHandler, 'edit', [$page, $data]);
// move to interaction
$keepAssigned = isset($data['keepAssigned']) ? $data['keepAssigned'] : [];
$page->uploadRelatedFiles($relatedFiles, $keepAssigned);
return $page;
}
/**
app/CMS/Interactions/Admin/Content/NewContent.php
+3 -18
View File
@@ -43,29 +43,14 @@ class NewContent implements Interaction
*/
public function handle($data, $parameters)
{
list($moduleHandler, $titlePhoto, $relatedFiles) = $parameters;
// upload file - if provided
$file = !is_null($titlePhoto) ? $this->file->upload($titlePhoto) : null;
list($moduleHandler) = $parameters;
$data['userId'] = \Auth::user()->id;
$data['language'] = LaravelLocalization::getCurrentLocale();
$data['titlePhoto'] = $file ? $file['filename'] : null;
$data['moduleHandler'] = $moduleHandler;
$page = Content::create($data);
// save module-specific stuff
$this->module->callOnString($moduleHandler, 'createNew', [&$page, $data]);
// let template to modify data and content page
CurrentTemplate::beforeSave($page, $data);
// save content of page before (possible) uploading related files
$page->save();
// upload files assigned to content page
$page->uploadRelatedFiles($relatedFiles);
$page = new Content();
app('saveContentPipeline')->run($page, $data);
return $page;
}
app/CMS/Pipeline/AbstractPipeline.php
+71
View File
@@ -0,0 +1,71 @@
<?php
namespace App\CMS\Pipeline;
use App\CMS\Pipeline\Exceptions\InvalidProcessType;
abstract class AbstractPipeline {
protected $processes = [];
protected $beforeStart = null;
protected $beforeRender = null;
protected $acceptedProcessInterface = null;
/**
* check if given classname implements valid Process interface
*
* @param $classname
*
* @throws InvalidProcessType
*/
protected function checkValidProcess($classname)
{
if (is_null($this->acceptedProcessInterface))
return;
if (!in_array($this->acceptedProcessInterface, class_implements($classname))) {
throw new InvalidProcessType($classname);
}
}
/**
* Add new process into pipeline
*
* @param $process
*
* @return void
* @throws InvalidProcessType
*/
function add($process)
{
$this->checkValidProcess($process);
$this->processes[] = $process;
}
/**
* @param null $beforeStart
*/
public function setBeforeStart($beforeStart)
{
$this->checkValidProcess($beforeStart);
if (!is_null($this->beforeStart)) {
array_unshift($this->processes, $this->beforeStart);
}
$this->beforeStart = $beforeStart;
}
/**
* @param null $beforeRender
*/
public function setBeforeRender($beforeRender)
{
$this->checkValidProcess($beforeRender);
if (!is_null($this->beforeRender)) {
array_push($this->processes, $this->beforeRender);
}
$this->beforeRender = $beforeRender;
}
}
app/CMS/Pipeline/DisplayPipeline/DisplayPipeline.php
+58
View File
@@ -0,0 +1,58 @@
<?php
namespace App\CMS\Pipeline\DisplayPipeline;
use App\CMS\Contracts\Content\DisplayPipeline\Pipeline;
use App\CMS\Contracts\Content\DisplayPipeline\Process;
use App\CMS\Pipeline\AbstractPipeline;
use App\Models\Content\Content;
class DisplayPipeline extends AbstractPipeline implements Pipeline
{
/**
* DisplayPipeline constructor.
*/
public function __construct()
{
$this->acceptedProcessInterface = Process::class;
}
/**
* Run pipeline
*
* @param Content $page
*
* @return Content
*/
function run(Content $page)
{
$this->runBeforeStart($page);
foreach ($this->processes as $process) {
/**
* @var $run Process
*/
$run = new $process;
$run->handle($page);
}
$this->runBeforeRender($page);
return $page;
}
protected function runBeforeStart($page)
{
if (!is_null($this->beforeStart)) {
$process = new $this->beforeStart;
$process->handle($page);
}
}
protected function runBeforeRender($page)
{
if (!is_null($this->beforeRender)) {
$process = new $this->beforeRender;
$process->handle($page);
}
}
}
app/CMS/Pipeline/DisplayPipeline/Process/AddViewedToPage.php
+19
View File
@@ -0,0 +1,19 @@
<?php
namespace App\CMS\Pipeline\DisplayPipeline\Process;
use App\CMS\Contracts\Content\DisplayPipeline\Process;
use App\Models\Content\Content;
class AddViewedToPage implements Process {
/**
* Process and modify given page
*
* @param Content $page
*
* @return mixed
*/
function handle(Content & $page)
{
$page->view();
}
}
app/CMS/Pipeline/DisplayPipeline/Process/CompileShortcodes.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App\CMS\Pipeline\DisplayPipeline\Process;
use App\CMS\Contracts\Content\DisplayPipeline\Process;
use App\Models\Content\Content;
use Webwizo\Shortcodes\Facades\Shortcode;
class CompileShortcodes implements Process {
/**
* Process and modify given page
*
* @param Content $page
*
* @return mixed
*/
function handle(Content & $page)
{
$page->pageContent = Shortcode::compile($page->pageContent);
}
}
app/CMS/Pipeline/Exceptions/InvalidProcessType.php
+6
View File
@@ -0,0 +1,6 @@
<?php
namespace App\CMS\Pipeline\Exceptions;
class InvalidProcessType extends \Exception
{
}
app/CMS/Pipeline/SavePipeline/Process/SaveCommonFields.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App\CMS\Pipeline\SavePipeline\Process;
use App\CMS\Contracts\Content\SavePipeline\Process;
use App\Models\Content\Content;
class SaveCommonFields implements Process {
/**
* Process and modify given page
*
* @param Content $page
* @param array $input
*
* @return void
*/
function handle(Content & $page, array &$input)
{
($page->exists == false) ? $page = Content::create($input): $page->update($input);
}
}
app/Models/Content/ModelTraits/Content.php → app/CMS/Pipeline/SavePipeline/Process/UploadRelatedFiles.php
+21 -31
View File
@@ -1,32 +1,33 @@
<?php
namespace App\Models\Content\ModelTraits;
namespace App\CMS\Pipeline\SavePipeline\Process;
use App\CMS\Contracts\Content\SavePipeline\Process;
use App\Models\Content\Content;
use App\Models\Content\ContentHasFile;
use App\Models\FileManager\Directory;
use App\Models\FileManager\File;
use Illuminate\Support\Facades\App;
trait Content
class UploadRelatedFiles implements Process
{
/**
* Upload and assign files to newly created content page
* Process and modify given page
*
* @param $files
* @param $assignedFiles
* @param null $revisionId
* @param Content $page
* @param array $input
*
* @return int
* @return void
*/
public function uploadRelatedFiles($files, $assignedFiles = [], $revisionId = null)
function handle(Content & $page, array & $input)
{
$changed = 0;
$files = $input['files'];
$assignedFiles = isset($input['keepAssigned']) ? $input['keepAssigned'] : [];
// check if any file was removed
$changed += $this->removeRelatedFiles($revisionId, $assignedFiles);
$this->removeRelatedFiles($page, $assignedFiles);
// allow uploading only on created pages
if (!$this->id || !$files[0]) {
return $changed;
if (!$page->id || !$files[0]) {
return;
}
// find or create new directory for files assigned to content
@@ -37,7 +38,7 @@ trait Content
$data = new \stdClass();
$data->directoryId = $directory->id;
$fileModel = App::make(File::class);
$fileModel = app(File::class);
foreach ($files as $file) {
if (!$file) {
@@ -48,38 +49,27 @@ trait Content
// add assignement
ContentHasFile::create([
'file_id' => $uploaded['id'],
'content_id' => $this->id
'content_id' => $page->id
]);
if ($revisionId) {
$this->saveHistory($revisionId, 'file', null, ['file' => $uploaded['file']->getClientOriginalName()]);
}
$changed++;
}
return $changed;
}
/**
* Delete files from association
*
* @param $revisionId
*
* @return int
* @param Content $page
* @param $assignedFiles
*/
private function removeRelatedFiles($revisionId, $assignedFiles)
private function removeRelatedFiles(Content $page, $assignedFiles)
{
$allFiles = $this->files()
$allFiles = $page->files()
->whereNotIn('id', array_keys($assignedFiles))
->get();
foreach ($allFiles as $file) {
ContentHasFile::where('content_id', $this->id)
ContentHasFile::where('content_id', $page->id)
->where('file_id', $file->id)
->delete();
}
return count($allFiles);
}
}
app/CMS/Pipeline/SavePipeline/Process/UploadTitlePhoto.php
+33
View File
@@ -0,0 +1,33 @@
<?php
namespace App\CMS\Pipeline\SavePipeline\Process;
use App\CMS\Contracts\Content\SavePipeline\Process;
use App\Models\Content\Content;
use App\Models\FileManager\File;
class UploadTitlePhoto implements Process {
/**
* Process and modify given page
*
* @param Content $page
* @param array $input
*
* @return void
*/
function handle(Content & $page, array & $input)
{
$fileModel = app(File::class);
$titlePhoto = isset($input['titlePhotoFile']) ? $input['titlePhotoFile'] : null;
// upload file - if provided
$page->titlePhoto = isset($input['existingTitlePhoto']) ? $input['existingTitlePhoto'] : null;
if (!is_null($titlePhoto)) {
$file = $fileModel->upload($titlePhoto);
$page->titlePhoto = $file ? $file['filename'] : null;
}
$page->save();
}
}
app/CMS/Pipeline/SavePipeline/SavePipeline.php
+69
View File
@@ -0,0 +1,69 @@
<?php
namespace App\CMS\Pipeline\SavePipeline;
use App\CMS\Contracts\Content\SavePipeline\Pipeline;
use App\CMS\Contracts\Content\SavePipeline\Process;
use App\CMS\Pipeline\AbstractPipeline;
use App\Models\Content\Content;
class SavePipeline extends AbstractPipeline implements Pipeline
{
/**
* SavePipeline constructor.
*/
public function __construct()
{
$this->acceptedProcessInterface = Process::class;
}
/**
* Save content page
*
* @param Content $page
* @param array $input
*
* @return Content
*/
function run(Content & $page, array $input)
{
$this->runBeforeStart($page, $input);
foreach ($this->processes as $process) {
/**
* @var $run Process
*/
$run = new $process;
$run->handle($page, $input);
}
$this->runAfter($page, $input);
return $page;
}
/**
* Run process as first - if specified
*
* @param Content $page
* @param array $input
*/
protected function runBeforeStart(Content $page, array $input)
{
if (!is_null($this->beforeStart)) {
app($this->beforeStart)->handle($page, $input);
}
}
/**
* Run some process in the end - if exists
*
* @param Content $page
* @param array $input
*/
protected function runAfter(Content $page, array $input)
{
if (!is_null($this->beforeRender)) {
app($this->beforeRender)->handle($page, $input);
}
}
}
app/CMS/Repositories/Content/Content.php
+7 -10
View File
@@ -46,7 +46,7 @@ class Content extends Repository implements IContent
public function all()
{
return $this->getPageQuery()
->get();
->get();
}
/**
@@ -63,7 +63,7 @@ class Content extends Repository implements IContent
$page->status = IContent::STATUS_DRAFT;
$page->moduleSettings = [];
} else {
$page = $this->model->findOrFail($id);
$page = $this->model->findOrFail($id);
}
return $page;
@@ -76,9 +76,8 @@ class Content extends Repository implements IContent
public function getHomepage()
{
return $this->getPageQuery()
->where('isHomepage', 1)
->first();
->where('isHomepage', 1)
->first();
}
/**
@@ -91,8 +90,8 @@ class Content extends Repository implements IContent
public function getByURL($url)
{
return $this->getPageQuery()
->where('url', $url)
->first();
->where('url', $url)
->first();
}
/**
@@ -126,8 +125,6 @@ class Content extends Repository implements IContent
$query = $query->whereIn('contents.status', $statuses);
}
$pages = $query->paginate(setting('paginatedResults', 20));
return $pages;
return $query;
}
}
app/CMS/Repositories/Widgets/Widget.php
+1 -1
View File
@@ -19,7 +19,7 @@ class Widget
$widget->name = $data['name'];
$widget->description = $data['description'];
$widget->container_class = $data['containerClass'];
$widget->container_id = $data['containerId'];
$widget->container_id = empty($data['containerId']) ? null : $data['containerId'];
$widget->settings = json_encode(call_user_func([$widgetType->handler, 'save'], $request));
// save into database
app/CMS/Widgets/Menu/Presenters/Menu.php
+2 -1
View File
@@ -107,7 +107,8 @@ class Menu implements WidgetRenderer
$content = App::make(ContentContract::class);
// get list of all pages
$pages = $content->getOverview();
$pages = $content->getOverview()
->get();
// make object from JSON
if (!isset($widget->settings->links)) {
app/Events/DeleteWidgetArea.php
+1 -2
View File
@@ -2,7 +2,7 @@
namespace App\Events;
use App\Models\WidgetArea;
use App\Models\Widgets\WidgetArea;
use Illuminate\Queue\SerializesModels;
class DeleteWidgetArea extends Event
@@ -20,7 +20,6 @@ class DeleteWidgetArea extends Event
*/
public function __construct(WidgetArea $widgetArea)
{
//
$this->widgetArea = $widgetArea;
}
}
app/Http/Controllers/Admin/Contents/ContentOverview.php
+2 -1
View File
@@ -39,7 +39,8 @@ class ContentOverview extends Controller
// get pages for overview
$handler = $module !== null ? $module->handler : null;
$pages = $this->content->getOverview($handler, [$status]);
$pages = $this->content->getOverview($handler, [$status])
->paginate(setting('paginatedResults', 20));
// get homepage - for checking if homepage is set and available
$homepage = $this->content->getHomepage();
app/Http/Controllers/Admin/Contents/CreateNewContent.php
+4 -6
View File
@@ -4,13 +4,13 @@ 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 Modules\Categories\Contracts\Repositories\Category as ICategory;
/**
* Class CreateNewContent
@@ -85,7 +85,8 @@ class CreateNewContent extends Controller
'module' => $module,
'categories' => $categories,
'page' => $page,
'rootPages' => $this->content->getOverview(),
'rootPages' => $this->content->getOverview()
->get(),
'formSectionNames' => call_user_func([$module->handler, 'getExtendedFormSections']),
'formSections' => call_user_func([$module->handler, 'getExtendedFormInputsCreate']),
]);
@@ -103,11 +104,8 @@ class CreateNewContent extends Controller
{
$module = $this->module->getOne($moduleId);
$titlePhoto = $request->file('titlePhoto');
$relatedFiles = $request->all()['files'];
// create new page
Interaction::handle(NewContent::class, $request->all(), $module->handler, $titlePhoto, $relatedFiles);
Interaction::handle(NewContent::class, $request->all(), $module->handler);
return redirect()
->route('content.overview')
app/Http/Controllers/Admin/Contents/EditContent.php
+2 -8
View File
@@ -87,9 +87,6 @@ class EditContent extends Controller
$categories = $this->category->getForModule($module);
$history = $this->history->getStructuredHistoryOf($page);
// modify data for edit form according to installed template
CurrentTemplate::beforePopulatingEditForm($page);
// render view
return view('admin.content.edit', [
'pageHeading' => $pageHeading,
@@ -97,7 +94,7 @@ class EditContent extends Controller
'page' => $page,
'module' => $module,
'categories' => $categories,
'rootPages' => $this->content->getOverview(),
'rootPages' => $this->content->getOverview()->get(),
'templates' => $templates,
'formSectionNames' => $this->module->call($module, 'getExtendedFormSections'),
'formSections' => $this->module->call($module, 'getExtendedFormInputsEdit'),
@@ -132,10 +129,7 @@ class EditContent extends Controller
}
// edit page
$titlePhoto = $request->file('titlePhoto');
$relatedFiles = $request->all()['files'];
Interaction::handle(EditContentInteraction::class, $request->all(), $page, $titlePhoto, $relatedFiles);
Interaction::handle(EditContentInteraction::class, $request->all(), $page);
// something was changed, inform user
return redirect()
app/Http/Controllers/Admin/Templates/EditTemplate.php
+21 -5
View File
@@ -12,6 +12,21 @@ use Illuminate\Support\Facades\File;
class EditTemplate extends Controller
{
/**
* @var TemplateRepositoryContract
*/
private $templateRepository;
/**
* EditTemplate constructor.
*
* @param TemplateRepositoryContract $templateRepository
*/
public function __construct(TemplateRepositoryContract $templateRepository)
{
$this->templateRepository = $templateRepository;
}
/**
* Render form for editing template
*
@@ -26,11 +41,10 @@ class EditTemplate extends Controller
*/
$template = Template::findOrFail($template);
$repo = app(TemplateRepositoryContract::class);
$repo->setModel($template);
$this->templateRepository->setModel($template);
// load template content
$absolutePath = $repo->getPathToTemplate();
$absolutePath = $this->templateRepository->getPathToTemplate();
$content = @file_get_contents($absolutePath);
return view('admin.templates.edit', [
@@ -78,9 +92,11 @@ class EditTemplate extends Controller
*/
private function saveContent(Template $template, EditTemplateRequest $request)
{
$this->templateRepository->setModel($template);
// get templates with paths
$originalTemplate = $template->getPathToTemplate();
$customTemplate = $template->getPathToTemplate(Template::CUSTOM_EDIT_DIRECTORY);
$originalTemplate = $this->templateRepository->getPathToTemplate();
$customTemplate = $this->templateRepository->getPathToTemplate(TemplateRepositoryContract::CUSTOM_EDIT_DIRECTORY);
// get paths
$originalDir = dirname($originalTemplate);
app/Http/Controllers/Visitor/ContentPage.php
+16 -7
View File
@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Visitor;
use App\CMS\Contracts\Repositories\Content;
use App\CMS\Helpers\PageRenderer;
use App\Http\Controllers\Controller;
use App\Models\Content\Content as ContentModel;
use Illuminate\Support\Facades\Auth;
@@ -24,11 +23,20 @@ class ContentPage extends Controller
$this->content = $content;
}
/**
* Load page by URL
*
* This method also caches content
*
* @param $url
*
* @return mixed
*/
public function getPage($url)
{
$contentModel = $this->content;
$page = Cache::remember('content-' . $url, setting('contentCacheLifetime', 5), function () use ($contentModel, $url) {
return $contentModel->getByURL($url);
$contentRepository = $this->content;
$page = Cache::remember('content-' . $url, setting('contentCacheLifetime', 5), function () use ($contentRepository, $url) {
return $contentRepository->getByURL($url);
});
// no page available
@@ -54,9 +62,10 @@ class ContentPage extends Controller
abort(404);
}
// add one new "view" for page
$page->view();
$displayPipeline = app('displayPipeline');
$page = $displayPipeline->run($page);
return Controller::VisitorsView($page->template, ['page' => $page]);
return PageRenderer::render($page);
}
}
app/Models/Content/Content.php
+1 -1
View File
@@ -17,7 +17,7 @@ use Modules\Categories\Entities\Category;
*/
class Content extends Model
{
use SoftDeletes, ModelTraits\Content, Nullable;
use SoftDeletes, Nullable;
public $timestamps = true;
protected $fillable = [
'userId',
app/Models/Content/ModelTraits/ContentHistory.php
+1 -1
View File
@@ -10,7 +10,7 @@ trait ContentHistory
/**
* Returns history grouped by revisions (edit_batches)
*
* @param Content $content
* @param ContentModel $content
*
* @return array
*/
app/Providers/AppServiceProvider.php
+36
View File
@@ -13,6 +13,13 @@ use App\CMS\Handlers\Search\Content;
use App\CMS\Handlers\Search\Files;
use App\CMS\Handlers\Search\Presenters\AdminContent as AdminContentPresenter;
use App\CMS\Handlers\Search\Presenters\AdminFiles;
use App\CMS\Pipeline\DisplayPipeline\DisplayPipeline;
use App\CMS\Pipeline\DisplayPipeline\Process\AddViewedToPage;
use App\CMS\Pipeline\DisplayPipeline\Process\CompileShortcodes;
use App\CMS\Pipeline\SavePipeline\Process\SaveCommonFields;
use App\CMS\Pipeline\SavePipeline\Process\UploadRelatedFiles;
use App\CMS\Pipeline\SavePipeline\Process\UploadTitlePhoto;
use App\CMS\Pipeline\SavePipeline\SavePipeline;
use App\CMS\Repositories\Content\Content as ContentRepository;
use App\CMS\Repositories\Module as ModuleRepository;
use App\CMS\Repositories\Templates\Template as TemplateRepository;
@@ -41,6 +48,8 @@ class AppServiceProvider extends ServiceProvider
$this->registerWidgets();
$this->registerSettings();
$this->registerSearch();
$this->registerDisplayPipeline();
$this->registerSavePipeline();
}
}
@@ -64,6 +73,16 @@ class AppServiceProvider extends ServiceProvider
return new WidgetRegistrator($app);
});
// create singleton for display pipeline - pipeline used for displaying visitor pages
$this->app->singleton('displayPipeline', function ($app) {
return new DisplayPipeline();
});
// create singleton for display pipeline - pipeline used for displaying visitor pages
$this->app->singleton('saveContentPipeline', function ($app) {
return new SavePipeline();
});
// create registrator for template directories
$this->app->singleton('registerTemplateDir', function ($app) {
return new TemplateRegistrator($app);
@@ -115,4 +134,21 @@ class AppServiceProvider extends ServiceProvider
$registrator->register(new Content(), new AdminContentPresenter(), SearchEngineRegistrator::ADMIN);
$registrator->register(new Files(), new AdminFiles(), SearchEngineRegistrator::ADMIN);
}
private function registerDisplayPipeline()
{
$registrator = $this->app->make('displayPipeline');
$registrator->add(AddViewedToPage::class);
$registrator->add(CompileShortcodes::class);
}
private function registerSavePipeline()
{
$pipeline = $this->app->make('saveContentPipeline');
$pipeline->add(SaveCommonFields::class);
$pipeline->add(UploadTitlePhoto::class);
$pipeline->add(UploadRelatedFiles::class);
}
}