Merge pull request #204 from viralsolani/develop

Merge Develop
FTXInfotech · Apr 12, 2018 · 4145207 · 4145207
2 parents 2f6984a + 0a5cd04
commit 4145207
Show file tree

Hide file tree

Showing 11 changed files with 335 additions and 129 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 ## Introduction
 * This is a laravel Admin Panel, based on [Rappasoft Laravel Boilerplate](https://github.com/rappasoft/laravel-5-boilerplate/releases/tag/4.5.7), with enhancemenets and many modules pre-made, just for you.
-* The project is taken to Laravel 5.5 so we can develop from the latest Laravel.
+* The project is taken to Laravel 5.6 so we can develop from the latest Laravel.
 
 ## Features
 For Laravel 5 Boilerplate Features : [Features](https://github.com/rappasoft/laravel-5-boilerplate/wiki#features)
@@ -29,7 +29,7 @@ It gives you the ability to create a module using a sweet GUI, where you put in
 
 ## Installation
 
-Please check the official laravel installation guide for server requirements before you start. [Official Documentation](https://laravel.com/docs/5.4/installation#installation)
+Please check the official laravel installation guide for server requirements before you start. [Official Documentation](https://laravel.com/docs/5.6/installation#installation)
 
 
 Clone the repository

diff --git a/app/Http/Controllers/Api/V1/PagesController.php b/app/Http/Controllers/Api/V1/PagesController.php
@@ -62,9 +62,9 @@ public function store(Request $request)
             return $this->throwValidation($validation->messages()->first());
         }
 
-        $this->repository->create($request->all());
+        $page = $this->repository->create($request->all());
 
-        return new PagesResource(Page::orderBy('created_at', 'desc')->first());
+        return new PagesResource($page);
     }
 
     /**

diff --git a/app/Http/Controllers/Api/V1/UsersController.php b/app/Http/Controllers/Api/V1/UsersController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Http\Requests\Backend\Access\User\ManageUserRequest;
 use App\Http\Resources\UserResource;
 use App\Models\Access\User\User;
 use App\Repositories\Backend\Access\User\UserRepository;
@@ -30,7 +29,7 @@ public function __construct(UserRepository $repository)
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function index(ManageUserRequest $request)
+    public function index(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
 

diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
@@ -12,6 +12,6 @@ class VerifyCsrfToken extends BaseVerifier
      * @var array
      */
     protected $except = [
-        //
+        'api/*',
     ];
 }
diff --git a/app/Repositories/Backend/Pages/PagesRepository.php b/app/Repositories/Backend/Pages/PagesRepository.php
@@ -58,7 +58,7 @@ public function create(array $input)
         if ($page = Page::create($input)) {
             event(new PageCreated($page));
 
-            return true;
+            return $page;
         }
 
         throw new GeneralException(trans('exceptions.backend.pages.create_error'));

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "laravel/socialite": "^3.0",
         "laravel/tinker": "~1.0",
         "laravelcollective/html": "^5.4.0",
-        "spatie/laravel-cors": "^1.1",
+        "spatie/laravel-cors": "^1.2",
         "tymon/jwt-auth": "dev-develop",
         "unisharp/laravel-filemanager": "~1.8",
         "yajra/laravel-datatables-oracle": "~8.0"