Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 0060f26

Browse files
ctf0ctf0
committed
v1.2.3
1 parent 1a7a54b commit 0060f26

File tree

6 files changed

+25
-28
lines changed

6 files changed

+25
-28
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php" : "~7.0",
2020
"illuminate/support": "^5.4",
21-
"tightenco/ziggy": "^0.3",
21+
"tightenco/ziggy": "^0.4",
2222
"ctf0/package-changelog": "^1.0"
2323
},
2424
"autoload": {

‎logs/v1.2.2.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎logs/v1.2.3.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- fixed sortBy:size
2+
- fixed sortBy:last_modified
3+
- add new option to config https://github.com/ctf0/Laravel-Media-Manager/blob/master/src/config/mediaManager.php#L51
4+
- update view

‎src/Controllers/MediaController.php

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -308,24 +308,26 @@ public function getFiles($dir)
308308
foreach ($storageFolders as $folder) {
309309
if (!preg_grep($pattern, [$folder])) {
310310
$files[] = [
311-
'name' => strpos($folder, '/') > 1 ? str_replace('/', '', strrchr($folder, '/')) : $folder,
312-
'type' => 'folder',
313-
'path' => $this->storageDisk->url($folder),
314-
'size' => '',
315-
'items' => count($this->storageDisk->allFiles($folder)) + count($this->storageDisk->allDirectories($folder)),
316-
'last_modified' => Carbon::createFromTimestamp($this->storageDisk->lastModified($folder))->{$this->LMF}(),
311+
'name' => strpos($folder, '/') > 1 ? str_replace('/', '', strrchr($folder, '/')) : $folder,
312+
'type' => 'folder',
313+
'path' => $this->storageDisk->url($folder),
314+
'size' => '',
315+
'items' => count($this->storageDisk->allFiles($folder)) + count($this->storageDisk->allDirectories($folder)),
316+
'last_modified' => $this->storageDisk->lastModified($folder),
317+
'last_modified_formated' => Carbon::createFromTimestamp($this->storageDisk->lastModified($folder))->{$this->LMF}(),
317318
];
318319
}
319320
}
320321

321322
foreach ($storageFiles as $file) {
322323
if (!preg_grep($pattern, [$file])) {
323324
$files[] = [
324-
'name' => strpos($file, '/') > 1 ? str_replace('/', '', strrchr($file, '/')) : $file,
325-
'type' => $this->storageDisk->mimeType($file),
326-
'path' => $this->storageDisk->url($file),
327-
'size' => $this->storageDisk->size($file),
328-
'last_modified' => Carbon::createFromTimestamp($this->storageDisk->lastModified($file))->{$this->LMF}(),
325+
'name' => strpos($file, '/') > 1 ? str_replace('/', '', strrchr($file, '/')) : $file,
326+
'type' => $this->storageDisk->mimeType($file),
327+
'path' => $this->storageDisk->url($file),
328+
'size' => $this->storageDisk->size($file),
329+
'last_modified' => $this->storageDisk->lastModified($file),
330+
'last_modified_formated' => Carbon::createFromTimestamp($this->storageDisk->lastModified($file))->{$this->LMF}(),
329331
];
330332
}
331333
}

‎src/resources/assets/js/components/bulma/media.vue

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -550,12 +550,6 @@ export default {
550550
$('#file_loader').hide()
551551
this.selectFirst()
552552
$('#right').fadeIn()
553-
554-
this.allFiles.map((e) => {
555-
if (typeof e.size !== 'undefined') {
556-
e.size = this.bytesToSize(e.size)
557-
}
558-
})
559553
})
560554
561555
// dirs list

‎src/resources/views/bulma/media.blade.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ class="button"
260260
</template>
261261

262262
<span class="icon is-large" v-else>
263-
<i v-if="fileTypeIs(file, 'folder')" class="fa fa-folder"></i>
264-
<i v-if="fileTypeIs(file, 'video')" class="fa fa-video-camera"></i>
265-
<i v-if="fileTypeIs(file, 'audio')" class="fa fa-music"></i>
266-
<i v-if="fileTypeIs(file, 'text')" class="fa fa-file-text"></i>
263+
<i v-if="fileTypeIs(file, 'folder')" class="fa fa-folder fa-3x"></i>
264+
<i v-if="fileTypeIs(file, 'video')" class="fa fa-video-camera fa-3x"></i>
265+
<i v-if="fileTypeIs(file, 'audio')" class="fa fa-music fa-3x"></i>
266+
<i v-if="fileTypeIs(file, 'text')" class="fa fa-file-text fa-3x"></i>
267267
</span>
268268
</div>
269269
<div class="details">
@@ -273,7 +273,7 @@ class="button"
273273
@{{ file.items }} item(s)
274274
</template>
275275
<template v-else>
276-
<span class="file_size">@{{ file.size }}</span>
276+
<span class="file_size">@{{ bytesToSize(file.size) }}</span>
277277
</template>
278278
</small>
279279
</div>
@@ -335,13 +335,13 @@ class="button"
335335
<h4>Title: <span>@{{ selectedFile.name }}</span></h4>
336336
<h4>Type: <span>@{{ selectedFile.type }}</span></h4>
337337
<template v-if="!selectedFileIs('folder')">
338-
<h4>Size: <span>@{{ selectedFile.size }}</span></h4>
338+
<h4>Size: <span>@{{ bytesToSize(selectedFile.size) }}</span></h4>
339339
<h4>Public URL: <a :href="selectedFile.path" target="_blank">Click Here</a></h4>
340340
</template>
341341
<template v-else>
342342
<h4>items: <span>@{{ selectedFile.items }} Item(s)</span></h4>
343343
</template>
344-
<h4>Last Modified: <span>@{{ selectedFile.last_modified }}</span></h4>
344+
<h4>Last Modified: <span>@{{ selectedFile.last_modified_formated }}</span></h4>
345345
</div>
346346
</div>
347347
</template>

0 commit comments

Comments
 (0)