Commit Graph

344 Commits

Author SHA1 Message Date
lsw
1f5b66b5ff Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop_ivy 2022-10-11 15:19:18 +09:00
Sangwon Lee
a5152f14ea Update modules.xml 2022-10-11 15:17:53 +09:00
Sangwon Lee
5330741030 Update .gitignore 2022-10-11 15:13:53 +09:00
lsw
75b77e755d [fix] ignore idea/modules.xml 2022-10-11 15:10:25 +09:00
Sangwon Lee
d0adc78744 Merge pull request #59 from e8133/develop_ivy
[feat] 서비스연결중
2022-10-11 14:49:32 +09:00
lsw
a5902ee083 [feat] 서비스 연결 2022-10-11 14:46:54 +09:00
godyuo
5b54390317 Merge pull request #57 from godyuo/develop_backend
Update widget, widget view, dataset API
2022-10-06 16:50:11 +09:00
godyuo
3890955215 Update app.module.ts 2022-10-06 16:47:20 +09:00
손승우
3c39ca1f1d update widget, widgetview, dataset api 2022-10-06 16:39:56 +09:00
SA K
60dc05c09a Merge pull request #56 from sakang07/develop
Add funnel, heatmap chart
2022-10-05 21:06:16 +09:00
Seula Kang
97f13689d2 [feat] Editing heatmap chart 2022-10-05 21:03:09 +09:00
Seula Kang
3df84e1c1f [fix] Fix errors in the chart and add a fixed style when scrolling in the widget box 2022-10-05 21:00:20 +09:00
Seula Kang
7897cc32a0 [feat] Add funnel, heatmap chart #55 2022-10-05 15:14:40 +09:00
Seula Kang
eafff9a085 [style] Add icon image(temporary) 2022-10-05 15:11:22 +09:00
Seula Kang
37e4a5d793 [style] Add icon image(temporary) 2022-10-05 12:16:10 +09:00
Seula Kang
e64dafb498 [style] Apply custom color palette 2022-10-05 10:25:08 +09:00
SA K
f8e955d30b Merge pull request #54 from sakang07/develop
Add treemap, sunburst charts and apply aggregation in the pie chart
2022-10-04 18:31:54 +09:00
Seula Kang
663608b726 [feat] Add sunburst chart #53 2022-10-04 18:28:31 +09:00
Seula Kang
c9492efd8e [fix] Fix an issue that does not apply color settings in the treemap chart 2022-10-04 16:41:54 +09:00
Seula Kang
810f58f16e [feat] Apply aggregation at pie chart 2022-10-04 16:25:51 +09:00
Seula Kang
2428dc8e80 [feat] Add treemap chart #52 2022-10-04 14:28:21 +09:00
SA K
e2796ca57e Merge pull request #51 from sakang07/develop
Add candlestick chart, gauge chart
2022-10-04 10:51:58 +09:00
Seula Kang
0462cbefe5 [feat] Add candlestick chart #50 2022-10-04 10:48:19 +09:00
Seula Kang
e93fc4add9 [feat] Adding treemap chart and candlestick chart 2022-09-30 17:04:40 +09:00
Seula Kang
51640d5d40 [feat] Add gauge chart #49 2022-09-30 16:24:00 +09:00
Seula Kang
cc04f85c67 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-09-29 18:55:03 +09:00
Seula Kang
ef731f555e [feat] Modify widget creation steps so that do not click the next button 2022-09-29 18:54:34 +09:00
SA K
b05fb0b692 Merge pull request #48 from sakang07/develop
Add radar chart and fix some error about chart
2022-09-29 18:03:59 +09:00
Seula Kang
0782cce2ae [feat] Add radar chart #47 2022-09-29 17:59:25 +09:00
손승우
cbad21230e dataset, widget, widget-view CRUD API setting 2022-09-29 15:54:52 +09:00
Seula Kang
c905c00bc8 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-09-29 14:08:12 +09:00
Seula Kang
c83a87ed71 [fix] Fix error of charts 2022-09-29 14:07:53 +09:00
Jeon Jae Yeoul
d49ce20afd Merge pull request #45 from jyjeun/jyjeun_develop
start:local 생성
2022-09-28 19:56:26 +09:00
jaeyeouljeon
3ab7fbc469 Merge branch 'develop' into jyjeun_develop 2022-09-28 19:54:40 +09:00
jaeyeouljeon
62aac61680 local json 파일 바라보고 개발할시
start:local 로 실행할 수 있게 처리
env.local 생성
2022-09-28 19:53:44 +09:00
Seula Kang
ecb7d67b90 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-09-28 19:40:26 +09:00
ivy
e23a099e19 [feat] widget properties change 2022-09-28 19:38:46 +09:00
Seula Kang
b383c48f0d Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-09-28 19:12:30 +09:00
Sangwon Lee
49b70a5951 Merge pull request #44 from e8133/develop_ivy
[feat] change name
2022-09-28 19:12:20 +09:00
ivy
2d31db34c7 [feat] change name 2022-09-28 19:10:52 +09:00
Jeon Jae Yeoul
5522fbb08c Merge pull request #43 from jyjeun/jyjeun_develop
서비스 조회 변경
2022-09-28 19:02:24 +09:00
jaeyeouljeon
d3d5542255 서비스 연결 안되어 있는 화면은 local sample json 가져오게 변경 2022-09-28 18:53:34 +09:00
HeeseonYoon
23c3539c9b Merge pull request #41 from yathoo88/develop_backend_yhs
front merge
2022-09-28 18:50:16 +09:00
Seula Kang
e138868472 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop
 Conflicts:
	backend-api/src/main.ts
2022-09-28 18:34:56 +09:00
Seula Kang
0eea7ad48e [feat] Adding aggregation functionality 2022-09-28 18:31:17 +09:00
jaeyeouljeon
c71d7871bc Merge branch 'develop' into jyjeun_develop 2022-09-28 18:26:40 +09:00
jaeyeouljeon
3debb16f96 서비스 연결 안되어 있는 화면은 local sample json 가져오게 변경 2022-09-28 18:26:20 +09:00
HeeseonYoon
acb4070b91 Merge pull request #40 from yathoo88/develop_backend_yhs
[feat] 데이터베이스 저장 및 조회 타입 변경, 템플릿 추천 목록 조회
2022-09-28 18:24:22 +09:00
HeeseonYoon
6eb8369f58 Merge branch 'develop' into develop_backend_yhs 2022-09-28 18:24:13 +09:00
Sangwon Lee
091286a553 Merge pull request #39 from e8133/develop_ivy
[feat] add alert, confirm component
2022-09-28 18:22:14 +09:00