Merge pull request #5 from stepanenko3/upload_files_fixes_and_updates

Upload files, updates and fixes

Author: stepanenko3

composer.json

@@ -9,12 +9,13 @@
     "license": "MIT",
     "require": {
         "php": ">=7.1.0",
-        "laravel/nova": "^4.0"
+        "laravel/nova": "^4.0",
+        "stepanenko3/laravel-helpers": "*"
     },
     "repositories": [
         {
             "type": "path",
-            "url": "../nova"
+            "url": "../../snotax/vendor/laravel/nova"
         }
     ],
     "autoload": {

config/nova-filemanager.php

@@ -11,7 +11,7 @@
     | This is the storage disk FileManager will use to put file uploads, you can use
     | any of the disks defined in your config/filesystems.php file. Default to public.
      */
-    'disk'      => env('FILEMANAGER_DISK', 'public'),
+    'disk' => env('FILEMANAGER_DISK', 'public'),
 
     /*
     |--------------------------------------------------------------------------
@@ -20,7 +20,7 @@
     | This will set the default order of the files and folders.
     | You can use mime, name or size. Default to mime
      */
-    'order'     => env('FILEMANAGER_ORDER', 'mime'),
+    'order' => env('FILEMANAGER_ORDER', 'mime'),
 
     /*
     |--------------------------------------------------------------------------
@@ -39,7 +39,7 @@
     | info. This is useful when s3 is being used or when needs to read a lot of files.
     | Cache is set by file, not by folder. Default to false.
      */
-    'cache'     => env('FILEMANAGER_CACHE', false),
+    'cache' => env('FILEMANAGER_CACHE', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -48,21 +48,21 @@
     | This will hide or show filemanager buttons. You can enable o disable buttons
     | as your own needs. True means visible. False hidden.
      */
-    'buttons'   => [
+    'buttons' => [
 
         // Menu
-        'create_folder'   => true,
-        'upload_button'   => true,
+        'create_folder' => true,
+        'upload_button' => true,
         'select_multiple' => true,
 
         // Folders
-        'rename_folder'   => true,
-        'delete_folder'   => true,
+        'rename_folder' => true,
+        'delete_folder' => true,
 
         // Files
-        'rename_file'     => true,
-        'delete_file'     => true,
-        'download_file'   => true,
+        'rename_file' => true,
+        'delete_file' => true,
+        'download_file' => true,
 
     ],
 
@@ -74,18 +74,16 @@
     | You can create|modify|delete as you want.
      */
 
-    'filters'   => [
+    'filters' => [
+        'Images' => ['jpg', 'jpeg', 'png', 'gif', 'svg', 'bmp', 'tiff'],
 
-        'Images'     => ['jpg', 'jpeg', 'png', 'gif', 'svg', 'bmp', 'tiff'],
+        'Documents' => ['json', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pps', 'pptx', 'odt', 'rtf', 'md', 'txt', 'css'],
 
-        'Documents'  => ['pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pps', 'pptx', 'odt', 'rtf', 'md', 'txt', 'css'],
+        'Videos' => ['mp4', 'avi', 'mov', 'mkv', 'wmv', 'flv', '3gp', 'h264'],
 
-        'Videos'     => ['mp4', 'avi', 'mov', 'mkv', 'wmv', 'flv', '3gp', 'h264'],
-
-        'Audios'     => ['mp3', 'ogg', 'wav', 'wma', 'midi'],
+        'Audios' => ['mp3', 'ogg', 'wav', 'wma', 'midi'],
 
         'Compressed' => ['zip', 'rar', 'tar', 'gz', '7z', 'pkg'],
-
     ],
 
     /*
@@ -96,16 +94,16 @@
     | of the keys used in filters in lowercase. If you have a key called Documents,
     | use 'documents' as your default filter. Default to false
      */
-    'filter'    => false,
+    'filter' => false,
 
     /*
     |--------------------------------------------------------------------------
     | Naming strategy
     |--------------------------------------------------------------------------
     | Resolve the upload file name with a class that extends
-    | Stepanenko3\NovaFilemanager\Http\Services\AbstractNamingStrategy
+    | Stepanenko3\NovaFilemanager\Services\AbstractNamingStrategy
      */
-    'naming'    => Stepanenko3\NovaFilemanager\Http\Services\DefaultNamingStrategy::class,
+    'naming' => Stepanenko3\NovaFilemanager\Services\DefaultNamingStrategy::class,
 
     /*
     |--------------------------------------------------------------------------
@@ -115,7 +113,7 @@
     | of the keys used in filters in lowercase. If you have a key called Documents,
     | use 'documents' as your default filter.
      */
-    'jobs'      => [],
+    'jobs' => [],
 
     'iconSize' => 48,
 ];

dist/js/field.js

@@ -5,13 +5,6 @@
  * @license  MIT
  */
 
-/*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <http://feross.org>
- * @license  MIT
- */
-
 /*!
  * URI.js - Mutating URLs
  *
@@ -61,7 +54,7 @@
 
 /*! https://mths.be/punycode v1.4.0 by @mathias */
 
-/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
 /**
  * @license

dist/js/field.js.LICENSE.txt

@@ -48,6 +48,8 @@
 
 /*! https://mths.be/punycode v1.4.0 by @mathias */
 
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
 /**
  * @license
  * Lodash <https://lodash.com/>

dist/js/tool.js

@@ -16,20 +16,21 @@
                 </svg>
             </OutlineButton>
 
-            <label
-                v-if="buttons.upload_button"
-                class="mr-2"
-            >
-                <DefaultButton>
+            <template v-if="buttons.upload_button">
+                <DefaultButton
+                    class="mr-2"
+                    @click="$refs.uploadFileInput.click()"
+                >
                     {{ __('Upload') }}
                 </DefaultButton>
                 <input
+                    ref="uploadFileInput"
                     type="file"
                     class="hidden"
                     multiple="true"
                     @change="uploadFilesByButton"
                 />
-            </label>
+            </template>
 
             <DefaultButton
                 v-if="buttons.create_folder"