Skip to content

Commit 4145207

Browse files
authored
Merge pull request #204 from viralsolani/develop
Merge Develop
2 parents 2f6984a + 0a5cd04 commit 4145207

File tree

11 files changed

+335
-129
lines changed

11 files changed

+335
-129
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
## Introduction
1010
* 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.
11-
* The project is taken to Laravel 5.5 so we can develop from the latest Laravel.
11+
* The project is taken to Laravel 5.6 so we can develop from the latest Laravel.
1212

1313
## Features
1414
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
2929

3030
## Installation
3131

32-
Please check the official laravel installation guide for server requirements before you start. [Official Documentation](https://laravel.com/docs/5.4/installation#installation)
32+
Please check the official laravel installation guide for server requirements before you start. [Official Documentation](https://laravel.com/docs/5.6/installation#installation)
3333

3434

3535
Clone the repository

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ public function store(Request $request)
6262
return $this->throwValidation($validation->messages()->first());
6363
}
6464

65-
$this->repository->create($request->all());
65+
$page = $this->repository->create($request->all());
6666

67-
return new PagesResource(Page::orderBy('created_at', 'desc')->first());
67+
return new PagesResource($page);
6868
}
6969

7070
/**

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace App\Http\Controllers\Api\V1;
44

5-
use App\Http\Requests\Backend\Access\User\ManageUserRequest;
65
use App\Http\Resources\UserResource;
76
use App\Models\Access\User\User;
87
use App\Repositories\Backend\Access\User\UserRepository;
@@ -30,7 +29,7 @@ public function __construct(UserRepository $repository)
3029
*
3130
* @return \Illuminate\Http\JsonResponse
3231
*/
33-
public function index(ManageUserRequest $request)
32+
public function index(Request $request)
3433
{
3534
$limit = $request->get('paginate') ? $request->get('paginate') : 25;
3635

app/Http/Middleware/VerifyCsrfToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ class VerifyCsrfToken extends BaseVerifier
1212
* @var array
1313
*/
1414
protected $except = [
15-
//
15+
'api/*',
1616
];
1717
}

app/Repositories/Backend/Pages/PagesRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function create(array $input)
5858
if ($page = Page::create($input)) {
5959
event(new PageCreated($page));
6060

61-
return true;
61+
return $page;
6262
}
6363

6464
throw new GeneralException(trans('exceptions.backend.pages.create_error'));

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"laravel/socialite": "^3.0",
2424
"laravel/tinker": "~1.0",
2525
"laravelcollective/html": "^5.4.0",
26-
"spatie/laravel-cors": "^1.1",
26+
"spatie/laravel-cors": "^1.2",
2727
"tymon/jwt-auth": "dev-develop",
2828
"unisharp/laravel-filemanager": "~1.8",
2929
"yajra/laravel-datatables-oracle": "~8.0"

0 commit comments

Comments
 (0)