diff --git a/apps/fo/app/layout.tsx b/apps/fo/app/layout.tsx
index 352c25034..af0725a7b 100644
--- a/apps/fo/app/layout.tsx
+++ b/apps/fo/app/layout.tsx
@@ -1,5 +1,4 @@
"use client"
-import Base from "./base";
import "./globals.css";
import { StoreProvider } from "./store";
@@ -12,7 +11,7 @@ export default function RootLayout({
- {children}
+ {children}
diff --git a/apps/fo/app/pages/(map-layout)/layout.tsx b/apps/fo/app/pages/(map-layout)/layout.tsx
new file mode 100644
index 000000000..a9e3baa7f
--- /dev/null
+++ b/apps/fo/app/pages/(map-layout)/layout.tsx
@@ -0,0 +1,10 @@
+
+export default function RootLayout({
+ children,
+}: Readonly<{
+ children: React.ReactNode;
+}>) {
+ return (
+ {children}
+ );
+}
diff --git a/apps/fo/app/pages/map/page.tsx b/apps/fo/app/pages/(map-layout)/map/page.tsx
similarity index 100%
rename from apps/fo/app/pages/map/page.tsx
rename to apps/fo/app/pages/(map-layout)/map/page.tsx
diff --git a/apps/fo/app/pages/dashboard/drainageEquipment/page.tsx b/apps/fo/app/pages/(with-layout)/dashboard/drainageEquipment/page.tsx
similarity index 100%
rename from apps/fo/app/pages/dashboard/drainageEquipment/page.tsx
rename to apps/fo/app/pages/(with-layout)/dashboard/drainageEquipment/page.tsx
diff --git a/apps/fo/app/pages/dashboard/facilityInfo/modal/page.tsx b/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/modal/page.tsx
similarity index 100%
rename from apps/fo/app/pages/dashboard/facilityInfo/modal/page.tsx
rename to apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/modal/page.tsx
diff --git a/apps/fo/app/pages/dashboard/facilityInfo/page.tsx b/apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx
similarity index 100%
rename from apps/fo/app/pages/dashboard/facilityInfo/page.tsx
rename to apps/fo/app/pages/(with-layout)/dashboard/facilityInfo/page.tsx
diff --git a/apps/fo/app/pages/dashboard/maingraph/page.tsx b/apps/fo/app/pages/(with-layout)/dashboard/maingraph/page.tsx
similarity index 100%
rename from apps/fo/app/pages/dashboard/maingraph/page.tsx
rename to apps/fo/app/pages/(with-layout)/dashboard/maingraph/page.tsx
diff --git a/apps/fo/app/pages/dashboard/page.tsx b/apps/fo/app/pages/(with-layout)/dashboard/page.tsx
similarity index 100%
rename from apps/fo/app/pages/dashboard/page.tsx
rename to apps/fo/app/pages/(with-layout)/dashboard/page.tsx
diff --git a/apps/fo/app/pages/dashboard/rainManage/page.tsx b/apps/fo/app/pages/(with-layout)/dashboard/rainManage/page.tsx
similarity index 100%
rename from apps/fo/app/pages/dashboard/rainManage/page.tsx
rename to apps/fo/app/pages/(with-layout)/dashboard/rainManage/page.tsx
diff --git a/apps/fo/app/pages/dashboardMain/page.tsx b/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx
similarity index 96%
rename from apps/fo/app/pages/dashboardMain/page.tsx
rename to apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx
index 143a78acd..71372672a 100644
--- a/apps/fo/app/pages/dashboardMain/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx
@@ -1,7 +1,7 @@
"use client"
import { useFoStore } from "@/app/store";
import { useEffect, useState } from "react";
-import SearchInput from "../../components/common/SearchInput";
+import SearchInput from "../../../components/common/SearchInput";
export default function DashBoardFclty({ onFacilityChange, sidoSigun, facilityNm, }: { onFacilityChange?: (facility: { bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | '' }) => void, sidoSigun?: string, facilityNm?: string }) {
// 입력값 상태 관리
diff --git a/apps/fo/app/pages/facilityPrecipitation/modal/page.tsx b/apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx
similarity index 100%
rename from apps/fo/app/pages/facilityPrecipitation/modal/page.tsx
rename to apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx
diff --git a/apps/fo/app/pages/facilityPrecipitation/page.tsx b/apps/fo/app/pages/(with-layout)/facilityPrecipitation/page.tsx
similarity index 100%
rename from apps/fo/app/pages/facilityPrecipitation/page.tsx
rename to apps/fo/app/pages/(with-layout)/facilityPrecipitation/page.tsx
diff --git a/apps/fo/app/pages/facilityWaterQlty/HeadMakeColSpan.tsx b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/HeadMakeColSpan.tsx
similarity index 100%
rename from apps/fo/app/pages/facilityWaterQlty/HeadMakeColSpan.tsx
rename to apps/fo/app/pages/(with-layout)/facilityWaterQlty/HeadMakeColSpan.tsx
diff --git a/apps/fo/app/pages/facilityWaterQlty/modal/page.tsx b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx
similarity index 99%
rename from apps/fo/app/pages/facilityWaterQlty/modal/page.tsx
rename to apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx
index 1ac1bc00f..0362b1ec3 100644
--- a/apps/fo/app/pages/facilityWaterQlty/modal/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx
@@ -4,8 +4,8 @@ import type { FacilityWaterQltyProps, modalExcelType } from "@/app/store/facilit
import { downloadExcel, UITab, UiTable } from "@common/business_components/ui";
import { Button, TabsContent } from "@common/components/ui";
import { useCallback, useEffect, useRef, useState } from "react";
-import type { ReturnType } from "../../../components/common/FacilityTermModalHeader";
-import FacilityTermModalHeader from "../../../components/common/FacilityTermModalHeader";
+import type { ReturnType } from "../../../../components/common/FacilityTermModalHeader";
+import FacilityTermModalHeader from "../../../../components/common/FacilityTermModalHeader";
import { HeadMakeColSpan } from "../HeadMakeColSpan";
type ModalProps ={
diff --git a/apps/fo/app/pages/facilityWaterQlty/page.tsx b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx
similarity index 100%
rename from apps/fo/app/pages/facilityWaterQlty/page.tsx
rename to apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx
diff --git a/apps/fo/app/pages/flowRate/modal/page.tsx b/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx
similarity index 99%
rename from apps/fo/app/pages/flowRate/modal/page.tsx
rename to apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx
index bc121708c..92e81f61d 100644
--- a/apps/fo/app/pages/flowRate/modal/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx
@@ -5,7 +5,7 @@ import type { FlowRateModalInterface, modalExcelType } from "@/app/store/flowRat
import { downloadExcel, UITab, UiTable } from "@common/business_components/ui";
import { Button, TabsContent } from "@common/components/ui";
import { useCallback, useEffect, useRef, useState } from "react";
-import type { ReturnType } from "../../../components/common/FacilityTermModalHeader";
+import type { ReturnType } from "../../../../components/common/FacilityTermModalHeader";
const tabList = [
{ value: 'tab_term_year', label: '연간' },
diff --git a/apps/fo/app/pages/flowRate/page.tsx b/apps/fo/app/pages/(with-layout)/flowRate/page.tsx
similarity index 100%
rename from apps/fo/app/pages/flowRate/page.tsx
rename to apps/fo/app/pages/(with-layout)/flowRate/page.tsx
diff --git a/apps/fo/app/pages/(with-layout)/layout.tsx b/apps/fo/app/pages/(with-layout)/layout.tsx
new file mode 100644
index 000000000..f7c0e62ba
--- /dev/null
+++ b/apps/fo/app/pages/(with-layout)/layout.tsx
@@ -0,0 +1,13 @@
+"use client"
+
+import Base from "@/app/base";
+
+export default function RootLayout({
+ children,
+}: Readonly<{
+ children: React.ReactNode;
+}>) {
+ return (
+ {children}
+ );
+}
diff --git a/apps/fo/app/pages/planSewage/page.tsx b/apps/fo/app/pages/(with-layout)/planSewage/page.tsx
similarity index 100%
rename from apps/fo/app/pages/planSewage/page.tsx
rename to apps/fo/app/pages/(with-layout)/planSewage/page.tsx
diff --git a/apps/fo/app/pages/processArea/HeadMakeColSpan.tsx b/apps/fo/app/pages/(with-layout)/processArea/HeadMakeColSpan.tsx
similarity index 99%
rename from apps/fo/app/pages/processArea/HeadMakeColSpan.tsx
rename to apps/fo/app/pages/(with-layout)/processArea/HeadMakeColSpan.tsx
index ffd556b2e..4045ed7b2 100644
--- a/apps/fo/app/pages/processArea/HeadMakeColSpan.tsx
+++ b/apps/fo/app/pages/(with-layout)/processArea/HeadMakeColSpan.tsx
@@ -1,5 +1,5 @@
+import type { TableUpperProps } from "@/app/store/common";
import { TableHead, TableRow } from "@common/components/ui";
-import type { TableUpperProps } from "../../store/dashboard";
const HeadMakeColSpan = ({ upHeadList, layoutNum }: { upHeadList: TableUpperProps[], layoutNum: number }) => {
return (
diff --git a/apps/fo/app/pages/processArea/modal/page.tsx b/apps/fo/app/pages/(with-layout)/processArea/modal/page.tsx
similarity index 100%
rename from apps/fo/app/pages/processArea/modal/page.tsx
rename to apps/fo/app/pages/(with-layout)/processArea/modal/page.tsx
diff --git a/apps/fo/app/pages/processArea/page.tsx b/apps/fo/app/pages/(with-layout)/processArea/page.tsx
similarity index 100%
rename from apps/fo/app/pages/processArea/page.tsx
rename to apps/fo/app/pages/(with-layout)/processArea/page.tsx
diff --git a/apps/fo/app/pages/processFacility/modal/page.tsx b/apps/fo/app/pages/(with-layout)/processFacility/modal/page.tsx
similarity index 100%
rename from apps/fo/app/pages/processFacility/modal/page.tsx
rename to apps/fo/app/pages/(with-layout)/processFacility/modal/page.tsx
diff --git a/apps/fo/app/pages/processFacility/page.tsx b/apps/fo/app/pages/(with-layout)/processFacility/page.tsx
similarity index 100%
rename from apps/fo/app/pages/processFacility/page.tsx
rename to apps/fo/app/pages/(with-layout)/processFacility/page.tsx
diff --git a/apps/fo/app/pages/rdi/page.tsx b/apps/fo/app/pages/(with-layout)/rdi/page.tsx
similarity index 100%
rename from apps/fo/app/pages/rdi/page.tsx
rename to apps/fo/app/pages/(with-layout)/rdi/page.tsx
diff --git a/apps/fo/app/pages/sewageOccur/modal/page.tsx b/apps/fo/app/pages/(with-layout)/sewageOccur/modal/page.tsx
similarity index 100%
rename from apps/fo/app/pages/sewageOccur/modal/page.tsx
rename to apps/fo/app/pages/(with-layout)/sewageOccur/modal/page.tsx
diff --git a/apps/fo/app/pages/sewageOccur/page.tsx b/apps/fo/app/pages/(with-layout)/sewageOccur/page.tsx
similarity index 100%
rename from apps/fo/app/pages/sewageOccur/page.tsx
rename to apps/fo/app/pages/(with-layout)/sewageOccur/page.tsx
diff --git a/apps/fo/app/pages/underWaterInput/modal/page.tsx b/apps/fo/app/pages/(with-layout)/underWaterInput/modal/page.tsx
similarity index 100%
rename from apps/fo/app/pages/underWaterInput/modal/page.tsx
rename to apps/fo/app/pages/(with-layout)/underWaterInput/modal/page.tsx
diff --git a/apps/fo/app/pages/underWaterInput/page.tsx b/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx
similarity index 100%
rename from apps/fo/app/pages/underWaterInput/page.tsx
rename to apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx