From 74ad6e65e88d6aa5702686dd0b6f55e2dc6b7b77 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Sun, 13 Feb 2022 21:40:39 +0100
Subject: [PATCH 01/32] feat: convert abstractService to ts

---
 src/services/abstractService.ts | 154 +++++++++++---------------------
 1 file changed, 53 insertions(+), 101 deletions(-)

diff --git a/src/services/abstractService.ts b/src/services/abstractService.ts
index c2a7b4578..255bed687 100644
--- a/src/services/abstractService.ts
+++ b/src/services/abstractService.ts
@@ -1,7 +1,18 @@
-import {objectToSnakeCase} from '@/helpers/case'
 import {AuthenticatedHTTPFactory} from '@/http-common'
+import type {Method} from 'axios'
 
-function convertObject(o) {
+import {objectToSnakeCase} from '@/helpers/case'
+import AbstractModel from '@/models/abstractModel'
+
+interface Paths {
+	create : string
+	get : string
+	getAll : string
+	update : string
+	delete : string
+}
+
+function convertObject(o: Record<string, unknown>) {
 	if (o instanceof Date) {
 		return o.toISOString()
 	}
@@ -9,7 +20,7 @@ function convertObject(o) {
 	return o
 }
 
-function prepareParams(params) {
+function prepareParams(params: Record<string, unknown | any[]>) {
 	if (typeof params !== 'object') {
 		return params
 	}
@@ -26,16 +37,16 @@ function prepareParams(params) {
 	return objectToSnakeCase(params)
 }
 
-export default class AbstractService {
+export default class AbstractService<Model extends AbstractModel> {
 
 	/////////////////////////////
 	// Initial variable definitions
 	///////////////////////////
 
-	http = null
+	http
 	loading = false
 	uploadProgress = 0
-	paths = {
+	paths: Paths = {
 		create: '',
 		get: '',
 		getAll: '',
@@ -52,9 +63,9 @@ export default class AbstractService {
 
 	/**
 	 * The abstract constructor.
-	 * @param [paths] An object with all paths. Default values are specified above.
+	 * @param [paths] An object with all paths.
 	 */
-	constructor(paths) {
+	constructor(paths : Partial<Paths> = {}) {
 		this.http = AuthenticatedHTTPFactory()
 
 		// Set the interceptors to process every request
@@ -82,38 +93,27 @@ export default class AbstractService {
 			return config
 		})
 
-		if (paths) {
-			this.paths = {
-				create: paths.create !== undefined ? paths.create : '',
-				get: paths.get !== undefined ? paths.get : '',
-				getAll: paths.getAll !== undefined ? paths.getAll : '',
-				update: paths.update !== undefined ? paths.update : '',
-				delete: paths.delete !== undefined ? paths.delete : '',
-			}
-		}
+		Object.assign(this.paths, paths)
 	}
 
 	/**
 	 * Whether or not to use the create interceptor which processes a request payload into json
-	 * @returns {boolean}
 	 */
-	useCreateInterceptor() {
+	useCreateInterceptor(): boolean {
 		return true
 	}
 
 	/**
 	 * Whether or not to use the update interceptor which processes a request payload into json
-	 * @returns {boolean}
 	 */
-	useUpdateInterceptor() {
+	useUpdateInterceptor(): boolean {
 		return true
 	}
 
 	/**
 	 * Whether or not to use the delete interceptor which processes a request payload into json
-	 * @returns {boolean}
 	 */
-	useDeleteInterceptor() {
+	useDeleteInterceptor(): boolean {
 		return true
 	}
 
@@ -123,11 +123,9 @@ export default class AbstractService {
 
 	/**
 	 * Returns an object with all route parameters and their values.
-	 * @param route
-	 * @returns object
 	 */
-	getRouteReplacements(route, parameters = {}) {
-		const replace$$1 = {}
+	getRouteReplacements(route : string, parameters = {}) {
+		const replace$$1: {} = {}
 		let pattern = this.getRouteParameterPattern()
 		pattern = new RegExp(pattern instanceof RegExp ? pattern.source : pattern, 'g')
 
@@ -140,22 +138,18 @@ export default class AbstractService {
 
 	/**
 	 * Holds the replacement pattern for url paths, can be overwritten by implementations.
-	 * @return {RegExp}
 	 */
-	getRouteParameterPattern() {
+	getRouteParameterPattern(): RegExp {
 		return /{([^}]+)}/
 	}
 
 	/**
 	 * Returns a fully-ready-ready-to-make-a-request-to route with replaced parameters.
-	 * @param path
-	 * @param pathparams
-	 * @return string
 	 */
-	getReplacedRoute(path, pathparams) {
+	getReplacedRoute(path : string, pathparams : {}) : string {
 		const replacements = this.getRouteReplacements(path, pathparams)
 		return Object.entries(replacements).reduce(
-			(result, [parameter, value]) => result.replace(parameter, value),
+			(result, [parameter, value]) => result.replace(parameter, value as string),
 			path,
 		)
 	}
@@ -166,9 +160,8 @@ export default class AbstractService {
 	 * case the api returns a response in < 100ms.
 	 * But because the timeout is created using setTimeout, it will still trigger even if the request is
 	 * already finished, so we return a method to call in that case.
-	 * @returns {Function}
 	 */
-	setLoading() {
+	setLoading(): Function {
 		const timeout = setTimeout(() => {
 			this.loading = true
 		}, 100)
@@ -188,46 +181,36 @@ export default class AbstractService {
 	/**
 	 * The modelFactory returns an model from an object.
 	 * This one here is the default one, usually the service definitions for a model will override this.
-	 * @param data
-	 * @returns {*}
 	 */
-	modelFactory(data) {
-		return data
+	modelFactory(data : Partial<Model>) {
+		return new AbstractModel(data)
 	}
 
 	/**
 	 * This is the model factory for get requests.
-	 * @param data
-	 * @return {*}
 	 */
-	modelGetFactory(data) {
+	modelGetFactory(data : Partial<Model>) {
 		return this.modelFactory(data)
 	}
 
 	/**
 	 * This is the model factory for get all requests.
-	 * @param data
-	 * @return {*}
 	 */
-	modelGetAllFactory(data) {
+	modelGetAllFactory(data : Partial<Model>) {
 		return this.modelFactory(data)
 	}
 
 	/**
 	 * This is the model factory for create requests.
-	 * @param data
-	 * @return {*}
 	 */
-	modelCreateFactory(data) {
+	modelCreateFactory(data : Partial<Model>) {
 		return this.modelFactory(data)
 	}
 
 	/**
 	 * This is the model factory for update requests.
-	 * @param data
-	 * @return {*}
 	 */
-	modelUpdateFactory(data) {
+	modelUpdateFactory(data : Partial<Model>) {
 		return this.modelFactory(data)
 	}
 
@@ -237,37 +220,29 @@ export default class AbstractService {
 
 	/**
 	 * Default preprocessor for get requests
-	 * @param model
-	 * @return {*}
 	 */
-	beforeGet(model) {
+	beforeGet(model : Model) {
 		return model
 	}
 
 	/**
 	 * Default preprocessor for create requests
-	 * @param model
-	 * @return {*}
 	 */
-	beforeCreate(model) {
+	beforeCreate(model : Model) {
 		return model
 	}
 
 	/**
 	 * Default preprocessor for update requests
-	 * @param model
-	 * @return {*}
 	 */
-	beforeUpdate(model) {
+	beforeUpdate(model : Model) {
 		return model
 	}
 
 	/**
 	 * Default preprocessor for delete requests
-	 * @param model
-	 * @return {*}
 	 */
-	beforeDelete(model) {
+	beforeDelete(model : Model) {
 		return model
 	}
 
@@ -279,9 +254,8 @@ export default class AbstractService {
 	 * Performs a get request to the url specified before.
 	 * @param model The model to use. The request path is built using the values from the model.
 	 * @param params Optional query parameters
-	 * @returns {Q.Promise<any>}
 	 */
-	get(model, params = {}) {
+	get(model : Model, params = {}) {
 		if (this.paths.get === '') {
 			throw new Error('This model is not able to get data.')
 		}
@@ -292,12 +266,8 @@ export default class AbstractService {
 	/**
 	 * This is a more abstract implementation which only does a get request.
 	 * Services which need more flexibility can use this.
-	 * @param url
-	 * @param model
-	 * @param params
-	 * @returns {Q.Promise<unknown>}
 	 */
-	async getM(url, model = {}, params = {}) {
+	async getM(url : string, model = new AbstractModel({}), params = {}) {
 		const cancel = this.setLoading()
 
 		model = this.beforeGet(model)
@@ -313,12 +283,12 @@ export default class AbstractService {
 		}
 	}
 
-	async getBlobUrl(url, method = 'GET', data = {}) {
+	async getBlobUrl(url : string, method = 'GET' as Method, data = {}) {
 		const response = await this.http({
-			url: url,
-			method: method,
+			url,
+			method,
 			responseType: 'blob',
-			data: data,
+			data,
 		})
 		return window.URL.createObjectURL(new Blob([response.data]))
 	}
@@ -329,9 +299,8 @@ export default class AbstractService {
 	 * @param model The model to use. The request path is built using the values from the model.
 	 * @param params Optional query parameters
 	 * @param page The page to get
-	 * @returns {Q.Promise<any>}
 	 */
-	async getAll(model = {}, params = {}, page = 1) {
+	async getAll(model : Model = new AbstractModel({}), params = {}, page = 1) {
 		if (this.paths.getAll === '') {
 			throw new Error('This model is not able to get data.')
 		}
@@ -362,10 +331,9 @@ export default class AbstractService {
 
 	/**
 	 * Performs a put request to the url specified before
-	 * @param model
 	 * @returns {Promise<any | never>}
 	 */
-	async create(model) {
+	async create(model : Model) {
 		if (this.paths.create === '') {
 			throw new Error('This model is not able to create data.')
 		}
@@ -388,11 +356,8 @@ export default class AbstractService {
 	/**
 	 * An abstract implementation to send post requests.
 	 * Services can use this to implement functions to do post requests other than using the update method.
-	 * @param url
-	 * @param model
-	 * @returns {Q.Promise<unknown>}
 	 */
-	async post(url, model) {
+	async post(url : string, model : Model) {
 		const cancel = this.setLoading()
 
 		try {
@@ -409,10 +374,8 @@ export default class AbstractService {
 
 	/**
 	 * Performs a post request to the update url
-	 * @param model
-	 * @returns {Q.Promise<any>}
 	 */
-	update(model) {
+	update(model : Model) {
 		if (this.paths.update === '') {
 			throw new Error('This model is not able to update data.')
 		}
@@ -423,10 +386,8 @@ export default class AbstractService {
 
 	/**
 	 * Performs a delete request to the update url
-	 * @param model
-	 * @returns {Q.Promise<any>}
 	 */
-	async delete(model) {
+	async delete(model : Model) {
 		if (this.paths.delete === '') {
 			throw new Error('This model is not able to delete data.')
 		}
@@ -447,21 +408,15 @@ export default class AbstractService {
 	 * @param url
 	 * @param file
 	 * @param fieldName The name of the field the file is uploaded to.
-	 * @returns {Q.Promise<unknown>}
 	 */
-	uploadFile(url, file, fieldName) {
+	uploadFile(url : string, file, fieldName : string) {
 		return this.uploadBlob(url, new Blob([file]), fieldName, file.name)
 	}
 
 	/**
 	 * Uploads a blob to a url.
-	 * @param url
-	 * @param blob
-	 * @param fieldName
-	 * @param filename
-	 * @returns {Q.Promise<unknown>}
 	 */
-	uploadBlob(url, blob, fieldName, filename) {
+	uploadBlob(url : string, blob: Blob, fieldName: string, filename : string) {
 		const data = new FormData()
 		data.append(fieldName, blob, filename)
 		return this.uploadFormData(url, data)
@@ -469,11 +424,8 @@ export default class AbstractService {
 
 	/**
 	 * Uploads a form data object.
-	 * @param url
-	 * @param formData
-	 * @returns {Q.Promise<unknown>}
 	 */
-	async uploadFormData(url, formData) {
+	async uploadFormData(url : string, formData: Record<string, unknown>) {
 		const cancel = this.setLoading()
 		try {
 			const response = await this.http.put(

From 797de0c5432face3887f4d77bcb7dd7ee2e7e0c1 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 23 Jun 2022 03:22:21 +0200
Subject: [PATCH 02/32] feat: add properties to models

---
 src/models/attachment.ts         |  11 ++-
 src/models/avatar.ts             |   4 +
 src/models/backgroundImage.ts    |   9 +++
 src/models/bucket.ts             |  12 +++
 src/models/caldavToken.ts        |   5 +-
 src/models/emailUpdate.ts        |   3 +
 src/models/file.ts               |   6 ++
 src/models/label.ts              |  11 +++
 src/models/labelTask.ts          |   4 +
 src/models/linkShare.ts          |  10 +++
 src/models/list.ts               |  60 +++++----------
 src/models/listDuplicateModel.ts |   5 ++
 src/models/namespace.ts          |  22 +++---
 src/models/notification.ts       |  99 ++++++++++++++++++------
 src/models/passwordReset.ts      |   4 +
 src/models/passwordUpdate.ts     |   3 +
 src/models/savedFilter.ts        |  17 +++++
 src/models/subscription.ts       |  19 ++---
 src/models/task.ts               | 124 +++++++++++++------------------
 src/models/taskAssignee.ts       |   6 ++
 src/models/taskComment.ts        |  11 ++-
 src/models/taskRelation.ts       |  24 ++++++
 src/models/team.ts               |  10 +++
 src/models/teamList.ts           |   3 +
 src/models/teamMember.ts         |   4 +
 src/models/teamNamespace.ts      |   3 +
 src/models/teamShareBase.ts      |   8 ++
 src/models/totp.ts               |   4 +
 src/models/user.ts               |  27 +++----
 src/models/userList.ts           |   4 +-
 src/models/userNamespace.ts      |   3 +
 src/models/userSettings.ts       |  10 +++
 src/models/userShareBase.ts      |   8 ++
 33 files changed, 367 insertions(+), 186 deletions(-)

diff --git a/src/models/attachment.ts b/src/models/attachment.ts
index b42349809..87d90d5d7 100644
--- a/src/models/attachment.ts
+++ b/src/models/attachment.ts
@@ -3,22 +3,25 @@ import UserModel from './user'
 import FileModel from './file'
 
 export default class AttachmentModel extends AbstractModel {
+	id: number
+	taskId: number
+	createdBy: UserModel
+	file: FileModel
+	created: Date
+
 	constructor(data) {
 		super(data)
 		this.createdBy = new UserModel(this.createdBy)
 		this.file = new FileModel(this.file)
 		this.created = new Date(this.created)
-
-		/** @type {number} */
-		this.id
 	}
 
 	defaults() {
 		return {
 			id: 0,
 			taskId: 0,
-			file: FileModel,
 			createdBy: UserModel,
+			file: FileModel,
 			created: null,
 		}
 	}
diff --git a/src/models/avatar.ts b/src/models/avatar.ts
index 33f3c4c1f..2ac7a5605 100644
--- a/src/models/avatar.ts
+++ b/src/models/avatar.ts
@@ -1,6 +1,10 @@
 import AbstractModel from './abstractModel'
 
+export type AVATAR_PROVIDERS = 'default' | 'initials' | 'gravatar' | 'marble' | 'upload'
+
 export default class AvatarModel extends AbstractModel {
+	avatarProvider: AVATAR_PROVIDERS
+
 	defaults() {
 		return {
 			avatarProvider: '',
diff --git a/src/models/backgroundImage.ts b/src/models/backgroundImage.ts
index 70e441225..07c9ee319 100644
--- a/src/models/backgroundImage.ts
+++ b/src/models/backgroundImage.ts
@@ -1,6 +1,15 @@
 import AbstractModel from './abstractModel'
 
 export default class BackgroundImageModel extends AbstractModel {
+	id: number
+	url: string
+	thumb: string
+	info: {
+		author: string
+		authorName: string
+	}
+	blurHash: string  
+
 	defaults() {
 		return {
 			id: 0,
diff --git a/src/models/bucket.ts b/src/models/bucket.ts
index 28d0558d1..269b54302 100644
--- a/src/models/bucket.ts
+++ b/src/models/bucket.ts
@@ -3,6 +3,18 @@ import UserModel from './user'
 import TaskModel from './task'
 
 export default class BucketModel extends AbstractModel {
+	id: number
+	title: string
+	listId: number
+	limit: number
+	tasks: TaskModel[]
+	isDoneBucket: boolean
+	position: number
+	
+	createdBy: UserModel
+	created: Date
+	updated: Date
+
 	constructor(bucket) {
 		super(bucket)
 
diff --git a/src/models/caldavToken.ts b/src/models/caldavToken.ts
index 2f8f1d547..708ed2293 100644
--- a/src/models/caldavToken.ts
+++ b/src/models/caldavToken.ts
@@ -1,14 +1,15 @@
 import AbstractModel from './abstractModel'
 
 export default class CaldavTokenModel extends AbstractModel {
+	id: number
+	created: Date
+
 	constructor(data? : Object) {
 		super(data)
 		
-		/** @type {number} */
 		this.id
 
 		if (this.created) {
-			/** @type {Date} */
 			this.created = new Date(this.created)
 		}
 	}
diff --git a/src/models/emailUpdate.ts b/src/models/emailUpdate.ts
index 04ed30453..229be90ee 100644
--- a/src/models/emailUpdate.ts
+++ b/src/models/emailUpdate.ts
@@ -1,6 +1,9 @@
 import AbstractModel from './abstractModel'
 
 export default class EmailUpdateModel extends AbstractModel {
+	newEmail: string
+	password: string
+
 	defaults() {
 		return {
 			newEmail: '',
diff --git a/src/models/file.ts b/src/models/file.ts
index 094979639..4b65ae33d 100644
--- a/src/models/file.ts
+++ b/src/models/file.ts
@@ -1,6 +1,12 @@
 import AbstractModel from './abstractModel'
 
 export default class FileModel extends AbstractModel {
+	id: number
+	mime: string
+	name: string
+	size: number
+	created: Date
+
 	constructor(data) {
 		super(data)
 		this.created = new Date(this.created)
diff --git a/src/models/label.ts b/src/models/label.ts
index f61658a73..4f7fa0afa 100644
--- a/src/models/label.ts
+++ b/src/models/label.ts
@@ -4,6 +4,17 @@ import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 const DEFAULT_LABEL_BACKGROUND_COLOR = 'e8e8e8'
 export default class LabelModel extends AbstractModel {
+	id: number
+	title: string
+	hexColor: string
+	description: string
+	createdBy: UserModel
+	listId: number
+	textColor: string
+
+	created: Date
+	updated: Date
+
 	constructor(data) {
 		super(data)
 		// FIXME: this should be empty and be definied in the client.
diff --git a/src/models/labelTask.ts b/src/models/labelTask.ts
index 9363cc735..6a4c68093 100644
--- a/src/models/labelTask.ts
+++ b/src/models/labelTask.ts
@@ -1,6 +1,10 @@
 import AbstractModel from './abstractModel'
 
 export default class LabelTask extends AbstractModel {
+	id: number
+	taskId: number
+	labelId: number
+
 	defaults() {
 		return {
 			id: 0,
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index 852cd8b7b..2d6b4ab17 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -2,6 +2,16 @@ import AbstractModel from './abstractModel'
 import UserModel from './user'
 
 export default class LinkShareModel extends AbstractModel {
+	id: number
+	hash: string
+	right: Right
+	sharedBy: UserModel
+	sharingType: number // FIXME: use correct numbers
+	listId: number
+	name: string
+	password: string
+	created: Date
+	updated: Date
 
 	constructor(data) {
 		// The constructor of AbstractModel handles all the default parsing.
diff --git a/src/models/list.ts b/src/models/list.ts
index f846920ca..8ee6a0f19 100644
--- a/src/models/list.ts
+++ b/src/models/list.ts
@@ -1,72 +1,48 @@
 import AbstractModel from './abstractModel'
 import TaskModel from './task'
 import UserModel from './user'
+import type NamespaceModel from './namespace'
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 import SubscriptionModel from '@/models/subscription'
 
 export default class ListModel extends AbstractModel {
+	id: number
+	title: string
+	description: string
+	owner: UserModel
+	tasks: TaskModel[]
+	namespaceId: NamespaceModel['id']
+	isArchived: boolean
+	hexColor: string
+	identifier: string
+	backgroundInformation: any
+	isFavorite: boolean
+	subscription: SubscriptionModel
+	position: number
+	backgroundBlurHash: string
+	
+	created: Date
+	updated: Date
 
 	constructor(data) {
 		super(data)
 
 		this.owner = new UserModel(this.owner)
 
-		/** @type {number} */
-		this.id
-
-		/** @type {string} */
-		this.title
-
-		/** @type {string} */
-		this.description
-		
-		/** @type {UserModel} */
-		this.owner
-
-		/** @type {TaskModel[]} */
-		this.tasks
-
 		// Make all tasks to task models
 		this.tasks = this.tasks.map(t => {
 			return new TaskModel(t)
 		})
-		
-		/** @type {number} */
-		this.namespaceId
-
-		/** @type {boolean} */
-		this.isArchived
-
-		/** @type {string} */
-		this.hexColor
 
 		if (this.hexColor !== '' && this.hexColor.substring(0, 1) !== '#') {
 			this.hexColor = '#' + this.hexColor
 		}
 
-		/** @type {string} */
-		this.identifier
-
-		/** @type */
-		this.backgroundInformation
-
-		/** @type {boolean} */
-		this.isFavorite
-
-		/** @type */
-		this.subscription
-
 		if (typeof this.subscription !== 'undefined' && this.subscription !== null) {
 			this.subscription = new SubscriptionModel(this.subscription)
 		}
 
-		/** @type {number} */
-		this.position
-
-		/** @type {Date} */
 		this.created = new Date(this.created)
-
-		/** @type {Date} */
 		this.updated = new Date(this.updated)
 	}
 
diff --git a/src/models/listDuplicateModel.ts b/src/models/listDuplicateModel.ts
index 28444185a..15a9735c8 100644
--- a/src/models/listDuplicateModel.ts
+++ b/src/models/listDuplicateModel.ts
@@ -1,7 +1,12 @@
 import AbstractModel from './abstractModel'
 import ListModel from './list'
+import NamespaceModel from './namespace'
 
 export default class ListDuplicateModel extends AbstractModel {
+	listId: number
+	namespaceId: NamespaceModel['id']
+	list: ListModel
+
 	constructor(data) {
 		super(data)
 		this.list = new ListModel(this.list)
diff --git a/src/models/namespace.ts b/src/models/namespace.ts
index 7a06a19ba..cae061287 100644
--- a/src/models/namespace.ts
+++ b/src/models/namespace.ts
@@ -4,6 +4,18 @@ import UserModel from './user'
 import SubscriptionModel from '@/models/subscription'
 
 export default class NamespaceModel extends AbstractModel {
+	id: number
+	title: string
+	description: string
+	owner: UserModel
+	lists: ListModel[]
+	isArchived: boolean
+	hexColor: string
+	subscription: SubscriptionModel
+
+	created: Date
+	updated: Date
+
 	constructor(data) {
 		super(data)
 
@@ -11,7 +23,6 @@ export default class NamespaceModel extends AbstractModel {
 			this.hexColor = '#' + this.hexColor
 		}
 
-		/** @type {ListModel[]} */
 		this.lists = this.lists.map(l => {
 			return new ListModel(l)
 		})
@@ -22,15 +33,6 @@ export default class NamespaceModel extends AbstractModel {
 			this.subscription = new SubscriptionModel(this.subscription)
 		}
 
-		/** @type {number} */
-		this.id
-
-		/** @type {string} */
-		this.title
-
-		/** @type {boolean} */
-		this.isArchived
-
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
 	}
diff --git a/src/models/notification.ts b/src/models/notification.ts
index ab522dc76..b130ce72e 100644
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@@ -5,35 +5,86 @@ import TaskModel from '@/models/task'
 import TaskCommentModel from '@/models/taskComment'
 import ListModel from '@/models/list'
 import TeamModel from '@/models/team'
-import names from './constants/notificationNames.json'
+
+export const NOTIFICATION_NAMES = {
+	'TASK_COMMENT': 'task.comment',
+	'TASK_ASSIGNED': 'task.assigned',
+	'TASK_DELETED': 'task.deleted',
+	'LIST_CREATED': 'list.created',
+	'TEAM_MEMBER_ADDED': 'team.member.added',
+} as const
+
+interface Notification {
+	doer: UserModel
+}
+interface NotificationTask extends Notification {
+	task: TaskModel
+	comment: TaskCommentModel
+}
+
+interface NotificationAssigned extends Notification {
+	task: TaskModel
+	assignee: UserModel
+}
+
+interface NotificationDeleted extends Notification {
+	task: TaskModel
+}
+
+interface NotificationCreated extends Notification {
+	task: TaskModel
+}
+
+interface NotificationMemberAdded extends Notification {
+	member: UserModel
+	team: TeamModel
+}
 
 export default class NotificationModel extends AbstractModel {
+	id: number
+	name: string
+	notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
+	read: boolean
+	readAt: Date | null
+
+	created: Date
+
 	constructor(data) {
 		super(data)
 
 		switch (this.name) {
-			case names.TASK_COMMENT:
-				this.notification.doer = new UserModel(this.notification.doer)
-				this.notification.task = new TaskModel(this.notification.task)
-				this.notification.comment = new TaskCommentModel(this.notification.comment)
+			case NOTIFICATION_NAMES.TASK_COMMENT:
+				this.notification = {
+					doer: new UserModel(this.notification.doer),
+					task: new TaskModel(this.notification.task),
+					comment: new TaskCommentModel(this.notification.comment),
+				}
 				break
-			case names.TASK_ASSIGNED:
-				this.notification.doer = new UserModel(this.notification.doer)
-				this.notification.task = new TaskModel(this.notification.task)
-				this.notification.assignee = new UserModel(this.notification.assignee)
+			case NOTIFICATION_NAMES.TASK_ASSIGNED:
+				this.notification = {
+					doer: new UserModel(this.notification.doer),
+					task: new TaskModel(this.notification.task),
+					assignee: new UserModel(this.notification.assignee),
+				}
 				break
-			case names.TASK_DELETED:
-				this.notification.doer = new UserModel(this.notification.doer)
-				this.notification.task = new TaskModel(this.notification.task)
+			case NOTIFICATION_NAMES.TASK_DELETED:
+				this.notification = {
+					doer: new UserModel(this.notification.doer),
+					task: new TaskModel(this.notification.task),
+				}
 				break
-			case names.LIST_CREATED:
-				this.notification.doer = new UserModel(this.notification.doer)
-				this.notification.list = new ListModel(this.notification.list)
+			case NOTIFICATION_NAMES.LIST_CREATED:
+				this.notification = {
+					doer: new UserModel(this.notification.doer),
+					list: new ListModel(this.notification.list),
+				}
 				break
-			case names.TEAM_MEMBER_ADDED:
-				this.notification.doer = new UserModel(this.notification.doer)
-				this.notification.member = new UserModel(this.notification.member)
-				this.notification.team = new TeamModel(this.notification.team)
+			case NOTIFICATION_NAMES.TEAM_MEMBER_ADDED:
+				this.notification = {
+					doer: new UserModel(this.notification.doer),
+					member: new UserModel(this.notification.member),
+					team: new TeamModel(this.notification.team),
+				}
 				break
 		}
 
@@ -55,9 +106,9 @@ export default class NotificationModel extends AbstractModel {
 		let who = ''
 
 		switch (this.name) {
-			case names.TASK_COMMENT:
+			case NOTIFICATION_NAMES.TASK_COMMENT:
 				return `commented on ${this.notification.task.getTextIdentifier()}`
-			case names.TASK_ASSIGNED:
+			case NOTIFICATION_NAMES.TASK_ASSIGNED:
 				who = `${this.notification.assignee.getDisplayName()}`
 
 				if (user !== null && user.id === this.notification.assignee.id) {
@@ -65,11 +116,11 @@ export default class NotificationModel extends AbstractModel {
 				}
 
 				return `assigned ${who} to ${this.notification.task.getTextIdentifier()}`
-			case names.TASK_DELETED:
+			case NOTIFICATION_NAMES.TASK_DELETED:
 				return `deleted ${this.notification.task.getTextIdentifier()}`
-			case names.LIST_CREATED:
+			case NOTIFICATION_NAMES.LIST_CREATED:
 				return `created ${this.notification.list.title}`
-			case names.TEAM_MEMBER_ADDED:
+			case NOTIFICATION_NAMES.TEAM_MEMBER_ADDED:
 				who = `${this.notification.member.getDisplayName()}`
 
 				if (user !== null && user.id === this.notification.member.id) {
diff --git a/src/models/passwordReset.ts b/src/models/passwordReset.ts
index b84df22d5..b269e54b3 100644
--- a/src/models/passwordReset.ts
+++ b/src/models/passwordReset.ts
@@ -1,6 +1,10 @@
 import AbstractModel from './abstractModel'
 
 export default class PasswordResetModel extends AbstractModel {
+	token: string
+	newPassword: string
+	email: string
+
 	constructor(data) {
 		super(data)
 
diff --git a/src/models/passwordUpdate.ts b/src/models/passwordUpdate.ts
index c98692976..b59a649be 100644
--- a/src/models/passwordUpdate.ts
+++ b/src/models/passwordUpdate.ts
@@ -1,6 +1,9 @@
 import AbstractModel from './abstractModel'
 
 export default class PasswordUpdateModel extends AbstractModel {
+	newPassword: string
+	oldPassword: string
+
 	defaults() {
 		return {
 			newPassword: '',
diff --git a/src/models/savedFilter.ts b/src/models/savedFilter.ts
index f0896b08e..06334e22c 100644
--- a/src/models/savedFilter.ts
+++ b/src/models/savedFilter.ts
@@ -2,6 +2,23 @@ import AbstractModel from '@/models/abstractModel'
 import UserModel from '@/models/user'
 
 export default class SavedFilterModel extends AbstractModel {
+	id: 0
+	title: string
+	description: string
+	filters: {
+		sortBy: ('done' | 'id')[]
+		orderBy: ('asc' | 'desc')[]
+		filterBy: 'done'[]
+		filterValue: 'false'[]
+		filterComparator: 'equals'[]
+		filterConcat: 'and'
+		filterIncludeNulls: boolean
+	}
+
+	owner: any
+	created: Date
+	updated: Date
+
 	constructor(data) {
 		super(data)
 
diff --git a/src/models/subscription.ts b/src/models/subscription.ts
index 81a86541f..a8bd7bdad 100644
--- a/src/models/subscription.ts
+++ b/src/models/subscription.ts
@@ -2,22 +2,17 @@ import AbstractModel from '@/models/abstractModel'
 import UserModel from '@/models/user'
 
 export default class SubscriptionModel extends AbstractModel {
+	id: number
+	entity: string // FIXME: correct type?
+	entityId: number // FIXME: correct type?
+	user: UserModel
+
+	created: Date
+
 	constructor(data) {
 		super(data)
 
-		/** @type {number} */
-		this.id
-
-		/** @type {string} */
-		this.entity
-
-		/** @type {number} */
-		this.entityId
-
-		/** @type {Date} */
 		this.created = new Date(this.created)
-
-		/** @type {UserModel} */
 		this.user = new UserModel(this.user)
 	}
 
diff --git a/src/models/task.ts b/src/models/task.ts
index e9146e7d3..540530db6 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -2,69 +2,86 @@ import AbstractModel from './abstractModel'
 import UserModel from './user'
 import LabelModel from './label'
 import AttachmentModel from './attachment'
-import {REPEAT_MODE_DEFAULT} from './constants/taskRepeatModes'
 
 import SubscriptionModel from '@/models/subscription'
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
+import type ListModel from './list'
 
 const SUPPORTS_TRIGGERED_NOTIFICATION = 'Notification' in window && 'showTrigger' in Notification.prototype
 export const TASK_DEFAULT_COLOR = '#1973ff'
 
+export const TASK_REPEAT_MODES = {
+	'REPEAT_MODE_DEFAULT': 0,
+	'REPEAT_MODE_MONTH': 1,
+	'REPEAT_MODE_FROM_CURRENT_DATE': 2,
+} as const
+
+export type TaskRepeatMode = typeof TASK_REPEAT_MODES[keyof typeof TASK_REPEAT_MODES] 
+
+export interface RepeatAfter {
+	type: 'hours' | 'weeks' | 'months' | 'years' | 'days'
+	amount: number
+}
+
 export default class TaskModel extends AbstractModel {
-	constructor(data) {
+	id: number
+	title: string
+	description: string
+	done: boolean
+	doneAt: Date | null
+	priority: 0
+	labels: LabelModel[]
+	assignees: UserModel[]
+
+	dueDate: Date | null
+	startDate: Date | null
+	endDate: Date | null
+	repeatAfter: number | RepeatAfter
+	repeatFromCurrentDate: boolean
+	repeatMode: TaskRepeatMode
+	reminderDates: Date[]
+	parentTaskId: TaskModel['id']
+	hexColor: string
+	percentDone: number
+	relatedTasks: { [relationKind: string]: TaskModel } // FIXME: use relationKinds
+	attachments: AttachmentModel[]
+	identifier: string
+	index: number
+	isFavorite: boolean
+	subscription: SubscriptionModel
+
+	position: number
+	kanbanPosition: number
+
+	createdBy: UserModel
+	created: Date
+	updated: Date
+
+	listId: ListModel['id'] // Meta, only used when creating a new task
+
+	constructor(data: Partial<TaskModel>) {
 		super(data)
 
-		/** @type {number} */
 		this.id = Number(this.id)
-
-		/** @type {string} */
 		this.title = this.title?.trim()
-
-		/** @type {string} */
-		this.description
-
-		/** @type {boolean} */
-		this.done
-
-		/** @type */
 		this.doneAt = parseDateOrNull(this.doneAt)
 
-		/** @type {number} */
-		this.priority
-
-		/** @type {LabelModel[]} */
 		this.labels = this.labels
 			.map(l => new LabelModel(l))
 			.sort((f, s) => f.title > s.title ? 1 : -1)
 
-		/** @type {UserModel[]} */
 		// Parse the assignees into user models
 		this.assignees = this.assignees.map(a => {
 			return new UserModel(a)
 		})
 
-		/** @type {Date} */
 		this.dueDate = parseDateOrNull(this.dueDate)
-
-		/** @type {Date} */
 		this.startDate = parseDateOrNull(this.startDate)
-
-		/** @type {Date} */
 		this.endDate = parseDateOrNull(this.endDate)
 
-		/** @type */
-		this.repeatAfter
-
 		// Parse the repeat after into something usable
 		this.parseRepeatAfter()
 
-		/** @type {boolean} */
-		this.repeatFromCurrentDate
-
-		/** @type {TaskRepeatMode: 0 | 1 | 2} */
-		this.repeatMode
-
-		/** @type {Date[]} */
 		this.reminderDates = this.reminderDates.map(d => new Date(d))
 
 		// Cancel all scheduled notifications for this task to be sure to only have available notifications
@@ -73,22 +90,10 @@ export default class TaskModel extends AbstractModel {
 			this.reminderDates.forEach(d => this.scheduleNotification(d))
 		})
 
-		/** @type {number} */
-		this.parentTaskId
-
-		/** @type {string} */
-		this.hexColor
-
 		if (this.hexColor !== '' && this.hexColor.substring(0, 1) !== '#') {
 			this.hexColor = '#' + this.hexColor
 		}
 
-		/** @type {number} */
-		this.percentDone
-
-		/** @type {{ [relationKind: string]: TaskModel }} */
-		this.relatedTasks
-
 		// Make all subtasks to task models
 		Object.keys(this.relatedTasks).forEach(relationKind => {
 			this.relatedTasks[relationKind] = this.relatedTasks[relationKind].map(t => {
@@ -97,46 +102,21 @@ export default class TaskModel extends AbstractModel {
 		})
 
 		// Make all attachments to attachment models
-		/** @type {AttachmentModel[]} */
 		this.attachments = this.attachments.map(a => new AttachmentModel(a))
 
-		/** @type {string} */
-		this.identifier
-
 		// Set the task identifier to empty if the list does not have one
 		if (this.identifier === `-${this.index}`) {
 			this.identifier = ''
 		}
 
-		/** @type {number} */
-		this.index
-
-		/** @type {boolean} */
-		this.isFavorite
-
-		/** @type {SubscriptionModel} */
-		this.subscription
-
 		if (typeof this.subscription !== 'undefined' && this.subscription !== null) {
 			this.subscription = new SubscriptionModel(this.subscription)
 		}
 
-		/** @type {number} */
-		this.position
-
-		/** @type {number} */
-		this.kanbanPosition
-
-		/** @type {UserModel} */
 		this.createdBy = new UserModel(this.createdBy)
-
-		/** @type {Date} */
 		this.created = new Date(this.created)
-
-		/** @type {Date} */
 		this.updated = new Date(this.updated)
 
-		/** @type {number} */
 		this.listId = Number(this.listId)
 	}
 
@@ -156,7 +136,7 @@ export default class TaskModel extends AbstractModel {
 			endDate: 0,
 			repeatAfter: 0,
 			repeatFromCurrentDate: false,
-			repeatMode: REPEAT_MODE_DEFAULT,
+			repeatMode: TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT,
 			reminderDates: [],
 			parentTaskId: 0,
 			hexColor: '',
@@ -204,7 +184,7 @@ export default class TaskModel extends AbstractModel {
 	 * This function should only be called from the constructor.
 	 */
 	parseRepeatAfter() {
-		const repeatAfterHours = (this.repeatAfter / 60) / 60
+		const repeatAfterHours = (this.repeatAfter as number / 60) / 60
 		this.repeatAfter = {type: 'hours', amount: repeatAfterHours}
 
 		// if its dividable by 24, its something with days, otherwise hours
diff --git a/src/models/taskAssignee.ts b/src/models/taskAssignee.ts
index ee697b9d7..966ab6407 100644
--- a/src/models/taskAssignee.ts
+++ b/src/models/taskAssignee.ts
@@ -1,6 +1,12 @@
 import AbstractModel from './abstractModel'
+import type UserModel from './user'
+import type TaskModel from './task'
 
 export default class TaskAssigneeModel extends AbstractModel {
+	created: Date
+	userId: UserModel['id']
+	taskId: TaskModel['id']
+
 	constructor(data) {
 		super(data)
 		this.created = new Date(this.created)
diff --git a/src/models/taskComment.ts b/src/models/taskComment.ts
index 376195a98..d2cb6db3d 100644
--- a/src/models/taskComment.ts
+++ b/src/models/taskComment.ts
@@ -1,7 +1,16 @@
 import AbstractModel from './abstractModel'
 import UserModel from './user'
+import type TaskModel from './task'
 
 export default class TaskCommentModel extends AbstractModel {
+	id: number
+	taskId: TaskModel['id']
+	comment: string
+	author: UserModel
+
+	created: Date
+	updated: Date
+
 	constructor(data) {
 		super(data)
 		this.author = new UserModel(this.author)
@@ -16,7 +25,7 @@ export default class TaskCommentModel extends AbstractModel {
 			comment: '',
 			author: UserModel,
 			created: null,
-			update: null,
+			updated: null,
 		}
 	}
 }
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index 63fcda0a7..5a944c027 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -1,7 +1,31 @@
 import AbstractModel from './abstractModel'
 import UserModel from './user'
+import type TaskModel from './task'
+
+export const RELATION_KINDS = [
+	'subtask',
+	'parenttask',
+	'related',
+	'duplicates',
+	'blocking',
+	'blocked',
+	'precedes',
+	'follows',
+	'copiedfrom',
+	'copiedto',
+  ] as const
+
+export type RelationKind = typeof RELATION_KINDS[number]
 
 export default class TaskRelationModel extends AbstractModel {
+	id: number
+	otherTaskId: TaskModel['id']
+	taskId: TaskModel['id']
+	relationKind: RelationKind
+
+	createdBy: UserModel
+	created: Date
+
 	constructor(data) {
 		super(data)
 		this.createdBy = new UserModel(this.createdBy)
diff --git a/src/models/team.ts b/src/models/team.ts
index d9217926f..05285ca1d 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -3,6 +3,16 @@ import UserModel from './user'
 import TeamMemberModel from './teamMember'
 
 export default class TeamModel extends AbstractModel {
+	id: 0
+	name: string
+	description: string
+	members: TeamMemberModel[]
+	right: Right
+
+	createdBy: UserModel
+	created: Date
+	updated: Date
+
 	constructor(data) {
 		super(data)
 
diff --git a/src/models/teamList.ts b/src/models/teamList.ts
index d000a01b1..82f2d76c6 100644
--- a/src/models/teamList.ts
+++ b/src/models/teamList.ts
@@ -1,6 +1,9 @@
 import TeamShareBaseModel from './teamShareBase'
+import type ListModel from './list'
 
 export default class TeamListModel extends TeamShareBaseModel {
+	listId: ListModel['id']
+
 	defaults() {
 		return {
 			...super.defaults(),
diff --git a/src/models/teamMember.ts b/src/models/teamMember.ts
index 2e5e236ae..f0c13a775 100644
--- a/src/models/teamMember.ts
+++ b/src/models/teamMember.ts
@@ -1,6 +1,10 @@
 import UserModel from './user'
+import type ListModel from './list'
 
 export default class TeamMemberModel extends UserModel {
+	admin: boolean
+	teamId: ListModel['id']
+
 	defaults() {
 		return {
 			...super.defaults(),
diff --git a/src/models/teamNamespace.ts b/src/models/teamNamespace.ts
index 4c1c7521d..edeb7fca8 100644
--- a/src/models/teamNamespace.ts
+++ b/src/models/teamNamespace.ts
@@ -1,6 +1,9 @@
 import TeamShareBaseModel from './teamShareBase'
+import type NamespaceModel from './namespace'
 
 export default class TeamNamespaceModel extends TeamShareBaseModel {
+	namespaceId: NamespaceModel['id']
+
 	defaults() {
 		return {
 			...super.defaults(),
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index 08b3dc80f..84e0373ba 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -1,10 +1,18 @@
 import AbstractModel from './abstractModel'
+import type TeamModel from './team'
+import type {Right} from '@/models/constants/rights'
 
 /**
  * This class is a base class for common team sharing model.
  * It is extended in a way so it can be used for namespaces as well for lists.
  */
 export default class TeamShareBaseModel extends AbstractModel {
+	teamId: TeamModel['id']
+	right: Right
+
+	created: Date
+	updated: Date
+
 	constructor(data) {
 		super(data)
 		this.created = new Date(this.created)
diff --git a/src/models/totp.ts b/src/models/totp.ts
index 17de13b6b..e631af7ce 100644
--- a/src/models/totp.ts
+++ b/src/models/totp.ts
@@ -1,6 +1,10 @@
 import AbstractModel from './abstractModel'
 
 export default class TotpModel extends AbstractModel {
+	secret: string
+	enabled: boolean
+	url: string
+
 	defaults() {
 		return {
 			secret: '',
diff --git a/src/models/user.ts b/src/models/user.ts
index 90d71ca7a..5c212c913 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -2,30 +2,21 @@ import AbstractModel from './abstractModel'
 import UserSettingsModel from '@/models/userSettings'
 
 export default class UserModel extends AbstractModel {
+	id: number
+	email: string
+	username: string
+	name: string
+
+	created: Date
+	updated: Date
+	settings: UserSettingsModel
+
 	constructor(data) {
 		super(data)
 
-		/** @type {number} */
-		this.id
-
-		/** @type {string} */
-		this.email
-
-		/** @type {string} */
-		this.username
-
-		/** @type {string} */
-		this.name
-
-		/** @type {Date} */
 		this.created = new Date(this.created)
-
-		/** @type {Date} */
 		this.updated = new Date(this.updated)
 
-		/** @type {UserSettingsModel} */
-		this.settings
-
 		if (this.settings !== null) {
 			this.settings = new UserSettingsModel(this.settings)
 		}
diff --git a/src/models/userList.ts b/src/models/userList.ts
index 42bde509c..f48989a24 100644
--- a/src/models/userList.ts
+++ b/src/models/userList.ts
@@ -1,7 +1,9 @@
 import UserShareBaseModel from './userShareBase'
-
+import type ListModel from './list'
 // This class extends the user share model with a 'rights' parameter which is used in sharing
 export default class UserListModel extends UserShareBaseModel {
+	listId: ListModel['id']
+
 	defaults() {
 		return {
 			...super.defaults(),
diff --git a/src/models/userNamespace.ts b/src/models/userNamespace.ts
index 085ece650..4a4703da8 100644
--- a/src/models/userNamespace.ts
+++ b/src/models/userNamespace.ts
@@ -1,7 +1,10 @@
 import UserShareBaseModel from './userShareBase'
+import type NamespaceModel from './namespace'
 
 // This class extends the user share model with a 'rights' parameter which is used in sharing
 export default class UserNamespaceModel extends UserShareBaseModel {
+	namespaceId: NamespaceModel['id']
+
 	defaults() {
 		return {
 			...super.defaults(),
diff --git a/src/models/userSettings.ts b/src/models/userSettings.ts
index 41932e261..3c033031f 100644
--- a/src/models/userSettings.ts
+++ b/src/models/userSettings.ts
@@ -1,7 +1,17 @@
 
 import AbstractModel from './abstractModel'
+import type ListModel from './list'
 
 export default class UserSettingsModel extends AbstractModel {
+	name: string
+	emailRemindersEnabled: boolean
+	discoverableByName: boolean
+	discoverableByEmail: boolean
+	overdueTasksRemindersEnabled: boolean
+	defaultListId: undefined | ListModel['id']
+	weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6
+	timezone: string
+
 	defaults() {
 		return {
 			name: '',
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index 171643a06..3d34ac3cf 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -1,6 +1,14 @@
 import AbstractModel from './abstractModel'
+import type UserModel from './user'
+import type {Right} from '@/models/constants/rights'
 
 export default class UserShareBaseModel extends AbstractModel {
+	userId: UserModel['id']
+	right: Right
+
+	created: Date
+	updated: Date
+
 	constructor(data) {
 		super(data)
 		this.created = new Date(this.created)

From af630d3b8c1536c1a9a320172aaf19e000bb2517 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 23 Jun 2022 03:08:35 +0200
Subject: [PATCH 03/32] chore: improve type imports

---
 src/App.vue                                   |  2 +-
 src/components/home/contentAuth.vue           |  2 +-
 src/components/home/navigation.vue            |  7 +++--
 src/components/input/button.vue               |  2 +-
 .../list/list-settings-dropdown.vue           |  2 +-
 src/components/list/partials/filters.vue      |  4 +--
 src/components/list/partials/list-card.vue    |  4 +--
 src/components/misc/Done.vue                  |  2 +-
 src/components/misc/message.vue               |  2 +-
 src/components/misc/subscription.vue          | 27 ++++++++++--------
 src/components/sharing/userTeam.vue           |  2 +-
 src/components/tasks/add-task.vue             |  2 +-
 src/components/tasks/gantt-component.vue      |  4 +--
 src/components/tasks/partials/attachments.vue |  2 +-
 .../tasks/partials/editAssignees.vue          |  4 +--
 src/components/tasks/partials/editLabels.vue  |  2 +-
 src/components/tasks/partials/kanban-card.vue | 15 +++++-----
 src/components/tasks/partials/labels.vue      |  4 +++
 src/components/tasks/partials/reminders.vue   |  2 +-
 .../tasks/partials/singleTaskInList.vue       | 10 +++----
 src/components/tasks/partials/sort.vue        |  2 +-
 src/helpers/redirectToProvider.ts             |  2 +-
 src/views/labels/ListLabels.vue               |  2 +-
 src/views/labels/NewLabel.vue                 |  2 +-
 src/views/list/ListTable.vue                  |  4 +--
 src/views/list/settings/archive.vue           |  3 +-
 src/views/list/settings/share.vue             |  6 +---
 src/views/migrator/MigrateService.vue         |  2 +-
 src/views/namespaces/NewNamespace.vue         |  4 +--
 src/views/tasks/ShowTasks.vue                 |  2 +-
 src/views/tasks/TaskDetailView.vue            | 28 +++++++++----------
 src/views/teams/EditTeam.vue                  |  6 ++--
 src/views/user/Login.vue                      |  4 +--
 src/views/user/OpenIdAuth.vue                 |  4 +--
 src/views/user/Register.vue                   |  4 +--
 src/views/user/RequestPasswordReset.vue       |  2 +-
 src/views/user/settings/Caldav.vue            |  2 +-
 src/views/user/settings/Deletion.vue          |  6 +---
 38 files changed, 92 insertions(+), 94 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 9c48735c4..d4ac424d6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script lang="ts" setup>
-import {computed, watch, Ref} from 'vue'
+import {computed, watch, type Ref} from 'vue'
 import {useRouter} from 'vue-router'
 import {useRouteQuery} from '@vueuse/router'
 import {useStore} from 'vuex'
diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index 17d228698..02c87356c 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -60,7 +60,7 @@
 </template>
 
 <script lang="ts" setup>
-import {watch, computed, shallowRef, watchEffect, VNode, h} from 'vue'
+import {watch, computed, shallowRef, watchEffect, type VNode, h} from 'vue'
 import {useStore} from 'vuex'
 import {useRoute, useRouter} from 'vue-router'
 import {useEventListener} from '@vueuse/core'
diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 5f378abdc..3ed3044bb 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -143,7 +143,7 @@
 import {ref, computed, onMounted, onBeforeMount} from 'vue'
 import {useStore} from 'vuex'
 import draggable from 'zhyswan-vuedraggable'
-import {SortableEvent} from 'sortablejs'
+import type {SortableEvent} from 'sortablejs'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue'
@@ -154,9 +154,10 @@ import Logo from '@/components/home/Logo.vue'
 import {MENU_ACTIVE} from '@/store/mutation-types'
 import {calculateItemPosition} from '@/helpers/calculateItemPosition'
 import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
+import {getListTitle} from '@/helpers/getListTitle'
 import {useEventListener} from '@vueuse/core'
-import NamespaceModel from '@/models/namespace'
-import ListModel from '@/models/list'
+import type NamespaceModel from '@/models/namespace'
+import type ListModel from '@/models/list'
 
 const drag = ref(false)
 const dragOptions = {
diff --git a/src/components/input/button.vue b/src/components/input/button.vue
index 738cfa1a2..6aa8184bf 100644
--- a/src/components/input/button.vue
+++ b/src/components/input/button.vue
@@ -26,7 +26,7 @@ export default defineComponent({
 </script>
 
 <script setup lang="ts">
-import {computed, useSlots, PropType} from 'vue'
+import {computed, useSlots, type PropType} from 'vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 
 const BUTTON_TYPES_MAP =  Object.freeze({
diff --git a/src/components/list/list-settings-dropdown.vue b/src/components/list/list-settings-dropdown.vue
index a0d77d686..74cafb884 100644
--- a/src/components/list/list-settings-dropdown.vue
+++ b/src/components/list/list-settings-dropdown.vue
@@ -84,7 +84,7 @@ import Dropdown from '@/components/misc/dropdown.vue'
 import DropdownItem from '@/components/misc/dropdown-item.vue'
 import TaskSubscription from '@/components/misc/subscription.vue'
 import ListModel from '@/models/list'
-import SubscriptionModel from '@/models/subscription'
+import type SubscriptionModel from '@/models/subscription'
 
 const props = defineProps({
 	list: {
diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 73e2711a4..939d1a891 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -186,8 +186,8 @@
 <script lang="ts">
 import {defineComponent} from 'vue'
 
-import DatepickerWithRange from '@/components/date/datepickerWithRange'
-import Fancycheckbox from '../../input/fancycheckbox'
+import DatepickerWithRange from '@/components/date/datepickerWithRange.vue'
+import Fancycheckbox from '@/components/input/fancycheckbox.vue'
 
 import {includesById} from '@/helpers/utils'
 import PrioritySelect from '@/components/tasks/partials/prioritySelect.vue'
diff --git a/src/components/list/partials/list-card.vue b/src/components/list/partials/list-card.vue
index 3d8c3b084..599ae058e 100644
--- a/src/components/list/partials/list-card.vue
+++ b/src/components/list/partials/list-card.vue
@@ -36,14 +36,14 @@
 </template>
 
 <script lang="ts" setup>
-import {PropType, ref, watch} from 'vue'
+import {type PropType, ref, watch} from 'vue'
 import {useStore} from 'vuex'
 
 import ListService from '@/services/list'
 import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
 
 import {colorIsDark} from '@/helpers/color/colorIsDark'
-import ListModel from '@/models/list'
+import type ListModel from '@/models/list'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 
diff --git a/src/components/misc/Done.vue b/src/components/misc/Done.vue
index f9bebd7e9..b8066b5bd 100644
--- a/src/components/misc/Done.vue
+++ b/src/components/misc/Done.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script lang="ts" setup>
-import {PropType} from 'vue'
+import type {PropType} from 'vue'
 type Variants = 'default' | 'small'
 
 defineProps({
diff --git a/src/components/misc/message.vue b/src/components/misc/message.vue
index 7ff84f9fe..86b1b93af 100644
--- a/src/components/misc/message.vue
+++ b/src/components/misc/message.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts" setup>
-import {computed, PropType} from 'vue'
+import {computed, type PropType} from 'vue'
 
 const TEXT_ALIGN_MAP = Object.freeze({
 	left: '',
diff --git a/src/components/misc/subscription.vue b/src/components/misc/subscription.vue
index 559852081..073e727ca 100644
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script lang="ts" setup>
-import {computed, shallowRef} from 'vue'
+import {computed, shallowRef, type PropType} from 'vue'
 import {useI18n} from 'vue-i18n'
 
 import BaseButton from '@/components/base/BaseButton.vue'
@@ -43,16 +43,21 @@ import SubscriptionModel from '@/models/subscription'
 
 import {success} from '@/message'
 
-interface Props {
-	entity: string
-	entityId: number
-	subscription: SubscriptionModel | null
-	type?: 'button' | 'dropdown' | null
-}
-
-const props = withDefaults(defineProps<Props>(), {
-	subscription: null,
-	type: 'button',
+const props = defineProps({
+	entity: String,
+	entityId: Number,
+	isButton: {
+		type: Boolean,
+		default: true,
+	},
+	subscription: {
+		type: Object as PropType<SubscriptionModel>,
+		default: null,
+	},
+	type: {
+		type: String as PropType<'button' | 'dropdown' | 'null'>,
+		default: 'button',
+	},
 })
 
 const subscriptionEntity = computed<string | null>(() => props.subscription?.entity ?? null)
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index 08bb42d7d..56ea03dc6 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -139,7 +139,7 @@ export default defineComponent({name: 'userTeamShare'})
 </script>
 
 <script setup lang="ts">
-import {ref, reactive, computed, shallowReactive, ShallowReactive, Ref} from 'vue'
+import {ref, reactive, computed, shallowReactive, type ShallowReactive, type Ref} from 'vue'
 import type {PropType} from 'vue'
 import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index a2a21cd5c..2a4b2e3e8 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -44,7 +44,7 @@
 import {ref, watch, unref, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
 import {useStore} from 'vuex'
-import {tryOnMounted, debouncedWatch, useWindowSize, MaybeRef} from '@vueuse/core'
+import {tryOnMounted, debouncedWatch, useWindowSize, type MaybeRef} from '@vueuse/core'
 
 import TaskService from '@/services/task'
 import QuickAddMagic from '@/components/tasks/partials/quick-add-magic.vue'
diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index 01a90a324..37316b048 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -175,12 +175,12 @@
 import {defineComponent} from 'vue'
 
 import VueDragResize from 'vue-drag-resize'
-import EditTask from './edit-task'
+import EditTask from './edit-task.vue'
 
 import TaskService from '../../services/task'
 import TaskModel from '../../models/task'
 import priorities from '../../models/constants/priorities'
-import PriorityLabel from './partials/priorityLabel'
+import PriorityLabel from './partials/priorityLabel.vue'
 import TaskCollectionService from '../../services/taskCollection'
 import {mapState} from 'vuex'
 import Rights from '../../models/constants/rights.json'
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index 580cd4fb3..1a2c0f686 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -148,7 +148,7 @@ import {defineComponent} from 'vue'
 
 import AttachmentService from '../../../services/attachment'
 import AttachmentModel from '../../../models/attachment'
-import User from '../../misc/user'
+import User from '@/components/misc/user.vue'
 import {mapState} from 'vuex'
 
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
diff --git a/src/components/tasks/partials/editAssignees.vue b/src/components/tasks/partials/editAssignees.vue
index 3d2dc6d2a..309cd15eb 100644
--- a/src/components/tasks/partials/editAssignees.vue
+++ b/src/components/tasks/partials/editAssignees.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script setup lang="ts">
-import {ref, shallowReactive, watch, PropType} from 'vue'
+import {ref, shallowReactive, watch, type PropType} from 'vue'
 import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
 
@@ -37,7 +37,7 @@ import Multiselect from '@/components/input/multiselect.vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 
 import {includesById} from '@/helpers/utils'
-import UserModel from '@/models/user'
+import type UserModel from '@/models/user'
 import ListUserService from '@/services/listUsers'
 import {success} from '@/message'
 
diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue
index 74b2d6e4a..bc218519a 100644
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script setup lang="ts">
-import {PropType, ref, computed, shallowReactive, watch} from 'vue'
+import {type PropType, ref, computed, shallowReactive, watch} from 'vue'
 import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
 
diff --git a/src/components/tasks/partials/kanban-card.vue b/src/components/tasks/partials/kanban-card.vue
index 1e4b02f83..03c6ae61c 100644
--- a/src/components/tasks/partials/kanban-card.vue
+++ b/src/components/tasks/partials/kanban-card.vue
@@ -66,15 +66,15 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
+import {defineComponent, type PropType} from 'vue'
 
 import {playPop} from '../../../helpers/playPop'
-import PriorityLabel from '../../../components/tasks/partials/priorityLabel'
-import User from '../../../components/misc/user'
+import PriorityLabel from '../../../components/tasks/partials/priorityLabel.vue'
+import User from '../../../components/misc/user.vue'
 import Done from '@/components/misc/Done.vue'
-import Labels from '../../../components/tasks/partials/labels'
-import ChecklistSummary from './checklist-summary'
-import {TASK_DEFAULT_COLOR} from '@/models/task'
+import Labels from '../../../components/tasks/partials/labels.vue'
+import ChecklistSummary from './checklist-summary.vue'
+import TaskModel, {TASK_DEFAULT_COLOR} from '@/models/task'
 
 import {colorIsDark} from '@/helpers/color/colorIsDark'
 
@@ -95,6 +95,7 @@ export default defineComponent({
 	},
 	props: {
 		task: {
+			type: Object as PropType<TaskModel>,
 			required: true,
 		},
 		loading: {
@@ -112,7 +113,7 @@ export default defineComponent({
 	},
 	methods: {
 		colorIsDark,
-		async toggleTaskDone(task) {
+		async toggleTaskDone(task: TaskModel) {
 			this.loadingInternal = true
 			try {
 				const done = !task.done
diff --git a/src/components/tasks/partials/labels.vue b/src/components/tasks/partials/labels.vue
index e9af8e398..59fdf702f 100644
--- a/src/components/tasks/partials/labels.vue
+++ b/src/components/tasks/partials/labels.vue
@@ -11,8 +11,12 @@
 </template>
 
 <script setup lang="ts">
+import type LabelModel from '@/models/label'
+import type { PropType } from 'vue'
+
 defineProps({
 	labels: {
+		type: Array as PropType<LabelModel[]>,
 		required: true,
 	},
 })
diff --git a/src/components/tasks/partials/reminders.vue b/src/components/tasks/partials/reminders.vue
index dc655ba86..45632c736 100644
--- a/src/components/tasks/partials/reminders.vue
+++ b/src/components/tasks/partials/reminders.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script setup lang="ts">
-import {PropType, ref, onMounted, watch} from 'vue'
+import {type PropType, ref, onMounted, watch} from 'vue'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import Datepicker from '@/components/input/datepicker.vue'
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index e153cb3ab..209633b61 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -99,16 +99,14 @@
 import {defineComponent} from 'vue'
 
 import TaskModel from '../../../models/task'
-import PriorityLabel from './priorityLabel'
+import PriorityLabel from './priorityLabel.vue'
 import TaskService from '../../../services/task'
-import Labels from './labels'
-import User from '../../misc/user'
 import BaseButton from '@/components/base/BaseButton.vue'
-import Fancycheckbox from '../../input/fancycheckbox'
-import DeferTask from './defer-task'
+import Fancycheckbox from '../../input/fancycheckbox.vue'
+import DeferTask from './defer-task.vue'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {playPop} from '@/helpers/playPop'
-import ChecklistSummary from './checklist-summary'
+import ChecklistSummary from './checklist-summary.vue'
 
 export default defineComponent({
 	name: 'singleTaskInList',
diff --git a/src/components/tasks/partials/sort.vue b/src/components/tasks/partials/sort.vue
index 4eeb5e9f6..22b316d10 100644
--- a/src/components/tasks/partials/sort.vue
+++ b/src/components/tasks/partials/sort.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup lang="ts">
-import {PropType} from 'vue'
+import type {PropType} from 'vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 
 type Order = 'asc' | 'desc' | 'none'
diff --git a/src/helpers/redirectToProvider.ts b/src/helpers/redirectToProvider.ts
index e7cd65e7e..1253b065d 100644
--- a/src/helpers/redirectToProvider.ts
+++ b/src/helpers/redirectToProvider.ts
@@ -1,7 +1,7 @@
 import {createRandomID} from '@/helpers/randomId'
 import {parseURL} from 'ufo'
 
-interface Provider {
+export interface Provider {
 	name: string
 	key: string
 	authUrl: string
diff --git a/src/views/labels/ListLabels.vue b/src/views/labels/ListLabels.vue
index e321a6e0e..c77be4f74 100644
--- a/src/views/labels/ListLabels.vue
+++ b/src/views/labels/ListLabels.vue
@@ -118,7 +118,7 @@ import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import AsyncEditor from '@/components/input/AsyncEditor'
-import ColorPicker from '@/components/input/colorPicker'
+import ColorPicker from '@/components/input/colorPicker.vue'
 
 export default defineComponent({
 	name: 'ListLabels',
diff --git a/src/views/labels/NewLabel.vue b/src/views/labels/NewLabel.vue
index a62c90895..423e13916 100644
--- a/src/views/labels/NewLabel.vue
+++ b/src/views/labels/NewLabel.vue
@@ -38,7 +38,7 @@
 import {defineComponent} from 'vue'
 import LabelModel from '../../models/label'
 import CreateEdit from '@/components/misc/create-edit.vue'
-import ColorPicker from '../../components/input/colorPicker'
+import ColorPicker from '../../components/input/colorPicker.vue'
 import {mapState} from 'vuex'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 
diff --git a/src/views/list/ListTable.vue b/src/views/list/ListTable.vue
index 165b8a6ff..f8b2c7082 100644
--- a/src/views/list/ListTable.vue
+++ b/src/views/list/ListTable.vue
@@ -180,7 +180,7 @@
 </template>
 
 <script setup lang="ts">
-import {toRef, computed, Ref} from 'vue'
+import {toRef, computed, type Ref} from 'vue'
 
 import {useStorage} from '@vueuse/core'
 
@@ -197,7 +197,7 @@ import Pagination from '@/components/misc/pagination.vue'
 import Popup from '@/components/misc/popup.vue'
 
 import {useTaskList} from '@/composables/taskList'
-import TaskModel from '@/models/task'
+import type TaskModel from '@/models/task'
 
 const ACTIVE_COLUMNS_DEFAULT = {
 	id: true,
diff --git a/src/views/list/settings/archive.vue b/src/views/list/settings/archive.vue
index b752448f3..2251fa374 100644
--- a/src/views/list/settings/archive.vue
+++ b/src/views/list/settings/archive.vue
@@ -12,8 +12,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-export default defineComponent({name: 'list-setting-archive'})
+export default {name: 'list-setting-archive'}
 </script>
 
 <script setup lang="ts">
diff --git a/src/views/list/settings/share.vue b/src/views/list/settings/share.vue
index bd2cf0728..b2dcca1ea 100644
--- a/src/views/list/settings/share.vue
+++ b/src/views/list/settings/share.vue
@@ -23,11 +23,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-
-export default defineComponent({
-	name: 'list-setting-share',
-})
+export default {name: 'list-setting-share'}
 </script>
 
 <script lang="ts" setup>
diff --git a/src/views/migrator/MigrateService.vue b/src/views/migrator/MigrateService.vue
index 9921a8560..802600999 100644
--- a/src/views/migrator/MigrateService.vue
+++ b/src/views/migrator/MigrateService.vue
@@ -71,7 +71,7 @@ import {defineComponent} from 'vue'
 import AbstractMigrationService from '@/services/migrator/abstractMigration'
 import AbstractMigrationFileService from '@/services/migrator/abstractMigrationFile'
 import Logo from '@/assets/logo.svg?component'
-import Message from '@/components/misc/message'
+import Message from '@/components/misc/message.vue'
 
 import {MIGRATORS} from './migrators'
 
diff --git a/src/views/namespaces/NewNamespace.vue b/src/views/namespaces/NewNamespace.vue
index aebb09377..19ffb16ce 100644
--- a/src/views/namespaces/NewNamespace.vue
+++ b/src/views/namespaces/NewNamespace.vue
@@ -43,11 +43,11 @@
 <script lang="ts">
 import {defineComponent} from 'vue'
 
-import Message from '@/components/misc/message'
+import Message from '@/components/misc/message.vue'
 import NamespaceModel from '../../models/namespace'
 import NamespaceService from '../../services/namespace'
 import CreateEdit from '@/components/misc/create-edit.vue'
-import ColorPicker from '../../components/input/colorPicker'
+import ColorPicker from '../../components/input/colorPicker.vue'
 
 export default defineComponent({
 	name: 'NewNamespace',
diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue
index 48872b836..7bca07693 100644
--- a/src/views/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -49,7 +49,7 @@ import {useStore} from 'vuex'
 import {useRoute, useRouter} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
-import TaskModel from '@/models/task'
+import type TaskModel from '@/models/task'
 import {formatDate} from '@/helpers/time/formatDate'
 import {setTitle} from '@/helpers/setTitle'
 
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 7ddf289de..02aec44ae 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -430,28 +430,28 @@ import TaskModel from '../../models/task'
 import priorites from '../../models/constants/priorities.json'
 import rights from '../../models/constants/rights.json'
 
-import PrioritySelect from '../../components/tasks/partials/prioritySelect'
-import PercentDoneSelect from '../../components/tasks/partials/percentDoneSelect'
-import EditLabels from '../../components/tasks/partials/editLabels'
-import EditAssignees from '../../components/tasks/partials/editAssignees'
-import Attachments from '../../components/tasks/partials/attachments'
-import RelatedTasks from '../../components/tasks/partials/relatedTasks'
-import RepeatAfter from '../../components/tasks/partials/repeatAfter'
-import Reminders from '../../components/tasks/partials/reminders'
-import Comments from '../../components/tasks/partials/comments'
-import ListSearch from '../../components/tasks/partials/listSearch'
+import PrioritySelect from '../../components/tasks/partials/prioritySelect.vue'
+import PercentDoneSelect from '../../components/tasks/partials/percentDoneSelect.vue'
+import EditLabels from '../../components/tasks/partials/editLabels.vue'
+import EditAssignees from '../../components/tasks/partials/editAssignees.vue'
+import Attachments from '../../components/tasks/partials/attachments.vue'
+import RelatedTasks from '../../components/tasks/partials/relatedTasks.vue'
+import RepeatAfter from '../../components/tasks/partials/repeatAfter.vue'
+import Reminders from '../../components/tasks/partials/reminders.vue'
+import Comments from '../../components/tasks/partials/comments.vue'
+import ListSearch from '../../components/tasks/partials/listSearch.vue'
 import description from '@/components/tasks/partials/description.vue'
-import ColorPicker from '../../components/input/colorPicker'
+import ColorPicker from '../../components/input/colorPicker.vue'
 import heading from '@/components/tasks/partials/heading.vue'
 import Datepicker from '@/components/input/datepicker.vue'
-import BaseButton from '@/components/base/BaseButton'
+import BaseButton from '@/components/base/BaseButton.vue'
 import {playPop} from '@/helpers/playPop'
 import TaskSubscription from '@/components/misc/subscription.vue'
 import {CURRENT_LIST} from '@/store/mutation-types'
 
 import {uploadFile} from '@/helpers/attachments'
-import ChecklistSummary from '../../components/tasks/partials/checklist-summary'
-import CreatedUpdated from '@/components/tasks/partials/createdUpdated'
+import ChecklistSummary from '../../components/tasks/partials/checklist-summary.vue'
+import CreatedUpdated from '@/components/tasks/partials/createdUpdated.vue'
 import { setTitle } from '@/helpers/setTitle'
 
 function scrollIntoView(el) {
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index 27881bba5..b5ccd7295 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -167,10 +167,10 @@ import Editor from '@/components/input/AsyncEditor'
 import {useStore} from 'vuex'
 
 import TeamService from '../../services/team'
-import TeamModel from '../../models/team'
+import type TeamModel from '../../models/team'
 import TeamMemberService from '../../services/teamMember'
-import TeamMemberModel from '../../models/teamMember'
-import UserModel from '../../models/user'
+import type TeamMemberModel from '../../models/teamMember'
+import type UserModel from '../../models/user'
 import UserService from '../../services/user'
 import Rights from '../../models/constants/rights.json'
 
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index ab37e16e6..8edb0f982 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -109,10 +109,10 @@ import {mapState} from 'vuex'
 import {HTTPFactory} from '@/http-common'
 import {LOADING} from '@/store/mutation-types'
 import {getErrorText} from '@/message'
-import Message from '@/components/misc/message'
+import Message from '@/components/misc/message.vue'
 import {redirectToProvider} from '../../helpers/redirectToProvider'
 import {getLastVisited, clearLastVisited} from '../../helpers/saveLastVisited'
-import Password from '@/components/input/password'
+import Password from '@/components/input/password.vue'
 
 export default defineComponent({
 	components: {
diff --git a/src/views/user/OpenIdAuth.vue b/src/views/user/OpenIdAuth.vue
index 083739fb7..42fb5ef64 100644
--- a/src/views/user/OpenIdAuth.vue
+++ b/src/views/user/OpenIdAuth.vue
@@ -10,9 +10,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-export default defineComponent({ name: 'Auth' })
-
+export default { name: 'Auth' }
 </script>
 
 <script setup lang="ts">
diff --git a/src/views/user/Register.vue b/src/views/user/Register.vue
index d6f8fdc60..7e630e90c 100644
--- a/src/views/user/Register.vue
+++ b/src/views/user/Register.vue
@@ -74,9 +74,9 @@ import {ref, reactive, toRaw, computed, onBeforeMount} from 'vue'
 
 import router from '@/router'
 import {store} from '@/store'
-import Message from '@/components/misc/message'
+import Message from '@/components/misc/message.vue'
 import {isEmail} from '@/helpers/isEmail'
-import Password from '@/components/input/password'
+import Password from '@/components/input/password.vue'
 
 // FIXME: use the `beforeEnter` hook of vue-router
 // Check if the user is already logged in, if so, redirect them to the homepage
diff --git a/src/views/user/RequestPasswordReset.vue b/src/views/user/RequestPasswordReset.vue
index 0919528ed..510016cbe 100644
--- a/src/views/user/RequestPasswordReset.vue
+++ b/src/views/user/RequestPasswordReset.vue
@@ -49,7 +49,7 @@ import {ref, reactive} from 'vue'
 
 import PasswordResetModel from '@/models/passwordReset'
 import PasswordResetService from '@/services/passwordReset'
-import Message from '@/components/misc/message'
+import Message from '@/components/misc/message.vue'
 
 // Not sure if this instance needs a shalloRef at all
 const passwordResetService = reactive(new PasswordResetService())
diff --git a/src/views/user/settings/Caldav.vue b/src/views/user/settings/Caldav.vue
index d8b81c379..fd2698f14 100644
--- a/src/views/user/settings/Caldav.vue
+++ b/src/views/user/settings/Caldav.vue
@@ -77,7 +77,7 @@ 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'
 
 const copy = useCopyToClipboard()
 
diff --git a/src/views/user/settings/Deletion.vue b/src/views/user/settings/Deletion.vue
index bba895a2c..b6526a999 100644
--- a/src/views/user/settings/Deletion.vue
+++ b/src/views/user/settings/Deletion.vue
@@ -83,11 +83,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-
-export default defineComponent({
-	name: 'user-settings-deletion',
-})
+export default { name: 'user-settings-deletion' }
 </script>
 
 <script setup lang="ts">

From 8fb00653e47c6f41a0e461c944b401d58b4a2351 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 23 Jun 2022 03:14:58 +0200
Subject: [PATCH 04/32] feat: constants

---
 src/components/home/TheNavigation.vue         |  2 +-
 .../notifications/notifications.vue           |  2 +-
 src/components/sharing/linkSharing.vue        |  2 +-
 src/components/sharing/userTeam.vue           |  2 +-
 src/components/tasks/gantt-component.vue      |  4 ++--
 .../tasks/partials/priorityLabel.vue          |  2 +-
 .../tasks/partials/prioritySelect.vue         | 14 ++++++-------
 .../tasks/partials/relatedTasks.vue           |  5 ++---
 src/components/tasks/partials/repeatAfter.vue | 21 ++++++++-----------
 src/models/abstractModel.ts                   |  3 ++-
 src/models/constants/notificationNames.json   |  7 -------
 src/models/constants/priorities.json          |  8 -------
 src/models/constants/priorities.ts            |  8 +++++++
 src/models/constants/relationKinds.json       | 12 -----------
 src/models/constants/rights.json              |  5 -----
 src/models/constants/rights.ts                |  7 +++++++
 src/models/constants/taskRepeatModes.json     |  5 -----
 src/models/linkShare.ts                       |  3 ++-
 src/models/team.ts                            |  3 ++-
 src/models/teamShareBase.ts                   |  4 ++--
 src/models/userShareBase.ts                   |  4 ++--
 src/modules/parseTaskText.test.ts             |  8 +++----
 src/modules/parseTaskText.ts                  | 13 ++----------
 src/views/list/ListKanban.vue                 |  2 +-
 src/views/list/ListList.vue                   |  2 +-
 src/views/tasks/TaskDetailView.vue            |  5 ++---
 src/views/teams/EditTeam.vue                  |  2 +-
 27 files changed, 61 insertions(+), 94 deletions(-)
 delete mode 100644 src/models/constants/notificationNames.json
 delete mode 100644 src/models/constants/priorities.json
 create mode 100644 src/models/constants/priorities.ts
 delete mode 100644 src/models/constants/relationKinds.json
 delete mode 100644 src/models/constants/rights.json
 create mode 100644 src/models/constants/rights.ts
 delete mode 100644 src/models/constants/taskRepeatModes.json

diff --git a/src/components/home/TheNavigation.vue b/src/components/home/TheNavigation.vue
index 051a7171d..fbdf2e049 100644
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@@ -92,7 +92,7 @@ import {useStore} from 'vuex'
 import {useRouter} from 'vue-router'
 
 import {QUICK_ACTIONS_ACTIVE} from '@/store/mutation-types'
-import Rights from '@/models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 
 import Update from '@/components/home/update.vue'
 import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue'
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 08f318c51..c7d253337 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -52,7 +52,7 @@ import {computed, onMounted, onUnmounted, ref} from 'vue'
 import NotificationService from '@/services/notification'
 import BaseButton from '@/components/base/BaseButton.vue'
 import User from '@/components/misc/user.vue'
-import names from '@/models/constants/notificationNames.json'
+import NotificationModel, { NOTIFICATION_NAMES as names} from '@/models/notification'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {useStore} from 'vuex'
 import {useRouter} from 'vue-router'
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index e0b454e6a..74cae27ac 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -180,7 +180,7 @@ import {ref, watch, computed, shallowReactive} from 'vue'
 import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
 
-import RIGHTS from '@/models/constants/rights.json'
+import {RIGHTS} from '@/models/constants/rights'
 import LinkShareModel from '@/models/linkShare'
 
 import LinkShareService from '@/services/linkShare'
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index 56ea03dc6..6920102ca 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -158,7 +158,7 @@ import TeamListService from '@/services/teamList'
 import TeamService from '@/services/team'
 import TeamModel from '@/models/team'
 
-import RIGHTS from '@/models/constants/rights.json'
+import {RIGHTS} from '@/models/constants/rights'
 import Multiselect from '@/components/input/multiselect.vue'
 import Nothing from '@/components/misc/nothing.vue'
 import {success} from '@/message'
diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index 37316b048..73f66ecfa 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -179,11 +179,11 @@ import EditTask from './edit-task.vue'
 
 import TaskService from '../../services/task'
 import TaskModel from '../../models/task'
-import priorities from '../../models/constants/priorities'
+import {PRIORITIES as priorities} from '@/models/constants/priorities'
 import PriorityLabel from './partials/priorityLabel.vue'
 import TaskCollectionService from '../../services/taskCollection'
 import {mapState} from 'vuex'
-import Rights from '../../models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 
diff --git a/src/components/tasks/partials/priorityLabel.vue b/src/components/tasks/partials/priorityLabel.vue
index f56dfde58..380d711b4 100644
--- a/src/components/tasks/partials/priorityLabel.vue
+++ b/src/components/tasks/partials/priorityLabel.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script setup lang="ts">
-import priorities from '@/models/constants/priorities'
+import {PRIORITIES as priorities} from '@/models/constants/priorities'
 	
 defineProps({
 	priority: {
diff --git a/src/components/tasks/partials/prioritySelect.vue b/src/components/tasks/partials/prioritySelect.vue
index 300cb60b9..def7b37f3 100644
--- a/src/components/tasks/partials/prioritySelect.vue
+++ b/src/components/tasks/partials/prioritySelect.vue
@@ -5,19 +5,19 @@
 			@change="updateData"
 			:disabled="disabled || undefined"
 		>
-			<option :value="priorities.UNSET">{{ $t('task.priority.unset') }}</option>
-			<option :value="priorities.LOW">{{ $t('task.priority.low') }}</option>
-			<option :value="priorities.MEDIUM">{{ $t('task.priority.medium') }}</option>
-			<option :value="priorities.HIGH">{{ $t('task.priority.high') }}</option>
-			<option :value="priorities.URGENT">{{ $t('task.priority.urgent') }}</option>
-			<option :value="priorities.DO_NOW">{{ $t('task.priority.doNow') }}</option>
+			<option :value="PRIORITIES.UNSET">{{ $t('task.priority.unset') }}</option>
+			<option :value="PRIORITIES.LOW">{{ $t('task.priority.low') }}</option>
+			<option :value="PRIORITIES.MEDIUM">{{ $t('task.priority.medium') }}</option>
+			<option :value="PRIORITIES.HIGH">{{ $t('task.priority.high') }}</option>
+			<option :value="PRIORITIES.URGENT">{{ $t('task.priority.urgent') }}</option>
+			<option :value="PRIORITIES.DO_NOW">{{ $t('task.priority.doNow') }}</option>
 		</select>
 	</div>
 </template>
 
 <script setup lang="ts">
 import {ref, watch} from 'vue'
-import priorities from '@/models/constants/priorities.json'
+import {PRIORITIES} from '@/models/constants/priorities'
 
 const priority = ref(0)
 
diff --git a/src/components/tasks/partials/relatedTasks.vue b/src/components/tasks/partials/relatedTasks.vue
index 979986565..c1d5c6298 100644
--- a/src/components/tasks/partials/relatedTasks.vue
+++ b/src/components/tasks/partials/relatedTasks.vue
@@ -144,8 +144,7 @@ import {defineComponent} from 'vue'
 import TaskService from '../../../services/task'
 import TaskModel from '../../../models/task'
 import TaskRelationService from '../../../services/taskRelation'
-import relationKinds from '../../../models/constants/relationKinds'
-import TaskRelationModel from '../../../models/taskRelation'
+import TaskRelationModel, {RELATION_KINDS} from '@/models/taskRelation'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import Multiselect from '@/components/input/multiselect.vue'
@@ -157,7 +156,7 @@ export default defineComponent({
 			relatedTasks: {},
 			taskService: new TaskService(),
 			foundTasks: [],
-			relationKinds: relationKinds,
+			relationKinds: RELATION_KINDS,
 			newTaskRelationTask: new TaskModel(),
 			newTaskRelationKind: 'related',
 			taskRelationService: new TaskRelationService(),
diff --git a/src/components/tasks/partials/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
index f77c127ae..8c3d5e28e 100644
--- a/src/components/tasks/partials/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@@ -18,17 +18,14 @@
 			<div class="control">
 				<div class="select">
 					<select @change="updateData" v-model="task.repeatMode" id="repeatMode">
-						<option :value="repeatModes.REPEAT_MODE_DEFAULT">{{ $t('misc.default') }}</option>
-						<option :value="repeatModes.REPEAT_MODE_MONTH">{{ $t('task.repeat.monthly') }}</option>
-						<option :value="repeatModes.REPEAT_MODE_FROM_CURRENT_DATE">{{
-								$t('task.repeat.fromCurrentDate')
-							}}
-						</option>
+						<option :value="TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT">{{ $t('misc.default') }}</option>
+						<option :value="TASK_REPEAT_MODES.REPEAT_MODE_MONTH">{{ $t('task.repeat.monthly') }}</option>
+						<option :value="TASK_REPEAT_MODES.REPEAT_MODE_FROM_CURRENT_DATE">{{ $t('task.repeat.fromCurrentDate') }}</option>
 					</select>
 				</div>
 			</div>
 		</div>
-		<div class="is-flex" v-if="task.repeatMode !== repeatModes.REPEAT_MODE_MONTH">
+		<div class="is-flex" v-if="task.repeatMode !== TASK_REPEAT_MODES.REPEAT_MODE_MONTH">
 			<p class="pr-4">
 				{{ $t('task.repeat.each') }}
 			</p>
@@ -66,10 +63,10 @@
 
 <script setup lang="ts">
 import {ref, reactive, watch} from 'vue'
-import repeatModes from '@/models/constants/taskRepeatModes.json'
-import TaskModel from '@/models/task'
 import {error} from '@/message'
 import {useI18n} from 'vue-i18n'
+import type TaskModel from '@/models/task'
+import {TASK_REPEAT_MODES, type RepeatAfter} from '@/models/task'
 
 const props = defineProps({
 	modelValue: {
@@ -104,7 +101,7 @@ watch(
 )
 
 function updateData() {
-	if (task.value.repeatMode !== repeatModes.REPEAT_MODE_DEFAULT && repeatAfter.amount === 0) {
+	if (!task.value || task.value.repeatMode !== TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT && repeatAfter.amount === 0) {
 		return
 	}
 
@@ -118,8 +115,8 @@ function updateData() {
 	emit('change')
 }
 
-function setRepeatAfter(amount: number, type) {
-	Object.assign(repeatAfter, {amount, type})
+function setRepeatAfter(amount: number, type: RepeatAfter['type']) {
+	Object.assign(repeatAfter, { amount, type})
 	updateData()
 }
 </script>
diff --git a/src/models/abstractModel.ts b/src/models/abstractModel.ts
index fbf074e29..7507265b6 100644
--- a/src/models/abstractModel.ts
+++ b/src/models/abstractModel.ts
@@ -1,12 +1,13 @@
 import {objectToCamelCase} from '@/helpers/case'
 import {omitBy, isNil} from '@/helpers/utils'
+import type {Right} from '@/models/constants/rights'
 
 export default class AbstractModel {
 
 	/**
 	 * The max right the user has on this object, as returned by the x-max-right header from the api.
 	 */
-	maxRight: number | null = null
+	maxRight: Right | null = null
 
 	/**
 	 * The abstract constructor takes an object and merges its data with the default data of this model.
diff --git a/src/models/constants/notificationNames.json b/src/models/constants/notificationNames.json
deleted file mode 100644
index 62260fe34..000000000
--- a/src/models/constants/notificationNames.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "TASK_COMMENT": "task.comment",
-  "TASK_ASSIGNED": "task.assigned",
-  "TASK_DELETED": "task.deleted",
-  "LIST_CREATED": "list.created",
-  "TEAM_MEMBER_ADDED": "team.member.added"
-}
\ No newline at end of file
diff --git a/src/models/constants/priorities.json b/src/models/constants/priorities.json
deleted file mode 100644
index c38b195d9..000000000
--- a/src/models/constants/priorities.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"UNSET": 0,
-"LOW": 1,
-"MEDIUM": 2,
-"HIGH": 3,
-"URGENT": 4,
-"DO_NOW": 5
-}
\ No newline at end of file
diff --git a/src/models/constants/priorities.ts b/src/models/constants/priorities.ts
new file mode 100644
index 000000000..b3cf85cb3
--- /dev/null
+++ b/src/models/constants/priorities.ts
@@ -0,0 +1,8 @@
+export const PRIORITIES = {
+	'UNSET': 0,
+	'LOW': 1,
+	'MEDIUM': 2,
+	'HIGH': 3,
+	'URGENT': 4,
+	'DO_NOW': 5,
+} as const
\ No newline at end of file
diff --git a/src/models/constants/relationKinds.json b/src/models/constants/relationKinds.json
deleted file mode 100644
index 4b3c2e519..000000000
--- a/src/models/constants/relationKinds.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  "subtask",
-  "parenttask",
-  "related",
-  "duplicates",
-  "blocking",
-  "blocked",
-  "precedes",
-  "follows",
-  "copiedfrom",
-  "copiedto"
-]
\ No newline at end of file
diff --git a/src/models/constants/rights.json b/src/models/constants/rights.json
deleted file mode 100644
index 61e6b145c..000000000
--- a/src/models/constants/rights.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "READ": 0,
-  "READ_WRITE": 1,
-  "ADMIN": 2
-}
\ No newline at end of file
diff --git a/src/models/constants/rights.ts b/src/models/constants/rights.ts
new file mode 100644
index 000000000..1c2aeb70d
--- /dev/null
+++ b/src/models/constants/rights.ts
@@ -0,0 +1,7 @@
+export const RIGHTS = {
+  'READ': 0,
+  'READ_WRITE': 1,
+  'ADMIN': 2,
+} as const
+
+export type Right = typeof RIGHTS[keyof typeof RIGHTS]
\ No newline at end of file
diff --git a/src/models/constants/taskRepeatModes.json b/src/models/constants/taskRepeatModes.json
deleted file mode 100644
index 7d172950b..000000000
--- a/src/models/constants/taskRepeatModes.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "REPEAT_MODE_DEFAULT": 0,
-  "REPEAT_MODE_MONTH": 1,
-  "REPEAT_MODE_FROM_CURRENT_DATE": 2
-}
\ No newline at end of file
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index 2d6b4ab17..a0c475779 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -1,5 +1,6 @@
 import AbstractModel from './abstractModel'
 import UserModel from './user'
+import {RIGHTS, type Right} from '@/models/constants/rights'
 
 export default class LinkShareModel extends AbstractModel {
 	id: number
@@ -28,7 +29,7 @@ export default class LinkShareModel extends AbstractModel {
 		return {
 			id: 0,
 			hash: '',
-			right: 0,
+			right: RIGHTS.READ,
 			sharedBy: UserModel,
 			sharingType: 0,
 			listId: 0,
diff --git a/src/models/team.ts b/src/models/team.ts
index 05285ca1d..c4e894f69 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -1,6 +1,7 @@
 import AbstractModel from './abstractModel'
 import UserModel from './user'
 import TeamMemberModel from './teamMember'
+import {RIGHTS, type Right} from '@/models/constants/rights'
 
 export default class TeamModel extends AbstractModel {
 	id: 0
@@ -32,7 +33,7 @@ export default class TeamModel extends AbstractModel {
 			name: '',
 			description: '',
 			members: [],
-			right: 0,
+			right: RIGHTS.READ,
 
 			createdBy: {},
 			created: null,
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index 84e0373ba..88060c919 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -1,6 +1,6 @@
 import AbstractModel from './abstractModel'
 import type TeamModel from './team'
-import type {Right} from '@/models/constants/rights'
+import {RIGHTS, type Right} from '@/models/constants/rights'
 
 /**
  * This class is a base class for common team sharing model.
@@ -22,7 +22,7 @@ export default class TeamShareBaseModel extends AbstractModel {
 	defaults() {
 		return {
 			teamId: 0,
-			right: 0,
+			right: RIGHTS.READ,
 
 			created: null,
 			updated: null,
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index 3d34ac3cf..9ae20de1d 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -1,6 +1,6 @@
 import AbstractModel from './abstractModel'
 import type UserModel from './user'
-import type {Right} from '@/models/constants/rights'
+import {RIGHTS, type Right} from '@/models/constants/rights'
 
 export default class UserShareBaseModel extends AbstractModel {
 	userId: UserModel['id']
@@ -18,7 +18,7 @@ export default class UserShareBaseModel extends AbstractModel {
 	defaults() {
 		return {
 			userId: '',
-			right: 0,
+			right: RIGHTS.READ,
 
 			created: null,
 			updated: null,
diff --git a/src/modules/parseTaskText.test.ts b/src/modules/parseTaskText.test.ts
index 90208b888..dadb9ed03 100644
--- a/src/modules/parseTaskText.test.ts
+++ b/src/modules/parseTaskText.test.ts
@@ -3,7 +3,7 @@ import {beforeEach, afterEach, describe, it, expect, vi} from 'vitest'
 import {parseTaskText} from './parseTaskText'
 import {getDateFromText, getDateFromTextIn} from '../helpers/time/parseDate'
 import {calculateDayInterval} from '../helpers/time/calculateDayInterval'
-import priorities from '../models/constants/priorities.json'
+import {PRIORITIES} from '@/models/constants/priorities.ts'
 
 describe('Parse Task Text', () => {
 	beforeEach(() => {
@@ -571,12 +571,12 @@ describe('Parse Task Text', () => {
 	})
 
 	describe('Priority', () => {
-		for (const p in priorities) {
+		for (const p in PRIORITIES) {
 			it(`should parse priority ${p}`, () => {
-				const result = parseTaskText(`Lorem Ipsum !${priorities[p]}`)
+				const result = parseTaskText(`Lorem Ipsum !${PRIORITIES[p]}`)
 
 				expect(result.text).toBe('Lorem Ipsum')
-				expect(result.priority).toBe(priorities[p])
+				expect(result.priority).toBe(PRIORITIES[p])
 			})
 		}
 		it(`should not parse an invalid priority`, () => {
diff --git a/src/modules/parseTaskText.ts b/src/modules/parseTaskText.ts
index 80c33e3da..c3c8ad7d4 100644
--- a/src/modules/parseTaskText.ts
+++ b/src/modules/parseTaskText.ts
@@ -1,5 +1,5 @@
 import {parseDate} from '../helpers/time/parseDate'
-import _priorities from '../models/constants/priorities.json'
+import {PRIORITIES} from '@/models/constants/priorities'
 
 const VIKUNJA_PREFIXES: Prefixes = {
 	label: '*',
@@ -27,16 +27,7 @@ export const PREFIXES = {
 	[PrefixMode.Todoist]: TODOIST_PREFIXES,
 }
 
-const priorities: Priorites = _priorities
-
-interface Priorites {
-	UNSET: number,
-	LOW: number,
-	MEDIUM: number,
-	HIGH: number,
-	URGENT: number,
-	DO_NOW: number,
-}
+const priorities = PRIORITIES
 
 enum RepeatType {
 	Hours = 'hours',
diff --git a/src/views/list/ListKanban.vue b/src/views/list/ListKanban.vue
index 447d849e5..fc17a2435 100644
--- a/src/views/list/ListKanban.vue
+++ b/src/views/list/ListKanban.vue
@@ -230,7 +230,7 @@ import cloneDeep from 'lodash.clonedeep'
 
 import BucketModel from '../../models/bucket'
 import {mapState} from 'vuex'
-import Rights from '../../models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import ListWrapper from './ListWrapper.vue'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
diff --git a/src/views/list/ListList.vue b/src/views/list/ListList.vue
index c94caf301..eb0c58c59 100644
--- a/src/views/list/ListList.vue
+++ b/src/views/list/ListList.vue
@@ -144,7 +144,7 @@ import EditTask from '@/components/tasks/edit-task.vue'
 import AddTask from '@/components/tasks/add-task.vue'
 import SingleTaskInList from '@/components/tasks/partials/singleTaskInList.vue'
 import { useTaskList } from '@/composables/taskList'
-import Rights from '../../models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
 import {HAS_TASKS} from '@/store/mutation-types'
 import Nothing from '@/components/misc/nothing.vue'
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 02aec44ae..33ed7059f 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -427,8 +427,8 @@ import {defineComponent} from 'vue'
 import TaskService from '../../services/task'
 import TaskModel from '../../models/task'
 
-import priorites from '../../models/constants/priorities.json'
-import rights from '../../models/constants/rights.json'
+import { PRIORITIES as priorites } from '@/models/constants/priorities'
+import {RIGHTS as rights} from '@/models/constants/rights'
 
 import PrioritySelect from '../../components/tasks/partials/prioritySelect.vue'
 import PercentDoneSelect from '../../components/tasks/partials/percentDoneSelect.vue'
@@ -520,7 +520,6 @@ export default defineComponent({
 			// Used to avoid flashing of empty elements if the task content is not yet loaded.
 			visible: false,
 
-			priorities: priorites,
 			activeFields: {
 				assignees: false,
 				priority: false,
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index b5ccd7295..8496d2f5e 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -172,7 +172,7 @@ import TeamMemberService from '../../services/teamMember'
 import type TeamMemberModel from '../../models/teamMember'
 import type UserModel from '../../models/user'
 import UserService from '../../services/user'
-import Rights from '../../models/constants/rights.json'
+import {RIGHTS as Rights} from '@/models/constants/rights'
 
 import Multiselect from '@/components/input/multiselect.vue'
 import {useRoute, useRouter} from 'vue-router'

From 332acf012c423d3201ec1811093226447cd065e8 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 23 Jun 2022 03:20:07 +0200
Subject: [PATCH 05/32] feat: function attribute typing

---
 src/components/home/navigation.vue                 |  2 +-
 src/components/input/fancycheckbox.vue             |  2 +-
 src/components/sharing/linkSharing.vue             |  7 ++++---
 src/components/sharing/userTeam.vue                |  2 +-
 src/components/tasks/partials/attachments.vue      |  5 +++--
 src/components/tasks/partials/comments.vue         |  5 +++--
 src/components/tasks/partials/relatedTasks.vue     |  2 +-
 src/components/tasks/partials/singleTaskInList.vue |  4 ++--
 src/services/accountDelete.ts                      | 12 ++++++------
 src/services/backgroundUpload.ts                   |  4 ++--
 src/services/dataExport.ts                         |  6 +++---
 src/views/filters/FilterDelete.vue                 |  2 +-
 src/views/filters/FilterEdit.vue                   | 14 ++++++++------
 src/views/labels/ListLabels.vue                    |  6 +++---
 src/views/list/ListList.vue                        |  9 +++++----
 src/views/tasks/TaskDetailView.vue                 |  5 +++--
 src/views/teams/EditTeam.vue                       |  2 +-
 17 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 3ed3044bb..76a0fb23d 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -209,7 +209,7 @@ function resize() {
 	store.commit(MENU_ACTIVE, window.innerWidth >= 770)
 }
 
-function toggleLists(namespaceId: number) {
+function toggleLists(namespaceId: NamespaceModel['id']) {
 	listsVisible.value[namespaceId] = !listsVisible.value[namespaceId]
 }
 
diff --git a/src/components/input/fancycheckbox.vue b/src/components/input/fancycheckbox.vue
index 204efeec6..31380bf9f 100644
--- a/src/components/input/fancycheckbox.vue
+++ b/src/components/input/fancycheckbox.vue
@@ -53,7 +53,7 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		updateData(checked) {
+		updateData(checked: boolean) {
 			this.checked = checked
 			this.$emit('update:modelValue', checked)
 			this.$emit('change', checked)
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index 74cae27ac..b38a58341 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -182,6 +182,7 @@ import {useI18n} from 'vue-i18n'
 
 import {RIGHTS} from '@/models/constants/rights'
 import LinkShareModel from '@/models/linkShare'
+import type ListModel from '@/models/list'
 
 import LinkShareService from '@/services/linkShare'
 
@@ -216,7 +217,7 @@ watch(
 const store = useStore()
 const frontendUrl = computed(() => store.state.config.frontendUrl)
 
-async function load(listId) {
+async function load(listId: ListModel['id']) {
 	// If listId == 0 the list on the calling component wasn't already loaded, so we just bail out here
 	if (listId === 0) {
 		return
@@ -225,7 +226,7 @@ async function load(listId) {
 	linkShares.value = await linkShareService.getAll({listId})
 }
 
-async function add(listId) {
+async function add(listId: ListModel['id']) {
 	const newLinkShare = new LinkShareModel({
 		right: selectedRight.value,
 		listId,
@@ -241,7 +242,7 @@ async function add(listId) {
 	await load(listId)
 }
 
-async function remove(listId) {
+async function remove(listId: ListModel['id']) {
 	try {
 		await linkShareService.delete(new LinkShareModel({
 			id: linkIdToDelete.value,
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index 6920102ca..c14902aa7 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -355,7 +355,7 @@ async function toggleType(sharable) {
 const found = ref([])
 
 const currentUserId = computed(() => store.state.auth.info.id)
-async function find(query) {
+async function find(query: string) {
 	if (query === '') {
 		found.value = []
 		return
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index 1a2c0f686..4f3292efc 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -148,6 +148,7 @@ import {defineComponent} from 'vue'
 
 import AttachmentService from '../../../services/attachment'
 import AttachmentModel from '../../../models/attachment'
+import type FileModel from '@/models/file'
 import User from '@/components/misc/user.vue'
 import {mapState} from 'vuex'
 
@@ -229,7 +230,7 @@ export default defineComponent({
 		})
 	},
 	methods: {
-		downloadAttachment(attachment) {
+		downloadAttachment(attachment: AttachmentModel) {
 			this.attachmentService.download(attachment)
 		},
 		uploadNewAttachment() {
@@ -239,7 +240,7 @@ export default defineComponent({
 
 			this.uploadFiles(this.$refs.files.files)
 		},
-		uploadFiles(files) {
+		uploadFiles(files: FileModel[]) {
 			uploadFiles(this.attachmentService, this.taskId, files)
 		},
 		async deleteAttachment() {
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index 9efe0d2a9..8f889e98f 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -163,6 +163,7 @@ import TaskCommentModel from '@/models/taskComment'
 import {uploadFile} from '@/helpers/attachments'
 import {success} from '@/message'
 
+import type TaskModel from '@/models/task'
 const props = defineProps({
 	taskId: {
 		type: Number,
@@ -213,7 +214,7 @@ function attachmentUpload(...args) {
 
 const taskCommentService = shallowReactive(new TaskCommentService())
 
-async function loadComments(taskId) {
+async function loadComments(taskId: TaskModel['id']) {
 	if (!enabled.value) {
 		return
 	}
@@ -262,7 +263,7 @@ function toggleEdit(comment: TaskCommentModel) {
 	Object.assign(commentEdit, comment)
 }
 
-function toggleDelete(commentId) {
+function toggleDelete(commentId: TaskCommentModel['id']) {
 	showDeleteModal.value = !showDeleteModal.value
 	commentToDelete.id = commentId
 }
diff --git a/src/components/tasks/partials/relatedTasks.vue b/src/components/tasks/partials/relatedTasks.vue
index c1d5c6298..a46c4f635 100644
--- a/src/components/tasks/partials/relatedTasks.vue
+++ b/src/components/tasks/partials/relatedTasks.vue
@@ -220,7 +220,7 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		async findTasks(query) {
+		async findTasks(query: string) {
 			this.query = query
 			this.foundTasks = await this.taskService.getAll({}, {s: query})
 		},
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 209633b61..6cc341d61 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -186,7 +186,7 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		async markAsDone(checked) {
+		async markAsDone(checked: boolean) {
 			const updateFunc = async () => {
 				const task = await this.taskService.update(this.task)
 				if (this.task.done) {
@@ -211,7 +211,7 @@ export default defineComponent({
 			}
 		},
 
-		undoDone(checked) {
+		undoDone(checked: boolean) {
 			this.task.done = !this.task.done
 			this.markAsDone(!checked)
 		},
diff --git a/src/services/accountDelete.ts b/src/services/accountDelete.ts
index c4f443cfe..52e922caf 100644
--- a/src/services/accountDelete.ts
+++ b/src/services/accountDelete.ts
@@ -1,15 +1,15 @@
 import AbstractService from './abstractService'
 
 export default class AccountDeleteService extends AbstractService {
-	request(password) {
-		return this.post('/user/deletion/request', {password: password})
+	request(password: string) {
+		return this.post('/user/deletion/request', {password})
 	}
 	
-	confirm(token) {
-		return this.post('/user/deletion/confirm', {token: token})
+	confirm(token: string) {
+		return this.post('/user/deletion/confirm', {token})
 	}
 	
-	cancel(password) {
-		return this.post('/user/deletion/cancel', {password: password})
+	cancel(password: string) {
+		return this.post('/user/deletion/cancel', {password})
 	}
 }
\ No newline at end of file
diff --git a/src/services/backgroundUpload.ts b/src/services/backgroundUpload.ts
index 8f9dcf622..0f9d9792d 100644
--- a/src/services/backgroundUpload.ts
+++ b/src/services/backgroundUpload.ts
@@ -22,9 +22,9 @@ export default class BackgroundUploadService extends AbstractService {
 	 * @param file
 	 * @returns {Promise<any|never>}
 	 */
-	create(listId, file) {
+	create(listId: ListModel['id'], file) {
 		return this.uploadFile(
-			this.getReplacedRoute(this.paths.create, {listId: listId}),
+			this.getReplacedRoute(this.paths.create, {listId}),
 			file,
 			'background',
 		)
diff --git a/src/services/dataExport.ts b/src/services/dataExport.ts
index 9f8720bf7..3c4064ac4 100644
--- a/src/services/dataExport.ts
+++ b/src/services/dataExport.ts
@@ -2,11 +2,11 @@ import AbstractService from './abstractService'
 import {downloadBlob} from '../helpers/downloadBlob'
 
 export default class DataExportService extends AbstractService {
-	request(password) {
-		return this.post('/user/export/request', {password: password})
+	request(password: string) {
+		return this.post('/user/export/request', {password})
 	}
 	
-	async download(password) {
+	async download(password: string) {
 		const clear = this.setLoading()
 		try {
 			const url = await this.getBlobUrl('/user/export/download', 'POST', {password})
diff --git a/src/views/filters/FilterDelete.vue b/src/views/filters/FilterDelete.vue
index 15238ec00..0f2c6fbf8 100644
--- a/src/views/filters/FilterDelete.vue
+++ b/src/views/filters/FilterDelete.vue
@@ -27,7 +27,7 @@ const route = useRoute()
 
 async function deleteSavedFilter() {
 	// We assume the listId in the route is the pseudolist
-	const savedFilterId = getSavedFilterIdFromListId(route.params.listId)
+	const savedFilterId = getSavedFilterIdFromListId(Number((route.params.listId as string)))
 
 	const filterService = new SavedFilterService()
 	const filter = new SavedFilterModel({id: savedFilterId})
diff --git a/src/views/filters/FilterEdit.vue b/src/views/filters/FilterEdit.vue
index 9f978b176..5e896470a 100644
--- a/src/views/filters/FilterEdit.vue
+++ b/src/views/filters/FilterEdit.vue
@@ -52,11 +52,12 @@
 </template>
 
 <script setup lang="ts">
-import {ref, shallowRef, computed, watch} from 'vue'
+import {ref, shallowRef, computed, watch, unref } from 'vue'
 import {useRouter, useRoute} from 'vue-router'
 import {store} from '@/store'
-import {success} from '@/message'
+import {success}  from '@/message'
 import {useI18n} from 'vue-i18n'
+import type {MaybeRef} from '@vueuse/core'
 
 import {default as Editor} from '@/components/input/AsyncEditor'
 import CreateEdit from '@/components/misc/create-edit.vue'
@@ -67,10 +68,11 @@ import SavedFilterService from '@/services/savedFilter'
 
 import {objectToSnakeCase} from '@/helpers/case'
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
+import type ListModel from '@/models/list'
 
 const {t} = useI18n({useScope: 'global'})
 
-function useSavedFilter(listId) {
+function useSavedFilter(listId: MaybeRef<ListModel['id']>) {
 	const filterService = shallowRef(new SavedFilterService())
 
 	const filter = ref(new SavedFilterModel())
@@ -82,9 +84,9 @@ function useSavedFilter(listId) {
 	})
 
 	// loadSavedFilter
-	watch(listId, async () => {
+	watch(() => unref(listId), async () => {
 		// We assume the listId in the route is the pseudolist
-		const savedFilterId = getSavedFilterIdFromListId(route.params.listId)
+		const savedFilterId = getSavedFilterIdFromListId(Number(route.params.listId as string))
 
 		filter.value = new SavedFilterModel({id: savedFilterId})
 		const response = await filterService.value.get(filter.value)
@@ -110,7 +112,7 @@ function useSavedFilter(listId) {
 }
 
 const route = useRoute()
-const listId = computed(() => route.params.listId)
+const listId =	computed(() => Number(route.params.listId as string))
 
 const {
 	save,
diff --git a/src/views/labels/ListLabels.vue b/src/views/labels/ListLabels.vue
index c77be4f74..61ac2fe50 100644
--- a/src/views/labels/ListLabels.vue
+++ b/src/views/labels/ListLabels.vue
@@ -149,7 +149,7 @@ export default defineComponent({
 		loading: state => state[LOADING] && state[LOADING_MODULE] === 'labels',
 	}),
 	methods: {
-		deleteLabel(label) {
+		deleteLabel(label: LabelModel) {
 			this.showDeleteModal = false
 			this.isLabelEdit = false
 			return this.$store.dispatch('labels/deleteLabel', label)
@@ -157,7 +157,7 @@ export default defineComponent({
 		editLabelSubmit() {
 			return this.$store.dispatch('labels/updateLabel', this.labelEditLabel)
 		},
-		editLabel(label) {
+		editLabel(label: LabelModel) {
 			if (label.createdBy.id !== this.userInfo.id) {
 				return
 			}
@@ -179,7 +179,7 @@ export default defineComponent({
 			this.editorActive = false
 			this.$nextTick(() => this.editorActive = true)
 		},
-		showDeleteDialoge(label) {
+		showDeleteDialoge(label: LabelModel) {
 			this.labelToDelete = label
 			this.showDeleteModal = true
 		},
diff --git a/src/views/list/ListList.vue b/src/views/list/ListList.vue
index eb0c58c59..1bfb76592 100644
--- a/src/views/list/ListList.vue
+++ b/src/views/list/ListList.vue
@@ -153,8 +153,9 @@ import {ALPHABETICAL_SORT} from '@/components/list/partials/filters.vue'
 
 import draggable from 'zhyswan-vuedraggable'
 import {calculateItemPosition} from '../../helpers/calculateItemPosition'
+import type TaskModel from '@/models/task'
 
-function sortTasks(tasks) {
+function sortTasks(tasks: TaskModel[]) {
 	if (tasks === null || tasks === []) {
 		return
 	}
@@ -273,7 +274,7 @@ export default defineComponent({
 		focusNewTaskInput() {
 			this.$refs.addTask.focusTaskInput()
 		},
-		updateTaskList( task ) {
+		updateTaskList(task: TaskModel) {
 			if ( this.isAlphabeticalSorting ) {
 				// reload tasks with current filter and sorting
 				this.loadTasks(1, undefined, undefined, true)
@@ -287,11 +288,11 @@ export default defineComponent({
 
 			this.$store.commit(HAS_TASKS, true)
 		},
-		editTask(id) {
+		editTask(id: TaskModel['id']) {
 			this.taskEditTask = {...this.tasks.find(t => t.id === parseInt(id))}
 			this.isTaskEdit = true
 		},
-		updateTasks(updatedTask) {
+		updateTasks(updatedTask: TaskModel) {
 			for (const t in this.tasks) {
 				if (this.tasks[t].id === updatedTask.id) {
 					this.tasks[t] = updatedTask
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 33ed7059f..4ca30e20a 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -453,6 +453,7 @@ import {uploadFile} from '@/helpers/attachments'
 import ChecklistSummary from '../../components/tasks/partials/checklist-summary.vue'
 import CreatedUpdated from '@/components/tasks/partials/createdUpdated.vue'
 import { setTitle } from '@/helpers/setTitle'
+import type ListModel from '@/models/list'
 
 function scrollIntoView(el) {
 	if (!el) {
@@ -592,7 +593,7 @@ export default defineComponent({
 			return uploadFile(this.taskId, ...args)
 		},
 
-		async loadTask(taskId) {
+		async loadTask(taskId: TaskModel['id']) {
 			if (taskId === undefined) {
 				return
 			}
@@ -698,7 +699,7 @@ export default defineComponent({
 			this.saveTask(true, this.toggleTaskDone)
 		},
 
-		async changeList(list) {
+		async changeList(list: ListModel) {
 			this.$store.commit('kanban/removeTaskInBucket', this.task)
 			this.task.listId = list.id
 			await this.saveTask()
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index 8496d2f5e..485c5c0a6 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -257,7 +257,7 @@ async function addUser() {
 	success({message: t('team.edit.userAddedSuccess')})
 }
 
-async function toggleUserType(member) {
+async function toggleUserType(member: TeamMemberModel) {
 	// FIXME: direct manipulation
 	member.admin = !member.admin
 	member.teamId = teamId.value

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

---
 src/components/date/datemathHelp.vue               | 4 ++--
 src/components/input/datepicker.vue                | 7 ++++---
 src/components/notifications/notifications.vue     | 3 ++-
 src/components/tasks/gantt-component.vue           | 3 ++-
 src/components/tasks/partials/attachments.vue      | 7 ++++++-
 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 | 7 ++++++-
 src/main.ts                                        | 7 -------
 src/views/migrator/MigrateService.vue              | 6 +++++-
 src/views/user/settings/Caldav.vue                 | 1 +
 src/views/user/settings/Deletion.vue               | 1 +
 14 files changed, 43 insertions(+), 24 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/input/datepicker.vue b/src/components/input/datepicker.vue
index e8dc8e746..d5e35e33a 100644
--- a/src/components/input/datepicker.vue
+++ b/src/components/input/datepicker.vue
@@ -97,7 +97,7 @@ import {i18n} from '@/i18n'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 
-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'
@@ -170,11 +170,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
@@ -233,7 +234,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 c7d253337..62d23a72d 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -30,7 +30,7 @@
 								{{ n.toText(userInfo) }}
 							</BaseButton>
 						</div>
-						<span class="created" v-tooltip="formatDate(n.created)">
+						<span class="created" v-tooltip="formatDateLong(n.created)">
 							{{ formatDateSince(n.created) }}
 						</span>
 					</div>
@@ -56,6 +56,7 @@ import NotificationModel, { NOTIFICATION_NAMES as names} from '@/models/notifica
 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 73f66ecfa..82c71547d 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -188,6 +188,7 @@ import FilterPopup from '@/components/list/partials/filter-popup.vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 
 import {colorIsDark} from '@/helpers/color/colorIsDark'
+import {formatDate} from '@/helpers/time/formatDate'
 
 export default defineComponent({
 	name: 'GanttChart',
@@ -439,7 +440,7 @@ export default defineComponent({
 		formatMonthAndYear(year, month) {
 			month = month < 10 ? '0' + month : month
 			const date = new Date(`${year}-${month}-01`)
-			return this.format(date, 'MMMM, yyyy')
+			return formatDate(date, 'MMMM, yyyy')
 		},
 	},
 })
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index 4f3292efc..c77532ba5 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -39,7 +39,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
@@ -154,6 +154,7 @@ import {mapState} from 'vuex'
 
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import { uploadFiles, generateAttachmentUrl } from '@/helpers/attachments'
+import {formatDate, formatDateSince, formatDateLong} from '@/helpers/time/formatDate'
 
 import BaseButton from '@/components/base/BaseButton'
 
@@ -230,6 +231,10 @@ export default defineComponent({
 		})
 	},
 	methods: {
+		formatDate,
+		formatDateSince,
+		formatDateLong,
+
 		downloadAttachment(attachment: AttachmentModel) {
 			this.attachmentService.download(attachment)
 		},
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index 8f889e98f..3501eadcd 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'
 
 import type TaskModel from '@/models/task'
 const props = defineProps({
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 03c6ae61c..16b1a0ff0 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.vue'
 import ChecklistSummary from './checklist-summary.vue'
 import TaskModel, {TASK_DEFAULT_COLOR} from '@/models/task'
 
+import {formatDateLong, formatISO, formatDateSince} from '@/helpers/time/formatDate'
 import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 export default defineComponent({
@@ -112,6 +113,9 @@ export default defineComponent({
 		},
 	},
 	methods: {
+		formatDateLong,
+		formatISO,
+		formatDateSince,
 		colorIsDark,
 		async toggleTaskDone(task: TaskModel) {
 			this.loadingInternal = true
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 6cc341d61..d8de6505e 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -43,7 +43,7 @@
 				v-if="+new Date(task.dueDate) > 0"
 				class="dueDate"
 				@click.prevent.stop="showDefer = !showDefer"
-				v-tooltip="formatDate(task.dueDate)"
+				v-tooltip="formatDateLong(task.dueDate)"
 			>
 				<time
 					:datetime="formatISO(task.dueDate)"
@@ -107,6 +107,7 @@ import DeferTask from './defer-task.vue'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {playPop} from '@/helpers/playPop'
 import ChecklistSummary from './checklist-summary.vue'
+import {formatDateSince, formatISO, formatDateLong} from '@/helpers/time/formatDate'
 
 export default defineComponent({
 	name: 'singleTaskInList',
@@ -186,6 +187,10 @@ export default defineComponent({
 		},
 	},
 	methods: {
+		formatDateSince,
+		formatISO,
+		formatDateLong,
+
 		async markAsDone(checked: boolean) {
 			const updateFunc = async () => {
 				const task = await this.taskService.update(this.task)
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 802600999..0025415aa 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">
@@ -73,6 +73,8 @@ import AbstractMigrationFileService from '@/services/migrator/abstractMigrationF
 import Logo from '@/assets/logo.svg?component'
 import Message from '@/components/misc/message.vue'
 
+import {formatDateLong} from '@/helpers/time/formatDate'
+
 import {MIGRATORS} from './migrators'
 
 const PROGRESS_DOTS_COUNT = 8
@@ -118,6 +120,8 @@ export default defineComponent({
 	},
 
 	methods: {
+		formatDateLong,
+
 		async initMigration() {
 			this.migrationService = this.migrator.isFileMigrator
 				? new AbstractMigrationFileService(this.migrator.id)
diff --git a/src/views/user/settings/Caldav.vue b/src/views/user/settings/Caldav.vue
index fd2698f14..ad63f8d33 100644
--- a/src/views/user/settings/Caldav.vue
+++ b/src/views/user/settings/Caldav.vue
@@ -78,6 +78,7 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import Message from '@/components/misc/message.vue'
 import CaldavTokenService from '@/services/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 b6526a999..5a1fb4a3f 100644
--- a/src/views/user/settings/Deletion.vue
+++ b/src/views/user/settings/Deletion.vue
@@ -93,6 +93,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'
 

From 4a247b2a7d6741bfec9fbdb387c9313d7b6381d1 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 23 Jun 2022 03:23:39 +0200
Subject: [PATCH 07/32] chore: remove global mixing

---
 src/components/home/TheNavigation.vue     |  2 ++
 src/main.ts                               | 13 -------------
 src/views/labels/ListLabels.vue           |  3 ++-
 src/views/labels/NewLabel.vue             |  3 ++-
 src/views/list/settings/background.vue    |  2 +-
 src/views/migrator/MigrateService.vue     |  3 ++-
 src/views/namespaces/ListNamespaces.vue   |  5 ++++-
 src/views/namespaces/NewNamespace.vue     |  3 ++-
 src/views/namespaces/settings/archive.vue |  3 ++-
 src/views/namespaces/settings/delete.vue  |  3 ++-
 src/views/tasks/TaskDetailView.vue        |  8 ++++++--
 src/views/teams/NewTeam.vue               |  4 +++-
 src/views/user/Login.vue                  |  3 ++-
 13 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/components/home/TheNavigation.vue b/src/components/home/TheNavigation.vue
index fbdf2e049..e8f72952a 100644
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@@ -103,6 +103,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/main.ts b/src/main.ts
index 9af014041..b24a216d5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -67,19 +67,6 @@ app.component('x-button', Button)
 app.component('modal', Modal)
 app.component('card', Card)
 
-// Mixins
-import {getNamespaceTitle} from './helpers/getNamespaceTitle'
-import {getListTitle} from './helpers/getListTitle'
-import {setTitle} from './helpers/setTitle'
-
-app.mixin({
-	methods: {
-		getNamespaceTitle,
-		getListTitle,
-		setTitle,
-	},
-})
-
 app.config.errorHandler = (err, vm, info) => {
 	if (import.meta.env.DEV) {
 		console.error(err, vm, info)
diff --git a/src/views/labels/ListLabels.vue b/src/views/labels/ListLabels.vue
index 61ac2fe50..ad9fae056 100644
--- a/src/views/labels/ListLabels.vue
+++ b/src/views/labels/ListLabels.vue
@@ -119,6 +119,7 @@ import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import BaseButton from '@/components/base/BaseButton.vue'
 import AsyncEditor from '@/components/input/AsyncEditor'
 import ColorPicker from '@/components/input/colorPicker.vue'
+import { setTitle } from '@/helpers/setTitle'
 
 export default defineComponent({
 	name: 'ListLabels',
@@ -140,7 +141,7 @@ export default defineComponent({
 		this.$store.dispatch('labels/loadAllLabels')
 	},
 	mounted() {
-		this.setTitle(this.$t('label.title'))
+		setTitle(this.$t('label.title'))
 	},
 	computed: mapState({
 		userInfo: state => state.auth.info,
diff --git a/src/views/labels/NewLabel.vue b/src/views/labels/NewLabel.vue
index 423e13916..0798b3598 100644
--- a/src/views/labels/NewLabel.vue
+++ b/src/views/labels/NewLabel.vue
@@ -41,6 +41,7 @@ import CreateEdit from '@/components/misc/create-edit.vue'
 import ColorPicker from '../../components/input/colorPicker.vue'
 import {mapState} from 'vuex'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
+import { setTitle } from '@/helpers/setTitle'
 
 export default defineComponent({
 	name: 'NewLabel',
@@ -55,7 +56,7 @@ export default defineComponent({
 		ColorPicker,
 	},
 	mounted() {
-		this.setTitle(this.$t('label.create.title'))
+		setTitle(this.$t('label.create.title'))
 	},
 	computed: mapState({
 		loading: state => state[LOADING] && state[LOADING_MODULE] === 'labels',
diff --git a/src/views/list/settings/background.vue b/src/views/list/settings/background.vue
index e17706583..16a1c10bf 100644
--- a/src/views/list/settings/background.vue
+++ b/src/views/list/settings/background.vue
@@ -109,7 +109,7 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import BackgroundUnsplashService from '@/services/backgroundUnsplash'
 import BackgroundUploadService from '@/services/backgroundUpload'
 import ListService from '@/services/list'
-import BackgroundImageModel from '@/models/backgroundImage'
+import type BackgroundImageModel from '@/models/backgroundImage'
 
 import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
 import {useTitle} from '@/composables/useTitle'
diff --git a/src/views/migrator/MigrateService.vue b/src/views/migrator/MigrateService.vue
index 0025415aa..d5138d13e 100644
--- a/src/views/migrator/MigrateService.vue
+++ b/src/views/migrator/MigrateService.vue
@@ -72,6 +72,7 @@ import AbstractMigrationService from '@/services/migrator/abstractMigration'
 import AbstractMigrationFileService from '@/services/migrator/abstractMigrationFile'
 import Logo from '@/assets/logo.svg?component'
 import Message from '@/components/misc/message.vue'
+import { setTitle } from '@/helpers/setTitle'
 
 import {formatDateLong} from '@/helpers/time/formatDate'
 
@@ -116,7 +117,7 @@ export default defineComponent({
 	},
 
 	mounted() {
-		this.setTitle(this.$t('migrate.titleService', {name: this.migrator.name}))
+		setTitle(this.$t('migrate.titleService', {name: this.migrator.name}))
 	},
 
 	methods: {
diff --git a/src/views/namespaces/ListNamespaces.vue b/src/views/namespaces/ListNamespaces.vue
index 5314c6969..c9d2e4acc 100644
--- a/src/views/namespaces/ListNamespaces.vue
+++ b/src/views/namespaces/ListNamespaces.vue
@@ -75,6 +75,8 @@ import {mapState} from 'vuex'
 import Fancycheckbox from '../../components/input/fancycheckbox.vue'
 import {LOADING} from '@/store/mutation-types'
 import ListCard from '@/components/list/partials/list-card.vue'
+import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
+import { setTitle } from '@/helpers/setTitle'
 
 export default defineComponent({
 	name: 'ListNamespaces',
@@ -88,7 +90,7 @@ export default defineComponent({
 		}
 	},
 	mounted() {
-		this.setTitle(this.$t('namespace.title'))
+		setTitle(this.$t('namespace.title'))
 	},
 	computed: mapState({
 		namespaces(state) {
@@ -101,6 +103,7 @@ export default defineComponent({
 		loading: LOADING,
 	}),
 	methods: {
+		getNamespaceTitle,
 		saveShowArchivedState() {
 			localStorage.setItem('showArchived', JSON.stringify(this.showArchived))
 		},
diff --git a/src/views/namespaces/NewNamespace.vue b/src/views/namespaces/NewNamespace.vue
index 19ffb16ce..02ed7b03e 100644
--- a/src/views/namespaces/NewNamespace.vue
+++ b/src/views/namespaces/NewNamespace.vue
@@ -48,6 +48,7 @@ import NamespaceModel from '../../models/namespace'
 import NamespaceService from '../../services/namespace'
 import CreateEdit from '@/components/misc/create-edit.vue'
 import ColorPicker from '../../components/input/colorPicker.vue'
+import { setTitle } from '@/helpers/setTitle'
 
 export default defineComponent({
 	name: 'NewNamespace',
@@ -64,7 +65,7 @@ export default defineComponent({
 		CreateEdit,
 	},
 	mounted() {
-		this.setTitle(this.$t('namespace.create.title'))
+		setTitle(this.$t('namespace.create.title'))
 	},
 	methods: {
 		async newNamespace() {
diff --git a/src/views/namespaces/settings/archive.vue b/src/views/namespaces/settings/archive.vue
index 23fc6de97..7903ef612 100644
--- a/src/views/namespaces/settings/archive.vue
+++ b/src/views/namespaces/settings/archive.vue
@@ -17,6 +17,7 @@
 import {defineComponent} from 'vue'
 
 import NamespaceService from '@/services/namespace'
+import { setTitle } from '@/helpers/setTitle'
 
 export default defineComponent({
 	name: 'namespace-setting-archive',
@@ -33,7 +34,7 @@ export default defineComponent({
 		this.title = this.namespace.isArchived ?
 			this.$t('namespace.archive.titleUnarchive', {namespace: this.namespace.title}) :
 			this.$t('namespace.archive.titleArchive', {namespace: this.namespace.title})
-		this.setTitle(this.title)
+		setTitle(this.title)
 	},
 
 	methods: {
diff --git a/src/views/namespaces/settings/delete.vue b/src/views/namespaces/settings/delete.vue
index b27d2533e..b778e66a7 100644
--- a/src/views/namespaces/settings/delete.vue
+++ b/src/views/namespaces/settings/delete.vue
@@ -14,6 +14,7 @@
 
 <script lang="ts">
 import {defineComponent} from 'vue'
+import { setTitle } from '@/helpers/setTitle'
 
 export default defineComponent({
 	name: 'namespace-setting-delete',
@@ -31,7 +32,7 @@ export default defineComponent({
 	watch: {
 		title: {
 			handler(title) {
-				this.setTitle(title)
+				setTitle(title)
 			},
 			immediate: true,
 		},
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 4ca30e20a..3d7831ad1 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -452,8 +452,10 @@ import {CURRENT_LIST} from '@/store/mutation-types'
 import {uploadFile} from '@/helpers/attachments'
 import ChecklistSummary from '../../components/tasks/partials/checklist-summary.vue'
 import CreatedUpdated from '@/components/tasks/partials/createdUpdated.vue'
-import { setTitle } from '@/helpers/setTitle'
 import type ListModel from '@/models/list'
+import { setTitle } from '@/helpers/setTitle'
+import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
+import {getListTitle} from '@/helpers/getListTitle'
 
 function scrollIntoView(el) {
 	if (!el) {
@@ -556,7 +558,7 @@ export default defineComponent({
 		// it from the page title.
 		'task.title': {
 			handler(title) {
-				this.setTitle(title)
+				setTitle(title)
 			},
 		},
 	},
@@ -589,6 +591,8 @@ export default defineComponent({
 		},
 	},
 	methods: {
+		getNamespaceTitle,
+		getListTitle,
 		attachmentUpload(...args) {
 			return uploadFile(this.taskId, ...args)
 		},
diff --git a/src/views/teams/NewTeam.vue b/src/views/teams/NewTeam.vue
index 8f0a1fe35..c6e9719f4 100644
--- a/src/views/teams/NewTeam.vue
+++ b/src/views/teams/NewTeam.vue
@@ -34,6 +34,8 @@ import TeamModel from '../../models/team'
 import TeamService from '../../services/team'
 import CreateEdit from '@/components/misc/create-edit.vue'
 
+import { setTitle } from '@/helpers/setTitle'
+
 export default defineComponent({
 	name: 'NewTeam',
 	data() {
@@ -47,7 +49,7 @@ export default defineComponent({
 		CreateEdit,
 	},
 	mounted() {
-		this.setTitle(this.$t('team.create.title'))
+		setTitle(this.$t('team.create.title'))
 	},
 	methods: {
 		async newTeam() {
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 8edb0f982..dcdb1564b 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -113,6 +113,7 @@ import Message from '@/components/misc/message.vue'
 import {redirectToProvider} from '../../helpers/redirectToProvider'
 import {getLastVisited, clearLastVisited} from '../../helpers/saveLastVisited'
 import Password from '@/components/input/password.vue'
+import { setTitle } from '@/helpers/setTitle'
 
 export default defineComponent({
 	components: {
@@ -162,7 +163,7 @@ export default defineComponent({
 		}
 	},
 	created() {
-		this.setTitle(this.$t('user.auth.login'))
+		setTitle(this.$t('user.auth.login'))
 	},
 	computed: {
 		hasOpenIdProviders() {

From 6f93d6343c1c518fec3591b83b999efcbccf9607 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Tue, 5 Jul 2022 00:11:12 +0200
Subject: [PATCH 08/32] chore: remove unnecessary defineComponent

---
 src/components/base/BaseButton.vue         | 7 +------
 src/components/input/button.vue            | 6 +-----
 src/components/sharing/userTeam.vue        | 4 +---
 src/views/namespaces/settings/share.vue    | 6 +-----
 src/views/user/settings/Avatar.vue         | 6 +-----
 src/views/user/settings/DataExport.vue     | 6 +-----
 src/views/user/settings/EmailUpdate.vue    | 5 +----
 src/views/user/settings/PasswordUpdate.vue | 6 +-----
 src/views/user/settings/TOTP.vue           | 3 +--
 9 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/components/base/BaseButton.vue b/src/components/base/BaseButton.vue
index 306e21b69..c06297d11 100644
--- a/src/components/base/BaseButton.vue
+++ b/src/components/base/BaseButton.vue
@@ -12,12 +12,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-
-// see https://v3.vuejs.org/api/sfc-script-setup.html#usage-alongside-normal-script
-export default defineComponent({
-	inheritAttrs: false,
-})
+export default { inheritAttrs: false }
 </script>
 
 <script lang="ts" setup>
diff --git a/src/components/input/button.vue b/src/components/input/button.vue
index 6aa8184bf..0131c287b 100644
--- a/src/components/input/button.vue
+++ b/src/components/input/button.vue
@@ -18,11 +18,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-
-export default defineComponent({
-	name: 'x-button',
-})
+export default { name: 'x-button' }
 </script>
 
 <script setup lang="ts">
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index c14902aa7..e67429cdb 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -133,9 +133,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-
-export default defineComponent({name: 'userTeamShare'})
+export default {name: 'userTeamShare'}
 </script>
 
 <script setup lang="ts">
diff --git a/src/views/namespaces/settings/share.vue b/src/views/namespaces/settings/share.vue
index e2b138ddb..6d01137b3 100644
--- a/src/views/namespaces/settings/share.vue
+++ b/src/views/namespaces/settings/share.vue
@@ -21,11 +21,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-
-export default defineComponent({
-	name: 'namespace-setting-share',
-})
+export default { name: 'namespace-setting-share' }
 </script>
 
 <script lang="ts" setup>
diff --git a/src/views/user/settings/Avatar.vue b/src/views/user/settings/Avatar.vue
index e059508a9..8ebd5ff51 100644
--- a/src/views/user/settings/Avatar.vue
+++ b/src/views/user/settings/Avatar.vue
@@ -58,11 +58,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-
-export default defineComponent({
-	name: 'user-settings-avatar',
-})
+export default { name: 'user-settings-avatar' }
 </script>
 
 <script setup lang="ts">
diff --git a/src/views/user/settings/DataExport.vue b/src/views/user/settings/DataExport.vue
index 36e3d6592..b395d9349 100644
--- a/src/views/user/settings/DataExport.vue
+++ b/src/views/user/settings/DataExport.vue
@@ -39,11 +39,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-
-export default defineComponent({
-	name: 'user-settings-data-export',
-})
+export default {name: 'user-settings-data-export'}
 </script>
 
 <script setup lang="ts">
diff --git a/src/views/user/settings/EmailUpdate.vue b/src/views/user/settings/EmailUpdate.vue
index 7fb21bcf9..fec0da18f 100644
--- a/src/views/user/settings/EmailUpdate.vue
+++ b/src/views/user/settings/EmailUpdate.vue
@@ -37,10 +37,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-export default defineComponent({
-	name: 'user-settings-update-email',
-})
+export default { name: 'user-settings-update-email' }
 </script>
 
 <script setup lang="ts">
diff --git a/src/views/user/settings/PasswordUpdate.vue b/src/views/user/settings/PasswordUpdate.vue
index d7db100b3..6c802b6cc 100644
--- a/src/views/user/settings/PasswordUpdate.vue
+++ b/src/views/user/settings/PasswordUpdate.vue
@@ -52,11 +52,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-
-export default defineComponent({
-	name: 'user-settings-password-update',
-})
+export default {name: 'user-settings-password-update'}
 </script>
 
 <script setup lang="ts">
diff --git a/src/views/user/settings/TOTP.vue b/src/views/user/settings/TOTP.vue
index f705ed089..15bd27c49 100644
--- a/src/views/user/settings/TOTP.vue
+++ b/src/views/user/settings/TOTP.vue
@@ -65,8 +65,7 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
-export default defineComponent({ name: 'user-settings-totp' })
+export default { name: 'user-settings-totp' }
 </script>
 
 <script lang="ts" setup>

From 42e72d14a4a804aa38908cc2a9d6b4cb120c988a Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 23 Jun 2022 03:28:48 +0200
Subject: [PATCH 09/32] chore: better variable typing

---
 src/components/notifications/notifications.vue | 2 +-
 src/components/sharing/linkSharing.vue         | 2 +-
 src/components/tasks/partials/comments.vue     | 4 ++--
 src/components/tasks/partials/description.vue  | 1 +
 src/components/tasks/partials/listSearch.vue   | 2 +-
 src/components/tasks/partials/repeatAfter.vue  | 5 +++--
 src/views/list/NewList.vue                     | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 62d23a72d..bb788a11b 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -63,7 +63,7 @@ const LOAD_NOTIFICATIONS_INTERVAL = 10000
 const store = useStore()
 const router = useRouter()
 
-const allNotifications = ref([])
+const allNotifications = ref<NotificationModel[]>([])
 const showNotifications = ref(false)
 const popup = ref(null)
 
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index b38a58341..4cdf873fb 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -198,7 +198,7 @@ const props = defineProps({
 
 const {t} = useI18n({useScope: 'global'})
 
-const linkShares = ref([])
+const linkShares = ref<LinkShareModel[]>([])
 const linkShareService = shallowReactive(new LinkShareService())
 const selectedRight = ref(RIGHTS.READ)
 const name = ref('')
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index 3501eadcd..48b7b6bd0 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -188,8 +188,8 @@ const commentEdit = reactive(new TaskCommentModel())
 
 const newComment = reactive(new TaskCommentModel())
 
-const saved = ref(null)
-const saving = ref(null)
+const saved = ref<TaskModel['id'] | null>(null)
+const saving = ref<TaskModel['id'] | null>(null)
 
 const userAvatar = computed(() => store.state.auth.info.getAvatarUrl(48))
 const currentUserId = computed(() => store.state.auth.info.id)
diff --git a/src/components/tasks/partials/description.vue b/src/components/tasks/partials/description.vue
index 2b3a14cea..71b1f37a3 100644
--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@@ -47,6 +47,7 @@ const props = defineProps({
 		required: true,
 	},
 	canWrite: {
+		type: Boolean,
 		required: true,
 	},
 })
diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue
index 482e47e2e..58c156439 100644
--- a/src/components/tasks/partials/listSearch.vue
+++ b/src/components/tasks/partials/listSearch.vue
@@ -38,7 +38,7 @@ const emit = defineEmits(['update:modelValue'])
 const store = useStore()
 const {t} = useI18n({useScope: 'global'})
 
-const list = reactive<ListModel>(new ListModel())
+const list: ListModel= reactive(new ListModel())
 
 watch(
 	() => props.modelValue,
diff --git a/src/components/tasks/partials/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
index 8c3d5e28e..2d2793309 100644
--- a/src/components/tasks/partials/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@@ -62,14 +62,15 @@
 </template>
 
 <script setup lang="ts">
-import {ref, reactive, watch} from 'vue'
+import {ref, reactive, watch, type PropType} from 'vue'
 import {error} from '@/message'
 import {useI18n} from 'vue-i18n'
-import type TaskModel from '@/models/task'
 import {TASK_REPEAT_MODES, type RepeatAfter} from '@/models/task'
+import type TaskModel from '@/models/task'
 
 const props = defineProps({
 	modelValue: {
+		type: Object as PropType<TaskModel>,
 		default: () => ({}),
 		required: true,
 	},
diff --git a/src/views/list/NewList.vue b/src/views/list/NewList.vue
index a63dc4081..28ec71d49 100644
--- a/src/views/list/NewList.vue
+++ b/src/views/list/NewList.vue
@@ -63,7 +63,7 @@ async function createNewList() {
 	}
 	showError.value = false
 
-	list.namespaceId = parseInt(route.params.namespaceId)
+	list.namespaceId = Number(route.params.namespaceId as string)
 	const newList = await store.dispatch('lists/createList', list)
 	await router.push({
 		name: 'list.index',

From c9e85cb52b562cf9dcfac3ed54d8289e2b499992 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Wed, 20 Jul 2022 21:15:35 +0200
Subject: [PATCH 10/32] feat: improve types

---
 src/components/tasks/add-task.vue            |  2 +-
 src/components/tasks/partials/editLabels.vue |  2 +-
 src/components/tasks/partials/listSearch.vue |  4 +--
 src/components/tasks/partials/reminders.vue  |  4 +--
 src/helpers/attachments.ts                   |  2 +-
 src/helpers/utils.ts                         |  4 +--
 src/models/constants/priorities.ts           |  4 ++-
 src/models/task.ts                           |  3 ++-
 src/models/taskRelation.ts                   | 26 +++++++++++---------
 src/modules/parseTaskText.ts                 |  2 +-
 src/services/abstractService.ts              | 24 +++++++++---------
 src/services/attachment.ts                   | 14 +++++------
 src/services/backgroundUpload.ts             |  4 +--
 src/services/task.ts                         |  2 +-
 14 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index 2a4b2e3e8..ef45ca884 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -200,7 +200,7 @@ function handleEnter(e: KeyboardEvent) {
 }
 
 function focusTaskInput() {
-	newTaskInput.value.focus()
+	newTaskInput.value?.focus()
 }
 
 defineExpose({
diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue
index bc218519a..0e2858225 100644
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@@ -117,7 +117,7 @@ async function removeLabel(label: LabelModel) {
 
 	for (const l in labels.value) {
 		if (labels.value[l].id === label.id) {
-			labels.value.splice(l, 1)
+			labels.value.splice(l, 1) // FIXME: l should be index
 		}
 	}
 	emit('update:modelValue', labels.value)
diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue
index 58c156439..df53679f3 100644
--- a/src/components/tasks/partials/listSearch.vue
+++ b/src/components/tasks/partials/listSearch.vue
@@ -1,5 +1,5 @@
 <template>
-	<multiselect
+	<Multiselect
 		class="control is-expanded"
 		:placeholder="$t('list.search')"
 		@search="findLists"
@@ -13,7 +13,7 @@
 			<span class="list-namespace-title search-result">{{ namespace(props.option.namespaceId) }} ></span>
 			{{ props.option.title }}
 		</template>
-	</multiselect>
+	</Multiselect>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/components/tasks/partials/reminders.vue b/src/components/tasks/partials/reminders.vue
index 45632c736..0f771aa42 100644
--- a/src/components/tasks/partials/reminders.vue
+++ b/src/components/tasks/partials/reminders.vue
@@ -45,8 +45,8 @@ const props = defineProps({
 				return false
 			}
 
-			const isDate = (e: any) => e instanceof Date
-			const isString = (e: any) => typeof e === 'string'
+			const isDate = (e: unknown) => e instanceof Date
+			const isString = (e: unknown) => typeof e === 'string'
 
 			for (const e of prop) {
 				if (!isDate(e) && !isString(e)) {
diff --git a/src/helpers/attachments.ts b/src/helpers/attachments.ts
index 4532bee12..e578fc220 100644
--- a/src/helpers/attachments.ts
+++ b/src/helpers/attachments.ts
@@ -29,6 +29,6 @@ export async function uploadFiles(attachmentService: AttachmentService, taskId:
 	}
 }
 
-export function generateAttachmentUrl(taskId: number, attachmentId: number) : any {
+export function generateAttachmentUrl(taskId: number, attachmentId: number) {
 	return `${window.API_URL}/tasks/${taskId}/attachments/${attachmentId}`
 }
\ No newline at end of file
diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts
index c735aa658..c65f0ddb4 100644
--- a/src/helpers/utils.ts
+++ b/src/helpers/utils.ts
@@ -11,11 +11,11 @@ export function includesById(array: [], id: string | number) {
 }
 
 // https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_isnil
-export function isNil(value: any) {
+export function isNil(value: unknown) {
 	return value == null
 }
 
-export function omitBy(obj: {}, check: (value: any) => boolean): {} {
+export function omitBy(obj: {}, check: (value: unknown) => boolean) {
 	if (isNil(obj)) {
 		return {}
 	}
diff --git a/src/models/constants/priorities.ts b/src/models/constants/priorities.ts
index b3cf85cb3..598adfd98 100644
--- a/src/models/constants/priorities.ts
+++ b/src/models/constants/priorities.ts
@@ -5,4 +5,6 @@ export const PRIORITIES = {
 	'HIGH': 3,
 	'URGENT': 4,
 	'DO_NOW': 5,
-} as const
\ No newline at end of file
+} as const
+
+export type Priority = typeof PRIORITIES[keyof typeof PRIORITIES]
\ No newline at end of file
diff --git a/src/models/task.ts b/src/models/task.ts
index 540530db6..4ede946b1 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -6,6 +6,7 @@ import AttachmentModel from './attachment'
 import SubscriptionModel from '@/models/subscription'
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
 import type ListModel from './list'
+import type { Priority } from './constants/priorities'
 
 const SUPPORTS_TRIGGERED_NOTIFICATION = 'Notification' in window && 'showTrigger' in Notification.prototype
 export const TASK_DEFAULT_COLOR = '#1973ff'
@@ -29,7 +30,7 @@ export default class TaskModel extends AbstractModel {
 	description: string
 	done: boolean
 	doneAt: Date | null
-	priority: 0
+	priority: Priority
 	labels: LabelModel[]
 	assignees: UserModel[]
 
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index 5a944c027..66ffe485f 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -2,18 +2,20 @@ import AbstractModel from './abstractModel'
 import UserModel from './user'
 import type TaskModel from './task'
 
-export const RELATION_KINDS = [
-	'subtask',
-	'parenttask',
-	'related',
-	'duplicates',
-	'blocking',
-	'blocked',
-	'precedes',
-	'follows',
-	'copiedfrom',
-	'copiedto',
-  ] as const
+export const RELATION_KIND = {
+	'SUBTASK': 'subtask',
+	'PARENTTASK': 'parenttask',
+	'RELATED': 'related',
+	'DUPLICATES': 'duplicates',
+	'BLOCKING': 'blocking',
+	'BLOCKED': 'blocked',
+	'PROCEDES': 'precedes',
+	'FOLLOWS': 'follows',
+	'COPIEDFROM': 'copiedfrom',
+	'COPIEDTO': 'copiedto',
+ } as const
+
+export const RELATION_KINDS = [...Object.values(RELATION_KIND)] as const
 
 export type RelationKind = typeof RELATION_KINDS[number]
 
diff --git a/src/modules/parseTaskText.ts b/src/modules/parseTaskText.ts
index c3c8ad7d4..d30975b8d 100644
--- a/src/modules/parseTaskText.ts
+++ b/src/modules/parseTaskText.ts
@@ -47,7 +47,7 @@ interface repeatParsedResult {
 	repeats: Repeats | null,
 }
 
-interface ParsedTaskText {
+export interface ParsedTaskText {
 	text: string,
 	date: Date | null,
 	labels: string[],
diff --git a/src/services/abstractService.ts b/src/services/abstractService.ts
index 255bed687..62094368c 100644
--- a/src/services/abstractService.ts
+++ b/src/services/abstractService.ts
@@ -3,6 +3,8 @@ import type {Method} from 'axios'
 
 import {objectToSnakeCase} from '@/helpers/case'
 import AbstractModel from '@/models/abstractModel'
+import type { Right } from '@/models/constants/rights'
+import type FileModel from '@/models/file'
 
 interface Paths {
 	create : string
@@ -20,7 +22,7 @@ function convertObject(o: Record<string, unknown>) {
 	return o
 }
 
-function prepareParams(params: Record<string, unknown | any[]>) {
+function prepareParams(params: Record<string, unknown | unknown[]>) {
 	if (typeof params !== 'object') {
 		return params
 	}
@@ -37,7 +39,7 @@ function prepareParams(params: Record<string, unknown | any[]>) {
 	return objectToSnakeCase(params)
 }
 
-export default class AbstractService<Model extends AbstractModel> {
+export default class AbstractService<Model extends AbstractModel = AbstractModel> {
 
 	/////////////////////////////
 	// Initial variable definitions
@@ -124,8 +126,8 @@ export default class AbstractService<Model extends AbstractModel> {
 	/**
 	 * Returns an object with all route parameters and their values.
 	 */
-	getRouteReplacements(route : string, parameters = {}) {
-		const replace$$1: {} = {}
+	getRouteReplacements(route : string, parameters : Record<string, unknown> = {}) {
+		const replace$$1: Record<string, unknown> = {}
 		let pattern = this.getRouteParameterPattern()
 		pattern = new RegExp(pattern instanceof RegExp ? pattern.source : pattern, 'g')
 
@@ -161,7 +163,7 @@ export default class AbstractService<Model extends AbstractModel> {
 	 * But because the timeout is created using setTimeout, it will still trigger even if the request is
 	 * already finished, so we return a method to call in that case.
 	 */
-	setLoading(): Function {
+	setLoading() {
 		const timeout = setTimeout(() => {
 			this.loading = true
 		}, 100)
@@ -267,7 +269,7 @@ export default class AbstractService<Model extends AbstractModel> {
 	 * This is a more abstract implementation which only does a get request.
 	 * Services which need more flexibility can use this.
 	 */
-	async getM(url : string, model = new AbstractModel({}), params = {}) {
+	async getM(url : string, model = new AbstractModel({}) as Model, params: Record<string, unknown> = {}) {
 		const cancel = this.setLoading()
 
 		model = this.beforeGet(model)
@@ -276,7 +278,7 @@ export default class AbstractService<Model extends AbstractModel> {
 		try {
 			const response = await this.http.get(finalUrl, {params: prepareParams(params)})
 			const result = this.modelGetFactory(response.data)
-			result.maxRight = Number(response.headers['x-max-right'])
+			result.maxRight = Number(response.headers['x-max-right']) as Right
 			return result
 		} finally {
 			cancel()
@@ -300,7 +302,7 @@ export default class AbstractService<Model extends AbstractModel> {
 	 * @param params Optional query parameters
 	 * @param page The page to get
 	 */
-	async getAll(model : Model = new AbstractModel({}), params = {}, page = 1) {
+	async getAll(model : Model = new AbstractModel({}) as Model, params = {}, page = 1) {
 		if (this.paths.getAll === '') {
 			throw new Error('This model is not able to get data.')
 		}
@@ -406,10 +408,10 @@ export default class AbstractService<Model extends AbstractModel> {
 	/**
 	 * Uploads a file to a url.
 	 * @param url
-	 * @param file
+	 * @param file {FileModel}
 	 * @param fieldName The name of the field the file is uploaded to.
 	 */
-	uploadFile(url : string, file, fieldName : string) {
+	uploadFile(url : string, file: FileModel, fieldName : string) {
 		return this.uploadBlob(url, new Blob([file]), fieldName, file.name)
 	}
 
@@ -425,7 +427,7 @@ export default class AbstractService<Model extends AbstractModel> {
 	/**
 	 * Uploads a form data object.
 	 */
-	async uploadFormData(url : string, formData: Record<string, unknown>) {
+	async uploadFormData(url : string, formData: FormData) {
 		const cancel = this.setLoading()
 		try {
 			const response = await this.http.put(
diff --git a/src/services/attachment.ts b/src/services/attachment.ts
index 098d5ef6f..9422bd04e 100644
--- a/src/services/attachment.ts
+++ b/src/services/attachment.ts
@@ -2,8 +2,9 @@ import AbstractService from './abstractService'
 import AttachmentModel from '../models/attachment'
 import {formatISO} from 'date-fns'
 import {downloadBlob} from '@/helpers/downloadBlob'
+import type FileModel from '@/models/file'
 
-export default class AttachmentService extends AbstractService {
+export default class AttachmentService extends AbstractService<AttachmentModel> {
 	constructor() {
 		super({
 			create: '/tasks/{taskId}/attachments',
@@ -12,7 +13,7 @@ export default class AttachmentService extends AbstractService {
 		})
 	}
 
-	processModel(model) {
+	processModel(model: AttachmentModel) {
 		model.created = formatISO(new Date(model.created))
 		return model
 	}
@@ -33,26 +34,25 @@ export default class AttachmentService extends AbstractService {
 		return data
 	}
 
-	getBlobUrl(model) {
+	getBlobUrl(model: AttachmentModel) {
 		return AbstractService.prototype.getBlobUrl.call(this, '/tasks/' + model.taskId + '/attachments/' + model.id)
 	}
 
-	async download(model) {
+	async download(model: AttachmentModel) {
 		const url = await this.getBlobUrl(model)
 		return downloadBlob(url, model.file.name)
 	}
 
 	/**
 	 * Uploads a file to the server
-	 * @param model
 	 * @param files
 	 * @returns {Promise<any|never>}
 	 */
-	create(model, files) {
+	create(model: AttachmentModel, files: FileModel[]) {
 		const data = new FormData()
 		for (let i = 0; i < files.length; i++) {
 			// TODO: Validation of file size
-			data.append('files', new Blob([files[i]]), files[i].name)
+			data.append('files', new Blob([JSON.stringify(files[i], null, 2)]), files[i].name)
 		}
 
 		return this.uploadFormData(
diff --git a/src/services/backgroundUpload.ts b/src/services/backgroundUpload.ts
index 0f9d9792d..b961061d4 100644
--- a/src/services/backgroundUpload.ts
+++ b/src/services/backgroundUpload.ts
@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
 import ListModel from '../models/list'
+import type FileModel from '@/models/file'
 
 export default class BackgroundUploadService extends AbstractService {
 	constructor() {
@@ -18,11 +19,10 @@ export default class BackgroundUploadService extends AbstractService {
 
 	/**
 	 * Uploads a file to the server
-	 * @param listId
 	 * @param file
 	 * @returns {Promise<any|never>}
 	 */
-	create(listId: ListModel['id'], file) {
+	create(listId: ListModel['id'], file: FileModel) {
 		return this.uploadFile(
 			this.getReplacedRoute(this.paths.create, {listId}),
 			file,
diff --git a/src/services/task.ts b/src/services/task.ts
index c17bc2ef4..b8b69a418 100644
--- a/src/services/task.ts
+++ b/src/services/task.ts
@@ -113,7 +113,7 @@ export default class TaskService extends AbstractService {
 			model.labels = model.labels.map(l => labelService.processModel(l))
 		}
 
-		return model
+		return model as TaskModel
 	}
 }
 

From 3766b5e51ba9c40a6affa91ce5cc11519e2da5c3 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 21 Jul 2022 00:42:36 +0200
Subject: [PATCH 11/32] feat: improve store and model typing

---
 src/components/home/navigation.vue            |  18 +--
 .../list/list-settings-dropdown.vue           |  10 +-
 src/components/list/partials/list-card.vue    |   6 +-
 src/components/misc/subscription.vue          |   4 +-
 .../namespace/namespace-settings-dropdown.vue |   5 +-
 .../notifications/notifications.vue           |   4 +-
 src/components/sharing/linkSharing.vue        |  12 +-
 src/components/sharing/userTeam.vue           |  24 ++--
 src/components/tasks/edit-task.vue            |  14 ++-
 src/components/tasks/partials/attachments.vue |  10 +-
 .../tasks/partials/checklist-summary.vue      |   6 +-
 src/components/tasks/partials/comments.vue    |  18 +--
 .../tasks/partials/createdUpdated.vue         |   6 +-
 src/components/tasks/partials/defer-task.vue  |   8 +-
 src/components/tasks/partials/description.vue |   8 +-
 .../tasks/partials/editAssignees.vue          |  10 +-
 src/components/tasks/partials/editLabels.vue  |  10 +-
 src/components/tasks/partials/heading.vue     |   6 +-
 src/components/tasks/partials/kanban-card.vue |   6 +-
 src/components/tasks/partials/labels.vue      |   4 +-
 src/components/tasks/partials/listSearch.vue  |  11 +-
 src/components/tasks/partials/repeatAfter.vue |  10 +-
 .../tasks/partials/singleTaskInList.vue       |   4 +-
 src/helpers/attachments.ts                    |  15 ++-
 src/helpers/getListTitle.ts                   |   5 +-
 src/helpers/getNamespaceTitle.ts              |   4 +-
 src/helpers/labels.ts                         |  18 +--
 src/helpers/saveCollapsedBucketState.ts       |   9 +-
 src/helpers/savedFilter.ts                    |   4 +-
 src/helpers/utils.ts                          |   4 +-
 src/models/abstractModel.ts                   |   6 +-
 src/models/attachment.ts                      |  19 ++-
 src/models/avatar.ts                          |  12 +-
 src/models/backgroundImage.ts                 |  15 ++-
 src/models/bucket.ts                          |  26 +++-
 src/models/caldavToken.ts                     |  13 +-
 src/models/emailUpdate.ts                     |   7 +-
 src/models/file.ts                            |  10 +-
 src/models/label.ts                           |  20 ++-
 src/models/labelTask.ts                       |   8 +-
 src/models/linkShare.ts                       |  21 +++-
 src/models/list.ts                            |  43 +++++--
 src/models/listDuplicateModel.ts              |  16 ++-
 src/models/namespace.ts                       |  30 +++--
 src/models/notification.ts                    |  38 +++---
 src/models/passwordReset.ts                   |   8 +-
 src/models/passwordUpdate.ts                  |   9 +-
 src/models/savedFilter.ts                     |  25 +++-
 src/models/subscription.ts                    |  15 ++-
 src/models/task.ts                            |  75 ++++++++---
 src/models/taskAssignee.ts                    |  16 ++-
 src/models/taskComment.ts                     |  20 ++-
 src/models/taskRelation.ts                    |  22 +++-
 src/models/team.ts                            |  24 +++-
 src/models/teamList.ts                        |  10 +-
 src/models/teamMember.ts                      |  11 +-
 src/models/teamNamespace.ts                   |  10 +-
 src/models/teamShareBase.ts                   |  16 ++-
 src/models/totp.ts                            |   8 +-
 src/models/user.ts                            |  18 ++-
 src/models/userList.ts                        |  11 +-
 src/models/userNamespace.ts                   |  10 +-
 src/models/userSettings.ts                    |  17 ++-
 src/models/userShareBase.ts                   |  14 ++-
 src/modules/parseTaskText.test.ts             |   2 +-
 src/services/abstractService.ts               |  17 +--
 src/services/attachment.ts                    |  12 +-
 src/services/avatar.ts                        |   4 +-
 src/services/backgroundUnsplash.ts            |   6 +-
 src/services/backgroundUpload.ts              |   6 +-
 src/services/bucket.ts                        |   4 +-
 src/services/caldavToken.ts                   |   6 +-
 src/services/label.ts                         |   4 +-
 src/services/list.ts                          |   4 +-
 src/services/namespace.ts                     |   4 +-
 src/services/task.ts                          |   4 +-
 src/services/taskComment.ts                   |   4 +-
 src/store/helper.ts                           |   8 +-
 src/store/index.ts                            |   8 +-
 src/store/modules/attachments.ts              |  13 +-
 src/store/modules/auth.ts                     |  57 ++++-----
 src/store/modules/config.ts                   |  13 +-
 src/store/modules/kanban.ts                   |  95 +++++++++-----
 src/store/modules/labels.ts                   |  41 ++++---
 src/store/modules/lists.ts                    |  25 ++--
 src/store/modules/namespaces.ts               |  37 +++---
 src/store/modules/tasks.ts                    |  83 +++++++++----
 src/store/types.ts                            | 116 ++++++++++++++++++
 src/views/filters/FilterEdit.vue              |   4 +-
 src/views/labels/ListLabels.vue               |   8 +-
 src/views/list/ListList.vue                   |  10 +-
 src/views/list/ListTable.vue                  |   4 +-
 src/views/list/settings/duplicate.vue         |   6 +-
 src/views/list/settings/edit.vue              |   4 +-
 src/views/tasks/ShowTasks.vue                 |   6 +-
 src/views/tasks/TaskDetailView.vue            |   8 +-
 src/views/teams/EditTeam.vue                  |  26 ++--
 src/views/user/settings/Caldav.vue            |  12 +-
 98 files changed, 1050 insertions(+), 507 deletions(-)
 create mode 100644 src/store/types.ts

diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 76a0fb23d..53f2a9f7a 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -156,8 +156,8 @@ import {calculateItemPosition} from '@/helpers/calculateItemPosition'
 import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
 import {getListTitle} from '@/helpers/getListTitle'
 import {useEventListener} from '@vueuse/core'
-import type NamespaceModel from '@/models/namespace'
-import type ListModel from '@/models/list'
+import type { IList } from '@/models/list'
+import type { INamespace } from '@/models/namespace'
 
 const drag = ref(false)
 const dragOptions = {
@@ -172,7 +172,7 @@ const loading = computed(() => store.state.loading && store.state.loadingModule
 
 
 const namespaces = computed(() => {
-	return (store.state.namespaces.namespaces as NamespaceModel[]).filter(n => !n.isArchived)
+	return (store.state.namespaces.namespaces as INamespace[]).filter(n => !n.isArchived)
 })
 const activeLists = computed(() => {
 	return namespaces.value.map(({lists}) => {
@@ -195,7 +195,7 @@ useEventListener('resize', resize)
 onMounted(() => resize())
 
 
-function toggleFavoriteList(list: ListModel) {
+function toggleFavoriteList(list: IList) {
 	// The favorites pseudo list is always favorite
 	// Archived lists cannot be marked favorite
 	if (list.id === -1 || list.isArchived) {
@@ -209,14 +209,14 @@ function resize() {
 	store.commit(MENU_ACTIVE, window.innerWidth >= 770)
 }
 
-function toggleLists(namespaceId: NamespaceModel['id']) {
+function toggleLists(namespaceId: INamespace['id']) {
 	listsVisible.value[namespaceId] = !listsVisible.value[namespaceId]
 }
 
-const listsVisible = ref<{ [id: NamespaceModel['id']]: boolean }>({})
+const listsVisible = ref<{ [id: INamespace['id']]: boolean }>({})
 // FIXME: async action will be unfinished when component mounts
 onBeforeMount(async () => {
-	const namespaces = await store.dispatch('namespaces/loadNamespaces') as NamespaceModel[]
+	const namespaces = await store.dispatch('namespaces/loadNamespaces') as INamespace[]
 	namespaces.forEach(n => {
 		if (typeof listsVisible.value[n.id] === 'undefined') {
 			listsVisible.value[n.id] = true
@@ -224,7 +224,7 @@ onBeforeMount(async () => {
 	})
 })
 
-function updateActiveLists(namespace: NamespaceModel, activeLists: ListModel[]) {
+function updateActiveLists(namespace: INamespace, activeLists: IList[]) {
 	// This is a bit hacky: since we do have to filter out the archived items from the list
 	// for vue draggable updating it is not as simple as replacing it.
 	// To work around this, we merge the active lists with the archived ones. Doing so breaks the order
@@ -241,7 +241,7 @@ function updateActiveLists(namespace: NamespaceModel, activeLists: ListModel[])
 	})
 }
 
-const listUpdating = ref<{ [id: NamespaceModel['id']]: boolean }>({})
+const listUpdating = ref<{ [id: INamespace['id']]: boolean }>({})
 
 async function saveListPosition(e: SortableEvent) {
 	if (!e.newIndex && e.newIndex !== 0) return
diff --git a/src/components/list/list-settings-dropdown.vue b/src/components/list/list-settings-dropdown.vue
index 74cafb884..180596b2c 100644
--- a/src/components/list/list-settings-dropdown.vue
+++ b/src/components/list/list-settings-dropdown.vue
@@ -76,24 +76,24 @@
 </template>
 
 <script setup lang="ts">
-import {ref, computed, watchEffect} from 'vue'
+import {ref, computed, watchEffect, type PropType} from 'vue'
 import {useStore} from 'vuex'
 
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 import Dropdown from '@/components/misc/dropdown.vue'
 import DropdownItem from '@/components/misc/dropdown-item.vue'
 import TaskSubscription from '@/components/misc/subscription.vue'
-import ListModel from '@/models/list'
-import type SubscriptionModel from '@/models/subscription'
+import type {IList} from '@/models/list'
+import type { ISubscription } from '@/models/subscription'
 
 const props = defineProps({
 	list: {
-		type: ListModel,
+		type: Object as PropType<IList>,
 		required: true,
 	},
 })
 
-const subscription = ref<SubscriptionModel | null>(null)
+const subscription = ref<ISubscription | null>(null)
 watchEffect(() => {
 	subscription.value = props.list.subscription ?? null
 })
diff --git a/src/components/list/partials/list-card.vue b/src/components/list/partials/list-card.vue
index 599ae058e..53317c4a2 100644
--- a/src/components/list/partials/list-card.vue
+++ b/src/components/list/partials/list-card.vue
@@ -43,9 +43,9 @@ import ListService from '@/services/list'
 import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
 
 import {colorIsDark} from '@/helpers/color/colorIsDark'
-import type ListModel from '@/models/list'
 
 import BaseButton from '@/components/base/BaseButton.vue'
+import type { IList } from '@/models/list'
 
 const background = ref<string | null>(null)
 const backgroundLoading = ref(false)
@@ -53,7 +53,7 @@ const blurHashUrl = ref('')
 
 const props = defineProps({
 	list: {
-		type: Object as PropType<ListModel>,
+		type: Object as PropType<IList>,
 		required: true,
 	},
 	showArchived: {
@@ -86,7 +86,7 @@ async function loadBackground() {
 
 const store = useStore()
 
-function toggleFavoriteList(list: ListModel) {
+function toggleFavoriteList(list: IList) {
 	// The favorites pseudo list is always favorite
 	// Archived lists cannot be marked favorite
 	if (list.id === -1 || list.isArchived) {
diff --git a/src/components/misc/subscription.vue b/src/components/misc/subscription.vue
index 073e727ca..070476888 100644
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@@ -39,7 +39,7 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import DropdownItem from '@/components/misc/dropdown-item.vue'
 
 import SubscriptionService from '@/services/subscription'
-import SubscriptionModel from '@/models/subscription'
+import SubscriptionModel, { type ISubscription } from '@/models/subscription'
 
 import {success} from '@/message'
 
@@ -51,7 +51,7 @@ const props = defineProps({
 		default: true,
 	},
 	subscription: {
-		type: Object as PropType<SubscriptionModel>,
+		type: Object as PropType<ISubscription>,
 		default: null,
 	},
 	type: {
diff --git a/src/components/namespace/namespace-settings-dropdown.vue b/src/components/namespace/namespace-settings-dropdown.vue
index 80a6a9357..d80d563d6 100644
--- a/src/components/namespace/namespace-settings-dropdown.vue
+++ b/src/components/namespace/namespace-settings-dropdown.vue
@@ -54,15 +54,16 @@
 </template>
 
 <script setup lang="ts">
-import {ref, onMounted} from 'vue'
+import {ref, onMounted, type PropType} from 'vue'
 
 import Dropdown from '@/components/misc/dropdown.vue'
 import DropdownItem from '@/components/misc/dropdown-item.vue'
 import TaskSubscription from '@/components/misc/subscription.vue'
+import type { INamespace } from '@/models/namespace'
 
 const props = defineProps({
 	namespace: {
-		type: Object, // NamespaceModel
+		type: Object as PropType<INamespace>,
 		required: true,
 	},
 })
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index bb788a11b..f004a27d0 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -52,7 +52,7 @@ import {computed, onMounted, onUnmounted, ref} from 'vue'
 import NotificationService from '@/services/notification'
 import BaseButton from '@/components/base/BaseButton.vue'
 import User from '@/components/misc/user.vue'
-import NotificationModel, { NOTIFICATION_NAMES as names} from '@/models/notification'
+import { NOTIFICATION_NAMES as names, type INotification} from '@/models/notification'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {useStore} from 'vuex'
 import {useRouter} from 'vue-router'
@@ -63,7 +63,7 @@ const LOAD_NOTIFICATIONS_INTERVAL = 10000
 const store = useStore()
 const router = useRouter()
 
-const allNotifications = ref<NotificationModel[]>([])
+const allNotifications = ref<INotification[]>([])
 const showNotifications = ref(false)
 const popup = ref(null)
 
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index 4cdf873fb..b0c2ff218 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -181,13 +181,13 @@ import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
 
 import {RIGHTS} from '@/models/constants/rights'
-import LinkShareModel from '@/models/linkShare'
-import type ListModel from '@/models/list'
+import LinkShareModel, { type ILinkShare } from '@/models/linkShare'
 
 import LinkShareService from '@/services/linkShare'
 
 import {useCopyToClipboard} from '@/composables/useCopyToClipboard'
 import {success} from '@/message'
+import type { IList } from '@/models/list'
 
 const props = defineProps({
 	listId: {
@@ -198,7 +198,7 @@ const props = defineProps({
 
 const {t} = useI18n({useScope: 'global'})
 
-const linkShares = ref<LinkShareModel[]>([])
+const linkShares = ref<ILinkShare[]>([])
 const linkShareService = shallowReactive(new LinkShareService())
 const selectedRight = ref(RIGHTS.READ)
 const name = ref('')
@@ -217,7 +217,7 @@ watch(
 const store = useStore()
 const frontendUrl = computed(() => store.state.config.frontendUrl)
 
-async function load(listId: ListModel['id']) {
+async function load(listId: IList['id']) {
 	// If listId == 0 the list on the calling component wasn't already loaded, so we just bail out here
 	if (listId === 0) {
 		return
@@ -226,7 +226,7 @@ async function load(listId: ListModel['id']) {
 	linkShares.value = await linkShareService.getAll({listId})
 }
 
-async function add(listId: ListModel['id']) {
+async function add(listId: IList['id']) {
 	const newLinkShare = new LinkShareModel({
 		right: selectedRight.value,
 		listId,
@@ -242,7 +242,7 @@ async function add(listId: ListModel['id']) {
 	await load(listId)
 }
 
-async function remove(listId: ListModel['id']) {
+async function remove(listId: IList['id']) {
 	try {
 		await linkShareService.delete(new LinkShareModel({
 			id: linkIdToDelete.value,
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index e67429cdb..cc1f9b6f0 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -143,18 +143,22 @@ import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
 
 import UserNamespaceService from '@/services/userNamespace'
-import UserNamespaceModel from '@/models/userNamespace'
-import UserListModel from '@/models/userList'
+import UserNamespaceModel, { type IUserNamespace } from '@/models/userNamespace'
+
 import UserListService from '@/services/userList'
+import UserListModel, { type IUserList } from '@/models/userList'
+
 import UserService from '@/services/user'
-import UserModel from '@/models/user'
+import UserModel, { type IUser } from '@/models/user'
 
 import TeamNamespaceService from '@/services/teamNamespace'
-import TeamNamespaceModel from '@/models/teamNamespace'
-import TeamListModel from '@/models/teamList'
+import TeamNamespaceModel, { type ITeamNamespace } from '@/models/teamNamespace'
+
 import TeamListService from '@/services/teamList'
+import TeamListModel, { type ITeamList } from '@/models/teamList'
+
 import TeamService from '@/services/team'
-import TeamModel from '@/models/team'
+import TeamModel, { type ITeam } from '@/models/team'
 
 import {RIGHTS} from '@/models/constants/rights'
 import Multiselect from '@/components/input/multiselect.vue'
@@ -183,10 +187,10 @@ const props = defineProps({
 const {t} = useI18n({useScope: 'global'})
 
 // This user service is either a userNamespaceService or a userListService, depending on the type we are using
-let stuffService: ShallowReactive<UserNamespaceService | UserListService | TeamListService | TeamNamespaceService>
-let stuffModel: UserNamespaceModel | UserListModel | TeamListModel | TeamNamespaceModel
-let searchService: ShallowReactive<UserService | TeamService>
-let sharable: Ref<UserModel | TeamModel>
+let stuffService: UserNamespaceService | UserListService | TeamListService | TeamNamespaceService
+let stuffModel: IUserNamespace | IUserList | ITeamList | ITeamNamespace
+let searchService: UserService | TeamService
+let sharable: Ref<IUser | ITeam>
 
 const searchLabel = ref('')
 const selectedRight = ref({})
diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index 54001ce67..a067f4036 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -76,14 +76,14 @@
 </template>
 
 <script setup lang="ts">
-import {ref, reactive, computed, shallowReactive, watch, nextTick} from 'vue'
+import {ref, reactive, computed, shallowReactive, watch, nextTick, type PropType} from 'vue'
 import {useRouter} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
 import Editor from '@/components/input/AsyncEditor'
 
 import TaskService from '@/services/task'
-import TaskModel from '@/models/task'
+import TaskModel, { type ITask } from '@/models/task'
 import EditLabels from './partials/editLabels.vue'
 import Reminders from './partials/reminders.vue'
 import ColorPicker from '../input/colorPicker.vue'
@@ -93,14 +93,16 @@ import {success} from '@/message'
 const {t} = useI18n({useScope: 'global'})
 const router = useRouter()
 
-const props = defineProps<{
-	task?: TaskModel | null,
-}>()
+const props = defineProps({
+	task: {
+		type: Object as PropType<ITask | null>,
+	},
+})
 
 const taskService = shallowReactive(new TaskService())
 
 const editorActive = ref(false)
-let taskEditTask: TaskModel | undefined
+let taskEditTask: ITask | undefined
 
 
 // FIXME: this initialization should not be necessary here 
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index c77532ba5..b5043eee9 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -147,8 +147,7 @@
 import {defineComponent} from 'vue'
 
 import AttachmentService from '../../../services/attachment'
-import AttachmentModel from '../../../models/attachment'
-import type FileModel from '@/models/file'
+import AttachmentModel, { type IAttachment } from '@/models/attachment'
 import User from '@/components/misc/user.vue'
 import {mapState} from 'vuex'
 
@@ -157,6 +156,7 @@ import { uploadFiles, generateAttachmentUrl } from '@/helpers/attachments'
 import {formatDate, formatDateSince, formatDateLong} from '@/helpers/time/formatDate'
 
 import BaseButton from '@/components/base/BaseButton'
+import type { IFile } from '@/models/file'
 
 export default defineComponent({
 	name: 'attachments',
@@ -192,7 +192,7 @@ export default defineComponent({
 	setup(props) {
 		const copy = useCopyToClipboard()
 
-		function copyUrl(attachment: AttachmentModel) {
+		function copyUrl(attachment: IAttachment) {
 			copy(generateAttachmentUrl(props.taskId, attachment.id))
 		}
 
@@ -235,7 +235,7 @@ export default defineComponent({
 		formatDateSince,
 		formatDateLong,
 
-		downloadAttachment(attachment: AttachmentModel) {
+		downloadAttachment(attachment: IAttachment) {
 			this.attachmentService.download(attachment)
 		},
 		uploadNewAttachment() {
@@ -245,7 +245,7 @@ export default defineComponent({
 
 			this.uploadFiles(this.$refs.files.files)
 		},
-		uploadFiles(files: FileModel[]) {
+		uploadFiles(files: IFile[]) {
 			uploadFiles(this.attachmentService, this.taskId, files)
 		},
 		async deleteAttachment() {
diff --git a/src/components/tasks/partials/checklist-summary.vue b/src/components/tasks/partials/checklist-summary.vue
index 23653bff7..6e17d140a 100644
--- a/src/components/tasks/partials/checklist-summary.vue
+++ b/src/components/tasks/partials/checklist-summary.vue
@@ -10,15 +10,15 @@
 </template>
 
 <script setup lang="ts">
-import {computed} from 'vue'
+import {computed, type PropType} from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import {getChecklistStatistics} from '@/helpers/checklistFromText'
-import TaskModel from '@/models/task'
+import type {ITask} from '@/models/task'
 
 const props = defineProps({
 	task: {
-		type: TaskModel,
+		type: Object as PropType<ITask>,
 		required: true,
 	},
 })
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index 48b7b6bd0..cfd4fe956 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -159,12 +159,12 @@ import {useI18n} from 'vue-i18n'
 import Editor from '@/components/input/AsyncEditor'
 
 import TaskCommentService from '@/services/taskComment'
-import TaskCommentModel from '@/models/taskComment'
+import TaskCommentModel, { type ITaskComment } from '@/models/taskComment'
 import {uploadFile} from '@/helpers/attachments'
 import {success} from '@/message'
 import {formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 
-import type TaskModel from '@/models/task'
+import type { ITask } from '@/models/task'
 const props = defineProps({
 	taskId: {
 		type: Number,
@@ -178,7 +178,7 @@ const props = defineProps({
 const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 
-const comments = ref<TaskCommentModel[]>([])
+const comments = ref<ITaskComment[]>([])
 
 const showDeleteModal = ref(false)
 const commentToDelete = reactive(new TaskCommentModel())
@@ -188,8 +188,8 @@ const commentEdit = reactive(new TaskCommentModel())
 
 const newComment = reactive(new TaskCommentModel())
 
-const saved = ref<TaskModel['id'] | null>(null)
-const saving = ref<TaskModel['id'] | null>(null)
+const saved = ref<ITask['id'] | null>(null)
+const saving = ref<ITask['id'] | null>(null)
 
 const userAvatar = computed(() => store.state.auth.info.getAvatarUrl(48))
 const currentUserId = computed(() => store.state.auth.info.id)
@@ -215,7 +215,7 @@ function attachmentUpload(...args) {
 
 const taskCommentService = shallowReactive(new TaskCommentService())
 
-async function loadComments(taskId: TaskModel['id']) {
+async function loadComments(taskId: ITask['id']) {
 	if (!enabled.value) {
 		return
 	}
@@ -259,12 +259,12 @@ async function addComment() {
 	}
 }
 
-function toggleEdit(comment: TaskCommentModel) {
+function toggleEdit(comment: ITaskComment) {
 	isCommentEdit.value = !isCommentEdit.value
 	Object.assign(commentEdit, comment)
 }
 
-function toggleDelete(commentId: TaskCommentModel['id']) {
+function toggleDelete(commentId: ITaskComment['id']) {
 	showDeleteModal.value = !showDeleteModal.value
 	commentToDelete.id = commentId
 }
@@ -294,7 +294,7 @@ async function editComment() {
 	}
 }
 
-async function deleteComment(commentToDelete: TaskCommentModel) {
+async function deleteComment(commentToDelete: ITaskComment) {
 	try {
 		await taskCommentService.delete(commentToDelete)
 		const index = comments.value.findIndex(({id}) => id === commentToDelete.id)
diff --git a/src/components/tasks/partials/createdUpdated.vue b/src/components/tasks/partials/createdUpdated.vue
index c216cfae3..3d839e5fe 100644
--- a/src/components/tasks/partials/createdUpdated.vue
+++ b/src/components/tasks/partials/createdUpdated.vue
@@ -27,13 +27,13 @@
 </template>
 
 <script lang="ts" setup>
-import {computed, toRefs} from 'vue'
-import TaskModel from '@/models/task'
+import {computed, toRefs, type PropType} from 'vue'
+import type { ITask } from '@/models/task'
 import {formatISO, formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 
 const props = defineProps({
 	task: {
-		type: TaskModel,
+		type: Object as PropType<ITask>,
 		required: true,
 	},
 })
diff --git a/src/components/tasks/partials/defer-task.vue b/src/components/tasks/partials/defer-task.vue
index 48b52fb60..c0309fca7 100644
--- a/src/components/tasks/partials/defer-task.vue
+++ b/src/components/tasks/partials/defer-task.vue
@@ -38,17 +38,17 @@
 </template>
 
 <script setup lang="ts">
-import {ref, shallowReactive, computed, watch, onMounted, onBeforeUnmount} from 'vue'
+import {ref, shallowReactive, computed, watch, onMounted, onBeforeUnmount, type PropType} from 'vue'
 import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
 import flatPickr from 'vue-flatpickr-component'
 
 import TaskService from '@/services/task'
-import TaskModel from '@/models/task'
+import { type ITask } from '@/models/task'
 
 const props = defineProps({
 	modelValue: {
-		type: TaskModel,
+		type: Object as PropType<ITask>,
 		required: true,
 	},
 })
@@ -58,7 +58,7 @@ const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 
 const taskService = shallowReactive(new TaskService())
-const task = ref<TaskModel>()
+const task = ref<ITask>()
 
 // We're saving the due date seperately to prevent null errors in very short periods where the task is null.
 const dueDate = ref<Date>()
diff --git a/src/components/tasks/partials/description.vue b/src/components/tasks/partials/description.vue
index 71b1f37a3..a2adc8c66 100644
--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@@ -30,17 +30,17 @@
 </template>
 
 <script setup lang="ts">
-import {ref,computed, watch} from 'vue'
+import {ref,computed, watch, type PropType} from 'vue'
 import {useStore} from 'vuex'
 
 import Editor from '@/components/input/AsyncEditor'
 
-import TaskModel from '@/models/task'
+import type { ITask } from '@/models/task'
 
 
 const props = defineProps({
 	modelValue: {
-		type: TaskModel,
+		type: Object as PropType<ITask>,
 		required: true,
 	},
 	attachmentUpload: {
@@ -54,7 +54,7 @@ const props = defineProps({
 
 const emit = defineEmits(['update:modelValue'])
 
-const task = ref<TaskModel>({description: ''})
+const task = ref<ITask>({description: ''})
 const saved = ref(false)
 
 // Since loading is global state, this variable ensures we're only showing the saving icon when saving the description.
diff --git a/src/components/tasks/partials/editAssignees.vue b/src/components/tasks/partials/editAssignees.vue
index 309cd15eb..eb4aacc14 100644
--- a/src/components/tasks/partials/editAssignees.vue
+++ b/src/components/tasks/partials/editAssignees.vue
@@ -37,9 +37,9 @@ import Multiselect from '@/components/input/multiselect.vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 
 import {includesById} from '@/helpers/utils'
-import type UserModel from '@/models/user'
 import ListUserService from '@/services/listUsers'
 import {success} from '@/message'
+import type { IUser } from '@/models/user'
 
 const props = defineProps({
 		taskId: {
@@ -54,7 +54,7 @@ const props = defineProps({
 			default: false,
 		},
 		modelValue: {
-			type: Array as PropType<UserModel[]>,
+			type: Array as PropType<IUser[]>,
 			default: () => [],
 		},
 	})
@@ -65,7 +65,7 @@ const {t} = useI18n({useScope: 'global'})
 
 const listUserService = shallowReactive(new ListUserService())
 const foundUsers = ref([])
-const assignees = ref<UserModel[]>([])
+const assignees = ref<IUser[]>([])
 
 watch(
 	() => props.modelValue,
@@ -78,13 +78,13 @@ watch(
 	},
 )
 
-async function addAssignee(user: UserModel) {
+async function addAssignee(user: IUser) {
 	await store.dispatch('tasks/addAssignee', {user: user, taskId: props.taskId})
 	emit('update:modelValue', assignees.value)
 	success({message: t('task.assignee.assignSuccess')})
 }
 
-async function removeAssignee(user: UserModel) {
+async function removeAssignee(user: IUser) {
 	await store.dispatch('tasks/removeAssignee', {user: user, taskId: props.taskId})
 
 	// Remove the assignee from the list
diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue
index 0e2858225..a15df8c42 100644
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@@ -43,7 +43,7 @@ import {type PropType, ref, computed, shallowReactive, watch} from 'vue'
 import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
 
-import LabelModel from '@/models/label'
+import LabelModel, { type ILabel } from '@/models/label'
 import LabelTaskService from '@/services/labelTask'
 import {success} from '@/message'
 
@@ -52,7 +52,7 @@ import Multiselect from '@/components/input/multiselect.vue'
 
 const props = defineProps({
 	modelValue: {
-		type: Array as PropType<LabelModel[]>,
+		type: Array as PropType<ILabel[]>,
 		default: () => [],
 	},
 	taskId: {
@@ -71,7 +71,7 @@ const store = useStore()
 const {t} = useI18n({useScope: 'global'})
 
 const labelTaskService = shallowReactive(new LabelTaskService())
-const labels = ref<LabelModel[]>([])
+const labels = ref<ILabel[]>([])
 const query = ref('')
 
 watch(
@@ -92,7 +92,7 @@ function findLabel(newQuery: string) {
 	query.value = newQuery
 }
 
-async function addLabel(label: LabelModel, showNotification = true) {
+async function addLabel(label: ILabel, showNotification = true) {
 	const bubble = () => {
 		emit('update:modelValue', labels.value)
 		emit('change', labels.value)
@@ -110,7 +110,7 @@ async function addLabel(label: LabelModel, showNotification = true) {
 	}
 }
 
-async function removeLabel(label: LabelModel) {
+async function removeLabel(label: ILabel) {
 	if (props.taskId !== 0) {
 		await store.dispatch('tasks/removeLabel', {label, taskId: props.taskId})
 	}
diff --git a/src/components/tasks/partials/heading.vue b/src/components/tasks/partials/heading.vue
index a50269626..b693b814d 100644
--- a/src/components/tasks/partials/heading.vue
+++ b/src/components/tasks/partials/heading.vue
@@ -32,18 +32,18 @@
 </template>
 
 <script setup lang="ts">
-import {ref, computed} from 'vue'
+import {ref, computed, type PropType} from 'vue'
 import {useStore} from 'vuex'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import Done from '@/components/misc/Done.vue'
-import TaskModel from '@/models/task'
+import type {ITask} from '@/models/task'
 import { useRouter } from 'vue-router'
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 
 const props = defineProps({
 	task: {
-		type: TaskModel,
+		type: Object as PropType<ITask>,
 		required: true,
 	},
 	canWrite: {
diff --git a/src/components/tasks/partials/kanban-card.vue b/src/components/tasks/partials/kanban-card.vue
index 16b1a0ff0..73abace13 100644
--- a/src/components/tasks/partials/kanban-card.vue
+++ b/src/components/tasks/partials/kanban-card.vue
@@ -74,7 +74,7 @@ import User from '../../../components/misc/user.vue'
 import Done from '@/components/misc/Done.vue'
 import Labels from '../../../components/tasks/partials/labels.vue'
 import ChecklistSummary from './checklist-summary.vue'
-import TaskModel, {TASK_DEFAULT_COLOR} from '@/models/task'
+import {TASK_DEFAULT_COLOR, type ITask} from '@/models/task'
 
 import {formatDateLong, formatISO, formatDateSince} from '@/helpers/time/formatDate'
 import {colorIsDark} from '@/helpers/color/colorIsDark'
@@ -96,7 +96,7 @@ export default defineComponent({
 	},
 	props: {
 		task: {
-			type: Object as PropType<TaskModel>,
+			type: Object as PropType<ITask>,
 			required: true,
 		},
 		loading: {
@@ -117,7 +117,7 @@ export default defineComponent({
 		formatISO,
 		formatDateSince,
 		colorIsDark,
-		async toggleTaskDone(task: TaskModel) {
+		async toggleTaskDone(task: ITask) {
 			this.loadingInternal = true
 			try {
 				const done = !task.done
diff --git a/src/components/tasks/partials/labels.vue b/src/components/tasks/partials/labels.vue
index 59fdf702f..2b640a35d 100644
--- a/src/components/tasks/partials/labels.vue
+++ b/src/components/tasks/partials/labels.vue
@@ -11,12 +11,12 @@
 </template>
 
 <script setup lang="ts">
-import type LabelModel from '@/models/label'
 import type { PropType } from 'vue'
+import type { ILabel } from '@/models/label'
 
 defineProps({
 	labels: {
-		type: Array as PropType<LabelModel[]>,
+		type: Array as PropType<ILabel[]>,
 		required: true,
 	},
 })
diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue
index df53679f3..0b0eda12f 100644
--- a/src/components/tasks/partials/listSearch.vue
+++ b/src/components/tasks/partials/listSearch.vue
@@ -21,15 +21,12 @@ import {reactive, ref, watch} from 'vue'
 import type {PropType} from 'vue'
 import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
-import ListModel from '@/models/list'
+import ListModel, { type IList } from '@/models/list'
 import Multiselect from '@/components/input/multiselect.vue'
 
 const props = defineProps({
 	modelValue: {
-		type: Object as PropType<ListModel>,
-		validator(value) {
-			return value instanceof ListModel
-		},
+		type: Object as PropType<IList>,
 		required: false,
 	},
 })
@@ -38,7 +35,7 @@ const emit = defineEmits(['update:modelValue'])
 const store = useStore()
 const {t} = useI18n({useScope: 'global'})
 
-const list: ListModel= reactive(new ListModel())
+const list: IList = reactive(new ListModel())
 
 watch(
 	() => props.modelValue,
@@ -57,7 +54,7 @@ function findLists(query: string) {
 	foundLists.value = store.getters['lists/searchList'](query)
 }
 
-function select(l: ListModel | null) {
+function select(l: IList | null) {
 	Object.assign(list, l)
 	emit('update:modelValue', list)
 }
diff --git a/src/components/tasks/partials/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
index 2d2793309..4cb246276 100644
--- a/src/components/tasks/partials/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@@ -63,14 +63,14 @@
 
 <script setup lang="ts">
 import {ref, reactive, watch, type PropType} from 'vue'
-import {error} from '@/message'
 import {useI18n} from 'vue-i18n'
-import {TASK_REPEAT_MODES, type RepeatAfter} from '@/models/task'
-import type TaskModel from '@/models/task'
+
+import {error} from '@/message'
+import {TASK_REPEAT_MODES, type ITask, type RepeatAfter} from '@/models/task'
 
 const props = defineProps({
 	modelValue: {
-		type: Object as PropType<TaskModel>,
+		type: Object as PropType<ITask>,
 		default: () => ({}),
 		required: true,
 	},
@@ -84,7 +84,7 @@ const {t} = useI18n({useScope: 'global'})
 
 const emit = defineEmits(['update:modelValue', 'change'])
 
-const task = ref<TaskModel>()
+const task = ref<ITask>()
 const repeatAfter = reactive({
 	amount: 0,
 	type: '',
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index d8de6505e..296abf645 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -98,7 +98,7 @@
 <script lang="ts">
 import {defineComponent} from 'vue'
 
-import TaskModel from '../../../models/task'
+import TaskModel, { type ITask } from '../../../models/task'
 import PriorityLabel from './priorityLabel.vue'
 import TaskService from '../../../services/task'
 import BaseButton from '@/components/base/BaseButton.vue'
@@ -129,7 +129,7 @@ export default defineComponent({
 	},
 	props: {
 		theTask: {
-			type: TaskModel,
+			type: Object as PropType<ITask>,
 			required: true,
 		},
 		isArchived: {
diff --git a/src/helpers/attachments.ts b/src/helpers/attachments.ts
index e578fc220..51556c68c 100644
--- a/src/helpers/attachments.ts
+++ b/src/helpers/attachments.ts
@@ -1,22 +1,27 @@
-import AttachmentModel from '@/models/attachment'
-import FileModel from '@/models/file'
+import AttachmentModel, { type IAttachment } from '@/models/attachment'
+import type {IFile} from '@/models/file'
 
 import AttachmentService from '@/services/attachment'
 import { store } from '@/store'
 
-export function uploadFile(taskId: number, file: FileModel, onSuccess: () => Function) {
+export function uploadFile(taskId: number, file: IFile, onSuccess: () => Function) {
 	const attachmentService = new AttachmentService()
 	const files = [file]
 
 	return uploadFiles(attachmentService, taskId, files, onSuccess)
 }
 
-export async function uploadFiles(attachmentService: AttachmentService, taskId: number, files: FileModel[], onSuccess : Function = () => {}) {
+export async function uploadFiles(
+	attachmentService: AttachmentService,
+	taskId: number,
+	files: IFile[],
+	onSuccess: Function = () => {},
+) {
 	const attachmentModel = new AttachmentModel({taskId})
 	const response = await attachmentService.create(attachmentModel, files)
 	console.debug(`Uploaded attachments for task ${taskId}, response was`, response)
 
-	response.success?.map((attachment: AttachmentModel) => {
+	response.success?.map((attachment: IAttachment) => {
 		store.dispatch('tasks/addTaskAttachment', {
 			taskId,
 			attachment,
diff --git a/src/helpers/getListTitle.ts b/src/helpers/getListTitle.ts
index 7d74507bd..3d262e9bc 100644
--- a/src/helpers/getListTitle.ts
+++ b/src/helpers/getListTitle.ts
@@ -1,8 +1,7 @@
 import {i18n} from '@/i18n'
+import type { IList } from '@/models/list'
 
-import type ListModal from '@/models/list'
-
-export function getListTitle(l: ListModal) {
+export function getListTitle(l: IList) {
 	if (l.id === -1) {
 		return i18n.global.t('list.pseudo.favorites.title')
 	}
diff --git a/src/helpers/getNamespaceTitle.ts b/src/helpers/getNamespaceTitle.ts
index de675feb5..54f5a7c06 100644
--- a/src/helpers/getNamespaceTitle.ts
+++ b/src/helpers/getNamespaceTitle.ts
@@ -1,7 +1,7 @@
 import {i18n} from '@/i18n'
-import NamespaceModel from '@/models/namespace'
+import type {INamespace} from '@/models/namespace'
 
-export const getNamespaceTitle = (n: NamespaceModel) => {
+export const getNamespaceTitle = (n: INamespace) => {
 	if (n.id === -1) {
 		return i18n.global.t('namespace.pseudo.sharedLists.title')
 	}
diff --git a/src/helpers/labels.ts b/src/helpers/labels.ts
index ca278e5b0..be2f688b0 100644
--- a/src/helpers/labels.ts
+++ b/src/helpers/labels.ts
@@ -1,18 +1,10 @@
 import {createNewIndexer} from '../indexes'
 
+import type {LabelState} from '@/store/types'
+import type {ILabel} from '@/models/label'
+
 const {search} = createNewIndexer('labels', ['title', 'description'])
 
-export interface label {
-	id: number,
-	title: string,
-}
-
-interface labelState {
-	labels: {
-		[k: number]: label,
-	},
-}
-
 /**
  * Checks if a list of labels is available in the store and filters them then query
  * @param {Object} state
@@ -20,7 +12,7 @@ interface labelState {
  * @param {String} query
  * @returns {Array}
  */
-export function filterLabelsByQuery(state: labelState, labelsToHide: label[], query: string) {
+export function filterLabelsByQuery(state: LabelState, labelsToHide: ILabel[], query: string) {
 	const labelIdsToHide: number[] = labelsToHide.map(({id}) => id)
 
 	return search(query)
@@ -36,6 +28,6 @@ export function filterLabelsByQuery(state: labelState, labelsToHide: label[], qu
  * @param {Array} ids
  * @returns {Array}
  */
-export function getLabelsByIds(state: labelState, ids: number[]) {
+export function getLabelsByIds(state: LabelState, ids: ILabel['id'][]) {
 	return Object.values(state.labels).filter(({id}) => ids.includes(id))
 }
\ No newline at end of file
diff --git a/src/helpers/saveCollapsedBucketState.ts b/src/helpers/saveCollapsedBucketState.ts
index ea4c50c04..781e94fa7 100644
--- a/src/helpers/saveCollapsedBucketState.ts
+++ b/src/helpers/saveCollapsedBucketState.ts
@@ -1,4 +1,4 @@
-import ListModel from '@/models/list'
+import type {IList} from '@/models/list'
 
 const key = 'collapsedBuckets'
 
@@ -11,7 +11,10 @@ const getAllState = () => {
 	return JSON.parse(saved)
 }
 
-export const saveCollapsedBucketState = (listId: ListModel['id'], collapsedBuckets) => {
+export const saveCollapsedBucketState = (
+	listId: IList['id'],
+	collapsedBuckets,
+) => {
 	const state = getAllState()
 	state[listId] = collapsedBuckets
 	for (const bucketId in state[listId]) {
@@ -22,7 +25,7 @@ export const saveCollapsedBucketState = (listId: ListModel['id'], collapsedBucke
 	localStorage.setItem(key, JSON.stringify(state))
 }
 
-export const getCollapsedBucketState = (listId : ListModel['id']) => {
+export const getCollapsedBucketState = (listId : IList['id']) => {
 	const state = getAllState()
 	if (typeof state[listId] !== 'undefined') {
 		return state[listId]
diff --git a/src/helpers/savedFilter.ts b/src/helpers/savedFilter.ts
index 0cb3cd9de..d059a07c6 100644
--- a/src/helpers/savedFilter.ts
+++ b/src/helpers/savedFilter.ts
@@ -1,6 +1,6 @@
-import ListModel from '@/models/list'
+import type {IList} from '@/models/list'
 
-export function getSavedFilterIdFromListId(listId: ListModel['id']) {
+export function getSavedFilterIdFromListId(listId: IList['id']) {
 	let filterId = listId * -1 - 1
 	// FilterIds from listIds are always positive
 	if (filterId < 0) {
diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts
index c65f0ddb4..e03c7f94c 100644
--- a/src/helpers/utils.ts
+++ b/src/helpers/utils.ts
@@ -1,8 +1,8 @@
-export function findIndexById(array : [], id : string | number) {
+export function findIndexById<T extends {id: string | number}>(array : T[], id : string | number) {
 	return array.findIndex(({id: currentId}) => currentId === id)
 }
 
-export function findById(array : [], id : string | number) {
+export function findById<T extends {id: string | number}>(array : T[], id : string | number) {
 	return array.find(({id: currentId}) => currentId === id)
 }
 
diff --git a/src/models/abstractModel.ts b/src/models/abstractModel.ts
index 7507265b6..02b89b744 100644
--- a/src/models/abstractModel.ts
+++ b/src/models/abstractModel.ts
@@ -2,7 +2,11 @@ import {objectToCamelCase} from '@/helpers/case'
 import {omitBy, isNil} from '@/helpers/utils'
 import type {Right} from '@/models/constants/rights'
 
-export default class AbstractModel {
+export interface IAbstract {
+	maxRight: Right | null
+}
+
+export default class AbstractModel implements IAbstract {
 
 	/**
 	 * The max right the user has on this object, as returned by the x-max-right header from the api.
diff --git a/src/models/attachment.ts b/src/models/attachment.ts
index 87d90d5d7..d2765c4a6 100644
--- a/src/models/attachment.ts
+++ b/src/models/attachment.ts
@@ -1,12 +1,21 @@
 import AbstractModel from './abstractModel'
-import UserModel from './user'
-import FileModel from './file'
+import UserModel, {type IUser} from './user'
+import FileModel, {type IFile} from './file'
+import type {IAbstract} from './abstractModel'
 
-export default class AttachmentModel extends AbstractModel {
+export interface IAttachment extends IAbstract {
 	id: number
 	taskId: number
-	createdBy: UserModel
-	file: FileModel
+	createdBy: IUser
+	file: IFile
+	created: Date
+}
+
+export default class AttachmentModel extends AbstractModel implements IAttachment {
+	declare id: number
+	declare taskId: number
+	createdBy: IUser
+	file: IFile
 	created: Date
 
 	constructor(data) {
diff --git a/src/models/avatar.ts b/src/models/avatar.ts
index 2ac7a5605..e6a670912 100644
--- a/src/models/avatar.ts
+++ b/src/models/avatar.ts
@@ -1,9 +1,13 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-export type AVATAR_PROVIDERS = 'default' | 'initials' | 'gravatar' | 'marble' | 'upload'
+export type AvatarProvider = 'default' | 'initials' | 'gravatar' | 'marble' | 'upload'
 
-export default class AvatarModel extends AbstractModel {
-	avatarProvider: AVATAR_PROVIDERS
+export interface IAvatar extends IAbstract {
+	avatarProvider: AvatarProvider
+}
+
+export default class AvatarModel extends AbstractModel implements IAvatar {
+	declare avatarProvider: AvatarProvider
 
 	defaults() {
 		return {
diff --git a/src/models/backgroundImage.ts b/src/models/backgroundImage.ts
index 07c9ee319..a5dbf8d76 100644
--- a/src/models/backgroundImage.ts
+++ b/src/models/backgroundImage.ts
@@ -1,6 +1,6 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-export default class BackgroundImageModel extends AbstractModel {
+export interface IBackgroundImage extends IAbstract {
 	id: number
 	url: string
 	thumb: string
@@ -9,6 +9,17 @@ export default class BackgroundImageModel extends AbstractModel {
 		authorName: string
 	}
 	blurHash: string  
+}
+
+export default class BackgroundImageModel extends AbstractModel implements IBackgroundImage {
+	declare id: number
+	declare url: string
+	declare thumb: string
+	declare info: {
+		author: string
+		authorName: string
+	}
+	declare blurHash: string  
 
 	defaults() {
 		return {
diff --git a/src/models/bucket.ts b/src/models/bucket.ts
index 269b54302..89bca3e91 100644
--- a/src/models/bucket.ts
+++ b/src/models/bucket.ts
@@ -1,17 +1,31 @@
-import AbstractModel from './abstractModel'
-import UserModel from './user'
-import TaskModel from './task'
+import AbstractModel, { type IAbstract } from './abstractModel'
+import UserModel, { type IUser } from './user'
+import TaskModel, { type ITask } from './task'
 
-export default class BucketModel extends AbstractModel {
+export interface IBucket extends IAbstract {
 	id: number
 	title: string
 	listId: number
 	limit: number
-	tasks: TaskModel[]
+	tasks: ITask[]
 	isDoneBucket: boolean
 	position: number
 	
-	createdBy: UserModel
+	createdBy: IUser
+	created: Date
+	updated: Date
+}
+
+export default class BucketModel extends AbstractModel implements IBucket {
+	declare id: number
+	declare title: string
+	declare listId: number
+	declare limit: number
+	declare tasks: ITask[]
+	declare isDoneBucket: boolean
+	declare position: number
+	
+	createdBy: IUser
 	created: Date
 	updated: Date
 
diff --git a/src/models/caldavToken.ts b/src/models/caldavToken.ts
index 708ed2293..5604eb42e 100644
--- a/src/models/caldavToken.ts
+++ b/src/models/caldavToken.ts
@@ -1,8 +1,13 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-export default class CaldavTokenModel extends AbstractModel {
-	id: number
-	created: Date
+export interface ICaldavToken extends IAbstract {
+	id: number;
+	created: Date;
+}
+
+export default class CaldavTokenModel extends AbstractModel implements ICaldavToken {
+	declare id: number
+	declare created: Date
 
 	constructor(data? : Object) {
 		super(data)
diff --git a/src/models/emailUpdate.ts b/src/models/emailUpdate.ts
index 229be90ee..2258176ef 100644
--- a/src/models/emailUpdate.ts
+++ b/src/models/emailUpdate.ts
@@ -1,8 +1,13 @@
 import AbstractModel from './abstractModel'
 
-export default class EmailUpdateModel extends AbstractModel {
+interface IEmailUpdate {
 	newEmail: string
 	password: string
+}
+
+export default class EmailUpdateModel extends AbstractModel implements IEmailUpdate {
+	declare newEmail: string
+	declare password: string
 
 	defaults() {
 		return {
diff --git a/src/models/file.ts b/src/models/file.ts
index 4b65ae33d..c6248bafd 100644
--- a/src/models/file.ts
+++ b/src/models/file.ts
@@ -1,11 +1,19 @@
 import AbstractModel from './abstractModel'
 
-export default class FileModel extends AbstractModel {
+export interface IFile {
 	id: number
 	mime: string
 	name: string
 	size: number
 	created: Date
+} 
+
+export default class FileModel extends AbstractModel implements IFile {
+	declare id: number
+	declare mime: string
+	declare name: string
+	declare size: number
+	created: Date
 
 	constructor(data) {
 		super(data)
diff --git a/src/models/label.ts b/src/models/label.ts
index 4f7fa0afa..a4dd72701 100644
--- a/src/models/label.ts
+++ b/src/models/label.ts
@@ -1,19 +1,33 @@
 import AbstractModel from './abstractModel'
-import UserModel from './user'
+import UserModel, { type IUser } from './user'
 import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 const DEFAULT_LABEL_BACKGROUND_COLOR = 'e8e8e8'
-export default class LabelModel extends AbstractModel {
+
+export interface ILabel {
 	id: number
 	title: string
 	hexColor: string
 	description: string
-	createdBy: UserModel
+	createdBy: IUser
 	listId: number
 	textColor: string
 
 	created: Date
 	updated: Date
+}
+
+export default class LabelModel extends AbstractModel implements ILabel {
+	declare id: number
+	declare title: string
+	declare hexColor: string
+	declare description: string
+	declare createdBy: IUser
+	declare listId: number
+	declare textColor: string
+
+	created: Date
+	updated: Date
 
 	constructor(data) {
 		super(data)
diff --git a/src/models/labelTask.ts b/src/models/labelTask.ts
index 6a4c68093..80dee9ded 100644
--- a/src/models/labelTask.ts
+++ b/src/models/labelTask.ts
@@ -1,9 +1,15 @@
 import AbstractModel from './abstractModel'
 
-export default class LabelTask extends AbstractModel {
+interface ILabel {
 	id: number
 	taskId: number
 	labelId: number
+}
+
+export default class LabelTask extends AbstractModel implements ILabel {
+	declare id: number
+	declare taskId: number
+	declare labelId: number
 
 	defaults() {
 		return {
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index a0c475779..1b1ae8804 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -1,18 +1,31 @@
-import AbstractModel from './abstractModel'
-import UserModel from './user'
+import AbstractModel, { type IAbstract } from './abstractModel'
+import UserModel, { type IUser } from './user'
 import {RIGHTS, type Right} from '@/models/constants/rights'
 
-export default class LinkShareModel extends AbstractModel {
+export interface ILinkShare extends IAbstract {
 	id: number
 	hash: string
 	right: Right
-	sharedBy: UserModel
+	sharedBy: IUser
 	sharingType: number // FIXME: use correct numbers
 	listId: number
 	name: string
 	password: string
 	created: Date
 	updated: Date
+}
+
+export default class LinkShareModel extends AbstractModel implements ILinkShare {
+	declare id: number
+	declare hash: string
+	declare right: Right
+	sharedBy: IUser
+	declare sharingType: number // FIXME: use correct numbers
+	declare listId: number
+	declare name: string
+	declare password: string
+	created: Date
+	updated: Date
 
 	constructor(data) {
 		// The constructor of AbstractModel handles all the default parsing.
diff --git a/src/models/list.ts b/src/models/list.ts
index 8ee6a0f19..a3426f840 100644
--- a/src/models/list.ts
+++ b/src/models/list.ts
@@ -1,28 +1,49 @@
-import AbstractModel from './abstractModel'
-import TaskModel from './task'
-import UserModel from './user'
-import type NamespaceModel from './namespace'
-import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
-import SubscriptionModel from '@/models/subscription'
+import AbstractModel, { type IAbstract } from '@/models/abstractModel'
+import TaskModel, { type ITask } from '@/models/task'
+import UserModel, { type IUser } from '@/models/user'
+import SubscriptionModel, { type ISubscription } from '@/models/subscription'
+import type { INamespace } from '@/models/namespace'
 
-export default class ListModel extends AbstractModel {
+import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
+
+export interface IList extends IAbstract {
 	id: number
 	title: string
 	description: string
-	owner: UserModel
-	tasks: TaskModel[]
-	namespaceId: NamespaceModel['id']
+	owner: IUser
+	tasks: ITask[]
+	namespaceId: INamespace['id']
 	isArchived: boolean
 	hexColor: string
 	identifier: string
 	backgroundInformation: any
 	isFavorite: boolean
-	subscription: SubscriptionModel
+	subscription: ISubscription
 	position: number
 	backgroundBlurHash: string
 	
 	created: Date
 	updated: Date
+}
+
+export default class ListModel extends AbstractModel implements IList {
+	declare id: number
+	declare title: string
+	declare description: string
+	owner: IUser
+	tasks: ITask[]
+	declare namespaceId: INamespace['id']
+	declare isArchived: boolean
+	declare hexColor: string
+	declare identifier: string
+	declare backgroundInformation: any
+	declare isFavorite: boolean
+	declare subscription: ISubscription
+	declare position: number
+	declare backgroundBlurHash: string
+	
+	created: Date
+	updated: Date
 
 	constructor(data) {
 		super(data)
diff --git a/src/models/listDuplicateModel.ts b/src/models/listDuplicateModel.ts
index 15a9735c8..bc3272ce2 100644
--- a/src/models/listDuplicateModel.ts
+++ b/src/models/listDuplicateModel.ts
@@ -1,11 +1,17 @@
 import AbstractModel from './abstractModel'
-import ListModel from './list'
-import NamespaceModel from './namespace'
+import ListModel, { type IList } from './list'
+import type { INamespace } from './namespace'
 
-export default class ListDuplicateModel extends AbstractModel {
+export interface ListDuplicate {
 	listId: number
-	namespaceId: NamespaceModel['id']
-	list: ListModel
+	namespaceId: INamespace['id']
+	list: IList
+}
+
+export default class ListDuplicateModel extends AbstractModel implements ListDuplicate {
+	declare listId: number
+	declare namespaceId: INamespace['id']
+	list: IList
 
 	constructor(data) {
 		super(data)
diff --git a/src/models/namespace.ts b/src/models/namespace.ts
index cae061287..ee120a962 100644
--- a/src/models/namespace.ts
+++ b/src/models/namespace.ts
@@ -1,17 +1,31 @@
-import AbstractModel from './abstractModel'
-import ListModel from './list'
-import UserModel from './user'
-import SubscriptionModel from '@/models/subscription'
+import AbstractModel, { type IAbstract } from './abstractModel'
+import ListModel, { type IList } from './list'
+import UserModel, { type IUser } from './user'
+import SubscriptionModel, { type ISubscription } from '@/models/subscription'
 
-export default class NamespaceModel extends AbstractModel {
+export interface INamespace extends IAbstract {
 	id: number
 	title: string
 	description: string
-	owner: UserModel
-	lists: ListModel[]
+	owner: IUser
+	lists: IList[]
 	isArchived: boolean
 	hexColor: string
-	subscription: SubscriptionModel
+	subscription: ISubscription
+
+	created: Date
+	updated: Date
+}
+
+export default class NamespaceModel extends AbstractModel implements INamespace {
+	declare id: number
+	declare title: string
+	declare description: string
+	owner: IUser
+	lists: IList[]
+	declare isArchived: boolean
+	declare hexColor: string
+	declare subscription: ISubscription
 
 	created: Date
 	updated: Date
diff --git a/src/models/notification.ts b/src/models/notification.ts
index b130ce72e..a21563205 100644
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@@ -1,10 +1,10 @@
 import AbstractModel from '@/models/abstractModel'
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
-import UserModel from '@/models/user'
-import TaskModel from '@/models/task'
-import TaskCommentModel from '@/models/taskComment'
+import UserModel, { type IUser } from '@/models/user'
+import TaskModel, { type ITask } from '@/models/task'
+import TaskCommentModel, { type ITaskComment } from '@/models/taskComment'
 import ListModel from '@/models/list'
-import TeamModel from '@/models/team'
+import TeamModel, { type ITeam } from '@/models/team'
 
 export const NOTIFICATION_NAMES = {
 	'TASK_COMMENT': 'task.comment',
@@ -15,32 +15,32 @@ export const NOTIFICATION_NAMES = {
 } as const
 
 interface Notification {
-	doer: UserModel
+	doer: IUser
 }
 interface NotificationTask extends Notification {
-	task: TaskModel
-	comment: TaskCommentModel
+	task: ITask
+	comment: ITaskComment
 }
 
 interface NotificationAssigned extends Notification {
-	task: TaskModel
-	assignee: UserModel
+	task: ITask
+	assignee: IUser
 }
 
 interface NotificationDeleted extends Notification {
-	task: TaskModel
+	task: ITask
 }
 
 interface NotificationCreated extends Notification {
-	task: TaskModel
+	task: ITask
 }
 
 interface NotificationMemberAdded extends Notification {
-	member: UserModel
-	team: TeamModel
+	member: IUser
+	team: ITeam
 }
 
-export default class NotificationModel extends AbstractModel {
+export interface INotification {
 	id: number
 	name: string
 	notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
@@ -48,6 +48,16 @@ export default class NotificationModel extends AbstractModel {
 	readAt: Date | null
 
 	created: Date
+}
+
+export default class NotificationModel extends AbstractModel implements INotification {
+	declare id: number
+	declare name: string
+	declare notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
+	declare read: boolean
+	readAt: Date | null
+
+	created: Date
 
 	constructor(data) {
 		super(data)
diff --git a/src/models/passwordReset.ts b/src/models/passwordReset.ts
index b269e54b3..0dc8ebed0 100644
--- a/src/models/passwordReset.ts
+++ b/src/models/passwordReset.ts
@@ -1,9 +1,15 @@
 import AbstractModel from './abstractModel'
 
-export default class PasswordResetModel extends AbstractModel {
+export interface IPasswordReset {
 	token: string
 	newPassword: string
 	email: string
+}
+
+export default class PasswordResetModel extends AbstractModel implements IPasswordReset {
+	token: string
+	declare newPassword: string
+	declare email: string
 
 	constructor(data) {
 		super(data)
diff --git a/src/models/passwordUpdate.ts b/src/models/passwordUpdate.ts
index b59a649be..a91a59c13 100644
--- a/src/models/passwordUpdate.ts
+++ b/src/models/passwordUpdate.ts
@@ -1,8 +1,13 @@
-import AbstractModel from './abstractModel'
+import AbstractModel from '@/models/abstractModel'
 
-export default class PasswordUpdateModel extends AbstractModel {
+export interface IPasswordUpdate {
 	newPassword: string
 	oldPassword: string
+}
+
+export default class PasswordUpdateModel extends AbstractModel implements IPasswordUpdate {
+	declare newPassword: string
+	declare oldPassword: string
 
 	defaults() {
 		return {
diff --git a/src/models/savedFilter.ts b/src/models/savedFilter.ts
index 06334e22c..60c0521cf 100644
--- a/src/models/savedFilter.ts
+++ b/src/models/savedFilter.ts
@@ -1,7 +1,7 @@
 import AbstractModel from '@/models/abstractModel'
-import UserModel from '@/models/user'
+import UserModel, { type IUser } from '@/models/user'
 
-export default class SavedFilterModel extends AbstractModel {
+export interface ISavedFilter {
 	id: 0
 	title: string
 	description: string
@@ -15,7 +15,26 @@ export default class SavedFilterModel extends AbstractModel {
 		filterIncludeNulls: boolean
 	}
 
-	owner: any
+	owner: IUser
+	created: Date
+	updated: Date
+}
+
+export default class SavedFilterModel extends AbstractModel implements ISavedFilter {
+	declare id: 0
+	declare title: string
+	declare description: string
+	declare filters: {
+		sortBy: ('done' | 'id')[]
+		orderBy: ('asc' | 'desc')[]
+		filterBy: 'done'[]
+		filterValue: 'false'[]
+		filterComparator: 'equals'[]
+		filterConcat: 'and'
+		filterIncludeNulls: boolean
+	}
+
+	owner: IUser
 	created: Date
 	updated: Date
 
diff --git a/src/models/subscription.ts b/src/models/subscription.ts
index a8bd7bdad..013aef7d8 100644
--- a/src/models/subscription.ts
+++ b/src/models/subscription.ts
@@ -1,11 +1,20 @@
 import AbstractModel from '@/models/abstractModel'
-import UserModel from '@/models/user'
+import UserModel, { type IUser } from '@/models/user'
 
-export default class SubscriptionModel extends AbstractModel {
+export interface ISubscription {
 	id: number
 	entity: string // FIXME: correct type?
 	entityId: number // FIXME: correct type?
-	user: UserModel
+	user: IUser
+
+	created: Date
+}
+
+export default class SubscriptionModel extends AbstractModel implements ISubscription {
+	declare id: number
+	declare entity: string // FIXME: correct type?
+	declare entityId: number // FIXME: correct type?
+	user: IUser
 
 	created: Date
 
diff --git a/src/models/task.ts b/src/models/task.ts
index 4ede946b1..518c53a2f 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -1,12 +1,14 @@
-import AbstractModel from './abstractModel'
-import UserModel from './user'
-import LabelModel from './label'
-import AttachmentModel from './attachment'
+import type { Priority } from '@/models/constants/priorities'
+
+import AbstractModel from '@/models/abstractModel'
+import UserModel, { type IUser } from '@/models/user'
+import LabelModel, { type ILabel } from '@/models/label'
+import AttachmentModel, {type IAttachment} from '@/models/attachment'
+import SubscriptionModel, { type ISubscription } from '@/models/subscription'
+import type { IList } from '@/models/list'
 
-import SubscriptionModel from '@/models/subscription'
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
-import type ListModel from './list'
-import type { Priority } from './constants/priorities'
+import type { IBucket } from './bucket'
 
 const SUPPORTS_TRIGGERED_NOTIFICATION = 'Notification' in window && 'showTrigger' in Notification.prototype
 export const TASK_DEFAULT_COLOR = '#1973ff'
@@ -24,15 +26,15 @@ export interface RepeatAfter {
 	amount: number
 }
 
-export default class TaskModel extends AbstractModel {
+export interface ITask {
 	id: number
 	title: string
 	description: string
 	done: boolean
 	doneAt: Date | null
 	priority: Priority
-	labels: LabelModel[]
-	assignees: UserModel[]
+	labels: ILabel[]
+	assignees: IUser[]
 
 	dueDate: Date | null
 	startDate: Date | null
@@ -41,26 +43,64 @@ export default class TaskModel extends AbstractModel {
 	repeatFromCurrentDate: boolean
 	repeatMode: TaskRepeatMode
 	reminderDates: Date[]
-	parentTaskId: TaskModel['id']
+	parentTaskId: ITask['id']
 	hexColor: string
 	percentDone: number
-	relatedTasks: { [relationKind: string]: TaskModel } // FIXME: use relationKinds
-	attachments: AttachmentModel[]
+	relatedTasks: { [relationKind: string]: ITask } // FIXME: use relationKinds
+	attachments: IAttachment[]
 	identifier: string
 	index: number
 	isFavorite: boolean
-	subscription: SubscriptionModel
+	subscription: ISubscription
 
 	position: number
 	kanbanPosition: number
 
-	createdBy: UserModel
+	createdBy: IUser
 	created: Date
 	updated: Date
 
-	listId: ListModel['id'] // Meta, only used when creating a new task
+	listId: IList['id'] // Meta, only used when creating a new task
+	bucketId: IBucket['id']
+}
 
-	constructor(data: Partial<TaskModel>) {
+export default class TaskModel extends AbstractModel implements ITask {
+	id: number
+	title: string
+	declare description: string
+	declare done: boolean
+	doneAt: Date | null
+	declare priority: Priority
+	labels: ILabel[]
+	assignees: IUser[]
+
+	dueDate: Date | null
+	startDate: Date | null
+	endDate: Date | null
+	declare repeatAfter: number | RepeatAfter
+	declare repeatFromCurrentDate: boolean
+	declare repeatMode: TaskRepeatMode
+	reminderDates: Date[]
+	declare parentTaskId: ITask['id']
+	declare hexColor: string
+	declare percentDone: number
+	declare relatedTasks: { [relationKind: string]: ITask } // FIXME: use relationKinds
+	attachments: IAttachment[]
+	declare identifier: string
+	declare index: number
+	declare isFavorite: boolean
+	declare subscription: ISubscription
+
+	declare position: number
+	declare kanbanPosition: number
+
+	createdBy: IUser
+	created: Date
+	updated: Date
+
+	listId: IList['id'] // Meta, only used when creating a new task
+
+	constructor(data: Partial<ITask>) {
 		super(data)
 
 		this.id = Number(this.id)
@@ -120,6 +160,7 @@ export default class TaskModel extends AbstractModel {
 
 		this.listId = Number(this.listId)
 	}
+bucketId: number
 
 	defaults() {
 		return {
diff --git a/src/models/taskAssignee.ts b/src/models/taskAssignee.ts
index 966ab6407..800e50afb 100644
--- a/src/models/taskAssignee.ts
+++ b/src/models/taskAssignee.ts
@@ -1,11 +1,17 @@
 import AbstractModel from './abstractModel'
-import type UserModel from './user'
-import type TaskModel from './task'
+import type { ITask } from './task'
+import type { IUser } from './user'
 
-export default class TaskAssigneeModel extends AbstractModel {
+export interface ITaskAssignee {
 	created: Date
-	userId: UserModel['id']
-	taskId: TaskModel['id']
+	userId: IUser['id']
+	taskId: ITask['id']
+}
+
+export default class TaskAssigneeModel extends AbstractModel implements ITaskAssignee {
+	created: Date
+	declare userId: IUser['id']
+	declare taskId: ITask['id']
 
 	constructor(data) {
 		super(data)
diff --git a/src/models/taskComment.ts b/src/models/taskComment.ts
index d2cb6db3d..93d58958a 100644
--- a/src/models/taskComment.ts
+++ b/src/models/taskComment.ts
@@ -1,12 +1,22 @@
 import AbstractModel from './abstractModel'
-import UserModel from './user'
-import type TaskModel from './task'
+import UserModel, { type IUser } from './user'
+import type { ITask } from './task'
 
-export default class TaskCommentModel extends AbstractModel {
+export interface ITaskComment {
 	id: number
-	taskId: TaskModel['id']
+	taskId: ITask['id']
 	comment: string
-	author: UserModel
+	author: IUser
+
+	created: Date
+	updated: Date
+}
+
+export default class TaskCommentModel extends AbstractModel implements ITaskComment {
+	declare id: number
+	declare taskId: ITask['id']
+	declare comment: string
+	author: IUser
 
 	created: Date
 	updated: Date
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index 66ffe485f..2f3b54cbc 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -1,6 +1,6 @@
 import AbstractModel from './abstractModel'
-import UserModel from './user'
-import type TaskModel from './task'
+import UserModel, { type IUser } from './user'
+import type { ITask } from './task'
 
 export const RELATION_KIND = {
 	'SUBTASK': 'subtask',
@@ -19,13 +19,23 @@ export const RELATION_KINDS = [...Object.values(RELATION_KIND)] as const
 
 export type RelationKind = typeof RELATION_KINDS[number]
 
-export default class TaskRelationModel extends AbstractModel {
+export interface ITaskRelationModel {
 	id: number
-	otherTaskId: TaskModel['id']
-	taskId: TaskModel['id']
+	otherTaskId: ITask['id']
+	taskId: ITask['id']
 	relationKind: RelationKind
 
-	createdBy: UserModel
+	createdBy: IUser
+	created: Date
+}
+
+export default class TaskRelationModel extends AbstractModel implements ITaskRelationModel {
+	declare id: number
+	declare otherTaskId: ITask['id']
+	declare taskId: ITask['id']
+	declare relationKind: RelationKind
+
+	createdBy: IUser
 	created: Date
 
 	constructor(data) {
diff --git a/src/models/team.ts b/src/models/team.ts
index c4e894f69..e76fa216f 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -1,16 +1,28 @@
 import AbstractModel from './abstractModel'
-import UserModel from './user'
-import TeamMemberModel from './teamMember'
+import UserModel, { type IUser } from './user'
+import TeamMemberModel, { type ITeamMember } from './teamMember'
 import {RIGHTS, type Right} from '@/models/constants/rights'
 
-export default class TeamModel extends AbstractModel {
-	id: 0
+export interface ITeam {
+	id: number
 	name: string
 	description: string
-	members: TeamMemberModel[]
+	members: ITeamMember[]
 	right: Right
 
-	createdBy: UserModel
+	createdBy: IUser
+	created: Date
+	updated: Date
+}
+
+export default class TeamModel extends AbstractModel implements ITeam {
+	declare id: number
+	declare name: string
+	declare description: string
+	members: ITeamMember[]
+	declare right: Right
+
+	createdBy: IUser
 	created: Date
 	updated: Date
 
diff --git a/src/models/teamList.ts b/src/models/teamList.ts
index 82f2d76c6..0dce79b60 100644
--- a/src/models/teamList.ts
+++ b/src/models/teamList.ts
@@ -1,8 +1,12 @@
 import TeamShareBaseModel from './teamShareBase'
-import type ListModel from './list'
+import type { IList } from './list'
 
-export default class TeamListModel extends TeamShareBaseModel {
-	listId: ListModel['id']
+export interface ITeamList {
+	listId: IList['id']
+}
+
+export default class TeamListModel extends TeamShareBaseModel implements ITeamList {
+	declare listId: IList['id']
 
 	defaults() {
 		return {
diff --git a/src/models/teamMember.ts b/src/models/teamMember.ts
index f0c13a775..ee6eb1619 100644
--- a/src/models/teamMember.ts
+++ b/src/models/teamMember.ts
@@ -1,9 +1,14 @@
 import UserModel from './user'
-import type ListModel from './list'
+import type { IList } from './list'
 
-export default class TeamMemberModel extends UserModel {
+export interface ITeamMember {
 	admin: boolean
-	teamId: ListModel['id']
+	teamId: IList['id']
+}
+
+export default class TeamMemberModel extends UserModel implements ITeamMember {
+	declare admin: boolean
+	declare teamId: IList['id']
 
 	defaults() {
 		return {
diff --git a/src/models/teamNamespace.ts b/src/models/teamNamespace.ts
index edeb7fca8..a550bbeea 100644
--- a/src/models/teamNamespace.ts
+++ b/src/models/teamNamespace.ts
@@ -1,8 +1,12 @@
 import TeamShareBaseModel from './teamShareBase'
-import type NamespaceModel from './namespace'
+import type { INamespace } from './namespace'
 
-export default class TeamNamespaceModel extends TeamShareBaseModel {
-	namespaceId: NamespaceModel['id']
+export interface ITeamNamespace {
+	namespaceId: INamespace['id']
+}
+
+export default class TeamNamespaceModel extends TeamShareBaseModel implements ITeamNamespace {
+	declare namespaceId: INamespace['id']
 
 	defaults() {
 		return {
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index 88060c919..3983905c7 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -1,14 +1,22 @@
 import AbstractModel from './abstractModel'
-import type TeamModel from './team'
 import {RIGHTS, type Right} from '@/models/constants/rights'
+import type { ITeam } from './team'
+
+export interface ITeamShareBase {
+	teamId: ITeam['id']
+	right: Right
+
+	created: Date
+	updated: Date
+}
 
 /**
  * This class is a base class for common team sharing model.
  * It is extended in a way so it can be used for namespaces as well for lists.
  */
-export default class TeamShareBaseModel extends AbstractModel {
-	teamId: TeamModel['id']
-	right: Right
+export default class TeamShareBaseModel extends AbstractModel implements ITeamShareBase {
+	declare teamId: ITeam['id']
+	declare right: Right
 
 	created: Date
 	updated: Date
diff --git a/src/models/totp.ts b/src/models/totp.ts
index e631af7ce..ab6415987 100644
--- a/src/models/totp.ts
+++ b/src/models/totp.ts
@@ -1,9 +1,15 @@
 import AbstractModel from './abstractModel'
 
-export default class TotpModel extends AbstractModel {
+export interface ITotp {
 	secret: string
 	enabled: boolean
 	url: string
+}
+
+export default class TotpModel extends AbstractModel implements ITotp{
+	declare secret: string
+	declare enabled: boolean
+	declare url: string
 
 	defaults() {
 		return {
diff --git a/src/models/user.ts b/src/models/user.ts
index 5c212c913..f3908149e 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -1,7 +1,7 @@
 import AbstractModel from './abstractModel'
-import UserSettingsModel from '@/models/userSettings'
+import UserSettingsModel, { type IUserSettings } from '@/models/userSettings'
 
-export default class UserModel extends AbstractModel {
+export interface IUser {
 	id: number
 	email: string
 	username: string
@@ -9,7 +9,18 @@ export default class UserModel extends AbstractModel {
 
 	created: Date
 	updated: Date
-	settings: UserSettingsModel
+	settings: IUserSettings
+}
+
+export default class UserModel extends AbstractModel implements IUser {
+	declare id: number
+	declare email: string
+	declare username: string
+	declare name: string
+
+	created: Date
+	updated: Date
+	settings: IUserSettings
 
 	constructor(data) {
 		super(data)
@@ -28,6 +39,7 @@ export default class UserModel extends AbstractModel {
 			email: '',
 			username: '',
 			name: '',
+
 			created: null,
 			updated: null,
 			settings: null,
diff --git a/src/models/userList.ts b/src/models/userList.ts
index f48989a24..1bc597adf 100644
--- a/src/models/userList.ts
+++ b/src/models/userList.ts
@@ -1,8 +1,13 @@
 import UserShareBaseModel from './userShareBase'
-import type ListModel from './list'
+import type { IList } from './list'
+
+export interface IUserList {
+	listId: IList['id']
+}
+
 // This class extends the user share model with a 'rights' parameter which is used in sharing
-export default class UserListModel extends UserShareBaseModel {
-	listId: ListModel['id']
+export default class UserListModel extends UserShareBaseModel implements IUserList {
+	declare listId: IList['id']
 
 	defaults() {
 		return {
diff --git a/src/models/userNamespace.ts b/src/models/userNamespace.ts
index 4a4703da8..a21995d1a 100644
--- a/src/models/userNamespace.ts
+++ b/src/models/userNamespace.ts
@@ -1,9 +1,13 @@
 import UserShareBaseModel from './userShareBase'
-import type NamespaceModel from './namespace'
+import type { INamespace } from './namespace'
+
+export interface IUserNamespace {
+	namespaceId: INamespace['id']
+}
 
 // This class extends the user share model with a 'rights' parameter which is used in sharing
-export default class UserNamespaceModel extends UserShareBaseModel {
-	namespaceId: NamespaceModel['id']
+export default class UserNamespaceModel extends UserShareBaseModel implements IUserNamespace {
+	declare namespaceId: INamespace['id']
 
 	defaults() {
 		return {
diff --git a/src/models/userSettings.ts b/src/models/userSettings.ts
index 3c033031f..4e7fcedec 100644
--- a/src/models/userSettings.ts
+++ b/src/models/userSettings.ts
@@ -1,16 +1,27 @@
 
 import AbstractModel from './abstractModel'
-import type ListModel from './list'
+import type { IList } from './list'
 
-export default class UserSettingsModel extends AbstractModel {
+export interface IUserSettings {
 	name: string
 	emailRemindersEnabled: boolean
 	discoverableByName: boolean
 	discoverableByEmail: boolean
 	overdueTasksRemindersEnabled: boolean
-	defaultListId: undefined | ListModel['id']
+	defaultListId: undefined | IList['id']
 	weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6
 	timezone: string
+}
+
+export default class UserSettingsModel extends AbstractModel implements IUserSettings {
+	declare name: string
+	declare emailRemindersEnabled: boolean
+	declare discoverableByName: boolean
+	declare discoverableByEmail: boolean
+	declare overdueTasksRemindersEnabled: boolean
+	declare defaultListId: undefined | IList['id']
+	declare weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6
+	declare timezone: string
 
 	defaults() {
 		return {
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index 9ae20de1d..fadeb894f 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -1,13 +1,21 @@
 import AbstractModel from './abstractModel'
-import type UserModel from './user'
 import {RIGHTS, type Right} from '@/models/constants/rights'
+import type { IUser } from './user'
 
-export default class UserShareBaseModel extends AbstractModel {
-	userId: UserModel['id']
+export interface IUserShareBase {
+	userId: IUser['id']
 	right: Right
 
 	created: Date
 	updated: Date
+}
+
+export default class UserShareBaseModel extends AbstractModel implements IUserShareBase {
+	declare userId: IUser['id']
+	declare right: Right
+
+	created: Date
+	updated: Date
 
 	constructor(data) {
 		super(data)
diff --git a/src/modules/parseTaskText.test.ts b/src/modules/parseTaskText.test.ts
index dadb9ed03..938cb91fe 100644
--- a/src/modules/parseTaskText.test.ts
+++ b/src/modules/parseTaskText.test.ts
@@ -3,7 +3,7 @@ import {beforeEach, afterEach, describe, it, expect, vi} from 'vitest'
 import {parseTaskText} from './parseTaskText'
 import {getDateFromText, getDateFromTextIn} from '../helpers/time/parseDate'
 import {calculateDayInterval} from '../helpers/time/calculateDayInterval'
-import {PRIORITIES} from '@/models/constants/priorities.ts'
+import {PRIORITIES} from '@/models/constants/priorities'
 
 describe('Parse Task Text', () => {
 	beforeEach(() => {
diff --git a/src/services/abstractService.ts b/src/services/abstractService.ts
index 62094368c..dc086d671 100644
--- a/src/services/abstractService.ts
+++ b/src/services/abstractService.ts
@@ -2,9 +2,9 @@ import {AuthenticatedHTTPFactory} from '@/http-common'
 import type {Method} from 'axios'
 
 import {objectToSnakeCase} from '@/helpers/case'
-import AbstractModel from '@/models/abstractModel'
+import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import type { Right } from '@/models/constants/rights'
-import type FileModel from '@/models/file'
+import type { IFile } from '@/models/file'
 
 interface Paths {
 	create : string
@@ -12,6 +12,7 @@ interface Paths {
 	getAll : string
 	update : string
 	delete : string
+	reset?: string
 }
 
 function convertObject(o: Record<string, unknown>) {
@@ -39,7 +40,7 @@ function prepareParams(params: Record<string, unknown | unknown[]>) {
 	return objectToSnakeCase(params)
 }
 
-export default class AbstractService<Model extends AbstractModel = AbstractModel> {
+export default class AbstractService<Model extends IAbstract = IAbstract> {
 
 	/////////////////////////////
 	// Initial variable definitions
@@ -269,7 +270,7 @@ export default class AbstractService<Model extends AbstractModel = AbstractModel
 	 * This is a more abstract implementation which only does a get request.
 	 * Services which need more flexibility can use this.
 	 */
-	async getM(url : string, model = new AbstractModel({}) as Model, params: Record<string, unknown> = {}) {
+	async getM(url : string, model : Model = new AbstractModel({}), params: Record<string, unknown> = {}) {
 		const cancel = this.setLoading()
 
 		model = this.beforeGet(model)
@@ -285,7 +286,7 @@ export default class AbstractService<Model extends AbstractModel = AbstractModel
 		}
 	}
 
-	async getBlobUrl(url : string, method = 'GET' as Method, data = {}) {
+	async getBlobUrl(url : string, method : Method = 'GET', data = {}) {
 		const response = await this.http({
 			url,
 			method,
@@ -302,7 +303,7 @@ export default class AbstractService<Model extends AbstractModel = AbstractModel
 	 * @param params Optional query parameters
 	 * @param page The page to get
 	 */
-	async getAll(model : Model = new AbstractModel({}) as Model, params = {}, page = 1) {
+	async getAll(model : Model = new AbstractModel({}), params = {}, page = 1) {
 		if (this.paths.getAll === '') {
 			throw new Error('This model is not able to get data.')
 		}
@@ -408,10 +409,10 @@ export default class AbstractService<Model extends AbstractModel = AbstractModel
 	/**
 	 * Uploads a file to a url.
 	 * @param url
-	 * @param file {FileModel}
+	 * @param file {IFile}
 	 * @param fieldName The name of the field the file is uploaded to.
 	 */
-	uploadFile(url : string, file: FileModel, fieldName : string) {
+	uploadFile(url : string, file: IFile, fieldName : string) {
 		return this.uploadBlob(url, new Blob([file]), fieldName, file.name)
 	}
 
diff --git a/src/services/attachment.ts b/src/services/attachment.ts
index 9422bd04e..ba9eaf284 100644
--- a/src/services/attachment.ts
+++ b/src/services/attachment.ts
@@ -1,8 +1,8 @@
 import AbstractService from './abstractService'
-import AttachmentModel from '../models/attachment'
+import AttachmentModel, { type IAttachment } from '../models/attachment'
 import {formatISO} from 'date-fns'
 import {downloadBlob} from '@/helpers/downloadBlob'
-import type FileModel from '@/models/file'
+import type { IFile } from '@/models/file'
 
 export default class AttachmentService extends AbstractService<AttachmentModel> {
 	constructor() {
@@ -13,7 +13,7 @@ export default class AttachmentService extends AbstractService<AttachmentModel>
 		})
 	}
 
-	processModel(model: AttachmentModel) {
+	processModel(model: IAttachment) {
 		model.created = formatISO(new Date(model.created))
 		return model
 	}
@@ -34,11 +34,11 @@ export default class AttachmentService extends AbstractService<AttachmentModel>
 		return data
 	}
 
-	getBlobUrl(model: AttachmentModel) {
+	getBlobUrl(model: IAttachment) {
 		return AbstractService.prototype.getBlobUrl.call(this, '/tasks/' + model.taskId + '/attachments/' + model.id)
 	}
 
-	async download(model: AttachmentModel) {
+	async download(model: IAttachment) {
 		const url = await this.getBlobUrl(model)
 		return downloadBlob(url, model.file.name)
 	}
@@ -48,7 +48,7 @@ export default class AttachmentService extends AbstractService<AttachmentModel>
 	 * @param files
 	 * @returns {Promise<any|never>}
 	 */
-	create(model: AttachmentModel, files: FileModel[]) {
+	create(model: IAttachment, files: IFile[]) {
 		const data = new FormData()
 		for (let i = 0; i < files.length; i++) {
 			// TODO: Validation of file size
diff --git a/src/services/avatar.ts b/src/services/avatar.ts
index 7bcab771d..becbc43b0 100644
--- a/src/services/avatar.ts
+++ b/src/services/avatar.ts
@@ -1,7 +1,7 @@
 import AbstractService from './abstractService'
-import AvatarModel from '../models/avatar'
+import AvatarModel, { type IAvatar } from '../models/avatar'
 
-export default class AvatarService extends AbstractService {
+export default class AvatarService extends AbstractService<IAvatar> {
 	constructor() {
 		super({
 			get: '/user/settings/avatar',
diff --git a/src/services/backgroundUnsplash.ts b/src/services/backgroundUnsplash.ts
index 09b748acc..3e3b40cc0 100644
--- a/src/services/backgroundUnsplash.ts
+++ b/src/services/backgroundUnsplash.ts
@@ -1,8 +1,8 @@
 import AbstractService from './abstractService'
-import BackgroundImageModel from '../models/backgroundImage'
-import ListModel from '../models/list'
+import BackgroundImageModel, { type IBackgroundImage } from '../models/backgroundImage'
+import ListModel from '@/models/list'
 
-export default class BackgroundUnsplashService extends AbstractService {
+export default class BackgroundUnsplashService extends AbstractService<IBackgroundImage> {
 	constructor() {
 		super({
 			getAll: '/backgrounds/unsplash/search',
diff --git a/src/services/backgroundUpload.ts b/src/services/backgroundUpload.ts
index b961061d4..079eac296 100644
--- a/src/services/backgroundUpload.ts
+++ b/src/services/backgroundUpload.ts
@@ -1,6 +1,6 @@
 import AbstractService from './abstractService'
-import ListModel from '../models/list'
-import type FileModel from '@/models/file'
+import ListModel, { type IList } from '../models/list'
+import type { IFile } from '@/models/file'
 
 export default class BackgroundUploadService extends AbstractService {
 	constructor() {
@@ -22,7 +22,7 @@ export default class BackgroundUploadService extends AbstractService {
 	 * @param file
 	 * @returns {Promise<any|never>}
 	 */
-	create(listId: ListModel['id'], file: FileModel) {
+	create(listId: IList['id'], file: IFile) {
 		return this.uploadFile(
 			this.getReplacedRoute(this.paths.create, {listId}),
 			file,
diff --git a/src/services/bucket.ts b/src/services/bucket.ts
index 0e0c016ab..36f3c7414 100644
--- a/src/services/bucket.ts
+++ b/src/services/bucket.ts
@@ -1,8 +1,8 @@
 import AbstractService from './abstractService'
-import BucketModel from '../models/bucket'
+import BucketModel, { type IBucket } from '../models/bucket'
 import TaskService from '@/services/task'
 
-export default class BucketService extends AbstractService {
+export default class BucketService extends AbstractService<IBucket> {
 	constructor() {
 		super({
 			getAll: '/lists/{listId}/buckets',
diff --git a/src/services/caldavToken.ts b/src/services/caldavToken.ts
index a296b8cc7..736bf3b14 100644
--- a/src/services/caldavToken.ts
+++ b/src/services/caldavToken.ts
@@ -1,8 +1,8 @@
 import {formatISO} from 'date-fns'
-import CaldavTokenModel from '../models/caldavToken'
+import CaldavTokenModel, {type ICaldavToken} from '../models/caldavToken'
 import AbstractService from './abstractService'
 
-export default class CaldavTokenService extends AbstractService {
+export default class CaldavTokenService extends AbstractService<ICaldavToken> {
 	constructor() {
 		super({
 			getAll: '/user/settings/token/caldav',
@@ -11,7 +11,7 @@ export default class CaldavTokenService extends AbstractService {
 		})
 	}
 
-	processModel(model: Partial<CaldavTokenModel>) {
+	processModel(model: Partial<ICaldavToken>) {
 		return {
 			...model,
 			created: formatISO(new Date(model.created)),
diff --git a/src/services/label.ts b/src/services/label.ts
index 4dea5b819..5d3f33c33 100644
--- a/src/services/label.ts
+++ b/src/services/label.ts
@@ -1,9 +1,9 @@
 import AbstractService from './abstractService'
-import LabelModel from '../models/label'
+import LabelModel, { type ILabel } from '@/models/label'
 import {formatISO} from 'date-fns'
 import {colorFromHex} from '@/helpers/color/colorFromHex'
 
-export default class LabelService extends AbstractService {
+export default class LabelService extends AbstractService<ILabel> {
 	constructor() {
 		super({
 			create: '/labels',
diff --git a/src/services/list.ts b/src/services/list.ts
index dba90f95b..2f05e4aa2 100644
--- a/src/services/list.ts
+++ b/src/services/list.ts
@@ -1,10 +1,10 @@
 import AbstractService from './abstractService'
-import ListModel from '../models/list'
+import ListModel, { type IList } from '@/models/list'
 import TaskService from './task'
 import {formatISO} from 'date-fns'
 import {colorFromHex} from '@/helpers/color/colorFromHex'
 
-export default class ListService extends AbstractService {
+export default class ListService extends AbstractService<IList> {
 	constructor() {
 		super({
 			create: '/namespaces/{namespaceId}/lists',
diff --git a/src/services/namespace.ts b/src/services/namespace.ts
index ecd0e9d8e..ce9c48c0f 100644
--- a/src/services/namespace.ts
+++ b/src/services/namespace.ts
@@ -1,9 +1,9 @@
 import AbstractService from './abstractService'
-import NamespaceModel from '../models/namespace'
+import NamespaceModel, { type INamespace } from '../models/namespace'
 import {formatISO} from 'date-fns'
 import {colorFromHex} from '@/helpers/color/colorFromHex'
 
-export default class NamespaceService extends AbstractService {
+export default class NamespaceService extends AbstractService<INamespace> {
 	constructor() {
 		super({
 			create: '/namespaces',
diff --git a/src/services/task.ts b/src/services/task.ts
index b8b69a418..25dd94843 100644
--- a/src/services/task.ts
+++ b/src/services/task.ts
@@ -1,5 +1,5 @@
 import AbstractService from './abstractService'
-import TaskModel from '../models/task'
+import TaskModel, { type ITask } from '../models/task'
 import AttachmentService from './attachment'
 import LabelService from './label'
 
@@ -113,7 +113,7 @@ export default class TaskService extends AbstractService {
 			model.labels = model.labels.map(l => labelService.processModel(l))
 		}
 
-		return model as TaskModel
+		return model as ITask
 	}
 }
 
diff --git a/src/services/taskComment.ts b/src/services/taskComment.ts
index 2bf2375c0..b4be337d7 100644
--- a/src/services/taskComment.ts
+++ b/src/services/taskComment.ts
@@ -1,8 +1,8 @@
 import AbstractService from './abstractService'
-import TaskCommentModel from '../models/taskComment'
+import TaskCommentModel, { type ITaskComment } from '../models/taskComment'
 import {formatISO} from 'date-fns'
 
-export default class TaskCommentService extends AbstractService {
+export default class TaskCommentService extends AbstractService<ITaskComment> {
 	constructor() {
 		super({
 			create: '/tasks/{taskId}/comments',
diff --git a/src/store/helper.ts b/src/store/helper.ts
index c1631361a..44205ddca 100644
--- a/src/store/helper.ts
+++ b/src/store/helper.ts
@@ -1,4 +1,6 @@
+import type { ActionContext } from 'vuex'
 import {LOADING, LOADING_MODULE} from './mutation-types'
+import type { RootStoreState } from './types'
 
 /**
  * This helper sets the loading state with a 100ms delay to avoid flickering.
@@ -7,7 +9,11 @@ import {LOADING, LOADING_MODULE} from './mutation-types'
  * @param {null|String} module The module that is loading. This parameter allows components to listen for specific parts of the application loading.
  * @param {null|function} loadFunc If not null, this function will be executed instead of the default setting loading.
  */
-export const setLoading = (context, module = null, loadFunc = null) => {
+export function setLoading<State>(
+	context : ActionContext<State, RootStoreState>,
+	module : string | null = null,
+	loadFunc : (() => void) | null = null,
+) {
 	const timeout = setTimeout(() => {
 		if (loadFunc === null) {
 			context.commit(LOADING, true, {root: true})
diff --git a/src/store/index.ts b/src/store/index.ts
index c421cb033..d2df346d6 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -25,7 +25,9 @@ import ListModel from '@/models/list'
 import ListService from '../services/list'
 import {checkAndSetApiUrl} from '@/helpers/checkAndSetApiUrl'
 
-export const store = createStore({
+import type { RootStoreState } from './types'
+
+export const store = createStore<RootStoreState>({
 	strict: import.meta.env.DEV,
 	modules: {
 		config,
@@ -37,7 +39,7 @@ export const store = createStore({
 		attachments,
 		labels,
 	},
-	state: {
+	state: () => ({
 		loading: false,
 		loadingModule: null,
 		// This is used to highlight the current list in menu for all list related views
@@ -51,7 +53,7 @@ export const store = createStore({
 		menuActive: true,
 		keyboardShortcutsActive: false,
 		quickActionsActive: false,
-	},
+	}),
 	mutations: {
 		[LOADING](state, loading) {
 			state.loading = loading
diff --git a/src/store/modules/attachments.ts b/src/store/modules/attachments.ts
index 3dc5957b3..7b85af8a8 100644
--- a/src/store/modules/attachments.ts
+++ b/src/store/modules/attachments.ts
@@ -1,21 +1,24 @@
 import {findIndexById} from '@/helpers/utils'
 
+import type { AttachmentState } from '@/store/types'
+import type { IAttachment } from '@/models/attachment'
+
 export default {
 	namespaced: true,
-	state: () => ({
+	state: (): AttachmentState => ({
 		attachments: [],
 	}),
 	mutations: {
-		set(state, attachments) {
+		set(state: AttachmentState, attachments: IAttachment[]) {
 			console.debug('Set attachments', attachments)
 			state.attachments = attachments
 		},
-		add(state, attachment) {
+		add(state: AttachmentState, attachment: IAttachment) {
 			console.debug('Add attachement', attachment)
 			state.attachments.push(attachment)
 		},
-		removeById(state, id) {
-			const attachmentIndex = findIndexById(state.attachments, id)
+		removeById(state: AttachmentState, id: IAttachment['id']) {
+			const attachmentIndex = findIndexById<IAttachment>(state.attachments, id)
 			state.attachments.splice(attachmentIndex, 1)
 			console.debug('Remove attachement', id)
 		},
diff --git a/src/store/modules/auth.ts b/src/store/modules/auth.ts
index a9c694c4c..4e6492133 100644
--- a/src/store/modules/auth.ts
+++ b/src/store/modules/auth.ts
@@ -1,3 +1,5 @@
+import type { ActionContext } from 'vuex'
+
 import {HTTPFactory, AuthenticatedHTTPFactory} from '@/http-common'
 import {i18n, getCurrentLanguage, saveLanguage} from '@/i18n'
 import {objectToSnakeCase} from '@/helpers/case'
@@ -8,12 +10,10 @@ import {getToken, refreshToken, removeToken, saveToken} from '@/helpers/auth'
 import {setLoading} from '@/store/helper'
 import {success} from '@/message'
 import {redirectToProvider} from '@/helpers/redirectToProvider'
+import type { RootStoreState, AuthState, Info} from '@/store/types'
+import {AUTH_TYPES} from '@/store/types'
+import type { IUserSettings } from '@/models/userSettings'
 
-const AUTH_TYPES = {
-	'UNKNOWN': 0,
-	'USER': 1,
-	'LINK_SHARE': 2,
-}
 
 const defaultSettings = settings => {
 	if (typeof settings.weekStart === 'undefined' || settings.weekStart === '') {
@@ -24,7 +24,7 @@ const defaultSettings = settings => {
 
 export default {
 	namespaced: true,
-	state: () => ({
+	state: (): AuthState => ({
 		authenticated: false,
 		isLinkShareAuth: false,
 		info: null,
@@ -34,13 +34,13 @@ export default {
 		settings: {},
 	}),
 	getters: {
-		authUser(state) {
+		authUser(state: AuthState) {
 			return state.authenticated && (
 				state.info &&
 				state.info.type === AUTH_TYPES.USER
 			)
 		},
-		authLinkShare(state) {
+		authLinkShare(state: AuthState) {
 			return state.authenticated && (
 				state.info &&
 				state.info.type === AUTH_TYPES.LINK_SHARE
@@ -48,7 +48,7 @@ export default {
 		},
 	},
 	mutations: {
-		info(state, info) {
+		info(state: AuthState, info: Info) {
 			state.info = info
 			if (info !== null) {
 				state.avatarUrl = info.getAvatarUrl()
@@ -60,31 +60,32 @@ export default {
 				state.isLinkShareAuth = info.id < 0
 			}
 		},
-		setUserSettings(state, settings) {
+		setUserSettings(state: AuthState, settings: IUserSettings) {
 			state.settings = defaultSettings(settings)
-			const info = state.info !== null ? state.info : {}
+			const info = state.info !== null ? state.info : {} as Info
 			info.name = settings.name
 			state.info = info
 		},
-		authenticated(state, authenticated) {
+		authenticated(state: AuthState, authenticated: boolean) {
 			state.authenticated = authenticated
 		},
-		isLinkShareAuth(state, is) {
-			state.isLinkShareAuth = is
+		isLinkShareAuth(state: AuthState, isLinkShareAuth: boolean) {
+			state.isLinkShareAuth = isLinkShareAuth
 		},
-		needsTotpPasscode(state, needs) {
-			state.needsTotpPasscode = needs
+		needsTotpPasscode(state: AuthState, needsTotpPasscode: boolean) {
+			state.needsTotpPasscode = needsTotpPasscode
 		},
-		reloadAvatar(state) {
+		reloadAvatar(state: AuthState) {
+			if (!state.info) return
 			state.avatarUrl = `${state.info.getAvatarUrl()}&=${+new Date()}`
 		},
-		lastUserRefresh(state) {
+		lastUserRefresh(state: AuthState) {
 			state.lastUserInfoRefresh = new Date()
 		},
 	},
 	actions: {
 		// Logs a user in with a set of credentials.
-		async login(ctx, credentials) {
+		async login(ctx: ActionContext<AuthState, RootStoreState>, credentials) {
 			const HTTP = HTTPFactory()
 			ctx.commit(LOADING, true, {root: true})
 
@@ -115,7 +116,7 @@ export default {
 
 		// Registers a new user and logs them in.
 		// Not sure if this is the right place to put the logic in, maybe a seperate js component would be better suited.
-		async register(ctx, credentials) {
+		async register(ctx: ActionContext<AuthState, RootStoreState>, credentials) {
 			const HTTP = HTTPFactory()
 			ctx.commit(LOADING, true, {root: true})
 			try {
@@ -132,7 +133,7 @@ export default {
 			}
 		},
 
-		async openIdAuth(ctx, {provider, code}) {
+		async openIdAuth(ctx: ActionContext<AuthState, RootStoreState>, {provider, code}) {
 			const HTTP = HTTPFactory()
 			ctx.commit(LOADING, true, {root: true})
 
@@ -154,7 +155,7 @@ export default {
 			}
 		},
 
-		async linkShareAuth(ctx, {hash, password}) {
+		async linkShareAuth(ctx: ActionContext<AuthState, RootStoreState>, {hash, password}) {
 			const HTTP = HTTPFactory()
 			const response = await HTTP.post('/shares/' + hash + '/auth', {
 				password: password,
@@ -165,7 +166,7 @@ export default {
 		},
 
 		// Populates user information from jwt token saved in local storage in store
-		checkAuth(ctx) {
+		checkAuth(ctx: ActionContext<AuthState, RootStoreState>) {
 
 			// This function can be called from multiple places at the same time and shortly after one another.
 			// To prevent hitting the api too frequently or race conditions, we check at most once per minute.
@@ -197,7 +198,7 @@ export default {
 			}
 		},
 
-		redirectToProviderIfNothingElseIsEnabled({rootState}) {
+		redirectToProviderIfNothingElseIsEnabled({rootState}: ActionContext<AuthState, RootStoreState>) {
 			const {auth} = rootState.config
 			if (
 				auth.local.enabled === false &&
@@ -209,7 +210,7 @@ export default {
 			}
 		},
 
-		async refreshUserInfo({state, commit, dispatch}) {
+		async refreshUserInfo({state, commit, dispatch}: ActionContext<AuthState, RootStoreState>) {
 			const jwt = getToken()
 			if (!jwt) {
 				return
@@ -243,7 +244,7 @@ export default {
 			}
 		},
 
-		async saveUserSettings(ctx, payload) {
+		async saveUserSettings(ctx: ActionContext<AuthState, RootStoreState>, payload) {
 			const {settings} = payload
 			const showMessage = payload.showMessage ?? true
 			const userSettingsService = new UserSettingsService()
@@ -264,7 +265,7 @@ export default {
 		},
 
 		// Renews the api token and saves it to local storage
-		renewToken(ctx) {
+		renewToken(ctx: ActionContext<AuthState, RootStoreState>) {
 			// FIXME: Timeout to avoid race conditions when authenticated as a user (=auth token in localStorage) and as a
 			// link share in another tab. Without the timeout both the token renew and link share auth are executed at
 			// the same time and one might win over the other.
@@ -285,7 +286,7 @@ export default {
 				}
 			}, 5000)
 		},
-		logout(ctx) {
+		logout(ctx: ActionContext<AuthState, RootStoreState>) {
 			removeToken()
 			window.localStorage.clear() // Clear all settings and history we might have saved in local storage.
 			ctx.dispatch('checkAuth')
diff --git a/src/store/modules/config.ts b/src/store/modules/config.ts
index f403b3643..27d61a2ca 100644
--- a/src/store/modules/config.ts
+++ b/src/store/modules/config.ts
@@ -1,11 +1,14 @@
+import type { ActionContext } from 'vuex'
+import {parseURL} from 'ufo'
+
 import {CONFIG} from '../mutation-types'
 import {HTTPFactory} from '@/http-common'
 import {objectToCamelCase} from '@/helpers/case'
-import {parseURL} from 'ufo'
+import type { RootStoreState, ConfigState } from '@/store/types'
 
 export default {
 	namespaced: true,
-	state: () => ({
+	state: (): ConfigState => ({
 		// These are the api defaults.
 		version: '',
 		frontendUrl: '',
@@ -36,19 +39,19 @@ export default {
 		},
 	}),
 	getters: {
-		migratorsEnabled: state => state.availableMigrators?.length > 0,
+		migratorsEnabled: (state: ConfigState) => state.availableMigrators?.length > 0,
 		apiBase() {
 			const {host, protocol} = parseURL(window.API_URL)
 			return protocol + '//' + host
 		},
 	},
 	mutations: {
-		[CONFIG](state, config) {
+		[CONFIG](state: ConfigState, config: ConfigState) {
 			Object.assign(state, config)
 		},
 	},
 	actions: {
-		async update(ctx) {
+		async update(ctx: ActionContext<ConfigState, RootStoreState>) {
 			const HTTP = HTTPFactory()
 			const {data: config} = await HTTP.get('info')
 			ctx.commit(CONFIG, objectToCamelCase(config))
diff --git a/src/store/modules/kanban.ts b/src/store/modules/kanban.ts
index 0378d9aa2..73e73088e 100644
--- a/src/store/modules/kanban.ts
+++ b/src/store/modules/kanban.ts
@@ -7,10 +7,15 @@ import {success} from '@/message'
 import BucketService from '../../services/bucket'
 import {setLoading} from '../helper'
 import TaskCollectionService from '@/services/taskCollection'
+import type { ActionContext } from 'vuex'
+import type { RootStoreState, KanbanState } from '@/store/types'
+import type { ITask } from '@/models/task'
+import type { IList } from '@/models/list'
+import type { IBucket } from '@/models/bucket'
 
 const TASKS_PER_BUCKET = 25
 
-function getTaskIndicesById(state, taskId) {
+function getTaskIndicesById(state: KanbanState, taskId: ITask['id']) {
 	let taskIndex
 	const bucketIndex = state.buckets.findIndex(({ tasks }) => {
 		taskIndex = findIndexById(tasks, taskId)
@@ -23,7 +28,7 @@ function getTaskIndicesById(state, taskId) {
 	}	
 }
 
-const addTaskToBucketAndSort = (state, task) => {
+const addTaskToBucketAndSort = (state: KanbanState, task: ITask) => {
 	const bucketIndex = findIndexById(state.buckets, task.bucketId)
 	state.buckets[bucketIndex].tasks.push(task)
 	state.buckets[bucketIndex].tasks.sort((a, b) => a.kanbanPosition > b.kanbanPosition ? 1 : -1)
@@ -36,7 +41,7 @@ const addTaskToBucketAndSort = (state, task) => {
 export default {
 	namespaced: true,
 
-	state: () => ({
+	state: (): KanbanState => ({
 		buckets: [],
 		listId: 0,
 		bucketLoading: {},
@@ -45,11 +50,11 @@ export default {
 	}),
 
 	mutations: {
-		setListId(state, listId) {
+		setListId(state: KanbanState, listId: IList['id']) {
 			state.listId = parseInt(listId)
 		},
 
-		setBuckets(state, buckets) {
+		setBuckets(state: KanbanState, buckets: IBucket[]) {
 			state.buckets = buckets
 			buckets.forEach(b => {
 				state.taskPagesPerBucket[b.id] = 1
@@ -57,31 +62,51 @@ export default {
 			})
 		},
 
-		addBucket(state, bucket) {
+		addBucket(state: KanbanState, bucket: IBucket) {
 			state.buckets.push(bucket)
 		},
 
-		removeBucket(state, bucket) {
+		removeBucket(state: KanbanState, bucket: IBucket) {
 			const bucketIndex = findIndexById(state.buckets, bucket.id)
 			state.buckets.splice(bucketIndex, 1)
 		},
 
-		setBucketById(state, bucket) {
+		setBucketById(state: KanbanState, bucket: IBucket) {
 			const bucketIndex = findIndexById(state.buckets, bucket.id)
 			state.buckets[bucketIndex] = bucket
 		},
 
-		setBucketByIndex(state, {bucketIndex, bucket}) {
+		setBucketByIndex(state: KanbanState, {
+			bucketIndex,
+			bucket,
+		} : {
+			bucketIndex: number,
+			bucket: IBucket
+		}) {
 			state.buckets[bucketIndex] = bucket
 		},
 
-		setTaskInBucketByIndex(state, {bucketIndex, taskIndex, task}) {
+		setTaskInBucketByIndex(state: KanbanState, {
+			bucketIndex,
+			taskIndex,
+			task,
+		} : {
+			bucketIndex: number,
+			taskIndex: number,
+			task: ITask
+		}) {
 			const bucket = state.buckets[bucketIndex]
 			bucket.tasks[taskIndex] = task
 			state.buckets[bucketIndex] = bucket
 		},
 
-		setTasksInBucketByBucketId(state, {bucketId, tasks}) {
+		setTasksInBucketByBucketId(state: KanbanState, {
+			bucketId,
+			tasks,
+		} : {
+			bucketId: IBucket['id'],
+			tasks: ITask[],
+		}) {
 			const bucketIndex = findIndexById(state.buckets, bucketId)
 			state.buckets[bucketIndex] = {
 				...state.buckets[bucketIndex],
@@ -89,7 +114,7 @@ export default {
 			}
 		},
 		
-		setTaskInBucket(state, task) {
+		setTaskInBucket(state: KanbanState, task: ITask) {
 			// If this gets invoked without any tasks actually loaded, we can save the hassle of finding the task
 			if (state.buckets.length === 0) {
 				return
@@ -133,7 +158,7 @@ export default {
 			}
 		},
 
-		addTaskToBucket(state, task) {
+		addTaskToBucket(state: KanbanState, task: ITask) {
 			const bucketIndex = findIndexById(state.buckets, task.bucketId)
 			const oldBucket = state.buckets[bucketIndex]
 			const newBucket = {
@@ -146,7 +171,10 @@ export default {
 			state.buckets[bucketIndex] = newBucket
 		},
 
-		addTasksToBucket(state, {tasks, bucketId}) {
+		addTasksToBucket(state: KanbanState, {tasks, bucketId}: {
+			tasks: ITask[];
+			bucketId: IBucket['id'];
+		}) {
 			const bucketIndex = findIndexById(state.buckets, bucketId)
 			const oldBucket = state.buckets[bucketIndex]
 			const newBucket = {
@@ -159,7 +187,7 @@ export default {
 			state.buckets[bucketIndex] = newBucket
 		},
 
-		removeTaskInBucket(state, task) {
+		removeTaskInBucket(state: KanbanState, task: ITask) {
 			// If this gets invoked without any tasks actually loaded, we can save the hassle of finding the task
 			if (state.buckets.length === 0) {
 				return
@@ -168,8 +196,10 @@ export default {
 			const { bucketIndex, taskIndex } = getTaskIndicesById(state, task.id)
 
 			if (
+				!bucketIndex || 
 				state.buckets[bucketIndex]?.id !== task.bucketId ||
-				state.buckets[bucketIndex]?.tasks[taskIndex]?.id !== task.id
+				!taskIndex ||
+				(state.buckets[bucketIndex]?.tasks[taskIndex]?.id !== task.id)
 			) {
 				return
 			}
@@ -177,39 +207,40 @@ export default {
 			state.buckets[bucketIndex].tasks.splice(taskIndex, 1)
 		},
 
-		setBucketLoading(state, {bucketId, loading}) {
+		setBucketLoading(state: KanbanState, {bucketId, loading}) {
 			state.bucketLoading[bucketId] = loading
 		},
 
-		setTasksLoadedForBucketPage(state, {bucketId, page}) {
+		setTasksLoadedForBucketPage(state: KanbanState, {bucketId, page}) {
 			state.taskPagesPerBucket[bucketId] = page
 		},
 
-		setAllTasksLoadedForBucket(state, bucketId) {
+		setAllTasksLoadedForBucket(state: KanbanState, bucketId) {
 			state.allTasksLoadedForBucket[bucketId] = true
 		},
 	},
 
 	getters: {
-		getBucketById(state) {
+		getBucketById(state: KanbanState) {
 			return (bucketId) => findById(state.buckets, bucketId)
 		},
 
-		getTaskById(state) {
+		getTaskById(state: KanbanState) {
 			return (id) => {
 				const { bucketIndex, taskIndex } = getTaskIndicesById(state, id)
 
+				
 				return {
 					bucketIndex,
 					taskIndex,
-					task: state.buckets[bucketIndex]?.tasks?.[taskIndex] || null,
+					task: bucketIndex && taskIndex && state.buckets[bucketIndex]?.tasks?.[taskIndex] || null,
 				}
 			}
 		},
 	},
 
 	actions: {
-		async loadBucketsForList(ctx, {listId, params}) {
+		async loadBucketsForList(ctx: ActionContext<KanbanState, RootStoreState>, {listId, params}) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			// Clear everything to prevent having old buckets in the list if loading the buckets from this list takes a few moments
@@ -219,7 +250,7 @@ export default {
 
 			const bucketService = new BucketService()
 			try {
-				const response = await  bucketService.getAll({listId: listId}, params)
+				const response = await  bucketService.getAll({listId}, params)
 				ctx.commit('setBuckets', response)
 				ctx.commit('setListId', listId)
 				return response
@@ -228,7 +259,7 @@ export default {
 			}
 		},
 
-		async loadNextTasksForBucket(ctx, {listId, ps = {}, bucketId}) {
+		async loadNextTasksForBucket(ctx: ActionContext<KanbanState, RootStoreState>, {listId, ps = {}, bucketId}) {
 			const isLoading = ctx.state.bucketLoading[bucketId] ?? false
 			if (isLoading) {
 				return
@@ -270,7 +301,7 @@ export default {
 
 			const taskService = new TaskCollectionService()
 			try {
-				const tasks = await taskService.getAll({listId: listId}, params, page)
+				const tasks = await taskService.getAll({listId}, params, page)
 				ctx.commit('addTasksToBucket', {tasks, bucketId: bucketId})
 				ctx.commit('setTasksLoadedForBucketPage', {bucketId, page})
 				if (taskService.totalPages <= page) {
@@ -283,7 +314,7 @@ export default {
 			}
 		},
 
-		async createBucket(ctx, bucket) {
+		async createBucket(ctx: ActionContext<KanbanState, RootStoreState>, bucket: IBucket) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			const bucketService = new BucketService()
@@ -296,7 +327,7 @@ export default {
 			}
 		},
 
-		async deleteBucket(ctx, {bucket, params}) {
+		async deleteBucket(ctx: ActionContext<KanbanState, RootStoreState>, {bucket, params}) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			const bucketService = new BucketService()
@@ -304,14 +335,14 @@ export default {
 				const response = await bucketService.delete(bucket)
 				ctx.commit('removeBucket', bucket)
 				// We reload all buckets because tasks are being moved from the deleted bucket
-				ctx.dispatch('loadBucketsForList', {listId: bucket.listId, params: params})
+				ctx.dispatch('loadBucketsForList', {listId: bucket.listId, params})
 				return response
 			} finally {
 				cancel()
 			}
 		},
 
-		async updateBucket(ctx, updatedBucketData) {
+		async updateBucket(ctx: ActionContext<KanbanState, RootStoreState>, updatedBucketData) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			const bucketIndex = findIndexById(ctx.state.buckets, updatedBucketData.id)
@@ -339,10 +370,10 @@ export default {
 			}
 		},
 
-		async updateBucketTitle(ctx, { id, title }) {
+		async updateBucketTitle(ctx: ActionContext<KanbanState, RootStoreState>, { id, title }) {
 			const bucket = findById(ctx.state.buckets, id)
 
-			if (bucket.title === title) {
+			if (bucket?.title === title) {
 				// bucket title has not changed
 				return
 			}
diff --git a/src/store/modules/labels.ts b/src/store/modules/labels.ts
index 24ad50c47..4366c4c53 100644
--- a/src/store/modules/labels.ts
+++ b/src/store/modules/labels.ts
@@ -1,15 +1,19 @@
+import type { ActionContext } from 'vuex'
+
+import {i18n} from '@/i18n'
+import {success} from '@/message'
 import LabelService from '@/services/label'
 import {setLoading} from '@/store/helper'
-import {success} from '@/message'
-import {i18n} from '@/i18n'
+import type { LabelState, RootStoreState } from '@/store/types'
 import {getLabelsByIds, filterLabelsByQuery} from '@/helpers/labels'
 import {createNewIndexer} from '@/indexes'
+import type { ILabel } from '@/models/label'
 
 const {add, remove, update} = createNewIndexer('labels', ['title', 'description'])
 
-async function getAllLabels(page = 1) {
+async function getAllLabels(page = 1): Promise<ILabel[]> {
 	const labelService = new LabelService()
-	const labels = await labelService.getAll({}, {}, page)
+	const labels  = await labelService.getAll({}, {}, page) as ILabel[]
 	if (page < labelService.totalPages) {
 		const nextLabels = await getAllLabels(page + 1)
 		return labels.concat(nextLabels)
@@ -20,45 +24,44 @@ async function getAllLabels(page = 1) {
 
 export default {
 	namespaced: true,
-	state: () => ({
-		// The labels are stored as an object which has the label ids as keys.
+	state: (): LabelState => ({
 		labels: {},
 		loaded: false,
 	}),
 	mutations: {
-		setLabels(state, labels) {
+		setLabels(state: LabelState, labels: ILabel[]) {
 			labels.forEach(l => {
 				state.labels[l.id] = l
 				add(l)
 			})
 		},
-		setLabel(state, label) {
+		setLabel(state: LabelState, label: ILabel) {
 			state.labels[label.id] = label
 			update(label)
 		},
-		removeLabelById(state, label) {
+		removeLabelById(state: LabelState, label: ILabel) {
 			remove(label)
 			delete state.labels[label.id]
 		},
-		setLoaded(state, loaded) {
+		setLoaded(state: LabelState, loaded: boolean) {
 			state.loaded = loaded
 		},
 	},
 	getters: {
-		getLabelsByIds(state) {
-			return (ids) => getLabelsByIds(state, ids)
+		getLabelsByIds(state: LabelState) {
+			return (ids: ILabel['id'][]) => getLabelsByIds(state, ids)
 		},
-		filterLabelsByQuery(state) {
-			return (labelsToHide, query) => filterLabelsByQuery(state, labelsToHide, query)
+		filterLabelsByQuery(state: LabelState) {
+			return (labelsToHide: ILabel[], query: string) => filterLabelsByQuery(state, labelsToHide, query)
 		},
-		getLabelsByExactTitles(state) {
+		getLabelsByExactTitles(state: LabelState) {
 			return labelTitles => Object
 				.values(state.labels)
 				.filter(({title}) => labelTitles.some(l => l.toLowerCase() === title.toLowerCase()))
 		},
 	},
 	actions: {
-		async loadAllLabels(ctx, {forceLoad} = {}) {
+		async loadAllLabels(ctx: ActionContext<LabelState, RootStoreState>, {forceLoad} = {}) {
 			if (ctx.state.loaded && !forceLoad) {
 				return
 			}
@@ -74,7 +77,7 @@ export default {
 				cancel()
 			}
 		},
-		async deleteLabel(ctx, label) {
+		async deleteLabel(ctx: ActionContext<LabelState, RootStoreState>, label: ILabel) {
 			const cancel = setLoading(ctx, 'labels')
 			const labelService = new LabelService()
 
@@ -87,7 +90,7 @@ export default {
 				cancel()
 			}
 		},
-		async updateLabel(ctx, label) {
+		async updateLabel(ctx: ActionContext<LabelState, RootStoreState>, label: ILabel) {
 			const cancel = setLoading(ctx, 'labels')
 			const labelService = new LabelService()
 
@@ -100,7 +103,7 @@ export default {
 				cancel()
 			}
 		},
-		async createLabel(ctx, label) {
+		async createLabel(ctx: ActionContext<LabelState, RootStoreState>, label: ILabel) {
 			const cancel = setLoading(ctx, 'labels')
 			const labelService = new LabelService()
 
diff --git a/src/store/modules/lists.ts b/src/store/modules/lists.ts
index 90bea0868..e438763ce 100644
--- a/src/store/modules/lists.ts
+++ b/src/store/modules/lists.ts
@@ -2,6 +2,9 @@ import ListService from '@/services/list'
 import {setLoading} from '@/store/helper'
 import {removeListFromHistory} from '@/modules/listHistory'
 import {createNewIndexer} from '@/indexes'
+import type {ListState, RootStoreState} from '@/store/types'
+import type {ActionContext} from 'vuex'
+import type {IList} from '@/models/list'
 
 const {add, remove, search, update} = createNewIndexer('lists', ['title', 'description'])
 
@@ -10,37 +13,37 @@ const FavoriteListsNamespace = -2
 export default {
 	namespaced: true,
 	// The state is an object which has the list ids as keys.
-	state: () => ({}),
+	state: (): ListState => ({}),
 	mutations: {
-		setList(state, list) {
+		setList(state: ListState, list: IList) {
 			state[list.id] = list
 			update(list)
 		},
-		setLists(state, lists) {
+		setLists(state: ListState, lists: IList[]) {
 			lists.forEach(l => {
 				state[l.id] = l
 				add(l)
 			})
 		},
-		removeListById(state, list) {
+		removeListById(state: ListState, list: IList) {
 			remove(list)
 			delete state[list.id]
 		},
 	},
 	getters: {
-		getListById: state => id => {
+		getListById: (state: ListState) => (id: IList['id']) => {
 			if (typeof state[id] !== 'undefined') {
 				return state[id]
 			}
 			return null
 		},
-		findListByExactname: state => name => {
+		findListByExactname: (state: ListState) => (name: string) => {
 			const list = Object.values(state).find(l => {
 				return l.title.toLowerCase() === name.toLowerCase()
 			})
 			return typeof list === 'undefined' ? null : list
 		},
-		searchList: state => (query, includeArchived = false) => {
+		searchList: (state: ListState) => (query: string, includeArchived = false) => {
 			return search(query)
 					?.filter(value => value > 0)
 					.map(id => state[id])
@@ -49,14 +52,14 @@ export default {
 		},
 	},
 	actions: {
-		toggleListFavorite(ctx, list) {
+		toggleListFavorite(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
 			return ctx.dispatch('updateList', {
 				...list,
 				isFavorite: !list.isFavorite,
 			})
 		},
 
-		async createList(ctx, list) {
+		async createList(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
 			const cancel = setLoading(ctx, 'lists')
 			const listService = new ListService()
 
@@ -71,7 +74,7 @@ export default {
 			}
 		},
 
-		async updateList(ctx, list) {
+		async updateList(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
 			const cancel = setLoading(ctx, 'lists')
 			const listService = new ListService()
 
@@ -106,7 +109,7 @@ export default {
 			}
 		},
 
-		async deleteList(ctx, list) {
+		async deleteList(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
 			const cancel = setLoading(ctx, 'lists')
 			const listService = new ListService()
 
diff --git a/src/store/modules/namespaces.ts b/src/store/modules/namespaces.ts
index 4512fb89f..745e9b941 100644
--- a/src/store/modules/namespaces.ts
+++ b/src/store/modules/namespaces.ts
@@ -1,22 +1,27 @@
+import type {ActionContext} from 'vuex'
+
 import NamespaceService from '../../services/namespace'
 import {setLoading} from '@/store/helper'
 import {createNewIndexer} from '@/indexes'
+import type {NamespaceState, RootStoreState} from '@/store/types'
+import type {INamespace} from '@/models/namespace'
+import type {IList} from '@/models/list'
 
 const {add, remove, search, update} = createNewIndexer('namespaces', ['title', 'description'])
 
 export default {
 	namespaced: true,
-	state: () => ({
+	state: (): NamespaceState => ({
 		namespaces: [],
 	}),
 	mutations: {
-		namespaces(state, namespaces) {
+		namespaces(state: NamespaceState, namespaces: INamespace[]) {
 			state.namespaces = namespaces
 			namespaces.forEach(n => {
 				add(n)
 			})
 		},
-		setNamespaceById(state, namespace) {
+		setNamespaceById(state: NamespaceState, namespace: INamespace) {
 			const namespaceIndex = state.namespaces.findIndex(n => n.id === namespace.id)
 
 			if (namespaceIndex === -1) {
@@ -30,7 +35,7 @@ export default {
 			state.namespaces[namespaceIndex] = namespace
 			update(namespace)
 		},
-		setListInNamespaceById(state, list) {
+		setListInNamespaceById(state: NamespaceState, list: IList) {
 			for (const n in state.namespaces) {
 				// We don't have the namespace id on the list which means we need to loop over all lists until we find it.
 				// FIXME: Not ideal at all - we should fix that at the api level.
@@ -46,11 +51,11 @@ export default {
 				}
 			}
 		},
-		addNamespace(state, namespace) {
+		addNamespace(state: NamespaceState, namespace: INamespace) {
 			state.namespaces.push(namespace)
 			add(namespace)
 		},
-		removeNamespaceById(state, namespaceId) {
+		removeNamespaceById(state: NamespaceState, namespaceId: INamespace['id']) {
 			for (const n in state.namespaces) {
 				if (state.namespaces[n].id === namespaceId) {
 					remove(state.namespaces[n])
@@ -59,7 +64,7 @@ export default {
 				}
 			}
 		},
-		addListToNamespace(state, list) {
+		addListToNamespace(state: NamespaceState, list: IList) {
 			for (const n in state.namespaces) {
 				if (state.namespaces[n].id === list.namespaceId) {
 					state.namespaces[n].lists.push(list)
@@ -67,7 +72,7 @@ export default {
 				}
 			}
 		},
-		removeListFromNamespaceById(state, list) {
+		removeListFromNamespaceById(state: NamespaceState, list: IList) {
 			for (const n in state.namespaces) {
 				// We don't have the namespace id on the list which means we need to loop over all lists until we find it.
 				// FIXME: Not ideal at all - we should fix that at the api level.
@@ -83,7 +88,7 @@ export default {
 		},
 	},
 	getters: {
-		getListAndNamespaceById: state => (listId, ignorePseudoNamespaces = false) => {
+		getListAndNamespaceById: (state: NamespaceState) => (listId: IList['id'], ignorePseudoNamespaces = false) => {
 			for (const n in state.namespaces) {
 
 				if (ignorePseudoNamespaces && state.namespaces[n].id < 0) {
@@ -101,10 +106,10 @@ export default {
 			}
 			return null
 		},
-		getNamespaceById: state => namespaceId => {
+		getNamespaceById: (state: NamespaceState) => (namespaceId: INamespace['id']) => {
 			return state.namespaces.find(({id}) => id == namespaceId) || null
 		},
-		searchNamespace: (state, getters) => query => {
+		searchNamespace: (state: NamespaceState, getters) => (query: string) => {
 			return search(query)
 					?.filter(value => value > 0)
 					.map(getters.getNamespaceById)
@@ -113,7 +118,7 @@ export default {
 		},
 	},
 	actions: {
-		async loadNamespaces(ctx) {
+		async loadNamespaces(ctx: ActionContext<NamespaceState, RootStoreState>) {
 			const cancel = setLoading(ctx, 'namespaces')
 
 			const namespaceService = new NamespaceService()
@@ -133,20 +138,20 @@ export default {
 			}
 		},
 
-		loadNamespacesIfFavoritesDontExist(ctx) {
+		loadNamespacesIfFavoritesDontExist(ctx: ActionContext<NamespaceState, RootStoreState>) {
 			// The first or second namespace should be the one holding all favorites
 			if (ctx.state.namespaces[0].id !== -2 && ctx.state.namespaces[1]?.id !== -2) {
 				return ctx.dispatch('loadNamespaces')
 			}
 		},
 
-		removeFavoritesNamespaceIfEmpty(ctx) {
+		removeFavoritesNamespaceIfEmpty(ctx: ActionContext<NamespaceState, RootStoreState>) {
 			if (ctx.state.namespaces[0].id === -2 && ctx.state.namespaces[0].lists.length === 0) {
 				ctx.state.namespaces.splice(0, 1)
 			}
 		},
 
-		async deleteNamespace(ctx, namespace) {
+		async deleteNamespace(ctx: ActionContext<NamespaceState, RootStoreState>, namespace: INamespace) {
 			const cancel = setLoading(ctx, 'namespaces')
 			const namespaceService = new NamespaceService()
 
@@ -159,7 +164,7 @@ export default {
 			}
 		},
 
-		async createNamespace(ctx, namespace) {
+		async createNamespace(ctx: ActionContext<NamespaceState, RootStoreState>, namespace: INamespace) {
 			const cancel = setLoading(ctx, 'namespaces')
 			const namespaceService = new NamespaceService()
 
diff --git a/src/store/modules/tasks.ts b/src/store/modules/tasks.ts
index a0b7671b1..242afc01f 100644
--- a/src/store/modules/tasks.ts
+++ b/src/store/modules/tasks.ts
@@ -1,20 +1,25 @@
 import router from '@/router'
+import type { ActionContext } from 'vuex'
+import {formatISO} from 'date-fns'
 
 import TaskService from '@/services/task'
 import TaskAssigneeService from '@/services/taskAssignee'
-import TaskAssigneeModel from '../../models/taskAssignee'
-import LabelTaskModel from '../../models/labelTask'
+import TaskAssigneeModel from '@/models/taskAssignee'
+import LabelTaskModel from '@/models/labelTask'
 import LabelTaskService from '@/services/labelTask'
 import {HAS_TASKS} from '../mutation-types'
 import {setLoading} from '../helper'
 import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
 
 import {parseTaskText} from '@/modules/parseTaskText'
-import TaskModel from '@/models/task'
-import {formatISO} from 'date-fns'
+import TaskModel, { type ITask } from '@/models/task'
 import LabelTask from '@/models/labelTask'
-import LabelModel from '@/models/label'
+import LabelModel, { type ILabel } from '@/models/label'
 import UserService from '@/services/user'
+import type { RootStoreState, TaskState } from '@/store/types'
+import type { IUser } from '@/models/user'
+import type { IAttachment } from '@/models/attachment'
+import type { IList } from '@/models/list'
 
 // IDEA: maybe use a small fuzzy search here to prevent errors
 function findPropertyByValue(object, key, value) {
@@ -24,16 +29,16 @@ function findPropertyByValue(object, key, value) {
 }
 
 // Check if the user exists
-function validateUsername(users, username) {
+function validateUsername(users: IUser[], username: IUser['username']) {
 	return findPropertyByValue(users, 'username', username)
 }
 
 // Check if the label exists
-function validateLabel(labels, label) {
+function validateLabel(labels: ILabel[], label: ILabel) {
 	return findPropertyByValue(labels, 'title', label)
 }
 
-async function addLabelToTask(task, label) {
+async function addLabelToTask(task: ITask, label: ILabel) {
 	const labelTask = new LabelTask({
 		taskId: task.id,
 		labelId: label.id,
@@ -62,9 +67,9 @@ async function findAssignees(parsedTaskAssignees) {
 
 export default {
 	namespaced: true,
-	state: () => ({}),
+	state: (): TaskState => ({}),
 	actions: {
-		async loadTasks(ctx, params) {
+		async loadTasks(ctx: ActionContext<TaskState, RootStoreState>, params) {
 			const taskService = new TaskService()
 
 			const cancel = setLoading(ctx, 'tasks')
@@ -77,7 +82,7 @@ export default {
 			}
 		},
 
-		async update(ctx, task) {
+		async update(ctx: ActionContext<TaskState, RootStoreState>, task: ITask) {
 			const cancel = setLoading(ctx, 'tasks')
 
 			const taskService = new TaskService()
@@ -90,7 +95,7 @@ export default {
 			}
 		},
 
-		async delete(ctx, task) {
+		async delete(ctx: ActionContext<TaskState, RootStoreState>, task: ITask) {
 			const taskService = new TaskService()
 			const response = await taskService.delete(task)
 			ctx.commit('kanban/removeTaskInBucket', task, {root: true})
@@ -99,7 +104,13 @@ export default {
 
 		// Adds a task attachment in store.
 		// This is an action to be able to commit other mutations
-		addTaskAttachment(ctx, {taskId, attachment}) {
+		addTaskAttachment(ctx: ActionContext<TaskState, RootStoreState>, {
+			taskId,
+			attachment,
+		}: {
+			taskId: ITask['id']
+			attachment: IAttachment
+		}) {
 			const t = ctx.rootGetters['kanban/getTaskById'](taskId)
 			if (t.task !== null) {
 				const attachments = [
@@ -119,7 +130,13 @@ export default {
 			ctx.commit('attachments/add', attachment, {root: true})
 		},
 
-		async addAssignee(ctx, {user, taskId}) {
+		async addAssignee(ctx: ActionContext<TaskState, RootStoreState>, {
+			user,
+			taskId,
+		}: {
+			user: IUser,
+			taskId: ITask['id']
+		}) {
 			const taskAssignee = new TaskAssigneeModel({userId: user.id, taskId: taskId})
 
 			const taskAssigneeService = new TaskAssigneeService()
@@ -148,7 +165,13 @@ export default {
 			return r
 		},
 
-		async removeAssignee(ctx, {user, taskId}) {
+		async removeAssignee(ctx: ActionContext<TaskState, RootStoreState>, {
+			user,
+			taskId,
+		}: {
+			user: IUser,
+			taskId: ITask['id']
+		}) {
 			const taskAssignee = new TaskAssigneeModel({userId: user.id, taskId: taskId})
 
 			const taskAssigneeService = new TaskAssigneeService()
@@ -175,8 +198,14 @@ export default {
 
 		},
 
-		async addLabel(ctx, {label, taskId}) {
-			const labelTask = new LabelTaskModel({taskId: taskId, labelId: label.id})
+		async addLabel(ctx: ActionContext<TaskState, RootStoreState>, {
+			label,
+			taskId,
+		} : {
+			label: ILabel,
+			taskId: ITask['id']
+		}) {
+			const labelTask = new LabelTaskModel({taskId, labelId: label.id})
 
 			const labelTaskService = new LabelTaskService()
 			const r = await labelTaskService.create(labelTask)
@@ -205,8 +234,8 @@ export default {
 			return r
 		},
 
-		async removeLabel(ctx, {label, taskId}) {
-			const labelTask = new LabelTaskModel({taskId: taskId, labelId: label.id})
+		async removeLabel(ctx: ActionContext<TaskState, RootStoreState>, {label, taskId}) {
+			const labelTask = new LabelTaskModel({taskId, labelId: label.id})
 
 			const labelTaskService = new LabelTaskService()
 			const response = await labelTaskService.delete(labelTask)
@@ -234,7 +263,10 @@ export default {
 		},
 
 		// Do everything that is involved in finding, creating and adding the label to the task
-		async addLabelsToTask({rootState, dispatch}, { task, parsedLabels }) {
+		async addLabelsToTask({rootState, dispatch}: ActionContext<TaskState, RootStoreState>, {
+			task,
+			parsedLabels,
+		}) {
 			if (parsedLabels.length <= 0) {
 				return task
 			}
@@ -257,7 +289,10 @@ export default {
 			return task
 		},
 
-		findListId({ rootGetters }, { list: listName, listId }) {
+		findListId({ rootGetters }: ActionContext<TaskState, RootStoreState>, { list: listName, listId }: {
+			list: string,
+			listId: IList['id']
+		}) {
 			let foundListId = null
 			
 			// Uses the following ways to get the list id of the new task:
@@ -285,12 +320,14 @@ export default {
 			return foundListId
 		},
 
-		async createNewTask({dispatch, commit}, { 
+		async createNewTask({dispatch, commit}: ActionContext<TaskState, RootStoreState>, { 
 			title,
 			bucketId,
 			listId,
 			position,
-		}) {
+		} : 
+			Partial<ITask>,
+		) {
 			const cancel = setLoading({commit}, 'tasks')
 			const parsedTask = parseTaskText(title, getQuickAddMagicMode())
 		
diff --git a/src/store/types.ts b/src/store/types.ts
new file mode 100644
index 000000000..95aa82d6b
--- /dev/null
+++ b/src/store/types.ts
@@ -0,0 +1,116 @@
+import type { IBucket } from '@/models/bucket'
+import type { IUserSettings } from '@/models/userSettings'
+import type { IList } from '@/models/list'
+import type { IAttachment } from '@/models/attachment'
+import type { ILabel } from '@/models/label'
+import type { INamespace } from '@/models/namespace'
+
+export interface RootStoreState {
+	loading: boolean,
+	loadingModule: null,
+	currentList: IList,
+	background: string,
+	blurHash: string,
+	hasTasks: boolean,
+	menuActive: boolean,
+	keyboardShortcutsActive: boolean,
+	quickActionsActive: boolean,
+
+	// modules
+	attachments: AttachmentState,
+	auth: AuthState,
+	config: ConfigState,
+	kanban: KanbanState,
+	labels: LabelState,
+	lists: ListState,
+	namespaces: NamespaceState,
+	tasks: TaskState, 
+}
+
+export interface AttachmentState {
+	attachments: IAttachment[],
+}
+
+export const AUTH_TYPES = {
+	'UNKNOWN': 0,
+	'USER': 1,
+	'LINK_SHARE': 2,
+} as const
+
+export interface Info {
+	id: number // what kind of id is this?
+	type: typeof AUTH_TYPES[keyof typeof AUTH_TYPES],
+	getAvatarUrl: () => string
+	settings: IUserSettings
+	name: string
+	email: string
+	exp: any
+}
+export interface AuthState {
+	authenticated: boolean,
+	isLinkShareAuth: boolean,
+	info: Info | null,
+	needsTotpPasscode: boolean,
+	avatarUrl: string,
+	lastUserInfoRefresh: Date | null,
+	settings: IUserSettings,
+}
+
+export interface ConfigState {
+	version: string,
+	frontendUrl: string,
+	motd: string,
+	linkSharingEnabled: boolean,
+	maxFileSize: '20MB',
+	registrationEnabled: boolean,
+	availableMigrators: [],
+	taskAttachmentsEnabled: boolean,
+	totpEnabled: boolean,
+	enabledBackgroundProviders: [],
+	legal: {
+		imprintUrl: string,
+		privacyPolicyUrl: string,
+	},
+	caldavEnabled: boolean,
+	userDeletionEnabled: boolean,
+	taskCommentsEnabled: boolean,
+	auth: {
+		local: {
+			enabled: boolean,
+		},
+		openidConnect: {
+			enabled: boolean,
+			redirectUrl: string,
+			providers: [],
+		},
+	},
+}
+
+export interface KanbanState {
+	buckets: IBucket[],
+	listId: IList['id'],
+	bucketLoading: {},
+	taskPagesPerBucket: {
+		[id: IBucket['id']]: number
+	},
+	allTasksLoadedForBucket: {
+		[id: IBucket['id']]: boolean
+	},
+}
+
+export interface LabelState {
+	labels: {
+		[id: ILabel['id']]: ILabel
+	},
+	loaded: boolean,
+}
+
+export interface ListState {
+	[id: IList['id']]: IList
+}
+
+export interface NamespaceState {
+	namespaces: INamespace[]
+}
+
+export interface TaskState {}
diff --git a/src/views/filters/FilterEdit.vue b/src/views/filters/FilterEdit.vue
index 5e896470a..7a64a92d6 100644
--- a/src/views/filters/FilterEdit.vue
+++ b/src/views/filters/FilterEdit.vue
@@ -68,11 +68,11 @@ import SavedFilterService from '@/services/savedFilter'
 
 import {objectToSnakeCase} from '@/helpers/case'
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
-import type ListModel from '@/models/list'
+import type { IList } from '@/models/list'
 
 const {t} = useI18n({useScope: 'global'})
 
-function useSavedFilter(listId: MaybeRef<ListModel['id']>) {
+function useSavedFilter(listId: MaybeRef<IList['id']>) {
 	const filterService = shallowRef(new SavedFilterService())
 
 	const filter = ref(new SavedFilterModel())
diff --git a/src/views/labels/ListLabels.vue b/src/views/labels/ListLabels.vue
index ad9fae056..b2970ada0 100644
--- a/src/views/labels/ListLabels.vue
+++ b/src/views/labels/ListLabels.vue
@@ -113,7 +113,7 @@
 import {defineComponent} from 'vue'
 import {mapState} from 'vuex'
 
-import LabelModel from '../../models/label'
+import LabelModel, { type ILabel } from '../../models/label'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 
 import BaseButton from '@/components/base/BaseButton.vue'
@@ -150,7 +150,7 @@ export default defineComponent({
 		loading: state => state[LOADING] && state[LOADING_MODULE] === 'labels',
 	}),
 	methods: {
-		deleteLabel(label: LabelModel) {
+		deleteLabel(label: ILabel) {
 			this.showDeleteModal = false
 			this.isLabelEdit = false
 			return this.$store.dispatch('labels/deleteLabel', label)
@@ -158,7 +158,7 @@ export default defineComponent({
 		editLabelSubmit() {
 			return this.$store.dispatch('labels/updateLabel', this.labelEditLabel)
 		},
-		editLabel(label: LabelModel) {
+		editLabel(label: ILabel) {
 			if (label.createdBy.id !== this.userInfo.id) {
 				return
 			}
@@ -180,7 +180,7 @@ export default defineComponent({
 			this.editorActive = false
 			this.$nextTick(() => this.editorActive = true)
 		},
-		showDeleteDialoge(label: LabelModel) {
+		showDeleteDialoge(label: ILabel) {
 			this.labelToDelete = label
 			this.showDeleteModal = true
 		},
diff --git a/src/views/list/ListList.vue b/src/views/list/ListList.vue
index 1bfb76592..27a995bae 100644
--- a/src/views/list/ListList.vue
+++ b/src/views/list/ListList.vue
@@ -153,9 +153,9 @@ import {ALPHABETICAL_SORT} from '@/components/list/partials/filters.vue'
 
 import draggable from 'zhyswan-vuedraggable'
 import {calculateItemPosition} from '../../helpers/calculateItemPosition'
-import type TaskModel from '@/models/task'
+import type { ITask } from '@/models/task'
 
-function sortTasks(tasks: TaskModel[]) {
+function sortTasks(tasks: ITask[]) {
 	if (tasks === null || tasks === []) {
 		return
 	}
@@ -274,7 +274,7 @@ export default defineComponent({
 		focusNewTaskInput() {
 			this.$refs.addTask.focusTaskInput()
 		},
-		updateTaskList(task: TaskModel) {
+		updateTaskList(task: ITask) {
 			if ( this.isAlphabeticalSorting ) {
 				// reload tasks with current filter and sorting
 				this.loadTasks(1, undefined, undefined, true)
@@ -288,11 +288,11 @@ export default defineComponent({
 
 			this.$store.commit(HAS_TASKS, true)
 		},
-		editTask(id: TaskModel['id']) {
+		editTask(id: ITask['id']) {
 			this.taskEditTask = {...this.tasks.find(t => t.id === parseInt(id))}
 			this.isTaskEdit = true
 		},
-		updateTasks(updatedTask: TaskModel) {
+		updateTasks(updatedTask: ITask) {
 			for (const t in this.tasks) {
 				if (this.tasks[t].id === updatedTask.id) {
 					this.tasks[t] = updatedTask
diff --git a/src/views/list/ListTable.vue b/src/views/list/ListTable.vue
index f8b2c7082..7d83da8b0 100644
--- a/src/views/list/ListTable.vue
+++ b/src/views/list/ListTable.vue
@@ -197,7 +197,7 @@ import Pagination from '@/components/misc/pagination.vue'
 import Popup from '@/components/misc/popup.vue'
 
 import {useTaskList} from '@/composables/taskList'
-import type TaskModel from '@/models/task'
+import type { ITask } from '@/models/task'
 
 const ACTIVE_COLUMNS_DEFAULT = {
 	id: true,
@@ -253,7 +253,7 @@ const {
 	currentPage,
 	sortByParam,
 } = taskList
-const tasks: Ref<TaskModel[]> = taskList.tasks
+const tasks: Ref<ITask[]> = taskList.tasks
 
 Object.assign(params.value, {
 	filter_by: [],
diff --git a/src/views/list/settings/duplicate.vue b/src/views/list/settings/duplicate.vue
index 83781404f..deb3769cc 100644
--- a/src/views/list/settings/duplicate.vue
+++ b/src/views/list/settings/duplicate.vue
@@ -30,7 +30,7 @@ import CreateEdit from '@/components/misc/create-edit.vue'
 import Multiselect from '@/components/input/multiselect.vue'
 
 import ListDuplicateModel from '@/models/listDuplicateModel'
-import NamespaceModel from '@/models/namespace'
+import type {INamespace} from '@/models/namespace'
 
 import {success} from '@/message'
 import {useTitle} from '@/composables/useTitle'
@@ -44,9 +44,9 @@ const {
 	findNamespaces,
 } = useNameSpaceSearch()
 
-const selectedNamespace = ref<NamespaceModel>()
+const selectedNamespace = ref<INamespace>()
 
-function selectNamespace(namespace: NamespaceModel) {
+function selectNamespace(namespace: INamespace) {
 	selectedNamespace.value = namespace
 }
 
diff --git a/src/views/list/settings/edit.vue b/src/views/list/settings/edit.vue
index 67055e442..8b7ab391e 100644
--- a/src/views/list/settings/edit.vue
+++ b/src/views/list/settings/edit.vue
@@ -80,14 +80,14 @@ import ColorPicker from '@/components/input/colorPicker.vue'
 import CreateEdit from '@/components/misc/create-edit.vue'
 
 import {CURRENT_LIST} from '@/store/mutation-types'
-import type ListModel from '@/models/list'
+import type { IList } from '@/models/list'
 
 import { useList } from '@/composables/useList'
 import { useTitle } from '@/composables/useTitle'
 
 const props = defineProps({
 	listId: {
-		type: Number as PropType<ListModel['id']>,
+		type: Number as PropType<IList['id']>,
 		required: true,
 	},
 })
diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue
index 7bca07693..1db62ac5c 100644
--- a/src/views/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -49,7 +49,6 @@ import {useStore} from 'vuex'
 import {useRoute, useRouter} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
-import type TaskModel from '@/models/task'
 import {formatDate} from '@/helpers/time/formatDate'
 import {setTitle} from '@/helpers/setTitle'
 
@@ -59,13 +58,14 @@ import DatepickerWithRange from '@/components/date/datepickerWithRange.vue'
 import {DATE_RANGES} from '@/components/date/dateRanges'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import LlamaCool from '@/assets/llama-cool.svg?component'
+import type { ITask } from '@/models/task'
 
 const store = useStore()
 const route = useRoute()
 const router = useRouter()
 const {t} = useI18n({useScope: 'global'})
 
-const tasks = ref<TaskModel[]>([])
+const tasks = ref<ITask[]>([])
 const showNothingToDo = ref<boolean>(false)
 
 setTimeout(() => showNothingToDo.value = true, 100)
@@ -182,7 +182,7 @@ async function loadPendingTasks(from: string, to: string) {
 }
 
 // FIXME: this modification should happen in the store
-function updateTasks(updatedTask: TaskModel) {
+function updateTasks(updatedTask: ITask) {
 	for (const t in tasks.value) {
 		if (tasks.value[t].id === updatedTask.id) {
 			tasks.value[t] = updatedTask
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 3d7831ad1..993d8de74 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -425,7 +425,7 @@
 import {defineComponent} from 'vue'
 
 import TaskService from '../../services/task'
-import TaskModel from '../../models/task'
+import TaskModel, { type ITask } from '@/models/task'
 
 import { PRIORITIES as priorites } from '@/models/constants/priorities'
 import {RIGHTS as rights} from '@/models/constants/rights'
@@ -452,10 +452,10 @@ import {CURRENT_LIST} from '@/store/mutation-types'
 import {uploadFile} from '@/helpers/attachments'
 import ChecklistSummary from '../../components/tasks/partials/checklist-summary.vue'
 import CreatedUpdated from '@/components/tasks/partials/createdUpdated.vue'
-import type ListModel from '@/models/list'
 import { setTitle } from '@/helpers/setTitle'
 import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
 import {getListTitle} from '@/helpers/getListTitle'
+import type { IList } from '@/models/list'
 
 function scrollIntoView(el) {
 	if (!el) {
@@ -597,7 +597,7 @@ export default defineComponent({
 			return uploadFile(this.taskId, ...args)
 		},
 
-		async loadTask(taskId: TaskModel['id']) {
+		async loadTask(taskId: ITask['id']) {
 			if (taskId === undefined) {
 				return
 			}
@@ -703,7 +703,7 @@ export default defineComponent({
 			this.saveTask(true, this.toggleTaskDone)
 		},
 
-		async changeList(list: ListModel) {
+		async changeList(list: IList) {
 			this.$store.commit('kanban/removeTaskInBucket', this.task)
 			this.task.listId = list.id
 			await this.saveTask()
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index 485c5c0a6..a5b6e8801 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -162,23 +162,23 @@
 
 <script lang="ts" setup>
 import {computed, ref} from 'vue'
+import {useI18n} from 'vue-i18n'
 
 import Editor from '@/components/input/AsyncEditor'
 import {useStore} from 'vuex'
 
-import TeamService from '../../services/team'
-import type TeamModel from '../../models/team'
-import TeamMemberService from '../../services/teamMember'
-import type TeamMemberModel from '../../models/teamMember'
-import type UserModel from '../../models/user'
-import UserService from '../../services/user'
+import TeamService from '@/services/team'
+import TeamMemberService from '@/services/teamMember'
+import UserService from '@/services/user'
 import {RIGHTS as Rights} from '@/models/constants/rights'
 
 import Multiselect from '@/components/input/multiselect.vue'
 import {useRoute, useRouter} from 'vue-router'
 import {useTitle} from '@/composables/useTitle'
-import {useI18n} from 'vue-i18n'
 import {success} from '@/message'
+import type { ITeam } from '@/models/team'
+import type { IUser } from '@/models/user'
+import type { ITeamMember } from '@/models/teamMember'
 
 const store = useStore()
 const route = useRoute()
@@ -198,11 +198,11 @@ const teamService = ref<TeamService>(new TeamService())
 const teamMemberService = ref<TeamMemberService>(new TeamMemberService())
 const userService = ref<UserService>(new UserService())
 
-const team = ref<TeamModel>()
+const team = ref<ITeam>()
 const teamId = computed(() => route.params.id)
-const memberToDelete = ref<TeamMemberModel>()
-const newMember = ref<UserModel>()
-const foundUsers = ref<UserModel[]>()
+const memberToDelete = ref<ITeamMember>()
+const newMember = ref<IUser>()
+const foundUsers = ref<IUser[]>()
 
 const showDeleteModal = ref(false)
 const showUserDeleteModal = ref(false)
@@ -257,7 +257,7 @@ async function addUser() {
 	success({message: t('team.edit.userAddedSuccess')})
 }
 
-async function toggleUserType(member: TeamMemberModel) {
+async function toggleUserType(member: ITeamMember) {
 	// FIXME: direct manipulation
 	member.admin = !member.admin
 	member.teamId = teamId.value
@@ -282,7 +282,7 @@ async function findUser(query: string) {
 	}
 
 	const users = await userService.value.getAll({}, {s: query})
-	foundUsers.value = users.filter((u: UserModel) => u.id !== userInfo.value.id)
+	foundUsers.value = users.filter((u: IUser) => u.id !== userInfo.value.id)
 }
 </script>
 
diff --git a/src/views/user/settings/Caldav.vue b/src/views/user/settings/Caldav.vue
index ad63f8d33..5d8cec387 100644
--- a/src/views/user/settings/Caldav.vue
+++ b/src/views/user/settings/Caldav.vue
@@ -77,8 +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 type CaldavTokenModel from '@/models/caldavToken'
 import { formatDateShort } from '@/helpers/time/formatDate'
+import type { ICaldavToken } from '@/models/caldavToken'
 
 const copy = useCopyToClipboard()
 
@@ -86,19 +86,19 @@ const {t} = useI18n({useScope: 'global'})
 useTitle(() => `${t('user.settings.caldav.title')} - ${t('user.settings.title')}`)
 
 const service = shallowReactive(new CaldavTokenService())
-const tokens = ref<CaldavTokenModel[]>([])
+const tokens = ref<ICaldavToken[]>([])
 
-service.getAll().then((result: CaldavTokenModel[]) => {
+service.getAll().then((result: ICaldavToken[]) => {
 	tokens.value = result
 })
 
-const newToken = ref<CaldavTokenModel>()
+const newToken = ref<ICaldavToken>()
 async function createToken() {
-	newToken.value = await service.create({}) as CaldavTokenModel
+	newToken.value = await service.create({}) as ICaldavToken
 	tokens.value.push(newToken.value)
 }
 
-async function deleteToken(token: CaldavTokenModel) {
+async function deleteToken(token: ICaldavToken) {
 	const r = await service.delete(token)
 	tokens.value = tokens.value.filter(({id}) => id !== token.id)
 	success(r)

From 79e7e4a8aefe9f4d00bcbad76c4206c409384b61 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 21 Jul 2022 00:43:21 +0200
Subject: [PATCH 12/32] feat: use lib ESNext setting for typescript

---
 tsconfig.app.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tsconfig.app.json b/tsconfig.app.json
index 5205363de..2d5644c2b 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -5,6 +5,7 @@
   "compilerOptions": {
     "composite": true,
     "baseUrl": ".",
+    "lib": ["ESNext"],
 
     "importHelpers": true,
     "sourceMap": true,

From 80eaf38090413b74524ddc5a7dfcc9a845a6ba26 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 21 Jul 2022 00:43:37 +0200
Subject: [PATCH 13/32] fix: add lodash.clonedeep types

---
 package.json |  1 +
 yarn.lock    | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/package.json b/package.json
index 756f60cdb..9db4b45c3 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "@sentry/tracing": "7.12.1",
     "@sentry/vue": "7.12.1",
     "@types/is-touch-device": "1.0.0",
+    "@types/lodash.clonedeep": "^4.5.7",
     "@types/sortablejs": "1.13.0",
     "@vueuse/core": "9.1.1",
     "@vueuse/router": "9.1.1",
diff --git a/yarn.lock b/yarn.lock
index b5ef10c05..d815c628e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2270,6 +2270,18 @@
   dependencies:
     "@types/node" "*"
 
+"@types/lodash.clonedeep@^4.5.7":
+  version "4.5.7"
+  resolved "https://registry.yarnpkg.com/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.7.tgz#0e119f582ed6f9e6b373c04a644651763214f197"
+  integrity sha512-ccNqkPptFIXrpVqUECi60/DFxjNKsfoQxSQsgcBJCX/fuX1wgyQieojkcWH/KpE3xzLoWN/2k+ZeGqIN3paSvw==
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash@*":
+  version "4.14.182"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
+  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+
 "@types/marked@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.1.tgz#d588a7bbc4d6551c5e75249bc106ffda96ae33c5"

From a6b96f857d949874ba75f657b887a7c997aa7c57 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 21 Jul 2022 18:35:37 +0200
Subject: [PATCH 14/32] feat: extend mode interface from class instead from
 interface

---
 src/models/attachment.ts         | 3 +--
 src/models/avatar.ts             | 4 ++--
 src/models/backgroundImage.ts    | 4 ++--
 src/models/bucket.ts             | 4 ++--
 src/models/caldavToken.ts        | 4 ++--
 src/models/emailUpdate.ts        | 2 +-
 src/models/file.ts               | 2 +-
 src/models/label.ts              | 2 +-
 src/models/labelTask.ts          | 2 +-
 src/models/linkShare.ts          | 4 ++--
 src/models/list.ts               | 4 ++--
 src/models/listDuplicateModel.ts | 2 +-
 src/models/namespace.ts          | 4 ++--
 src/models/notification.ts       | 2 +-
 src/models/passwordReset.ts      | 2 +-
 src/models/passwordUpdate.ts     | 2 +-
 src/models/savedFilter.ts        | 2 +-
 src/models/subscription.ts       | 2 +-
 src/models/task.ts               | 2 +-
 src/models/taskAssignee.ts       | 2 +-
 src/models/taskComment.ts        | 2 +-
 src/models/taskRelation.ts       | 2 +-
 src/models/team.ts               | 2 +-
 src/models/teamList.ts           | 2 +-
 src/models/teamMember.ts         | 2 +-
 src/models/teamNamespace.ts      | 2 +-
 src/models/teamShareBase.ts      | 2 +-
 src/models/totp.ts               | 2 +-
 src/models/user.ts               | 2 +-
 src/models/userList.ts           | 2 +-
 src/models/userNamespace.ts      | 2 +-
 src/models/userSettings.ts       | 2 +-
 src/models/userShareBase.ts      | 2 +-
 33 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/src/models/attachment.ts b/src/models/attachment.ts
index d2765c4a6..c5c9933c3 100644
--- a/src/models/attachment.ts
+++ b/src/models/attachment.ts
@@ -1,9 +1,8 @@
 import AbstractModel from './abstractModel'
 import UserModel, {type IUser} from './user'
 import FileModel, {type IFile} from './file'
-import type {IAbstract} from './abstractModel'
 
-export interface IAttachment extends IAbstract {
+export interface IAttachment extends AbstractModel {
 	id: number
 	taskId: number
 	createdBy: IUser
diff --git a/src/models/avatar.ts b/src/models/avatar.ts
index e6a670912..411e3cd3e 100644
--- a/src/models/avatar.ts
+++ b/src/models/avatar.ts
@@ -1,8 +1,8 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 
 export type AvatarProvider = 'default' | 'initials' | 'gravatar' | 'marble' | 'upload'
 
-export interface IAvatar extends IAbstract {
+export interface IAvatar extends AbstractModel {
 	avatarProvider: AvatarProvider
 }
 
diff --git a/src/models/backgroundImage.ts b/src/models/backgroundImage.ts
index a5dbf8d76..21be0773e 100644
--- a/src/models/backgroundImage.ts
+++ b/src/models/backgroundImage.ts
@@ -1,6 +1,6 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 
-export interface IBackgroundImage extends IAbstract {
+export interface IBackgroundImage extends AbstractModel {
 	id: number
 	url: string
 	thumb: string
diff --git a/src/models/bucket.ts b/src/models/bucket.ts
index 89bca3e91..f4b437594 100644
--- a/src/models/bucket.ts
+++ b/src/models/bucket.ts
@@ -1,8 +1,8 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 import UserModel, { type IUser } from './user'
 import TaskModel, { type ITask } from './task'
 
-export interface IBucket extends IAbstract {
+export interface IBucket extends AbstractModel {
 	id: number
 	title: string
 	listId: number
diff --git a/src/models/caldavToken.ts b/src/models/caldavToken.ts
index 5604eb42e..b2186b0a4 100644
--- a/src/models/caldavToken.ts
+++ b/src/models/caldavToken.ts
@@ -1,6 +1,6 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 
-export interface ICaldavToken extends IAbstract {
+export interface ICaldavToken extends AbstractModel {
 	id: number;
 	created: Date;
 }
diff --git a/src/models/emailUpdate.ts b/src/models/emailUpdate.ts
index 2258176ef..4f6f4385c 100644
--- a/src/models/emailUpdate.ts
+++ b/src/models/emailUpdate.ts
@@ -1,6 +1,6 @@
 import AbstractModel from './abstractModel'
 
-interface IEmailUpdate {
+interface IEmailUpdate extends AbstractModel {
 	newEmail: string
 	password: string
 }
diff --git a/src/models/file.ts b/src/models/file.ts
index c6248bafd..81240a792 100644
--- a/src/models/file.ts
+++ b/src/models/file.ts
@@ -1,6 +1,6 @@
 import AbstractModel from './abstractModel'
 
-export interface IFile {
+export interface IFile extends AbstractModel {
 	id: number
 	mime: string
 	name: string
diff --git a/src/models/label.ts b/src/models/label.ts
index a4dd72701..75a104e30 100644
--- a/src/models/label.ts
+++ b/src/models/label.ts
@@ -4,7 +4,7 @@ import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 const DEFAULT_LABEL_BACKGROUND_COLOR = 'e8e8e8'
 
-export interface ILabel {
+export interface ILabel extends AbstractModel {
 	id: number
 	title: string
 	hexColor: string
diff --git a/src/models/labelTask.ts b/src/models/labelTask.ts
index 80dee9ded..2179f9a8c 100644
--- a/src/models/labelTask.ts
+++ b/src/models/labelTask.ts
@@ -1,6 +1,6 @@
 import AbstractModel from './abstractModel'
 
-interface ILabel {
+interface ILabel extends AbstractModel {
 	id: number
 	taskId: number
 	labelId: number
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index 1b1ae8804..10100ee42 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -1,8 +1,8 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 import UserModel, { type IUser } from './user'
 import {RIGHTS, type Right} from '@/models/constants/rights'
 
-export interface ILinkShare extends IAbstract {
+export interface ILinkShare extends AbstractModel {
 	id: number
 	hash: string
 	right: Right
diff --git a/src/models/list.ts b/src/models/list.ts
index a3426f840..7ced89296 100644
--- a/src/models/list.ts
+++ b/src/models/list.ts
@@ -1,4 +1,4 @@
-import AbstractModel, { type IAbstract } from '@/models/abstractModel'
+import AbstractModel from '@/models/abstractModel'
 import TaskModel, { type ITask } from '@/models/task'
 import UserModel, { type IUser } from '@/models/user'
 import SubscriptionModel, { type ISubscription } from '@/models/subscription'
@@ -6,7 +6,7 @@ import type { INamespace } from '@/models/namespace'
 
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 
-export interface IList extends IAbstract {
+export interface IList extends AbstractModel {
 	id: number
 	title: string
 	description: string
diff --git a/src/models/listDuplicateModel.ts b/src/models/listDuplicateModel.ts
index bc3272ce2..408965372 100644
--- a/src/models/listDuplicateModel.ts
+++ b/src/models/listDuplicateModel.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 import ListModel, { type IList } from './list'
 import type { INamespace } from './namespace'
 
-export interface ListDuplicate {
+export interface ListDuplicate extends AbstractModel {
 	listId: number
 	namespaceId: INamespace['id']
 	list: IList
diff --git a/src/models/namespace.ts b/src/models/namespace.ts
index ee120a962..5d8c608c6 100644
--- a/src/models/namespace.ts
+++ b/src/models/namespace.ts
@@ -1,9 +1,9 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 import ListModel, { type IList } from './list'
 import UserModel, { type IUser } from './user'
 import SubscriptionModel, { type ISubscription } from '@/models/subscription'
 
-export interface INamespace extends IAbstract {
+export interface INamespace extends AbstractModel {
 	id: number
 	title: string
 	description: string
diff --git a/src/models/notification.ts b/src/models/notification.ts
index a21563205..4d9f48ab2 100644
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@@ -40,7 +40,7 @@ interface NotificationMemberAdded extends Notification {
 	team: ITeam
 }
 
-export interface INotification {
+export interface INotification extends AbstractModel {
 	id: number
 	name: string
 	notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
diff --git a/src/models/passwordReset.ts b/src/models/passwordReset.ts
index 0dc8ebed0..dd05f37a7 100644
--- a/src/models/passwordReset.ts
+++ b/src/models/passwordReset.ts
@@ -1,6 +1,6 @@
 import AbstractModel from './abstractModel'
 
-export interface IPasswordReset {
+export interface IPasswordReset extends AbstractModel {
 	token: string
 	newPassword: string
 	email: string
diff --git a/src/models/passwordUpdate.ts b/src/models/passwordUpdate.ts
index a91a59c13..51640e323 100644
--- a/src/models/passwordUpdate.ts
+++ b/src/models/passwordUpdate.ts
@@ -1,6 +1,6 @@
 import AbstractModel from '@/models/abstractModel'
 
-export interface IPasswordUpdate {
+export interface IPasswordUpdate extends AbstractModel {
 	newPassword: string
 	oldPassword: string
 }
diff --git a/src/models/savedFilter.ts b/src/models/savedFilter.ts
index 60c0521cf..168613067 100644
--- a/src/models/savedFilter.ts
+++ b/src/models/savedFilter.ts
@@ -1,7 +1,7 @@
 import AbstractModel from '@/models/abstractModel'
 import UserModel, { type IUser } from '@/models/user'
 
-export interface ISavedFilter {
+export interface ISavedFilter extends AbstractModel {
 	id: 0
 	title: string
 	description: string
diff --git a/src/models/subscription.ts b/src/models/subscription.ts
index 013aef7d8..bd52d0d6d 100644
--- a/src/models/subscription.ts
+++ b/src/models/subscription.ts
@@ -1,7 +1,7 @@
 import AbstractModel from '@/models/abstractModel'
 import UserModel, { type IUser } from '@/models/user'
 
-export interface ISubscription {
+export interface ISubscription extends AbstractModel {
 	id: number
 	entity: string // FIXME: correct type?
 	entityId: number // FIXME: correct type?
diff --git a/src/models/task.ts b/src/models/task.ts
index 518c53a2f..92003d6da 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -26,7 +26,7 @@ export interface RepeatAfter {
 	amount: number
 }
 
-export interface ITask {
+export interface ITask extends AbstractModel {
 	id: number
 	title: string
 	description: string
diff --git a/src/models/taskAssignee.ts b/src/models/taskAssignee.ts
index 800e50afb..5ceb15ad8 100644
--- a/src/models/taskAssignee.ts
+++ b/src/models/taskAssignee.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 import type { ITask } from './task'
 import type { IUser } from './user'
 
-export interface ITaskAssignee {
+export interface ITaskAssignee extends AbstractModel {
 	created: Date
 	userId: IUser['id']
 	taskId: ITask['id']
diff --git a/src/models/taskComment.ts b/src/models/taskComment.ts
index 93d58958a..15ca3b6d3 100644
--- a/src/models/taskComment.ts
+++ b/src/models/taskComment.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 import UserModel, { type IUser } from './user'
 import type { ITask } from './task'
 
-export interface ITaskComment {
+export interface ITaskComment extends AbstractModel {
 	id: number
 	taskId: ITask['id']
 	comment: string
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index 2f3b54cbc..e86e9dab0 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -19,7 +19,7 @@ export const RELATION_KINDS = [...Object.values(RELATION_KIND)] as const
 
 export type RelationKind = typeof RELATION_KINDS[number]
 
-export interface ITaskRelationModel {
+export interface ITaskRelationModel extends AbstractModel {
 	id: number
 	otherTaskId: ITask['id']
 	taskId: ITask['id']
diff --git a/src/models/team.ts b/src/models/team.ts
index e76fa216f..b81c99d8e 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -3,7 +3,7 @@ import UserModel, { type IUser } from './user'
 import TeamMemberModel, { type ITeamMember } from './teamMember'
 import {RIGHTS, type Right} from '@/models/constants/rights'
 
-export interface ITeam {
+export interface ITeam extends AbstractModel {
 	id: number
 	name: string
 	description: string
diff --git a/src/models/teamList.ts b/src/models/teamList.ts
index 0dce79b60..d3bbb42ab 100644
--- a/src/models/teamList.ts
+++ b/src/models/teamList.ts
@@ -1,7 +1,7 @@
 import TeamShareBaseModel from './teamShareBase'
 import type { IList } from './list'
 
-export interface ITeamList {
+export interface ITeamList extends TeamShareBaseModel {
 	listId: IList['id']
 }
 
diff --git a/src/models/teamMember.ts b/src/models/teamMember.ts
index ee6eb1619..f699408ad 100644
--- a/src/models/teamMember.ts
+++ b/src/models/teamMember.ts
@@ -1,7 +1,7 @@
 import UserModel from './user'
 import type { IList } from './list'
 
-export interface ITeamMember {
+export interface ITeamMember extends UserModel {
 	admin: boolean
 	teamId: IList['id']
 }
diff --git a/src/models/teamNamespace.ts b/src/models/teamNamespace.ts
index a550bbeea..2064d1412 100644
--- a/src/models/teamNamespace.ts
+++ b/src/models/teamNamespace.ts
@@ -1,7 +1,7 @@
 import TeamShareBaseModel from './teamShareBase'
 import type { INamespace } from './namespace'
 
-export interface ITeamNamespace {
+export interface ITeamNamespace extends TeamShareBaseModel {
 	namespaceId: INamespace['id']
 }
 
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index 3983905c7..c3e943701 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 import {RIGHTS, type Right} from '@/models/constants/rights'
 import type { ITeam } from './team'
 
-export interface ITeamShareBase {
+export interface ITeamShareBase extends AbstractModel {
 	teamId: ITeam['id']
 	right: Right
 
diff --git a/src/models/totp.ts b/src/models/totp.ts
index ab6415987..a47044c5e 100644
--- a/src/models/totp.ts
+++ b/src/models/totp.ts
@@ -1,6 +1,6 @@
 import AbstractModel from './abstractModel'
 
-export interface ITotp {
+export interface ITotp extends AbstractModel {
 	secret: string
 	enabled: boolean
 	url: string
diff --git a/src/models/user.ts b/src/models/user.ts
index f3908149e..eaa472a75 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -1,7 +1,7 @@
 import AbstractModel from './abstractModel'
 import UserSettingsModel, { type IUserSettings } from '@/models/userSettings'
 
-export interface IUser {
+export interface IUser extends AbstractModel {
 	id: number
 	email: string
 	username: string
diff --git a/src/models/userList.ts b/src/models/userList.ts
index 1bc597adf..d0b9cbd36 100644
--- a/src/models/userList.ts
+++ b/src/models/userList.ts
@@ -1,7 +1,7 @@
 import UserShareBaseModel from './userShareBase'
 import type { IList } from './list'
 
-export interface IUserList {
+export interface IUserList extends UserShareBaseModel {
 	listId: IList['id']
 }
 
diff --git a/src/models/userNamespace.ts b/src/models/userNamespace.ts
index a21995d1a..2a11a35e7 100644
--- a/src/models/userNamespace.ts
+++ b/src/models/userNamespace.ts
@@ -1,7 +1,7 @@
 import UserShareBaseModel from './userShareBase'
 import type { INamespace } from './namespace'
 
-export interface IUserNamespace {
+export interface IUserNamespace extends UserShareBaseModel {
 	namespaceId: INamespace['id']
 }
 
diff --git a/src/models/userSettings.ts b/src/models/userSettings.ts
index 4e7fcedec..a5db3f807 100644
--- a/src/models/userSettings.ts
+++ b/src/models/userSettings.ts
@@ -2,7 +2,7 @@
 import AbstractModel from './abstractModel'
 import type { IList } from './list'
 
-export interface IUserSettings {
+export interface IUserSettings extends AbstractModel {
 	name: string
 	emailRemindersEnabled: boolean
 	discoverableByName: boolean
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index fadeb894f..8eda9ed29 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -2,7 +2,7 @@ import AbstractModel from './abstractModel'
 import {RIGHTS, type Right} from '@/models/constants/rights'
 import type { IUser } from './user'
 
-export interface IUserShareBase {
+export interface IUserShareBase extends AbstractModel {
 	userId: IUser['id']
 	right: Right
 

From 244478400ad8b8243ae2b29d741c03fa2b83601b Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 21 Jul 2022 18:45:58 +0200
Subject: [PATCH 15/32] feat: improve store typing

---
 src/App.vue                                   |  2 +-
 src/components/date/datepickerWithRange.vue   |  2 +-
 src/components/home/MenuButton.vue            |  2 +-
 src/components/home/TheNavigation.vue         |  2 +-
 src/components/home/contentAuth.vue           |  2 +-
 src/components/home/contentLinkShare.vue      |  2 +-
 src/components/home/navigation.vue            |  2 +-
 .../list/list-settings-dropdown.vue           |  2 +-
 src/components/list/partials/list-card.vue    |  2 +-
 .../misc/keyboard-shortcuts/index.vue         |  2 +-
 src/components/misc/legal.vue                 |  2 +-
 src/components/misc/no-auth-wrapper.vue       |  2 +-
 src/components/misc/ready.vue                 |  2 +-
 .../notifications/notifications.vue           |  2 +-
 src/components/sharing/linkSharing.vue        |  2 +-
 src/components/sharing/userTeam.vue           |  2 +-
 src/components/tasks/add-task.vue             |  2 +-
 src/components/tasks/partials/comments.vue    |  2 +-
 src/components/tasks/partials/defer-task.vue  |  2 +-
 src/components/tasks/partials/description.vue |  2 +-
 .../tasks/partials/editAssignees.vue          |  2 +-
 src/components/tasks/partials/editLabels.vue  |  2 +-
 src/components/tasks/partials/heading.vue     |  2 +-
 src/components/tasks/partials/listSearch.vue  |  2 +-
 src/composables/useNamespaceSearch.ts         |  2 +-
 src/main.ts                                   |  4 +-
 src/store/index.ts                            | 14 ++++-
 src/store/modules/attachments.ts              | 17 +++---
 src/store/modules/auth.ts                     | 50 +++++++++---------
 src/store/modules/config.ts                   | 16 +++---
 src/store/modules/kanban.ts                   | 52 ++++++++++---------
 src/store/modules/labels.ts                   | 30 ++++++-----
 src/store/modules/lists.ts                    | 31 ++++++-----
 src/store/modules/namespaces.ts               | 40 +++++++-------
 src/store/modules/tasks.ts                    | 32 ++++++------
 src/store/types.ts                            | 22 ++++----
 src/types/shims-vue.d.ts                      | 27 ++++++++--
 src/views/Home.vue                            |  2 +-
 src/views/list/ListGantt.vue                  |  2 +-
 src/views/list/ListWrapper.vue                |  2 +-
 src/views/list/NewList.vue                    |  2 +-
 src/views/list/settings/archive.vue           |  2 +-
 src/views/list/settings/delete.vue            |  2 +-
 src/views/list/settings/duplicate.vue         |  2 +-
 src/views/list/settings/share.vue             |  2 +-
 src/views/migrator/Migrate.vue                |  2 +-
 src/views/namespaces/settings/edit.vue        |  2 +-
 src/views/namespaces/settings/share.vue       |  2 +-
 src/views/sharing/LinkSharingAuth.vue         |  2 +-
 src/views/tasks/ShowTasks.vue                 |  2 +-
 src/views/teams/EditTeam.vue                  |  2 +-
 src/views/user/OpenIdAuth.vue                 |  2 +-
 src/views/user/settings/Avatar.vue            |  2 +-
 src/views/user/settings/Caldav.vue            |  2 +-
 src/views/user/settings/DataExport.vue        |  2 +-
 src/views/user/settings/Deletion.vue          |  2 +-
 src/views/user/settings/EmailUpdate.vue       |  2 +-
 src/views/user/settings/General.vue           |  2 +-
 src/views/user/settings/PasswordUpdate.vue    |  2 +-
 src/views/user/settings/TOTP.vue              |  2 +-
 60 files changed, 239 insertions(+), 192 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d4ac424d6..c63cf7bf4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,7 +18,7 @@
 import {computed, watch, type Ref} from 'vue'
 import {useRouter} from 'vue-router'
 import {useRouteQuery} from '@vueuse/router'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 import isTouchDevice from 'is-touch-device'
 import {success} from '@/message'
diff --git a/src/components/date/datepickerWithRange.vue b/src/components/date/datepickerWithRange.vue
index 00302eac1..848877c45 100644
--- a/src/components/date/datepickerWithRange.vue
+++ b/src/components/date/datepickerWithRange.vue
@@ -71,7 +71,7 @@
 
 <script lang="ts" setup>
 import {computed, ref, watch} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import flatPickr from 'vue-flatpickr-component'
diff --git a/src/components/home/MenuButton.vue b/src/components/home/MenuButton.vue
index 8d2e0d664..49a252863 100644
--- a/src/components/home/MenuButton.vue
+++ b/src/components/home/MenuButton.vue
@@ -11,7 +11,7 @@
 
 <script setup lang="ts">
 import {computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 
diff --git a/src/components/home/TheNavigation.vue b/src/components/home/TheNavigation.vue
index e8f72952a..22dd35cf8 100644
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@@ -88,7 +88,7 @@
 
 <script setup lang="ts">
 import {ref, computed, onMounted, nextTick} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRouter} from 'vue-router'
 
 import {QUICK_ACTIONS_ACTIVE} from '@/store/mutation-types'
diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index 02c87356c..c4b420153 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -61,7 +61,7 @@
 
 <script lang="ts" setup>
 import {watch, computed, shallowRef, watchEffect, type VNode, h} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {useEventListener} from '@vueuse/core'
 
diff --git a/src/components/home/contentLinkShare.vue b/src/components/home/contentLinkShare.vue
index f073a7f41..0a02db1d8 100644
--- a/src/components/home/contentLinkShare.vue
+++ b/src/components/home/contentLinkShare.vue
@@ -23,7 +23,7 @@
 
 <script lang="ts" setup>
 import {computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Logo from '@/components/home/Logo.vue'
 import PoweredByLink from './PoweredByLink.vue'
diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 53f2a9f7a..108d7fd71 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -141,7 +141,7 @@
 
 <script setup lang="ts">
 import {ref, computed, onMounted, onBeforeMount} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import draggable from 'zhyswan-vuedraggable'
 import type {SortableEvent} from 'sortablejs'
 
diff --git a/src/components/list/list-settings-dropdown.vue b/src/components/list/list-settings-dropdown.vue
index 180596b2c..611bf8708 100644
--- a/src/components/list/list-settings-dropdown.vue
+++ b/src/components/list/list-settings-dropdown.vue
@@ -77,7 +77,7 @@
 
 <script setup lang="ts">
 import {ref, computed, watchEffect, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 import Dropdown from '@/components/misc/dropdown.vue'
diff --git a/src/components/list/partials/list-card.vue b/src/components/list/partials/list-card.vue
index 53317c4a2..0597639d2 100644
--- a/src/components/list/partials/list-card.vue
+++ b/src/components/list/partials/list-card.vue
@@ -37,7 +37,7 @@
 
 <script lang="ts" setup>
 import {type PropType, ref, watch} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import ListService from '@/services/list'
 import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
diff --git a/src/components/misc/keyboard-shortcuts/index.vue b/src/components/misc/keyboard-shortcuts/index.vue
index 274c5ff57..781d8a231 100644
--- a/src/components/misc/keyboard-shortcuts/index.vue
+++ b/src/components/misc/keyboard-shortcuts/index.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script lang="ts" setup>
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Shortcut from '@/components/misc/shortcut.vue'
 import Message from '@/components/misc/message.vue'
diff --git a/src/components/misc/legal.vue b/src/components/misc/legal.vue
index 46e1dfd6b..3adc9a95f 100644
--- a/src/components/misc/legal.vue
+++ b/src/components/misc/legal.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts" setup>
 import {computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 
diff --git a/src/components/misc/no-auth-wrapper.vue b/src/components/misc/no-auth-wrapper.vue
index 2f1239d47..5279c3001 100644
--- a/src/components/misc/no-auth-wrapper.vue
+++ b/src/components/misc/no-auth-wrapper.vue
@@ -30,7 +30,7 @@ import Logo from '@/components/home/Logo.vue'
 import Message from '@/components/misc/message.vue'
 import Legal from '@/components/misc/legal.vue'
 import ApiConfig from '@/components/misc/api-config.vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {computed} from 'vue'
 import {useRoute} from 'vue-router'
 import {useI18n} from 'vue-i18n'
diff --git a/src/components/misc/ready.vue b/src/components/misc/ready.vue
index 8fd3f4fd3..2f3fdbfef 100644
--- a/src/components/misc/ready.vue
+++ b/src/components/misc/ready.vue
@@ -42,7 +42,7 @@
 
 <script lang="ts" setup>
 import {ref, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Logo from '@/assets/logo.svg?component'
 import ApiConfig from '@/components/misc/api-config.vue'
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index f004a27d0..308cf9e90 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -54,7 +54,7 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import User from '@/components/misc/user.vue'
 import { NOTIFICATION_NAMES as names, type INotification} from '@/models/notification'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRouter} from 'vue-router'
 import {formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index b0c2ff218..e40eefa2b 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -177,7 +177,7 @@
 
 <script setup lang="ts">
 import {ref, watch, computed, shallowReactive} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import {RIGHTS} from '@/models/constants/rights'
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index cc1f9b6f0..2c54befa4 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -139,7 +139,7 @@ export default {name: 'userTeamShare'}
 <script setup lang="ts">
 import {ref, reactive, computed, shallowReactive, type ShallowReactive, type Ref} from 'vue'
 import type {PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import UserNamespaceService from '@/services/userNamespace'
diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index ef45ca884..60004a928 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -43,7 +43,7 @@
 <script setup lang="ts">
 import {ref, watch, unref, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {tryOnMounted, debouncedWatch, useWindowSize, type MaybeRef} from '@vueuse/core'
 
 import TaskService from '@/services/task'
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index cfd4fe956..653c60b90 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -153,7 +153,7 @@
 
 <script setup lang="ts">
 import {ref, reactive, computed, shallowReactive, watch, nextTick} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import Editor from '@/components/input/AsyncEditor'
diff --git a/src/components/tasks/partials/defer-task.vue b/src/components/tasks/partials/defer-task.vue
index c0309fca7..d57b783a1 100644
--- a/src/components/tasks/partials/defer-task.vue
+++ b/src/components/tasks/partials/defer-task.vue
@@ -39,7 +39,7 @@
 
 <script setup lang="ts">
 import {ref, shallowReactive, computed, watch, onMounted, onBeforeUnmount, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 import flatPickr from 'vue-flatpickr-component'
 
diff --git a/src/components/tasks/partials/description.vue b/src/components/tasks/partials/description.vue
index a2adc8c66..c2623c9e7 100644
--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@@ -31,7 +31,7 @@
 
 <script setup lang="ts">
 import {ref,computed, watch, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Editor from '@/components/input/AsyncEditor'
 
diff --git a/src/components/tasks/partials/editAssignees.vue b/src/components/tasks/partials/editAssignees.vue
index eb4aacc14..226e8016d 100644
--- a/src/components/tasks/partials/editAssignees.vue
+++ b/src/components/tasks/partials/editAssignees.vue
@@ -29,7 +29,7 @@
 
 <script setup lang="ts">
 import {ref, shallowReactive, watch, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import User from '@/components/misc/user.vue'
diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue
index a15df8c42..9a96ed56f 100644
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@@ -40,7 +40,7 @@
 
 <script setup lang="ts">
 import {type PropType, ref, computed, shallowReactive, watch} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import LabelModel, { type ILabel } from '@/models/label'
diff --git a/src/components/tasks/partials/heading.vue b/src/components/tasks/partials/heading.vue
index b693b814d..c02ceb63a 100644
--- a/src/components/tasks/partials/heading.vue
+++ b/src/components/tasks/partials/heading.vue
@@ -33,7 +33,7 @@
 
 <script setup lang="ts">
 import {ref, computed, type PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import Done from '@/components/misc/Done.vue'
diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue
index 0b0eda12f..ccfedd79f 100644
--- a/src/components/tasks/partials/listSearch.vue
+++ b/src/components/tasks/partials/listSearch.vue
@@ -19,7 +19,7 @@
 <script lang="ts" setup>
 import {reactive, ref, watch} from 'vue'
 import type {PropType} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 import ListModel, { type IList } from '@/models/list'
 import Multiselect from '@/components/input/multiselect.vue'
diff --git a/src/composables/useNamespaceSearch.ts b/src/composables/useNamespaceSearch.ts
index 35c8b54f7..b2595aaac 100644
--- a/src/composables/useNamespaceSearch.ts
+++ b/src/composables/useNamespaceSearch.ts
@@ -1,5 +1,5 @@
 import {ref, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 export function useNameSpaceSearch() {
 	const query = ref('')
diff --git a/src/main.ts b/src/main.ts
index b24a216d5..89b7f312c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -14,7 +14,7 @@ import Notifications from '@kyvg/vue3-notification'
 import './registerServiceWorker'
 
 // Vuex
-import {store} from './store'
+import { store, key } from './store'
 // i18n
 import {i18n} from './i18n'
 
@@ -104,7 +104,7 @@ if (window.SENTRY_ENABLED) {
 	import('./sentry').then(sentry => sentry.default(app, router))
 }
 
-app.use(store)
+app.use(store, key) // pass the injection key
 app.use(router)
 app.use(i18n)
 
diff --git a/src/store/index.ts b/src/store/index.ts
index d2df346d6..0033e07e1 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,4 +1,7 @@
-import {createStore} from 'vuex'
+import type {InjectionKey} from 'vue'
+import {createStore, useStore as baseUseStore, Store} from 'vuex'
+
+
 import {getBlobFromBlurHash} from '../helpers/getBlobFromBlurHash'
 import {
 	BACKGROUND,
@@ -25,7 +28,14 @@ import ListModel from '@/models/list'
 import ListService from '../services/list'
 import {checkAndSetApiUrl} from '@/helpers/checkAndSetApiUrl'
 
-import type { RootStoreState } from './types'
+import type { RootStoreState, StoreState } from './types'
+
+export const key: InjectionKey<Store<StoreState>> = Symbol()
+
+// define your own `useStore` composition function
+export function useStore () {
+  return baseUseStore(key)
+}
 
 export const store = createStore<RootStoreState>({
 	strict: import.meta.env.DEV,
diff --git a/src/store/modules/attachments.ts b/src/store/modules/attachments.ts
index 7b85af8a8..208ab4cef 100644
--- a/src/store/modules/attachments.ts
+++ b/src/store/modules/attachments.ts
@@ -1,26 +1,29 @@
+import type { Module } from 'vuex'
 import {findIndexById} from '@/helpers/utils'
 
-import type { AttachmentState } from '@/store/types'
+import type { AttachmentState, RootStoreState } from '@/store/types'
 import type { IAttachment } from '@/models/attachment'
 
-export default {
+const store : Module<AttachmentState, RootStoreState> = {
 	namespaced: true,
-	state: (): AttachmentState => ({
+	state: () => ({
 		attachments: [],
 	}),
 	mutations: {
-		set(state: AttachmentState, attachments: IAttachment[]) {
+		set(state, attachments: IAttachment[]) {
 			console.debug('Set attachments', attachments)
 			state.attachments = attachments
 		},
-		add(state: AttachmentState, attachment: IAttachment) {
+		add(state, attachment: IAttachment) {
 			console.debug('Add attachement', attachment)
 			state.attachments.push(attachment)
 		},
-		removeById(state: AttachmentState, id: IAttachment['id']) {
+		removeById(state, id: IAttachment['id']) {
 			const attachmentIndex = findIndexById<IAttachment>(state.attachments, id)
 			state.attachments.splice(attachmentIndex, 1)
 			console.debug('Remove attachement', id)
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default store
\ No newline at end of file
diff --git a/src/store/modules/auth.ts b/src/store/modules/auth.ts
index 4e6492133..a66b656b6 100644
--- a/src/store/modules/auth.ts
+++ b/src/store/modules/auth.ts
@@ -1,4 +1,4 @@
-import type { ActionContext } from 'vuex'
+import type { Module } from 'vuex'
 
 import {HTTPFactory, AuthenticatedHTTPFactory} from '@/http-common'
 import {i18n, getCurrentLanguage, saveLanguage} from '@/i18n'
@@ -22,25 +22,25 @@ const defaultSettings = settings => {
 	return settings
 }
 
-export default {
+const authStore : Module<AuthState, RootStoreState> =  {
 	namespaced: true,
-	state: (): AuthState => ({
+	state: () => ({
 		authenticated: false,
 		isLinkShareAuth: false,
 		info: null,
 		needsTotpPasscode: false,
 		avatarUrl: '',
 		lastUserInfoRefresh: null,
-		settings: {},
+		settings: {}, // should be IUserSettings
 	}),
 	getters: {
-		authUser(state: AuthState) {
+		authUser(state) {
 			return state.authenticated && (
 				state.info &&
 				state.info.type === AUTH_TYPES.USER
 			)
 		},
-		authLinkShare(state: AuthState) {
+		authLinkShare(state) {
 			return state.authenticated && (
 				state.info &&
 				state.info.type === AUTH_TYPES.LINK_SHARE
@@ -48,7 +48,7 @@ export default {
 		},
 	},
 	mutations: {
-		info(state: AuthState, info: Info) {
+		info(state, info: Info) {
 			state.info = info
 			if (info !== null) {
 				state.avatarUrl = info.getAvatarUrl()
@@ -60,32 +60,32 @@ export default {
 				state.isLinkShareAuth = info.id < 0
 			}
 		},
-		setUserSettings(state: AuthState, settings: IUserSettings) {
+		setUserSettings(state, settings: IUserSettings) {
 			state.settings = defaultSettings(settings)
 			const info = state.info !== null ? state.info : {} as Info
 			info.name = settings.name
 			state.info = info
 		},
-		authenticated(state: AuthState, authenticated: boolean) {
+		authenticated(state, authenticated: boolean) {
 			state.authenticated = authenticated
 		},
-		isLinkShareAuth(state: AuthState, isLinkShareAuth: boolean) {
+		isLinkShareAuth(state, isLinkShareAuth: boolean) {
 			state.isLinkShareAuth = isLinkShareAuth
 		},
-		needsTotpPasscode(state: AuthState, needsTotpPasscode: boolean) {
+		needsTotpPasscode(state, needsTotpPasscode: boolean) {
 			state.needsTotpPasscode = needsTotpPasscode
 		},
-		reloadAvatar(state: AuthState) {
+		reloadAvatar(state) {
 			if (!state.info) return
 			state.avatarUrl = `${state.info.getAvatarUrl()}&=${+new Date()}`
 		},
-		lastUserRefresh(state: AuthState) {
+		lastUserRefresh(state) {
 			state.lastUserInfoRefresh = new Date()
 		},
 	},
 	actions: {
 		// Logs a user in with a set of credentials.
-		async login(ctx: ActionContext<AuthState, RootStoreState>, credentials) {
+		async login(ctx, credentials) {
 			const HTTP = HTTPFactory()
 			ctx.commit(LOADING, true, {root: true})
 
@@ -116,7 +116,7 @@ export default {
 
 		// Registers a new user and logs them in.
 		// Not sure if this is the right place to put the logic in, maybe a seperate js component would be better suited.
-		async register(ctx: ActionContext<AuthState, RootStoreState>, credentials) {
+		async register(ctx, credentials) {
 			const HTTP = HTTPFactory()
 			ctx.commit(LOADING, true, {root: true})
 			try {
@@ -133,7 +133,7 @@ export default {
 			}
 		},
 
-		async openIdAuth(ctx: ActionContext<AuthState, RootStoreState>, {provider, code}) {
+		async openIdAuth(ctx, {provider, code}) {
 			const HTTP = HTTPFactory()
 			ctx.commit(LOADING, true, {root: true})
 
@@ -155,7 +155,7 @@ export default {
 			}
 		},
 
-		async linkShareAuth(ctx: ActionContext<AuthState, RootStoreState>, {hash, password}) {
+		async linkShareAuth(ctx, {hash, password}) {
 			const HTTP = HTTPFactory()
 			const response = await HTTP.post('/shares/' + hash + '/auth', {
 				password: password,
@@ -166,7 +166,7 @@ export default {
 		},
 
 		// Populates user information from jwt token saved in local storage in store
-		checkAuth(ctx: ActionContext<AuthState, RootStoreState>) {
+		checkAuth(ctx) {
 
 			// This function can be called from multiple places at the same time and shortly after one another.
 			// To prevent hitting the api too frequently or race conditions, we check at most once per minute.
@@ -198,7 +198,7 @@ export default {
 			}
 		},
 
-		redirectToProviderIfNothingElseIsEnabled({rootState}: ActionContext<AuthState, RootStoreState>) {
+		redirectToProviderIfNothingElseIsEnabled({rootState}) {
 			const {auth} = rootState.config
 			if (
 				auth.local.enabled === false &&
@@ -210,7 +210,7 @@ export default {
 			}
 		},
 
-		async refreshUserInfo({state, commit, dispatch}: ActionContext<AuthState, RootStoreState>) {
+		async refreshUserInfo({state, commit, dispatch}) {
 			const jwt = getToken()
 			if (!jwt) {
 				return
@@ -244,7 +244,7 @@ export default {
 			}
 		},
 
-		async saveUserSettings(ctx: ActionContext<AuthState, RootStoreState>, payload) {
+		async saveUserSettings(ctx, payload) {
 			const {settings} = payload
 			const showMessage = payload.showMessage ?? true
 			const userSettingsService = new UserSettingsService()
@@ -265,7 +265,7 @@ export default {
 		},
 
 		// Renews the api token and saves it to local storage
-		renewToken(ctx: ActionContext<AuthState, RootStoreState>) {
+		renewToken(ctx) {
 			// FIXME: Timeout to avoid race conditions when authenticated as a user (=auth token in localStorage) and as a
 			// link share in another tab. Without the timeout both the token renew and link share auth are executed at
 			// the same time and one might win over the other.
@@ -286,10 +286,12 @@ export default {
 				}
 			}, 5000)
 		},
-		logout(ctx: ActionContext<AuthState, RootStoreState>) {
+		logout(ctx) {
 			removeToken()
 			window.localStorage.clear() // Clear all settings and history we might have saved in local storage.
 			ctx.dispatch('checkAuth')
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default authStore
\ No newline at end of file
diff --git a/src/store/modules/config.ts b/src/store/modules/config.ts
index 27d61a2ca..fb1ef8aec 100644
--- a/src/store/modules/config.ts
+++ b/src/store/modules/config.ts
@@ -1,4 +1,4 @@
-import type { ActionContext } from 'vuex'
+import type { Module } from 'vuex'
 import {parseURL} from 'ufo'
 
 import {CONFIG} from '../mutation-types'
@@ -6,9 +6,9 @@ import {HTTPFactory} from '@/http-common'
 import {objectToCamelCase} from '@/helpers/case'
 import type { RootStoreState, ConfigState } from '@/store/types'
 
-export default {
+const configStore : Module<ConfigState, RootStoreState> = {
 	namespaced: true,
-	state: (): ConfigState => ({
+	state: () => ({
 		// These are the api defaults.
 		version: '',
 		frontendUrl: '',
@@ -39,23 +39,25 @@ export default {
 		},
 	}),
 	getters: {
-		migratorsEnabled: (state: ConfigState) => state.availableMigrators?.length > 0,
+		migratorsEnabled: (state) => state.availableMigrators?.length > 0,
 		apiBase() {
 			const {host, protocol} = parseURL(window.API_URL)
 			return protocol + '//' + host
 		},
 	},
 	mutations: {
-		[CONFIG](state: ConfigState, config: ConfigState) {
+		[CONFIG](state, config: ConfigState) {
 			Object.assign(state, config)
 		},
 	},
 	actions: {
-		async update(ctx: ActionContext<ConfigState, RootStoreState>) {
+		async update(ctx) {
 			const HTTP = HTTPFactory()
 			const {data: config} = await HTTP.get('info')
 			ctx.commit(CONFIG, objectToCamelCase(config))
 			return config
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default configStore
\ No newline at end of file
diff --git a/src/store/modules/kanban.ts b/src/store/modules/kanban.ts
index 73e73088e..c6e46d58a 100644
--- a/src/store/modules/kanban.ts
+++ b/src/store/modules/kanban.ts
@@ -1,3 +1,4 @@
+import type { Module } from 'vuex'
 import cloneDeep from 'lodash.clonedeep'
 
 import {findById, findIndexById} from '@/helpers/utils'
@@ -7,7 +8,6 @@ import {success} from '@/message'
 import BucketService from '../../services/bucket'
 import {setLoading} from '../helper'
 import TaskCollectionService from '@/services/taskCollection'
-import type { ActionContext } from 'vuex'
 import type { RootStoreState, KanbanState } from '@/store/types'
 import type { ITask } from '@/models/task'
 import type { IList } from '@/models/list'
@@ -38,10 +38,10 @@ const addTaskToBucketAndSort = (state: KanbanState, task: ITask) => {
  * This store is intended to hold the currently active kanban view.
  * It should hold only the current buckets.
  */
-export default {
+const kanbanStore : Module<KanbanState, RootStoreState> = {
 	namespaced: true,
 
-	state: (): KanbanState => ({
+	state: () => ({
 		buckets: [],
 		listId: 0,
 		bucketLoading: {},
@@ -50,11 +50,11 @@ export default {
 	}),
 
 	mutations: {
-		setListId(state: KanbanState, listId: IList['id']) {
+		setListId(state, listId: IList['id']) {
 			state.listId = parseInt(listId)
 		},
 
-		setBuckets(state: KanbanState, buckets: IBucket[]) {
+		setBuckets(state, buckets: IBucket[]) {
 			state.buckets = buckets
 			buckets.forEach(b => {
 				state.taskPagesPerBucket[b.id] = 1
@@ -62,21 +62,21 @@ export default {
 			})
 		},
 
-		addBucket(state: KanbanState, bucket: IBucket) {
+		addBucket(state, bucket: IBucket) {
 			state.buckets.push(bucket)
 		},
 
-		removeBucket(state: KanbanState, bucket: IBucket) {
+		removeBucket(state, bucket: IBucket) {
 			const bucketIndex = findIndexById(state.buckets, bucket.id)
 			state.buckets.splice(bucketIndex, 1)
 		},
 
-		setBucketById(state: KanbanState, bucket: IBucket) {
+		setBucketById(state, bucket: IBucket) {
 			const bucketIndex = findIndexById(state.buckets, bucket.id)
 			state.buckets[bucketIndex] = bucket
 		},
 
-		setBucketByIndex(state: KanbanState, {
+		setBucketByIndex(state, {
 			bucketIndex,
 			bucket,
 		} : {
@@ -86,7 +86,7 @@ export default {
 			state.buckets[bucketIndex] = bucket
 		},
 
-		setTaskInBucketByIndex(state: KanbanState, {
+		setTaskInBucketByIndex(state, {
 			bucketIndex,
 			taskIndex,
 			task,
@@ -100,7 +100,7 @@ export default {
 			state.buckets[bucketIndex] = bucket
 		},
 
-		setTasksInBucketByBucketId(state: KanbanState, {
+		setTasksInBucketByBucketId(state, {
 			bucketId,
 			tasks,
 		} : {
@@ -114,7 +114,7 @@ export default {
 			}
 		},
 		
-		setTaskInBucket(state: KanbanState, task: ITask) {
+		setTaskInBucket(state, task: ITask) {
 			// If this gets invoked without any tasks actually loaded, we can save the hassle of finding the task
 			if (state.buckets.length === 0) {
 				return
@@ -158,7 +158,7 @@ export default {
 			}
 		},
 
-		addTaskToBucket(state: KanbanState, task: ITask) {
+		addTaskToBucket(state, task: ITask) {
 			const bucketIndex = findIndexById(state.buckets, task.bucketId)
 			const oldBucket = state.buckets[bucketIndex]
 			const newBucket = {
@@ -171,7 +171,7 @@ export default {
 			state.buckets[bucketIndex] = newBucket
 		},
 
-		addTasksToBucket(state: KanbanState, {tasks, bucketId}: {
+		addTasksToBucket(state, {tasks, bucketId}: {
 			tasks: ITask[];
 			bucketId: IBucket['id'];
 		}) {
@@ -187,7 +187,7 @@ export default {
 			state.buckets[bucketIndex] = newBucket
 		},
 
-		removeTaskInBucket(state: KanbanState, task: ITask) {
+		removeTaskInBucket(state, task: ITask) {
 			// If this gets invoked without any tasks actually loaded, we can save the hassle of finding the task
 			if (state.buckets.length === 0) {
 				return
@@ -207,7 +207,7 @@ export default {
 			state.buckets[bucketIndex].tasks.splice(taskIndex, 1)
 		},
 
-		setBucketLoading(state: KanbanState, {bucketId, loading}) {
+		setBucketLoading(state, {bucketId, loading}) {
 			state.bucketLoading[bucketId] = loading
 		},
 
@@ -221,11 +221,11 @@ export default {
 	},
 
 	getters: {
-		getBucketById(state: KanbanState) {
+		getBucketById(state) {
 			return (bucketId) => findById(state.buckets, bucketId)
 		},
 
-		getTaskById(state: KanbanState) {
+		getTaskById(state) {
 			return (id) => {
 				const { bucketIndex, taskIndex } = getTaskIndicesById(state, id)
 
@@ -240,7 +240,7 @@ export default {
 	},
 
 	actions: {
-		async loadBucketsForList(ctx: ActionContext<KanbanState, RootStoreState>, {listId, params}) {
+		async loadBucketsForList(ctx, {listId, params}) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			// Clear everything to prevent having old buckets in the list if loading the buckets from this list takes a few moments
@@ -259,7 +259,7 @@ export default {
 			}
 		},
 
-		async loadNextTasksForBucket(ctx: ActionContext<KanbanState, RootStoreState>, {listId, ps = {}, bucketId}) {
+		async loadNextTasksForBucket(ctx, {listId, ps = {}, bucketId}) {
 			const isLoading = ctx.state.bucketLoading[bucketId] ?? false
 			if (isLoading) {
 				return
@@ -314,7 +314,7 @@ export default {
 			}
 		},
 
-		async createBucket(ctx: ActionContext<KanbanState, RootStoreState>, bucket: IBucket) {
+		async createBucket(ctx, bucket: IBucket) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			const bucketService = new BucketService()
@@ -327,7 +327,7 @@ export default {
 			}
 		},
 
-		async deleteBucket(ctx: ActionContext<KanbanState, RootStoreState>, {bucket, params}) {
+		async deleteBucket(ctx, {bucket, params}) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			const bucketService = new BucketService()
@@ -342,7 +342,7 @@ export default {
 			}
 		},
 
-		async updateBucket(ctx: ActionContext<KanbanState, RootStoreState>, updatedBucketData) {
+		async updateBucket(ctx, updatedBucketData) {
 			const cancel = setLoading(ctx, 'kanban')
 
 			const bucketIndex = findIndexById(ctx.state.buckets, updatedBucketData.id)
@@ -370,7 +370,7 @@ export default {
 			}
 		},
 
-		async updateBucketTitle(ctx: ActionContext<KanbanState, RootStoreState>, { id, title }) {
+		async updateBucketTitle(ctx, { id, title }) {
 			const bucket = findById(ctx.state.buckets, id)
 
 			if (bucket?.title === title) {
@@ -387,4 +387,6 @@ export default {
 			success({message: i18n.global.t('list.kanban.bucketTitleSavedSuccess')})
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default kanbanStore
\ No newline at end of file
diff --git a/src/store/modules/labels.ts b/src/store/modules/labels.ts
index 4366c4c53..ce32db6d0 100644
--- a/src/store/modules/labels.ts
+++ b/src/store/modules/labels.ts
@@ -1,4 +1,4 @@
-import type { ActionContext } from 'vuex'
+import type { Module } from 'vuex'
 
 import {i18n} from '@/i18n'
 import {success} from '@/message'
@@ -22,46 +22,46 @@ async function getAllLabels(page = 1): Promise<ILabel[]> {
 	}
 }
 
-export default {
+const LabelStore : Module<LabelState, RootStoreState> = {
 	namespaced: true,
-	state: (): LabelState => ({
+	state: () => ({
 		labels: {},
 		loaded: false,
 	}),
 	mutations: {
-		setLabels(state: LabelState, labels: ILabel[]) {
+		setLabels(state, labels: ILabel[]) {
 			labels.forEach(l => {
 				state.labels[l.id] = l
 				add(l)
 			})
 		},
-		setLabel(state: LabelState, label: ILabel) {
+		setLabel(state, label: ILabel) {
 			state.labels[label.id] = label
 			update(label)
 		},
-		removeLabelById(state: LabelState, label: ILabel) {
+		removeLabelById(state, label: ILabel) {
 			remove(label)
 			delete state.labels[label.id]
 		},
-		setLoaded(state: LabelState, loaded: boolean) {
+		setLoaded(state, loaded: boolean) {
 			state.loaded = loaded
 		},
 	},
 	getters: {
-		getLabelsByIds(state: LabelState) {
+		getLabelsByIds(state) {
 			return (ids: ILabel['id'][]) => getLabelsByIds(state, ids)
 		},
-		filterLabelsByQuery(state: LabelState) {
+		filterLabelsByQuery(state) {
 			return (labelsToHide: ILabel[], query: string) => filterLabelsByQuery(state, labelsToHide, query)
 		},
-		getLabelsByExactTitles(state: LabelState) {
+		getLabelsByExactTitles(state) {
 			return labelTitles => Object
 				.values(state.labels)
 				.filter(({title}) => labelTitles.some(l => l.toLowerCase() === title.toLowerCase()))
 		},
 	},
 	actions: {
-		async loadAllLabels(ctx: ActionContext<LabelState, RootStoreState>, {forceLoad} = {}) {
+		async loadAllLabels(ctx, {forceLoad} = {}) {
 			if (ctx.state.loaded && !forceLoad) {
 				return
 			}
@@ -77,7 +77,7 @@ export default {
 				cancel()
 			}
 		},
-		async deleteLabel(ctx: ActionContext<LabelState, RootStoreState>, label: ILabel) {
+		async deleteLabel(ctx, label: ILabel) {
 			const cancel = setLoading(ctx, 'labels')
 			const labelService = new LabelService()
 
@@ -90,7 +90,7 @@ export default {
 				cancel()
 			}
 		},
-		async updateLabel(ctx: ActionContext<LabelState, RootStoreState>, label: ILabel) {
+		async updateLabel(ctx, label: ILabel) {
 			const cancel = setLoading(ctx, 'labels')
 			const labelService = new LabelService()
 
@@ -103,7 +103,7 @@ export default {
 				cancel()
 			}
 		},
-		async createLabel(ctx: ActionContext<LabelState, RootStoreState>, label: ILabel) {
+		async createLabel(ctx, label: ILabel) {
 			const cancel = setLoading(ctx, 'labels')
 			const labelService = new LabelService()
 
@@ -117,3 +117,5 @@ export default {
 		},
 	},
 }
+
+export default LabelStore
\ No newline at end of file
diff --git a/src/store/modules/lists.ts b/src/store/modules/lists.ts
index e438763ce..0d18a2c04 100644
--- a/src/store/modules/lists.ts
+++ b/src/store/modules/lists.ts
@@ -1,49 +1,50 @@
+import type { Module } from 'vuex'
+
 import ListService from '@/services/list'
 import {setLoading} from '@/store/helper'
 import {removeListFromHistory} from '@/modules/listHistory'
 import {createNewIndexer} from '@/indexes'
 import type {ListState, RootStoreState} from '@/store/types'
-import type {ActionContext} from 'vuex'
 import type {IList} from '@/models/list'
 
 const {add, remove, search, update} = createNewIndexer('lists', ['title', 'description'])
 
 const FavoriteListsNamespace = -2
 
-export default {
+const listsStore : Module<ListState, RootStoreState>= {
 	namespaced: true,
 	// The state is an object which has the list ids as keys.
-	state: (): ListState => ({}),
+	state: () => ({}),
 	mutations: {
-		setList(state: ListState, list: IList) {
+		setList(state, list: IList) {
 			state[list.id] = list
 			update(list)
 		},
-		setLists(state: ListState, lists: IList[]) {
+		setLists(state, lists: IList[]) {
 			lists.forEach(l => {
 				state[l.id] = l
 				add(l)
 			})
 		},
-		removeListById(state: ListState, list: IList) {
+		removeListById(state, list: IList) {
 			remove(list)
 			delete state[list.id]
 		},
 	},
 	getters: {
-		getListById: (state: ListState) => (id: IList['id']) => {
+		getListById: (state) => (id: IList['id']) => {
 			if (typeof state[id] !== 'undefined') {
 				return state[id]
 			}
 			return null
 		},
-		findListByExactname: (state: ListState) => (name: string) => {
+		findListByExactname: (state) => (name: string) => {
 			const list = Object.values(state).find(l => {
 				return l.title.toLowerCase() === name.toLowerCase()
 			})
 			return typeof list === 'undefined' ? null : list
 		},
-		searchList: (state: ListState) => (query: string, includeArchived = false) => {
+		searchList: (state) => (query: string, includeArchived = false) => {
 			return search(query)
 					?.filter(value => value > 0)
 					.map(id => state[id])
@@ -52,14 +53,14 @@ export default {
 		},
 	},
 	actions: {
-		toggleListFavorite(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
+		toggleListFavorite(ctx, list: IList) {
 			return ctx.dispatch('updateList', {
 				...list,
 				isFavorite: !list.isFavorite,
 			})
 		},
 
-		async createList(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
+		async createList(ctx, list: IList) {
 			const cancel = setLoading(ctx, 'lists')
 			const listService = new ListService()
 
@@ -74,7 +75,7 @@ export default {
 			}
 		},
 
-		async updateList(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
+		async updateList(ctx, list: IList) {
 			const cancel = setLoading(ctx, 'lists')
 			const listService = new ListService()
 
@@ -109,7 +110,7 @@ export default {
 			}
 		},
 
-		async deleteList(ctx: ActionContext<ListState, RootStoreState>, list: IList) {
+		async deleteList(ctx, list: IList) {
 			const cancel = setLoading(ctx, 'lists')
 			const listService = new ListService()
 
@@ -124,4 +125,6 @@ export default {
 			}
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default listsStore
\ No newline at end of file
diff --git a/src/store/modules/namespaces.ts b/src/store/modules/namespaces.ts
index 745e9b941..0eccc99bb 100644
--- a/src/store/modules/namespaces.ts
+++ b/src/store/modules/namespaces.ts
@@ -1,4 +1,4 @@
-import type {ActionContext} from 'vuex'
+import type { Module } from 'vuex'
 
 import NamespaceService from '../../services/namespace'
 import {setLoading} from '@/store/helper'
@@ -9,19 +9,19 @@ import type {IList} from '@/models/list'
 
 const {add, remove, search, update} = createNewIndexer('namespaces', ['title', 'description'])
 
-export default {
+const namespacesStore : Module<NamespaceState, RootStoreState> = {
 	namespaced: true,
-	state: (): NamespaceState => ({
+	state: () => ({
 		namespaces: [],
 	}),
 	mutations: {
-		namespaces(state: NamespaceState, namespaces: INamespace[]) {
+		namespaces(state, namespaces: INamespace[]) {
 			state.namespaces = namespaces
 			namespaces.forEach(n => {
 				add(n)
 			})
 		},
-		setNamespaceById(state: NamespaceState, namespace: INamespace) {
+		setNamespaceById(state, namespace: INamespace) {
 			const namespaceIndex = state.namespaces.findIndex(n => n.id === namespace.id)
 
 			if (namespaceIndex === -1) {
@@ -35,7 +35,7 @@ export default {
 			state.namespaces[namespaceIndex] = namespace
 			update(namespace)
 		},
-		setListInNamespaceById(state: NamespaceState, list: IList) {
+		setListInNamespaceById(state, list: IList) {
 			for (const n in state.namespaces) {
 				// We don't have the namespace id on the list which means we need to loop over all lists until we find it.
 				// FIXME: Not ideal at all - we should fix that at the api level.
@@ -51,11 +51,11 @@ export default {
 				}
 			}
 		},
-		addNamespace(state: NamespaceState, namespace: INamespace) {
+		addNamespace(state, namespace: INamespace) {
 			state.namespaces.push(namespace)
 			add(namespace)
 		},
-		removeNamespaceById(state: NamespaceState, namespaceId: INamespace['id']) {
+		removeNamespaceById(state, namespaceId: INamespace['id']) {
 			for (const n in state.namespaces) {
 				if (state.namespaces[n].id === namespaceId) {
 					remove(state.namespaces[n])
@@ -64,7 +64,7 @@ export default {
 				}
 			}
 		},
-		addListToNamespace(state: NamespaceState, list: IList) {
+		addListToNamespace(state, list: IList) {
 			for (const n in state.namespaces) {
 				if (state.namespaces[n].id === list.namespaceId) {
 					state.namespaces[n].lists.push(list)
@@ -72,7 +72,7 @@ export default {
 				}
 			}
 		},
-		removeListFromNamespaceById(state: NamespaceState, list: IList) {
+		removeListFromNamespaceById(state, list: IList) {
 			for (const n in state.namespaces) {
 				// We don't have the namespace id on the list which means we need to loop over all lists until we find it.
 				// FIXME: Not ideal at all - we should fix that at the api level.
@@ -88,7 +88,7 @@ export default {
 		},
 	},
 	getters: {
-		getListAndNamespaceById: (state: NamespaceState) => (listId: IList['id'], ignorePseudoNamespaces = false) => {
+		getListAndNamespaceById: (state) => (listId: IList['id'], ignorePseudoNamespaces = false) => {
 			for (const n in state.namespaces) {
 
 				if (ignorePseudoNamespaces && state.namespaces[n].id < 0) {
@@ -106,10 +106,10 @@ export default {
 			}
 			return null
 		},
-		getNamespaceById: (state: NamespaceState) => (namespaceId: INamespace['id']) => {
+		getNamespaceById: (state) => (namespaceId: INamespace['id']) => {
 			return state.namespaces.find(({id}) => id == namespaceId) || null
 		},
-		searchNamespace: (state: NamespaceState, getters) => (query: string) => {
+		searchNamespace: (state, getters) => (query: string) => {
 			return search(query)
 					?.filter(value => value > 0)
 					.map(getters.getNamespaceById)
@@ -118,7 +118,7 @@ export default {
 		},
 	},
 	actions: {
-		async loadNamespaces(ctx: ActionContext<NamespaceState, RootStoreState>) {
+		async loadNamespaces(ctx) {
 			const cancel = setLoading(ctx, 'namespaces')
 
 			const namespaceService = new NamespaceService()
@@ -138,20 +138,20 @@ export default {
 			}
 		},
 
-		loadNamespacesIfFavoritesDontExist(ctx: ActionContext<NamespaceState, RootStoreState>) {
+		loadNamespacesIfFavoritesDontExist(ctx) {
 			// The first or second namespace should be the one holding all favorites
 			if (ctx.state.namespaces[0].id !== -2 && ctx.state.namespaces[1]?.id !== -2) {
 				return ctx.dispatch('loadNamespaces')
 			}
 		},
 
-		removeFavoritesNamespaceIfEmpty(ctx: ActionContext<NamespaceState, RootStoreState>) {
+		removeFavoritesNamespaceIfEmpty(ctx) {
 			if (ctx.state.namespaces[0].id === -2 && ctx.state.namespaces[0].lists.length === 0) {
 				ctx.state.namespaces.splice(0, 1)
 			}
 		},
 
-		async deleteNamespace(ctx: ActionContext<NamespaceState, RootStoreState>, namespace: INamespace) {
+		async deleteNamespace(ctx, namespace: INamespace) {
 			const cancel = setLoading(ctx, 'namespaces')
 			const namespaceService = new NamespaceService()
 
@@ -164,7 +164,7 @@ export default {
 			}
 		},
 
-		async createNamespace(ctx: ActionContext<NamespaceState, RootStoreState>, namespace: INamespace) {
+		async createNamespace(ctx, namespace: INamespace) {
 			const cancel = setLoading(ctx, 'namespaces')
 			const namespaceService = new NamespaceService()
 
@@ -177,4 +177,6 @@ export default {
 			}
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default namespacesStore
\ No newline at end of file
diff --git a/src/store/modules/tasks.ts b/src/store/modules/tasks.ts
index 242afc01f..bb459b790 100644
--- a/src/store/modules/tasks.ts
+++ b/src/store/modules/tasks.ts
@@ -1,5 +1,5 @@
+import type { Module } from 'vuex'
 import router from '@/router'
-import type { ActionContext } from 'vuex'
 import {formatISO} from 'date-fns'
 
 import TaskService from '@/services/task'
@@ -65,11 +65,11 @@ async function findAssignees(parsedTaskAssignees) {
 }
 
 
-export default {
+const tasksStore : Module<TaskState, RootStoreState>= {
 	namespaced: true,
-	state: (): TaskState => ({}),
+	state: () => ({}),
 	actions: {
-		async loadTasks(ctx: ActionContext<TaskState, RootStoreState>, params) {
+		async loadTasks(ctx, params) {
 			const taskService = new TaskService()
 
 			const cancel = setLoading(ctx, 'tasks')
@@ -82,7 +82,7 @@ export default {
 			}
 		},
 
-		async update(ctx: ActionContext<TaskState, RootStoreState>, task: ITask) {
+		async update(ctx, task: ITask) {
 			const cancel = setLoading(ctx, 'tasks')
 
 			const taskService = new TaskService()
@@ -95,7 +95,7 @@ export default {
 			}
 		},
 
-		async delete(ctx: ActionContext<TaskState, RootStoreState>, task: ITask) {
+		async delete(ctx, task: ITask) {
 			const taskService = new TaskService()
 			const response = await taskService.delete(task)
 			ctx.commit('kanban/removeTaskInBucket', task, {root: true})
@@ -104,7 +104,7 @@ export default {
 
 		// Adds a task attachment in store.
 		// This is an action to be able to commit other mutations
-		addTaskAttachment(ctx: ActionContext<TaskState, RootStoreState>, {
+		addTaskAttachment(ctx, {
 			taskId,
 			attachment,
 		}: {
@@ -130,7 +130,7 @@ export default {
 			ctx.commit('attachments/add', attachment, {root: true})
 		},
 
-		async addAssignee(ctx: ActionContext<TaskState, RootStoreState>, {
+		async addAssignee(ctx, {
 			user,
 			taskId,
 		}: {
@@ -165,7 +165,7 @@ export default {
 			return r
 		},
 
-		async removeAssignee(ctx: ActionContext<TaskState, RootStoreState>, {
+		async removeAssignee(ctx, {
 			user,
 			taskId,
 		}: {
@@ -198,7 +198,7 @@ export default {
 
 		},
 
-		async addLabel(ctx: ActionContext<TaskState, RootStoreState>, {
+		async addLabel(ctx, {
 			label,
 			taskId,
 		} : {
@@ -234,7 +234,7 @@ export default {
 			return r
 		},
 
-		async removeLabel(ctx: ActionContext<TaskState, RootStoreState>, {label, taskId}) {
+		async removeLabel(ctx, {label, taskId}) {
 			const labelTask = new LabelTaskModel({taskId, labelId: label.id})
 
 			const labelTaskService = new LabelTaskService()
@@ -263,7 +263,7 @@ export default {
 		},
 
 		// Do everything that is involved in finding, creating and adding the label to the task
-		async addLabelsToTask({rootState, dispatch}: ActionContext<TaskState, RootStoreState>, {
+		async addLabelsToTask({rootState, dispatch}, {
 			task,
 			parsedLabels,
 		}) {
@@ -289,7 +289,7 @@ export default {
 			return task
 		},
 
-		findListId({ rootGetters }: ActionContext<TaskState, RootStoreState>, { list: listName, listId }: {
+		findListId({ rootGetters }, { list: listName, listId }: {
 			list: string,
 			listId: IList['id']
 		}) {
@@ -320,7 +320,7 @@ export default {
 			return foundListId
 		},
 
-		async createNewTask({dispatch, commit}: ActionContext<TaskState, RootStoreState>, { 
+		async createNewTask({dispatch, commit}, { 
 			title,
 			bucketId,
 			listId,
@@ -366,4 +366,6 @@ export default {
 			return result
 		},
 	},
-}
\ No newline at end of file
+}
+
+export default tasksStore
\ No newline at end of file
diff --git a/src/store/types.ts b/src/store/types.ts
index 95aa82d6b..96f061dca 100644
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -15,16 +15,6 @@ export interface RootStoreState {
 	menuActive: boolean,
 	keyboardShortcutsActive: boolean,
 	quickActionsActive: boolean,
-
-	// modules
-	attachments: AttachmentState,
-	auth: AuthState,
-	config: ConfigState,
-	kanban: KanbanState,
-	labels: LabelState,
-	lists: ListState,
-	namespaces: NamespaceState,
-	tasks: TaskState, 
 }
 
 export interface AttachmentState {
@@ -114,3 +104,15 @@ export interface NamespaceState {
 }
 
 export interface TaskState {}
+
+
+export type StoreState = RootStoreState & {
+	config: ConfigState,
+	auth: AuthState,
+	namespaces: NamespaceState,
+	kanban: KanbanState,
+	tasks: TaskState,
+	lists: ListState,
+	attachments: AttachmentState,
+	labels: LabelState,
+}
\ No newline at end of file
diff --git a/src/types/shims-vue.d.ts b/src/types/shims-vue.d.ts
index af426f99c..e073434c9 100644
--- a/src/types/shims-vue.d.ts
+++ b/src/types/shims-vue.d.ts
@@ -1,13 +1,30 @@
 // https://next.vuex.vuejs.org/guide/migrating-to-4-0-from-3-x.html#typescript-support
 import { Store } from 'vuex'
 
+import type {
+	RootStoreState,
+	AttachmentState,
+	AuthState,
+	ConfigState,
+	KanbanState,
+	LabelState,
+	ListState,
+	NamespaceState,
+	TaskState,
+} from '@/store/types'
+
 declare module '@vue/runtime-core' {
-  // Declare your own store states.
-  interface State {
-    count: number
-  }
 
   interface ComponentCustomProperties {
-    $store: Store<State>
+    $store: Store<RootStoreState & {
+			config: ConfigState,
+			auth: AuthState,
+			namespaces: NamespaceState,
+			kanban: KanbanState,
+			tasks: TaskState,
+			lists: ListState,
+			attachments: AttachmentState,
+			labels: LabelState,
+		}>
   }
 }
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 92110b66e..b8cf712d1 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -60,7 +60,7 @@
 
 <script lang="ts" setup>
 import {ref, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import Message from '@/components/misc/message.vue'
 import ShowTasks from '@/views/tasks/ShowTasks.vue'
diff --git a/src/views/list/ListGantt.vue b/src/views/list/ListGantt.vue
index 3373e4950..f4dc88829 100644
--- a/src/views/list/ListGantt.vue
+++ b/src/views/list/ListGantt.vue
@@ -69,7 +69,7 @@ import {ref, computed} from 'vue'
 import flatPickr from 'vue-flatpickr-component'
 
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import ListWrapper from './ListWrapper.vue'
 import GanttChart from '@/components/tasks/gantt-component.vue'
diff --git a/src/views/list/ListWrapper.vue b/src/views/list/ListWrapper.vue
index 82315566b..cbe50fc85 100644
--- a/src/views/list/ListWrapper.vue
+++ b/src/views/list/ListWrapper.vue
@@ -60,7 +60,7 @@ import {BACKGROUND, BLUR_HASH, CURRENT_LIST} from '@/store/mutation-types'
 import {getListTitle} from '@/helpers/getListTitle'
 import {saveListToHistory} from '@/modules/listHistory'
 import {useTitle} from '@/composables/useTitle'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 const props = defineProps({
 	listId: {
diff --git a/src/views/list/NewList.vue b/src/views/list/NewList.vue
index 28ec71d49..47af4178d 100644
--- a/src/views/list/NewList.vue
+++ b/src/views/list/NewList.vue
@@ -35,7 +35,7 @@
 import {ref, reactive, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
 import {useRouter, useRoute} from 'vue-router'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import ListService from '@/services/list'
 import ListModel from '@/models/list'
diff --git a/src/views/list/settings/archive.vue b/src/views/list/settings/archive.vue
index 2251fa374..922f83007 100644
--- a/src/views/list/settings/archive.vue
+++ b/src/views/list/settings/archive.vue
@@ -17,7 +17,7 @@ export default {name: 'list-setting-archive'}
 
 <script setup lang="ts">
 import {computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRouter, useRoute} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
diff --git a/src/views/list/settings/delete.vue b/src/views/list/settings/delete.vue
index 6ddb2b4ab..a455dcf65 100644
--- a/src/views/list/settings/delete.vue
+++ b/src/views/list/settings/delete.vue
@@ -30,7 +30,7 @@
 import {computed, ref, watchEffect} from 'vue'
 import {useTitle} from '@/composables/useTitle'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {success} from '@/message'
 import TaskCollectionService from '@/services/taskCollection'
diff --git a/src/views/list/settings/duplicate.vue b/src/views/list/settings/duplicate.vue
index deb3769cc..2cfe5c52a 100644
--- a/src/views/list/settings/duplicate.vue
+++ b/src/views/list/settings/duplicate.vue
@@ -22,7 +22,7 @@
 <script setup lang="ts">
 import {ref, shallowReactive} from 'vue'
 import {useRoute, useRouter} from 'vue-router'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import ListDuplicateService from '@/services/listDuplicateService'
diff --git a/src/views/list/settings/share.vue b/src/views/list/settings/share.vue
index b2dcca1ea..07c43cae0 100644
--- a/src/views/list/settings/share.vue
+++ b/src/views/list/settings/share.vue
@@ -28,7 +28,7 @@ export default {name: 'list-setting-share'}
 
 <script lang="ts" setup>
 import {ref, computed, watchEffect} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 import {useTitle} from '@vueuse/core'
diff --git a/src/views/migrator/Migrate.vue b/src/views/migrator/Migrate.vue
index 450276aab..f9995df56 100644
--- a/src/views/migrator/Migrate.vue
+++ b/src/views/migrator/Migrate.vue
@@ -23,7 +23,7 @@
 <script setup lang="ts">
 import {computed} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import {MIGRATORS} from './migrators'
 import {useTitle} from '@/composables/useTitle'
diff --git a/src/views/namespaces/settings/edit.vue b/src/views/namespaces/settings/edit.vue
index 590a64f93..60596b286 100644
--- a/src/views/namespaces/settings/edit.vue
+++ b/src/views/namespaces/settings/edit.vue
@@ -57,7 +57,7 @@
 
 <script lang="ts" setup>
 import {nextTick, ref, watch} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {success} from '@/message'
 import router from '@/router'
 
diff --git a/src/views/namespaces/settings/share.vue b/src/views/namespaces/settings/share.vue
index 6d01137b3..25f212db9 100644
--- a/src/views/namespaces/settings/share.vue
+++ b/src/views/namespaces/settings/share.vue
@@ -26,7 +26,7 @@ export default { name: 'namespace-setting-share' }
 
 <script lang="ts" setup>
 import {ref, computed, watchEffect} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 import {useTitle} from '@vueuse/core'
diff --git a/src/views/sharing/LinkSharingAuth.vue b/src/views/sharing/LinkSharingAuth.vue
index 7dd2a8e11..5041418e2 100644
--- a/src/views/sharing/LinkSharingAuth.vue
+++ b/src/views/sharing/LinkSharingAuth.vue
@@ -34,7 +34,7 @@
 
 <script lang="ts" setup>
 import {ref, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 import {useTitle} from '@vueuse/core'
diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue
index 1db62ac5c..38784cd07 100644
--- a/src/views/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -45,7 +45,7 @@
 
 <script setup lang="ts">
 import {computed, ref, watchEffect} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index a5b6e8801..dfcdf0620 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -165,7 +165,7 @@ import {computed, ref} from 'vue'
 import {useI18n} from 'vue-i18n'
 
 import Editor from '@/components/input/AsyncEditor'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import TeamService from '@/services/team'
 import TeamMemberService from '@/services/teamMember'
diff --git a/src/views/user/OpenIdAuth.vue b/src/views/user/OpenIdAuth.vue
index 42fb5ef64..a2d012a32 100644
--- a/src/views/user/OpenIdAuth.vue
+++ b/src/views/user/OpenIdAuth.vue
@@ -15,7 +15,7 @@ export default { name: 'Auth' }
 
 <script setup lang="ts">
 import {ref, computed, onMounted} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
diff --git a/src/views/user/settings/Avatar.vue b/src/views/user/settings/Avatar.vue
index 8ebd5ff51..4993f9e2e 100644
--- a/src/views/user/settings/Avatar.vue
+++ b/src/views/user/settings/Avatar.vue
@@ -64,7 +64,7 @@ export default { name: 'user-settings-avatar' }
 <script setup lang="ts">
 import {computed, ref, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {Cropper} from 'vue-advanced-cropper'
 import 'vue-advanced-cropper/dist/style.css'
 
diff --git a/src/views/user/settings/Caldav.vue b/src/views/user/settings/Caldav.vue
index 5d8cec387..151d97082 100644
--- a/src/views/user/settings/Caldav.vue
+++ b/src/views/user/settings/Caldav.vue
@@ -68,7 +68,7 @@
 <script lang="ts" setup>
 import {computed, ref, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import {CALDAV_DOCS} from '@/urls'
 import {useTitle} from '@/composables/useTitle'
diff --git a/src/views/user/settings/DataExport.vue b/src/views/user/settings/DataExport.vue
index b395d9349..29aeb8523 100644
--- a/src/views/user/settings/DataExport.vue
+++ b/src/views/user/settings/DataExport.vue
@@ -44,7 +44,7 @@ export default {name: 'user-settings-data-export'}
 
 <script setup lang="ts">
 import {ref, computed, shallowReactive} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import DataExportService from '@/services/dataExport'
diff --git a/src/views/user/settings/Deletion.vue b/src/views/user/settings/Deletion.vue
index 5a1fb4a3f..5a101c85d 100644
--- a/src/views/user/settings/Deletion.vue
+++ b/src/views/user/settings/Deletion.vue
@@ -88,7 +88,7 @@ export default { name: 'user-settings-deletion' }
 
 <script setup lang="ts">
 import {ref, shallowReactive, computed} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import AccountDeleteService from '@/services/accountDelete'
diff --git a/src/views/user/settings/EmailUpdate.vue b/src/views/user/settings/EmailUpdate.vue
index fec0da18f..ef8a3e423 100644
--- a/src/views/user/settings/EmailUpdate.vue
+++ b/src/views/user/settings/EmailUpdate.vue
@@ -43,7 +43,7 @@ export default { name: 'user-settings-update-email' }
 <script setup lang="ts">
 import {reactive, computed, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import EmailUpdateService from '@/services/emailUpdate'
 import EmailUpdateModel from '@/models/emailUpdate'
diff --git a/src/views/user/settings/General.vue b/src/views/user/settings/General.vue
index dec9c8260..d72febe29 100644
--- a/src/views/user/settings/General.vue
+++ b/src/views/user/settings/General.vue
@@ -157,7 +157,7 @@ export default defineComponent({
 <script setup lang="ts">
 import {computed, watch, ref} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import {PrefixMode} from '@/modules/parseTaskText'
 
diff --git a/src/views/user/settings/PasswordUpdate.vue b/src/views/user/settings/PasswordUpdate.vue
index 6c802b6cc..96b7c431e 100644
--- a/src/views/user/settings/PasswordUpdate.vue
+++ b/src/views/user/settings/PasswordUpdate.vue
@@ -58,7 +58,7 @@ export default {name: 'user-settings-password-update'}
 <script setup lang="ts">
 import {ref, reactive, shallowReactive, computed} from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useStore } from 'vuex'
+import {useStore} from '@/store'
 
 import PasswordUpdateService from '@/services/passwordUpdateService'
 import PasswordUpdateModel from '@/models/passwordUpdate'
diff --git a/src/views/user/settings/TOTP.vue b/src/views/user/settings/TOTP.vue
index 15bd27c49..ff5b0ee7d 100644
--- a/src/views/user/settings/TOTP.vue
+++ b/src/views/user/settings/TOTP.vue
@@ -70,7 +70,7 @@ export default { name: 'user-settings-totp' }
 
 <script lang="ts" setup>
 import {computed, ref, shallowReactive} from 'vue'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import TotpService from '@/services/totp'

From 3ba423ed238a5f8f445246793829c7645dfe42aa Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 21 Jul 2022 18:56:31 +0200
Subject: [PATCH 16/32] fix: use correct model for generics

---
 src/models/labelTask.ts               | 4 ++--
 src/models/listDuplicateModel.ts      | 4 ++--
 src/models/taskRelation.ts            | 4 ++--
 src/services/labelTask.ts             | 4 ++--
 src/services/linkShare.ts             | 4 ++--
 src/services/listDuplicateService.ts  | 4 ++--
 src/services/notification.ts          | 4 ++--
 src/services/passwordReset.ts         | 4 ++--
 src/services/passwordUpdateService.ts | 3 ++-
 src/services/savedFilter.ts           | 4 ++--
 src/services/subscription.ts          | 4 ++--
 src/services/task.ts                  | 2 +-
 src/services/taskAssignee.ts          | 4 ++--
 src/services/taskRelation.ts          | 7 ++++---
 src/services/team.ts                  | 4 ++--
 src/services/teamList.ts              | 4 ++--
 src/services/teamMember.ts            | 4 ++--
 src/services/teamNamespace.ts         | 4 ++--
 src/services/totp.ts                  | 4 ++--
 src/services/user.ts                  | 4 ++--
 src/services/userList.ts              | 4 ++--
 src/services/userNamespace.ts         | 4 ++--
 src/services/userSettings.ts          | 3 ++-
 23 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/src/models/labelTask.ts b/src/models/labelTask.ts
index 2179f9a8c..496d6a69f 100644
--- a/src/models/labelTask.ts
+++ b/src/models/labelTask.ts
@@ -1,12 +1,12 @@
 import AbstractModel from './abstractModel'
 
-interface ILabel extends AbstractModel {
+export interface ILabelTask extends AbstractModel {
 	id: number
 	taskId: number
 	labelId: number
 }
 
-export default class LabelTask extends AbstractModel implements ILabel {
+export default class LabelTask extends AbstractModel implements ILabelTask {
 	declare id: number
 	declare taskId: number
 	declare labelId: number
diff --git a/src/models/listDuplicateModel.ts b/src/models/listDuplicateModel.ts
index 408965372..e1a32cdf4 100644
--- a/src/models/listDuplicateModel.ts
+++ b/src/models/listDuplicateModel.ts
@@ -2,13 +2,13 @@ import AbstractModel from './abstractModel'
 import ListModel, { type IList } from './list'
 import type { INamespace } from './namespace'
 
-export interface ListDuplicate extends AbstractModel {
+export interface IListDuplicate extends AbstractModel {
 	listId: number
 	namespaceId: INamespace['id']
 	list: IList
 }
 
-export default class ListDuplicateModel extends AbstractModel implements ListDuplicate {
+export default class ListDuplicateModel extends AbstractModel implements IListDuplicate {
 	declare listId: number
 	declare namespaceId: INamespace['id']
 	list: IList
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index e86e9dab0..bc924b47d 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -19,7 +19,7 @@ export const RELATION_KINDS = [...Object.values(RELATION_KIND)] as const
 
 export type RelationKind = typeof RELATION_KINDS[number]
 
-export interface ITaskRelationModel extends AbstractModel {
+export interface ITaskRelation extends AbstractModel {
 	id: number
 	otherTaskId: ITask['id']
 	taskId: ITask['id']
@@ -29,7 +29,7 @@ export interface ITaskRelationModel extends AbstractModel {
 	created: Date
 }
 
-export default class TaskRelationModel extends AbstractModel implements ITaskRelationModel {
+export default class TaskRelationModel extends AbstractModel implements ITaskRelation {
 	declare id: number
 	declare otherTaskId: ITask['id']
 	declare taskId: ITask['id']
diff --git a/src/services/labelTask.ts b/src/services/labelTask.ts
index 14f4758ec..cabc2c404 100644
--- a/src/services/labelTask.ts
+++ b/src/services/labelTask.ts
@@ -1,7 +1,7 @@
 import AbstractService from './abstractService'
-import LabelTask from '../models/labelTask'
+import LabelTask, {type ILabelTask} from '@/models/labelTask'
 
-export default class LabelTaskService extends AbstractService {
+export default class LabelTaskService extends AbstractService<ILabelTask> {
 	constructor() {
 		super({
 			create: '/tasks/{taskId}/labels',
diff --git a/src/services/linkShare.ts b/src/services/linkShare.ts
index 34179dc6a..61220d488 100644
--- a/src/services/linkShare.ts
+++ b/src/services/linkShare.ts
@@ -1,8 +1,8 @@
 import AbstractService from './abstractService'
-import LinkShareModel from '../models/linkShare'
+import LinkShareModel, { type ILinkShare } from '@/models/linkShare'
 import {formatISO} from 'date-fns'
 
-export default class ListService extends AbstractService {
+export default class LinkShareService extends AbstractService<ILinkShare> {
 	constructor() {
 		super({
 			getAll: '/lists/{listId}/shares',
diff --git a/src/services/listDuplicateService.ts b/src/services/listDuplicateService.ts
index f34af5ca1..b860c7c7f 100644
--- a/src/services/listDuplicateService.ts
+++ b/src/services/listDuplicateService.ts
@@ -1,7 +1,7 @@
 import AbstractService from './abstractService'
-import listDuplicateModel from '../models/listDuplicateModel'
+import listDuplicateModel, {type IListDuplicate} from '../models/listDuplicateModel'
 
-export default class ListDuplicateService extends AbstractService {
+export default class ListDuplicateService extends AbstractService<IListDuplicate> {
 	constructor() {
 		super({
 			create: '/lists/{listId}/duplicate',
diff --git a/src/services/notification.ts b/src/services/notification.ts
index ff21251f3..2d6f36aa3 100644
--- a/src/services/notification.ts
+++ b/src/services/notification.ts
@@ -1,8 +1,8 @@
 import AbstractService from '@/services/abstractService'
 import {formatISO} from 'date-fns'
-import NotificationModel from '@/models/notification'
+import NotificationModel, { type INotification } from '@/models/notification'
 
-export default class NotificationService extends AbstractService {
+export default class NotificationService extends AbstractService<INotification> {
 	constructor() {
 		super({
 			getAll: '/notifications',
diff --git a/src/services/passwordReset.ts b/src/services/passwordReset.ts
index 9d3dc56bf..c43381c5b 100644
--- a/src/services/passwordReset.ts
+++ b/src/services/passwordReset.ts
@@ -1,7 +1,7 @@
 import AbstractService from './abstractService'
-import PasswordResetModel from '../models/passwordReset'
+import PasswordResetModel, { type IPasswordReset } from '../models/passwordReset'
 
-export default class PasswordResetService extends AbstractService {
+export default class PasswordResetService extends AbstractService<IPasswordReset> {
 
 	constructor() {
 		super({})
diff --git a/src/services/passwordUpdateService.ts b/src/services/passwordUpdateService.ts
index 0c328dee2..03306af16 100644
--- a/src/services/passwordUpdateService.ts
+++ b/src/services/passwordUpdateService.ts
@@ -1,6 +1,7 @@
+import type { IPasswordUpdate } from '@/models/passwordUpdate'
 import AbstractService from './abstractService'
 
-export default class PasswordUpdateService extends AbstractService {
+export default class PasswordUpdateService extends AbstractService<IPasswordUpdate> {
 	constructor() {
 		super({
 			update: '/user/password',
diff --git a/src/services/savedFilter.ts b/src/services/savedFilter.ts
index e9c85f6f4..61ae569d6 100644
--- a/src/services/savedFilter.ts
+++ b/src/services/savedFilter.ts
@@ -1,8 +1,8 @@
 import AbstractService from '@/services/abstractService'
-import SavedFilterModel from '@/models/savedFilter'
+import SavedFilterModel, { type ISavedFilter } from '@/models/savedFilter'
 import {objectToCamelCase} from '@/helpers/case'
 
-export default class SavedFilterService extends AbstractService {
+export default class SavedFilterService extends AbstractService<ISavedFilter> {
 	constructor() {
 		super({
 			get: '/filters/{id}',
diff --git a/src/services/subscription.ts b/src/services/subscription.ts
index 20c79c097..2c41d6ec8 100644
--- a/src/services/subscription.ts
+++ b/src/services/subscription.ts
@@ -1,7 +1,7 @@
 import AbstractService from '@/services/abstractService'
-import SubscriptionModel from '@/models/subscription'
+import SubscriptionModel, { type ISubscription } from '@/models/subscription'
 
-export default class SubscriptionService extends AbstractService {
+export default class SubscriptionService extends AbstractService<ISubscription> {
 	constructor() {
 		super({
 			create: '/subscriptions/{entity}/{entityId}',
diff --git a/src/services/task.ts b/src/services/task.ts
index 25dd94843..9c4ba6fc9 100644
--- a/src/services/task.ts
+++ b/src/services/task.ts
@@ -14,7 +14,7 @@ const parseDate = date => {
 	return null
 }
 
-export default class TaskService extends AbstractService {
+export default class TaskService extends AbstractService<ITask> {
 	constructor() {
 		super({
 			create: '/lists/{listId}',
diff --git a/src/services/taskAssignee.ts b/src/services/taskAssignee.ts
index 6b76960bd..e76921da0 100644
--- a/src/services/taskAssignee.ts
+++ b/src/services/taskAssignee.ts
@@ -1,8 +1,8 @@
 import AbstractService from './abstractService'
-import TaskAssigneeModel from '../models/taskAssignee'
+import TaskAssigneeModel, { type ITaskAssignee } from '../models/taskAssignee'
 import {formatISO} from 'date-fns'
 
-export default class TaskAssigneeService extends AbstractService {
+export default class TaskAssigneeService extends AbstractService<ITaskAssignee> {
 	constructor() {
 		super({
 			create: '/tasks/{taskId}/assignees',
diff --git a/src/services/taskRelation.ts b/src/services/taskRelation.ts
index 54459f0e8..e5efdd715 100644
--- a/src/services/taskRelation.ts
+++ b/src/services/taskRelation.ts
@@ -1,8 +1,9 @@
-import AbstractService from './abstractService'
-import TaskRelationModel from '../models/taskRelation'
 import {formatISO} from 'date-fns'
 
-export default class TaskRelationService extends AbstractService {
+import AbstractService from './abstractService'
+import TaskRelationModel, {type ITaskRelation} from '@/models/taskRelation'
+
+export default class TaskRelationService extends AbstractService<ITaskRelation> {
 	constructor() {
 		super({
 			create: '/tasks/{taskId}/relations',
diff --git a/src/services/team.ts b/src/services/team.ts
index e14fd9314..d4602e13e 100644
--- a/src/services/team.ts
+++ b/src/services/team.ts
@@ -1,8 +1,8 @@
 import AbstractService from './abstractService'
-import TeamModel from '../models/team'
+import TeamModel, { type ITeam } from '../models/team'
 import {formatISO} from 'date-fns'
 
-export default class TeamService extends AbstractService {
+export default class TeamService extends AbstractService<ITeam> {
 	constructor() {
 		super({
 			create: '/teams',
diff --git a/src/services/teamList.ts b/src/services/teamList.ts
index d04af9274..841b717a4 100644
--- a/src/services/teamList.ts
+++ b/src/services/teamList.ts
@@ -1,9 +1,9 @@
 import AbstractService from './abstractService'
-import TeamListModel from '../models/teamList'
+import TeamListModel, { type ITeamList } from '../models/teamList'
 import TeamModel from '../models/team'
 import {formatISO} from 'date-fns'
 
-export default class TeamListService extends AbstractService {
+export default class TeamListService extends AbstractService<ITeamList> {
 	constructor() {
 		super({
 			create: '/lists/{listId}/teams',
diff --git a/src/services/teamMember.ts b/src/services/teamMember.ts
index 9927c82bd..617180aa3 100644
--- a/src/services/teamMember.ts
+++ b/src/services/teamMember.ts
@@ -1,8 +1,8 @@
 import AbstractService from './abstractService'
-import TeamMemberModel from '../models/teamMember'
+import TeamMemberModel, { type ITeamMember } from '../models/teamMember'
 import {formatISO} from 'date-fns'
 
-export default class TeamMemberService extends AbstractService {
+export default class TeamMemberService extends AbstractService<ITeamMember> {
 	constructor() {
 		super({
 			create: '/teams/{teamId}/members',
diff --git a/src/services/teamNamespace.ts b/src/services/teamNamespace.ts
index 3ceb428ca..bbde85167 100644
--- a/src/services/teamNamespace.ts
+++ b/src/services/teamNamespace.ts
@@ -1,9 +1,9 @@
 import AbstractService from './abstractService'
-import TeamNamespaceModel from '../models/teamNamespace'
+import TeamNamespaceModel, { type ITeamNamespace } from '../models/teamNamespace'
 import TeamModel from '../models/team'
 import {formatISO} from 'date-fns'
 
-export default class TeamNamespaceService extends AbstractService {
+export default class TeamNamespaceService extends AbstractService<ITeamNamespace> {
 	constructor() {
 		super({
 			create: '/namespaces/{namespaceId}/teams',
diff --git a/src/services/totp.ts b/src/services/totp.ts
index 93367ab38..cd4a1a37d 100644
--- a/src/services/totp.ts
+++ b/src/services/totp.ts
@@ -1,7 +1,7 @@
 import AbstractService from './abstractService'
-import TotpModel from '../models/totp'
+import TotpModel, { type ITotp } from '@/models/totp'
 
-export default class TotpService extends AbstractService {
+export default class TotpService extends AbstractService<ITotp> {
 	urlPrefix = '/user/settings/totp'
 
 	constructor() {
diff --git a/src/services/user.ts b/src/services/user.ts
index d1b5cfb31..1db5ae9c9 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -1,8 +1,8 @@
 import AbstractService from './abstractService'
-import UserModel from '../models/user'
+import UserModel, { type IUser } from '../models/user'
 import {formatISO} from 'date-fns'
 
-export default class UserService extends AbstractService {
+export default class UserService extends AbstractService<IUser> {
 	constructor() {
 		super({
 			getAll: '/users',
diff --git a/src/services/userList.ts b/src/services/userList.ts
index 7cdcda592..40b823b29 100644
--- a/src/services/userList.ts
+++ b/src/services/userList.ts
@@ -1,9 +1,9 @@
 import AbstractService from './abstractService'
-import UserListModel from '../models/userList'
+import UserListModel, { type IUserList } from '../models/userList'
 import UserModel from '../models/user'
 import {formatISO} from 'date-fns'
 
-export default class UserListService extends AbstractService {
+export default class UserListService extends AbstractService<IUserList> {
 	constructor() {
 		super({
 			create: '/lists/{listId}/users',
diff --git a/src/services/userNamespace.ts b/src/services/userNamespace.ts
index 64473dff4..b3ede973a 100644
--- a/src/services/userNamespace.ts
+++ b/src/services/userNamespace.ts
@@ -1,9 +1,9 @@
 import AbstractService from './abstractService'
-import UserNamespaceModel from '../models/userNamespace'
+import UserNamespaceModel, { type IUserNamespace } from '../models/userNamespace'
 import UserModel from '../models/user'
 import {formatISO} from 'date-fns'
 
-export default class UserNamespaceService extends AbstractService {
+export default class UserNamespaceService extends AbstractService<IUserNamespace> {
 	constructor() {
 		super({
 			create: '/namespaces/{namespaceId}/users',
diff --git a/src/services/userSettings.ts b/src/services/userSettings.ts
index eb7aebf2e..03497f6b9 100644
--- a/src/services/userSettings.ts
+++ b/src/services/userSettings.ts
@@ -1,7 +1,8 @@
 
+import type { IUserSettings } from '@/models/userSettings'
 import AbstractService from './abstractService'
 
-export default class UserSettingsService extends AbstractService {
+export default class UserSettingsService extends AbstractService<IUserSettings> {
 	constructor() {
 		super({
 			update: '/user/settings/general',

From 106abfc842ca0c916ef7574b0fe5c89940869ac2 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 21 Jul 2022 19:16:13 +0200
Subject: [PATCH 17/32] fix: merge duplicate types

---
 src/models/task.ts           | 13 ++++------
 src/modules/parseTaskText.ts | 48 +++++++++++++-----------------------
 src/types/IRepeats.ts        | 14 +++++++++++
 3 files changed, 36 insertions(+), 39 deletions(-)
 create mode 100644 src/types/IRepeats.ts

diff --git a/src/models/task.ts b/src/models/task.ts
index 92003d6da..88e2f141b 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -6,6 +6,7 @@ import LabelModel, { type ILabel } from '@/models/label'
 import AttachmentModel, {type IAttachment} from '@/models/attachment'
 import SubscriptionModel, { type ISubscription } from '@/models/subscription'
 import type { IList } from '@/models/list'
+import  type {IRepeats} from '@/types/IRepeats'
 
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
 import type { IBucket } from './bucket'
@@ -21,11 +22,6 @@ export const TASK_REPEAT_MODES = {
 
 export type TaskRepeatMode = typeof TASK_REPEAT_MODES[keyof typeof TASK_REPEAT_MODES] 
 
-export interface RepeatAfter {
-	type: 'hours' | 'weeks' | 'months' | 'years' | 'days'
-	amount: number
-}
-
 export interface ITask extends AbstractModel {
 	id: number
 	title: string
@@ -39,7 +35,7 @@ export interface ITask extends AbstractModel {
 	dueDate: Date | null
 	startDate: Date | null
 	endDate: Date | null
-	repeatAfter: number | RepeatAfter
+	repeatAfter: number | IRepeats
 	repeatFromCurrentDate: boolean
 	repeatMode: TaskRepeatMode
 	reminderDates: Date[]
@@ -77,7 +73,7 @@ export default class TaskModel extends AbstractModel implements ITask {
 	dueDate: Date | null
 	startDate: Date | null
 	endDate: Date | null
-	declare repeatAfter: number | RepeatAfter
+	declare repeatAfter: number | IRepeats
 	declare repeatFromCurrentDate: boolean
 	declare repeatMode: TaskRepeatMode
 	reminderDates: Date[]
@@ -99,6 +95,7 @@ export default class TaskModel extends AbstractModel implements ITask {
 	updated: Date
 
 	listId: IList['id'] // Meta, only used when creating a new task
+	declare bucketId: IBucket['id']
 
 	constructor(data: Partial<ITask>) {
 		super(data)
@@ -160,7 +157,6 @@ export default class TaskModel extends AbstractModel implements ITask {
 
 		this.listId = Number(this.listId)
 	}
-bucketId: number
 
 	defaults() {
 		return {
@@ -198,6 +194,7 @@ bucketId: number
 			updated: null,
 
 			listId: 0, // Meta, only used when creating a new task
+			bucketId: 0,
 		}
 	}
 
diff --git a/src/modules/parseTaskText.ts b/src/modules/parseTaskText.ts
index d30975b8d..b9aa1599e 100644
--- a/src/modules/parseTaskText.ts
+++ b/src/modules/parseTaskText.ts
@@ -1,5 +1,6 @@
 import {parseDate} from '../helpers/time/parseDate'
 import {PRIORITIES} from '@/models/constants/priorities'
+import {REPEAT_TYPES, type IRepeats, type RepeatType} from '@/types/IRepeats'
 
 const VIKUNJA_PREFIXES: Prefixes = {
 	label: '*',
@@ -27,24 +28,9 @@ export const PREFIXES = {
 	[PrefixMode.Todoist]: TODOIST_PREFIXES,
 }
 
-const priorities = PRIORITIES
-
-enum RepeatType {
-	Hours = 'hours',
-	Days = 'days',
-	Weeks = 'weeks',
-	Months = 'months',
-	Years = 'years',
-}
-
-interface Repeats {
-	type: RepeatType,
-	amount: number,
-}
-
 interface repeatParsedResult {
 	textWithoutMatched: string,
-	repeats: Repeats | null,
+	repeats: IRepeats | null,
 }
 
 export interface ParsedTaskText {
@@ -54,7 +40,7 @@ export interface ParsedTaskText {
 	list: string | null,
 	priority: number | null,
 	assignees: string[],
-	repeats: Repeats | null,
+	repeats: IRepeats | null,
 }
 
 interface Prefixes {
@@ -144,7 +130,7 @@ const getPriority = (text: string, prefix: string): number | null => {
 	}
 
 	for (const p of ps) {
-		for (const pi of Object.values(priorities)) {
+		for (const pi of Object.values(PRIORITIES)) {
 			if (pi === parseInt(p)) {
 				return parseInt(p)
 			}
@@ -199,55 +185,55 @@ const getRepeats = (text: string): repeatParsedResult => {
 		default:
 			amount = results[3] ? parseInt(results[3]) : 1
 	}
-	let type: RepeatType = RepeatType.Hours
+	let type: RepeatType = REPEAT_TYPES.Hours
 
 	switch (results[0]) {
 		case 'biennially':
-			type = RepeatType.Years
+			type = REPEAT_TYPES.Years
 			amount = 2
 			break
 		case 'bianually':
 		case 'semiannually':
-			type = RepeatType.Months
+			type = REPEAT_TYPES.Months
 			amount = 6
 			break
 		case 'yearly':
 		case 'anually':
-			type = RepeatType.Years
+			type = REPEAT_TYPES.Years
 			break
 		case 'daily':
-			type = RepeatType.Days
+			type = REPEAT_TYPES.Days
 			break
 		case 'hourly':
-			type = RepeatType.Hours
+			type = REPEAT_TYPES.Hours
 			break
 		case 'monthly':
-			type = RepeatType.Months
+			type = REPEAT_TYPES.Months
 			break
 		case 'weekly':
-			type = RepeatType.Weeks
+			type = REPEAT_TYPES.Weeks
 			break
 		default:
 			switch (results[5]) {
 				case 'hour':
 				case 'hours':
-					type = RepeatType.Hours
+					type = REPEAT_TYPES.Hours
 					break
 				case 'day':
 				case 'days':
-					type = RepeatType.Days
+					type = REPEAT_TYPES.Days
 					break
 				case 'week':
 				case 'weeks':
-					type = RepeatType.Weeks
+					type = REPEAT_TYPES.Weeks
 					break
 				case 'month':
 				case 'months':
-					type = RepeatType.Months
+					type = REPEAT_TYPES.Months
 					break
 				case 'year':
 				case 'years':
-					type = RepeatType.Years
+					type = REPEAT_TYPES.Years
 					break
 			}
 	}
diff --git a/src/types/IRepeats.ts b/src/types/IRepeats.ts
new file mode 100644
index 000000000..e2ab90777
--- /dev/null
+++ b/src/types/IRepeats.ts
@@ -0,0 +1,14 @@
+export const REPEAT_TYPES = {
+	Hours: 'hours',
+	Days: 'days',
+	Weeks: 'weeks',
+	Months: 'months',
+	Years: 'years',
+} as const
+
+export type RepeatType = typeof REPEAT_TYPES[keyof typeof REPEAT_TYPES]
+
+export interface IRepeats {
+	type: RepeatType,
+	amount: number,
+}
\ No newline at end of file

From f9b51306c396ceb0d8fa0c4af3fea24d2b28b64b Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 21 Jul 2022 19:22:36 +0200
Subject: [PATCH 18/32] fix: createNewTask typing

---
 src/store/modules/tasks.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/tasks.ts b/src/store/modules/tasks.ts
index bb459b790..6588c51f7 100644
--- a/src/store/modules/tasks.ts
+++ b/src/store/modules/tasks.ts
@@ -320,7 +320,7 @@ const tasksStore : Module<TaskState, RootStoreState>= {
 			return foundListId
 		},
 
-		async createNewTask({dispatch, commit}, { 
+		async createNewTask(ctx, { 
 			title,
 			bucketId,
 			listId,
@@ -328,10 +328,10 @@ const tasksStore : Module<TaskState, RootStoreState>= {
 		} : 
 			Partial<ITask>,
 		) {
-			const cancel = setLoading({commit}, 'tasks')
+			const cancel = setLoading(ctx, 'tasks')
 			const parsedTask = parseTaskText(title, getQuickAddMagicMode())
 		
-			const foundListId = await dispatch('findListId', {
+			const foundListId = await ctx.dispatch('findListId', {
 				list: parsedTask.list,
 				listId: listId || 0,
 			})
@@ -358,7 +358,7 @@ const tasksStore : Module<TaskState, RootStoreState>= {
 		
 			const taskService = new TaskService()
 			const createdTask = await taskService.create(task)
-			const result = await dispatch('addLabelsToTask', {
+			const result = await ctx.dispatch('addLabelsToTask', {
 				task: createdTask,
 				parsedLabels: parsedTask.labels,
 			})

From 4a50e6aae28d22c3d441f1fead4edce7d0e30ff1 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Sat, 30 Jul 2022 17:51:09 +0200
Subject: [PATCH 19/32] fix: improve some types

---
 src/components/base/BaseButton.vue                 | 2 +-
 src/components/sharing/userTeam.vue                | 2 +-
 src/components/tasks/partials/singleTaskInList.vue | 6 ++++--
 src/helpers/auth.ts                                | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/base/BaseButton.vue b/src/components/base/BaseButton.vue
index c06297d11..f7e909307 100644
--- a/src/components/base/BaseButton.vue
+++ b/src/components/base/BaseButton.vue
@@ -25,7 +25,7 @@ export default { inheritAttrs: false }
 
 // NOTE: Do NOT use buttons with @click to push routes. => Use router-links instead!
 
-import {ref, watchEffect, computed, useAttrs, PropType} from 'vue'
+import { ref, watchEffect, computed, useAttrs, type PropType } from 'vue'
 
 const BASE_BUTTON_TYPES_MAP = Object.freeze({
 	button: 'button',
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index 2c54befa4..5106ab3e1 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -137,7 +137,7 @@ export default {name: 'userTeamShare'}
 </script>
 
 <script setup lang="ts">
-import {ref, reactive, computed, shallowReactive, type ShallowReactive, type Ref} from 'vue'
+import {ref, reactive, computed, shallowReactive, type Ref} from 'vue'
 import type {PropType} from 'vue'
 import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 296abf645..5c466e428 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -30,7 +30,7 @@
 				{{ task.title }}
 			</span>
 
-			<labels class="labels ml-2 mr-1" :labels="task.labels" v-if="task.labels.length > 0"/>
+			<labels class="labels ml-2 mr-1" :labels="task.labels" v-if="task.labels.length > 0" />
 			<user
 				:avatar-size="27"
 				:is-inline="true"
@@ -96,11 +96,13 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from 'vue'
+import {defineComponent, type PropType} from 'vue'
 
 import TaskModel, { type ITask } from '../../../models/task'
 import PriorityLabel from './priorityLabel.vue'
 import TaskService from '../../../services/task'
+import Labels from '@/components/tasks/partials/labels.vue'
+import User from '@/components/misc/user.vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 import Fancycheckbox from '../../input/fancycheckbox.vue'
 import DeferTask from './defer-task.vue'
diff --git a/src/helpers/auth.ts b/src/helpers/auth.ts
index 0b5d598b7..54e1cdb40 100644
--- a/src/helpers/auth.ts
+++ b/src/helpers/auth.ts
@@ -1,5 +1,5 @@
 import {AuthenticatedHTTPFactory} from '@/http-common'
-import {AxiosResponse} from 'axios'
+import type {AxiosResponse} from 'axios'
 
 let savedToken: string | null = null
 

From 041a1a4cc087b1ef23fce8e487f63d9ab344516b Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Sat, 13 Aug 2022 15:26:57 +0200
Subject: [PATCH 20/32] move constants

---
 src/components/home/TheNavigation.vue            | 2 +-
 src/components/sharing/linkSharing.vue           | 2 +-
 src/components/sharing/userTeam.vue              | 2 +-
 src/components/tasks/gantt-component.vue         | 4 ++--
 src/components/tasks/partials/priorityLabel.vue  | 2 +-
 src/components/tasks/partials/prioritySelect.vue | 2 +-
 src/{models => }/constants/config.ts             | 0
 src/{models => }/constants/priorities.ts         | 0
 src/{models => }/constants/rights.ts             | 0
 src/models/abstractModel.ts                      | 2 +-
 src/models/linkShare.ts                          | 2 +-
 src/models/task.ts                               | 2 +-
 src/models/team.ts                               | 2 +-
 src/models/teamShareBase.ts                      | 2 +-
 src/models/userShareBase.ts                      | 2 +-
 src/modules/parseTaskText.test.ts                | 2 +-
 src/modules/parseTaskText.ts                     | 2 +-
 src/services/abstractService.ts                  | 2 +-
 src/views/list/ListKanban.vue                    | 2 +-
 src/views/list/ListList.vue                      | 2 +-
 src/views/tasks/TaskDetailView.vue               | 4 ++--
 src/views/teams/EditTeam.vue                     | 2 +-
 22 files changed, 21 insertions(+), 21 deletions(-)
 rename src/{models => }/constants/config.ts (100%)
 rename src/{models => }/constants/priorities.ts (100%)
 rename src/{models => }/constants/rights.ts (100%)

diff --git a/src/components/home/TheNavigation.vue b/src/components/home/TheNavigation.vue
index 22dd35cf8..dbe6fefaa 100644
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@@ -92,7 +92,7 @@ import {useStore} from '@/store'
 import {useRouter} from 'vue-router'
 
 import {QUICK_ACTIONS_ACTIVE} from '@/store/mutation-types'
-import {RIGHTS as Rights} from '@/models/constants/rights'
+import {RIGHTS as Rights} from '@/constants/rights'
 
 import Update from '@/components/home/update.vue'
 import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue'
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index e40eefa2b..c36b3ddcf 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -180,7 +180,7 @@ import {ref, watch, computed, shallowReactive} from 'vue'
 import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
-import {RIGHTS} from '@/models/constants/rights'
+import {RIGHTS} from '@/constants/rights'
 import LinkShareModel, { type ILinkShare } from '@/models/linkShare'
 
 import LinkShareService from '@/services/linkShare'
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index 5106ab3e1..84a212cc2 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -160,7 +160,7 @@ import TeamListModel, { type ITeamList } from '@/models/teamList'
 import TeamService from '@/services/team'
 import TeamModel, { type ITeam } from '@/models/team'
 
-import {RIGHTS} from '@/models/constants/rights'
+import {RIGHTS} from '@/constants/rights'
 import Multiselect from '@/components/input/multiselect.vue'
 import Nothing from '@/components/misc/nothing.vue'
 import {success} from '@/message'
diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index 82c71547d..0db199dcb 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -179,11 +179,11 @@ import EditTask from './edit-task.vue'
 
 import TaskService from '../../services/task'
 import TaskModel from '../../models/task'
-import {PRIORITIES as priorities} from '@/models/constants/priorities'
+import {PRIORITIES as priorities} from '@/constants/priorities'
 import PriorityLabel from './partials/priorityLabel.vue'
 import TaskCollectionService from '../../services/taskCollection'
 import {mapState} from 'vuex'
-import {RIGHTS as Rights} from '@/models/constants/rights'
+import {RIGHTS as Rights} from '@/constants/rights'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 
diff --git a/src/components/tasks/partials/priorityLabel.vue b/src/components/tasks/partials/priorityLabel.vue
index 380d711b4..f4ba86a52 100644
--- a/src/components/tasks/partials/priorityLabel.vue
+++ b/src/components/tasks/partials/priorityLabel.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script setup lang="ts">
-import {PRIORITIES as priorities} from '@/models/constants/priorities'
+import {PRIORITIES as priorities} from '@/constants/priorities'
 	
 defineProps({
 	priority: {
diff --git a/src/components/tasks/partials/prioritySelect.vue b/src/components/tasks/partials/prioritySelect.vue
index def7b37f3..30a528921 100644
--- a/src/components/tasks/partials/prioritySelect.vue
+++ b/src/components/tasks/partials/prioritySelect.vue
@@ -17,7 +17,7 @@
 
 <script setup lang="ts">
 import {ref, watch} from 'vue'
-import {PRIORITIES} from '@/models/constants/priorities'
+import {PRIORITIES} from '@/constants/priorities'
 
 const priority = ref(0)
 
diff --git a/src/models/constants/config.ts b/src/constants/config.ts
similarity index 100%
rename from src/models/constants/config.ts
rename to src/constants/config.ts
diff --git a/src/models/constants/priorities.ts b/src/constants/priorities.ts
similarity index 100%
rename from src/models/constants/priorities.ts
rename to src/constants/priorities.ts
diff --git a/src/models/constants/rights.ts b/src/constants/rights.ts
similarity index 100%
rename from src/models/constants/rights.ts
rename to src/constants/rights.ts
diff --git a/src/models/abstractModel.ts b/src/models/abstractModel.ts
index 02b89b744..a0b761648 100644
--- a/src/models/abstractModel.ts
+++ b/src/models/abstractModel.ts
@@ -1,6 +1,6 @@
 import {objectToCamelCase} from '@/helpers/case'
 import {omitBy, isNil} from '@/helpers/utils'
-import type {Right} from '@/models/constants/rights'
+import type {Right} from '@/constants/rights'
 
 export interface IAbstract {
 	maxRight: Right | null
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index 10100ee42..78c7d302f 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -1,6 +1,6 @@
 import AbstractModel from './abstractModel'
 import UserModel, { type IUser } from './user'
-import {RIGHTS, type Right} from '@/models/constants/rights'
+import {RIGHTS, type Right} from '@/constants/rights'
 
 export interface ILinkShare extends AbstractModel {
 	id: number
diff --git a/src/models/task.ts b/src/models/task.ts
index 88e2f141b..5dd5eae2d 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -1,4 +1,4 @@
-import type { Priority } from '@/models/constants/priorities'
+import type { Priority } from '@/constants/priorities'
 
 import AbstractModel from '@/models/abstractModel'
 import UserModel, { type IUser } from '@/models/user'
diff --git a/src/models/team.ts b/src/models/team.ts
index b81c99d8e..d53cb1c78 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -1,7 +1,7 @@
 import AbstractModel from './abstractModel'
 import UserModel, { type IUser } from './user'
 import TeamMemberModel, { type ITeamMember } from './teamMember'
-import {RIGHTS, type Right} from '@/models/constants/rights'
+import {RIGHTS, type Right} from '@/constants/rights'
 
 export interface ITeam extends AbstractModel {
 	id: number
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index c3e943701..83a3b0d1e 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -1,5 +1,5 @@
 import AbstractModel from './abstractModel'
-import {RIGHTS, type Right} from '@/models/constants/rights'
+import {RIGHTS, type Right} from '@/constants/rights'
 import type { ITeam } from './team'
 
 export interface ITeamShareBase extends AbstractModel {
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index 8eda9ed29..c6e80d41d 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -1,5 +1,5 @@
 import AbstractModel from './abstractModel'
-import {RIGHTS, type Right} from '@/models/constants/rights'
+import {RIGHTS, type Right} from '@/constants/rights'
 import type { IUser } from './user'
 
 export interface IUserShareBase extends AbstractModel {
diff --git a/src/modules/parseTaskText.test.ts b/src/modules/parseTaskText.test.ts
index 938cb91fe..2851a440d 100644
--- a/src/modules/parseTaskText.test.ts
+++ b/src/modules/parseTaskText.test.ts
@@ -3,7 +3,7 @@ import {beforeEach, afterEach, describe, it, expect, vi} from 'vitest'
 import {parseTaskText} from './parseTaskText'
 import {getDateFromText, getDateFromTextIn} from '../helpers/time/parseDate'
 import {calculateDayInterval} from '../helpers/time/calculateDayInterval'
-import {PRIORITIES} from '@/models/constants/priorities'
+import {PRIORITIES} from '@/constants/priorities'
 
 describe('Parse Task Text', () => {
 	beforeEach(() => {
diff --git a/src/modules/parseTaskText.ts b/src/modules/parseTaskText.ts
index b9aa1599e..5be6d2ab0 100644
--- a/src/modules/parseTaskText.ts
+++ b/src/modules/parseTaskText.ts
@@ -1,5 +1,5 @@
 import {parseDate} from '../helpers/time/parseDate'
-import {PRIORITIES} from '@/models/constants/priorities'
+import {PRIORITIES} from '@/constants/priorities'
 import {REPEAT_TYPES, type IRepeats, type RepeatType} from '@/types/IRepeats'
 
 const VIKUNJA_PREFIXES: Prefixes = {
diff --git a/src/services/abstractService.ts b/src/services/abstractService.ts
index dc086d671..1cc74e9f8 100644
--- a/src/services/abstractService.ts
+++ b/src/services/abstractService.ts
@@ -3,7 +3,7 @@ import type {Method} from 'axios'
 
 import {objectToSnakeCase} from '@/helpers/case'
 import AbstractModel, { type IAbstract } from '@/models/abstractModel'
-import type { Right } from '@/models/constants/rights'
+import type { Right } from '@/constants/rights'
 import type { IFile } from '@/models/file'
 
 interface Paths {
diff --git a/src/views/list/ListKanban.vue b/src/views/list/ListKanban.vue
index fc17a2435..3252a25fc 100644
--- a/src/views/list/ListKanban.vue
+++ b/src/views/list/ListKanban.vue
@@ -230,7 +230,7 @@ import cloneDeep from 'lodash.clonedeep'
 
 import BucketModel from '../../models/bucket'
 import {mapState} from 'vuex'
-import {RIGHTS as Rights} from '@/models/constants/rights'
+import {RIGHTS as Rights} from '@/constants/rights'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import ListWrapper from './ListWrapper.vue'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
diff --git a/src/views/list/ListList.vue b/src/views/list/ListList.vue
index 27a995bae..6c018fe13 100644
--- a/src/views/list/ListList.vue
+++ b/src/views/list/ListList.vue
@@ -144,7 +144,7 @@ import EditTask from '@/components/tasks/edit-task.vue'
 import AddTask from '@/components/tasks/add-task.vue'
 import SingleTaskInList from '@/components/tasks/partials/singleTaskInList.vue'
 import { useTaskList } from '@/composables/taskList'
-import {RIGHTS as Rights} from '@/models/constants/rights'
+import {RIGHTS as Rights} from '@/constants/rights'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
 import {HAS_TASKS} from '@/store/mutation-types'
 import Nothing from '@/components/misc/nothing.vue'
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 993d8de74..18f141e86 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -427,8 +427,8 @@ import {defineComponent} from 'vue'
 import TaskService from '../../services/task'
 import TaskModel, { type ITask } from '@/models/task'
 
-import { PRIORITIES as priorites } from '@/models/constants/priorities'
-import {RIGHTS as rights} from '@/models/constants/rights'
+import { PRIORITIES as priorites } from '@/constants/priorities'
+import {RIGHTS as rights} from '@/constants/rights'
 
 import PrioritySelect from '../../components/tasks/partials/prioritySelect.vue'
 import PercentDoneSelect from '../../components/tasks/partials/percentDoneSelect.vue'
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index dfcdf0620..5497ba347 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -170,7 +170,7 @@ import {useStore} from '@/store'
 import TeamService from '@/services/team'
 import TeamMemberService from '@/services/teamMember'
 import UserService from '@/services/user'
-import {RIGHTS as Rights} from '@/models/constants/rights'
+import {RIGHTS as Rights} from '@/constants/rights'
 
 import Multiselect from '@/components/input/multiselect.vue'
 import {useRoute, useRouter} from 'vue-router'

From 96f5f00c073f71c71d85c351f86ad16a67db6992 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Sat, 13 Aug 2022 15:38:41 +0200
Subject: [PATCH 21/32] fix: use definite assignment assertion operator

We used declare which is the wrong use-case for this. See: https://www.typescriptlang.org/docs/handbook/2/classes.html#--strictpropertyinitialization
---
 src/models/attachment.ts         |  4 ++--
 src/models/avatar.ts             |  2 +-
 src/models/backgroundImage.ts    | 10 +++++-----
 src/models/bucket.ts             | 14 ++++++-------
 src/models/caldavToken.ts        |  4 ++--
 src/models/emailUpdate.ts        |  4 ++--
 src/models/file.ts               |  8 ++++----
 src/models/label.ts              | 14 ++++++-------
 src/models/labelTask.ts          |  6 +++---
 src/models/linkShare.ts          | 14 ++++++-------
 src/models/list.ts               | 24 +++++++++++-----------
 src/models/listDuplicateModel.ts |  4 ++--
 src/models/namespace.ts          | 12 +++++------
 src/models/notification.ts       |  8 ++++----
 src/models/passwordReset.ts      |  4 ++--
 src/models/passwordUpdate.ts     |  4 ++--
 src/models/savedFilter.ts        |  8 ++++----
 src/models/subscription.ts       |  6 +++---
 src/models/task.ts               | 34 ++++++++++++++++----------------
 src/models/taskAssignee.ts       |  4 ++--
 src/models/taskComment.ts        |  6 +++---
 src/models/taskRelation.ts       |  8 ++++----
 src/models/team.ts               |  8 ++++----
 src/models/teamList.ts           |  2 +-
 src/models/teamMember.ts         |  4 ++--
 src/models/teamNamespace.ts      |  2 +-
 src/models/teamShareBase.ts      |  4 ++--
 src/models/totp.ts               |  6 +++---
 src/models/user.ts               |  8 ++++----
 src/models/userList.ts           |  2 +-
 src/models/userNamespace.ts      |  2 +-
 src/models/userSettings.ts       | 16 +++++++--------
 src/models/userShareBase.ts      |  4 ++--
 33 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/src/models/attachment.ts b/src/models/attachment.ts
index c5c9933c3..10f935f14 100644
--- a/src/models/attachment.ts
+++ b/src/models/attachment.ts
@@ -11,8 +11,8 @@ export interface IAttachment extends AbstractModel {
 }
 
 export default class AttachmentModel extends AbstractModel implements IAttachment {
-	declare id: number
-	declare taskId: number
+	id!: number
+	taskId!: number
 	createdBy: IUser
 	file: IFile
 	created: Date
diff --git a/src/models/avatar.ts b/src/models/avatar.ts
index 411e3cd3e..f87c60db2 100644
--- a/src/models/avatar.ts
+++ b/src/models/avatar.ts
@@ -7,7 +7,7 @@ export interface IAvatar extends AbstractModel {
 }
 
 export default class AvatarModel extends AbstractModel implements IAvatar {
-	declare avatarProvider: AvatarProvider
+	avatarProvider!: AvatarProvider
 
 	defaults() {
 		return {
diff --git a/src/models/backgroundImage.ts b/src/models/backgroundImage.ts
index 21be0773e..71f732468 100644
--- a/src/models/backgroundImage.ts
+++ b/src/models/backgroundImage.ts
@@ -12,14 +12,14 @@ export interface IBackgroundImage extends AbstractModel {
 }
 
 export default class BackgroundImageModel extends AbstractModel implements IBackgroundImage {
-	declare id: number
-	declare url: string
-	declare thumb: string
-	declare info: {
+	id!: number
+	url!: string
+	thumb!: string
+	info!: {
 		author: string
 		authorName: string
 	}
-	declare blurHash: string  
+	blurHash!: string  
 
 	defaults() {
 		return {
diff --git a/src/models/bucket.ts b/src/models/bucket.ts
index f4b437594..46afd96af 100644
--- a/src/models/bucket.ts
+++ b/src/models/bucket.ts
@@ -17,13 +17,13 @@ export interface IBucket extends AbstractModel {
 }
 
 export default class BucketModel extends AbstractModel implements IBucket {
-	declare id: number
-	declare title: string
-	declare listId: number
-	declare limit: number
-	declare tasks: ITask[]
-	declare isDoneBucket: boolean
-	declare position: number
+	id!: number
+	title!: string
+	listId!: number
+	limit!: number
+	tasks!: ITask[]
+	isDoneBucket!: boolean
+	position!: number
 	
 	createdBy: IUser
 	created: Date
diff --git a/src/models/caldavToken.ts b/src/models/caldavToken.ts
index b2186b0a4..2518e123d 100644
--- a/src/models/caldavToken.ts
+++ b/src/models/caldavToken.ts
@@ -6,8 +6,8 @@ export interface ICaldavToken extends AbstractModel {
 }
 
 export default class CaldavTokenModel extends AbstractModel implements ICaldavToken {
-	declare id: number
-	declare created: Date
+	id!: number
+	created!: Date
 
 	constructor(data? : Object) {
 		super(data)
diff --git a/src/models/emailUpdate.ts b/src/models/emailUpdate.ts
index 4f6f4385c..d01dd959a 100644
--- a/src/models/emailUpdate.ts
+++ b/src/models/emailUpdate.ts
@@ -6,8 +6,8 @@ interface IEmailUpdate extends AbstractModel {
 }
 
 export default class EmailUpdateModel extends AbstractModel implements IEmailUpdate {
-	declare newEmail: string
-	declare password: string
+	newEmail!: string
+	password!: string
 
 	defaults() {
 		return {
diff --git a/src/models/file.ts b/src/models/file.ts
index 81240a792..74b66ce71 100644
--- a/src/models/file.ts
+++ b/src/models/file.ts
@@ -9,10 +9,10 @@ export interface IFile extends AbstractModel {
 } 
 
 export default class FileModel extends AbstractModel implements IFile {
-	declare id: number
-	declare mime: string
-	declare name: string
-	declare size: number
+	id!: number
+	mime!: string
+	name!: string
+	size!: number
 	created: Date
 
 	constructor(data) {
diff --git a/src/models/label.ts b/src/models/label.ts
index 75a104e30..5c5be2481 100644
--- a/src/models/label.ts
+++ b/src/models/label.ts
@@ -18,13 +18,13 @@ export interface ILabel extends AbstractModel {
 }
 
 export default class LabelModel extends AbstractModel implements ILabel {
-	declare id: number
-	declare title: string
-	declare hexColor: string
-	declare description: string
-	declare createdBy: IUser
-	declare listId: number
-	declare textColor: string
+	id!: number
+	title!: string
+	hexColor!: string
+	description!: string
+	createdBy!: IUser
+	listId!: number
+	textColor!: string
 
 	created: Date
 	updated: Date
diff --git a/src/models/labelTask.ts b/src/models/labelTask.ts
index 496d6a69f..5550e5cd0 100644
--- a/src/models/labelTask.ts
+++ b/src/models/labelTask.ts
@@ -7,9 +7,9 @@ export interface ILabelTask extends AbstractModel {
 }
 
 export default class LabelTask extends AbstractModel implements ILabelTask {
-	declare id: number
-	declare taskId: number
-	declare labelId: number
+	id!: number
+	taskId!: number
+	labelId!: number
 
 	defaults() {
 		return {
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index 78c7d302f..67f1dd2a6 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -16,14 +16,14 @@ export interface ILinkShare extends AbstractModel {
 }
 
 export default class LinkShareModel extends AbstractModel implements ILinkShare {
-	declare id: number
-	declare hash: string
-	declare right: Right
+	id!: number
+	hash!: string
+	right!: Right
 	sharedBy: IUser
-	declare sharingType: number // FIXME: use correct numbers
-	declare listId: number
-	declare name: string
-	declare password: string
+	sharingType!: number // FIXME: use correct numbers
+	listId!: number
+	name!: string
+	password!: string
 	created: Date
 	updated: Date
 
diff --git a/src/models/list.ts b/src/models/list.ts
index 7ced89296..c4b28273f 100644
--- a/src/models/list.ts
+++ b/src/models/list.ts
@@ -27,20 +27,20 @@ export interface IList extends AbstractModel {
 }
 
 export default class ListModel extends AbstractModel implements IList {
-	declare id: number
-	declare title: string
-	declare description: string
+	id!: number
+	title!: string
+	description!: string
 	owner: IUser
 	tasks: ITask[]
-	declare namespaceId: INamespace['id']
-	declare isArchived: boolean
-	declare hexColor: string
-	declare identifier: string
-	declare backgroundInformation: any
-	declare isFavorite: boolean
-	declare subscription: ISubscription
-	declare position: number
-	declare backgroundBlurHash: string
+	namespaceId!: INamespace['id']
+	isArchived!: boolean
+	hexColor!: string
+	identifier!: string
+	backgroundInformation!: any
+	isFavorite!: boolean
+	subscription!: ISubscription
+	position!: number
+	backgroundBlurHash!: string
 	
 	created: Date
 	updated: Date
diff --git a/src/models/listDuplicateModel.ts b/src/models/listDuplicateModel.ts
index e1a32cdf4..8dd0db9fb 100644
--- a/src/models/listDuplicateModel.ts
+++ b/src/models/listDuplicateModel.ts
@@ -9,8 +9,8 @@ export interface IListDuplicate extends AbstractModel {
 }
 
 export default class ListDuplicateModel extends AbstractModel implements IListDuplicate {
-	declare listId: number
-	declare namespaceId: INamespace['id']
+	listId!: number
+	namespaceId!: INamespace['id']
 	list: IList
 
 	constructor(data) {
diff --git a/src/models/namespace.ts b/src/models/namespace.ts
index 5d8c608c6..00f42a85b 100644
--- a/src/models/namespace.ts
+++ b/src/models/namespace.ts
@@ -18,14 +18,14 @@ export interface INamespace extends AbstractModel {
 }
 
 export default class NamespaceModel extends AbstractModel implements INamespace {
-	declare id: number
-	declare title: string
-	declare description: string
+	id!: number
+	title!: string
+	description!: string
 	owner: IUser
 	lists: IList[]
-	declare isArchived: boolean
-	declare hexColor: string
-	declare subscription: ISubscription
+	isArchived!: boolean
+	hexColor!: string
+	subscription!: ISubscription
 
 	created: Date
 	updated: Date
diff --git a/src/models/notification.ts b/src/models/notification.ts
index 4d9f48ab2..21a392dae 100644
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@@ -51,10 +51,10 @@ export interface INotification extends AbstractModel {
 }
 
 export default class NotificationModel extends AbstractModel implements INotification {
-	declare id: number
-	declare name: string
-	declare notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
-	declare read: boolean
+	id!: number
+	name!: string
+	notification!: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
+	read!: boolean
 	readAt: Date | null
 
 	created: Date
diff --git a/src/models/passwordReset.ts b/src/models/passwordReset.ts
index dd05f37a7..3d5099aae 100644
--- a/src/models/passwordReset.ts
+++ b/src/models/passwordReset.ts
@@ -8,8 +8,8 @@ export interface IPasswordReset extends AbstractModel {
 
 export default class PasswordResetModel extends AbstractModel implements IPasswordReset {
 	token: string
-	declare newPassword: string
-	declare email: string
+	newPassword!: string
+	email!: string
 
 	constructor(data) {
 		super(data)
diff --git a/src/models/passwordUpdate.ts b/src/models/passwordUpdate.ts
index 51640e323..d78e7801c 100644
--- a/src/models/passwordUpdate.ts
+++ b/src/models/passwordUpdate.ts
@@ -6,8 +6,8 @@ export interface IPasswordUpdate extends AbstractModel {
 }
 
 export default class PasswordUpdateModel extends AbstractModel implements IPasswordUpdate {
-	declare newPassword: string
-	declare oldPassword: string
+	newPassword!: string
+	oldPassword!: string
 
 	defaults() {
 		return {
diff --git a/src/models/savedFilter.ts b/src/models/savedFilter.ts
index 168613067..6bb7be4a2 100644
--- a/src/models/savedFilter.ts
+++ b/src/models/savedFilter.ts
@@ -21,10 +21,10 @@ export interface ISavedFilter extends AbstractModel {
 }
 
 export default class SavedFilterModel extends AbstractModel implements ISavedFilter {
-	declare id: 0
-	declare title: string
-	declare description: string
-	declare filters: {
+	id!: 0
+	title!: string
+	description!: string
+	filters!: {
 		sortBy: ('done' | 'id')[]
 		orderBy: ('asc' | 'desc')[]
 		filterBy: 'done'[]
diff --git a/src/models/subscription.ts b/src/models/subscription.ts
index bd52d0d6d..d17a692fd 100644
--- a/src/models/subscription.ts
+++ b/src/models/subscription.ts
@@ -11,9 +11,9 @@ export interface ISubscription extends AbstractModel {
 }
 
 export default class SubscriptionModel extends AbstractModel implements ISubscription {
-	declare id: number
-	declare entity: string // FIXME: correct type?
-	declare entityId: number // FIXME: correct type?
+	id!: number
+	entity!: string // FIXME: correct type?
+	entityId!: number // FIXME: correct type?
 	user: IUser
 
 	created: Date
diff --git a/src/models/task.ts b/src/models/task.ts
index 5dd5eae2d..e54d80eb3 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -63,39 +63,39 @@ export interface ITask extends AbstractModel {
 export default class TaskModel extends AbstractModel implements ITask {
 	id: number
 	title: string
-	declare description: string
-	declare done: boolean
+	description!: string
+	done!: boolean
 	doneAt: Date | null
-	declare priority: Priority
+	priority!: Priority
 	labels: ILabel[]
 	assignees: IUser[]
 
 	dueDate: Date | null
 	startDate: Date | null
 	endDate: Date | null
-	declare repeatAfter: number | IRepeats
-	declare repeatFromCurrentDate: boolean
-	declare repeatMode: TaskRepeatMode
+	repeatAfter!: number | IRepeats
+	repeatFromCurrentDate!: boolean
+	repeatMode!: TaskRepeatMode
 	reminderDates: Date[]
-	declare parentTaskId: ITask['id']
-	declare hexColor: string
-	declare percentDone: number
-	declare relatedTasks: { [relationKind: string]: ITask } // FIXME: use relationKinds
+	parentTaskId!: ITask['id']
+	hexColor!: string
+	percentDone!: number
+	relatedTasks!: { [relationKind: string]: ITask } // FIXME: use relationKinds
 	attachments: IAttachment[]
-	declare identifier: string
-	declare index: number
-	declare isFavorite: boolean
-	declare subscription: ISubscription
+	identifier!: string
+	index!: number
+	isFavorite!: boolean
+	subscription!: ISubscription
 
-	declare position: number
-	declare kanbanPosition: number
+	position!: number
+	kanbanPosition!: number
 
 	createdBy: IUser
 	created: Date
 	updated: Date
 
 	listId: IList['id'] // Meta, only used when creating a new task
-	declare bucketId: IBucket['id']
+	bucketId!: IBucket['id']
 
 	constructor(data: Partial<ITask>) {
 		super(data)
diff --git a/src/models/taskAssignee.ts b/src/models/taskAssignee.ts
index 5ceb15ad8..84c9ba220 100644
--- a/src/models/taskAssignee.ts
+++ b/src/models/taskAssignee.ts
@@ -10,8 +10,8 @@ export interface ITaskAssignee extends AbstractModel {
 
 export default class TaskAssigneeModel extends AbstractModel implements ITaskAssignee {
 	created: Date
-	declare userId: IUser['id']
-	declare taskId: ITask['id']
+	userId!: IUser['id']
+	taskId!: ITask['id']
 
 	constructor(data) {
 		super(data)
diff --git a/src/models/taskComment.ts b/src/models/taskComment.ts
index 15ca3b6d3..5c4a0f9b0 100644
--- a/src/models/taskComment.ts
+++ b/src/models/taskComment.ts
@@ -13,9 +13,9 @@ export interface ITaskComment extends AbstractModel {
 }
 
 export default class TaskCommentModel extends AbstractModel implements ITaskComment {
-	declare id: number
-	declare taskId: ITask['id']
-	declare comment: string
+	id!: number
+	taskId!: ITask['id']
+	comment!: string
 	author: IUser
 
 	created: Date
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index bc924b47d..b576bb55f 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -30,10 +30,10 @@ export interface ITaskRelation extends AbstractModel {
 }
 
 export default class TaskRelationModel extends AbstractModel implements ITaskRelation {
-	declare id: number
-	declare otherTaskId: ITask['id']
-	declare taskId: ITask['id']
-	declare relationKind: RelationKind
+	id!: number
+	otherTaskId!: ITask['id']
+	taskId!: ITask['id']
+	relationKind!: RelationKind
 
 	createdBy: IUser
 	created: Date
diff --git a/src/models/team.ts b/src/models/team.ts
index d53cb1c78..fa9c536ea 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -16,11 +16,11 @@ export interface ITeam extends AbstractModel {
 }
 
 export default class TeamModel extends AbstractModel implements ITeam {
-	declare id: number
-	declare name: string
-	declare description: string
+	id!: number
+	name!: string
+	description!: string
 	members: ITeamMember[]
-	declare right: Right
+	right!: Right
 
 	createdBy: IUser
 	created: Date
diff --git a/src/models/teamList.ts b/src/models/teamList.ts
index d3bbb42ab..472cd479b 100644
--- a/src/models/teamList.ts
+++ b/src/models/teamList.ts
@@ -6,7 +6,7 @@ export interface ITeamList extends TeamShareBaseModel {
 }
 
 export default class TeamListModel extends TeamShareBaseModel implements ITeamList {
-	declare listId: IList['id']
+	listId!: IList['id']
 
 	defaults() {
 		return {
diff --git a/src/models/teamMember.ts b/src/models/teamMember.ts
index f699408ad..597599a7f 100644
--- a/src/models/teamMember.ts
+++ b/src/models/teamMember.ts
@@ -7,8 +7,8 @@ export interface ITeamMember extends UserModel {
 }
 
 export default class TeamMemberModel extends UserModel implements ITeamMember {
-	declare admin: boolean
-	declare teamId: IList['id']
+	admin!: boolean
+	teamId!: IList['id']
 
 	defaults() {
 		return {
diff --git a/src/models/teamNamespace.ts b/src/models/teamNamespace.ts
index 2064d1412..31a845107 100644
--- a/src/models/teamNamespace.ts
+++ b/src/models/teamNamespace.ts
@@ -6,7 +6,7 @@ export interface ITeamNamespace extends TeamShareBaseModel {
 }
 
 export default class TeamNamespaceModel extends TeamShareBaseModel implements ITeamNamespace {
-	declare namespaceId: INamespace['id']
+	namespaceId!: INamespace['id']
 
 	defaults() {
 		return {
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index 83a3b0d1e..5d24ae8dd 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -15,8 +15,8 @@ export interface ITeamShareBase extends AbstractModel {
  * It is extended in a way so it can be used for namespaces as well for lists.
  */
 export default class TeamShareBaseModel extends AbstractModel implements ITeamShareBase {
-	declare teamId: ITeam['id']
-	declare right: Right
+	teamId!: ITeam['id']
+	right!: Right
 
 	created: Date
 	updated: Date
diff --git a/src/models/totp.ts b/src/models/totp.ts
index a47044c5e..619af601a 100644
--- a/src/models/totp.ts
+++ b/src/models/totp.ts
@@ -7,9 +7,9 @@ export interface ITotp extends AbstractModel {
 }
 
 export default class TotpModel extends AbstractModel implements ITotp{
-	declare secret: string
-	declare enabled: boolean
-	declare url: string
+	secret!: string
+	enabled!: boolean
+	url!: string
 
 	defaults() {
 		return {
diff --git a/src/models/user.ts b/src/models/user.ts
index eaa472a75..181910cc1 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -13,10 +13,10 @@ export interface IUser extends AbstractModel {
 }
 
 export default class UserModel extends AbstractModel implements IUser {
-	declare id: number
-	declare email: string
-	declare username: string
-	declare name: string
+	id!: number
+	email!: string
+	username!: string
+	name!: string
 
 	created: Date
 	updated: Date
diff --git a/src/models/userList.ts b/src/models/userList.ts
index d0b9cbd36..51c2a229a 100644
--- a/src/models/userList.ts
+++ b/src/models/userList.ts
@@ -7,7 +7,7 @@ export interface IUserList extends UserShareBaseModel {
 
 // This class extends the user share model with a 'rights' parameter which is used in sharing
 export default class UserListModel extends UserShareBaseModel implements IUserList {
-	declare listId: IList['id']
+	listId!: IList['id']
 
 	defaults() {
 		return {
diff --git a/src/models/userNamespace.ts b/src/models/userNamespace.ts
index 2a11a35e7..6d7c80685 100644
--- a/src/models/userNamespace.ts
+++ b/src/models/userNamespace.ts
@@ -7,7 +7,7 @@ export interface IUserNamespace extends UserShareBaseModel {
 
 // This class extends the user share model with a 'rights' parameter which is used in sharing
 export default class UserNamespaceModel extends UserShareBaseModel implements IUserNamespace {
-	declare namespaceId: INamespace['id']
+	namespaceId!: INamespace['id']
 
 	defaults() {
 		return {
diff --git a/src/models/userSettings.ts b/src/models/userSettings.ts
index a5db3f807..e7e7acadc 100644
--- a/src/models/userSettings.ts
+++ b/src/models/userSettings.ts
@@ -14,14 +14,14 @@ export interface IUserSettings extends AbstractModel {
 }
 
 export default class UserSettingsModel extends AbstractModel implements IUserSettings {
-	declare name: string
-	declare emailRemindersEnabled: boolean
-	declare discoverableByName: boolean
-	declare discoverableByEmail: boolean
-	declare overdueTasksRemindersEnabled: boolean
-	declare defaultListId: undefined | IList['id']
-	declare weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6
-	declare timezone: string
+	name!: string
+	emailRemindersEnabled!: boolean
+	discoverableByName!: boolean
+	discoverableByEmail!: boolean
+	overdueTasksRemindersEnabled!: boolean
+	defaultListId!: undefined | IList['id']
+	weekStart!: 0 | 1 | 2 | 3 | 4 | 5 | 6
+	timezone!: string
 
 	defaults() {
 		return {
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index c6e80d41d..703ce6309 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -11,8 +11,8 @@ export interface IUserShareBase extends AbstractModel {
 }
 
 export default class UserShareBaseModel extends AbstractModel implements IUserShareBase {
-	declare userId: IUser['id']
-	declare right: Right
+	userId!: IUser['id']
+	right!: Right
 
 	created: Date
 	updated: Date

From 2445f0eec8b130d8d71e5fc399a399c0d1cf6836 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Sun, 14 Aug 2022 11:59:20 +0200
Subject: [PATCH 22/32] chore: align docker cypress image version with drone

---
 .drone.yml                 | 2 +-
 cypress/docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 76da86f6d..631829481 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -108,7 +108,7 @@ steps:
       - dependencies
 
   - name: test-frontend
-    image: cypress/browsers:node16.5.0-chrome94-ff93
+    image: cypress/browsers:node16.14.0-chrome99-ff97
     pull: true
     environment:
       CYPRESS_API_URL: http://api:3456/api/v1
diff --git a/cypress/docker-compose.yml b/cypress/docker-compose.yml
index 98a24edd3..d30e22e16 100644
--- a/cypress/docker-compose.yml
+++ b/cypress/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     ports:
       - 3456:3456
   cypress:
-    image: cypress/browsers:node12.18.3-chrome87-ff82
+    image: cypress/browsers:node16.14.0-chrome99-ff97
     volumes:
     - ..:/project
     - $HOME/.cache:/home/node/.cache/

From d36577c04e1eea00fb21a5fb774e7f6b1f667d54 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Sun, 14 Aug 2022 12:12:05 +0200
Subject: [PATCH 23/32] fix: mark abstractModel and abstractService abstract

---
 src/models/abstractModel.ts     | 4 ++--
 src/services/abstractService.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/models/abstractModel.ts b/src/models/abstractModel.ts
index a0b761648..9592ec554 100644
--- a/src/models/abstractModel.ts
+++ b/src/models/abstractModel.ts
@@ -3,10 +3,10 @@ import {omitBy, isNil} from '@/helpers/utils'
 import type {Right} from '@/constants/rights'
 
 export interface IAbstract {
-	maxRight: Right | null
+	maxRight: Right | null // FIXME: should this be readonly?
 }
 
-export default class AbstractModel implements IAbstract {
+export default abstract class AbstractModel<Model extends IAbstract = IAbstract> implements IAbstract {
 
 	/**
 	 * The max right the user has on this object, as returned by the x-max-right header from the api.
diff --git a/src/services/abstractService.ts b/src/services/abstractService.ts
index 1cc74e9f8..8f97bb37e 100644
--- a/src/services/abstractService.ts
+++ b/src/services/abstractService.ts
@@ -40,7 +40,7 @@ function prepareParams(params: Record<string, unknown | unknown[]>) {
 	return objectToSnakeCase(params)
 }
 
-export default class AbstractService<Model extends IAbstract = IAbstract> {
+export default abstract class AbstractService<Model extends IAbstract = IAbstract> {
 
 	/////////////////////////////
 	// Initial variable definitions

From 8be1f81848303d590adb890743dd688fbf5cdf1c Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Sun, 14 Aug 2022 12:15:09 +0200
Subject: [PATCH 24/32] fix: use IAbstract to extend model interface

---
 src/models/attachment.ts         | 4 ++--
 src/models/avatar.ts             | 4 ++--
 src/models/backgroundImage.ts    | 4 ++--
 src/models/bucket.ts             | 4 ++--
 src/models/caldavToken.ts        | 4 ++--
 src/models/emailUpdate.ts        | 4 ++--
 src/models/file.ts               | 4 ++--
 src/models/label.ts              | 4 ++--
 src/models/labelTask.ts          | 4 ++--
 src/models/linkShare.ts          | 4 ++--
 src/models/list.ts               | 4 ++--
 src/models/listDuplicateModel.ts | 4 ++--
 src/models/namespace.ts          | 4 ++--
 src/models/notification.ts       | 4 ++--
 src/models/passwordReset.ts      | 4 ++--
 src/models/passwordUpdate.ts     | 4 ++--
 src/models/savedFilter.ts        | 4 ++--
 src/models/subscription.ts       | 4 ++--
 src/models/task.ts               | 4 ++--
 src/models/taskAssignee.ts       | 4 ++--
 src/models/taskComment.ts        | 4 ++--
 src/models/taskRelation.ts       | 4 ++--
 src/models/team.ts               | 4 ++--
 src/models/teamShareBase.ts      | 4 ++--
 src/models/totp.ts               | 4 ++--
 src/models/user.ts               | 4 ++--
 src/models/userSettings.ts       | 4 ++--
 src/models/userShareBase.ts      | 4 ++--
 28 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/models/attachment.ts b/src/models/attachment.ts
index 10f935f14..8c48a17d2 100644
--- a/src/models/attachment.ts
+++ b/src/models/attachment.ts
@@ -1,8 +1,8 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import UserModel, {type IUser} from './user'
 import FileModel, {type IFile} from './file'
 
-export interface IAttachment extends AbstractModel {
+export interface IAttachment extends IAbstract {
 	id: number
 	taskId: number
 	createdBy: IUser
diff --git a/src/models/avatar.ts b/src/models/avatar.ts
index f87c60db2..43d491518 100644
--- a/src/models/avatar.ts
+++ b/src/models/avatar.ts
@@ -1,8 +1,8 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
 export type AvatarProvider = 'default' | 'initials' | 'gravatar' | 'marble' | 'upload'
 
-export interface IAvatar extends AbstractModel {
+export interface IAvatar extends IAbstract {
 	avatarProvider: AvatarProvider
 }
 
diff --git a/src/models/backgroundImage.ts b/src/models/backgroundImage.ts
index 71f732468..f56e750cf 100644
--- a/src/models/backgroundImage.ts
+++ b/src/models/backgroundImage.ts
@@ -1,6 +1,6 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-export interface IBackgroundImage extends AbstractModel {
+export interface IBackgroundImage extends IAbstract {
 	id: number
 	url: string
 	thumb: string
diff --git a/src/models/bucket.ts b/src/models/bucket.ts
index 46afd96af..1d89c86fa 100644
--- a/src/models/bucket.ts
+++ b/src/models/bucket.ts
@@ -1,8 +1,8 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import UserModel, { type IUser } from './user'
 import TaskModel, { type ITask } from './task'
 
-export interface IBucket extends AbstractModel {
+export interface IBucket extends IAbstract {
 	id: number
 	title: string
 	listId: number
diff --git a/src/models/caldavToken.ts b/src/models/caldavToken.ts
index 2518e123d..a2e53c985 100644
--- a/src/models/caldavToken.ts
+++ b/src/models/caldavToken.ts
@@ -1,6 +1,6 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-export interface ICaldavToken extends AbstractModel {
+export interface ICaldavToken extends IAbstract {
 	id: number;
 	created: Date;
 }
diff --git a/src/models/emailUpdate.ts b/src/models/emailUpdate.ts
index d01dd959a..aef40a12f 100644
--- a/src/models/emailUpdate.ts
+++ b/src/models/emailUpdate.ts
@@ -1,6 +1,6 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-interface IEmailUpdate extends AbstractModel {
+interface IEmailUpdate extends IAbstract {
 	newEmail: string
 	password: string
 }
diff --git a/src/models/file.ts b/src/models/file.ts
index 74b66ce71..0a768743c 100644
--- a/src/models/file.ts
+++ b/src/models/file.ts
@@ -1,6 +1,6 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-export interface IFile extends AbstractModel {
+export interface IFile extends IAbstract {
 	id: number
 	mime: string
 	name: string
diff --git a/src/models/label.ts b/src/models/label.ts
index 5c5be2481..48642e391 100644
--- a/src/models/label.ts
+++ b/src/models/label.ts
@@ -1,10 +1,10 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import UserModel, { type IUser } from './user'
 import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 const DEFAULT_LABEL_BACKGROUND_COLOR = 'e8e8e8'
 
-export interface ILabel extends AbstractModel {
+export interface ILabel extends IAbstract {
 	id: number
 	title: string
 	hexColor: string
diff --git a/src/models/labelTask.ts b/src/models/labelTask.ts
index 5550e5cd0..46a5b1371 100644
--- a/src/models/labelTask.ts
+++ b/src/models/labelTask.ts
@@ -1,6 +1,6 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-export interface ILabelTask extends AbstractModel {
+export interface ILabelTask extends IAbstract {
 	id: number
 	taskId: number
 	labelId: number
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index 67f1dd2a6..08f67a3e9 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -1,8 +1,8 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import UserModel, { type IUser } from './user'
 import {RIGHTS, type Right} from '@/constants/rights'
 
-export interface ILinkShare extends AbstractModel {
+export interface ILinkShare extends IAbstract {
 	id: number
 	hash: string
 	right: Right
diff --git a/src/models/list.ts b/src/models/list.ts
index c4b28273f..496737a13 100644
--- a/src/models/list.ts
+++ b/src/models/list.ts
@@ -1,4 +1,4 @@
-import AbstractModel from '@/models/abstractModel'
+import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import TaskModel, { type ITask } from '@/models/task'
 import UserModel, { type IUser } from '@/models/user'
 import SubscriptionModel, { type ISubscription } from '@/models/subscription'
@@ -6,7 +6,7 @@ import type { INamespace } from '@/models/namespace'
 
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 
-export interface IList extends AbstractModel {
+export interface IList extends IAbstract {
 	id: number
 	title: string
 	description: string
diff --git a/src/models/listDuplicateModel.ts b/src/models/listDuplicateModel.ts
index 8dd0db9fb..d3b199d49 100644
--- a/src/models/listDuplicateModel.ts
+++ b/src/models/listDuplicateModel.ts
@@ -1,8 +1,8 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import ListModel, { type IList } from './list'
 import type { INamespace } from './namespace'
 
-export interface IListDuplicate extends AbstractModel {
+export interface IListDuplicate extends IAbstract {
 	listId: number
 	namespaceId: INamespace['id']
 	list: IList
diff --git a/src/models/namespace.ts b/src/models/namespace.ts
index 00f42a85b..802e85171 100644
--- a/src/models/namespace.ts
+++ b/src/models/namespace.ts
@@ -1,9 +1,9 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import ListModel, { type IList } from './list'
 import UserModel, { type IUser } from './user'
 import SubscriptionModel, { type ISubscription } from '@/models/subscription'
 
-export interface INamespace extends AbstractModel {
+export interface INamespace extends IAbstract {
 	id: number
 	title: string
 	description: string
diff --git a/src/models/notification.ts b/src/models/notification.ts
index 21a392dae..94b65bc98 100644
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@@ -1,4 +1,4 @@
-import AbstractModel from '@/models/abstractModel'
+import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
 import UserModel, { type IUser } from '@/models/user'
 import TaskModel, { type ITask } from '@/models/task'
@@ -40,7 +40,7 @@ interface NotificationMemberAdded extends Notification {
 	team: ITeam
 }
 
-export interface INotification extends AbstractModel {
+export interface INotification extends IAbstract {
 	id: number
 	name: string
 	notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
diff --git a/src/models/passwordReset.ts b/src/models/passwordReset.ts
index 3d5099aae..696fae260 100644
--- a/src/models/passwordReset.ts
+++ b/src/models/passwordReset.ts
@@ -1,6 +1,6 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-export interface IPasswordReset extends AbstractModel {
+export interface IPasswordReset extends IAbstract {
 	token: string
 	newPassword: string
 	email: string
diff --git a/src/models/passwordUpdate.ts b/src/models/passwordUpdate.ts
index d78e7801c..f4f04553c 100644
--- a/src/models/passwordUpdate.ts
+++ b/src/models/passwordUpdate.ts
@@ -1,6 +1,6 @@
-import AbstractModel from '@/models/abstractModel'
+import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 
-export interface IPasswordUpdate extends AbstractModel {
+export interface IPasswordUpdate extends IAbstract {
 	newPassword: string
 	oldPassword: string
 }
diff --git a/src/models/savedFilter.ts b/src/models/savedFilter.ts
index 6bb7be4a2..7c6ac36bd 100644
--- a/src/models/savedFilter.ts
+++ b/src/models/savedFilter.ts
@@ -1,7 +1,7 @@
-import AbstractModel from '@/models/abstractModel'
+import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import UserModel, { type IUser } from '@/models/user'
 
-export interface ISavedFilter extends AbstractModel {
+export interface ISavedFilter extends IAbstract {
 	id: 0
 	title: string
 	description: string
diff --git a/src/models/subscription.ts b/src/models/subscription.ts
index d17a692fd..459c78d30 100644
--- a/src/models/subscription.ts
+++ b/src/models/subscription.ts
@@ -1,7 +1,7 @@
-import AbstractModel from '@/models/abstractModel'
+import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import UserModel, { type IUser } from '@/models/user'
 
-export interface ISubscription extends AbstractModel {
+export interface ISubscription extends IAbstract {
 	id: number
 	entity: string // FIXME: correct type?
 	entityId: number // FIXME: correct type?
diff --git a/src/models/task.ts b/src/models/task.ts
index e54d80eb3..8d450cc49 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -1,6 +1,6 @@
 import type { Priority } from '@/constants/priorities'
 
-import AbstractModel from '@/models/abstractModel'
+import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import UserModel, { type IUser } from '@/models/user'
 import LabelModel, { type ILabel } from '@/models/label'
 import AttachmentModel, {type IAttachment} from '@/models/attachment'
@@ -22,7 +22,7 @@ export const TASK_REPEAT_MODES = {
 
 export type TaskRepeatMode = typeof TASK_REPEAT_MODES[keyof typeof TASK_REPEAT_MODES] 
 
-export interface ITask extends AbstractModel {
+export interface ITask extends IAbstract {
 	id: number
 	title: string
 	description: string
diff --git a/src/models/taskAssignee.ts b/src/models/taskAssignee.ts
index 84c9ba220..93b9434f8 100644
--- a/src/models/taskAssignee.ts
+++ b/src/models/taskAssignee.ts
@@ -1,8 +1,8 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import type { ITask } from './task'
 import type { IUser } from './user'
 
-export interface ITaskAssignee extends AbstractModel {
+export interface ITaskAssignee extends IAbstract {
 	created: Date
 	userId: IUser['id']
 	taskId: ITask['id']
diff --git a/src/models/taskComment.ts b/src/models/taskComment.ts
index 5c4a0f9b0..d774d7a0b 100644
--- a/src/models/taskComment.ts
+++ b/src/models/taskComment.ts
@@ -1,8 +1,8 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import UserModel, { type IUser } from './user'
 import type { ITask } from './task'
 
-export interface ITaskComment extends AbstractModel {
+export interface ITaskComment extends IAbstract {
 	id: number
 	taskId: ITask['id']
 	comment: string
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index b576bb55f..931c5f155 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -1,4 +1,4 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import UserModel, { type IUser } from './user'
 import type { ITask } from './task'
 
@@ -19,7 +19,7 @@ export const RELATION_KINDS = [...Object.values(RELATION_KIND)] as const
 
 export type RelationKind = typeof RELATION_KINDS[number]
 
-export interface ITaskRelation extends AbstractModel {
+export interface ITaskRelation extends IAbstract {
 	id: number
 	otherTaskId: ITask['id']
 	taskId: ITask['id']
diff --git a/src/models/team.ts b/src/models/team.ts
index fa9c536ea..c24c1352d 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -1,9 +1,9 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import UserModel, { type IUser } from './user'
 import TeamMemberModel, { type ITeamMember } from './teamMember'
 import {RIGHTS, type Right} from '@/constants/rights'
 
-export interface ITeam extends AbstractModel {
+export interface ITeam extends IAbstract {
 	id: number
 	name: string
 	description: string
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index 5d24ae8dd..7ce563648 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -1,8 +1,8 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import {RIGHTS, type Right} from '@/constants/rights'
 import type { ITeam } from './team'
 
-export interface ITeamShareBase extends AbstractModel {
+export interface ITeamShareBase extends IAbstract {
 	teamId: ITeam['id']
 	right: Right
 
diff --git a/src/models/totp.ts b/src/models/totp.ts
index 619af601a..7d33ebd34 100644
--- a/src/models/totp.ts
+++ b/src/models/totp.ts
@@ -1,6 +1,6 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 
-export interface ITotp extends AbstractModel {
+export interface ITotp extends IAbstract {
 	secret: string
 	enabled: boolean
 	url: string
diff --git a/src/models/user.ts b/src/models/user.ts
index 181910cc1..642acff8f 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -1,7 +1,7 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import UserSettingsModel, { type IUserSettings } from '@/models/userSettings'
 
-export interface IUser extends AbstractModel {
+export interface IUser extends IAbstract {
 	id: number
 	email: string
 	username: string
diff --git a/src/models/userSettings.ts b/src/models/userSettings.ts
index e7e7acadc..c5bc638a4 100644
--- a/src/models/userSettings.ts
+++ b/src/models/userSettings.ts
@@ -1,8 +1,8 @@
 
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import type { IList } from './list'
 
-export interface IUserSettings extends AbstractModel {
+export interface IUserSettings extends IAbstract {
 	name: string
 	emailRemindersEnabled: boolean
 	discoverableByName: boolean
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index 703ce6309..274700007 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -1,8 +1,8 @@
-import AbstractModel from './abstractModel'
+import AbstractModel, { type IAbstract } from './abstractModel'
 import {RIGHTS, type Right} from '@/constants/rights'
 import type { IUser } from './user'
 
-export interface IUserShareBase extends AbstractModel {
+export interface IUserShareBase extends IAbstract {
 	userId: IUser['id']
 	right: Right
 

From 8416b1f44811ff477d81db20370ff68e899c7252 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Sun, 14 Aug 2022 12:15:45 +0200
Subject: [PATCH 25/32] fix: use new assignData method for default data

---
 src/models/abstractModel.ts      |  21 ++----
 src/models/attachment.ts         |  26 +++-----
 src/models/avatar.ts             |   9 ++-
 src/models/backgroundImage.ts    |  23 +++----
 src/models/bucket.ts             |  41 ++++--------
 src/models/caldavToken.ts        |  11 ++--
 src/models/emailUpdate.ts        |  12 ++--
 src/models/file.ts               |  26 +++-----
 src/models/label.ts              |  47 +++++---------
 src/models/labelTask.ts          |  15 ++---
 src/models/linkShare.ts          |  43 ++++---------
 src/models/list.ts               |  62 ++++++------------
 src/models/listDuplicateModel.ts |  20 ++----
 src/models/namespace.ts          |  42 ++++--------
 src/models/notification.ts       |  28 +++-----
 src/models/passwordReset.ts      |  19 ++----
 src/models/passwordUpdate.ts     |  12 ++--
 src/models/savedFilter.ts        |  50 ++++++---------
 src/models/subscription.ts       |  25 +++-----
 src/models/task.ts               | 107 ++++++++++---------------------
 src/models/taskAssignee.ts       |  19 ++----
 src/models/taskComment.ts        |  29 +++------
 src/models/taskRelation.ts       |  30 +++------
 src/models/team.ts               |  35 ++++------
 src/models/teamList.ts           |  10 ++-
 src/models/teamMember.ts         |  13 ++--
 src/models/teamNamespace.ts      |  10 ++-
 src/models/teamShareBase.ts      |  24 +++----
 src/models/totp.ts               |  17 ++---
 src/models/user.ts               |  32 +++------
 src/models/userList.ts           |  10 ++-
 src/models/userNamespace.ts      |  10 ++-
 src/models/userSettings.ts       |  30 ++++-----
 src/models/userShareBase.ts      |  24 +++----
 34 files changed, 317 insertions(+), 615 deletions(-)

diff --git a/src/models/abstractModel.ts b/src/models/abstractModel.ts
index 9592ec554..f859c361d 100644
--- a/src/models/abstractModel.ts
+++ b/src/models/abstractModel.ts
@@ -12,25 +12,14 @@ export default abstract class AbstractModel<Model extends IAbstract = IAbstract>
 	 * The max right the user has on this object, as returned by the x-max-right header from the api.
 	 */
 	maxRight: Right | null = null
-
+	
 	/**
-	 * The abstract constructor takes an object and merges its data with the default data of this model.
-	 */
-	constructor(data : Object = {}) {
+	* Takes an object and merges its data with the default data of this model.
+	*/
+	assignData(data: Partial<Model>) {
 		data = objectToCamelCase(data)
 
 		// Put all data in our model while overriding those with a value of null or undefined with their defaults
-		Object.assign(
-			this,
-			this.defaults(),
-			omitBy(data, isNil),
-		)
-	}
-
-	/**
-	 * Default attributes that define the "empty" state.
-	 */
-	defaults(): Object {
-		return {}
+		Object.assign(this, omitBy(data, isNil))
 	}
 }
\ No newline at end of file
diff --git a/src/models/attachment.ts b/src/models/attachment.ts
index 8c48a17d2..074d61b65 100644
--- a/src/models/attachment.ts
+++ b/src/models/attachment.ts
@@ -11,26 +11,18 @@ export interface IAttachment extends IAbstract {
 }
 
 export default class AttachmentModel extends AbstractModel implements IAttachment {
-	id!: number
-	taskId!: number
-	createdBy: IUser
-	file: IFile
-	created: Date
+	id = 0
+	taskId = 0
+	createdBy: IUser = UserModel
+	file: IFile = FileModel
+	created: Date = null
+
+	constructor(data: Partial<IAttachment>) {
+		super()
+		this.assignData(data)
 
-	constructor(data) {
-		super(data)
 		this.createdBy = new UserModel(this.createdBy)
 		this.file = new FileModel(this.file)
 		this.created = new Date(this.created)
 	}
-
-	defaults() {
-		return {
-			id: 0,
-			taskId: 0,
-			createdBy: UserModel,
-			file: FileModel,
-			created: null,
-		}
-	}
 }
diff --git a/src/models/avatar.ts b/src/models/avatar.ts
index 43d491518..daf221c0a 100644
--- a/src/models/avatar.ts
+++ b/src/models/avatar.ts
@@ -7,11 +7,10 @@ export interface IAvatar extends IAbstract {
 }
 
 export default class AvatarModel extends AbstractModel implements IAvatar {
-	avatarProvider!: AvatarProvider
+	avatarProvider: AvatarProvider = 'default'
 
-	defaults() {
-		return {
-			avatarProvider: '',
-		}
+	constructor(data: Partial<IAvatar>) {
+		super()
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/backgroundImage.ts b/src/models/backgroundImage.ts
index f56e750cf..137c83836 100644
--- a/src/models/backgroundImage.ts
+++ b/src/models/backgroundImage.ts
@@ -12,22 +12,17 @@ export interface IBackgroundImage extends IAbstract {
 }
 
 export default class BackgroundImageModel extends AbstractModel implements IBackgroundImage {
-	id!: number
-	url!: string
-	thumb!: string
-	info!: {
+	id = 0
+	url = ''
+	thumb = ''
+	info: {
 		author: string
 		authorName: string
-	}
-	blurHash!: string  
+	} = {}
+	blurHash = ''
 
-	defaults() {
-		return {
-			id: 0,
-			url: '',
-			thumb: '',
-			info: {},
-			blurHash: '',
-		}
+	constructor(data: Partial<IBackgroundImage>) {
+		super()
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/bucket.ts b/src/models/bucket.ts
index 1d89c86fa..94f6c2d08 100644
--- a/src/models/bucket.ts
+++ b/src/models/bucket.ts
@@ -17,20 +17,21 @@ export interface IBucket extends IAbstract {
 }
 
 export default class BucketModel extends AbstractModel implements IBucket {
-	id!: number
-	title!: string
-	listId!: number
-	limit!: number
-	tasks!: ITask[]
-	isDoneBucket!: boolean
-	position!: number
+	id = 0
+	title = ''
+	listId = ''
+	limit = 0
+	tasks: ITask[] = []
+	isDoneBucket: false
+	position: 0
 	
-	createdBy: IUser
-	created: Date
-	updated: Date
+	createdBy: IUser = null
+	created: Date = null
+	updated: Date = null
 
-	constructor(bucket) {
-		super(bucket)
+	constructor(data: Partial<IBucket>) {
+		super()
+		this.assignData(data)
 
 		this.tasks = this.tasks.map(t => new TaskModel(t))
 
@@ -38,20 +39,4 @@ export default class BucketModel extends AbstractModel implements IBucket {
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
 	}
-
-	defaults() {
-		return {
-			id: 0,
-			title: '',
-			listId: 0,
-			limit: 0,
-			tasks: [],
-			isDoneBucket: false,
-			position: 0,
-
-			createdBy: null,
-			created: null,
-			updated: null,
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/models/caldavToken.ts b/src/models/caldavToken.ts
index a2e53c985..4a4d4c4da 100644
--- a/src/models/caldavToken.ts
+++ b/src/models/caldavToken.ts
@@ -6,14 +6,13 @@ export interface ICaldavToken extends IAbstract {
 }
 
 export default class CaldavTokenModel extends AbstractModel implements ICaldavToken {
-	id!: number
-	created!: Date
+	id: number
+	created: Date
 
-	constructor(data? : Object) {
-		super(data)
+	constructor(data? : Partial<CaldavTokenModel>) {
+		super()
+		this.assignData(data)
 		
-		this.id
-
 		if (this.created) {
 			this.created = new Date(this.created)
 		}
diff --git a/src/models/emailUpdate.ts b/src/models/emailUpdate.ts
index aef40a12f..2f8c9a853 100644
--- a/src/models/emailUpdate.ts
+++ b/src/models/emailUpdate.ts
@@ -6,13 +6,11 @@ interface IEmailUpdate extends IAbstract {
 }
 
 export default class EmailUpdateModel extends AbstractModel implements IEmailUpdate {
-	newEmail!: string
-	password!: string
+	newEmail = ''
+	password = ''
 
-	defaults() {
-		return {
-			newEmail: '',
-			password: '',
-		}
+	constructor(data : Partial<IEmailUpdate>) {
+		super()
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/file.ts b/src/models/file.ts
index 0a768743c..ba5950c7b 100644
--- a/src/models/file.ts
+++ b/src/models/file.ts
@@ -9,27 +9,19 @@ export interface IFile extends IAbstract {
 } 
 
 export default class FileModel extends AbstractModel implements IFile {
-	id!: number
-	mime!: string
-	name!: string
-	size!: number
-	created: Date
+	id = 0
+	mime = ''
+	name = ''
+	size = 0
+	created: Date = null
+
+	constructor(data: Partial<IFile>) {
+		super()
+		this.assignData(data)
 
-	constructor(data) {
-		super(data)
 		this.created = new Date(this.created)
 	}
 
-	defaults() {
-		return {
-			id: 0,
-			mime: '',
-			name: '',
-			size: 0,
-			created: null,
-		}
-	}
-
 	getHumanSize() {
 		const sizes = {
 			0: 'B',
diff --git a/src/models/label.ts b/src/models/label.ts
index 48642e391..5b3659b70 100644
--- a/src/models/label.ts
+++ b/src/models/label.ts
@@ -18,25 +18,23 @@ export interface ILabel extends IAbstract {
 }
 
 export default class LabelModel extends AbstractModel implements ILabel {
-	id!: number
-	title!: string
-	hexColor!: string
-	description!: string
-	createdBy!: IUser
-	listId!: number
-	textColor!: string
+	id = 0
+	title = ''
+	// FIXME: this should be empty and be definied in the client.
+	// that way it get's never send to the server db and is easier to change in future versions.
+	hexColor = DEFAULT_LABEL_BACKGROUND_COLOR
+	description = ''
+	createdBy: IUser
+	listId = 0
+	textColor = ''
 
-	created: Date
-	updated: Date
+	created: Date = null
+	updated: Date = null
+
+	constructor(data: Partial<ILabel>) {
+		super()
+		this.assignData(data)
 
-	constructor(data) {
-		super(data)
-		// FIXME: this should be empty and be definied in the client.
-		// that way it get's never send to the server db and is easier to change in future versions.
-		// Set the default color
-		if (this.hexColor === '') {
-			this.hexColor = DEFAULT_LABEL_BACKGROUND_COLOR
-		}
 		if (this.hexColor.substring(0, 1) !== '#') {
 			this.hexColor = '#' + this.hexColor
 		}
@@ -46,19 +44,4 @@ export default class LabelModel extends AbstractModel implements ILabel {
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
 	}
-
-	defaults() {
-		return {
-			id: 0,
-			title: '',
-			hexColor: '',
-			description: '',
-			createdBy: UserModel,
-			listId: 0,
-			textColor: '',
-
-			created: null,
-			updated: null,
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/models/labelTask.ts b/src/models/labelTask.ts
index 46a5b1371..8223edb4f 100644
--- a/src/models/labelTask.ts
+++ b/src/models/labelTask.ts
@@ -7,15 +7,12 @@ export interface ILabelTask extends IAbstract {
 }
 
 export default class LabelTask extends AbstractModel implements ILabelTask {
-	id!: number
-	taskId!: number
-	labelId!: number
+	id = 0
+	taskId = 0
+	labelId = 0
 
-	defaults() {
-		return {
-			id: 0,
-			taskId: 0,
-			labelId: 0,
-		}
+	constructor(data: Partial<ILabelTask>) {
+		super()
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index 08f67a3e9..c7df693b0 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -16,41 +16,24 @@ export interface ILinkShare extends IAbstract {
 }
 
 export default class LinkShareModel extends AbstractModel implements ILinkShare {
-	id!: number
-	hash!: string
-	right!: Right
-	sharedBy: IUser
-	sharingType!: number // FIXME: use correct numbers
-	listId!: number
-	name!: string
-	password!: string
-	created: Date
-	updated: Date
+	id = 0
+	hash = ''
+	right: Right = RIGHTS.READ
+	sharedBy: IUser = UserModel
+	sharingType = 0 // FIXME: use correct numbers
+	listId = 0
+	name: ''
+	password: ''
+	created: Date = null
+	updated: Date = null
 
-	constructor(data) {
-		// The constructor of AbstractModel handles all the default parsing.
-		super(data)
+	constructor(data: Partial<ILinkShare>) {
+		super()
+		this.assignData(data)
 
 		this.sharedBy = new UserModel(this.sharedBy)
 
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
 	}
-
-	// Default attributes that define the "empty" state.
-	defaults() {
-		return {
-			id: 0,
-			hash: '',
-			right: RIGHTS.READ,
-			sharedBy: UserModel,
-			sharingType: 0,
-			listId: 0,
-			name: '',
-			password: '',
-
-			created: null,
-			updated: null,
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/models/list.ts b/src/models/list.ts
index 496737a13..7ef058c45 100644
--- a/src/models/list.ts
+++ b/src/models/list.ts
@@ -16,7 +16,7 @@ export interface IList extends IAbstract {
 	isArchived: boolean
 	hexColor: string
 	identifier: string
-	backgroundInformation: any
+	backgroundInformation: any // FIXME: improve type
 	isFavorite: boolean
 	subscription: ISubscription
 	position: number
@@ -27,26 +27,27 @@ export interface IList extends IAbstract {
 }
 
 export default class ListModel extends AbstractModel implements IList {
-	id!: number
-	title!: string
-	description!: string
-	owner: IUser
-	tasks: ITask[]
-	namespaceId!: INamespace['id']
-	isArchived!: boolean
-	hexColor!: string
-	identifier!: string
-	backgroundInformation!: any
-	isFavorite!: boolean
-	subscription!: ISubscription
-	position!: number
-	backgroundBlurHash!: string
+	id = 0
+	title = ''
+	description = ''
+	owner: IUser = UserModel
+	tasks: ITask[] = []
+	namespaceId: INamespace['id'] = 0
+	isArchived = false
+	hexColor = ''
+	identifier = ''
+	backgroundInformation: any = null
+	isFavorite = false
+	subscription: ISubscription = null
+	position = 0
+	backgroundBlurHash = ''
 	
-	created: Date
-	updated: Date
+	created: Date = null
+	updated: Date = null
 
-	constructor(data) {
-		super(data)
+	constructor(data: Partial<IList>) {
+		super()
+		this.assignData(data)
 
 		this.owner = new UserModel(this.owner)
 
@@ -67,29 +68,6 @@ export default class ListModel extends AbstractModel implements IList {
 		this.updated = new Date(this.updated)
 	}
 
-	// Default attributes that define the "empty" state.
-	defaults() {
-		return {
-			id: 0,
-			title: '',
-			description: '',
-			owner: UserModel,
-			tasks: [],
-			namespaceId: 0,
-			isArchived: false,
-			hexColor: '',
-			identifier: '',
-			backgroundInformation: null,
-			isFavorite: false,
-			subscription: null,
-			position: 0,
-			backgroundBlurHash: '',
-
-			created: null,
-			updated: null,
-		}
-	}
-
 	isSavedFilter() {
 		return this.getSavedFilterId() > 0
 	}
diff --git a/src/models/listDuplicateModel.ts b/src/models/listDuplicateModel.ts
index d3b199d49..4d8faf1f4 100644
--- a/src/models/listDuplicateModel.ts
+++ b/src/models/listDuplicateModel.ts
@@ -9,20 +9,14 @@ export interface IListDuplicate extends IAbstract {
 }
 
 export default class ListDuplicateModel extends AbstractModel implements IListDuplicate {
-	listId!: number
-	namespaceId!: INamespace['id']
-	list: IList
+	listId = 0
+	namespaceId: INamespace['id'] = 0
+	list: IList = ListModel
+
+	constructor(data : Partial<IListDuplicate>) {
+		super()
+		this.assignData(data)
 
-	constructor(data) {
-		super(data)
 		this.list = new ListModel(this.list)
 	}
-
-	defaults() {
-		return {
-			listId: 0,
-			namespaceId: 0,
-			list: ListModel,
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/models/namespace.ts b/src/models/namespace.ts
index 802e85171..f1962f1af 100644
--- a/src/models/namespace.ts
+++ b/src/models/namespace.ts
@@ -18,20 +18,21 @@ export interface INamespace extends IAbstract {
 }
 
 export default class NamespaceModel extends AbstractModel implements INamespace {
-	id!: number
-	title!: string
-	description!: string
-	owner: IUser
-	lists: IList[]
-	isArchived!: boolean
-	hexColor!: string
-	subscription!: ISubscription
+	id = 0
+	title = ''
+	description = ''
+	owner: IUser = UserModel
+	lists: IList[] = []
+	isArchived = false
+	hexColor = ''
+	subscription: ISubscription = null
 
-	created: Date
-	updated: Date
+	created: Date = null
+	updated: Date = null
 
-	constructor(data) {
-		super(data)
+	constructor(data: Partial<INamespace>) {
+		super()
+		this.assignData(data)
 
 		if (this.hexColor !== '' && this.hexColor.substring(0, 1) !== '#') {
 			this.hexColor = '#' + this.hexColor
@@ -50,21 +51,4 @@ export default class NamespaceModel extends AbstractModel implements INamespace
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
 	}
-
-	// Default attributes that define the 'empty' state.
-	defaults() {
-		return {
-			id: 0,
-			title: '',
-			description: '',
-			owner: UserModel,
-			lists: [],
-			isArchived: false,
-			hexColor: '',
-			subscription: null,
-
-			created: null,
-			updated: null,
-		}
-	}
 }
diff --git a/src/models/notification.ts b/src/models/notification.ts
index 94b65bc98..bd9c87276 100644
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@@ -3,7 +3,7 @@ import {parseDateOrNull} from '@/helpers/parseDateOrNull'
 import UserModel, { type IUser } from '@/models/user'
 import TaskModel, { type ITask } from '@/models/task'
 import TaskCommentModel, { type ITaskComment } from '@/models/taskComment'
-import ListModel from '@/models/list'
+import ListModel, { type IList } from '@/models/list'
 import TeamModel, { type ITeam } from '@/models/team'
 
 export const NOTIFICATION_NAMES = {
@@ -33,6 +33,7 @@ interface NotificationDeleted extends Notification {
 
 interface NotificationCreated extends Notification {
 	task: ITask
+	list: IList
 }
 
 interface NotificationMemberAdded extends Notification {
@@ -51,16 +52,17 @@ export interface INotification extends IAbstract {
 }
 
 export default class NotificationModel extends AbstractModel implements INotification {
-	id!: number
-	name!: string
-	notification!: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
-	read!: boolean
-	readAt: Date | null
+	id = 0
+	name = ''
+	notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded = null
+	read = false
+	readAt: Date | null = null
 
 	created: Date
 
-	constructor(data) {
-		super(data)
+	constructor(data: Partial<INotification>) {
+		super()
+		this.assignData(data)
 
 		switch (this.name) {
 			case NOTIFICATION_NAMES.TASK_COMMENT:
@@ -102,16 +104,6 @@ export default class NotificationModel extends AbstractModel implements INotific
 		this.readAt = parseDateOrNull(this.readAt)
 	}
 
-	defaults() {
-		return {
-			id: 0,
-			name: '',
-			notification: null,
-			read: false,
-			readAt: null,
-		}
-	}
-
 	toText(user = null) {
 		let who = ''
 
diff --git a/src/models/passwordReset.ts b/src/models/passwordReset.ts
index 696fae260..e982f7cd7 100644
--- a/src/models/passwordReset.ts
+++ b/src/models/passwordReset.ts
@@ -7,21 +7,14 @@ export interface IPasswordReset extends IAbstract {
 }
 
 export default class PasswordResetModel extends AbstractModel implements IPasswordReset {
-	token: string
-	newPassword!: string
-	email!: string
+	token = ''
+	newPassword = ''
+	email = ''
 
-	constructor(data) {
-		super(data)
+	constructor(data: Partial<IPasswordReset>) {
+		super()
+		this.assignData(data)
 
 		this.token = localStorage.getItem('passwordResetToken')
 	}
-
-	defaults() {
-		return {
-			token: '',
-			newPassword: '',
-			email: '',
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/models/passwordUpdate.ts b/src/models/passwordUpdate.ts
index f4f04553c..1548ccb9b 100644
--- a/src/models/passwordUpdate.ts
+++ b/src/models/passwordUpdate.ts
@@ -6,13 +6,11 @@ export interface IPasswordUpdate extends IAbstract {
 }
 
 export default class PasswordUpdateModel extends AbstractModel implements IPasswordUpdate {
-	newPassword!: string
-	oldPassword!: string
+	newPassword = ''
+	oldPassword = ''
 
-	defaults() {
-		return {
-			newPassword: '',
-			oldPassword: '',
-		}
+	constructor(data: Partial<IPasswordUpdate>) {
+		super()
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/savedFilter.ts b/src/models/savedFilter.ts
index 7c6ac36bd..8749d0359 100644
--- a/src/models/savedFilter.ts
+++ b/src/models/savedFilter.ts
@@ -2,7 +2,7 @@ import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import UserModel, { type IUser } from '@/models/user'
 
 export interface ISavedFilter extends IAbstract {
-	id: 0
+	id: number
 	title: string
 	description: string
 	filters: {
@@ -21,10 +21,10 @@ export interface ISavedFilter extends IAbstract {
 }
 
 export default class SavedFilterModel extends AbstractModel implements ISavedFilter {
-	id!: 0
-	title!: string
-	description!: string
-	filters!: {
+	id = 0
+	title = ''
+	description = ''
+	filters: {
 		sortBy: ('done' | 'id')[]
 		orderBy: ('asc' | 'desc')[]
 		filterBy: 'done'[]
@@ -32,14 +32,23 @@ export default class SavedFilterModel extends AbstractModel implements ISavedFil
 		filterComparator: 'equals'[]
 		filterConcat: 'and'
 		filterIncludeNulls: boolean
+	} = {
+		sortBy: ['done', 'id'],
+		orderBy: ['asc', 'desc'],
+		filterBy: ['done'],
+		filterValue: ['false'],
+		filterComparator: ['equals'],
+		filterConcat: 'and',
+		filterIncludeNulls: true,
 	}
 
-	owner: IUser
-	created: Date
-	updated: Date
+	owner: IUser = {}
+	created: Date = null
+	updated: Date = null
 
-	constructor(data) {
-		super(data)
+	constructor(data: Partial<ISavedFilter>) {
+		super()
+		this.assignData(data)
 
 		this.owner = new UserModel(this.owner)
 
@@ -47,27 +56,6 @@ export default class SavedFilterModel extends AbstractModel implements ISavedFil
 		this.updated = new Date(this.updated)
 	}
 
-	defaults() {
-		return {
-			id: 0,
-			title: '',
-			description: '',
-			filters: {
-				sortBy: ['done', 'id'],
-				orderBy: ['asc', 'desc'],
-				filterBy: ['done'],
-				filterValue: ['false'],
-				filterComparator: ['equals'],
-				filterConcat: 'and',
-				filterIncludeNulls: true,
-			},
-
-			owner: {},
-			created: null,
-			updated: null,
-		}
-	}
-
 	/**
 	 * Calculates the corresponding list id to this saved filter.
 	 * This function matches the one in the api.
diff --git a/src/models/subscription.ts b/src/models/subscription.ts
index 459c78d30..3ae79dd2e 100644
--- a/src/models/subscription.ts
+++ b/src/models/subscription.ts
@@ -11,27 +11,18 @@ export interface ISubscription extends IAbstract {
 }
 
 export default class SubscriptionModel extends AbstractModel implements ISubscription {
-	id!: number
-	entity!: string // FIXME: correct type?
-	entityId!: number // FIXME: correct type?
-	user: IUser
+	id = 0
+	entity = ''
+	entityId = 0
+	user: IUser = {}
 
-	created: Date
+	created: Date = null
 
-	constructor(data) {
-		super(data)
+	constructor(data : Partial<ISubscription>) {
+		super()
+		this.assignData(data)
 
 		this.created = new Date(this.created)
 		this.user = new UserModel(this.user)
 	}
-
-	defaults() {
-		return {
-			id: 0,
-			entity: '',
-			entityId: 0,
-			created: null,
-			user: {},
-		}
-	}
 }
diff --git a/src/models/task.ts b/src/models/task.ts
index 8d450cc49..e3c03b13d 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -1,4 +1,4 @@
-import type { Priority } from '@/constants/priorities'
+import { PRIORITIES, type Priority } from '@/constants/priorities'
 
 import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import UserModel, { type IUser } from '@/models/user'
@@ -61,44 +61,45 @@ export interface ITask extends IAbstract {
 }
 
 export default class TaskModel extends AbstractModel implements ITask {
-	id: number
-	title: string
-	description!: string
-	done!: boolean
-	doneAt: Date | null
-	priority!: Priority
-	labels: ILabel[]
-	assignees: IUser[]
+	id = 0
+	title = ''
+	description = ''
+	done = false
+	doneAt: Date | null = null
+	priority: Priority = PRIORITIES.UNSET
+	labels: ILabel[] = []
+	assignees: IUser[] = []
 
-	dueDate: Date | null
-	startDate: Date | null
-	endDate: Date | null
-	repeatAfter!: number | IRepeats
-	repeatFromCurrentDate!: boolean
-	repeatMode!: TaskRepeatMode
-	reminderDates: Date[]
-	parentTaskId!: ITask['id']
-	hexColor!: string
-	percentDone!: number
-	relatedTasks!: { [relationKind: string]: ITask } // FIXME: use relationKinds
-	attachments: IAttachment[]
-	identifier!: string
-	index!: number
-	isFavorite!: boolean
-	subscription!: ISubscription
+	dueDate: Date | null = 0
+	startDate: Date | null = 0
+	endDate: Date | null = 0
+	repeatAfter: number | IRepeats = 0
+	repeatFromCurrentDate = false
+	repeatMode: TaskRepeatMode = TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT
+	reminderDates: Date[] = []
+	parentTaskId: ITask['id'] = 0
+	hexColor = ''
+	percentDone = 0
+	relatedTasks: { [relationKind: string]: ITask } = {}
+	attachments: IAttachment[] = []
+	identifier = ''
+	index = 0
+	isFavorite = false
+	subscription: ISubscription = null
 
-	position!: number
-	kanbanPosition!: number
+	position = 0
+	kanbanPosition = 0
 
-	createdBy: IUser
-	created: Date
-	updated: Date
+	createdBy: IUser = UserModel
+	created: Date = null
+	updated: Date = null
 
-	listId: IList['id'] // Meta, only used when creating a new task
-	bucketId!: IBucket['id']
+	listId: IList['id'] = 0
+	bucketId: IBucket['id'] = 0
 
 	constructor(data: Partial<ITask>) {
-		super(data)
+		super()
+		this.assignData(data)
 
 		this.id = Number(this.id)
 		this.title = this.title?.trim()
@@ -158,46 +159,6 @@ export default class TaskModel extends AbstractModel implements ITask {
 		this.listId = Number(this.listId)
 	}
 
-	defaults() {
-		return {
-			id: 0,
-			title: '',
-			description: '',
-			done: false,
-			doneAt: null,
-			priority: 0,
-			labels: [],
-			assignees: [],
-
-			dueDate: 0,
-			startDate: 0,
-			endDate: 0,
-			repeatAfter: 0,
-			repeatFromCurrentDate: false,
-			repeatMode: TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT,
-			reminderDates: [],
-			parentTaskId: 0,
-			hexColor: '',
-			percentDone: 0,
-			relatedTasks: {},
-			attachments: [],
-			identifier: '',
-			index: 0,
-			isFavorite: false,
-			subscription: null,
-
-			position: 0,
-			kanbanPosition: 0,
-
-			createdBy: UserModel,
-			created: null,
-			updated: null,
-
-			listId: 0, // Meta, only used when creating a new task
-			bucketId: 0,
-		}
-	}
-
 	getTextIdentifier() {
 		if (this.identifier === '') {
 			return `#${this.index}`
diff --git a/src/models/taskAssignee.ts b/src/models/taskAssignee.ts
index 93b9434f8..29a8db271 100644
--- a/src/models/taskAssignee.ts
+++ b/src/models/taskAssignee.ts
@@ -9,20 +9,13 @@ export interface ITaskAssignee extends IAbstract {
 }
 
 export default class TaskAssigneeModel extends AbstractModel implements ITaskAssignee {
-	created: Date
-	userId!: IUser['id']
-	taskId!: ITask['id']
+	created: Date = null
+	userId: IUser['id'] = 0
+	taskId: ITask['id'] = 0
 
-	constructor(data) {
-		super(data)
+	constructor(data: Partial<ITaskAssignee>) {
+		super()
+		this.assignData(data)
 		this.created = new Date(this.created)
 	}
-
-	defaults() {
-		return {
-			created: null,
-			userId: 0,
-			taskId: 0,
-		}
-	}
 }
diff --git a/src/models/taskComment.ts b/src/models/taskComment.ts
index d774d7a0b..bb5ceb101 100644
--- a/src/models/taskComment.ts
+++ b/src/models/taskComment.ts
@@ -13,29 +13,20 @@ export interface ITaskComment extends IAbstract {
 }
 
 export default class TaskCommentModel extends AbstractModel implements ITaskComment {
-	id!: number
-	taskId!: ITask['id']
-	comment!: string
-	author: IUser
+	id = 0
+	taskId: ITask['id'] = 0
+	comment = ''
+	author: IUser = UserModel
 
-	created: Date
-	updated: Date
+	created: Date = null
+	updated: Date = null
+
+	constructor(data: Partial<ITaskComment>) {
+		super()
+		this.assignData(data)
 
-	constructor(data) {
-		super(data)
 		this.author = new UserModel(this.author)
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
 	}
-
-	defaults() {
-		return {
-			id: 0,
-			taskId: 0,
-			comment: '',
-			author: UserModel,
-			created: null,
-			updated: null,
-		}
-	}
 }
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index 931c5f155..db375faba 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -30,29 +30,19 @@ export interface ITaskRelation extends IAbstract {
 }
 
 export default class TaskRelationModel extends AbstractModel implements ITaskRelation {
-	id!: number
-	otherTaskId!: ITask['id']
-	taskId!: ITask['id']
-	relationKind!: RelationKind
+	id = 0
+	otherTaskId: ITask['id'] = 0
+	taskId: ITask['id'] = 0
+	relationKind: RelationKind = ''
 
-	createdBy: IUser
-	created: Date
+	createdBy: IUser = UserModel
+	created: Date = null
+
+	constructor(data: Partial<ITaskRelation>) {
+		super()
+		this.assignData(data)
 
-	constructor(data) {
-		super(data)
 		this.createdBy = new UserModel(this.createdBy)
 		this.created = new Date(this.created)
 	}
-
-	defaults() {
-		return {
-			id: 0,
-			otherTaskId: 0,
-			taskId: 0,
-			relationKind: '',
-
-			createdBy: UserModel,
-			created: null,
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/models/team.ts b/src/models/team.ts
index c24c1352d..56e13dee5 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -16,18 +16,19 @@ export interface ITeam extends IAbstract {
 }
 
 export default class TeamModel extends AbstractModel implements ITeam {
-	id!: number
-	name!: string
-	description!: string
-	members: ITeamMember[]
-	right!: Right
+	id = 0
+	name = ''
+	description = ''
+	members: ITeamMember[] = []
+	right: Right = RIGHTS.READ
 
-	createdBy: IUser
-	created: Date
-	updated: Date
+	createdBy: IUser = {} // FIXME: seems wrong
+	created: Date = null
+	updated: Date = null
 
-	constructor(data) {
-		super(data)
+	constructor(data: Partial<ITeam>) {
+		super()
+		this.assignData(data)
 
 		// Make the members to usermodels
 		this.members = this.members.map(m => {
@@ -38,18 +39,4 @@ export default class TeamModel extends AbstractModel implements ITeam {
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
 	}
-
-	defaults() {
-		return {
-			id: 0,
-			name: '',
-			description: '',
-			members: [],
-			right: RIGHTS.READ,
-
-			createdBy: {},
-			created: null,
-			updated: null,
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/models/teamList.ts b/src/models/teamList.ts
index 472cd479b..bb55b1cc2 100644
--- a/src/models/teamList.ts
+++ b/src/models/teamList.ts
@@ -6,12 +6,10 @@ export interface ITeamList extends TeamShareBaseModel {
 }
 
 export default class TeamListModel extends TeamShareBaseModel implements ITeamList {
-	listId!: IList['id']
+	listId: IList['id'] = 0
 
-	defaults() {
-		return {
-			...super.defaults(),
-			listId: 0,
-		}
+	constructor(data: Partial<ITeamList>) {
+		super(data)
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/teamMember.ts b/src/models/teamMember.ts
index 597599a7f..6caf49328 100644
--- a/src/models/teamMember.ts
+++ b/src/models/teamMember.ts
@@ -7,14 +7,11 @@ export interface ITeamMember extends UserModel {
 }
 
 export default class TeamMemberModel extends UserModel implements ITeamMember {
-	admin!: boolean
-	teamId!: IList['id']
+	admin = false
+	teamId: IList['id'] = 0
 
-	defaults() {
-		return {
-			...super.defaults(),
-			admin: false,
-			teamId: 0,
-		}
+	constructor(data: Partial<ITeamMember>) {
+		super(data)
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/teamNamespace.ts b/src/models/teamNamespace.ts
index 31a845107..104d7a77d 100644
--- a/src/models/teamNamespace.ts
+++ b/src/models/teamNamespace.ts
@@ -6,12 +6,10 @@ export interface ITeamNamespace extends TeamShareBaseModel {
 }
 
 export default class TeamNamespaceModel extends TeamShareBaseModel implements ITeamNamespace {
-	namespaceId!: INamespace['id']
+	namespaceId: INamespace['id'] = 0
 
-	defaults() {
-		return {
-			...super.defaults(),
-			namespaceId: 0,
-		}
+	constructor(data: Partial<ITeamNamespace>) {
+		super(data)
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index 7ce563648..02495d1cd 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -15,25 +15,17 @@ export interface ITeamShareBase extends IAbstract {
  * It is extended in a way so it can be used for namespaces as well for lists.
  */
 export default class TeamShareBaseModel extends AbstractModel implements ITeamShareBase {
-	teamId!: ITeam['id']
-	right!: Right
+	teamId: ITeam['id'] = 0
+	right: Right = RIGHTS.READ
 
-	created: Date
-	updated: Date
+	created: Date = null
+	updated: Date = null
+
+	constructor(data: Partial<ITeamShareBase>) {
+		super()
+		this.assignData(data)
 
-	constructor(data) {
-		super(data)
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
 	}
-
-	defaults() {
-		return {
-			teamId: 0,
-			right: RIGHTS.READ,
-
-			created: null,
-			updated: null,
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/models/totp.ts b/src/models/totp.ts
index 7d33ebd34..42242cf01 100644
--- a/src/models/totp.ts
+++ b/src/models/totp.ts
@@ -6,16 +6,13 @@ export interface ITotp extends IAbstract {
 	url: string
 }
 
-export default class TotpModel extends AbstractModel implements ITotp{
-	secret!: string
-	enabled!: boolean
-	url!: string
+export default class TotpModel extends AbstractModel implements ITotp {
+	secret = ''
+	enabled = false
+	url = ''
 
-	defaults() {
-		return {
-			secret: '',
-			enabled: false,
-			url: '',
-		}
+	constructor(data: Partial<ITotp>) {
+		super()
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/user.ts b/src/models/user.ts
index 642acff8f..cd6423b76 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -13,17 +13,18 @@ export interface IUser extends IAbstract {
 }
 
 export default class UserModel extends AbstractModel implements IUser {
-	id!: number
-	email!: string
-	username!: string
-	name!: string
+	id = 0
+	email = ''
+	username = ''
+	name = ''
 
-	created: Date
-	updated: Date
-	settings: IUserSettings
+	created: Date = null
+	updated: Date = null
+	settings: IUserSettings = null
 
-	constructor(data) {
-		super(data)
+	constructor(data: Partial<IUser>) {
+		super()
+		this.assignData(data)
 
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
@@ -33,19 +34,6 @@ export default class UserModel extends AbstractModel implements IUser {
 		}
 	}
 
-	defaults() {
-		return {
-			id: 0,
-			email: '',
-			username: '',
-			name: '',
-
-			created: null,
-			updated: null,
-			settings: null,
-		}
-	}
-
 	getAvatarUrl(size = 50) {
 		return `${window.API_URL}/avatar/${this.username}?size=${size}`
 	}
diff --git a/src/models/userList.ts b/src/models/userList.ts
index 51c2a229a..ae5f88112 100644
--- a/src/models/userList.ts
+++ b/src/models/userList.ts
@@ -7,12 +7,10 @@ export interface IUserList extends UserShareBaseModel {
 
 // This class extends the user share model with a 'rights' parameter which is used in sharing
 export default class UserListModel extends UserShareBaseModel implements IUserList {
-	listId!: IList['id']
+	listId: IList['id'] = 0
 
-	defaults() {
-		return {
-			...super.defaults(),
-			listId: 0,
-		}
+	constructor(data: Partial<IUserList>) {
+		super(data)
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/userNamespace.ts b/src/models/userNamespace.ts
index 6d7c80685..4795b8737 100644
--- a/src/models/userNamespace.ts
+++ b/src/models/userNamespace.ts
@@ -7,12 +7,10 @@ export interface IUserNamespace extends UserShareBaseModel {
 
 // This class extends the user share model with a 'rights' parameter which is used in sharing
 export default class UserNamespaceModel extends UserShareBaseModel implements IUserNamespace {
-	namespaceId!: INamespace['id']
+	namespaceId: INamespace['id'] = 0
 
-	defaults() {
-		return {
-			...super.defaults(),
-			namespaceId: 0,
-		}
+	constructor(data: Partial<IUserNamespace>) {
+		super(data)
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/userSettings.ts b/src/models/userSettings.ts
index c5bc638a4..382e71590 100644
--- a/src/models/userSettings.ts
+++ b/src/models/userSettings.ts
@@ -14,25 +14,17 @@ export interface IUserSettings extends IAbstract {
 }
 
 export default class UserSettingsModel extends AbstractModel implements IUserSettings {
-	name!: string
-	emailRemindersEnabled!: boolean
-	discoverableByName!: boolean
-	discoverableByEmail!: boolean
-	overdueTasksRemindersEnabled!: boolean
-	defaultListId!: undefined | IList['id']
-	weekStart!: 0 | 1 | 2 | 3 | 4 | 5 | 6
-	timezone!: string
+	name = ''
+	emailRemindersEnabled = true
+	discoverableByName = false
+	discoverableByEmail = false
+	overdueTasksRemindersEnabled = true
+	defaultListId: undefined | IList['id'] = undefined
+	weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6 = 0
+	timezone = ''
 
-	defaults() {
-		return {
-			name: '',
-			emailRemindersEnabled: true,
-			discoverableByName: false,
-			discoverableByEmail: false,
-			overdueTasksRemindersEnabled: true,
-			defaultListId: undefined,
-			weekStart: 0,
-			timezone: '',
-		}
+	constructor(data: Partial<IUserSettings>) {
+		super()
+		this.assignData(data)
 	}
 }
\ No newline at end of file
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index 274700007..82ab54327 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -11,25 +11,17 @@ export interface IUserShareBase extends IAbstract {
 }
 
 export default class UserShareBaseModel extends AbstractModel implements IUserShareBase {
-	userId!: IUser['id']
-	right!: Right
+	userId: IUser['id'] = ''
+	right: Right = RIGHTS.READ
 
-	created: Date
-	updated: Date
+	created: Date = null
+	updated: Date = null
 
-	constructor(data) {
-		super(data)
+	constructor(data: Partial<IUserShareBase>) {
+		super()
+		this.assignData(data)
+	
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
 	}
-
-	defaults() {
-		return {
-			userId: '',
-			right: RIGHTS.READ,
-
-			created: null,
-			updated: null,
-		}
-	}
 }
\ No newline at end of file

From 7d4ba6249e300b6711369476f5d6a84728668b0f Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Thu, 4 Aug 2022 20:57:43 +0200
Subject: [PATCH 26/32] feat: add modelTypes

---
 .../notifications/notifications.vue           |  2 +-
 src/components/tasks/partials/attachments.vue |  4 +-
 .../tasks/partials/relatedTasks.vue           |  5 +-
 src/components/tasks/partials/repeatAfter.vue |  7 +-
 src/helpers/color/colorIsDark.ts              |  2 +-
 src/helpers/getHumanSize.ts                   | 18 ++++
 src/modelSchema/common/repeats.ts             | 43 ++++++++++
 src/modelTypes/IAbstract.ts                   |  5 ++
 src/modelTypes/IAttachment.ts                 | 11 +++
 src/modelTypes/IAvatar.ts                     |  7 ++
 src/modelTypes/IBackgroundImage.ts            | 12 +++
 src/modelTypes/IBucket.ts                     | 17 ++++
 src/modelTypes/ICaldavToken.ts                |  7 ++
 src/modelTypes/IEmailUpdate.ts                |  6 ++
 src/modelTypes/IFile.ts                       | 10 +++
 src/modelTypes/ILabel.ts                      | 15 ++++
 src/modelTypes/ILabelTask.ts                  |  7 ++
 src/modelTypes/ILinkShare.ts                  | 17 ++++
 src/modelTypes/IList.ts                       | 26 ++++++
 src/modelTypes/IListDuplicate.ts              |  9 ++
 src/modelTypes/INamespace.ts                  | 18 ++++
 src/modelTypes/INotification.ts               | 51 +++++++++++
 src/modelTypes/IPasswordReset.ts              |  7 ++
 src/modelTypes/IPasswordUpdate.ts             |  6 ++
 src/modelTypes/ISavedFilter.ts                | 14 +++
 src/modelTypes/ISubscription.ts               | 11 +++
 src/modelTypes/ITask.ts                       | 50 +++++++++++
 src/modelTypes/ITaskAssignee.ts               |  9 ++
 src/modelTypes/ITaskComment.ts                | 13 +++
 src/modelTypes/ITaskRelation.ts               | 15 ++++
 src/modelTypes/ITeam.ts                       | 16 ++++
 src/modelTypes/ITeamList.ts                   |  6 ++
 src/modelTypes/ITeamMember.ts                 |  7 ++
 src/modelTypes/ITeamNamespace.ts              |  6 ++
 src/modelTypes/ITeamShareBase.ts              | 11 +++
 src/modelTypes/ITotp.ts                       |  7 ++
 src/modelTypes/IUser.ts                       | 13 +++
 src/modelTypes/IUserList.ts                   |  6 ++
 src/modelTypes/IUserNamespace.ts              |  6 ++
 src/modelTypes/IUserSettings.ts               | 14 +++
 src/modelTypes/IUserShareBase.ts              | 11 +++
 src/models/abstractModel.ts                   |  6 +-
 src/models/attachment.ts                      | 17 ++--
 src/models/avatar.ts                          | 11 +--
 src/models/backgroundImage.ts                 | 14 +--
 src/models/bucket.ts                          | 22 ++---
 src/models/caldavToken.ts                     |  9 +-
 src/models/emailUpdate.ts                     |  7 +-
 src/models/file.ts                            | 30 +------
 src/models/label.ts                           | 21 ++---
 src/models/labelTask.ts                       |  8 +-
 src/models/linkShare.ts                       | 20 ++---
 src/models/list.ts                            | 35 +++-----
 src/models/listDuplicateModel.ts              | 13 ++-
 src/models/namespace.ts                       | 25 ++----
 src/models/notification.ts                    | 59 ++-----------
 src/models/passwordReset.ts                   |  8 +-
 src/models/passwordUpdate.ts                  |  7 +-
 src/models/savedFilter.ts                     | 34 ++------
 src/models/subscription.ts                    | 14 +--
 src/models/task.ts                            | 86 ++++++-------------
 src/models/taskAssignee.ts                    | 12 +--
 src/models/taskComment.ts                     | 17 ++--
 src/models/taskRelation.ts                    | 37 ++------
 src/models/team.ts                            | 22 ++---
 src/models/teamList.ts                        |  6 +-
 src/models/teamMember.ts                      |  7 +-
 src/models/teamNamespace.ts                   |  6 +-
 src/models/teamShareBase.ts                   | 14 +--
 src/models/totp.ts                            |  8 +-
 src/models/user.ts                            | 16 +---
 src/models/userList.ts                        |  6 +-
 src/models/userNamespace.ts                   |  6 +-
 src/models/userSettings.ts                    | 17 +---
 src/models/userShareBase.ts                   | 14 +--
 src/modules/parseTaskText.ts                  |  8 +-
 src/store/index.ts                            |  1 -
 src/store/modules/attachments.ts              |  2 +-
 src/store/modules/auth.ts                     |  2 +-
 src/store/modules/kanban.ts                   |  6 +-
 src/store/modules/labels.ts                   |  2 +-
 src/store/modules/lists.ts                    |  2 +-
 src/store/modules/namespaces.ts               |  4 +-
 src/store/modules/tasks.ts                    | 23 +++--
 src/store/types.ts                            | 12 +--
 src/types/IFilter.ts                          |  9 ++
 src/types/IRelationKind.ts                    | 16 ++++
 src/types/{IRepeats.ts => IRepeatAfter.ts}    |  6 +-
 src/types/IRepeatMode.ts                      |  7 ++
 src/views/list/ListList.vue                   |  2 +-
 src/views/teams/EditTeam.vue                  |  1 +
 91 files changed, 751 insertions(+), 513 deletions(-)
 create mode 100644 src/helpers/getHumanSize.ts
 create mode 100644 src/modelSchema/common/repeats.ts
 create mode 100644 src/modelTypes/IAbstract.ts
 create mode 100644 src/modelTypes/IAttachment.ts
 create mode 100644 src/modelTypes/IAvatar.ts
 create mode 100644 src/modelTypes/IBackgroundImage.ts
 create mode 100644 src/modelTypes/IBucket.ts
 create mode 100644 src/modelTypes/ICaldavToken.ts
 create mode 100644 src/modelTypes/IEmailUpdate.ts
 create mode 100644 src/modelTypes/IFile.ts
 create mode 100644 src/modelTypes/ILabel.ts
 create mode 100644 src/modelTypes/ILabelTask.ts
 create mode 100644 src/modelTypes/ILinkShare.ts
 create mode 100644 src/modelTypes/IList.ts
 create mode 100644 src/modelTypes/IListDuplicate.ts
 create mode 100644 src/modelTypes/INamespace.ts
 create mode 100644 src/modelTypes/INotification.ts
 create mode 100644 src/modelTypes/IPasswordReset.ts
 create mode 100644 src/modelTypes/IPasswordUpdate.ts
 create mode 100644 src/modelTypes/ISavedFilter.ts
 create mode 100644 src/modelTypes/ISubscription.ts
 create mode 100644 src/modelTypes/ITask.ts
 create mode 100644 src/modelTypes/ITaskAssignee.ts
 create mode 100644 src/modelTypes/ITaskComment.ts
 create mode 100644 src/modelTypes/ITaskRelation.ts
 create mode 100644 src/modelTypes/ITeam.ts
 create mode 100644 src/modelTypes/ITeamList.ts
 create mode 100644 src/modelTypes/ITeamMember.ts
 create mode 100644 src/modelTypes/ITeamNamespace.ts
 create mode 100644 src/modelTypes/ITeamShareBase.ts
 create mode 100644 src/modelTypes/ITotp.ts
 create mode 100644 src/modelTypes/IUser.ts
 create mode 100644 src/modelTypes/IUserList.ts
 create mode 100644 src/modelTypes/IUserNamespace.ts
 create mode 100644 src/modelTypes/IUserSettings.ts
 create mode 100644 src/modelTypes/IUserShareBase.ts
 create mode 100644 src/types/IFilter.ts
 create mode 100644 src/types/IRelationKind.ts
 rename src/types/{IRepeats.ts => IRepeatAfter.ts} (53%)
 create mode 100644 src/types/IRepeatMode.ts

diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 308cf9e90..d1d28c20b 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -52,7 +52,7 @@ import {computed, onMounted, onUnmounted, ref} from 'vue'
 import NotificationService from '@/services/notification'
 import BaseButton from '@/components/base/BaseButton.vue'
 import User from '@/components/misc/user.vue'
-import { NOTIFICATION_NAMES as names, type INotification} from '@/models/notification'
+import { NOTIFICATION_NAMES as names, type INotification} from '@/modelTypes/INotification'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {useStore} from '@/store'
 import {useRouter} from 'vue-router'
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index b5043eee9..70d6e5b1e 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -49,7 +49,7 @@
 							/>
 						</i18n-t>
 						<span>
-							{{ a.file.getHumanSize() }}
+							{{ getHumanSize(a.file.size) }}
 						</span>
 						<span v-if="a.file.mime">
 							{{ a.file.mime }}
@@ -157,6 +157,7 @@ import {formatDate, formatDateSince, formatDateLong} from '@/helpers/time/format
 
 import BaseButton from '@/components/base/BaseButton'
 import type { IFile } from '@/models/file'
+import { getHumanSize } from '@/helpers/getHumanSize'
 
 export default defineComponent({
 	name: 'attachments',
@@ -231,6 +232,7 @@ export default defineComponent({
 		})
 	},
 	methods: {
+		getHumanSize,
 		formatDate,
 		formatDateSince,
 		formatDateLong,
diff --git a/src/components/tasks/partials/relatedTasks.vue b/src/components/tasks/partials/relatedTasks.vue
index a46c4f635..2e717fd95 100644
--- a/src/components/tasks/partials/relatedTasks.vue
+++ b/src/components/tasks/partials/relatedTasks.vue
@@ -144,7 +144,8 @@ import {defineComponent} from 'vue'
 import TaskService from '../../../services/task'
 import TaskModel from '../../../models/task'
 import TaskRelationService from '../../../services/taskRelation'
-import TaskRelationModel, {RELATION_KINDS} from '@/models/taskRelation'
+import TaskRelationModel from '@/models/taskRelation'
+import { RELATION_KIND, RELATION_KINDS } from '@/types/IRelationKind'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import Multiselect from '@/components/input/multiselect.vue'
@@ -158,7 +159,7 @@ export default defineComponent({
 			foundTasks: [],
 			relationKinds: RELATION_KINDS,
 			newTaskRelationTask: new TaskModel(),
-			newTaskRelationKind: 'related',
+			newTaskRelationKind: RELATION_KIND.RELATED,
 			taskRelationService: new TaskRelationService(),
 			showDeleteModal: false,
 			relationToDelete: {},
diff --git a/src/components/tasks/partials/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
index 4cb246276..bf50384dc 100644
--- a/src/components/tasks/partials/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@@ -66,7 +66,10 @@ import {ref, reactive, watch, type PropType} from 'vue'
 import {useI18n} from 'vue-i18n'
 
 import {error} from '@/message'
-import {TASK_REPEAT_MODES, type ITask, type RepeatAfter} from '@/models/task'
+
+import {TASK_REPEAT_MODES} from '@/types/IRepeatMode'
+import type {IRepeatAfter} from '@/types/IRepeatAfter'
+import type {ITask} from '@/modelTypes/ITask'
 
 const props = defineProps({
 	modelValue: {
@@ -116,7 +119,7 @@ function updateData() {
 	emit('change')
 }
 
-function setRepeatAfter(amount: number, type: RepeatAfter['type']) {
+function setRepeatAfter(amount: number, type: IRepeatAfter['type']) {
 	Object.assign(repeatAfter, { amount, type})
 	updateData()
 }
diff --git a/src/helpers/color/colorIsDark.ts b/src/helpers/color/colorIsDark.ts
index 3ae8ff286..5548dab99 100644
--- a/src/helpers/color/colorIsDark.ts
+++ b/src/helpers/color/colorIsDark.ts
@@ -1,4 +1,4 @@
-export function colorIsDark(color) {
+export function colorIsDark(color: string | undefined) {
 	if (typeof color === 'undefined') {
 		return true // Defaults to dark
 	}
diff --git a/src/helpers/getHumanSize.ts b/src/helpers/getHumanSize.ts
new file mode 100644
index 000000000..2744e1eb0
--- /dev/null
+++ b/src/helpers/getHumanSize.ts
@@ -0,0 +1,18 @@
+const SIZES = [
+	'B',
+	'KB',
+	'MB',
+	'GB',
+	'TB',
+ ] as const
+
+export function getHumanSize(inputSize: number) {
+	let iterator = 0
+	let size = inputSize
+	while (size > 1024) {
+		size /= 1024
+		iterator++
+	}
+
+	return Number(Math.round(Number(size + 'e2')) + 'e-2') + ' ' + SIZES[iterator]
+}
\ No newline at end of file
diff --git a/src/modelSchema/common/repeats.ts b/src/modelSchema/common/repeats.ts
new file mode 100644
index 000000000..175b0c727
--- /dev/null
+++ b/src/modelSchema/common/repeats.ts
@@ -0,0 +1,43 @@
+import { REPEAT_TYPES, type IRepeatAfter } from '@/types/IRepeatAfter'
+import { nativeEnum, number, object, preprocess } from 'zod'
+
+export const RepeatsSchema = preprocess(
+	(repeats: unknown) => {
+		// Parses the "repeat after x seconds" from the task into a usable js object inside the task.
+	
+		if (typeof repeats !== 'number') {
+			return repeats
+		}
+	
+		const repeatAfterHours = (repeats / 60) / 60
+		
+		const repeatAfter : IRepeatAfter = {
+			type: 'hours',
+			amount: repeatAfterHours,
+		}
+	
+		// if its dividable by 24, its something with days, otherwise hours
+		if (repeatAfterHours % 24 === 0) {
+			const repeatAfterDays = repeatAfterHours / 24
+			if (repeatAfterDays % 7 === 0) {
+				repeatAfter.type = 'weeks'
+				repeatAfter.amount = repeatAfterDays / 7
+			} else if (repeatAfterDays % 30 === 0) {
+				repeatAfter.type = 'months'
+				repeatAfter.amount = repeatAfterDays / 30
+			} else if (repeatAfterDays % 365 === 0) {
+				repeatAfter.type = 'years'
+				repeatAfter.amount = repeatAfterDays / 365
+			} else {
+				repeatAfter.type = 'days'
+				repeatAfter.amount = repeatAfterDays
+			}
+		}
+	
+		return repeatAfter
+	},
+	object({
+		type: nativeEnum(REPEAT_TYPES),
+		amount: number().int(),
+	}),
+)
\ No newline at end of file
diff --git a/src/modelTypes/IAbstract.ts b/src/modelTypes/IAbstract.ts
new file mode 100644
index 000000000..7ca1142d6
--- /dev/null
+++ b/src/modelTypes/IAbstract.ts
@@ -0,0 +1,5 @@
+import type {Right} from '@/constants/rights'
+
+export interface IAbstract {
+	maxRight: Right | null // FIXME: should this be readonly?
+}
\ No newline at end of file
diff --git a/src/modelTypes/IAttachment.ts b/src/modelTypes/IAttachment.ts
new file mode 100644
index 000000000..b1b279b61
--- /dev/null
+++ b/src/modelTypes/IAttachment.ts
@@ -0,0 +1,11 @@
+import type {IAbstract} from './IAbstract'
+import type {IFile} from './IFile'
+import type {IUser} from './IUser'
+
+export interface IAttachment extends IAbstract {
+	id: number
+	taskId: number
+	createdBy: IUser
+	file: IFile
+	created: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/IAvatar.ts b/src/modelTypes/IAvatar.ts
new file mode 100644
index 000000000..ab681996a
--- /dev/null
+++ b/src/modelTypes/IAvatar.ts
@@ -0,0 +1,7 @@
+import type {IAbstract} from './IAbstract'
+
+export type AvatarProvider = 'default' | 'initials' | 'gravatar' | 'marble' | 'upload'
+
+export interface IAvatar extends IAbstract {
+	avatarProvider: AvatarProvider
+}
\ No newline at end of file
diff --git a/src/modelTypes/IBackgroundImage.ts b/src/modelTypes/IBackgroundImage.ts
new file mode 100644
index 000000000..311d7bc72
--- /dev/null
+++ b/src/modelTypes/IBackgroundImage.ts
@@ -0,0 +1,12 @@
+import type {IAbstract} from './IAbstract'
+
+export interface IBackgroundImage extends IAbstract {
+	id: number
+	url: string
+	thumb: string
+	info: {
+		author: string
+		authorName: string
+	}
+	blurHash: string  
+}
\ No newline at end of file
diff --git a/src/modelTypes/IBucket.ts b/src/modelTypes/IBucket.ts
new file mode 100644
index 000000000..e4c2c5685
--- /dev/null
+++ b/src/modelTypes/IBucket.ts
@@ -0,0 +1,17 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+import type {ITask} from './ITask'
+
+export interface IBucket extends IAbstract {
+	id: number
+	title: string
+	listId: number
+	limit: number
+	tasks: ITask[]
+	isDoneBucket: boolean
+	position: number
+	
+	createdBy: IUser
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/ICaldavToken.ts b/src/modelTypes/ICaldavToken.ts
new file mode 100644
index 000000000..d7e1e68d5
--- /dev/null
+++ b/src/modelTypes/ICaldavToken.ts
@@ -0,0 +1,7 @@
+import type {IAbstract} from './IAbstract'
+
+export interface ICaldavToken extends IAbstract {
+	id: number;
+
+	created: Date;
+}
\ No newline at end of file
diff --git a/src/modelTypes/IEmailUpdate.ts b/src/modelTypes/IEmailUpdate.ts
new file mode 100644
index 000000000..fbb39c1b9
--- /dev/null
+++ b/src/modelTypes/IEmailUpdate.ts
@@ -0,0 +1,6 @@
+import type {IAbstract} from './IAbstract'
+
+export interface IEmailUpdate extends IAbstract {
+	newEmail: string
+	password: string
+}
\ No newline at end of file
diff --git a/src/modelTypes/IFile.ts b/src/modelTypes/IFile.ts
new file mode 100644
index 000000000..70ae38739
--- /dev/null
+++ b/src/modelTypes/IFile.ts
@@ -0,0 +1,10 @@
+import type {IAbstract} from './IAbstract'
+
+export interface IFile extends IAbstract {
+	id: number
+	mime: string
+	name: string
+	size: number
+
+	created: Date
+} 
\ No newline at end of file
diff --git a/src/modelTypes/ILabel.ts b/src/modelTypes/ILabel.ts
new file mode 100644
index 000000000..c7cbe778b
--- /dev/null
+++ b/src/modelTypes/ILabel.ts
@@ -0,0 +1,15 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+
+export interface ILabel extends IAbstract {
+	id: number
+	title: string
+	hexColor: string
+	description: string
+	createdBy: IUser
+	listId: number
+	textColor: string
+
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/ILabelTask.ts b/src/modelTypes/ILabelTask.ts
new file mode 100644
index 000000000..dcc2acefe
--- /dev/null
+++ b/src/modelTypes/ILabelTask.ts
@@ -0,0 +1,7 @@
+import type {IAbstract} from './IAbstract'
+
+export interface ILabelTask extends IAbstract {
+	id: number
+	taskId: number
+	labelId: number
+}
\ No newline at end of file
diff --git a/src/modelTypes/ILinkShare.ts b/src/modelTypes/ILinkShare.ts
new file mode 100644
index 000000000..d5eacb241
--- /dev/null
+++ b/src/modelTypes/ILinkShare.ts
@@ -0,0 +1,17 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+import type { Right } from '@/constants/rights'
+
+export interface ILinkShare extends IAbstract {
+	id: number
+	hash: string
+	right: Right
+	sharedBy: IUser
+	sharingType: number // FIXME: use correct numbers
+	listId: number
+	name: string
+	password: string
+
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/IList.ts b/src/modelTypes/IList.ts
new file mode 100644
index 000000000..c51633b52
--- /dev/null
+++ b/src/modelTypes/IList.ts
@@ -0,0 +1,26 @@
+import type {IAbstract} from './IAbstract'
+import type {ITask} from './ITask'
+import type {IUser} from './IUser'
+import type {ISubscription} from './ISubscription'
+import type {INamespace} from './INamespace'
+
+
+export interface IList extends IAbstract {
+	id: number
+	title: string
+	description: string
+	owner: IUser
+	tasks: ITask[]
+	namespaceId: INamespace['id']
+	isArchived: boolean
+	hexColor: string
+	identifier: string
+	backgroundInformation: any // FIXME: improve type
+	isFavorite: boolean
+	subscription: ISubscription
+	position: number
+	backgroundBlurHash: string
+	
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/IListDuplicate.ts b/src/modelTypes/IListDuplicate.ts
new file mode 100644
index 000000000..bdd924e34
--- /dev/null
+++ b/src/modelTypes/IListDuplicate.ts
@@ -0,0 +1,9 @@
+import type {IAbstract} from './IAbstract'
+import type {IList} from './IList'
+import type {INamespace} from './INamespace'
+
+export interface IListDuplicate extends IAbstract {
+	listId: number
+	namespaceId: INamespace['id']
+	list: IList
+}
\ No newline at end of file
diff --git a/src/modelTypes/INamespace.ts b/src/modelTypes/INamespace.ts
new file mode 100644
index 000000000..95ee4700a
--- /dev/null
+++ b/src/modelTypes/INamespace.ts
@@ -0,0 +1,18 @@
+import type {IAbstract} from './IAbstract'
+import type {IList} from './IList'
+import type {IUser} from './IUser'
+import type {ISubscription} from './ISubscription'
+
+export interface INamespace extends IAbstract {
+	id: number
+	title: string
+	description: string
+	owner: IUser
+	lists: IList[]
+	isArchived: boolean
+	hexColor: string
+	subscription: ISubscription
+
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/INotification.ts b/src/modelTypes/INotification.ts
new file mode 100644
index 000000000..52d6dc2a9
--- /dev/null
+++ b/src/modelTypes/INotification.ts
@@ -0,0 +1,51 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+import type {ITask} from './ITask'
+import type {ITaskComment} from './ITaskComment'
+import type {ITeam} from './ITeam'
+import type { IList } from './IList'
+
+export const NOTIFICATION_NAMES = {
+	'TASK_COMMENT': 'task.comment',
+	'TASK_ASSIGNED': 'task.assigned',
+	'TASK_DELETED': 'task.deleted',
+	'LIST_CREATED': 'list.created',
+	'TEAM_MEMBER_ADDED': 'team.member.added',
+} as const
+
+interface Notification {
+	doer: IUser
+}
+interface NotificationTask extends Notification {
+	task: ITask
+	comment: ITaskComment
+}
+
+interface NotificationAssigned extends Notification {
+	task: ITask
+	assignee: IUser
+}
+
+interface NotificationDeleted extends Notification {
+	task: ITask
+}
+
+interface NotificationCreated extends Notification {
+	task: ITask
+	list: IList
+}
+
+interface NotificationMemberAdded extends Notification {
+	member: IUser
+	team: ITeam
+}
+
+export interface INotification extends IAbstract {
+	id: number
+	name: string
+	notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
+	read: boolean
+	readAt: Date | null
+
+	created: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/IPasswordReset.ts b/src/modelTypes/IPasswordReset.ts
new file mode 100644
index 000000000..0b3d679ad
--- /dev/null
+++ b/src/modelTypes/IPasswordReset.ts
@@ -0,0 +1,7 @@
+import type {IAbstract} from './IAbstract'
+
+export interface IPasswordReset extends IAbstract {
+	token: string
+	newPassword: string
+	email: string
+}
\ No newline at end of file
diff --git a/src/modelTypes/IPasswordUpdate.ts b/src/modelTypes/IPasswordUpdate.ts
new file mode 100644
index 000000000..003b43b8d
--- /dev/null
+++ b/src/modelTypes/IPasswordUpdate.ts
@@ -0,0 +1,6 @@
+import type {IAbstract} from './IAbstract'
+
+export interface IPasswordUpdate extends IAbstract {
+	newPassword: string
+	oldPassword: string
+}
\ No newline at end of file
diff --git a/src/modelTypes/ISavedFilter.ts b/src/modelTypes/ISavedFilter.ts
new file mode 100644
index 000000000..5f206efa9
--- /dev/null
+++ b/src/modelTypes/ISavedFilter.ts
@@ -0,0 +1,14 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+import type {IFilter} from '@/types/IFilter'
+
+export interface ISavedFilter extends IAbstract {
+	id: number
+	title: string
+	description: string
+	filters: IFilter
+
+	owner: IUser
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/ISubscription.ts b/src/modelTypes/ISubscription.ts
new file mode 100644
index 000000000..51dbfbcfb
--- /dev/null
+++ b/src/modelTypes/ISubscription.ts
@@ -0,0 +1,11 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+
+export interface ISubscription extends IAbstract {
+	id: number
+	entity: string // FIXME: correct type?
+	entityId: number // FIXME: correct type?
+	user: IUser
+
+	created: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/ITask.ts b/src/modelTypes/ITask.ts
new file mode 100644
index 000000000..86bae8c2a
--- /dev/null
+++ b/src/modelTypes/ITask.ts
@@ -0,0 +1,50 @@
+import type { Priority } from '@/constants/priorities'
+
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+import type {ILabel} from './ILabel'
+import type {IAttachment} from './IAttachment'
+import type {ISubscription} from './ISubscription'
+import type {IList} from './IList'
+import type {IBucket} from './IBucket'
+
+import type {IRelationKind} from '@/types/IRelationKind'
+import type {IRepeatAfter} from '@/types/IRepeatAfter'
+import type {IRepeatMode} from '@/types/IRepeatMode'
+export interface ITask extends IAbstract {
+	id: number
+	title: string
+	description: string
+	done: boolean
+	doneAt: Date | null
+	priority: Priority
+	labels: ILabel[]
+	assignees: IUser[]
+
+	dueDate: Date | null
+	startDate: Date | null
+	endDate: Date | null
+	repeatAfter: number | IRepeatAfter
+	repeatFromCurrentDate: boolean
+	repeatMode: IRepeatMode
+	reminderDates: Date[]
+	parentTaskId: ITask['id']
+	hexColor: string
+	percentDone: number
+	relatedTasks: Partial<Record<IRelationKind, ITask>>,
+	attachments: IAttachment[]
+	identifier: string
+	index: number
+	isFavorite: boolean
+	subscription: ISubscription
+
+	position: number
+	kanbanPosition: number
+
+	createdBy: IUser
+	created: Date
+	updated: Date
+
+	listId: IList['id'] // Meta, only used when creating a new task
+	bucketId: IBucket['id']
+}
\ No newline at end of file
diff --git a/src/modelTypes/ITaskAssignee.ts b/src/modelTypes/ITaskAssignee.ts
new file mode 100644
index 000000000..a508e4b86
--- /dev/null
+++ b/src/modelTypes/ITaskAssignee.ts
@@ -0,0 +1,9 @@
+import type {IAbstract} from './IAbstract'
+import type {ITask} from './ITask'
+import type {IUser} from './IUser'
+
+export interface ITaskAssignee extends IAbstract {
+	created: Date
+	userId: IUser['id']
+	taskId: ITask['id']
+}
\ No newline at end of file
diff --git a/src/modelTypes/ITaskComment.ts b/src/modelTypes/ITaskComment.ts
new file mode 100644
index 000000000..4246ab13d
--- /dev/null
+++ b/src/modelTypes/ITaskComment.ts
@@ -0,0 +1,13 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+import type {ITask} from './ITask'
+
+export interface ITaskComment extends IAbstract {
+	id: number
+	taskId: ITask['id']
+	comment: string
+	author: IUser
+
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/ITaskRelation.ts b/src/modelTypes/ITaskRelation.ts
new file mode 100644
index 000000000..df286f5c0
--- /dev/null
+++ b/src/modelTypes/ITaskRelation.ts
@@ -0,0 +1,15 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+import type {ITask} from './ITask'
+
+import type {IRelationKind} from '@/types/IRelationKind'
+
+export interface ITaskRelation extends IAbstract {
+	id: number
+	otherTaskId: ITask['id']
+	taskId: ITask['id']
+	relationKind: IRelationKind
+
+	createdBy: IUser
+	created: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/ITeam.ts b/src/modelTypes/ITeam.ts
new file mode 100644
index 000000000..cd5a7dc73
--- /dev/null
+++ b/src/modelTypes/ITeam.ts
@@ -0,0 +1,16 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+import type {ITeamMember} from './ITeamMember'
+import type {Right} from '@/constants/rights'
+
+export interface ITeam extends IAbstract {
+	id: number
+	name: string
+	description: string
+	members: ITeamMember[]
+	right: Right
+
+	createdBy: IUser
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/ITeamList.ts b/src/modelTypes/ITeamList.ts
new file mode 100644
index 000000000..a1abd692d
--- /dev/null
+++ b/src/modelTypes/ITeamList.ts
@@ -0,0 +1,6 @@
+import type {ITeamShareBase} from './ITeamShareBase'
+import type {IList} from './IList'
+
+export interface ITeamList extends ITeamShareBase {
+	listId: IList['id']
+}
\ No newline at end of file
diff --git a/src/modelTypes/ITeamMember.ts b/src/modelTypes/ITeamMember.ts
new file mode 100644
index 000000000..62a1d91ba
--- /dev/null
+++ b/src/modelTypes/ITeamMember.ts
@@ -0,0 +1,7 @@
+import type {IUser} from './IUser'
+import type {IList} from './IList'
+
+export interface ITeamMember extends IUser {
+	admin: boolean
+	teamId: IList['id']
+}
diff --git a/src/modelTypes/ITeamNamespace.ts b/src/modelTypes/ITeamNamespace.ts
new file mode 100644
index 000000000..e66a98bb6
--- /dev/null
+++ b/src/modelTypes/ITeamNamespace.ts
@@ -0,0 +1,6 @@
+import type {ITeamShareBase} from './ITeamShareBase'
+import type {INamespace} from './INamespace'
+
+export interface ITeamNamespace extends ITeamShareBase {
+	namespaceId: INamespace['id']
+}
\ No newline at end of file
diff --git a/src/modelTypes/ITeamShareBase.ts b/src/modelTypes/ITeamShareBase.ts
new file mode 100644
index 000000000..793b88945
--- /dev/null
+++ b/src/modelTypes/ITeamShareBase.ts
@@ -0,0 +1,11 @@
+import type {IAbstract} from './IAbstract'
+import type {ITeam} from './ITeam'
+import type {Right} from '@/constants/rights'
+
+export interface ITeamShareBase extends IAbstract {
+	teamId: ITeam['id']
+	right: Right
+
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/modelTypes/ITotp.ts b/src/modelTypes/ITotp.ts
new file mode 100644
index 000000000..8c2147bba
--- /dev/null
+++ b/src/modelTypes/ITotp.ts
@@ -0,0 +1,7 @@
+import type {IAbstract} from './IAbstract'
+
+export interface ITotp extends IAbstract {
+	secret: string
+	enabled: boolean
+	url: string
+}
\ No newline at end of file
diff --git a/src/modelTypes/IUser.ts b/src/modelTypes/IUser.ts
new file mode 100644
index 000000000..d2ee19ea8
--- /dev/null
+++ b/src/modelTypes/IUser.ts
@@ -0,0 +1,13 @@
+import type {IAbstract} from './IAbstract'
+import type {IUserSettings} from './IUserSettings'
+
+export interface IUser extends IAbstract {
+	id: number
+	email: string
+	username: string
+	name: string
+
+	created: Date
+	updated: Date
+	settings: IUserSettings
+}
\ No newline at end of file
diff --git a/src/modelTypes/IUserList.ts b/src/modelTypes/IUserList.ts
new file mode 100644
index 000000000..20787db7f
--- /dev/null
+++ b/src/modelTypes/IUserList.ts
@@ -0,0 +1,6 @@
+import type {IUserShareBase} from './IUserShareBase'
+import type {IList} from './IList'
+
+export interface IUserList extends IUserShareBase {
+	listId: IList['id']
+}
\ No newline at end of file
diff --git a/src/modelTypes/IUserNamespace.ts b/src/modelTypes/IUserNamespace.ts
new file mode 100644
index 000000000..e2bd1b468
--- /dev/null
+++ b/src/modelTypes/IUserNamespace.ts
@@ -0,0 +1,6 @@
+import type {IUserShareBase} from './IUserShareBase'
+import type {INamespace} from './INamespace'
+
+export interface IUserNamespace extends IUserShareBase {
+	namespaceId: INamespace['id']
+}
\ No newline at end of file
diff --git a/src/modelTypes/IUserSettings.ts b/src/modelTypes/IUserSettings.ts
new file mode 100644
index 000000000..9550e1e67
--- /dev/null
+++ b/src/modelTypes/IUserSettings.ts
@@ -0,0 +1,14 @@
+
+import type {IAbstract} from './IAbstract'
+import type {IList} from './IList'
+
+export interface IUserSettings extends IAbstract {
+	name: string
+	emailRemindersEnabled: boolean
+	discoverableByName: boolean
+	discoverableByEmail: boolean
+	overdueTasksRemindersEnabled: boolean
+	defaultListId: undefined | IList['id']
+	weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6
+	timezone: string
+}
\ No newline at end of file
diff --git a/src/modelTypes/IUserShareBase.ts b/src/modelTypes/IUserShareBase.ts
new file mode 100644
index 000000000..cc23a2be0
--- /dev/null
+++ b/src/modelTypes/IUserShareBase.ts
@@ -0,0 +1,11 @@
+import type {IAbstract} from './IAbstract'
+import type {IUser} from './IUser'
+import type {Right} from '@/constants/rights'
+
+export interface IUserShareBase extends IAbstract {
+	userId: IUser['id']
+	right: Right
+
+	created: Date
+	updated: Date
+}
\ No newline at end of file
diff --git a/src/models/abstractModel.ts b/src/models/abstractModel.ts
index f859c361d..8e0605e52 100644
--- a/src/models/abstractModel.ts
+++ b/src/models/abstractModel.ts
@@ -1,13 +1,11 @@
 import {objectToCamelCase} from '@/helpers/case'
 import {omitBy, isNil} from '@/helpers/utils'
 import type {Right} from '@/constants/rights'
-
-export interface IAbstract {
-	maxRight: Right | null // FIXME: should this be readonly?
-}
+import type {IAbstract} from '@/modelTypes/IAbstract'
 
 export default abstract class AbstractModel<Model extends IAbstract = IAbstract> implements IAbstract {
 
+
 	/**
 	 * The max right the user has on this object, as returned by the x-max-right header from the api.
 	 */
diff --git a/src/models/attachment.ts b/src/models/attachment.ts
index 074d61b65..694609725 100644
--- a/src/models/attachment.ts
+++ b/src/models/attachment.ts
@@ -1,14 +1,9 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import UserModel, {type IUser} from './user'
-import FileModel, {type IFile} from './file'
-
-export interface IAttachment extends IAbstract {
-	id: number
-	taskId: number
-	createdBy: IUser
-	file: IFile
-	created: Date
-}
+import AbstractModel from './abstractModel'
+import UserModel from './user'
+import FileModel from './file'
+import type { IUser } from '@/modelTypes/IUser'
+import type { IFile } from '@/modelTypes/IFile'
+import type { IAttachment } from '@/modelTypes/IAttachment'
 
 export default class AttachmentModel extends AbstractModel implements IAttachment {
 	id = 0
diff --git a/src/models/avatar.ts b/src/models/avatar.ts
index daf221c0a..06f484fce 100644
--- a/src/models/avatar.ts
+++ b/src/models/avatar.ts
@@ -1,13 +1,8 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-
-export type AvatarProvider = 'default' | 'initials' | 'gravatar' | 'marble' | 'upload'
-
-export interface IAvatar extends IAbstract {
-	avatarProvider: AvatarProvider
-}
+import AbstractModel from './abstractModel'
+import type { IAvatar } from '@/modelTypes/IAvatar'
 
 export default class AvatarModel extends AbstractModel implements IAvatar {
-	avatarProvider: AvatarProvider = 'default'
+	avatarProvider: IAvatar['avatarProvider'] = 'default'
 
 	constructor(data: Partial<IAvatar>) {
 		super()
diff --git a/src/models/backgroundImage.ts b/src/models/backgroundImage.ts
index 137c83836..8c1a21341 100644
--- a/src/models/backgroundImage.ts
+++ b/src/models/backgroundImage.ts
@@ -1,15 +1,5 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-
-export interface IBackgroundImage extends IAbstract {
-	id: number
-	url: string
-	thumb: string
-	info: {
-		author: string
-		authorName: string
-	}
-	blurHash: string  
-}
+import AbstractModel from './abstractModel'
+import type {IBackgroundImage} from '@/modelTypes/IBackgroundImage'
 
 export default class BackgroundImageModel extends AbstractModel implements IBackgroundImage {
 	id = 0
diff --git a/src/models/bucket.ts b/src/models/bucket.ts
index 94f6c2d08..3394583c4 100644
--- a/src/models/bucket.ts
+++ b/src/models/bucket.ts
@@ -1,20 +1,10 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import UserModel, { type IUser } from './user'
-import TaskModel, { type ITask } from './task'
+import AbstractModel from './abstractModel'
+import UserModel from './user'
+import TaskModel from './task'
 
-export interface IBucket extends IAbstract {
-	id: number
-	title: string
-	listId: number
-	limit: number
-	tasks: ITask[]
-	isDoneBucket: boolean
-	position: number
-	
-	createdBy: IUser
-	created: Date
-	updated: Date
-}
+import type {IBucket} from '@/modelTypes/IBucket'
+import type {ITask} from '@/modelTypes/ITask'
+import type {IUser} from '@/modelTypes/IUser'
 
 export default class BucketModel extends AbstractModel implements IBucket {
 	id = 0
diff --git a/src/models/caldavToken.ts b/src/models/caldavToken.ts
index 4a4d4c4da..bc904c477 100644
--- a/src/models/caldavToken.ts
+++ b/src/models/caldavToken.ts
@@ -1,15 +1,12 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 
-export interface ICaldavToken extends IAbstract {
-	id: number;
-	created: Date;
-}
+import type {ICaldavToken} from '@/modelTypes/ICaldavToken'
 
 export default class CaldavTokenModel extends AbstractModel implements ICaldavToken {
 	id: number
 	created: Date
 
-	constructor(data? : Partial<CaldavTokenModel>) {
+	constructor(data: Partial<CaldavTokenModel>) {
 		super()
 		this.assignData(data)
 		
diff --git a/src/models/emailUpdate.ts b/src/models/emailUpdate.ts
index 2f8c9a853..aece407f1 100644
--- a/src/models/emailUpdate.ts
+++ b/src/models/emailUpdate.ts
@@ -1,9 +1,6 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 
-interface IEmailUpdate extends IAbstract {
-	newEmail: string
-	password: string
-}
+import type {IEmailUpdate} from '@/modelTypes/IEmailUpdate'
 
 export default class EmailUpdateModel extends AbstractModel implements IEmailUpdate {
 	newEmail = ''
diff --git a/src/models/file.ts b/src/models/file.ts
index ba5950c7b..cb17d5151 100644
--- a/src/models/file.ts
+++ b/src/models/file.ts
@@ -1,12 +1,5 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-
-export interface IFile extends IAbstract {
-	id: number
-	mime: string
-	name: string
-	size: number
-	created: Date
-} 
+import AbstractModel from './abstractModel'
+import type {IFile} from '@/modelTypes/IFile'
 
 export default class FileModel extends AbstractModel implements IFile {
 	id = 0
@@ -21,23 +14,4 @@ export default class FileModel extends AbstractModel implements IFile {
 
 		this.created = new Date(this.created)
 	}
-
-	getHumanSize() {
-		const sizes = {
-			0: 'B',
-			1: 'KB',
-			2: 'MB',
-			3: 'GB',
-			4: 'TB',
-		}
-
-		let it = 0
-		let size = this.size
-		while (size > 1024) {
-			size /= 1024
-			it++
-		}
-
-		return Number(Math.round(size + 'e2') + 'e-2') + ' ' + sizes[it]
-	}
 }
diff --git a/src/models/label.ts b/src/models/label.ts
index 5b3659b70..1e14cf820 100644
--- a/src/models/label.ts
+++ b/src/models/label.ts
@@ -1,22 +1,13 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import UserModel, { type IUser } from './user'
+import AbstractModel from './abstractModel'
+import UserModel from './user'
+
+import type {ILabel} from '@/modelTypes/ILabel'
+import type {IUser} from '@/modelTypes/IUser'
+
 import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 const DEFAULT_LABEL_BACKGROUND_COLOR = 'e8e8e8'
 
-export interface ILabel extends IAbstract {
-	id: number
-	title: string
-	hexColor: string
-	description: string
-	createdBy: IUser
-	listId: number
-	textColor: string
-
-	created: Date
-	updated: Date
-}
-
 export default class LabelModel extends AbstractModel implements ILabel {
 	id = 0
 	title = ''
diff --git a/src/models/labelTask.ts b/src/models/labelTask.ts
index 8223edb4f..b1e068224 100644
--- a/src/models/labelTask.ts
+++ b/src/models/labelTask.ts
@@ -1,10 +1,6 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 
-export interface ILabelTask extends IAbstract {
-	id: number
-	taskId: number
-	labelId: number
-}
+import type { ILabelTask } from '@/modelTypes/ILabelTask'
 
 export default class LabelTask extends AbstractModel implements ILabelTask {
 	id = 0
diff --git a/src/models/linkShare.ts b/src/models/linkShare.ts
index c7df693b0..24aa8779c 100644
--- a/src/models/linkShare.ts
+++ b/src/models/linkShare.ts
@@ -1,19 +1,9 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import UserModel, { type IUser } from './user'
-import {RIGHTS, type Right} from '@/constants/rights'
+import AbstractModel from './abstractModel'
+import UserModel from './user'
 
-export interface ILinkShare extends IAbstract {
-	id: number
-	hash: string
-	right: Right
-	sharedBy: IUser
-	sharingType: number // FIXME: use correct numbers
-	listId: number
-	name: string
-	password: string
-	created: Date
-	updated: Date
-}
+import {RIGHTS, type Right} from '@/constants/rights'
+import type {ILinkShare} from '@/modelTypes/ILinkShare'
+import type {IUser} from '@/modelTypes/IUser'
 
 export default class LinkShareModel extends AbstractModel implements ILinkShare {
 	id = 0
diff --git a/src/models/list.ts b/src/models/list.ts
index 7ef058c45..02387f18e 100644
--- a/src/models/list.ts
+++ b/src/models/list.ts
@@ -1,31 +1,16 @@
-import AbstractModel, { type IAbstract } from '@/models/abstractModel'
-import TaskModel, { type ITask } from '@/models/task'
-import UserModel, { type IUser } from '@/models/user'
-import SubscriptionModel, { type ISubscription } from '@/models/subscription'
-import type { INamespace } from '@/models/namespace'
+import AbstractModel from './abstractModel'
+import TaskModel from '@/models/task'
+import UserModel from '@/models/user'
+import SubscriptionModel from '@/models/subscription'
+
+import type {IList} from '@/modelTypes/IList'
+import type {IUser} from '@/modelTypes/IUser'
+import type {ITask} from '@/modelTypes/ITask'
+import type {INamespace} from '@/modelTypes/INamespace'
+import type {ISubscription} from '@/modelTypes/ISubscription'
 
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 
-export interface IList extends IAbstract {
-	id: number
-	title: string
-	description: string
-	owner: IUser
-	tasks: ITask[]
-	namespaceId: INamespace['id']
-	isArchived: boolean
-	hexColor: string
-	identifier: string
-	backgroundInformation: any // FIXME: improve type
-	isFavorite: boolean
-	subscription: ISubscription
-	position: number
-	backgroundBlurHash: string
-	
-	created: Date
-	updated: Date
-}
-
 export default class ListModel extends AbstractModel implements IList {
 	id = 0
 	title = ''
diff --git a/src/models/listDuplicateModel.ts b/src/models/listDuplicateModel.ts
index 4d8faf1f4..8ed2ae74d 100644
--- a/src/models/listDuplicateModel.ts
+++ b/src/models/listDuplicateModel.ts
@@ -1,12 +1,9 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import ListModel, { type IList } from './list'
-import type { INamespace } from './namespace'
+import AbstractModel from './abstractModel'
+import ListModel from './list'
 
-export interface IListDuplicate extends IAbstract {
-	listId: number
-	namespaceId: INamespace['id']
-	list: IList
-}
+import type {IListDuplicate} from '@/modelTypes/IListDuplicate'
+import type {INamespace} from '@/modelTypes/INamespace'
+import type {IList} from '@/modelTypes/IList'
 
 export default class ListDuplicateModel extends AbstractModel implements IListDuplicate {
 	listId = 0
diff --git a/src/models/namespace.ts b/src/models/namespace.ts
index f1962f1af..dade605e8 100644
--- a/src/models/namespace.ts
+++ b/src/models/namespace.ts
@@ -1,21 +1,12 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import ListModel, { type IList } from './list'
-import UserModel, { type IUser } from './user'
-import SubscriptionModel, { type ISubscription } from '@/models/subscription'
+import AbstractModel from './abstractModel'
+import ListModel from './list'
+import UserModel from './user'
+import SubscriptionModel from '@/models/subscription'
 
-export interface INamespace extends IAbstract {
-	id: number
-	title: string
-	description: string
-	owner: IUser
-	lists: IList[]
-	isArchived: boolean
-	hexColor: string
-	subscription: ISubscription
-
-	created: Date
-	updated: Date
-}
+import type {INamespace} from '@/modelTypes/INamespace'
+import type {IUser} from '@/modelTypes/IUser'
+import type {IList} from '@/modelTypes/IList'
+import type {ISubscription} from '@/modelTypes/ISubscription'
 
 export default class NamespaceModel extends AbstractModel implements INamespace {
 	id = 0
diff --git a/src/models/notification.ts b/src/models/notification.ts
index bd9c87276..a1fc44ad5 100644
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@@ -1,60 +1,17 @@
-import AbstractModel, { type IAbstract } from '@/models/abstractModel'
+import AbstractModel from './abstractModel'
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
-import UserModel, { type IUser } from '@/models/user'
-import TaskModel, { type ITask } from '@/models/task'
-import TaskCommentModel, { type ITaskComment } from '@/models/taskComment'
-import ListModel, { type IList } from '@/models/list'
-import TeamModel, { type ITeam } from '@/models/team'
+import UserModel from '@/models/user'
+import TaskModel from '@/models/task'
+import TaskCommentModel from '@/models/taskComment'
+import ListModel from '@/models/list'
+import TeamModel from '@/models/team'
 
-export const NOTIFICATION_NAMES = {
-	'TASK_COMMENT': 'task.comment',
-	'TASK_ASSIGNED': 'task.assigned',
-	'TASK_DELETED': 'task.deleted',
-	'LIST_CREATED': 'list.created',
-	'TEAM_MEMBER_ADDED': 'team.member.added',
-} as const
-
-interface Notification {
-	doer: IUser
-}
-interface NotificationTask extends Notification {
-	task: ITask
-	comment: ITaskComment
-}
-
-interface NotificationAssigned extends Notification {
-	task: ITask
-	assignee: IUser
-}
-
-interface NotificationDeleted extends Notification {
-	task: ITask
-}
-
-interface NotificationCreated extends Notification {
-	task: ITask
-	list: IList
-}
-
-interface NotificationMemberAdded extends Notification {
-	member: IUser
-	team: ITeam
-}
-
-export interface INotification extends IAbstract {
-	id: number
-	name: string
-	notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded
-	read: boolean
-	readAt: Date | null
-
-	created: Date
-}
+import {NOTIFICATION_NAMES, type INotification} from '@/modelTypes/INotification'
 
 export default class NotificationModel extends AbstractModel implements INotification {
 	id = 0
 	name = ''
-	notification: NotificationTask | NotificationAssigned | NotificationDeleted | NotificationCreated | NotificationMemberAdded = null
+	notification: INotification['notification'] = null
 	read = false
 	readAt: Date | null = null
 
diff --git a/src/models/passwordReset.ts b/src/models/passwordReset.ts
index e982f7cd7..5140063f8 100644
--- a/src/models/passwordReset.ts
+++ b/src/models/passwordReset.ts
@@ -1,10 +1,6 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 
-export interface IPasswordReset extends IAbstract {
-	token: string
-	newPassword: string
-	email: string
-}
+import type {IPasswordReset} from '@/modelTypes/IPasswordReset'
 
 export default class PasswordResetModel extends AbstractModel implements IPasswordReset {
 	token = ''
diff --git a/src/models/passwordUpdate.ts b/src/models/passwordUpdate.ts
index 1548ccb9b..702fcd50f 100644
--- a/src/models/passwordUpdate.ts
+++ b/src/models/passwordUpdate.ts
@@ -1,9 +1,6 @@
-import AbstractModel, { type IAbstract } from '@/models/abstractModel'
+import AbstractModel from './abstractModel'
 
-export interface IPasswordUpdate extends IAbstract {
-	newPassword: string
-	oldPassword: string
-}
+import type {IPasswordUpdate} from '@/modelTypes/IPasswordUpdate'
 
 export default class PasswordUpdateModel extends AbstractModel implements IPasswordUpdate {
 	newPassword = ''
diff --git a/src/models/savedFilter.ts b/src/models/savedFilter.ts
index 8749d0359..c432014ff 100644
--- a/src/models/savedFilter.ts
+++ b/src/models/savedFilter.ts
@@ -1,38 +1,14 @@
-import AbstractModel, { type IAbstract } from '@/models/abstractModel'
-import UserModel, { type IUser } from '@/models/user'
+import AbstractModel from './abstractModel'
+import UserModel from '@/models/user'
 
-export interface ISavedFilter extends IAbstract {
-	id: number
-	title: string
-	description: string
-	filters: {
-		sortBy: ('done' | 'id')[]
-		orderBy: ('asc' | 'desc')[]
-		filterBy: 'done'[]
-		filterValue: 'false'[]
-		filterComparator: 'equals'[]
-		filterConcat: 'and'
-		filterIncludeNulls: boolean
-	}
-
-	owner: IUser
-	created: Date
-	updated: Date
-}
+import type {ISavedFilter} from '@/modelTypes/ISavedFilter'
+import type {IUser} from '@/modelTypes/IUser'
 
 export default class SavedFilterModel extends AbstractModel implements ISavedFilter {
 	id = 0
 	title = ''
 	description = ''
-	filters: {
-		sortBy: ('done' | 'id')[]
-		orderBy: ('asc' | 'desc')[]
-		filterBy: 'done'[]
-		filterValue: 'false'[]
-		filterComparator: 'equals'[]
-		filterConcat: 'and'
-		filterIncludeNulls: boolean
-	} = {
+	filters: ISavedFilter['filters'] = {
 		sortBy: ['done', 'id'],
 		orderBy: ['asc', 'desc'],
 		filterBy: ['done'],
diff --git a/src/models/subscription.ts b/src/models/subscription.ts
index 3ae79dd2e..77ae3dec8 100644
--- a/src/models/subscription.ts
+++ b/src/models/subscription.ts
@@ -1,14 +1,8 @@
-import AbstractModel, { type IAbstract } from '@/models/abstractModel'
-import UserModel, { type IUser } from '@/models/user'
+import AbstractModel from './abstractModel'
+import UserModel from '@/models/user'
 
-export interface ISubscription extends IAbstract {
-	id: number
-	entity: string // FIXME: correct type?
-	entityId: number // FIXME: correct type?
-	user: IUser
-
-	created: Date
-}
+import type {ISubscription} from '@/modelTypes/ISubscription'
+import type {IUser} from '@/modelTypes/IUser'
 
 export default class SubscriptionModel extends AbstractModel implements ISubscription {
 	id = 0
diff --git a/src/models/task.ts b/src/models/task.ts
index e3c03b13d..e8dafdf1c 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -1,63 +1,35 @@
+
 import { PRIORITIES, type Priority } from '@/constants/priorities'
 
-import AbstractModel, { type IAbstract } from '@/models/abstractModel'
-import UserModel, { type IUser } from '@/models/user'
-import LabelModel, { type ILabel } from '@/models/label'
-import AttachmentModel, {type IAttachment} from '@/models/attachment'
-import SubscriptionModel, { type ISubscription } from '@/models/subscription'
-import type { IList } from '@/models/list'
-import  type {IRepeats} from '@/types/IRepeats'
+import type {ITask} from '@/modelTypes/ITask'
+import type {ILabel} from '@/modelTypes/ILabel'
+import type {IUser} from '@/modelTypes/IUser'
+import type {IAttachment} from '@/modelTypes/IAttachment'
+import type {IList} from '@/modelTypes/IList'
+import type {ISubscription} from '@/modelTypes/ISubscription'
+import type {IBucket} from '@/modelTypes/IBucket'
+
+import type {IRepeatAfter} from '@/types/IRepeatAfter'
+import {TASK_REPEAT_MODES, type IRepeatMode} from '@/types/IRepeatMode'
 
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
-import type { IBucket } from './bucket'
+import type { IRelationKind } from '@/types/IRelationKind'
+
+import AbstractModel from './abstractModel'
+import LabelModel from './label'
+import UserModel from './user'
+import AttachmentModel from './attachment'
+import SubscriptionModel from './subscription'
 
 const SUPPORTS_TRIGGERED_NOTIFICATION = 'Notification' in window && 'showTrigger' in Notification.prototype
 export const TASK_DEFAULT_COLOR = '#1973ff'
 
-export const TASK_REPEAT_MODES = {
-	'REPEAT_MODE_DEFAULT': 0,
-	'REPEAT_MODE_MONTH': 1,
-	'REPEAT_MODE_FROM_CURRENT_DATE': 2,
-} as const
+export function	getHexColor(hexColor: string) {
+	if (hexColor === '' || hexColor === '#') {
+		return TASK_DEFAULT_COLOR
+	}
 
-export type TaskRepeatMode = typeof TASK_REPEAT_MODES[keyof typeof TASK_REPEAT_MODES] 
-
-export interface ITask extends IAbstract {
-	id: number
-	title: string
-	description: string
-	done: boolean
-	doneAt: Date | null
-	priority: Priority
-	labels: ILabel[]
-	assignees: IUser[]
-
-	dueDate: Date | null
-	startDate: Date | null
-	endDate: Date | null
-	repeatAfter: number | IRepeats
-	repeatFromCurrentDate: boolean
-	repeatMode: TaskRepeatMode
-	reminderDates: Date[]
-	parentTaskId: ITask['id']
-	hexColor: string
-	percentDone: number
-	relatedTasks: { [relationKind: string]: ITask } // FIXME: use relationKinds
-	attachments: IAttachment[]
-	identifier: string
-	index: number
-	isFavorite: boolean
-	subscription: ISubscription
-
-	position: number
-	kanbanPosition: number
-
-	createdBy: IUser
-	created: Date
-	updated: Date
-
-	listId: IList['id'] // Meta, only used when creating a new task
-	bucketId: IBucket['id']
+	return hexColor
 }
 
 export default class TaskModel extends AbstractModel implements ITask {
@@ -73,14 +45,14 @@ export default class TaskModel extends AbstractModel implements ITask {
 	dueDate: Date | null = 0
 	startDate: Date | null = 0
 	endDate: Date | null = 0
-	repeatAfter: number | IRepeats = 0
+	repeatAfter: number | IRepeatAfter = 0
 	repeatFromCurrentDate = false
-	repeatMode: TaskRepeatMode = TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT
+	repeatMode: IRepeatMode = TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT
 	reminderDates: Date[] = []
 	parentTaskId: ITask['id'] = 0
 	hexColor = ''
 	percentDone = 0
-	relatedTasks: { [relationKind: string]: ITask } = {}
+	relatedTasks:  Partial<Record<IRelationKind, ITask>> = {}
 	attachments: IAttachment[] = []
 	identifier = ''
 	index = 0
@@ -168,11 +140,7 @@ export default class TaskModel extends AbstractModel implements ITask {
 	}
 
 	getHexColor() {
-		if (this.hexColor === '' || this.hexColor === '#') {
-			return TASK_DEFAULT_COLOR
-		}
-
-		return this.hexColor
+		return getHexColor(this.hexColor)
 	}
 
 	/////////////////
diff --git a/src/models/taskAssignee.ts b/src/models/taskAssignee.ts
index 29a8db271..5777e5b20 100644
--- a/src/models/taskAssignee.ts
+++ b/src/models/taskAssignee.ts
@@ -1,12 +1,8 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import type { ITask } from './task'
-import type { IUser } from './user'
+import AbstractModel from './abstractModel'
 
-export interface ITaskAssignee extends IAbstract {
-	created: Date
-	userId: IUser['id']
-	taskId: ITask['id']
-}
+import type {ITaskAssignee} from '@/modelTypes/ITaskAssignee'
+import type {IUser} from '@/modelTypes/IUser'
+import type {ITask} from '@/modelTypes/ITask'
 
 export default class TaskAssigneeModel extends AbstractModel implements ITaskAssignee {
 	created: Date = null
diff --git a/src/models/taskComment.ts b/src/models/taskComment.ts
index bb5ceb101..6c76e822f 100644
--- a/src/models/taskComment.ts
+++ b/src/models/taskComment.ts
@@ -1,16 +1,9 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import UserModel, { type IUser } from './user'
-import type { ITask } from './task'
+import AbstractModel from './abstractModel'
+import UserModel from './user'
 
-export interface ITaskComment extends IAbstract {
-	id: number
-	taskId: ITask['id']
-	comment: string
-	author: IUser
-
-	created: Date
-	updated: Date
-}
+import type {ITaskComment} from '@/modelTypes/ITaskComment'
+import type {ITask} from '@/modelTypes/ITask'
+import type {IUser} from '@/modelTypes/IUser'
 
 export default class TaskCommentModel extends AbstractModel implements ITaskComment {
 	id = 0
diff --git a/src/models/taskRelation.ts b/src/models/taskRelation.ts
index db375faba..e22eddb91 100644
--- a/src/models/taskRelation.ts
+++ b/src/models/taskRelation.ts
@@ -1,39 +1,16 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import UserModel, { type IUser } from './user'
-import type { ITask } from './task'
+import AbstractModel from './abstractModel'
+import UserModel from './user'
 
-export const RELATION_KIND = {
-	'SUBTASK': 'subtask',
-	'PARENTTASK': 'parenttask',
-	'RELATED': 'related',
-	'DUPLICATES': 'duplicates',
-	'BLOCKING': 'blocking',
-	'BLOCKED': 'blocked',
-	'PROCEDES': 'precedes',
-	'FOLLOWS': 'follows',
-	'COPIEDFROM': 'copiedfrom',
-	'COPIEDTO': 'copiedto',
- } as const
-
-export const RELATION_KINDS = [...Object.values(RELATION_KIND)] as const
-
-export type RelationKind = typeof RELATION_KINDS[number]
-
-export interface ITaskRelation extends IAbstract {
-	id: number
-	otherTaskId: ITask['id']
-	taskId: ITask['id']
-	relationKind: RelationKind
-
-	createdBy: IUser
-	created: Date
-}
+import type {ITaskRelation} from '@/modelTypes/ITaskRelation'
+import type {ITask} from '@/modelTypes/ITask'
+import type {IUser} from '@/modelTypes/IUser'
 
+import type {IRelationKind} from '@/types/IRelationKind'
 export default class TaskRelationModel extends AbstractModel implements ITaskRelation {
 	id = 0
 	otherTaskId: ITask['id'] = 0
 	taskId: ITask['id'] = 0
-	relationKind: RelationKind = ''
+	relationKind: IRelationKind = ''
 
 	createdBy: IUser = UserModel
 	created: Date = null
diff --git a/src/models/team.ts b/src/models/team.ts
index 56e13dee5..5e3bd27e5 100644
--- a/src/models/team.ts
+++ b/src/models/team.ts
@@ -1,19 +1,11 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import UserModel, { type IUser } from './user'
-import TeamMemberModel, { type ITeamMember } from './teamMember'
+import AbstractModel from './abstractModel'
+import UserModel from './user'
+import TeamMemberModel from './teamMember'
+
 import {RIGHTS, type Right} from '@/constants/rights'
-
-export interface ITeam extends IAbstract {
-	id: number
-	name: string
-	description: string
-	members: ITeamMember[]
-	right: Right
-
-	createdBy: IUser
-	created: Date
-	updated: Date
-}
+import type {ITeam} from '@/modelTypes/ITeam'
+import type {ITeamMember} from '@/modelTypes/ITeamMember'
+import type {IUser} from '@/modelTypes/IUser'
 
 export default class TeamModel extends AbstractModel implements ITeam {
 	id = 0
diff --git a/src/models/teamList.ts b/src/models/teamList.ts
index bb55b1cc2..eab202cf0 100644
--- a/src/models/teamList.ts
+++ b/src/models/teamList.ts
@@ -1,9 +1,7 @@
 import TeamShareBaseModel from './teamShareBase'
-import type { IList } from './list'
 
-export interface ITeamList extends TeamShareBaseModel {
-	listId: IList['id']
-}
+import type {ITeamList} from '@/modelTypes/ITeamList'
+import type {IList} from '@/modelTypes/IList'
 
 export default class TeamListModel extends TeamShareBaseModel implements ITeamList {
 	listId: IList['id'] = 0
diff --git a/src/models/teamMember.ts b/src/models/teamMember.ts
index 6caf49328..ee8768f02 100644
--- a/src/models/teamMember.ts
+++ b/src/models/teamMember.ts
@@ -1,10 +1,7 @@
 import UserModel from './user'
-import type { IList } from './list'
 
-export interface ITeamMember extends UserModel {
-	admin: boolean
-	teamId: IList['id']
-}
+import type {ITeamMember} from '@/modelTypes/ITeamMember'
+import type {IList} from '@/modelTypes/IList'
 
 export default class TeamMemberModel extends UserModel implements ITeamMember {
 	admin = false
diff --git a/src/models/teamNamespace.ts b/src/models/teamNamespace.ts
index 104d7a77d..3d583ae80 100644
--- a/src/models/teamNamespace.ts
+++ b/src/models/teamNamespace.ts
@@ -1,9 +1,7 @@
 import TeamShareBaseModel from './teamShareBase'
-import type { INamespace } from './namespace'
 
-export interface ITeamNamespace extends TeamShareBaseModel {
-	namespaceId: INamespace['id']
-}
+import type {ITeamNamespace} from '@/modelTypes/ITeamNamespace'
+import type {INamespace} from '@/modelTypes/INamespace'
 
 export default class TeamNamespaceModel extends TeamShareBaseModel implements ITeamNamespace {
 	namespaceId: INamespace['id'] = 0
diff --git a/src/models/teamShareBase.ts b/src/models/teamShareBase.ts
index 02495d1cd..c7eb23c7e 100644
--- a/src/models/teamShareBase.ts
+++ b/src/models/teamShareBase.ts
@@ -1,14 +1,8 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
+
 import {RIGHTS, type Right} from '@/constants/rights'
-import type { ITeam } from './team'
-
-export interface ITeamShareBase extends IAbstract {
-	teamId: ITeam['id']
-	right: Right
-
-	created: Date
-	updated: Date
-}
+import type {ITeamShareBase} from '@/modelTypes/ITeamShareBase'
+import type {ITeam} from '@/modelTypes/ITeam'
 
 /**
  * This class is a base class for common team sharing model.
diff --git a/src/models/totp.ts b/src/models/totp.ts
index 42242cf01..5e094392d 100644
--- a/src/models/totp.ts
+++ b/src/models/totp.ts
@@ -1,10 +1,6 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
 
-export interface ITotp extends IAbstract {
-	secret: string
-	enabled: boolean
-	url: string
-}
+import type {ITotp} from '@/modelTypes/ITotp'
 
 export default class TotpModel extends AbstractModel implements ITotp {
 	secret = ''
diff --git a/src/models/user.ts b/src/models/user.ts
index cd6423b76..41509c171 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -1,16 +1,8 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
-import UserSettingsModel, { type IUserSettings } from '@/models/userSettings'
+import AbstractModel from './abstractModel'
+import UserSettingsModel from '@/models/userSettings'
 
-export interface IUser extends IAbstract {
-	id: number
-	email: string
-	username: string
-	name: string
-
-	created: Date
-	updated: Date
-	settings: IUserSettings
-}
+import type { IUser } from '@/modelTypes/IUser'
+import type { IUserSettings } from '@/modelTypes/IUserSettings'
 
 export default class UserModel extends AbstractModel implements IUser {
 	id = 0
diff --git a/src/models/userList.ts b/src/models/userList.ts
index ae5f88112..ed264d9b8 100644
--- a/src/models/userList.ts
+++ b/src/models/userList.ts
@@ -1,9 +1,7 @@
 import UserShareBaseModel from './userShareBase'
-import type { IList } from './list'
 
-export interface IUserList extends UserShareBaseModel {
-	listId: IList['id']
-}
+import type {IUserList} from '@/modelTypes/IUserList'
+import type {IList} from '@/modelTypes/IList'
 
 // This class extends the user share model with a 'rights' parameter which is used in sharing
 export default class UserListModel extends UserShareBaseModel implements IUserList {
diff --git a/src/models/userNamespace.ts b/src/models/userNamespace.ts
index 4795b8737..326373837 100644
--- a/src/models/userNamespace.ts
+++ b/src/models/userNamespace.ts
@@ -1,9 +1,7 @@
 import UserShareBaseModel from './userShareBase'
-import type { INamespace } from './namespace'
 
-export interface IUserNamespace extends UserShareBaseModel {
-	namespaceId: INamespace['id']
-}
+import type {INamespace} from '@/modelTypes/INamespace'
+import type {IUserNamespace} from '@/modelTypes/IUserNamespace'
 
 // This class extends the user share model with a 'rights' parameter which is used in sharing
 export default class UserNamespaceModel extends UserShareBaseModel implements IUserNamespace {
diff --git a/src/models/userSettings.ts b/src/models/userSettings.ts
index 382e71590..6b5bd7ca4 100644
--- a/src/models/userSettings.ts
+++ b/src/models/userSettings.ts
@@ -1,17 +1,8 @@
 
-import AbstractModel, { type IAbstract } from './abstractModel'
-import type { IList } from './list'
+import AbstractModel from './abstractModel'
 
-export interface IUserSettings extends IAbstract {
-	name: string
-	emailRemindersEnabled: boolean
-	discoverableByName: boolean
-	discoverableByEmail: boolean
-	overdueTasksRemindersEnabled: boolean
-	defaultListId: undefined | IList['id']
-	weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6
-	timezone: string
-}
+import type {IUserSettings} from '@/modelTypes/IUserSettings'
+import type {IList} from '@/modelTypes/IList'
 
 export default class UserSettingsModel extends AbstractModel implements IUserSettings {
 	name = ''
@@ -20,7 +11,7 @@ export default class UserSettingsModel extends AbstractModel implements IUserSet
 	discoverableByEmail = false
 	overdueTasksRemindersEnabled = true
 	defaultListId: undefined | IList['id'] = undefined
-	weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6 = 0
+	weekStart: IUserSettings['weekStart'] = 0
 	timezone = ''
 
 	constructor(data: Partial<IUserSettings>) {
diff --git a/src/models/userShareBase.ts b/src/models/userShareBase.ts
index 82ab54327..e21998d94 100644
--- a/src/models/userShareBase.ts
+++ b/src/models/userShareBase.ts
@@ -1,14 +1,8 @@
-import AbstractModel, { type IAbstract } from './abstractModel'
+import AbstractModel from './abstractModel'
+
 import {RIGHTS, type Right} from '@/constants/rights'
-import type { IUser } from './user'
-
-export interface IUserShareBase extends IAbstract {
-	userId: IUser['id']
-	right: Right
-
-	created: Date
-	updated: Date
-}
+import type {IUserShareBase} from '@/modelTypes/IUserShareBase'
+import type {IUser} from '@/modelTypes/IUser'
 
 export default class UserShareBaseModel extends AbstractModel implements IUserShareBase {
 	userId: IUser['id'] = ''
diff --git a/src/modules/parseTaskText.ts b/src/modules/parseTaskText.ts
index 5be6d2ab0..319bada8f 100644
--- a/src/modules/parseTaskText.ts
+++ b/src/modules/parseTaskText.ts
@@ -1,6 +1,6 @@
 import {parseDate} from '../helpers/time/parseDate'
 import {PRIORITIES} from '@/constants/priorities'
-import {REPEAT_TYPES, type IRepeats, type RepeatType} from '@/types/IRepeats'
+import {REPEAT_TYPES, type IRepeatAfter, type IRepeatType} from '@/types/IRepeatAfter'
 
 const VIKUNJA_PREFIXES: Prefixes = {
 	label: '*',
@@ -30,7 +30,7 @@ export const PREFIXES = {
 
 interface repeatParsedResult {
 	textWithoutMatched: string,
-	repeats: IRepeats | null,
+	repeats: IRepeatAfter | null,
 }
 
 export interface ParsedTaskText {
@@ -40,7 +40,7 @@ export interface ParsedTaskText {
 	list: string | null,
 	priority: number | null,
 	assignees: string[],
-	repeats: IRepeats | null,
+	repeats: IRepeatAfter | null,
 }
 
 interface Prefixes {
@@ -185,7 +185,7 @@ const getRepeats = (text: string): repeatParsedResult => {
 		default:
 			amount = results[3] ? parseInt(results[3]) : 1
 	}
-	let type: RepeatType = REPEAT_TYPES.Hours
+	let type: IRepeatType = REPEAT_TYPES.Hours
 
 	switch (results[0]) {
 		case 'biennially':
diff --git a/src/store/index.ts b/src/store/index.ts
index 0033e07e1..34dc7c049 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,7 +1,6 @@
 import type {InjectionKey} from 'vue'
 import {createStore, useStore as baseUseStore, Store} from 'vuex'
 
-
 import {getBlobFromBlurHash} from '../helpers/getBlobFromBlurHash'
 import {
 	BACKGROUND,
diff --git a/src/store/modules/attachments.ts b/src/store/modules/attachments.ts
index 208ab4cef..172696e41 100644
--- a/src/store/modules/attachments.ts
+++ b/src/store/modules/attachments.ts
@@ -2,7 +2,7 @@ import type { Module } from 'vuex'
 import {findIndexById} from '@/helpers/utils'
 
 import type { AttachmentState, RootStoreState } from '@/store/types'
-import type { IAttachment } from '@/models/attachment'
+import type { IAttachment } from '@/modelTypes/IAttachment'
 
 const store : Module<AttachmentState, RootStoreState> = {
 	namespaced: true,
diff --git a/src/store/modules/auth.ts b/src/store/modules/auth.ts
index a66b656b6..c101381ca 100644
--- a/src/store/modules/auth.ts
+++ b/src/store/modules/auth.ts
@@ -12,7 +12,7 @@ import {success} from '@/message'
 import {redirectToProvider} from '@/helpers/redirectToProvider'
 import type { RootStoreState, AuthState, Info} from '@/store/types'
 import {AUTH_TYPES} from '@/store/types'
-import type { IUserSettings } from '@/models/userSettings'
+import type { IUserSettings } from '@/modelTypes/IUserSettings'
 
 
 const defaultSettings = settings => {
diff --git a/src/store/modules/kanban.ts b/src/store/modules/kanban.ts
index c6e46d58a..194121309 100644
--- a/src/store/modules/kanban.ts
+++ b/src/store/modules/kanban.ts
@@ -9,9 +9,9 @@ import BucketService from '../../services/bucket'
 import {setLoading} from '../helper'
 import TaskCollectionService from '@/services/taskCollection'
 import type { RootStoreState, KanbanState } from '@/store/types'
-import type { ITask } from '@/models/task'
-import type { IList } from '@/models/list'
-import type { IBucket } from '@/models/bucket'
+import type { ITask } from '@/modelTypes/ITask'
+import type { IList } from '@/modelTypes/IList'
+import type { IBucket } from '@/modelTypes/IBucket'
 
 const TASKS_PER_BUCKET = 25
 
diff --git a/src/store/modules/labels.ts b/src/store/modules/labels.ts
index ce32db6d0..928b6b1e4 100644
--- a/src/store/modules/labels.ts
+++ b/src/store/modules/labels.ts
@@ -7,7 +7,7 @@ import {setLoading} from '@/store/helper'
 import type { LabelState, RootStoreState } from '@/store/types'
 import {getLabelsByIds, filterLabelsByQuery} from '@/helpers/labels'
 import {createNewIndexer} from '@/indexes'
-import type { ILabel } from '@/models/label'
+import type { ILabel } from '@/modelTypes/ILabel'
 
 const {add, remove, update} = createNewIndexer('labels', ['title', 'description'])
 
diff --git a/src/store/modules/lists.ts b/src/store/modules/lists.ts
index 0d18a2c04..be2e3fcfe 100644
--- a/src/store/modules/lists.ts
+++ b/src/store/modules/lists.ts
@@ -5,7 +5,7 @@ import {setLoading} from '@/store/helper'
 import {removeListFromHistory} from '@/modules/listHistory'
 import {createNewIndexer} from '@/indexes'
 import type {ListState, RootStoreState} from '@/store/types'
-import type {IList} from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 
 const {add, remove, search, update} = createNewIndexer('lists', ['title', 'description'])
 
diff --git a/src/store/modules/namespaces.ts b/src/store/modules/namespaces.ts
index 0eccc99bb..d835c7095 100644
--- a/src/store/modules/namespaces.ts
+++ b/src/store/modules/namespaces.ts
@@ -4,8 +4,8 @@ import NamespaceService from '../../services/namespace'
 import {setLoading} from '@/store/helper'
 import {createNewIndexer} from '@/indexes'
 import type {NamespaceState, RootStoreState} from '@/store/types'
-import type {INamespace} from '@/models/namespace'
-import type {IList} from '@/models/list'
+import type {INamespace} from '@/modelTypes/INamespace'
+import type {IList} from '@/modelTypes/IList'
 
 const {add, remove, search, update} = createNewIndexer('namespaces', ['title', 'description'])
 
diff --git a/src/store/modules/tasks.ts b/src/store/modules/tasks.ts
index 6588c51f7..332286917 100644
--- a/src/store/modules/tasks.ts
+++ b/src/store/modules/tasks.ts
@@ -4,22 +4,27 @@ import {formatISO} from 'date-fns'
 
 import TaskService from '@/services/task'
 import TaskAssigneeService from '@/services/taskAssignee'
-import TaskAssigneeModel from '@/models/taskAssignee'
-import LabelTaskModel from '@/models/labelTask'
 import LabelTaskService from '@/services/labelTask'
+import UserService from '@/services/user'
+
 import {HAS_TASKS} from '../mutation-types'
 import {setLoading} from '../helper'
 import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
-
 import {parseTaskText} from '@/modules/parseTaskText'
-import TaskModel, { type ITask } from '@/models/task'
+
+import TaskAssigneeModel from '@/models/taskAssignee'
+import LabelTaskModel from '@/models/labelTask'
+import TaskModel from '@/models/task'
 import LabelTask from '@/models/labelTask'
-import LabelModel, { type ILabel } from '@/models/label'
-import UserService from '@/services/user'
+import LabelModel from '@/models/label'
+
+import type {ILabel} from '@/modelTypes/ILabel'
+import type {ITask} from '@/modelTypes/ITask'
+import type { IUser } from '@/modelTypes/IUser'
+import type { IAttachment } from '@/modelTypes/IAttachment'
+import type { IList } from '@/modelTypes/IList'
+
 import type { RootStoreState, TaskState } from '@/store/types'
-import type { IUser } from '@/models/user'
-import type { IAttachment } from '@/models/attachment'
-import type { IList } from '@/models/list'
 
 // IDEA: maybe use a small fuzzy search here to prevent errors
 function findPropertyByValue(object, key, value) {
diff --git a/src/store/types.ts b/src/store/types.ts
index 96f061dca..2cc467a1e 100644
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -1,9 +1,9 @@
-import type { IBucket } from '@/models/bucket'
-import type { IUserSettings } from '@/models/userSettings'
-import type { IList } from '@/models/list'
-import type { IAttachment } from '@/models/attachment'
-import type { ILabel } from '@/models/label'
-import type { INamespace } from '@/models/namespace'
+import type { IBucket } from '@/modelTypes/IBucket'
+import type { IUserSettings } from '@/modelTypes/IUserSettings'
+import type { IList } from '@/modelTypes/IList'
+import type { IAttachment } from '@/modelTypes/IAttachment'
+import type { ILabel } from '@/modelTypes/ILabel'
+import type { INamespace } from '@/modelTypes/INamespace'
 
 export interface RootStoreState {
 	loading: boolean,
diff --git a/src/types/IFilter.ts b/src/types/IFilter.ts
new file mode 100644
index 000000000..aca000ab6
--- /dev/null
+++ b/src/types/IFilter.ts
@@ -0,0 +1,9 @@
+export interface IFilter {
+	sortBy: ('done' | 'id')[]
+	orderBy: ('asc' | 'desc')[]
+	filterBy: 'done'[]
+	filterValue: 'false'[]
+	filterComparator: 'equals'[]
+	filterConcat: 'and'
+	filterIncludeNulls: boolean
+}
\ No newline at end of file
diff --git a/src/types/IRelationKind.ts b/src/types/IRelationKind.ts
new file mode 100644
index 000000000..a9ffb3d67
--- /dev/null
+++ b/src/types/IRelationKind.ts
@@ -0,0 +1,16 @@
+export enum RELATION_KIND {
+	'SUBTASK' = 'subtask',
+	'PARENTTASK' = 'parenttask',
+	'RELATED' = 'related',
+	'DUPLICATES' = 'duplicates',
+	'BLOCKING' = 'blocking',
+	'BLOCKED' = 'blocked',
+	'PROCEDES' = 'precedes',
+	'FOLLOWS' = 'follows',
+	'COPIEDFROM' = 'copiedfrom',
+	'COPIEDTO' = 'copiedto',
+}
+	
+export type IRelationKind = typeof RELATION_KIND[keyof typeof RELATION_KIND] 
+ 
+export const RELATION_KINDS = [...Object.values(RELATION_KIND)] as const
\ No newline at end of file
diff --git a/src/types/IRepeats.ts b/src/types/IRepeatAfter.ts
similarity index 53%
rename from src/types/IRepeats.ts
rename to src/types/IRepeatAfter.ts
index e2ab90777..0b132a2f7 100644
--- a/src/types/IRepeats.ts
+++ b/src/types/IRepeatAfter.ts
@@ -6,9 +6,9 @@ export const REPEAT_TYPES = {
 	Years: 'years',
 } as const
 
-export type RepeatType = typeof REPEAT_TYPES[keyof typeof REPEAT_TYPES]
+export type IRepeatType = typeof REPEAT_TYPES[keyof typeof REPEAT_TYPES]
 
-export interface IRepeats {
-	type: RepeatType,
+export interface IRepeatAfter {
+	type: IRepeatType,
 	amount: number,
 }
\ No newline at end of file
diff --git a/src/types/IRepeatMode.ts b/src/types/IRepeatMode.ts
new file mode 100644
index 000000000..46297ff72
--- /dev/null
+++ b/src/types/IRepeatMode.ts
@@ -0,0 +1,7 @@
+export const TASK_REPEAT_MODES = {
+	'REPEAT_MODE_DEFAULT': 0,
+	'REPEAT_MODE_MONTH': 1,
+	'REPEAT_MODE_FROM_CURRENT_DATE': 2,
+} as const
+
+export type IRepeatMode = typeof TASK_REPEAT_MODES[keyof typeof TASK_REPEAT_MODES] 
diff --git a/src/views/list/ListList.vue b/src/views/list/ListList.vue
index 6c018fe13..b5ef4aa5f 100644
--- a/src/views/list/ListList.vue
+++ b/src/views/list/ListList.vue
@@ -156,7 +156,7 @@ import {calculateItemPosition} from '../../helpers/calculateItemPosition'
 import type { ITask } from '@/models/task'
 
 function sortTasks(tasks: ITask[]) {
-	if (tasks === null || tasks === []) {
+	if (tasks === null || Array.isArray(tasks) && tasks.length === 0) {
 		return
 	}
 	return tasks.sort((a, b) => {
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index 5497ba347..08a6c4025 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -170,6 +170,7 @@ import {useStore} from '@/store'
 import TeamService from '@/services/team'
 import TeamMemberService from '@/services/teamMember'
 import UserService from '@/services/user'
+
 import {RIGHTS as Rights} from '@/constants/rights'
 
 import Multiselect from '@/components/input/multiselect.vue'

From 49f3b928cbc16031cf65fa3ed1cc908968e1083b Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Mon, 5 Sep 2022 18:32:42 +0200
Subject: [PATCH 27/32] chore: minor fixes

---
 src/components/tasks/partials/editAssignees.vue | 2 +-
 src/components/tasks/partials/editLabels.vue    | 3 ++-
 src/store/modules/auth.ts                       | 2 +-
 src/store/modules/kanban.ts                     | 4 ++--
 src/views/list/settings/duplicate.vue           | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/tasks/partials/editAssignees.vue b/src/components/tasks/partials/editAssignees.vue
index 226e8016d..bb21fd571 100644
--- a/src/components/tasks/partials/editAssignees.vue
+++ b/src/components/tasks/partials/editAssignees.vue
@@ -39,7 +39,7 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import {includesById} from '@/helpers/utils'
 import ListUserService from '@/services/listUsers'
 import {success} from '@/message'
-import type { IUser } from '@/models/user'
+import type { IUser } from '@/modelTypes/IUser'
 
 const props = defineProps({
 		taskId: {
diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue
index 9a96ed56f..ae99693f3 100644
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@@ -43,12 +43,13 @@ import {type PropType, ref, computed, shallowReactive, watch} from 'vue'
 import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
-import LabelModel, { type ILabel } from '@/models/label'
+import LabelModel from '@/models/label'
 import LabelTaskService from '@/services/labelTask'
 import {success} from '@/message'
 
 import BaseButton from '@/components/base/BaseButton.vue'
 import Multiselect from '@/components/input/multiselect.vue'
+import type { ILabel } from '@/modelTypes/ILabel'
 
 const props = defineProps({
 	modelValue: {
diff --git a/src/store/modules/auth.ts b/src/store/modules/auth.ts
index c101381ca..2e6249109 100644
--- a/src/store/modules/auth.ts
+++ b/src/store/modules/auth.ts
@@ -15,7 +15,7 @@ import {AUTH_TYPES} from '@/store/types'
 import type { IUserSettings } from '@/modelTypes/IUserSettings'
 
 
-const defaultSettings = settings => {
+function defaultSettings(settings: Partial<IUserSettings>) {
 	if (typeof settings.weekStart === 'undefined' || settings.weekStart === '') {
 		settings.weekStart = 0
 	}
diff --git a/src/store/modules/kanban.ts b/src/store/modules/kanban.ts
index 194121309..0f302eb0b 100644
--- a/src/store/modules/kanban.ts
+++ b/src/store/modules/kanban.ts
@@ -222,11 +222,11 @@ const kanbanStore : Module<KanbanState, RootStoreState> = {
 
 	getters: {
 		getBucketById(state) {
-			return (bucketId) => findById(state.buckets, bucketId)
+			return (bucketId: IBucket['id']) => findById(state.buckets, bucketId)
 		},
 
 		getTaskById(state) {
-			return (id) => {
+			return (id: ITask['id']) => {
 				const { bucketIndex, taskIndex } = getTaskIndicesById(state, id)
 
 				
diff --git a/src/views/list/settings/duplicate.vue b/src/views/list/settings/duplicate.vue
index 2cfe5c52a..0752a78ec 100644
--- a/src/views/list/settings/duplicate.vue
+++ b/src/views/list/settings/duplicate.vue
@@ -30,7 +30,7 @@ import CreateEdit from '@/components/misc/create-edit.vue'
 import Multiselect from '@/components/input/multiselect.vue'
 
 import ListDuplicateModel from '@/models/listDuplicateModel'
-import type {INamespace} from '@/models/namespace'
+import type {INamespace} from '@/modelTypes/INamespace'
 
 import {success} from '@/message'
 import {useTitle} from '@/composables/useTitle'

From 9616badc33173483e0b5cc0c99655e0c9a4907f9 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Mon, 5 Sep 2022 15:47:18 +0200
Subject: [PATCH 28/32] fix: don't push a select event when nothing was
 selected

---
 src/components/tasks/partials/listSearch.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue
index ccfedd79f..2b48f716f 100644
--- a/src/components/tasks/partials/listSearch.vue
+++ b/src/components/tasks/partials/listSearch.vue
@@ -55,6 +55,9 @@ function findLists(query: string) {
 }
 
 function select(l: IList | null) {
+	if (l === null) {
+		return
+	}
 	Object.assign(list, l)
 	emit('update:modelValue', list)
 }

From c06b781837c66174be41f40c967fbfcbcc35495e Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Mon, 5 Sep 2022 15:49:21 +0200
Subject: [PATCH 29/32] fix: don't try to set the bucket of a task when it was
 moved to a new list

---
 src/store/modules/kanban.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/store/modules/kanban.ts b/src/store/modules/kanban.ts
index 0f302eb0b..df09d46cf 100644
--- a/src/store/modules/kanban.ts
+++ b/src/store/modules/kanban.ts
@@ -30,6 +30,9 @@ function getTaskIndicesById(state: KanbanState, taskId: ITask['id']) {
 
 const addTaskToBucketAndSort = (state: KanbanState, task: ITask) => {
 	const bucketIndex = findIndexById(state.buckets, task.bucketId)
+	if(typeof state.buckets[bucketIndex] === 'undefined') {
+		return
+	}
 	state.buckets[bucketIndex].tasks.push(task)
 	state.buckets[bucketIndex].tasks.sort((a, b) => a.kanbanPosition > b.kanbanPosition ? 1 : -1)
 }

From b4cba6f7d96334b46e5e2d6be5ac87432b01f0c0 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Mon, 5 Sep 2022 18:06:55 +0200
Subject: [PATCH 30/32] fix: mutation error in TaskDetailView

---
 src/views/tasks/TaskDetailView.vue | 51 +++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 18f141e86..903ca84d8 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -423,6 +423,7 @@
 
 <script lang="ts">
 import {defineComponent} from 'vue'
+import cloneDeep from 'lodash.clonedeep'
 
 import TaskService from '../../services/task'
 import TaskModel, { type ITask } from '@/models/task'
@@ -639,7 +640,23 @@ export default defineComponent({
 			this.activeFields.attachments = this.task.attachments.length > 0
 			this.activeFields.relatedTasks = Object.keys(this.task.relatedTasks).length > 0
 		},
-		async saveTask(showNotification = true, undoCallback = null) {
+		async saveTask(args?: {
+			task: ITask,
+			showNotification?: boolean,
+			undoCallback?: () => void,
+		}) {
+			const {
+				task,
+				showNotification,
+				undoCallback,
+			} = {
+				...{
+					task: cloneDeep(this.task),
+					showNotification: true,
+				},
+				...args,
+			}
+
 			if (!this.canWrite) {
 				return
 			}
@@ -648,22 +665,23 @@ export default defineComponent({
 			// setting the due date on mobile which leads to no due date change being saved.
 			await this.$nextTick()
 
-			this.task.hexColor = this.taskColor
+
+			task.hexColor = this.taskColor
 
 			// If no end date is being set, but a start date and due date,
 			// use the due date as the end date
-			if (this.task.endDate === null && this.task.startDate !== null && this.task.dueDate !== null) {
-				this.task.endDate = this.task.dueDate
+			if (task.endDate === null && task.startDate !== null && task.dueDate !== null) {
+				task.endDate = task.dueDate
 			}
 
-			this.task = await this.$store.dispatch('tasks/update', this.task)
+			this.task = await this.$store.dispatch('tasks/update', task)
 
 			if (!showNotification) {
 				return
 			}
 
 			let actions = []
-			if (undoCallback !== null) {
+			if (undoCallback !== undefined) {
 				actions = [{
 					title: 'Undo',
 					callback: undoCallback,
@@ -694,19 +712,28 @@ export default defineComponent({
 		},
 
 		toggleTaskDone() {
-			this.task.done = !this.task.done
-
-			if (this.task.done) {
+			const newTask = {
+				...this.task,
+				done: !this.task.done,
+			}
+			if (newTask.done) {
 				playPop()
 			}
 
-			this.saveTask(true, this.toggleTaskDone)
+			this.saveTask({
+				task: newTask,
+				undoCallback: this.toggleTaskDone,
+			})
 		},
 
 		async changeList(list: IList) {
 			this.$store.commit('kanban/removeTaskInBucket', this.task)
-			this.task.listId = list.id
-			await this.saveTask()
+			await this.saveTask({
+				task: {
+					...this.task,
+					listId: list.id,
+				},
+			})
 		},
 
 		async toggleFavorite() {

From 878b5bf236f7d1ddc9825d8dca8415313b08fd94 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Tue, 16 Aug 2022 20:18:42 +0200
Subject: [PATCH 31/32] fix: defaultListId

---
 src/views/Home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index b8cf712d1..fe34d2056 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -89,7 +89,7 @@ const listHistory = computed(() => {
 const migratorsEnabled = computed(() => store.state.config.availableMigrators?.length > 0)
 const userInfo = computed(() => store.state.auth.info)
 const hasTasks = computed(() => store.state.hasTasks)
-const defaultListId = computed(() => store.state.auth.defaultListId)
+const defaultListId = computed(() => store.state.auth.settings.defaultListId)
 const defaultNamespaceId = computed(() => store.state.namespaces.namespaces?.[0]?.id || 0)
 const hasLists = computed(() => store.state.namespaces.namespaces?.[0]?.lists.length > 0)
 const loading = computed(() => store.state.loading && store.state.loadingModule === 'tasks')

From 54de368642519fc900ce89e4ee38989555054a05 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Mon, 5 Sep 2022 18:56:37 +0200
Subject: [PATCH 32/32] fix: use typed useStore

---
 src/composables/useList.ts             | 2 +-
 src/views/list/settings/background.vue | 2 +-
 src/views/list/settings/edit.vue       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/composables/useList.ts b/src/composables/useList.ts
index 6db3ad1d5..e372da3cb 100644
--- a/src/composables/useList.ts
+++ b/src/composables/useList.ts
@@ -1,6 +1,6 @@
 import {watch, reactive, shallowReactive, unref, toRefs, readonly} from 'vue'
 import type {MaybeRef} from '@vueuse/core'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 
 import ListService from '@/services/list'
 import ListModel from '@/models/list'
diff --git a/src/views/list/settings/background.vue b/src/views/list/settings/background.vue
index 16a1c10bf..3a5fd95cd 100644
--- a/src/views/list/settings/background.vue
+++ b/src/views/list/settings/background.vue
@@ -101,7 +101,7 @@ export default defineComponent({ name: 'list-setting-background' })
 <script setup lang="ts">
 import {ref, computed, shallowReactive} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useRoute, useRouter} from 'vue-router'
 import debounce from 'lodash.debounce'
 import BaseButton from '@/components/base/BaseButton.vue'
diff --git a/src/views/list/settings/edit.vue b/src/views/list/settings/edit.vue
index 8b7ab391e..c45b21a8e 100644
--- a/src/views/list/settings/edit.vue
+++ b/src/views/list/settings/edit.vue
@@ -72,7 +72,7 @@ export default { name: 'list-setting-edit' }
 <script setup lang="ts">
 import type {PropType} from 'vue'
 import {useRouter} from 'vue-router'
-import {useStore} from 'vuex'
+import {useStore} from '@/store'
 import {useI18n} from 'vue-i18n'
 
 import Editor from '@/components/input/AsyncEditor'
@@ -80,7 +80,7 @@ import ColorPicker from '@/components/input/colorPicker.vue'
 import CreateEdit from '@/components/misc/create-edit.vue'
 
 import {CURRENT_LIST} from '@/store/mutation-types'
-import type { IList } from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 
 import { useList } from '@/composables/useList'
 import { useTitle } from '@/composables/useTitle'