update

z-song · Sep 18, 2018 · 86a1a61 · 86a1a61
1 parent b3a143f
commit 86a1a61
Show file tree

Hide file tree

Showing 15 changed files with 4,787 additions and 141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+.php_cs.cache
diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php
@@ -93,7 +93,7 @@ public function grid()
                 return '';
             }
 
-            $profile = array_only($this->profile, ['homepage', 'gender', 'birthday', 'address', 'last_login_at', 'last_login_ip', 'lat', 'lng']);
+            $profile = array_only($this->profile->toArray(), ['homepage', 'gender', 'birthday', 'address', 'last_login_at', 'last_login_ip', 'lat', 'lng']);
 
             return new Table([], $profile);
 

diff --git a/app/Admin/Extensions/Form/MarkdownEditor.php b/app/Admin/Extensions/Form/MarkdownEditor.php
diff --git a/app/Admin/Extensions/Form/PHPEditor.php b/app/Admin/Extensions/Form/PHPEditor.php
diff --git a/app/Admin/Extensions/Form/WangEditor.php b/app/Admin/Extensions/Form/WangEditor.php
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "type": "project",
     "require": {
         "php": ">=7.0.0",
-        "encore/laravel-admin": "v1.6.0",
+        "encore/laravel-admin": "^1.6",
         "fideloper/proxy": "~3.3",
         "intervention/image": "^2.4",
         "jxlwqq/code-mirror": "^1.0",
@@ -28,6 +28,7 @@
         "laravel-admin-ext/scheduling": "dev-master",
         "laravel-admin-ext/simplemde": "^1.0",
         "laravel-admin-ext/summernote": "^0.1.0",
+        "laravel-admin-ext/wang-editor": "^1.0",
         "laravel/framework": "5.5.*",
         "laravel/tinker": "~1.0",
         "maatwebsite/excel": "~2.1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/public/vendor/laravel-admin-ext/wang-editor/wangEditor-3.0.10/release/fonts/w-e-icon.woff b/public/vendor/laravel-admin-ext/wang-editor/wangEditor-3.0.10/release/fonts/w-e-icon.woff