From 44f97005349cb6e45cbd88b8ea07b5584508aa9c Mon Sep 17 00:00:00 2001 From: vgeffer Date: Sat, 9 Dec 2023 21:23:55 +0100 Subject: [PATCH 1/7] feat(pass-reset): added password reset form --- .../LoginFormWrapper/LoginFormWrapper.tsx | 2 +- .../PasswordResetRequest.tsx | 2 +- .../PasswordReset/PasswordReset.tsx | 94 +++++++++++++++++++ .../strom/reset-password/[...resetToken].tsx | 31 ++++++ 4 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 src/components/PasswordReset/PasswordReset.tsx create mode 100644 src/pages/strom/reset-password/[...resetToken].tsx diff --git a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx index e58e7596..9d21c696 100644 --- a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx +++ b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx @@ -32,7 +32,7 @@ export const LoginFormWrapper: FC = ({closeOverlay}) => { return ( { - router.push('/verifikacia') + router.push(`${router.asPath}/../verifikacia`) }} /> ) diff --git a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx index 2d6f2eef..7e50559b 100644 --- a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx +++ b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx @@ -24,7 +24,7 @@ export const PasswordResetRequestForm: FC = ({closeOverla const {mutate: submitFormData} = useMutation({ mutationFn: (data: PasswordResetRequestFormValues) => { - return axios.post('/api/user/password/reset/', data) + return axios.post('/api/user/password/reset', data) }, onError: (error, variables, context) => {}, diff --git a/src/components/PasswordReset/PasswordReset.tsx b/src/components/PasswordReset/PasswordReset.tsx new file mode 100644 index 00000000..812307a4 --- /dev/null +++ b/src/components/PasswordReset/PasswordReset.tsx @@ -0,0 +1,94 @@ +import {useMutation} from '@tanstack/react-query' +import axios from 'axios' +import {useRouter} from 'next/router' +import {FC} from 'react' +import {SubmitHandler, useForm} from 'react-hook-form' + +import {Button} from '@/components/Clickable/Button' +import {FormInput} from '@/components/FormItems/FormInput/FormInput' +import {IGeneralPostResponse} from '@/types/api/general' + +export type PasswordResetFormProps = { + uid: string + token: string +} + +type PasswordResetForm = { + password1: string + password2: string +} + +const defaultValues: PasswordResetForm = { + password1: '', + password2: '', +} + +export const PasswordResetForm: FC = ({uid, token}) => { + const router = useRouter() + + const {handleSubmit, control, getValues} = useForm({defaultValues}) + + const requiredRule = {required: '* Toto pole nemôže byť prázdne.'} + + const transformFormData = (data: PasswordResetForm) => { + return { + new_password1: data.password1, + new_password2: data.password2, + uid: uid, + token: token, + } + } + + const {mutate: submitFormData} = useMutation({ + mutationFn: (data: PasswordResetForm) => { + return axios.post('/api/user/password/reset/confirm', transformFormData(data)) + }, + + onError: (error, variables, context) => { + console.log(error) + }, + + onSuccess: () => { + alert(1) + }, + }) + + const onSubmit: SubmitHandler = (data) => { + submitFormData(data) + } + + return ( + <> +

Debug: {uid}

+

Debug: {token}

+
+ + { + if (val !== getValues().password1) return '* Zadané heslá sa nezhodujú.' + }, + }} + /> + + + + ) +} diff --git a/src/pages/strom/reset-password/[...resetToken].tsx b/src/pages/strom/reset-password/[...resetToken].tsx new file mode 100644 index 00000000..1f0af4a8 --- /dev/null +++ b/src/pages/strom/reset-password/[...resetToken].tsx @@ -0,0 +1,31 @@ +import {NextPage} from 'next' + +import {PageLayout} from '@/components/PageLayout/PageLayout' +import {PasswordResetForm, PasswordResetFormProps} from '@/components/PasswordReset/PasswordReset' + +type QueryType = { + query?: { + resetToken: string | string[] + } +} + +const Verify: NextPage = ({uid, token}) => ( + + + +) + +export default Verify + +export const getServerSideProps = async ({query}: QueryType) => { + const errorRedirect = {redirect: {destination: '/', permanent: false}} + + if (query?.resetToken && Array.isArray(query.resetToken) && query.resetToken.length === 2) { + const token = query.resetToken[0] + const uid = query.resetToken[1] + + if (typeof token === 'string' && typeof uid === 'string') return {props: {uid: uid, token: token}} + } + + return errorRedirect +} From 37793744287b559e9793eb177d57e092d1d26e4f Mon Sep 17 00:00:00 2001 From: vgeffer Date: Sat, 9 Dec 2023 21:59:41 +0100 Subject: [PATCH 2/7] feat(pass-reset): finished flow --- .../LoginFormWrapper/LoginFormWrapper.tsx | 2 +- .../PasswordResetRequest.tsx | 4 ++- .../PasswordReset/PasswordReset.tsx | 28 ++++++++++++------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx index 9d21c696..25535cb2 100644 --- a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx +++ b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx @@ -32,7 +32,7 @@ export const LoginFormWrapper: FC = ({closeOverlay}) => { return ( { - router.push(`${router.asPath}/../verifikacia`) + router.push(`${router.asPath}/verifikacia`) }} /> ) diff --git a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx index 7e50559b..fb735082 100644 --- a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx +++ b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx @@ -27,7 +27,9 @@ export const PasswordResetRequestForm: FC = ({closeOverla return axios.post('/api/user/password/reset', data) }, - onError: (error, variables, context) => {}, + onError: (error) => { + alert(error.message) + }, onSuccess: () => { closeOverlay() diff --git a/src/components/PasswordReset/PasswordReset.tsx b/src/components/PasswordReset/PasswordReset.tsx index 812307a4..741c8d7f 100644 --- a/src/components/PasswordReset/PasswordReset.tsx +++ b/src/components/PasswordReset/PasswordReset.tsx @@ -1,3 +1,4 @@ +import {Typography} from '@mui/material' import {useMutation} from '@tanstack/react-query' import axios from 'axios' import {useRouter} from 'next/router' @@ -8,6 +9,8 @@ import {Button} from '@/components/Clickable/Button' import {FormInput} from '@/components/FormItems/FormInput/FormInput' import {IGeneralPostResponse} from '@/types/api/general' +import {LoginForm} from '../PageLayout/LoginForm/LoginForm' + export type PasswordResetFormProps = { uid: string token: string @@ -39,17 +42,12 @@ export const PasswordResetForm: FC = ({uid, token}) => { } } - const {mutate: submitFormData} = useMutation({ + const {mutate: submitFormData, isSuccess: isReset} = useMutation({ mutationFn: (data: PasswordResetForm) => { return axios.post('/api/user/password/reset/confirm', transformFormData(data)) }, - - onError: (error, variables, context) => { - console.log(error) - }, - - onSuccess: () => { - alert(1) + onError: (error) => { + alert(error.name) }, }) @@ -57,10 +55,20 @@ export const PasswordResetForm: FC = ({uid, token}) => { submitFormData(data) } + if (isReset) + return ( + <> + Heslo úspešne zmenené, môžeš sa prihlásiť + { + router.push('/') + }} + /> + + ) + return ( <> -

Debug: {uid}

-

Debug: {token}

Date: Sat, 9 Dec 2023 22:44:32 +0100 Subject: [PATCH 3/7] feat(login, pass-reset): resolved merge conflict --- .../LoginFormWrapper/LoginFormWrapper.tsx | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx index 25535cb2..12a667f8 100644 --- a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx +++ b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx @@ -3,6 +3,7 @@ import {useRouter} from 'next/router' import {FC, useState} from 'react' import {Button} from '@/components/Clickable/Button' +import {useSeminarInfo} from '@/utils/useSeminarInfo' import {LoginForm} from '../LoginForm/LoginForm' import {PasswordResetRequestForm} from '../PasswordResetRequest/PasswordResetRequest' @@ -15,24 +16,30 @@ export const LoginFormWrapper: FC = ({closeOverlay}) => { const router = useRouter() const [form, changeForm] = useState('login') + const {seminar} = useSeminarInfo() + if (form === 'login') return ( - - - - + <> + + + + + + + ) return ( { - router.push(`${router.asPath}/verifikacia`) + router.push(`/${seminar}/reset-sent`) }} /> ) From e73a809b5725adbf0749e0f18a12f3816f252094 Mon Sep 17 00:00:00 2001 From: vgeffer Date: Sat, 9 Dec 2023 22:45:18 +0100 Subject: [PATCH 4/7] feat(pass-reset): changed styles and messages --- .../PasswordResetRequest.tsx | 37 +++++---- .../PasswordReset/PasswordReset.tsx | 77 ++++++++++--------- .../PasswordResetSent/PasswordResetSent.tsx | 10 +++ src/components/Verification/Verification.tsx | 3 +- src/pages/malynar/reset-sent/index.tsx | 15 ++++ src/pages/matik/reset-sent/index.tsx | 15 ++++ src/pages/strom/reset-sent/index.tsx | 15 ++++ 7 files changed, 118 insertions(+), 54 deletions(-) create mode 100644 src/components/PasswordResetSent/PasswordResetSent.tsx create mode 100644 src/pages/malynar/reset-sent/index.tsx create mode 100644 src/pages/matik/reset-sent/index.tsx create mode 100644 src/pages/strom/reset-sent/index.tsx diff --git a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx index fb735082..5bc44c36 100644 --- a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx +++ b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx @@ -1,3 +1,4 @@ +import {Stack} from '@mui/material' import {useMutation} from '@tanstack/react-query' import axios from 'axios' import {FC} from 'react' @@ -27,10 +28,6 @@ export const PasswordResetRequestForm: FC = ({closeOverla return axios.post('/api/user/password/reset', data) }, - onError: (error) => { - alert(error.message) - }, - onSuccess: () => { closeOverlay() }, @@ -42,19 +39,25 @@ export const PasswordResetRequestForm: FC = ({closeOverla return ( - - + + + + + + ) } diff --git a/src/components/PasswordReset/PasswordReset.tsx b/src/components/PasswordReset/PasswordReset.tsx index 741c8d7f..7d623b09 100644 --- a/src/components/PasswordReset/PasswordReset.tsx +++ b/src/components/PasswordReset/PasswordReset.tsx @@ -1,4 +1,4 @@ -import {Typography} from '@mui/material' +import {Stack, Typography} from '@mui/material' import {useMutation} from '@tanstack/react-query' import axios from 'axios' import {useRouter} from 'next/router' @@ -46,9 +46,6 @@ export const PasswordResetForm: FC = ({uid, token}) => { mutationFn: (data: PasswordResetForm) => { return axios.post('/api/user/password/reset/confirm', transformFormData(data)) }, - onError: (error) => { - alert(error.name) - }, }) const onSubmit: SubmitHandler = (data) => { @@ -58,44 +55,52 @@ export const PasswordResetForm: FC = ({uid, token}) => { if (isReset) return ( <> - Heslo úspešne zmenené, môžeš sa prihlásiť - { - router.push('/') - }} - /> + + Heslo úspešne zmenené, môžeš sa prihlásiť + { + router.push('/') + }} + /> + ) return ( <>
- - { - if (val !== getValues().password1) return '* Zadané heslá sa nezhodujú.' - }, - }} - /> - + + + { + if (val !== getValues().password1) return '* Zadané heslá sa nezhodujú.' + }, + }} + /> + + + + ) diff --git a/src/components/PasswordResetSent/PasswordResetSent.tsx b/src/components/PasswordResetSent/PasswordResetSent.tsx new file mode 100644 index 00000000..b079954c --- /dev/null +++ b/src/components/PasswordResetSent/PasswordResetSent.tsx @@ -0,0 +1,10 @@ +import {Typography} from '@mui/material' +import {FC} from 'react' + +export const PasswordResetSent: FC = () => { + return ( + + Ak existuje účet so zadaným e-mailom, poslali sme ti naňho link pre zmenu hesla. + + ) +} diff --git a/src/components/Verification/Verification.tsx b/src/components/Verification/Verification.tsx index b916cada..daff59ec 100644 --- a/src/components/Verification/Verification.tsx +++ b/src/components/Verification/Verification.tsx @@ -1,5 +1,6 @@ +import {Typography} from '@mui/material' import {FC} from 'react' export const Verification: FC = () => { - return
Verifikačný e-mail bol odoslaný na zadanú e-mailovú adresu.
+ return Verifikačný e-mail bol odoslaný na zadanú e-mailovú adresu. } diff --git a/src/pages/malynar/reset-sent/index.tsx b/src/pages/malynar/reset-sent/index.tsx new file mode 100644 index 00000000..1256e1d5 --- /dev/null +++ b/src/pages/malynar/reset-sent/index.tsx @@ -0,0 +1,15 @@ +import {NextPage} from 'next' + +import {PasswordResetSent} from '@/components/PasswordResetSent/PasswordResetSent' + +import {PageLayout} from '../../../components/PageLayout/PageLayout' + +const Verifikacia: NextPage = () => { + return ( + + + + ) +} + +export default Verifikacia diff --git a/src/pages/matik/reset-sent/index.tsx b/src/pages/matik/reset-sent/index.tsx new file mode 100644 index 00000000..1256e1d5 --- /dev/null +++ b/src/pages/matik/reset-sent/index.tsx @@ -0,0 +1,15 @@ +import {NextPage} from 'next' + +import {PasswordResetSent} from '@/components/PasswordResetSent/PasswordResetSent' + +import {PageLayout} from '../../../components/PageLayout/PageLayout' + +const Verifikacia: NextPage = () => { + return ( + + + + ) +} + +export default Verifikacia diff --git a/src/pages/strom/reset-sent/index.tsx b/src/pages/strom/reset-sent/index.tsx new file mode 100644 index 00000000..1256e1d5 --- /dev/null +++ b/src/pages/strom/reset-sent/index.tsx @@ -0,0 +1,15 @@ +import {NextPage} from 'next' + +import {PasswordResetSent} from '@/components/PasswordResetSent/PasswordResetSent' + +import {PageLayout} from '../../../components/PageLayout/PageLayout' + +const Verifikacia: NextPage = () => { + return ( + + + + ) +} + +export default Verifikacia From a49f485aaa60979bc4112092e10a81b5914bf4d5 Mon Sep 17 00:00:00 2001 From: matushl Date: Sun, 10 Dec 2023 11:44:25 +0100 Subject: [PATCH 5/7] Some code cleaning --- .../Admin/resources/cms/post/PostList.tsx | 2 +- .../LoginFormWrapper/LoginFormWrapper.tsx | 24 +++--- .../PasswordReset/PasswordReset.tsx | 86 +++++++++---------- src/components/Posts/Post.tsx | 2 +- src/pages/malynar/reset-sent/index.tsx | 3 +- .../malynar/verifikacia/[[...params]].tsx | 3 +- src/pages/matik/reset-sent/index.tsx | 3 +- src/pages/matik/verifikacia/[[...params]].tsx | 3 +- src/pages/strom/archiv/[[...params]].tsx | 3 +- src/pages/strom/reset-sent/index.tsx | 3 +- src/pages/strom/verifikacia/[[...params]].tsx | 3 +- 11 files changed, 65 insertions(+), 70 deletions(-) diff --git a/src/components/Admin/resources/cms/post/PostList.tsx b/src/components/Admin/resources/cms/post/PostList.tsx index 909746c5..1b043821 100644 --- a/src/components/Admin/resources/cms/post/PostList.tsx +++ b/src/components/Admin/resources/cms/post/PostList.tsx @@ -1,5 +1,5 @@ import {FC} from 'react' -import {Datagrid, DateField, FunctionField, List, NumberField, RaRecord, TextField} from 'react-admin' +import {Datagrid, DateField, FunctionField, List, RaRecord, TextField} from 'react-admin' import {SitesArrayField} from '@/components/Admin/custom/SitesArrayField' import {TruncatedTextField} from '@/components/Admin/custom/TruncatedTextField' diff --git a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx index 12a667f8..d2e4cb56 100644 --- a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx +++ b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx @@ -20,20 +20,18 @@ export const LoginFormWrapper: FC = ({closeOverlay}) => { if (form === 'login') return ( - <> - - - - - + + + + - + ) return ( diff --git a/src/components/PasswordReset/PasswordReset.tsx b/src/components/PasswordReset/PasswordReset.tsx index 7d623b09..ffba07a7 100644 --- a/src/components/PasswordReset/PasswordReset.tsx +++ b/src/components/PasswordReset/PasswordReset.tsx @@ -54,54 +54,50 @@ export const PasswordResetForm: FC = ({uid, token}) => { if (isReset) return ( - <> - - Heslo úspešne zmenené, môžeš sa prihlásiť - { - router.push('/') - }} - /> - - + + Heslo úspešne zmenené, môžeš sa prihlásiť + { + router.push('/') + }} + /> + ) return ( - <> -
- - - { - if (val !== getValues().password1) return '* Zadané heslá sa nezhodujú.' - }, - }} - /> - - - + + + + { + if (val !== getValues().password1) return '* Zadané heslá sa nezhodujú.' + }, + }} + /> + + - - + + ) } diff --git a/src/components/Posts/Post.tsx b/src/components/Posts/Post.tsx index 952a3b5b..9c9ae050 100644 --- a/src/components/Posts/Post.tsx +++ b/src/components/Posts/Post.tsx @@ -18,7 +18,7 @@ export interface IPost { sites: number[] } -export const Post: FC = ({id, caption, short_text, links, sites, added_at}) => { +export const Post: FC = ({caption, short_text, links, sites, added_at}) => { const {seminarId} = useSeminarInfo() if (!sites.includes(seminarId)) return null diff --git a/src/pages/malynar/reset-sent/index.tsx b/src/pages/malynar/reset-sent/index.tsx index 1256e1d5..6790a4fe 100644 --- a/src/pages/malynar/reset-sent/index.tsx +++ b/src/pages/malynar/reset-sent/index.tsx @@ -1,9 +1,8 @@ import {NextPage} from 'next' +import {PageLayout} from '@/components/PageLayout/PageLayout' import {PasswordResetSent} from '@/components/PasswordResetSent/PasswordResetSent' -import {PageLayout} from '../../../components/PageLayout/PageLayout' - const Verifikacia: NextPage = () => { return ( diff --git a/src/pages/malynar/verifikacia/[[...params]].tsx b/src/pages/malynar/verifikacia/[[...params]].tsx index 7727865e..3a39698d 100644 --- a/src/pages/malynar/verifikacia/[[...params]].tsx +++ b/src/pages/malynar/verifikacia/[[...params]].tsx @@ -1,6 +1,7 @@ import {NextPage} from 'next' -import {PageLayout} from '../../../components/PageLayout/PageLayout' +import {PageLayout} from '@/components/PageLayout/PageLayout' + import {Verification} from '../../../components/Verification/Verification' const Verifikacia: NextPage = () => { diff --git a/src/pages/matik/reset-sent/index.tsx b/src/pages/matik/reset-sent/index.tsx index 1256e1d5..6790a4fe 100644 --- a/src/pages/matik/reset-sent/index.tsx +++ b/src/pages/matik/reset-sent/index.tsx @@ -1,9 +1,8 @@ import {NextPage} from 'next' +import {PageLayout} from '@/components/PageLayout/PageLayout' import {PasswordResetSent} from '@/components/PasswordResetSent/PasswordResetSent' -import {PageLayout} from '../../../components/PageLayout/PageLayout' - const Verifikacia: NextPage = () => { return ( diff --git a/src/pages/matik/verifikacia/[[...params]].tsx b/src/pages/matik/verifikacia/[[...params]].tsx index 7727865e..3a39698d 100644 --- a/src/pages/matik/verifikacia/[[...params]].tsx +++ b/src/pages/matik/verifikacia/[[...params]].tsx @@ -1,6 +1,7 @@ import {NextPage} from 'next' -import {PageLayout} from '../../../components/PageLayout/PageLayout' +import {PageLayout} from '@/components/PageLayout/PageLayout' + import {Verification} from '../../../components/Verification/Verification' const Verifikacia: NextPage = () => { diff --git a/src/pages/strom/archiv/[[...params]].tsx b/src/pages/strom/archiv/[[...params]].tsx index 7bb94415..43f26130 100644 --- a/src/pages/strom/archiv/[[...params]].tsx +++ b/src/pages/strom/archiv/[[...params]].tsx @@ -1,7 +1,8 @@ import {NextPage} from 'next' +import {PageLayout} from '@/components/PageLayout/PageLayout' + import {Archive} from '../../../components/Archive/Archive' -import {PageLayout} from '../../../components/PageLayout/PageLayout' const Archiv: NextPage = () => { return ( diff --git a/src/pages/strom/reset-sent/index.tsx b/src/pages/strom/reset-sent/index.tsx index 1256e1d5..6790a4fe 100644 --- a/src/pages/strom/reset-sent/index.tsx +++ b/src/pages/strom/reset-sent/index.tsx @@ -1,9 +1,8 @@ import {NextPage} from 'next' +import {PageLayout} from '@/components/PageLayout/PageLayout' import {PasswordResetSent} from '@/components/PasswordResetSent/PasswordResetSent' -import {PageLayout} from '../../../components/PageLayout/PageLayout' - const Verifikacia: NextPage = () => { return ( diff --git a/src/pages/strom/verifikacia/[[...params]].tsx b/src/pages/strom/verifikacia/[[...params]].tsx index 7727865e..3a39698d 100644 --- a/src/pages/strom/verifikacia/[[...params]].tsx +++ b/src/pages/strom/verifikacia/[[...params]].tsx @@ -1,6 +1,7 @@ import {NextPage} from 'next' -import {PageLayout} from '../../../components/PageLayout/PageLayout' +import {PageLayout} from '@/components/PageLayout/PageLayout' + import {Verification} from '../../../components/Verification/Verification' const Verifikacia: NextPage = () => { From f173679d1c70f5ad84a4861f8ffe46d4c9e6131e Mon Sep 17 00:00:00 2001 From: vgeffer Date: Sun, 10 Dec 2023 12:17:03 +0100 Subject: [PATCH 6/7] feat(pass-reset): removed redundant code from pages --- src/pages/malynar/reset-sent/index.tsx | 9 ++------- src/pages/matik/reset-sent/index.tsx | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/pages/malynar/reset-sent/index.tsx b/src/pages/malynar/reset-sent/index.tsx index 6790a4fe..ae458357 100644 --- a/src/pages/malynar/reset-sent/index.tsx +++ b/src/pages/malynar/reset-sent/index.tsx @@ -1,14 +1,9 @@ import {NextPage} from 'next' -import {PageLayout} from '@/components/PageLayout/PageLayout' -import {PasswordResetSent} from '@/components/PasswordResetSent/PasswordResetSent' +import Page from '../../strom/reset-sent/index' const Verifikacia: NextPage = () => { - return ( - - - - ) + return } export default Verifikacia diff --git a/src/pages/matik/reset-sent/index.tsx b/src/pages/matik/reset-sent/index.tsx index 6790a4fe..ae458357 100644 --- a/src/pages/matik/reset-sent/index.tsx +++ b/src/pages/matik/reset-sent/index.tsx @@ -1,14 +1,9 @@ import {NextPage} from 'next' -import {PageLayout} from '@/components/PageLayout/PageLayout' -import {PasswordResetSent} from '@/components/PasswordResetSent/PasswordResetSent' +import Page from '../../strom/reset-sent/index' const Verifikacia: NextPage = () => { - return ( - - - - ) + return } export default Verifikacia From e0a3bf0eb35000989f90af4df486bb0aa220b101 Mon Sep 17 00:00:00 2001 From: vgeffer Date: Sun, 10 Dec 2023 12:25:39 +0100 Subject: [PATCH 7/7] feat(pass-reset): changed style --- .../PageLayout/PasswordResetRequest/PasswordResetRequest.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx index 5bc44c36..3ed8f952 100644 --- a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx +++ b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx @@ -52,7 +52,7 @@ export const PasswordResetRequestForm: FC = ({closeOverla }, }} /> - +