diff --git a/src/components/AppNavigation/CalendarList/Trashbin.vue b/src/components/AppNavigation/CalendarList/Trashbin.vue
index 827aac8ed..13d6062fb 100644
--- a/src/components/AppNavigation/CalendarList/Trashbin.vue
+++ b/src/components/AppNavigation/CalendarList/Trashbin.vue
@@ -187,7 +187,7 @@ export default {
 		},
 		retentionDuration() {
 			return Math.ceil(
-				this.calendarsStore.trashBin.retentionDuration / (60 * 60 * 24)
+				this.calendarsStore.trashBin.retentionDuration / (60 * 60 * 24),
 			)
 		},
 	},
diff --git a/src/components/AppNavigation/EditCalendarModal/ShareItem.vue b/src/components/AppNavigation/EditCalendarModal/ShareItem.vue
index 07bb0adf3..56529fb82 100644
--- a/src/components/AppNavigation/EditCalendarModal/ShareItem.vue
+++ b/src/components/AppNavigation/EditCalendarModal/ShareItem.vue
@@ -87,12 +87,12 @@ export default {
 		displayName() {
 			if (this.sharee.isCircle) {
 				return t('calendar', '{teamDisplayName} (Team)', {
-					teamDisplayName: this.sharee.displayName
+					teamDisplayName: this.sharee.displayName,
 				})
 			}
 
 			return this.sharee.displayName
-		}
+		},
 	},
 	mounted() {
 		this.updateShareeEmail()
diff --git a/src/components/AppNavigation/Settings/SettingsAttachmentsFolder.vue b/src/components/AppNavigation/Settings/SettingsAttachmentsFolder.vue
index 0e6b1eba0..210c2ba68 100644
--- a/src/components/AppNavigation/Settings/SettingsAttachmentsFolder.vue
+++ b/src/components/AppNavigation/Settings/SettingsAttachmentsFolder.vue
@@ -9,9 +9,9 @@
 			{{ $t('calendar', 'Default attachments location') }}
 		</label>
 		<div class="form-group">
-			<NcInputField v-model="attachmentsFolder"
+			<NcInputField :id="inputId"
+				v-model="attachmentsFolder"
 				type="text"
-				:id="inputId"
 				:label-outside="true"
 				@input="debounceSaveAttachmentsFolder(attachmentsFolder)"
 				@change="debounceSaveAttachmentsFolder(attachmentsFolder)"
diff --git a/src/components/Editor/Attachments/AttachmentsList.vue b/src/components/Editor/Attachments/AttachmentsList.vue
index e8833a586..4445efe27 100644
--- a/src/components/Editor/Attachments/AttachmentsList.vue
+++ b/src/components/Editor/Attachments/AttachmentsList.vue
@@ -257,7 +257,7 @@ export default {
 					type: 'primary',
 					callback: () => {
 						window.open(url.href, '_blank', 'noopener noreferrer')
-					}
+					},
 				},
 			]
 			this.showOpenConfirmation = true
diff --git a/src/components/Editor/Invitees/InviteesList.vue b/src/components/Editor/Invitees/InviteesList.vue
index 19b55cf70..7ea3bc614 100644
--- a/src/components/Editor/Invitees/InviteesList.vue
+++ b/src/components/Editor/Invitees/InviteesList.vue
@@ -237,14 +237,14 @@ export default {
 				organizers.push({
 					id: owner.id,
 					label: owner.displayname,
-					address: owner.emailAddress
+					address: owner.emailAddress,
 				})
 			}
 			if (principal && owner.id !== principal.id) {
 				organizers.push({
 					id: principal.id,
 					label: principal.displayname,
-					address: principal.emailAddress
+					address: principal.emailAddress,
 				})
 			}
 			return organizers
@@ -305,13 +305,13 @@ export default {
 				const user = this.calendarObjectInstance.organizer
 				organizer = {
 					label: user.commonName,
-					address: removeMailtoPrefix(user.uri)
+					address: removeMailtoPrefix(user.uri),
 				}
 			} else if (this.principalsStore.getCurrentUserPrincipal) {
 				const user = this.principalsStore.getCurrentUserPrincipal
 				organizer = {
 					label: user.displayname,
-					address: user.emailAddress
+					address: user.emailAddress,
 				}
 			}
 			return organizer
diff --git a/src/components/Editor/Invitees/OrganizerListItem.vue b/src/components/Editor/Invitees/OrganizerListItem.vue
index a7049321d..4a4a5eaa2 100644
--- a/src/components/Editor/Invitees/OrganizerListItem.vue
+++ b/src/components/Editor/Invitees/OrganizerListItem.vue
@@ -23,7 +23,7 @@
 				<template v-for="person in organizerSelection">
 					<NcActionButton v-if="!selectedOrganizer(person.address)"
 						:key="person.address + '-1'"
-						:closeAfterClick = "true"
+						:close-after-click="true"
 						@click="changeOrganizer(person, false)">
 						<template #icon>
 							<Crown :size="20" />
@@ -32,7 +32,7 @@
 					</NcActionButton>
 					<NcActionButton v-if="!selectedOrganizer(person.address)"
 						:key="person.address + '-2'"
-						:closeAfterClick = "true"
+						:close-after-click="true"
 						@click="changeOrganizer(person, true)">
 						<template #icon>
 							<Crown :size="20" />
diff --git a/src/components/Shared/CalendarPicker.vue b/src/components/Shared/CalendarPicker.vue
index 10d40d305..fc89791d0 100644
--- a/src/components/Shared/CalendarPicker.vue
+++ b/src/components/Shared/CalendarPicker.vue
@@ -11,8 +11,8 @@
 		:multiple="multiple"
 		:clearable="clearable"
 		:filter-by="selectFilterBy"
-		:input-label="this.inputLabel"
-		:label-outside="this.inputLabel === ''"
+		:input-label="inputLabel"
+		:label-outside="inputLabel === ''"
 		@option:selected="change"
 		@option:deselected="remove">
 		<template #option="{ id }">
diff --git a/src/components/Shared/DatePicker.vue b/src/components/Shared/DatePicker.vue
index 5ea24dfab..1c9726d04 100644
--- a/src/components/Shared/DatePicker.vue
+++ b/src/components/Shared/DatePicker.vue
@@ -20,8 +20,8 @@
 		:append-to-body="appendToBody"
 		v-bind="$attrs"
 		confirm
-		v-on="$listeners"
 		class="date-time-picker"
+		v-on="$listeners"
 		@close="close"
 		@change="change"
 		@pick="pickDate">