3265 Commits

Author SHA1 Message Date
aa3337a383 Merge branch 'feature/test' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into feature/hj
# Conflicts:
#	src/components/fabric/QLine.js
#	src/hooks/useCanvas.js
#	src/util/qpolygon-utils.js
2024-07-29 15:35:31 +09:00
5b1dd76aa6 QLine, QPolygon canvas 역직렬화 문제 수정
문제 없을 시 제거
2024-07-29 15:33:43 +09:00
yjnoh
96b1e5822f 8각 ㄷ자 패턴 작업 2024-07-29 11:32:30 +09:00
bdd928ba26 QLine 복구 작업중 2024-07-27 16:34:47 +09:00
Jaeyoung Lee
217ce62451 다각형 테스트 및 작업 중 2024-07-26 18:38:15 +09:00
yjnoh
7e39eee4bf Merge branches 'feature/test' and 'feature/test' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into feature/test 2024-07-26 18:29:41 +09:00
yjnoh
d88fb8f389 8각 가로 작업 2024-07-26 18:29:33 +09:00
94f1b9b28a 지붕 선그리기 작업중 2024-07-26 18:29:21 +09:00
aaeccdb6dd clear 추가 2024-07-26 17:11:01 +09:00
11fec70ac2 guideLine 추가 2024-07-26 15:40:55 +09:00
58820d2bf2 팔각형 타입 추가 및 시작점 큰 빨간 원으로 수정 2024-07-26 13:53:17 +09:00
6ecfab2472 import 정리 2024-07-26 13:42:13 +09:00
42b2c5371e Merge branch 'feature/test' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into feature/hj 2024-07-26 12:59:47 +09:00
adbf79ecd3 이벤트 수정 및 지붕선 그리기 수정 2024-07-26 12:59:27 +09:00
Jaeyoung Lee
2159a4b64b 테스트중 2024-07-25 17:58:28 +09:00
yoosangwook
f243cd2d74 feature: 템플릿B 케이스 지붕패턴 입히기 2024-07-25 13:19:48 +09:00
yjnoh
9601c62824 폴리곤 패턴 배열로 수정 2024-07-24 18:08:54 +09:00
Jaeyoung Lee
1704efc9d5 Merge branch 'feature/test' into feature/test-jy
# Conflicts:
#	src/components/Roof2.jsx
#	src/components/fabric/QPolygon.js
2024-07-24 14:48:53 +09:00
Jaeyoung Lee
b8cba10fe2 테스트중 2024-07-24 14:46:50 +09:00
yoosangwook
8d944afb0c Merge branch 'feature/test' 2024-07-24 12:50:59 +09:00
204d1ac3e4 템플릿 기둥 작업중 2024-07-24 10:11:03 +09:00
38881ead6a Merge branch 'feature/test' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into feature/hj
# Conflicts:
#	src/hooks/useMode.js
2024-07-23 18:14:44 +09:00
229c4eb876 QLine default direction 추가 2024-07-23 18:08:38 +09:00
0402b8ef05 Merge branch 'feature/test' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into feature/test 2024-07-23 18:05:06 +09:00
3ee113eb34 대각일 경우 오류 처리 2024-07-23 18:04:49 +09:00
yjnoh
1a37daca3d 지붕 8각 자동 그리기 테스트 2024-07-23 18:01:30 +09:00
933f2a67c4 Merge branch 'feature/test' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into feature/hj
# Conflicts:
#	src/hooks/useMode.js
2024-07-23 17:25:05 +09:00
75d610433e editMode 키보드 추가 2024-07-23 17:22:50 +09:00
f0a78ca5b3 sortedPoint 다시 수정 2024-07-23 16:15:47 +09:00
69bbd18b51 Merge branch 'feature/test' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into feature/hj
# Conflicts:
#	src/components/Roof2.jsx
#	src/hooks/useMode.js
#	src/store/canvasAtom.js
#	src/util/canvas-util.js
2024-07-23 15:54:39 +09:00
084c09de6e sortedPoint 수정 2024-07-23 15:51:15 +09:00
cb38a3815f 작업중 2024-07-23 15:47:08 +09:00
Jaeyoung Lee
f9939c4c1e Merge branch 'feature/test' into feature/test-jy 2024-07-23 09:56:17 +09:00
89007b79ac test 2024-07-22 18:35:45 +09:00
Jaeyoung Lee
9cf523dac4 다각형 테스트 중 2024-07-22 18:35:19 +09:00
ae5009ba2b 점 8개 오류 2024-07-22 17:03:32 +09:00
yjnoh
e34f3c002a 지붕모양 지그재그패턴 추가 2024-07-22 16:17:35 +09:00
yjnoh
88a3ee601c 지붕 패턴 1 적용 2024-07-22 15:16:46 +09:00
3b9abe4bb3 group에 추가 2024-07-22 12:00:00 +09:00
yoosangwook
8089caafdf conflict resolve 2024-07-22 11:58:26 +09:00
yjnoh
4ae2b17e8d 세로형 폴리곤 패턴 추가 2024-07-22 11:49:40 +09:00
yoosangwook
b321f75e6f Merge branch 'feature/mongo-test' into feature/hj 2024-07-22 11:48:40 +09:00
yoosangwook
19df114848 test 2024-07-22 11:47:38 +09:00
d97ba2bec7 작업중 2024-07-22 11:35:15 +09:00
nalpari
4c1fb002c1 겨우 성공(효준짱한테 혼날뻔)
아오 술땡겨
2024-07-21 23:20:34 +09:00
0449d512f2 test 2024-07-21 11:20:23 +09:00
e5de66bc94 6각형 polygon make 테스트 2024-07-20 15:20:41 +09:00
Jaeyoung Lee
a061ec018d Merge branch 'feature/test' into feature/test-jy
# Conflicts:
#	src/components/fabric/QPolygon.js
2024-07-19 20:31:50 +09:00
Jaeyoung Lee
01faaead93 테스트 중 직각일 경우 지붕 라인 그리기 처리. 2024-07-19 20:30:12 +09:00
3d126dbfc7 aa 2024-07-19 19:00:07 +09:00