-
+
{{ formatDateSince(a.created) }}
@@ -289,21 +289,6 @@ export default {
content: '·';
padding: 0 .25rem;
}
-
- @media screen and (max-width: $mobile) {
- &.collapses {
- flex-direction: column;
-
- > span:not(:last-child):after,
- > a:not(:last-child):after {
- display: none;
- }
-
- .user .username {
- display: none;
- }
- }
- }
}
}
}
@@ -341,6 +326,10 @@ export default {
height: auto;
text-shadow: var(--shadow-md);
animation: bounce 2s infinite;
+
+ @media (prefers-reduced-motion: reduce) {
+ animation: none;
+ }
}
.hint {
@@ -357,6 +346,35 @@ export default {
}
}
+.attachment-info-meta {
+ display: flex;
+ align-items: center;
+
+ :deep(.user) {
+ display: flex !important;
+ align-items: center;
+ margin: 0 .5rem;
+ }
+
+ @media screen and (max-width: $mobile) {
+ flex-direction: column;
+ align-items: flex-start;
+
+ :deep(.user) {
+ margin: .5rem 0;
+ }
+
+ > span:not(:last-child):after,
+ > a:not(:last-child):after {
+ display: none;
+ }
+
+ .user .username {
+ display: none;
+ }
+ }
+}
+
@keyframes bounce {
from,
20%,
@@ -382,4 +400,6 @@ export default {
transform: translate3d(0, -4px, 0);
}
}
+
+@include modal-transition();
\ No newline at end of file
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index d5db45c3..23105771 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -162,7 +162,7 @@ import {mapState} from 'vuex'
export default {
name: 'comments',
components: {
- editor: AsyncEditor,
+ Editor: AsyncEditor,
},
props: {
taskId: {
@@ -339,4 +339,6 @@ export default {
.media-content {
width: calc(100% - 48px - 2rem);
}
+
+@include modal-transition();
\ No newline at end of file
diff --git a/src/components/tasks/partials/date-table-cell.vue b/src/components/tasks/partials/date-table-cell.vue
index e405c0b3..8df948c7 100644
--- a/src/components/tasks/partials/date-table-cell.vue
+++ b/src/components/tasks/partials/date-table-cell.vue
@@ -1,6 +1,8 @@
- {{ +date === 0 ? '-' : formatDateSince(date) }}
+
+ {{ +date === 0 ? '-' : formatDateSince(date) }}
+
diff --git a/src/components/tasks/partials/description.vue b/src/components/tasks/partials/description.vue
index 28fd5a88..07d136fd 100644
--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@@ -38,7 +38,7 @@ import {mapState} from 'vuex'
export default {
name: 'description',
components: {
- editor: AsyncEditor,
+ Editor: AsyncEditor,
},
data() {
return {
diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue
index ddc10dc3..f2d01934 100644
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@@ -19,19 +19,19 @@
:style="{'background': props.item.hexColor, 'color': props.item.textColor}"
class="tag">
{{ props.item.title }}
-
+ class="tag search-result">
{{ props.option }}
+ class="tag search-result">
{{ props.option.title }}
@@ -114,23 +114,17 @@ export default {
},
async removeLabel(label) {
- const removeFromState = () => {
- for (const l in this.labels) {
- if (this.labels[l].id === label.id) {
- this.labels.splice(l, 1)
- }
+ if (!this.taskId === 0) {
+ await this.$store.dispatch('tasks/removeLabel', {label: label, taskId: this.taskId})
+ }
+
+ for (const l in this.labels) {
+ if (this.labels[l].id === label.id) {
+ this.labels.splice(l, 1)
}
- this.$emit('update:modelValue', this.labels)
- this.$emit('change', this.labels)
}
-
- if (this.taskId === 0) {
- removeFromState()
- return
- }
-
- await this.$store.dispatch('tasks/removeLabel', {label: label, taskId: this.taskId})
- removeFromState()
+ this.$emit('update:modelValue', this.labels)
+ this.$emit('change', this.labels)
this.$message.success({message: this.$t('task.label.removeSuccess')})
},
@@ -152,6 +146,18 @@ export default {
diff --git a/src/components/tasks/partials/kanban-card.vue b/src/components/tasks/partials/kanban-card.vue
index e1910643..d0d4501d 100644
--- a/src/components/tasks/partials/kanban-card.vue
+++ b/src/components/tasks/partials/kanban-card.vue
@@ -7,8 +7,8 @@
'has-light-text': !colorIsDark(task.hexColor) && task.hexColor !== `#${task.defaultColor}` && task.hexColor !== task.defaultColor,
}"
:style="{'background-color': task.hexColor !== '#' && task.hexColor !== `#${task.defaultColor}` ? task.hexColor : false}"
+ @click.exact="openTaskDetail()"
@click.ctrl="() => toggleTaskDone(task)"
- @click.exact="() => $router.push({ name: 'task.kanban.detail', params: { id: task.id } })"
@click.meta="() => toggleTaskDone(task)"
>
@@ -28,9 +28,9 @@
-
+
{{ formatDateSince(task.dueDate) }}
-
+
{{ task.title }}
diff --git a/src/components/tasks/partials/relatedTasks.vue b/src/components/tasks/partials/relatedTasks.vue
index 0b2be060..80c04e04 100644
--- a/src/components/tasks/partials/relatedTasks.vue
+++ b/src/components/tasks/partials/relatedTasks.vue
@@ -274,10 +274,11 @@ export default {
return tasks
.map(task => {
// by doing this here once we can save a lot of duplicate calls in the template
+ const listAndNamespace = this.$store.getters['namespaces/getListAndNamespaceById'](task.listId, true)
const {
list,
namespace,
- } = this.$store.getters['namespaces/getListAndNamespaceById'](task.listId, true)
+ } = listAndNamespace === null ? {list: null, namespace: null} : listAndNamespace
return {
...task,
@@ -364,4 +365,6 @@ export default {
:deep(.multiselect .search-results button) {
padding: 0.5rem;
}
+
+@include modal-transition();
\ No newline at end of file
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 9e955d5c..85293dec 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -8,7 +8,7 @@
>
@@ -39,14 +39,17 @@
:user="a"
v-for="(a, i) in task.assignees"
/>
-
- {{ $t('task.detail.due', {at: formatDateSince(task.dueDate)}) }}
-
+
@@ -126,10 +129,6 @@ export default {
type: Boolean,
default: false,
},
- taskDetailRoute: {
- type: String,
- default: 'task.list.detail',
- },
showList: {
type: Boolean,
default: false,
@@ -167,6 +166,14 @@ export default {
title: '',
} : this.$store.state.currentList
},
+ taskDetailRoute() {
+ return {
+ name: 'task.detail',
+ params: { id: this.task.id },
+ // TODO: re-enable opening task detail in modal
+ // state: { backdropView: this.$router.currentRoute.value.fullPath },
+ }
+ },
},
methods: {
async markAsDone(checked) {
diff --git a/src/components/tasks/partials/sort.vue b/src/components/tasks/partials/sort.vue
index c3581ba5..4eeb5e9f 100644
--- a/src/components/tasks/partials/sort.vue
+++ b/src/components/tasks/partials/sort.vue
@@ -1,20 +1,21 @@
-
+
+
-
diff --git a/src/composables/taskList.js b/src/composables/taskList.js
new file mode 100644
index 00000000..e80c5cbe
--- /dev/null
+++ b/src/composables/taskList.js
@@ -0,0 +1,111 @@
+import { ref, shallowReactive, watch, computed } from 'vue'
+import {useRoute} from 'vue-router'
+
+import TaskCollectionService from '@/services/taskCollection'
+
+// FIXME: merge with DEFAULT_PARAMS in filters.vue
+export const getDefaultParams = () => ({
+ sort_by: ['position', 'id'],
+ order_by: ['asc', 'desc'],
+ filter_by: ['done'],
+ filter_value: ['false'],
+ filter_comparator: ['equals'],
+ filter_concat: 'and',
+})
+
+const SORT_BY_DEFAULT = {
+ id: 'desc',
+}
+
+/**
+ * This mixin provides a base set of methods and properties to get tasks on a list.
+ */
+export function useTaskList(listId) {
+ const params = ref({...getDefaultParams()})
+
+ const search = ref('')
+ const page = ref(1)
+
+ const sortBy = ref({ ...SORT_BY_DEFAULT })
+
+
+ // This makes sure an id sort order is always sorted last.
+ // When tasks would be sorted first by id and then by whatever else was specified, the id sort takes
+ // precedence over everything else, making any other sort columns pretty useless.
+ function formatSortOrder(params) {
+ let hasIdFilter = false
+ const sortKeys = Object.keys(sortBy.value)
+ for (const s of sortKeys) {
+ if (s === 'id') {
+ sortKeys.splice(s, 1)
+ hasIdFilter = true
+ break
+ }
+ }
+ if (hasIdFilter) {
+ sortKeys.push('id')
+ }
+ params.sort_by = sortKeys
+ params.order_by = sortKeys.map(s => sortBy.value[s])
+
+ return params
+ }
+
+ const getAllTasksParams = computed(() => {
+ let loadParams = {...params.value}
+
+ if (search.value !== '') {
+ loadParams.s = search.value
+ }
+
+ loadParams = formatSortOrder(loadParams)
+
+ return [
+ {listId: listId.value},
+ loadParams,
+ page.value || 1,
+ ]
+ })
+
+ const taskCollectionService = shallowReactive(new TaskCollectionService())
+ const loading = computed(() => taskCollectionService.loading)
+ const totalPages = computed(() => taskCollectionService.totalPages)
+
+ const tasks = ref([])
+ async function loadTasks() {
+ tasks.value = await taskCollectionService.getAll(...getAllTasksParams.value)
+ return tasks.value
+ }
+
+ const route = useRoute()
+ watch(() => route.query, (query) => {
+ const { page: pageQueryValue, search: searchQuery } = query
+ if (searchQuery !== undefined) {
+ search.value = searchQuery
+ }
+ if (pageQueryValue !== undefined) {
+ page.value = parseInt(pageQueryValue)
+ }
+
+ }, { immediate: true })
+
+
+ // Only listen for query path changes
+ watch(() => JSON.stringify(getAllTasksParams.value), (newParams, oldParams) => {
+ if (oldParams === newParams) {
+ return
+ }
+
+ loadTasks()
+ }, { immediate: true })
+
+ return {
+ tasks,
+ loading,
+ totalPages,
+ currentPage: page,
+ loadTasks,
+ searchTerm: search,
+ params,
+ }
+}
\ No newline at end of file
diff --git a/src/composables/useColorScheme.ts b/src/composables/useColorScheme.ts
index c0fed121..f9b1cb94 100644
--- a/src/composables/useColorScheme.ts
+++ b/src/composables/useColorScheme.ts
@@ -1,9 +1,9 @@
import {computed, watch, readonly} from 'vue'
-import {useStorage, createSharedComposable, ColorSchema, usePreferredColorScheme, tryOnMounted} from '@vueuse/core'
+import {useStorage, createSharedComposable, BasicColorSchema, usePreferredColorScheme, tryOnMounted} from '@vueuse/core'
const STORAGE_KEY = 'color-scheme'
-const DEFAULT_COLOR_SCHEME_SETTING: ColorSchema = 'light'
+const DEFAULT_COLOR_SCHEME_SETTING: BasicColorSchema = 'light'
const CLASS_DARK = 'dark'
const CLASS_LIGHT = 'light'
@@ -16,7 +16,7 @@ const CLASS_LIGHT = 'light'
// - value is synced via `createSharedComposable`
// https://github.com/vueuse/vueuse/blob/main/packages/core/useDark/index.ts
export const useColorScheme = createSharedComposable(() => {
- const store = useStorage(STORAGE_KEY, DEFAULT_COLOR_SCHEME_SETTING)
+ const store = useStorage(STORAGE_KEY, DEFAULT_COLOR_SCHEME_SETTING)
const preferredColorScheme = usePreferredColorScheme()
diff --git a/src/composables/useTitle.ts b/src/composables/useTitle.ts
index e3544829..84aaa177 100644
--- a/src/composables/useTitle.ts
+++ b/src/composables/useTitle.ts
@@ -1,9 +1,9 @@
import { computed, watchEffect } from 'vue'
import { setTitle } from '@/helpers/setTitle'
-import { ComputedGetter, ComputedRef } from '@vue/reactivity'
+import { ComputedGetter } from '@vue/reactivity'
-export function useTitle(titleGetter: ComputedGetter) : ComputedRef {
+export function useTitle(titleGetter: ComputedGetter) {
const titleRef = computed(titleGetter)
watchEffect(() => setTitle(titleRef.value))
diff --git a/src/helpers/auth.ts b/src/helpers/auth.ts
index b073a8ca..81cd5580 100644
--- a/src/helpers/auth.ts
+++ b/src/helpers/auth.ts
@@ -53,6 +53,7 @@ export async function refreshToken(persist: boolean): Promise {
return response
} catch(e) {
+ // @ts-ignore
throw new Error('Error renewing token: ', { cause: e })
}
}
diff --git a/src/helpers/isEmail.ts b/src/helpers/isEmail.ts
new file mode 100644
index 00000000..08957d0f
--- /dev/null
+++ b/src/helpers/isEmail.ts
@@ -0,0 +1,6 @@
+export function isEmail(email: string): Boolean {
+ const format = /^.+@.+$/
+ const match = email.match(format)
+
+ return match === null ? false : match.length > 0
+}
diff --git a/src/helpers/saveListView.js b/src/helpers/saveListView.js
index b7f735e1..96be6342 100644
--- a/src/helpers/saveListView.js
+++ b/src/helpers/saveListView.js
@@ -1,3 +1,5 @@
+// Save the current list view to local storage
+// We use local storage and not vuex here to make it persistent across reloads.
export const saveListView = (listId, routeName) => {
if (routeName.includes('settings.')) {
return
diff --git a/src/helpers/setTitle.js b/src/helpers/setTitle.ts
similarity index 65%
rename from src/helpers/setTitle.js
rename to src/helpers/setTitle.ts
index a2f31a45..d7e6b5dd 100644
--- a/src/helpers/setTitle.js
+++ b/src/helpers/setTitle.ts
@@ -1,4 +1,4 @@
-export function setTitle(title) {
+export function setTitle(title : undefined | string) {
document.title = (typeof title === 'undefined' || title === '')
? 'Vikunja'
: `${title} | Vikunja`
diff --git a/src/helpers/time/formatDate.js b/src/helpers/time/formatDate.js
index c3e8c1b7..afa3f70a 100644
--- a/src/helpers/time/formatDate.js
+++ b/src/helpers/time/formatDate.js
@@ -1,5 +1,5 @@
import {createDateFromString} from '@/helpers/time/createDateFromString'
-import {format, formatDistanceToNow} from 'date-fns'
+import {format, formatDistanceToNow, formatISO as formatISOfns} from 'date-fns'
import {enGB, de, fr, ru} from 'date-fns/locale'
import {i18n} from '@/i18n'
@@ -44,3 +44,7 @@ export const formatDateSince = (date) => {
addSuffix: true,
})
}
+
+export function formatISO(date) {
+ return date ? formatISOfns(date) : ''
+}
diff --git a/src/helpers/time/parseDate.ts b/src/helpers/time/parseDate.ts
index 34e6ef0f..3b663469 100644
--- a/src/helpers/time/parseDate.ts
+++ b/src/helpers/time/parseDate.ts
@@ -288,7 +288,7 @@ const getDateFromWeekday = (text: string): dateFoundResult => {
}
const getDayFromText = (text: string) => {
- const matcher = /(([1-2][0-9])|(3[01])|(0?[1-9]))(st|nd|rd|th|\.)/ig
+ 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 {
@@ -302,17 +302,17 @@ const getDayFromText = (text: string) => {
const day = parseInt(results[0])
date.setDate(day)
- // If the parsed day is the 31st but the next month only has 30 days, setting the day to 31 will "overflow" the
- // date to the next month, but the first.
+ // If the parsed day is the 31st (or 29+ and the next month is february) but the next month only has 30 days,
+ // setting the day to 31 will "overflow" the date to the next month, but the first.
// This would look like a very weired bug. Now, to prevent that, we check if the day is the same as parsed after
// setting it for the first time and set it again if it isn't - that would mean the month overflowed.
- if (day === 31 && date.getDate() !== day) {
- date.setDate(day)
- }
-
- if (date < now) {
+ while (date < now) {
date.setMonth(date.getMonth() + 1)
}
+
+ if (date.getDate() !== day) {
+ date.setDate(day)
+ }
return {
foundText: results[0],
diff --git a/src/i18n/lang/cs-CZ.json b/src/i18n/lang/cs-CZ.json
index ad67dd81..85dac7e1 100644
--- a/src/i18n/lang/cs-CZ.json
+++ b/src/i18n/lang/cs-CZ.json
@@ -899,7 +899,7 @@
"4015": "Komentář k úkolu neexistuje.",
"4016": "Neplatné pole úkolu.",
"4017": "Neplatný komparátor filtru úkolů.",
- "4018": "Neplatný koncatinátor filtru úkolů.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Neplatná hodnota filtru úkolů.",
"5001": "Prostor neexistuje.",
"5003": "Nemáte přístup ke zvolenému prostoru.",
diff --git a/src/i18n/lang/de-DE.json b/src/i18n/lang/de-DE.json
index 44ca9c0b..49543c4c 100644
--- a/src/i18n/lang/de-DE.json
+++ b/src/i18n/lang/de-DE.json
@@ -7,7 +7,7 @@
"lastViewed": "Zuletzt angesehen",
"list": {
"newText": "Du kannst eine neue Liste für deine neuen Aufgaben erstellen:",
- "new": "New list",
+ "new": "Neue Liste",
"importText": "Oder importiere deine Listen und Aufgaben aus anderen Diensten in Vikunja:",
"import": "Deine Daten in Vikunja importieren"
}
@@ -157,7 +157,7 @@
"searchSelect": "Klicke auf oder drücke die Eingabetaste, um diese Liste auszuwählen",
"shared": "Geteilte Listen",
"create": {
- "header": "New list",
+ "header": "Neue Liste",
"titlePlaceholder": "Der Titel der Liste steht hier…",
"addTitleRequired": "Bitte gebe einen Namen an.",
"createdSuccess": "Die Liste wurde erfolgreich erstellt.",
@@ -315,7 +315,7 @@
"namespaces": "Namespaces",
"search": "Beginne zu schreiben, um einen Namespace zu suchen…",
"create": {
- "title": "New namespace",
+ "title": "Neuer Namespace",
"titleRequired": "Bitte gebe einen Titel an.",
"explanation": "Ein Namespace ist eine Sammlung von Listen, die du teilen und zur Organisation verwenden kannst. Jede Liste zu einem Namespace.",
"tooltip": "Was ist ein Namespace?",
@@ -383,7 +383,7 @@
"reminderRange": "Erinnerungs-Datumsbereich"
},
"create": {
- "title": "New Saved Filter",
+ "title": "Neuer gespeicherter Filter",
"description": "Ein gespeicherter Filter ist eine virtuelle Liste, die bei jedem Zugriff aus einem Satz von Filtern errechnet wird. Einmal erstellt, erscheint diese in einem speziellen Namespace.",
"action": "Neuen gespeicherten Filter erstellen"
},
@@ -545,7 +545,7 @@
"chooseStartDate": "Klicke hier, um ein Startdatum zu setzen",
"chooseEndDate": "Klicke hier, um ein Enddatum zu setzen",
"move": "Aufgabe in eine andere Liste verschieben",
- "done": "Mark task done!",
+ "done": "Als erledigt markieren!",
"undone": "Als nicht erledigt markieren",
"created": "Erstellt {0} von {1}",
"updated": "Aktualisiert {0}",
@@ -781,7 +781,7 @@
"then": "dann",
"task": {
"title": "Aufgabenseite",
- "done": "Done",
+ "done": "Fertig",
"assign": "Benutzer:in zuweisen",
"labels": "Dieser Aufgabe ein Label hinzufügen",
"dueDate": "Ändere das Fälligkeitsdatum dieser Aufgabe",
@@ -899,7 +899,7 @@
"4015": "Dieser Aufgabenkommentar existiert nicht.",
"4016": "Ungültiges Aufgabenfeld.",
"4017": "Ungültiger Aufgabenfilter (Vergleichskriterium).",
- "4018": "Ungültiger Aufgabenfilter (Kombination).",
+ "4018": "Ungültige Verkettung von Aufgabenfiltern.",
"4019": "Ungültiger Aufgabenfilter (Wert).",
"5001": "Dieser Namespace existiert nicht.",
"5003": "Du hast keinen Zugriff auf den Namespace.",
diff --git a/src/i18n/lang/de-swiss.json b/src/i18n/lang/de-swiss.json
index 7bb3dafe..76d8f042 100644
--- a/src/i18n/lang/de-swiss.json
+++ b/src/i18n/lang/de-swiss.json
@@ -7,7 +7,7 @@
"lastViewed": "Zletscht ahglueget",
"list": {
"newText": "Du chasch e Liste für dini neue Uufgabe erstelle:",
- "new": "New list",
+ "new": "Neue Liste",
"importText": "Oder importier dini Liste und Uufgabe us anderne Dienst nach Vikunja:",
"import": "Dini Date in Vikunja importiere"
}
@@ -157,7 +157,7 @@
"searchSelect": "Druck uf Enter um die Liste uuszwähle",
"shared": "Teilti Liste",
"create": {
- "header": "New list",
+ "header": "Neue Liste",
"titlePlaceholder": "Listetitl da ahgeh…",
"addTitleRequired": "Bitte gib en Titl ah.",
"createdSuccess": "Liste erfolgriich erstellt.",
@@ -315,7 +315,7 @@
"namespaces": "Namensrüüm",
"search": "Schriib, um nachemne Namensruum z'sueche…",
"create": {
- "title": "New namespace",
+ "title": "Neuer Namespace",
"titleRequired": "Bitte gib en Titl ah.",
"explanation": "En Namensruum isch e Gruppe vo Liste, wo du chasch zur Organisation benutze. Tatsächlich sind alli Listene emne Namensruum zuegwise.",
"tooltip": "Was isch en Namensruum?",
@@ -383,7 +383,7 @@
"reminderRange": "Errinnerigs Datumbereich"
},
"create": {
- "title": "New Saved Filter",
+ "title": "Neuer gespeicherter Filter",
"description": "En gspeicherete Filter isch e virtuelli Liste, welche vomene Satz a Filter zemmegsetzt wird, sobald me uf sie zuegriift. Wenn sie mal erstellt worde isch, erhaltet si ihren eigene Namensruum.",
"action": "Neue gspeicherete Filter erstelle"
},
@@ -545,7 +545,7 @@
"chooseStartDate": "Druck dah, um es Startdatum z'setze",
"chooseEndDate": "Druck da, um es Enddatum z'setze",
"move": "Schieb die Uufgab in e anderi Liste",
- "done": "Mark task done!",
+ "done": "Als erledigt markieren!",
"undone": "Als unerledigt markierä",
"created": "Erstellt am {0} vo {1}",
"updated": "{0} g'updatet",
@@ -781,7 +781,7 @@
"then": "dann",
"task": {
"title": "Uufgabesiite",
- "done": "Done",
+ "done": "Fertig",
"assign": "Benutzer:in zuweisen",
"labels": "Labels ennere Uufgab hinzuefüege",
"dueDate": "S'Fälligkeitsdatum für die Uufgab ändere",
@@ -899,7 +899,7 @@
"4015": "De Uufgabe Kommentar giz nid.",
"4016": "Ungültigs Uufgabefeld.",
"4017": "Ungültige Uufgabefilter vergliich.",
- "4018": "Ungültige Uufgabefilter Zemmezug.",
+ "4018": "Ungültige Verkettung von Aufgabenfiltern.",
"4019": "Ungültigi Uufgabe Filter Wert.",
"5001": "De Namensruum existiert nid.",
"5003": "Du hesch kei Zuegriff zu dem Namensruum.",
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index a6c86d72..1121d91b 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -31,10 +31,9 @@
"username": "Username",
"usernameEmail": "Username Or Email Address",
"usernamePlaceholder": "e.g. frederick",
- "email": "E-mail address",
+ "email": "Email address",
"emailPlaceholder": "e.g. frederic{'@'}vikunja.io",
"password": "Password",
- "passwordRepeat": "Retype your password",
"passwordPlaceholder": "e.g. •••••••••••",
"forgotPassword": "Forgot your password?",
"resetPassword": "Reset your password",
@@ -45,12 +44,19 @@
"totpTitle": "Two Factor Authentication Code",
"totpPlaceholder": "e.g. 123456",
"login": "Login",
- "register": "Register",
+ "createAccount": "Create account",
"loginWith": "Log in with {provider}",
"authenticating": "Authenticating…",
"openIdStateError": "State does not match, refusing to continue!",
"openIdGeneralError": "An error occured while authenticating against the third party.",
- "logout": "Logout"
+ "logout": "Logout",
+ "emailInvalid": "Please enter a valid email address.",
+ "usernameRequired": "Please provide a username.",
+ "passwordRequired": "Please provide a password.",
+ "showPassword": "Show the password",
+ "hidePassword": "Hide the password",
+ "noAccountYet": "Don't have an account yet?",
+ "alreadyHaveAnAccount": "Already have an account?"
},
"settings": {
"title": "Settings",
@@ -61,7 +67,7 @@
"currentPasswordPlaceholder": "Your current password",
"passwordsDontMatch": "The new password and its confirmation don't match.",
"passwordUpdateSuccess": "The password was successfully updated.",
- "updateEmailTitle": "Update Your E-Mail Address",
+ "updateEmailTitle": "Update Your Email Address",
"updateEmailNew": "New Email Address",
"updateEmailSuccess": "Your email address was successfully updated. We've sent you a link to confirm it.",
"general": {
@@ -904,7 +910,7 @@
"4015": "The task comment does not exist.",
"4016": "Invalid task field.",
"4017": "Invalid task filter comparator.",
- "4018": "Invalid task filter concatinator.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Invalid task filter value.",
"5001": "The namespace does not exist.",
"5003": "You do not have access to the specified namespace.",
diff --git a/src/i18n/lang/es-ES.json b/src/i18n/lang/es-ES.json
index 29537fe3..1f03d175 100644
--- a/src/i18n/lang/es-ES.json
+++ b/src/i18n/lang/es-ES.json
@@ -899,7 +899,7 @@
"4015": "The task comment does not exist.",
"4016": "Invalid task field.",
"4017": "Invalid task filter comparator.",
- "4018": "Invalid task filter concatinator.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Invalid task filter value.",
"5001": "The namespace does not exist.",
"5003": "You do not have access to the specified namespace.",
diff --git a/src/i18n/lang/fr-FR.json b/src/i18n/lang/fr-FR.json
index 1e566213..eae7cd95 100644
--- a/src/i18n/lang/fr-FR.json
+++ b/src/i18n/lang/fr-FR.json
@@ -116,12 +116,12 @@
"vikunja": "Vikunja"
},
"appearance": {
- "title": "Color Scheme",
- "setSuccess": "Saved change of color scheme to {colorScheme}",
+ "title": "Jeu de couleurs",
+ "setSuccess": "Changement du jeu de couleurs enregistré vers {colorScheme}",
"colorScheme": {
- "light": "Light",
- "system": "System",
- "dark": "Dark"
+ "light": "Clair",
+ "system": "Système",
+ "dark": "Sombre"
}
}
},
@@ -475,7 +475,7 @@
"download": "Télécharger",
"showMenu": "Afficher le menu",
"hideMenu": "Masquer le menu",
- "forExample": "For example:",
+ "forExample": "Par exemple :",
"welcomeBack": "Welcome Back!"
},
"input": {
@@ -561,7 +561,7 @@
"text2": "Ceci supprimera également toutes les pièces jointes, les rappels et les relations associés à cette tâche et ne pourra pas être annulé !"
},
"actions": {
- "assign": "Assign to a user",
+ "assign": "Attribuer à un utilisateur",
"label": "Ajouter des étiquettes",
"priority": "Définir la priorité",
"dueDate": "Définir l’échéance",
@@ -726,8 +726,8 @@
"dateCurrentYear": "utilisera l’année en cours",
"dateNth": "utilisera le {day}e du mois en cours",
"dateTime": "Combinez n’importe lequel des formats de date avec « {time} » (ou {timePM}) pour définir une heure.",
- "repeats": "Repeating tasks",
- "repeatsDescription": "To set a task as repeating in an interval, simply add '{suffix}' to the task text. The amount needs to be a number and can be omitted to use just the type (see examples)."
+ "repeats": "Tâches répétitives",
+ "repeatsDescription": "Pour définir une tâche comme répétitive dans un intervalle, il suffit d'ajouter « {suffix} » au texte de la tâche. Le montant doit être un nombre et peut être omis pour utiliser uniquement le type (voir exemples)."
}
},
"team": {
@@ -782,7 +782,7 @@
"task": {
"title": "Page de tâche",
"done": "Done",
- "assign": "Assign to a user",
+ "assign": "Attribuer à un utilisateur",
"labels": "Ajouter des étiquettes à cette tâche",
"dueDate": "Modifier la date d’échéance de cette tâche",
"attachment": "Ajouter une pièce jointe à cette tâche",
@@ -899,7 +899,7 @@
"4015": "Le commentaire de la tâche n’existe pas.",
"4016": "Champ de tâche invalide.",
"4017": "Comparateur de filtre de tâche invalide.",
- "4018": "Concaténateur de filtre de tâche invalide.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Valeur de filtre de tâche invalide.",
"5001": "L’espace de noms n’existe pas.",
"5003": "Tu n’as pas accès à l’espace de noms indiqué.",
@@ -908,7 +908,7 @@
"5010": "Cette équipe n’a pas accès à cet espace de noms.",
"5011": "Cet·e utilisateur·rice a déjà accès à cet espace de noms.",
"5012": "L’espace de noms est archivé et ne peut donc être consulté qu’en lecture seule.",
- "6001": "The team name cannot be empty.",
+ "6001": "Le nom de l'équipe ne peut pas être vide.",
"6002": "L’équipe n’existe pas.",
"6004": "L’équipe a déjà accès à cet espace de noms ou à cette liste.",
"6005": "L’utilisateur·rice est déjà membre de cette équipe.",
diff --git a/src/i18n/lang/it-IT.json b/src/i18n/lang/it-IT.json
index 355d8ed5..647497b4 100644
--- a/src/i18n/lang/it-IT.json
+++ b/src/i18n/lang/it-IT.json
@@ -7,7 +7,7 @@
"lastViewed": "Ultima visualizzazione",
"list": {
"newText": "È possibile creare una nuova lista per le nuove attività:",
- "new": "New list",
+ "new": "Nuova lista",
"importText": "O importare le liste e le attività da altri servizi in Vikunja:",
"import": "Importa i tuoi dati in Vikunja"
}
@@ -17,14 +17,14 @@
"text": "La pagina richiesta non esiste."
},
"ready": {
- "loading": "Vikunja is loading…",
- "errorOccured": "An error occured:",
- "checkApiUrl": "Please check if the api url is correct.",
- "noApiUrlConfigured": "No API url was configured. Please set one below:"
+ "loading": "Vikunja sta caricando…",
+ "errorOccured": "Si è verificato un errore:",
+ "checkApiUrl": "Controlla se l'URL API è corretto.",
+ "noApiUrlConfigured": "Nessun URL API configurato. Impostane uno qui sotto:"
},
"offline": {
- "title": "You are offline.",
- "text": "Please check your network connection and try again."
+ "title": "Sei offline.",
+ "text": "Controlla la connessione di rete e riprova."
},
"user": {
"auth": {
@@ -36,7 +36,7 @@
"password": "Password",
"passwordRepeat": "Digita di nuovo la tua password",
"passwordPlaceholder": "es. ••••••••••••",
- "forgotPassword": "Forgot your password?",
+ "forgotPassword": "Password dimenticata?",
"resetPassword": "Reimposta la tua password",
"resetPasswordAction": "Inviami il link per reimpostare la password",
"resetPasswordSuccess": "Controlla la tua casella di posta! Dovresti avere un'e-mail con le istruzioni su come reimpostare la password.",
@@ -48,7 +48,7 @@
"register": "Registrati",
"loginWith": "Accedi con {provider}",
"authenticating": "Autenticazione…",
- "openIdStateError": "State does not match, refusing to continue!",
+ "openIdStateError": "Stato non corrispondente, impossibile continuare!",
"openIdGeneralError": "Si è verificato un errore durante l'autenticazione con terze parti.",
"logout": "Esci"
},
@@ -103,31 +103,31 @@
"title": "Avatar",
"initials": "Iniziali",
"gravatar": "Gravatar",
- "marble": "Marble",
+ "marble": "Marmo",
"upload": "Carica",
"uploadAvatar": "Carica Avatar",
- "statusUpdateSuccess": "Avatar status was updated successfully!",
+ "statusUpdateSuccess": "Avatar aggiornato!",
"setSuccess": "L'avatar è stato impostato con successo!"
},
"quickAddMagic": {
- "title": "Quick Add Magic Mode",
+ "title": "Modalità Aggiunta Rapida Magica",
"disabled": "Disabilitato",
"todoist": "Todoist",
"vikunja": "Vikunja"
},
"appearance": {
- "title": "Color Scheme",
- "setSuccess": "Saved change of color scheme to {colorScheme}",
+ "title": "Tema",
+ "setSuccess": "Tema cambiato in {colorScheme}",
"colorScheme": {
- "light": "Light",
- "system": "System",
- "dark": "Dark"
+ "light": "Chiaro",
+ "system": "Sistema",
+ "dark": "Scuro"
}
}
},
"deletion": {
- "title": "Delete your Vikunja Account",
- "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, lists, tasks and everything associated with it.",
+ "title": "Elimina il tuo Account Vikunja",
+ "text1": "La cancellazione del tuo account è permanente e non può essere annullata. Elimineremo tutti i tuoi namespace, liste, attività e tutto ciò che è ad esso associato.",
"text2": "Per continuare, inserisci la tua password. Riceverai un'e-mail con ulteriori istruzioni.",
"confirm": "Elimina il mio profilo",
"requestSuccess": "Richiesta riuscita. Riceverai un'e-mail con ulteriori istruzioni.",
@@ -141,7 +141,7 @@
},
"export": {
"title": "Esporta i tuoi dati Vikunja",
- "description": "You can request a copy of all your Vikunja data. This include Namespaces, Lists, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
+ "description": "Puoi richiedere una copia di tutti i tuoi dati all'interno di Vikunja. Questo include i Namespace, le Liste, le Attività e tutto ciò che è loro associato. È possibile importare questi dati in qualsiasi istanza Vikunja attraverso la funzione di migrazione.",
"descriptionPasswordRequired": "Inserisci la tua password per procedere:",
"request": "Richiedi una copia dei miei dati Vikunja",
"success": "Hai richiesto con successo i tuoi dati Vikunja! Ti invieremo un'e-mail una volta che saranno pronti da scaricare.",
@@ -157,7 +157,7 @@
"searchSelect": "Fare clic o premere invio per selezionare questa lista",
"shared": "Liste Condivise",
"create": {
- "header": "New list",
+ "header": "Nuova lista",
"titlePlaceholder": "Il titolo della lista va qui…",
"addTitleRequired": "Specifica un titolo.",
"createdSuccess": "La lista è stata creata correttamente.",
@@ -191,7 +191,7 @@
"duplicate": {
"title": "Duplica questa lista",
"label": "Duplica",
- "text": "Select a namespace which should hold the duplicated list:",
+ "text": "Seleziona un namespace che dovrebbe contenere l'elenco duplicato:",
"success": "Lista duplicata."
},
"edit": {
@@ -279,23 +279,23 @@
"title": "Kanban",
"limit": "Limite: {limit}",
"noLimit": "Non Impostato",
- "doneBucket": "Done bucket",
- "doneBucketHint": "All tasks moved into this bucket will automatically marked as done.",
- "doneBucketHintExtended": "All tasks moved into the done bucket will be marked as done automatically. All tasks marked as done from elsewhere will be moved as well.",
- "doneBucketSavedSuccess": "The done bucket has been saved successfully.",
- "deleteLast": "You cannot remove the last bucket.",
- "addTaskPlaceholder": "Enter the new task title…",
+ "doneBucket": "Colonna attività completate",
+ "doneBucketHint": "Tutte le attività spostate in questa colonna verranno automaticamente contrassegnate come completate.",
+ "doneBucketHintExtended": "Tutte le attività spostate nella colonna attività completate saranno contrassegnate automaticamente come completate. Tutte le attività contrassegnate come completate altrove verranno anche spostate.",
+ "doneBucketSavedSuccess": "Colonna attività completate salvata.",
+ "deleteLast": "Impossibile eliminare l'ultima colonna.",
+ "addTaskPlaceholder": "Inserisci il nuovo titolo dell'attività…",
"addTask": "Aggiungi un'attività",
"addAnotherTask": "Aggiungi un'altra attività",
- "addBucket": "Create a new bucket",
- "addBucketPlaceholder": "Enter the new bucket title…",
- "deleteHeaderBucket": "Delete the bucket",
- "deleteBucketText1": "Are you sure you want to delete this bucket?",
- "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.",
- "collapse": "Collapse this bucket"
+ "addBucket": "Crea una nuova colonna",
+ "addBucketPlaceholder": "Inserisci il titolo della nuova colonna…",
+ "deleteHeaderBucket": "Elimina la colonna",
+ "deleteBucketText1": "Confermi di voler eliminare questa colonna?",
+ "deleteBucketText2": "Questo non eliminerà nessuna attività, ma la sposterà nel bucket predefinito.",
+ "deleteBucketSuccess": "Colonna eliminata.",
+ "bucketTitleSavedSuccess": "Titolo della colonna salvato.",
+ "bucketLimitSavedSuccess": "Limite della colonna salvato.",
+ "collapse": "Comprimi questa colonna"
},
"pseudo": {
"favorites": {
@@ -304,52 +304,52 @@
}
},
"namespace": {
- "title": "Namespaces & Lists",
+ "title": "Namespace e Liste",
"namespace": "Namespace",
- "showArchived": "Show Archived",
- "noneAvailable": "You don't have any namespaces right now.",
- "unarchive": "Un-Archive",
- "archived": "Archived",
- "noLists": "This namespace does not contain any lists.",
- "createList": "Create a new list in this namespace.",
- "namespaces": "Namespaces",
- "search": "Type to search for a namespace…",
+ "showArchived": "Mostra Archiviati",
+ "noneAvailable": "Non hai alcun namespace in questo momento.",
+ "unarchive": "De-Archivia",
+ "archived": "Archiviato",
+ "noLists": "Questo namespace non contiene alcuna lista.",
+ "createList": "Crea una nuova lista in questo namespace.",
+ "namespaces": "Namespace",
+ "search": "Digita per cercare un namespace…",
"create": {
- "title": "New namespace",
- "titleRequired": "Please specify a title.",
- "explanation": "A namespace is a collection of lists you can share and use to organize your lists with. In fact, every list belongs to a namepace.",
- "tooltip": "What's a namespace?",
- "success": "The namespace was successfully created."
+ "title": "Nuovo namespace",
+ "titleRequired": "Specifica un titolo.",
+ "explanation": "Un namespace è una raccolta di liste che puoi condividere e che puoi usare per organizzare le tue liste. Infatti, ogni lista appartiene a un namespace.",
+ "tooltip": "Che cos'è un namespace?",
+ "success": "Namespace creato."
},
"archive": {
"titleArchive": "Archivia \"{namespace}\"",
- "titleUnarchive": "Un-Archive \"{namespace}\"",
- "archiveText": "You won't be able to edit this namespace or create new lists until you un-archive it. This will also archive all lists in this namespace.",
- "unarchiveText": "You will be able to create new lists or edit it.",
- "success": "The namespace was successfully archived.",
- "description": "If a namespace is archived, you cannot create new lists or edit it."
+ "titleUnarchive": "Disarchivia \"{namespace}\"",
+ "archiveText": "Non sarà possibile modificare questo namespace o creare nuove liste fino a quando non verrà disarchiviato. Questo archivierà anche tutte le liste in questo namespace.",
+ "unarchiveText": "Potrai creare nuove liste o modificarle.",
+ "success": "Namespace creato.",
+ "description": "Se un namespace è archiviato, non è possibile creare nuove liste o modificarlo."
},
"delete": {
- "title": "Delete \"{namespace}\"",
- "text1": "Are you sure you want to delete this namespace and all of its contents?",
+ "title": "Elimina \"{namespace}\"",
+ "text1": "Sei sicuro di voler rimuovere questo namespace e tutto il relativo contenuto?",
"text2": "Questo include tutte le liste e le attività e NON PUÒ ESSERE RIPRISTINATO!",
- "success": "The namespace was successfully deleted."
+ "success": "Namespace eliminato."
},
"edit": {
"title": "Modifica \"{namespace}\"",
- "success": "The namespace was successfully updated."
+ "success": "Namespace aggiornato."
},
"share": {
"title": "Condividi \"{namespace}\""
},
"attributes": {
- "title": "Namespace Title",
- "titlePlaceholder": "The namespace title goes here…",
+ "title": "Titolo del Namespace",
+ "titlePlaceholder": "Il titolo del namespace va qui…",
"description": "Descrizione",
- "descriptionPlaceholder": "The namespaces description goes here…",
+ "descriptionPlaceholder": "La descrizione del namespace va qui…",
"color": "Colore",
- "archived": "Is Archived",
- "isArchived": "This namespace is archived"
+ "archived": "Archiviato",
+ "isArchived": "Questo namespace è archiviato"
},
"pseudo": {
"sharedLists": {
@@ -365,7 +365,7 @@
},
"filters": {
"title": "Filtri",
- "clear": "Clear Filters",
+ "clear": "Pulisci Filtri",
"attributes": {
"title": "Titolo",
"titlePlaceholder": "Il titolo del filtro salvato va qui…",
@@ -374,17 +374,17 @@
"includeNulls": "Includi attività che non hanno un valore impostato",
"requireAll": "Tutti i filtri devono essere veri affinché l'attività venga mostrata",
"showDoneTasks": "Mostra Attività Fatte",
- "sortAlphabetically": "Sort Alphabetically",
+ "sortAlphabetically": "Ordine alfabetico",
"enablePriority": "Abilita Filtro Per Priorità",
"enablePercentDone": "Abilitare Filtro Per Percentuale Fatta",
"dueDateRange": "Intervallo Data Di Scadenza",
"startDateRange": "Intervallo Data Iniziale",
"endDateRange": "Intervallo Data Finale",
- "reminderRange": "Reminder Date Range"
+ "reminderRange": "Intervallo date dei promemoria"
},
"create": {
- "title": "New Saved Filter",
- "description": "A saved filter is a virtual list which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
+ "title": "Nuovo Filtro Salvato",
+ "description": "Un filtro salvato è una lista virtuale che viene calcolata da un insieme di filtri di volta in volta. Una volta creato, apparirà in un namespace speciale.",
"action": "Crea nuovo filtro salvato"
},
"delete": {
@@ -446,9 +446,9 @@
},
"navigation": {
"overview": "Panoramica",
- "upcoming": "Upcoming",
+ "upcoming": "Prossimamente",
"settings": "Impostazioni",
- "imprint": "Imprint",
+ "imprint": "Informazioni legali",
"privacy": "Politica sulla Privacy"
},
"misc": {
@@ -464,19 +464,19 @@
"searchPlaceholder": "Digita per cercare…",
"previous": "Precedente",
"next": "Successivo",
- "poweredBy": "Powered by Vikunja",
+ "poweredBy": "Creato con Vikunja",
"info": "Info",
- "create": "Create",
+ "create": "Crea",
"doit": "Fallo!",
"saving": "Salvataggio…",
"saved": "Salvato!",
"default": "Predefinito",
"close": "Chiudi",
"download": "Scarica",
- "showMenu": "Show the menu",
- "hideMenu": "Hide the menu",
- "forExample": "For example:",
- "welcomeBack": "Welcome Back!"
+ "showMenu": "Mostra il menu",
+ "hideMenu": "Nascondi il menù",
+ "forExample": "Ad esempio:",
+ "welcomeBack": "Bentornato!"
},
"input": {
"resetColor": "Ripristina Colore",
@@ -485,9 +485,9 @@
"tomorrow": "Domani",
"nextMonday": "Lunedì Prossimo",
"thisWeekend": "Questo fine settimana",
- "laterThisWeek": "Later This Week",
+ "laterThisWeek": "Alla fine di questa settimana",
"nextWeek": "Prossima Settimana",
- "chooseDate": "Choose a date"
+ "chooseDate": "Seleziona una data"
},
"editor": {
"edit": "Modifica",
@@ -504,16 +504,16 @@
"quote": "Citazione",
"unorderedList": "Elenco puntato",
"orderedList": "Elenco numerato",
- "cleanBlock": "Clean Block",
+ "cleanBlock": "Pulisci Blocco",
"link": "Link",
"image": "Immagine",
"table": "Tabella",
- "horizontalRule": "Horizontal Rule",
- "sideBySide": "Side By Side",
- "guide": "Guide"
+ "horizontalRule": "Divisore Orizzontale",
+ "sideBySide": "Affianca",
+ "guide": "Guida"
},
"multiselect": {
- "createPlaceholder": "Create new",
+ "createPlaceholder": "Crea nuovo",
"selectPlaceholder": "Clicca o premere invio per selezionare"
}
},
@@ -533,19 +533,19 @@
"titleDates": "Attività dal {from} al {to}",
"noDates": "Mostra attività senza date",
"current": "Attività attuali",
- "from": "Tasks from",
- "until": "until",
+ "from": "Attività dal",
+ "until": "fino al",
"today": "Oggi",
"nextWeek": "Settimana Prossima",
"nextMonth": "Prossimo Mese",
- "noTasks": "Nothing to do — Have a nice day!"
+ "noTasks": "Nessuna attività — Buona giornata!"
},
"detail": {
"chooseDueDate": "Clicca qui per impostare una data di scadenza",
"chooseStartDate": "Clicca qui per impostare una data di inizio",
"chooseEndDate": "Clicca qui per impostare una data di fine",
"move": "Sposta attività in un'altra lista",
- "done": "Mark task done!",
+ "done": "Segna attività fatta!",
"undone": "Segna come non completato",
"created": "Creato {0} da {1}",
"updated": "Aggiornato {0}",
@@ -554,21 +554,21 @@
"deleteSuccess": "L'attività è stata eliminata con successo.",
"belongsToList": "Questa attività appartiene alla lista '{list}'",
"due": "Scadenza {at}",
- "closePopup": "Close popup",
+ "closePopup": "Chiudi popup",
"delete": {
"header": "Elimina questa attività",
"text1": "Sei sicuro di voler eliminare questa attività?",
"text2": "Questo rimuoverà anche tutti gli allegati, i promemoria e le relazioni associati a questa attività e non può essere ripristinato!"
},
"actions": {
- "assign": "Assign to a user",
+ "assign": "Assegna ad un utente",
"label": "Aggiungi etichette",
"priority": "Imposta Priorità",
"dueDate": "Imposta data di scadenza",
"startDate": "Imposta una data di inizio",
"endDate": "Imposta una data di fine",
"reminders": "Imposta promemoria",
- "repeatAfter": "Set a repeating interval",
+ "repeatAfter": "Imposta ricorrenza",
"percentDone": "Imposta Percentuale Completata",
"attachments": "Aggiungi allegati",
"relatedTasks": "Aggiungi attività collegate",
@@ -599,13 +599,13 @@
"updated": "Aggiornato"
},
"subscription": {
- "subscribedThroughParent": "You can't unsubscribe here because you are subscribed to this {entity} through its {parent}.",
- "subscribed": "You are currently subscribed to this {entity} and will receive notifications for changes.",
- "notSubscribed": "You are not subscribed to this {entity} and won't receive notifications for changes.",
- "subscribe": "Subscribe",
- "unsubscribe": "Unsubscribe",
- "subscribeSuccess": "You are now subscribed to this {entity}",
- "unsubscribeSuccess": "You are now unsubscribed to this {entity}"
+ "subscribedThroughParent": "Non puoi annullare l'iscrizione qui perché sei iscritto a questo {entity} attraverso il suo {parent}.",
+ "subscribed": "Sei attualmente iscritto a questo {entity} e riceverai notifiche per le modifiche.",
+ "notSubscribed": "Non sei iscritto a questo {entity} e non riceverai notifiche per le modifiche.",
+ "subscribe": "Iscriviti",
+ "unsubscribe": "Disiscriviti",
+ "subscribeSuccess": "Ti sei iscritto a questo {entity}",
+ "unsubscribeSuccess": "Ti sei disiscritto a questo {entity}"
},
"attachment": {
"title": "Allegati",
@@ -623,41 +623,41 @@
"comment": {
"title": "Commenti",
"loading": "Caricamento commenti…",
- "edited": "edited {date}",
+ "edited": "modificato il {date}",
"creating": "Creazione del commento…",
"placeholder": "Aggiungi un commento…",
- "comment": "Comment",
+ "comment": "Commenta",
"delete": "Elimina questo commento",
"deleteText1": "Sei sicuro di voler eliminare questo commento?",
"deleteText2": "Questa azione non può essere annullata!",
"addedSuccess": "Il commento è stato aggiunto correttamente."
},
"deferDueDate": {
- "title": "Defer due date",
+ "title": "Rinvia data di scadenza",
"1day": "1 giorno",
"3days": "3 giorni",
"1week": "1 settimana"
},
"description": {
- "placeholder": "Click here to enter a description…",
- "empty": "No description available yet."
+ "placeholder": "Clicca qui per inserire una descrizione…",
+ "empty": "Nessuna descrizione."
},
"assignee": {
- "placeholder": "Type to assign a user…",
+ "placeholder": "Digita per assegnare un utente…",
"selectPlaceholder": "Assegna questo utente",
- "assignSuccess": "The user has been assigned successfully.",
- "unassignSuccess": "The user has been unassigned successfully."
+ "assignSuccess": "Utente assegnato.",
+ "unassignSuccess": "Utente disassegnato."
},
"label": {
- "placeholder": "Type to add a new label…",
- "createPlaceholder": "Add this as new label",
+ "placeholder": "Digita per aggiungere una nuova etichetta…",
+ "createPlaceholder": "Aggiungila come nuova etichetta",
"addSuccess": "Etichetta aggiunta.",
"createSuccess": "Etichetta creata.",
"removeSuccess": "Etichetta eliminata.",
"addCreateSuccess": "Etichetta creata e aggiunta."
},
"priority": {
- "unset": "Unset",
+ "unset": "Azzera",
"low": "Bassa",
"medium": "Media",
"high": "Alta",
@@ -665,38 +665,38 @@
"doNow": "FARE ORA"
},
"relation": {
- "add": "Add a New Task Relation",
- "new": "New Task Relation",
- "searchPlaceholder": "Type search for a new task to add as related…",
- "createPlaceholder": "Add this as new related task",
- "differentList": "This task belongs to a different list.",
- "differentNamespace": "This task belongs to a different namespace.",
- "noneYet": "No task relations yet.",
- "delete": "Delete Task Relation",
- "deleteText1": "Are you sure you want to delete this task relation?",
+ "add": "Aggiungi Attività Collegata",
+ "new": "Nuova Attività Collegata",
+ "searchPlaceholder": "Digita per cercare un'attività da aggiungere come collegata…",
+ "createPlaceholder": "Aggiungi come attività collegata",
+ "differentList": "Questa attività è di una lista diversa.",
+ "differentNamespace": "Questa attività appartiene ad un namespace diverso.",
+ "noneYet": "Nessuna attività collegata.",
+ "delete": "Elimina Collegamento Attività",
+ "deleteText1": "Confermi di voler eliminare questo collegamento attività?",
"deleteText2": "Questa azione non può essere annullata!",
- "select": "Select a relation kind",
+ "select": "Seleziona un tipo di collegamento",
"kinds": {
- "subtask": "Subtask | Subtasks",
- "parenttask": "Parent Task | Parent Tasks",
- "related": "Related Task | Related Tasks",
+ "subtask": "Sotto-attività | Sotto-attività",
+ "parenttask": "Attività Principale | Attività Principale",
+ "related": "Attività Correlata | Attività Correlata",
"duplicateof": "Duplicato Di | Duplicati Di",
- "duplicates": "Duplicates | Duplicates",
- "blocking": "Blocking | Blocking",
- "blocked": "Blocked By | Blocked By",
- "precedes": "Precedes | Precedes",
- "follows": "Follows | Follows",
- "copiedfrom": "Copied From | Copied From",
- "copiedto": "Copied To | Copied To"
+ "duplicates": "Duplicato | Duplicati",
+ "blocking": "Bloccante | Bloccanti",
+ "blocked": "Bloccato Da | Bloccati Da",
+ "precedes": "Precede | Precede",
+ "follows": "Segue | Segue",
+ "copiedfrom": "Copiata Da | Copiate Da",
+ "copiedto": "Copiata In | Copiate In"
}
},
"repeat": {
"everyDay": "Ogni Giorno",
"everyWeek": "Ogni Settimana",
"everyMonth": "Ogni Mese",
- "mode": "Repeat mode",
+ "mode": "Modalità Ripetizione",
"monthly": "Mensilmente",
- "fromCurrentDate": "From Current Date",
+ "fromCurrentDate": "Dalla Data Attuale",
"each": "Ogni",
"specifyAmount": "Specifica una quantità…",
"hours": "Ore",
@@ -706,32 +706,32 @@
"years": "Anni"
},
"quickAddMagic": {
- "hint": "You can use Quick Add Magic",
+ "hint": "Puoi usare l'Aggiunta Rapida Magica",
"what": "Cosa?",
- "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.",
+ "title": "Aggiunta Rapida Magica",
+ "intro": "Quando si crea un'attività, è possibile utilizzare parole chiave speciali per aggiungere direttamente attributi all'attività appena creata. Questo permette di aggiungere gli attributi comuni molto più velocemente.",
"multiple": "Puoi usarlo più volte.",
- "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 {prefix} 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.",
+ "label1": "Per aggiungere un'etichetta, basta aggiungere il nome dell'etichetta preceduto da {prefix}.",
+ "label2": "Vikunja controllerà prima se l'etichetta esiste già e nel caso la creerà.",
+ "label3": "Per usare gli spazi, basta \" prima e dopo del nome dell'etichetta.",
+ "label4": "Per esempio: {prefix}\"Etichetta con spazi\".",
+ "priority1": "Per impostare la priorità di un'attività, aggiungi un numero 1-5, preceduto da {prefix}.",
+ "priority2": "Più alto è il numero, più alta è la priorità.",
+ "assignees": "Per assegnare direttamente l'attività a un utente, aggiungere il suo nome utente preceduto da {prefix} all'attività.",
+ "list1": "Per impostare una lista di appartenenza all'attività, inserisci il suo nome prefisso con {prefix}.",
+ "list2": "Ciò restituirà un errore se la lista non esiste.",
"dateAndTime": "Data e ora",
- "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.",
- "repeats": "Repeating tasks",
- "repeatsDescription": "To set a task as repeating in an interval, simply add '{suffix}' to the task text. The amount needs to be a number and can be omitted to use just the type (see examples)."
+ "date": "Qualsiasi data verrà utilizzata come data di scadenza della nuova attività. È possibile utilizzare le date in uno qualsiasi di questi formati:",
+ "dateWeekday": "qualsiasi giorno della settimana, userà la data più vicina",
+ "dateCurrentYear": "userà l’anno corrente",
+ "dateNth": "userà il {day} del mese corrente",
+ "dateTime": "Combina uno qualsiasi dei formati di data con \"{time}\" (o {timePM}) per impostare un orario.",
+ "repeats": "Attività ricorrenti",
+ "repeatsDescription": "Per impostare un'attività come ricorrente in un intervallo, basta aggiungere '{suffix}' al testo dell'attività. La quantità deve essere un numero e può essere omesso per usare solo il tipo (vedi esempi)."
}
},
"team": {
- "title": "Teams",
+ "title": "Gruppi",
"noTeams": "Non fai parte di nessun gruppo.",
"create": {
"title": "Crea un nuovo gruppo",
@@ -746,23 +746,23 @@
"makeAdmin": "Rendi Amministratore",
"success": "Gruppo aggiornato.",
"userAddedSuccess": "Membro del gruppo aggiunto.",
- "madeMember": "The team member was successfully made member.",
- "madeAdmin": "The team member was successfully made admin.",
+ "madeMember": "Membro del gruppo reso membro.",
+ "madeAdmin": "Membro del gruppo reso amministratore.",
"delete": {
"header": "Elimina il gruppo",
"text1": "Sei sicuro di voler eliminare questo gruppo e tutti i suoi membri?",
- "text2": "All team members will lose access to lists and namespaces shared with this team. This CANNOT BE UNDONE!",
+ "text2": "Tutti i membri del gruppo perderanno l'accesso alle liste e ai namespace condivisi con questo gruppo. NON PUÒ ESSERE RIPRISTINATO!",
"success": "Gruppo eliminato."
},
"deleteUser": {
"header": "Rimuovi un utente dal gruppo",
"text1": "Confermi di voler rimuovere questo utente dal gruppo?",
- "text2": "They will lose access to all lists and namespaces this team has access to. This CANNOT BE UNDONE!",
+ "text2": "Perderanno l'accesso a tutte le liste e i namespace a cui questo gruppo ha accesso. NON PUÒ ESSERE RIPRISTINATO!",
"success": "Utente rimosso dal gruppo."
}
},
"attributes": {
- "name": "Team Name",
+ "name": "Nome Gruppo",
"namePlaceholder": "Il nome del gruppo va qui…",
"nameRequired": "Specifica un nome.",
"description": "Descrizione",
@@ -772,32 +772,32 @@
}
},
"keyboardShortcuts": {
- "title": "Keyboard Shortcuts",
- "general": "General",
+ "title": "Tasti Rapidi",
+ "general": "Generali",
"allPages": "Queste scorciatoie funzionano in tutte le pagine.",
"currentPageOnly": "Queste scorciatoie funzionano solo nella pagina attuale.",
"toggleMenu": "Attiva/Disattiva Menu",
"quickSearch": "Apri la barra di ricerca/azione rapida",
- "then": "then",
+ "then": "e dopo",
"task": {
- "title": "Task Page",
- "done": "Done",
- "assign": "Assign to a user",
- "labels": "Add labels to this task",
- "dueDate": "Change the due date of this task",
- "attachment": "Add an attachment to this task",
- "related": "Modify related tasks of this task"
+ "title": "Pagina Attività",
+ "done": "Fatto",
+ "assign": "Assegna a un utente",
+ "labels": "Aggiungi etichette a questa attività",
+ "dueDate": "Modifica la data di scadenza di questa attività",
+ "attachment": "Aggiungi un allegato a questa attività",
+ "related": "Modifica le attività collegate a questa"
},
"list": {
- "title": "List Views",
- "switchToListView": "Switch to list view",
- "switchToGanttView": "Switch to gantt view",
- "switchToKanbanView": "Switch to kanban view",
- "switchToTableView": "Switch to table view"
+ "title": "Viste Liste",
+ "switchToListView": "Passa alla vista Lista",
+ "switchToGanttView": "Passa alla vista Gantt",
+ "switchToKanbanView": "Passa alla vista Kanban",
+ "switchToTableView": "Passa alla vista Tabella"
}
},
"update": {
- "available": "There is an update for Vikunja available!",
+ "available": "È disponibile un aggiornamento per Vikunja!",
"do": "Aggiorna Adesso"
},
"menu": {
@@ -805,136 +805,136 @@
"archive": "Archivia",
"duplicate": "Duplica",
"delete": "Elimina",
- "unarchive": "Un-Archive",
- "setBackground": "Set background",
+ "unarchive": "Disarchivia",
+ "setBackground": "Imposta sfondo",
"share": "Condividi",
"newList": "Nuova lista"
},
"apiConfig": {
"url": "URL Vikunja",
"urlPlaceholder": "es. http://localhost:8080",
- "change": "change",
- "use": "Using Vikunja installation at {0}",
- "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.",
- "success": "Using Vikunja installation at \"{domain}\".",
- "urlRequired": "A url is required."
+ "change": "modifica",
+ "use": "Usa l'installazione di Vikunja a {0}",
+ "error": "Impossibile trovare o usare l'installazione di Vikunja su \"{domain}\". Prova per favore con un altro Url.",
+ "success": "Utilizzando l'installazione di Vikunja su \"{domain}\".",
+ "urlRequired": "L'URL è obbligatorio."
},
"loadingError": {
- "failed": "Loading failed, please {0}. If the error persists, please {1}.",
- "tryAgain": "try again",
- "contact": "contact us"
+ "failed": "Caricamento non riuscito, si prega di {0}. Se l'errore persiste, per favore {1}.",
+ "tryAgain": "riprova",
+ "contact": "Contattaci"
},
"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."
+ "title": "Notifiche",
+ "none": "Nessuna notifica. Buona giornata!",
+ "explainer": "Le notifiche appariranno qui quando le azioni su Namespace, liste o attività a cui hai sottoscritto la sottoscrizione avvengono."
},
"quickActions": {
- "commands": "Commands",
- "placeholder": "Type a command or search…",
- "hint": "You can use {list} to limit the search to a list. Combine {list} or {label} (labels) with a search query to search for a task with these labels or on that list. Use {assignee} to only search for teams.",
- "tasks": "Tasks",
+ "commands": "Comandi",
+ "placeholder": "Digita un comando o cerca…",
+ "hint": "Puoi usare {list} per limitare la ricerca a una lista. Unisci {list} o {label} (etichette) alla ricerca per trovare un'attività con quelle etichette o in quella lista. Usa {assignee} per cercare solo i gruppi.",
+ "tasks": "Attivitá",
"lists": "Liste",
- "teams": "Teams",
- "newList": "Enter the title of the new list…",
- "newTask": "Enter the title of the new task…",
- "newNamespace": "Enter the title of the new namespace…",
- "newTeam": "Enter the name of the new team…",
- "createTask": "Create a task in the current list ({title})",
- "createList": "Create a list in the current namespace ({title})",
+ "teams": "Gruppi",
+ "newList": "Inserisci il titolo della nuova lista…",
+ "newTask": "Inserisci il titolo della nuova attività…",
+ "newNamespace": "Inserisci il titolo del nuovo namespace…",
+ "newTeam": "Inserisci il nome del nuovo gruppo…",
+ "createTask": "Crea un'attività nella lista attuale ({title})",
+ "createList": "Crea una lista nel namespace attuale ({title})",
"cmds": {
- "newTask": "New task",
- "newList": "New list",
- "newNamespace": "New namespace",
- "newTeam": "New team"
+ "newTask": "Nuova attività",
+ "newList": "Nuova lista",
+ "newNamespace": "Nuovo Namespace",
+ "newTeam": "Nuovo gruppo"
}
},
"date": {
- "locale": "en",
+ "locale": "it",
"altFormatLong": "j M Y H:i",
"altFormatShort": "j M Y"
},
"error": {
"error": "Errore",
- "success": "Success",
+ "success": "Fatto",
"0001": "Non ti è permesso farlo.",
- "1001": "A user with this username already exists.",
+ "1001": "Esiste già un utente con questo nome utente.",
"1002": "Un utente con questo indirizzo e-mail esiste già.",
- "1004": "No username and password specified.",
+ "1004": "Nessun nome utente e password specificati.",
"1005": "L'utente non esiste.",
"1006": "Impossibile ottenere l'id utente.",
- "1008": "No password reset token provided.",
- "1009": "Invalid password reset token.",
+ "1008": "Nessun codice di reimpostazione password fornito.",
+ "1009": "Codice di reimpostazione password non valido.",
"1010": "Token di conferma dell'e-mail non valido.",
- "1011": "Wrong username or password.",
+ "1011": "Nome utente o password errati.",
"1012": "Indirizzo e-mail dell'utente non confermato.",
"1013": "La nuova password è vuota.",
"1014": "La vecchia password è vuota.",
"1015": "Autenticazione TOTP già abilitata per questo utente.",
"1016": "Autenticazione TOTP non abilitata per questo utente.",
"1017": "Codice TOTP non valido.",
- "1018": "The user avatar type setting is invalid.",
+ "1018": "L'impostazione del tipo di avatar utente non è valida.",
"2001": "L'ID non può essere vuoto o 0.",
"2002": "Alcuni dati della richiesta non erano validi.",
"3001": "La lista non esiste.",
- "3004": "You need to have read permissions on that list to perform that action.",
+ "3004": "Devi avere i permessi di lettura su quella lista per eseguire quell'azione.",
"3005": "Il titolo della lista non può essere vuoto.",
- "3006": "The list share does not exist.",
+ "3006": "La condivisione della lista non esiste.",
"3007": "Esiste già una lista con questo identificatore.",
- "3008": "The list is archived and can therefore only be accessed read only. This is also true for all tasks associated with this list.",
- "4001": "The list task text cannot be empty.",
- "4002": "The list task does not exist.",
+ "3008": "La lista è archiviata e può quindi essere consultata solo in sola lettura. Questo vale anche per tutte le attività associate a questa lista.",
+ "4001": "Il testo delle attività della lista non può essere vuoto.",
+ "4002": "Lista di attività non esistente.",
"4003": "Tutte le attività di modifica in blocco devono appartenere alla stessa lista.",
"4004": "Hai bisogno di almeno un'attività quando si modificano in blocco le attività.",
"4005": "Non hai il permesso di vedere l'attività.",
- "4006": "You can't set a parent task as the task itself.",
- "4007": "You can't create a task relation with an invalid kind of relation.",
- "4008": "You can't create a task relation which already exists.",
- "4009": "The task relation does not exist.",
- "4010": "Cannot relate a task with itself.",
- "4011": "The task attachment does not exist.",
- "4012": "The task attachment is too large.",
- "4013": "The task sort param is invalid.",
- "4014": "The task sort order is invalid.",
- "4015": "The task comment does not exist.",
- "4016": "Invalid task field.",
- "4017": "Invalid task filter comparator.",
- "4018": "Invalid task filter concatinator.",
- "4019": "Invalid task filter value.",
- "5001": "The namespace does not exist.",
- "5003": "You do not have access to the specified namespace.",
- "5006": "The namespace name cannot be empty.",
- "5009": "You need to have namespace read access to perform that action.",
- "5010": "This team does not have access to that namespace.",
- "5011": "This user has already access to that namespace.",
- "5012": "The namespace is archived and can therefore only be accessed read only.",
- "6001": "The team name cannot be empty.",
- "6002": "The team does not exist.",
- "6004": "The team already has access to that namespace or list.",
- "6005": "The user is already a member of that team.",
- "6006": "Cannot delete the last team member.",
- "6007": "The team does not have access to the list to perform that action.",
- "7002": "The user already has access to that list.",
+ "4006": "Non è possibile impostare un'attività principale come l'attività stessa.",
+ "4007": "Non è possibile creare una relazione di attività con un tipo di relazione non valido.",
+ "4008": "Non è possibile creare una relazione di attività già esistente.",
+ "4009": "La relazione di attività non esiste.",
+ "4010": "Non è possibile relazionare un'attività con se stessa.",
+ "4011": "L'allegato dell'attività non esiste.",
+ "4012": "L'allegato dell'attività è troppo grande.",
+ "4013": "Il parametro di ordinamento dei task non è valido.",
+ "4014": "L' ordinamento dei task non è valido.",
+ "4015": "Il commento all'attività non esiste.",
+ "4016": "Campo attività non valido.",
+ "4017": "Comparatore di filtri attività non valido.",
+ "4018": "Concatenatore filtro attività non valido.",
+ "4019": "Filtro attività non valido.",
+ "5001": "Il namespace non esiste.",
+ "5003": "Non hai accesso a questo namespace.",
+ "5006": "Il nome del namespace non può essere vuoto.",
+ "5009": "Devi avere accesso in lettura al namespace per effettuare questa operazione.",
+ "5010": "Il tuo gruppo non ha accesso a questo namespace.",
+ "5011": "Questo utente ha già accesso a quel namespace.",
+ "5012": "Il namespace è archiviato e può quindi essere accessibile solo in sola lettura.",
+ "6001": "Il nome del gruppo non può essere vuoto.",
+ "6002": "Gruppo non esistente.",
+ "6004": "Il team ha già accesso a questo namespace o lista.",
+ "6005": "L'utente è già membro di quel gruppo.",
+ "6006": "Non è possibile eliminare l'ultimo membro del gruppo.",
+ "6007": "Il gruppo non ha accesso alla lista per eseguire quell'azione.",
+ "7002": "L'utente ha già accesso a quella lista.",
"7003": "Non hai accesso a quella lista.",
"8001": "Questa etichetta esiste già in quell'attività.",
"8002": "L'etichetta non esiste.",
"8003": "Non hai accesso a questa etichetta.",
- "9001": "The right is invalid.",
- "10001": "The bucket does not exist.",
- "10002": "The bucket does not belong to that list.",
- "10003": "You cannot remove the last bucket on a list.",
- "10004": "You cannot add the task to this bucket as it already exceeded the limit of tasks it can hold.",
- "10005": "There can be only one done bucket per list.",
- "11001": "The saved filter does not exist.",
- "11002": "Saved filters are not available for link shares.",
- "12001": "The subscription entity type is invalid.",
- "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."
+ "9001": "Permesso non valido.",
+ "10001": "Colonna non esistente.",
+ "10002": "La colonna non appartiene a quella lista.",
+ "10003": "Non puoi rimuovere l'ultima colonna di una lista.",
+ "10004": "Non puoi aggiungere l'attività a questa colonna perché ha già superato il limite di attività che può contenere.",
+ "10005": "Ci può essere solo una colonna completati per lista.",
+ "11001": "Filtro salvato non esistente.",
+ "11002": "I filtri salvati non sono disponibili per i link di condivisione.",
+ "12001": "Il tipo di entità sottoscritto non è valido.",
+ "12002": "Sei già iscritto all'entità stessa o a un'entità principale.",
+ "13001": "Questa condivisione di link richiede una password per l'autenticazione, ma non è stato inserita.",
+ "13002": "La password inserita per il link di condivisione è valida."
},
"about": {
- "title": "About",
- "frontendVersion": "Frontend Version: {version}",
- "apiVersion": "API Version: {version}"
+ "title": "Informazioni",
+ "frontendVersion": "Versione Frontend: {version}",
+ "apiVersion": "Versione API: {version}"
}
}
diff --git a/src/i18n/lang/nl-NL.json b/src/i18n/lang/nl-NL.json
index 29537fe3..1f03d175 100644
--- a/src/i18n/lang/nl-NL.json
+++ b/src/i18n/lang/nl-NL.json
@@ -899,7 +899,7 @@
"4015": "The task comment does not exist.",
"4016": "Invalid task field.",
"4017": "Invalid task filter comparator.",
- "4018": "Invalid task filter concatinator.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Invalid task filter value.",
"5001": "The namespace does not exist.",
"5003": "You do not have access to the specified namespace.",
diff --git a/src/i18n/lang/pt-BR.json b/src/i18n/lang/pt-BR.json
index 29537fe3..1f03d175 100644
--- a/src/i18n/lang/pt-BR.json
+++ b/src/i18n/lang/pt-BR.json
@@ -899,7 +899,7 @@
"4015": "The task comment does not exist.",
"4016": "Invalid task field.",
"4017": "Invalid task filter comparator.",
- "4018": "Invalid task filter concatinator.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Invalid task filter value.",
"5001": "The namespace does not exist.",
"5003": "You do not have access to the specified namespace.",
diff --git a/src/i18n/lang/pt-PT.json b/src/i18n/lang/pt-PT.json
index 29537fe3..1f03d175 100644
--- a/src/i18n/lang/pt-PT.json
+++ b/src/i18n/lang/pt-PT.json
@@ -899,7 +899,7 @@
"4015": "The task comment does not exist.",
"4016": "Invalid task field.",
"4017": "Invalid task filter comparator.",
- "4018": "Invalid task filter concatinator.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Invalid task filter value.",
"5001": "The namespace does not exist.",
"5003": "You do not have access to the specified namespace.",
diff --git a/src/i18n/lang/ro-RO.json b/src/i18n/lang/ro-RO.json
index 29537fe3..1f03d175 100644
--- a/src/i18n/lang/ro-RO.json
+++ b/src/i18n/lang/ro-RO.json
@@ -899,7 +899,7 @@
"4015": "The task comment does not exist.",
"4016": "Invalid task field.",
"4017": "Invalid task filter comparator.",
- "4018": "Invalid task filter concatinator.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Invalid task filter value.",
"5001": "The namespace does not exist.",
"5003": "You do not have access to the specified namespace.",
diff --git a/src/i18n/lang/ru-RU.json b/src/i18n/lang/ru-RU.json
index d5d98771..49b46546 100644
--- a/src/i18n/lang/ru-RU.json
+++ b/src/i18n/lang/ru-RU.json
@@ -899,7 +899,7 @@
"4015": "Комментарий не существует.",
"4016": "Неверное поле задачи.",
"4017": "Неверный сравнитель фильтров задач.",
- "4018": "Неверный соединитель фильтров задач.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Неверное значение фильтра задач.",
"5001": "Пространство имён не существует.",
"5003": "Нет доступа к указанному пространству имён.",
diff --git a/src/i18n/lang/sv-SE.json b/src/i18n/lang/sv-SE.json
index 29537fe3..1f03d175 100644
--- a/src/i18n/lang/sv-SE.json
+++ b/src/i18n/lang/sv-SE.json
@@ -899,7 +899,7 @@
"4015": "The task comment does not exist.",
"4016": "Invalid task field.",
"4017": "Invalid task filter comparator.",
- "4018": "Invalid task filter concatinator.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Invalid task filter value.",
"5001": "The namespace does not exist.",
"5003": "You do not have access to the specified namespace.",
diff --git a/src/i18n/lang/tr-TR.json b/src/i18n/lang/tr-TR.json
index 29537fe3..1f03d175 100644
--- a/src/i18n/lang/tr-TR.json
+++ b/src/i18n/lang/tr-TR.json
@@ -899,7 +899,7 @@
"4015": "The task comment does not exist.",
"4016": "Invalid task field.",
"4017": "Invalid task filter comparator.",
- "4018": "Invalid task filter concatinator.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Invalid task filter value.",
"5001": "The namespace does not exist.",
"5003": "You do not have access to the specified namespace.",
diff --git a/src/i18n/lang/vi-VN.json b/src/i18n/lang/vi-VN.json
index 0b68ee80..d027aae7 100644
--- a/src/i18n/lang/vi-VN.json
+++ b/src/i18n/lang/vi-VN.json
@@ -899,7 +899,7 @@
"4015": "Bình luận không tồn tại.",
"4016": "Trường công việc không hợp lệ.",
"4017": "Bộ so sánh bộ lọc công việc không hợp lệ.",
- "4018": "Bộ lọc kết hợp không hợp lệ.",
+ "4018": "Invalid task filter concatenator.",
"4019": "Giá trị bộ lọc công việc không hợp lệ.",
"5001": "Góc làm việc không có nữa.",
"5003": "Bạn chưa được phép bước vào vào góc làm việc được chỉ định.",
diff --git a/src/icons.js b/src/icons.js
index 48ef230c..89e1d1a3 100644
--- a/src/icons.js
+++ b/src/icons.js
@@ -16,6 +16,8 @@ import {
faCocktail,
faCoffee,
faCog,
+ faEye,
+ faEyeSlash,
faEllipsisH,
faEllipsisV,
faExclamation,
@@ -87,6 +89,8 @@ library.add(faCocktail)
library.add(faCoffee)
library.add(faCog)
library.add(faComments)
+library.add(faEye)
+library.add(faEyeSlash)
library.add(faEllipsisH)
library.add(faEllipsisV)
library.add(faExclamation)
diff --git a/src/main.ts b/src/main.ts
index 45108a74..b4ed880a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,7 +18,7 @@ declare global {
}
}
-import {formatDate, formatDateShort, formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
+import {formatDate, formatDateShort, formatDateLong, formatDateSince, formatISO} from '@/helpers/time/formatDate'
// @ts-ignore
import {VERSION} from './version.json'
@@ -52,6 +52,7 @@ app.use(Notifications)
// directives
import focus from '@/directives/focus'
+// @ts-ignore The export does exist, ts just doesn't find it.
import { VTooltip } from 'v-tooltip'
import 'v-tooltip/dist/v-tooltip.css'
import shortcut from '@/directives/shortcut'
@@ -84,6 +85,7 @@ app.mixin({
format: formatDate,
formatDate: formatDateLong,
formatDateShort: formatDateShort,
+ formatISO,
getNamespaceTitle,
getListTitle,
setTitle,
diff --git a/src/models/task.js b/src/models/task.js
index c0334237..63839689 100644
--- a/src/models/task.js
+++ b/src/models/task.js
@@ -10,9 +10,6 @@ import {parseDateOrNull} from '@/helpers/parseDateOrNull'
const SUPPORTS_TRIGGERED_NOTIFICATION = 'Notification' in window && 'showTrigger' in Notification.prototype
export default class TaskModel extends AbstractModel {
-
- defaultColor = '198CFF'
-
constructor(data) {
super(data)
diff --git a/src/modules/parseTaskText.test.js b/src/modules/parseTaskText.test.js
index 19f3ba17..30e5743c 100644
--- a/src/modules/parseTaskText.test.js
+++ b/src/modules/parseTaskText.test.js
@@ -1,4 +1,4 @@
-import {describe, it, expect} from 'vitest'
+import {beforeEach, afterEach, describe, it, expect, vi} from 'vitest'
import {parseTaskText} from './parseTaskText'
import {getDateFromText, getDateFromTextIn} from '../helpers/time/parseDate'
@@ -6,6 +6,14 @@ import {calculateDayInterval} from '../helpers/time/calculateDayInterval'
import priorities from '../models/constants/priorities.json'
describe('Parse Task Text', () => {
+ beforeEach(() => {
+ vi.useFakeTimers()
+ })
+
+ afterEach(() => {
+ vi.useRealTimers()
+ })
+
it('should return text with no intents as is', () => {
expect(parseTaskText('Lorem Ipsum').text).toBe('Lorem Ipsum')
})
@@ -32,7 +40,7 @@ describe('Parse Task Text', () => {
expect(result.assignees).toHaveLength(1)
expect(result.assignees[0]).toBe('user')
})
-
+
it('should ignore email addresses', () => {
const text = 'Lorem Ipsum email@example.com'
const result = parseTaskText(text)
@@ -211,17 +219,36 @@ describe('Parse Task Text', () => {
expect(`${result.date.getHours()}:${result.date.getMinutes()}`).toBe('14:0')
})
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`)
+ const time = new Date(2022, 0, 15)
+ vi.setSystemTime(time)
+
+ const result = parseTaskText(`Lorem Ipsum ${time.getDate() - 1}th`)
expect(result.text).toBe('Lorem Ipsum')
- expect(result.date.getDate()).toBe(date.getDate())
+ expect(result.date.getDate()).toBe(time.getDate() - 1)
+ expect(result.date.getMonth()).toBe(time.getMonth() + 1)
+ })
+ it('should recognize dates of the month in the past but next month when february is the next month', () => {
+ const jan = new Date(2022, 0, 30)
+ vi.setSystemTime(jan)
- const nextMonthWithDate = result.date.getDate() === 31
- ? (date.getMonth() + 2) % 12
- : (date.getMonth() + 1) % 12
- expect(result.date.getMonth()).toBe(nextMonthWithDate)
+ const result = parseTaskText(`Lorem Ipsum ${jan.getDate() - 1}th`)
+
+ const expectedDate = new Date(2022, 2, jan.getDate() - 1)
+ expect(result.text).toBe('Lorem Ipsum')
+ expect(result.date.getDate()).toBe(expectedDate.getDate())
+ expect(result.date.getMonth()).toBe(expectedDate.getMonth())
+ })
+ it('should recognize dates of the month in the past but next month when the next month has less days than this one', () => {
+ const mar = new Date(2022, 2, 32)
+ vi.setSystemTime(mar)
+
+ const result = parseTaskText(`Lorem Ipsum 31st`)
+
+ const expectedDate = new Date(2022, 4, 31)
+ expect(result.text).toBe('Lorem Ipsum')
+ expect(result.date.getDate()).toBe(expectedDate.getDate())
+ expect(result.date.getMonth()).toBe(expectedDate.getMonth())
})
it('should recognize dates of the month in the future', () => {
const nextDay = new Date(+new Date() + 60 * 60 * 24 * 1000)
@@ -242,6 +269,12 @@ describe('Parse Task Text', () => {
expect(result.text).toBe('Lorem Ipsum github')
expect(result.date).toBeNull()
})
+ it('should not recognize date number with no spacing around them', () => {
+ const result = parseTaskText('Lorem Ispum v1.1.1')
+
+ expect(result.text).toBe('Lorem Ispum v1.1.1')
+ expect(result.date).toBeNull()
+ })
describe('Parse weekdays', () => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 7b28a509..6e4ccce2 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -2,6 +2,8 @@ import { createRouter, createWebHistory, RouteLocation } from 'vue-router'
import {saveLastVisited} from '@/helpers/saveLastVisited'
import {store} from '@/store'
+import {saveListView, getListView} from '@/helpers/saveListView'
+
import HomeComponent from '../views/Home.vue'
import NotFoundComponent from '../views/404.vue'
import About from '../views/About.vue'
@@ -13,9 +15,8 @@ import DataExportDownload from '../views/user/DataExportDownload.vue'
// Tasks
import ShowTasksInRangeComponent from '../views/tasks/ShowTasksInRange.vue'
import LinkShareAuthComponent from '../views/sharing/LinkSharingAuth.vue'
-import TaskDetailViewModal from '../views/tasks/TaskDetailViewModal.vue'
-import TaskDetailView from '../views/tasks/TaskDetailView.vue'
import ListNamespaces from '../views/namespaces/ListNamespaces.vue'
+import TaskDetailView from '../views/tasks/TaskDetailView.vue'
// Team Handling
import ListTeamsComponent from '../views/teams/ListTeams.vue'
// Label Handling
@@ -25,11 +26,11 @@ import NewLabelComponent from '../views/labels/NewLabel.vue'
import MigrationComponent from '../views/migrator/Migrate.vue'
import MigrateServiceComponent from '../views/migrator/MigrateService.vue'
// List Views
-import ShowListComponent from '../views/list/ShowList.vue'
-import Kanban from '../views/list/views/Kanban.vue'
-import List from '../views/list/views/List.vue'
-import Gantt from '../views/list/views/Gantt.vue'
-import Table from '../views/list/views/Table.vue'
+import ListList from '../views/list/ListList.vue'
+import ListGantt from '../views/list/ListGantt.vue'
+import ListTable from '../views/list/ListTable.vue'
+import ListKanban from '../views/list/ListKanban.vue'
+
// List Settings
import ListSettingEdit from '../views/list/settings/edit.vue'
import ListSettingBackground from '../views/list/settings/background.vue'
@@ -80,7 +81,7 @@ const router = createRouter({
// Scroll to anchor should still work
if (to.hash) {
- return {el: document.getElementById(to.hash.slice(1))}
+ return {el: to.hash}
}
// Otherwise just scroll to the top
@@ -132,7 +133,7 @@ const router = createRouter({
name: 'user.register',
component: RegisterComponent,
meta: {
- title: 'user.auth.register',
+ title: 'user.auth.createAccount',
},
},
{
@@ -201,320 +202,170 @@ const router = createRouter({
{
path: '/namespaces/new',
name: 'namespace.create',
- components: {
- popup: NewNamespaceComponent,
- },
- },
- {
- path: '/namespaces/:id/list',
- name: 'list.create',
- components: {
- popup: NewListComponent,
+ component: NewNamespaceComponent,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/namespaces/:id/settings/edit',
name: 'namespace.settings.edit',
- components: {
- popup: NamespaceSettingEdit,
+ component: NamespaceSettingEdit,
+ meta: {
+ showAsModal: true,
},
},
{
- path: '/namespaces/:id/settings/share',
+ path: '/namespaces/:namespaceId/settings/share',
name: 'namespace.settings.share',
- components: {
- popup: NamespaceSettingShare,
+ component: NamespaceSettingShare,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/namespaces/:id/settings/archive',
name: 'namespace.settings.archive',
- components: {
- popup: NamespaceSettingArchive,
+ component: NamespaceSettingArchive,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/namespaces/:id/settings/delete',
name: 'namespace.settings.delete',
- components: {
- popup: NamespaceSettingDelete,
+ component: NamespaceSettingDelete,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/tasks/:id',
name: 'task.detail',
component: TaskDetailView,
+ props: route => ({ taskId: parseInt(route.params.id as string) }),
},
{
path: '/tasks/by/upcoming',
name: 'tasks.range',
component: ShowTasksInRangeComponent,
},
+ {
+ path: '/lists/new/:namespaceId/',
+ name: 'list.create',
+ component: NewListComponent,
+ meta: {
+ showAsModal: true,
+ },
+ },
{
path: '/lists/:listId/settings/edit',
name: 'list.settings.edit',
- components: {
- popup: ListSettingEdit,
+ component: ListSettingEdit,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/lists/:listId/settings/background',
name: 'list.settings.background',
- components: {
- popup: ListSettingBackground,
+ component: ListSettingBackground,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/lists/:listId/settings/duplicate',
name: 'list.settings.duplicate',
- components: {
- popup: ListSettingDuplicate,
+ component: ListSettingDuplicate,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/lists/:listId/settings/share',
name: 'list.settings.share',
- components: {
- popup: ListSettingShare,
+ component: ListSettingShare,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/lists/:listId/settings/delete',
name: 'list.settings.delete',
- components: {
- popup: ListSettingDelete,
+ component: ListSettingDelete,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/lists/:listId/settings/archive',
name: 'list.settings.archive',
- components: {
- popup: ListSettingArchive,
+ component: ListSettingArchive,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/lists/:listId/settings/edit',
name: 'filter.settings.edit',
- components: {
- popup: FilterEdit,
+ component: FilterEdit,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/lists/:listId/settings/delete',
name: 'filter.settings.delete',
- components: {
- popup: FilterDelete,
+ component: FilterDelete,
+ meta: {
+ showAsModal: true,
},
},
{
path: '/lists/:listId',
name: 'list.index',
- component: ShowListComponent,
- children: [
- {
- path: '/lists/:listId/list',
- name: 'list.list',
- component: List,
- children: [
- {
- path: '/tasks/:id',
- name: 'task.list.detail',
- component: TaskDetailViewModal,
- },
- {
- path: '/lists/:listId/settings/edit',
- name: 'list.list.settings.edit',
- component: ListSettingEdit,
- },
- {
- path: '/lists/:listId/settings/background',
- name: 'list.list.settings.background',
- component: ListSettingBackground,
- },
- {
- path: '/lists/:listId/settings/duplicate',
- name: 'list.list.settings.duplicate',
- component: ListSettingDuplicate,
- },
- {
- path: '/lists/:listId/settings/share',
- name: 'list.list.settings.share',
- component: ListSettingShare,
- },
- {
- path: '/lists/:listId/settings/delete',
- name: 'list.list.settings.delete',
- component: ListSettingDelete,
- },
- {
- path: '/lists/:listId/settings/archive',
- name: 'list.list.settings.archive',
- component: ListSettingArchive,
- },
- {
- path: '/lists/:listId/settings/edit',
- name: 'filter.list.settings.edit',
- component: FilterEdit,
- },
- {
- path: '/lists/:listId/settings/delete',
- name: 'filter.list.settings.delete',
- component: FilterDelete,
- },
- ],
- },
- {
- path: '/lists/:listId/gantt',
- name: 'list.gantt',
- component: Gantt,
- children: [
- {
- path: '/tasks/:id',
- name: 'task.gantt.detail',
- component: TaskDetailViewModal,
- },
- {
- path: '/lists/:listId/settings/edit',
- name: 'list.gantt.settings.edit',
- component: ListSettingEdit,
- },
- {
- path: '/lists/:listId/settings/background',
- name: 'list.gantt.settings.background',
- component: ListSettingBackground,
- },
- {
- path: '/lists/:listId/settings/duplicate',
- name: 'list.gantt.settings.duplicate',
- component: ListSettingDuplicate,
- },
- {
- path: '/lists/:listId/settings/share',
- name: 'list.gantt.settings.share',
- component: ListSettingShare,
- },
- {
- path: '/lists/:listId/settings/delete',
- name: 'list.gantt.settings.delete',
- component: ListSettingDelete,
- },
- {
- path: '/lists/:listId/settings/archive',
- name: 'list.gantt.settings.archive',
- component: ListSettingArchive,
- },
- {
- path: '/lists/:listId/settings/edit',
- name: 'filter.gantt.settings.edit',
- component: FilterEdit,
- },
- {
- path: '/lists/:listId/settings/delete',
- name: 'filter.gantt.settings.delete',
- component: FilterDelete,
- },
- ],
- },
- {
- path: '/lists/:listId/table',
- name: 'list.table',
- component: Table,
- children: [
- {
- path: '/lists/:listId/settings/edit',
- name: 'list.table.settings.edit',
- component: ListSettingEdit,
- },
- {
- path: '/lists/:listId/settings/background',
- name: 'list.table.settings.background',
- component: ListSettingBackground,
- },
- {
- path: '/lists/:listId/settings/duplicate',
- name: 'list.table.settings.duplicate',
- component: ListSettingDuplicate,
- },
- {
- path: '/lists/:listId/settings/share',
- name: 'list.table.settings.share',
- component: ListSettingShare,
- },
- {
- path: '/lists/:listId/settings/delete',
- name: 'list.table.settings.delete',
- component: ListSettingDelete,
- },
- {
- path: '/lists/:listId/settings/archive',
- name: 'list.table.settings.archive',
- component: ListSettingArchive,
- },
- {
- path: '/lists/:listId/settings/edit',
- name: 'filter.table.settings.edit',
- component: FilterEdit,
- },
- {
- path: '/lists/:listId/settings/delete',
- name: 'filter.table.settings.delete',
- component: FilterDelete,
- },
- ],
- },
- {
- path: '/lists/:listId/kanban',
- name: 'list.kanban',
- component: Kanban,
- children: [
- {
- path: '/tasks/:id',
- name: 'task.kanban.detail',
- component: TaskDetailViewModal,
- },
- {
- path: '/lists/:listId/settings/edit',
- name: 'list.kanban.settings.edit',
- component: ListSettingEdit,
- },
- {
- path: '/lists/:listId/settings/background',
- name: 'list.kanban.settings.background',
- component: ListSettingBackground,
- },
- {
- path: '/lists/:listId/settings/duplicate',
- name: 'list.kanban.settings.duplicate',
- component: ListSettingDuplicate,
- },
- {
- path: '/lists/:listId/settings/share',
- name: 'list.kanban.settings.share',
- component: ListSettingShare,
- },
- {
- path: '/lists/:listId/settings/delete',
- name: 'list.kanban.settings.delete',
- component: ListSettingDelete,
- },
- {
- path: '/lists/:listId/settings/archive',
- name: 'list.kanban.settings.archive',
- component: ListSettingArchive,
- },
- {
- path: '/lists/:listId/settings/edit',
- name: 'filter.kanban.settings.edit',
- component: FilterEdit,
- },
- {
- path: '/lists/:listId/settings/delete',
- name: 'filter.kanban.settings.delete',
- component: FilterDelete,
- },
- ],
- },
- ],
+ redirect(to) {
+ // Redirect the user to list view by default
+
+ const savedListView = getListView(to.params.listId)
+ console.debug('Replaced list view with', savedListView)
+
+ return {
+ name: router.hasRoute(savedListView)
+ ? savedListView
+ : 'list.list',
+ params: {listId: to.params.listId},
+ }
+ },
+ },
+ {
+ path: '/lists/:listId/list',
+ name: 'list.list',
+ component: ListList,
+ beforeEnter: (to) => saveListView(to.params.listId, to.name),
+ props: route => ({ listId: parseInt(route.params.listId as string) }),
+ },
+ {
+ path: '/lists/:listId/gantt',
+ name: 'list.gantt',
+ component: ListGantt,
+ beforeEnter: (to) => saveListView(to.params.listId, to.name),
+ props: route => ({ listId: parseInt(route.params.listId as string) }),
+ },
+ {
+ path: '/lists/:listId/table',
+ name: 'list.table',
+ component: ListTable,
+ beforeEnter: (to) => saveListView(to.params.listId, to.name),
+ props: route => ({ listId: parseInt(route.params.listId as string) }),
+ },
+ {
+ path: '/lists/:listId/kanban',
+ name: 'list.kanban',
+ component: ListKanban,
+ beforeEnter: (to) => saveListView(to.params.listId, to.name),
+ props: route => ({ listId: parseInt(route.params.listId as string) }),
},
{
path: '/teams',
@@ -524,8 +375,9 @@ const router = createRouter({
{
path: '/teams/new',
name: 'teams.create',
- components: {
- popup: NewTeamComponent,
+ component: NewTeamComponent,
+ meta: {
+ showAsModal: true,
},
},
{
@@ -541,8 +393,9 @@ const router = createRouter({
{
path: '/labels/new',
name: 'labels.create',
- components: {
- popup: NewLabelComponent,
+ component: NewLabelComponent,
+ meta: {
+ showAsModal: true,
},
},
{
@@ -558,8 +411,9 @@ const router = createRouter({
{
path: '/filters/new',
name: 'filters.create',
- components: {
- popup: FilterNew,
+ component: FilterNew,
+ meta: {
+ showAsModal: true,
},
},
{
@@ -575,11 +429,7 @@ const router = createRouter({
],
})
-router.beforeEach((to) => {
- return checkAuth(to)
-})
-
-function checkAuth(route: RouteLocation) {
+export function getAuthForRoute(route: RouteLocation) {
const authUser = store.getters['auth/authUser']
const authLinkShare = store.getters['auth/authLinkShare']
diff --git a/src/store/index.js b/src/store/index.js
index 37c74ae8..0833e3f6 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -18,6 +18,8 @@ import lists from './modules/lists'
import attachments from './modules/attachments'
import labels from './modules/labels'
+import ListModel from '@/models/list'
+
import ListService from '../services/list'
import {checkAndSetApiUrl} from '@/helpers/checkAndSetApiUrl'
@@ -37,13 +39,15 @@ export const store = createStore({
loading: false,
loadingModule: null,
// This is used to highlight the current list in menu for all list related views
- currentList: {id: 0},
+ currentList: new ListModel({
+ id: 0,
+ isArchived: false,
+ }),
background: '',
hasTasks: false,
menuActive: true,
keyboardShortcutsActive: false,
quickActionsActive: false,
- vikunjaReady: false,
},
mutations: {
[LOADING](state, loading) {
@@ -79,9 +83,6 @@ export const store = createStore({
[BACKGROUND](state, background) {
state.background = background
},
- vikunjaReady(state, ready) {
- state.vikunjaReady = ready
- },
},
actions: {
async [CURRENT_LIST]({state, commit}, currentList) {
@@ -136,10 +137,9 @@ export const store = createStore({
commit(CURRENT_LIST, currentList)
},
- async loadApp({commit, dispatch}) {
+ async loadApp({dispatch}) {
await checkAndSetApiUrl(window.API_URL)
await dispatch('auth/checkAuth')
- commit('vikunjaReady', true)
},
},
})
diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
index 42078322..e71bbe73 100644
--- a/src/store/modules/auth.js
+++ b/src/store/modules/auth.js
@@ -1,12 +1,12 @@
import {HTTPFactory} from '@/http-common'
-import {getCurrentLanguage, saveLanguage} from '@/i18n'
+import {i18n, getCurrentLanguage, saveLanguage} from '@/i18n'
import {LOADING} from '../mutation-types'
import UserModel from '@/models/user'
import UserSettingsService from '@/services/userSettings'
import {getToken, refreshToken, removeToken, saveToken} from '@/helpers/auth'
import {setLoading} from '@/store/helper'
-import {i18n} from '@/i18n'
import {success} from '@/message'
+import {redirectToProvider} from '@/helpers/redirectToProvider'
const AUTH_TYPES = {
'UNKNOWN': 0,
@@ -201,7 +201,19 @@ export default {
ctx.commit('authenticated', authenticated)
if (!authenticated) {
ctx.commit('info', null)
- ctx.dispatch('config/redirectToProviderIfNothingElseIsEnabled', null, {root: true})
+ ctx.dispatch('redirectToProviderIfNothingElseIsEnabled')
+ }
+ },
+
+ redirectToProviderIfNothingElseIsEnabled({rootState}) {
+ const {auth} = rootState.config
+ if (
+ auth.local.enabled === false &&
+ auth.openidConnect.enabled &&
+ auth.openidConnect.providers?.length === 1 &&
+ window.location.pathname.startsWith('/login') // Kinda hacky, but prevents an endless loop.
+ ) {
+ redirectToProvider(auth.openidConnect.providers[0], auth.openidConnect.redirectUrl)
}
},
@@ -226,7 +238,7 @@ export default {
commit('info', info)
commit('lastUserRefresh')
- if (typeof info.settings.language !== 'undefined') {
+ if (typeof info.settings.language === 'undefined' || info.settings.language === '') {
// save current language
await dispatch('saveUserSettings', {
settings: {
diff --git a/src/store/modules/config.js b/src/store/modules/config.js
index 82c2b20c..dfe1e01f 100644
--- a/src/store/modules/config.js
+++ b/src/store/modules/config.js
@@ -1,7 +1,6 @@
import {CONFIG} from '../mutation-types'
import {HTTPFactory} from '@/http-common'
import {objectToCamelCase} from '@/helpers/case'
-import {redirectToProvider} from '../../helpers/redirectToProvider'
import {parseURL} from 'ufo'
export default {
@@ -75,16 +74,5 @@ export default {
ctx.commit(CONFIG, info)
return info
},
-
- redirectToProviderIfNothingElseIsEnabled(ctx) {
- if (ctx.state.auth.local.enabled === false &&
- ctx.state.auth.openidConnect.enabled &&
- ctx.state.auth.openidConnect.providers &&
- ctx.state.auth.openidConnect.providers.length === 1 &&
- window.location.pathname.startsWith('/login') // Kinda hacky, but prevents an endless loop.
- ) {
- redirectToProvider(ctx.state.auth.openidConnect.providers[0])
- }
- },
},
}
\ No newline at end of file
diff --git a/src/store/modules/namespaces.js b/src/store/modules/namespaces.js
index ae47a95f..4512fb89 100644
--- a/src/store/modules/namespaces.js
+++ b/src/store/modules/namespaces.js
@@ -23,8 +23,6 @@ export default {
return
}
- // FIXME: direct manipulation of the prop
- // might not be a problem since this is happening in the mutation
if (!namespace.lists || namespace.lists.length === 0) {
namespace.lists = state.namespaces[namespaceIndex].lists
}
@@ -136,8 +134,8 @@ export default {
},
loadNamespacesIfFavoritesDontExist(ctx) {
- // The first namespace should be the one holding all favorites
- if (ctx.state.namespaces[0].id !== -2) {
+ // The first or second namespace should be the one holding all favorites
+ if (ctx.state.namespaces[0].id !== -2 && ctx.state.namespaces[1]?.id !== -2) {
return ctx.dispatch('loadNamespaces')
}
},
diff --git a/src/store/modules/tasks.js b/src/store/modules/tasks.js
index 8d29cc89..504554c9 100644
--- a/src/store/modules/tasks.js
+++ b/src/store/modules/tasks.js
@@ -179,9 +179,18 @@ export default {
console.debug('Could not add label to task in kanban, task not found', t)
return r
}
- // FIXME: direct store manipulation (task)
- t.task.labels.push(label)
- ctx.commit('kanban/setTaskInBucketByIndex', t, { root: true })
+
+ const labels = [...t.task.labels]
+ labels.push(label)
+
+ ctx.commit('kanban/setTaskInBucketByIndex', {
+ task: {
+ labels,
+ ...t.task,
+ },
+ ...t,
+ }, { root: true })
+
return r
},
@@ -200,15 +209,21 @@ export default {
}
// Remove the label from the list
- for (const l in t.task.labels) {
- if (t.task.labels[l].id === label.id) {
- // FIXME: direct store manipulation (task)
- t.task.labels.splice(l, 1)
+ const labels = [...t.task.labels]
+ for (const l in labels) {
+ if (labels[l].id === label.id) {
+ labels.splice(l, 1)
break
}
}
- ctx.commit('kanban/setTaskInBucketByIndex', t, {root: true})
+ ctx.commit('kanban/setTaskInBucketByIndex', {
+ task: {
+ labels,
+ ...t.task,
+ },
+ ...t,
+ }, {root: true})
return response
},
diff --git a/src/styles/common-imports.scss b/src/styles/common-imports.scss
index 5ca35fc4..a9e163e3 100644
--- a/src/styles/common-imports.scss
+++ b/src/styles/common-imports.scss
@@ -16,6 +16,8 @@
// since $tablet is defined by bulma we can just define it after importing the utilities
$mobile: math.div($tablet, 2);
+@import "mixins";
+
$family-sans-serif: 'Open Sans', Helvetica, Arial, sans-serif;
$vikunja-font: 'Quicksand', sans-serif;
diff --git a/src/styles/components/_index.scss b/src/styles/components/_index.scss
index ba87006b..080c93d0 100644
--- a/src/styles/components/_index.scss
+++ b/src/styles/components/_index.scss
@@ -2,4 +2,4 @@
@import "labels";
@import "list";
@import "task";
-@import "tasks";
\ No newline at end of file
+@import "tasks";
diff --git a/src/styles/custom-properties/colors.scss b/src/styles/custom-properties/colors.scss
index 2fc3ba0d..ae68dd60 100644
--- a/src/styles/custom-properties/colors.scss
+++ b/src/styles/custom-properties/colors.scss
@@ -60,9 +60,9 @@
--danger: hsla(var(--danger-h), var(--danger-s), var(--danger-l), var(--danger-a));
// var(--primary) / $blue is #1973ff
- --primary-h: 216.5deg;
- --primary-s: 100%;
- --primary-l: 54.9%;
+ --primary-h: 217deg;
+ --primary-s: 98%;
+ --primary-l: 53%;
--primary-a: 1;
--primary-hsl: var(--primary-h), var(--primary-s), var(--primary-l);
--primary: hsla(var(--primary-h), var(--primary-s), var(--primary-l), var(--primary-a));
@@ -122,5 +122,10 @@
// Custom color variables we need to override
--card-border-color: hsla(var(--grey-100-hsl), 0.3);
--logo-text-color: var(--grey-700);
+
+ // Slightly different primary color to make sure it has a sufficent contrast ratio
+ --primary-h: 217deg;
+ --primary-s: 98%;
+ --primary-l: 58%;
}
}
\ No newline at end of file
diff --git a/src/styles/mixins.scss b/src/styles/mixins.scss
new file mode 100644
index 00000000..687355e7
--- /dev/null
+++ b/src/styles/mixins.scss
@@ -0,0 +1,12 @@
+/* Transitions */
+@mixin modal-transition() {
+ .modal-enter,
+ .modal-leave-active {
+ opacity: 0;
+ }
+
+ .modal-enter .modal-container,
+ .modal-leave-active .modal-container {
+ transform: scale(0.9);
+ }
+}
\ No newline at end of file
diff --git a/src/styles/theme/background.scss b/src/styles/theme/background.scss
index b03b04f4..d478aac4 100644
--- a/src/styles/theme/background.scss
+++ b/src/styles/theme/background.scss
@@ -14,7 +14,7 @@
.box,
.card,
.switch-view,
- .table-view .button,
+ .list-table .button,
.filter-container .button,
.search .button {
box-shadow: none;
diff --git a/src/types/faker.d.ts b/src/types/faker.d.ts
new file mode 100644
index 00000000..de01ac25
--- /dev/null
+++ b/src/types/faker.d.ts
@@ -0,0 +1,4 @@
+declare module '@faker-js/faker' {
+ import faker from 'faker'
+ export default faker
+}
\ No newline at end of file
diff --git a/src/types/shims-vue.d.ts b/src/types/shims-vue.d.ts
index 4f0571df..c04ff091 100644
--- a/src/types/shims-vue.d.ts
+++ b/src/types/shims-vue.d.ts
@@ -1,8 +1,11 @@
declare module 'vue' {
import { CompatVue } from '@vue/runtime-dom'
const Vue: CompatVue
- export default Vue
- export * from '@vue/runtime-dom'
+ export default Vue
+ export * from '@vue/runtime-dom'
+
+ const { configureCompat } = Vue
+ export { configureCompat }
}
// https://next.vuex.vuejs.org/guide/migrating-to-4-0-from-3-x.html#typescript-support
diff --git a/src/types/vue-flatpickr-component.d.ts b/src/types/vue-flatpickr-component.d.ts
new file mode 100644
index 00000000..2ac9cc87
--- /dev/null
+++ b/src/types/vue-flatpickr-component.d.ts
@@ -0,0 +1 @@
+declare module 'vue-flatpickr-component';
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index f3d2b3ec..14c160d4 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -23,7 +23,7 @@
{{ $t('home.list.newText') }}
diff --git a/src/views/list/views/Gantt.vue b/src/views/list/ListGantt.vue
similarity index 66%
rename from src/views/list/views/Gantt.vue
rename to src/views/list/ListGantt.vue
index b3628238..82b765dd 100644
--- a/src/views/list/views/Gantt.vue
+++ b/src/views/list/ListGantt.vue
@@ -1,6 +1,6 @@
-
-
+
+
{{ $t('list.gantt.showTasksWithoutDates') }}
@@ -44,65 +44,64 @@