From 08bd9865e4eccb8811f2bca2ba79dc55f0414308 Mon Sep 17 00:00:00 2001 From: Bob den Otter Date: Fri, 4 Jan 2019 17:36:00 +0100 Subject: [PATCH] Some minor JS cleanup (with Prettier) `prettier --single-quote --write assets/js/app/editor/Components/**/*` --- .../editor/Components/Editor/Date/Date.vue | 81 +++++----- .../editor/Components/Editor/Date/index.md | 16 +- .../editor/Components/Editor/Html/Html.vue | 37 +++-- .../editor/Components/Editor/Image/Image.vue | 149 +++++++++++------- .../Components/Editor/Markdown/Markdown.vue | 21 ++- .../Components/Editor/Number/Number.vue | 18 +-- .../Components/Editor/Select/Select.vue | 41 +++-- .../editor/Components/Editor/Slug/Slug.vue | 107 +++++++------ .../editor/Components/Editor/Text/Text.vue | 30 ++-- .../Components/Editor/Textarea/Textarea.vue | 18 +-- .../js/app/editor/Components/Editor/index.js | 13 +- .../Components/General/Language/Language.vue | 74 ++++----- .../js/app/editor/Components/General/index.js | 4 +- package.json | 7 + 14 files changed, 328 insertions(+), 288 deletions(-) diff --git a/assets/js/app/editor/Components/Editor/Date/Date.vue b/assets/js/app/editor/Components/Editor/Date/Date.vue index 570217b7..954cb8e1 100644 --- a/assets/js/app/editor/Components/Editor/Date/Date.vue +++ b/assets/js/app/editor/Components/Editor/Date/Date.vue @@ -1,89 +1,89 @@ diff --git a/assets/js/app/editor/Components/Editor/Date/index.md b/assets/js/app/editor/Components/Editor/Date/index.md index c802f9df..40607862 100644 --- a/assets/js/app/editor/Components/Editor/Date/index.md +++ b/assets/js/app/editor/Components/Editor/Date/index.md @@ -2,11 +2,11 @@ #### Props -| Name | Type | -| ------------- |-------------- | -| value | `string` | -| name | `string` | -| disabled | `boolean` | -| mode | `string` | -| form | `string` | -| locale | `string` | \ No newline at end of file +| Name | Type | +| -------- | --------- | +| value | `string` | +| name | `string` | +| disabled | `boolean` | +| mode | `string` | +| form | `string` | +| locale | `string` | diff --git a/assets/js/app/editor/Components/Editor/Html/Html.vue b/assets/js/app/editor/Components/Editor/Html/Html.vue index e702dd39..c15ec2e2 100644 --- a/assets/js/app/editor/Components/Editor/Html/Html.vue +++ b/assets/js/app/editor/Components/Editor/Html/Html.vue @@ -1,6 +1,11 @@ @@ -9,12 +14,12 @@ import trumbowyg from 'vue-trumbowyg'; import 'trumbowyg/dist/ui/trumbowyg.css'; export default { - name: "editor-html", + name: 'editor-html', props: ['value', 'label', 'name'], components: { trumbowyg }, - mounted(){ + mounted() { this.val = this.$options.filters.strip(this.value); }, data: () => { @@ -22,20 +27,20 @@ export default { val: null, config: { btns: [ - // ['undo', 'redo'], - ['formatting'], - ['strong', 'em', 'del'], - ['link'], - ['insertImage'], - ['justifyLeft', 'justifyCenter', 'justifyRight'], - ['unorderedList', 'orderedList'], - ['horizontalRule'], - ['removeformat'], - ['fullscreen'], - ['viewHTML'], + // ['undo', 'redo'], + ['formatting'], + ['strong', 'em', 'del'], + ['link'], + ['insertImage'], + ['justifyLeft', 'justifyCenter', 'justifyRight'], + ['unorderedList', 'orderedList'], + ['horizontalRule'], + ['removeformat'], + ['fullscreen'], + ['viewHTML'] ] } }; - }, + } }; - \ No newline at end of file + diff --git a/assets/js/app/editor/Components/Editor/Image/Image.vue b/assets/js/app/editor/Components/Editor/Image/Image.vue index 0aa7e7c1..e64095f0 100644 --- a/assets/js/app/editor/Components/Editor/Image/Image.vue +++ b/assets/js/app/editor/Components/Editor/Image/Image.vue @@ -1,5 +1,5 @@ @@ -67,19 +91,28 @@ import baguetteBox from 'baguettebox.js'; import field from '../../../mixins/value'; export default { - name: "editor-image", - props: ['label', 'filename', 'name', 'thumbnail', 'alt', 'title', 'directory', 'media'], + name: 'editor-image', + props: [ + 'label', + 'filename', + 'name', + 'thumbnail', + 'alt', + 'title', + 'directory', + 'media' + ], mixins: [field], - mounted(){ + mounted() { this.previewImage = this.thumbnail; }, updated() { baguetteBox.run('.editor__image--preview', { - afterShow: () =>{ - noScroll.on() + afterShow: () => { + noScroll.on(); }, - afterHide: () =>{ - noScroll.off() + afterHide: () => { + noScroll.off(); } }); }, @@ -92,34 +125,35 @@ export default { }; }, methods: { - selectFile(){ - this.$refs.selectFile.click() + selectFile() { + this.$refs.selectFile.click(); }, onDragEnter(e) { - e.preventDefault(); - this.dragCount++; - this.isDragging = true; - return false; + e.preventDefault(); + this.dragCount++; + this.isDragging = true; + return false; }, onDragLeave(e) { - e.preventDefault(); - this.dragCount--; - if (this.dragCount <= 0) - this.isDragging = false; + e.preventDefault(); + this.dragCount--; + if (this.dragCount <= 0) this.isDragging = false; }, onDrop(e) { - e.preventDefault(); - e.stopPropagation(); - this.isDragging = false; - const image = e.dataTransfer.files[0]; - return this.uploadFile(image); + e.preventDefault(); + e.stopPropagation(); + this.isDragging = false; + const image = e.dataTransfer.files[0]; + return this.uploadFile(image); }, - uploadFile(file){ + uploadFile(file) { const thumbnailParams = this.thumbnail.split('?').pop(); const fd = new FormData(); const config = { - onUploadProgress: (progressEvent) => { - const percentCompleted = Math.round( (progressEvent.loaded * 100) / progressEvent.total ) + onUploadProgress: progressEvent => { + const percentCompleted = Math.round( + (progressEvent.loaded * 100) / progressEvent.total + ); this.progress = percentCompleted; }, headers: { @@ -127,21 +161,22 @@ export default { } }; fd.append('image', file); - this.$axios.post(this.directory, fd, config) - .then(res => { - this.filename = res.data; - this.previewImage = `/thumbs/${res.data}?${thumbnailParams}`; - this.progress = 0; - }) - .catch(err => { - console.log(err); - this.progress = 0; - }) - }, + this.$axios + .post(this.directory, fd, config) + .then(res => { + this.filename = res.data; + this.previewImage = `/thumbs/${res.data}?${thumbnailParams}`; + this.progress = 0; + }) + .catch(err => { + console.log(err); + this.progress = 0; + }); + } }, - computed:{ - fieldName(){ - return this.name + '[]' + computed: { + fieldName() { + return this.name + '[]'; } } }; diff --git a/assets/js/app/editor/Components/Editor/Markdown/Markdown.vue b/assets/js/app/editor/Components/Editor/Markdown/Markdown.vue index d3c25578..87bd91b2 100644 --- a/assets/js/app/editor/Components/Editor/Markdown/Markdown.vue +++ b/assets/js/app/editor/Components/Editor/Markdown/Markdown.vue @@ -1,34 +1,39 @@ \ No newline at end of file +@import '~simplemde/dist/simplemde.min.css'; + diff --git a/assets/js/app/editor/Components/Editor/Number/Number.vue b/assets/js/app/editor/Components/Editor/Number/Number.vue index 9d77de7c..15ef385b 100644 --- a/assets/js/app/editor/Components/Editor/Number/Number.vue +++ b/assets/js/app/editor/Components/Editor/Number/Number.vue @@ -1,13 +1,13 @@ @@ -15,8 +15,8 @@ import val from '../../../mixins/value'; export default { - name: "editor-number", + name: 'editor-number', props: ['value', 'label', 'name', 'step', 'type', 'disabled'], - mixins: [val], + mixins: [val] }; - \ No newline at end of file + diff --git a/assets/js/app/editor/Components/Editor/Select/Select.vue b/assets/js/app/editor/Components/Editor/Select/Select.vue index 9560b080..a8623c53 100644 --- a/assets/js/app/editor/Components/Editor/Select/Select.vue +++ b/assets/js/app/editor/Components/Editor/Select/Select.vue @@ -15,56 +15,63 @@ @tag="addTag" > + /> \ No newline at end of file + diff --git a/assets/js/app/editor/Components/Editor/Slug/Slug.vue b/assets/js/app/editor/Components/Editor/Slug/Slug.vue index 2bab430a..ff60fbae 100644 --- a/assets/js/app/editor/Components/Editor/Slug/Slug.vue +++ b/assets/js/app/editor/Components/Editor/Slug/Slug.vue @@ -1,43 +1,43 @@ @@ -46,7 +46,7 @@ import field from '../../../mixins/value'; export default { - name: "editor-slug", + name: 'editor-slug', props: ['value', 'label', 'name', 'prefix', 'fieldClass', 'generate'], mixins: [field], data: () => { @@ -56,41 +56,44 @@ export default { icon: 'lock' }; }, - mounted(){ - setTimeout(()=>{ - const title = document.querySelector(`input[name='fields[${this.generate}]']`).value; - if(title.length <= 0){ + mounted() { + setTimeout(() => { + const title = document.querySelector( + `input[name='fields[${this.generate}]']` + ).value; + if (title.length <= 0) { this.$root.$emit('generate-from-title', true); } }, 0); this.$root.$on('slugify-from-title', data => this.generateSlug()); }, methods: { - editSlug(){ + editSlug() { this.$root.$emit('generate-from-title', false); - if(!this.edit){ + if (!this.edit) { this.edit = true; - this.buttonText = "Edit" - this.icon = 'pencil-alt' + this.buttonText = 'Edit'; + this.icon = 'pencil-alt'; } else { - const slug = this.$options.filters.slugify(this.val) + const slug = this.$options.filters.slugify(this.val); this.val = slug; this.edit = false; - this.buttonText = "Locked" - this.icon = 'lock' + this.buttonText = 'Locked'; + this.icon = 'lock'; } }, - generateSlug(){ - const title = document.querySelector(`input[name='fields[${this.generate}]']`).value; + generateSlug() { + const title = document.querySelector( + `input[name='fields[${this.generate}]']` + ).value; const slug = this.$options.filters.slugify(title); this.val = slug; this.$root.$emit('generate-from-title', true); this.edit = false; - this.buttonText = "Locked" - this.icon = 'lock' + this.buttonText = 'Locked'; + this.icon = 'lock'; } } }; - diff --git a/assets/js/app/editor/Components/Editor/Text/Text.vue b/assets/js/app/editor/Components/Editor/Text/Text.vue index 8be37440..fc88c642 100644 --- a/assets/js/app/editor/Components/Editor/Text/Text.vue +++ b/assets/js/app/editor/Components/Editor/Text/Text.vue @@ -4,12 +4,12 @@ :id="id" class="form-control" :class="getType" - :name="name" - placeholder="…" - type="text" - v-model="val" - :disabled="disabled == 1" - > + :name="name" + placeholder="…" + type="text" + v-model="val" + :disabled="disabled == 1" + /> @@ -17,11 +17,11 @@ import field from '../../../mixins/value'; export default { - name: "editor-text", + name: 'editor-text', props: ['value', 'label', 'name', 'type', 'disabled', 'id'], mixins: [field], mounted() { - this.$root.$on('generate-from-title', data => this.generate = data); + this.$root.$on('generate-from-title', data => (this.generate = data)); }, data: () => { return { @@ -29,18 +29,18 @@ export default { }; }, watch: { - val(){ - if(this.generate){ + val() { + if (this.generate) { this.$root.$emit('slugify-from-title'); } } }, - computed:{ - getType(){ - if(this.type === 'large'){ - return 'form-control-lg' + computed: { + getType() { + if (this.type === 'large') { + return 'form-control-lg'; } } } }; - \ No newline at end of file + diff --git a/assets/js/app/editor/Components/Editor/Textarea/Textarea.vue b/assets/js/app/editor/Components/Editor/Textarea/Textarea.vue index 9ee9dc6a..248079dd 100644 --- a/assets/js/app/editor/Components/Editor/Textarea/Textarea.vue +++ b/assets/js/app/editor/Components/Editor/Textarea/Textarea.vue @@ -1,11 +1,11 @@ @@ -13,8 +13,8 @@ import field from '../../../mixins/value'; export default { - name: "editor-textarea", + name: 'editor-textarea', props: ['value', 'label', 'name'], - mixins: [field], + mixins: [field] }; - \ No newline at end of file + diff --git a/assets/js/app/editor/Components/Editor/index.js b/assets/js/app/editor/Components/Editor/index.js index c4178b6b..2f882b10 100644 --- a/assets/js/app/editor/Components/Editor/index.js +++ b/assets/js/app/editor/Components/Editor/index.js @@ -13,15 +13,4 @@ import Textarea from './Textarea/Textarea'; import Image from './Image/Image'; - -export { - Text, - Slug, - Number, - Date, - Select, - Html, - Markdown, - Textarea, - Image -}; +export { Text, Slug, Number, Date, Select, Html, Markdown, Textarea, Image }; diff --git a/assets/js/app/editor/Components/General/Language/Language.vue b/assets/js/app/editor/Components/General/Language/Language.vue index f063bcfd..5430c520 100644 --- a/assets/js/app/editor/Components/General/Language/Language.vue +++ b/assets/js/app/editor/Components/General/Language/Language.vue @@ -1,6 +1,6 @@ \ No newline at end of file + diff --git a/assets/js/app/editor/Components/General/index.js b/assets/js/app/editor/Components/General/index.js index 724009c9..6cc8f6cf 100644 --- a/assets/js/app/editor/Components/General/index.js +++ b/assets/js/app/editor/Components/General/index.js @@ -1,5 +1,3 @@ import Language from './Language/Language'; -export { - Language -}; \ No newline at end of file +export { Language }; diff --git a/package.json b/package.json index 2ffa9142..98e3fb9f 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,13 @@ "build": "encore production --progress", "test": "jest" }, + "eslintConfig": { + "root": true, + "extends": [ + "plugin:vue/essential", + "eslint:recommended" + ] + }, "browserslist": [ "> 1%" ],