From 20b77061ad491f27e2987fc519216ed96314dcc4 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Fri, 17 Jan 2025 14:57:06 +0100 Subject: [PATCH] feat: re-add route names, meta and props via definePage --- frontend/src/pages/[[...path]]+.vue | 5 ++ .../src/pages/[[auth]]/get-password-reset.vue | 5 ++ frontend/src/pages/[[auth]]/login.vue | 5 ++ .../src/pages/[[auth]]/password-reset.vue | 5 ++ frontend/src/pages/[[auth]]/register.vue | 5 ++ frontend/src/pages/about.vue | 2 + frontend/src/pages/auth/openid/[provider].vue | 2 + .../filters/[projectId]/settings/delete.vue | 6 ++ .../filters/[projectId]/settings/edit.vue | 6 ++ frontend/src/pages/filters/new.vue | 5 ++ frontend/src/pages/labels/(labels).vue | 2 + frontend/src/pages/labels/new.vue | 2 + frontend/src/pages/migrate/[service].vue | 23 +++--- frontend/src/pages/projects/(projects).vue | 2 + .../projects/[[parentProjectId]]/new.vue | 8 ++ .../src/pages/projects/[projectId]/info.vue | 6 ++ .../projects/[projectId]/settings/archive.vue | 6 ++ .../[projectId]/settings/background.vue | 6 ++ .../projects/[projectId]/settings/delete.vue | 6 ++ .../[projectId]/settings/duplicate.vue | 6 ++ .../projects/[projectId]/settings/edit.vue | 6 ++ .../projects/[projectId]/settings/share.vue | 6 ++ .../projects/[projectId]/settings/views.vue | 6 ++ .../[projectId]/settings/webhooks.vue | 6 ++ frontend/src/pages/share/[share]/auth.vue | 2 + frontend/src/pages/task/[id].vue | 5 ++ frontend/src/pages/tasks/by/upcoming.vue | 4 +- frontend/src/pages/teams/(teams).vue | 2 + frontend/src/pages/teams/[id]/edit.vue | 2 + frontend/src/pages/teams/new.vue | 5 ++ frontend/src/pages/user/export/download.vue | 2 + frontend/src/pages/user/settings.vue | 2 + .../src/pages/user/settings/api-tokens.vue | 2 + frontend/src/pages/user/settings/avatar.vue | 2 + frontend/src/pages/user/settings/caldav.vue | 2 + .../src/pages/user/settings/data-export.vue | 2 + frontend/src/pages/user/settings/deletion.vue | 2 + .../src/pages/user/settings/email-update.vue | 2 + frontend/src/pages/user/settings/general.vue | 2 + frontend/src/pages/user/settings/migrate.vue | 2 + .../pages/user/settings/password-update.vue | 2 + frontend/src/pages/user/settings/totp.vue | 2 + frontend/src/router/index.ts | 2 - frontend/typed-router.d.ts | 82 +++++++++---------- 44 files changed, 210 insertions(+), 55 deletions(-) diff --git a/frontend/src/pages/[[...path]]+.vue b/frontend/src/pages/[[...path]]+.vue index 91a192171..ef5eafca6 100644 --- a/frontend/src/pages/[[...path]]+.vue +++ b/frontend/src/pages/[[...path]]+.vue @@ -8,5 +8,10 @@ diff --git a/frontend/src/pages/[[auth]]/get-password-reset.vue b/frontend/src/pages/[[auth]]/get-password-reset.vue index 01643c382..76915b485 100644 --- a/frontend/src/pages/[[auth]]/get-password-reset.vue +++ b/frontend/src/pages/[[auth]]/get-password-reset.vue @@ -71,6 +71,11 @@ import PasswordResetModel from '@/models/passwordReset' import PasswordResetService from '@/services/passwordReset' import Message from '@/components/misc/Message.vue' +definePage({ + name: 'user.password-reset.request', + meta: { title: 'user.auth.resetPassword' }, +}) + const passwordResetService = shallowReactive(new PasswordResetService()) const passwordReset = ref(new PasswordResetModel()) const errorMsg = ref('') diff --git a/frontend/src/pages/[[auth]]/login.vue b/frontend/src/pages/[[auth]]/login.vue index d0940c649..1ddcbd0ce 100644 --- a/frontend/src/pages/[[auth]]/login.vue +++ b/frontend/src/pages/[[auth]]/login.vue @@ -161,6 +161,11 @@ import {useConfigStore} from '@/stores/config' import {useTitle} from '@/composables/useTitle' +definePage({ + name: 'user.login', + meta: { title: 'user.auth.login' }, +}) + const {t} = useI18n({useScope: 'global'}) useTitle(() => t('user.auth.login')) diff --git a/frontend/src/pages/[[auth]]/password-reset.vue b/frontend/src/pages/[[auth]]/password-reset.vue index fe3636af6..b69337069 100644 --- a/frontend/src/pages/[[auth]]/password-reset.vue +++ b/frontend/src/pages/[[auth]]/password-reset.vue @@ -58,6 +58,11 @@ import PasswordResetService from '@/services/passwordReset' import Message from '@/components/misc/Message.vue' import Password from '@/components/input/Password.vue' +definePage({ + name: 'user.password-reset.reset', + meta: { title: 'user.auth.resetPassword' }, +}) + const credentials = reactive({ password: '', }) diff --git a/frontend/src/pages/[[auth]]/register.vue b/frontend/src/pages/[[auth]]/register.vue index 72151e5b3..c37057c2f 100644 --- a/frontend/src/pages/[[auth]]/register.vue +++ b/frontend/src/pages/[[auth]]/register.vue @@ -129,6 +129,11 @@ import {useAuthStore} from '@/stores/auth' import {useConfigStore} from '@/stores/config' import {validatePassword} from '@/helpers/validatePasswort' +definePage({ + name: 'user.register', + meta: { title: 'user.auth.createAccount' }, +}) + const {t} = useI18n() const authStore = useAuthStore() const configStore = useConfigStore() diff --git a/frontend/src/pages/about.vue b/frontend/src/pages/about.vue index b50615070..312d82611 100644 --- a/frontend/src/pages/about.vue +++ b/frontend/src/pages/about.vue @@ -32,6 +32,8 @@ import {computed} from 'vue' import {useConfigStore} from '@/stores/config' +definePage({ name: 'about' }) + const configStore = useConfigStore() const apiVersion = computed(() => configStore.version) diff --git a/frontend/src/pages/auth/openid/[provider].vue b/frontend/src/pages/auth/openid/[provider].vue index 0325b2e0e..c79c77772 100644 --- a/frontend/src/pages/auth/openid/[provider].vue +++ b/frontend/src/pages/auth/openid/[provider].vue @@ -34,6 +34,8 @@ import {useRedirectToLastVisited} from '@/composables/useRedirectToLastVisited' import {useAuthStore} from '@/stores/auth' +definePage({ name: 'openid.auth' }) + const {t} = useI18n({useScope: 'global'}) const route = useRoute() diff --git a/frontend/src/pages/filters/[projectId]/settings/delete.vue b/frontend/src/pages/filters/[projectId]/settings/delete.vue index c0362dcae..7fdbff7fc 100644 --- a/frontend/src/pages/filters/[projectId]/settings/delete.vue +++ b/frontend/src/pages/filters/[projectId]/settings/delete.vue @@ -17,6 +17,12 @@ import type {IProject} from '@/modelTypes/IProject' import {useSavedFilter} from '@/services/savedFilter' +definePage({ + name: 'filter.settings.delete', + meta: { showAsModal: true }, + props: route => ({ projectId: Number(route.params.projectId as string) }), +}) + const props = defineProps<{ projectId: IProject['id'], }>() diff --git a/frontend/src/pages/filters/[projectId]/settings/edit.vue b/frontend/src/pages/filters/[projectId]/settings/edit.vue index 8ab6ab81c..32fceabdb 100644 --- a/frontend/src/pages/filters/[projectId]/settings/edit.vue +++ b/frontend/src/pages/filters/[projectId]/settings/edit.vue @@ -77,6 +77,12 @@ import {useSavedFilter} from '@/services/savedFilter' import type {IProject} from '@/modelTypes/IProject' +definePage({ + name: 'filter.settings.edit', + meta: { showAsModal: true }, + props: route => ({ projectId: Number(route.params.projectId as string) }), +}) + const props = defineProps<{ projectId: IProject['id'], }>() diff --git a/frontend/src/pages/filters/new.vue b/frontend/src/pages/filters/new.vue index 11eb0af72..0556f82fb 100644 --- a/frontend/src/pages/filters/new.vue +++ b/frontend/src/pages/filters/new.vue @@ -88,6 +88,11 @@ import Filters from '@/components/project/partials/Filters.vue' import {useSavedFilter} from '@/services/savedFilter' +definePage({ + name: 'filters.create', + meta: { showAsModal: true }, +}) + const { filter, filters, diff --git a/frontend/src/pages/labels/(labels).vue b/frontend/src/pages/labels/(labels).vue index 254df3f00..0c0565479 100644 --- a/frontend/src/pages/labels/(labels).vue +++ b/frontend/src/pages/labels/(labels).vue @@ -149,6 +149,8 @@ import {useLabelStore} from '@/stores/labels' import { useTitle } from '@/composables/useTitle' +definePage({ name: 'labels.index' }) + const {t} = useI18n({useScope: 'global'}) const labelEditLabel = ref(new LabelModel()) diff --git a/frontend/src/pages/labels/new.vue b/frontend/src/pages/labels/new.vue index 0ef4cb924..325f65939 100644 --- a/frontend/src/pages/labels/new.vue +++ b/frontend/src/pages/labels/new.vue @@ -54,6 +54,8 @@ import {useTitle} from '@/composables/useTitle' import {success} from '@/message' import {getRandomColorHex} from '@/helpers/color/randomColor' +definePage({ name: 'labels.create' }) + const router = useRouter() const {t} = useI18n({useScope: 'global'}) diff --git a/frontend/src/pages/migrate/[service].vue b/frontend/src/pages/migrate/[service].vue index 19d8042eb..f52ef65c4 100644 --- a/frontend/src/pages/migrate/[service].vue +++ b/frontend/src/pages/migrate/[service].vue @@ -110,16 +110,6 @@ - -