Merge remote-tracking branch 'origin/master' into feature/slicing

This commit is contained in:
fredy.siswanto
2025-03-19 17:16:56 +07:00
5 changed files with 58 additions and 16 deletions
+5 -1
View File
@@ -51,6 +51,10 @@ export const AdvertisementsPage = () => {
return formatDate(data)
},
},
{
title: 'Jumlah Klik',
data: 'clicked',
},
{
title: 'Action',
data: 'id',
@@ -66,7 +70,7 @@ export const AdvertisementsPage = () => {
/>
)
},
5: (value: string, _type: unknown, data: TAdResponse) => (
6: (value: string, _type: unknown, data: TAdResponse) => (
<div className="flex space-x-2">
<Button
as="a"
+4 -2
View File
@@ -4,11 +4,13 @@ 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 { loader } from '~/routes/_news._index'
import { type clientLoader } from '~/routes/_news._index'
import type { TNews } from '~/types/news'
export const NewsPage = () => {
const loaderData = useRouteLoaderData<typeof loader>('routes/_news._index')
const loaderData = useRouteLoaderData<typeof clientLoader>(
'routes/_news._index',
)
const spotlight: TNews = {
title: loaderData?.spotlightCategory?.name || '',
description: loaderData?.spotlightCategory?.description || '',