legalgonews/legalgo-FE-reactrouter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: simplify loader implementation by removing clientLoader and streamlining data fetching

Browse Source
This commit is contained in:
Ardeman 2025-03-19 18:53:30 +08:00
parent b8378d37ad
commit 2dc84c582d
2 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/pages/news/index.tsx
View File

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

42
app/routes/_news._index.tsx
View File

@ -26,6 +26,21 @@ export const loader = async ({}: Route.LoaderArgs) => {
(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 {
spotlightCategory,
spotlightCode,
@ -33,39 +48,12 @@ export const loader = async ({}: Route.LoaderArgs) => {
beritaCode,
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,
}
}
clientLoader.hydrate = true as const
export const HydrateFallback = () => {
return (
<Card>