From 5ada3eaef1c0eda81d94a3fe26826313241d929d Mon Sep 17 00:00:00 2001 From: dartcafe Date: Sun, 18 Apr 2021 22:58:08 +0200 Subject: object-shorthand Signed-off-by: dartcafe --- src/js/components/Navigation/Navigation.vue | 6 +++--- src/js/components/Poll/PublicEmail.vue | 2 +- src/js/components/Poll/PublicRegisterModal.vue | 4 ++-- src/js/components/Settings/FeatureSettings.vue | 2 +- src/js/components/Shares/SharesEffective.vue | 4 ++-- src/js/components/Shares/SharesPublic.vue | 2 +- src/js/components/Shares/SharesUnsent.vue | 6 +++--- src/js/components/SideBar/SideBarTabShare.vue | 2 +- src/js/components/User/UserMenu.vue | 2 +- src/js/mixins/optionMixins.js | 4 ++-- src/js/store/modules/comments.js | 4 ++-- src/js/store/modules/options.js | 14 +++++++------- src/js/store/modules/poll.js | 10 +++++----- src/js/store/modules/share.js | 8 ++++---- src/js/store/modules/shares.js | 8 ++++---- src/js/store/modules/votes.js | 4 ++-- src/js/views/Administration.vue | 2 +- src/js/views/PollList.vue | 10 +++++----- src/js/views/Vote.vue | 6 +++--- 19 files changed, 50 insertions(+), 50 deletions(-) (limited to 'src/js') diff --git a/src/js/components/Navigation/Navigation.vue b/src/js/components/Navigation/Navigation.vue index 0dbcf614..53d72467 100644 --- a/src/js/components/Navigation/Navigation.vue +++ b/src/js/components/Navigation/Navigation.vue @@ -111,7 +111,7 @@ export default { async clonePoll(pollId) { try { - const response = await this.$store.dispatch('poll/clone', { pollId: pollId }) + const response = await this.$store.dispatch('poll/clone', { pollId }) emit('update-polls') this.$router.push({ name: 'vote', params: { id: response.data.id } }) } catch { @@ -121,7 +121,7 @@ export default { async switchDeleted(pollId) { try { - await this.$store.dispatch('poll/switchDeleted', { pollId: pollId }) + await this.$store.dispatch('poll/switchDeleted', { pollId }) emit('update-polls') } catch { showError(t('polls', 'Error deleting poll.')) @@ -130,7 +130,7 @@ export default { async deletePermanently(pollId) { try { - await this.$store.dispatch('poll/delete', { pollId: pollId }) + await this.$store.dispatch('poll/delete', { pollId }) // if we permanently delete current selected poll, // reload deleted polls route if (this.$route.params.id && this.$route.params.id === pollId) { diff --git a/src/js/components/Poll/PublicEmail.vue b/src/js/components/Poll/PublicEmail.vue index 4bf1f8a4..786d7946 100644 --- a/src/js/components/Poll/PublicEmail.vue +++ b/src/js/components/Poll/PublicEmail.vue @@ -85,7 +85,7 @@ export default { }, watch: { - emailAddress: function() { + emailAddress() { this.validateEmailAddress() }, }, diff --git a/src/js/components/Poll/PublicRegisterModal.vue b/src/js/components/Poll/PublicRegisterModal.vue index 97a0fb0f..9a295a22 100644 --- a/src/js/components/Poll/PublicRegisterModal.vue +++ b/src/js/components/Poll/PublicRegisterModal.vue @@ -181,7 +181,7 @@ export default { }, watch: { - userName: function() { + userName() { if (this.userName.length > 2) { this.checkingUserName = true if (this.userName !== this.share.userid) { @@ -193,7 +193,7 @@ export default { } }, - emailAddress: function() { + emailAddress() { if (this.emailAddress.length > 0) { this.checkingEmailAddress = true this.validateEmailAddress() diff --git a/src/js/components/Settings/FeatureSettings.vue b/src/js/components/Settings/FeatureSettings.vue index 1c103fab..10429008 100644 --- a/src/js/components/Settings/FeatureSettings.vue +++ b/src/js/components/Settings/FeatureSettings.vue @@ -127,7 +127,7 @@ export default { if (this.settings.checkCalendars.includes(calendar.key)) { await this.writeValue({ checkCalendars: this.settings.checkCalendars.filter(item => item !== calendar.key.toString()) }) } else { - await this.$store.commit('settings/addCheckCalendar', { calendar: calendar }) + await this.$store.commit('settings/addCheckCalendar', { calendar }) } this.$store.dispatch('settings/write') }, diff --git a/src/js/components/Shares/SharesEffective.vue b/src/js/components/Shares/SharesEffective.vue index 7560272c..e2d3d519 100644 --- a/src/js/components/Shares/SharesEffective.vue +++ b/src/js/components/Shares/SharesEffective.vue @@ -78,7 +78,7 @@ export default { methods: { async sendInvitation(share) { - const response = await this.$store.dispatch('shares/sendInvitation', { share: share }) + const response = await this.$store.dispatch('shares/sendInvitation', { share }) if (response.data?.sentResult?.sentMails) { response.data.sentResult.sentMails.forEach((item) => { showSuccess(t('polls', 'Invitation sent to {emailAddress}', { emailAddress: item })) @@ -102,7 +102,7 @@ export default { }, removeShare(share) { - this.$store.dispatch('shares/delete', { share: share }) + this.$store.dispatch('shares/delete', { share }) }, }, diff --git a/src/js/components/Shares/SharesPublic.vue b/src/js/components/Shares/SharesPublic.vue index 6a96f7a2..79bf5b6f 100644 --- a/src/js/components/Shares/SharesPublic.vue +++ b/src/js/components/Shares/SharesPublic.vue @@ -79,7 +79,7 @@ export default { }, removeShare(share) { - this.$store.dispatch('shares/delete', { share: share }) + this.$store.dispatch('shares/delete', { share }) }, async addShare(payload) { diff --git a/src/js/components/Shares/SharesUnsent.vue b/src/js/components/Shares/SharesUnsent.vue index eafad028..6e7d56f0 100644 --- a/src/js/components/Shares/SharesUnsent.vue +++ b/src/js/components/Shares/SharesUnsent.vue @@ -75,7 +75,7 @@ export default { methods: { async resolveGroup(share) { try { - await this.$store.dispatch('shares/resolveGroup', { share: share }) + await this.$store.dispatch('shares/resolveGroup', { share }) } catch (e) { if (e.response.status === 409 && e.response.data === 'Circles is not enabled for this user') { showError(t('polls', 'Resolving of {name} is not possible. The circles app is not enabled.', { name: share.displayName })) @@ -88,7 +88,7 @@ export default { }, async sendInvitation(share) { - const response = await this.$store.dispatch('shares/sendInvitation', { share: share }) + const response = await this.$store.dispatch('shares/sendInvitation', { share }) if (response.data?.sentResult?.sentMails) { response.data.sentResult.sentMails.forEach((item) => { showSuccess(t('polls', 'Invitation sent to {emailAddress}', { emailAddress: item })) @@ -103,7 +103,7 @@ export default { }, removeShare(share) { - this.$store.dispatch('shares/delete', { share: share }) + this.$store.dispatch('shares/delete', { share }) }, }, } diff --git a/src/js/components/SideBar/SideBarTabShare.vue b/src/js/components/SideBar/SideBarTabShare.vue index 7e6dec82..bc84d6ae 100644 --- a/src/js/components/SideBar/SideBarTabShare.vue +++ b/src/js/components/SideBar/SideBarTabShare.vue @@ -59,7 +59,7 @@ export default { methods: { removeShare(share) { - this.$store.dispatch('shares/delete', { share: share }) + this.$store.dispatch('shares/delete', { share }) }, }, } diff --git a/src/js/components/User/UserMenu.vue b/src/js/components/User/UserMenu.vue index dcd3e9e1..171669be 100644 --- a/src/js/components/User/UserMenu.vue +++ b/src/js/components/User/UserMenu.vue @@ -124,7 +124,7 @@ export default { }, watch: { - emailAddress: function() { + emailAddress() { this.emailAddressTemp = this.emailAddress }, }, diff --git a/src/js/mixins/optionMixins.js b/src/js/mixins/optionMixins.js index 9e5257cd..e05cadf6 100644 --- a/src/js/mixins/optionMixins.js +++ b/src/js/mixins/optionMixins.js @@ -1,7 +1,7 @@ export const confirmOption = { methods: { confirmOption(option) { - this.$store.dispatch('options/confirm', { option: option }) + this.$store.dispatch('options/confirm', { option }) }, }, } @@ -9,7 +9,7 @@ export const confirmOption = { export const removeOption = { methods: { removeOption(option) { - this.$store.dispatch('options/delete', { option: option }) + this.$store.dispatch('options/delete', { option }) }, }, } diff --git a/src/js/store/modules/comments.js b/src/js/store/modules/comments.js index 696400d7..7d5e7bd5 100644 --- a/src/js/store/modules/comments.js +++ b/src/js/store/modules/comments.js @@ -102,7 +102,7 @@ const actions = { const response = await axios.post(generateUrl(endPoint + '/comment'), { message: payload.message }) context.commit('add', { comment: response.data.comment }) } catch (e) { - console.error('Error writing comment', { error: e.response }, { payload: payload }) + console.error('Error writing comment', { error: e.response }, { payload }) throw e } }, @@ -118,7 +118,7 @@ const actions = { await axios.delete(generateUrl(endPoint + '/comment/' + payload.comment.id)) context.commit('delete', { comment: payload.comment }) } catch (e) { - console.error('Error deleting comment', { error: e.response }, { payload: payload }) + console.error('Error deleting comment', { error: e.response }, { payload }) throw e } }, diff --git a/src/js/store/modules/options.js b/src/js/store/modules/options.js index 4fb942e9..6bce196f 100644 --- a/src/js/store/modules/options.js +++ b/src/js/store/modules/options.js @@ -143,7 +143,7 @@ const actions = { }) context.commit('setItem', { option: response.data.option }) } catch (e) { - console.error('Error adding option: ' + e.response.data, { error: e.response }, { payload: payload }) + console.error('Error adding option: ' + e.response.data, { error: e.response }, { payload }) context.dispatch('list') throw e } @@ -159,7 +159,7 @@ const actions = { }) context.commit('setItem', { option: response.data.option }) } catch (e) { - console.error('Error updating option', { error: e.response }, { payload: payload }) + console.error('Error updating option', { error: e.response }, { payload }) context.dispatch('list') throw e } @@ -171,7 +171,7 @@ const actions = { await axios.delete(generateUrl(endPoint + '/' + payload.option.id)) context.commit('delete', { option: payload.option }) } catch (e) { - console.error('Error deleting option', { error: e.response }, { payload: payload }) + console.error('Error deleting option', { error: e.response }, { payload }) context.dispatch('list') throw e } @@ -184,7 +184,7 @@ const actions = { const response = await axios.put(generateUrl(endPoint + '/' + payload.option.id + '/confirm')) context.commit('setItem', { option: response.data.option }) } catch (e) { - console.error('Error confirming option', { error: e.response }, { payload: payload }) + console.error('Error confirming option', { error: e.response }, { payload }) context.dispatch('list') throw e } @@ -199,7 +199,7 @@ const actions = { }) context.commit('set', { options: response.data.options }) } catch (e) { - console.error('Error reordering option', { error: e.response }, { payload: payload }) + console.error('Error reordering option', { error: e.response }, { payload }) context.dispatch('list') throw e } @@ -215,7 +215,7 @@ const actions = { }) context.commit('set', { options: response.data.options }) } catch (e) { - console.error('Error creating sequence', { error: e.response }, { payload: payload }) + console.error('Error creating sequence', { error: e.response }, { payload }) context.dispatch('list') throw e } @@ -230,7 +230,7 @@ const actions = { }) context.commit('set', { options: response.data.options }) } catch (e) { - console.error('Error shifting dates', { error: e.response }, { payload: payload }) + console.error('Error shifting dates', { error: e.response }, { payload }) context.dispatch('list') throw e } diff --git a/src/js/store/modules/poll.js b/src/js/store/modules/poll.js index 87da57ba..07774c95 100644 --- a/src/js/store/modules/poll.js +++ b/src/js/store/modules/poll.js @@ -57,7 +57,7 @@ const state = defaultPoll() const namespaced = true const modules = { - acl: acl, + acl, } const mutations = { @@ -192,7 +192,7 @@ const actions = { try { return await axios.post(generateUrl(endPoint), { title: payload.title, type: payload.type }) } catch (e) { - console.error('Error adding poll:', { error: e.response }, { state: state }) + console.error('Error adding poll:', { error: e.response }, { state }) throw e } }, @@ -202,7 +202,7 @@ const actions = { try { return await axios.get(generateUrl(endPoint + '/' + payload.pollId + '/clone')) } catch (e) { - console.error('Error cloning poll', { error: e.response }, { payload: payload }) + console.error('Error cloning poll', { error: e.response }, { payload }) } }, @@ -222,7 +222,7 @@ const actions = { try { await axios.put(generateUrl(endPoint + '/' + payload.pollId + '/switchDeleted')) } catch (e) { - console.error('Error switching deleted status', { error: e.response }, { payload: payload }) + console.error('Error switching deleted status', { error: e.response }, { payload }) } }, @@ -231,7 +231,7 @@ const actions = { try { await axios.delete(generateUrl(endPoint + '/' + payload.pollId)) } catch (e) { - console.error('Error deleting poll', { error: e.response }, { payload: payload }) + console.error('Error deleting poll', { error: e.response }, { payload }) } }, diff --git a/src/js/store/modules/share.js b/src/js/store/modules/share.js index 4d9639bb..9fda41e0 100644 --- a/src/js/store/modules/share.js +++ b/src/js/store/modules/share.js @@ -88,7 +88,7 @@ const actions = { }) return { token: response.data.share.token } } catch (e) { - console.error('Error writing personal share', { error: e.response }, { payload: payload }) + console.error('Error writing personal share', { error: e.response }, { payload }) throw e } }, @@ -107,7 +107,7 @@ const actions = { context.commit('set', { share: response.data.share }) context.dispatch('poll/get', null, { root: true }) } catch (e) { - console.error('Error writing email address', { error: e.response }, { payload: payload }) + console.error('Error writing email address', { error: e.response }, { payload }) throw e } }, @@ -125,7 +125,7 @@ const actions = { context.dispatch('subscription/update', false, { root: true }) context.dispatch('poll/get', null, { root: true }) } catch (e) { - console.error('Error writing email address', { error: e.response }, { payload: payload }) + console.error('Error writing email address', { error: e.response }, { payload }) throw e } }, @@ -140,7 +140,7 @@ const actions = { try { return await axios.get(generateUrl(endPoint + '/resend')) } catch (e) { - console.error('Error sending invitation', { error: e.response }, { payload: payload }) + console.error('Error sending invitation', { error: e.response }, { payload }) throw e } }, diff --git a/src/js/store/modules/shares.js b/src/js/store/modules/shares.js index 45b7834c..f93e4cd0 100644 --- a/src/js/store/modules/shares.js +++ b/src/js/store/modules/shares.js @@ -111,7 +111,7 @@ const actions = { try { await axios.post(generateUrl(endPoint + '/share'), payload.share) } catch (e) { - console.error('Error writing share', { error: e.response }, { payload: payload }) + console.error('Error writing share', { error: e.response }, { payload }) throw e } finally { context.dispatch('list') @@ -125,7 +125,7 @@ const actions = { try { await axios.delete(generateUrl(endPoint + '/' + payload.share.token)) } catch (e) { - console.error('Error removing share', { error: e.response }, { payload: payload }) + console.error('Error removing share', { error: e.response }, { payload }) throw e } finally { context.dispatch('list') @@ -137,7 +137,7 @@ const actions = { try { return await axios.post(generateUrl(endPoint + '/' + payload.share.token + '/invite')) } catch (e) { - console.error('Error sending invitation', { error: e.response }, { payload: payload }) + console.error('Error sending invitation', { error: e.response }, { payload }) throw e } finally { context.dispatch('list') @@ -149,7 +149,7 @@ const actions = { try { await axios.get(generateUrl(endPoint + '/' + payload.share.token + '/resolve')) } catch (e) { - console.error('Error exploding group', e.response.data, { error: e.response }, { payload: payload }) + console.error('Error exploding group', e.response.data, { error: e.response }, { payload }) throw e } finally { context.dispatch('list') diff --git a/src/js/store/modules/votes.js b/src/js/store/modules/votes.js index 52c35bed..d5a361dc 100644 --- a/src/js/store/modules/votes.js +++ b/src/js/store/modules/votes.js @@ -129,7 +129,7 @@ const actions = { context.dispatch('list') context.dispatch('options/list', null, { root: true }) } else { - console.error('Error setting vote', { error: e.response }, { payload: payload }) + console.error('Error setting vote', { error: e.response }, { payload }) throw e } } @@ -141,7 +141,7 @@ const actions = { await axios.delete(generateUrl(endPoint)) context.commit('deleteVotes', payload) } catch (e) { - console.error('Error deleting votes', { error: e.response }, { payload: payload }) + console.error('Error deleting votes', { error: e.response }, { payload }) throw e } }, diff --git a/src/js/views/Administration.vue b/src/js/views/Administration.vue index daa83fac..af3f5204 100644 --- a/src/js/views/Administration.vue +++ b/src/js/views/Administration.vue @@ -188,7 +188,7 @@ export default { async switchDeleted(pollId) { try { - await this.$store.dispatch('poll/switchDeleted', { pollId: pollId }) + await this.$store.dispatch('poll/switchDeleted', { pollId }) emit('update-polls') } catch { showError(t('polls', 'Error switching deleted status.')) diff --git a/src/js/views/PollList.vue b/src/js/views/PollList.vue index 0dd41d74..ef63f223 100644 --- a/src/js/views/PollList.vue +++ b/src/js/views/PollList.vue @@ -172,7 +172,7 @@ export default { async loadPoll(pollId) { try { - await this.$store.dispatch({ type: 'poll/get', pollId: pollId }) + await this.$store.dispatch({ type: 'poll/get', pollId }) emit('toggle-sidebar', { open: true }) } catch { showError(t('polls', 'Error loading poll')) @@ -200,7 +200,7 @@ export default { callPoll(index, poll, name) { this.$router.push({ - name: name, + name, params: { id: poll.id, }, @@ -209,7 +209,7 @@ export default { async switchDeleted(pollId) { try { - await this.$store.dispatch('poll/switchDeleted', { pollId: pollId }) + await this.$store.dispatch('poll/switchDeleted', { pollId }) } catch { showError(t('polls', 'Error deleting poll.')) } finally { @@ -219,7 +219,7 @@ export default { async deletePermanently(pollId) { try { - await this.$store.dispatch('poll/delete', { pollId: pollId }) + await this.$store.dispatch('poll/delete', { pollId }) } catch { showError(t('polls', 'Error deleting poll.')) } finally { @@ -229,7 +229,7 @@ export default { async clonePoll(pollId) { try { - await this.$store.dispatch('poll/clone', { pollId: pollId }) + await this.$store.dispatch('poll/clone', { pollId }) } catch { showError(t('polls', 'Error cloning poll.')) } finally { diff --git a/src/js/views/Vote.vue b/src/js/views/Vote.vue index 63b88fb8..6549544d 100644 --- a/src/js/views/Vote.vue +++ b/src/js/views/Vote.vue @@ -175,10 +175,10 @@ export default { async submitEmailAddress(emailAddress) { try { - await this.$store.dispatch('share/updateEmailAddress', { emailAddress: emailAddress }) - showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress: emailAddress })) + await this.$store.dispatch('share/updateEmailAddress', { emailAddress }) + showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress })) } catch { - showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress: emailAddress })) + showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress })) } }, }, -- cgit v1.2.3