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

Author: AndreiDecuseara

changelog.md

@@ -13,3 +13,11 @@ All notable changes to `Paper Dashboard` frontend preset for Laravel will be doc
 ## Version 1.0.1 - 2019-09-23
 
 - Update to Laravel 6.x
+
+## Version 1.0.2 - 2019-11-14
+
+- Update Composer
+
+## Version 1.0.3 - 2020-03-18
+
+- Update to Laravel 7.x

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/paper`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
-3. Run `php artisan ui paper` 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`
+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/paper`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
+4. Run `php artisan ui paper` 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
+5. In your terminal run `composer dump-autoload`
+6. Run `php artisan migrate --seed` to create basic users table
 
 ### By using the archive
 
@@ -65,7 +66,7 @@ You can access the dashboard either by using the "**Dashboard**" link in the lef
 
 You have the option to edit the current logged in user's profile (change name, email and password). To access this page just click the "**User profile**" link in the left sidebar or by adding **/profile** in the url.
 
-The `App\Htttp\Controlers\ProfileController` handles the update of the user information. 
+The `App\Http\Controllers\ProfileController` handles the update of the user information. 
 
 ```
 public function update(ProfileRequest $request)

src/paper-dashboard-stubs/resources/views/layouts/navbars/auth.blade.php

@@ -72,12 +72,12 @@
                     <p>{{ __('Typography') }}</p>
                 </a>
             </li>
-            <li class="active-pro {{ $elementActive == 'upgrade' ? 'active' : '' }} bg-danger">
-                <a href="{{ route('page.index', 'upgrade') }}">
+            <li class="active-pro {{ $elementActive == 'upgrade' ? 'active' : '' }}">
+                <a href="{{ route('page.index', 'upgrade') }}" class="bg-danger">
                     <i class="nc-icon nc-spaceship text-white"></i>
                     <p class="text-white">{{ __('Upgrade to PRO') }}</p>
                 </a>
             </li>
         </ul>
     </div>
-</div>
+</div>

src/paper-dashboard-stubs/resources/views/users/index.blade.php

@@ -198,10 +198,10 @@
                                     <p>{{ __('Typography') }}</p>
                                 </a>
                             </li>
-                            <li >
-                                <a href="{{ route('page.index', 'upgrade') }}">
-                                    <i class="nc-icon nc-spaceship"></i>
-                                    <p>{{ __('Upgrade to PRO') }}</p>
+                            <li class="active-pro {{ $elementActive == 'upgrade' ? 'active' : '' }}">
+                                <a href="{{ route('page.index', 'upgrade') }}" class="bg-danger">
+                                    <i class="nc-icon nc-spaceship text-white"></i>
+                                    <p class="text-white">{{ __('Upgrade to PRO') }}</p>
                                 </a>
                             </li>
                         </ul>