diff --git a/.gitignore b/.gitignore index bcf6dab44..ee2cfd052 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,4 @@ settings.json .agent apps/**/tsconfig.tsbuildinfo -logs/ \ No newline at end of file +logs/ diff --git a/.husky/pre-push b/.husky/pre-push index 929f5302d..2adeaead9 100755 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -1,7 +1,10 @@ #!/bin/sh BRANCH=$(git rev-parse --abbrev-ref HEAD) +if [ "$BRANCH" != "main" ]; then + exit 0 +fi echo "Branch: $BRANCH" echo "Changed packages (dry-run):" pnpm turbo run build --filter="...[origin/$BRANCH]" --dry-run echo "Starting build..." -pnpm turbo run build --filter="...[origin/$BRANCH]" \ No newline at end of file +pnpm turbo run build --filter="...[origin/$BRANCH]" diff --git a/apps/dm_new/.env.local b/apps/dm_new/.env.local index 62c4be2cc..58001643c 100644 --- a/apps/dm_new/.env.local +++ b/apps/dm_new/.env.local @@ -1,12 +1,13 @@ NEXT_PUBLIC_SITE_ID = DN +NEXT_PUBLIC_PORT = 3015 NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id NEXT_PUBLIC_ACCESS_TOKEN = access-token NEXT_PUBLIC_REFRESH_TOKEN = refresh-token -NEXT_PUBLIC_PORT = 3005 NEXT_PUBLIC_PROXY_HOST = http://localhost:3005 -NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 +NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 +NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 NEXT_PUBLIC_DM_SERVER_API_URL = http://con.mind-one.co.kr:11083/reuse-service/api/v1 # NEXT_PUBLIC_FO_SERVER_API_URL = http://192.168.1.222:8883/operation-service/api/v1 NEXT_PUBLIC_FO_SERVER_API_URL = http://con.mind-one.co.kr:11083/operation-service/api/v1 @@ -19,7 +20,6 @@ NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&ver NEXT_PUBLIC_GATEWAY_URL=http://con.mind-one.co.kr:11083 # 개발 서버 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 # 박이정 -NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do diff --git a/apps/dm_new/.env.mindone b/apps/dm_new/.env.mindone index da6f80177..9a5005d2b 100644 --- a/apps/dm_new/.env.mindone +++ b/apps/dm_new/.env.mindone @@ -1,23 +1,25 @@ -NEXT_PUBLIC_SITE_ID = DM -NEXT_PUBLIC_PORT = 11035 -NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11035 -NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 -NEXT_PUBLIC_DM_SERVER_API_URL = http://con.mind-one.co.kr:11083/reuse-service/api/v1 -NEXT_PUBLIC_FO_SERVER_API_URL = http://con.mind-one.co.kr:11083/operation-service/api/v1 -NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 -NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload +NEXT_PUBLIC_SITE_ID = DN +NEXT_PUBLIC_PORT = 11315 NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id NEXT_PUBLIC_ACCESS_TOKEN = access-token NEXT_PUBLIC_REFRESH_TOKEN = refresh-token +NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11315 +NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login +NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 +NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 +NEXT_PUBLIC_DM_SERVER_API_URL = http://con.mind-one.co.kr:11083/reuse-service/api/v1 +NEXT_PUBLIC_FO_SERVER_API_URL = http://con.mind-one.co.kr:11083/operation-service/api/v1 NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11083/reuse-service/api/v1 +#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_NGII_URL = https://map.ngii.go.kr NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={x}&tilerow={y} NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service # 개발 서버 API NEXT_PUBLIC_GATEWAY_URL=http://con.mind-one.co.kr:11083 # 개발 서버 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 # 박이정 -NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do diff --git a/apps/dm_new/.env.production b/apps/dm_new/.env.production index 5a401c89a..b413d1312 100644 --- a/apps/dm_new/.env.production +++ b/apps/dm_new/.env.production @@ -1,5 +1,5 @@ # 공단 운영 -NEXT_PUBLIC_SITE_ID = DM +NEXT_PUBLIC_SITE_ID = DN NEXT_PUBLIC_PORT = 3000 NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id @@ -8,16 +8,16 @@ NEXT_PUBLIC_REFRESH_TOKEN = refresh-token #NEXT_PUBLIC_PROXY_HOST = https://devreuse.hasuon.or.kr #NEXT_PUBLIC_CM_LOGIN_PAGE_URL = https://devqueen.hasuon.or.kr/auth/login NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000 -NEXT_PUBLIC_FO_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/operation-service/api/v1 NEXT_PUBLIC_CS_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000 -NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload +NEXT_PUBLIC_FO_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/operation-service/api/v1 +NEXT_PUBLIC_WR_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1 NEXT_PUBLIC_GEOSERVER_URL = http://172.29.143.87:8080/geoserver NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl -NEXT_PUBLIC_WR_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1 +NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/sewerage-service -NEXT_PUBLIC_GATEWAY_URL = http://apigateway.iipbs-was.svc.cluster.local:8000 NEXT_PUBLIC_NGII_URL = http://172.29.143.87/poiact NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x} +NEXT_PUBLIC_GATEWAY_URL = http://apigateway.iipbs-was.svc.cluster.local:8000 NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do diff --git a/apps/dm_new/app/(landing)/reuse/_components/CaseTabsCarousel.tsx b/apps/dm_new/app/(landing)/reuse/_components/CaseTabsCarousel.tsx index 8d916817e..ece8f0848 100644 --- a/apps/dm_new/app/(landing)/reuse/_components/CaseTabsCarousel.tsx +++ b/apps/dm_new/app/(landing)/reuse/_components/CaseTabsCarousel.tsx @@ -8,6 +8,7 @@ import React, { useRef, useState, } from "react"; +import Image from "next/image"; /** * CaseTabsCarousel.tsx (FINAL OPTIMIZED) @@ -459,10 +460,12 @@ export default function CaseTabsCarousel() { ].join(" ")} aria-label="이전" > - 이전 @@ -480,10 +483,12 @@ export default function CaseTabsCarousel() { ].join(" ")} aria-label="다음" > - 다음 @@ -513,10 +518,13 @@ export default function CaseTabsCarousel() { className="overflow-hidden rounded-[22px] border-2 border-sky-400 bg-white" >
- {c.title}
diff --git a/apps/dm_new/app/(landing)/reuse/_components/ImageSlider.tsx b/apps/dm_new/app/(landing)/reuse/_components/ImageSlider.tsx index 6c50d5a5c..41d8987b8 100644 --- a/apps/dm_new/app/(landing)/reuse/_components/ImageSlider.tsx +++ b/apps/dm_new/app/(landing)/reuse/_components/ImageSlider.tsx @@ -1,6 +1,7 @@ // apps/dm/app/(landing)/reuse/_components/ImageSlider.tsx "use client"; +import Image from "next/image"; import { useEffect, useMemo, useRef, useState } from "react"; type Slide = { src: string; alt?: string }; @@ -86,10 +87,12 @@ export default function CaseImageSlider({ w-[80px] h-[80px] rounded-full border border-black/20 bg-white grid place-items-center shadow-sm hover:bg-black/[0.03]" > - 이전 @@ -102,10 +105,12 @@ export default function CaseImageSlider({ w-[80px] h-[80px] rounded-full border border-black/20 bg-white grid place-items-center shadow-sm hover:bg-black/[0.03]" > - 다음 @@ -129,10 +134,13 @@ export default function CaseImageSlider({ > {safeSlides.map((s, i) => (
- {s.alt
diff --git a/apps/dm_new/app/(landing)/reuse/_components/Lnb.tsx b/apps/dm_new/app/(landing)/reuse/_components/Lnb.tsx index 4a33e7314..f5bc7bbfe 100644 --- a/apps/dm_new/app/(landing)/reuse/_components/Lnb.tsx +++ b/apps/dm_new/app/(landing)/reuse/_components/Lnb.tsx @@ -1,6 +1,7 @@ // apps/dm/app/(landing)/reuse/_components/Lnb.tsx "use client"; +import Image from "next/image"; import Link from "next/link"; import { usePathname } from "next/navigation"; import { useMemo, useState } from "react"; @@ -29,7 +30,15 @@ export default function Lnb({ title, items }: { title: string; items: LnbItem[] const [openLabel, setOpenLabel] = useState(defaultOpenLabel); return ( -