Commit 8864ca1a authored by Vipul Basapati's avatar Vipul Basapati

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

parents 09c55736 597c4baa
...@@ -54,6 +54,9 @@ Generate a new application key ...@@ -54,6 +54,9 @@ Generate a new application key
php artisan key:generate php artisan key:generate
Generate a new JWT secret key (If you want to use API)
php artisan jwt:secret
Generate a new JWT authentication secret key Generate a new JWT authentication secret key
php artisan jwt:secret php artisan jwt:secret
...@@ -79,7 +82,7 @@ For generating the files of unisharp file manager ...@@ -79,7 +82,7 @@ For generating the files of unisharp file manager
php artisan vendor:publish --tag=lfm_public php artisan vendor:publish --tag=lfm_public
For linking storage folder in public For linking storage folder in public
php artisan storage:link php artisan storage:link
Start the local development server Start the local development server
......
...@@ -32,9 +32,11 @@ class BlogCategoriesController extends APIController ...@@ -32,9 +32,11 @@ class BlogCategoriesController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return BlogCategoriesResource::collection( return BlogCategoriesResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -30,9 +30,11 @@ class BlogTagsController extends APIController ...@@ -30,9 +30,11 @@ class BlogTagsController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return BlogTagsResource::collection( return BlogTagsResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -30,9 +30,11 @@ class BlogsController extends APIController ...@@ -30,9 +30,11 @@ class BlogsController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return BlogsResource::collection( return BlogsResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -30,9 +30,11 @@ class DeactivatedUsersController extends APIController ...@@ -30,9 +30,11 @@ class DeactivatedUsersController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return UserResource::collection( return UserResource::collection(
$this->repository->getForDataTable(0, false)->paginate($limit) $this->repository->getForDataTable(0, false)->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
} }
...@@ -30,9 +30,11 @@ class DeletedUsersController extends APIController ...@@ -30,9 +30,11 @@ class DeletedUsersController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return UserResource::collection( return UserResource::collection(
$this->repository->getForDataTable(0, true)->paginate($limit) $this->repository->getForDataTable(0, true)->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
} }
...@@ -30,9 +30,11 @@ class FaqsController extends APIController ...@@ -30,9 +30,11 @@ class FaqsController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return FaqsResource::collection( return FaqsResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -30,9 +30,11 @@ class PagesController extends APIController ...@@ -30,9 +30,11 @@ class PagesController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return PagesResource::collection( return PagesResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -32,9 +32,11 @@ class PermissionController extends APIController ...@@ -32,9 +32,11 @@ class PermissionController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return PermissionResource::collection( return PermissionResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
...@@ -104,6 +106,7 @@ class PermissionController extends APIController ...@@ -104,6 +106,7 @@ class PermissionController extends APIController
$this->repository->delete($permission); $this->repository->delete($permission);
return $this->respond([ return $this->respond([
'data' => $permission->id,
'message' => trans('alerts.backend.permissions.deleted'), 'message' => trans('alerts.backend.permissions.deleted'),
]); ]);
} }
......
...@@ -32,9 +32,11 @@ class RolesController extends APIController ...@@ -32,9 +32,11 @@ class RolesController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return RoleResource::collection( return RoleResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
...@@ -60,6 +62,7 @@ class RolesController extends APIController ...@@ -60,6 +62,7 @@ class RolesController extends APIController
public function store(Request $request) public function store(Request $request)
{ {
$validation = $this->validateRole($request); $validation = $this->validateRole($request);
if ($validation->fails()) { if ($validation->fails()) {
return $this->throwValidation($validation->messages()->first()); return $this->throwValidation($validation->messages()->first());
} }
...@@ -105,6 +108,7 @@ class RolesController extends APIController ...@@ -105,6 +108,7 @@ class RolesController extends APIController
$this->repository->delete($role); $this->repository->delete($role);
return $this->respond([ return $this->respond([
'data' => $role->id,
'message' => trans('alerts.backend.roles.deleted'), 'message' => trans('alerts.backend.roles.deleted'),
]); ]);
} }
......
...@@ -32,9 +32,11 @@ class UsersController extends APIController ...@@ -32,9 +32,11 @@ class UsersController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return UserResource::collection( return UserResource::collection(
$this->repository->getForDataTable(1, false)->paginate($limit) $this->repository->getForDataTable(1, false)->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
...@@ -106,6 +108,7 @@ class UsersController extends APIController ...@@ -106,6 +108,7 @@ class UsersController extends APIController
$this->repository->delete($user); $this->repository->delete($user);
return $this->respond([ return $this->respond([
'data' => $user->id,
'message' => trans('alerts.backend.users.deleted'), 'message' => trans('alerts.backend.users.deleted'),
]); ]);
} }
......
<?php
namespace App\Http\Middleware;
use Closure;
use JWTAuth;
use Tymon\JWTAuth\Exceptions\JWTException;
class VerifyJWTToken
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
{
try {
$user = JWTAuth::parseToken()->authenticate();
} catch (JWTException $e) {
if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) {
return response()->json(['token_expired'], $e->getStatusCode());
} elseif ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) {
return response()->json(['token_invalid'], $e->getStatusCode());
} else {
return response()->json(['error' => 'Token is required']);
}
}
return $next($request);
}
}
...@@ -20,8 +20,8 @@ class PermissionResource extends Resource ...@@ -20,8 +20,8 @@ class PermissionResource extends Resource
'name' => $this->name, 'name' => $this->name,
'display_name' => $this->display_name, 'display_name' => $this->display_name,
'sort' => $this->sort, 'sort' => $this->sort,
'registered_at' => $this->created_at->toIso8601String(), 'created_at' => $this->created_at->toIso8601String(),
'last_updated_at' => $this->updated_at->toIso8601String(), 'updated_at' => $this->updated_at->toIso8601String(),
]; ];
} }
......
...@@ -18,12 +18,12 @@ class RoleResource extends Resource ...@@ -18,12 +18,12 @@ class RoleResource extends Resource
return [ return [
'id' => $this->id, 'id' => $this->id,
'name' => $this->name, 'name' => $this->name,
'permission' => ($this->all) ? 'All' : optional($this->permissions)->pluck('display_name'), 'permissions' => ($this->all) ? 'All' : optional($this->permissions)->pluck('display_name'),
'noofuses' => $this->users->count(), 'number_of_users' => $this->users->count(),
'sort' => $this->sort, 'sort' => $this->sort,
'status' => $this->status, 'status' => $this->status,
'registered_at' => $this->created_at->toIso8601String(), 'created_at' => $this->created_at->toIso8601String(),
'last_updated_at' => $this->updated_at->toIso8601String(), 'updated_at' => $this->updated_at->toIso8601String(),
]; ];
} }
} }
...@@ -25,8 +25,8 @@ class UserResource extends Resource ...@@ -25,8 +25,8 @@ class UserResource extends Resource
'role' => optional($this->roles()->first())->name, 'role' => optional($this->roles()->first())->name,
'permissions' => $this->permissions()->get(), 'permissions' => $this->permissions()->get(),
'status' => $this->status, 'status' => $this->status,
'registered_at' => $this->created_at->toIso8601String(), 'created_at' => $this->created_at->toIso8601String(),
'last_updated_at' => $this->updated_at->toIso8601String(), 'updated_at' => $this->updated_at->toIso8601String(),
]; ];
} }
} }
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "7de0f651e0b9ca6ad95d58c8409c7a1a", "content-hash": "1ff0891115bc89c4dcca27e33644c3cf",
"packages": [ "packages": [
{ {
"name": "arcanedev/log-viewer", "name": "arcanedev/log-viewer",
...@@ -2208,16 +2208,16 @@ ...@@ -2208,16 +2208,16 @@
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
"version": "v2.0.15", "version": "v2.0.17",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paragonie/random_compat.git", "url": "https://github.com/paragonie/random_compat.git",
"reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09" "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09", "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
"reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09", "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2253,7 +2253,7 @@ ...@@ -2253,7 +2253,7 @@
"pseudorandom", "pseudorandom",
"random" "random"
], ],
"time": "2018-06-08T15:26:40+00:00" "time": "2018-07-04T16:31:37+00:00"
}, },
{ {
"name": "psr/container", "name": "psr/container",
...@@ -2662,16 +2662,16 @@ ...@@ -2662,16 +2662,16 @@
}, },
{ {
"name": "swiftmailer/swiftmailer", "name": "swiftmailer/swiftmailer",
"version": "v6.0.2", "version": "v6.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git", "url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "412333372fb6c8ffb65496a2bbd7321af75733fc" "reference": "aa899fef280b1c1aec8d5d4ac069af7f80c89a23"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/412333372fb6c8ffb65496a2bbd7321af75733fc", "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/aa899fef280b1c1aec8d5d4ac069af7f80c89a23",
"reference": "412333372fb6c8ffb65496a2bbd7321af75733fc", "reference": "aa899fef280b1c1aec8d5d4ac069af7f80c89a23",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2682,10 +2682,14 @@ ...@@ -2682,10 +2682,14 @@
"mockery/mockery": "~0.9.1", "mockery/mockery": "~0.9.1",
"symfony/phpunit-bridge": "~3.3@dev" "symfony/phpunit-bridge": "~3.3@dev"
}, },
"suggest": {
"ext-intl": "Needed to support internationalized email addresses",
"true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "6.0-dev" "dev-master": "6.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2707,26 +2711,26 @@ ...@@ -2707,26 +2711,26 @@
} }
], ],
"description": "Swiftmailer, free feature-rich PHP mailer", "description": "Swiftmailer, free feature-rich PHP mailer",
"homepage": "http://swiftmailer.symfony.com", "homepage": "https://swiftmailer.symfony.com",
"keywords": [ "keywords": [
"email", "email",
"mail", "mail",
"mailer" "mailer"
], ],
"time": "2017-09-30T22:39:41+00:00" "time": "2018-07-04T11:12:44+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "2d5d973bf9933d46802b01010bd25c800c87c242" "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/2d5d973bf9933d46802b01010bd25c800c87c242", "url": "https://api.github.com/repos/symfony/console/zipball/70591cda56b4b47c55776ac78e157c4bb6c8b43f",
"reference": "2d5d973bf9933d46802b01010bd25c800c87c242", "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2781,11 +2785,11 @@ ...@@ -2781,11 +2785,11 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-05-30T07:26:09+00:00" "time": "2018-05-31T10:17:53+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
...@@ -2838,16 +2842,16 @@ ...@@ -2838,16 +2842,16 @@
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "449f8b00b28ab6e6912c3e6b920406143b27193b" "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/449f8b00b28ab6e6912c3e6b920406143b27193b", "url": "https://api.github.com/repos/symfony/debug/zipball/dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
"reference": "449f8b00b28ab6e6912c3e6b920406143b27193b", "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2890,11 +2894,11 @@ ...@@ -2890,11 +2894,11 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-05-16T14:33:22+00:00" "time": "2018-06-08T09:39:36+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
...@@ -2957,16 +2961,16 @@ ...@@ -2957,16 +2961,16 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "087e2ee0d74464a4c6baac4e90417db7477dc238" "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/087e2ee0d74464a4c6baac4e90417db7477dc238", "url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb",
"reference": "087e2ee0d74464a4c6baac4e90417db7477dc238", "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3002,20 +3006,20 @@ ...@@ -3002,20 +3006,20 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-05-16T14:33:22+00:00" "time": "2018-06-19T21:38:16+00:00"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "a916c88390fb861ee21f12a92b107d51bb68af99" "reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/a916c88390fb861ee21f12a92b107d51bb68af99", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
"reference": "a916c88390fb861ee21f12a92b107d51bb68af99", "reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3056,20 +3060,20 @@ ...@@ -3056,20 +3060,20 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-05-25T14:55:38+00:00" "time": "2018-06-19T21:38:16+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "b5ab9d4cdbfd369083744b6b5dfbf454e31e5f90" "reference": "29c094a1c4f8209b7e033f612cbbd69029e38955"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/b5ab9d4cdbfd369083744b6b5dfbf454e31e5f90", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/29c094a1c4f8209b7e033f612cbbd69029e38955",
"reference": "b5ab9d4cdbfd369083744b6b5dfbf454e31e5f90", "reference": "29c094a1c4f8209b7e033f612cbbd69029e38955",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3077,13 +3081,13 @@ ...@@ -3077,13 +3081,13 @@
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/debug": "~3.4|~4.0", "symfony/debug": "~3.4|~4.0",
"symfony/event-dispatcher": "~4.1", "symfony/event-dispatcher": "~4.1",
"symfony/http-foundation": "~4.1", "symfony/http-foundation": "^4.1.1",
"symfony/polyfill-ctype": "~1.8" "symfony/polyfill-ctype": "~1.8"
}, },
"conflict": { "conflict": {
"symfony/config": "<3.4", "symfony/config": "<3.4",
"symfony/dependency-injection": "<4.1", "symfony/dependency-injection": "<4.1",
"symfony/var-dumper": "<4.1", "symfony/var-dumper": "<4.1.1",
"twig/twig": "<1.34|<2.4,>=2" "twig/twig": "<1.34|<2.4,>=2"
}, },
"provide": { "provide": {
...@@ -3104,7 +3108,7 @@ ...@@ -3104,7 +3108,7 @@
"symfony/stopwatch": "~3.4|~4.0", "symfony/stopwatch": "~3.4|~4.0",
"symfony/templating": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0",
"symfony/translation": "~3.4|~4.0", "symfony/translation": "~3.4|~4.0",
"symfony/var-dumper": "~4.1" "symfony/var-dumper": "^4.1.1"
}, },
"suggest": { "suggest": {
"symfony/browser-kit": "", "symfony/browser-kit": "",
...@@ -3143,7 +3147,7 @@ ...@@ -3143,7 +3147,7 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-05-30T12:52:34+00:00" "time": "2018-06-25T13:06:45+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
...@@ -3424,16 +3428,16 @@ ...@@ -3424,16 +3428,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "73445bd33b0d337c060eef9652b94df72b6b3434" "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/73445bd33b0d337c060eef9652b94df72b6b3434", "url": "https://api.github.com/repos/symfony/process/zipball/1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
"reference": "73445bd33b0d337c060eef9652b94df72b6b3434", "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3469,20 +3473,20 @@ ...@@ -3469,20 +3473,20 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-05-30T07:26:09+00:00" "time": "2018-05-31T10:17:53+00:00"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "180b51c66d10f09e562c9ebc395b39aacb2cf8a2" "reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/180b51c66d10f09e562c9ebc395b39aacb2cf8a2", "url": "https://api.github.com/repos/symfony/routing/zipball/b38b9797327b26ea2e4146a40e6e2dc9820a6932",
"reference": "180b51c66d10f09e562c9ebc395b39aacb2cf8a2", "reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3495,7 +3499,6 @@ ...@@ -3495,7 +3499,6 @@
}, },
"require-dev": { "require-dev": {
"doctrine/annotations": "~1.0", "doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~3.4|~4.0", "symfony/config": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0",
...@@ -3547,20 +3550,20 @@ ...@@ -3547,20 +3550,20 @@
"uri", "uri",
"url" "url"
], ],
"time": "2018-05-30T07:26:09+00:00" "time": "2018-06-19T21:38:16+00:00"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a" "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/16328f5b217cebc8dd4adfe4aeeaa8c377581f5a", "url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
"reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a", "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3616,20 +3619,20 @@ ...@@ -3616,20 +3619,20 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-05-30T07:26:09+00:00" "time": "2018-06-22T08:59:39+00:00"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "bc88ad53e825ebacc7b190bbd360781fce381c64" "reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/bc88ad53e825ebacc7b190bbd360781fce381c64", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
"reference": "bc88ad53e825ebacc7b190bbd360781fce381c64", "reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3691,7 +3694,7 @@ ...@@ -3691,7 +3694,7 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2018-04-29T07:56:09+00:00" "time": "2018-06-23T12:23:56+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
...@@ -3742,16 +3745,16 @@ ...@@ -3742,16 +3745,16 @@
}, },
{ {
"name": "tymon/jwt-auth", "name": "tymon/jwt-auth",
"version": "dev-develop", "version": "1.0.0-rc.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/tymondesigns/jwt-auth.git", "url": "https://github.com/tymondesigns/jwt-auth.git",
"reference": "6e419252cc592afc2ed4cd61be6f5e303a636cc5" "reference": "d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/6e419252cc592afc2ed4cd61be6f5e303a636cc5", "url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b",
"reference": "6e419252cc592afc2ed4cd61be6f5e303a636cc5", "reference": "d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3813,20 +3816,20 @@ ...@@ -3813,20 +3816,20 @@
"jwt", "jwt",
"laravel" "laravel"
], ],
"time": "2018-06-19T20:04:27+00:00" "time": "2018-02-07T20:55:14+00:00"
}, },
{ {
"name": "unisharp/laravel-filemanager", "name": "unisharp/laravel-filemanager",
"version": "v1.8.4", "version": "v1.9.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/UniSharp/laravel-filemanager.git", "url": "https://github.com/UniSharp/laravel-filemanager.git",
"reference": "ccbba303a3a66a9706b50c98923af12e2f9ac02a" "reference": "aaf2764f26eb8dcc9356bea1e25010333c2e61f4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/UniSharp/laravel-filemanager/zipball/ccbba303a3a66a9706b50c98923af12e2f9ac02a", "url": "https://api.github.com/repos/UniSharp/laravel-filemanager/zipball/aaf2764f26eb8dcc9356bea1e25010333c2e61f4",
"reference": "ccbba303a3a66a9706b50c98923af12e2f9ac02a", "reference": "aaf2764f26eb8dcc9356bea1e25010333c2e61f4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3852,14 +3855,14 @@ ...@@ -3852,14 +3855,14 @@
"extra": { "extra": {
"laravel": { "laravel": {
"providers": [ "providers": [
"Unisharp\\Laravelfilemanager\\LaravelFilemanagerServiceProvider" "UniSharp\\LaravelFilemanager\\LaravelFilemanagerServiceProvider"
], ],
"aliases": [] "aliases": []
} }
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Unisharp\\Laravelfilemanager\\": "src/" "UniSharp\\LaravelFilemanager\\": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -3887,32 +3890,32 @@ ...@@ -3887,32 +3890,32 @@
"tinymce", "tinymce",
"upload" "upload"
], ],
"time": "2017-12-28T09:23:53+00:00" "time": "2018-07-05T11:36:08+00:00"
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
"version": "v2.4.0", "version": "v2.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vlucas/phpdotenv.git", "url": "https://github.com/vlucas/phpdotenv.git",
"reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c" "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
"reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.9" "php": ">=5.3.9"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8 || ^5.0" "phpunit/phpunit": "^4.8.35 || ^5.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.4-dev" "dev-master": "2.5-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3922,7 +3925,7 @@ ...@@ -3922,7 +3925,7 @@
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"BSD-3-Clause-Attribution" "BSD-3-Clause"
], ],
"authors": [ "authors": [
{ {
...@@ -3937,7 +3940,7 @@ ...@@ -3937,7 +3940,7 @@
"env", "env",
"environment" "environment"
], ],
"time": "2016-09-01T10:05:43+00:00" "time": "2018-07-01T10:25:50+00:00"
}, },
{ {
"name": "yajra/laravel-datatables-oracle", "name": "yajra/laravel-datatables-oracle",
...@@ -5913,7 +5916,7 @@ ...@@ -5913,7 +5916,7 @@
}, },
{ {
"name": "symfony/dom-crawler", "name": "symfony/dom-crawler",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dom-crawler.git", "url": "https://github.com/symfony/dom-crawler.git",
...@@ -5970,7 +5973,7 @@ ...@@ -5970,7 +5973,7 @@
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v4.1.0", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
...@@ -6227,7 +6230,7 @@ ...@@ -6227,7 +6230,7 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"tymon/jwt-auth": 20 "tymon/jwt-auth": 5
}, },
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
......
<?php <?php
/* /*
......
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