diff --git a/app/pages/dashboard-categories/index.tsx b/app/pages/dashboard-categories/index.tsx index c45e645..66056d2 100644 --- a/app/pages/dashboard-categories/index.tsx +++ b/app/pages/dashboard-categories/index.tsx @@ -6,9 +6,11 @@ import type { TCategoryResponse } from '~/apis/common/get-categories' import { Button } from '~/components/ui/button' import { UiTable } from '~/components/ui/table' import { TitleDashboard } from '~/components/ui/title-dashboard' -import type { loader } from '~/routes/_admin.lg-admin' +import type { loader } from '~/routes/_admin.lg-admin._dashboard' export const CategoriesPage = () => { - const loaderData = useRouteLoaderData('routes/_admin.lg-admin') + const loaderData = useRouteLoaderData( + 'routes/_admin.lg-admin._dashboard', + ) DataTable.use(DT) const dataTable = loaderData?.categoriesData?.sort((a, b) => { diff --git a/app/pages/dashboard-tags/index.tsx b/app/pages/dashboard-tags/index.tsx index 1bcd4d7..8d6bddc 100644 --- a/app/pages/dashboard-tags/index.tsx +++ b/app/pages/dashboard-tags/index.tsx @@ -5,11 +5,11 @@ import { Link, useRouteLoaderData } from 'react-router' import { Button } from '~/components/ui/button' import { UiTable } from '~/components/ui/table' import { TitleDashboard } from '~/components/ui/title-dashboard' -import type { loader } from '~/routes/_admin.lg-admin._dashboard.tags._index' +import type { loader } from '~/routes/_admin.lg-admin._dashboard' export const TagsPage = () => { const loaderData = useRouteLoaderData( - 'routes/_admin.lg-admin._dashboard.tags._index', + 'routes/_admin.lg-admin._dashboard', ) const { tagsData: dataTable } = loaderData || {} diff --git a/app/pages/form-contents/index.tsx b/app/pages/form-contents/index.tsx index b2484ce..5337a3c 100644 --- a/app/pages/form-contents/index.tsx +++ b/app/pages/form-contents/index.tsx @@ -12,7 +12,7 @@ import { Combobox } from '~/components/ui/combobox' import { Input } from '~/components/ui/input' import { Switch } from '~/components/ui/switch' import { TitleDashboard } from '~/components/ui/title-dashboard' -import type { loader } from '~/routes/_admin.lg-admin' +import type { loader } from '~/routes/_admin.lg-admin._dashboard' export const contentSchema = z.object({ id: z.string().optional(), @@ -64,7 +64,9 @@ export const FormContentsPage = (properties: TProperties) => { const { newsData } = properties || {} const fetcher = useFetcher() const navigate = useNavigate() - const loaderData = useRouteLoaderData('routes/_admin.lg-admin') + const loaderData = useRouteLoaderData( + 'routes/_admin.lg-admin._dashboard', + ) const { categoriesData: categories } = loaderData || {} const { tagsData: tags } = loaderData || {} const [error, setError] = useState() diff --git a/app/routes/_admin.lg-admin._dashboard.tags._index.tsx b/app/routes/_admin.lg-admin._dashboard.tags._index.tsx index 0d96fc9..11ae680 100644 --- a/app/routes/_admin.lg-admin._dashboard.tags._index.tsx +++ b/app/routes/_admin.lg-admin._dashboard.tags._index.tsx @@ -1,12 +1,4 @@ -import { getTags } from '~/apis/common/get-tags' import { TagsPage } from '~/pages/dashboard-tags' -import type { Route } from './+types/_admin.lg-admin._dashboard.tags._index' - -export const loader = async ({}: Route.LoaderArgs) => { - const { data: tagsData } = await getTags() - return { tagsData } -} - const DashboardTagsIndexLayout = () => export default DashboardTagsIndexLayout diff --git a/app/routes/_admin.lg-admin._dashboard.tsx b/app/routes/_admin.lg-admin._dashboard.tsx index 20e8b85..11b5ffc 100644 --- a/app/routes/_admin.lg-admin._dashboard.tsx +++ b/app/routes/_admin.lg-admin._dashboard.tsx @@ -1,7 +1,21 @@ import { Outlet } from 'react-router' +import { getCategories } from '~/apis/common/get-categories' +import { getTags } from '~/apis/common/get-tags' import { AdminDashboardLayout } from '~/layouts/admin/dashboard' +import type { Route } from './+types/_admin.lg-admin._dashboard' + +export const loader = async ({}: Route.LoaderArgs) => { + const { data: categoriesData } = await getCategories() + const { data: tagsData } = await getTags() + + return { + categoriesData, + tagsData, + } +} + const DashboardLayout = () => { return ( diff --git a/app/routes/_admin.lg-admin.tsx b/app/routes/_admin.lg-admin.tsx index dbabe7a..eea1a83 100644 --- a/app/routes/_admin.lg-admin.tsx +++ b/app/routes/_admin.lg-admin.tsx @@ -1,8 +1,6 @@ import { Outlet, redirect } from 'react-router' import { getStaff } from '~/apis/admin/get-staff' -import { getCategories } from '~/apis/common/get-categories' -import { getTags } from '~/apis/common/get-tags' import { AUTH_PAGES } from '~/configs/pages' import { AdminDefaultLayout } from '~/layouts/admin/default' import { handleCookie } from '~/libs/cookies' @@ -29,13 +27,9 @@ export const loader = async ({ request }: Route.LoaderArgs) => { }) staffData = data } - const { data: categoriesData } = await getCategories() - const { data: tagsData } = await getTags() return { staffData, - categoriesData, - tagsData, } }