From aedd5127cbda8d33480544b6328087350851c7b3 Mon Sep 17 00:00:00 2001 From: Sanjay Date: Thu, 5 May 2022 16:32:33 +0530 Subject: [PATCH 1/3] Issue #6357 fixed --- .../Admin/src/DataGrids/CMSPageDataGrid.php | 11 ++++++++-- .../Shop/PagePresenterController.php | 20 +++++++++++++++++++ .../Shop/src/Routes/store-front-routes.php | 4 ++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php index 992b3596a..81eae7e67 100644 --- a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php @@ -57,20 +57,27 @@ class CMSPageDataGrid extends DataGrid public function prepareActions() { + $this->addAction([ + 'title' => trans('admin::app.datagrid.view'), + 'method' => 'GET', + 'route' => 'shop.cms.view.front', + 'icon' => 'icon eye-icon', + ]); + $this->addAction([ 'title' => trans('admin::app.datagrid.edit'), 'method' => 'GET', 'route' => 'admin.cms.edit', 'icon' => 'icon pencil-lg-icon', ]); - + $this->addAction([ 'title' => trans('admin::app.datagrid.delete'), 'method' => 'POST', 'route' => 'admin.cms.delete', 'icon' => 'icon trash-icon', ]); - } + } public function prepareMassActions() { diff --git a/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php b/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php index 1c8eecb08..e97ee5a28 100644 --- a/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php +++ b/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php @@ -15,6 +15,7 @@ class PagePresenterController extends Controller */ public function __construct(protected CmsRepository $cmsRepository) { + $this->_config = request('_config'); } /** @@ -29,4 +30,23 @@ class PagePresenterController extends Controller return view('shop::cms.page')->with('page', $page); } + + /** + * Preview the CMS page from datagrid. + * + * @param int $id + * @return \Illuminate\View\View + */ + public function view($id) + { + $page = $this->cmsRepository->findOrFail($id); + + request()->merge(['url_key' => $page->url_key]); + + if (is_null($page)) { + abort(404); + } + + return view($this->_config['view'], compact('page')); + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Routes/store-front-routes.php b/packages/Webkul/Shop/src/Routes/store-front-routes.php index 369f24361..f752f3bba 100644 --- a/packages/Webkul/Shop/src/Routes/store-front-routes.php +++ b/packages/Webkul/Shop/src/Routes/store-front-routes.php @@ -24,6 +24,10 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function */ Route::get('page/{slug}', [PagePresenterController::class, 'presenter'])->name('shop.cms.page'); + Route::get('preview/{id}', [PagePresenterController::class, 'view'])->defaults('_config', [ + 'view' => 'shop::cms.page', + ])->name('shop.cms.view.front'); + /** * Fallback route. */ From ed8d56749b44a2e76a532dbc2b7c237dba900db9 Mon Sep 17 00:00:00 2001 From: Sanjay Date: Mon, 9 May 2022 12:56:12 +0530 Subject: [PATCH 2/3] Changes-complete --- .../Admin/src/DataGrids/CMSPageDataGrid.php | 4 +++- .../Shop/PagePresenterController.php | 20 ------------------- .../Shop/src/Routes/store-front-routes.php | 4 ---- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php index 81eae7e67..b4cbd7bf9 100644 --- a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php @@ -60,8 +60,10 @@ class CMSPageDataGrid extends DataGrid $this->addAction([ 'title' => trans('admin::app.datagrid.view'), 'method' => 'GET', - 'route' => 'shop.cms.view.front', + 'route' => 'shop.cms.page', + 'index' => 'url_key', 'icon' => 'icon eye-icon', + ]); $this->addAction([ diff --git a/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php b/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php index e97ee5a28..1c8eecb08 100644 --- a/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php +++ b/packages/Webkul/CMS/src/Http/Controllers/Shop/PagePresenterController.php @@ -15,7 +15,6 @@ class PagePresenterController extends Controller */ public function __construct(protected CmsRepository $cmsRepository) { - $this->_config = request('_config'); } /** @@ -30,23 +29,4 @@ class PagePresenterController extends Controller return view('shop::cms.page')->with('page', $page); } - - /** - * Preview the CMS page from datagrid. - * - * @param int $id - * @return \Illuminate\View\View - */ - public function view($id) - { - $page = $this->cmsRepository->findOrFail($id); - - request()->merge(['url_key' => $page->url_key]); - - if (is_null($page)) { - abort(404); - } - - return view($this->_config['view'], compact('page')); - } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Routes/store-front-routes.php b/packages/Webkul/Shop/src/Routes/store-front-routes.php index f752f3bba..369f24361 100644 --- a/packages/Webkul/Shop/src/Routes/store-front-routes.php +++ b/packages/Webkul/Shop/src/Routes/store-front-routes.php @@ -24,10 +24,6 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function */ Route::get('page/{slug}', [PagePresenterController::class, 'presenter'])->name('shop.cms.page'); - Route::get('preview/{id}', [PagePresenterController::class, 'view'])->defaults('_config', [ - 'view' => 'shop::cms.page', - ])->name('shop.cms.view.front'); - /** * Fallback route. */ From acadccebe0742752f7b3d97bbe2f87a7da817c34 Mon Sep 17 00:00:00 2001 From: Devansh <68321766+devansh-webkul@users.noreply.github.com> Date: Mon, 9 May 2022 17:17:08 +0530 Subject: [PATCH 3/3] Update CMSPageDataGrid.php --- packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php index b4cbd7bf9..ee1ad666e 100644 --- a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php @@ -63,7 +63,6 @@ class CMSPageDataGrid extends DataGrid 'route' => 'shop.cms.page', 'index' => 'url_key', 'icon' => 'icon eye-icon', - ]); $this->addAction([ @@ -90,4 +89,4 @@ class CMSPageDataGrid extends DataGrid 'method' => 'POST', ]); } -} \ No newline at end of file +}