Merge branch 'feature/slicing'

# Conflicts:
#	app/contexts/news.tsx
#	app/routes/_layout.admin.dashboard._index.tsx
This commit is contained in:
Ardeman
2025-02-23 11:38:30 +08:00
5 changed files with 53 additions and 13 deletions
+19 -3
View File
@@ -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>
)
}