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

README.md

@@ -54,6 +54,9 @@ Generate a new application key
 
     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
 
     php artisan jwt:secret
@@ -79,7 +82,7 @@ For generating the files of unisharp file manager
     php artisan vendor:publish --tag=lfm_public
 
 For linking storage folder in public
-    
+
     php artisan storage:link
 
 Start the local development server

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

@@ -32,9 +32,11 @@ class BlogCategoriesController extends APIController
     public function index(Request $request)
     {
         $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(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 

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

@@ -30,9 +30,11 @@ class BlogTagsController extends APIController
     public function index(Request $request)
     {
         $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(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 

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

@@ -30,9 +30,11 @@ class BlogsController extends APIController
     public function index(Request $request)
     {
         $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(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 

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

@@ -30,9 +30,11 @@ class DeactivatedUsersController extends APIController
     public function index(Request $request)
     {
         $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(
-            $this->repository->getForDataTable(0, false)->paginate($limit)
+            $this->repository->getForDataTable(0, false)->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 }

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

@@ -30,9 +30,11 @@ class DeletedUsersController extends APIController
     public function index(Request $request)
     {
         $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(
-            $this->repository->getForDataTable(0, true)->paginate($limit)
+            $this->repository->getForDataTable(0, true)->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 }

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

@@ -30,9 +30,11 @@ class FaqsController extends APIController
     public function index(Request $request)
     {
         $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(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 

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

@@ -30,9 +30,11 @@ class PagesController extends APIController
     public function index(Request $request)
     {
         $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(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 

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

@@ -32,9 +32,11 @@ class PermissionController extends APIController
     public function index(Request $request)
     {
         $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(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 
@@ -104,6 +106,7 @@ class PermissionController extends APIController
         $this->repository->delete($permission);
 
         return $this->respond([
+            'data'    => $permission->id,
             'message' => trans('alerts.backend.permissions.deleted'),
         ]);
     }

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

@@ -32,9 +32,11 @@ class RolesController extends APIController
     public function index(Request $request)
     {
         $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(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 
@@ -60,6 +62,7 @@ class RolesController extends APIController
     public function store(Request $request)
     {
         $validation = $this->validateRole($request);
+
         if ($validation->fails()) {
             return $this->throwValidation($validation->messages()->first());
         }
@@ -105,6 +108,7 @@ class RolesController extends APIController
         $this->repository->delete($role);
 
         return $this->respond([
+            'data'    => $role->id,
             'message' => trans('alerts.backend.roles.deleted'),
         ]);
     }

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

@@ -32,9 +32,11 @@ class UsersController extends APIController
     public function index(Request $request)
     {
         $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(
-            $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
         $this->repository->delete($user);
 
         return $this->respond([
+            'data'      => $user->id,
             'message'   => trans('alerts.backend.users.deleted'),
         ]);
     }

app/Http/Middleware/VerifyJWTToken.php

-<?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);
-    }
-}

app/Http/Resources/PermissionResource.php

@@ -20,8 +20,8 @@ class PermissionResource extends Resource
             'name'              => $this->name,
             'display_name'      => $this->display_name,
             'sort'              => $this->sort,
-            'registered_at'     => $this->created_at->toIso8601String(),
-            'last_updated_at'   => $this->updated_at->toIso8601String(),
+            'created_at'        => $this->created_at->toIso8601String(),
+            'updated_at'        => $this->updated_at->toIso8601String(),
 
         ];
     }

app/Http/Resources/RoleResource.php

@@ -18,12 +18,12 @@ class RoleResource extends Resource
         return [
             'id'                => $this->id,
             'name'              => $this->name,
-            'permission'        => ($this->all) ? 'All' : optional($this->permissions)->pluck('display_name'),
-            'noofuses'          => $this->users->count(),
+            'permissions'       => ($this->all) ? 'All' : optional($this->permissions)->pluck('display_name'),
+            'number_of_users'   => $this->users->count(),
             'sort'              => $this->sort,
             'status'            => $this->status,
-            'registered_at'     => $this->created_at->toIso8601String(),
-            'last_updated_at'   => $this->updated_at->toIso8601String(),
+            'created_at'        => $this->created_at->toIso8601String(),
+            'updated_at'        => $this->updated_at->toIso8601String(),
         ];
     }
 }

app/Http/Resources/UserResource.php

@@ -25,8 +25,8 @@ class UserResource extends Resource
             'role'            => optional($this->roles()->first())->name,
             'permissions'     => $this->permissions()->get(),
             'status'          => $this->status,
-            'registered_at'   => $this->created_at->toIso8601String(),
-            'last_updated_at' => $this->updated_at->toIso8601String(),
+            'created_at'      => $this->created_at->toIso8601String(),
+            'updated_at'      => $this->updated_at->toIso8601String(),
         ];
     }
 }

composer.json

@@ -24,7 +24,7 @@
         "laravel/tinker": "~1.0",
         "laravelcollective/html": "^5.4.0",
         "spatie/laravel-cors": "^1.2",
-        "tymon/jwt-auth": "dev-develop",
+        "tymon/jwt-auth": "1.0.0-rc.2",
         "unisharp/laravel-filemanager": "~1.8",
         "yajra/laravel-datatables-oracle": "~8.0"
     },

routes/api.php

-    <?php
+<?php
 
 
 /*