Merge pull request #16 from creativetimofficial/master

Update to Laravel 8.x

Author: teamupdivision

composer.json

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

src/PaperPreset.php

@@ -104,7 +104,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
         );
 
@@ -121,7 +121,7 @@ protected static function updateAuthViews()
     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::copyFile('app/Http/Controllers/UserController.php', app_path('Http/Controllers/UserController.php'));
         static::copyFile('app/Http/Controllers/ProfileController.php', app_path('Http/Controllers/ProfileController.php'));
@@ -131,7 +131,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});\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});\n\n", 
             FILE_APPEND
         );
 
@@ -190,7 +190,7 @@ public static function addPagesSection()
         // Add routes
         file_put_contents(
             './routes/web.php', 
-            "Route::group(['middleware' => 'auth'], function () {\n\tRoute::get('{page}', ['as' => 'page.index', 'uses' => 'PageController@index']);\n});\n\n", 
+            "Route::group(['middleware' => 'auth'], function () {\n\tRoute::get('{page}', ['as' => 'page.index', 'uses' => 'App\Http\Controllers\PageController@index']);\n});\n\n", 
             FILE_APPEND
         );
 

src/paper-dashboard-stubs/app/Http/Controllers/Auth/RegisterController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
+use App\Models\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -60,7 +60,7 @@ protected function validator(array $data)
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return \App\Models\User
      */
     protected function create(array $data)
     {

src/paper-dashboard-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/paper-dashboard-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/paper-dashboard-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/paper-dashboard-stubs/database/seeds/DatabaseSeeder.php

@@ -1,4 +1,5 @@
 <?php
+namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
 

src/paper-dashboard-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/paper-dashboard-stubs/resources/views/users/index.blade.php

@@ -198,12 +198,12 @@
                                     <p>{{ __('Typography') }}</p>
                                 </a>
                             </li>
-                            <li class="active-pro {{ $elementActive == 'upgrade' ? 'active' : '' }}">
+                            {{-- <li class="active-pro {{ $elementActive == 'upgrade' ? 'active' : '' }}">
                                 <a href="{{ route('page.index', 'upgrade') }}" class="bg-danger">
                                     <i class="nc-icon nc-spaceship text-white"></i>
                                     <p class="text-white">{{ __('Upgrade to PRO') }}</p>
                                 </a>
-                            </li>
+                            </li> --}}
                         </ul>
                     </div>
                 </div>