Merge pull request #35 from creativetimofficial/master

Update to Laravel 8.x

Author: teamupdivision

changelog.md

@@ -24,4 +24,7 @@ All notable changes to `Argon` frontend preset for Laravel will be documented in
 
 ## Version 1.1.0 - 2020-03-18
   - Update to Laravel 7.x
+  
+## Version 1.1.1 - 2020-09-23
+  - Update to Laravel 8.x
 

composer.json

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

readme.md

@@ -1,4 +1,4 @@
-# Argon Frontend Preset For Laravel Framework 5.5 and Up
+# Argon Frontend Preset For Laravel Framework 8.x and Up
 
 ![version](https://img.shields.io/badge/version-1.0.12-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/laravel-frontend-presets/argon.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/argon/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/laravel-frontend-presets/argon.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/argon/issues?q=is%3Aissue+is%3Aclosed)
 
@@ -29,7 +29,7 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 
 1. `Cd` to your Laravel app  
 2. Type in your terminal: `composer require laravel/ui` and `php artisan ui vue --auth`
-3. Install this preset via `composer require laravel-frontend-presets/argon`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
+3. Install this preset via `composer require laravel-frontend-presets/argon`. No need to register the service provider. Laravel 8.x & up can auto detect the package.
 4. Run `php artisan ui argon` command to install the Argon preset. This will install all the necessary assets and also the custom auth views, it will also add the auth route in `routes/web.php`
 (NOTE: If you run this command several times, be sure to clean up the duplicate Auth entries in routes/web.php)
 5. In your terminal run `composer dump-autoload`

src/ArgonPreset.php

@@ -103,7 +103,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
         );
 
@@ -120,7 +120,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'));
@@ -130,7 +130,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::get('upgrade', function () {return view('pages.upgrade');})->name('upgrade'); \n\t Route::get('map', function () {return view('pages.maps');})->name('map');\n\t Route::get('icons', function () {return view('pages.icons');})->name('icons'); \n\t Route::get('table-list', function () {return view('pages.tables');})->name('table');\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::get('upgrade', function () {return view('pages.upgrade');})->name('upgrade'); \n\t Route::get('map', function () {return view('pages.maps');})->name('map');\n\t Route::get('icons', function () {return view('pages.icons');})->name('icons'); \n\t Route::get('table-list', function () {return view('pages.tables');})->name('table');\n\tRoute::put('profile/password', ['as' => 'profile.password', 'uses' => 'App\Http\Controllers\ProfileController@password']);\n});\n\n", 
             FILE_APPEND
         );
 

src/argon-stubs/app/Console/Commands/DeleteOldUsers.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Hash;
 

src/argon-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;
@@ -59,7 +59,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/argon-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/argon-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/argon-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/argon-stubs/database/seeds/DatabaseSeeder.php

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