863 Commits

Author SHA1 Message Date
yjnoh
2e52a05f3e 수동 셀 작업 추가 2024-10-02 14:07:40 +09:00
yoosangwook
b6c73f8df8 Merge remote-tracking branch 'origin/dev' into dev 2024-10-02 14:06:13 +09:00
yoosangwook
fcfdd6547c feat: Add grid color setting modal 2024-10-02 14:05:33 +09:00
minsik
94c704345a Merge remote-tracking branch 'origin/qcast-pub' into dev 2024-10-02 13:52:34 +09:00
minsik
f7310b53d5 - 배치면 초기 설정 modal 추가 2024-10-02 13:51:31 +09:00
yoosangwook
d664136909 fix: Control modal handle props 2024-10-02 13:18:04 +09:00
yoosangwook
533b39f0ec refactor: Add modal handle 2024-10-02 11:33:49 +09:00
Jaeyoung Lee
b1c4338a73 Merge branch 'dev' into feature/test-jy 2024-10-02 11:13:17 +09:00
yjnoh
58ab20a807 Merge branch 'dev' into dev-yj 2024-09-30 17:10:44 +09:00
yjnoh
71e3d78c9b 모듈 흡착점 추가 2024-09-30 17:09:31 +09:00
Daseul Kim
82e751f2ca refactor: canvas plan 저장 시 swalFire(confirm)으로 변경 2024-09-30 17:08:40 +09:00
Daseul Kim
4ee102f1b9 feat: canvas plan 삭제 기능 추가 2024-09-30 16:36:10 +09:00
Daseul Kim
ee91d65c85 Merge branch 'dev' into dev-ds 2024-09-30 16:31:02 +09:00
05d2db69c3 외벽선 속성 설정 추가 2024-09-30 16:22:00 +09:00
0bf1fbfe56 외벽선 그리기 => 외벽선 속성 설정 작업중 2024-09-30 14:48:02 +09:00
Daseul Kim
8f3f74b608 refactor: canvas status 조회 함수에 userId 추가 방식 변경 2024-09-30 14:26:36 +09:00
minsik
64fa7c0642 외벽선 속성 modal 닫기 기능 추가 2024-09-30 13:30:39 +09:00
minsik
c28f798038 title 추가 2024-09-30 13:30:13 +09:00
minsik
1d8d46eb4a 🚨chore: Sync Sass 2024-09-30 13:29:22 +09:00
Jaeyoung Lee
0381fc837d Merge branch 'dev' into feature/test-jy
# Conflicts:
#	src/components/Roof2.jsx
2024-09-30 11:18:32 +09:00
minsik
202e91811f feat: PropertiesSetting 2024-09-30 09:45:56 +09:00
minsik
320f6f9e1f chore: withDraggable -> WithDraggable change file name 2024-09-30 09:45:14 +09:00
8f6d30e7b5 물건화면 showdatacount 이벤트 수정 2024-09-29 11:25:43 +09:00
29eeebcd04 물건관리 2024-09-28 19:41:25 +09:00
changkyu choi
955117a1c8 Merge branch 'main' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev-ck 2024-09-27 18:18:55 +09:00
changkyu choi
3190a4420a Canvas 상태 조회 조건 userId 추가 2024-09-27 18:16:09 +09:00
yoosangwook
2a110ff9c8 Merge branch 'dev' 2024-09-27 17:42:23 +09:00
yoosangwook
7c26319be0 Refactor profile button in Header component to include a link to "/roof2" 2024-09-27 17:42:03 +09:00
yoosangwook
c175ba35a2 Merge branch 'dev' 2024-09-27 17:31:32 +09:00
yoosangwook
8fe1620b05 chore: Update API server path in production environment 2024-09-27 17:31:13 +09:00
yoosangwook
e2526b4f5a Merge branch 'dev' 2024-09-27 17:24:43 +09:00
minsik
fab2a5f9ff Merge remote-tracking branch 'origin/qcast-pub' into dev 2024-09-27 17:17:23 +09:00
minsik
fd08fedf97 - 외벽선 작성 모달 수정
- icon 추가 및 스타일 수정
2024-09-27 17:15:54 +09:00
changkyu choi
8bd0166d08 점.선 그리드 설정 팝업 숨김 2024-09-27 17:07:27 +09:00
Jaeyoung Lee
170ede663b Merge branch 'dev' into feature/test-jy 2024-09-27 16:23:26 +09:00
Jaeyoung Lee
112ebea1c1 변별 속성 작업중 2024-09-27 16:23:04 +09:00
yoosangwook
621f829511 Merge branch 'dev' 2024-09-27 16:19:25 +09:00
yoosangwook
f47fbbe7bd refactor: Update toast functionality to use Swal 2024-09-27 16:10:36 +09:00
yoosangwook
8779444b9b refactor: Update toast functionality to use Swal 2024-09-27 15:50:59 +09:00
yoosangwook
cba28de088 refactor: Update toast functionality to use Swal 2024-09-27 15:40:30 +09:00
nalpari
8f36a5a170 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev 2024-09-27 15:11:35 +09:00
nalpari
febc257199 feat: Add LINE_TYPE constants for wall lines and sublines 2024-09-27 15:11:29 +09:00
bae554a8ce deleteObject 추가 2024-09-27 12:49:31 +09:00
592c076555 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev 2024-09-27 10:11:48 +09:00
40a0af8e9b 이벤트 분리 및 임의그리드 기능 추가 2024-09-27 10:11:34 +09:00
yoosangwook
84cb9aea60 feat: Add Swal hook 2024-09-27 10:06:11 +09:00
yoosangwook
1e944cc316 chore: Add SweetAlert2 lib 2024-09-27 10:05:58 +09:00
Daseul Kim
5ec615051d Merge branch 'dev-ds' into dev 2024-09-26 17:46:44 +09:00
Daseul Kim
4d4af3c1b5 refactor: modify canvas status api handling
- get 함수명 수정
- post/put 응답 toast 메세지 수정
2024-09-26 17:45:15 +09:00
changkyu choi
64d4b7e472 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev-ck 2024-09-26 15:50:10 +09:00