feat: refactor news and category schemas, update API response handling, and improve date formatting
This commit is contained in:
parent
661437a2d3
commit
1bb63bec8e
@ -1,5 +1,6 @@
|
|||||||
import { z } from 'zod'
|
import { z } from 'zod'
|
||||||
|
|
||||||
|
import { categorySchema } from '~/apis/common/get-categories'
|
||||||
import { HttpServer, type THttpServer } from '~/libs/http-server'
|
import { HttpServer, type THttpServer } from '~/libs/http-server'
|
||||||
|
|
||||||
const authorSchema = z.object({
|
const authorSchema = z.object({
|
||||||
@ -7,47 +8,37 @@ const authorSchema = z.object({
|
|||||||
name: z.string(),
|
name: z.string(),
|
||||||
profile_picture: z.string(),
|
profile_picture: z.string(),
|
||||||
})
|
})
|
||||||
|
|
||||||
const categoriesCodeSchema = z.array(
|
|
||||||
z.object({
|
|
||||||
id: z.string(),
|
|
||||||
name: z.string(),
|
|
||||||
code: z.string(),
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
const newsSchema = z.object({
|
const newsSchema = z.object({
|
||||||
data: z.array(
|
id: z.string(),
|
||||||
|
title: z.string(),
|
||||||
|
content: z.string(),
|
||||||
|
categories: z.array(categorySchema),
|
||||||
|
tags: z.array(
|
||||||
z.object({
|
z.object({
|
||||||
id: z.string(),
|
id: z.string(),
|
||||||
title: z.string(),
|
name: z.string(),
|
||||||
content: z.string(),
|
code: z.string(),
|
||||||
categories: categoriesCodeSchema,
|
|
||||||
tags: z.array(
|
|
||||||
z.object({
|
|
||||||
id: z.string(),
|
|
||||||
name: z.string(),
|
|
||||||
code: z.string(),
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
is_premium: z.boolean(),
|
|
||||||
slug: z.string(),
|
|
||||||
featured_image: z.string(),
|
|
||||||
author_id: z.string(),
|
|
||||||
live_at: z.string(),
|
|
||||||
created_at: z.string(),
|
|
||||||
updated_at: z.string(),
|
|
||||||
author: authorSchema,
|
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
|
is_premium: z.boolean(),
|
||||||
|
slug: z.string(),
|
||||||
|
featured_image: z.string(),
|
||||||
|
author_id: z.string(),
|
||||||
|
live_at: z.string(),
|
||||||
|
created_at: z.string(),
|
||||||
|
updated_at: z.string(),
|
||||||
|
author: authorSchema,
|
||||||
|
})
|
||||||
|
const dataSchema = z.object({
|
||||||
|
data: z.array(newsSchema),
|
||||||
})
|
})
|
||||||
|
|
||||||
export type TAuthor = z.infer<typeof authorSchema>
|
export type TNewsSchema = z.infer<typeof newsSchema>
|
||||||
export type TCategories = z.infer<typeof categoriesCodeSchema>
|
|
||||||
|
|
||||||
export const getNews = async (parameters: THttpServer) => {
|
export const getNews = async (parameters: THttpServer) => {
|
||||||
try {
|
try {
|
||||||
const { data } = await HttpServer(parameters).get(`/api/news`)
|
const { data } = await HttpServer(parameters).get(`/api/news`)
|
||||||
return newsSchema.parse(data)
|
return dataSchema.parse(data)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
|
// eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
|
||||||
return Promise.reject(error)
|
return Promise.reject(error)
|
||||||
|
|||||||
@ -2,22 +2,22 @@ import { z } from 'zod'
|
|||||||
|
|
||||||
import { HttpServer, type THttpServer } from '~/libs/http-server'
|
import { HttpServer, type THttpServer } from '~/libs/http-server'
|
||||||
|
|
||||||
const categorySchema = z.object({
|
export const categorySchema = z.object({
|
||||||
data: z.array(
|
id: z.string(),
|
||||||
z.object({
|
name: z.string(),
|
||||||
id: z.string(),
|
code: z.string(),
|
||||||
code: z.string(),
|
})
|
||||||
name: z.string(),
|
const categoriesSchema = z.object({
|
||||||
}),
|
data: z.array(categorySchema),
|
||||||
),
|
|
||||||
})
|
})
|
||||||
|
|
||||||
export type TCategorySchema = z.infer<typeof categorySchema>
|
export type TCategorySchema = z.infer<typeof categorySchema>
|
||||||
|
export type TCategoriesSchema = z.infer<typeof categoriesSchema>
|
||||||
|
|
||||||
export const getCategories = async (parameters?: THttpServer) => {
|
export const getCategories = async (parameters?: THttpServer) => {
|
||||||
try {
|
try {
|
||||||
const { data } = await HttpServer(parameters).get(`/api/category`)
|
const { data } = await HttpServer(parameters).get(`/api/category`)
|
||||||
return categorySchema.parse(data)
|
return categoriesSchema.parse(data)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
|
// eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
|
||||||
return Promise.reject(error)
|
return Promise.reject(error)
|
||||||
|
|||||||
@ -3,13 +3,12 @@ import { z } from 'zod'
|
|||||||
import { HttpServer, type THttpServer } from '~/libs/http-server'
|
import { HttpServer, type THttpServer } from '~/libs/http-server'
|
||||||
|
|
||||||
const tagSchema = z.object({
|
const tagSchema = z.object({
|
||||||
data: z.array(
|
id: z.string(),
|
||||||
z.object({
|
code: z.string(),
|
||||||
id: z.string(),
|
name: z.string(),
|
||||||
code: z.string(),
|
})
|
||||||
name: z.string(),
|
const tagsSchema = z.object({
|
||||||
}),
|
data: z.array(tagSchema),
|
||||||
),
|
|
||||||
})
|
})
|
||||||
|
|
||||||
export type TTagSchema = z.infer<typeof tagSchema>
|
export type TTagSchema = z.infer<typeof tagSchema>
|
||||||
@ -17,7 +16,7 @@ export type TTagSchema = z.infer<typeof tagSchema>
|
|||||||
export const getTags = async (parameters?: THttpServer) => {
|
export const getTags = async (parameters?: THttpServer) => {
|
||||||
try {
|
try {
|
||||||
const { data } = await HttpServer(parameters).get(`/api/tag`)
|
const { data } = await HttpServer(parameters).get(`/api/tag`)
|
||||||
return tagSchema.parse(data)
|
return tagsSchema.parse(data)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
|
// eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
|
||||||
return Promise.reject(error)
|
return Promise.reject(error)
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { Link, useFetcher, useRouteLoaderData } from 'react-router'
|
import { Link, useFetcher, useRouteLoaderData } from 'react-router'
|
||||||
|
|
||||||
import type { TCategorySchema } from '~/apis/common/get-categories'
|
import type { TCategoriesSchema } from '~/apis/common/get-categories'
|
||||||
import { CloseIcon } from '~/components/icons/close'
|
import { CloseIcon } from '~/components/icons/close'
|
||||||
import { MenuIcon } from '~/components/icons/menu'
|
import { MenuIcon } from '~/components/icons/menu'
|
||||||
import { Button } from '~/components/ui/button'
|
import { Button } from '~/components/ui/button'
|
||||||
@ -10,7 +10,7 @@ import { HeaderSearch } from '~/layouts/news/header-search'
|
|||||||
import type { loader } from '~/routes/_layout'
|
import type { loader } from '~/routes/_layout'
|
||||||
|
|
||||||
type THeaderMenuMobile = {
|
type THeaderMenuMobile = {
|
||||||
menu?: TCategorySchema['data']
|
menu?: TCategoriesSchema['data']
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function HeaderMenuMobile(properties: THeaderMenuMobile) {
|
export default function HeaderMenuMobile(properties: THeaderMenuMobile) {
|
||||||
|
|||||||
@ -1,102 +0,0 @@
|
|||||||
type TContents = {
|
|
||||||
id: number
|
|
||||||
createdAt: string
|
|
||||||
author: string
|
|
||||||
title: string
|
|
||||||
tags: string
|
|
||||||
category: string
|
|
||||||
status: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export const CONTENTS: TContents[] = [
|
|
||||||
{
|
|
||||||
id: 1,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'John Doe',
|
|
||||||
title: 'Introduction to TypeScript',
|
|
||||||
tags: 'Normal',
|
|
||||||
category: 'Education',
|
|
||||||
status: 'Published',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 2,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'Jane Smith',
|
|
||||||
title: 'Advanced React Patterns',
|
|
||||||
tags: 'Normal',
|
|
||||||
category: 'Development',
|
|
||||||
status: 'Draft',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 3,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'Alice Johnson',
|
|
||||||
title: 'Understanding Redux',
|
|
||||||
tags: 'Normal',
|
|
||||||
category: 'Development',
|
|
||||||
status: 'Published',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 4,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'Bob Brown',
|
|
||||||
title: 'CSS Grid Layout',
|
|
||||||
tags: 'Premium',
|
|
||||||
category: 'Design',
|
|
||||||
status: 'Published',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 5,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'Charlie Davis',
|
|
||||||
title: 'Node.js Best Practices',
|
|
||||||
tags: 'Premium',
|
|
||||||
category: 'Development',
|
|
||||||
status: 'Published',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 6,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'Diana Evans',
|
|
||||||
title: 'GraphQL for Beginners',
|
|
||||||
tags: 'Premium',
|
|
||||||
category: 'Development',
|
|
||||||
status: 'Draft',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 7,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'Evan Harris',
|
|
||||||
title: 'Building RESTful APIs',
|
|
||||||
tags: 'Premium',
|
|
||||||
category: 'Development',
|
|
||||||
status: 'Published',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 8,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'Fiona Green',
|
|
||||||
title: 'Introduction to Docker',
|
|
||||||
tags: 'Normal',
|
|
||||||
category: 'DevOps',
|
|
||||||
status: 'Published',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 9,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'George King',
|
|
||||||
title: 'Microservices Architecture',
|
|
||||||
tags: 'Normal',
|
|
||||||
category: 'Development',
|
|
||||||
status: 'Draft',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 10,
|
|
||||||
createdAt: '24/10/2024',
|
|
||||||
author: 'Hannah Lee',
|
|
||||||
title: 'Kubernetes Essentials',
|
|
||||||
tags: 'Normal',
|
|
||||||
category: 'DevOps',
|
|
||||||
status: 'Published',
|
|
||||||
},
|
|
||||||
]
|
|
||||||
@ -2,7 +2,9 @@ import DT from 'datatables.net-dt'
|
|||||||
import DataTable from 'datatables.net-react'
|
import DataTable from 'datatables.net-react'
|
||||||
import { Link, useRouteLoaderData } from 'react-router'
|
import { Link, useRouteLoaderData } from 'react-router'
|
||||||
|
|
||||||
import type { TCategories } from '~/apis/admin/get-news'
|
import type { TNewsSchema } from '~/apis/admin/get-news'
|
||||||
|
import type { TCategorySchema } from '~/apis/common/get-categories'
|
||||||
|
import type { TTagSchema } from '~/apis/common/get-tags'
|
||||||
import { Button } from '~/components/ui/button'
|
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'
|
||||||
@ -20,28 +22,31 @@ export const ContentsPage = () => {
|
|||||||
const dataColumns = [
|
const dataColumns = [
|
||||||
{
|
{
|
||||||
title: 'No',
|
title: 'No',
|
||||||
data: undefined,
|
render: (
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
data: unknown,
|
||||||
render: function (data: any, type: any, row: any, meta: any) {
|
type: unknown,
|
||||||
|
row: unknown,
|
||||||
|
meta: { row: number },
|
||||||
|
) => {
|
||||||
return meta.row + 1
|
return meta.row + 1
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{ title: 'Tanggal Konten', data: 'live_at' },
|
{
|
||||||
|
title: 'Tanggal Konten',
|
||||||
|
data: 'live_at',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: 'Nama Penulis',
|
title: 'Nama Penulis',
|
||||||
|
|
||||||
data: 'author',
|
|
||||||
},
|
},
|
||||||
{ title: 'Judul', data: 'title' },
|
{ title: 'Judul', data: 'title' },
|
||||||
{ title: 'Kategori', data: 'categories' },
|
|
||||||
{
|
{
|
||||||
title: 'Tags',
|
title: 'Kategori',
|
||||||
|
data: 'categories',
|
||||||
|
},
|
||||||
|
{ title: 'Tag', data: 'tags' },
|
||||||
|
{
|
||||||
|
title: 'Premium',
|
||||||
data: 'is_premium',
|
data: 'is_premium',
|
||||||
render: (value: string) => {
|
|
||||||
return value
|
|
||||||
? `<span class="bg-[#FFFCAF] text-[#DBCA6E] px-4 py-2 rounded-full">Premium</span>`
|
|
||||||
: `<span class="bg-[#F5F5F5] text-[#4C5CA0] px-4 py-2 rounded-full">Normal</span>`
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Action',
|
title: 'Action',
|
||||||
@ -49,28 +54,35 @@ export const ContentsPage = () => {
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
const dataSlot = {
|
const dataSlot = {
|
||||||
1: (value: string) => {
|
1: (value: string) => formatDate(value),
|
||||||
return formatDate(value)
|
2: (_value: unknown, _type: unknown, data: TNewsSchema) => (
|
||||||
},
|
<div>
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
<div>{data.author.name}</div>
|
||||||
2: (value: any, type: any, data: any) =>
|
<div className="text-sm text-[#7C7C7C]">ID: {data.id.slice(0, 8)}</div>
|
||||||
`<span>${value.name}</span> <br> <span class="text-sm text-[#7C7C7C]">ID: ${data.id.slice(0, 12)}</span>`,
|
</div>
|
||||||
4: (value: TCategories) => {
|
),
|
||||||
const categories = value.map((item) => item.name).join(', ')
|
4: (value: TCategorySchema[]) => value.map((item) => item.name).join(', '),
|
||||||
return `${categories}`
|
5: (value: TTagSchema[]) => value.map((item) => item.name).join(', '),
|
||||||
},
|
6: (value: string) =>
|
||||||
6: (value: string | number) => {
|
value ? (
|
||||||
return (
|
<div className="rounded-full bg-[#FFFCAF] px-2 text-center text-[#DBCA6E]">
|
||||||
<Button
|
Premium
|
||||||
as="a"
|
</div>
|
||||||
href={`/lg-admin/contents/update/${value}`}
|
) : (
|
||||||
className="text-md rounded-md"
|
<div className="rounded-full bg-[#F5F5F5] px-2 text-center text-[#4C5CA0]">
|
||||||
size="sm"
|
Normal
|
||||||
>
|
</div>
|
||||||
Lihat Detail
|
),
|
||||||
</Button>
|
7: (value: string) => (
|
||||||
)
|
<Button
|
||||||
},
|
as="a"
|
||||||
|
href={`/lg-admin/contents/update/${value}`}
|
||||||
|
className="text-md rounded-md"
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
|
Lihat Detail
|
||||||
|
</Button>
|
||||||
|
),
|
||||||
}
|
}
|
||||||
const dataOptions = {
|
const dataOptions = {
|
||||||
paging: true,
|
paging: true,
|
||||||
|
|||||||
@ -3,9 +3,9 @@ export const formatNumberWithPeriods = (number: number) => {
|
|||||||
}
|
}
|
||||||
export const formatDate = (isoDate: string): string => {
|
export const formatDate = (isoDate: string): string => {
|
||||||
const date = new Date(isoDate)
|
const date = new Date(isoDate)
|
||||||
const day = date.getDate().toString().padStart(2, '0')
|
return new Intl.DateTimeFormat('id-ID', {
|
||||||
const month = (date.getMonth() + 1).toString().padStart(2, '0') // Month is zero-based
|
day: '2-digit',
|
||||||
const year = date.getFullYear()
|
month: '2-digit',
|
||||||
|
year: 'numeric',
|
||||||
return `${day}/${month}/${year}`
|
}).format(date)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user