diff --git a/apps/cs/app/(without-base-layout)/popup/[popupSn]/page.tsx b/apps/cs/app/(without-base-layout)/popup/[popupSn]/page.tsx new file mode 100644 index 000000000..16cd8e0af --- /dev/null +++ b/apps/cs/app/(without-base-layout)/popup/[popupSn]/page.tsx @@ -0,0 +1,10 @@ +import { ViewPopup as VViewPopup } from "@/pages/popup"; + +export default async function ViewPopup({ + params, +}: { + params: Promise<{ popupSn: string }>; +}) { + const { popupSn } = await params; + return ; +} diff --git a/apps/cs/app/(without-base-layout)/view-popup/[popupSn]/page.tsx b/apps/cs/app/(without-base-layout)/view-popup/[popupSn]/page.tsx deleted file mode 100644 index fd6705fb7..000000000 --- a/apps/cs/app/(without-base-layout)/view-popup/[popupSn]/page.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { ViewPopupPage as VViewPopupPage } from "@/pages/popup"; - -export default async function ViewPopupPage({ - params, -}: { - params: Promise<{ popupSn: string }>; -}) { - const { popupSn } = await params; - return ; -} diff --git a/apps/cs/src/pages/popup/index.ts b/apps/cs/src/pages/popup/index.ts index 571c01e24..44e21e42c 100644 --- a/apps/cs/src/pages/popup/index.ts +++ b/apps/cs/src/pages/popup/index.ts @@ -1,4 +1,4 @@ export { CreatePage } from "./ui/create-page"; export { ModifyPage } from "./ui/modify-page"; export { PopupPage } from "./ui/popup-page"; -export { ViewPopupPage } from "./ui/view-popup-page"; +export { ViewPopup } from "./ui/view-popup"; diff --git a/apps/cs/src/pages/popup/model/table-columns.tsx b/apps/cs/src/pages/popup/model/table-columns.tsx index ce6da9072..558b65827 100644 --- a/apps/cs/src/pages/popup/model/table-columns.tsx +++ b/apps/cs/src/pages/popup/model/table-columns.tsx @@ -83,7 +83,7 @@ const PreviewButton = ({ popupSn }: { popupSn: number }) => { const left = response.popupHrzntltyPstn + window.screenX; const top = response.popupVtclPstn + window.screenY; window.open( - `/view-popup/${popupSn}`, + `/popup/${popupSn}`, "", `width=${width},height=${height},left=${left},top=${top}`, ); diff --git a/apps/cs/src/pages/popup/ui/view-popup-page.tsx b/apps/cs/src/pages/popup/ui/view-popup.tsx similarity index 95% rename from apps/cs/src/pages/popup/ui/view-popup-page.tsx rename to apps/cs/src/pages/popup/ui/view-popup.tsx index bcf7f8de3..e587b17cb 100644 --- a/apps/cs/src/pages/popup/ui/view-popup-page.tsx +++ b/apps/cs/src/pages/popup/ui/view-popup.tsx @@ -7,7 +7,7 @@ import { PopupApi } from "../api/popup-service"; import { useEffect, useRef } from "react"; import { setCookie, getCookie } from "@/shared/lib/cookie"; -function ViewPopupPage({ popupSn }: { popupSn: string }) { +function ViewPopup({ popupSn }: { popupSn: string }) { const doNotShowTodayRef = useRef(false); const { data: popupInfo } = useQuery({ @@ -71,4 +71,4 @@ function ViewPopupPage({ popupSn }: { popupSn: string }) { ); } -export { ViewPopupPage }; +export { ViewPopup }; diff --git a/packages/common/components/src/ui/header/index.tsx b/packages/common/components/src/ui/header/index.tsx index fb3026af2..e0e94e17b 100644 --- a/packages/common/components/src/ui/header/index.tsx +++ b/packages/common/components/src/ui/header/index.tsx @@ -64,7 +64,7 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) { const top = (response.popupVtclPstn || 0) + window.screenY; const popupWindow = window.open( - `/view-popup/${popup.popupSn}`, + `/popup/${popup.popupSn}`, "", `width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes,status=no,location=no,menubar=no`, );