v1.2.3

ctf0 · Sep 17, 2017 · 0060f26 · 0060f26
1 parent 1a7a54b
commit 0060f26
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php" : "~7.0",
        "illuminate/support": "^5.4",
-       "tightenco/ziggy": "^0.3",
+       "tightenco/ziggy": "^0.4",
        "ctf0/package-changelog": "^1.0"
     },
     "autoload": {

diff --git a/logs/v1.2.2.txt b/logs/v1.2.2.txt
diff --git a/logs/v1.2.3.txt b/logs/v1.2.3.txt
@@ -0,0 +1,4 @@
+- fixed sortBy:size
+- fixed sortBy:last_modified
+- add new option to config https://github.com/ctf0/Laravel-Media-Manager/blob/master/src/config/mediaManager.php#L51
+- update view
diff --git a/src/Controllers/MediaController.php b/src/Controllers/MediaController.php
@@ -308,24 +308,26 @@ public function getFiles($dir)
         foreach ($storageFolders as $folder) {
             if (!preg_grep($pattern, [$folder])) {
                 $files[] = [
-                    'name'          => strpos($folder, '/') > 1 ? str_replace('/', '', strrchr($folder, '/')) : $folder,
-                    'type'          => 'folder',
-                    'path'          => $this->storageDisk->url($folder),
-                    'size'          => '',
-                    'items'         => count($this->storageDisk->allFiles($folder)) + count($this->storageDisk->allDirectories($folder)),
-                    'last_modified' => Carbon::createFromTimestamp($this->storageDisk->lastModified($folder))->{$this->LMF}(),
+                    'name'                   => strpos($folder, '/') > 1 ? str_replace('/', '', strrchr($folder, '/')) : $folder,
+                    'type'                   => 'folder',
+                    'path'                   => $this->storageDisk->url($folder),
+                    'size'                   => '',
+                    'items'                  => count($this->storageDisk->allFiles($folder)) + count($this->storageDisk->allDirectories($folder)),
+                    'last_modified'          => $this->storageDisk->lastModified($folder),
+                    'last_modified_formated' => Carbon::createFromTimestamp($this->storageDisk->lastModified($folder))->{$this->LMF}(),
                 ];
             }
         }
 
         foreach ($storageFiles as $file) {
             if (!preg_grep($pattern, [$file])) {
                 $files[] = [
-                    'name'          => strpos($file, '/') > 1 ? str_replace('/', '', strrchr($file, '/')) : $file,
-                    'type'          => $this->storageDisk->mimeType($file),
-                    'path'          => $this->storageDisk->url($file),
-                    'size'          => $this->storageDisk->size($file),
-                    'last_modified' => Carbon::createFromTimestamp($this->storageDisk->lastModified($file))->{$this->LMF}(),
+                    'name'                   => strpos($file, '/') > 1 ? str_replace('/', '', strrchr($file, '/')) : $file,
+                    'type'                   => $this->storageDisk->mimeType($file),
+                    'path'                   => $this->storageDisk->url($file),
+                    'size'                   => $this->storageDisk->size($file),
+                    'last_modified'          => $this->storageDisk->lastModified($file),
+                    'last_modified_formated' => Carbon::createFromTimestamp($this->storageDisk->lastModified($file))->{$this->LMF}(),
                 ];
             }
         }

diff --git a/src/resources/assets/js/components/bulma/media.vue b/src/resources/assets/js/components/bulma/media.vue
@@ -550,12 +550,6 @@ export default {
                 $('#file_loader').hide()
                 this.selectFirst()
                 $('#right').fadeIn()
-
-                this.allFiles.map((e) => {
-                    if (typeof e.size !== 'undefined') {
-                        e.size = this.bytesToSize(e.size)
-                    }
-                })
             })
 
             // dirs list

diff --git a/src/resources/views/bulma/media.blade.php b/src/resources/views/bulma/media.blade.php
@@ -260,10 +260,10 @@ class="button"
                                                         </template>
 
                                                         <span class="icon is-large" v-else>
-                                                            <i v-if="fileTypeIs(file, 'folder')" class="fa fa-folder"></i>
-                                                            <i v-if="fileTypeIs(file, 'video')" class="fa fa-video-camera"></i>
-                                                            <i v-if="fileTypeIs(file, 'audio')" class="fa fa-music"></i>
-                                                            <i v-if="fileTypeIs(file, 'text')" class="fa fa-file-text"></i>
+                                                            <i v-if="fileTypeIs(file, 'folder')" class="fa fa-folder fa-3x"></i>
+                                                            <i v-if="fileTypeIs(file, 'video')" class="fa fa-video-camera fa-3x"></i>
+                                                            <i v-if="fileTypeIs(file, 'audio')" class="fa fa-music fa-3x"></i>
+                                                            <i v-if="fileTypeIs(file, 'text')" class="fa fa-file-text fa-3x"></i>
                                                         </span>
                                                     </div>
                                                     <div class="details">
@@ -273,7 +273,7 @@ class="button"
                                                                 @{{ file.items }} item(s)
                                                             </template>
                                                             <template v-else>
-                                                                <span class="file_size">@{{ file.size }}</span>
+                                                                <span class="file_size">@{{ bytesToSize(file.size) }}</span>
                                                             </template>
                                                         </small>
                                                     </div>
@@ -335,13 +335,13 @@ class="button"
                                                         <h4>Title: <span>@{{ selectedFile.name }}</span></h4>
                                                         <h4>Type: <span>@{{ selectedFile.type }}</span></h4>
                                                         <template v-if="!selectedFileIs('folder')">
-                                                            <h4>Size: <span>@{{ selectedFile.size }}</span></h4>
+                                                            <h4>Size: <span>@{{ bytesToSize(selectedFile.size) }}</span></h4>
                                                             <h4>Public URL: <a :href="selectedFile.path" target="_blank">Click Here</a></h4>
                                                         </template>
                                                         <template v-else>
                                                             <h4>items: <span>@{{ selectedFile.items }} Item(s)</span></h4>
                                                         </template>
-                                                        <h4>Last Modified: <span>@{{ selectedFile.last_modified }}</span></h4>
+                                                        <h4>Last Modified: <span>@{{ selectedFile.last_modified_formated }}</span></h4>
                                                     </div>
                                                 </div>
                                             </template>