Skip to content

Commit

Permalink
add PDF uploading
Browse files Browse the repository at this point in the history
  • Loading branch information
hellozach committed Sep 7, 2018
1 parent 6ab8ed4 commit 9c5cf68
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 22 deletions.
11 changes: 10 additions & 1 deletion resources/assets/js/components/media-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
});
6 changes: 4 additions & 2 deletions resources/assets/js/components/post-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
},
Expand Down
6 changes: 5 additions & 1 deletion resources/assets/js/gazette.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
});
35 changes: 18 additions & 17 deletions resources/views/kiosk/content/media.blade.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<media-browser inline-template>
<div>
<div class="row">
<div class="col-md-6">
<media-uploader emit="uploaded-to-media-browser"></media-uploader>
<div>
<div class="row">
<div class="col-md-6">
<media-uploader emit="uploaded-to-media-browser"></media-uploader>
</div>
<div class="col-md-6">
<form @submit.prevent="searchMedia">
<input type="text" class="form-control" placeholder="Search for media">
</form>
</div>
</div>
<div class="col-md-6">
<form @submit.prevent="searchMedia">
<input type="text" class="form-control" placeholder="Search for media">
</form>
</div>
</div>

<ul class="list-unstyled row text-center mt-4" v-if="media">
<li class="col-6 col-sm-3 pb-4" v-for="(file, index) in media">
<img :src="file.filename | asset_url" width="100">
</li>
</ul>
</div>
</media-browser>
<ul class="list-unstyled row text-center mt-4" v-if="media">
<li class="col-6 col-sm-3 pb-4" v-for="(file, index) in media">
<img :src="file.filename | asset_url" width="100">
<button class="btn btn-sm btn-secondary mt-2" @click.prevent="copyUrl(file)" v-if="file.filename.indexOf('.pdf') > -1">Copy URL</button>
</li>
</ul>
</div>
</media-browser>
2 changes: 1 addition & 1 deletion src/Http/Controllers/Kiosk/UploadController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down

0 comments on commit 9c5cf68

Please sign in to comment.