From d806f99c619aa04afb8dbe31089d09f85c09fde7 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 15 Jul 2025 11:29:09 +0200 Subject: [PATCH] lint --- frontend/src/components/Auth/AuthNavbarSmall.vue | 8 ++++++-- .../components/LinkInformations/RedeemLoggedOut.vue | 4 +++- .../LinkInformations/RedeemSelectCommunity.vue | 12 ++++++++++-- frontend/src/composables/useAuthLinks.js | 12 ++++++------ frontend/src/pages/Login.vue | 5 ++++- frontend/src/pages/ResetPassword.spec.js | 6 ++++-- frontend/src/pages/ResetPassword.vue | 9 ++++++--- 7 files changed, 39 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/Auth/AuthNavbarSmall.vue b/frontend/src/components/Auth/AuthNavbarSmall.vue index bf1a4a364..32986c7ab 100644 --- a/frontend/src/components/Auth/AuthNavbarSmall.vue +++ b/frontend/src/components/Auth/AuthNavbarSmall.vue @@ -2,9 +2,13 @@ diff --git a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue index f9d98c617..425131c33 100644 --- a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue +++ b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue @@ -16,7 +16,9 @@

{{ $t('gdd_per_link.has-account') }}

- {{ $t('gdd_per_link.to-login') }} + + {{ $t('gdd_per_link.to-login') }} +
diff --git a/frontend/src/components/LinkInformations/RedeemSelectCommunity.vue b/frontend/src/components/LinkInformations/RedeemSelectCommunity.vue index a733015e8..0e3113200 100644 --- a/frontend/src/components/LinkInformations/RedeemSelectCommunity.vue +++ b/frontend/src/components/LinkInformations/RedeemSelectCommunity.vue @@ -17,13 +17,21 @@

{{ $t('gdd_per_link.no-account') }}

- + {{ $t('gdd_per_link.to-register') }}

{{ $t('gdd_per_link.has-account') }}

- + {{ $t('gdd_per_link.to-login') }}
diff --git a/frontend/src/composables/useAuthLinks.js b/frontend/src/composables/useAuthLinks.js index 043df5bf5..7e06ae03d 100644 --- a/frontend/src/composables/useAuthLinks.js +++ b/frontend/src/composables/useAuthLinks.js @@ -4,15 +4,15 @@ export function useAuthLinks() { const route = useRoute() /** * Combine current route params and query with given params and query - * @param {string} name - * @param {{ params: {}, query: {} }} options + * @param {string} name + * @param {{ params: {}, query: {} }} options * @returns {{ name: string, params: {}, query: {} }} a vue3 routing object for :to */ const routeWithParamsAndQuery = (name, options = { params: {}, query: {} }) => { - return { - name, - params: { ...route.params, ...options.params }, - query: { ...route.query, ...options.query } + return { + name, + params: { ...route.params, ...options.params }, + query: { ...route.query, ...options.query }, } } diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index d54620bc7..24291943f 100644 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -13,7 +13,10 @@
- + {{ $t('settings.password.forgot_pwd') }} diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js index db5b090c5..0e7f49842 100644 --- a/frontend/src/pages/ResetPassword.spec.js +++ b/frontend/src/pages/ResetPassword.spec.js @@ -362,7 +362,6 @@ describe('ResetPassword', () => { }) it('redirects to /forgot-password/resetPassword', () => { - console.log(router.currentRoute.value) expect(router.currentRoute.value.path).toBe('/forgot-password/resetPassword') }) }) @@ -418,7 +417,10 @@ describe('ResetPassword', () => { '...email was sent more than 23 hours and 10 minutes ago', ) expect(message.props('buttonText')).toBe('settings.password.reset') - expect(message.props('linkTo')).toMatchObject({ name: 'ForgotPassword', params: { comingFrom: 'reset-password' } }) + expect(message.props('linkTo')).toMatchObject({ + name: 'ForgotPassword', + params: { comingFrom: 'reset-password' }, + }) expect(mockToastError).toHaveBeenCalledWith( '...email was sent more than 23 hours and 10 minutes ago', ) diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue index 54e53a7c6..8c04e81ae 100644 --- a/frontend/src/pages/ResetPassword.vue +++ b/frontend/src/pages/ResetPassword.vue @@ -85,7 +85,6 @@ const { load: queryOptInQuery } = useLazyQuery(queryOptIn) const { toastError } = useAppToast() - const { meta: formMeta, values: formValues, setFieldValue } = useForm() const onSubmit = async () => { @@ -116,7 +115,9 @@ const onSubmit = async () => { messageHeadline.value = t('message.errorTitle') messageSubtitle.value = errorMessage messageButtonText.value = t('settings.password.reset') - messageButtonLinkTo.value = routeWithParamsAndQuery('ForgotPassword', { params: { comingFrom: 'reset-password' } }) + messageButtonLinkTo.value = routeWithParamsAndQuery('ForgotPassword', { + params: { comingFrom: 'reset-password' }, + }) toastError(errorMessage) } } @@ -128,7 +129,9 @@ const checkOptInCode = async () => { }) } catch (error) { toastError(error.message) - await router.push(routeWithParamsAndQuery('ForgotPassword', { params: { comingFrom: 'reset-password' } })) + await router.push( + routeWithParamsAndQuery('ForgotPassword', { params: { comingFrom: 'reset-password' } }), + ) } }