diff --git a/apps/dm/.env.local b/apps/dm/.env.local index a3b30abf5..f691fb313 100644 --- a/apps/dm/.env.local +++ b/apps/dm/.env.local @@ -12,8 +12,8 @@ NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload -NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API -#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api # 최용성 +#NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API +NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api # 최용성 #NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.66:8883/sewerage-service/api # 박이정 diff --git a/apps/dm/app/(base-layout)/layout.tsx b/apps/dm/app/(base-layout)/layout.tsx index 56260331f..5caa088b0 100644 --- a/apps/dm/app/(base-layout)/layout.tsx +++ b/apps/dm/app/(base-layout)/layout.tsx @@ -1,20 +1,16 @@ -"use client" +"use client"; import Base from "../base"; import "../globals.css"; import { StoreProvider } from "../store"; -export default function RootLayout({ +export default function BaseLayout({ children, }: Readonly<{ children: React.ReactNode; }>) { return ( - - - - {children} - - - + + {children} + ); -} \ No newline at end of file +} diff --git a/apps/dm/app/(popup-layout)/layout.tsx b/apps/dm/app/(popup-layout)/layout.tsx index 60d925f3e..742519a66 100644 --- a/apps/dm/app/(popup-layout)/layout.tsx +++ b/apps/dm/app/(popup-layout)/layout.tsx @@ -1,19 +1,11 @@ -"use client" +"use client"; import "../globals.css"; import { StoreProvider } from "../store"; -export default function RootLayout({ +export default function PopupLayout({ children, }: Readonly<{ children: React.ReactNode; }>) { - return ( - - - - {children} - - - - ); -} \ No newline at end of file + return {children}; +} diff --git a/apps/dm/app/(popup-layout)/map/mainMap/page.tsx b/apps/dm/app/(popup-layout)/map/mainMap/page.tsx deleted file mode 100644 index ca33e5142..000000000 --- a/apps/dm/app/(popup-layout)/map/mainMap/page.tsx +++ /dev/null @@ -1,28 +0,0 @@ -"use client"; - -import { SearchBar } from "@/components/ui/map/searchBar/searchBar"; -import { useEffect, useState } from "react"; - -const Map = () => { - - const [selectDataPk, setSelectDataPk] = useState ('') - - // 삭제요망 데이터 선ㅌ - useEffect(() =>{ - console.log("Selected Data Pk: ", selectDataPk); - },[selectDataPk]) - return ( - <> - { - console.log("Selected HasuPk: ", hasuPk); - if(hasuPk !==""){ - setSelectDataPk(hasuPk); - } - }} - /> - - ); -}; - -export default Map; diff --git a/apps/dm/app/(popup-layout)/map/service/map.ts b/apps/dm/app/(popup-layout)/map/service/map.ts index 05bef69be..ecc35d074 100644 --- a/apps/dm/app/(popup-layout)/map/service/map.ts +++ b/apps/dm/app/(popup-layout)/map/service/map.ts @@ -30,7 +30,7 @@ export type LyrStngProps = { export const mapService = { //레이어 설정 조회 getLyrStngs: async () => { - const response = await fetch(`${API_URL}/lyrStngs/WR_NETWORK`, { + const response = await fetch(`${API_URL}/lyrStngs/DM_NETWORK`, { method: 'GET', headers: { 'Accept': 'application/json', diff --git a/apps/dm/app/layout.tsx b/apps/dm/app/layout.tsx index 119daee77..af4dcaf1d 100644 --- a/apps/dm/app/layout.tsx +++ b/apps/dm/app/layout.tsx @@ -1,7 +1,5 @@ "use client" -import Base from "./base"; import "./globals.css"; -import { StoreProvider } from "./store"; export default function RootLayout({ children, @@ -9,10 +7,11 @@ export default function RootLayout({ children: React.ReactNode; }>) { return ( - + {children} ); -} \ No newline at end of file +} +