Jaeyoung Lee
|
b03cea96bb
|
Merge branch 'dev' into feature/test-jy
# Conflicts:
# src/components/Roof2.jsx
# src/components/fabric/QPolygon.js
# src/hooks/useMode.js
# src/util/qpolygon-utils.js
|
2024-08-01 13:51:34 +09:00 |
|
yjnoh
|
7b3db8e8b7
|
Merge branch 'dev' into dev-yj
|
2024-08-01 13:50:53 +09:00 |
|
yjnoh
|
df1ef24576
|
cell 작업
|
2024-08-01 13:50:33 +09:00 |
|
yoosangwook
|
38258ba278
|
fix: canvas size 조절 기능 수정
|
2024-08-01 13:49:34 +09:00 |
|
minsik
|
af7ed4f2f4
|
- 메뉴 라우터 추가
|
2024-08-01 13:37:16 +09:00 |
|
Jaeyoung Lee
|
0559b2d8e4
|
도형 외곽선 로직 테스트중
|
2024-08-01 13:24:51 +09:00 |
|
yoosangwook
|
1f89d3f9d8
|
fix: canvas size 조절 기능 수정
|
2024-08-01 13:23:51 +09:00 |
|
|
|
4dbebf4cf9
|
import 수정
|
2024-07-31 10:58:06 +09:00 |
|
|
|
76d9a046a4
|
QPolygon 수정
|
2024-07-31 10:55:36 +09:00 |
|
|
|
71494d0369
|
안쓰는거 제거
|
2024-07-31 10:55:04 +09:00 |
|
yjnoh
|
14a4bfa0d9
|
가대 설치 추가
|
2024-07-31 10:22:40 +09:00 |
|
yjnoh
|
e3ac278379
|
Merge branch 'feature/test' into test-yj
|
2024-07-31 10:13:56 +09:00 |
|
|
|
ba590c4f9f
|
Qpolygon 수정
|
2024-07-31 10:13:11 +09:00 |
|
Jaeyoung Lee
|
b3d8928941
|
Merge branch 'feature/test' into feature/test-jy
# Conflicts:
# src/components/fabric/QPolygon.js
|
2024-07-31 09:55:59 +09:00 |
|
yjnoh
|
6bf0a934c2
|
Merge branch 'feature/test' into test-yj
|
2024-07-31 09:47:40 +09:00 |
|
|
|
4e39987ed4
|
QPolygon 수정
|
2024-07-30 21:33:58 +09:00 |
|
Jaeyoung Lee
|
a6f0020542
|
Merge branch 'feature/test' into feature/test-jy
# Conflicts:
# src/components/Roof2.jsx
|
2024-07-30 17:58:48 +09:00 |
|
Jaeyoung Lee
|
3feaf79306
|
다각형 시도 중
|
2024-07-30 17:58:03 +09:00 |
|
yjnoh
|
819ba5c8ca
|
test
|
2024-07-30 16:35:00 +09:00 |
|
yjnoh
|
a614438b27
|
템플릿 타입 recoil 추가
|
2024-07-30 15:27:16 +09:00 |
|
Jaeyoung Lee
|
e29d581f10
|
Merge branch 'feature/test' into feature/test-jy
# Conflicts:
# src/components/Roof2.jsx
# src/components/fabric/QPolygon.js
# src/hooks/useMode.js
|
2024-07-30 13:39:20 +09:00 |
|
Jaeyoung Lee
|
89fbc1c1b4
|
작업 중
|
2024-07-30 13:34:47 +09:00 |
|
Jaeyoung Lee
|
e685e53c5f
|
디버깅 및 리팩토링 중
|
2024-07-29 18:21:42 +09:00 |
|
|
|
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 |
|
|
|
bdd928ba26
|
QLine 복구 작업중
|
2024-07-27 16:34:47 +09:00 |
|
Jaeyoung Lee
|
217ce62451
|
다각형 테스트 및 작업 중
|
2024-07-26 18:38:15 +09:00 |
|
|
|
94f1b9b28a
|
지붕 선그리기 작업중
|
2024-07-26 18:29:21 +09:00 |
|
|
|
58820d2bf2
|
팔각형 타입 추가 및 시작점 큰 빨간 원으로 수정
|
2024-07-26 13:53:17 +09:00 |
|
|
|
6ecfab2472
|
import 정리
|
2024-07-26 13:42:13 +09:00 |
|
|
|
adbf79ecd3
|
이벤트 수정 및 지붕선 그리기 수정
|
2024-07-26 12:59:27 +09:00 |
|
Jaeyoung Lee
|
2159a4b64b
|
테스트중
|
2024-07-25 17:58:28 +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 |
|
|
|
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 |
|
yjnoh
|
1a37daca3d
|
지붕 8각 자동 그리기 테스트
|
2024-07-23 18:01:30 +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 |
|
|
|
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 |
|
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 |
|
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 |
|
