Merge pull request #5 from creativetimofficial/master

Update Laravel 7.x

Author: teamupdivision

composer.json

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

readme.md

@@ -30,11 +30,12 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 ### Via composer
 
 1. `Cd` to your Laravel app  
-2. Install this preset via `composer require laravel-frontend-presets/light-bootstrap`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
-3. Run `php artisan preset light-bootstrap` command to install the Light Bootstrap 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`
+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/light-bootstrap`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
+4. Run `php artisan ui light-bootstrap` command to install the Light Bootstrap 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
+5. In your terminal run `composer dump-autoload`
+6. Run `php artisan migrate --seed` to create basic users table
 
 ### By using the archive
 
@@ -44,10 +45,11 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 4. Open `composer.json` file 
 5. Add `"LaravelFrontendPresets\\LightBootstrapPreset\\": "presets/light-bootstrap/src"` to `autoload/psr-4` and to `autoload-dev/psr-4`
 6. Add `LaravelFrontendPresets\LightBootstrapPreset\LightBootstrapPresetServiceProvider::class` to `config/app.php` file
-7. In your terminal run `composer dump-autoload`
-8. Run `php artisan preset light-bootstrap` command to install the Light Bootstrap 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 light-bootstrap` command to install the Light Bootstrap 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/LightBootstrapPreset.php

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

src/LightBootstrapPresetServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Foundation\Console\PresetCommand;
+use Laravel\Ui\UiCommand; use Laravel\Ui\AuthCommand;
 
 class LightBootstrapPresetServiceProvider extends ServiceProvider
 {
@@ -14,7 +15,7 @@ class LightBootstrapPresetServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        PresetCommand::macro('light-bootstrap', function ($command) {
+        UiCommand::macro('light-bootstrap', function ($command) {
             LightBootstrapPreset::install();
 
             $command->info('Light Bootstrap scaffolding installed successfully.');

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

@@ -76,7 +76,7 @@
                     <p>{{ __("Notifications") }}</p>
                 </a>
             </li>
-            <li class="nav-item active active-pro">
+            <li class="nav-item active-pro bg-danger">
                 <a class="nav-link active" href="{{route('page.index', 'upgrade')}}">
                     <i class="nc-icon nc-alien-33"></i>
                     <p>{{ __("Upgrade to PRO") }}</p>