From bc73d75a9b6eb11938ac3e4f2ebff1e068ee7cd1 Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Sun, 4 Jul 2021 13:10:30 +0000
Subject: [PATCH 01/40] Update dependency eslint to v7.30.0 (#571)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/571
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 package.json |  2 +-
 yarn.lock    | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fa5c94185..567385edb 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "babel-eslint": "10.1.0",
     "cypress": "7.6.0",
     "cypress-file-upload": "5.0.8",
-    "eslint": "7.29.0",
+    "eslint": "7.30.0",
     "eslint-plugin-vue": "7.12.1",
     "faker": "5.5.3",
     "jest": "27.0.6",
diff --git a/yarn.lock b/yarn.lock
index f6680fe7f..f3d43357c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1796,6 +1796,20 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
+"@humanwhocodes/config-array@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
+  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.0"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
+  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+
 "@intervolga/optimize-cssnano-plugin@^1.0.5":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz#be7c7846128b88f6a9b1d1261a0ad06eb5c0fdf8"
@@ -6215,13 +6229,14 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@7.29.0:
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"
-  integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==
+eslint@7.30.0:
+  version "7.30.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.30.0.tgz#6d34ab51aaa56112fd97166226c9a97f505474f8"
+  integrity sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==
   dependencies:
     "@babel/code-frame" "7.12.11"
     "@eslint/eslintrc" "^0.4.2"
+    "@humanwhocodes/config-array" "^0.5.0"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"

From c8209c6c104e96a1b45776ba3a3e2582d903c9ad Mon Sep 17 00:00:00 2001
From: konrad <konrad@kola-entertainments.de>
Date: Mon, 5 Jul 2021 10:29:04 +0000
Subject: [PATCH 02/40] Quick add magic for tasks (#570)

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/570
Co-authored-by: konrad <konrad@kola-entertainments.de>
Co-committed-by: konrad <konrad@kola-entertainments.de>
---
 src/components/misc/keyboard-shortcuts.vue    |   2 +-
 src/components/modal/modal.vue                |   4 +-
 .../quick-actions/quick-actions.vue           |  22 +-
 src/components/tasks/mixins/createTask.js     | 124 ++++++
 .../tasks/partials/quick-add-magic.vue        |  82 ++++
 src/helpers/parseDateOrNull.js                |   4 +
 src/helpers/parseTaskText.js                  | 103 +++++
 src/helpers/parseTaskText.test.js             | 409 ++++++++++++++++++
 src/helpers/replaceAll.js                     |  15 +
 src/helpers/time/parseDate.js                 | 290 +++++++++++++
 src/i18n/lang/en.json                         |  22 +
 src/store/modules/lists.js                    |   6 +
 src/styles/components/_all.scss               |   1 +
 src/styles/components/hint-modal.scss         |  43 ++
 src/styles/components/keyboard-shortcuts.scss |  39 --
 src/views/filters/CreateSavedFilter.vue       |   2 +-
 src/views/list/views/Kanban.vue               |  32 +-
 src/views/list/views/List.vue                 | 156 +------
 18 files changed, 1136 insertions(+), 220 deletions(-)
 create mode 100644 src/components/tasks/mixins/createTask.js
 create mode 100644 src/components/tasks/partials/quick-add-magic.vue
 create mode 100644 src/helpers/parseTaskText.js
 create mode 100644 src/helpers/parseTaskText.test.js
 create mode 100644 src/helpers/replaceAll.js
 create mode 100644 src/helpers/time/parseDate.js
 create mode 100644 src/styles/components/hint-modal.scss

diff --git a/src/components/misc/keyboard-shortcuts.vue b/src/components/misc/keyboard-shortcuts.vue
index d0fb9d447..d87a005df 100644
--- a/src/components/misc/keyboard-shortcuts.vue
+++ b/src/components/misc/keyboard-shortcuts.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="modal-mask keyboard-shortcuts-modal">
+	<div class="modal-mask hint-modal">
 		<div @click.self="close()" class="modal-container">
 			<div class="modal-content">
 				<card class="has-background-white has-no-shadow" :title="$t('keyboardShortcuts.title')">
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 4f0057ccd..0ce9880dc 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -1,7 +1,7 @@
 <template>
 	<transition name="modal">
-		<div class="modal-mask">
-			<div class="modal-container" @mousedown.self.prevent.stop="$emit('close')">
+		<div class="modal-mask has-overflow" :class="{'has-overflow': overflow}">
+			<div class="modal-container" @mousedown.self.prevent.stop="$emit('close')" :class="{'has-overflow': overflow}">
 				<div class="modal-content" :class="{'has-overflow': overflow, 'is-wide': wide}">
 					<slot>
 						<div class="header">
diff --git a/src/components/quick-actions/quick-actions.vue b/src/components/quick-actions/quick-actions.vue
index db9193811..633c6e083 100644
--- a/src/components/quick-actions/quick-actions.vue
+++ b/src/components/quick-actions/quick-actions.vue
@@ -1,5 +1,5 @@
 <template>
-	<modal v-if="active" class="quick-actions" @close="closeQuickActions">
+	<modal v-if="active" class="quick-actions" @close="closeQuickActions" :overflow="isNewTaskCommand">
 		<div class="card">
 			<div class="action-input" :class="{'has-active-cmd': selectedCmd !== null}">
 				<div class="active-cmd tag" v-if="selectedCmd !== null">
@@ -20,10 +20,12 @@
 				/>
 			</div>
 
-			<div class="help has-text-grey-light p-2" v-if="hintText !== ''">
+			<div class="help has-text-grey-light p-2" v-if="hintText !== '' && !isNewTaskCommand">
 				{{ hintText }}
 			</div>
 
+			<quick-add-magic class="p-2 modal-container-smaller" v-if="isNewTaskCommand"/>
+
 			<div class="results" v-if="selectedCmd === null">
 				<div v-for="(r, k) in results" :key="k" class="result">
 					<span class="result-title">
@@ -53,12 +55,13 @@
 import TaskService from '@/services/task'
 import TeamService from '@/services/team'
 
-import TaskModel from '@/models/task'
 import NamespaceModel from '@/models/namespace'
 import TeamModel from '@/models/team'
 
 import {CURRENT_LIST, LOADING, LOADING_MODULE, QUICK_ACTIONS_ACTIVE} from '@/store/mutation-types'
 import ListModel from '@/models/list'
+import createTask from '@/components/tasks/mixins/createTask'
+import QuickAddMagic from '@/components/tasks/partials/quick-add-magic'
 
 const TYPE_LIST = 'list'
 const TYPE_TASK = 'task'
@@ -77,6 +80,7 @@ const SEARCH_MODE_TEAMS = 'teams'
 
 export default {
 	name: 'quick-actions',
+	components: {QuickAddMagic},
 	data() {
 		return {
 			query: '',
@@ -91,6 +95,9 @@ export default {
 			teamService: null,
 		}
 	},
+	mixins: [
+		createTask,
+	],
 	computed: {
 		active() {
 			const active = this.$store.state[QUICK_ACTIONS_ACTIVE]
@@ -222,6 +229,9 @@ export default {
 
 			return SEARCH_MODE_ALL
 		},
+		isNewTaskCommand() {
+			return this.selectedCmd !== null && this.selectedCmd.action === CMD_NEW_TASK
+		},
 	},
 	created() {
 		this.taskService = new TaskService()
@@ -348,11 +358,7 @@ export default {
 				return
 			}
 
-			const newTask = new TaskModel({
-				title: this.query,
-				listId: this.currentList.id,
-			})
-			this.taskService.create(newTask)
+			this.createNewTask(this.query, 0, this.currentList.id)
 				.then(r => {
 					this.success({message: this.$t('task.createSuccess')})
 					this.$router.push({name: 'task.detail', params: {id: r.id}})
diff --git a/src/components/tasks/mixins/createTask.js b/src/components/tasks/mixins/createTask.js
new file mode 100644
index 000000000..2b7b8c8d3
--- /dev/null
+++ b/src/components/tasks/mixins/createTask.js
@@ -0,0 +1,124 @@
+import {parseTaskText} from '@/helpers/parseTaskText'
+import TaskModel from '@/models/task'
+import {formatISO} from 'date-fns'
+import LabelTask from '@/models/labelTask'
+import LabelModel from '@/models/label'
+import LabelTaskService from '@/services/labelTask'
+import {mapState} from 'vuex'
+import UserService from '@/services/user'
+
+export default {
+	data() {
+		return {
+			labelTaskService: LabelTaskService,
+			userService: UserService,
+		}
+	},
+	created() {
+		this.labelTaskService = new LabelTaskService()
+		this.userService = new UserService()
+	},
+	computed: mapState({
+		labels: state => state.labels.labels,
+	}),
+	methods: {
+		createNewTask(newTaskTitle, bucketId = 0, lId = 0) {
+			const parsedTask = parseTaskText(newTaskTitle)
+			const assignees = []
+
+			let listId = null
+			if (parsedTask.list !== null) {
+				const list = this.$store.getters['lists/findListByExactname'](parsedTask.list)
+				listId = list === null ? null : list.id
+			}
+			if (listId === null) {
+				listId = lId !== 0 ? lId : this.$route.params.listId
+			}
+
+			// Separate closure because we need to wait for the results of the user search if users were entered in the
+			// task create request. Because _that_ happens in a promise, we'll need something to call when it resolves.
+			const createTask = () => {
+				const task = new TaskModel({
+					title: parsedTask.text,
+					listId: listId,
+					dueDate: parsedTask.date !== null ? formatISO(parsedTask.date) : null, // I don't know why, but it all goes up in flames when I just pass in the date normally.
+					priority: parsedTask.priority,
+					assignees: assignees,
+					bucketId: bucketId,
+				})
+				return this.taskService.create(task)
+					.then(task => {
+
+						if (parsedTask.labels.length > 0) {
+
+							const labelAddsToWaitFor = []
+
+							const addLabelToTask = label => {
+								const labelTask = new LabelTask({
+									taskId: task.id,
+									labelId: label.id,
+								})
+								return this.labelTaskService.create(labelTask)
+									.then(result => {
+										task.labels.push(label)
+										return Promise.resolve(result)
+									})
+									.catch(e => Promise.reject(e))
+							}
+
+							// Then do everything that is involved in finding, creating and adding the label to the task
+							parsedTask.labels.forEach(labelTitle => {
+								// Check if the label exists
+								const label = Object.values(this.labels).find(l => {
+									return l.title.toLowerCase() === labelTitle.toLowerCase()
+								})
+
+								// Label found, use it
+								if (typeof label !== 'undefined') {
+									labelAddsToWaitFor.push(addLabelToTask(label))
+								} else {
+									// label not found, create it
+									const label = new LabelModel({title: labelTitle})
+									labelAddsToWaitFor.push(this.$store.dispatch('labels/createLabel', label)
+										.then(res => {
+											return addLabelToTask(res)
+										})
+										.catch(e => Promise.reject(e))
+									)
+								}
+							})
+
+							// This waits until all labels are created and added to the task
+							return Promise.all(labelAddsToWaitFor)
+								.then(() => {
+									return Promise.resolve(task)
+								})
+						}
+
+						return Promise.resolve(task)
+					})
+					.catch(e => Promise.reject(e))
+			}
+
+			if (parsedTask.assignees.length > 0) {
+				const searches = []
+				parsedTask.assignees.forEach(a => {
+					searches.push(this.userService.getAll({}, {s: a})
+						.then(users => {
+							const user = users.find(u => u.username.toLowerCase() === a.toLowerCase())
+							if (typeof user !== 'undefined') {
+								assignees.push(user)
+							}
+							return Promise.resolve(users)
+						})
+					)
+				})
+
+				return Promise.all(searches)
+					.then(() => createTask())
+			}
+
+			return createTask()
+		},
+	},
+}
diff --git a/src/components/tasks/partials/quick-add-magic.vue b/src/components/tasks/partials/quick-add-magic.vue
new file mode 100644
index 000000000..172d41afa
--- /dev/null
+++ b/src/components/tasks/partials/quick-add-magic.vue
@@ -0,0 +1,82 @@
+<template>
+	<div>
+		<p class="help has-text-grey">
+			{{ $t('task.quickAddMagic.hint') }}.
+			<a @click="() => visible = true">{{ $t('task.quickAddMagic.what') }}</a>
+		</p>
+		<transition name="fade">
+			<div class="modal-mask hint-modal" v-if="visible">
+				<div @click.self="() => visible = false" class="modal-container">
+					<div class="modal-content">
+						<card class="has-background-white has-no-shadow" :title="$t('task.quickAddMagic.title')">
+							<p>{{ $t('task.quickAddMagic.intro') }}</p>
+
+							<h3>{{ $t('task.attributes.labels') }}</h3>
+							<p>
+								{{ $t('task.quickAddMagic.label1', {prefix: '~'}) }}
+								{{ $t('task.quickAddMagic.label2') }}
+								{{ $t('task.quickAddMagic.multiple') }}
+							</p>
+							<p>
+								{{ $t('task.quickAddMagic.label3') }}
+								{{ $t('task.quickAddMagic.label4', {prefix: '~'}) }}
+							</p>
+
+							<h3>{{ $t('task.attributes.priority') }}</h3>
+							<p>
+								{{ $t('task.quickAddMagic.priority1', {prefix: '!'}) }}
+								{{ $t('task.quickAddMagic.priority2') }}
+							</p>
+
+							<h3>{{ $t('task.attributes.assignees') }}</h3>
+							<p>
+								{{ $t('task.quickAddMagic.assignees') }}
+								{{ $t('task.quickAddMagic.multiple') }}
+							</p>
+
+							<h3>{{ $t('list.list.title') }}</h3>
+							<p>
+								{{ $t('task.quickAddMagic.list1', {prefix: '*'}) }}
+								{{ $t('task.quickAddMagic.list2') }}
+							</p>
+
+							<h3>{{ $t('task.quickAddMagic.dateAndTime') }}</h3>
+							<p>
+								{{ $t('task.quickAddMagic.date') }}
+							</p>
+							<ul>
+								<!-- Not localized because these only work in english -->
+								<li>Today</li>
+								<li>Tomorrow</li>
+								<li>Next monday</li>
+								<li>This weekend</li>
+								<li>Later this week</li>
+								<li>Later next week</li>
+								<li>Next week</li>
+								<li>Next month</li>
+								<li>End of month</li>
+								<li>In 5 days [hours/weeks/months]</li>
+								<li>Tuesday ({{ $t('task.quickAddMagic.dateWeekday') }})</li>
+								<li>17/02/2021</li>
+								<li>Feb 17 ({{ $t('task.quickAddMagic.dateCurrentYear') }})</li>
+								<li>17th ({{ $t('task.quickAddMagic.dateNth', {day: '17'}) }})</li>
+							</ul>
+							<p>{{ $t('task.quickAddMagic.dateTime', {time: 'at 17:00', timePM: '5pm'}) }}</p>
+						</card>
+					</div>
+				</div>
+			</div>
+		</transition>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'quick-add-magic',
+	data() {
+		return {
+			visible: false,
+		}
+	},
+}
+</script>
diff --git a/src/helpers/parseDateOrNull.js b/src/helpers/parseDateOrNull.js
index 08022e8a8..7fd1cf280 100644
--- a/src/helpers/parseDateOrNull.js
+++ b/src/helpers/parseDateOrNull.js
@@ -1,4 +1,8 @@
 export const parseDateOrNull = date => {
+	if (date instanceof Date) {
+		return date
+	}
+
 	if (date && !date.startsWith('0001')) {
 		return new Date(date)
 	}
diff --git a/src/helpers/parseTaskText.js b/src/helpers/parseTaskText.js
new file mode 100644
index 000000000..0039a6d80
--- /dev/null
+++ b/src/helpers/parseTaskText.js
@@ -0,0 +1,103 @@
+import {parseDate} from './time/parseDate'
+import priorities from '../models/priorities.json'
+
+const LABEL_PREFIX = '~'
+const LIST_PREFIX = '*'
+const PRIORITY_PREFIX = '!'
+const ASSIGNEE_PREFIX = '@'
+
+/**
+ * Parses task text for dates, assignees, labels, lists, priorities and returns an object with all found intents.
+ *
+ * @param text
+ */
+export const parseTaskText = text => {
+	const result = {
+		text: text,
+		date: null,
+		labels: [],
+		list: null,
+		priority: null,
+		assignees: [],
+	}
+
+	result.labels = getItemsFromPrefix(text, LABEL_PREFIX)
+
+	const lists = getItemsFromPrefix(text, LIST_PREFIX)
+	result.list = lists.length > 0 ? lists[0] : null
+
+	result.priority = getPriority(text)
+
+	result.assignees = getItemsFromPrefix(text, ASSIGNEE_PREFIX)
+
+	const {newText, date} = parseDate(text)
+	result.text = newText
+	result.date = date
+
+	return cleanupResult(result)
+}
+
+const getItemsFromPrefix = (text, prefix) => {
+	const items = []
+
+	const itemParts = text.split(prefix)
+	itemParts.forEach((p, index) => {
+		// First part contains the rest
+		if (index < 1) {
+			return
+		}
+
+		let labelText
+		if (p.charAt(0) === `'`) {
+			labelText = p.split(`'`)[1]
+		} else if (p.charAt(0) === `"`) {
+			labelText = p.split(`"`)[1]
+		} else {
+			// Only until the next space
+			labelText = p.split(' ')[0]
+		}
+		items.push(labelText)
+	})
+
+	return Array.from(new Set(items))
+}
+
+const getPriority = text => {
+	const ps = getItemsFromPrefix(text, PRIORITY_PREFIX)
+	if (ps.length === 0) {
+		return null
+	}
+
+	for (const p of ps) {
+		for (const pi in priorities) {
+			if (priorities[pi] === parseInt(p)) {
+				return parseInt(p)
+			}
+		}
+	}
+
+	return null
+}
+
+const cleanupItemText = (text, items, prefix) => {
+	items.forEach(l => {
+		text = text
+			.replace(`${prefix}'${l}' `, '')
+			.replace(`${prefix}'${l}'`, '')
+			.replace(`${prefix}"${l}" `, '')
+			.replace(`${prefix}"${l}"`, '')
+			.replace(`${prefix}${l} `, '')
+			.replace(`${prefix}${l}`, '')
+	})
+	return text
+}
+
+const cleanupResult = result => {
+	result.text = cleanupItemText(result.text, result.labels, LABEL_PREFIX)
+	result.text = cleanupItemText(result.text, [result.list], LIST_PREFIX)
+	result.text = cleanupItemText(result.text, [result.priority], PRIORITY_PREFIX)
+	result.text = cleanupItemText(result.text, result.assignees, ASSIGNEE_PREFIX)
+	result.text = result.text.trim()
+
+	return result
+}
diff --git a/src/helpers/parseTaskText.test.js b/src/helpers/parseTaskText.test.js
new file mode 100644
index 000000000..618e97223
--- /dev/null
+++ b/src/helpers/parseTaskText.test.js
@@ -0,0 +1,409 @@
+import {parseTaskText} from './parseTaskText'
+import {getDateFromText, getDateFromTextIn} from './time/parseDate'
+import {calculateDayInterval} from './time/calculateDayInterval'
+import priorities from '../models/priorities.json'
+
+describe('Parse Task Text', () => {
+	it('should return text with no intents as is', () => {
+		expect(parseTaskText('Lorem Ipsum').text).toBe('Lorem Ipsum')
+	})
+
+	describe('Date Parsing', () => {
+		it('should not return any date if none was provided', () => {
+			const result = parseTaskText('Lorem Ipsum')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.date).toBeNull()
+		})
+		it('should ignore casing', () => {
+			const result = parseTaskText('Lorem Ipsum ToDay')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const now = new Date()
+			expect(result.date.getFullYear()).toBe(now.getFullYear())
+			expect(result.date.getMonth()).toBe(now.getMonth())
+			expect(result.date.getDate()).toBe(now.getDate())
+		})
+		it('should recognize today', () => {
+			const result = parseTaskText('Lorem Ipsum today')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const now = new Date()
+			expect(result.date.getFullYear()).toBe(now.getFullYear())
+			expect(result.date.getMonth()).toBe(now.getMonth())
+			expect(result.date.getDate()).toBe(now.getDate())
+		})
+		describe('should recognize today with a time', () => {
+			const cases = {
+				'at 15:00': '15:0',
+				'@ 15:00': '15:0',
+				'at 15:30': '15:30',
+				'@ 3pm': '15:0',
+				'at 3pm': '15:0',
+				'at 3 pm': '15:0',
+				'at 3am': '3:0',
+				'at 3:12 am': '3:12',
+				'at 3:12 pm': '15:12',
+			}
+
+			for (const c in cases) {
+				it('should recognize today with a time ' + c, () => {
+					const result = parseTaskText('Lorem Ipsum today ' + c)
+
+					expect(result.text).toBe('Lorem Ipsum')
+					const now = new Date()
+					expect(result.date.getFullYear()).toBe(now.getFullYear())
+					expect(result.date.getMonth()).toBe(now.getMonth())
+					expect(result.date.getDate()).toBe(now.getDate())
+					expect(`${result.date.getHours()}:${result.date.getMinutes()}`).toBe(cases[c])
+					expect(result.date.getSeconds()).toBe(0)
+				})
+			}
+		})
+		it('should recognize tomorrow', () => {
+			const result = parseTaskText('Lorem Ipsum tomorrow')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const tomorrow = new Date()
+			tomorrow.setDate(tomorrow.getDate() + 1)
+			expect(result.date.getFullYear()).toBe(tomorrow.getFullYear())
+			expect(result.date.getMonth()).toBe(tomorrow.getMonth())
+			expect(result.date.getDate()).toBe(tomorrow.getDate())
+		})
+		it('should recognize next monday', () => {
+			const result = parseTaskText('Lorem Ipsum next monday')
+
+			const untilNextMonday = calculateDayInterval('nextMonday')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const nextMonday = new Date()
+			nextMonday.setDate(nextMonday.getDate() + untilNextMonday)
+			expect(result.date.getFullYear()).toBe(nextMonday.getFullYear())
+			expect(result.date.getMonth()).toBe(nextMonday.getMonth())
+			expect(result.date.getDate()).toBe(nextMonday.getDate())
+		})
+		it('should recognize this weekend', () => {
+			const result = parseTaskText('Lorem Ipsum this weekend')
+
+			const untilThisWeekend = calculateDayInterval('thisWeekend')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const thisWeekend = new Date()
+			thisWeekend.setDate(thisWeekend.getDate() + untilThisWeekend)
+			expect(result.date.getFullYear()).toBe(thisWeekend.getFullYear())
+			expect(result.date.getMonth()).toBe(thisWeekend.getMonth())
+			expect(result.date.getDate()).toBe(thisWeekend.getDate())
+		})
+		it('should recognize later this week', () => {
+			const result = parseTaskText('Lorem Ipsum later this week')
+
+			const untilLaterThisWeek = calculateDayInterval('laterThisWeek')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const laterThisWeek = new Date()
+			laterThisWeek.setDate(laterThisWeek.getDate() + untilLaterThisWeek)
+			expect(result.date.getFullYear()).toBe(laterThisWeek.getFullYear())
+			expect(result.date.getMonth()).toBe(laterThisWeek.getMonth())
+			expect(result.date.getDate()).toBe(laterThisWeek.getDate())
+		})
+		it('should recognize later next week', () => {
+			const result = parseTaskText('Lorem Ipsum later next week')
+
+			const untilLaterNextWeek = calculateDayInterval('laterNextWeek')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const laterNextWeek = new Date()
+			laterNextWeek.setDate(laterNextWeek.getDate() + untilLaterNextWeek)
+			expect(result.date.getFullYear()).toBe(laterNextWeek.getFullYear())
+			expect(result.date.getMonth()).toBe(laterNextWeek.getMonth())
+			expect(result.date.getDate()).toBe(laterNextWeek.getDate())
+		})
+		it('should recognize next week', () => {
+			const result = parseTaskText('Lorem Ipsum next week')
+
+			const untilNextWeek = calculateDayInterval('nextWeek')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const nextWeek = new Date()
+			nextWeek.setDate(nextWeek.getDate() + untilNextWeek)
+			expect(result.date.getFullYear()).toBe(nextWeek.getFullYear())
+			expect(result.date.getMonth()).toBe(nextWeek.getMonth())
+			expect(result.date.getDate()).toBe(nextWeek.getDate())
+		})
+		it('should recognize next month', () => {
+			const result = parseTaskText('Lorem Ipsum next month')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const nextMonth = new Date()
+			nextMonth.setDate(1)
+			nextMonth.setMonth(nextMonth.getMonth() + 1)
+			expect(result.date.getFullYear()).toBe(nextMonth.getFullYear())
+			expect(result.date.getMonth()).toBe(nextMonth.getMonth())
+			expect(result.date.getDate()).toBe(nextMonth.getDate())
+		})
+		it('should recognize a date', () => {
+			const result = parseTaskText('Lorem Ipsum 06/26/2021')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const date = new Date()
+			date.setFullYear(2021, 5, 26)
+			expect(result.date.getFullYear()).toBe(date.getFullYear())
+			expect(result.date.getMonth()).toBe(date.getMonth())
+			expect(result.date.getDate()).toBe(date.getDate())
+		})
+		it('should recognize end of month', () => {
+			const result = parseTaskText('Lorem Ipsum end of month')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const curDate = new Date()
+			const date = new Date(curDate.getFullYear(), curDate.getMonth() + 1, 0)
+			expect(result.date.getFullYear()).toBe(date.getFullYear())
+			expect(result.date.getMonth()).toBe(date.getMonth())
+			expect(result.date.getDate()).toBe(date.getDate())
+		})
+		it('should recognize weekdays', () => {
+			const result = parseTaskText('Lorem Ipsum thu')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const nextThursday = new Date()
+			nextThursday.setDate(nextThursday.getDate() + ((4 + 7 - nextThursday.getDay()) % 7))
+			expect(`${result.date.getFullYear()}-${result.date.getMonth()}-${result.date.getDate()}`).toBe(`${nextThursday.getFullYear()}-${nextThursday.getMonth()}-${nextThursday.getDate()}`)
+			expect(+new Date(result.date)).toBeGreaterThan(+new Date() - 10) // In on thursdays, this may be different by one second and thus fails the test
+		})
+		it('should recognize weekdays with time', () => {
+			const result = parseTaskText('Lorem Ipsum thu at 14:00')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			const nextThursday = new Date()
+			nextThursday.setDate(nextThursday.getDate() + ((4 + 7 - nextThursday.getDay()) % 7))
+			expect(`${result.date.getFullYear()}-${result.date.getMonth()}-${result.date.getDate()}`).toBe(`${nextThursday.getFullYear()}-${nextThursday.getMonth()}-${nextThursday.getDate()}`)
+			expect(`${result.date.getHours()}:${result.date.getMinutes()}`).toBe('14:0')
+			expect(+new Date(result.date)).toBeGreaterThan(+new Date() - 10) // In on thursdays, this may be different by one second and thus fails the test
+		})
+		it('should recognize dates of the month in the past but next month', () => {
+			const date = new Date()
+			date.setDate(date.getDate() - 1)
+			const result = parseTaskText(`Lorem Ipsum ${date.getDate()}nd`)
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.date.getDate()).toBe(date.getDate())
+			expect(result.date.getMonth()).toBe(date.getMonth() + 1)
+		})
+		it('should recognize dates of the month in the future', () => {
+			const date = new Date()
+			const result = parseTaskText(`Lorem Ipsum ${date.getDate() + 1}nd`)
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.date.getDate()).toBe(date.getDate() + 1)
+		})
+
+		describe('Parse date from text', () => {
+			const now = new Date()
+			now.setFullYear(2021, 5, 24)
+
+			const cases = {
+				'Lorem Ipsum 06/08/2021 ad': '2021-6-8',
+				'Lorem Ipsum 6/7/21 ad': '2021-6-7',
+				'27/07/2021,': null,
+				'2021/07/06,': '2021-7-6',
+				'2021-07-06': '2021-7-6',
+				'27 jan': '2022-1-27',
+				'27/1': '2022-1-27',
+				'27/01': '2022-1-27',
+				'16/12': '2021-12-16',
+				'01/27': '2022-1-27',
+				'1/27': '2022-1-27',
+				'Jan 27': '2022-1-27',
+				'jan 27': '2022-1-27',
+				'feb 21': '2022-2-21',
+				'mar 21': '2022-3-21',
+				'apr 21': '2022-4-21',
+				'may 21': '2022-5-21',
+				'jun 21': '2022-6-21',
+				'jul 21': '2021-7-21',
+				'aug 21': '2021-8-21',
+				'sep 21': '2021-9-21',
+				'oct 21': '2021-10-21',
+				'nov 21': '2021-11-21',
+				'dec 21': '2021-12-21',
+			}
+
+			for (const c in cases) {
+				it(`should parse '${c}' as '${cases[c]}'`, () => {
+					const {date} = getDateFromText(c, now)
+					if (date === null && cases[c] === null) {
+						expect(date).toBeNull()
+						return
+					}
+
+					expect(`${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`).toBe(cases[c])
+				})
+			}
+		})
+
+		describe('Parse date from text in', () => {
+			const now = new Date()
+			now.setFullYear(2021, 5, 24)
+			now.setHours(12)
+			now.setMinutes(0)
+			now.setSeconds(0)
+
+			const cases = {
+				'Lorem Ipsum in 1 hour': '2021-6-24 13:0',
+				'in 2 hours': '2021-6-24 14:0',
+				'in 1 day': '2021-6-25 12:0',
+				'in 2 days': '2021-6-26 12:0',
+				'in 1 week': '2021-7-1 12:0',
+				'in 2 weeks': '2021-7-8 12:0',
+				'in 4 weeks': '2021-7-22 12:0',
+				'in 1 month': '2021-7-24 12:0',
+				'in 3 months': '2021-9-24 12:0',
+			}
+
+			for (const c in cases) {
+				it(`should parse '${c}' as '${cases[c]}'`, () => {
+					const {date} = getDateFromTextIn(c, now)
+					if (date === null && cases[c] === null) {
+						expect(date).toBeNull()
+						return
+					}
+
+					expect(`${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} ${date.getHours()}:${date.getMinutes()}`).toBe(cases[c])
+				})
+			}
+		})
+
+	})
+
+	describe('Labels', () => {
+		it('should parse labels', () => {
+			const result = parseTaskText('Lorem Ipsum ~label1 ~label2')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.labels).toHaveLength(2)
+			expect(result.labels[0]).toBe('label1')
+			expect(result.labels[1]).toBe('label2')
+		})
+		it('should parse labels from the start', () => {
+			const result = parseTaskText('~label1 Lorem Ipsum ~label2')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.labels).toHaveLength(2)
+			expect(result.labels[0]).toBe('label1')
+			expect(result.labels[1]).toBe('label2')
+		})
+		it('should resolve duplicate labels', () => {
+			const result = parseTaskText('Lorem Ipsum ~label1 ~label1 ~label2')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.labels).toHaveLength(2)
+			expect(result.labels[0]).toBe('label1')
+			expect(result.labels[1]).toBe('label2')
+		})
+		it('should correctly parse labels with spaces in them', () => {
+			const result = parseTaskText(`Lorem ~'label with space' Ipsum`)
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.labels).toHaveLength(1)
+			expect(result.labels[0]).toBe('label with space')
+		})
+		it('should correctly parse labels with spaces in them and "', () => {
+			const result = parseTaskText('Lorem ~"label with space" Ipsum')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.labels).toHaveLength(1)
+			expect(result.labels[0]).toBe('label with space')
+		})
+	})
+
+	describe('List', () => {
+		it('should parse a list', () => {
+			const result = parseTaskText('Lorem Ipsum *list')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.list).toBe('list')
+		})
+		it('should parse a list with a space in it', () => {
+			const result = parseTaskText(`Lorem Ipsum *'list with long name'`)
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.list).toBe('list with long name')
+		})
+		it('should parse a list with a space in it and "', () => {
+			const result = parseTaskText(`Lorem Ipsum *"list with long name"`)
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.list).toBe('list with long name')
+		})
+		it('should parse only the first list', () => {
+			const result = parseTaskText(`Lorem Ipsum *list1 *list2 *list3`)
+
+			expect(result.text).toBe('Lorem Ipsum *list2 *list3')
+			expect(result.list).toBe('list1')
+		})
+	})
+
+	describe('Priority', () => {
+		for (const p in priorities) {
+			it(`should parse priority ${p}`, () => {
+				const result = parseTaskText(`Lorem Ipsum !${priorities[p]}`)
+
+				expect(result.text).toBe('Lorem Ipsum')
+				expect(result.priority).toBe(priorities[p])
+			})
+		}
+		it(`should not parse an invalid priority`, () => {
+			const result = parseTaskText(`Lorem Ipsum !9999`)
+
+			expect(result.text).toBe('Lorem Ipsum !9999')
+			expect(result.priority).toBe(null)
+		})
+		it(`should not parse an invalid priority but use the first valid one it finds`, () => {
+			const result = parseTaskText(`Lorem Ipsum !9999 !1`)
+
+			expect(result.text).toBe('Lorem Ipsum !9999')
+			expect(result.priority).toBe(1)
+		})
+	})
+
+	describe('Assignee', () => {
+		it('should parse an assignee', () => {
+			const result = parseTaskText('Lorem Ipsum @user')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.assignees).toHaveLength(1)
+			expect(result.assignees[0]).toBe('user')
+		})
+		it('should parse multiple assignees', () => {
+			const result = parseTaskText('Lorem Ipsum @user1 @user2 @user3')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.assignees).toHaveLength(3)
+			expect(result.assignees[0]).toBe('user1')
+			expect(result.assignees[1]).toBe('user2')
+			expect(result.assignees[2]).toBe('user3')
+		})
+		it('should parse avoid duplicate assignees', () => {
+			const result = parseTaskText('Lorem Ipsum @user1 @user1 @user2')
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.assignees).toHaveLength(2)
+			expect(result.assignees[0]).toBe('user1')
+			expect(result.assignees[1]).toBe('user2')
+		})
+		it('should parse an assignee with a space in it', () => {
+			const result = parseTaskText(`Lorem Ipsum @'user with long name'`)
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.assignees).toHaveLength(1)
+			expect(result.assignees[0]).toBe('user with long name')
+		})
+		it('should parse an assignee with a space in it and "', () => {
+			const result = parseTaskText(`Lorem Ipsum @"user with long name"`)
+
+			expect(result.text).toBe('Lorem Ipsum')
+			expect(result.assignees).toHaveLength(1)
+			expect(result.assignees[0]).toBe('user with long name')
+		})
+	})
+})
diff --git a/src/helpers/replaceAll.js b/src/helpers/replaceAll.js
new file mode 100644
index 000000000..db6834b17
--- /dev/null
+++ b/src/helpers/replaceAll.js
@@ -0,0 +1,15 @@
+/**
+ * This function replaces all text, no matter the case.
+ *
+ * See https://stackoverflow.com/a/7313467/10924593
+ *
+ * @parma str
+ * @param search
+ * @param replace
+ * @returns {*}
+ */
+export const replaceAll = (str, search, replace) => {
+	const esc = search.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+	const reg = new RegExp(esc, 'ig');
+	return str.replace(reg, replace);
+}
\ No newline at end of file
diff --git a/src/helpers/time/parseDate.js b/src/helpers/time/parseDate.js
new file mode 100644
index 000000000..77e7fb9ed
--- /dev/null
+++ b/src/helpers/time/parseDate.js
@@ -0,0 +1,290 @@
+import {calculateDayInterval} from './calculateDayInterval'
+import {calculateNearestHours} from './calculateNearestHours'
+import {replaceAll} from '../replaceAll'
+
+export const parseDate = text => {
+	const lowerText = text.toLowerCase()
+
+	if (lowerText.includes('today')) {
+		return addTimeToDate(text, getDateFromInterval(calculateDayInterval('today')), 'today')
+	}
+	if (lowerText.includes('tomorrow')) {
+		return addTimeToDate(text, getDateFromInterval(calculateDayInterval('tomorrow')), 'tomorrow')
+	}
+	if (lowerText.includes('next monday')) {
+		return addTimeToDate(text, getDateFromInterval(calculateDayInterval('nextMonday')), 'next monday')
+	}
+	if (lowerText.includes('this weekend')) {
+		return addTimeToDate(text, getDateFromInterval(calculateDayInterval('thisWeekend')), 'this weekend')
+	}
+	if (lowerText.includes('later this week')) {
+		return addTimeToDate(text, getDateFromInterval(calculateDayInterval('laterThisWeek')), 'later this week')
+	}
+	if (lowerText.includes('later next week')) {
+		return addTimeToDate(text, getDateFromInterval(calculateDayInterval('laterNextWeek')), 'later next week')
+	}
+	if (lowerText.includes('next week')) {
+		return addTimeToDate(text, getDateFromInterval(calculateDayInterval('nextWeek')), 'next week')
+	}
+	if (lowerText.includes('next month')) {
+		const date = new Date()
+		date.setDate(1)
+		date.setMonth(date.getMonth() + 1)
+		date.setHours(calculateNearestHours(date))
+		date.setMinutes(0)
+		date.setSeconds(0)
+
+		return addTimeToDate(text, date, 'next month')
+	}
+	if (lowerText.includes('end of month')) {
+		const curDate = new Date()
+		const date = new Date(curDate.getFullYear(), curDate.getMonth() + 1, 0)
+		date.setHours(calculateNearestHours(date))
+		date.setMinutes(0)
+		date.setSeconds(0)
+
+		return addTimeToDate(text, date, 'end of month')
+	}
+
+	let parsed = getDateFromWeekday(text)
+	if (parsed.date !== null) {
+		return addTimeToDate(text, parsed.date, parsed.foundText)
+	}
+
+	parsed = getDayFromText(text)
+	if (parsed.date !== null) {
+		return addTimeToDate(text, parsed.date, parsed.foundText)
+	}
+
+	parsed = getDateFromTextIn(text)
+	if (parsed.date !== null) {
+		return {
+			newText: replaceAll(text, parsed.foundText, ''),
+			date: parsed.date,
+		}
+	}
+
+	parsed = getDateFromText(text)
+
+	return {
+		newText: replaceAll(text, parsed.foundText, ''),
+		date: parsed.date,
+	}
+}
+
+const addTimeToDate = (text, date, match) => {
+	const matcher = new RegExp(`(${match} (at|@) )([0-9][0-9]?(:[0-9][0-9]?)?( ?(a|p)m)?)`, 'ig')
+	const results = matcher.exec(text)
+
+	if (results !== null) {
+		const time = results[3]
+		const parts = time.split(':')
+		let hours = parseInt(parts[0])
+		let minutes = 0
+		if (time.endsWith('pm')) {
+			hours += 12
+		}
+		if (parts.length > 1) {
+			minutes = parseInt(parts[1])
+		}
+
+		date.setHours(hours)
+		date.setMinutes(minutes)
+		date.setSeconds(0)
+	}
+
+	const replace = results !== null ? results[0] : match
+	return {
+		newText: replaceAll(text, replace, ''),
+		date: date,
+	}
+}
+
+export const getDateFromText = (text, now = new Date()) => {
+	const fullDateRegex = /([0-9][0-9]?\/[0-9][0-9]?\/[0-9][0-9]([0-9][0-9])?|[0-9][0-9][0-9][0-9]\/[0-9][0-9]?\/[0-9][0-9]?|[0-9][0-9][0-9][0-9]-[0-9][0-9]?-[0-9][0-9]?)/ig
+
+	// 1. Try parsing the text as a "usual" date, like 2021-06-24 or 06/24/2021
+	let results = fullDateRegex.exec(text)
+	let result = results === null ? null : results[0]
+	let foundText = result
+	let containsYear = true
+	if (result === null) {
+		// 2. Try parsing the date as something like "jan 21" or "21 jan"
+		const monthRegex = /((jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec) [0-9][0-9]?|[0-9][0-9]? (jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec))/ig
+		results = monthRegex.exec(text)
+		result = results === null ? null : `${results[0]} ${now.getFullYear()}`
+		foundText = results === null ? '' : results[0]
+		containsYear = false
+
+		if (result === null) {
+			// 3. Try parsing the date as "27/01" or "01/27"
+			const monthNumericRegex = /([0-9][0-9]?\/[0-9][0-9]?)/ig
+			results = monthNumericRegex.exec(text)
+
+			// Put the year before or after the date, depending on what works
+			result = results === null ? null : `${now.getFullYear()}/${results[0]}`
+			foundText = results === null ? '' : results[0]
+			if (isNaN(new Date(result))) {
+				result = results === null ? null : `${results[0]}/${now.getFullYear()}`
+			}
+			if (isNaN(new Date(result)) && results[0] !== null) {
+				const parts = results[0].split('/')
+				result = `${parts[1]}/${parts[0]}/${now.getFullYear()}`
+			}
+		}
+	}
+
+	if (result === null) {
+		return {
+			foundText,
+			date: null,
+		}
+	}
+
+	const date = new Date(result)
+	if (isNaN(date)) {
+		return {
+			foundText,
+			date: null,
+		}
+	}
+
+	if (!containsYear && date < now) {
+		date.setFullYear(date.getFullYear() + 1)
+	}
+
+	return {
+		foundText,
+		date,
+	}
+}
+
+export const getDateFromTextIn = (text, now = new Date()) => {
+	const regex = /(in [0-9]+ (hours?|days?|weeks?|months?))/ig
+	const results = regex.exec(text)
+	if (results === null) {
+		return {
+			foundText: '',
+			date: null,
+		}
+	}
+
+	let foundText = results[0]
+	const date = new Date(now)
+	const parts = foundText.split(' ')
+	switch (parts[2]) {
+		case 'hours':
+		case 'hour':
+			date.setHours(date.getHours() + parseInt(parts[1]))
+			break
+		case 'days':
+		case 'day':
+			date.setDate(date.getDate() + parseInt(parts[1]))
+			break
+		case 'weeks':
+		case 'week':
+			date.setDate(date.getDate() + parseInt(parts[1]) * 7)
+			break
+		case 'months':
+		case 'month':
+			date.setMonth(date.getMonth() + parseInt(parts[1]))
+			break
+	}
+
+	return {
+		foundText,
+		date,
+	}
+}
+
+const getDateFromWeekday = text => {
+	const matcher = /(mon|monday|tue|tuesday|wed|wednesday|thu|thursday|fri|friday|sat|saturday|sun|sunday)/ig
+	const results = matcher.exec(text)
+	if (results === null) {
+		return {
+			foundText: null,
+			date: null,
+		}
+	}
+
+	const date = new Date()
+	const currentDay = date.getDay()
+	let day = 0
+
+	switch (results[0]) {
+		case 'mon':
+		case 'monday':
+			day = 1
+			break
+		case 'tue':
+		case 'tuesday':
+			day = 2
+			break
+		case 'wed':
+		case 'wednesday':
+			day = 3
+			break
+		case 'thu':
+		case 'thursday':
+			day = 4
+			break
+		case 'fri':
+		case 'friday':
+			day = 5
+			break
+		case 'sat':
+		case 'saturday':
+			day = 6
+			break
+		case 'sun':
+		case 'sunday':
+			day = 0
+			break
+		default:
+			return {
+				foundText: null,
+				date: null,
+			}
+	}
+
+	const distance = (day + 7 - currentDay) % 7
+	date.setDate(date.getDate() + distance)
+
+	return {
+		foundText: results[0],
+		date: date,
+	}
+}
+
+const getDayFromText = text => {
+	const matcher = /(([1-2][0-9])|(3[01])|(0?[1-9]))(st|nd|rd|th|\.)/ig
+	const results = matcher.exec(text)
+	if (results === null) {
+		return {
+			foundText: null,
+			date: null,
+		}
+	}
+
+	const date = new Date()
+	date.setDate(parseInt(results[0]))
+
+	if (date < new Date()) {
+		date.setMonth(date.getMonth() + 1)
+	}
+
+	return {
+		foundText: results[0],
+		date: date,
+	}
+}
+
+const getDateFromInterval = interval => {
+	const newDate = new Date()
+	newDate.setDate(newDate.getDate() + interval)
+	newDate.setHours(calculateNearestHours(newDate))
+	newDate.setMinutes(0)
+	newDate.setSeconds(0)
+
+	return newDate
+}
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 87d1091f9..f7ba7f71f 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -597,6 +597,28 @@
       "weeks": "Weeks",
       "months": "Months",
       "years": "Years"
+    },
+    "quickAddMagic": {
+      "hint": "You can use Quick Add Magic",
+      "what": "What?",
+      "title": "Quick Add Magic",
+      "intro": "When creating a task, you can use special keywords to directly add attributes to the newly created task. This allows to add commonly used attributes to tasks much faster.",
+      "multiple": "You can use this multiple times.",
+      "label1": "To add a label, simply prefix the name of the label with {prefix}.",
+      "label2": "Vikunja will first check if the label already exist and create it if not.",
+      "label3": "To use spaces, simply add a \" around the label name.",
+      "label4": "For example: {prefix}\"Label with spaces\".",
+      "priority1": "To set a task's priority, add a number 1-5, prefixed with a {prefix}.",
+      "priority2": "The higher the number, the higher the priority.",
+      "assignees": "To directly assign the task to a user, add their username prefixed with @ to the task.",
+      "list1": "To set a list for the task to appear in, enter its name prefixed with {prefix}.",
+      "list2": "This will return an error if the list does not exist.",
+      "dateAndTime": "Date and time",
+      "date": "Any date will be used as the due date of the new task. You can use dates in any of these formats:",
+      "dateWeekday": "any weekday, will use the next date with that date",
+      "dateCurrentYear": "will use the current year",
+      "dateNth": "will use the {day}th of the current month",
+      "dateTime": "Combine any of the date formats with \"{time}\" (or {timePM}) to set a time."
     }
   },
   "team": {
diff --git a/src/store/modules/lists.js b/src/store/modules/lists.js
index ace651f69..cd088b86a 100644
--- a/src/store/modules/lists.js
+++ b/src/store/modules/lists.js
@@ -25,6 +25,12 @@ export default {
 			}
 			return null
 		},
+		findListByExactname: state => name => {
+			const list = Object.values(state).find(l => {
+				return l.title.toLowerCase() === name.toLowerCase()
+			})
+			return typeof list === 'undefined' ? null : list
+		},
 	},
 	actions: {
 		toggleListFavorite(ctx, list) {
diff --git a/src/styles/components/_all.scss b/src/styles/components/_all.scss
index b870f9648..5895a11fe 100644
--- a/src/styles/components/_all.scss
+++ b/src/styles/components/_all.scss
@@ -24,3 +24,4 @@
 @import 'datepicker';
 @import 'notifications';
 @import 'quick-actions';
+@import 'hint-modal';
diff --git a/src/styles/components/hint-modal.scss b/src/styles/components/hint-modal.scss
new file mode 100644
index 000000000..e82b32d28
--- /dev/null
+++ b/src/styles/components/hint-modal.scss
@@ -0,0 +1,43 @@
+.hint-modal {
+	z-index: 4600;
+
+	.card-content {
+		text-align: left;
+
+		.info {
+			font-style: italic;
+		}
+
+		p {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.shortcuts {
+				display: flex;
+				align-items: center;
+
+				i {
+					padding: 0 .25rem;
+				}
+
+				span {
+					padding: .1rem .35rem;
+					border: 1px solid $grey-300;
+					background: $grey-100;
+					border-radius: 3px;
+					font-size: .75rem;
+				}
+			}
+		}
+
+		.message-body {
+			padding: .5rem .75rem;
+		}
+	}
+}
+
+.modal-container-smaller .hint-modal .modal-container {
+	height: calc(100vh - 5rem);
+}
+
diff --git a/src/styles/components/keyboard-shortcuts.scss b/src/styles/components/keyboard-shortcuts.scss
index 892fb07c9..93b3f9e4c 100644
--- a/src/styles/components/keyboard-shortcuts.scss
+++ b/src/styles/components/keyboard-shortcuts.scss
@@ -7,42 +7,3 @@
   color: $grey-500;
   transition: color $transition;
 }
-
-.keyboard-shortcuts-modal {
-  z-index: 4600;
-
-  .card-content {
-    text-align: left;
-
-    .info {
-      font-style: italic;
-    }
-
-    p {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .shortcuts {
-        display: flex;
-        align-items: center;
-
-        i {
-          padding: 0 .25rem;
-        }
-
-        span {
-          padding: .1rem .35rem;
-          border: 1px solid $grey-300;
-          background: $grey-100;
-          border-radius: 3px;
-          font-size: .75rem;
-        }
-      }
-    }
-
-    .message-body {
-      padding: .5rem .75rem;
-    }
-  }
-}
diff --git a/src/views/filters/CreateSavedFilter.vue b/src/views/filters/CreateSavedFilter.vue
index 331e923db..6bbd76522 100644
--- a/src/views/filters/CreateSavedFilter.vue
+++ b/src/views/filters/CreateSavedFilter.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="modal-mask keyboard-shortcuts-modal">
+	<div class="modal-mask hint-modal">
 		<div @click.self="$router.back()" class="modal-container">
 			<div class="modal-content">
 				<card class="has-background-white has-no-shadow" :title="$t('filters.create.title')">
diff --git a/src/views/list/views/Kanban.vue b/src/views/list/views/Kanban.vue
index ba256fccb..b9bea14e2 100644
--- a/src/views/list/views/Kanban.vue
+++ b/src/views/list/views/Kanban.vue
@@ -71,7 +71,9 @@
 								</div>
 							</div>
 							<template v-else>
-								{{ $t('list.kanban.limit', {limit: bucket.limit > 0 ? bucket.limit : $t('list.kanban.noLimit') }) }}
+								{{
+									$t('list.kanban.limit', {limit: bucket.limit > 0 ? bucket.limit : $t('list.kanban.noLimit')})
+								}}
 							</template>
 						</a>
 						<a
@@ -264,7 +266,6 @@
 
 <script>
 import TaskService from '../../../services/task'
-import TaskModel from '../../../models/task'
 import BucketModel from '../../../models/bucket'
 
 import {Container, Draggable} from 'vue-smooth-dnd'
@@ -281,6 +282,7 @@ import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import FilterPopup from '@/components/list/partials/filter-popup'
 import Dropdown from '@/components/misc/dropdown'
 import {playPop} from '@/helpers/playPop'
+import createTask from '@/components/tasks/mixins/createTask'
 
 export default {
 	name: 'Kanban',
@@ -328,6 +330,9 @@ export default {
 			filtersChanged: false, // To trigger a reload of the board
 		}
 	},
+	mixins: [
+		createTask,
+	],
 	created() {
 		this.taskService = new TaskService()
 		this.loadBuckets()
@@ -488,24 +493,7 @@ export default {
 			}
 			this.$set(this.newTaskError, bucketId, false)
 
-			// We need the actual bucket index so we put that in a seperate function
-			const bucketIndex = () => {
-				for (const t in this.buckets) {
-					if (this.buckets[t].id === bucketId) {
-						return t
-					}
-				}
-			}
-
-			const bi = bucketIndex()
-
-			const task = new TaskModel({
-				title: this.newTaskText,
-				bucketId: this.buckets[bi].id,
-				listId: this.$route.params.listId,
-			})
-
-			this.taskService.create(task)
+			this.createNewTask(this.newTaskText, bucketId)
 				.then(r => {
 					this.newTaskText = ''
 					this.$store.commit('kanban/addTaskToBucket', r)
@@ -514,10 +502,10 @@ export default {
 					this.error(e)
 				})
 				.finally(() => {
-					if (!this.$refs[`tasks-container${task.bucketId}`][0]) {
+					if (!this.$refs[`tasks-container${bucketId}`][0]) {
 						return
 					}
-					this.$refs[`tasks-container${task.bucketId}`][0].scrollTop = this.$refs[`tasks-container${task.bucketId}`][0].scrollHeight
+					this.$refs[`tasks-container${bucketId}`][0].scrollTop = this.$refs[`tasks-container${bucketId}`][0].scrollHeight
 				})
 		},
 		createNewBucket() {
diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue
index a10e956a1..f93da3451 100644
--- a/src/views/list/views/List.vue
+++ b/src/views/list/views/List.vue
@@ -82,6 +82,7 @@
 				<p class="help is-danger" v-if="showError && newTaskText === ''">
 					{{ $t('list.list.addTitleRequired') }}
 				</p>
+				<quick-add-magic v-if="!showError"/>
 			</div>
 
 			<nothing v-if="ctaVisible && tasks.length === 0 && !taskCollectionService.loading">
@@ -109,7 +110,8 @@
 				</div>
 				<card
 					v-if="isTaskEdit"
-					class="taskedit mt-0" :title="$t('list.list.editTask')" :has-close="true" @close="() => isTaskEdit = false"
+					class="taskedit mt-0" :title="$t('list.list.editTask')" :has-close="true"
+					@close="() => isTaskEdit = false"
 					:shadow="false">
 					<edit-task :task="taskEditTask"/>
 				</card>
@@ -156,15 +158,13 @@
 			<router-view/>
 		</transition>
 
+
 	</div>
 </template>
 
 <script>
 import TaskService from '../../../services/task'
 import TaskModel from '../../../models/task'
-import LabelTaskService from '../../../services/labelTask'
-import LabelTask from '../../../models/labelTask'
-import LabelModel from '../../../models/label'
 
 import EditTask from '../../../components/tasks/edit-task'
 import SingleTaskInList from '../../../components/tasks/partials/singleTaskInList'
@@ -173,8 +173,9 @@ import {saveListView} from '@/helpers/saveListView'
 import Rights from '../../../models/rights.json'
 import {mapState} from 'vuex'
 import FilterPopup from '@/components/list/partials/filter-popup'
-import {HAS_TASKS} from '@/store/mutation-types'
 import Nothing from '@/components/misc/nothing'
+import createTask from '@/components/tasks/mixins/createTask'
+import QuickAddMagic from '@/components/tasks/partials/quick-add-magic'
 
 export default {
 	name: 'List',
@@ -184,17 +185,16 @@ export default {
 			isTaskEdit: false,
 			taskEditTask: TaskModel,
 			newTaskText: '',
-
 			showError: false,
-			labelTaskService: LabelTaskService,
-
 			ctaVisible: false,
 		}
 	},
 	mixins: [
 		taskList,
+		createTask,
 	],
 	components: {
+		QuickAddMagic,
 		Nothing,
 		FilterPopup,
 		SingleTaskInList,
@@ -202,7 +202,6 @@ export default {
 	},
 	created() {
 		this.taskService = new TaskService()
-		this.labelTaskService = new LabelTaskService()
 
 		// Save the current list view to local storage
 		// We use local storage and not vuex here to make it persistent across reloads.
@@ -229,148 +228,11 @@ export default {
 			}
 			this.showError = false
 
-			let task = new TaskModel({title: this.newTaskText, listId: this.$route.params.listId})
-			this.taskService.create(task)
+			this.createNewTask(this.newTaskText)
 				.then(task => {
 					this.tasks.push(task)
 					this.sortTasks()
 					this.newTaskText = ''
-
-					// Unlike a proper programming language, Javascript only knows references to objects and does not
-					// allow you to control what is a reference and what isnt. Because of this we can't just add
-					// all labels to the task they belong to right after we found and added them to the task since
-					// the task update method also ensures all data the api sees has the right format. That means
-					// it processes labels. That processing changes the date format and the label color and makes
-					// the label pretty much unusable for everything else. Normally, this is not a big deal, because
-					// the labels on a task get thrown away anyway and replaced with the new models from the api
-					// when we get the updated answer back. However, in this specific case because we're passing a
-					// label we obtained from vuex that reference is kept and not thrown away. The task itself gets
-					// a new label object - you won't notice the bad reference until you want to add the same label
-					// again and notice it doesn't have a color anymore.
-					// I think this is what happens: (or rather would happen without the hack I've put in)
-					//   1. Query the store for a label which matches the name
-					//   2. Find one - remember, we get only a *reference* to the label from the store, not a new label object.
-					//      (Now there's *two* places with a reference to the same label object: in the store and in the
-					//      variable which holds the label from the search in the store)
-					//   3. .push the label to the task
-					//   4. Update the task to remove the labels from the name
-					//   4.1. The task update processes all labels belonging to that task, changing attributes of our
-					//        label in the process. Because this is a reference, it is also "updated" in the store.
-					//   5. Get an api response back. The service handler now creates a new label object for all labels
-					//      returned from the api. It will throw away all references to the old label in the process.
-					//   6. Now we have two objects with the same label data: The old one we originally obtained from
-					//      the store and the one that was created when parsing the api response. The old one was
-					//      modified before sending the api request and thus, our store which still holds a reference
-					//      to the old label now contains old data.
-					//      I guess this is the point where normally the GC would come in and collect the old label
-					//      object if the store wouldn't still hold a reference to it.
-					//
-					// Now, as a workaround, I'm putting all new labels added to that task in this separate variable to
-					// add them only after the task was updated to circumvent the task update service processing the
-					// label before sending it. Feels more hacky than it probably is.
-					const newLabels = []
-
-					// Check if the task has words starting with ~ in the title and make them to labels
-					const parts = task.title.split(' ~')
-					// The first element will always contain the title, even if there is no occurrence of ~
-					if (parts.length > 1) {
-
-						// First, create an unresolved promise for each entry in the array to wait
-						// until all labels are added to update the task title once again
-						let labelAddings = []
-						let labelAddsToWaitFor = []
-						parts.forEach((p, index) => {
-							if (index < 1) {
-								return
-							}
-
-							labelAddsToWaitFor.push(new Promise((resolve, reject) => {
-								labelAddings.push({resolve: resolve, reject: reject})
-							}))
-						})
-
-						// Then do everything that is involved in finding, creating and adding the label to the task
-						parts.forEach((p, index) => {
-							if (index < 1) {
-								return
-							}
-
-							// The part up until the next space
-							const labelTitle = p.split(' ')[0]
-
-							// Don't create an empty label
-							if (labelTitle === '') {
-								return
-							}
-
-							// Check if the label exists
-							const label = Object.values(this.$store.state.labels.labels).find(l => {
-								return l.title.toLowerCase() === labelTitle.toLowerCase()
-							})
-
-							// Label found, use it
-							if (typeof label !== 'undefined') {
-								const labelTask = new LabelTask({
-									taskId: task.id,
-									labelId: label.id,
-								})
-								this.labelTaskService.create(labelTask)
-									.then(result => {
-										newLabels.push(label)
-
-										// Remove the label text from the task title
-										task.title = task.title.replace(` ~${labelTitle}`, '')
-
-										// Make the promise done (the one with the index 0 does not exist)
-										labelAddings[index - 1].resolve(result)
-									})
-									.catch(e => {
-										this.error(e)
-									})
-							} else {
-								// label not found, create it
-								const label = new LabelModel({title: labelTitle})
-								this.$store.dispatch('labels/createLabel', label)
-									.then(res => {
-										const labelTask = new LabelTask({
-											taskId: task.id,
-											labelId: res.id,
-										})
-										this.labelTaskService.create(labelTask)
-											.then(result => {
-												newLabels.push(res)
-
-												// Remove the label text from the task title
-												task.title = task.title.replace(` ~${labelTitle}`, '')
-
-												// Make the promise done (the one with the index 0 does not exist)
-												labelAddings[index - 1].resolve(result)
-											})
-											.catch(e => {
-												this.error(e)
-											})
-									})
-									.catch(e => {
-										this.error(e)
-									})
-							}
-						})
-
-						// This waits to update the task until all labels have been added and the title has
-						// been modified to remove each label text
-						Promise.all(labelAddsToWaitFor)
-							.then(() => {
-								this.taskService.update(task)
-									.then(updatedTask => {
-										updatedTask.labels = newLabels
-										this.updateTasks(updatedTask)
-										this.$store.commit(HAS_TASKS, true)
-									})
-									.catch(e => {
-										this.error(e)
-									})
-							})
-					}
 				})
 				.catch(e => {
 					this.error(e)

From 8fca4f4c53ddf7ba6e3278f513081a04a025162e Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Tue, 6 Jul 2021 08:16:26 +0000
Subject: [PATCH 03/40] Update dependency vue-flatpickr-component to v8.1.7
 (#572)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/572
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 567385edb..658cc0c32 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "faker": "5.5.3",
     "jest": "27.0.6",
     "sass-loader": "10.2.0",
-    "vue-flatpickr-component": "8.1.6",
+    "vue-flatpickr-component": "8.1.7",
     "vue-notification": "1.3.20",
     "vue-router": "3.5.2",
     "vue-template-compiler": "2.6.14",
diff --git a/yarn.lock b/yarn.lock
index f3d43357c..00a3036d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13527,10 +13527,10 @@ vue-eslint-parser@^7.6.0:
     esquery "^1.4.0"
     lodash "^4.17.15"
 
-vue-flatpickr-component@8.1.6:
-  version "8.1.6"
-  resolved "https://registry.yarnpkg.com/vue-flatpickr-component/-/vue-flatpickr-component-8.1.6.tgz#8fb25dc72946ceb1ab005b871a8151461c0883f6"
-  integrity sha512-RUu/M/1lbuzQT+U3yP7O5/M2EIizr9vXLXqSc1eFOvCT3AHurQg8+iO02rjW+2l78Kit8pCNAUvHw7eexws6hw==
+vue-flatpickr-component@8.1.7:
+  version "8.1.7"
+  resolved "https://registry.yarnpkg.com/vue-flatpickr-component/-/vue-flatpickr-component-8.1.7.tgz#202a8977ee5838b09e6920154c99a69ce17a00e0"
+  integrity sha512-T9aapLERf5XrisKUHw8QVByFpN9UB583Bhu6+HtzvhCcfXqIYBtRc3rQC0ZhFSRk3CNMo7533U+B5Qs4WAbhyA==
   dependencies:
     flatpickr "^4.6.6"
 

From f9e5a17907321b34091934daa33dc210f611f561 Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Tue, 6 Jul 2021 11:10:58 +0000
Subject: [PATCH 04/40] Update dependency dompurify to v2.3.0 (#573)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/573
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 658cc0c32..593260ef9 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "camel-case": "4.1.2",
     "copy-to-clipboard": "3.3.1",
     "date-fns": "2.22.1",
-    "dompurify": "2.2.9",
+    "dompurify": "2.3.0",
     "highlight.js": "11.0.1",
     "lodash": "4.17.21",
     "marked": "2.1.3",
diff --git a/yarn.lock b/yarn.lock
index 00a3036d8..1a2683a10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5835,10 +5835,10 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-dompurify@2.2.9:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.9.tgz#4b42e244238032d9286a0d2c87b51313581d9624"
-  integrity sha512-+9MqacuigMIZ+1+EwoEltogyWGFTJZWU3258Rupxs+2CGs4H914G9er6pZbsme/bvb5L67o2rade9n21e4RW/w==
+dompurify@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz#07bb39515e491588e5756b1d3e8375b5964814e2"
+  integrity sha512-VV5C6Kr53YVHGOBKO/F86OYX6/iLTw2yVSI721gKetxpHCK/V5TaLEf9ODjRgl1KLSWRMY6cUhAbv/c+IUnwQw==
 
 domutils@1.5.1:
   version "1.5.1"

From e63dbdd6258217d4637414e1d687ff47362cc5d1 Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Tue, 6 Jul 2021 12:47:40 +0000
Subject: [PATCH 05/40] Update dependency eslint-plugin-vue to v7.13.0 (#574)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/574
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 package.json |  2 +-
 yarn.lock    | 31 ++++++++++++-------------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 593260ef9..fbed6eb60 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "cypress": "7.6.0",
     "cypress-file-upload": "5.0.8",
     "eslint": "7.30.0",
-    "eslint-plugin-vue": "7.12.1",
+    "eslint-plugin-vue": "7.13.0",
     "faker": "5.5.3",
     "jest": "27.0.6",
     "sass-loader": "10.2.0",
diff --git a/yarn.lock b/yarn.lock
index 1a2683a10..653292936 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6173,15 +6173,15 @@ eslint-loader@^2.2.1:
     object-hash "^1.1.4"
     rimraf "^2.6.1"
 
-eslint-plugin-vue@7.12.1:
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.12.1.tgz#ef6499ce4fe0566659c8e12c71713f5308630a76"
-  integrity sha512-xHf/wCt88qmzqQerjaSteUFGASj7fPreglKD4ijnvoKRkoSJ3/H3kuJE8QFFtc+2wjw6hRDs834HH7vpuTJQzg==
+eslint-plugin-vue@7.13.0:
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.13.0.tgz#6f3d232bf1fcd0428353b0d581ebaca1c5dbc17a"
+  integrity sha512-u0+jL8h2MshRuMTCLslktxRsPTjlENNcNufhgHu01N982DmHVdeFniyMPoVLLRjACQOwdz3FdlsgYGBMBG+AKg==
   dependencies:
     eslint-utils "^2.1.0"
     natural-compare "^1.4.0"
     semver "^7.3.2"
-    vue-eslint-parser "^7.6.0"
+    vue-eslint-parser "^7.8.0"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -6191,14 +6191,6 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
-  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -13515,17 +13507,18 @@ vue-easymde@1.4.0:
     easymde "^2.14.0"
     marked "^2.0.1"
 
-vue-eslint-parser@^7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz#01ea1a2932f581ff244336565d712801f8f72561"
-  integrity sha512-QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA==
+vue-eslint-parser@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.8.0.tgz#43850bf856c9a69d62c0e12769609c338423684b"
+  integrity sha512-ehmmrLZNYLUoKayvVW8l8HyPQIfuYZHiJoQLRP3dapDlTU7bGs4tqIKVGdAEpMuXS/b4R/PImCt7Tkj4UhX1SQ==
   dependencies:
     debug "^4.1.1"
-    eslint-scope "^5.0.0"
+    eslint-scope "^5.1.1"
     eslint-visitor-keys "^1.1.0"
     espree "^6.2.1"
     esquery "^1.4.0"
-    lodash "^4.17.15"
+    lodash "^4.17.21"
+    semver "^6.3.0"
 
 vue-flatpickr-component@8.1.7:
   version "8.1.7"

From f68794bd01063fd14d96b30434e4dfd140568f5b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 6 Jul 2021 14:53:32 +0200
Subject: [PATCH 06/40] Change quick add magic characters to be more familiar
 with the todoist ones

---
 .../tasks/partials/quick-add-magic.vue        |  6 ++--
 src/helpers/parseTaskText.js                  |  6 ++--
 src/helpers/parseTaskText.test.js             | 30 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/components/tasks/partials/quick-add-magic.vue b/src/components/tasks/partials/quick-add-magic.vue
index 172d41afa..0204a9cc6 100644
--- a/src/components/tasks/partials/quick-add-magic.vue
+++ b/src/components/tasks/partials/quick-add-magic.vue
@@ -13,13 +13,13 @@
 
 							<h3>{{ $t('task.attributes.labels') }}</h3>
 							<p>
-								{{ $t('task.quickAddMagic.label1', {prefix: '~'}) }}
+								{{ $t('task.quickAddMagic.label1', {prefix: '@'}) }}
 								{{ $t('task.quickAddMagic.label2') }}
 								{{ $t('task.quickAddMagic.multiple') }}
 							</p>
 							<p>
 								{{ $t('task.quickAddMagic.label3') }}
-								{{ $t('task.quickAddMagic.label4', {prefix: '~'}) }}
+								{{ $t('task.quickAddMagic.label4', {prefix: '@'}) }}
 							</p>
 
 							<h3>{{ $t('task.attributes.priority') }}</h3>
@@ -36,7 +36,7 @@
 
 							<h3>{{ $t('list.list.title') }}</h3>
 							<p>
-								{{ $t('task.quickAddMagic.list1', {prefix: '*'}) }}
+								{{ $t('task.quickAddMagic.list1', {prefix: '#'}) }}
 								{{ $t('task.quickAddMagic.list2') }}
 							</p>
 
diff --git a/src/helpers/parseTaskText.js b/src/helpers/parseTaskText.js
index 0039a6d80..e7c707527 100644
--- a/src/helpers/parseTaskText.js
+++ b/src/helpers/parseTaskText.js
@@ -1,10 +1,10 @@
 import {parseDate} from './time/parseDate'
 import priorities from '../models/priorities.json'
 
-const LABEL_PREFIX = '~'
-const LIST_PREFIX = '*'
+const LABEL_PREFIX = '@'
+const LIST_PREFIX = '#'
 const PRIORITY_PREFIX = '!'
-const ASSIGNEE_PREFIX = '@'
+const ASSIGNEE_PREFIX = '+'
 
 /**
  * Parses task text for dates, assignees, labels, lists, priorities and returns an object with all found intents.
diff --git a/src/helpers/parseTaskText.test.js b/src/helpers/parseTaskText.test.js
index 618e97223..459ad628d 100644
--- a/src/helpers/parseTaskText.test.js
+++ b/src/helpers/parseTaskText.test.js
@@ -277,7 +277,7 @@ describe('Parse Task Text', () => {
 
 	describe('Labels', () => {
 		it('should parse labels', () => {
-			const result = parseTaskText('Lorem Ipsum ~label1 ~label2')
+			const result = parseTaskText('Lorem Ipsum @label1 @label2')
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.labels).toHaveLength(2)
@@ -285,7 +285,7 @@ describe('Parse Task Text', () => {
 			expect(result.labels[1]).toBe('label2')
 		})
 		it('should parse labels from the start', () => {
-			const result = parseTaskText('~label1 Lorem Ipsum ~label2')
+			const result = parseTaskText('@label1 Lorem Ipsum @label2')
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.labels).toHaveLength(2)
@@ -293,7 +293,7 @@ describe('Parse Task Text', () => {
 			expect(result.labels[1]).toBe('label2')
 		})
 		it('should resolve duplicate labels', () => {
-			const result = parseTaskText('Lorem Ipsum ~label1 ~label1 ~label2')
+			const result = parseTaskText('Lorem Ipsum @label1 @label1 @label2')
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.labels).toHaveLength(2)
@@ -301,14 +301,14 @@ describe('Parse Task Text', () => {
 			expect(result.labels[1]).toBe('label2')
 		})
 		it('should correctly parse labels with spaces in them', () => {
-			const result = parseTaskText(`Lorem ~'label with space' Ipsum`)
+			const result = parseTaskText(`Lorem @'label with space' Ipsum`)
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.labels).toHaveLength(1)
 			expect(result.labels[0]).toBe('label with space')
 		})
 		it('should correctly parse labels with spaces in them and "', () => {
-			const result = parseTaskText('Lorem ~"label with space" Ipsum')
+			const result = parseTaskText('Lorem @"label with space" Ipsum')
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.labels).toHaveLength(1)
@@ -318,27 +318,27 @@ describe('Parse Task Text', () => {
 
 	describe('List', () => {
 		it('should parse a list', () => {
-			const result = parseTaskText('Lorem Ipsum *list')
+			const result = parseTaskText('Lorem Ipsum #list')
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.list).toBe('list')
 		})
 		it('should parse a list with a space in it', () => {
-			const result = parseTaskText(`Lorem Ipsum *'list with long name'`)
+			const result = parseTaskText(`Lorem Ipsum #'list with long name'`)
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.list).toBe('list with long name')
 		})
 		it('should parse a list with a space in it and "', () => {
-			const result = parseTaskText(`Lorem Ipsum *"list with long name"`)
+			const result = parseTaskText(`Lorem Ipsum #"list with long name"`)
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.list).toBe('list with long name')
 		})
 		it('should parse only the first list', () => {
-			const result = parseTaskText(`Lorem Ipsum *list1 *list2 *list3`)
+			const result = parseTaskText(`Lorem Ipsum #list1 #list2 #list3`)
 
-			expect(result.text).toBe('Lorem Ipsum *list2 *list3')
+			expect(result.text).toBe('Lorem Ipsum #list2 #list3')
 			expect(result.list).toBe('list1')
 		})
 	})
@@ -368,14 +368,14 @@ describe('Parse Task Text', () => {
 
 	describe('Assignee', () => {
 		it('should parse an assignee', () => {
-			const result = parseTaskText('Lorem Ipsum @user')
+			const result = parseTaskText('Lorem Ipsum +user')
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.assignees).toHaveLength(1)
 			expect(result.assignees[0]).toBe('user')
 		})
 		it('should parse multiple assignees', () => {
-			const result = parseTaskText('Lorem Ipsum @user1 @user2 @user3')
+			const result = parseTaskText('Lorem Ipsum +user1 +user2 +user3')
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.assignees).toHaveLength(3)
@@ -384,7 +384,7 @@ describe('Parse Task Text', () => {
 			expect(result.assignees[2]).toBe('user3')
 		})
 		it('should parse avoid duplicate assignees', () => {
-			const result = parseTaskText('Lorem Ipsum @user1 @user1 @user2')
+			const result = parseTaskText('Lorem Ipsum +user1 +user1 +user2')
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.assignees).toHaveLength(2)
@@ -392,14 +392,14 @@ describe('Parse Task Text', () => {
 			expect(result.assignees[1]).toBe('user2')
 		})
 		it('should parse an assignee with a space in it', () => {
-			const result = parseTaskText(`Lorem Ipsum @'user with long name'`)
+			const result = parseTaskText(`Lorem Ipsum +'user with long name'`)
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.assignees).toHaveLength(1)
 			expect(result.assignees[0]).toBe('user with long name')
 		})
 		it('should parse an assignee with a space in it and "', () => {
-			const result = parseTaskText(`Lorem Ipsum @"user with long name"`)
+			const result = parseTaskText(`Lorem Ipsum +"user with long name"`)
 
 			expect(result.text).toBe('Lorem Ipsum')
 			expect(result.assignees).toHaveLength(1)

From e640f904886345bc25bb2665a822283684d650c1 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 6 Jul 2021 15:00:31 +0200
Subject: [PATCH 07/40] Don't show archived lists/namespaces in quick actions

---
 src/components/quick-actions/quick-actions.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/components/quick-actions/quick-actions.vue b/src/components/quick-actions/quick-actions.vue
index 633c6e083..062013888 100644
--- a/src/components/quick-actions/quick-actions.vue
+++ b/src/components/quick-actions/quick-actions.vue
@@ -114,7 +114,21 @@ export default {
 					query = query.substr(1)
 				}
 
+				const ncache = {}
+
 				lists = (Object.values(this.$store.state.lists).filter(l => {
+					if (l.isArchived) {
+						return false
+					}
+
+					if (typeof ncache[l.namespaceId] === 'undefined') {
+						ncache[l.namespaceId] = this.$store.getters['namespaces/getNamespaceById'](l.namespaceId)
+					}
+
+					if (ncache[l.namespaceId].isArchived) {
+						return false
+					}
+
 					return l.title.toLowerCase().includes(query.toLowerCase())
 				}) ?? [])
 			}

From 21d31f2b409b120854b8fda555e3aac3990289ba Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 6 Jul 2021 15:08:55 +0200
Subject: [PATCH 08/40] Indicate done tasks in quick actions

---
 src/components/quick-actions/quick-actions.vue | 1 +
 src/styles/theme/theme.scss                    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/components/quick-actions/quick-actions.vue b/src/components/quick-actions/quick-actions.vue
index 062013888..2e9a8b2cb 100644
--- a/src/components/quick-actions/quick-actions.vue
+++ b/src/components/quick-actions/quick-actions.vue
@@ -41,6 +41,7 @@
 							@click.prevent.stop="() => doAction(r.type, i)"
 							@keyup.prevent.enter="() => doAction(r.type, i)"
 							@keyup.prevent.esc="() => $refs.searchInput.focus()"
+							:class="{'is-strikethrough': i.done}"
 						>
 							{{ i.title }}
 						</button>
diff --git a/src/styles/theme/theme.scss b/src/styles/theme/theme.scss
index 684a68631..f29ff64e3 100644
--- a/src/styles/theme/theme.scss
+++ b/src/styles/theme/theme.scss
@@ -144,3 +144,7 @@ button.table {
     box-shadow: $shadow-md;
   }
 }
+
+.is-strikethrough {
+  text-decoration: line-through;
+}

From 647b02e989d6cfa346ca791105bd00ac521c79f6 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 6 Jul 2021 16:46:45 +0200
Subject: [PATCH 09/40] Fix translating dates

---
 src/helpers/time/formatDate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/helpers/time/formatDate.js b/src/helpers/time/formatDate.js
index faf373742..b1d6d46f5 100644
--- a/src/helpers/time/formatDate.js
+++ b/src/helpers/time/formatDate.js
@@ -1,6 +1,6 @@
 import {createDateFromString} from '@/helpers/time/createDateFromString'
 import {format, formatDistance} from 'date-fns'
-import { enGB, de } from 'date-fns/locale'
+import {enGB, de} from 'date-fns/locale'
 
 const locales = {enGB, de}
 
@@ -30,7 +30,7 @@ export const formatDateSince = (date, $t) => {
 	date = createDateFromString(date)
 
 	const currentDate = new Date()
-	const distance = formatDistance(date, currentDate)
+	const distance = formatDistance(date, currentDate, {locale: locales[$t('date.locale')]})
 
 	if (date > currentDate) {
 		return $t('date.in', {date: distance})

From f3715c79009efec09bce0e111533066a09043663 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 6 Jul 2021 17:05:35 +0200
Subject: [PATCH 10/40] Add showing version info in GUI

Resolves #373
---
 src/components/home/topNavigation.vue |  3 ++
 src/i18n/lang/en.json                 |  8 ++++-
 src/router/index.js                   |  6 ++++
 src/views/About.vue                   | 51 +++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/views/About.vue

diff --git a/src/components/home/topNavigation.vue b/src/components/home/topNavigation.vue
index 385f971a2..4f09ea71f 100644
--- a/src/components/home/topNavigation.vue
+++ b/src/components/home/topNavigation.vue
@@ -82,6 +82,9 @@
 					<a @click="$store.commit('keyboardShortcutsActive', true)" class="dropdown-item">
 						{{ $t('keyboardShortcuts.title') }}
 					</a>
+					<router-link :to="{name: 'about'}" class="dropdown-item">
+						{{ $t('about.title') }}
+					</router-link>
 					<a @click="logout()" class="dropdown-item">
 						{{ $t('user.auth.logout') }}
 					</a>
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index f7ba7f71f..b1aa20d3f 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -394,7 +394,8 @@
     "doit": "Do it!",
     "saving": "Saving…",
     "saved": "Saved!",
-    "default": "Default"
+    "default": "Default",
+    "close": "Close"
   },
   "input": {
     "resetColor": "Reset Color",
@@ -813,5 +814,10 @@
     "12002": "You are already subscribed to the entity itself or a parent entity.",
     "13001": "This link share requires a password for authentication, but none was provided.",
     "13002": "The provided link share password was invalid."
+  },
+  "about": {
+    "title": "About",
+    "frontendVersion": "Frontend Version: {version}",
+    "apiVersion": "API Version: {version}"
   }
 }
diff --git a/src/router/index.js b/src/router/index.js
index d79ab68ba..5f14afdc5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,6 +5,7 @@ import HomeComponent from '../views/Home'
 import NotFoundComponent from '../views/404'
 import LoadingComponent from '../components/misc/loading'
 import ErrorComponent from '../components/misc/error'
+import About from '../views/About'
 // User Handling
 import LoginComponent from '../views/user/Login'
 import RegisterComponent from '../views/user/Register'
@@ -527,5 +528,10 @@ export default new Router({
 			name: 'openid.auth',
 			component: OpenIdAuth,
 		},
+		{
+			path: '/about',
+			name: 'about',
+			component: About,
+		},
 	],
 })
\ No newline at end of file
diff --git a/src/views/About.vue b/src/views/About.vue
new file mode 100644
index 000000000..47b811fd9
--- /dev/null
+++ b/src/views/About.vue
@@ -0,0 +1,51 @@
+<template>
+	<transition name="fade">
+		<div class="modal-mask hint-modal">
+			<div @click.self="$router.back()" class="modal-container">
+				<div class="modal-content">
+					<card
+						class="has-background-white has-no-shadow"
+						:title="$t('about.title')"
+						:has-close="true"
+						close-icon="times"
+						@close="$router.back()"
+						:padding="false"
+					>
+						<div class="p-4">
+							<p>
+								{{ $t('about.frontendVersion', {version: this.frontendVersion}) }}
+							</p>
+							<p>
+								{{ $t('about.apiVersion', {version: this.apiVersion}) }}
+							</p>
+						</div>
+						<footer class="modal-card-foot is-flex is-justify-content-flex-end">
+							<x-button
+								type="secondary"
+								@click.prevent.stop="$router.back()"
+							>
+								{{ $t('misc.close') }}
+							</x-button>
+						</footer>
+					</card>
+				</div>
+			</div>
+		</div>
+	</transition>
+</template>
+
+<script>
+import {VERSION} from '../version.json'
+
+export default {
+	name: 'About',
+	computed: {
+		frontendVersion() {
+			return VERSION
+		},
+		apiVersion() {
+			return this.$store.state.config.version
+		},
+	},
+}
+</script>

From c7c9b5ee47493f3b0d7f80917fcb2f9f4c02efce Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 6 Jul 2021 17:13:13 +0200
Subject: [PATCH 11/40] Show salutation based on the time of day

---
 src/i18n/lang/en.json |  5 +++-
 src/views/Home.vue    | 55 ++++++++++++++++++++++++++++++-------------
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index b1aa20d3f..e183ce401 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -1,6 +1,9 @@
 {
   "home": {
-    "welcome": "Hi {username}",
+    "welcomeNight": "Good Night {username}",
+    "welcomeMorning": "Good Morning {username}",
+    "welcomeDay": "Hi {username}",
+    "welcomeEvening": "Good Evening {username}",
     "list": {
       "newText": "You can create a new list for your new tasks:",
       "new": "Create a new list",
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 487d7aaec..325570b90 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="content has-text-centered">
 		<h2>
-			{{ $t('home.welcome', {username: userInfo.name !== '' ? userInfo.name : userInfo.username}) }}!
+			{{ $t(`home.welcome${welcome}`, {username: userInfo.name !== '' ? userInfo.name : userInfo.username}) }}!
 		</h2>
 		<template v-if="!hasTasks">
 			<p>{{ $t('home.list.newText') }}</p>
@@ -43,25 +43,48 @@ export default {
 			tasks: [],
 		}
 	},
-	computed: mapState({
-		migratorsEnabled: state => state.config.availableMigrators !== null && state.config.availableMigrators.length > 0,
-		authenticated: state => state.auth.authenticated,
-		userInfo: state => state.auth.info,
-		hasTasks: state => state.hasTasks,
-		defaultNamespaceId: state => {
-			if (state.namespaces.namespaces.length === 0) {
-				return 0
+	computed: {
+		welcome() {
+			const now = new Date()
+
+			if (now.getHours() < 5) {
+				return 'Night'
 			}
 
-			return state.namespaces.namespaces[0].id
-		},
-		hasLists: state => {
-			if (state.namespaces.namespaces.length === 0) {
-				return false
+			if(now.getHours() < 11) {
+				return 'Morning'
 			}
 
-			return state.namespaces.namespaces[0].lists.length > 0
+			if(now.getHours() < 18) {
+				return 'Day'
+			}
+
+			if(now.getHours() < 23) {
+				return 'Evening'
+			}
+
+			return 'Night'
 		},
-	}),
+		...mapState({
+			migratorsEnabled: state => state.config.availableMigrators !== null && state.config.availableMigrators.length > 0,
+			authenticated: state => state.auth.authenticated,
+			userInfo: state => state.auth.info,
+			hasTasks: state => state.hasTasks,
+			defaultNamespaceId: state => {
+				if (state.namespaces.namespaces.length === 0) {
+					return 0
+				}
+
+				return state.namespaces.namespaces[0].id
+			},
+			hasLists: state => {
+				if (state.namespaces.namespaces.length === 0) {
+					return false
+				}
+
+				return state.namespaces.namespaces[0].lists.length > 0
+			},
+		}),
+	}
 }
 </script>

From d09eff1655f769d5bac00e4031b83424c46113b7 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 6 Jul 2021 22:22:57 +0200
Subject: [PATCH 12/40] Show last visited list on home page

---
 package.json                               |   3 +-
 src/components/list/partials/list-card.vue |  61 +++++++++
 src/helpers/color/colorIsDark.js           |   4 +
 src/i18n/lang/en.json                      |   1 +
 src/modules/listHistory.js                 |  26 ++++
 src/modules/listHistory.test.js            |  67 ++++++++++
 src/store/modules/lists.js                 |   2 +-
 src/styles/components/list.scss            | 137 +++++++++++++++++++++
 src/styles/components/namespaces.scss      | 129 -------------------
 src/views/Home.vue                         |  26 +++-
 src/views/list/ShowList.vue                |   7 +-
 src/views/namespaces/ListNamespaces.vue    |  49 ++------
 12 files changed, 337 insertions(+), 175 deletions(-)
 create mode 100644 src/components/list/partials/list-card.vue
 create mode 100644 src/modules/listHistory.js
 create mode 100644 src/modules/listHistory.test.js

diff --git a/package.json b/package.json
index fbed6eb60..3d822e280 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
   "jest": {
     "testPathIgnorePatterns": [
       "cypress"
-    ]
+    ],
+    "testEnvironment": "jsdom"
   }
 }
diff --git a/src/components/list/partials/list-card.vue b/src/components/list/partials/list-card.vue
new file mode 100644
index 000000000..053e6528f
--- /dev/null
+++ b/src/components/list/partials/list-card.vue
@@ -0,0 +1,61 @@
+<template>
+	<router-link
+		:class="{
+			'has-light-text': !colorIsDark(list.hexColor),
+			'has-background': backgroundResolver(list.id) !== null
+		}"
+		:style="{
+			'background-color': list.hexColor,
+			'background-image': backgroundResolver(list.id) !== null ? `url(${backgroundResolver(list.id)})` : false,
+		}"
+		:to="{ name: 'list.index', params: { listId: list.id} }"
+		class="list-card"
+		tag="span"
+		v-if="showArchived ? true : !list.isArchived"
+	>
+		<div class="is-archived-container">
+			<span class="is-archived" v-if="list.isArchived">
+				{{ $t('namespace.archived') }}
+			</span>
+			<span
+				:class="{'is-favorite': list.isFavorite, 'is-archived': list.isArchived}"
+				@click.stop="toggleFavoriteList(list)"
+				class="favorite">
+				<icon icon="star" v-if="list.isFavorite"/>
+				<icon :icon="['far', 'star']" v-else/>
+			</span>
+		</div>
+		<div class="title">{{ list.title }}</div>
+	</router-link>
+</template>
+
+<script>
+export default {
+	name: 'list-card',
+	props: {
+		list: {
+			required: true,
+		},
+		showArchived: {
+			default: false,
+			type: Boolean,
+		},
+		// A function, returning a background blob or null if none exists for that list.
+		// Receives the list id as parameter.
+		backgroundResolver: {
+			required: true,
+		},
+	},
+	methods: {
+		toggleFavoriteList(list) {
+			// The favorites pseudo list is always favorite
+			// Archived lists cannot be marked favorite
+			if (list.id === -1 || list.isArchived) {
+				return
+			}
+			this.$store.dispatch('lists/toggleListFavorite', list)
+				.catch(e => this.error(e))
+		},
+	},
+}
+</script>
diff --git a/src/helpers/color/colorIsDark.js b/src/helpers/color/colorIsDark.js
index 01cf9e80c..d548fdcdd 100644
--- a/src/helpers/color/colorIsDark.js
+++ b/src/helpers/color/colorIsDark.js
@@ -1,4 +1,8 @@
 export const colorIsDark = color => {
+	if (typeof color === 'undefined') {
+		return true // Defaults to dark
+	}
+
 	if (color === '#' || color === '') {
 		return true // Defaults to dark
 	}
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index e183ce401..ec7cdf76e 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -4,6 +4,7 @@
     "welcomeMorning": "Good Morning {username}",
     "welcomeDay": "Hi {username}",
     "welcomeEvening": "Good Evening {username}",
+    "lastViewed": "Last viewed",
     "list": {
       "newText": "You can create a new list for your new tasks:",
       "new": "Create a new list",
diff --git a/src/modules/listHistory.js b/src/modules/listHistory.js
new file mode 100644
index 000000000..96acbe332
--- /dev/null
+++ b/src/modules/listHistory.js
@@ -0,0 +1,26 @@
+export const getHistory = () => {
+	const savedHistory = localStorage.getItem('listHistory')
+	if (savedHistory === null) {
+		return []
+	}
+
+	return JSON.parse(savedHistory)
+}
+
+export function saveListToHistory(list) {
+	const history = getHistory()
+
+	// Remove the element if it already exists in history, preventing duplicates and essentially moving it to the beginning
+	for (const i in history) {
+		if (history[i].id === list.id) {
+			history.splice(i, 1)
+		}
+	}
+
+	history.unshift(list)
+
+	if (history.length > 5) {
+		history.pop()
+	}
+	localStorage.setItem('listHistory', JSON.stringify(history))
+}
diff --git a/src/modules/listHistory.test.js b/src/modules/listHistory.test.js
new file mode 100644
index 000000000..d3d8b8423
--- /dev/null
+++ b/src/modules/listHistory.test.js
@@ -0,0 +1,67 @@
+import {getHistory, saveListToHistory} from './listHistory'
+
+test('return an empty history when none was saved', () => {
+	Storage.prototype.getItem = jest.fn(() => null)
+	const h = getHistory()
+	expect(h).toStrictEqual([])
+})
+
+test('return a saved history', () => {
+	const saved = [{id: 1}, {id: 2}]
+	Storage.prototype.getItem = jest.fn(() => JSON.stringify(saved))
+
+	const h = getHistory()
+	expect(h).toStrictEqual(saved)
+})
+
+test('store list in history', () => {
+	let saved = {}
+	Storage.prototype.getItem = jest.fn(() => null)
+	Storage.prototype.setItem = jest.fn((key, lists) => {
+		saved = lists
+	})
+
+	saveListToHistory({id: 1})
+	expect(saved).toBe('[{"id":1}]')
+})
+
+test('store only the last 5 lists in history', () => {
+	let saved = null
+	Storage.prototype.getItem = jest.fn(() => saved)
+	Storage.prototype.setItem = jest.fn((key, lists) => {
+		saved = lists
+	})
+
+	saveListToHistory({id: 1})
+	saveListToHistory({id: 2})
+	saveListToHistory({id: 3})
+	saveListToHistory({id: 4})
+	saveListToHistory({id: 5})
+	saveListToHistory({id: 6})
+	expect(saved).toBe('[{"id":6},{"id":5},{"id":4},{"id":3},{"id":2}]')
+})
+
+test('don\'t store the same list twice', () => {
+	let saved = null
+	Storage.prototype.getItem = jest.fn(() => saved)
+	Storage.prototype.setItem = jest.fn((key, lists) => {
+		saved = lists
+	})
+
+	saveListToHistory({id: 1})
+	saveListToHistory({id: 1})
+	expect(saved).toBe('[{"id":1}]')
+})
+
+test('move a list to the beginning when storing it multiple times', () => {
+	let saved = null
+	Storage.prototype.getItem = jest.fn(() => saved)
+	Storage.prototype.setItem = jest.fn((key, lists) => {
+		saved = lists
+	})
+
+	saveListToHistory({id: 1})
+	saveListToHistory({id: 2})
+	saveListToHistory({id: 1})
+	expect(saved).toBe('[{"id":1},{"id":2}]')
+})
diff --git a/src/store/modules/lists.js b/src/store/modules/lists.js
index cd088b86a..5f5b57db4 100644
--- a/src/store/modules/lists.js
+++ b/src/store/modules/lists.js
@@ -78,6 +78,6 @@ export default {
 					return Promise.reject(e)
 				})
 				.finally(() => cancel())
-		}
+		},
 	},
 }
\ No newline at end of file
diff --git a/src/styles/components/list.scss b/src/styles/components/list.scss
index d20d2e13e..cfd512c5a 100644
--- a/src/styles/components/list.scss
+++ b/src/styles/components/list.scss
@@ -163,3 +163,140 @@ $filter-container-top-link-share-list: -47px;
 .is-archived .notification.is-warning {
   margin-bottom: 1rem;
 }
+
+$lists-per-row: 5;
+$list-height: 150px;
+$list-spacing: 1rem;
+
+.list-card {
+  cursor: pointer;
+  width: calc((100% - #{($lists-per-row - 1) * 1rem}) / #{$lists-per-row});
+  height: $list-height;
+  background: $white;
+  margin: 0 $list-spacing $list-spacing 0;
+  padding: 1rem;
+  border-radius: $radius;
+  box-shadow: $shadow-sm;
+  transition: box-shadow $transition;
+
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+
+  &:hover {
+    box-shadow: $shadow-md;
+  }
+
+  &:active,
+  &:focus,
+  &:focus:not(:active) {
+    box-shadow: $shadow-xs !important;
+  }
+
+  @media screen and (min-width: $widescreen) {
+    &:nth-child(#{$lists-per-row}n) {
+      margin-right: 0;
+    }
+  }
+
+  @media screen and (max-width: $widescreen) and (min-width: $tablet) {
+    $lists-per-row: 3;
+    & {
+      width: calc((100% - #{($lists-per-row - 1) * 1rem}) / #{$lists-per-row});
+    }
+
+    &:nth-child(#{$lists-per-row}n) {
+      margin-right: 0;
+    }
+  }
+
+  @media screen and (max-width: $tablet) {
+    $lists-per-row: 2;
+    & {
+      width: calc((100% - #{($lists-per-row - 1) * 1rem}) / #{$lists-per-row});
+    }
+
+    &:nth-child(#{$lists-per-row}n) {
+      margin-right: 0;
+    }
+  }
+
+  @media screen and (max-width: $mobile) {
+    $lists-per-row: 1;
+    & {
+      width: 100%;
+      margin-right: 0;
+    }
+  }
+
+  .is-archived-container {
+    width: 100%;
+    text-align: right;
+
+    .is-archived {
+      font-size: .75rem;
+      float: left;
+    }
+  }
+
+  .title {
+    align-self: flex-end;
+    font-family: $vikunja-font;
+    font-weight: 400;
+    font-size: 1.5rem;
+    color: $text;
+    width: 100%;
+    margin-bottom: 0;
+    max-height: calc(100% - 2rem); // 1rem padding, 1rem height of the "is archived" badge
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+  }
+
+  &.has-light-text .title {
+    color: $light;
+  }
+
+  &.has-background {
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: center;
+
+    .title {
+      text-shadow: 0 0 10px $black, 1px 1px 5px $grey-700, -1px -1px 5px $grey-700;
+      color: $white;
+    }
+  }
+
+  .favorite {
+    transition: opacity $transition, color $transition;
+    opacity: 0;
+
+    &:hover {
+      color: $orange;
+    }
+
+    &.is-archived {
+      display: none;
+    }
+
+    &.is-favorite {
+      display: inline-block;
+      opacity: 1;
+      color: $orange;
+    }
+  }
+
+  &:hover .favorite {
+    opacity: 1;
+  }
+}
+
+.list-cards-wrapper-2-rows {
+  flex-wrap: wrap;
+  max-height: calc(#{$list-height * 2} + #{$list-spacing * 2});
+  overflow: hidden;
+}
diff --git a/src/styles/components/namespaces.scss b/src/styles/components/namespaces.scss
index e7b2e2cf5..2e63d051e 100644
--- a/src/styles/components/namespaces.scss
+++ b/src/styles/components/namespaces.scss
@@ -1,5 +1,3 @@
-$lists-per-row: 5;
-
 .namespaces-list {
   .button.new-namespace {
     float: right;
@@ -44,133 +42,6 @@ $lists-per-row: 5;
     .lists {
       display: flex;
       flex-flow: row wrap;
-
-      .list {
-        cursor: pointer;
-        width: calc((100% - #{($lists-per-row - 1) * 1rem}) / #{$lists-per-row});
-        height: 150px;
-        background: $white;
-        margin: 0 1rem 1rem 0;
-        padding: 1rem;
-        border-radius: $radius;
-        box-shadow: $shadow-sm;
-        transition: box-shadow $transition;
-
-        display: flex;
-        justify-content: space-between;
-        flex-wrap: wrap;
-
-        &:hover {
-          box-shadow: $shadow-md;
-        }
-
-        &:active,
-        &:focus,
-        &:focus:not(:active) {
-          box-shadow: $shadow-xs !important;
-        }
-
-        @media screen and (min-width: $widescreen) {
-          &:nth-child(#{$lists-per-row}n) {
-            margin-right: 0;
-          }
-        }
-
-        @media screen and (max-width: $widescreen) and (min-width: $tablet) {
-          $lists-per-row: 3;
-          & {
-            width: calc((100% - #{($lists-per-row - 1) * 1rem}) / #{$lists-per-row});
-          }
-
-          &:nth-child(#{$lists-per-row}n) {
-            margin-right: 0;
-          }
-        }
-
-        @media screen and (max-width: $tablet) {
-          $lists-per-row: 2;
-          & {
-            width: calc((100% - #{($lists-per-row - 1) * 1rem}) / #{$lists-per-row});
-          }
-
-          &:nth-child(#{$lists-per-row}n) {
-            margin-right: 0;
-          }
-        }
-
-        @media screen and (max-width: $mobile) {
-          $lists-per-row: 1;
-          & {
-            width: 100%;
-            margin-right: 0;
-          }
-        }
-
-        .is-archived-container {
-          width: 100%;
-          text-align: right;
-
-          .is-archived {
-            font-size: .75rem;
-            float: left;
-          }
-        }
-
-        .title {
-          align-self: flex-end;
-          font-family: $vikunja-font;
-          font-weight: 400;
-          font-size: 1.5rem;
-          color: $text;
-          width: 100%;
-          margin-bottom: 0;
-          max-height: calc(100% - 2rem); // 1rem padding, 1rem height of the "is archived" badge
-          overflow: hidden;
-          text-overflow: ellipsis;
-
-          display: -webkit-box;
-          -webkit-line-clamp: 3;
-          -webkit-box-orient: vertical;
-        }
-
-        &.has-light-text .title {
-          color: $light;
-        }
-
-        &.has-background {
-          background-size: cover;
-          background-repeat: no-repeat;
-          background-position: center;
-
-          .title {
-            text-shadow: 0 0 10px $black, 1px 1px 5px $grey-700, -1px -1px 5px $grey-700;
-            color: $white;
-          }
-        }
-
-        .favorite {
-          transition: opacity $transition, color $transition;
-          opacity: 0;
-
-          &:hover {
-            color: $orange;
-          }
-
-          &.is-archived {
-            display: none;
-          }
-
-          &.is-favorite {
-            display: inline-block;
-            opacity: 1;
-            color: $orange;
-          }
-        }
-
-        &:hover .favorite {
-          opacity: 1;
-        }
-      }
     }
   }
 }
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 325570b90..d2cbb2661 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -23,6 +23,17 @@
 				{{ $t('home.list.import') }}
 			</x-button>
 		</template>
+		<div v-if="listHistory.length > 0" class="is-max-width-desktop has-text-left">
+			<h3>{{ $t('home.lastViewed') }}</h3>
+			<div class="is-flex list-cards-wrapper-2-rows">
+				<list-card
+					v-for="(l, k) in listHistory"
+					:key="`l${k}`"
+					:list="l"
+					:background-resolver="() => null"
+				/>
+			</div>
+		</div>
 		<ShowTasks :show-all="true" v-if="hasLists"/>
 	</div>
 </template>
@@ -30,10 +41,13 @@
 <script>
 import {mapState} from 'vuex'
 import ShowTasks from './tasks/ShowTasks'
+import {getHistory} from '@/modules/listHistory'
+import ListCard from '@/components/list/partials/list-card'
 
 export default {
 	name: 'Home',
 	components: {
+		ListCard,
 		ShowTasks,
 	},
 	data() {
@@ -51,20 +65,26 @@ export default {
 				return 'Night'
 			}
 
-			if(now.getHours() < 11) {
+			if (now.getHours() < 11) {
 				return 'Morning'
 			}
 
-			if(now.getHours() < 18) {
+			if (now.getHours() < 18) {
 				return 'Day'
 			}
 
-			if(now.getHours() < 23) {
+			if (now.getHours() < 23) {
 				return 'Evening'
 			}
 
 			return 'Night'
 		},
+		listHistory() {
+			const history = getHistory()
+			return history.map(l => {
+				return this.$store.getters['lists/getListById'](l.id)
+			})
+		},
 		...mapState({
 			migratorsEnabled: state => state.config.availableMigrators !== null && state.config.availableMigrators.length > 0,
 			authenticated: state => state.auth.authenticated,
diff --git a/src/views/list/ShowList.vue b/src/views/list/ShowList.vue
index d27c5a563..e2ec94c3d 100644
--- a/src/views/list/ShowList.vue
+++ b/src/views/list/ShowList.vue
@@ -44,6 +44,7 @@ import ListModel from '../../models/list'
 import ListService from '../../services/list'
 import {CURRENT_LIST} from '@/store/mutation-types'
 import {getListView} from '@/helpers/saveListView'
+import {saveListToHistory} from '@/modules/listHistory'
 
 export default {
 	data() {
@@ -92,6 +93,10 @@ export default {
 				return
 			}
 
+			const listData = {id: this.$route.params.listId}
+
+			saveListToHistory(listData)
+
 			this.setTitle(this.currentList.title)
 
 			// This invalidates the loaded list at the kanban board which lets it reload its content when
@@ -134,7 +139,7 @@ export default {
 			console.debug(`Loading list, $route.name = ${this.$route.name}, $route.params =`, this.$route.params, `, listLoaded = ${this.listLoaded}, currentList = `, this.currentList)
 
 			// We create an extra list object instead of creating it in this.list because that would trigger a ui update which would result in bad ux.
-			let list = new ListModel({id: this.$route.params.listId})
+			const list = new ListModel(listData)
 			this.listService.get(list)
 				.then(r => {
 					this.$set(this, 'list', r)
diff --git a/src/views/namespaces/ListNamespaces.vue b/src/views/namespaces/ListNamespaces.vue
index 07b6984d9..c6f1d846c 100644
--- a/src/views/namespaces/ListNamespaces.vue
+++ b/src/views/namespaces/ListNamespaces.vue
@@ -53,37 +53,13 @@
 			</p>
 
 			<div class="lists">
-				<template v-for="l in n.lists">
-					<router-link
-						:class="{
-							'has-light-text': !colorIsDark(l.hexColor),
-							'has-background': typeof backgrounds[l.id] !== 'undefined',
-						}"
-						:key="`l${l.id}`"
-						:style="{
-							'background-color': l.hexColor,
-							'background-image': typeof backgrounds[l.id] !== 'undefined' ? `url(${backgrounds[l.id]})` : false,
-						}"
-						:to="{ name: 'list.index', params: { listId: l.id} }"
-						class="list"
-						tag="span"
-						v-if="showArchived ? true : !l.isArchived"
-					>
-						<div class="is-archived-container">
-							<span class="is-archived" v-if="l.isArchived">
-								{{ $t('namespace.archived') }}
-							</span>
-							<span
-								:class="{'is-favorite': l.isFavorite, 'is-archived': l.isArchived}"
-								@click.stop="toggleFavoriteList(l)"
-								class="favorite">
-								<icon icon="star" v-if="l.isFavorite"/>
-								<icon :icon="['far', 'star']" v-else/>
-							</span>
-						</div>
-						<div class="title">{{ l.title }}</div>
-					</router-link>
-				</template>
+				<list-card
+					v-for="l in n.lists"
+					:key="`l${l.id}`"
+					:list="l"
+					:show-archived="showArchived"
+					:background-resolver="lId =>  typeof backgrounds[lId] !== 'undefined' ? backgrounds[lId] : null"
+				/>
 			</div>
 		</div>
 	</div>
@@ -94,10 +70,12 @@ import {mapState} from 'vuex'
 import ListService from '../../services/list'
 import Fancycheckbox from '../../components/input/fancycheckbox'
 import {LOADING} from '@/store/mutation-types'
+import ListCard from '@/components/list/partials/list-card'
 
 export default {
 	name: 'ListNamespaces',
 	components: {
+		ListCard,
 		Fancycheckbox,
 	},
 	data() {
@@ -137,15 +115,6 @@ export default {
 				})
 			})
 		},
-		toggleFavoriteList(list) {
-			// The favorites pseudo list is always favorite
-			// Archived lists cannot be marked favorite
-			if (list.id === -1 || list.isArchived) {
-				return
-			}
-			this.$store.dispatch('lists/toggleListFavorite', list)
-				.catch(e => this.error(e))
-		},
 		saveShowArchivedState() {
 			localStorage.setItem('showArchived', JSON.stringify(this.showArchived))
 		},

From 8097ef93c14320f425c8a5935524ed2b17f0fb8c Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 6 Jul 2021 22:50:54 +0200
Subject: [PATCH 13/40] Load list background in list card

---
 src/components/list/partials/list-card.vue | 42 ++++++++++++++++++----
 src/views/namespaces/ListNamespaces.vue    | 21 -----------
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/components/list/partials/list-card.vue b/src/components/list/partials/list-card.vue
index 053e6528f..8cf8d2d39 100644
--- a/src/components/list/partials/list-card.vue
+++ b/src/components/list/partials/list-card.vue
@@ -2,16 +2,16 @@
 	<router-link
 		:class="{
 			'has-light-text': !colorIsDark(list.hexColor),
-			'has-background': backgroundResolver(list.id) !== null
+			'has-background': background !== null
 		}"
 		:style="{
 			'background-color': list.hexColor,
-			'background-image': backgroundResolver(list.id) !== null ? `url(${backgroundResolver(list.id)})` : false,
+			'background-image': background !== null ? `url(${background})` : false,
 		}"
 		:to="{ name: 'list.index', params: { listId: list.id} }"
 		class="list-card"
 		tag="span"
-		v-if="showArchived ? true : !list.isArchived"
+		v-if="list !== null && (showArchived ? true : !list.isArchived)"
 	>
 		<div class="is-archived-container">
 			<span class="is-archived" v-if="list.isArchived">
@@ -30,8 +30,16 @@
 </template>
 
 <script>
+import ListService from '@/services/list'
+
 export default {
 	name: 'list-card',
+	data() {
+		return {
+			background: null,
+			backgroundLoading: false,
+		}
+	},
 	props: {
 		list: {
 			required: true,
@@ -40,13 +48,33 @@ export default {
 			default: false,
 			type: Boolean,
 		},
-		// A function, returning a background blob or null if none exists for that list.
-		// Receives the list id as parameter.
-		backgroundResolver: {
-			required: true,
+	},
+	watch: {
+		list() {
+			this.loadBackground()
 		},
 	},
+	created() {
+		this.loadBackground()
+	},
 	methods: {
+		loadBackground() {
+			if (this.list === null || !this.list.backgroundInformation || this.backgroundLoading) {
+				return
+			}
+
+			this.backgroundLoading = true
+
+			const listService = new ListService()
+			listService.background(this.list)
+				.then(b => {
+					this.$set(this, 'background', b)
+				})
+				.catch(e => {
+					this.error(e)
+				})
+				.finally(() => this.backgroundLoading = false)
+		},
 		toggleFavoriteList(list) {
 			// The favorites pseudo list is always favorite
 			// Archived lists cannot be marked favorite
diff --git a/src/views/namespaces/ListNamespaces.vue b/src/views/namespaces/ListNamespaces.vue
index c6f1d846c..d8fe0fd59 100644
--- a/src/views/namespaces/ListNamespaces.vue
+++ b/src/views/namespaces/ListNamespaces.vue
@@ -58,7 +58,6 @@
 					:key="`l${l.id}`"
 					:list="l"
 					:show-archived="showArchived"
-					:background-resolver="lId =>  typeof backgrounds[lId] !== 'undefined' ? backgrounds[lId] : null"
 				/>
 			</div>
 		</div>
@@ -67,7 +66,6 @@
 
 <script>
 import {mapState} from 'vuex'
-import ListService from '../../services/list'
 import Fancycheckbox from '../../components/input/fancycheckbox'
 import {LOADING} from '@/store/mutation-types'
 import ListCard from '@/components/list/partials/list-card'
@@ -81,13 +79,10 @@ export default {
 	data() {
 		return {
 			showArchived: false,
-			// listId is the key, the object is the background blob
-			backgrounds: {},
 		}
 	},
 	created() {
 		this.showArchived = JSON.parse(localStorage.getItem('showArchived')) ?? false
-		this.loadBackgroundsForLists()
 	},
 	mounted() {
 		this.setTitle(this.$t('namespace.title'))
@@ -99,22 +94,6 @@ export default {
 		loading: LOADING,
 	}),
 	methods: {
-		loadBackgroundsForLists() {
-			const listService = new ListService()
-			this.namespaces.forEach(n => {
-				n.lists.forEach(l => {
-					if (l.backgroundInformation) {
-						listService.background(l)
-							.then(b => {
-								this.$set(this.backgrounds, l.id, b)
-							})
-							.catch(e => {
-								this.error(e)
-							})
-					}
-				})
-			})
-		},
 		saveShowArchivedState() {
 			localStorage.setItem('showArchived', JSON.stringify(this.showArchived))
 		},

From c094b5175a0c7c2308cff7d4917685088b4695bb Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 6 Jul 2021 22:58:06 +0200
Subject: [PATCH 14/40] Show recently visited lists in quick actions

---
 src/components/quick-actions/quick-actions.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/quick-actions/quick-actions.vue b/src/components/quick-actions/quick-actions.vue
index 2e9a8b2cb..a428e762f 100644
--- a/src/components/quick-actions/quick-actions.vue
+++ b/src/components/quick-actions/quick-actions.vue
@@ -63,6 +63,7 @@ import {CURRENT_LIST, LOADING, LOADING_MODULE, QUICK_ACTIONS_ACTIVE} from '@/sto
 import ListModel from '@/models/list'
 import createTask from '@/components/tasks/mixins/createTask'
 import QuickAddMagic from '@/components/tasks/partials/quick-add-magic'
+import {getHistory} from '@/modules/listHistory'
 
 const TYPE_LIST = 'list'
 const TYPE_TASK = 'task'
@@ -117,7 +118,15 @@ export default {
 
 				const ncache = {}
 
-				lists = (Object.values(this.$store.state.lists).filter(l => {
+				const history = getHistory()
+				// Puts recently visited lists at the top
+				const allLists = [...new Set([
+					...history.map(l => {
+						return this.$store.getters['lists/getListById'](l.id)
+					}),
+					...Object.values(this.$store.state.lists)])]
+
+				lists = (allLists.filter(l => {
 					if (l.isArchived) {
 						return false
 					}

From 9b4efc773b9036d4d97b7600b973da92ee375b0b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 7 Jul 2021 10:19:37 +0200
Subject: [PATCH 15/40] Fix home page tests

---
 cypress/integration/misc/home.spec.js         | 35 +++++++++++++++++++
 cypress/integration/user/login.spec.js        |  1 +
 cypress/integration/user/registration.spec.js |  1 +
 3 files changed, 37 insertions(+)
 create mode 100644 cypress/integration/misc/home.spec.js

diff --git a/cypress/integration/misc/home.spec.js b/cypress/integration/misc/home.spec.js
new file mode 100644
index 000000000..82cbeed22
--- /dev/null
+++ b/cypress/integration/misc/home.spec.js
@@ -0,0 +1,35 @@
+import '../../support/authenticateUser'
+
+const setHours = hours => {
+	const date = new Date()
+	date.setHours(hours)
+	cy.clock(+date)
+}
+
+describe('Home Page', () => {
+	it('shows the right salutation in the night', () => {
+		setHours(4)
+		cy.visit('/')
+		cy.get('h2').should('contain', 'Good Night')
+	})
+	it('shows the right salutation in the morning', () => {
+		setHours(8)
+		cy.visit('/')
+		cy.get('h2').should('contain', 'Good Morning')
+	})
+	it('shows the right salutation in the day', () => {
+		setHours(13)
+		cy.visit('/')
+		cy.get('h2').should('contain', 'Hi')
+	})
+	it('shows the right salutation in the night', () => {
+		setHours(20)
+		cy.visit('/')
+		cy.get('h2').should('contain', 'Good Evening')
+	})
+	it('shows the right salutation in the night again', () => {
+		setHours(23)
+		cy.visit('/')
+		cy.get('h2').should('contain', 'Good Night')
+	})
+})
\ No newline at end of file
diff --git a/cypress/integration/user/login.spec.js b/cypress/integration/user/login.spec.js
index d1cde64ef..ce6086ce0 100644
--- a/cypress/integration/user/login.spec.js
+++ b/cypress/integration/user/login.spec.js
@@ -34,6 +34,7 @@ context('Login', () => {
 		cy.get('input[id=password]').type(fixture.password)
 		cy.get('.button').contains('Login').click()
 		cy.url().should('include', '/')
+		cy.clock(1625656161057) // 13:00
 		cy.get('h2').should('contain', `Hi ${fixture.username}!`)
 	})
 
diff --git a/cypress/integration/user/registration.spec.js b/cypress/integration/user/registration.spec.js
index 37c238e34..3e7cf1f54 100644
--- a/cypress/integration/user/registration.spec.js
+++ b/cypress/integration/user/registration.spec.js
@@ -28,6 +28,7 @@ context('Registration', () => {
 		cy.get('#password2').type(fixture.password)
 		cy.get('#register-submit').click()
 		cy.url().should('include', '/')
+		cy.clock(1625656161057) // 13:00
 		cy.get('h2').should('contain', `Hi ${fixture.username}!`)
 	})
 

From f3d42950495b0f5fef562f89d350a22fa38b16c2 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 7 Jul 2021 10:26:31 +0200
Subject: [PATCH 16/40] Add frontend tests for list history

---
 cypress/integration/list/list.spec.js | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/cypress/integration/list/list.spec.js b/cypress/integration/list/list.spec.js
index 843d82913..57e98b15d 100644
--- a/cypress/integration/list/list.spec.js
+++ b/cypress/integration/list/list.spec.js
@@ -511,4 +511,34 @@ describe('Lists', () => {
 				.should('not.contain', task.title)
 		})
 	})
+
+	describe('List history', () => {
+		it('should show a list history on the home page', () => {
+			const lists = ListFactory.create(6)
+
+			cy.visit('/')
+			cy.get('h3')
+				.contains('Last viewed')
+				.should('not.exist')
+
+			cy.visit(`/lists/${lists[0].id}`)
+			cy.visit(`/lists/${lists[1].id}`)
+			cy.visit(`/lists/${lists[2].id}`)
+			cy.visit(`/lists/${lists[3].id}`)
+			cy.visit(`/lists/${lists[4].id}`)
+			cy.visit(`/lists/${lists[5].id}`)
+
+			cy.visit('/')
+			cy.get('h3')
+				.contains('Last viewed')
+				.should('exist')
+			cy.get('.list-cards-wrapper-2-rows')
+				.should('not.contain', lists[0].title)
+				.should('contain', lists[1].title)
+				.should('contain', lists[2].title)
+				.should('contain', lists[3].title)
+				.should('contain', lists[4].title)
+				.should('contain', lists[5].title)
+		})
+	})
 })

From b8c1086c4a29a85e91aa79068f991c77687431a4 Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Wed, 7 Jul 2021 09:26:38 +0000
Subject: [PATCH 17/40] Update Node.js to v16.4.1 (#576)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/576
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b29baf8db..cce95eede 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build application
-FROM node:16.3.0 AS compile-image
+FROM node:16.4.1 AS compile-image
 
 WORKDIR /build
 

From c3f91a044932e3e1a1976e5fe195b03e5127e31e Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Wed, 7 Jul 2021 15:12:41 +0000
Subject: [PATCH 18/40] Update dependency cypress to v7.7.0 (#577)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/577
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3d822e280..249cd7dd3 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@vue/cli-service": "4.5.13",
     "axios": "0.21.1",
     "babel-eslint": "10.1.0",
-    "cypress": "7.6.0",
+    "cypress": "7.7.0",
     "cypress-file-upload": "5.0.8",
     "eslint": "7.30.0",
     "eslint-plugin-vue": "7.13.0",
diff --git a/yarn.lock b/yarn.lock
index 653292936..468d4f350 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5397,10 +5397,10 @@ cypress-file-upload@5.0.8:
   resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1"
   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==
 
-cypress@7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.6.0.tgz#80fe7496cd4165a0fa06e25fc11413dda4544463"
-  integrity sha512-tTwQExY28CKt6cY85/2V1uLExcMfpBEBWXt/EcE2ht/Onl9k4lxUS7ul1UnUO5MrYwMIHMdGVh13DxdzXj4Z5w==
+cypress@7.7.0:
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.7.0.tgz#0839ae28e5520536f9667d6c9ae81496b3836e64"
+  integrity sha512-uYBYXNoI5ym0UxROwhQXWTi8JbUEjpC6l/bzoGZNxoKGsLrC1SDPgIDJMgLX/MeEdPL0UInXLDUWN/rSyZUCjQ==
   dependencies:
     "@cypress/request" "^2.88.5"
     "@cypress/xvfb" "^1.2.4"

From 304ba797a0a5ea4f7ef5cb1749ad3391db30eba0 Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Wed, 7 Jul 2021 19:16:32 +0000
Subject: [PATCH 19/40] Update Node.js to v16.4.2 (#578)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/578
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cce95eede..f83b1adae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build application
-FROM node:16.4.1 AS compile-image
+FROM node:16.4.2 AS compile-image
 
 WORKDIR /build
 

From ac6082a670daf08d97cf838340cd3e19f0c174a8 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 7 Jul 2021 21:58:29 +0200
Subject: [PATCH 20/40] Add collapsing kanban buckets

---
 src/helpers/saveCollapsedBucketState.js | 30 +++++++++++++++++++
 src/i18n/lang/en.json                   |  3 +-
 src/styles/components/kanban.scss       | 17 ++++++++++-
 src/views/list/views/Kanban.vue         | 39 +++++++++++++++++++++----
 4 files changed, 81 insertions(+), 8 deletions(-)
 create mode 100644 src/helpers/saveCollapsedBucketState.js

diff --git a/src/helpers/saveCollapsedBucketState.js b/src/helpers/saveCollapsedBucketState.js
new file mode 100644
index 000000000..df44a8802
--- /dev/null
+++ b/src/helpers/saveCollapsedBucketState.js
@@ -0,0 +1,30 @@
+const key = 'collapsedBuckets'
+
+const getAllState = () => {
+	const saved = localStorage.getItem(key)
+	if (saved === null) {
+		return {}
+	}
+
+	return JSON.parse(saved)
+}
+
+export const saveCollapsedBucketState = (listId, collapsedBuckets) => {
+	const state = getAllState()
+	state[listId] = collapsedBuckets
+	for (const bucketId in state[listId]) {
+		if (!state[listId][bucketId]) {
+			delete state[listId][bucketId]
+		}
+	}
+	localStorage.setItem(key, JSON.stringify(state))
+}
+
+export const getCollapsedBucketState = listId => {
+	const state = getAllState()
+	if (typeof state[listId] !== 'undefined') {
+		return state[listId]
+	}
+
+	return {}
+}
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index ec7cdf76e..fdebc1893 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -243,7 +243,8 @@
       "deleteBucketText2": "This will not delete any tasks but move them into the default bucket.",
       "deleteBucketSuccess": "The bucket has been deleted successfully.",
       "bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
-      "bucketLimitSavedSuccess": "The bucket limit been saved successfully."
+      "bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
+      "collapse": "Collapse this bucket"
     }
   },
   "namespace": {
diff --git a/src/styles/components/kanban.scss b/src/styles/components/kanban.scss
index 758d6696a..2f2c9908f 100644
--- a/src/styles/components/kanban.scss
+++ b/src/styles/components/kanban.scss
@@ -2,6 +2,8 @@ $bucket-background: $grey-100;
 $task-background: $white;
 $ease-out: all .3s cubic-bezier(0.23, 1, 0.32, 1);
 $bucket-width: 300px;
+$bucket-header-height: 60px;
+$bucket-right-margin: 1rem;
 
 $crazy-height-calculation: '100vh - 4.5rem - 1.5rem - 1rem - 1.5rem - 11px';
 $crazy-height-calculation-tasks: '#{$crazy-height-calculation} - 1rem - 2.5rem - 2rem - #{$button-height} - 1rem';
@@ -31,7 +33,7 @@ $filter-container-height: '1rem - #{$switch-view-height}';
     position: relative;
 
     flex: 0 0 $bucket-width;
-    margin: 0 1rem 0 0;
+    margin: 0 $bucket-right-margin 0 0;
     max-height: 100%;
     min-height: 20px;
     max-width: $bucket-width;
@@ -233,6 +235,18 @@ $filter-container-height: '1rem - #{$switch-view-height}';
     a.dropdown-item {
       padding-right: 1rem;
     }
+
+    &.is-collapsed {
+      transform: rotate(90deg) translateX($bucket-width / 2 - $bucket-header-height / 2);
+      // Using negative margins instead of translateY here to make all other buckets fill the empty space
+      margin-left: ($bucket-width / 2 - $bucket-header-height / 2) * -1;
+      margin-right: calc(#{($bucket-width / 2 - $bucket-header-height / 2) * -1} + #{$bucket-right-margin});
+      cursor: pointer;
+
+      .tasks, .bucket-footer {
+        display: none;
+      }
+    }
   }
 
   .bucket-header {
@@ -240,6 +254,7 @@ $filter-container-height: '1rem - #{$switch-view-height}';
     align-items: center;
     justify-content: space-between;
     padding: .5rem;
+    height: $bucket-header-height;
 
     .limit {
       padding-left: .5rem;
diff --git a/src/views/list/views/Kanban.vue b/src/views/list/views/Kanban.vue
index b9bea14e2..3aa6b6e13 100644
--- a/src/views/list/views/Kanban.vue
+++ b/src/views/list/views/Kanban.vue
@@ -17,8 +17,13 @@
 			/>
 		</div>
 		<div :class="{ 'is-loading': loading && !oneTaskUpdating}" class="kanban loader-container">
-			<div :key="`bucket${bucket.id}`" class="bucket" v-for="bucket in buckets">
-				<div class="bucket-header">
+			<div
+				:key="`bucket${bucket.id}`"
+				class="bucket"
+				:class="{'is-collapsed': collapsedBuckets[bucket.id]}"
+				v-for="bucket in buckets"
+			>
+				<div class="bucket-header" @click="() => unCollapseBucket(bucket)">
 					<span
 						v-if="bucket.isDoneBucket"
 						class="icon is-small has-text-success mr-2"
@@ -31,7 +36,7 @@
 						@focusout="() => saveBucketTitle(bucket.id)"
 						@keydown.enter.prevent.stop="() => saveBucketTitle(bucket.id)"
 						class="title input"
-						:contenteditable="canWrite"
+						:contenteditable="canWrite && !collapsedBuckets[bucket.id]"
 						spellcheck="false">{{ bucket.title }}</h2>
 					<span
 						:class="{'is-max': bucket.tasks.length >= bucket.limit}"
@@ -41,7 +46,7 @@
 					</span>
 					<dropdown
 						class="is-right options"
-						v-if="canWrite"
+						v-if="canWrite && !collapsedBuckets[bucket.id]"
 						trigger-icon="ellipsis-v"
 						@close="() => showSetLimitInput = false"
 					>
@@ -77,7 +82,7 @@
 							</template>
 						</a>
 						<a
-							@click="toggleDoneBucket(bucket)"
+							@click.stop="toggleDoneBucket(bucket)"
 							class="dropdown-item"
 							v-tooltip="$t('list.kanban.doneBucketHintExtended')"
 						>
@@ -85,9 +90,15 @@
 								icon="check-double"/></span>
 							{{ $t('list.kanban.doneBucket') }}
 						</a>
+						<a
+							class="dropdown-item"
+							@click.stop="() => collapseBucket(bucket)"
+						>
+							{{ $t('list.kanban.collapse') }}
+						</a>
 						<a
 							:class="{'is-disabled': buckets.length <= 1}"
-							@click="() => deleteBucketModal(bucket.id)"
+							@click.stop="() => deleteBucketModal(bucket.id)"
 							class="dropdown-item has-text-danger"
 							v-tooltip="buckets.length <= 1 ? $t('list.kanban.deleteLast') : ''"
 						>
@@ -283,6 +294,7 @@ import FilterPopup from '@/components/list/partials/filter-popup'
 import Dropdown from '@/components/misc/dropdown'
 import {playPop} from '@/helpers/playPop'
 import createTask from '@/components/tasks/mixins/createTask'
+import {getCollapsedBucketState, saveCollapsedBucketState} from '@/helpers/saveCollapsedBucketState'
 
 export default {
 	name: 'Kanban',
@@ -315,6 +327,7 @@ export default {
 			showNewBucketInput: false,
 			newTaskError: {},
 			showSetLimitInput: false,
+			collapsedBuckets: {},
 
 			// We're using this to show the loading animation only at the task when updating it
 			taskUpdating: {},
@@ -369,6 +382,8 @@ export default {
 				return
 			}
 
+			this.collapsedBuckets = getCollapsedBucketState(this.$route.params.listId)
+
 			console.debug(`Loading buckets, loadedListId = ${this.loadedListId}, $route.params =`, this.$route.params)
 			this.filtersChanged = false
 
@@ -612,6 +627,18 @@ export default {
 					bucket.isDoneBucket = !bucket.isDoneBucket
 				})
 		},
+		collapseBucket(bucket) {
+			this.$set(this.collapsedBuckets, bucket.id, true)
+			saveCollapsedBucketState(this.$route.params.listId, this.collapsedBuckets)
+		},
+		unCollapseBucket(bucket) {
+			if (!this.collapsedBuckets[bucket.id]) {
+				return
+			}
+
+			this.$set(this.collapsedBuckets, bucket.id, false)
+			saveCollapsedBucketState(this.$route.params.listId, this.collapsedBuckets)
+		},
 	},
 }
 </script>

From b6bc410346e05c0e002d5fb7e19438518ba85b17 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 7 Jul 2021 22:13:21 +0200
Subject: [PATCH 21/40] Add a button to copy an attachment url from the
 attachment overview

---
 src/components/tasks/mixins/attachmentUpload.js |  3 ++-
 src/components/tasks/partials/attachments.vue   | 17 ++++++++++++++---
 src/helpers/generateAttachmentUrl.js            |  3 +++
 src/i18n/lang/en.json                           |  6 +++++-
 4 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 src/helpers/generateAttachmentUrl.js

diff --git a/src/components/tasks/mixins/attachmentUpload.js b/src/components/tasks/mixins/attachmentUpload.js
index 1e08e0fc4..4ba368822 100644
--- a/src/components/tasks/mixins/attachmentUpload.js
+++ b/src/components/tasks/mixins/attachmentUpload.js
@@ -1,5 +1,6 @@
 import AttachmentModel from '../../../models/attachment'
 import AttachmentService from '../../../services/attachment'
+import {generateAttachmentUrl} from '@/helpers/generateAttachmentUrl'
 
 export default {
 	methods: {
@@ -21,7 +22,7 @@ export default {
 								taskId: this.taskId,
 								attachment: a,
 							})
-							onSuccess(`${window.API_URL}/tasks/${this.taskId}/attachments/${a.id}`)
+							onSuccess(generateAttachmentUrl(this.taskId, a.id))
 						})
 					}
 					if (r.errors !== null) {
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index 2f76ae3c7..52f49fa6f 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -55,14 +55,20 @@
 					<p>
 						<a
 							@click.prevent.stop="downloadAttachment(a)"
-							v-tooltip="'Download this attachment'"
+							v-tooltip="$t('task.attachment.downloadTooltip')"
 						>
 							{{ $t('task.attachment.download') }}
 						</a>
+						<a
+							@click.stop="copyUrl(a)"
+							v-tooltip="$t('task.attachment.copyUrlTooltip')"
+						>
+							{{ $t('task.attachment.copyUrl') }}
+						</a>
 						<a
 							@click.prevent.stop="() => {attachmentToDelete = a; showDeleteModal = true}"
 							v-if="editEnabled"
-							v-tooltip="'Delete this attachment'"
+							v-tooltip="$t('task.attachment.deleteTooltip')"
 						>
 							{{ $t('misc.delete') }}
 						</a>
@@ -106,7 +112,7 @@
 			>
 				<span slot="header">{{ $t('task.attachment.delete') }}</span>
 				<p slot="text">
-					{{ $t('task.attachment.deleteText1', {filename: attachmentUpload.file.name}) }}<br/>
+					{{ $t('task.attachment.deleteText1', {filename: attachmentToDelete.file.name}) }}<br/>
 					<strong>{{ $t('task.attachment.deleteText2') }}</strong>
 				</p>
 			</modal>
@@ -133,7 +139,9 @@ import AttachmentService from '../../../services/attachment'
 import AttachmentModel from '../../../models/attachment'
 import User from '../../misc/user'
 import attachmentUpload from '@/components/tasks/mixins/attachmentUpload'
+import {generateAttachmentUrl} from '@/helpers/generateAttachmentUrl'
 import {mapState} from 'vuex'
+import copy from 'copy-to-clipboard'
 
 export default {
 	name: 'attachments',
@@ -247,6 +255,9 @@ export default {
 				this.downloadAttachment(attachment)
 			}
 		},
+		copyUrl(attachment) {
+			copy(generateAttachmentUrl(this.taskId, attachment.id))
+		},
 	},
 }
 </script>
diff --git a/src/helpers/generateAttachmentUrl.js b/src/helpers/generateAttachmentUrl.js
new file mode 100644
index 000000000..40c1e1efc
--- /dev/null
+++ b/src/helpers/generateAttachmentUrl.js
@@ -0,0 +1,3 @@
+export const generateAttachmentUrl = (taskId, attachmentId) => {
+	return `${window.API_URL}/tasks/${taskId}/attachments/${attachmentId}`
+}
\ No newline at end of file
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index fdebc1893..fe007a663 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -529,11 +529,15 @@
       "title": "Attachments",
       "createdBy": "created {0} by {1}",
       "download": "Download",
+      "downloadTooltip": "Download this attachment",
       "upload": "Upload attachment",
       "drop": "Drop files here to upload",
       "delete": "Delete attachment",
+      "deleteTooltip": "Delete this attachment",
       "deleteText1": "Are you sure you want to delete the attachment {filename}?",
-      "deleteText2": "This cannot be undone!"
+      "deleteText2": "This cannot be undone!",
+      "copyUrl": "Copy URL",
+      "copyUrlTooltip": "Copy the url of this attachment for usage in text"
     },
     "comment": {
       "title": "Comments",

From 9f9016e17b55003a7341e4e3b9bd3760b690e8af Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Wed, 7 Jul 2021 20:38:08 +0000
Subject: [PATCH 22/40] Update dependency sass to v1.35.2 (#579)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/579
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 249cd7dd3..38208a235 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "lodash": "4.17.21",
     "marked": "2.1.3",
     "register-service-worker": "1.7.2",
-    "sass": "1.35.1",
+    "sass": "1.35.2",
     "snake-case": "3.0.4",
     "verte": "0.0.12",
     "vue": "2.6.14",
diff --git a/yarn.lock b/yarn.lock
index 468d4f350..027630515 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11870,10 +11870,10 @@ sass-loader@10.2.0:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@1.35.1:
-  version "1.35.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.1.tgz#90ecf774dfe68f07b6193077e3b42fb154b9e1cd"
-  integrity sha512-oCisuQJstxMcacOPmxLNiLlj4cUyN2+8xJnG7VanRoh2GOLr9RqkvI4AxA4a6LHVg/rsu+PmxXeGhrdSF9jCiQ==
+sass@1.35.2:
+  version "1.35.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821"
+  integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
 

From 21e96a08c9220ac42d4875c7f16d1b6e2f23e70d Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 7 Jul 2021 22:39:35 +0200
Subject: [PATCH 23/40] Change the docker builder image to a working one on arm

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f83b1adae..d73a4fe80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build application
-FROM node:16.4.2 AS compile-image
+FROM node:16 AS compile-image
 
 WORKDIR /build
 

From 096fc0bbc84ff14ca459cd0044baf971f8e45d40 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 9 Jul 2021 09:48:33 +0200
Subject: [PATCH 24/40] Fix tests failing on thursdays

---
 src/helpers/parseTaskText.test.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/helpers/parseTaskText.test.js b/src/helpers/parseTaskText.test.js
index 459ad628d..94382558f 100644
--- a/src/helpers/parseTaskText.test.js
+++ b/src/helpers/parseTaskText.test.js
@@ -168,7 +168,6 @@ describe('Parse Task Text', () => {
 			const nextThursday = new Date()
 			nextThursday.setDate(nextThursday.getDate() + ((4 + 7 - nextThursday.getDay()) % 7))
 			expect(`${result.date.getFullYear()}-${result.date.getMonth()}-${result.date.getDate()}`).toBe(`${nextThursday.getFullYear()}-${nextThursday.getMonth()}-${nextThursday.getDate()}`)
-			expect(+new Date(result.date)).toBeGreaterThan(+new Date() - 10) // In on thursdays, this may be different by one second and thus fails the test
 		})
 		it('should recognize weekdays with time', () => {
 			const result = parseTaskText('Lorem Ipsum thu at 14:00')
@@ -178,7 +177,6 @@ describe('Parse Task Text', () => {
 			nextThursday.setDate(nextThursday.getDate() + ((4 + 7 - nextThursday.getDay()) % 7))
 			expect(`${result.date.getFullYear()}-${result.date.getMonth()}-${result.date.getDate()}`).toBe(`${nextThursday.getFullYear()}-${nextThursday.getMonth()}-${nextThursday.getDate()}`)
 			expect(`${result.date.getHours()}:${result.date.getMinutes()}`).toBe('14:0')
-			expect(+new Date(result.date)).toBeGreaterThan(+new Date() - 10) // In on thursdays, this may be different by one second and thus fails the test
 		})
 		it('should recognize dates of the month in the past but next month', () => {
 			const date = new Date()

From 7355204d2f7367a52d27b5079087b231c6caf5ae Mon Sep 17 00:00:00 2001
From: andreymal <andriyano-31@mail.ru>
Date: Fri, 9 Jul 2021 08:22:20 +0000
Subject: [PATCH 25/40] Improve some translations (#581)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/581
Reviewed-by: konrad <konrad@kola-entertainments.de>
Co-authored-by: andreymal <andriyano-31@mail.ru>
Co-committed-by: andreymal <andriyano-31@mail.ru>
---
 src/components/home/navigation.vue             |  6 +++---
 src/components/home/topNavigation.vue          |  2 +-
 src/components/input/editor.vue                |  6 +++---
 src/components/list/partials/filters.vue       |  2 +-
 src/components/notifications/notifications.vue |  2 +-
 src/components/sharing/linkSharing.vue         |  2 +-
 src/helpers/getListTitle.js                    |  6 ++++++
 src/helpers/getNamespaceTitle.js               | 12 ++++++++++++
 src/i18n/lang/en.json                          | 18 ++++++++++++++++++
 src/main.js                                    |  8 ++++++++
 src/store/index.js                             |  5 +----
 src/views/list/ShowList.vue                    |  5 +++--
 src/views/namespaces/ListNamespaces.vue        |  2 +-
 src/views/tasks/TaskDetailView.vue             |  4 ++--
 14 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 src/helpers/getListTitle.js
 create mode 100644 src/helpers/getNamespaceTitle.js

diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 65b045088..ed91c1771 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -54,14 +54,14 @@
 					<span
 						@click="toggleLists(n.id)"
 						class="menu-label"
-						v-tooltip="n.title + ' (' + n.lists.filter(l => !l.isArchived).length + ')'">
+						v-tooltip="getNamespaceTitle(n) + ' (' + n.lists.filter(l => !l.isArchived).length + ')'">
 						<span class="name">
 							<span
 								:style="{ backgroundColor: n.hexColor }"
 								class="color-bubble"
 								v-if="n.hexColor !== ''">
 							</span>
-							{{ n.title }} ({{ n.lists.filter(l => !l.isArchived).length }})
+							{{ getNamespaceTitle(n) }} ({{ n.lists.filter(l => !l.isArchived).length }})
 						</span>
 					</span>
 					<a
@@ -91,7 +91,7 @@
 										v-if="l.hexColor !== ''">
 									</span>
 									<span class="list-menu-title">
-										{{ l.title }}
+										{{ getListTitle(l) }}
 									</span>
 									<span
 										:class="{'is-favorite': l.isFavorite}"
diff --git a/src/components/home/topNavigation.vue b/src/components/home/topNavigation.vue
index 4f09ea71f..dc6f60a3c 100644
--- a/src/components/home/topNavigation.vue
+++ b/src/components/home/topNavigation.vue
@@ -30,7 +30,7 @@
 				<h1
 					:style="{ 'opacity': currentList.title === '' ? '0': '1' }"
 					class="title">
-					{{ currentList.title === '' ? $t('misc.loading') : currentList.title }}
+					{{ currentList.title === '' ? $t('misc.loading') : getListTitle(currentList) }}
 				</h1>
 
 				<list-settings-dropdown v-if="canWriteCurrentList && currentList.id !== -1" :list="currentList"/>
diff --git a/src/components/input/editor.vue b/src/components/input/editor.vue
index 068799901..4b9ced964 100644
--- a/src/components/input/editor.vue
+++ b/src/components/input/editor.vue
@@ -35,15 +35,15 @@
 		<p class="has-text-centered has-text-grey is-italic" v-if="isPreviewActive && text === '' && emptyText !== ''">
 			{{ emptyText }}
 			<template v-if="isEditEnabled">
-				<a @click="toggleEdit">Edit</a>.
+				<a @click="toggleEdit">{{ $t('input.editor.edit') }}</a>.
 			</template>
 		</p>
 
 		<ul class="actions">
 			<template v-if="hasEditBottom && isEditEnabled">
 				<li>
-					<a v-if="!isEditActive" @click="toggleEdit">Edit</a>
-					<a v-else @click="toggleEdit">Done</a>
+					<a v-if="!isEditActive" @click="toggleEdit">{{ $t('input.editor.edit') }}</a>
+					<a v-else @click="toggleEdit">{{ $t('input.editor.done') }}</a>
 				</li>
 			</template>
 			<li v-for="(action, k) in bottomActions" :key="k">
diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 1bb586593..b2f54f30f 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -130,7 +130,7 @@
 		</div>
 
 		<div class="field">
-			<label class="label">{{ $t('task.attributes.label') }}</label>
+			<label class="label">{{ $t('task.attributes.labels') }}</label>
 			<div class="control">
 				<multiselect
 					:placeholder="$t('label.search')"
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 21049a3fb..315f14ac7 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -9,7 +9,7 @@
 
 		<transition name="fade">
 			<div class="notifications-list" v-if="showNotifications" ref="popup">
-				<span class="head">Notifications</span>
+				<span class="head">{{ $t('notification.title') }}</span>
 				<div
 					v-for="(n, index) in notifications"
 					:key="n.id"
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index d7fb695c4..dd33cecbf 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -62,7 +62,7 @@
 							id="linkSharePassword"
 							type="password"
 							class="input"
-							:placeholder="$t('user.auth.passwortPlaceholder')"
+							:placeholder="$t('user.auth.passwordPlaceholder')"
 							v-tooltip="$t('list.share.links.passwordExplanation')"
 							v-model="password"
 						/>
diff --git a/src/helpers/getListTitle.js b/src/helpers/getListTitle.js
new file mode 100644
index 000000000..35c943e32
--- /dev/null
+++ b/src/helpers/getListTitle.js
@@ -0,0 +1,6 @@
+export const getListTitle = (l, $t) => {
+	if (l.id === -1) {
+		return $t('list.pseudo.favorites.title');
+	}
+	return l.title;
+}
diff --git a/src/helpers/getNamespaceTitle.js b/src/helpers/getNamespaceTitle.js
new file mode 100644
index 000000000..21fe7b7e4
--- /dev/null
+++ b/src/helpers/getNamespaceTitle.js
@@ -0,0 +1,12 @@
+export const getNamespaceTitle = (n, $t) => {
+	if (n.id === -1) {
+		return $t('namespace.pseudo.sharedLists.title');
+	}
+	if (n.id === -2) {
+		return $t('namespace.pseudo.favorites.title');
+	}
+	if (n.id === -3) {
+		return $t('namespace.pseudo.savedFilters.title');
+	}
+	return n.title;
+}
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index fe007a663..889ed5e9a 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -245,6 +245,11 @@
       "bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
       "bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
       "collapse": "Collapse this bucket"
+    },
+    "pseudo": {
+      "favorites": {
+        "title": "Favorites"
+      }
     }
   },
   "namespace": {
@@ -294,6 +299,17 @@
       "color": "Color",
       "archived": "Is Archived",
       "isArchived": "This namespace is archived"
+    },
+    "pseudo": {
+      "sharedLists": {
+        "title": "Shared Lists"
+      },
+      "favorites": {
+        "title": "Favorites"
+      },
+      "savedFilters": {
+        "title": "Filters"
+      }
     }
   },
   "filters": {
@@ -414,6 +430,7 @@
       "chooseDate": "Choose a date"
     },
     "editor": {
+      "edit": "Edit",
       "done": "Done",
       "heading1": "Heading 1",
       "heading2": "Heading 2",
@@ -716,6 +733,7 @@
     "contact": "contact us"
   },
   "notification": {
+    "title": "Notifications",
     "none": "You don't have any notifications. Have a nice day!",
     "explainer": "Notifications will appear here when actions on namespaces, lists or tasks you subscribed to happen."
   },
diff --git a/src/main.js b/src/main.js
index ce389dcf0..7475e9575 100644
--- a/src/main.js
+++ b/src/main.js
@@ -85,6 +85,8 @@ import vueShortkey from 'vue-shortkey'
 import message from './message'
 import {colorIsDark} from './helpers/color/colorIsDark'
 import {setTitle} from './helpers/setTitle'
+import {getNamespaceTitle} from './helpers/getNamespaceTitle'
+import {getListTitle} from './helpers/getListTitle'
 // Vuex
 import {store} from './store'
 // i18n
@@ -199,6 +201,12 @@ Vue.mixin({
 		formatDateShort(date) {
 			return formatDate(date, 'PPpp', this.$t('date.locale'))
 		},
+		getNamespaceTitle(n) {
+			return getNamespaceTitle(n, p => this.$t(p))
+		},
+		getListTitle(l) {
+			return getListTitle(l, p => this.$t(p))
+		},
 		error(e, actions = []) {
 			return message.error(e, this, p => this.$t(p), actions)
 		},
diff --git a/src/store/index.js b/src/store/index.js
index dbe860673..ef235f649 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -20,7 +20,6 @@ import attachments from './modules/attachments'
 import labels from './modules/labels'
 
 import ListService from '../services/list'
-import {setTitle} from '@/helpers/setTitle'
 
 Vue.use(Vuex)
 
@@ -69,8 +68,6 @@ export const store = new Vuex.Store({
 				return
 			}
 
-			setTitle(currentList.title)
-
 			// Not sure if this is the right way to do it but hey, it works
 			if (
 				// List changed
@@ -140,4 +137,4 @@ export const store = new Vuex.Store({
 			state.quickActionsActive = active
 		},
 	},
-})
\ No newline at end of file
+})
diff --git a/src/views/list/ShowList.vue b/src/views/list/ShowList.vue
index e2ec94c3d..086e0bcdd 100644
--- a/src/views/list/ShowList.vue
+++ b/src/views/list/ShowList.vue
@@ -97,7 +97,7 @@ export default {
 
 			saveListToHistory(listData)
 
-			this.setTitle(this.currentList.title)
+			this.setTitle(this.currentList.id ? this.getListTitle(this.currentList) : '')
 
 			// This invalidates the loaded list at the kanban board which lets it reload its content when
 			// switched to it. This ensures updates done to tasks in the gantt or list views are consistently
@@ -144,6 +144,7 @@ export default {
 				.then(r => {
 					this.$set(this, 'list', r)
 					this.$store.commit(CURRENT_LIST, r)
+					this.setTitle(this.getListTitle(r))
 				})
 				.catch(e => {
 					this.error(e)
@@ -154,4 +155,4 @@ export default {
 		},
 	},
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/namespaces/ListNamespaces.vue b/src/views/namespaces/ListNamespaces.vue
index d8fe0fd59..1f520816c 100644
--- a/src/views/namespaces/ListNamespaces.vue
+++ b/src/views/namespaces/ListNamespaces.vue
@@ -39,7 +39,7 @@
 			</x-button>
 
 			<h1>
-				<span>{{ n.title }}</span>
+				<span>{{ getNamespaceTitle(n) }}</span>
 				<span class="is-archived" v-if="n.isArchived">
 					{{ $t('namespace.archived') }}
 				</span>
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 6330e25b6..7092b38e8 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -3,9 +3,9 @@
 		<div class="task-view">
 			<heading v-model="task" :can-write="canWrite" ref="heading"/>
 			<h6 class="subtitle" v-if="parent && parent.namespace && parent.list">
-				{{ parent.namespace.title }} >
+				{{ getNamespaceTitle(parent.namespace) }} >
 				<router-link :to="{ name: listViewName, params: { listId: parent.list.id } }">
-					{{ parent.list.title }}
+					{{ getListTitle(parent.list) }}
 				</router-link>
 			</h6>
 

From e3d7ebf1b30c5f4af078fdcfc0da59019d15dd32 Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Fri, 9 Jul 2021 08:44:34 +0000
Subject: [PATCH 26/40] Update dependency highlight.js to v11.1.0 (#582)

Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/582
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 38208a235..d197039a4 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "copy-to-clipboard": "3.3.1",
     "date-fns": "2.22.1",
     "dompurify": "2.3.0",
-    "highlight.js": "11.0.1",
+    "highlight.js": "11.1.0",
     "lodash": "4.17.21",
     "marked": "2.1.3",
     "register-service-worker": "1.7.2",
diff --git a/yarn.lock b/yarn.lock
index 027630515..dce3dab4f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7571,10 +7571,10 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-highlight.js@11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.0.1.tgz#a78bafccd9aa297978799fe5eed9beb7ee1ef887"
-  integrity sha512-EqYpWyTF2s8nMfttfBA2yLKPNoZCO33pLS4MnbXQ4hECf1TKujCt1Kq7QAdrio7roL4+CqsfjqwYj4tYgq0pJQ==
+highlight.js@11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.1.0.tgz#0198f7326e64ddfbea5f76b00e84ab542cf24ae8"
+  integrity sha512-X9VVhYKHQPPuwffO8jk4bP/FVj+ibNCy3HxZZNDXFtJrq4O5FdcdCDRIkDis5MiMnjh7UwEdHgRZJcHFYdzDdA==
 
 highlight.js@^9.6.0:
   version "9.17.1"

From 2854d3a0c2b45b02303d030c608ebc0cce9b6021 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 9 Jul 2021 17:43:49 +0200
Subject: [PATCH 27/40] Fix table text alignment in task detail page

Fixes #585
---
 src/styles/components/task.scss | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/styles/components/task.scss b/src/styles/components/task.scss
index a403c37c9..d5d214987 100644
--- a/src/styles/components/task.scss
+++ b/src/styles/components/task.scss
@@ -83,15 +83,6 @@
     }
   }
 
-  table {
-    table-layout: fixed;
-
-    td {
-      overflow: hidden;
-      word-break: break-all;
-    }
-  }
-
   .details {
     padding-bottom: 0.75rem;
     flex-flow: row wrap;

From eac4f88a65b24b8f79b9af3d34ba3b2adf6d7b8e Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 9 Jul 2021 18:04:49 +0200
Subject: [PATCH 28/40] Don't load already loaded task attachments again when
 saving an edited task description

---
 src/components/input/editor.vue | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/input/editor.vue b/src/components/input/editor.vue
index 4b9ced964..fe857caad 100644
--- a/src/components/input/editor.vue
+++ b/src/components/input/editor.vue
@@ -1,7 +1,7 @@
 <template>
 	<div :class="{'is-pulled-up': isEditEnabled}" class="editor">
 		<div class="is-pulled-right mb-4" v-if="hasPreview && isEditEnabled && !hasEditBottom">
-			<x-button 
+			<x-button
 				v-if="!isEditActive"
 				@click="toggleEdit"
 				:shadow="false"
@@ -9,8 +9,8 @@
 			>
 				<icon icon="pen"/>
 			</x-button>
-			<x-button 
-				v-else 
+			<x-button
+				v-else
 				@click="toggleEdit"
 				:shadow="false"
 				type="secondary"
@@ -117,6 +117,7 @@ export default {
 
 			preview: '',
 			attachmentService: null,
+			loadedAttachments: {},
 
 			config: {
 				autoDownloadFontAwesome: false,
@@ -284,7 +285,7 @@ export default {
 		// that in the end, only one change event is triggered to the outside per change.
 		handleInput(val) {
 			// Don't bubble if the text is up to date
-			if(val === this.text) {
+			if (val === this.text) {
 				return
 			}
 
@@ -375,7 +376,7 @@ export default {
 				},
 			})
 
-			this.preview = DOMPurify.sanitize(marked(this.text), { ADD_ATTR: ['target'] })
+			this.preview = DOMPurify.sanitize(marked(this.text), {ADD_ATTR: ['target']})
 
 			// Since the render function is synchronous, we can't do async http requests in it.
 			// Therefore, we can't resolve the blob url at (markdown) compile time.
@@ -392,6 +393,13 @@ export default {
 						const parts = img.dataset.src.substr(window.API_URL.length + 1).split('/')
 						const taskId = parseInt(parts[1])
 						const attachmentId = parseInt(parts[3])
+						const cacheKey = `${taskId}-${attachmentId}`
+
+						if (typeof this.loadedAttachments[cacheKey] !== 'undefined') {
+							img.src = this.loadedAttachments[cacheKey]
+							continue
+						}
+
 						const attachment = new AttachmentModel({taskId: taskId, id: attachmentId})
 
 						if (this.attachmentService === null) {
@@ -401,6 +409,7 @@ export default {
 						this.attachmentService.getBlobUrl(attachment)
 							.then(url => {
 								img.src = url
+								this.loadedAttachments[cacheKey] = url
 							})
 					}
 				}

From aebfde0c7428c54b2b31e59c93ed424c7465431a Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 9 Jul 2021 19:10:25 +0200
Subject: [PATCH 29/40] Fix error property already defined as a function

---
 src/views/sharing/LinkSharingAuth.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/sharing/LinkSharingAuth.vue b/src/views/sharing/LinkSharingAuth.vue
index b0f80870a..d48388bb6 100644
--- a/src/views/sharing/LinkSharingAuth.vue
+++ b/src/views/sharing/LinkSharingAuth.vue
@@ -25,8 +25,8 @@
 				{{ $t('user.auth.login') }}
 			</x-button>
 
-			<div class="notification is-danger mt-4" v-if="error !== ''">
-				{{ error }}
+			<div class="notification is-danger mt-4" v-if="errorMessage !== ''">
+				{{ errorMessage }}
 			</div>
 		</div>
 	</div>
@@ -42,7 +42,7 @@ export default {
 		return {
 			loading: true,
 			authenticateWithPassword: false,
-			error: '',
+			errorMessage: '',
 
 			hash: '',
 			password: '',
@@ -59,7 +59,7 @@ export default {
 	}),
 	methods: {
 		auth() {
-			this.error = ''
+			this.errorMessage = ''
 
 			if (this.authLinkShare) {
 				return
@@ -77,15 +77,15 @@ export default {
 						return
 					}
 
-					// TODO: Put this logic in a global error handler method which checks all auth codes
-					let error = this.$t('sharing.error')
+					// TODO: Put this logic in a global errorMessage handler method which checks all auth codes
+					let errorMessage = this.$t('sharing.errorMessage')
 					if (e.response && e.response.data && e.response.data.message) {
-						error = e.response.data.message
+						errorMessage = e.response.data.message
 					}
 					if (typeof e.response.data.code !== 'undefined' && e.response.data.code === 13002) {
-						error = this.$t('sharing.invalidPassword')
+						errorMessage = this.$t('sharing.invalidPassword')
 					}
-					this.error = error
+					this.errorMessage = errorMessage
 				})
 				.finally(() => {
 					this.loading = false

From a787f6ffc79d6234f58868b3815c33b73d7d9952 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 9 Jul 2021 20:10:57 +0200
Subject: [PATCH 30/40] Save auth tokens from link shares only in memory, don't
 persist them to localStorage

Resolves #587
---
 src/helpers/auth.js             | 62 +++++++++++++++++++++++++++++++++
 src/registerServiceWorker.js    |  3 +-
 src/services/abstractService.js | 10 +++---
 src/store/modules/auth.js       | 28 ++++++---------
 4 files changed, 78 insertions(+), 25 deletions(-)
 create mode 100644 src/helpers/auth.js

diff --git a/src/helpers/auth.js b/src/helpers/auth.js
new file mode 100644
index 000000000..beffc20c7
--- /dev/null
+++ b/src/helpers/auth.js
@@ -0,0 +1,62 @@
+import {HTTPFactory} from '@/http-common'
+
+let savedToken = null
+let persisted = false
+
+/**
+ * Saves a token while optionally saving it to lacal storage. This is used when viewing a link share:
+ * It enables viewing multiple link shares indipendently from each in multiple tabs other without overriding any other open ones.
+ * @param token
+ * @param persist
+ */
+export const saveToken = (token, persist = true) => {
+	savedToken = token
+	if (persist) {
+		persisted = true
+		localStorage.setItem('token', token)
+	}
+}
+
+/**
+ * Returns a saved token. If there is one saved in memory it will use that before anything else.
+ * @returns {string|null}
+ */
+export const getToken = () => {
+	if (savedToken !== null) {
+		return savedToken
+	}
+
+	savedToken = localStorage.getItem('token')
+	return savedToken
+}
+
+/**
+ * Removes all tokens everywhere.
+ */
+export const removeToken = () => {
+	savedToken = null
+	localStorage.removeItem('token')
+}
+
+/**
+ * Refreshes an auth token while ensuring it is updated everywhere.
+ * @returns {Promise<AxiosResponse<any>>}
+ */
+export const refreshToken = () => {
+	const HTTP = HTTPFactory()
+	return HTTP.post('user/token', null, {
+		headers: {
+			Authorization: `Bearer ${getToken()}`,
+		},
+	})
+		.then(r => {
+			saveToken(r.data.token, persisted)
+			return Promise.resolve(r)
+		})
+		.catch(e => {
+			// eslint-disable-next-line
+			console.log('Error renewing token: ', e)
+			return Promise.reject(e)
+		})
+}
+
diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js
index e198e95fd..76ff257db 100644
--- a/src/registerServiceWorker.js
+++ b/src/registerServiceWorker.js
@@ -2,6 +2,7 @@
 
 import {register} from 'register-service-worker'
 import swEvents from './ServiceWorker/events'
+import {getToken} from './helpers/auth'
 
 if (process.env.NODE_ENV === 'production') {
 	register(`${process.env.BASE_URL}sw.js`, {
@@ -44,7 +45,7 @@ if (navigator && navigator.serviceWorker) {
 		if (action === 'getBearerToken') {
 			console.debug('Token request from sw')
 			port.postMessage({
-				authToken: localStorage.getItem('token'),
+				authToken: getToken(),
 			})
 		} else {
 			console.error('Unknown event', event)
diff --git a/src/services/abstractService.js b/src/services/abstractService.js
index e7501af60..86a8abdaa 100644
--- a/src/services/abstractService.js
+++ b/src/services/abstractService.js
@@ -2,6 +2,7 @@ import axios from 'axios'
 import reduce from 'lodash/reduce'
 import replace from 'lodash/replace'
 import {objectToSnakeCase} from '@/helpers/case'
+import {getToken} from '@/helpers/auth'
 
 export default class AbstractService {
 
@@ -66,12 +67,9 @@ export default class AbstractService {
 		})
 
 		// Set the default auth header if we have a token
-		if (
-			localStorage.getItem('token') !== '' &&
-			localStorage.getItem('token') !== null &&
-			localStorage.getItem('token') !== undefined
-		) {
-			this.http.defaults.headers.common['Authorization'] = 'Bearer ' + localStorage.getItem('token')
+		const token = getToken()
+		if (token !== null) {
+			this.http.defaults.headers.common['Authorization'] = `Bearer ${token}`
 		}
 
 		this.paths = {
diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
index 0e32414df..59ae66daf 100644
--- a/src/store/modules/auth.js
+++ b/src/store/modules/auth.js
@@ -1,6 +1,7 @@
 import {HTTPFactory} from '@/http-common'
 import {ERROR_MESSAGE, LOADING} from '../mutation-types'
 import UserModel from '../../models/user'
+import {getToken, refreshToken, removeToken, saveToken} from '@/helpers/auth'
 
 const defaultSettings = settings => {
 	if (typeof settings.weekStart === 'undefined' || settings.weekStart === '') {
@@ -60,7 +61,7 @@ export default {
 			ctx.commit(LOADING, true, {root: true})
 
 			// Delete an eventually preexisting old token
-			localStorage.removeItem('token')
+			removeToken()
 
 			const data = {
 				username: credentials.username,
@@ -74,7 +75,7 @@ export default {
 			return HTTP.post('login', data)
 				.then(response => {
 					// Save the token to local storage for later use
-					localStorage.setItem('token', response.data.token)
+					saveToken(response.data.token)
 
 					// Tell others the user is autheticated
 					ctx.commit('isLinkShareAuth', false)
@@ -127,11 +128,11 @@ export default {
 			}
 
 			// Delete an eventually preexisting old token
-			localStorage.removeItem('token')
+			removeToken()
 			return HTTP.post(`/auth/openid/${provider}/callback`, data)
 				.then(response => {
 					// Save the token to local storage for later use
-					localStorage.setItem('token', response.data.token)
+					saveToken(response.data.token)
 
 					// Tell others the user is autheticated
 					ctx.commit('isLinkShareAuth', false)
@@ -151,7 +152,7 @@ export default {
 				password: password,
 			})
 				.then(r => {
-					localStorage.setItem('token', r.data.token)
+					saveToken(r.data.token, false)
 					ctx.dispatch('checkAuth')
 					return Promise.resolve(r.data)
 				}).catch(e => {
@@ -167,7 +168,7 @@ export default {
 				return Promise.resolve()
 			}
 
-			const jwt = localStorage.getItem('token')
+			const jwt = getToken()
 			let authenticated = false
 			if (jwt) {
 				const base64 = jwt
@@ -213,24 +214,15 @@ export default {
 		},
 		// Renews the api token and saves it to local storage
 		renewToken(ctx) {
-			const HTTP = HTTPFactory()
 			if (!ctx.state.authenticated) {
 				return
 			}
 
-			HTTP.post('user/token', null, {
-				headers: {
-					Authorization: 'Bearer ' + localStorage.getItem('token'),
-				},
-			})
-				.then(r => {
-					localStorage.setItem('token', r.data.token)
+			refreshToken()
+				.then(() => {
 					ctx.dispatch('checkAuth')
 				})
 				.catch(e => {
-					// eslint-disable-next-line
-					console.log('Error renewing token: ', e)
-
 					// Don't logout on network errors as the user would then get logged out if they don't have
 					// internet for a short period of time - such as when the laptop is still reconnecting
 					if (e.request.status) {
@@ -239,7 +231,7 @@ export default {
 				})
 		},
 		logout(ctx) {
-			localStorage.removeItem('token')
+			removeToken()
 			ctx.dispatch('checkAuth')
 		},
 	},

From 20fd25e2809b332680270faccd4bd15ef95a2145 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 10 Jul 2021 12:32:04 +0200
Subject: [PATCH 31/40] Add timeout to fix race condition when authenticating
 as a link share and renewing the token simultaneously

Related #587
---
 src/store/modules/auth.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
index 59ae66daf..65369a3e0 100644
--- a/src/store/modules/auth.js
+++ b/src/store/modules/auth.js
@@ -214,21 +214,26 @@ export default {
 		},
 		// Renews the api token and saves it to local storage
 		renewToken(ctx) {
-			if (!ctx.state.authenticated) {
-				return
-			}
+			// 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.
+			setTimeout(() => {
+				if (!ctx.state.authenticated) {
+					return
+				}
 
-			refreshToken()
-				.then(() => {
-					ctx.dispatch('checkAuth')
-				})
-				.catch(e => {
-					// Don't logout on network errors as the user would then get logged out if they don't have
-					// internet for a short period of time - such as when the laptop is still reconnecting
-					if (e.request.status) {
-						ctx.dispatch('logout')
-					}
-				})
+				refreshToken()
+					.then(() => {
+						ctx.dispatch('checkAuth')
+					})
+					.catch(e => {
+						// Don't logout on network errors as the user would then get logged out if they don't have
+						// internet for a short period of time - such as when the laptop is still reconnecting
+						if (e.request.status) {
+							ctx.dispatch('logout')
+						}
+					})
+			}, 5000)
 		},
 		logout(ctx) {
 			removeToken()

From a6842d959bf5e9b5bd06e3c89e6e18ae4c0c3a18 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 10 Jul 2021 12:35:29 +0200
Subject: [PATCH 32/40] Fix quick actions not opening

---
 src/components/quick-actions/quick-actions.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/quick-actions/quick-actions.vue b/src/components/quick-actions/quick-actions.vue
index a428e762f..185a050a1 100644
--- a/src/components/quick-actions/quick-actions.vue
+++ b/src/components/quick-actions/quick-actions.vue
@@ -127,6 +127,10 @@ export default {
 					...Object.values(this.$store.state.lists)])]
 
 				lists = (allLists.filter(l => {
+					if (typeof l === 'undefined') {
+						return false
+					}
+
 					if (l.isArchived) {
 						return false
 					}

From 7fa94a9bd525439c1893c36f209ce5bf2649b697 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 10 Jul 2021 12:45:36 +0200
Subject: [PATCH 33/40] Fix loading a list when it was already partially saved
 in vuex

---
 src/store/index.js          |  2 +-
 src/views/list/ShowList.vue | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index ef235f649..df24ccd06 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -116,7 +116,7 @@ export const store = new Vuex.Store({
 			// Server updates don't return the right. Therefore the right is reset after updating the list which is
 			// confusing because all the buttons will disappear in that case. To prevent this, we're keeping the right
 			// when updating the list in global state.
-			if (typeof state.currentList.maxRight !== 'undefined') {
+			if (typeof state.currentList.maxRight !== 'undefined' && (typeof currentList.maxRight === 'undefined' || currentList.maxRight === null)) {
 				currentList.maxRight = state.currentList.maxRight
 			}
 			state.currentList = currentList
diff --git a/src/views/list/ShowList.vue b/src/views/list/ShowList.vue
index 086e0bcdd..a3b4ee616 100644
--- a/src/views/list/ShowList.vue
+++ b/src/views/list/ShowList.vue
@@ -89,7 +89,7 @@ export default {
 			return
 		},
 		loadList() {
-			if(this.$route.name.includes('.settings.')) {
+			if (this.$route.name.includes('.settings.')) {
 				return
 			}
 
@@ -116,12 +116,16 @@ export default {
 				return this.replaceListView()
 			}
 
-			// Don't load the list if we either already loaded it or aren't dealing with a list at all currently
+			// Don't load the list if we either already loaded it or aren't dealing with a list at all currently and
+			// the currently loaded list has the right set.
 			if (
-				this.$route.params.listId === this.listLoaded ||
-				typeof this.$route.params.listId === 'undefined' ||
-				this.$route.params.listId === this.currentList.id ||
-				parseInt(this.$route.params.listId) === this.currentList.id
+				(
+					this.$route.params.listId === this.listLoaded ||
+					typeof this.$route.params.listId === 'undefined' ||
+					this.$route.params.listId === this.currentList.id ||
+					parseInt(this.$route.params.listId) === this.currentList.id
+				)
+				&& typeof this.currentList !== 'undefined' && this.currentList.maxRight !== null
 			) {
 				return
 			}

From f0e093b3d6a1ddb293715bd1bc90becc11b3a67e Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 10 Jul 2021 13:13:10 +0200
Subject: [PATCH 34/40] Remove logout button for link shares

---
 src/components/home/contentLinkShare.vue | 8 --------
 src/styles/theme/link-share.scss         | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/src/components/home/contentLinkShare.vue b/src/components/home/contentLinkShare.vue
index e3602c561..601f17d87 100644
--- a/src/components/home/contentLinkShare.vue
+++ b/src/components/home/contentLinkShare.vue
@@ -13,14 +13,6 @@
 					{{ currentList.title === '' ? $t('misc.loading') : currentList.title }}
 				</h1>
 				<div class="box has-text-left view">
-					<div class="logout">
-						<x-button @click="logout()" type="secondary">
-							<span>{{ $t('user.auth.logout') }}</span>
-							<span class="icon is-small">
-								<icon icon="sign-out-alt"/>
-							</span>
-						</x-button>
-					</div>
 					<router-view/>
 					<a class="menu-bottom-link" href="https://vikunja.io" target="_blank">
 						{{ $t('misc.poweredBy') }}
diff --git a/src/styles/theme/link-share.scss b/src/styles/theme/link-share.scss
index 18fbd0298..a38856f29 100644
--- a/src/styles/theme/link-share.scss
+++ b/src/styles/theme/link-share.scss
@@ -5,11 +5,6 @@
     margin: 2rem 0 1.5rem;
   }
 
-  .logout {
-    text-align: right;
-    margin-bottom: 1rem;
-  }
-
   .column {
     max-width: 100%;
   }

From 9e42559d70b430e95787385fde8fc8a62bb28ed7 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 13 Jul 2021 12:06:50 +0200
Subject: [PATCH 35/40] Add syncing translations to crowdin

---
 .drone.yml | 52 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c4e9e67e0..325d66533 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -530,7 +530,7 @@ steps:
         - failure
 ---
 kind: pipeline
-name: ping-weblate
+name: update-translations
 
 depends_on:
   - build
@@ -542,20 +542,40 @@ trigger:
     - push
 
 steps:
-  - name: update-translation-base
-    image: appleboy/drone-git-push
-    failure: ignore
+#  - name: download
+#    pull: always
+#    image: jonasfranz/crowdin
+#    settings:
+#      download: true
+#      export_dir: src/i18n/lang/
+#      ignore_branch: true
+#      project_identifier: vikunja
+#    environment:
+#      CROWDIN_KEY:
+#        from_secret: crowdin_key
+#
+#  - name: push
+#    pull: always
+#    image: appleboy/drone-git-push
+#    settings:
+#      author_email: "frederik@vikunja.io"
+#      author_name: Frederick [Bot]
+#      branch: main
+#      commit: true
+#      commit_message: "[skip ci] Updated translations via Crowdin"
+#      remote: "git@kolaente.dev:9022/vikunja/frontend.git"
+#    environment:
+#      GIT_PUSH_SSH_KEY:
+#        from_secret: git_push_ssh_key
+
+  - name: upload
+    pull: always
+    image: jonasfranz/crowdin
     settings:
-      branch: translations
-      remote: ssh://git@kolaente.dev:9022/vikunja/frontend.git
-      ssh_key:
-        from_secret: translations_branch_update_ssh_key
-  - name: notify-weblate
-    image: curlimages/curl
-    depends_on:
-      - update-translation-base
+      files:
+        en.json: src/i18n/lang/en.json
+      ignore_branch: true
+      project_identifier: vikunja
     environment:
-      WEBLATE_TOKEN:
-        from_secret: weblate_token
-    commands:
-      - ./ping-weblate.sh
+      CROWDIN_KEY:
+        from_secret: crowdin_key

From 01ed17a0f07111fdc55bffd9043cb08e65f6c9b4 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 13 Jul 2021 12:18:54 +0200
Subject: [PATCH 36/40] Fix setting task favorite status in test fixtures

---
 cypress/factories/task.js | 1 -
 src/models/file.js        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cypress/factories/task.js b/cypress/factories/task.js
index 8e0d7b59d..6fa8d5b67 100644
--- a/cypress/factories/task.js
+++ b/cypress/factories/task.js
@@ -14,7 +14,6 @@ export class TaskFactory extends Factory {
 			done: false,
 			list_id: 1,
 			created_by_id: 1,
-			is_favorite: false,
 			index: '{increment}',
 			created: formatISO(now),
 			updated: formatISO(now)
diff --git a/src/models/file.js b/src/models/file.js
index 258de4247..094979639 100644
--- a/src/models/file.js
+++ b/src/models/file.js
@@ -11,7 +11,7 @@ export default class FileModel extends AbstractModel {
 			id: 0,
 			mime: '',
 			name: '',
-			size: '',
+			size: 0,
 			created: null,
 		}
 	}

From 0e5954cf966cd008d345d8ea4ddae720b6fd4223 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 17 Jul 2021 19:02:03 +0200
Subject: [PATCH 37/40] Fix user test fixtures

---
 cypress/factories/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/factories/user.js b/cypress/factories/user.js
index ca8bb896e..37fcaaab4 100644
--- a/cypress/factories/user.js
+++ b/cypress/factories/user.js
@@ -13,7 +13,7 @@ export class UserFactory extends Factory {
             id: '{increment}',
             username: faker.lorem.word(10) + faker.random.uuid(),
             password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.', // 1234
-            is_active: true,
+			status: 0,
 			created: formatISO(now),
 			updated: formatISO(now)
 		}

From be0bc5c84fcdc51b696c94d774b650f3017764e5 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 17 Jul 2021 19:10:05 +0200
Subject: [PATCH 38/40] Fix lists showing up multiple times in history

---
 src/modules/listHistory.js      |  3 +++
 src/modules/listHistory.test.js | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/modules/listHistory.js b/src/modules/listHistory.js
index 96acbe332..0a5c0bb73 100644
--- a/src/modules/listHistory.js
+++ b/src/modules/listHistory.js
@@ -10,6 +10,8 @@ export const getHistory = () => {
 export function saveListToHistory(list) {
 	const history = getHistory()
 
+	list.id = parseInt(list.id)
+
 	// Remove the element if it already exists in history, preventing duplicates and essentially moving it to the beginning
 	for (const i in history) {
 		if (history[i].id === list.id) {
@@ -17,6 +19,7 @@ export function saveListToHistory(list) {
 		}
 	}
 
+	// Add the new list to the beginning of the list
 	history.unshift(list)
 
 	if (history.length > 5) {
diff --git a/src/modules/listHistory.test.js b/src/modules/listHistory.test.js
index d3d8b8423..dce26d7ce 100644
--- a/src/modules/listHistory.test.js
+++ b/src/modules/listHistory.test.js
@@ -53,6 +53,18 @@ test('don\'t store the same list twice', () => {
 	expect(saved).toBe('[{"id":1}]')
 })
 
+test('don\'t store the same list twice with different id types', () => {
+	let saved = null
+	Storage.prototype.getItem = jest.fn(() => saved)
+	Storage.prototype.setItem = jest.fn((key, lists) => {
+		saved = lists
+	})
+
+	saveListToHistory({id: 1})
+	saveListToHistory({id: '1'})
+	expect(saved).toBe('[{"id":1}]')
+})
+
 test('move a list to the beginning when storing it multiple times', () => {
 	let saved = null
 	Storage.prototype.getItem = jest.fn(() => saved)

From 15085a7c26fee62351a28ff5a4737f3213e1ecf9 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 17 Jul 2021 19:14:26 +0200
Subject: [PATCH 39/40] Fix sass division

---
 src/styles/components/kanban.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/styles/components/kanban.scss b/src/styles/components/kanban.scss
index 2f2c9908f..c63cb3f84 100644
--- a/src/styles/components/kanban.scss
+++ b/src/styles/components/kanban.scss
@@ -1,3 +1,5 @@
+@use 'sass:math';
+
 $bucket-background: $grey-100;
 $task-background: $white;
 $ease-out: all .3s cubic-bezier(0.23, 1, 0.32, 1);
@@ -237,10 +239,10 @@ $filter-container-height: '1rem - #{$switch-view-height}';
     }
 
     &.is-collapsed {
-      transform: rotate(90deg) translateX($bucket-width / 2 - $bucket-header-height / 2);
+      transform: rotate(90deg) translateX(math.div($bucket-width, 2) - math.div($bucket-header-height, 2));
       // Using negative margins instead of translateY here to make all other buckets fill the empty space
-      margin-left: ($bucket-width / 2 - $bucket-header-height / 2) * -1;
-      margin-right: calc(#{($bucket-width / 2 - $bucket-header-height / 2) * -1} + #{$bucket-right-margin});
+      margin-left: (math.div($bucket-width, 2) - math.div($bucket-header-height, 2)) * -1;
+      margin-right: calc(#{(math.div($bucket-width, 2) - math.div($bucket-header-height, 2)) * -1} + #{$bucket-right-margin});
       cursor: pointer;
 
       .tasks, .bucket-footer {

From bad5e3d0ec799778dd92f7c80baacd0a68b7e8d9 Mon Sep 17 00:00:00 2001
From: renovate <renovatebot@kolaente.de>
Date: Sat, 17 Jul 2021 17:35:20 +0000
Subject: [PATCH 40/40] Update dependency vue-i18n to v8.25.0 (#595)

Co-authored-by: konrad <konrad@kola-entertainments.de>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/595
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d197039a4..c0deccfca 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "vue-advanced-cropper": "1.7.0",
     "vue-drag-resize": "1.5.4",
     "vue-easymde": "1.4.0",
-    "vue-i18n": "8.24.5",
+    "vue-i18n": "8.25.0",
     "vue-shortkey": "3.1.7",
     "vue-smooth-dnd": "0.8.1",
     "vuex": "3.6.2"
diff --git a/yarn.lock b/yarn.lock
index dce3dab4f..06ac3e75c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13532,10 +13532,10 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
-vue-i18n@8.24.5:
-  version "8.24.5"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.24.5.tgz#7127a666d5be2199be69be39e439a419a90ff931"
-  integrity sha512-p8W5xOmniuZ8fj76VXe0vBL3bRWVU87jHuC/v8VwmhKVH2iMQsKnheB1U+umxDBqC/5g9K+NwzokepcLxnBAVQ==
+vue-i18n@8.25.0:
+  version "8.25.0"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.25.0.tgz#1037d9295fa2845a230b771de473481edb2cfc4c"
+  integrity sha512-ynhcL+PmTxuuSE1T10htiSXzjBozxYIE3ffbM1RfgAkVbr/v1SP+9Mi/7/uv8ZVV1yGuKjFAYp9BXq+X7op6MQ==
 
 "vue-loader-v16@npm:vue-loader@^16.1.0":
   version "16.1.2"