Merge pull request #15 from creativetimofficial/master

Update Laravel 7.x

Author: teamupdivision

composer.json

@@ -5,7 +5,7 @@
     "homepage": "https://github.com/creativetimofficial/material-dashboard-laravel",
     "keywords": ["Laravel", "Preset", "Material"],
     "require": {
-        "laravel/framework": "^5.5 || ^6.0"
+        "laravel/framework": "^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -19,4 +19,4 @@
             ]
         }
     }
-}
+}

readme.md

@@ -21,7 +21,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
 
@@ -31,7 +31,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/material-dashboard`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
-3. Run `php artisan preset material` 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 material` 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
@@ -44,10 +44,11 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 4. Open `composer.json` file 
 5. Add `"LaravelFrontendPresets\\MaterialPreset\\": "presets/material/src"` to `autoload/psr-4` and to `autoload-dev/psr-4`
 6. Add `LaravelFrontendPresets\MaterialPreset\MaterialPresetServiceProvider::class` to `config/app.php` file
-7. In your terminal run `composer dump-autoload`
-8. Run `php artisan preset material` command to install the Material 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 material` command to install the Material 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/MaterialPreset.php

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

src/MaterialPresetServiceProvider.php

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

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

@@ -77,8 +77,8 @@
           <p>{{ __('RTL Support') }}</p>
         </a>
       </li>
-      <li class="nav-item active-pro{{ $activePage == 'upgrade' ? ' active' : '' }}">
-        <a class="nav-link" href="{{ route('upgrade') }}">
+      <li class="nav-item active-pro{{ $activePage == 'upgrade' ? ' active' : '' }} bg-danger">
+        <a class="nav-link text-white" href="{{ route('upgrade') }}">
           <i class="material-icons">unarchive</i>
           <p>{{ __('Upgrade to PRO') }}</p>
         </a>