refactor: simplify loader implementation by removing clientLoader and streamlining data fetching
This commit is contained in:
parent
b8378d37ad
commit
2dc84c582d
@ -4,13 +4,11 @@ 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 clientLoader } from '~/routes/_news._index'
|
import { type loader } 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 clientLoader>(
|
const loaderData = useRouteLoaderData<typeof loader>('routes/_news._index')
|
||||||
'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 || '',
|
||||||
|
|||||||
@ -26,6 +26,21 @@ export const loader = async ({}: Route.LoaderArgs) => {
|
|||||||
(category) => category.code === kajianCode,
|
(category) => category.code === kajianCode,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
let { data: spotlightNews } = await getNews({
|
||||||
|
categories: [spotlightCode],
|
||||||
|
})
|
||||||
|
spotlightNews = spotlightNews.filter(
|
||||||
|
(news) => new Date(news.live_at) <= new Date(),
|
||||||
|
)
|
||||||
|
let { data: beritaNews } = await getNews({
|
||||||
|
categories: [beritaCode],
|
||||||
|
})
|
||||||
|
beritaNews = beritaNews.filter((news) => new Date(news.live_at) <= new Date())
|
||||||
|
let { data: kajianNews } = await getNews({
|
||||||
|
categories: [kajianCode],
|
||||||
|
})
|
||||||
|
kajianNews = kajianNews.filter((news) => new Date(news.live_at) <= new Date())
|
||||||
|
|
||||||
return {
|
return {
|
||||||
spotlightCategory,
|
spotlightCategory,
|
||||||
spotlightCode,
|
spotlightCode,
|
||||||
@ -33,39 +48,12 @@ export const loader = async ({}: Route.LoaderArgs) => {
|
|||||||
beritaCode,
|
beritaCode,
|
||||||
kajianCategory,
|
kajianCategory,
|
||||||
kajianCode,
|
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,
|
spotlightNews,
|
||||||
beritaNews,
|
beritaNews,
|
||||||
kajianNews,
|
kajianNews,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
clientLoader.hydrate = true as const
|
|
||||||
|
|
||||||
export const HydrateFallback = () => {
|
export const HydrateFallback = () => {
|
||||||
return (
|
return (
|
||||||
<Card>
|
<Card>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user