Compare commits

...
Author SHA1 Message Date
kiminchan ef3c32045b Merge branch 'iipbs/sn/dev2' into iipbs/sn/dev2_kic 2026-05-06 14:46:12 +09:00
kiminchan 31ce13397e 관로분석 기능 구현 2026-05-06 14:42:21 +09:00
mind-one001 52d41166be 유하방향 표출 피처수 2000->5000 2026-05-04 15:55:42 +09:00
mind-one001 5515a98749 하수관망도 영역 남한으로 제한 2026-04-30 17:06:21 +09:00
mind-one001 d81952810f 유하방향 표출 2026-04-30 16:54:06 +09:00
mind-one001 54bd38ae5f Merge branch 'iipbs/sn/dev2' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev2 2026-04-28 15:07:14 +09:00
mind-one001 c6575a8182 처리구역 관로분석정보 기능 추가 2026-04-28 15:04:08 +09:00
kiminchan 4644c0ba3a 노후관로 분석 공통 팝업 적용 2026-04-28 09:44:10 +09:00
kiminchan 945d182651 Merge iipbs/sn/dev_popup into iipbs/sn/dev2_kic 2026-04-27 17:00:38 +09:00
kiminchan 5dae10af6f Merge iipbs/sn/dev_kic into iipbs/sn/dev2_kic 2026-04-27 16:56:40 +09:00
kiminchan 3293893b7f merge전 md 파일 삭제 2026-04-27 16:42:47 +09:00
mind-one001 8689b0a8a6 md 구조 잡기 2026-04-27 15:51:36 +09:00
kiminchan 0b7a264f06 모달창 윈도우 팝업 전면 수정 2026-04-27 13:30:59 +09:00
mind-one001 e0a6410c37 md 구조 설계중1 2026-04-24 16:55:11 +09:00
kiminchan 9d573e6ad1 노후관로 ai 개발 기능 테스트_V1.0 2026-04-23 17:27:19 +09:00
chanii8 f507afdfe9 Merge branch 'iipbs/cs/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-22 18:04:20 +09:00
chanii8 86467ada6d [cs] feat: 그룹관리 및 권한관리 페이지 수정 2026-04-22 18:02:02 +09:00
chanii8 0bb227d147 Merge remote-tracking branch 'origin/iipbs/st/dev' 2026-04-22 13:29:04 +09:00
chanii8 2e858dc901 [st] feat: 통계 검증 승인 기능 작업 2026-04-22 13:28:32 +09:00
chanii8 91263b77dd [st] chore: DataGrid의 rows prop 복원 2026-04-22 09:53:44 +09:00
chanii8 84beab1f4e Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-21 18:09:43 +09:00
chanii8 6cb654a4b5 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-04-21 18:09:21 +09:00
chanii8 a5e50fc576 [st] feat: 통계 검증 리포트 페이지 작업 2026-04-21 18:09:11 +09:00
rsone001 9c7e71e65a [st] feat: 입력 - 제출 시 imr 요청 및 상태 확인, 진행 progress bar 추가 2026-04-21 17:57:00 +09:00
rsone001 d0a808882d Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-04-21 11:49:38 +09:00
rsone001 67b3d978a4 [st] feat: 검증결과 보기 작업중 2026-04-21 11:47:27 +09:00
kiminchan e30d62b429 Merge branch 'iipbs/sn/dev' into iipbs/sn/dev_kic 2026-04-21 09:39:52 +09:00
mind-one005 663fc7cdc8 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-20 18:24:01 +09:00
mind-one005 8f9469e8ae Merge branch 'iipbs/sn/dev' 2026-04-20 18:12:56 +09:00
chanii8 34a0324124 [st] fix: mock 파일 제거 & statistics 엔티티 수정 2026-04-20 17:56:11 +09:00
chanii8 e8de6d66f8 [st] fix: eslint 에러 2026-04-20 17:50:27 +09:00
chanii8 79cf19d023 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-20 17:46:03 +09:00
mind-one005 1f1c5bd603 wr: 수정 2026-04-20 17:39:13 +09:00
mind-one005 9cf9081efc wr: 통계 2026-04-20 17:20:12 +09:00
kiminchan 723cb3139a Merge remote-tracking branch 'origin/main' into iipbs/sn/dev_kic 2026-04-20 17:08:41 +09:00
chanii8 c9a73889f1 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-04-20 16:09:10 +09:00
chanii8 16c8fe716d [st] feat: 통계 검증 리포트 화면 작업 2026-04-20 16:08:14 +09:00
chanii8 dbcbd5f8b2 [st] chore: IMR 이상치 데이터 당해년도 값 소숫점 표시 2026-04-20 13:21:33 +09:00
rsone001 c950652f34 [st] fix: 로그 조회, SearchForm, DataGrid 수정 2026-04-20 10:39:25 +09:00
mind-one001 1d3272f836 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-20 09:55:34 +09:00
mind-one001 8dd2bf6eb4 md 추가 2026-04-20 09:55:28 +09:00
chanii8 1120112fa8 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-20 09:41:40 +09:00
mind-one005 3d2dcb4ead wr: 빗물이용시설 통계1 2026-04-17 17:58:09 +09:00
mind-one005 f88b4dfc7e sn: 로그인 페이지 추가 및 남은시간 2026-04-17 15:01:56 +09:00
mind-one005 75eaaa81ac sn: use client 추가 2026-04-17 13:15:12 +09:00
mind-one005 c164b02081 sn: 무한 루프 수정 2026-04-17 11:45:16 +09:00
mind-one001 c7a05cc77d lock 2026-04-17 11:38:16 +09:00
mind-one001 f10157c178 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-17 11:28:11 +09:00
mind-one001 3641a21fc5 하수관로 md 추가 2026-04-17 11:28:03 +09:00
mind-one005 24f377e048 wr: 필요없는 코드 삭제 2026-04-16 18:17:55 +09:00
chanii8 4a26dae6b4 [st] feat: 통계검증리포트 화면 레이아웃 구현 2026-04-16 14:29:44 +09:00
chanii8 2ced8d9b5c [cs] chore: NEXT_PUBLIC_SERVER_API_URL -> SERVER_API_URL 변경 2026-04-16 09:45:02 +09:00
chanii8 b1beff9ef0 [st] chore: NEXT_PUBLIC_SERVER_API_URL -> SERVER_API_URL 변경 2026-04-16 09:34:55 +09:00
chanii8 cf6df58e7a Merge branch 'iipbs/cs/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-15 17:25:14 +09:00
chanii8 0075c720dc [cs] chore: updateSite 요청 파라미터 수정 2026-04-15 17:23:38 +09:00
mind-one001 4805f8ebe3 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-15 16:55:58 +09:00
mind-one001 8b11f65d8f sn > agents.md 추가 2026-04-15 16:55:49 +09:00
chanii8 a5092087db Merge remote-tracking branch 'origin/iipbs/cs/dev' 2026-04-15 16:54:16 +09:00
chanii8 10d8658dc7 [cs] chore: crypto 코드 수정 2026-04-15 16:53:40 +09:00
mind-one005 5f954c0a9d fo: header에 site-id추가 2026-04-15 15:59:22 +09:00
chanii8 6f3f431761 [cs] refactor: auth/main 그룹 분리 2026-04-15 15:40:02 +09:00
chanii8 3141777447 Merge branch 'iipbs/cs/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-15 13:31:23 +09:00
chanii8 11b0070fe1 [cs] feat: 알림톡템플릿관리 > 변수관리 > 변수추가 로직 다이얼로그로 변경 2026-04-15 13:30:05 +09:00
mind-one005 0e81ed1c07 sn: 파일 삭제 2026-04-15 10:42:34 +09:00
mind-one005 4dacfdaadc sn: header에 site-id 추가 2026-04-15 10:18:33 +09:00
jcchoi 2fddc9194c any type 처리 2026-04-14 17:42:33 +09:00
mind-one005 812293b4fa wr: header에 site_id추가 2026-04-14 17:39:12 +09:00
jcchoi 041694e161 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-14 17:25:35 +09:00
chanii8 b56a291512 Merge remote-tracking branch 'origin/iipbs/cs/dev' 2026-04-14 16:28:07 +09:00
chanii8 d54399a2d0 [cs] feat: 알림톡템플릿관리 페이지 구현 2026-04-14 16:24:30 +09:00
mind-one005 0e57bbc4e8 wr: 하수재이용실적현황 지자체 2026-04-14 15:45:20 +09:00
mind-one005 0411b2a894 wr: 재이용시설현황 지차제 2026-04-14 14:57:26 +09:00
jcchoi 2040984be9 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-14 13:19:49 +09:00
mind-one001 ea5db79bb6 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-14 09:50:51 +09:00
mind-one005 7359f19e7d wr: 하수처리시설현황 지자체 2026-04-13 18:18:19 +09:00
chanii8 6a3124ed60 Merge branch 'iipbs/cm/dev' 2026-04-13 17:05:00 +09:00
mind-one001 f9b3b367fc Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-13 16:49:42 +09:00
mind-one001 1279efbd75 NEXT_PUBLIC_SEWERAGE_API_URL 수정 2026-04-13 16:37:46 +09:00
chanii8 77dc0905b6 fix: 타입 에러 2026-04-13 15:57:10 +09:00
chanii8 5a59b3f0eb Merge remote-tracking branch 'origin/iipbs/cs/dev' 2026-04-13 15:47:01 +09:00
chanii8 68f77151bf chore: FormEvent -> SubmitEvent 2026-04-13 15:43:19 +09:00
chanii8 43fe3a1a99 [cs] WIP: 알림톡발송이력관리 페이지 2026-04-13 15:27:31 +09:00
chanii8 5777f000d4 ci: deploy.yml 수정 2026-04-13 11:17:40 +09:00
chanii8 9d18ef7527 [cs] WIP: 알림톡템플릿관리 2026-04-13 10:58:41 +09:00
mind-one005 2de065ceb0 wr: jwt 남은시간 2026-04-10 18:01:12 +09:00
rsone001 a1f02d3717 st: fix: 로그 조회, Grid cell style 수정, 입력,검토,집계표 작업중 2026-04-10 17:23:43 +09:00
mind-one005 6f0f03f83b wr: 중수도 상세 modal 냄새 2026-04-10 11:46:49 +09:00
chanii8 207268b7fc [st] refactor: 인증 처리 로직 공통 패키지로 수정 2026-04-09 18:30:58 +09:00
mind-one005 c5df40a9ef wr: 지도점검결과 중수도 수정 2026-04-09 18:12:09 +09:00
chanii8 8965a62d94 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-04-09 17:44:36 +09:00
jcchoi 8ae9cfe050 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-09 17:04:35 +09:00
chanii8 85304447b2 Merge branch 'iipbs/cs/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-04-09 16:27:12 +09:00
chanii8 dcdee0f758 [cs, common/components] feat: 공통 헤더에서 로그아웃 시 tokenManager로 쿠키 제거하도록 변경 2026-04-09 16:26:54 +09:00
chanii8 5cbe57aa8d Revert "[cs] feat: 로그아웃 시 쿠키 제거 방식 변경"
This reverts commit 6422b3013a.
2026-04-09 15:30:54 +09:00
chanii8 5e0d1b8b63 Merge remote-tracking branch 'origin/iipbs/cs/dev' 2026-04-09 15:06:49 +09:00
chanii8 6422b3013a [cs] feat: 로그아웃 시 쿠키 제거 방식 변경 2026-04-09 15:06:25 +09:00
chanii8 7bf86e8619 Revert "[cs] chore: COOKIE_DOMAIN 기본값 설정"
This reverts commit 36b4393134.
2026-04-09 14:28:52 +09:00
chanii8 36b4393134 [cs] chore: COOKIE_DOMAIN 기본값 설정 2026-04-09 14:04:09 +09:00
chanii8 ee65714d01 [common/components] chore: 로그아웃 로직에서 clearClientCookies 주석 처리 2026-04-09 10:39:52 +09:00
chanii8 6ea99e47d8 Merge remote-tracking branch 'origin/iipbs/cs/dev' 2026-04-08 17:12:41 +09:00
chanii8 07e842ecb2 [cs] feat: 알림톡템플릿관리 페이지 생성 2026-04-08 17:11:52 +09:00
mind-one005 c6838839e6 운영에는 빌드에 설정했음. 2026-04-08 16:01:13 +09:00
mind-one005 e808e79391 Merge branch 'iipbs/sn/dev' 2026-04-08 11:06:44 +09:00
jsyang 9bbc3f521b Merge commit 'b42d518ecf3605c250aadbd9eb4f79e259aeb708' into iipbs/dm/dev 2026-04-08 11:02:53 +09:00
chanii8 f73901c78c Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/cs/dev 2026-04-08 09:58:28 +09:00
chanii8 6c17c12384 rename: "login-*" -> "auth-*" 2026-04-08 09:56:58 +09:00
jsyang 68f2aec5f1 SITE_ID = DM 2026-04-08 09:35:25 +09:00
dongsilove b42d518ecf wr: headList 주석 2026-04-07 23:14:56 +09:00
mind-one005 cb8cc460f9 wr: 주석 추가 및 냄새 - 으로 나오도록 2026-04-07 18:12:21 +09:00
mind-one005 bc577e488f wr: tableBody 분리 외 2026-04-07 17:05:54 +09:00
rsone001 51b1daf083 st: feat: 로그 조회, 입력-하수관로 조회, 입력-하수도보급률 예외 제출 2026-04-07 14:57:35 +09:00
mind-one005 f7c7305ba0 wr: 중수도 지도점검결과등록 2026-04-07 13:50:48 +09:00
mind-one005 dd5ff0f7f8 wr: 중수도시설 지도점검결과 등록 2026-04-06 18:21:15 +09:00
mind-one005 bd85a3c3aa wr: 파일명 잘리는 현상 2026-04-06 16:12:10 +09:00
mind-one005 ff0eeb2e40 Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2026-04-06 15:02:49 +09:00
mind-one005 c9378a0048 wr: 계통도 파일다운로드명, 1건 삭제 2026-04-06 15:02:38 +09:00
jsyang bf95161243 Merge commit 'bd31f9c6f859b711c3d838b9341ff39ae9351280' into iipbs/sn/dev 2026-04-06 14:00:36 +09:00
jsyang bd31f9c6f8 dm_new > dm으로 덮어씀... 이전껀 백업 브렌치로 백업해놓음 2026-04-06 13:59:38 +09:00
mind-one005 c111aaa54f Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2026-04-06 10:19:14 +09:00
mind-one005 09de176d16 wr: modal toast 변경 2026-04-06 10:15:27 +09:00
jsyang c580141b71 Merge commit '5cb0719297bb84a4762095513ed55e9e9a001ce9' into iipbs/dm/dev 2026-04-06 09:15:57 +09:00
dongsilove 5cb0719297 wr: store toast 변경 2026-04-04 20:30:45 +09:00
dongsilove 1b6fb6f77d wr: (with-layout) toast 변경 2026-04-03 21:42:52 +09:00
mind-one005 5e5678f005 wr: 표준공사비 산정 toast > useConfirm으로 2026-04-03 18:07:09 +09:00
mind-one005 bbca5ac6f2 wr: confirmToast->useConfirm 2026-04-03 17:50:13 +09:00
mind-one005 b8ff15f187 wr: Toaster 상위로 위치 변경 2026-04-03 17:33:34 +09:00
chanii8 e130e92376 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into deploy
Deploy Frontend / deploy (push) Successful in 2m27s
2026-04-03 16:27:54 +09:00
chanii8 1489fdc664 [st] chore: 이상치 로그 API 파라미터 수정 2026-04-03 16:26:34 +09:00
jsyang 049ea098d0 수요신청현황 수정일자, 등록일자 추출 2026-04-03 13:29:20 +09:00
chanii8 046b2c0553 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into deploy
Deploy Frontend / deploy (push) Successful in 2m10s
2026-04-03 10:54:51 +09:00
chanii8 0e5ec20c58 ci: deploy.yml 브랜치 수정 2026-04-03 10:53:57 +09:00
chanii8 1c60f0f51b [st] fix: IMR 이상치 데이터 조회 정상적으로 안 되는 이슈
Deploy Frontend / deploy (push) Successful in 1m1s
2026-04-03 10:50:03 +09:00
chanii8 4c4c031e03 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into deploy
Deploy Frontend / deploy (push) Successful in 2m30s
2026-04-02 18:01:56 +09:00
chanii8 a606afef2f [st] feat: IMR API 수정
Deploy Frontend / deploy (push) Successful in 1m0s
2026-04-02 18:00:45 +09:00
mind-one005 70b941c081 wr: 사용용도-WR018 2026-04-02 16:14:54 +09:00
jsyang f528c0e893 수요신청현황에서 수요정보 수정 기능 추가 2026-04-02 15:44:40 +09:00
jsyang f5f2a8f675 스타일재수정 2026-04-02 11:31:43 +09:00
mind-one005 21878892dc Merge branch 'iipbs/dm/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/dm/dev 2026-04-02 11:06:11 +09:00
mind-one005 112634a8e3 dm: .env 수정 2026-04-02 11:06:03 +09:00
mind-one005 64d33bec6d wr: 로그인 전 cookie 삭제 외 2026-04-02 10:32:04 +09:00
mind-one005 4b1dd416b5 wr: 고정 width2 2026-04-01 18:12:28 +09:00
jsyang 6d28936a35 대민지원 빌드에러 수정 2026-04-01 17:58:14 +09:00
mind-one001 aca6e249b4 Merge branch 'iipbs/dm/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/dm/dev 2026-04-01 17:37:46 +09:00
chanii8 2f7d860b89 [cs] refactor: auth 리팩토링 (@common/auth) 2026-04-01 17:06:56 +09:00
mind-one001 1dee2c4200 대민 수요정보등록 기능 수정 2026-04-01 17:03:16 +09:00
mind-one005 f2be91986c wr: 고정 width 2026-04-01 16:26:46 +09:00
jsyang fa64855574 middleware 원복 2026-04-01 16:24:15 +09:00
jsyang df7a66b2c7 후보지 선택 후 수요정보에 입력, 저장 시 넘어가는 데이터 테스트 필요 2026-04-01 15:31:37 +09:00
chanii8 011a68e5f2 [cs] refactor: auth 리팩토링 (refresh token) 2026-04-01 15:00:55 +09:00
jsyang e7f4da2322 미들웨어 reuse-service수정 2026-04-01 14:37:16 +09:00
jsyang c551481c5b Merge commit '3efac843d465e79fa6a53ea1a8cb250d0d26cacb' into iipbs/dm/dev 2026-04-01 14:05:16 +09:00
jsyang b0f71f2239 들여쓰기 수정(개발서버 깃못불러와서 확인용) 2026-04-01 13:35:02 +09:00
jsyang 688ec0f88f 대민지원 후보지조회 base.css style적용 2026-04-01 13:22:14 +09:00
mind-one005 3efac843d4 sn: 개발환경 2026-04-01 11:02:23 +09:00
chanii8 86d899d708 [st] chore: 배포 정책 변경 (deploy 브랜치)
Deploy Frontend / deploy (push) Successful in 1m1s
2026-04-01 09:12:04 +09:00
jsyang 3ed8b4ed6c url확인? 2026-03-31 22:08:03 +09:00
jsyang 2042076597 middleware 수정 2026-03-31 21:06:38 +09:00
jsyang 7088540ccc 빌드에러수정(변수타입 수정) 2026-03-31 20:24:44 +09:00
jsyang c279124c41 빌드에러수정(안쓰는거 제거) 2026-03-31 20:22:14 +09:00
jsyang fc03a19da1 수요정보등록 validation 제거(임시), 수요신청현황 수정버튼 임시비활성화 2026-03-31 20:18:45 +09:00
chanii8 4dce22a30f [st] feat: IMR 이상치 데이터 그리드에 '검증대상' 컬럼 추가
Deploy Frontend / deploy (push) Successful in 3m15s
2026-03-31 16:57:38 +09:00
chanii8 c8391fe8eb ci: deploy.yml 수정
Deploy Frontend / deploy (push) Successful in 57s
2026-03-31 16:45:56 +09:00
chanii8 c79c484c1b Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend
Deploy Frontend / deploy (push) Successful in 6m37s
2026-03-31 16:35:09 +09:00
chanii8 9c323e6b5d ci: deploy.yml 생성 2026-03-31 16:34:03 +09:00
jsyang e566bc087b 유사사례 모달 수정 (초기조회 되도록) 2026-03-31 16:12:44 +09:00
jsyang 90eb5f3b04 수요정보 등록 후보지조회 제외 완료 2026-03-31 16:12:25 +09:00
mind-one005 7b9db8d879 Merge branch 'iipbs/sn/dev' 2026-03-31 13:43:47 +09:00
mind-one005 b1d556c6ee wr: 수요매칭 pageNation 주석처리 2026-03-31 13:32:30 +09:00
mind-one005 5e01305922 wr: 표준공사비 산정 comp 수정 2026-03-31 11:00:42 +09:00
rsone001 8015dc4b93 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-03-30 17:11:10 +09:00
rsone001 bb6274ef12 st: fix: 경로 에러 수정 2026-03-30 17:11:01 +09:00
chanii8 2805e382b3 [st] feat: 일반 검증 관리 -> 검증 항목 관리 탭으로 이동 2026-03-30 17:05:02 +09:00
chanii8 df4f3b296b Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-03-30 16:40:14 +09:00
rsone001 42632d96ad st: fix: 불필요 주석 삭제 2026-03-30 16:27:37 +09:00
rsone001 a73265eac6 st: feat: 수식 다이얼로그 컬럼 검색 추가 2026-03-30 16:26:36 +09:00
chanii8 1a82d549f5 [st] feat: HB 통계 검증 차트 수정 2026-03-30 11:52:30 +09:00
rsone001 28681969e2 st: fix: 입력단 api 수정 2026-03-30 10:06:42 +09:00
dongsilove f5f0f67798 wr: 후보지 조회 -feature 선택시 확대 제한 2026-03-28 20:46:09 +09:00
mind-one005 cbee407911 wr: 수요처 매칭 검토 readOnly 처리 외 2026-03-27 18:15:26 +09:00
chanii8 cc291243b0 [st] feat: IMR 이상치 데이터 그리드 컬럼 수정 2026-03-27 17:48:55 +09:00
chanii8 11ecd90d13 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-03-27 17:14:30 +09:00
mind-one005 57904427cf wr: 수요처관리 전화번호에 - 2026-03-27 17:07:50 +09:00
mind-one005 5372ef9d9c Merge branch 'iipbs/sn/dev' into iipbs/dm/dev 2026-03-27 14:36:57 +09:00
mind-one005 214bd9db4d wr: 후보지 조회지도 선택된 시설목록 수정 2026-03-27 14:31:40 +09:00
chanii8 7423b778ee [st] feat: HB 검증 이력 그리드 placeholderData 적용 2026-03-27 11:15:28 +09:00
chanii8 4bd67fcbb3 [st] feat: IMR 이상치 데이터 그리드 컬럼 필터링 적용 2026-03-27 11:10:39 +09:00
mind-one005 ce0e6e9d99 wr: 수요처매칭 용도 수정 2026-03-26 18:16:17 +09:00
rsone001 ca324251ad st: feat: 하수도보급률 집계표 조회, 기타 수정 2026-03-26 11:49:54 +09:00
mind-one005 41504e6e0f sn: 노후관로관리 1차 디자인 2026-03-26 10:53:43 +09:00
mind-one005 b40a974ba3 sn: md 추가 2026-03-26 09:45:36 +09:00
mind-one005 5f11b39810 sn: package.json @common/config 추가 2026-03-25 17:59:26 +09:00
chanii8 f706f07bc5 chore: eslint 버전 통일 2026-03-25 17:35:38 +09:00
mind-one005 c987f6beed wr: 수요처 수정 2026-03-25 17:23:48 +09:00
jsyang 4bcda65c05 빌드 에러 수정 2026-03-25 15:43:28 +09:00
chanii8 3f12cfd8c3 chore: fo, sn, wr 환경변수 수정 2026-03-25 14:44:32 +09:00
chanii8 fdb3b23165 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/cm/dev 2026-03-25 14:28:58 +09:00
chanii8 abfa231493 [st] refactor: 로그인 페이지 auth 그룹으로 분기 처리 (client api 영향 범위에서 벗어나기 위함) 2026-03-25 14:22:48 +09:00
chanii8 601e99fbd5 refactor: 권한 인증 에러 처리 로직 2026-03-25 13:18:19 +09:00
mind-one005 c7b22b3e95 sn: 하수관로 html 2026-03-25 13:03:39 +09:00
jsyang a57c1a4a5c 수요정보 등록 기능 추가 2026-03-25 11:44:18 +09:00
jcchoi 620f4275ae 로그인 페이지 수정정 2026-03-24 16:48:41 +09:00
mind-one005 7cb1a9ab6f wr: 도로명 입력시 추천 나타나고 결과주소선택시 시도,시군구 설정 2026-03-24 16:38:16 +09:00
mind-one005 c86dd2bb9e wr: 우편번호 관련 수정 2026-03-24 14:41:06 +09:00
chanii8 dc8006899e [st] refactor: IMR 검증 이력 마스터, 결과 인터페이스 수정 2026-03-24 14:35:13 +09:00
chanii8 6e50514096 [st] refactor: IMR 검증 이력 API 변경 2026-03-24 11:57:40 +09:00
chanii8 863634ea6a Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-03-24 10:36:42 +09:00
chanii8 fcd5f215e8 [st] refactor: HB 통계검증 상세 시도/시군구 필터 코드 2026-03-24 10:36:33 +09:00
mind-one005 645a7db2e5 wr: 점검현황 excel 수정 2026-03-23 18:06:31 +09:00
chanii8 fe930d4773 [st] feat: IMR 검증이력 시도/시군구 셀렉트 API 변경 2026-03-23 17:16:26 +09:00
chanii8 b2d528dc78 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-03-23 16:45:11 +09:00
chanii8 a7c4d251a2 [st] feat: IMR 데이터 엑셀 다운로드 기능 2026-03-23 16:44:53 +09:00
mind-one005 edf0d30b95 wr: commom -> common 2026-03-23 16:40:03 +09:00
mind-one005 bb8e3e5456 wr: 페이지이동시 선택 해제 2026-03-23 16:03:40 +09:00
chanii8 2ee400c9bb [st] feat: tab store에 persist 적용 2026-03-23 14:36:18 +09:00
chanii8 a46b185c16 [st] refactor: 시도/시군구 셀렉트 API 변경 2026-03-23 11:45:34 +09:00
dongsilove c9c8a7ff62 Merge remote-tracking branch 'origin/iipbs/sn/dev' 2026-03-20 20:47:18 +09:00
rsone001 1728d1879c st: fix: 검토-하수관로 컬럼 footer 수정 2026-03-20 17:51:34 +09:00
jcchoi bdd3708fde pm2 config 수정(instances) 2026-03-20 17:50:58 +09:00
chanii8 6c76f9a810 [st] remove: 불필요한 파일 제거 2026-03-20 17:37:53 +09:00
chanii8 36e7c6cfee Merge remote-tracking branch 'origin/iipbs/st/dev' 2026-03-20 17:30:40 +09:00
chanii8 c3b5c5d0cd [st] feat: IMR 검증 이력 이상치 데이터 차트 수정 2026-03-20 17:29:36 +09:00
chanii8 ca7002f3bb [st] feat: 검증 항목 관리 정렬 코드 추가 2026-03-20 15:23:34 +09:00
mind-one005 9642680909 wr: 잠재수요처 추가등록 2026-03-20 14:47:21 +09:00
chanii8 6eb8a3baac [st] feat: 검증 항목 관리 > 컬럼 검사 버튼 추가 2026-03-20 14:45:02 +09:00
chanii8 4e404abad3 AGENT.md 문서 제거 2026-03-20 11:09:21 +09:00
chanii8 5e56999c68 [st] fix: 경로 에러 2026-03-20 10:50:29 +09:00
chanii8 45fd44aa01 Merge remote-tracking branch 'origin/iipbs/st/dev' 2026-03-20 10:44:47 +09:00
chanii8 57b16653d4 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-03-20 10:43:23 +09:00
chanii8 4dcd422815 [st] rename: entities 폴더 정리 2026-03-20 10:41:35 +09:00
jcchoi 4a8c748095 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-03-20 10:33:30 +09:00
jcchoi 01f1076a5d 로그인 페이지 문구 교체 2026-03-20 09:41:07 +09:00
mind-one005 58fee673ce sn: icon 수정 2026-03-19 16:35:16 +09:00
rsone001 9567d7f7ce st: fix: 수식 등록 유효성검사 수정 2026-03-19 15:09:03 +09:00
rsone001 11cf1bf7c9 st: feat: 일반검증 관리 기능 2026-03-19 14:15:20 +09:00
dongsilove 0818b63cdc Merge branch 'iipbs/sn/dev' 2026-03-18 23:01:51 +09:00
dongsilove 14f2aab0be Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2026-03-18 22:50:18 +09:00
dongsilove 72f5fdd7a8 sn: 하수처리시설500 2026-03-18 22:50:12 +09:00
mind-one005 96db2b4ed4 sn: zoom level 디자인 및 기능 변경 2026-03-18 18:07:26 +09:00
mind-one005 f9a1af43f5 sn: zoom level 2026-03-18 17:45:29 +09:00
mind-one005 b711dae3ed wr: 공장주소>회사주소 2026-03-18 17:20:39 +09:00
chanii8 512c39cd46 [st] feat: IMR 서비스 추가 2026-03-18 16:57:25 +09:00
mind-one005 cb8743ea39 sn: 분석화면 2026-03-18 16:15:25 +09:00
mind-one005 0b46ba36dc Merge branch 'iipbs/dm/dev' into iipbs/sn/dev 2026-03-18 15:25:38 +09:00
mind-one005 53356228a7 sn: 강우유입수 수정 2026-03-18 15:24:32 +09:00
mind-one005 59e3dd0804 wr: message alert matMng 2026-03-18 14:46:36 +09:00
LGS 165c7bcbbf 침입수 분석결과 [강우유입수분석결과] 박스 內 3개 숫자 단위 정렬 수정 2026-03-18 14:13:08 +09:00
mind-one005 3d11a8be21 wr: message alert 2026-03-18 13:20:32 +09:00
LGS daaff4a4ca 맵 [침입수 분석] [RDII분석] 팝업 수정 2026-03-18 13:16:17 +09:00
mind-one005 a3270acd29 sn: rdii 분석 결과 수정 2026-03-18 10:43:03 +09:00
chanii8 3184ea4386 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-03-18 10:16:37 +09:00
mind-one005 13fad0c692 sn: 침입수2차 수정 2026-03-18 09:38:43 +09:00
mind-one005 9181ec192d Merge branch 'iipbs/sn/dev' into iipbs/dm/dev 2026-03-18 09:34:01 +09:00
dongsilove f993a4a13e sn: 폰트 수정 2026-03-17 22:53:00 +09:00
dongsilove 630c9492cd sn: 침입수 1차 수정 2026-03-17 22:42:46 +09:00
mind-one005 c57c7ce1f7 wr: 공통 alet 사용 2026-03-17 18:05:02 +09:00
chanii8 d320d96edf [st] feat: 통계 검증 상세 화면 "검증확정" 버튼 추가 2026-03-17 16:05:46 +09:00
chanii8 a32a1ac003 [st] feat: 검증 결과 상세 그리드 '행정구역', '시설명' 컬럼 추가 2026-03-17 15:53:50 +09:00
LGS 908ec81fb7 침입수 분석 팝업 레이아웃 수정 2026-03-17 15:47:34 +09:00
mind-one005 43bbc81616 wr: alert 시험 2026-03-17 15:17:43 +09:00
chanii8 80510adb8e Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-03-17 14:52:19 +09:00
chanii8 ee2301470a [st] feat: 통계 검증 상세 테이블 체크박스 기능 추가 2026-03-17 14:51:43 +09:00
rsone001 bb778b6dc0 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-03-17 10:49:08 +09:00
rsone001 1bc03d99c6 st: fix: eslint error 수정 2026-03-17 10:47:51 +09:00
chanii8 dc64095e76 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-03-17 10:45:14 +09:00
chanii8 414a69c6ad [st] feat: 검증 대상 통계 항목 전체 선택/해제 기능 2026-03-17 10:42:03 +09:00
rsone001 4c86f7f3a5 Merge remote-tracking branch 'origin/feature/review-skeleton-sein' into iipbs/st/dev 2026-03-17 10:08:54 +09:00
rsone001 685ba15baa st: feat: 일반검증 관리 기능 작업 중 2026-03-17 10:07:08 +09:00
chanii8 2cf241236e [st] design: 검증 항목 등록 다이얼로그 ui 수정 2026-03-17 09:29:01 +09:00
dongsilove f5320259b9 Merge branch 'iipbs/sn/dev' 2026-03-16 20:19:00 +09:00
mind-one005 b5ecfdf3f8 fo: 주석 제거 및 잠재수요처 총 건수 2026-03-16 18:01:53 +09:00
mind-one005 57afe5dc5c fo: 총 건수 2026-03-16 17:20:45 +09:00
changwng 5fb7a83de8 Merge remote-tracking branch 'origin/main' 2026-03-16 17:01:50 +09:00
changwng 3fdc459b16 [사용자서비스] 회원로그인로그 상태값에 전체 추가 2026-03-16 17:00:51 +09:00
mind-one005 96bd0185b3 sn: 하수처리구역 선택시, 처리시설 표시 2026-03-16 13:33:23 +09:00
mind-one005 980c4f1c9f Merge branch 'iipbs/sn/dev' 2026-03-16 09:07:05 +09:00
mind-one005 76bb48aacd sn: md 추가 2026-03-13 18:20:33 +09:00
changwng af12aa0718 [통계 프론트엔드] 목록보기 클릭시 다시 조회 로직 추가 2026-03-13 17:23:07 +09:00
changwng 1970a8d632 Merge remote-tracking branch 'origin/main' 2026-03-13 16:59:09 +09:00
changwng 8269b31b42 [통계 프론트엔드] 검증 항목등록 수정에 컬럼명 선택 팝업 추가 2026-03-13 16:58:19 +09:00
mind-one005 d8d0207891 조건 수정 2026-03-13 16:36:22 +09:00
chanii8 f575e3b677 [st] feat: 검증 결과 상세 그리드 및 차트 데이터 동기화 2026-03-13 14:51:58 +09:00
chanii8 6b28c4e332 [st] chore: 검증 결과 상태 값 추가 2026-03-13 14:20:36 +09:00
mind-one005 6ae792c3e2 Merge branch 'iipbs/sn/dev' into iipbs/dm/dev 2026-03-13 13:45:50 +09:00
mind-one005 5f42eb080e sn: 지도 중심 위치로 2026-03-13 13:33:59 +09:00
jcchoi 1d73da316c ci: 배포 config 생성 2026-03-12 22:54:01 -04:00
dongsilove ea490bcdbc sn: map 조회 버튼 추가 2026-03-12 23:37:15 +09:00
mind-one005 4cde2a56b4 sn: 하수관로 전국지도로 보이도록 2026-03-12 17:30:22 +09:00
chanii8 5446a8a656 [st] feat: 검증 항목 등록 기능 추가 2026-03-12 16:56:39 +09:00
chanii8 7662e80eba [st] feat: WithLoadingButton 컴포넌트 추가 2026-03-12 16:31:36 +09:00
chanii8 e610b3b8e8 [st] feat: 검증이력 그리드에 분석실패 시 에러 툴팁 추가 2026-03-12 16:10:22 +09:00
chanii8 9d6902f521 [st] fix: 검증 결과 상세 그리드 초기화 로직 수정 2026-03-12 15:38:55 +09:00
chanii8 b6e11b4be4 [st] feat: 차트 포인터 클릭 시 그리드 포커싱되는 기능 추가 2026-03-12 15:20:42 +09:00
chanii8 969d24736d [st] feat: 통계 검증 상세 차트 구현 2026-03-12 14:59:34 +09:00
changwng bf577ddc81 idea 제외 2026-03-12 10:51:29 +09:00
changwng d731a3fc5b idea 제외 2026-03-12 10:42:07 +09:00
chanii8 dabdf5739a [st] feat: 통계 검증 상세 자료 다운로드 작업 및 QA 반영 2026-03-11 17:45:16 +09:00
mind-one005 f09028a7ea dm_new: pnpm install 2026-03-11 15:20:32 +09:00
chanii8 57e8e4c8d6 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-03-11 14:40:00 +09:00
chanii8 8c384a51ce [st] feat: 통계 검증 상세 화면 작업 2026-03-11 14:35:57 +09:00
chanii8 c8a66d2e53 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-03-11 12:51:37 +09:00
chanii8 42a99708a3 [st] feat: 통계 검증 상세 화면 작업 2026-03-11 12:51:31 +09:00
rsone001 d8d704aec1 Merge remote-tracking branch 'origin/feature/review-skeleton-sein' into iipbs/st/dev 2026-03-11 11:21:03 +09:00
rsone001 9ef58ef153 st: 메뉴 정보 road 로직 수정, TabDataGrid 수정, 일반검증관리 화면 작업 중 2026-03-11 10:38:25 +09:00
mind-one005 a8948fd1f3 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-03-10 17:45:45 +09:00
mind-one005 56a9218210 Merge branch 'iipbs/sn/dev' 2026-03-10 17:45:36 +09:00
mind-one005 19670a6ff0 wr: 빗물 지도점검 등록화면 수정 2026-03-10 17:42:03 +09:00
chanii8 38bbce9ea1 Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-03-09 18:02:44 +09:00
chanii8 9d7ceb69b1 chore: pre-push 훅 수정 2026-03-09 18:02:04 +09:00
chanii8 3fb1fe870b Merge branch 'iipbs/st/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/st/dev 2026-03-09 17:36:47 +09:00
chanii8 ff2b79aaa6 [st] feat: 통계 검증 상세 화면 작업 2026-03-09 17:36:25 +09:00
mind-one005 bffa8fbc11 dm_new: package.json start 수정 2026-03-06 16:55:12 +09:00
mind-one005 3e8f55bee5 dm_new: build 준비 2026-03-06 16:42:15 +09:00
chanii8 64e7a1f43f import 모듈 정리 ESLint 설정 2026-03-06 16:41:09 +09:00
mind-one005 dd849958c0 Merge branch 'main' into iipbs/dm/dev 2026-03-06 16:19:58 +09:00
mind-one005 dde92cf779 Merge branch 'iipbs/dm/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/dm/dev 2026-03-06 15:31:59 +09:00
mind-one005 ec14773409 dm_new: env수정 2026-03-06 15:31:54 +09:00
mind-one005 50232da090 wr: 주석 추가 2026-03-06 15:14:08 +09:00
chanii8 97a67bfd55 [st] feat: 검증 에러 처리 2026-03-06 12:04:19 +09:00
mind-one005 ac24ebff40 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2026-03-06 10:41:11 +09:00
mind-one005 45ad5eb5eb Merge branch 'iipbs/sn/dev' 2026-03-06 10:40:57 +09:00
mind-one005 fad671ef29 wr: headList 수정 2026-03-05 17:26:18 +09:00
LGS 0eeac7512b 물 재이용 대민서비스 수요신청 > 수요정보등록 > 유사사례조회 모달팝업 수정 2026-03-05 17:03:57 +09:00
mind-one005 a71a2a147f wr: 하수재이용시설현황 excel 천단위 콤마 2026-03-05 11:10:04 +09:00
LGS cb442bfc13 물 재이용 대민서비스 수요신청 > 수요정보등록 > 후보지조회 / 유사사례조회 모달팝업 수정 및 신규 추가 2026-03-05 09:19:52 +09:00
mind-one005 6504d53672 wr: excel template header에 단위 확인 2026-03-04 14:09:40 +09:00
mind-one005 c1813ba4f3 wr: exceldown 천단위 콤마 2026-03-04 11:42:02 +09:00
dongsilove aa05cb5d73 wr: 빗물사용시설 excel 천단위 처리 2026-03-03 23:23:00 +09:00
mind-one005 9cf73141df wr: 화면 천단위,처리 2026-03-03 18:22:10 +09:00
mind-one005 3772cd6edd dm_dev: 주석 추가 2026-03-03 11:39:24 +09:00
dongsilove fd6b008b80 dm_new: 수요정보등록 원복 2026-02-26 23:08:49 +09:00
dongsilove c5fbd6e6f3 dm_new: 수요신청현황 - 진행상태 추가 2026-02-26 21:47:59 +09:00
mind-one005 409e755e7d dm_new: main화면 수정 외 2026-02-26 16:56:31 +09:00
mind-one005 6dae2896d7 dm_new: (with-layout) 이하 <Image />로 교체 2026-02-26 15:05:04 +09:00
mind-one005 fa21387c55 dm_new: Lnb고정 2026-02-26 14:39:25 +09:00
mind-one005 ec59447db9 dm_new: <Image />사용 2026-02-26 14:15:24 +09:00
LGS 9cd3ce9f63 물 재이용 대민서비스 lnb 고정(본문 스크롤 시 lnb 고정되도록 수정) 2026-02-26 13:47:14 +09:00
chanii8 355e0ef1e4 [cm] feat: 대시보드 패널 헤더에 드래그 핸들러 적용 2026-02-06 16:33:49 +09:00
chanii8 c9b2ef35b7 [cm] fix: hydration 에러 2026-02-05 09:24:28 +09:00
chanii8 8491d0243a [cm] feat: 대시보드 페이지 dnd 적용 2026-02-04 15:22:17 +09:00
1084 changed files with 53907 additions and 38616 deletions
+33
View File
@@ -0,0 +1,33 @@
name: Deploy Frontend
on:
push:
branches:
- deploy
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup SSH
run: |
mkdir -p ~/.ssh
echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/deploy_key
chmod 600 ~/.ssh/deploy_key
ssh-keyscan -p 28 -H 192.168.0.4 >> ~/.ssh/known_hosts
- name: Deploy
run: |
ssh -i ~/.ssh/deploy_key -p 28 onasys@192.168.0.4 << 'EOF'
cd ~/frontend
git restore .
git clean -fd
git pull origin deploy
pnpm install
pnpm turbo build
pm2 reload all
EOF
+6 -4
View File
@@ -4,10 +4,7 @@
# dependencies
node_modules/
# build
.next/
dist/
.idea/
# build
.next
@@ -22,9 +19,14 @@ apps/fo/.next/**/*
#.env*
.qodo
# next-agents-md
.next-docs/
pnpm-lock.yaml
settings.json
.npmrc
.cursor
.agent
apps/**/tsconfig.tsbuildinfo
logs/
+7
View File
@@ -1,3 +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]"
+3
View File
@@ -3,3 +3,6 @@ NEXT_PUBLIC_PORT=
NEXT_PUBLIC_PROXY_HOST=
NEXT_PUBLIC_SITE_ID=
NEXT_PUBLIC_SERVER_API_URL=
# 401 시 브라우저 리다이렉트 대상
NEXT_PUBLIC_AUTH_LOGIN_REDIRECT_URL=/auth/login
+4 -1
View File
@@ -13,6 +13,7 @@
> ⚠️ **중요**: 모든 것을 feature로 만들 필요는 없습니다.
Feature로 만드는 것이 좋은 지표:
- **여러 페이지에서 재사용됨**: 예를 들어, 여러 에디터가 있고 모두 댓글 기능이 있다면, 댓글은 재사용 가능한 feature입니다
- **중요한 비즈니스 기능**: 신규 프로젝트 참여자가 Features 폴더를 보고 앱의 주요 기능을 빠르게 파악할 수 있어야 합니다
@@ -56,7 +57,7 @@ export function LoginForm() {
password: ''
});
const handleSubmit = async (e: React.FormEvent) => {
const handleSubmit = async (e: React.SubmitEvent) => {
e.preventDefault();
await loginUser(credentials);
};
@@ -104,11 +105,13 @@ export type { LoginCredentials } from './model/types';
## 레이어 의존성 규칙
✅ **허용되는 의존성**:
- `shared` 레이어의 모듈
- `entities` 레이어의 모듈
- 같은 feature 슬라이스 내의 다른 세그먼트
❌ **금지된 의존성**:
- 다른 `features` 슬라이스 (feature 간 직접 의존 금지)
- `widgets` 레이어
- `pages` 레이어
+1 -1
View File
@@ -25,7 +25,7 @@
},
"devDependencies": {
"eslint": "^9.0.0",
"eslint-config-next": "15.4.0",
"eslint-config-next": "15.3.8",
"postcss": "^8.4.49",
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.6.11",
+4 -1
View File
@@ -12,6 +12,9 @@
"@common/assets": "workspace:*",
"@common/components": "workspace:*",
"@common/config": "workspace:*",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@fontsource-variable/noto-sans-kr": "^5.2.5",
"@frontend-opensource/use-react-hooks": "^1.1.4",
"@fullcalendar/core": "^6.1.17",
@@ -52,7 +55,7 @@
"@types/node": "^22.13.1",
"@types/webpack": "^5.28.5",
"eslint": "^9.0.0",
"eslint-config-next": "15.4.0",
"eslint-config-next": "15.3.8",
"postcss": "^8.4.49",
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.6.11",
+4 -10
View File
@@ -5,16 +5,15 @@ import { useRouter } from "next/navigation";
import { client } from "@/shared/api";
import type { IUserInfo } from "@/shared/store";
import { getCookie, useUserStore } from "@/shared/lib";
import { isAtLoginRedirectUrl } from "@common/network";
import { ENDPOINT, AUTH_USER_ID } from "@/shared/config";
import { LoginApi } from "../api/login-service";
const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
const router = useRouter();
const { userInfo, setUserInfo } = useUserStore((state) => state);
async function authCheck() {
// 로그인 페이지에서는 인증 체크를 건너뜀
if (window.location.pathname === '/auth/login') {
if (isAtLoginRedirectUrl("/auth/login")) {
return;
}
@@ -35,13 +34,8 @@ const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
await authCheck();
} catch (error) {
console.error(error);
try {
await LoginApi.silentRefresh();
await authCheck();
} catch (refreshError) {
console.error("Token refresh failed:", refreshError);
setUserInfo(null);
setUserInfo(null);
if (!isAtLoginRedirectUrl("/auth/login")) {
router.push("/auth/login");
}
}
+155 -75
View File
@@ -14,7 +14,9 @@ interface SignupModalProps {
}
function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
const [currentStep, setCurrentStep] = useState<'agreement' | 'signup'>('agreement');
const [currentStep, setCurrentStep] = useState<"agreement" | "signup">(
"agreement",
);
const [agreed, setAgreed] = useState(false);
const [formData, setFormData] = useState({
userId: "",
@@ -47,7 +49,7 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
// 모달이 닫힐 때 초기화
useEffect(() => {
if (!open) {
setCurrentStep('agreement');
setCurrentStep("agreement");
setAgreed(false);
setFormData({
userId: "",
@@ -81,17 +83,19 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
const handleNextStep = () => {
if (agreed) {
setCurrentStep('signup');
setCurrentStep("signup");
}
};
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>) => {
const handleInputChange = (
e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>,
) => {
const { name, value } = e.target;
setFormData(prev => ({ ...prev, [name]: value }));
setFormData((prev) => ({ ...prev, [name]: value }));
// 에러 초기화
if (errors[name]) {
setErrors(prev => ({ ...prev, [name]: "" }));
setErrors((prev) => ({ ...prev, [name]: "" }));
}
};
@@ -102,20 +106,27 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
if (!formData.userId) newErrors.userId = "아이디를 입력해주세요.";
if (!formData.userName) newErrors.userName = "이름을 입력해주세요.";
if (!formData.password) newErrors.password = "비밀번호를 입력해주세요.";
if (!formData.confirmPassword) newErrors.confirmPassword = "비밀번호 확인을 입력해주세요.";
if (!formData.confirmPassword)
newErrors.confirmPassword = "비밀번호 확인을 입력해주세요.";
if (!formData.pswdHnt) newErrors.pswdHnt = "비밀번호 힌트를 입력해주세요.";
if (!formData.laeSeCd) newErrors.laeSeCd = "법인구분을 선택해주세요.";
if (!formData.ogdpSeCd) newErrors.ogdpSeCd = "기관구분을 선택해주세요.";
// 비밀번호 확인
if (formData.password && formData.confirmPassword && formData.password !== formData.confirmPassword) {
if (
formData.password &&
formData.confirmPassword &&
formData.password !== formData.confirmPassword
) {
newErrors.confirmPassword = "비밀번호가 일치하지 않습니다.";
}
// 비밀번호 정규식 검증
const passwordRegex = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/;
const passwordRegex =
/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/;
if (formData.password && !passwordRegex.test(formData.password)) {
newErrors.password = "비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.";
newErrors.password =
"비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.";
}
// 이메일 형식 검증
@@ -124,8 +135,10 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
}
// 중복 체크 검증
if (idAvailable === false) newErrors.userId = "이미 사용 중인 아이디입니다.";
if (emailAvailable === false) newErrors.email = "이미 사용 중인 이메일입니다.";
if (idAvailable === false)
newErrors.userId = "이미 사용 중인 아이디입니다.";
if (emailAvailable === false)
newErrors.email = "이미 사용 중인 이메일입니다.";
setErrors(newErrors);
const isValid = Object.keys(newErrors).length === 0;
@@ -135,7 +148,7 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
const checkUserIdDuplicate = async () => {
if (!formData.userId) {
setErrors(prev => ({ ...prev, userId: "아이디를 입력해주세요." }));
setErrors((prev) => ({ ...prev, userId: "아이디를 입력해주세요." }));
return;
}
@@ -147,19 +160,25 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
});
const response = await signupClient.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/existsUserId`,
{ userId: formData.userId }
{ userId: formData.userId },
);
const exists = response.data;
setIdAvailable(!exists);
if (exists) {
setErrors(prev => ({ ...prev, userId: "이미 사용 중인 아이디입니다." }));
setErrors((prev) => ({
...prev,
userId: "이미 사용 중인 아이디입니다.",
}));
} else {
setErrors(prev => ({ ...prev, userId: "" }));
setErrors((prev) => ({ ...prev, userId: "" }));
}
} catch (error) {
console.error("아이디 중복 체크 오류:", error);
setErrors(prev => ({ ...prev, userId: "아이디 중복 체크 중 오류가 발생했습니다." }));
setErrors((prev) => ({
...prev,
userId: "아이디 중복 체크 중 오류가 발생했습니다.",
}));
} finally {
setIsCheckingId(false);
}
@@ -167,7 +186,7 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
const checkEmailDuplicate = async () => {
if (!formData.email) {
setErrors(prev => ({ ...prev, email: "이메일을 입력해주세요." }));
setErrors((prev) => ({ ...prev, email: "이메일을 입력해주세요." }));
return;
}
@@ -179,28 +198,34 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
});
const response = await signupClient.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/exists`,
{ email: formData.email }
{ email: formData.email },
);
const exists = response.data;
setEmailAvailable(!exists);
if (exists) {
setErrors(prev => ({ ...prev, email: "이미 사용 중인 이메일입니다." }));
setErrors((prev) => ({
...prev,
email: "이미 사용 중인 이메일입니다.",
}));
} else {
setErrors(prev => ({ ...prev, email: "" }));
setErrors((prev) => ({ ...prev, email: "" }));
}
} catch (error) {
console.error("이메일 중복 체크 오류:", error);
setErrors(prev => ({ ...prev, email: "이메일 중복 체크 중 오류가 발생했습니다." }));
setErrors((prev) => ({
...prev,
email: "이메일 중복 체크 중 오류가 발생했습니다.",
}));
} finally {
setIsCheckingEmail(false);
}
};
const handleSubmit = async (e: React.FormEvent) => {
const handleSubmit = async (e: React.SubmitEvent) => {
e.preventDefault();
console.log("회원가입 버튼 클릭됨");
if (!validateForm()) {
console.log("폼 검증 실패");
return;
@@ -230,19 +255,19 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
// SignupClient를 통해 익명사용자 회원가입 API 호출
const signupClient = SignupClient.getInstance({
baseURL: BASE_URL
baseURL: BASE_URL,
});
const response = await signupClient.post(
`${ENDPOINT.USER_SERVICE.USERS}/anonymouse/users/join`,
signupData
signupData,
);
console.log("회원가입 성공:", response.data);
// 성공 시 모달 닫기 및 콜백 호출
onSuccess();
onClose();
// 폼 초기화
setFormData({
userId: "",
@@ -267,13 +292,12 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
setErrors({});
setIdAvailable(null);
setEmailAvailable(null);
} catch (error: unknown) {
console.error("회원가입 오류:", error);
if (error instanceof Error) {
setErrors(prev => ({ ...prev, submit: error.message }));
setErrors((prev) => ({ ...prev, submit: error.message }));
} else {
setErrors(prev => ({ ...prev, submit: "회원가입에 실패했습니다." }));
setErrors((prev) => ({ ...prev, submit: "회원가입에 실패했습니다." }));
}
} finally {
setIsLoading(false);
@@ -286,36 +310,52 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
<div className="modal-overlay" onClick={onClose}>
<div className="modal-content" onClick={(e) => e.stopPropagation()}>
<div className="modal-header">
<h2>{currentStep === 'agreement' ? '개인정보제공동의' : '회원가입'}</h2>
<button className="close-button" onClick={onClose}>×</button>
<h2>
{currentStep === "agreement" ? "개인정보제공동의" : "회원가입"}
</h2>
<button className="close-button" onClick={onClose}>
×
</button>
</div>
{currentStep === 'agreement' ? (
{currentStep === "agreement" ? (
<div className="agreement-content">
<div className="agreement-text">
<h3>개인정보 수집 및 이용 동의</h3>
<p>회원가입을 위해 다음과 같이 개인정보를 수집 및 이용합니다.</p>
<h4>1. 수집하는 개인정보 항목</h4>
<ul>
<li>필수항목: 아이디, 이름, 비밀번호, 비밀번호 힌트, 법인구분, 기관구분</li>
<li>선택항목: 이메일, 휴대폰번호, 전화번호, 주소, 기관코드, 상세기관코드, 사업자등록번호</li>
<li>
필수항목: 아이디, 이름, 비밀번호, 비밀번호 힌트, 법인구분,
기관구분
</li>
<li>
선택항목: 이메일, 휴대폰번호, 전화번호, 주소, 기관코드,
상세기관코드, 사업자등록번호
</li>
</ul>
<h4>2. 개인정보의 수집 및 이용목적</h4>
<ul>
<li>회원가입 및 관리</li>
<li>서비스 제공 및 운영</li>
<li>고객상담 및 문의응답</li>
</ul>
<h4>3. 개인정보의 보유 및 이용기간</h4>
<p>회원탈퇴 시까지 (단, 관련 법령에 따라 보존이 필요한 경우 해당 기간까지)</p>
<p>
회원탈퇴 시까지 (단, 관련 법령에 따라 보존이 필요한 경우 해당
기간까지)
</p>
<h4>4. 동의 거부권 및 거부 시 불이익</h4>
<p>개인정보 수집 및 이용에 대한 동의를 거부할 수 있으며, 동의 거부 시 회원가입이 제한됩니다.</p>
<p>
개인정보 수집 및 이용에 대한 동의를 거부할 수 있으며, 동의 거부
시 회원가입이 제한됩니다.
</p>
</div>
<div className="agreement-checkbox">
<label>
<input
@@ -326,13 +366,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
<span>개인정보 수집 및 이용에 동의합니다.</span>
</label>
</div>
<div className="agreement-actions">
<button
type="button"
onClick={onClose}
className="cancel-button"
>
<button type="button" onClick={onClose} className="cancel-button">
취소
</button>
<button
@@ -349,7 +385,7 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
<form onSubmit={handleSubmit} className="signup-form">
<div className="form-section">
<h3>기본 정보</h3>
<div className="form-row">
<div className="form-group">
<label htmlFor="userId">아이디 *</label>
@@ -373,8 +409,14 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
{isCheckingId ? "확인중..." : "중복확인"}
</button>
</div>
{idAvailable === true && <span className="success-message">사용 가능한 아이디입니다.</span>}
{errors.userId && <span className="error-message">{errors.userId}</span>}
{idAvailable === true && (
<span className="success-message">
사용 가능한 아이디입니다.
</span>
)}
{errors.userId && (
<span className="error-message">{errors.userId}</span>
)}
</div>
</div>
@@ -390,7 +432,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
placeholder="이름을 입력하세요"
disabled={isLoading}
/>
{errors.userName && <span className="error-message">{errors.userName}</span>}
{errors.userName && (
<span className="error-message">{errors.userName}</span>
)}
</div>
</div>
@@ -416,8 +460,14 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
{isCheckingEmail ? "확인중..." : "중복확인"}
</button>
</div>
{emailAvailable === true && <span className="success-message">사용 가능한 이메일입니다.</span>}
{errors.email && <span className="error-message">{errors.email}</span>}
{emailAvailable === true && (
<span className="success-message">
사용 가능한 이메일입니다.
</span>
)}
{errors.email && (
<span className="error-message">{errors.email}</span>
)}
</div>
</div>
@@ -434,7 +484,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={20}
disabled={isLoading}
/>
{errors.password && <span className="error-message">{errors.password}</span>}
{errors.password && (
<span className="error-message">{errors.password}</span>
)}
</div>
</div>
@@ -451,7 +503,11 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={20}
disabled={isLoading}
/>
{errors.confirmPassword && <span className="error-message">{errors.confirmPassword}</span>}
{errors.confirmPassword && (
<span className="error-message">
{errors.confirmPassword}
</span>
)}
</div>
</div>
@@ -468,7 +524,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={10}
disabled={isLoading}
/>
{errors.pswdHnt && <span className="error-message">{errors.pswdHnt}</span>}
{errors.pswdHnt && (
<span className="error-message">{errors.pswdHnt}</span>
)}
</div>
</div>
@@ -485,14 +543,16 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={100}
disabled={isLoading}
/>
{errors.pswdAns && <span className="error-message">{errors.pswdAns}</span>}
{errors.pswdAns && (
<span className="error-message">{errors.pswdAns}</span>
)}
</div>
</div>
</div>
<div className="form-section">
<h3>연락처 정보</h3>
<div className="form-row">
<div className="form-group">
<label htmlFor="mphn">휴대폰 번호</label>
@@ -506,7 +566,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={11}
disabled={isLoading}
/>
{errors.mphn && <span className="error-message">{errors.mphn}</span>}
{errors.mphn && (
<span className="error-message">{errors.mphn}</span>
)}
</div>
</div>
@@ -523,14 +585,16 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={11}
disabled={isLoading}
/>
{errors.telno && <span className="error-message">{errors.telno}</span>}
{errors.telno && (
<span className="error-message">{errors.telno}</span>
)}
</div>
</div>
</div>
<div className="form-section">
<h3>주소 정보</h3>
<div className="form-row">
<div className="form-group">
<label htmlFor="zip">우편번호</label>
@@ -544,7 +608,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={5}
disabled={isLoading}
/>
{errors.zip && <span className="error-message">{errors.zip}</span>}
{errors.zip && (
<span className="error-message">{errors.zip}</span>
)}
</div>
</div>
@@ -561,7 +627,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={200}
disabled={isLoading}
/>
{errors.addr && <span className="error-message">{errors.addr}</span>}
{errors.addr && (
<span className="error-message">{errors.addr}</span>
)}
</div>
</div>
@@ -578,14 +646,16 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={200}
disabled={isLoading}
/>
{errors.daddr && <span className="error-message">{errors.daddr}</span>}
{errors.daddr && (
<span className="error-message">{errors.daddr}</span>
)}
</div>
</div>
</div>
<div className="form-section">
<h3>기관 정보</h3>
<div className="form-row">
<div className="form-group">
<label htmlFor="laeSeCd">법인구분 *</label>
@@ -601,7 +671,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
<option value="02">민간기업</option>
<option value="03">개인</option>
</select>
{errors.laeSeCd && <span className="error-message">{errors.laeSeCd}</span>}
{errors.laeSeCd && (
<span className="error-message">{errors.laeSeCd}</span>
)}
</div>
</div>
@@ -621,7 +693,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
<option value="03">공공기관</option>
<option value="04">민간기업</option>
</select>
{errors.ogdpSeCd && <span className="error-message">{errors.ogdpSeCd}</span>}
{errors.ogdpSeCd && (
<span className="error-message">{errors.ogdpSeCd}</span>
)}
</div>
</div>
@@ -638,7 +712,9 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={10}
disabled={isLoading}
/>
{errors.instSeCd && <span className="error-message">{errors.instSeCd}</span>}
{errors.instSeCd && (
<span className="error-message">{errors.instSeCd}</span>
)}
</div>
</div>
@@ -655,21 +731,25 @@ function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
maxLength={10}
disabled={isLoading}
/>
{errors.dtlInstCd && <span className="error-message">{errors.dtlInstCd}</span>}
{errors.dtlInstCd && (
<span className="error-message">{errors.dtlInstCd}</span>
)}
</div>
</div>
</div>
{errors.submit && (
<div className="form-row">
<div className="error-message submit-error">{errors.submit}</div>
<div className="error-message submit-error">
{errors.submit}
</div>
</div>
)}
<div className="form-actions">
<button
type="button"
onClick={() => setCurrentStep('agreement')}
onClick={() => setCurrentStep("agreement")}
className="back-button"
disabled={isLoading}
>
@@ -305,7 +305,7 @@ function UserSignupModal({ open, onClose, onSuccess }: UserSignupModalProps) {
}
};
const handleSubmit = async (e: React.FormEvent) => {
const handleSubmit = async (e: React.SubmitEvent) => {
e.preventDefault();
console.log("회원가입 버튼 클릭됨 - handleSubmit");
console.log("현재 폼 데이터:", formData);
+54 -33
View File
@@ -26,7 +26,7 @@ function LoginPage() {
console.log("Modal states - OTP:", showOtpModal, "2FA:", showTwoFAModal);
}, [showOtpModal, showTwoFAModal]);
const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
const handleSubmit = async (e: React.SubmitEvent<HTMLFormElement>) => {
e.preventDefault();
setIsLoading(true);
setError("");
@@ -43,44 +43,54 @@ function LoginPage() {
if (isOtpEnabled) {
// 2FA 로그인 - Proxy를 통해 처리 (2FA 전용 엔드포인트 사용)
console.log("Starting 2FA login...");
const response = await fetch(`/api/proxy${ENDPOINT.USER_SERVICE.LOGIN_2FA}`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
userId,
password,
provider: 'password'
}),
});
const response = await fetch(
`/api/proxy${ENDPOINT.USER_SERVICE.LOGIN_2FA}`,
{
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
userId,
password,
provider: "password",
}),
},
);
if (!response.ok) {
const errorData = await response.json();
let errorMsg = errorData.message || '로그인 실패';
let errorMsg = errorData.message || "로그인 실패";
if (Array.isArray(errorData.errors) && errorData.errors.length > 0) {
errorMsg = errorData.errors.map((e: { message: string }) => e.message).join(', ');
errorMsg = errorData.errors
.map((e: { message: string }) => e.message)
.join(", ");
}
throw new Error(errorMsg);
}
const data = await response.json();
console.log("2FA login response:", data);
console.log("Response headers:", Object.fromEntries(response.headers.entries()));
console.log(
"Response headers:",
Object.fromEntries(response.headers.entries()),
);
// 2FA 로그인 응답에는 tempToken과 registered2FA만 포함됨
if (!data.tempToken) {
throw new Error("Missing tempToken in 2FA login response");
}
// 임시 토큰을 localStorage에 저장 (OTP 인증용)
localStorage.setItem('tempToken', data.tempToken);
localStorage.setItem("tempToken", data.tempToken);
console.log("tempToken saved:", data.tempToken);
if (data.registered2FA) {
console.log("User has 2FA registered, showing OTP modal");
setShowOtpModal(true);
} else {
console.log("User doesn't have 2FA registered, showing 2FA setup modal");
console.log(
"User doesn't have 2FA registered, showing 2FA setup modal",
);
setShowTwoFAModal(true);
}
} else {
@@ -91,7 +101,7 @@ function LoginPage() {
}
} catch (error: unknown) {
console.error("Login error:", error);
// 에러 처리
if (error instanceof Error) {
setError(error.message);
@@ -145,11 +155,11 @@ function LoginPage() {
<div className="left_box fx">
<div className="text">
<h1>
유역하수도 통합플랫폼
유역하수도통합플랫폼
<br />
<span>통합관리시스템</span>
<span>유역하수도 포탈</span>
</h1>
<p>유역하수도 통합플랫폼에 오신 것을 환영합니다.</p>
<p>유역하수도통합플랫폼 유역하수도포탈에 오신 것을 환영합니다.</p>
</div>
<div className="img">
<Image src={images.logo} width={229} height={46} alt="logo" />
@@ -218,25 +228,36 @@ function LoginPage() {
<label htmlFor="checkTwoFA">OTP 인증</label>
</div>
</div>
<button
type="submit"
className="login_btn fx"
disabled={isLoading}
>
<button type="submit" className="login_btn fx" disabled={isLoading}>
<span>{isLoading ? "로그인 중..." : "LOGIN"}</span>
</button>
{error && (
<div className="error-message" style={{ color: "red", textAlign: "center", marginTop: "10px" }}>
<div
className="error-message"
style={{ color: "red", textAlign: "center", marginTop: "10px" }}
>
{error}
</div>
)}
{successMessage && (
<div className="success-message" style={{ color: "green", textAlign: "center", marginTop: "10px" }}>
<div
className="success-message"
style={{
color: "green",
textAlign: "center",
marginTop: "10px",
}}
>
{successMessage}
</div>
)}
<div className="signup-link" style={{ textAlign: "center", marginTop: "15px" }}>
<span style={{ color: "#666", fontSize: "14px" }}>계정이 없으신가요? </span>
<div
className="signup-link"
style={{ textAlign: "center", marginTop: "15px" }}
>
<span style={{ color: "#666", fontSize: "14px" }}>
계정이 없으신가요?{" "}
</span>
<button
type="button"
onClick={() => setShowSignupModal(true)}
@@ -246,7 +267,7 @@ function LoginPage() {
color: "#3b82f6",
textDecoration: "underline",
cursor: "pointer",
fontSize: "14px"
fontSize: "14px",
}}
>
회원가입
@@ -282,8 +303,8 @@ function LoginPage() {
종합환경연구단지)
</span>
<span>
전화 : (시스템) 032-590-4321, 3752, 4314 / (통 계) 032-590-3723,
3722
전화 : (시스템) 032-590-4321, 3752, 4314 / (통 계)
032-590-3723, 3722
</span>
<span>팩스 :032-590-3729</span>
</p>
@@ -0,0 +1,16 @@
import {
KeyboardSensor,
PointerSensor,
useSensor,
useSensors,
} from "@dnd-kit/core";
import { sortableKeyboardCoordinates } from "@dnd-kit/sortable";
export function useDndSensors() {
return useSensors(
useSensor(PointerSensor),
useSensor(KeyboardSensor, {
coordinateGetter: sortableKeyboardCoordinates,
}),
);
}
@@ -0,0 +1,59 @@
import { useState, useEffect } from "react";
import { arrayMove } from "@dnd-kit/sortable";
import type { DragEndEvent } from "@dnd-kit/core";
import type { PanelItem } from "../../model/types";
interface UsePanelOrderProps {
initialPanels: PanelItem[];
storageKey: string;
}
export function usePanelOrder({
initialPanels,
storageKey,
}: UsePanelOrderProps) {
const [panels, setPanels] = useState<PanelItem[]>(initialPanels);
const [isInitialized, setIsInitialized] = useState(false);
useEffect(() => {
if (isInitialized) return;
const saved = localStorage.getItem(storageKey);
if (saved) {
try {
const savedIds = JSON.parse(saved);
const restoredPanels = savedIds
.map((id: string) => initialPanels.find((p) => p.id === id))
.filter(Boolean);
if (restoredPanels.length === initialPanels.length) {
setPanels(restoredPanels);
}
} catch {
setPanels(initialPanels);
}
}
setIsInitialized(true);
}, [storageKey]);
const handleDragEnd = (event: DragEndEvent) => {
const { active, over } = event;
if (over && active.id !== over.id) {
setPanels((items) => {
const oldIndex = items.findIndex((item) => item.id === active.id);
const newIndex = items.findIndex((item) => item.id === over.id);
const newItems = arrayMove(items, oldIndex, newIndex);
// localStorage에 저장
localStorage.setItem(
storageKey,
JSON.stringify(newItems.map((item) => item.id)),
);
return newItems;
});
}
};
return { panels, handleDragEnd };
}
@@ -0,0 +1,71 @@
import FoFcltCntRt from "@/pages/dashboard/ui/fo-fclt-cnt-rt";
import SnPplStatus from "@/pages/dashboard/ui/sn-ppl-status";
import ReuseChart from "@/pages/dashboard/ui/reuse-chart";
import FoWqltInflEffl from "@/pages/dashboard/ui/fo-wqlt-Infl-effl";
import SnOldPpl from "@/pages/dashboard/ui/sn-old-ppl";
import ReuseStatus from "@/pages/dashboard/ui/reuse-status";
import SupportList from "@/pages/dashboard/ui/support-list";
import DataStatusList from "@/pages/dashboard/ui/datastatus-list";
import NoticeList from "@/pages/dashboard/ui/notice-list";
import BannerList from "@/pages/dashboard/ui/banner-list";
import type { PanelItem } from "./types";
export function getInitialTopPanels(): PanelItem[] {
return [
{
id: "panel-1",
component: <FoFcltCntRt />,
className: "",
},
{
id: "panel-2",
component: <SnPplStatus />,
className: "",
},
{
id: "panel-3",
component: <ReuseChart />,
className: "",
},
{
id: "panel-4",
component: <FoWqltInflEffl />,
className: "",
},
{
id: "panel-5",
component: <SnOldPpl />,
className: "",
},
{
id: "panel-6",
component: <ReuseStatus />,
className: "",
},
];
}
export function getInitialBottomPanels(): PanelItem[] {
return [
{
id: "panel-7",
component: <SupportList />,
className: "",
},
{
id: "panel-8",
component: <DataStatusList />,
className: "",
},
{
id: "panel-9",
component: <NoticeList />,
className: "",
},
{
id: "panel-10",
component: <BannerList />,
className: "",
},
];
}
@@ -0,0 +1,7 @@
export interface PanelItem {
id: string;
component: React.ReactNode;
className?: string;
}
export type PanelType = "top" | "bottom";
+34 -17
View File
@@ -1,10 +1,15 @@
"use client";
import { useRef } from "react";
import { useRef, useState, useEffect } from "react";
import { useQuery } from "@tanstack/react-query";
import { ENDPOINT } from "@/shared/config";
import { getImageUrlByAtflCd, getBannerList, type Banner } from "../api/banner-service";
import {
getImageUrlByAtflCd,
getBannerList,
type Banner,
} from "../api/banner-service";
import { getCookie } from "@/shared/lib";
import { useDragHandle } from "./sortable-panel";
import {
Carousel,
@@ -21,7 +26,13 @@ type BannerImageProps = {
};
const BannerList: React.FC = () => {
const siteId = getCookie("site-id-key") ?? "";
const { dragHandleProps, isDragging } = useDragHandle();
const [siteId, setSiteId] = useState<string>("");
useEffect(() => {
const id = getCookie("site-id-key") ?? "";
setSiteId(id);
}, []);
const BannerImage = ({ atflCd, lnkgUrlAddr }: BannerImageProps) => {
const { data: imageUrl, isLoading } = useQuery({
@@ -91,6 +102,19 @@ const BannerList: React.FC = () => {
return maybe.status ?? maybe.response?.status;
};
// siteId가 없을 때
if (!siteId) {
return (
<div className="card card-border">
<div className="relative flex h-[240px] w-full items-center justify-center bg-accent">
<div className="text-sm text-muted-foreground">
사이트 ID가 없습니다
</div>
</div>
</div>
);
}
// 401 에러 처리
if (bannerError) {
const is401Error =
@@ -133,21 +157,14 @@ const BannerList: React.FC = () => {
);
}
// siteId가 없을 때
if (!siteId) {
return (
<div className="card card-border">
<div className="relative flex h-[240px] w-full items-center justify-center bg-accent">
<div className="text-sm text-muted-foreground">
사이트 ID가 없습니다
</div>
</div>
</div>
);
}
return (
<div className="card card-border" style={{ height: "230px" }}>
<div className="card card-border" style={{ height: "230px" }}>
{/* 드래그 핸들 - 배너 위에 오버레이 */}
<div
className={`absolute inset-0 z-10 cursor-grab active:cursor-grabbing ${isDragging ? 'bg-black/20' : 'bg-transparent'}`}
{...dragHandleProps}
title="배너를 드래그하여 패널 순서 변경"
/>
<Carousel
plugins={[plugin.current]}
opts={{ loop: true }}
+168 -94
View File
@@ -6,6 +6,8 @@ import { tokenManager } from "@/entities/auth/lib/token-manager";
import { client } from "@/shared/api";
import { ENDPOINT } from "@/shared/config";
import { KoreaBasinMap } from "../lib/korea-basin-map";
import { useDndSensors } from "../lib/hooks/use-dnd-sensors";
import { usePanelOrder } from "../lib/hooks/use-panel-order";
import {
Chart as ChartJS,
CategoryScale,
@@ -18,18 +20,15 @@ import {
Tooltip,
ArcElement,
} from "chart.js";
import SnPplStatus from "./sn-ppl-status";
import SnOldPpl from "./sn-old-ppl";
import FoFcltCntRt from "./fo-fclt-cnt-rt";
import FoWqltInflEffl from "./fo-wqlt-Infl-effl";
import ReuseChart from "./reuse-chart";
import ReuseStatus from "./reuse-status";
import NoticeList from "./notice-list";
import BannerList from "./banner-list";
import SupportList from "./support-list";
import DataStatusList from "./datastatus-list";
import { DndContext, closestCenter } from "@dnd-kit/core";
import { SortableContext, rectSortingStrategy } from "@dnd-kit/sortable";
import {
getInitialTopPanels,
getInitialBottomPanels,
} from "../model/panel-config";
import MyPostList from "./mypost-list";
import ScheduleList from "./schedule-list";
import { SortablePanel } from "./sortable-panel";
// Chart.js 등록
ChartJS.register(
@@ -41,7 +40,7 @@ ChartJS.register(
Filler,
Legend,
Tooltip,
ArcElement
ArcElement,
);
interface UserInfo {
@@ -54,7 +53,29 @@ interface UserInfo {
function DashboardPage() {
const [userInfo, setUserInfo] = useState<UserInfo | null>(null);
const [error, setError] = useState("");
const router = useRouter();
const [isMounted, setIsMounted] = useState(false);
const router = useRouter();
// dnd-kit 센서 설정
const sensors = useDndSensors();
// 패널 순서 관리
const { panels: topPanels, handleDragEnd: handleTopDragEnd } = usePanelOrder({
initialPanels: getInitialTopPanels(),
storageKey: "dashboard-top-panels-order",
});
const { panels: bottomPanels, handleDragEnd: handleBottomDragEnd } =
usePanelOrder({
initialPanels: getInitialBottomPanels(),
storageKey: "dashboard-bottom-panels-order",
});
// 클라이언트에서만 드래그 기능 활성화 (hydration 문제 방지)
useEffect(() => {
setIsMounted(true);
}, []);
useEffect(() => {
const fetchUserInfo = async () => {
console.log("fetchUserInfo called");
@@ -115,96 +136,149 @@ function DashboardPage() {
return (
<div className="p-2 sm:p-4 md:p-6">
<div className="flex flex-col gap-1">
{/* 첫번째 라인 */}
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 xl:grid-cols-8 gap-1">
{/* 첫번쨰 열 */}
<div className="col-span-1 md:col-span-1 lg:col-span-1 xl:col-span-2 h-250 !p-0">
{/* 전국 하수처리시설 개소수 및 가동률 */}
<FoFcltCntRt />
{/* 오수관로 및 우수관로 현황 */}
<SnPplStatus />
{/* 하수처리수 재이용 (m³) */}
<ReuseChart />
{/* 첫번째 라인 - 좌측 6개 패널(2x3) + 우측 지도/사용자 정보 */}
<div className="flex flex-col gap-1 lg:flex-row">
{/* 좌측: 드래그 가능한 6개 패널 (2x3 그리드, 화면의 50%) */}
<div className="w-full lg:w-1/2">
{isMounted ? (
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragEnd={handleTopDragEnd}
>
<SortableContext
items={topPanels.map((p) => p.id)}
strategy={rectSortingStrategy}
>
<div className="grid grid-cols-2 gap-1">
{topPanels.map((panel) => (
<SortablePanel
key={panel.id}
id={panel.id}
className={panel.className}
>
{panel.component}
</SortablePanel>
))}
</div>
</SortableContext>
</DndContext>
) : (
<div className="grid grid-cols-2 gap-1">
{topPanels.map((panel) => (
<div key={panel.id} className={panel.className}>
{panel.component}
</div>
))}
</div>
)}
</div>
{/* 두번쨰 열 */}
<div className="col-span-1 md:col-span-1 lg:col-span-1 xl:col-span-2 h-250 !p-0">
{/* 수계별 유입ㆍ방류수질 분석 */}
<FoWqltInflEffl />
{/* 우측: 고정된 지도와 사용자 정보 (화면의 50%) */}
<div className="flex w-full gap-1 lg:w-1/2">
{/* 지도영역 - 고정 (드래그 불가) */}
<div className="flex-1">
<KoreaBasinMap />
</div>
{/* 노후하수관로현황 */}
<SnOldPpl />
{/* 물재이용 현황 (재이용량, m³) */}
<ReuseStatus />
</div>
{/* 지도영역 */}
<div className="col-span-1 md:col-span-2 lg:col-span-1 xl:col-span-3">
<KoreaBasinMap />
</div>
{/* 사용자 정보 카드 */}
<div className="col-span-1 md:col-span-2 lg:col-span-1 xl:col-span-1 !p-0">
{error && <div className="mb-4 text-red-500">{error}</div>}
{userInfo ? (
<div className="card card_border login_info_box" style={{ minHeight: "150px", height: "auto" }}>
<div className="login_header" style={{ paddingLeft: "10px", paddingRight: "10px" }}>
<div className="login_avatar">
<Image
src="/images/icon_loginID.png"
alt="프로필"
width={40}
height={40}
onError={(e) => {
const target = e.target as HTMLImageElement;
target.src = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='40' height='40' viewBox='0 0 40 40'%3E%3Ccircle cx='20' cy='20' r='18' fill='%23e1e5e9'/%3E%3Ctext x='20' y='26' font-size='20' text-anchor='middle' fill='%23999'%3E%3F%3C/text%3E%3C/svg%3E";
}}
/>
</div>
<div className="login_user_info">
<div className="user_name">{userInfo.userName || "-"}</div>
<div className="user_status">온라인</div>
<div className="user_status text-xs sm:text-sm">
<b>2FA 활성화:</b>{" "}
{userInfo.twoFactorEnabled ? "예" : "아니오"}
{/* 사용자 정보 카드 - 고정 (드래그 불가) */}
<div className="flex w-full flex-col gap-1 !p-0 lg:w-[300px]">
{error && <div className="mb-4 text-red-500">{error}</div>}
{userInfo ? (
<div
className="card card_border login_info_box"
style={{ minHeight: "150px", height: "auto" }}
>
<div
className="login_header"
style={{ paddingLeft: "10px", paddingRight: "10px" }}
>
<div className="login_avatar">
<Image
src="/images/icon_loginID.png"
alt="프로필"
width={40}
height={40}
onError={(e) => {
const target = e.target as HTMLImageElement;
target.src =
"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='40' height='40' viewBox='0 0 40 40'%3E%3Ccircle cx='20' cy='20' r='18' fill='%23e1e5e9'/%3E%3Ctext x='20' y='26' font-size='20' text-anchor='middle' fill='%23999'%3E%3F%3C/text%3E%3C/svg%3E";
}}
/>
</div>
<div className="login_user_info">
<div className="user_name">
{userInfo.userName || "-"}
</div>
<div className="user_status">온라인</div>
<div className="user_status text-xs sm:text-sm">
<b>2FA 활성화:</b>{" "}
{userInfo.twoFactorEnabled ? "예" : "아니오"}
</div>
</div>
</div>
<div
className="login_actions"
style={{ paddingLeft: "10px", paddingRight: "10px" }}
>
<button
className="login_btn text-xs sm:text-sm"
onClick={handleLogout}
>
로그아웃
</button>
<button
className="signup_btn text-xs sm:text-sm"
onClick={handleChangePassword}
>
마이페이지
</button>
</div>
</div>
</div>
<div className="login_actions" style={{ paddingLeft: "10px", paddingRight: "10px" }}>
<button className="login_btn text-xs sm:text-sm" onClick={handleLogout}>로그아웃</button>
<button className="signup_btn text-xs sm:text-sm" onClick={handleChangePassword}>마이페이지</button>
</div>
) : (
!error && <div>사용자 정보를 불러오는 중...</div>
)}
<ScheduleList />
<MyPostList />
</div>
) : (
!error && <div>사용자 정보를 불러오는 중...</div>
)}
<ScheduleList />
<MyPostList />
</div>
</div>
{/* 두번째 라인 */}
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-1">
<div className="card card-border" style={{ height: "250px" }}>
<SupportList />
</div>
<div className="card card-border" style={{ height: "250px" }}>
<DataStatusList />
</div>
<div className="card card-border" style={{ height: "250px" }}>
<NoticeList />
</div>
{/* 배너 영역 */}
<div className="card card-border" style={{ height: "250px" }}>
<BannerList />
</div>
</div>
{/* 두번째 라인 - 드래그 가능한 4개 패널 */}
{isMounted ? (
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragEnd={handleBottomDragEnd}
>
<SortableContext
items={bottomPanels.map((p) => p.id)}
strategy={rectSortingStrategy}
>
<div className="grid grid-cols-1 gap-1 sm:grid-cols-2 lg:grid-cols-4">
{bottomPanels.map((panel) => (
<SortablePanel
key={panel.id}
id={panel.id}
className="card card-border"
>
<div style={{ height: "250px" }}>{panel.component}</div>
</SortablePanel>
))}
</div>
</SortableContext>
</DndContext>
) : (
<div className="grid grid-cols-1 gap-1 sm:grid-cols-2 lg:grid-cols-4">
{bottomPanels.map((panel) => (
<div key={panel.id} className="card card-border">
<div style={{ height: "250px" }}>{panel.component}</div>
</div>
))}
</div>
)}
</div>
</div>
);
@@ -5,6 +5,7 @@ import { useQuery } from "@tanstack/react-query";
import { ENDPOINT } from "@/shared/config";
import { getDataStatusList, type DataStatus } from "../api/datastatus-service";
import type { PageableList } from "@/shared/model";
import { useDragHandle } from "./sortable-panel";
import {
Carousel,
@@ -35,6 +36,7 @@ const getRegionInfo = (regionName: string) => {
};
const DataStatusList: React.FC = () => {
const { dragHandleProps, isDragging } = useDragHandle();
const plugin = useRef(
Autoplay({ delay: 3000, stopOnInteraction: true })
);
@@ -106,7 +108,11 @@ const DataStatusList: React.FC = () => {
return (
<>
<div className="card_title bottomline">
<div
className={`card_title bottomline cursor-grab active:cursor-grabbing ${isDragging ? 'opacity-50' : ''}`}
{...dragHandleProps}
title="헤더를 드래그하여 패널 순서 변경"
>
<div className="leftArea">
<h4>자료현황</h4>
</div>
@@ -9,8 +9,10 @@ import { Doughnut } from "react-chartjs-2";
import type { Chart as ChartJS } from "chart.js";
// import type { mapOperFcltItem, mapBasinData } from "../model/fo-interface";
import { OperationApi, operFcltStore, basinStore } from "../api/fo-service";
import { useDragHandle } from "./sortable-panel";
const FoFcltCntRt: React.FC = () => {
const { dragHandleProps, isDragging } = useDragHandle();
const [year, setYear] = useState<string | null>(null);
const { selectedBasin, setSelectedBasin } = useStore(basinStore);
const operFcltStatus = useStore(operFcltStore, (state) => state.operFcltStatus);
@@ -57,9 +59,18 @@ const FoFcltCntRt: React.FC = () => {
return (
<div className="card card-border" style={{ height: "250px" }}>
<div className="card-header text-foreground">
<div
className={`card-header text-foreground cursor-grab active:cursor-grabbing ${isDragging ? 'opacity-50' : ''}`}
{...dragHandleProps}
title="헤더를 드래그하여 패널 순서 변경"
>
<h3 className="text-2xl font-medium">수계별 시설운영 개소수 및 가동률</h3>
<BasinSelect selectedBasin={selectedBasin} onValueChange={onBasinChange} />
<div
onPointerDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
<BasinSelect selectedBasin={selectedBasin} onValueChange={onBasinChange} />
</div>
</div>
<div className="h-70 p-4">
<div className="flex gap-2 h-full">
@@ -14,6 +14,7 @@ import {
import type { OperWqltContent } from "../model/fo-interface";
import { OperationApi, basinStore } from "../api/fo-service";
import { defaultInitOperWqltState } from "../api/fo-service";
import { useDragHandle } from "./sortable-panel";
// Chart.js 등록
ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip, Legend);
@@ -21,6 +22,7 @@ ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Title, T
type WaterQualityType = 'BOD' | 'TOC' | 'SS' | 'TP' | 'TN';
const FoWqltInflEffl: React.FC = () => {
const { dragHandleProps, isDragging } = useDragHandle();
const { selectedBasin, setSelectedBasin } = useStore(basinStore);
const [selectedTab, setSelectedTab] = useState<WaterQualityType>('BOD');
const [wqltData, setWqltData] = useState<OperWqltContent[]>([]);
@@ -195,9 +197,18 @@ const FoWqltInflEffl: React.FC = () => {
return (
<div className="card card-border" style={{ height: "250px" }}>
<div className="card-header text-foreground">
<div
className={`card-header text-foreground cursor-grab active:cursor-grabbing ${isDragging ? 'opacity-50' : ''}`}
{...dragHandleProps}
title="헤더를 드래그하여 패널 순서 변경"
>
<h3 className="text-2xl font-medium">수계별 유입ㆍ방류수질 분석</h3>
<BasinSelect selectedBasin={selectedBasin} onValueChange={onBasinChange} />
<div
onPointerDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
<BasinSelect selectedBasin={selectedBasin} onValueChange={onBasinChange} />
</div>
</div>
<div className="h-70 p-0 flex items-center justify-center">
<div style={{ width: "100%", maxWidth: 400, height: 180 }}>
+13 -2
View File
@@ -10,9 +10,11 @@ import {
noticePostTableColumns,
} from "../model/table-columns";
import { Button } from "@common/components";
import { useDragHandle } from "./sortable-panel";
const NoticeList: React.FC = () => {
const { dragHandleProps, isDragging } = useDragHandle();
const router = useRouter();
const noticePostQuery = useQuery({
queryKey: [ENDPOINT.BOARD_SERVICE.POSTS],
@@ -51,9 +53,18 @@ const NoticeList: React.FC = () => {
return (
<div className="card card-border !p-0" style={{ height: "220px" }}>
<div className="card-header !m-0 !border-none text-foreground">
<div
className={`card-header !m-0 !border-none text-foreground cursor-grab active:cursor-grabbing ${isDragging ? 'opacity-50' : ''}`}
{...dragHandleProps}
title="헤더를 드래그하여 패널 순서 변경"
>
<h3 className="text-2xl font-medium">공지사항</h3>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
<div
onPointerDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
</div>
</div>
{noticePostTableComponent}
</div>
+13 -2
View File
@@ -8,6 +8,7 @@ import { Line } from 'react-chartjs-2';
import { Button } from "@common/components";
import type { ReuseStatusContent } from "../model/fo-interface";
import { OperationApi, reuseStore } from "../api/fo-service";
import { useDragHandle } from "./sortable-panel";
import {
Chart as ChartJS,
CategoryScale,
@@ -36,6 +37,7 @@ ChartJS.register(
const ReuseChart: React.FC = () => {
const { dragHandleProps, isDragging } = useDragHandle();
const [activeIndex, setActiveIndex] = useState(0);
const intervalRef = useRef<NodeJS.Timeout | null>(null);
const reuseStatusData = useStore(
@@ -183,9 +185,18 @@ const ReuseChart: React.FC = () => {
return (
<div className="card card-border" style={{ height: "250px" }}>
<div className="card-header text-foreground">
<div
className={`card-header text-foreground cursor-grab active:cursor-grabbing ${isDragging ? 'opacity-50' : ''}`}
{...dragHandleProps}
title="헤더를 드래그하여 패널 순서 변경"
>
<h3 className="text-2xl font-medium">{chartItems[activeIndex]?.title}</h3>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
<div
onPointerDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
</div>
</div>
<div className="relative" style={{ maxWidth: 400, height: 180, marginLeft: 20 }}>
<div className="h-full">
@@ -7,8 +7,10 @@ import { useStore } from "zustand";
import { Button } from "@common/components";
import type { ReuseStatusContent } from "../model/fo-interface";
import { OperationApi, reuseStore} from "../api/fo-service";
import { useDragHandle } from "./sortable-panel";
const ReuseStatus: React.FC = () => {
const { dragHandleProps, isDragging } = useDragHandle();
// const [reuseStatusData, setReuseStatusData] = useState<ReuseStatusContent[]>([]);
const reuseStatusData = useStore(
reuseStore,
@@ -32,9 +34,18 @@ const ReuseStatus: React.FC = () => {
return (
<div className="card card-border" style={{ height: "250px" }}>
<div className="card-header text-foreground">
<div
className={`card-header text-foreground cursor-grab active:cursor-grabbing ${isDragging ? 'opacity-50' : ''}`}
{...dragHandleProps}
title="헤더를 드래그하여 패널 순서 변경"
>
<h3 className="text-2xl font-medium">물재이용 현황 (재이용량, m³)</h3>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
<div
onPointerDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
</div>
</div>
<div className="h-70 p-4">
<div className="w-full h-full flex items-center justify-center">
+13 -2
View File
@@ -17,12 +17,14 @@ import { Bar } from "react-chartjs-2";
import { Button } from "@common/components";
import type { PplLengthContent, ChartDataSet, OldPplChartData } from "../model/sn-interface";
import { SewerageApi, useOldPplStore,useMapOldPplStore, transformChartDataToMapData } from "../api/sn-service";
import { useDragHandle } from "./sortable-panel";
// ChartJS 컴포넌트 등록
ChartJS.register(CategoryScale, LinearScale, BarElement, Title, Tooltip, Legend);
export default function SnOldPpl() {
const { dragHandleProps, isDragging } = useDragHandle();
const [oldPplLenData, setOldPplLenData] = useState<PplLengthContent[]>([]);
const {chartData, setChartData} = useOldPplStore();
const {setMapData} = useMapOldPplStore();
@@ -170,9 +172,18 @@ export default function SnOldPpl() {
return (
<div className="card card-border" style={{ height: "250px" }}>
<div className="card-header text-foreground">
<div
className={`card-header text-foreground cursor-grab active:cursor-grabbing ${isDragging ? 'opacity-50' : ''}`}
{...dragHandleProps}
title="헤더를 드래그하여 패널 순서 변경"
>
<h3 className="text-2xl font-medium">노후 하수관로 현황</h3>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
<div
onPointerDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
</div>
</div>
<div className="h-70 p-0 flex items-center justify-center">
<div style={{ width: "100%", maxWidth: 400, height: 180 }}>
@@ -17,6 +17,7 @@ import { Bar } from "react-chartjs-2";
import { Button } from "@common/components";
import type { PplLengthContent } from "../model/sn-interface";
import { SewerageApi,useUsePplStore } from "../api/sn-service";
import { useDragHandle } from "./sortable-panel";
interface ChartDataSet {
label: string;
@@ -29,6 +30,7 @@ interface ChartDataSet {
ChartJS.register(CategoryScale, LinearScale, BarElement, Title, Tooltip, Legend);
export default function SnPplStatus() {
const { dragHandleProps, isDragging } = useDragHandle();
const {chartData, setChartData} = useUsePplStore();
const [usgPplLenData, setUsgPplLenData] = useState<PplLengthContent[]>([]);
@@ -157,10 +159,18 @@ export default function SnPplStatus() {
};
return (
<div className="card card-border" style={{ height: "250px" }}>
<div className="card-header text-foreground">
<div
className={`card-header text-foreground cursor-grab active:cursor-grabbing ${isDragging ? 'opacity-50' : ''}`}
{...dragHandleProps}
title="헤더를 드래그하여 패널 순서 변경"
>
<h3 className="text-2xl font-medium">오수관로 및 우수관로 현황</h3>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
<div
onPointerDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
</div>
</div>
<div className="h-60 p-4">
<div style={{ width: "100%", maxWidth: 400, height: 180 }}>
@@ -0,0 +1,64 @@
import { useSortable } from "@dnd-kit/sortable";
import { CSS } from "@dnd-kit/utilities";
import { createContext, useContext } from "react";
interface SortablePanelProps {
id: string;
children: React.ReactNode;
className?: string;
}
interface DragHandleContextValue {
dragHandleProps: React.HTMLAttributes<HTMLElement>;
isDragging: boolean;
}
const DragHandleContext = createContext<DragHandleContextValue | null>(null);
export function SortablePanel({ id, children, className }: SortablePanelProps) {
const {
attributes,
listeners,
setNodeRef,
transform,
transition,
isDragging,
} = useSortable({ id });
const style = {
transform: CSS.Transform.toString(transform),
transition,
opacity: isDragging ? 0.5 : 1,
};
const contextValue: DragHandleContextValue = {
dragHandleProps: { ...attributes, ...listeners },
isDragging,
};
return (
<DragHandleContext.Provider value={contextValue}>
<div
ref={setNodeRef}
style={style}
className={className}
>
{children}
</div>
</DragHandleContext.Provider>
);
}
export function useDragHandle() {
const context = useContext(DragHandleContext);
// Context가 없을 때 (서버 렌더링 또는 isMounted = false) 기본값 반환
if (!context) {
return {
dragHandleProps: {},
isDragging: false,
};
}
return context;
}
@@ -7,8 +7,10 @@ import { useDataTable } from "@/shared/lib";
import type { PageableList } from "@/shared/model";
import { supportTableColumns } from "../model/support-columns";
import { getSupportList, type Support } from "../api/support-service";
import { useDragHandle } from "./sortable-panel";
const SupportList: React.FC = () => {
const { dragHandleProps, isDragging } = useDragHandle();
const supportQuery = useQuery<PageableList<Support>>({
queryKey: [ENDPOINT.IC_SERVICE.GROUPING_STATISTICS],
queryFn: async () => {
@@ -29,7 +31,11 @@ const SupportList: React.FC = () => {
return (
<div className="card card-border !p-0" style={{ height: "220px" }}>
<div className="card-header !m-0 !border-none text-foreground">
<div
className={`card-header !m-0 !border-none text-foreground cursor-grab active:cursor-grabbing ${isDragging ? 'opacity-50' : ''}`}
{...dragHandleProps}
title="헤더를 드래그하여 패널 순서 변경"
>
<h3 className="text-2xl font-medium">지원현황</h3>
</div>
{supportTableComponent}
+1 -1
View File
@@ -102,7 +102,7 @@ function UsersPage() {
},
});
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
const handleSubmit = (e: React.SubmitEvent<HTMLFormElement>) => {
e.preventDefault();
setPagination({
...pagination,
+15
View File
@@ -1,6 +1,21 @@
import type { NextConfig } from "next";
const nextConfig: NextConfig = {
output: "standalone",
experimental: {
proxyTimeout: 600000,
},
eslint: {
ignoreDuringBuilds: true,
},
typescript: {
ignoreBuildErrors: true,
},
logging: {
fetches: {
fullUrl: true,
},
},
async rewrites() {
return {
afterFiles: [
+1 -1
View File
@@ -46,7 +46,7 @@
"@types/node": "^22.13.1",
"@types/webpack": "^5.28.5",
"eslint": "^9",
"eslint-config-next": "15.1.7",
"eslint-config-next": "15.3.8",
"postcss": "^8",
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.6.11",
@@ -4,13 +4,17 @@ import { useEffect } from "react";
import { client } from "@/shared/api";
import type { IUserInfo } from "@/shared/store";
import { getCookie, useUserStore } from "@/shared/lib";
import { getAuthLoginRedirectUrl, isAtLoginRedirectUrl } from "@common/network";
import { ENDPOINT, AUTH_USER_ID } from "@/shared/config";
import { LoginApi } from "../api/login-service";
const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
const { userInfo, setUserInfo } = useUserStore((state) => state);
async function authCheck() {
if (isAtLoginRedirectUrl(getAuthLoginRedirectUrl())) {
return;
}
const userId = getCookie(AUTH_USER_ID);
if (!userId) {
throw new Error("Missing required authentication tokens");
@@ -28,8 +32,6 @@ const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
await authCheck();
} catch (error) {
console.error(error);
await LoginApi.silentRefresh();
await authCheck();
}
})();
}, []);
@@ -83,7 +83,7 @@ function FaqPage({ bbsId }: { bbsId: string }) {
}
};
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
const handleSubmit = (e: React.SubmitEvent<HTMLFormElement>) => {
e.preventDefault();
refetch();
};
@@ -6,7 +6,7 @@ import { LoginApi } from "@/entities/auth";
import "./login.css";
function LoginPage() {
const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
const handleSubmit = async (e: React.SubmitEvent<HTMLFormElement>) => {
e.preventDefault();
const formData = new FormData(e.target as HTMLFormElement);
@@ -33,7 +33,7 @@ function SearchPage() {
queryFn: () => SearchApi.searchPost({ keyword: keyword, siteId }),
});
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
const handleSubmit = (e: React.SubmitEvent<HTMLFormElement>) => {
e.preventDefault();
const formData = new FormData(e.target as HTMLFormElement);
setKeyword(formData.get("keyword") as string);
@@ -84,7 +84,8 @@ function SearchPage() {
<TabsList className="mx-auto">
<TabsTrigger value="all">
전체 (
{ (data?.contsList?.length ?? 0) + (data?.boardList?.totalElements ?? 0)}
{(data?.contsList?.length ?? 0) +
(data?.boardList?.totalElements ?? 0)}
건)
</TabsTrigger>
<TabsTrigger value="contents">
@@ -134,7 +134,7 @@ function PostPage({ bbsId }: { bbsId: string }) {
}
};
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
const handleSubmit = (e: React.SubmitEvent<HTMLFormElement>) => {
e.preventDefault();
setPagination({
...pagination,
+3 -2
View File
@@ -1,7 +1,8 @@
# apps/cs/src/shared/config/env.ts 참고
NEXT_PUBLIC_PORT=3000
NEXT_PUBLIC_PROXY_HOST=http://localhost:3000
SERVER_API_URL=http://192.168.0.102:8000
NEXT_PUBLIC_SITE_ID=CS
NEXT_PUBLIC_SUB_DOMAIN=http://localhost:3000
NEXT_PUBLIC_SERVER_API_URL=http://192.168.0.102:8000
NEXT_PUBLIC_TINY_API_KEY=t9nc4z6inquvvd5pq1vea8wcp7lb01qmqseh6egms9vpaju2
NEXT_PUBLIC_TINY_API_KEY=t9nc4z6inquvvd5pq1vea8wcp7lb01qmqseh6egms9vpaju2
NEXT_PUBLIC_TINY_BASE_URL=
+2 -1
View File
@@ -38,4 +38,5 @@ yarn-error.log*
next-env.d.ts
.env*
!.env.example
!.env.example
/start_cs.log
+17
View File
@@ -0,0 +1,17 @@
import "@/app/styles/base.css";
export const metadata = {
title: "유역하수도 통합 정보플랫폼",
};
export default function AuthLayout({
children,
}: {
children: React.ReactNode;
}) {
return (
<html lang="ko">
<body>{children}</body>
</html>
);
}
@@ -6,6 +6,7 @@ import { BaseLayout } from "@common/components";
import type { MenuItem } from "@/entities/menu";
import { useMenuStore } from "@/shared/lib";
import { PageLayout } from "@/shared/ui/page-layout";
import { tokenManager } from "@/entities/auth";
export default function WithBaseLayout({
children,
@@ -26,6 +27,7 @@ export default function WithBaseLayout({
return (
<BaseLayout
queryClient={queryClient}
tokenManager={tokenManager}
currentPath={pathname ?? ""}
handleMenuClick={handleMenuClick}
>
@@ -0,0 +1,3 @@
import { NtftalkHistoryPage } from "@/pages/ntftalk-history";
export default NtftalkHistoryPage;
@@ -0,0 +1,3 @@
import { NtftalkTempPage } from "@/pages/ntftalk-temp";
export default NtftalkTempPage;

Some files were not shown because too many files have changed in this diff Show More