Merge branch 'master' of https://github.com/creativetimofficial/now-ui-dashboard-laravel

Author: AndreiDecuseara

README.md

@@ -27,11 +27,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/now-ui-dashboard`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
-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`
+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/now-ui-dashboard`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
+4. 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
+5. In your terminal run `composer dump-autoload`
+6. Run `php artisan migrate --seed` to create basic users table
 
 ### By using the archive
 
@@ -41,8 +42,8 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 4. Open `composer.json` file 
 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. TYpe in your terminal: `composer require laravel/ui` and  `php artisan ui vue --auth`
+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 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)
 10. Run `php artisan migrate --seed` to create basic users table

changelog.md

@@ -13,3 +13,7 @@ All notable changes to `Now Ui Dashboard` frontend preset for Laravel will be do
 ## Version 1.0.1 - 2019-09-23
 
 - Update to Laravel 6.x
+
+## Version 1.0.2 - 2020-03-18
+
+- Update to Laravel 7.x

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

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

src/now-ui-stubs/resources/views/users/index.blade.php

@@ -221,8 +221,8 @@
               <p>{{ __('Typography') }}</p>
             </a>
           </li>
-          <li class = " active-pro">
-            <a href="{{ route('page.index','upgrade') }}">
+          <li class = "">
+            <a href="{{ route('page.index','upgrade') }}" class="bg-info">
               <i class="now-ui-icons arrows-1_cloud-download-93"></i>
               <p>{{ __('Upgrade to PRO') }}</p>
             </a>
@@ -422,4 +422,4 @@
   @stack('js')
 </body>
 
-</html>
+</html>