diff --git a/src/app/(pages)/(main)/safety-inspection/sub/SafetyInspectionDivDetail.tsx b/src/app/(pages)/(main)/safety-inspection/sub/SafetyInspectionDivDetail.tsx index bac458c..04613a0 100644 --- a/src/app/(pages)/(main)/safety-inspection/sub/SafetyInspectionDivDetail.tsx +++ b/src/app/(pages)/(main)/safety-inspection/sub/SafetyInspectionDivDetail.tsx @@ -1,13 +1,13 @@ "use client"; import { useEffect, useMemo, useState } from "react"; +import { useSearchParams } from "next/navigation"; import { useQueryClient } from "@tanstack/react-query"; import { toast } from "sonner"; import DataTable from "@/components/table/DataTable"; import type { DataColumn } from "@/components/table/types"; import { Button } from "@/components/ui/button"; import { DIV_KEY_MAP } from "@/config/kfpaConfig"; -import { useAuth } from "@/hooks/useAuth"; import { formatKoreanBaseDate } from "@/lib/utils"; import { useWriteDivCommentMutation } from "@/query/admin"; import { statisticsQueryKeys } from "@/query/key/keys"; @@ -15,6 +15,7 @@ import { useDivDetailDataQuery } from "@/query/statistics"; import type { CommentValue, DivDetailData } from "@/types/kfpa"; import { Pencil, Save, X } from 'lucide-react'; import SectionTitle from "@/components/common/SectionTitle"; +import { hasAdminRouteParam } from "@/lib/admin-route"; export type SafetyInspectionDivDetailProps = { selectedDiv: string; @@ -85,7 +86,7 @@ const createDraft = (columns: Array<{ key: string }>, source?: Record { - const { auth } = useAuth(); + const searchParams = useSearchParams(); const queryClient = useQueryClient(); const { data, isLoading, isError } = useDivDetailDataQuery(selectedDiv, selectedDiv !== "-1"); const writeMutation = useWriteDivCommentMutation(); @@ -103,7 +104,7 @@ const SafetyInspectionDivDetail = ({ selectedDiv }: SafetyInspectionDivDetailPro }, [commentColumns, detail?.commentValues, selectedDiv]); const baseDateLabel = useMemo(() => formatKoreanBaseDate(), []); - const isAuthenticated = auth.user != null; + const isAuthenticated = hasAdminRouteParam(searchParams); const rankRows: RankRow[] = useMemo(() => { const ranks = detail?.csiRanks ?? {}; diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx index ab09aea..e5f2af2 100644 --- a/src/components/layout/Header.tsx +++ b/src/components/layout/Header.tsx @@ -69,27 +69,31 @@ const Header = ({

{SITE_TITLE}

- {isAuthenticated && ( - - {userName} - - )} - + + */ + }
diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx index 9bd0f58..ff66f47 100644 --- a/src/components/layout/MainLayout.tsx +++ b/src/components/layout/MainLayout.tsx @@ -1,7 +1,7 @@ "use client" import {ReactNode, useEffect, useState} from "react"; -import {useRouter} from "next/navigation"; +import {useRouter, useSearchParams} from "next/navigation"; import {DivKey} from "@/types/kfpa"; import {useAuth} from "@/hooks/useAuth"; import {LayoutCategoryProvider} from "./LayoutCategoryContext"; @@ -12,6 +12,7 @@ import {TOP_MENUS, SIDE_MENUS} from "@/config/menu.data"; import {useLogoutMutation} from "@/query/auth"; import {useDialog} from "@/hooks/useDialog"; import LoginDialog from "@/components/dialog/loginDialog"; +import { appendAdminRouteParam, hasAdminRouteParam } from "@/lib/admin-route"; type MainLayoutProps = { children: ReactNode; @@ -26,13 +27,15 @@ const MainLayout = ({ children }: MainLayoutProps) => { const { showDialog } = useDialog(); const logoutMutation = useLogoutMutation(); const router = useRouter(); + const searchParams = useSearchParams(); const isMounted = useMounted(); const [menuOpen, setMenuOpen] = useState(true); const [selectedDiv, setSelectedDiv] = useState(getDivKey()); + const isRouteAdmin = hasAdminRouteParam(searchParams); const movePage = (path: string) => { - router.push(path); + router.push(appendAdminRouteParam(path, searchParams)); }; const openLoginDialog = () => { @@ -60,7 +63,7 @@ const MainLayout = ({ children }: MainLayoutProps) => {
= { '2601009_A': '안전점검', - //'2604005_E': 'UCIS', - //'2604005_D': 'Bridge플랫폼', - //'2604005_C': '방재컨설팅', - //'2604005_A': '보험 공동인수', - //'2604005_B': '화재조사', + '2604005_E': 'UCIS', + '2604005_D': 'Bridge플랫폼', + '2604005_C': '방재컨설팅', + '2604005_A': '보험 공동인수', + '2604005_B': '화재조사', }; export const CATEGORY_PATH_MAP: Record = {