Compare commits

..

No commits in common. "fc23f458546e03ded5dcd035a4d981b2929aa3e1" and "01f9cf06ca4f8654508e569ba1fd8808345d192b" have entirely different histories.

11 changed files with 8 additions and 170 deletions

View File

@ -15,15 +15,10 @@ type TParameters = {
export const createAdsRequest = async (parameters: TParameters) => { export const createAdsRequest = async (parameters: TParameters) => {
const { payload, ...restParameters } = parameters const { payload, ...restParameters } = parameters
const transformedPayload = {
...payload,
start_date: new Date(payload.start_date).toISOString(),
end_date: new Date(payload.end_date).toISOString(),
}
try { try {
const { data } = await HttpServer(restParameters).post( const { data } = await HttpServer(restParameters).post(
'/api/ads/create', '/api/ads/create',
transformedPayload, payload,
) )
return advertisementsResponseSchema.parse(data) return advertisementsResponseSchema.parse(data)
} catch (error) { } catch (error) {

View File

@ -1,34 +0,0 @@
import { z } from 'zod'
import { HttpServer, type THttpServer } from '~/libs/http-server'
import type { TAdsSchema } from '~/pages/form-advertisements'
const advertisementsResponseSchema = z.object({
data: z.object({
Message: z.string(),
}),
})
type TParameters = {
payload: TAdsSchema
} & THttpServer
export const updateAdsRequest = async (parameters: TParameters) => {
const { payload, ...restParameters } = parameters
const { id, ...restPayload } = payload
const transformedPayload = {
...restPayload,
start_date: new Date(payload.start_date).toISOString(),
end_date: new Date(payload.end_date).toISOString(),
}
try {
const { data } = await HttpServer(restParameters).put(
`/api/ads/${id}/update`,
transformedPayload,
)
return advertisementsResponseSchema.parse(data)
} catch (error) {
// eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
return Promise.reject(error)
}
}

View File

@ -6,8 +6,6 @@ const adResponseSchema = z.object({
id: z.string(), id: z.string(),
image_url: z.string(), image_url: z.string(),
url: z.string(), url: z.string(),
start_date: z.string(),
end_date: z.string(),
}) })
const adsResponseSchema = z.object({ const adsResponseSchema = z.object({
data: z.array(adResponseSchema), data: z.array(adResponseSchema),

View File

@ -14,7 +14,6 @@ import { Button } from '~/components/ui/button'
import { UiTable } from '~/components/ui/table' import { UiTable } from '~/components/ui/table'
import { TitleDashboard } from '~/components/ui/title-dashboard' import { TitleDashboard } from '~/components/ui/title-dashboard'
import type { loader } from '~/routes/_admin.lg-admin._dashboard.advertisements._index' import type { loader } from '~/routes/_admin.lg-admin._dashboard.advertisements._index'
import { formatDate } from '~/utils/formatter'
export const AdvertisementsPage = () => { export const AdvertisementsPage = () => {
const loaderData = useRouteLoaderData<typeof loader>( const loaderData = useRouteLoaderData<typeof loader>(
@ -37,20 +36,6 @@ export const AdvertisementsPage = () => {
}, },
{ title: 'Banner', data: 'image_url' }, { title: 'Banner', data: 'image_url' },
{ title: 'Link', data: 'url' }, { title: 'Link', data: 'url' },
{
title: 'Tanggal Mulai',
data: 'start_date',
render: (data: string) => {
return formatDate(data)
},
},
{
title: 'Tanggal Berakhir',
data: 'end_date',
render: (data: string) => {
return formatDate(data)
},
},
{ {
title: 'Action', title: 'Action',
data: 'id', data: 'id',
@ -66,7 +51,7 @@ export const AdvertisementsPage = () => {
/> />
) )
}, },
5: (value: string, _type: unknown, data: TAdResponse) => ( 3: (value: string, _type: unknown, data: TAdResponse) => (
<div className="flex space-x-2"> <div className="flex space-x-2">
<Button <Button
as="a" as="a"

View File

@ -19,12 +19,6 @@ export const adsSchema = z.object({
url: z.string().url({ url: z.string().url({
message: 'URL must be valid', message: 'URL must be valid',
}), }),
start_date: z.string().min(1, {
message: 'Tanggal mulai is required',
}),
end_date: z.string().min(1, {
message: 'Tanggal berakhir is required',
}),
}) })
export type TAdsSchema = z.infer<typeof adsSchema> export type TAdsSchema = z.infer<typeof adsSchema>
type TProperties = { type TProperties = {
@ -43,12 +37,6 @@ export const FormAdvertisementsPage = (properties: TProperties) => {
id: adData?.id || undefined, id: adData?.id || undefined,
image: adData?.image_url || '', image: adData?.image_url || '',
url: adData?.url || '', url: adData?.url || '',
start_date: adData?.start_date
? new Date(adData.start_date).toISOString().split('T')[0]
: '',
end_date: adData?.end_date
? new Date(adData.end_date).toISOString().split('T')[0]
: '',
}, },
}) })
@ -109,26 +97,6 @@ export const FormAdvertisementsPage = (properties: TProperties) => {
Save Save
</Button> </Button>
</div> </div>
<div className="flex items-end justify-between gap-4">
<Input
id="start_date"
label="Tanggal Mulai"
type="date"
name="start_date"
className="border-0 bg-white shadow read-only:bg-gray-100 focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none disabled:bg-gray-100"
labelClassName="text-sm font-medium text-[#363636]"
containerClassName="flex-1"
/>
<Input
id="end_date"
label="Tanggal Berakhir"
type="date"
name="end_date"
className="border-0 bg-white shadow read-only:bg-gray-100 focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none disabled:bg-gray-100"
labelClassName="text-sm font-medium text-[#363636]"
containerClassName="flex-1"
/>
</div>
</fetcher.Form> </fetcher.Form>
</RemixFormProvider> </RemixFormProvider>
</div> </div>

View File

@ -13,24 +13,19 @@ 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] }) const { 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] }) const { 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] }) const { data: kajianNews } = await getNews({ categories: [kajianCode] })
kajianNews = kajianNews.filter((news) => new Date(news.live_at) <= new Date())
return { return {
spotlightCategory, spotlightCategory,

View File

@ -11,8 +11,7 @@ export const loader = async ({ params }: Route.LoaderArgs) => {
const { data: categoriesData } = await getCategories() const { data: categoriesData } = await getCategories()
const { code } = params const { code } = params
const categoryData = categoriesData.find((category) => category.code === code) const categoryData = categoriesData.find((category) => category.code === code)
let { data: newsData } = await getNews({ categories: [code] }) const { data: newsData } = await getNews({ categories: [code] })
newsData = newsData.filter((news) => new Date(news.live_at) <= new Date())
return { categoryData, newsData } return { categoryData, newsData }
} }

View File

@ -18,8 +18,7 @@ export const loader = async ({ request, params }: Route.LoaderArgs) => {
const beritaCategory = categoriesData.find( const beritaCategory = categoriesData.find(
(category) => category.code === beritaCode, (category) => category.code === beritaCode,
) )
let { data: beritaNews } = await getNews({ categories: [beritaCode] }) const { data: beritaNews } = await getNews({ categories: [beritaCode] })
beritaNews = beritaNews.filter((news) => new Date(news.live_at) <= new Date())
return { return {
newsDetailData, newsDetailData,

View File

@ -27,12 +27,7 @@ export const loader = async ({ request }: Route.LoaderArgs) => {
} }
const { data: subscribePlanData } = await getSubscribePlan() const { data: subscribePlanData } = await getSubscribePlan()
const { data: categoriesData } = await getCategories() const { data: categoriesData } = await getCategories()
let { data: adsData } = await getAds() const { data: adsData } = await getAds()
adsData = adsData.filter(
(ad) =>
new Date(ad.start_date) <= new Date() &&
new Date(ad.end_date) >= new Date(),
)
return { return {
userData, userData,

View File

@ -1,61 +0,0 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { data } from 'react-router'
import { getValidatedFormData } from 'remix-hook-form'
import { XiorError } from 'xior'
import { updateAdsRequest } from '~/apis/admin/update-ads'
import { handleCookie } from '~/libs/cookies'
import { adsSchema, type TAdsSchema } from '~/pages/form-advertisements'
import type { Route } from './+types/actions.admin.advertisements.create'
export const action = async ({ request }: Route.ActionArgs) => {
const { staffToken: accessToken } = await handleCookie(request)
try {
const {
errors,
data: payload,
receivedValues: defaultValues,
} = await getValidatedFormData<TAdsSchema>(
request,
zodResolver(adsSchema),
false,
)
if (errors) {
return data({ success: false, errors, defaultValues }, { status: 400 })
}
const { data: adsData } = await updateAdsRequest({ accessToken, payload })
return data(
{
success: true,
adsData,
},
{
status: 200,
statusText: 'OK',
},
)
} catch (error) {
if (error instanceof XiorError) {
return data(
{
success: false,
message: error?.response?.data?.error?.message || error.message,
},
{
status: error?.response?.status || 500,
},
)
}
return data(
{
success: false,
message: 'Internal server error',
},
{ status: 500 },
)
}
}

View File

@ -2,7 +2,6 @@ export const formatNumberWithPeriods = (number: number) => {
return new Intl.NumberFormat('id-ID').format(number) return new Intl.NumberFormat('id-ID').format(number)
} }
export const formatDate = (isoDate: string): string => { export const formatDate = (isoDate: string): string => {
if (!isoDate) return '-'
const date = new Date(isoDate) const date = new Date(isoDate)
return new Intl.DateTimeFormat('id-ID', { return new Intl.DateTimeFormat('id-ID', {
day: '2-digit', day: '2-digit',