diff --git a/frontend/src/views/user/DataExportDownload.vue b/frontend/src/views/user/DataExportDownload.vue index f8116f1d7..14b8e15c2 100644 --- a/frontend/src/views/user/DataExportDownload.vue +++ b/frontend/src/views/user/DataExportDownload.vue @@ -3,32 +3,17 @@

{{ $t('user.export.downloadTitle') }}

import {ref, computed, reactive} from 'vue' import DataExportService from '@/services/dataExport' +import FormField from '@/components/input/FormField.vue' import {useAuthStore} from '@/stores/auth' const dataExportService = reactive(new DataExportService()) diff --git a/frontend/src/views/user/settings/ApiTokens.vue b/frontend/src/views/user/settings/ApiTokens.vue index 4f6746f4b..7fdd362d5 100644 --- a/frontend/src/views/user/settings/ApiTokens.vue +++ b/frontend/src/views/user/settings/ApiTokens.vue @@ -12,6 +12,7 @@ import flatPickr from 'vue-flatpickr-component' import 'flatpickr/dist/flatpickr.css' import {useI18n} from 'vue-i18n' import Message from '@/components/misc/Message.vue' +import FormField from '@/components/input/FormField.vue' import type {IApiToken} from '@/modelTypes/IApiToken' const service = new ApiTokenService() @@ -232,31 +233,18 @@ function toggleGroupPermissionsFromChild(group: string, checked: boolean) { @submit.prevent="createToken" > -
- -
- -
-

- {{ $t('user.settings.apiTokens.titleRequired') }} -

-
+
diff --git a/frontend/src/views/user/settings/Caldav.vue b/frontend/src/views/user/settings/Caldav.vue index d7778ef89..bc79e6972 100644 --- a/frontend/src/views/user/settings/Caldav.vue +++ b/frontend/src/views/user/settings/Caldav.vue @@ -6,24 +6,20 @@

{{ $t('user.settings.caldav.howTo') }}

-
-
- -
-
+ + +
{{ $t('user.settings.caldav.tokens') }} @@ -108,6 +104,7 @@ import {useCopyToClipboard} from '@/composables/useCopyToClipboard' import {success} from '@/message' import BaseButton from '@/components/base/BaseButton.vue' import Message from '@/components/misc/Message.vue' +import FormField from '@/components/input/FormField.vue' import CaldavTokenService from '@/services/caldavToken' import { formatDateShort } from '@/helpers/time/formatDate' import type {ICaldavToken} from '@/modelTypes/ICaldavToken' diff --git a/frontend/src/views/user/settings/DataExport.vue b/frontend/src/views/user/settings/DataExport.vue index 213aba910..fd2ffc106 100644 --- a/frontend/src/views/user/settings/DataExport.vue +++ b/frontend/src/views/user/settings/DataExport.vue @@ -32,32 +32,17 @@

{{ $t('user.export.descriptionPasswordRequired') }}

-
- -
- -
-

- {{ $t('user.deletion.passwordRequired') }} -

-
+ {{ $t('user.deletion.scheduledCancelText') }}

-
- -
- -
-

- {{ $t('user.deletion.passwordRequired') }} -

-
+

{{ $t('user.deletion.scheduledCancelButton') }} @@ -68,32 +53,17 @@

{{ $t('user.deletion.text2') }}

-
- -
- -
-

- {{ $t('user.deletion.passwordRequired') }} -

-
+

{{ $t('user.deletion.text3') }} @@ -121,6 +91,7 @@ import {useTitle} from '@/composables/useTitle' import {success} from '@/message' import {useAuthStore} from '@/stores/auth' import {useConfigStore} from '@/stores/config' +import FormField from '@/components/input/FormField.vue' defineOptions({name: 'UserSettingsDeletion'}) diff --git a/frontend/src/views/user/settings/EmailUpdate.vue b/frontend/src/views/user/settings/EmailUpdate.vue index 6d10fc371..5a4ac30e2 100644 --- a/frontend/src/views/user/settings/EmailUpdate.vue +++ b/frontend/src/views/user/settings/EmailUpdate.vue @@ -4,38 +4,22 @@ :title="$t('user.settings.updateEmailTitle')" >

-
- -
- -
-
-
- -
- -
-
+ +
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
+ + +

-
- -
- -
-
+ {{ $t('misc.confirm') }} @@ -58,23 +50,15 @@

-
- -
- -
-
+