feat: fix conflic
This commit is contained in:
@@ -2,6 +2,7 @@ import { type PropsWithChildren } from 'react'
|
||||
|
||||
import { PopupModal } from '~/components/popup/modal'
|
||||
import Banner from '~/components/ui/banner'
|
||||
import FormForgotPassword from '~/components/ui/form-forgot-password'
|
||||
import { FormLogin } from '~/components/ui/form-login'
|
||||
import { FormRegister } from '~/components/ui/form-register'
|
||||
import { useNewsContext } from '~/contexts/news'
|
||||
@@ -13,8 +14,14 @@ import { HeaderTop } from './header-top'
|
||||
|
||||
export const NewsDefaultLayout = (properties: PropsWithChildren) => {
|
||||
const { children } = properties
|
||||
const { isLoginOpen, setIsLoginOpen, isRegisterOpen, setIsRegisterOpen } =
|
||||
useNewsContext()
|
||||
const {
|
||||
isLoginOpen,
|
||||
setIsLoginOpen,
|
||||
isRegisterOpen,
|
||||
setIsRegisterOpen,
|
||||
isForgetOpen,
|
||||
setForgetOpen,
|
||||
} = useNewsContext()
|
||||
return (
|
||||
<main className="relative min-h-dvh bg-[#ECECEC]">
|
||||
<header>
|
||||
@@ -39,16 +46,25 @@ export const NewsDefaultLayout = (properties: PropsWithChildren) => {
|
||||
<FormLogin
|
||||
setIsRegisterOpen={setIsRegisterOpen}
|
||||
setIsLoginOpen={setIsLoginOpen}
|
||||
setIsForgetOpen={setForgetOpen}
|
||||
/>
|
||||
</PopupModal>
|
||||
|
||||
<PopupModal
|
||||
isOpen={isRegisterOpen}
|
||||
onClose={() => setIsRegisterOpen(false)}
|
||||
description="Selamat Datang, silakan daftarkan akun Anda untuk melanjutkan!"
|
||||
description="Selamat Datang, silakan isi keterangan akun Anda untuk melanjutkan!"
|
||||
>
|
||||
<FormRegister />
|
||||
</PopupModal>
|
||||
|
||||
<PopupModal
|
||||
isOpen={isForgetOpen}
|
||||
onClose={() => setForgetOpen(false)}
|
||||
description="Selamat Datang, silakan isi keterangan akun Anda untuk melanjutkan!"
|
||||
>
|
||||
<FormForgotPassword />
|
||||
</PopupModal>
|
||||
</main>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user