feat: implement clientLoader for news data fetching and update serverLoader structure

This commit is contained in:
Ardeman 2025-03-19 17:46:26 +08:00
parent 4ca2d8cf84
commit ba4e380023
2 changed files with 40 additions and 12 deletions

View File

@ -4,11 +4,13 @@ import { Card } from '~/components/ui/card'
import { CarouselHero } from '~/components/ui/carousel-hero' import { CarouselHero } from '~/components/ui/carousel-hero'
import { CarouselSection } from '~/components/ui/carousel-section' import { CarouselSection } from '~/components/ui/carousel-section'
import { Newsletter } from '~/components/ui/newsletter' import { Newsletter } from '~/components/ui/newsletter'
import type { loader } from '~/routes/_news._index' import { type clientLoader } from '~/routes/_news._index'
import type { TNews } from '~/types/news' import type { TNews } from '~/types/news'
export const NewsPage = () => { export const NewsPage = () => {
const loaderData = useRouteLoaderData<typeof loader>('routes/_news._index') const loaderData = useRouteLoaderData<typeof clientLoader>(
'routes/_news._index',
)
const spotlight: TNews = { const spotlight: TNews = {
title: loaderData?.spotlightCategory?.name || '', title: loaderData?.spotlightCategory?.name || '',
description: loaderData?.spotlightCategory?.description || '', description: loaderData?.spotlightCategory?.description || '',

View File

@ -13,35 +13,61 @@ export const loader = async ({}: Route.LoaderArgs) => {
const spotlightCategory = categoriesData.find( const spotlightCategory = categoriesData.find(
(category) => category.code === spotlightCode, (category) => category.code === spotlightCode,
) )
let { data: spotlightNews } = await getNews({ categories: [spotlightCode] })
spotlightNews = spotlightNews.filter(
(news) => new Date(news.live_at) <= new Date(),
)
const beritaCode = 'berita' const beritaCode = 'berita'
const beritaCategory = categoriesData.find( const beritaCategory = categoriesData.find(
(category) => category.code === beritaCode, (category) => category.code === beritaCode,
) )
let { data: beritaNews } = await getNews({ categories: [beritaCode] })
beritaNews = beritaNews.filter((news) => new Date(news.live_at) <= new Date())
const kajianCode = 'kajian' const kajianCode = 'kajian'
const kajianCategory = categoriesData.find( const kajianCategory = categoriesData.find(
(category) => category.code === kajianCode, (category) => category.code === kajianCode,
) )
let { data: kajianNews } = await getNews({ categories: [kajianCode] })
kajianNews = kajianNews.filter((news) => new Date(news.live_at) <= new Date())
return { return {
spotlightCategory, spotlightCategory,
spotlightNews, spotlightCode,
beritaCategory, beritaCategory,
beritaNews, beritaCode,
kajianCategory, kajianCategory,
kajianCode,
}
}
export const clientLoader = async ({
serverLoader,
}: Route.ClientLoaderArgs) => {
const serverData = await serverLoader()
let { data: spotlightNews } = await getNews({
categories: [serverData.spotlightCode],
})
spotlightNews = spotlightNews.filter(
(news) => new Date(news.live_at) <= new Date(),
)
let { data: beritaNews } = await getNews({
categories: [serverData.beritaCode],
})
beritaNews = beritaNews.filter((news) => new Date(news.live_at) <= new Date())
let { data: kajianNews } = await getNews({
categories: [serverData.kajianCode],
})
kajianNews = kajianNews.filter((news) => new Date(news.live_at) <= new Date())
return {
...serverData,
spotlightNews,
beritaNews,
kajianNews, kajianNews,
} }
} }
clientLoader.hydrate = true as const
export const HydrateFallback = () => {
return <div>Loading...</div>
}
export const ErrorBoundary = ({ error }: Route.ErrorBoundaryProps) => { export const ErrorBoundary = ({ error }: Route.ErrorBoundaryProps) => {
let message = 'Oops!' let message = 'Oops!'
let details = 'An unexpected error occurred.' let details = 'An unexpected error occurred.'