Merge branch 'develop' of git://github.com/viralsolani/laravel-adminpanel into develop

app/Http/Controllers/Api/V1/BlogCategoriesController.php

@@ -29,9 +29,8 @@ class BlogCategoriesController extends APIController
      */
     public function index(Request $request)
     {
-
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
-       
+
         return BlogCategoriesResource::collection(
             $this->repository->getForDataTable()->paginate($limit)
         );
@@ -91,7 +90,6 @@ class BlogCategoriesController extends APIController
 
     public function validatingRequest(Request $request)
     {
-        
         $validation = Validator::make($request->all(), [
             'name' => 'required|max:191',
         ]);

app/Http/Controllers/Api/V1/FaqsController.php

@@ -29,9 +29,8 @@ class FaqsController extends APIController
      */
     public function index(Request $request)
     {
-
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
-       
+
         return FaqsResource::collection(
             $this->repository->getForDataTable()->paginate($limit)
         );
@@ -91,10 +90,9 @@ class FaqsController extends APIController
 
     public function validatingRequest(Request $request)
     {
-        
         $validation = Validator::make($request->all(), [
             'question' => 'required|max:191',
-            'answer' => 'required',
+            'answer'   => 'required',
         ]);
 
         return $validation;

app/Http/Controllers/Api/V1/PagesController.php

@@ -29,9 +29,8 @@ class PagesController extends APIController
      */
     public function index(Request $request)
     {
-
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
-       
+
         return PagesResource::collection(
             $this->repository->getForDataTable()->paginate($limit)
         );
@@ -91,9 +90,8 @@ class PagesController extends APIController
 
     public function validatingRequest(Request $request)
     {
-        
         $validation = Validator::make($request->all(), [
-            'title' => 'required|max:191',
+            'title'       => 'required|max:191',
             'description' => 'required',
         ]);
 

app/Http/Controllers/Api/V1/UsersController.php

@@ -56,19 +56,19 @@ class UsersController extends APIController
     /**
      * Return the specified resource.
      *
-     * @param Request 
+     * @param Request
      *
      * @return \Illuminate\Http\Response
      */
     public function deactivatedUserList(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
-        
+
         return UserResource::collection(
-            $this->repository->getForDataTable(0,false)->paginate($limit)
+            $this->repository->getForDataTable(0, false)->paginate($limit)
         );
     }
-    
+
     /**
      * Return the specified resource.
      *
@@ -79,11 +79,12 @@ class UsersController extends APIController
     public function deleteUserList(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
+
         return UserResource::collection(
             $this->repository->getForDataTable(0, true)->paginate($limit)
         );
     }
-        
+
     /**
      * Update the specified resource in storage.
      */

app/Http/Resources/BlogCategoriesResource.php

@@ -15,11 +15,10 @@ class BlogCategoriesResource extends Resource
      */
     public function toArray($request)
     {
-        
         return [
             'id'            => $this->id,
             'name'          => $this->name,
-            'status'        => ($this->isActive()) ? "Active" : "InActive",
+            'status'        => ($this->isActive()) ? 'Active' : 'InActive',
             'created_at'    => optional($this->created_at)->toDateString(),
             'created_by'    => (isset($this->creator)) ? optional($this->creator)->first_name : $this->user_name,
         ];

app/Http/Resources/FaqsResource.php

@@ -15,12 +15,11 @@ class FaqsResource extends Resource
      */
     public function toArray($request)
     {
-        
         return [
             'id'            => $this->id,
             'question'      => $this->question,
             'answer'        => $this->answer,
-            'status'        => ($this->isActive()) ? "Active" : "InActive",
+            'status'        => ($this->isActive()) ? 'Active' : 'InActive',
             'created_at'    => $this->created_at->toDateString(),
         ];
     }

app/Http/Resources/PagesResource.php

@@ -15,14 +15,13 @@ class PagesResource extends Resource
      */
     public function toArray($request)
     {
-        
         return [
             'id'            => $this->id,
             'title'         => $this->title,
             'status_label'  => $this->status_label,
-            'status'        => ($this->isActive())?"Active":"InActive",
+            'status'        => ($this->isActive()) ? 'Active' : 'InActive',
             'created_at'    => $this->created_at->toDateString(),
-            'created_by'    => is_int($this->created_by)?optional($this->owner)->first_name:$this->created_by,
+            'created_by'    => is_int($this->created_by) ? optional($this->owner)->first_name : $this->created_by,
         ];
     }
 }

routes/api.php

@@ -34,7 +34,7 @@ Route::group(['namespace' => 'Api\V1', 'prefix' => 'v1', 'as' => 'v1.'], functio
             Route::get('deleteUsers', 'UsersController@deleteUserList');
         });
         Route::resource('users', 'UsersController');
-      
+
         // Roles
         Route::resource('roles', 'RolesController');
         // Permission
@@ -42,7 +42,7 @@ Route::group(['namespace' => 'Api\V1', 'prefix' => 'v1', 'as' => 'v1.'], functio
 
         // Page
         Route::resource('pages', 'PagesController');
-        
+
         // Faqs
         Route::resource('faqs', 'FaqsController');