From 2e6d62f274d12053dcbb95cf69dc0490adb4d35e Mon Sep 17 00:00:00 2001 From: Kamila Date: Thu, 8 Aug 2024 09:44:31 +0200 Subject: [PATCH] WIP on monterail_vue3_migration_frontend--vee-validate-refactor --- frontend/components.d.ts | 156 +++++++++++++ frontend/src/components/Inputs/InputHour.vue | 2 + .../Inputs/InputPasswordConfirmation.vue | 69 +++--- .../src/components/Inputs/InputUsername.vue | 120 +++++----- .../src/components/UserSettings/UserName.vue | 194 ++++++++-------- .../UserSettings/UserNamingFormat.vue | 143 ++++++------ .../UserSettings/UserNewsletter.vue | 62 ++--- .../components/UserSettings/UserPassword.vue | 177 +++++++-------- .../UserSettings/UserSettingsSwitch.vue | 97 ++++---- frontend/src/pages/Settings.vue | 214 ++++++++---------- 10 files changed, 670 insertions(+), 564 deletions(-) create mode 100644 frontend/components.d.ts diff --git a/frontend/components.d.ts b/frontend/components.d.ts new file mode 100644 index 000000000..47afcd874 --- /dev/null +++ b/frontend/components.d.ts @@ -0,0 +1,156 @@ +/* eslint-disable */ +// @ts-nocheck +// Generated by unplugin-vue-components +// Read more: https://github.com/vuejs/core/pull/3399 +export {} + +/* prettier-ignore */ +declare module 'vue' { + export interface GlobalComponents { + AmountAndNameRow: typeof import('./src/components/TransactionRows/AmountAndNameRow.vue')['default'] + AuthCarousel: typeof import('./src/components/Auth/AuthCarousel.vue')['default'] + AuthFooter: typeof import('./src/components/Auth/AuthFooter.vue')['default'] + AuthNavbar: typeof import('./src/components/Auth/AuthNavbar.vue')['default'] + AuthNavbarSmall: typeof import('./src/components/Auth/AuthNavbarSmall.vue')['default'] + BAvatar: typeof import('bootstrap-vue-next')['BAvatar'] + BBadge: typeof import('bootstrap-vue-next')['BBadge'] + BButton: typeof import('bootstrap-vue-next')['BButton'] + BCard: typeof import('bootstrap-vue-next')['BCard'] + BCardBody: typeof import('bootstrap-vue-next')['BCardBody'] + BCardText: typeof import('bootstrap-vue-next')['BCardText'] + BCardTitle: typeof import('bootstrap-vue-next')['BCardTitle'] + BCarousel: typeof import('bootstrap-vue-next')['BCarousel'] + BCarouselSlide: typeof import('bootstrap-vue-next')['BCarouselSlide'] + BCol: typeof import('bootstrap-vue-next')['BCol'] + BCollapse: typeof import('bootstrap-vue-next')['BCollapse'] + BContainer: typeof import('bootstrap-vue-next')['BContainer'] + BDropdown: typeof import('bootstrap-vue-next')['BDropdown'] + BDropdownItem: typeof import('bootstrap-vue-next')['BDropdownItem'] + BForm: typeof import('bootstrap-vue-next')['BForm'] + BFormCheckbox: typeof import('bootstrap-vue-next')['BFormCheckbox'] + BFormGroup: typeof import('bootstrap-vue-next')['BFormGroup'] + BFormInput: typeof import('bootstrap-vue-next')['BFormInput'] + BFormInvalidFeedback: typeof import('bootstrap-vue-next')['BFormInvalidFeedback'] + BFormSelect: typeof import('bootstrap-vue-next')['BFormSelect'] + BImg: typeof import('bootstrap-vue-next')['BImg'] + BInputGroup: typeof import('bootstrap-vue-next')['BInputGroup'] + BLink: typeof import('bootstrap-vue-next')['BLink'] + BModal: typeof import('bootstrap-vue-next')['BModal'] + BNav: typeof import('bootstrap-vue-next')['BNav'] + BNavbar: typeof import('bootstrap-vue-next')['BNavbar'] + BNavbarBrand: typeof import('bootstrap-vue-next')['BNavbarBrand'] + BNavbarNav: typeof import('bootstrap-vue-next')['BNavbarNav'] + BNavItem: typeof import('bootstrap-vue-next')['BNavItem'] + BPopover: typeof import('bootstrap-vue-next')['BPopover'] + Breadcrumb: typeof import('./src/components/Breadcrumb/breadcrumb.vue')['default'] + BRow: typeof import('bootstrap-vue-next')['BRow'] + BTab: typeof import('bootstrap-vue-next')['BTab'] + BTabs: typeof import('bootstrap-vue-next')['BTabs'] + BToastOrchestrator: typeof import('bootstrap-vue-next')['BToastOrchestrator'] + ClipboardCopy: typeof import('./src/components/ClipboardCopy.vue')['default'] + CollapseIcon: typeof import('./src/components/TransactionRows/CollapseIcon.vue')['default'] + CollapseLinksList: typeof import('./src/components/DecayInformations/CollapseLinksList.vue')['default'] + CommunityMember: typeof import('./src/components/Template/ContentHeader/CommunityMember.vue')['default'] + CommunityNews: typeof import('./src/components/Overview/CommunityNews.vue')['default'] + CommunitySwitch: typeof import('./src/components/CommunitySwitch.vue')['default'] + ContentFooter: typeof import('./src/components/ContentFooter.vue')['default'] + ContributionForm: typeof import('./src/components/Contributions/ContributionForm.vue')['default'] + ContributionInfo: typeof import('./src/components/Template/RightSide/ContributionInfo.vue')['default'] + ContributionList: typeof import('./src/components/Contributions/ContributionList.vue')['default'] + ContributionListItem: typeof import('./src/components/Contributions/ContributionListItem.vue')['default'] + ContributionMessagesFormular: typeof import('./src/components/ContributionMessages/ContributionMessagesFormular.vue')['default'] + ContributionMessagesList: typeof import('./src/components/ContributionMessages/ContributionMessagesList.vue')['default'] + ContributionMessagesListItem: typeof import('./src/components/ContributionMessages/ContributionMessagesListItem.vue')['default'] + DateRow: typeof import('./src/components/TransactionRows/DateRow.vue')['default'] + DecayInformation: typeof import('./src/components/DecayInformations/DecayInformation.vue')['default'] + DecayInformationBeforeStartblock: typeof import('./src/components/DecayInformations/DecayInformation-BeforeStartblock.vue')['default'] + DecayInformationDecay: typeof import('./src/components/DecayInformations/DecayInformation-Decay.vue')['default'] + DecayInformationDecayStartblock: typeof import('./src/components/DecayInformations/DecayInformation-DecayStartblock.vue')['default'] + DecayInformationLong: typeof import('./src/components/DecayInformations/DecayInformation-Long.vue')['default'] + DecayInformationShort: typeof import('./src/components/DecayInformations/DecayInformation-Short.vue')['default'] + DecayRow: typeof import('./src/components/TransactionRows/DecayRow.vue')['default'] + DurationRow: typeof import('./src/components/TransactionRows/DurationRow.vue')['default'] + FigureQrCode: typeof import('./src/components/QrCode/FigureQrCode.vue')['default'] + FirstName: typeof import('./src/components/Inputs/FirstName.vue')['default'] + GddAmount: typeof import('./src/components/Template/ContentHeader/GddAmount.vue')['default'] + GddSend: typeof import('./src/components/GddSend.vue')['default'] + GddTransactionList: typeof import('./src/components/GddTransactionList.vue')['default'] + GddTransactionListFooter: typeof import('./src/components/GddTransactionListFooter.vue')['default'] + GdtAmount: typeof import('./src/components/Template/ContentHeader/GdtAmount.vue')['default'] + GdtTransactionList: typeof import('./src/components/GdtTransactionList.vue')['default'] + IBiBellFill: typeof import('~icons/bi/bell-fill')['default'] + IBiCaretDownFill: typeof import('~icons/bi/caret-down-fill')['default'] + IBiCheck: typeof import('~icons/bi/check')['default'] + IBiEye: typeof import('~icons/bi/eye')['default'] + IBiEyeSlash: typeof import('~icons/bi/eye-slash')['default'] + IBiLayers: typeof import('~icons/bi/layers')['default'] + IBiPeople: typeof import('~icons/bi/people')['default'] + IBiQuestion: typeof import('~icons/bi/question')['default'] + IBiTrash: typeof import('~icons/bi/trash')['default'] + IBiXCircle: typeof import('~icons/bi/x-circle')['default'] + InputAmount: typeof import('./src/components/Inputs/InputAmount.vue')['default'] + InputEmail: typeof import('./src/components/Inputs/InputEmail.vue')['default'] + InputHour: typeof import('./src/components/Inputs/InputHour.vue')['default'] + InputIdentifier: typeof import('./src/components/Inputs/InputIdentifier.vue')['default'] + InputPassword: typeof import('./src/components/Inputs/InputPassword.vue')['default'] + InputPasswordConfirmation: typeof import('./src/components/Inputs/InputPasswordConfirmation.vue')['default'] + InputTextarea: typeof import('./src/components/Inputs/InputTextarea.vue')['default'] + InputUsername: typeof import('./src/components/Inputs/InputUsername.vue')['default'] + LanguageSwitch: typeof import('./src/components/LanguageSwitch.vue')['default'] + LanguageSwitch2: typeof import('./src/components/LanguageSwitch2.vue')['default'] + LanguageSwitchSelect: typeof import('./src/components/LanguageSwitchSelect.vue')['default'] + LastContributions: typeof import('./src/components/Template/RightSide/LastContributions.vue')['default'] + LastName: typeof import('./src/components/Inputs/LastName.vue')['default'] + LastTransactions: typeof import('./src/components/Template/RightSide/LastTransactions.vue')['default'] + LinkCountRow: typeof import('./src/components/TransactionRows/LinkCountRow.vue')['default'] + MemoRow: typeof import('./src/components/TransactionRows/MemoRow.vue')['default'] + Message: typeof import('./src/components/Message/Message.vue')['default'] + MobileSidebar: typeof import('./src/components/MobileSidebar/MobileSidebar.vue')['default'] + Name: typeof import('./src/components/TransactionRows/Name.vue')['default'] + Navbar: typeof import('./src/components/Menu/Navbar.vue')['default'] + NavCommunity: typeof import('./src/components/Template/ContentHeader/NavCommunity.vue')['default'] + OpenCreationsAmount: typeof import('./src/components/Contributions/OpenCreationsAmount.vue')['default'] + Overview: typeof import('./src/components/skeleton/Overview.vue')['default'] + ParseMessage: typeof import('./src/components/ContributionMessages/ParseMessage.vue')['default'] + RedeemedTextBox: typeof import('./src/components/LinkInformations/RedeemedTextBox.vue')['default'] + RedeemInformation: typeof import('./src/components/LinkInformations/RedeemInformation.vue')['default'] + RedeemLoggedOut: typeof import('./src/components/LinkInformations/RedeemLoggedOut.vue')['default'] + RedeemSelfCreator: typeof import('./src/components/LinkInformations/RedeemSelfCreator.vue')['default'] + RedeemValid: typeof import('./src/components/LinkInformations/RedeemValid.vue')['default'] + RouterLink: typeof import('vue-router')['RouterLink'] + RouterView: typeof import('vue-router')['RouterView'] + SessionLogoutTimeout: typeof import('./src/components/SessionLogoutTimeout.vue')['default'] + Sidebar: typeof import('./src/components/Menu/Sidebar.vue')['default'] + Status: typeof import('./src/components/Status.vue')['default'] + Transaction: typeof import('./src/components/Transaction.vue')['default'] + TransactionCollapse: typeof import('./src/components/TransactionCollapse.vue')['default'] + TransactionConfirmationLink: typeof import('./src/components/GddSend/TransactionConfirmationLink.vue')['default'] + TransactionConfirmationSend: typeof import('./src/components/GddSend/TransactionConfirmationSend.vue')['default'] + TransactionCreation: typeof import('./src/components/Transactions/TransactionCreation.vue')['default'] + TransactionDecay: typeof import('./src/components/Transactions/TransactionDecay.vue')['default'] + TransactionForm: typeof import('./src/components/GddSend/TransactionForm.vue')['default'] + TransactionLink: typeof import('./src/components/TransactionLinks/TransactionLink.vue')['default'] + TransactionLinkItem: typeof import('./src/components/TransactionLinkItem.vue')['default'] + TransactionLinkSummary: typeof import('./src/components/Transactions/TransactionLinkSummary.vue')['default'] + TransactionListItem: typeof import('./src/components/TransactionListItem.vue')['default'] + TransactionReceive: typeof import('./src/components/Transactions/TransactionReceive.vue')['default'] + TransactionResultLink: typeof import('./src/components/GddSend/TransactionResultLink.vue')['default'] + TransactionResultSendError: typeof import('./src/components/GddSend/TransactionResultSendError.vue')['default'] + TransactionResultSendSuccess: typeof import('./src/components/GddSend/TransactionResultSendSuccess.vue')['default'] + TransactionSend: typeof import('./src/components/Transactions/TransactionSend.vue')['default'] + TypeIcon: typeof import('./src/components/TransactionRows/TypeIcon.vue')['default'] + UserCard: typeof import('./src/components/UserSettings/UserCard.vue')['default'] + UserData: typeof import('./src/components/UserSettings/UserData.vue')['default'] + UserGMSLocation: typeof import('./src/components/UserSettings/UserGMSLocation.vue')['default'] + UserGMSLocationFormat: typeof import('./src/components/UserSettings/UserGMSLocationFormat.vue')['default'] + UserLanguage: typeof import('./src/components/UserSettings/UserLanguage.vue')['default'] + UserName: typeof import('./src/components/UserSettings/UserName.vue')['default'] + UserNamingFormat: typeof import('./src/components/UserSettings/UserNamingFormat.vue')['default'] + UserNewsletter: typeof import('./src/components/UserSettings/UserNewsletter.vue')['default'] + UserPassword: typeof import('./src/components/UserSettings/UserPassword.vue')['default'] + UserSettingsSwitch: typeof import('./src/components/UserSettings/UserSettingsSwitch.vue')['default'] + } + export interface ComponentCustomProperties { + vBToggle: typeof import('bootstrap-vue-next')['vBToggle'] + } +} diff --git a/frontend/src/components/Inputs/InputHour.vue b/frontend/src/components/Inputs/InputHour.vue index 760c3b7e5..ef8f93c0c 100644 --- a/frontend/src/components/Inputs/InputHour.vue +++ b/frontend/src/components/Inputs/InputHour.vue @@ -27,6 +27,8 @@ + v-model="password" + /> @@ -35,52 +36,40 @@ :immediate="true" :name="createId(register ? $t('form.passwordRepeat') : $t('form.password_new_repeat'))" :placeholder="register ? $t('form.passwordRepeat') : $t('form.password_new_repeat')" - > + v-model="passwordRepeat" + /> - diff --git a/frontend/src/components/Inputs/InputUsername.vue b/frontend/src/components/Inputs/InputUsername.vue index 486a4e676..96e893698 100644 --- a/frontend/src/components/Inputs/InputUsername.vue +++ b/frontend/src/components/Inputs/InputUsername.vue @@ -1,18 +1,11 @@ - diff --git a/frontend/src/components/UserSettings/UserName.vue b/frontend/src/components/UserSettings/UserName.vue index e44a2ecd3..57b488f67 100644 --- a/frontend/src/components/UserSettings/UserName.vue +++ b/frontend/src/components/UserSettings/UserName.vue @@ -1,117 +1,113 @@ - + diff --git a/frontend/src/components/UserSettings/UserSettingsSwitch.vue b/frontend/src/components/UserSettings/UserSettingsSwitch.vue index 56649fd2b..4b6f96bd1 100644 --- a/frontend/src/components/UserSettings/UserSettingsSwitch.vue +++ b/frontend/src/components/UserSettings/UserSettingsSwitch.vue @@ -1,59 +1,64 @@ - diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue index 596a3589f..fc9cf32c3 100644 --- a/frontend/src/pages/Settings.vue +++ b/frontend/src/pages/Settings.vue @@ -1,7 +1,7 @@ -