Updates to laravel 7.0

Author: jamesdordoy

Diff for: .gitignore

@@ -9,3 +9,4 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+seedme.txt

Diff for: app/Exceptions/Handler.php

@@ -2,7 +2,7 @@
 
 namespace App\Exceptions;
 
-use Exception;
+use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -32,7 +32,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -44,7 +44,7 @@ public function report(Exception $exception)
      * @param  \Exception  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

Diff for: app/Http/Controllers/Auth/LoginController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller
@@ -25,7 +26,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = RouteServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

Diff for: app/Http/Controllers/UserController.php

@@ -16,8 +16,6 @@ public function index(Request $request)
             $request->input('search'),
             [
                 "role",
-                "telephoneNumbers",
-                "departments"
             ]
         );
 
@@ -38,24 +36,38 @@ public function queryBuilder(Request $request)
         $orderBy = $request->input('column');
         $orderBydir = $request->input("dir");
         $length = $request->input('length');
+        $isActive = $request->input('isActive');
+        $roleId = $request->input('roleId');
 
-        $data = \DB::table('users')
+        $query = \DB::table('users')
             ->join('roles', 'roles.id', '=', 'users.role_id')
             ->join('departments', 'departments.id', '=', 'roles.department_id')
             ->select(
                 'roles.name as role_name',
                 'users.id',
                 'users.cost',
+                'users.is_active',
                 'users.name as user_name',
                 'users.email',
                 'departments.name as department_name'
             )
-            ->where("users.name", "LIKE", "%$searchValue%")
-            ->orWhere('users.email', "LIKE", "%$searchValue%")
-            ->orWhere('roles.name', "LIKE", "%$searchValue%")
-            ->orWhere('departments.name', "LIKE", "%$searchValue%")
-            ->orderBy($orderBy, $orderBydir)
-            ->paginate($length);
+            ->where(function ($query) use($searchValue) {
+                $query->where("users.name", "LIKE", "%$searchValue%")
+                    ->orWhere('users.email', "LIKE", "%$searchValue%")
+                    ->orWhere('roles.name', "LIKE", "%$searchValue%")
+                    ->orWhere('departments.name', "LIKE", "%$searchValue%");
+            })
+            ->orderBy($orderBy, $orderBydir);
+
+        if (isset($isActive) && ! empty($isActive)) {
+            $query = $query->where("users.is_active", $isActive);
+        }
+
+        if (isset($roleId) && ! empty($roleId)) {
+            $query = $query->where("users.role_id", $roleId);
+        }
+            
+        $data = $query->paginate($length);
 
         return new DataTableCollectionResource($data);
     }

Diff for: app/Http/Kernel.php

@@ -19,7 +19,6 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Barryvdh\Cors\HandleCors::class,
     ];
 
     /**

Diff for: app/Providers/RouteServiceProvider.php

@@ -16,6 +16,14 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected $namespace = 'App\Http\Controllers';
 
+
+    /**
+     * The path to the "home" route for your application.
+     *
+     * @var string
+     */
+    public const HOME = '/';
+
     /**
      * Define your route model bindings, pattern filters, etc.
      *

Diff for: app/User.php

@@ -47,6 +47,18 @@ class User extends Authenticatable
                 ],
             ],
         ],
+        // "hasOne" => [
+        //     "role" => [
+        //         "model" => \App\Role::class,
+        //         "foreign_key" => "role_id",
+        //         "columns" => [
+        //             "name" => [
+        //                 "searchable" => true,
+        //                 "orderable" => true,
+        //             ],
+        //         ],
+        //     ],
+        // ],
         "hasMany" => [
             "telephoneNumbers" => [
                 "model" => \App\TelephoneNumber::class,
@@ -77,7 +89,7 @@ class User extends Authenticatable
                     ]
                 ],
             ],
-        ]
+        ],
     ];
 
     /**

Diff for: bootstrap/cache/.gitignore

@@ -0,0 +1,62 @@
+<?php return array (
+  'facade/ignition' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    ),
+    'aliases' => 
+    array (
+      'Flare' => 'Facade\\Ignition\\Facades\\Flare',
+    ),
+  ),
+  'fideloper/proxy' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    ),
+  ),
+  'fruitcake/laravel-cors' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Fruitcake\\Cors\\CorsServiceProvider',
+    ),
+  ),
+  'jamesdordoy/laravelvuedatatable' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'JamesDordoy\\LaravelVueDatatable\\Providers\\LaravelVueDatatableServiceProvider',
+    ),
+  ),
+  'laravel/tinker' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    ),
+  ),
+  'laravel/ui' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Laravel\\Ui\\UiServiceProvider',
+    ),
+  ),
+  'nesbot/carbon' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Carbon\\Laravel\\ServiceProvider',
+    ),
+  ),
+  'nunomaduro/collision' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    ),
+  ),
+);