v2.2.0

Author: ctf0

README.md

@@ -157,12 +157,7 @@ return [
     /**
      * hide file extension in files list
      */
-    'hide_ext' => true,
-
-    /*
-     * locked files list
-     */
-    'locked_files_list' => storage_path('logs/MediaManager.php')
+    'hide_ext' => true
 ];
 ```
 

logs/v2.1.0.txt

@@ -0,0 +1,11 @@
+- added missing vendor/download “sorry about that”
+- keep visited folder active when navigating up
+- add animation
+- add swipe left/right for image preview
+- add swipe up/down for move & delete selected
+- add lock item option “check wiki for notes”
+- removed framework config, update your ‘webpack.mix.js’
+- less depend on jquery
+- update assets
+- update readme
+- make sure to republish the assets as new files were added.

logs/v2.2.0.txt

@@ -61,7 +61,7 @@ public function get_files(Request $request)
         }
 
         return response()->json([
-            'locked' => file_exists($this->locked_files_list) ? include $this->locked_files_list : [],
+            'locked' => app('db')->connection('mediamanager')->table('locked')->pluck('path'),
             'files'  => [
                 'path'   => $folder,
                 'items'  => $this->getData($folder),
@@ -345,20 +345,12 @@ public function lock_file(Request $request)
     {
         $path  = $request->path;
         $state = $request->state;
-        $data  = [];
+        $db    = app('db')->connection('mediamanager')->table('locked');
 
-        if (file_exists($this->locked_files_list)) {
-            $data = include $this->locked_files_list;
-        }
-
-        'add' == $state
-            ? array_push($data, $path)
-            : array_splice($data, array_search($path, $data), 1);
-
-        $res = "<?php\n\nreturn " . var_export($data, true) . ';';
+        'added' == $state
+            ? $db->insert(['path'=>$path])
+            : $db->where('path', $path)->delete();
 
-        return app('files')->put($this->locked_files_list, $res)
-            ? response()->json(['message'=>"done $state"])
-            : response()->json(['message'=>trans('MediaManager::messages.ajax_error')]);
+        return response()->json(['message'=>"'$path' $state"]);
     }
 }

src/Controllers/MediaController.php

@@ -32,6 +32,18 @@ protected function packagePublish()
             __DIR__ . '/config' => config_path(),
         ], 'config');
 
+        // database
+        $this->publishes([
+            __DIR__ . '/database' => storage_path('log'),
+        ], 'db');
+
+        $db_info = [
+            'driver'   => 'sqlite',
+            'database' => storage_path('logs/MediaManager.sqlite'),
+            'prefix'   => '',
+        ];
+        config(['database.connections.mediamanager' => $db_info]);
+
         // public
         $this->publishes([
             __DIR__ . '/dist' => public_path('assets/vendor/MediaManager'),
@@ -55,7 +67,6 @@ protected function packagePublish()
         ], 'view');
 
         $this->viewComp();
-        static::create_LLD(config('mediaManager.locked_files_list'));
     }
 
     protected function viewComp()
@@ -71,22 +82,6 @@ protected function viewComp()
         });
     }
 
-    /**
-     * create locked list dir.
-     *
-     * @param [type] $dir [description]
-     *
-     * @return [type] [description]
-     */
-    protected static function create_LLD($dir)
-    {
-        $dir_name = dirname($dir);
-
-        if (!app('files')->exists($dir_name)) {
-            return app('files')->makeDirectory($dir_name, 0755, true);
-        }
-    }
-
     /**
      * [autoReg description].
      *
@@ -115,7 +110,7 @@ protected function autoReg()
 // MediaManager
 require('dotenv').config()
 mix.js('resources/assets/vendor/MediaManager/js/manager.js', 'public/assets/vendor/MediaManager')
-    .sass('resources/assets/vendor/MediaManager/sass/media-' + process.env.MIX_MM_FRAMEWORK + '.scss', 'public/assets/vendor/MediaManager/style.css')
+    .sass('resources/assets/vendor/MediaManager/sass/media.scss', 'public/assets/vendor/MediaManager/style.css')
     .version();
 EOT;
 

src/MediaManagerServiceProvider.php

@@ -47,9 +47,4 @@
      * hide file extension in files list
      */
     'hide_ext' => true,
-
-    /*
-     * locked files list
-     */
-    'locked_files_list' => storage_path('logs/MediaManager.php'),
 ];

src/config/mediaManager.php

@@ -1,6 +1,5 @@
 <script>
 import Form from './mixins/form'
-import Ops from './mixins/ops'
 import FileFiltration from './mixins/filtration'
 import BulkSelect from './mixins/bulk'
 import LockFile from './mixins/lock'
@@ -14,7 +13,6 @@ export default {
     name: 'media-manager',
     mixins: [
         Form,
-        Ops,
         FileFiltration,
         BulkSelect,
         LockFile,
@@ -25,13 +23,15 @@ export default {
         Watchers
     ],
     props: [
+        'baseUrl',
         'inModal',
+        'hideExt',
+        'mediaTrans',
         'filesRoute',
         'dirsRoute',
-        'hideExt',
+        'lockFileRoute',
         'restrictPath',
-        'restrictExt',
-        'mediaTrans'
+        'restrictExt'
     ],
     data() {
         return {
@@ -90,7 +90,7 @@ export default {
                     $('#uploadProgress').fadeIn()
                 },
                 totaluploadprogress(uploadProgress) {
-                    $('#uploadProgress .progress-bar').css('width', uploadProgress + '%')
+                    $('.progress-bar').css('width', uploadProgress + '%')
                 },
                 successmultiple(files, res) {
                     res.data.map((item) => {
@@ -107,13 +107,14 @@ export default {
                     this.showNotif(res, 'danger')
                 },
                 queuecomplete() {
-                    manager.$refs.upload.click()
+                    manager.toggleUploadPanel()
                     $('#uploadProgress').fadeOut(() => {
-                        $('#uploadProgress .progress-bar').css('width', 0)
+                        $('.progress-bar').css('width', 0)
                     })
                 }
             })
         },
+
         shortCuts() {
             $(document).keydown((e) => {
 
@@ -163,12 +164,12 @@ export default {
 
                             // refresh
                             if (keycode(e) == 'r') {
-                                this.$refs.refresh.click()
+                                this.getFiles(this.folders)
                             }
 
                             // file upload
                             if (keycode(e) == 'u') {
-                                this.$refs.upload.click()
+                                this.toggleUploadPanel()
                             }
                         }
                         /* end of no bulk selection */
@@ -191,17 +192,17 @@ export default {
 
                             // delete file
                             if (keycode(e) == 'delete' || keycode(e) == 'd') {
-                                this.deleteItem()
+                                this.$refs.delete.click()
                             }
 
                             // move file
                             if (this.checkForFolders() && keycode(e) == 'm') {
-                                this.moveItem()
+                                this.$refs.move.click()
                             }
 
                             // lock files
                             if (keycode(e) == 'l') {
-                                this.pushToLockedList()
+                                this.$refs.lock.click()
                             }
                         }
                         /* end of with or without bulk selection */
@@ -240,6 +241,106 @@ export default {
                 /* end of modal is visible */
             })
         },
+        deleteItem() {
+            if (!this.isBulkSelecting() && this.selectedFile) {
+                if (this.selectedFileIs('folder')) {
+                    this.folderWarning = true
+                } else {
+                    this.folderWarning = false
+                }
+
+                this.$refs.confirm_delete.innerText = this.selectedFile.name
+            }
+
+            if (this.bulkItemsCount) {
+                this.bulkListFilter.some((item) => {
+                    if (this.fileTypeIs(item, 'folder')) {
+                        return this.folderWarning = true
+                    }
+
+                    this.folderWarning = false
+                })
+            }
+
+            this.toggleModal('#confirm_delete_modal')
+        },
+        moveItem() {
+            this.toggleModal('#move_file_modal')
+        },
+        renameItem() {
+            this.toggleModal('#rename_file_modal')
+        },
+        blkSlct() {
+            this.bulkSelect = !this.bulkSelect
+
+            // reset when toggled off
+            if (this.isBulkSelecting()) {
+                return this.clearSelected()
+            }
+
+            this.bulkSelectAll = false
+            this.clearSelected()
+            this.resetInput('bulkList', [])
+            this.selectFirst()
+        },
+        blkSlctAll() {
+            // if no items in bulk list
+            if (this.bulkList == 0) {
+                // if no search query
+                if (!this.searchFor) {
+                    this.bulkSelectAll = true
+                    this.bulkList = this.allFiles.slice(0)
+                }
+
+                // if found search items
+                if (this.searchItemsCount) {
+                    this.bulkSelectAll = true
+                    $('#files li').each(function() {
+                        $(this).trigger('click')
+                    })
+                }
+            }
+
+            // if having search + having bulk items < search found items
+            else if (this.searchFor && this.bulkItemsCount < this.searchItemsCount) {
+                this.resetInput('bulkList', [])
+                this.clearSelected()
+
+                if (this.bulkSelectAll) {
+                    this.bulkSelectAll = false
+                } else {
+                    this.bulkSelectAll = true
+                    $('#files li').each(function() {
+                        $(this).trigger('click')
+                    })
+                }
+            }
+
+            // if NO search + having bulk items < all items
+            else if (!this.searchFor && this.bulkItemsCount < this.allItemsCount) {
+                if (this.bulkSelectAll) {
+                    this.bulkSelectAll = false
+                    this.resetInput('bulkList', [])
+                } else {
+                    this.bulkSelectAll = true
+                    this.bulkList = this.allFiles.slice(0)
+                }
+
+                this.clearSelected()
+            }
+
+            // otherwise
+            else {
+                this.bulkSelectAll = false
+                this.resetInput('bulkList', [])
+                this.clearSelected()
+            }
+
+            // if we have items in bulk list, select first item
+            if (this.bulkItemsCount) {
+                this.selectedFile = this.bulkList[0]
+            }
+        },
 
         /**
          * autoplay media