From 9c5cf680c1828cbac61b675b65b7c17b5f89934d Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Thu, 6 Sep 2018 18:39:35 -0700 Subject: [PATCH] add PDF uploading --- .../assets/js/components/media-browser.js | 11 +++++- resources/assets/js/components/post-editor.js | 6 ++-- resources/assets/js/gazette.js | 6 +++- resources/views/kiosk/content/media.blade.php | 35 ++++++++++--------- .../Controllers/Kiosk/UploadController.php | 2 +- 5 files changed, 38 insertions(+), 22 deletions(-) diff --git a/resources/assets/js/components/media-browser.js b/resources/assets/js/components/media-browser.js index 7d17429..13dab2c 100644 --- a/resources/assets/js/components/media-browser.js +++ b/resources/assets/js/components/media-browser.js @@ -34,6 +34,15 @@ Vue.component('media-browser', { searchMedia() { return; - } + }, + + copyUrl(file) { + const el = document.createElement('textarea'); + el.value = this.$options.filters.asset_url(file.filename, true); + document.body.appendChild(el); + el.select(); + document.execCommand('copy'); + document.body.removeChild(el); + } } }); diff --git a/resources/assets/js/components/post-editor.js b/resources/assets/js/components/post-editor.js index 6d8d17b..b628c86 100644 --- a/resources/assets/js/components/post-editor.js +++ b/resources/assets/js/components/post-editor.js @@ -14,9 +14,11 @@ Vue.component('post-editor', { plugins: [ 'advlist link image hr media table directionality paste imagetools autoresize code', ], - toolbar1: 'styleselect | bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | hr table link media image', + toolbar1: 'styleselect | bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | hr table link media image', + file_picker_types: 'file image media', images_upload_url: '/gazette/media', - images_upload_handler: this.imageHandler + images_upload_handler: this.imageHandler, + convert_urls: false } } }, diff --git a/resources/assets/js/gazette.js b/resources/assets/js/gazette.js index ad36c50..dca8185 100644 --- a/resources/assets/js/gazette.js +++ b/resources/assets/js/gazette.js @@ -19,6 +19,10 @@ require('./components/media-browser'); require('./components/post-list'); require('./components/post-editor'); -Vue.filter('asset_url', function (filename) { +Vue.filter('asset_url', function (filename, ignorePdf) { + if (filename.indexOf('.pdf') > -1 && ignorePdf !== true) { + return '//placehold.it/300x300?text=PDF'; + } + return `//${window.location.host}/storage/${filename}` }); diff --git a/resources/views/kiosk/content/media.blade.php b/resources/views/kiosk/content/media.blade.php index 0fcfd1d..3cae8ec 100644 --- a/resources/views/kiosk/content/media.blade.php +++ b/resources/views/kiosk/content/media.blade.php @@ -1,20 +1,21 @@ -
-
-
- +
+
+
+ +
+
+
+ +
+
-
-
- -
-
-
-
    -
  • - -
  • -
-
- +
    +
  • + + +
  • +
+
+ diff --git a/src/Http/Controllers/Kiosk/UploadController.php b/src/Http/Controllers/Kiosk/UploadController.php index 230a43f..bd49d84 100644 --- a/src/Http/Controllers/Kiosk/UploadController.php +++ b/src/Http/Controllers/Kiosk/UploadController.php @@ -12,7 +12,7 @@ class UploadController extends Controller public function upload(Request $request) { $this->validate($request, [ - 'asset' => 'required|image|mimes:' . config('gazette.media.types') . '|max:' . config('gazette.media.max_size') . '', + 'asset' => 'required|mimes:' . config('gazette.media.types') . '|max:' . config('gazette.media.max_size') . '', ]); $file = $request->file('asset');