diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 7743a300d..152185df5 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -186,6 +186,20 @@ const router = createRouter({ name: 'user.settings.apiTokens', component: UserSettingsApiTokensComponent, }, + { + path: '/user/settings/migrate', + name: 'migrate.start', + component: MigrationComponent, + }, + { + path: '/user/settings/migrate/:service', + name: 'migrate.service', + component: MigrationHandlerComponent, + props: route => ({ + service: route.params.service as string, + code: route.query.code as string, + }), + }, ], }, { @@ -402,20 +416,6 @@ const router = createRouter({ showAsModal: true, }, }, - { - path: '/migrate', - name: 'migrate.start', - component: MigrationComponent, - }, - { - path: '/migrate/:service', - name: 'migrate.service', - component: MigrationHandlerComponent, - props: route => ({ - service: route.params.service as string, - code: route.query.code as string, - }), - }, { path: '/filters/new', name: 'filters.create', diff --git a/frontend/src/views/user/Settings.vue b/frontend/src/views/user/Settings.vue index 6f97c19e4..de197bf9c 100644 --- a/frontend/src/views/user/Settings.vue +++ b/frontend/src/views/user/Settings.vue @@ -9,6 +9,7 @@ > {{ title }} @@ -29,12 +30,14 @@ import { useI18n } from 'vue-i18n' import { useTitle } from '@/composables/useTitle' import { useConfigStore } from '@/stores/config' import { useAuthStore } from '@/stores/auth' +import {useRoute} from 'vue-router' const { t } = useI18n({useScope: 'global'}) useTitle(() => t('user.settings.title')) const configStore = useConfigStore() const authStore = useAuthStore() +const route = useRoute() const totpEnabled = computed(() => configStore.totpEnabled) const caldavEnabled = computed(() => configStore.caldavEnabled)