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

Author: mariusconstantin2503

changelog.md

@@ -18,3 +18,7 @@ All notable changes to `Argon` frontend preset for Laravel will be documented in
 
 ## Version 1.0.7 - 1.0.10
   - Menu structure changes, replace texts
+  
+## Version 1.0.11 - 2019-09-23
+  - Update to Laravel 6.x
+

composer.json

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

readme.md

@@ -1,9 +1,11 @@
 # Argon Frontend Preset For Laravel Framework 5.5 and Up
 
-Argon Frontend Preset For Laravel Framework 5.5 and Up
+![version](https://img.shields.io/badge/version-1.0.12-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/laravel-frontend-presets/argon.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/argon/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/laravel-frontend-presets/argon.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/argon/issues?q=is%3Aissue+is%3Aclosed)
 
 *Current version*: Argon v1.0.10. More info at https://www.creative-tim.com/product/argon-dashboard-laravel.
 
+![Product Image](https://s3.amazonaws.com/creativetim_bucket/products/140/original/opt_ad_laravel_thumbnail.jpg?1548334671)
+
 ## Note
 
 We recommend installing this preset on a project that you are starting from scratch, otherwise your project's design might break.
@@ -17,7 +19,7 @@ If you don't already have an Apache local environment with PHP and MySQL, use on
  - Mac: https://wpshout.com/quick-guides/how-to-install-mamp-on-your-mac/
 
 Also, you will need to install Composer: https://getcomposer.org/doc/00-intro.md   
-And Laravel: https://laravel.com/docs/5.8/installation
+And Laravel: https://laravel.com/docs/6.x/installation
 
 ## Installation
 

src/argon-stubs/resources/views/auth/verify.blade.php

@@ -19,9 +19,12 @@
                             @endif
 
                             {{ __('Before proceeding, please check your email for a verification link.') }}
-                            
                             @if (Route::has('verification.resend'))
-                                {{ __('If you did not receive the email') }}, <a href="{{ route('verification.resend') }}">{{ __('click here to request another') }}</a>
+                                {{ __('If you did not receive the email') }},
+                                <form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
+                                    @csrf
+                                    <button type="submit" class="btn btn-link p-0 m-0 align-baseline">{{ __('click here to request another') }}</button>.
+                                </form>
                             @endif
                         </div>
                     </div>