refactor: update SuccessModal and News context for improved state management and clarity
This commit is contained in:
parent
6b2ba85642
commit
cf130a00d9
@ -31,10 +31,9 @@ const DESCRIPTIONS: DescriptionMap = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const SuccessModal = ({ isOpen, onClose }: ModalProperties) => {
|
export const SuccessModal = ({ isOpen, onClose }: ModalProperties) => {
|
||||||
if (!isOpen) return
|
const message = isOpen
|
||||||
|
? DESCRIPTIONS[isOpen]
|
||||||
const message =
|
: 'Terjadi kesalahan. Silakan coba lagi.'
|
||||||
DESCRIPTIONS[isOpen] || 'Terjadi kesalahan. Silakan coba lagi.'
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog
|
<Dialog
|
||||||
@ -48,7 +47,10 @@ export const SuccessModal = ({ isOpen, onClose }: ModalProperties) => {
|
|||||||
transition
|
transition
|
||||||
/>
|
/>
|
||||||
<div className="fixed inset-0 flex w-screen justify-center overflow-y-auto p-4 max-sm:bg-white sm:items-center">
|
<div className="fixed inset-0 flex w-screen justify-center overflow-y-auto p-4 max-sm:bg-white sm:items-center">
|
||||||
<DialogPanel className="max-w-lg space-y-6 rounded-lg bg-white p-8 duration-300 ease-out data-[closed]:scale-95 data-[closed]:opacity-0 sm:shadow-lg">
|
<DialogPanel
|
||||||
|
className="max-w-lg space-y-6 rounded-lg bg-white p-8 duration-300 ease-out data-[closed]:scale-95 data-[closed]:opacity-0 sm:shadow-lg"
|
||||||
|
transition
|
||||||
|
>
|
||||||
<DialogTitle className="relative flex justify-center">
|
<DialogTitle className="relative flex justify-center">
|
||||||
<button
|
<button
|
||||||
onClick={onClose}
|
onClick={onClose}
|
||||||
@ -73,22 +75,23 @@ export const SuccessModal = ({ isOpen, onClose }: ModalProperties) => {
|
|||||||
<div className="relative">
|
<div className="relative">
|
||||||
<div className="relative flex flex-col items-center justify-center">
|
<div className="relative flex flex-col items-center justify-center">
|
||||||
<div className="mb-4 p-4 text-center">
|
<div className="mb-4 p-4 text-center">
|
||||||
{['resetPassword', 'register', 'payment'].includes(isOpen) && (
|
{isOpen &&
|
||||||
<div className="justify-center">
|
['resetPassword', 'register', 'payment'].includes(isOpen) && (
|
||||||
<img
|
<div className="justify-center">
|
||||||
src={'/images/back-to-home.svg'}
|
<img
|
||||||
alt={APP.title}
|
src={'/images/back-to-home.svg'}
|
||||||
className="h-[300px]"
|
alt={APP.title}
|
||||||
/>
|
className="h-[300px]"
|
||||||
<Button
|
/>
|
||||||
className="mt-5 w-full rounded-md"
|
<Button
|
||||||
variant={'newsPrimary'}
|
className="mt-5 w-full rounded-md"
|
||||||
onClick={onClose}
|
variant={'newsPrimary'}
|
||||||
>
|
onClick={onClose}
|
||||||
Back to Home
|
>
|
||||||
</Button>
|
Back to Home
|
||||||
</div>
|
</Button>
|
||||||
)}
|
</div>
|
||||||
|
)}
|
||||||
{isOpen === 'warning' && (
|
{isOpen === 'warning' && (
|
||||||
<div className="justify-center">
|
<div className="justify-center">
|
||||||
<img
|
<img
|
||||||
|
|||||||
@ -4,11 +4,13 @@ import { twMerge } from 'tailwind-merge'
|
|||||||
|
|
||||||
import { CarouselNextIcon } from '~/components/icons/carousel-next'
|
import { CarouselNextIcon } from '~/components/icons/carousel-next'
|
||||||
import { CarouselPreviousIcon } from '~/components/icons/carousel-previous'
|
import { CarouselPreviousIcon } from '~/components/icons/carousel-previous'
|
||||||
|
import { useNewsContext } from '~/contexts/news'
|
||||||
import type { TNews } from '~/types/news'
|
import type { TNews } from '~/types/news'
|
||||||
|
|
||||||
import { Button } from './button'
|
import { Button } from './button'
|
||||||
|
|
||||||
export const Carousel = (properties: TNews) => {
|
export const Carousel = (properties: TNews) => {
|
||||||
|
const { setIsSuccessOpen } = useNewsContext()
|
||||||
const [currentIndex, setCurrentIndex] = useState(0)
|
const [currentIndex, setCurrentIndex] = useState(0)
|
||||||
const { pathname } = useLocation()
|
const { pathname } = useLocation()
|
||||||
const hasCategory = pathname.includes('/category/')
|
const hasCategory = pathname.includes('/category/')
|
||||||
@ -65,7 +67,7 @@ export const Carousel = (properties: TNews) => {
|
|||||||
>
|
>
|
||||||
{items
|
{items
|
||||||
.slice(currentIndex * itemsPerPage, (currentIndex + 1) * itemsPerPage)
|
.slice(currentIndex * itemsPerPage, (currentIndex + 1) * itemsPerPage)
|
||||||
.map(({ featured, title, content, tags, slug }, index) => (
|
.map(({ featured, title, content, tags, slug, isPremium }, index) => (
|
||||||
<div
|
<div
|
||||||
key={index}
|
key={index}
|
||||||
className={twMerge(
|
className={twMerge(
|
||||||
@ -89,15 +91,25 @@ export const Carousel = (properties: TNews) => {
|
|||||||
type === 'hero' ? 'gap-7' : 'gap-4',
|
type === 'hero' ? 'gap-7' : 'gap-4',
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div className={`${type === 'hero' ? 'hidden' : ''} `}>
|
<div
|
||||||
{tags?.map((item, index) => (
|
className={twMerge(
|
||||||
|
'uppercase',
|
||||||
|
type === 'hero' ? 'hidden' : '',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{tags?.map((item) => (
|
||||||
<span
|
<span
|
||||||
key={index}
|
key={`${index}-${item}`}
|
||||||
className="my-3 mr-2 inline-block rounded bg-gray-200 px-3 py-1"
|
className="my-3 mr-2 inline-block rounded bg-[#F4F4F4] px-3 py-1 font-bold text-[#777777]"
|
||||||
>
|
>
|
||||||
{item}
|
{item}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
|
{isPremium && (
|
||||||
|
<span className="my-3 mr-2 inline-block rounded bg-[#D1C675] px-3 py-1 font-bold text-[#9D761D]">
|
||||||
|
Premium Content
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
@ -117,8 +129,14 @@ export const Carousel = (properties: TNews) => {
|
|||||||
</div>
|
</div>
|
||||||
<Button
|
<Button
|
||||||
size="block"
|
size="block"
|
||||||
as={Link}
|
{...(isPremium
|
||||||
to={`detail/${slug}`}
|
? {
|
||||||
|
onClick: () => {
|
||||||
|
setIsSuccessOpen('warning')
|
||||||
|
},
|
||||||
|
to: '',
|
||||||
|
}
|
||||||
|
: { as: Link, to: `/news/detail/${slug}` })}
|
||||||
className={twMerge('', type === 'hero' ? '' : 'mb-5')}
|
className={twMerge('', type === 'hero' ? '' : 'mb-5')}
|
||||||
>
|
>
|
||||||
View More
|
View More
|
||||||
|
|||||||
@ -16,8 +16,8 @@ export type NewsContextProperties = {
|
|||||||
setIsRegisterOpen: Dispatch<SetStateAction<boolean>>
|
setIsRegisterOpen: Dispatch<SetStateAction<boolean>>
|
||||||
isForgetOpen: boolean
|
isForgetOpen: boolean
|
||||||
setForgetOpen: Dispatch<SetStateAction<boolean>>
|
setForgetOpen: Dispatch<SetStateAction<boolean>>
|
||||||
isSuccessModalOpen?: ModalProperties['isOpen']
|
isSuccessOpen: ModalProperties['isOpen']
|
||||||
setIsSuccessModalOpen?: Dispatch<
|
setIsSuccessOpen: Dispatch<
|
||||||
SetStateAction<ModalProperties['isOpen'] | undefined>
|
SetStateAction<ModalProperties['isOpen'] | undefined>
|
||||||
>
|
>
|
||||||
isInitSubscribeOpen: boolean
|
isInitSubscribeOpen: boolean
|
||||||
@ -30,7 +30,7 @@ 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, setForgetOpen] = useState(false)
|
||||||
const [isSuccessModalOpen, setIsSuccessModalOpen] =
|
const [isSuccessOpen, setIsSuccessOpen] =
|
||||||
useState<ModalProperties['isOpen']>()
|
useState<ModalProperties['isOpen']>()
|
||||||
const [isInitSubscribeOpen, setIsInitSubscribeOpen] = useState(false)
|
const [isInitSubscribeOpen, setIsInitSubscribeOpen] = useState(false)
|
||||||
|
|
||||||
@ -43,8 +43,8 @@ export const NewsProvider = ({ children }: PropsWithChildren) => {
|
|||||||
setIsRegisterOpen,
|
setIsRegisterOpen,
|
||||||
isForgetOpen,
|
isForgetOpen,
|
||||||
setForgetOpen,
|
setForgetOpen,
|
||||||
isSuccessModalOpen,
|
isSuccessOpen,
|
||||||
setIsSuccessModalOpen,
|
setIsSuccessOpen,
|
||||||
isInitSubscribeOpen,
|
isInitSubscribeOpen,
|
||||||
setIsInitSubscribeOpen,
|
setIsInitSubscribeOpen,
|
||||||
}}
|
}}
|
||||||
|
|||||||
@ -23,8 +23,8 @@ export const NewsDefaultLayout = (properties: PropsWithChildren) => {
|
|||||||
setIsRegisterOpen,
|
setIsRegisterOpen,
|
||||||
isForgetOpen,
|
isForgetOpen,
|
||||||
setForgetOpen,
|
setForgetOpen,
|
||||||
isSuccessModalOpen,
|
isSuccessOpen,
|
||||||
setIsSuccessModalOpen,
|
setIsSuccessOpen,
|
||||||
isInitSubscribeOpen,
|
isInitSubscribeOpen,
|
||||||
setIsInitSubscribeOpen,
|
setIsInitSubscribeOpen,
|
||||||
} = useNewsContext()
|
} = useNewsContext()
|
||||||
@ -82,11 +82,9 @@ export const NewsDefaultLayout = (properties: PropsWithChildren) => {
|
|||||||
</PopupModal>
|
</PopupModal>
|
||||||
|
|
||||||
<SuccessModal
|
<SuccessModal
|
||||||
isOpen={isSuccessModalOpen}
|
isOpen={isSuccessOpen}
|
||||||
onClose={() => {
|
onClose={() => {
|
||||||
if (setIsSuccessModalOpen) {
|
setIsSuccessOpen(undefined)
|
||||||
setIsSuccessModalOpen(undefined)
|
|
||||||
}
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user