919 Commits

Author SHA1 Message Date
minsik
f09cce0e6a 도면 크기 설정 추가 2024-10-22 10:13:37 +09:00
minsik
30267703e7 usePopup 적용 2024-10-22 10:13:17 +09:00
yjnoh
1903834314 Merge branch 'dev' into dev-yj
# Conflicts:
#	src/components/floor-plan/CanvasMenu.jsx
2024-10-21 18:14:25 +09:00
yjnoh
51096a150d 메뉴 공통기능(텍스트, 치수선, 거리측정) 작업 2024-10-21 18:12:53 +09:00
f42ef08b09 점선 그리드 조건 수정 2024-10-21 17:32:35 +09:00
5be1561373
Merge Q-CAST-III-MR-139: 물건현황 화면 작업 2024-10-21 07:59:59 +00:00
220e6fe8c2 물건현황 화면 작업 2024-10-21 16:59:02 +09:00
5c8db48ac0 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
# Conflicts:
#	src/components/floor-plan/modal/setting01/GridOption.jsx
2024-10-21 16:59:00 +09:00
cc70bf1db5 캔버스 세팅 수정, arrow usePolygon으로 변경 2024-10-21 16:53:00 +09:00
minsik
82009ef281 모달 위치 수정 2024-10-21 16:27:19 +09:00
yjnoh
fd0fc1ed6e Merge branch 'dev' into dev-yj 2024-10-21 15:42:59 +09:00
minsik
f26429ef99 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into qcast-pub
# Conflicts:
#	src/app/layout.js
#	src/components/floor-plan/CanvasFrame.jsx
#	src/components/floor-plan/CanvasMenu.jsx
#	src/components/floor-plan/FloorPlan.jsx
#	src/locales/ja.json
#	src/locales/ko.json
#	src/styles/_modal.scss
2024-10-21 15:37:42 +09:00
minsik
e3ad0fc9cb Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev 2024-10-21 15:31:29 +09:00
minsik
fa2231d5b0 마크업 수정 2024-10-21 15:31:01 +09:00
yoosangwook
4f47eae1a4 fix: add key prop map syntax 2024-10-21 14:47:38 +09:00
yjnoh
f50e1675d0 Merge branch 'dev' into dev-yj 2024-10-21 14:32:26 +09:00
minsik
93ee8c14d9 글꼴 및 도면 크기 작업중 2024-10-21 14:13:43 +09:00
Daseul Kim
2b18ad2303 Merge branch 'dev-ds' into dev 2024-10-21 13:45:55 +09:00
Daseul Kim
05441f6a53 Merge branch 'dev' into dev-ds 2024-10-21 13:11:20 +09:00
49218ddc61 자동로그인 페이지 추가 2024-10-21 13:10:13 +09:00
909adc63fc 물건목록 리스트화면 수정 2024-10-21 11:23:29 +09:00
yoosangwook
1b44edbac3 feat: Add locale switch 2024-10-21 10:56:15 +09:00
Daseul Kim
8c0c7dc272 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev-ds 2024-10-21 09:46:35 +09:00
7e6b8ffff3 그리드 표시, 외벽선 표시, 지붕선 표시 추가 2024-10-18 18:09:48 +09:00
7d2d32f198 물건정보 2024-10-18 17:42:03 +09:00
e1a4ccaa08 캔버스 설정 hooks 추가 2024-10-18 17:28:42 +09:00
7f56e632ce 자료다운로드 수정 2024-10-18 16:39:58 +09:00
minsik
d6fbea705f popupManager canvasSetting 적용 2024-10-18 15:28:59 +09:00
yjnoh
e8d5883317 Merge branch 'dev' into dev-yj 2024-10-18 14:57:45 +09:00
yjnoh
e186ca1774 object 배치 수정 2024-10-18 14:57:25 +09:00
076ea3afba polygon LengthText 생성 위치 수정 2024-10-18 14:55:06 +09:00
162c521768 [QCAST] 내정보팝업 수정 2024-10-18 14:30:56 +09:00
325cef14f0 물건현황 화면 수정 react-select scss, svg 적용 2024-10-18 14:15:00 +09:00
3fccada6e8 Merge branch 'dev' into feature/qcast-100 2024-10-18 14:12:26 +09:00
yjnoh
8152b83b06 삼각형, 오각형 도머 작업 지붕 패턴 가로 세로 작업 2024-10-18 13:56:24 +09:00
Daseul Kim
696d4211e5 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev-ds 2024-10-18 13:47:34 +09:00
minsik
15af4655a3 popupManager 개발 중 2024-10-18 13:36:32 +09:00
698939b21f scroll={false} 원복 2024-10-18 13:04:00 +09:00
779261308a 물건현황 리스트 상세 자동완성 셋팅 수정 2024-10-18 12:57:43 +09:00
Jaeyoung Lee
4d9aaffa8d Merge branch 'dev' into feature/test-jy 2024-10-18 10:46:52 +09:00
b3ecda5637 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev 2024-10-18 10:40:35 +09:00
381af987f6 보조선 수동 작성 시 roofId 추가 2024-10-18 10:40:25 +09:00
Jaeyoung Lee
fd92766a4f Merge branch 'dev' into feature/test-jy
# Conflicts:
#	src/util/qpolygon-utils.js
2024-10-18 10:33:54 +09:00
Daseul Kim
0f97344d0a refactor: CanvasLayout 컴포넌트 내 sesion 수정, 신규 plan id를 uuid로 수정 2024-10-18 10:30:06 +09:00
Jaeyoung Lee
0bc0e73a10 지붕 모양 변경 작업 중 2024-10-18 10:29:31 +09:00
32485efb93 물건정보 & 설계의뢰 2024-10-18 09:58:29 +09:00
yoosangwook
451f742b0f refactor: layout.js and CanvasLayout.jsx
- Add SessionProvider to layout.js to handle user session
- Import SessionContext and useContext in CanvasLayout.jsx to access session data
- Remove unnecessary comments and console.log statements
2024-10-18 09:35:40 +09:00
be866218fa 물건현황 react-select 용 퍼블 scss 머지 2024-10-18 08:51:23 +09:00
cdf6a43cac 미사용 라이브러리 삭제 & 물건현황 설계의뢰 불러오기 팝업적용증 2024-10-17 17:50:33 +09:00
Daseul Kim
1cde324337 refactor: canvas plan confirm 메세지 다국어 수정 2024-10-17 17:35:09 +09:00