fix: make sure the app is fully ready before trying to redirect to the login page

cypress/integration/task/task.spec.js

@@ -128,7 +128,7 @@ describe('Task', () => {
 			cy.visit(`/tasks/${tasks[0].id}`)
 
 			cy.get('.task-view .action-buttons .button')
-				.contains('Mark task done!')
+				.contains('Done!')
 				.click()
 
 			cy.get('.task-view .heading .is-done')

src/components/input/editor.vue

@@ -348,10 +348,6 @@ $editor-border-color: #ddd;
 		color: var(--grey-400) !important;
 		font-style: italic;
 	}
-	
-	&-cursor {
-		border-color: var(--grey-700);
-	}
 }
 
 .editor-preview {

src/components/misc/ready.vue

@@ -52,6 +52,12 @@ import NoAuthWrapper from '@/components/misc/no-auth-wrapper.vue'
 import {ERROR_NO_API_URL} from '@/helpers/checkAndSetApiUrl'
 import {useOnline} from '@/composables/useOnline'
 
+import {useRouter, useRoute} from 'vue-router'
+import {checkAuth} from '@/router'
+
+const router = useRouter()
+const route = useRoute()
+
 const store = useStore()
 
 const ready = computed(() => store.state.vikunjaReady)
@@ -63,7 +69,12 @@ const showLoading = computed(() => !ready.value && error.value === '')
 async function load() {
 	try {
 		await store.dispatch('loadApp')
-	} catch(e: any) {
+		const redirectTo = checkAuth(route)
+		if (typeof redirectTo !== 'undefined') {
+			await router.push(redirectTo)
+		}
+		store.commit('vikunjaReady', true)
+	} catch (e: any) {
 		error.value = e
 	}
 }

src/i18n/lang/en.json

@@ -545,7 +545,7 @@
       "chooseStartDate": "Click here to set a start date",
       "chooseEndDate": "Click here to set an end date",
       "move": "Move task to a different list",
-      "done": "Mark task done!",
+      "done": "Done!",
       "undone": "Mark as undone",
       "created": "Created {0} by {1}",
       "updated": "Updated {0}",
@@ -781,7 +781,7 @@
     "then": "then",
     "task": {
       "title": "Task Page",
-      "done": "Done",
+      "done": "Mark a task as done",
       "assign": "Assign to a user",
       "labels": "Add labels to this task",
       "dueDate": "Change the due date of this task",

src/router/index.ts

@@ -575,11 +575,7 @@ const router = createRouter({
 	],
 })
 
-router.beforeEach((to) => {
-	return checkAuth(to)
-})
-
-function checkAuth(route: RouteLocation) {
+export function checkAuth(route: RouteLocation) {
 	const authUser = store.getters['auth/authUser']
 	const authLinkShare = store.getters['auth/authLinkShare']
 

src/store/index.js

@@ -136,10 +136,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)
 		},
 	},
 })