diff --git a/src/components/ActivityEntry.vue b/src/components/ActivityEntry.vue index 782503503..b4117bd15 100644 --- a/src/components/ActivityEntry.vue +++ b/src/components/ActivityEntry.vue @@ -63,7 +63,7 @@ export default { components: { RichText, }, - mixins: [ relativeDate ], + mixins: [relativeDate], props: { activity: { type: Object, diff --git a/src/components/AttachmentDragAndDrop.vue b/src/components/AttachmentDragAndDrop.vue index 68ceeb893..f8f7c52db 100644 --- a/src/components/AttachmentDragAndDrop.vue +++ b/src/components/AttachmentDragAndDrop.vue @@ -79,7 +79,7 @@ try { export default { name: 'AttachmentDragAndDrop', components: { Modal }, - mixins: [ attachmentUpload ], + mixins: [attachmentUpload], props: { cardId: { type: Number, diff --git a/src/components/Controls.vue b/src/components/Controls.vue index 6ffa54e98..ff3382950 100644 --- a/src/components/Controls.vue +++ b/src/components/Controls.vue @@ -206,7 +206,7 @@ export default { components: { Actions, ActionButton, Popover, Avatar, }, - mixins: [ labelStyle ], + mixins: [labelStyle], props: { board: { type: Object, diff --git a/src/components/board/DeletedTabSidebar.vue b/src/components/board/DeletedTabSidebar.vue index fc4cc82d4..99637d80d 100644 --- a/src/components/board/DeletedTabSidebar.vue +++ b/src/components/board/DeletedTabSidebar.vue @@ -38,7 +38,7 @@ import relativeDate from '../../mixins/relativeDate' export default { name: 'DeletedTabSidebar', - mixins: [ relativeDate ], + mixins: [relativeDate], props: { board: { type: Object, diff --git a/src/components/card/CardSidebarTabComments.vue b/src/components/card/CardSidebarTabComments.vue index 7feff2712..b1779d363 100644 --- a/src/components/card/CardSidebarTabComments.vue +++ b/src/components/card/CardSidebarTabComments.vue @@ -71,7 +71,7 @@ export default { }, }, watch: { - 'card': { + card: { immediate: true, handler() { this.loadComments() diff --git a/src/components/card/CommentItem.vue b/src/components/card/CommentItem.vue index 38507d578..70d10a2f0 100644 --- a/src/components/card/CommentItem.vue +++ b/src/components/card/CommentItem.vue @@ -60,7 +60,7 @@ const AtMention = { const { user, displayName } = context.props return createElement( 'span', - { attrs: { 'data-at-embedded': true, 'contenteditable': false } }, + { attrs: { 'data-at-embedded': true, contenteditable: false } }, [createElement(UserBubble, { props: { user, displayName }, attrs: { 'data-mention-id': user } })] ) }, @@ -76,7 +76,7 @@ export default { CommentForm, RichText, }, - mixins: [ relativeDate ], + mixins: [relativeDate], props: { comment: { type: Object, diff --git a/src/mixins/attachmentUpload.js b/src/mixins/attachmentUpload.js index ede21c5a3..b730b3af0 100644 --- a/src/mixins/attachmentUpload.js +++ b/src/mixins/attachmentUpload.js @@ -35,7 +35,7 @@ export default { async onLocalAttachmentSelected(file) { if (this.maxUploadSize > 0 && file.size > this.maxUploadSize) { showError( - t('deck', `Failed to upload {name}`, { name: file.name }) + ' - ' + t('deck', 'Failed to upload {name}', { name: file.name }) + ' - ' + t('deck', 'Maximum file size of {size} exceeded', { size: formatFileSize(this.maxUploadSize) }) ) event.target.value = '' @@ -49,7 +49,8 @@ export default { bodyFormData.append('file', file) await queue.add(async() => { try { - await this.$store.dispatch('createAttachment', { cardId: this.cardId, + await this.$store.dispatch('createAttachment', { + cardId: this.cardId, formData: bodyFormData, onUploadProgress: (e) => { const percentCompleted = Math.round((e.loaded * 100) / e.total) diff --git a/src/mixins/labelStyle.js b/src/mixins/labelStyle.js index 240f02958..8fe1d62b9 100644 --- a/src/mixins/labelStyle.js +++ b/src/mixins/labelStyle.js @@ -23,7 +23,7 @@ import Color from './color' export default { - mixins: [ Color ], + mixins: [Color], computed: { labelStyle() { return (label) => { diff --git a/src/services/CardApi.js b/src/services/CardApi.js index 114556d05..f1ec7aec0 100644 --- a/src/services/CardApi.js +++ b/src/services/CardApi.js @@ -31,7 +31,7 @@ export class CardApi { } addCard(card) { - return axios.post(this.url(`/cards`), card) + return axios.post(this.url('/cards'), card) .then( (response) => { return Promise.resolve(response.data) diff --git a/src/services/CommentApi.js b/src/services/CommentApi.js index 31fd98bef..e2c048f1e 100644 --- a/src/services/CommentApi.js +++ b/src/services/CommentApi.js @@ -31,7 +31,7 @@ export class CommentApi { } async loadComments({ cardId, limit, offset }) { - const api = await axios.get(generateOcsUrl(`apps/deck/api/v1.0/cards`, 2) + `${cardId}/comments`, { + const api = await axios.get(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments`, { params: { limit, offset }, headers: { 'OCS-APIRequest': 'true' }, }) @@ -39,7 +39,7 @@ export class CommentApi { } async createComment({ cardId, comment, replyTo }) { - const api = await axios.post(generateOcsUrl(`apps/deck/api/v1.0/cards`, 2) + `${cardId}/comments`, { + const api = await axios.post(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments`, { message: `${comment}`, parentId: replyTo ? replyTo.id : null, }) @@ -47,14 +47,14 @@ export class CommentApi { } async updateComment({ cardId, id, comment }) { - const api = await axios.put(generateOcsUrl(`apps/deck/api/v1.0/cards`, 2) + `${cardId}/comments/${id}`, { + const api = await axios.put(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments/${id}`, { message: `${comment}`, }) return api.data.ocs.data } async deleteComment({ cardId, id }) { - const api = await axios.delete(generateOcsUrl(`apps/deck/api/v1.0/cards`, 2) + `${cardId}/comments/${id}`) + const api = await axios.delete(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments/${id}`) return api.data.ocs.data } diff --git a/src/services/OverviewApi.js b/src/services/OverviewApi.js index 30f0890ab..3210e2bfd 100644 --- a/src/services/OverviewApi.js +++ b/src/services/OverviewApi.js @@ -26,7 +26,7 @@ import { generateOcsUrl } from '@nextcloud/router' export class OverviewApi { url(url) { - return generateOcsUrl(`apps/deck/api/v1.0`) + url + return generateOcsUrl('apps/deck/api/v1.0') + url } get(filter) { diff --git a/src/services/StackApi.js b/src/services/StackApi.js index 0ed440a22..5d1e0505a 100644 --- a/src/services/StackApi.js +++ b/src/services/StackApi.js @@ -81,7 +81,7 @@ export class StackApi { * @returns {Promise} */ createStack(stack) { - return axios.post(this.url(`/stacks`), stack) + return axios.post(this.url('/stacks'), stack) .then( (response) => { return Promise.resolve(response.data) diff --git a/src/store/comment.js b/src/store/comment.js index 9ec0c5845..ad58a5719 100644 --- a/src/store/comment.js +++ b/src/store/comment.js @@ -53,7 +53,7 @@ export default { if (state.comments[cardId] === undefined) { Vue.set(state.comments, cardId, { hasMore: comments.length > 0, - comments: [ ...comments ], + comments: [...comments], }) } else { const newComments = comments.filter((comment) => { diff --git a/src/store/main.js b/src/store/main.js index d6ee6f5e7..4987421b2 100644 --- a/src/store/main.js +++ b/src/store/main.js @@ -312,7 +312,7 @@ export default new Vuex.Store({ async setConfig({ commit }, config) { for (const key in config) { try { - await axios.post(generateOcsUrl(`apps/deck/api/v1.0/config`) + key, { + await axios.post(generateOcsUrl('apps/deck/api/v1.0/config') + key, { value: config[key], }) commit('SET_CONFIG', { key, value: config[key] }) diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index 669f55c38..6e4960127 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -62,7 +62,7 @@ export default { DueDate, DashboardWidget, }, - mixins: [ labelStyle ], + mixins: [labelStyle], data() { return { loading: false,