Compare commits

..

No commits in common. "acd3e36b31d8579c00f7bef732e02056bcc51f64" and "1b4ff4c3e7909b489638ef70433a6a71d9ab60ce" have entirely different histories.

9 changed files with 17 additions and 117 deletions

View File

@ -1,21 +0,0 @@
import { z } from 'zod'
import { HttpServer, type THttpServer } from '~/libs/http-server'
const staffSchema = z.object({
data: z.object({
id: z.string(),
email: z.string(),
username: z.string(),
}),
})
export const getStaff = async (parameters: THttpServer) => {
try {
const { data } = await HttpServer(parameters).get(`/api/staff/profile`)
return staffSchema.parse(data)
} catch (error) {
// eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
return Promise.reject(error)
}
}

View File

@ -1,20 +0,0 @@
import { z } from 'zod'
import { type TLoginSchema } from '~/layouts/news/form-login'
import { HttpServer } from '~/libs/http-server'
const loginResponseSchema = z.object({
data: z.object({
token: z.string(),
}),
})
export const staffLoginRequest = async (payload: TLoginSchema) => {
try {
const { data } = await HttpServer().post('/api/staff/login', payload)
return loginResponseSchema.parse(data)
} catch (error) {
// eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
return Promise.reject(error)
}
}

View File

@ -9,7 +9,7 @@ const loginResponseSchema = z.object({
}), }),
}) })
export const userLoginRequest = async (payload: TLoginSchema) => { export const newsLoginRequest = async (payload: TLoginSchema) => {
try { try {
const { data } = await HttpServer().post('/api/user/login', payload) const { data } = await HttpServer().post('/api/user/login', payload)
return loginResponseSchema.parse(data) return loginResponseSchema.parse(data)

View File

@ -9,7 +9,7 @@ const loginResponseSchema = z.object({
}), }),
}) })
export const userRegisterRequest = async (payload: TRegisterSchema) => { export const newsRegisterRequest = async (payload: TRegisterSchema) => {
try { try {
const { subscribe_plan, ...restPayload } = payload const { subscribe_plan, ...restPayload } = payload
const transformedPayload = { const transformedPayload = {

View File

@ -1,38 +1,21 @@
import useEmblaCarousel from 'embla-carousel-react'
import { Link } from 'react-router' import { Link } from 'react-router'
import { BANNER } from '~/data/contents' import { APP } from '~/configs/meta'
export const Banner = () => { export const Banner = () => {
const [emblaReference] = useEmblaCarousel({ loop: false })
return ( return (
<div className=""> <div className="min-h-[65px]">
<div className="relative"> <div className="relative">
<div <Link
className="embla overflow-hidden" to="/#"
ref={emblaReference} className="mt-2 h-full py-2"
> >
<div className="embla__container flex"> <img
{BANNER.map(({ urlImage, alt, link }, index) => ( src={'/images/banner.png'}
<div alt={APP.title}
key={index} className="h-[70px] w-[100%] content-center sm:h-full"
className="embla__slide max-h-[100px] min-h-[65px] w-full min-w-0 flex-none" />
> </Link>
<Link
to={link}
className="mt-2 h-full py-2"
>
<img
src={urlImage}
alt={alt}
className="h-[70px] w-[100%] content-center sm:h-full"
/>
</Link>
</div>
))}
</div>
</div>
</div> </div>
</div> </div>
) )

View File

@ -1,9 +1,4 @@
import type { TNews } from '~/types/news' import type { TNews } from '~/types/news'
type TBanner = {
urlImage: string
alt: string
link: string
}
export const DUMMY_DESCRIPTION = 'Berita Terhangat hari ini' export const DUMMY_DESCRIPTION = 'Berita Terhangat hari ini'
@ -152,21 +147,3 @@ export const KAJIAN: TNews = {
}, },
], ],
} }
export const BANNER: TBanner[] = [
{
urlImage: '/images/banner.png',
alt: 'banner',
link: '/category/spotlight',
},
{
urlImage: 'https://placehold.co/1000x65.png',
alt: 'banner',
link: '/#',
},
{
urlImage: '/images/banner.png',
alt: 'banner',
link: '/#',
},
]

View File

@ -1,26 +1,7 @@
import { Outlet } from 'react-router' import { Outlet } from 'react-router'
import { getStaff } from '~/apis/admin/get-staff'
import { AdminProvider } from '~/contexts/admin' import { AdminProvider } from '~/contexts/admin'
import { AdminDefaultLayout } from '~/layouts/admin/default' import { AdminDefaultLayout } from '~/layouts/admin/default'
import { handleCookie } from '~/libs/cookies'
import type { Route } from './+types/_admin.lg-admin'
export const loader = async ({ request }: Route.LoaderArgs) => {
const { adminToken } = await handleCookie(request)
let adminData
if (adminToken) {
const { data } = await getStaff({
accessToken: adminToken,
})
adminData = data
}
return {
adminData,
}
}
const AdminLayout = () => { const AdminLayout = () => {
return ( return (

View File

@ -4,7 +4,7 @@ import { getValidatedFormData } from 'remix-hook-form'
import { XiorError } from 'xior' import { XiorError } from 'xior'
import { getUser } from '~/apis/news/get-user' import { getUser } from '~/apis/news/get-user'
import { userLoginRequest } from '~/apis/news/login-user' import { newsLoginRequest } from '~/apis/news/login'
import { loginSchema, type TLoginSchema } from '~/layouts/news/form-login' import { loginSchema, type TLoginSchema } from '~/layouts/news/form-login'
import { generateTokenCookie } from '~/utils/token' import { generateTokenCookie } from '~/utils/token'
@ -26,7 +26,7 @@ export const action = async ({ request }: Route.ActionArgs) => {
return data({ success: false, errors, defaultValues }, { status: 400 }) return data({ success: false, errors, defaultValues }, { status: 400 })
} }
const { data: loginData } = await userLoginRequest(payload) const { data: loginData } = await newsLoginRequest(payload)
const { token } = loginData const { token } = loginData
const { data: userData } = await getUser({ const { data: userData } = await getUser({
accessToken: token, accessToken: token,

View File

@ -4,7 +4,7 @@ import { getValidatedFormData } from 'remix-hook-form'
import { XiorError } from 'xior' import { XiorError } from 'xior'
import { getUser } from '~/apis/news/get-user' import { getUser } from '~/apis/news/get-user'
import { userRegisterRequest } from '~/apis/news/register-user' import { newsRegisterRequest } from '~/apis/news/register'
import { import {
registerSchema, registerSchema,
type TRegisterSchema, type TRegisterSchema,
@ -29,7 +29,7 @@ export const action = async ({ request }: Route.ActionArgs) => {
return data({ success: false, errors, defaultValues }, { status: 400 }) return data({ success: false, errors, defaultValues }, { status: 400 })
} }
const { data: registerData } = await userRegisterRequest(payload) const { data: registerData } = await newsRegisterRequest(payload)
const { token } = registerData const { token } = registerData
const { data: userData } = await getUser({ const { data: userData } = await getUser({
accessToken: token, accessToken: token,