Merge pull request #27 from creativetimofficial/master

Update to Laravel 8.x

Author: teamupdivision

composer.json

@@ -5,7 +5,9 @@
     "homepage": "https://github.com/creativetimofficial/now-ui-dashboard-laravel",
     "keywords": ["Laravel", "Preset", "Now UI"],
     "require": {
-        "laravel/framework": "^7.0"
+        "laravel/framework": "^8.0",
+        "laravel/legacy-factories": "^1.0"
+
     },
     "autoload": {
         "psr-4": {

src/NowUiPreset.php

@@ -106,7 +106,7 @@ protected static function updateAuthViews()
         // Add Auth routes in 'routes/web.php'
         file_put_contents(
             './routes/web.php',
-            "Auth::routes();\n\nRoute::get('/home', 'HomeController@index')->name('home');\n\n",
+            "Auth::routes();\n\nRoute::get('/home', 'App\Http\Controllers\HomeController@index')->name('home');\n\n",
             FILE_APPEND
         );
 
@@ -126,7 +126,7 @@ public static function addAlerts()
     public static function addUserManagement()
     {
         // Add seeder, controllers, requests and rules
-        static::copyDirectory('database/seeds', app_path('../database/seeds'));
+        static::copyDirectory('database/seeds', app_path('../database/seeders'));
         static::copyDirectory('database/factories', app_path('../database/factories'));
 
         static::copyFile('app/Http/Controllers/UserController.php', app_path('Http/Controllers/UserController.php'));
@@ -137,7 +137,7 @@ public static function addUserManagement()
         // Add routes
         file_put_contents(
             './routes/web.php',
-            "Route::group(['middleware' => 'auth'], function () {\n\tRoute::resource('user', 'UserController', ['except' => ['show']]);\n\tRoute::get('profile', ['as' => 'profile.edit', 'uses' => 'ProfileController@edit']);\n\tRoute::put('profile', ['as' => 'profile.update', 'uses' => 'ProfileController@update']);\n\tRoute::put('profile/password', ['as' => 'profile.password', 'uses' => 'ProfileController@password']);\n\tRoute::get('{page}', ['as' => 'page.index', 'uses' => 'PageController@index']);\n});\n\n",
+            "Route::group(['middleware' => 'auth'], function () {\n\tRoute::resource('user', 'App\Http\Controllers\UserController', ['except' => ['show']]);\n\tRoute::get('profile', ['as' => 'profile.edit', 'uses' => 'App\Http\Controllers\ProfileController@edit']);\n\tRoute::put('profile', ['as' => 'profile.update', 'uses' => 'App\Http\Controllers\ProfileController@update']);\n\tRoute::put('profile/password', ['as' => 'profile.password', 'uses' => 'App\Http\Controllers\ProfileController@password']);\n\tRoute::get('{page}', ['as' => 'page.index', 'uses' => 'App\Http\Controllers\PageController@index']);\n});\n\n",
             FILE_APPEND
         );
 

src/now-ui-stubs/app/Http/Controllers/ProfileController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Gate;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use App\Http\Requests\ProfileRequest;
 use App\Http\Requests\PasswordRequest;

src/now-ui-stubs/app/Http/Controllers/UserController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
+use App\Models\User;
 use App\Http\Requests\UserRequest;
 use Illuminate\Support\Facades\Hash;
 
@@ -11,7 +11,7 @@ class UserController extends Controller
     /**
      * Display a listing of the users
      *
-     * @param  \App\User  $model
+     * @param  \App\Models\User  $model
      * @return \Illuminate\View\View
      */
     public function index(User $model)

src/now-ui-stubs/app/Http/Requests/ProfileRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
 

src/now-ui-stubs/app/Http/Requests/UserRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
 

src/now-ui-stubs/database/seeds/DatabaseSeeder.php

@@ -1,10 +1,12 @@
 <?php
+namespace Database\Seeders;
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
-    /**
+    /**  
      * Seed the application's database.
      *
      * @return void

src/now-ui-stubs/database/seeds/UsersTableSeeder.php

@@ -1,5 +1,7 @@
 <?php
+namespace Database\Seeders;
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Hash;
 

src/now-ui-stubs/resources/views/alerts/migrations_check.blade.php

@@ -1,4 +1,4 @@
-@if (!\Schema::hasTable((new \App\User)->getTable()))
+@if (!\Schema::hasTable((new \App\Models\User)->getTable()))
     <div class="alert alert-danger fade show" role="alert">
         {{ __('You did not run the migrations and seeders! The login information will not be available!') }}
     </div>