From 88d64def93dd00c2c643220aaf76c1b14376bc06 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 13 Nov 2022 22:44:01 +0100 Subject: [PATCH] fix: list view route --- src/components/home/contentAuth.vue | 2 +- src/components/project/ProjectWrapper.vue | 4 ++-- src/components/tasks/partials/singleTaskInProject.vue | 4 ++-- src/helpers/saveProjectView.ts | 2 +- src/router/index.ts | 6 +++--- src/views/project/ProjectList.vue | 2 +- src/views/sharing/LinkSharingAuth.vue | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue index 91ad9c194..54b649e84 100644 --- a/src/components/home/contentAuth.vue +++ b/src/components/home/contentAuth.vue @@ -33,7 +33,7 @@ - + diff --git a/src/components/project/ProjectWrapper.vue b/src/components/project/ProjectWrapper.vue index 45f07ff78..cd45ac22a 100644 --- a/src/components/project/ProjectWrapper.vue +++ b/src/components/project/ProjectWrapper.vue @@ -10,9 +10,9 @@ :title="$t('keyboardShortcuts.project.switchToProjectView')" class="switch-view-button" :class="{'is-active': viewName === 'project'}" - :to="{ name: 'project.project', params: { projectId } }" + :to="{ name: 'project.list', params: { projectId } }" > - {{ $t('project.project.title') }} + {{ $t('project.list.title') }} @@ -105,7 +105,7 @@ diff --git a/src/helpers/saveProjectView.ts b/src/helpers/saveProjectView.ts index 4c46c21ef..8814a2fc8 100644 --- a/src/helpers/saveProjectView.ts +++ b/src/helpers/saveProjectView.ts @@ -2,7 +2,7 @@ import type { IProject } from '@/modelTypes/IProject' type ProjectView = Record -const DEFAULT_PROJECT_VIEW = 'project.project' as const +const DEFAULT_PROJECT_VIEW = 'project.list' as const /** * Save the current project view to local storage diff --git a/src/router/index.ts b/src/router/index.ts index d00910390..7ed68a3b6 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -364,14 +364,14 @@ const router = createRouter({ return { name: router.hasRoute(savedProjectView) ? savedProjectView - : 'project.project', + : 'project.list', params: {projectId: to.params.projectId}, } }, }, { - path: '/projects/:projectId/project', - name: 'project.project', + path: '/projects/:projectId/list', + name: 'project.list', component: ProjectList, beforeEnter: (to) => saveProjectView(to.params.projectId, to.name), props: route => ({ projectId: Number(route.params.projectId as string) }), diff --git a/src/views/project/ProjectList.vue b/src/views/project/ProjectList.vue index a7b5a6f34..54c49510c 100644 --- a/src/views/project/ProjectList.vue +++ b/src/views/project/ProjectList.vue @@ -260,7 +260,7 @@ function searchTasks() { } router.push({ - name: 'project.project', + name: 'project.list', query: {search: searchTerm.value}, }) } diff --git a/src/views/sharing/LinkSharingAuth.vue b/src/views/sharing/LinkSharingAuth.vue index 017e3a822..2e007d7fe 100644 --- a/src/views/sharing/LinkSharingAuth.vue +++ b/src/views/sharing/LinkSharingAuth.vue @@ -65,7 +65,7 @@ function useAuth() { errorMessage.value = '' if (authLinkShare.value) { - // FIXME: push to 'project.project' since authenticated? + // FIXME: push to 'project.list' since authenticated? return }