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

Update Laravel 6.x

Author: teamupdivision

.gitignore

@@ -0,0 +1 @@
+/.vscode

changelog.md

@@ -8,4 +8,15 @@ All notable changes to `Black Dashboard` frontend preset for Laravel will be doc
 - Black Dashboard v1.0.0 frontend theme
 - Laravel Auth preset
 - Change user profile
-- User CRUD
+- User CRUD
+
+## Version 1.0.1
+  - Link to the pro theme
+
+## Version 1.0.2 - 1.0.3
+  - Bugs fix
+  
+## Version 1.0.4 - 2019-09-23
+
+  - Update to Laravel 6.x
+

composer.json

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

readme.md

@@ -1,6 +1,6 @@
 # [Black Dashboard Laravel - Free Frontend Preset for Laravel](https://www.creative-tim.com/live/black-dashboard-laravel/?ref=bdl-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Black%20Dashboard%20Laravel%20is%20a%20Free%20Frontend%20Preset%20for%20Laravel%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//www.creative-tim.com/live/black-dashboard-laravel%20%23%black%20%23design%20%23dashboard%20%23laravel%20%23free%20via%20%40CreativeTim)
 
-<a href="https://packagist.org/packages/laravel-frontend-presets/black-dashboard"><img src="https://poser.pugx.org/laravel-frontend-presets/black-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/black-dashboard.svg)](https://github.com/laravel-frontend-presets/black-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/laravel-frontend-presets/black-dashboard.svg)](https://github.com/laravel-frontend-presets/black-dashboard/issues?q=is%3Aissue+is%3Aclosed)
+![version](https://img.shields.io/badge/version-1.0.4-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/laravel-frontend-presets/black-dashboard.svg)](https://github.com/laravel-frontend-presets/black-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/laravel-frontend-presets/black-dashboard.svg)](https://github.com/laravel-frontend-presets/black-dashboard/issues?q=is%3Aissue+is%3Aclosed)
 
 *Frontend version*: Black Dashboard v1.0.0. More info at https://www.creative-tim.com/product/black-dashboard
 
@@ -21,7 +21,8 @@ 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
 
@@ -356,7 +357,6 @@ The documentation for the Black Dashboard Laravel is hosted at our [website](htt
     │           │   │   _type.scss
     │           │   │   _utilities.scss
     │           │   │   _variables.scss
-    │           │   │   _white-content.scss
     │           │   │   
     │           │   ├───cards
     │           │   │       _card-chart.scss

src/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#4E200A",
+        "titleBar.activeBackground": "#6D2D0D",
+        "titleBar.activeForeground": "#FEFAF8"
+    }
+}

src/black-stubs/app/Http/Controllers/UserController.php

@@ -67,9 +67,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.'));