Update

Author: AndreiDecuseara

changelog.md

@@ -20,5 +20,8 @@ All notable changes to `Argon` frontend preset for Laravel will be documented in
   - Menu structure changes, replace texts
 
 ## Version 1.0.11 - 2019-09-23
-  - Update to Laravel 6.x
+  - Update to Laravel 6.x  
+  
+## Version 1.1.0 - 2020-03-18
+  - Update to Laravel 7.x
 

readme.md

@@ -28,11 +28,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/argon`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
-3. Run `php artisan ui argon` 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/argon`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
+4. Run `php artisan ui argon` 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
 

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

@@ -120,9 +120,20 @@
                       <i class="ni ni-bullet-list-67 text-default"></i>
                       <span class="nav-link-text">Tables</span>
                     </a>
+<<<<<<< HEAD
                   </li>
                 <li class="nav-item mb-5 mr-4 ml-4 pl-1 bg-danger" style="position: absolute; bottom: 0;">
                     <a class="nav-link text-white" href="{{route('upgrade')}}">
+=======
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#">
+                        <i class="ni ni-circle-08 text-pink"></i> {{ __('Register') }}
+                    </a>
+                </li>
+                <li class="nav-item mb-5 mr-4 ml-4 pl-1 bg-danger" style="position: absolute; bottom: 0;">
+                    <a class="nav-link text-white" href="https://www.creative-tim.com/product/argon-dashboard-pro-laravel" target="_blank">
+>>>>>>> eb7186b6a79559baac814003cdcfe77840ef8fc4
                         <i class="ni ni-cloud-download-95"></i> Upgrade to PRO
                     </a>
                 </li>

src/argon-stubs/resources/views/users/index.blade.php

@@ -185,12 +185,21 @@
                   <i class="ni ni-bullet-list-67 text-default"></i>
                   <span class="nav-link-text">Tables</span>
                 </a>
+<<<<<<< HEAD
               </li>
             <li class="nav-item mb-5 mr-4 ml-4 pl-1 bg-danger" style="position: absolute; bottom: 0;">
                 <a class="nav-link text-white" href="{{route('upgrade')}}">
                     <i class="ni ni-cloud-download-95"></i> Upgrade to PRO
                 </a>
             </li>
+=======
+            </li>
+                           <li class="nav-item mb-5 mr-4 ml-4 pl-1 bg-danger" style="position: absolute; bottom: 0;">
+                    <a class="nav-link text-white" href="https://www.creative-tim.com/product/argon-dashboard-pro-laravel" target="_blank">
+                        <i class="ni ni-cloud-download-95"></i> Upgrade to PRO
+                    </a>
+                </li>
+>>>>>>> eb7186b6a79559baac814003cdcfe77840ef8fc4
         </ul>
         <!-- Divider -->
         <hr class="my-3">