From 717144b9dd3f0d8b06eee5cafb8c7589c6ef9190 Mon Sep 17 00:00:00 2001 From: ctf0 Date: Fri, 27 Mar 2020 08:29:49 +0200 Subject: [PATCH] some updates --- README.md | 2 +- src/App/Controllers/Modules/GetContent.php | 1 - src/App/Controllers/Modules/Utils.php | 2 +- .../js/components/globalSearch/button.vue | 18 ++--- .../js/components/globalSearch/image.vue | 2 +- .../js/components/globalSearch/panel.vue | 2 +- .../assets/js/components/manager.vue | 11 +-- .../assets/js/components/search-by-voice.vue | 67 +++++++++++++++++++ .../js/components/usageIntro/button.vue | 2 +- .../container-click-overlay.vue} | 20 +++--- src/resources/assets/js/manager.js | 6 -- src/resources/assets/js/modules/icons.js | 1 + src/resources/assets/js/modules/url.js | 12 ++-- src/resources/assets/sass/manager.scss | 18 +++-- .../assets/sass/modules/usage-intro.scss | 11 +-- src/resources/assets/sass/packages/goo.scss | 2 +- src/resources/lang/en/messages.php | 4 ++ src/resources/views/_manager.blade.php | 56 +++++++++------- src/resources/views/partials/card.blade.php | 6 +- .../views/partials/mobile-nav.blade.php | 4 +- 20 files changed, 165 insertions(+), 82 deletions(-) create mode 100644 src/resources/assets/js/components/search-by-voice.vue rename src/resources/assets/js/components/{usageIntro/overlay.vue => utils/container-click-overlay.vue} (87%) diff --git a/README.md b/README.md index 77abe2b..59cc3ff 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ - [install dependencies](https://github.com/ctf0/Laravel-Media-Manager/wiki/Packages-In-Use) ```bash - yarn add vue vue-ls vue-infinite-loading vue-image-compare2 vue-tippy@v2 vue2-filters vue-input-autowidth vue-notif vue-clipboard2 vue-awesome@v2 vue-touch@next vue-focuspoint-component axios dropzone cropperjs keycode lottie-web plyr fuse.js music-metadata-browser idb-keyval + yarn add vue vue-ls vue-infinite-loading vue-image-compare2 vue-tippy@v2 vue2-filters vue-input-autowidth vue-notif vue-clipboard2 vue-awesome@v2 vue-touch@next vue-focuspoint-component axios dropzone cropperjs keycode lottie-web plyr fuse.js music-metadata-browser idb-keyval annyang yarn add worker-loader --dev ``` diff --git a/src/App/Controllers/Modules/GetContent.php b/src/App/Controllers/Modules/GetContent.php index 1450c80..fabab55 100644 --- a/src/App/Controllers/Modules/GetContent.php +++ b/src/App/Controllers/Modules/GetContent.php @@ -47,7 +47,6 @@ protected function getData($dir) $dirList = $this->getFolderContent($dir); $storageFolders = $this->getFolderListByType($dirList, 'dir'); $storageFiles = $this->getFolderListByType($dirList, 'file'); - $pattern = $this->ignoreFiles; // folders foreach ($storageFolders as $folder) { diff --git a/src/App/Controllers/Modules/Utils.php b/src/App/Controllers/Modules/Utils.php index accf584..cc62448 100644 --- a/src/App/Controllers/Modules/Utils.php +++ b/src/App/Controllers/Modules/Utils.php @@ -59,7 +59,7 @@ protected function filePattern($item) protected function getItemTime($time) { - return Carbon::createFromTimestamp($time)->{$this->LMF}(); + return $time ? Carbon::createFromTimestamp($time)->{$this->LMF}() : null; } /** diff --git a/src/resources/assets/js/components/globalSearch/button.vue b/src/resources/assets/js/components/globalSearch/button.vue index efe280c..669a449 100644 --- a/src/resources/assets/js/components/globalSearch/button.vue +++ b/src/resources/assets/js/components/globalSearch/button.vue @@ -1,5 +1,5 @@