|
|
6ccadf80af
|
보조선 intersect 검사 수정
|
2024-11-05 15:15:52 +09:00 |
|
Jaeyoung Lee
|
1fb9e26efc
|
lock file add ignore
|
2024-11-05 15:12:58 +09:00 |
|
Jaeyoung Lee
|
57ee521410
|
Merge branch 'dev' into feature/test-jy
# Conflicts:
# src/hooks/roofcover/usePropertiesSetting.js
# src/hooks/roofcover/useRoofAllocationSetting.js
|
2024-11-05 14:47:04 +09:00 |
|
Jaeyoung Lee
|
3a94703a8f
|
git clear cache
|
2024-11-05 14:45:08 +09:00 |
|
minsik
|
6871b41659
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-11-05 13:17:39 +09:00 |
|
minsik
|
13f9577e62
|
Merge branch 'qcast-pub' into dev
|
2024-11-05 13:17:20 +09:00 |
|
|
|
30dc9a1215
|
견적서 작업중
|
2024-11-05 13:14:53 +09:00 |
|
minsik
|
34e3872123
|
다국어 추가
|
2024-11-05 13:13:22 +09:00 |
|
|
|
70ebb63fa7
|
api 호출 제거
|
2024-11-05 10:17:40 +09:00 |
|
yoosangwook
|
2950eb80c0
|
Merge remote-tracking branch 'origin/feature/Q-CAST-III-T-22' into feature/Q-CAST-III-T-22
|
2024-11-04 18:05:04 +09:00 |
|
yoosangwook
|
f71cc701c2
|
feat: add canvas bg attribute
|
2024-11-04 18:04:50 +09:00 |
|
yoosangwook
|
b2fb166029
|
fix: 도면을 이미지로 컨버팅 후 이미지 업로드 구현
|
2024-11-04 18:04:01 +09:00 |
|
yoosangwook
|
b1f16e55e3
|
feat: Add floor-plan image load feature
|
2024-11-04 18:04:01 +09:00 |
|
yoosangwook
|
a1f80b0752
|
🚨chore: Sync Sass
|
2024-11-04 18:03:43 +09:00 |
|
|
|
187f11df19
|
견적서 상세 화면 작업중
|
2024-11-04 17:54:34 +09:00 |
|
minsik
|
c7549b243a
|
🚨chore: Sync Sass
|
2024-11-04 17:50:57 +09:00 |
|
minsik
|
f42207dfad
|
Merge branch 'qcast-pub' into dev
|
2024-11-04 17:37:34 +09:00 |
|
minsik
|
204ab66f90
|
🚨chore: Sync Sass
|
2024-11-04 17:37:01 +09:00 |
|
minsik
|
62ef25c048
|
회로 및 가대 설정 다국어 추가
|
2024-11-04 17:36:18 +09:00 |
|
yoosangwook
|
56916a884f
|
feat: add canvas bg attribute
|
2024-11-04 17:15:50 +09:00 |
|
minsik
|
2009caf522
|
Merge branch 'qcast-pub' into dev
|
2024-11-04 16:19:53 +09:00 |
|
minsik
|
45c9abd86a
|
modal 버그 수정
|
2024-11-04 16:19:20 +09:00 |
|
minsik
|
40fa42b19b
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into qcast-pub
|
2024-11-04 16:15:51 +09:00 |
|
minsik
|
291109719a
|
Merge branch 'qcast-pub' into dev
|
2024-11-04 16:12:38 +09:00 |
|
minsik
|
1838320606
|
modal 버그 수정
|
2024-11-04 16:11:58 +09:00 |
|
|
|
4891eb50aa
|
지붕면 할당 시 방향 설정 작업 추가
|
2024-11-04 16:02:02 +09:00 |
|
|
|
19e22ba9ea
|
보조선 자르기 로직 추가
|
2024-11-04 15:15:36 +09:00 |
|
|
|
c60db3cda5
|
같은좌표판단 1오차 허용
|
2024-11-04 15:07:27 +09:00 |
|
|
|
04e8e66b04
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
|
2024-11-04 14:46:50 +09:00 |
|
|
|
0adfe0916c
|
polygon name 수정, 지붕 나누기 수정
|
2024-11-04 14:46:38 +09:00 |
|
yoosangwook
|
2a4d37e2e3
|
Merge remote-tracking branch 'origin/feature/Q-CAST-III-T-22' into feature/Q-CAST-III-T-22
|
2024-11-04 14:26:15 +09:00 |
|
yoosangwook
|
d2c4e169b1
|
fix: 도면을 이미지로 컨버팅 후 이미지 업로드 구현
|
2024-11-04 14:25:43 +09:00 |
|
yoosangwook
|
4b56a0a5f8
|
feat: Add floor-plan image load feature
|
2024-11-04 14:25:43 +09:00 |
|
|
|
c476709850
|
견적서 상세화면 메세지 & 견적서 상세화면 상단 CanvasMenu 저장 버튼 관련
|
2024-11-04 14:11:27 +09:00 |
|
nalpari
|
f8f769fd49
|
feat: add useEstimateController
|
2024-11-04 13:40:42 +09:00 |
|
Jaeyoung Lee
|
da26628f69
|
Merge branch 'dev' into feature/test-jy
# Conflicts:
# src/app/roof2/page.jsx
# src/util/canvas-util.js
|
2024-11-04 09:48:46 +09:00 |
|
Jaeyoung Lee
|
f5661cd01f
|
지붕 형상 변경 작업 중
|
2024-11-04 09:39:59 +09:00 |
|
minsik
|
44e5041b4d
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into qcast-pub
# Conflicts:
# src/hooks/useContextMenu.js
|
2024-11-04 09:23:48 +09:00 |
|
yjnoh
|
57157bb82f
|
배치면 개구, 그림자 크기조절 추가
|
2024-11-04 09:16:33 +09:00 |
|
yjnoh
|
00418f5071
|
roof2 세션 오류 삭제
|
2024-11-04 09:13:04 +09:00 |
|
yjnoh
|
df63fb2218
|
Merge branch 'dev' into dev-yj
|
2024-11-04 09:12:38 +09:00 |
|
|
|
88ffb2c4ee
|
견적서 링크 수정, canvasMenu에 견적서 인경우 버튼명 변경
|
2024-11-01 18:11:05 +09:00 |
|
minsik
|
ea8b4a3e36
|
contextmenu modal 추가
|
2024-11-01 18:10:42 +09:00 |
|
minsik
|
51c4fcfe14
|
canvas menu 삭제 버튼 삭제 및 zoom 버튼기능 수정
|
2024-11-01 18:10:27 +09:00 |
|
yjnoh
|
223bf2dddf
|
오각형 도머 크기변경, 이동 기능 추가
|
2024-11-01 17:46:58 +09:00 |
|
yoosangwook
|
0b3390546f
|
fix: 도면을 이미지로 컨버팅 후 이미지 업로드 구현
|
2024-11-01 17:43:15 +09:00 |
|
yjnoh
|
e0cf50beec
|
삼각형 도머 크기 변경
|
2024-11-01 15:37:05 +09:00 |
|
yjnoh
|
088b0c5e77
|
Merge branch 'dev' into dev-yj
# Conflicts:
# src/hooks/common/useCommonUtils.js
# src/hooks/object/useObjectBatch.js
# src/hooks/useContextMenu.js
|
2024-11-01 15:36:27 +09:00 |
|
|
|
6099faab3f
|
물건목록화면 수정
|
2024-11-01 14:02:39 +09:00 |
|
yoosangwook
|
0df127de17
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-11-01 13:22:13 +09:00 |
|