Unverified Commit b641a4ba authored by Viral Solani's avatar Viral Solani Committed by GitHub

Merge pull request #177 from indranshastri/develop

Refactoring Pages APIs
parents cdaf02b7 06a4273c
...@@ -106,7 +106,7 @@ class BlogCategoriesController extends APIController ...@@ -106,7 +106,7 @@ class BlogCategoriesController extends APIController
} }
/** /**
* validateUser Permission Requests. * validateUser BlogCategory Requests.
* *
* @param Request $request * @param Request $request
* *
......
...@@ -23,9 +23,9 @@ class PagesController extends APIController ...@@ -23,9 +23,9 @@ class PagesController extends APIController
} }
/** /**
* Return the users. * Return the pages.
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\JsonResponse
*/ */
public function index(Request $request) public function index(Request $request)
{ {
...@@ -39,9 +39,9 @@ class PagesController extends APIController ...@@ -39,9 +39,9 @@ class PagesController extends APIController
/** /**
* Return the specified resource. * Return the specified resource.
* *
* @param User $user * @param Pages $page
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\JsonResponse
*/ */
public function show(Page $page) public function show(Page $page)
{ {
...@@ -49,15 +49,15 @@ class PagesController extends APIController ...@@ -49,15 +49,15 @@ class PagesController extends APIController
} }
/** /**
* Creates the Resourse for Page. * Creates the Resource for Page.
* *
* @param Request $request * @param Request $request
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\JsonResponse
*/ */
public function store(Request $request) public function store(Request $request)
{ {
$validation = $this->validatingRequest($request); $validation = $this->validatePages($request);
if ($validation->fails()) { if ($validation->fails()) {
return $this->throwValidation($validation->messages()->first()); return $this->throwValidation($validation->messages()->first());
} }
...@@ -68,14 +68,16 @@ class PagesController extends APIController ...@@ -68,14 +68,16 @@ class PagesController extends APIController
} }
/** /**
* @param Page $page * Update Page.
* @param UpdatePageRequest $request *
* @param Page $page
* @param Request $request
* *
* @return mixed * @return \Illuminate\Http\JsonResponse
*/ */
public function update(Request $request, Page $page) public function update(Request $request, Page $page)
{ {
$validation = $this->validatingRequest($request); $validation = $this->validatePages($request, $page->id);
if ($validation->fails()) { if ($validation->fails()) {
return $this->throwValidation($validation->messages()->first()); return $this->throwValidation($validation->messages()->first());
...@@ -88,26 +90,41 @@ class PagesController extends APIController ...@@ -88,26 +90,41 @@ class PagesController extends APIController
return new PagesResource($page); return new PagesResource($page);
} }
public function validatingRequest(Request $request)
{
$validation = Validator::make($request->all(), [
'title' => 'required|max:191',
'description' => 'required',
]);
return $validation;
}
/** /**
* Delete Page.
*
* @param Page $page * @param Page $page
* @param DeletePageRequest $request * @param DeletePageRequest $request
* *
* @return mixed * @return \Illuminate\Http\JsonResponse
*/ */
public function destroy(Page $page, Request $request) public function destroy(Page $page, Request $request)
{ {
$this->repository->delete($page); $this->repository->delete($page);
return ['message'=>'success']; return $this->respond([
'message' => trans('alerts.backend.pages.deleted'),
]);
}
/**
* validateUser Pages Requests.
*
* @param Request $request
* @param int $id
*
* @return \Illuminate\Http\JsonResponse
*/
public function validatePages(Request $request,$id=0)
{
$validation = Validator::make($request->all(), [
'title' => 'required|max:191|unique:pages,title,'.$id,
'description' => 'required',
]);
return $validation;
} }
} }
...@@ -92,6 +92,8 @@ class PermissionController extends APIController ...@@ -92,6 +92,8 @@ class PermissionController extends APIController
} }
/** /**
* Delete permission
*
* @param Role $role * @param Role $role
* @param DeleteRoleRequest $request * @param DeleteRoleRequest $request
* *
......
...@@ -70,7 +70,7 @@ class RolesController extends APIController ...@@ -70,7 +70,7 @@ class RolesController extends APIController
} }
/** /**
* Update User. * Update Role.
* *
* @param Request $request * @param Request $request
* @param Role $role * @param Role $role
...@@ -93,6 +93,8 @@ class RolesController extends APIController ...@@ -93,6 +93,8 @@ class RolesController extends APIController
} }
/** /**
* Delete Role.
*
* @param Role $role * @param Role $role
* @param Request $request * @param Request $request
* *
......
...@@ -38,18 +38,18 @@ Route::group(['namespace' => 'Api\V1', 'prefix' => 'v1', 'as' => 'v1.'], functio ...@@ -38,18 +38,18 @@ Route::group(['namespace' => 'Api\V1', 'prefix' => 'v1', 'as' => 'v1.'], functio
Route::resource('permission', 'PermissionController', ['except' => ['create', 'edit']]); Route::resource('permission', 'PermissionController', ['except' => ['create', 'edit']]);
// Page // Page
Route::resource('pages', 'PagesController'); Route::resource('pages', 'PagesController', ['except' => ['create', 'edit']]);
// Faqs // Faqs
Route::resource('faqs', 'FaqsController'); Route::resource('faqs', 'FaqsController', ['except' => ['create', 'edit']]);
// Blog Categories // Blog Categories
Route::resource('blog_categories', 'BlogCategoriesController', ['except' => ['create', 'edit']]); Route::resource('blog_categories', 'BlogCategoriesController', ['except' => ['create', 'edit']]);
// Blog Tags // Blog Tags
Route::resource('blog_tags', 'BlogTagsController'); Route::resource('blog_tags', 'BlogTagsController', ['except' => ['create', 'edit']]);
// Blogs // Blogs
Route::resource('blogs', 'BlogsController'); Route::resource('blogs', 'BlogsController', ['except' => ['create', 'edit']]);
}); });
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment