Merge pull request #26 from creativetimofficial/master

Update Laravel 7.x

Author: teamupdivision

.vscode/settings.json

@@ -3,5 +3,5 @@
         "activityBar.background": "#490D65",
         "titleBar.activeBackground": "#67128E",
         "titleBar.activeForeground": "#FCF8FE"
-    }  
+    }
 }

composer.json

@@ -1,11 +1,11 @@
 {
     "name": "laravel-frontend-presets/argon",
-    "description": "Laravel 5.x Front-end preset for argon",
+    "description": "Laravel 7.x Front-end preset for argon",
     "license": "MIT",
     "homepage": "https://github.com/creativetimofficial/argon-dashboard-laravel",
     "keywords": ["Laravel", "Preset", "Argon"],
     "require": {
-        "laravel/framework": "^5.5 || ^6.0"
+        "laravel/framework": "^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -19,4 +19,4 @@
             ]
         }
     }
-}
+}

readme.md

@@ -19,7 +19,7 @@ If you don't already have an Apache local environment with PHP and MySQL, use on
  - Mac: https://wpshout.com/quick-guides/how-to-install-mamp-on-your-mac/
 
 Also, you will need to install Composer: https://getcomposer.org/doc/00-intro.md   
-And Laravel: https://laravel.com/docs/6.x/installation
+And Laravel: https://laravel.com/docs/7.x/installation
 
 ## Installation
 
@@ -29,7 +29,7 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 
 1. `Cd` to your Laravel app  
 2. 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. Run `php artisan preset 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`
+3. 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)
 4. In your terminal run `composer dump-autoload`
 5. Run `php artisan migrate --seed` to create basic users table
@@ -42,10 +42,11 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 4. Open `composer.json` file 
 5. Add `"LaravelFrontendPresets\\ArgonPreset\\": "presets/argon/src"` to `autoload/psr-4` and to `autoload-dev/psr-4`
 6. Add `LaravelFrontendPresets\ArgonPreset\ArgonPresetServiceProvider::class` to `config/app.php` file
-7. In your terminal run `composer dump-autoload`
-8. Run `php artisan preset 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`
+7. Type in your terminal: `composer require laravel/ui` and `php artisan ui vue --auth`
+8. In your terminal run `composer dump-autoload`
+9. 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)
-9. Run `php artisan migrate --seed` to create basic users table
+10. Run `php artisan migrate --seed` to create basic users table
 
 
 ## Usage

src/ArgonPreset.php

@@ -3,7 +3,7 @@
 namespace LaravelFrontendPresets\ArgonPreset;
 
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Foundation\Console\Presets\Preset;
+use Laravel\Ui\Presets\Preset;
 
 class ArgonPreset extends Preset
 {

src/ArgonPresetServiceProvider.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Foundation\Console\PresetCommand;
+use Laravel\Ui\UiCommand;
+use Laravel\Ui\AuthCommand;
 
 class ArgonPresetServiceProvider extends ServiceProvider
 {
@@ -14,7 +16,7 @@ class ArgonPresetServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        PresetCommand::macro('argon', function ($command) {
+        UiCommand::macro('argon', function ($command) {
             ArgonPreset::install();
 
             $command->info('Argon scaffolding installed successfully.');

src/argon-stubs/resources/views/layouts/navbars/sidebar.blade.php

@@ -125,8 +125,8 @@
                         <i class="ni ni-circle-08 text-pink"></i> {{ __('Register') }}
                     </a>
                 </li>
-                <li class="nav-item mb-5" style="position: absolute; bottom: 0;">
-                    <a class="nav-link" href="https://www.creative-tim.com/product/argon-dashboard-pro-laravel" target="_blank">
+                <li class="nav-item mb-5 bg-danger" style="position: absolute; bottom: 0;">
+                    <a class="nav-link text-white" href="https://www.creative-tim.com/product/argon-dashboard-pro-laravel" target="_blank">
                         <i class="ni ni-cloud-download-95"></i> Upgrade to PRO
                     </a>
                 </li>

src/argon-stubs/resources/views/users/index.blade.php

@@ -27,7 +27,7 @@
         <span class="navbar-toggler-icon"></span>
     </button>
     <!-- Brand -->
-   <a class="navbar-brand pt-0" href="{{ route('home') }}">
+    <a class="navbar-brand pt-0" href="{{ route('home') }}">
         <img src="{{ asset('argon') }}/img/brand/blue.png" class="navbar-brand-img" alt="...">
     </a>
     <!-- User -->