Merge pull request #6 from laravel-frontend-presets/master

Update Laravel 6.x

Author: teamupdivision

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#511B26",
+        "titleBar.activeBackground": "#712635",
+        "titleBar.activeForeground": "#FEFBFC"
+    }
+}

changelog.md

@@ -11,4 +11,10 @@ All notable changes to `Material Dashboard` frontend preset for Laravel will be
 - User CRUD
 
 ## Version 1.0.0 - Version 1.0.4
-- Bugfixes
+- Bugfixes
+
+## Version 1.0.5
+- Add link to pro theme
+
+## Version 1.0.6 - 2019-09-23
+- Update to Laravel 6.x

composer.json

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

readme.md

@@ -1,6 +1,6 @@
 # [Material Dashboard Laravel - Free Frontend Preset for Laravel](https://material-dashboard-laravel.creative-tim.com/?ref=adnp-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Material%20Dashboard%20Laravel%20is%20a%20Free%20Frontend%20Preset%20for%20Laravel%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//material-dashboard-laravel.creative-tim.com/%20%23%material%20%23design%20%23dashboard%20%23laravel%20%23free%20via%20%40CreativeTim)
 
-<a href="https://packagist.org/packages/laravel-frontend-presets/material-dashboard"><img src="https://poser.pugx.org/laravel-frontend-presets/material-dashboard/v/stable.svg" alt="Latest Stable Version"></a> ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/laravel-frontend-presets/material-dashboard.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/material-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/laravel-frontend-presets/material-dashboard.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/material-dashboard/issues?q=is%3Aissue+is%3Aclosed)
+![version](https://img.shields.io/badge/version-1.0.9-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/laravel-frontend-presets/material-dashboard.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/material-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/laravel-frontend-presets/material-dashboard.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/material-dashboard/issues?q=is%3Aissue+is%3Aclosed)
 
 *Frontend version*: Material Dashboard v2.1.1. More info at https://www.creative-tim.com/product/material-dashboard
 
@@ -21,7 +21,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/material-stubs/app/Http/Controllers/UserController.php

@@ -63,9 +63,10 @@ public function edit(User $user)
      */
     public function update(UserRequest $request, User  $user)
     {
+        $hasPassword = $request->get('password');
         $user->update(
             $request->merge(['password' => Hash::make($request->get('password'))])
-                ->except([$request->get('password') ? '' : 'password']
+                ->except([$hasPassword ? '' : 'password']
         ));
 
         return redirect()->route('user.index')->withStatus(__('User successfully updated.'));

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

@@ -20,12 +20,16 @@
                 {{ __('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
               </p>
             </div>
           </div>
       </div>
   </div>
 </div>
-@endsection
+@endsection

src/material-stubs/resources/views/layouts/app.blade.php

@@ -83,6 +83,11 @@
                   View Documentation
                 </a>
               </li>
+              <li class="button-container">
+                <a href="https://www.creative-tim.com/product/material-dashboard-pro-laravel" target="_blank" class="btn btn-danger btn-block btn-round">
+                  Upgrade to PRO
+                </a>
+              </li>
               <li class="button-container github-star">
                 <a class="github-button" href="https://github.com/creativetimofficial/material-dashboard-laravel" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star ntkme/github-buttons on GitHub">Star</a>
               </li>

src/material-stubs/resources/views/pages/upgrade.blade.php

@@ -117,7 +117,7 @@
                       <a href="#" class="btn btn-round btn-fill btn-default disabled">Current Version</a>
                     </td>
                     <td class="text-center">
-                      <a target="_blank" href="javascript:void(0)" aria-disabled="true" class="btn btn-round btn-fill btn-info">Coming soon</a>
+                      <a target="_blank" href="https://www.creative-tim.com/product/material-dashboard-pro-laravel" aria-disabled="true" class="btn btn-round btn-fill btn-info">Upgrade to PRO</a>
                     </td>
                   </tr>
                 </tbody>
@@ -129,4 +129,4 @@
     </div>
   </div>
 </div>
-@endsection
+@endsection