Merge pull request #17 from creativetimofficial/master

Laravel update 7.x

README.md

@@ -28,7 +28,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/now-ui-dashboard`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
-3. Run `php artisan preset nowui` command to install the NowUI 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 nowui` command to install the NowUI 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,9 +42,10 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 5. Add `"LaravelFrontendPresets\\NowUiPreset\\": "presets/NowUi/src"` to `autoload/psr-4` and to `autoload-dev/psr-4`
 6. Add `LaravelFrontendPresets\NowUiPreset\NowUiPresetServiceProvider::class` to `config/app.php` file
 7. In your terminal run `composer dump-autoload`
-8. Run `php artisan preset nowui` command to install the NowUI 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`
+8. TYpe in your terminal: `composer require laravel/ui` and  `php artisan ui vue --auth`
+9. Run `php artisan ui nowui` command to install the NowUI 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
 

composer.json

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

src/NowUIPresetServiceProvider.php

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

src/NowUiPreset.php

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

src/now-ui-stubs/resources/assets/css/now-ui-dashboard.css

@@ -29,6 +29,10 @@ Licensed under the MIT license - http://opensource.org/licenses/MIT
 Copyright (c) 2015 Daniel Eden
 */
 
+.color-ev {
+    background-color: rgb(12, 152, 152);
+}
+
 .animated {
     -webkit-animation-duration: 1s;
     animation-duration: 1s;

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

@@ -73,7 +73,7 @@
         </a>
       </li>
       <li class = "@if ($activePage == 'upgrade') active @endif active-pro">
-        <a href="{{ route('page.index','upgrade') }}">
+        <a href="{{ route('page.index','upgrade') }}" class="color-ev">
           <i class="now-ui-icons arrows-1_cloud-download-93"></i>
           <p>{{ __('Upgrade to PRO') }}</p>
         </a>