feat: update News context to use consistent setter naming and refactor FormLogin to utilize context

This commit is contained in:
Ardeman 2025-02-28 22:50:58 +08:00
parent 3f9bfded80
commit 13f44f336d
4 changed files with 28 additions and 21 deletions

View File

@ -15,7 +15,7 @@ export type NewsContextProperties = {
isRegisterOpen: boolean isRegisterOpen: boolean
setIsRegisterOpen: Dispatch<SetStateAction<boolean>> setIsRegisterOpen: Dispatch<SetStateAction<boolean>>
isForgetOpen: boolean isForgetOpen: boolean
setForgetOpen: Dispatch<SetStateAction<boolean>> setIsForgetOpen: Dispatch<SetStateAction<boolean>>
isSuccessOpen: ModalProperties['isOpen'] isSuccessOpen: ModalProperties['isOpen']
setIsSuccessOpen: Dispatch< setIsSuccessOpen: Dispatch<
SetStateAction<ModalProperties['isOpen'] | undefined> SetStateAction<ModalProperties['isOpen'] | undefined>
@ -29,7 +29,7 @@ const NewsContext = createContext<NewsContextProperties | undefined>(undefined)
export const NewsProvider = ({ children }: PropsWithChildren) => { export const NewsProvider = ({ children }: PropsWithChildren) => {
const [isLoginOpen, setIsLoginOpen] = useState(false) const [isLoginOpen, setIsLoginOpen] = useState(false)
const [isRegisterOpen, setIsRegisterOpen] = useState(false) const [isRegisterOpen, setIsRegisterOpen] = useState(false)
const [isForgetOpen, setForgetOpen] = useState(false) const [isForgetOpen, setIsForgetOpen] = useState(false)
const [isSuccessOpen, setIsSuccessOpen] = const [isSuccessOpen, setIsSuccessOpen] =
useState<ModalProperties['isOpen']>() useState<ModalProperties['isOpen']>()
const [isInitSubscribeOpen, setIsInitSubscribeOpen] = useState(false) const [isInitSubscribeOpen, setIsInitSubscribeOpen] = useState(false)
@ -42,7 +42,7 @@ export const NewsProvider = ({ children }: PropsWithChildren) => {
isRegisterOpen, isRegisterOpen,
setIsRegisterOpen, setIsRegisterOpen,
isForgetOpen, isForgetOpen,
setForgetOpen, setIsForgetOpen,
isSuccessOpen, isSuccessOpen,
setIsSuccessOpen, setIsSuccessOpen,
isInitSubscribeOpen, isInitSubscribeOpen,

View File

@ -22,7 +22,7 @@ export const NewsDefaultLayout = (properties: PropsWithChildren) => {
isRegisterOpen, isRegisterOpen,
setIsRegisterOpen, setIsRegisterOpen,
isForgetOpen, isForgetOpen,
setForgetOpen, setIsForgetOpen,
isSuccessOpen, isSuccessOpen,
setIsSuccessOpen, setIsSuccessOpen,
isInitSubscribeOpen, isInitSubscribeOpen,
@ -49,12 +49,7 @@ export const NewsDefaultLayout = (properties: PropsWithChildren) => {
onClose={() => setIsLoginOpen(false)} onClose={() => setIsLoginOpen(false)}
description="Selamat Datang, silakan daftarkan akun Anda untuk melanjutkan!" description="Selamat Datang, silakan daftarkan akun Anda untuk melanjutkan!"
> >
<FormLogin <FormLogin />
setIsRegisterOpen={setIsRegisterOpen}
setIsLoginOpen={setIsLoginOpen}
setIsForgetOpen={setForgetOpen}
setIsInitSubscribeOpen={setIsInitSubscribeOpen}
/>
</PopupModal> </PopupModal>
<PopupModal <PopupModal
@ -67,7 +62,7 @@ export const NewsDefaultLayout = (properties: PropsWithChildren) => {
<PopupModal <PopupModal
isOpen={isForgetOpen} isOpen={isForgetOpen}
onClose={() => setForgetOpen(false)} onClose={() => setIsForgetOpen(false)}
description="Selamat Datang, silakan isi keterangan akun Anda untuk melanjutkan!" description="Selamat Datang, silakan isi keterangan akun Anda untuk melanjutkan!"
> >
<FormForgotPassword /> <FormForgotPassword />

View File

@ -6,7 +6,7 @@ import { z } from 'zod'
import { Button } from '~/components/ui/button' import { Button } from '~/components/ui/button'
import { Input } from '~/components/ui/input' import { Input } from '~/components/ui/input'
import type { NewsContextProperties } from '~/contexts/news' import { useNewsContext } from '~/contexts/news'
export const loginSchema = z.object({ export const loginSchema = z.object({
email: z.string().email('Email tidak valid'), email: z.string().email('Email tidak valid'),
@ -15,20 +15,13 @@ export const loginSchema = z.object({
export type TLoginSchema = z.infer<typeof loginSchema> export type TLoginSchema = z.infer<typeof loginSchema>
type TProperties = { export const FormLogin = () => {
setIsRegisterOpen: NewsContextProperties['setIsRegisterOpen']
setIsLoginOpen: NewsContextProperties['setIsLoginOpen']
setIsForgetOpen: NewsContextProperties['setForgetOpen']
setIsInitSubscribeOpen: NewsContextProperties['setIsInitSubscribeOpen']
}
export const FormLogin = (properties: TProperties) => {
const { const {
setIsRegisterOpen, setIsRegisterOpen,
setIsLoginOpen, setIsLoginOpen,
setIsForgetOpen, setIsForgetOpen,
setIsInitSubscribeOpen, setIsInitSubscribeOpen,
} = properties } = useNewsContext()
const fetcher = useFetcher() const fetcher = useFetcher()
const [error, setError] = useState<string>() const [error, setError] = useState<string>()
const [disabled, setDisabled] = useState(false) const [disabled, setDisabled] = useState(false)

View File

@ -1,9 +1,12 @@
import { useState } from 'react' import { useState } from 'react'
import { Button } from '~/components/ui/button' import { Button } from '~/components/ui/button'
import { useNewsContext } from '~/contexts/news'
export const FormRegister = () => { export const FormRegister = () => {
const { setIsLoginOpen, setIsRegisterOpen } = useNewsContext()
const [showPassword, setShowPassword] = useState(false) const [showPassword, setShowPassword] = useState(false)
return ( return (
<div className="flex flex-col items-center justify-center"> <div className="flex flex-col items-center justify-center">
<div className="w-full max-w-md"> <div className="w-full max-w-md">
@ -104,6 +107,22 @@ export const FormRegister = () => {
Daftar Daftar
</Button> </Button>
</form> </form>
{/* Link Login */}
<div className="mt-4 text-center text-sm">
Sudah punya akun?{' '}
<Button
onClick={() => {
setIsLoginOpen(true)
setIsRegisterOpen(false)
}}
className="font-semibold text-[#2E2F7C]"
variant="link"
size="fit"
>
Masuk Disini
</Button>
</div>
</div> </div>
</div> </div>
) )