From ee16efc548f4523fa0667dcbb681373eed9745df Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 23 Jun 2022 02:58:00 +0200
Subject: [PATCH] chore: remove date mixins

---
 src/components/date/datemathHelp.vue               |  4 ++--
 src/components/home/TheNavigation.vue              |  2 ++
 src/components/home/navigation.vue                 |  1 +
 src/components/input/datepicker.vue                |  8 +++++---
 src/components/notifications/notifications.vue     |  3 ++-
 src/components/tasks/gantt-component.vue           |  2 +-
 src/components/tasks/partials/attachments.vue      |  8 ++++++--
 src/components/tasks/partials/comments.vue         |  5 +++--
 src/components/tasks/partials/createdUpdated.vue   |  4 ++--
 src/components/tasks/partials/date-table-cell.vue  |  6 ++++--
 src/components/tasks/partials/kanban-card.vue      |  6 +++++-
 src/components/tasks/partials/singleTaskInList.vue | 10 +++++++---
 src/main.ts                                        |  7 -------
 src/views/migrator/MigrateService.vue              |  2 +-
 src/views/user/settings/Caldav.vue                 |  3 ++-
 src/views/user/settings/Deletion.vue               |  1 +
 16 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/components/date/datemathHelp.vue b/src/components/date/datemathHelp.vue
index f645fdb3e..98b98e9a1 100644
--- a/src/components/date/datemathHelp.vue
+++ b/src/components/date/datemathHelp.vue
@@ -110,10 +110,10 @@
 </template>
 
 <script lang="ts" setup>
-import {format} from 'date-fns'
+import { formatDate } from '@/helpers/time/formatDate'
 import BaseButton from '@/components/base/BaseButton.vue'
 
-const exampleDate = format(new Date(), 'yyyy-MM-dd')
+const exampleDate = formatDate(new Date(), 'yyyy-MM-dd')
 </script>
 
 <style scoped>
diff --git a/src/components/home/TheNavigation.vue b/src/components/home/TheNavigation.vue
index 824fd1ffa..1c68e05e9 100644
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@@ -108,6 +108,8 @@ import Logo from '@/components/home/Logo.vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 import MenuButton from '@/components/home/MenuButton.vue'
 
+import {getListTitle} from '@/helpers/getListTitle'
+
 const store = useStore()
 
 const userInfo = computed(() => store.state.auth.info)
diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index d79f002da..7a2420850 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -173,6 +173,7 @@ import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
 import {useEventListener} from '@vueuse/core'
 import NamespaceModel from '@/models/namespace'
 import ListModel from '@/models/list'
+import {getListTitle} from '@/helpers/getListTitle'
 
 const drag = ref(false)
 const dragOptions = {
diff --git a/src/components/input/datepicker.vue b/src/components/input/datepicker.vue
index 27a35d486..1968bc5e4 100644
--- a/src/components/input/datepicker.vue
+++ b/src/components/input/datepicker.vue
@@ -117,7 +117,8 @@ import flatPickr from 'vue-flatpickr-component'
 import 'flatpickr/dist/flatpickr.css'
 import {i18n} from '@/i18n'
 
-import {format} from 'date-fns'
+import {formatDate, formatDateShort} from '@/helpers/time/formatDate'
+
 import {calculateDayInterval} from '@/helpers/time/calculateDayInterval'
 import {calculateNearestHours} from '@/helpers/time/calculateNearestHours'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
@@ -189,11 +190,12 @@ export default defineComponent({
 					return ''
 				}
 
-				return format(this.date, 'yyy-LL-dd H:mm')
+				return formatDate(this.date, 'yyy-LL-dd H:mm')
 			},
 		},
 	},
 	methods: {
+		formatDateShort,
 		setDateValue(newVal) {
 			if (newVal === null) {
 				this.date = null
@@ -252,7 +254,7 @@ export default defineComponent({
 			const interval = calculateDayInterval(date)
 			const newDate = new Date()
 			newDate.setDate(newDate.getDate() + interval)
-			return format(newDate, 'E')
+			return formatDate(newDate, 'E')
 		},
 	},
 })
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index a332765ea..78a51e6f7 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -30,7 +30,7 @@
 								{{ n.toText(userInfo) }}
 							</a>
 						</div>
-						<span class="created" v-tooltip="formatDate(n.created)">
+						<span class="created" v-tooltip="formatDateLong(n.created)">
 							{{ formatDateSince(n.created) }}
 						</span>
 					</div>
@@ -55,6 +55,7 @@ import names from '@/models/constants/notificationNames.json'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {useStore} from 'vuex'
 import {useRouter} from 'vue-router'
+import {formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 
 const LOAD_NOTIFICATIONS_INTERVAL = 10000
 
diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index cb2298cfe..e117ea1c6 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -434,7 +434,7 @@ export default defineComponent({
 			this.hideCrateNewTask()
 		},
 		formatYear(date) {
-			return this.format(date, 'MMMM, yyyy')
+			return this.formatDate(date, 'MMMM, yyyy')
 		},
 	},
 })
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index 1972c73d9..633a76253 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -36,7 +36,7 @@
 				<div class="info">
 					<p class="attachment-info-meta">
 						<i18n-t keypath="task.attachment.createdBy">
-							<span v-tooltip="formatDate(a.created)">
+							<span v-tooltip="formatDateLong(a.created)">
 								{{ formatDateSince(a.created) }}
 							</span>
 							<user
@@ -147,6 +147,7 @@ import {mapState} from 'vuex'
 
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import { uploadFiles, generateAttachmentUrl } from '@/helpers/attachments'
+import {formatDate, formatDateSince, formatDateLong} from '@/helpers/time/formatDate'
 
 export default defineComponent({
 	name: 'attachments',
@@ -220,7 +221,10 @@ export default defineComponent({
 		})
 	},
 	methods: {
-		downloadAttachment(attachment) {
+		formatDate,
+		formatDateSince,
+		formatDateLong,
+		downloadAttachment(attachment: AttachmentModel) {
 			this.attachmentService.download(attachment)
 		},
 		uploadNewAttachment() {
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index 9efe0d2a9..c1e83faae 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -34,12 +34,12 @@
 							width="20"
 						/>
 						<strong>{{ c.author.getDisplayName() }}</strong>&nbsp;
-						<span v-tooltip="formatDate(c.created)" class="has-text-grey">
+						<span v-tooltip="formatDateLong(c.created)" class="has-text-grey">
 							{{ formatDateSince(c.created) }}
 						</span>
 						<span
 							v-if="+new Date(c.created) !== +new Date(c.updated)"
-							v-tooltip="formatDate(c.updated)"
+							v-tooltip="formatDateLong(c.updated)"
 						>
 							· {{ $t('task.comment.edited', {date: formatDateSince(c.updated)}) }}
 						</span>
@@ -162,6 +162,7 @@ import TaskCommentService from '@/services/taskComment'
 import TaskCommentModel from '@/models/taskComment'
 import {uploadFile} from '@/helpers/attachments'
 import {success} from '@/message'
+import {formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 
 const props = defineProps({
 	taskId: {
diff --git a/src/components/tasks/partials/createdUpdated.vue b/src/components/tasks/partials/createdUpdated.vue
index 51ef1d31e..c216cfae3 100644
--- a/src/components/tasks/partials/createdUpdated.vue
+++ b/src/components/tasks/partials/createdUpdated.vue
@@ -1,6 +1,6 @@
 <template>
 	<p class="created">
-		<time :datetime="formatISO(task.created)" v-tooltip="formatDate(task.created)">
+		<time :datetime="formatISO(task.created)" v-tooltip="formatDateLong(task.created)">
 			<i18n-t keypath="task.detail.created">
 				<span>{{ formatDateSince(task.created) }}</span>
 				{{ task.createdBy.getDisplayName() }}
@@ -29,7 +29,7 @@
 <script lang="ts" setup>
 import {computed, toRefs} from 'vue'
 import TaskModel from '@/models/task'
-import {formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
+import {formatISO, formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 
 const props = defineProps({
 	task: {
diff --git a/src/components/tasks/partials/date-table-cell.vue b/src/components/tasks/partials/date-table-cell.vue
index fead14452..85ac5504e 100644
--- a/src/components/tasks/partials/date-table-cell.vue
+++ b/src/components/tasks/partials/date-table-cell.vue
@@ -1,12 +1,14 @@
 <template>
-	<td v-tooltip="+date === 0 ? '' : formatDate(date)">
-		<time :datetime="date ? formatISO(date) : null">
+	<td v-tooltip="+date === 0 ? '' : formatDateLong(date)">
+		<time :datetime="date ? formatISO(date) : undefined">
 			{{ +date === 0 ? '-' : formatDateSince(date) }}
 		</time>
 	</td>
 </template>
 
 <script setup lang="ts">
+import {formatISO, formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
+
 defineProps({
 	date: {
 		type: Date,
diff --git a/src/components/tasks/partials/kanban-card.vue b/src/components/tasks/partials/kanban-card.vue
index 7076c5245..c2daa2598 100644
--- a/src/components/tasks/partials/kanban-card.vue
+++ b/src/components/tasks/partials/kanban-card.vue
@@ -24,7 +24,7 @@
 			:class="{'overdue': task.dueDate <= new Date() && !task.done}"
 			class="due-date"
 			v-if="task.dueDate > 0"
-			v-tooltip="formatDate(task.dueDate)">
+			v-tooltip="formatDateLong(task.dueDate)">
 			<span class="icon">
 				<icon :icon="['far', 'calendar-alt']"/>
 			</span>
@@ -76,6 +76,7 @@ import Labels from '../../../components/tasks/partials/labels'
 import ChecklistSummary from './checklist-summary'
 import {TASK_DEFAULT_COLOR} from '@/models/task'
 
+import {formatDateLong, formatISO, formatDateSince} from '@/helpers/time/formatDate'
 import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 export default defineComponent({
@@ -104,6 +105,9 @@ export default defineComponent({
 		},
 	},
 	methods: {
+		formatDateLong,
+		formatISO,
+		formatDateSince,
 		colorIsDark,
 		async toggleTaskDone(task) {
 			this.loadingInternal = true
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index e9cc0de29..b5c19a375 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -45,7 +45,7 @@
 				class="is-italic"
 				@click.prevent.stop="showDefer = !showDefer"
 				v-if="+new Date(task.dueDate) > 0"
-				v-tooltip="formatDate(task.dueDate)"
+				v-tooltip="formatDateLong(task.dueDate)"
 				:aria-expanded="showDefer ? 'true' : 'false'"
 			>
 				- {{ $t('task.detail.due', {at: formatDateSince(task.dueDate)}) }}
@@ -103,7 +103,8 @@ import Fancycheckbox from '../../input/fancycheckbox'
 import DeferTask from './defer-task'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {playPop} from '@/helpers/playPop'
-import ChecklistSummary from './checklist-summary'
+import {formatDateSince, formatISO, formatDateLong} from '@/helpers/time/formatDate'
+import ChecklistSummary from './checklist-summary.vue'
 
 export default defineComponent({
 	name: 'singleTaskInList',
@@ -178,7 +179,10 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		async markAsDone(checked) {
+		formatDateSince,
+		formatISO,
+		formatDateLong,
+		async markAsDone(checked: boolean) {
 			const updateFunc = async () => {
 				const task = await this.taskService.update(this.task)
 				if (this.task.done) {
diff --git a/src/main.ts b/src/main.ts
index 3752d5de7..9af014041 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,8 +5,6 @@ import router from './router'
 
 import {error, success} from './message'
 
-import {formatDate, formatDateShort, formatDateLong, formatDateSince, formatISO} from '@/helpers/time/formatDate'
-
 import {VERSION} from './version.json'
 
 // Notifications
@@ -76,11 +74,6 @@ import {setTitle} from './helpers/setTitle'
 
 app.mixin({
 	methods: {
-		formatDateSince,
-		format: formatDate,
-		formatDate: formatDateLong,
-		formatDateShort: formatDateShort,
-		formatISO,
 		getNamespaceTitle,
 		getListTitle,
 		setTitle,
diff --git a/src/views/migrator/MigrateService.vue b/src/views/migrator/MigrateService.vue
index 9921a8560..1b47dd592 100644
--- a/src/views/migrator/MigrateService.vue
+++ b/src/views/migrator/MigrateService.vue
@@ -48,7 +48,7 @@
 		</template>
 		<div v-else-if="lastMigrationDate">
 			<p>
-				{{ $t('migrate.alreadyMigrated1', {name: migrator.name, date: formatDate(lastMigrationDate)}) }}<br/>
+				{{ $t('migrate.alreadyMigrated1', {name: migrator.name, date: formatDateLong(lastMigrationDate)}) }}<br/>
 				{{ $t('migrate.alreadyMigrated2') }}
 			</p>
 			<div class="buttons">
diff --git a/src/views/user/settings/Caldav.vue b/src/views/user/settings/Caldav.vue
index d8b81c379..ad63f8d33 100644
--- a/src/views/user/settings/Caldav.vue
+++ b/src/views/user/settings/Caldav.vue
@@ -77,7 +77,8 @@ import {success} from '@/message'
 import BaseButton from '@/components/base/BaseButton.vue'
 import Message from '@/components/misc/message.vue'
 import CaldavTokenService from '@/services/caldavToken'
-import CaldavTokenModel from '@/models/caldavToken'
+import type CaldavTokenModel from '@/models/caldavToken'
+import { formatDateShort } from '@/helpers/time/formatDate'
 
 const copy = useCopyToClipboard()
 
diff --git a/src/views/user/settings/Deletion.vue b/src/views/user/settings/Deletion.vue
index bba895a2c..5b3920f59 100644
--- a/src/views/user/settings/Deletion.vue
+++ b/src/views/user/settings/Deletion.vue
@@ -97,6 +97,7 @@ import {useI18n} from 'vue-i18n'
 
 import AccountDeleteService from '@/services/accountDelete'
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
+import {formatDateShort, formatDateSince} from '@/helpers/time/formatDate'
 import {useTitle} from '@/composables/useTitle'
 import {success} from '@/message'