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

Merge branch 'static_pages' into dev

Browse Source
This commit is contained in:
Michal Kváček
2016-03-11 15:48:51 +01:00
parent d0601c4fdd eed7e15650
commit 0a1a25b300
12 changed files with 62 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/StaticPages/Handlers/StaticPage.php
+55 -2
View File
@@ -1,8 +1,10 @@
<?php
namespace Modules\StaticPages\Handlers;
use App\Enumerations\ModulesHandlerToId;
use App\Handlers\Handler;
use App\Http\Controllers\Controller;
use App\Http\Requests\Request;
use App\Models\Content;
use App\Models\User;
@@ -15,11 +17,19 @@ class StaticPage extends Handler
// register links in admin menu
$menu = \Menu::instance('mainMenu');
$menu->dropdown(trans('staticpages::adminMenu.staticPages'), function ($submenu) use ($user) {
$submenu->route('staticpage.new', trans('staticpages::adminMenu.new'), [], 1, ['icon' => 'fa fa-plus-square-o']);
$submenu->route('staticpage.overview', trans('staticpages::adminMenu.overview'), [], 20, ['icon' => 'fa fa-list']);
$submenu->route('content.new', trans('staticpages::adminMenu.new'), ['moduleId' => self::getModuleId()], 10, ['icon' => 'fa fa-plus']);
$submenu->route('content.overview', trans('staticpages::adminMenu.overview'), ['moduleId' => self::getModuleId()], 20, ['icon' => 'fa fa-list']);
}, 15, ['icon' => 'fa fa-newspaper-o']);
}
public static function getModuleId()
{
$allModules = ModulesHandlerToId::getWithTranslations();
$moduleId = $allModules[config('staticpages.handler')];
return $moduleId;
}
/**
* Render given module into visitor area.
*
@@ -32,4 +42,47 @@ class StaticPage extends Handler
{
return Controller::VisitorsView($content->template, ['page' => $content]);
}
/**
* Does given module manage content? Or is it just module with widgets/something internal/something absolutely else?
*
* @return bool
*/
public static function managesContent()
{
return true;
}
/**
* Save module-specific values into database
*
* @param Content $content
* @param Request $request
*
* @return mixed
*/
public static function createNew(Content &$content, Request $request)
{
// There is nothing more we can save. Static pages are only text saved into database.
// This funcionality is already covered in saving content page alone.
}
/**
* 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 $request
* @param string $revisionId
*
* @return mixed
*/
public static function edit(Content &$content, Request $request, $revisionId)
{
// There is nothing more we can save. Static pages are only text saved into database.
// This funcionality is already covered in saving content page alone.
return 0;
}
}
modules/StaticPages/Http/Controllers/Admin/Controller.php
-9
View File
@@ -1,9 +0,0 @@
<?php
namespace Modules\StaticPages\Http\Controllers\Admin;
use Pingpong\Modules\Routing\Controller as BaseController;
class Controller extends BaseController
{
}
modules/StaticPages/Http/Controllers/Admin/CreateNewStaticPage.php
-70
View File
@@ -1,70 +0,0 @@
<?php
namespace Modules\StaticPages\Http\Controllers\Admin;
use App\Enumerations\ContentStatuses;
use App\Enumerations\ModulesHandlerToId;
use App\Models\Content;
use App\Models\Template;
use Illuminate\Support\Facades\Event;
use Modules\StaticPages\Http\Requests\CreateNewStaticPageRequest;
class CreateNewStaticPage extends Controller
{
/**
* Display form for new static page
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function getNew()
{
$statuses = ContentStatuses::getWithTranslations();
// we do not want to create deleted page
unset($statuses[Content::STATUS_DELETED]);
$allModules = ModulesHandlerToId::getWithTranslations();
$moduleId = $allModules[config('staticpages.handler')];
$templates = Template::where('module_id', $moduleId)
->select(['template_name', 'name', 'description'])
->get();
// render view
return view('staticpages::admin.new', [
'contentStatuses' => $statuses,
'templates' => $templates,
'selectedStatus' => Content::STATUS_DRAFT
]);
}
/**
* Save new static page
*
* @param CreateNewStaticPageRequest $request
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postNew(CreateNewStaticPageRequest $request)
{
$page = new Content();
$page->user_id = \Auth::user()->id;
$page->title = $request->title;
$page->url = $request->url;
$page->published_from = $request->publishedFrom;
$page->published_to = $request->publishedTo;
$page->meta_keywords = $request->meta_description;
$page->meta_description = $request->meta_description;
$page->content = $request->pageContent;
$page->status = $request->status;
$page->module_handler = config('staticpages.handler');
$page->template = $request->template;
$page->save();
Event::fire(new \Modules\StaticPages\Events\CreateNewStaticPage($page));
return redirect()
->route('staticpage.new')
->with('success', trans('staticpages::admin.successfullyCreated'));
}
}
modules/StaticPages/Http/Controllers/Admin/EditStaticPage.php
-213
View File
@@ -1,213 +0,0 @@
<?php
namespace Modules\StaticPages\Http\Controllers\Admin;
use App\Enumerations\ContentStatuses;
use App\Enumerations\ModulesHandlerToId;
use App\Models\Content;
use App\Models\ContentHistory;
use App\Models\Template;
use Illuminate\Support\Facades\Event;
use Modules\StaticPages\Events\DeleteStaticPage;
use Modules\StaticPages\Events\EditStaticPage as EditStaticPageEvent;
use Modules\StaticPages\Events\MakeDraftFromStaticPage;
use Modules\StaticPages\Events\PublishStaticPage;
use Modules\StaticPages\Http\Requests\EditStaticPageRequest;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class EditStaticPage extends Controller
{
/**
* @var ContentHistory
*/
private $history;
public function __construct(ContentHistory $history)
{
$this->history = $history;
}
/**
* Display form for editing static page
*
* @param $id
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function getEdit($id)
{
// select all content statuses
$statuses = ContentStatuses::getWithTranslations();
// try to find requested page
$page = Content::where('module_handler', config('staticpages.handler'))
->findOrFail($id);
$allModules = ModulesHandlerToId::getWithTranslations();
$moduleId = $allModules[config('staticpages.handler')];
$templates = Template::where('module_id', $moduleId)
->select(['template_name', 'name', 'description'])
->get();
$history = $this->history->getStructuredHistoryOf($page);
// render view
return view('staticpages::admin.edit', [
'contentStatuses' => $statuses,
'page' => $page,
'templates' => $templates,
'historySize' => count($history['changesets'])
]);
}
/**
* Edit static page and save changes into history.
*
* @param EditStaticPageRequest $request
* @param $id
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postEdit(EditStaticPageRequest $request, $id)
{
try {
$page = Content::where('module_handler', config('staticpages.handler'))
->findOrFail($id);
} catch (NotFoundHttpException $e) {
// page for editing not found
return redirect()
->route('staticpage.overview')
->with('error', trans('staticpages::admin.invalidPage'));
}
// array of fields in database and fields from request
$fields = [
'title' => 'title',
'url' => 'url',
'template' => 'template',
'published_from' => 'publishedFrom',
'published_to' => 'publishedTo',
'meta_keywords' => 'metaKeywords',
'meta_description' => 'metaDescription',
'content' => 'pageContent',
'status' => 'status'
];
// save new values with history
list($revision, $changedColumns) = $page->updateWithHistory($fields, $request->all());
// was something changed?
if ($changedColumns == 0) {
return redirect()
->route('staticpage.edit', ['id' => $page->id])
->with('error', trans('staticpages::admin.nothingToEdit'));
}
// fire event with
Event::fire(new EditStaticPageEvent($page, $revision));
// something was changed, inform user
return redirect()
->route('staticpage.edit', ['id' => $page->id])
->with('success', trans('staticpages::admin.successfullyEdited'));
}
/**
* Method for changing page status
*
* This method is called in static page overview from quick actions. It checks if status is valid, if page exists
* and updates status.
*
* @param $id
* @param $status
*
* @return \Illuminate\Http\RedirectResponse
*/
public function changeStatus($id, $status)
{
// get possible statuses
$statuses = ContentStatuses::getWithTranslations();
unset($statuses[Content::STATUS_DELETED]);
// check if given status is valid
if (!isset($statuses[$status])) {
return redirect()
->route('staticpage.overview')
->with('error', trans('staticpages::admin.invalidStatus'));
}
try {
// try to find this page
$page = Content::where('module_handler', config('staticpages.handler'))
->findOrFail($id);
} catch (NotFoundHttpException $e) {
// page not found
return redirect()
->route('staticpage.overview')
->with('error', trans('staticpages::admin.invalidPage'));
}
// try to change the page
list ($revision, $changedColumns) = $page->updateWithHistory(['status' => 'status'], ['status' => $status]);
// was something changed?
if ($changedColumns == 0) {
return redirect()
->route('staticpage.edit', ['id' => $page->id])
->with('error', trans('staticpages::admin.nothingToEdit'));
}
// fire events
if ($status != Content::STATUS_DRAFT) {
Event::fire(new PublishStaticPage($page, $revision));
} else {
Event::fire(new MakeDraftFromStaticPage($page, $revision));
}
// redirect back to overview with info for user
return redirect()
->route('staticpage.overview')
->with('success', trans('staticpages::admin.statusChanged'));
}
/**
* Delete page
*
* @param $id
*
* @return \Illuminate\Http\RedirectResponse
*/
public function deletePage($id)
{
try {
// try to find this page
$page = Content::where('module_handler', config('staticpages.handler'))
->findOrFail($id);
} catch (NotFoundHttpException $e) {
// page not found
return redirect()
->route('staticpage.overview')
->with('error', trans('staticpages::admin.invalidPage'));
}
list ($revision, $changedColumns) = $page->updateWithHistory(['status' => 'status'], ['status' => Content::STATUS_DELETED]);
// was something changed?
if ($changedColumns == 0) {
return redirect()
->route('staticpage.edit', ['id' => $page->id])
->with('error', trans('staticpages::admin.nothingToEdit'));
}
// trigger delete event
Event::fire(new DeleteStaticPage($page, $revision));
// redirect back to overview with info for user
return redirect()
->route('staticpage.overview')
->with('success', trans('staticpages::admin.pageDeleted', [
'name' => $page->title,
'url' => $page->url
]));
}
}
modules/StaticPages/Http/Controllers/Admin/StaticPageOverview.php
-22
View File
@@ -1,22 +0,0 @@
<?php
namespace Modules\StaticPages\Http\Controllers\Admin;
use App\Enumerations\ContentStatuses;
use App\Models\Content;
class StaticPageOverview extends Controller
{
public function getOverview($perPage = 20, $status = null)
{
$model = new Content();
$pages = $model->getByType(config('staticpages.handler'), true);
// add filtering by status
if (!is_null($status) && in_array($status, ContentStatuses::getSimple())) {
$pages = $pages->where('status', $status);
}
$pages = $pages->paginate($perPage);
return view('staticpages::admin.overview', ['pages' => $pages]);
}
}
modules/StaticPages/Http/Controllers/StaticPagesController.php
-12
View File
@@ -1,12 +0,0 @@
<?php
namespace Modules\StaticPages\Http\Controllers;
use Pingpong\Modules\Routing\Controller;
class StaticPagesController extends Controller
{
public function index()
{
return view('staticpages::index');
}
}
modules/StaticPages/Http/Requests/CreateNewStaticPageRequest.php
-26
View File
@@ -1,26 +0,0 @@
<?php
namespace Modules\StaticPages\Http\Requests;
use App\Http\Requests\Request;
class CreateNewStaticPageRequest extends Request
{
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'title' => 'required',
'url' => 'required|unique:contents,url',
'template' => 'required|exists:templates,template_name',
'published_from' => 'date',
'published_to' => 'date',
'title_photo' => 'exists:files,id',
'module_settings' => 'json',
'status' => 'required|in:draft,protected,public'
];
}
}
modules/StaticPages/Http/Requests/EditStaticPageRequest.php
-30
View File
@@ -1,30 +0,0 @@
<?php
namespace Modules\StaticPages\Http\Requests;
use App\Enumerations\ContentStatuses;
use App\Http\Requests\Request;
class EditStaticPageRequest extends Request
{
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
// get all available statuses
$statuses = ContentStatuses::getSimple();
$statuses = implode(',', $statuses);
return [
'title' => 'required',
'url' => 'required|unique:contents,url,'.$this->id,
'template' => 'required|exists:templates,template_name',
'published_from' => 'date',
'published_to' => 'date',
'title_photo' => 'exists:files,id',
'status' => 'required|in:'.$statuses
];
}
}
modules/StaticPages/Http/routes.php
-53
View File
@@ -1,54 +1 @@
<?php
Route::group([
'middleware' => 'web',
'prefix' => 'page',
'namespace' => 'Modules\StaticPages\Http\Controllers'
], function () {
Route::get('/{url}', 'StaticPagesController@index');
});
// routes group for admin area
Route::group([
'middleware' => ['web', 'auth'],
'prefix' => 'admin/pages',
'namespace' => 'Modules\StaticPages\Http\Controllers\Admin'
], function () {
// list of all static pages
Route::get('overview', 'StaticPageOverview@getOverview')
->name('staticpage.overview');
// form for creating new static page
Route::get('new', 'CreateNewStaticPage@getNew')
->name('staticpage.new');
// form for editing existing static page
Route::get('edit/{id}', 'EditStaticPage@getEdit')
->name('staticpage.edit');
// post method for creating new static page
Route::post('new', 'CreateNewStaticPage@postNew')
->name('staticpage.newPost');
// post method for creating new static page
Route::post('edit/{id}', 'EditStaticPage@postEdit')
->name('staticpage.editPost');
// routes for quick actions
// change status of page (protected, public or draft)
Route::get('status/{id}/{status}', 'EditStaticPage@changeStatus')
->name('staticpage.changeStatus');
// delete page
Route::get('delete/{id}', 'EditStaticPage@deletePage')
->name('staticpage.delete');
// display change history of given page
// Route::get('history/{id}', 'StaticPageHistory@getHistory')->name('staticpage.history');
// Route::get('', '')->name('staticpage.');
});
modules/StaticPages/Providers/StaticPagesServiceProvider.php
+2 -5
View File
@@ -48,7 +48,7 @@ class StaticPagesServiceProvider extends ServiceProvider
protected function install()
{
$handler = config('staticpages.handler');
$installedModules = Modules::getWithTranslations();
$installedModules = ModulesHandlerToId::getWithTranslations();
if (!isset($installedModules[$handler])) {
// insert module into database
@@ -121,13 +121,10 @@ class StaticPagesServiceProvider extends ServiceProvider
*/
$registrator = $this->app->make('registerTemplateDir');
try {
$allModules = ModulesHandlerToId::getWithTranslations();
$moduleId = $allModules[config('staticpages.handler')];
// setup some global variables
$registrator->setBaseDirectory('resources/views/modules/staticpages/visitor');
$registrator->setNamespace('staticpages');
$registrator->setModuleId($moduleId);
$registrator->setModuleId(call_user_func([config('staticpages.handler'), 'getModuleId']));
// register path with current template name
$registrator->register(config('app.theme'), 'staticpages::admin.templatePath');
modules/StaticPages/Resources/lang/en/admin.php
+3 -32
View File
@@ -1,35 +1,6 @@
<?php
return [
'overview' => 'List of all static pages',
'new' => 'Create new static page',
'content' => 'Page content',
'save' => 'Save new page',
'basicInfo' => 'Basic information',
'metaOptions' => 'Meta information',
'publicationOptions' => 'Publication setup',
'field_title' => 'Page title',
'field_url' => 'URL',
'field_meta_keywords' => 'Keywords',
'field_meta_description' => 'Page description',
'field_published_from' => 'Published from',
'field_published_to' => 'Published to',
'successfullyCreated' => 'Page successfully created',
'noPagesAvailable' => 'No static pages available. Try to create one first.',
'viewPage' => 'View page on web',
'edit' => 'Edit page :name',
'deletePage' => 'Delete page (ireversible!)',
'makePublic' => 'Publish page',
'makeProtected' => 'Publish page only for logged users',
'makeDraft' => 'Disable page and make it draft',
'invalidStatus' => 'Cannot change status to something undefined.',
'statusChanged' => 'Status successfully changed.',
'invalidPage' => 'Specified page does not exist.',
'pageDeleted' => 'Page :name (:url) successfully deleted.',
'nothingToEdit' => 'You did not submit any changes. Nothing was edited.',
'successfullyEdited' => 'Edit successfull',
'showHistory' => 'History (:count)',
'templatePath' => 'Static pages',
'appearance' => 'Appearance',
'template' => 'Template of this page'
'overview' => 'List of all static pages',
'templatePath' => 'Static pages',
'new' => 'nova stranka'
];
modules/StaticPages/Resources/lang/en/adminMenu.php
+2 -2
View File
@@ -1,6 +1,6 @@
<?php
return [
'staticPages' => 'Static pages',
'new' => 'Create new',
'overview' => 'Overview'
'new' => 'Create new',
'overview' => 'Overview'
];