578 Commits
v0.1 ... main

Author SHA1 Message Date
godyuo
6f3d09c43e Merge pull request #417 from godyuo/develop
update typeorm-seeding
2023-04-20 12:12:27 +09:00
godyuo
ef4610a11f Merge branch 'vanillabrain:develop' into develop 2023-04-20 12:10:16 +09:00
손승우
6fa38b1463 update: seed package 2023-04-19 10:48:00 +09:00
Dosun Yun
23d9b232c8 Merge branch 'feature' into develop 2023-03-04 09:45:23 +09:00
Dosun Yun
6d295497d9 refactoring modules.xml 2023-03-04 09:45:10 +09:00
godyuo
1253ac5f08 Update .env.ci 2023-03-02 11:54:48 +09:00
godyuo
745883a23b Merge pull request #416 from godyuo/develop
update path
2023-03-02 11:45:39 +09:00
손승우
775d0e55e6 update path 2023-03-02 11:43:24 +09:00
godyuo
6dad88affe Update .env.ci 2023-03-02 10:57:07 +09:00
SA K
d8c5466cc1 Merge pull request #415 from sakang07/develop
Add series label option to chart
2023-02-27 10:53:17 +09:00
SA K
0b43978d6a [FE-chart] Add series label option at Mixed chart #413 2023-02-25 16:48:54 +09:00
SA K
e9f72b7290 [FE-chart] Add series label option at Radar, Gauge chart #413 2023-02-24 10:53:11 +09:00
SA K
3c58d35ed5 Merge pull request #414 from sakang07/develop
Fix bugs and Add features
2023-02-23 20:54:59 +09:00
SA K
e9abc4b49f [FE-chart] Add series label option #413 2023-02-23 16:19:52 +09:00
SA K
750916d49c [FE-chart] Add the option to hide the title to the numeric board #412 2023-02-23 15:36:13 +09:00
SA K
51ae590182 [FE-widget] Fix a widget creation page title bug #411 2023-02-23 14:42:21 +09:00
godyuo
c1495716b6 Merge pull request #410 from vanillabrain/feature
Feature > develop
2023-02-21 18:29:33 +09:00
godyuo
b7384113c8 Update README.md 2023-02-17 19:21:34 +09:00
godyuo
fbb1fc35fc Update README.md 2023-02-17 19:20:07 +09:00
godyuo
c0cac23f98 Merge pull request #409 from godyuo/develop_sqlite
Develop sqlite setting
2023-02-17 18:15:15 +09:00
godyuo
dbedadca7e Update README.md 2023-02-17 18:14:39 +09:00
손승우
427e858786 Merge remote-tracking branch 'origin/develop_sqlite' into develop_sqlite 2023-02-17 18:12:08 +09:00
손승우
053b8ed28f add: changInfo crypto 2023-02-17 18:12:01 +09:00
godyuo
273a2594a2 Update README.md 2023-02-17 17:15:51 +09:00
godyuo
0e302a2d68 Update README.md 2023-02-17 14:28:59 +09:00
손승우
39aac2dea5 add: cryptoLogin 2023-02-17 14:27:21 +09:00
godyuo
04e7d835d6 Update README.md 2023-02-17 13:21:19 +09:00
godyuo
b062f06cb9 Update README.md 2023-02-17 13:18:24 +09:00
손승우
cf0d8a36fd add: seedLibrary 2023-02-17 12:27:50 +09:00
손승우
2e96c3a8dc add: add seedData 2023-02-16 19:08:13 +09:00
손승우
469362c664 update: update widgetQuery 2023-02-16 11:05:22 +09:00
손승우
62815a1036 update: update sqlite.db 2023-02-15 18:42:55 +09:00
손승우
0ba8fcdccb update: update shareToken entity 2023-02-15 17:03:43 +09:00
손승우
2a472a5e9e update: default setting 2023-02-15 15:27:01 +09:00
손승우
ac8f2735c3 Merge remote-tracking branch 'origin/develop_sqlite' into develop_sqlite 2023-02-15 15:09:32 +09:00
손승우
07a34550c7 add: default db 추가 2023-02-15 15:09:26 +09:00
godyuo
0d2fe924b9 Merge branch 'vanillabrain:main' into develop_sqlite 2023-02-15 14:35:15 +09:00
손승우
68083e9aa3 Merge remote-tracking branch 'origin/develop_backend' into develop_sqlite
# Conflicts:
#	backend-api/.env.sample.dev
#	backend-api/Dockerfile
#	backend-api/docker-compose.yml
#	backend-api/package-lock.json
#	backend-api/src/app.module.ts
#	backend-api/src/database/connection/connection.service.ts
#	backend-api/src/database/database.controller.ts
#	backend-api/src/database/database.service.ts
#	backend-api/src/database/dto/create-database.dto.ts
#	backend-api/src/database/entities/database.entity.ts
#	backend-api/src/main.ts
2023-02-15 11:27:17 +09:00
손승우
7988db8d7f update: entity 변경 2023-02-15 11:20:50 +09:00
godyuo
b1a433d83a Merge pull request #408 from godyuo/feature
update: update dashboard.service.ts
2023-02-02 22:33:03 +09:00
손승우
fe17ace2db update: update dashboard.service.ts 2023-02-02 22:31:57 +09:00
godyuo
50da9b2822 Merge pull request #407 from godyuo/feature
update: update docker-compose clear
2023-01-02 18:18:27 +09:00
손승우
762fbef35a Merge remote-tracking branch 'origin/feature' into feature 2023-01-02 18:17:48 +09:00
손승우
e90e42c134 update: update docker-compose clear 2023-01-02 18:17:40 +09:00
godyuo
26e57227b0 Merge pull request #406 from godyuo/feature
fix: fix docker-compose local dump
2022-12-23 18:22:36 +09:00
손승우
4a3d19a3ec Merge remote-tracking branch 'origin/feature' into feature 2022-12-23 18:21:43 +09:00
손승우
c5c7a020af fix: fix docker-compose local dump 2022-12-23 18:21:04 +09:00
godyuo
d27a97ccfd Merge pull request #405 from godyuo/feature
add: add docker-compose
2022-12-21 19:17:27 +09:00
손승우
2ccfcfb0ba Merge remote-tracking branch 'origin/feature' into feature 2022-12-21 19:16:44 +09:00
손승우
1b623d5257 add: add docker-compose 2022-12-21 19:16:19 +09:00
SA K
e018dea72e Merge pull request #404 from sakang07/feature
Modify footer
2022-12-19 18:01:41 +09:00
SA K
454a6115f7 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-19 14:59:09 +09:00
godyuo
5e12b8e375 Merge pull request #403 from godyuo/feature
fix: fix sentence
2022-12-19 14:42:38 +09:00
손승우
9cc9ae0404 Merge remote-tracking branch 'origin/feature' into feature 2022-12-19 14:41:57 +09:00
손승우
a7c986fc52 fix: fix sentence 2022-12-19 14:41:50 +09:00
SA K
d3e673186a [FE] footer link floating in a new window 2022-12-19 11:16:25 +09:00
SA K
04c0715552 Merge pull request #402 from sakang07/feature
Remove token from local storage when refresh token expires
2022-12-19 11:05:40 +09:00
SA K
0d8e807f53 [FE-auth] Remove token from local storage when refresh token expires 2022-12-19 11:04:12 +09:00
godyuo
7657fdc790 Merge pull request #401 from godyuo/feature
fix: fix acessToken
2022-12-16 21:10:36 +09:00
손승우
eb14caa2fd Merge remote-tracking branch 'origin/feature' into feature 2022-12-16 21:10:02 +09:00
손승우
daf29a975f fix: fix AccessToken 2022-12-16 21:09:50 +09:00
SA K
09243a0873 Merge pull request #400 from sakang07/feature
Fix issues
2022-12-15 18:53:20 +09:00
SA K
f10e925411 [FE-share] Separate the invalid state and the expired state 2022-12-15 18:51:43 +09:00
SA K
fa014b8643 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-15 17:57:27 +09:00
godyuo
f85435088b Merge pull request #399 from godyuo/feature
update: update endDate
2022-12-15 17:57:11 +09:00
손승우
18547a311b update: update endDate 2022-12-15 17:56:51 +09:00
SA K
ee5287bcbc [FE-data] Encrypt password 2022-12-15 17:54:33 +09:00
SA K
ebe86ec76d Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-15 16:48:07 +09:00
godyuo
158691e14b Merge pull request #398 from godyuo/feature
update: update statusMessage
2022-12-15 16:47:55 +09:00
손승우
d28a86d2df update: update statusMessage 2022-12-15 16:46:58 +09:00
SA K
6ed9a5e966 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-15 16:19:41 +09:00
godyuo
c6976e17d5 Merge pull request #397 from godyuo/feature
style: style statusCode
2022-12-15 16:12:57 +09:00
godyuo
c436e8206d Merge branch 'vanillabrain:feature' into feature 2022-12-15 16:12:08 +09:00
SA K
10d2b3fcc9 [FE-share] Change logo link to landing page 2022-12-15 16:11:47 +09:00
손승우
2657f3b76c style: style statusCode 2022-12-15 16:11:42 +09:00
SA K
a2494a8733 [FE-router] Remove error alert on first connection 2022-12-15 15:53:23 +09:00
godyuo
f4f973cf4f Merge pull request #396 from godyuo/feature
fix: fix DateError
2022-12-15 15:52:36 +09:00
손승우
351a601762 Merge remote-tracking branch 'origin/feature' into feature 2022-12-15 15:51:55 +09:00
손승우
4e878eb3ea fix: fix DateError 2022-12-15 15:51:23 +09:00
SA K
20f7f2ec46 Merge pull request #395 from sakang07/feature
Feature
2022-12-15 15:06:48 +09:00
SA K
8dd76f9d3d Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-15 14:08:33 +09:00
godyuo
f93306298c Merge pull request #394 from godyuo/feature
update: update endDate
2022-12-15 14:07:11 +09:00
손승우
d61425279c Merge remote-tracking branch 'origin/feature' into feature 2022-12-15 14:06:40 +09:00
손승우
c880e1b1d7 update: update endDate 2022-12-15 14:06:14 +09:00
SA K
d3cdb04172 [FE-share] Add conditions to shared token auth logic 2022-12-15 13:58:05 +09:00
SA K
b124e911db Merge pull request #393 from sakang07/feature
Add a screen to show during loading
2022-12-15 13:20:42 +09:00
SA K
5fdf822c7b [FE-share] Add a screen to show during loading 2022-12-15 13:19:54 +09:00
godyuo
a112843975 Merge pull request #392 from godyuo/feature
update: update urlAuth
2022-12-15 11:29:18 +09:00
손승우
4766bad6d1 update: update urlAuth 2022-12-15 11:28:50 +09:00
손승우
15ba3d1faa update: update urlAuth 2022-12-15 11:26:28 +09:00
손승우
7c413347ba update: update urlAuth 2022-12-15 11:26:06 +09:00
SA K
020980ada1 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-15 10:59:33 +09:00
SA K
4613592b9e [FE-share] Modify auth header key 2022-12-15 10:59:12 +09:00
godyuo
8046f0838e Merge pull request #391 from godyuo/feature
update: update env
2022-12-15 09:56:02 +09:00
손승우
7b2e3432b8 Merge remote-tracking branch 'origin/feature' into feature 2022-12-15 09:55:35 +09:00
손승우
7360b45b91 update: update env 2022-12-15 09:55:12 +09:00
SA K
6eec0fc620 Merge pull request #390 from sakang07/feature
Fix a bug where api calls were repeated multiple times
2022-12-14 23:46:57 +09:00
SA K
740492a5da [FE-share] Fix a bug where api calls were repeated multiple times 2022-12-14 23:45:49 +09:00
SA K
683c5409eb Merge pull request #389 from sakang07/feature
Fix axios setting
2022-12-14 23:19:08 +09:00
SA K
535dc6ce42 [FE-share] Fix axios setting 2022-12-14 23:17:51 +09:00
godyuo
406c6cdf9f Merge pull request #388 from godyuo/feature
update: update shareAccessToken
2022-12-14 18:14:06 +09:00
손승우
95a7907f5e update: update shareAccessToken 2022-12-14 18:13:22 +09:00
손승우
d647f9172c update: update shareAccessToken 2022-12-14 18:10:59 +09:00
SA K
0ef540309d Merge pull request #387 from sakang07/feature
Change the access token store from context to local storage
2022-12-14 17:06:28 +09:00
SA K
d98cefd76a [FE-auth/share] Change the access token store from context to local storage 2022-12-14 17:05:20 +09:00
SA K
83b593b495 [FE-share] Change package directory slightly 2022-12-14 13:22:20 +09:00
SA K
dba0159912 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-14 13:12:28 +09:00
SA K
01f5731d6a [FE] Change package directory slightly 2022-12-14 13:12:10 +09:00
godyuo
7301dc8118 Merge pull request #386 from godyuo/feature
add: add swagger-spec.json
2022-12-14 10:55:57 +09:00
손승우
d59a1213d6 Merge remote-tracking branch 'origin/feature' into feature 2022-12-14 10:55:19 +09:00
손승우
70c107ff83 add: add swagger-spec.json 2022-12-14 10:55:15 +09:00
godyuo
46ac486cea Merge pull request #385 from godyuo/feature
update: update tokenTime
2022-12-13 16:51:18 +09:00
손승우
7a1cf206b4 Merge remote-tracking branch 'origin/feature' into feature 2022-12-13 16:49:27 +09:00
손승우
86295c75f9 update: update tokenTime 2022-12-13 16:48:53 +09:00
SA K
e0d7aefdb1 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-13 16:13:23 +09:00
SA K
604be5f149 [FE-share] Fix logout process 2022-12-13 16:12:21 +09:00
SA K
a49843b31b [FE] Fix the issue that axios does not pending success result 2022-12-13 16:01:33 +09:00
godyuo
33f2ca0634 Merge pull request #384 from godyuo/feature
update: update dashboardUrl
2022-12-13 15:56:27 +09:00
손승우
64b68d27aa Merge remote-tracking branch 'origin/feature' into feature
# Conflicts:
#	.idea/modules.xml
2022-12-13 15:53:17 +09:00
손승우
b31a6dfb94 update: update dashboardUrl 2022-12-13 15:52:20 +09:00
SA K
278936bce4 Merge pull request #383 from sakang07/feature
Add error handling
2022-12-13 15:03:28 +09:00
SA K
178b34d402 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-13 15:02:34 +09:00
SA K
d7fb5bc075 [FE-share] Add error handling 2022-12-13 15:01:11 +09:00
SA K
d289aba9f7 Merge pull request #382 from sakang07/feature
Change API parameter to receive shareToken on Authorizatio…
2022-12-13 14:09:51 +09:00
SA K
33e833807d Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-13 14:09:31 +09:00
godyuo
4424d88272 Merge pull request #381 from godyuo/feature
update: update dashboardUrl
2022-12-13 14:09:14 +09:00
SA K
1997fa8dd6 [FE-share] Change API parameter to receive shareToken on Authorization headers 2022-12-13 14:08:52 +09:00
손승우
fbfa2cc7a7 Merge remote-tracking branch 'origin/feature' into feature 2022-12-13 14:08:36 +09:00
손승우
dcf2039c08 update: update dashboardUrl 2022-12-13 14:08:11 +09:00
SA K
642e433d3d Merge pull request #380 from sakang07/feature
Fix meta tag text
2022-12-13 11:11:23 +09:00
SA K
155e75f140 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-13 11:10:30 +09:00
SA K
f60e42f514 [FE, Landing] Fix meta tag text 2022-12-13 11:09:19 +09:00
Dosun Yun
f007f9fd4a Add Jenkinsfile for aws s3 deploy 2022-12-13 10:51:58 +09:00
Dosun Yun
15a2cc2930 Add Jenkinsfile for aws s3 deploy 2022-12-13 10:47:27 +09:00
Dosun Yun
8c76bd6e3d Add Jenkinsfile for aws s3 deploy 2022-12-13 10:34:11 +09:00
godyuo
5e525fc000 Merge pull request #379 from godyuo/feature
add: add swagger
2022-12-12 19:40:03 +09:00
손승우
ba0634e0da add: add swagger 2022-12-12 19:39:28 +09:00
godyuo
a40e250bdc Merge pull request #378 from godyuo/feature
add: add swagger
2022-12-12 19:37:12 +09:00
손승우
9d9ff3ceae Merge remote-tracking branch 'origin/feature' into feature 2022-12-12 19:36:26 +09:00
손승우
c7381ba825 add: add swagger 2022-12-12 19:36:17 +09:00
SA K
6a8b166896 Merge pull request #377 from sakang07/feature
Add landing page
2022-12-12 19:22:38 +09:00
SA K
37b72b148a [Landing] Markup and style on mobile responsive pages 2022-12-12 19:21:47 +09:00
SA K
fa11f8ffc1 [Landing] Style on tablet responsive pages 2022-12-12 18:11:18 +09:00
SA K
c97fc7da9b [Landing] Markup and style on pc responsive pages: step 1 2022-12-12 14:51:23 +09:00
SA K
3a175c0c56 Merge pull request #376 from sakang07/feature
Feature
2022-12-12 10:01:46 +09:00
SA K
ac04dc5df9 [FE-share] Modify text of the share state 2022-12-12 09:58:33 +09:00
SA K
d0471bbcb8 [Landing] initialization and mark up 2022-12-11 13:51:26 +09:00
SA K
2d5719d9bf [FE] Fix font of DatePicker 2022-12-10 18:14:16 +09:00
SA K
585452b923 Merge pull request #375 from sakang07/feature
Apply design to the dashboard share window
2022-12-09 20:26:56 +09:00
SA K
4c267dbd91 [FE] Fix DatePicker 2022-12-09 20:25:21 +09:00
SA K
79df4c456d Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-09 20:08:52 +09:00
SA K
4399623cdf [FE] Apply design to the dashboard share window 2022-12-09 20:08:41 +09:00
손승우
ef8aa2f9bc update: update endDate 2022-12-09 18:18:38 +09:00
손승우
d9b1d48e58 test: restore 2022-12-09 17:56:31 +09:00
손승우
b614f37208 test: NODE_ENV 2022-12-09 17:51:19 +09:00
손승우
1f4c0039f3 test: NODE_ENV 2022-12-09 17:45:47 +09:00
손승우
0434798bd0 Merge remote-tracking branch 'origin/feature' into feature 2022-12-09 17:37:38 +09:00
손승우
d98a180680 test: NODE_ENV 2022-12-09 17:37:14 +09:00
godyuo
c8d592aff9 Merge pull request #374 from godyuo/feature
test: NODE_ENV
2022-12-09 17:30:11 +09:00
손승우
0c33c52a0d test: NODE_ENV 2022-12-09 17:29:25 +09:00
SA K
0fda321195 Merge pull request #373 from sakang07/feature
Add og image
2022-12-09 16:02:07 +09:00
SA K
d0ffe58d5a [FE] Add og image 2022-12-09 15:59:52 +09:00
손승우
4672f1852f Merge remote-tracking branch 'origin/feature' into feature 2022-12-09 14:39:07 +09:00
손승우
51d400ff04 update: update package_script 2022-12-09 14:38:46 +09:00
SA K
2338ec5d34 Merge pull request #372 from sakang07/feature
Fix text
2022-12-09 14:31:51 +09:00
SA K
398c583116 Merge remote-tracking branch 'upstream/feature' into feature 2022-12-09 14:26:17 +09:00
SA K
1a6aa5819f [FE] Fix text 2022-12-09 14:24:48 +09:00
손승우
fb203e654a test: test dbName 2022-12-09 14:01:40 +09:00
손승우
f53b89ec4b test: test dbName 2022-12-09 13:53:09 +09:00
손승우
e4e652fd3a test: test db 2022-12-09 13:32:25 +09:00
손승우
74e53252b6 Merge remote-tracking branch 'origin/feature' into feature 2022-12-09 13:23:01 +09:00
손승우
94312d9067 fix: fix awsserver 2022-12-09 13:22:38 +09:00
SA K
bab7dd7f84 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-09 12:30:36 +09:00
SA K
34276b9ce7 [FE] Add meta tag to public html 2022-12-09 12:29:43 +09:00
David Yun
d2d86b6448 Update README.md 2022-12-09 10:57:10 +09:00
David Yun
60781deefd Update README.md 2022-12-09 10:56:02 +09:00
손승우
c8b12f2aec update: hostUrl 2022-12-08 18:58:01 +09:00
손승우
9f3505a72f update: logout 2022-12-08 18:48:33 +09:00
손승우
38ceb994e5 Merge remote-tracking branch 'origin/feature' into feature
# Conflicts:
#	frontend-web/.env.feature
2022-12-08 18:02:56 +09:00
손승우
0998ee982a update: cookie 2022-12-08 18:01:59 +09:00
SA K
7346b7cec7 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-08 17:35:40 +09:00
SA K
2d3ac3086c [FE] Add react-hydratable 2022-12-08 17:35:16 +09:00
손승우
37dc338171 update: update secretKey 2022-12-08 16:47:18 +09:00
godyuo
30f43d1835 Update .env.feature 2022-12-08 16:44:12 +09:00
godyuo
5e8999e5ae Update .env.feature 2022-12-08 16:37:46 +09:00
godyuo
5bd63e14a0 update: env.feature 2022-12-08 16:37:05 +09:00
SA K
624ceb40a8 [FE] Change api url 2022-12-08 16:20:05 +09:00
SA K
d274d8c453 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-08 16:04:08 +09:00
SA K
712ff9deba [FE] Add react-spa-prerender 2022-12-08 16:03:56 +09:00
godyuo
52472dfb27 Merge pull request #370 from godyuo/feature
update: update whiteList
2022-12-08 16:01:32 +09:00
손승우
e6ec10c62d update: update whiteList 2022-12-08 16:00:00 +09:00
SA K
039c24d9e7 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-08 15:21:27 +09:00
SA K
97c08126a1 [FE] Install react-snap and change api server to localhost 2022-12-08 15:21:08 +09:00
godyuo
9810011664 Merge pull request #369 from godyuo/feature
update: update cors
2022-12-08 15:02:27 +09:00
손승우
8d4ec1dfa0 update: update cors 2022-12-08 15:01:26 +09:00
godyuo
a4da9f12e3 Merge pull request #368 from godyuo/feature
update: update Datetime
2022-12-08 14:35:04 +09:00
손승우
949670081f update: update Datetime 2022-12-08 14:34:08 +09:00
SA K
97aab02f52 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-08 13:20:54 +09:00
SA K
13afdc8ec1 [FE-share] Add date option 2022-12-08 13:19:13 +09:00
SA K
5d00c398b5 Merge pull request #367 from sakang07/feature
Change api parameter key to camel case
2022-12-08 11:33:51 +09:00
SA K
a4bd0691b9 [FE-share/auth] Change api parameter key to camel case 2022-12-08 11:32:57 +09:00
godyuo
684f17f072 Merge pull request #366 from godyuo/feature
update: update uuid, dashboard, camelcase
2022-12-08 11:23:50 +09:00
godyuo
05d5403bdc Merge branch 'vanillabrain:feature' into feature 2022-12-08 11:08:46 +09:00
손승우
c44c55b235 update: update uuid, dashboard, camelcase 2022-12-08 11:03:21 +09:00
SA K
275d4c9062 Merge pull request #365 from sakang07/feature
Feature
2022-12-08 10:57:57 +09:00
SA K
c401c8a673 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-08 10:55:07 +09:00
SA K
a70c801ab4 [FE-share] Fix api parameter key 2022-12-08 10:55:00 +09:00
SA K
b721e7dd45 [FE-share] Add meta tag for SEO 2022-12-07 23:35:33 +09:00
SA K
b98e6741dd Merge pull request #364 from sakang07/feature
Add date picker to share window
2022-12-07 18:49:52 +09:00
SA K
0cf821f2bb [FE-share] Add date picker to share window 2022-12-07 18:49:07 +09:00
godyuo
4e907a75b5 Merge pull request #363 from godyuo/feature
add: update uuid
2022-12-07 16:07:39 +09:00
손승우
85f2c2609b Merge remote-tracking branch 'origin/feature' into feature 2022-12-07 16:06:46 +09:00
손승우
f21d5643bb add: update uuid 2022-12-07 16:06:21 +09:00
SA K
c1133c3803 Merge pull request #362 from sakang07/feature
Fix bug
2022-12-07 11:45:36 +09:00
SA K
753109cc6b [FE-auth] Exclude the sign up feature 2022-12-07 11:45:04 +09:00
SA K
d578efb7c6 [FE-auth] Add todo 2022-12-07 10:11:53 +09:00
SA K
dc8d853a54 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-06 17:47:04 +09:00
godyuo
958de5da8d Merge pull request #361 from godyuo/feature
fix: update login
2022-12-06 17:45:42 +09:00
손승우
438ec94717 Merge remote-tracking branch 'origin/feature' into feature 2022-12-06 17:45:04 +09:00
손승우
6cca301b69 fix: update login 2022-12-06 17:44:24 +09:00
SA K
34bcdd8df9 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-06 15:19:37 +09:00
godyuo
5139d8e5ae Merge pull request #360 from godyuo/feature
fix: update shareUrl
2022-12-06 15:17:05 +09:00
손승우
4b804a5aa2 fix: update shareUrl 2022-12-06 15:16:15 +09:00
SA K
a6fbafacdd [FE-auth] fix and separate the logout component 2022-12-06 14:29:30 +09:00
godyuo
d541d437af Merge pull request #359 from godyuo/feature
fix: update db
2022-12-06 13:48:45 +09:00
손승우
fb8b5cc8a7 Merge remote-tracking branch 'origin/feature' into feature 2022-12-06 13:48:00 +09:00
손승우
f450a1d23c fix: update db 2022-12-06 13:46:52 +09:00
SA K
dccef038d7 Merge pull request #358 from sakang07/feature
Fix axios interceptor
2022-12-06 13:06:39 +09:00
SA K
0430fe7c77 [FE-auth] Fix axios interceptor 2022-12-06 13:05:35 +09:00
godyuo
931f33b0e2 Merge pull request #357 from godyuo/feature
update: update db
2022-12-06 11:24:59 +09:00
손승우
bf46b6c26d update: update db 2022-12-06 11:24:13 +09:00
godyuo
98154de24f Merge pull request #356 from godyuo/feature
update: update jwt
2022-12-06 09:58:14 +09:00
손승우
89fef781f7 Merge remote-tracking branch 'origin/feature' into feature 2022-12-06 09:57:48 +09:00
손승우
d5053f0132 update: update jwt 2022-12-06 09:57:37 +09:00
godyuo
95dd5af82b Merge pull request #355 from godyuo/feature
update: update database
2022-12-05 15:00:03 +09:00
손승우
8abc5f27bb Merge remote-tracking branch 'origin/feature' into feature 2022-12-05 14:55:29 +09:00
손승우
4e4f2aef75 update: update database 2022-12-05 14:55:23 +09:00
SA K
560a355cfe Merge pull request #354 from sakang07/feature
Feature
2022-12-05 13:52:51 +09:00
SA K
e5601a6dd2 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature
 Conflicts:
	frontend-web/src/pages/User/components/ProfileModify.tsx
2022-12-05 13:12:09 +09:00
SA K
de7613e57a [FE-auth] Fix and refactor auth asynchronous code 2022-12-05 13:09:12 +09:00
SA K
abef60b968 [FE-auth] Fix bug about alert windows 2022-12-02 19:56:04 +09:00
SA K
5c05cbc795 [FE-auth] Change modifying profile page 2022-12-02 18:25:03 +09:00
godyuo
a20cef8ea1 fix: fix dashboard createAt 2022-12-02 18:23:07 +09:00
Dosun Yun
eeff56aacc [FE-setting] Add build config 2022-12-02 18:23:07 +09:00
SA K
dabe1b02a4 [FE-auth] Change modifing profile page 2022-12-02 18:23:06 +09:00
손승우
e61b6ee388 fix: update authorization 2022-12-02 18:23:06 +09:00
godyuo
5dac280b13 Merge pull request #352 from godyuo/feature
fix: fix dashboard createAt
2022-12-02 17:38:33 +09:00
godyuo
8b2a632f71 fix: fix dashboard createAt 2022-12-02 17:36:51 +09:00
David Yun
12aba2b83c Merge pull request #348 from ido82/main
Update README.md
2022-12-02 13:19:11 +09:00
Dosun Yun
81d2266f7c [FE-setting] Add build config 2022-12-02 11:36:38 +09:00
godyuo
32f66c551e Merge pull request #351 from godyuo/feature
fix: update authorization
2022-12-01 14:24:55 +09:00
손승우
fae5aeb74f Merge remote-tracking branch 'origin/feature' into feature 2022-12-01 14:24:17 +09:00
손승우
6e01508c10 fix: update authorization 2022-12-01 14:23:48 +09:00
SA K
e0f3ab5ec1 Merge pull request #350 from sakang07/feature
Change conditional statements
2022-12-01 09:58:31 +09:00
SA K
e0a6f96686 [FE-auth] Change conditional statements according to the changed http status code 2022-12-01 09:57:00 +09:00
godyuo
0aa64ff13d Merge pull request #349 from godyuo/feature
fix: fix authorization
2022-12-01 09:24:38 +09:00
손승우
b63577dc86 fix: fix authorization 2022-12-01 09:23:55 +09:00
ido82
e1a2246230 Update README.md 2022-12-01 05:38:38 +09:00
SA K
f754a458ed Merge pull request #346 from sakang07/feature
Feature
2022-11-30 21:03:38 +09:00
SA K
a7e39bfc8d [FE-auth] Fix error alerts, form validation 2022-11-30 21:02:46 +09:00
SA K
9f11c88879 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-30 16:15:32 +09:00
godyuo
2a427b4a74 Merge pull request #347 from godyuo/feature
update: update personalization dashboard
2022-11-30 15:54:05 +09:00
손승우
c679355891 Merge remote-tracking branch 'origin/feature' into feature 2022-11-30 15:53:06 +09:00
손승우
8eb6f337e6 update: update personalization dashboard 2022-11-30 15:52:39 +09:00
SA K
a5e14b00c9 [FE-theme] Modify the layout and style of images, fonts, etc 2022-11-30 14:04:07 +09:00
SA K
b826b85d71 Merge pull request #345 from sakang07/feature
Feature
2022-11-29 19:08:51 +09:00
SA K
1b64f4cc95 [FE-theme] Fix layout 2022-11-29 19:07:29 +09:00
SA K
4363fcca1c [FE-share] Connect API of sharing dashboard url: step 2 #304 2022-11-29 18:01:33 +09:00
SA K
091c866f95 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-29 16:58:13 +09:00
godyuo
b221cab18e Merge pull request #344 from godyuo/feature
fix: fix share-dashboard
2022-11-29 16:52:42 +09:00
손승우
a06a69535d Merge remote-tracking branch 'origin/feature' into feature 2022-11-29 16:51:58 +09:00
손승우
31341d6be6 fix: fix share-dashboard 2022-11-29 16:51:50 +09:00
godyuo
ebd42fae55 Merge pull request #343 from godyuo/feature
update: update middleware( login, share, user )
2022-11-29 16:07:29 +09:00
손승우
6fe562ecb6 Merge remote-tracking branch 'origin/feature' into feature 2022-11-29 16:06:15 +09:00
손승우
257b478e4e update: update middleware(login, share, user) 2022-11-29 16:06:03 +09:00
SA K
5968ca9185 [FE-auth] Connect API of editing user profile #302 2022-11-29 14:51:59 +09:00
SA K
c86b440407 Merge pull request #342 from sakang07/feature
Fix authorization
2022-11-29 14:33:21 +09:00
SA K
e7498131d8 [FE-auth] Fix the loading screen does not disappear from the protected route 2022-11-29 14:32:01 +09:00
godyuo
f429f99e97 Merge pull request #341 from godyuo/feature
update: update middleware
2022-11-29 14:04:48 +09:00
손승우
bdcbad7989 Merge remote-tracking branch 'origin/feature' into feature 2022-11-29 14:03:42 +09:00
손승우
598d3cb7dd update: update middleware 2022-11-29 14:03:31 +09:00
SA K
ef971421db Merge pull request #340 from sakang07/feature
Fix authorization
2022-11-29 13:57:16 +09:00
SA K
b675f0adf4 [FE-auth] Fix ProtectedRoute 2022-11-29 13:55:43 +09:00
SA K
009792b753 [FE-auth] Fix Authorization 2022-11-29 13:30:04 +09:00
SA K
43e0c9bfa8 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-28 20:48:51 +09:00
SA K
22edc4b3d1 [FE-auth] Fix axios interceptor 2022-11-28 20:48:43 +09:00
godyuo
6ee5b3a901 Merge pull request #339 from godyuo/feature
update: update modules
2022-11-28 20:47:17 +09:00
손승우
768a898f4b update: update dto 2022-11-28 20:46:31 +09:00
손승우
924de9f96d update: update modules 2022-11-28 20:44:43 +09:00
SA K
b29ff10cf0 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-28 20:24:43 +09:00
godyuo
e99545a684 Merge pull request #338 from godyuo/feature
update: update modules
2022-11-28 19:35:24 +09:00
손승우
0f7861a468 Merge remote-tracking branch 'origin/feature' into feature 2022-11-28 19:34:16 +09:00
손승우
f6d0156961 update: update modules 2022-11-28 19:34:10 +09:00
SA K
ed5c601d1f Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-28 16:35:36 +09:00
godyuo
a3ed959965 Merge pull request #337 from godyuo/feature
fix: update get-access-token
2022-11-28 13:48:21 +09:00
손승우
466419715a Merge remote-tracking branch 'origin/feature' into feature 2022-11-28 13:47:43 +09:00
손승우
45359ebd9a fix: update get-access-token 2022-11-28 13:47:19 +09:00
SA K
46e6f6ac5c Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-28 10:46:48 +09:00
godyuo
13f50f6f49 Merge pull request #336 from godyuo/feature
fix: fix userInfo change
2022-11-28 10:44:26 +09:00
손승우
3f8a94078c Merge remote-tracking branch 'origin/feature' into feature 2022-11-28 10:43:17 +09:00
손승우
aef99494a3 fix: fix userInfo change 2022-11-28 10:42:32 +09:00
SA K
fe46c1e24d Merge pull request #335 from sakang07/feature
Connecting API
2022-11-28 09:33:48 +09:00
David Yun
c754630207 Merge pull request #334 from dahaesther/main
Update README.md
2022-11-27 23:26:19 +09:00
dahaesther
00ac974506 Update README.md 2022-11-27 23:24:03 +09:00
David Yun
86c02d46f3 Merge pull request #333 from crystal1177/main
Update README.md
2022-11-26 21:52:58 +09:00
crystal1177
826f6aea21 Update README.md 2022-11-26 20:44:55 +09:00
SA K
3d934b09f9 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-26 18:42:45 +09:00
SA K
011f2a032d [FE-auth] Connect sign up and login authorization API: step 4 #298 2022-11-26 18:42:30 +09:00
SA K
18d9e44711 [FE-auth] Connect API of sharing dashboard url: step 1 #304 2022-11-26 16:23:47 +09:00
SA K
18adb7d4da [FE-auth] Connect API of editing user profile: step 1 #302 2022-11-26 15:47:36 +09:00
SA K
104da16707 [FE-auth] Connect sign up and login authorization API: step 3 #298 2022-11-26 15:44:33 +09:00
SA K
1538687673 Merge pull request #332 from sakang07/feature
Connect sign up and login authorization API: step 2 #298
2022-11-25 14:51:28 +09:00
SA K
9f9a635ab4 [FE-auth] Connect sign up and login authorization API: step 2 #298 2022-11-25 14:50:34 +09:00
David Yun
b53820df94 Change License
GPL3 -> Apache2
2022-11-25 11:25:55 +09:00
David Yun
83a3bc1f19 Merge pull request #328 from advanced-rising/main
Update README.md
2022-11-25 11:19:23 +09:00
David Yun
3a3c233595 Merge branch 'main' into main 2022-11-25 11:19:13 +09:00
SA K
ae836dcfbe Merge pull request #331 from sakang07/feature
Add icons
2022-11-24 19:40:53 +09:00
SA K
156fb76397 [FE] Add icons 2022-11-24 19:39:04 +09:00
godyuo
974539391c Merge pull request #330 from godyuo/feature
fix: update auth
2022-11-24 19:36:01 +09:00
손승우
6c1aaf8cca fix: update auth 2022-11-24 19:35:20 +09:00
SA K
7d6b6c05ca Merge pull request #329 from sakang07/feature
Feature
2022-11-24 19:15:21 +09:00
SA K
14ac2d9a26 [FE-auth] Connect sign up API: step 1 #298 2022-11-24 19:14:25 +09:00
risingcore
0e25acc4df Update README.md 2022-11-24 19:13:16 +09:00
SA K
f431c276de Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-24 17:54:04 +09:00
godyuo
4ad1c87f5d Merge pull request #327 from godyuo/feature
fix: fix signup
2022-11-24 17:52:37 +09:00
손승우
6979dac870 fix: fix signup 2022-11-24 17:50:23 +09:00
SA K
9cae1ce495 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-24 17:27:15 +09:00
godyuo
9de14d7395 Merge pull request #322 from godyuo/feature
feat: add Token, ChangeUserInfo
2022-11-24 17:09:38 +09:00
손승우
63b8d25bf8 feat: add Token, ChangeUserInfo 2022-11-24 17:08:35 +09:00
SA K
8e7ab7db46 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-24 14:41:47 +09:00
godyuo
869c57e1b9 Merge pull request #321 from godyuo/feature
fix: fix login
2022-11-24 14:39:39 +09:00
손승우
70b3704ea9 Merge remote-tracking branch 'origin/feature' into feature 2022-11-24 14:38:52 +09:00
손승우
c9659e766c fix: fix login 2022-11-24 14:37:46 +09:00
SA K
0abf84a9be [FE-dashboard] Modify share button position #303 2022-11-24 14:12:48 +09:00
David Yun
e694d2217a Merge pull request #320 from uprain1116/main
Update README.md
2022-11-24 10:08:06 +09:00
SANGWOO PARK
a27d1c1748 Update README.md 2022-11-24 02:23:34 +09:00
David Yun
ca757f4a82 Merge pull request #319 from yeongeunkwon/main
Update README.md
2022-11-23 20:55:41 +09:00
Yeongeun Kwon
005a2a04ee Update README.md 2022-11-23 20:21:02 +09:00
HeeseonYoon
bb69234805 Merge pull request #318 from YoonHS/main
Update README.md
2022-11-23 20:19:06 +09:00
YoonHS
e2b0132f12 Update README.md 2022-11-23 20:15:19 +09:00
SA K
8bb1951efb Merge pull request #315 from sakang07/feature
Feature
2022-11-23 19:15:48 +09:00
SA K
d0affbad60 [FE-auth] Change to enable scrolling outside the model window #300 2022-11-23 19:14:07 +09:00
SA K
ba37818f8b [FE-auth] Add user profile edit page #301 2022-11-23 18:20:12 +09:00
ssissac
075690d39b Merge pull request #314 from DanBi-Lee/main
Update README.md
2022-11-23 16:52:51 +09:00
DanBi-Lee
cff1482be3 Update README.md 2022-11-23 15:42:24 +09:00
SA K
cbde5fa735 [FE-dashboard] Add modal window of sharing dashboard url #303 2022-11-23 15:22:18 +09:00
ssissac
968775cd71 Merge pull request #313 from forfila/main
Update README.md
2022-11-23 14:28:16 +09:00
forfila
e20bc87ced Update README.md 2022-11-23 10:53:24 +09:00
SA K
7c354184ce Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-11-23 09:50:45 +09:00
SA K
042fcf9ecc [FE-theme] Fix button shadows #309 2022-11-23 09:50:06 +09:00
SA K
0a1c0db2dd Merge pull request #312 from sakang07/feature
Add auth
2022-11-22 23:08:21 +09:00
SA K
f8474cd228 [FE-auth] Add user profile information to the header #299 2022-11-22 23:04:40 +09:00
SA K
388df289cc [FE-auth] Add sign up page #297 2022-11-22 21:50:52 +09:00
ssissac
1dc33d82de Merge pull request #311 from VB-sis/main
Update README.md
2022-11-22 19:18:34 +09:00
VB-sis
a25fb5606d Update README.md 2022-11-22 19:11:40 +09:00
David Yun
4eb8f127ca Merge pull request #310 from dosunyun/main
Update README.md
2022-11-22 18:19:04 +09:00
dosunyun
051367e6ce Update README.md 2022-11-22 18:16:22 +09:00
godyuo
335b479ab0 Merge pull request #296 from godyuo/feature
fix: fix package
2022-11-22 15:33:54 +09:00
손승우
7c5385b343 fix: fix package 2022-11-22 15:32:25 +09:00
godyuo
a7f97b7ab6 Merge pull request #295 from godyuo/feature
fix: fix cors error
2022-11-22 15:25:54 +09:00
godyuo
56d543a5f8 Delete package-lock.json 2022-11-22 15:22:16 +09:00
godyuo
18709a219e Delete package.json 2022-11-22 15:22:00 +09:00
손승우
8c26a6bcee fix: fix cors error 2022-11-22 15:19:55 +09:00
손승우
c47e9b2070 Merge remote-tracking branch 'origin/feature' into feature 2022-11-22 15:11:52 +09:00
손승우
8852b60492 fix: update cors error 2022-11-22 15:11:46 +09:00
godyuo
ef1e06a6a0 Merge branch 'vanillabrain:feature' into feature 2022-11-22 15:10:22 +09:00
SA K
1d629d1535 Merge pull request #294 from sakang07/feature
Setup auth service: step 4 #290
2022-11-22 15:09:55 +09:00
SA K
dffdd310aa [FE-auth] Setup auth service: step 4 #290 2022-11-22 15:08:20 +09:00
손승우
18771185d8 Merge remote-tracking branch 'origin/feature' into feature 2022-11-21 18:49:40 +09:00
SA K
54bf5f5927 Merge pull request #293 from sakang07/feature
Setup auth service: step 3 #290
2022-11-21 18:46:26 +09:00
SA K
93e4302acb [FE-auth] Setup auth service: step 3 #290 2022-11-21 18:44:21 +09:00
손승우
5ce2be7f01 feat: Add login 2022-11-21 18:42:54 +09:00
손승우
1a8dea3da9 Merge remote-tracking branch 'origin/feature' into feature 2022-11-21 14:43:26 +09:00
SA K
7876d671cd Merge pull request #292 from sakang07/feature
Setup auth service: step 2 #290
2022-11-21 14:42:28 +09:00
SA K
100334da92 [FE-auth] Setup auth service: step 2 #290 2022-11-21 14:41:03 +09:00
손승우
f765d212a1 Merge remote-tracking branch 'origin/feature' into feature 2022-11-21 14:35:25 +09:00
손승우
8ce6e85021 feat: Add login 2022-11-21 14:34:58 +09:00
SA K
e816aaade8 Merge pull request #291 from sakang07/feature
[FE-auth] Setup auth service: step 1 #290
2022-11-15 18:18:08 +09:00
SA K
cc0ba02c05 [FE-auth] Setup auth service: step 1 #290 2022-11-15 18:16:07 +09:00
godyuo
0caef2a24e Merge pull request #289 from godyuo/feature
feat: Add login
2022-11-15 17:42:29 +09:00
godyuo
64395cf980 Update app.module.ts 2022-11-15 17:41:28 +09:00
손승우
c0e43b7679 feat: Add login 2022-11-15 17:39:40 +09:00
HeeseonYoon
1d16c03851 Update README.md 2022-11-11 14:15:17 +09:00
HeeseonYoon
7d30d398db Merge remote-tracking branch 'upstream/develop' 2022-11-11 14:13:43 +09:00
SA K
8dc60190b3 Merge pull request #288 from sakang07/develop
Fix
2022-11-11 14:09:29 +09:00
SA K
9d4bbc97ac [FE-data] Fix an issue where a database could not be selected when entering the Create Dataset menu in the navigation bar #287 2022-11-11 13:44:24 +09:00
HeeseonYoon
d938ca43ef Merge pull request #286 from yathoo88/develop_backend_yhs
[BE-widget] Add order by
2022-11-11 13:36:45 +09:00
HeeseonYoon
b6aa0c13b0 [BE-widget] Add order by 2022-11-11 13:35:29 +09:00
SA K
62066817c6 [FE-dashboard] Fix broken style of board and button 2022-11-11 11:45:48 +09:00
SA K
9ef9b698a1 Merge pull request #285 from sakang07/develop
Fix 404 error when clicking on main logo and clicking on dashboard post
2022-11-11 10:20:52 +09:00
SA K
d510a14947 [FE-router] Fix logo link to router link 2022-11-11 10:16:10 +09:00
SA K
1fb91c891c [FE-router] Fix 404 error when clicking on main logo and clicking on dashboard post #284 2022-11-11 10:07:53 +09:00
SA K
a16b845940 Merge pull request #283 from sakang07/develop
Modify router
2022-11-11 09:14:24 +09:00
SA K
4cbf9d0068 Merge remote-tracking branch 'upstream/develop' into develop 2022-11-11 00:39:21 +09:00
SA K
28cc8868fc [FE] Modify router 2022-11-11 00:34:38 +09:00
SA K
9466254b17 Merge pull request #282 from sakang07/develop
Modify the legend name differently for each aggregation method #281
2022-11-10 23:58:48 +09:00
SA K
5dd71d9985 [FE-chart] Modify the legend name differently for each aggregation method #281 2022-11-10 23:55:39 +09:00
HeeseonYoon
e42712fa46 Merge pull request #280 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-10 23:24:11 +09:00
HeeseonYoon
f508d76ee6 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-10 23:23:08 +09:00
HeeseonYoon
23c01912ea [BE-test] Modify test files 2022-11-10 23:22:58 +09:00
Dosun Yun
5e3518bdb1 [BE-setting] Fix .gitignore rule 2022-11-10 20:50:42 +09:00
godyuo
7aadf008a2 Merge pull request #279 from godyuo/develop
test: update QTT-002, QTT-003 test script
2022-11-10 19:38:22 +09:00
손승우
095bb928a8 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	backend-api/.gitignore
#	backend-api/test_connect_info.json
2022-11-10 19:34:24 +09:00
손승우
8799782a27 test: update QTT-002, QTT-003 test script 2022-11-10 19:33:06 +09:00
HeeseonYoon
ab58170d27 Merge pull request #278 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-10 18:34:50 +09:00
HeeseonYoon
1e2f102eac Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-10 18:33:48 +09:00
HeeseonYoon
1e24f9bea1 [BE-test] Modify test files 2022-11-10 18:33:24 +09:00
Dosun Yun
8c75c354d0 [FE-lint] Fix let to const 2022-11-10 18:25:37 +09:00
HeeseonYoon
a3b3a946cb Add gitignore 2022-11-10 18:11:47 +09:00
HeeseonYoon
ba3aaee726 Merge pull request #277 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-10 17:49:55 +09:00
HeeseonYoon
5a52cc8eca Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-10 17:48:57 +09:00
HeeseonYoon
74d6aba229 [FE-data] Modify eslint bug 2022-11-10 17:48:34 +09:00
SA K
d423106e27 Merge pull request #276 from sakang07/develop
Develop
2022-11-10 17:42:46 +09:00
SA K
d256d4cb1b Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-10 17:33:38 +09:00
SA K
5c21a47557 [FE] Add error handling at 403 in apiHelper 2022-11-10 17:32:46 +09:00
HeeseonYoon
6fd55a640f Merge pull request #274 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-10 17:30:55 +09:00
HeeseonYoon
ee05ebfb33 . 2022-11-10 17:30:18 +09:00
HeeseonYoon
9fd5cdcf8f Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-10 17:26:47 +09:00
HeeseonYoon
95c56caa16 [FE-test] Modify aggregate function test file (QTT-004) 2022-11-10 17:26:33 +09:00
SA K
b47cf4f429 Merge pull request #273 from sakang07/develop
Fix bugs
2022-11-10 16:46:37 +09:00
SA K
338deb2807 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-10 16:43:13 +09:00
SA K
d6466d9a73 [FE] Fix an issue where a blank page appears when pressing logo #272 2022-11-10 16:43:00 +09:00
Dosun Yun
0a6395460f [BE-docker] add expose 2022-11-10 16:18:42 +09:00
godyuo
db4fb4f1a4 Merge pull request #271 from godyuo/develop
feat: add QTT-002, QTT-003 test script
2022-11-10 15:28:21 +09:00
손승우
f0f81d7229 feat: add QTT-002, QTT-003 test script 2022-11-10 15:23:15 +09:00
SA K
3da477ea0e [FE-chart] Fix an issue where the layout was broken when the table and numeric board boxes were too small or too large #270 2022-11-10 14:59:15 +09:00
SA K
93f13ad478 [FE-chart] Fix issue of missing title and legend option in scatter series charts #269 2022-11-10 13:25:16 +09:00
SA K
1b6fec9f52 [FE-chart] Fix a bug of not receiving single color when modifying in the funnel chart #268 2022-11-10 13:04:52 +09:00
SA K
6f2ebc6b70 [FE] Fix error messages that appear twice 2022-11-10 13:00:51 +09:00
손승우
1eb8ea593c feat: add QTT-002 2022-11-09 20:58:52 +09:00
SA K
e5f029356c Merge pull request #267 from sakang07/develop
Fix bugs
2022-11-09 19:20:38 +09:00
SA K
3d6a5c0f39 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-09 19:19:22 +09:00
SA K
86a0a28dfe [FE-chart] Fix option nesting bugs 2022-11-09 19:18:46 +09:00
SA K
a6533b4ed5 [FE-chart] Fix pie chart series color errors 2022-11-09 19:16:02 +09:00
SA K
4f0166434a [FE-data] Initialize when an error occurs 2022-11-09 19:05:40 +09:00
HeeseonYoon
4bf16cccb9 Merge pull request #266 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-09 19:03:40 +09:00
HeeseonYoon
aa139a693e [FE-aggregation] Fix aggregate function logic #265 2022-11-09 19:02:44 +09:00
HeeseonYoon
5be30144b4 [FE-test] Modify aggregate function test file (QTT-004) 2022-11-09 18:54:15 +09:00
HeeseonYoon
889a5c4011 Merge pull request #264 from yathoo88/develop_backend_yhs
[FE-data] Modify select database info service #261
2022-11-09 18:34:39 +09:00
HeeseonYoon
ab31fcb8e7 [FE-data] Modify select database info service #261 2022-11-09 18:33:23 +09:00
HeeseonYoon
37d68ac5d9 Merge pull request #263 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-09 18:25:14 +09:00
HeeseonYoon
31e4457f39 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-09 18:24:26 +09:00
HeeseonYoon
7484ba098b [FE-aggregation] Add aggregate function test file (QTT-004) #262 2022-11-09 18:24:13 +09:00
HeeseonYoon
93417fd355 [BE-database] Add select database info service #261 2022-11-09 18:22:21 +09:00
SA K
6663567c90 Merge pull request #260 from sakang07/develop
Fix Issue
2022-11-09 17:08:49 +09:00
SA K
d327f4fd29 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-09 17:05:37 +09:00
SA K
0106f1a312 [FE-data] Modify query error message 2022-11-09 17:04:24 +09:00
SA K
b8bbced7b7 [FE-data] Add error handling when querying database #259 2022-11-09 16:51:20 +09:00
HeeseonYoon
b163530d67 Merge pull request #258 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-09 14:50:26 +09:00
HeeseonYoon
2c8ff8ace9 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-09 14:49:32 +09:00
HeeseonYoon
4244f30dbd [BE-test] Add template test case ( QTT-06 ) #257 2022-11-09 14:49:17 +09:00
godyuo
71df441572 Merge pull request #256 from godyuo/develop
feat: add QTT-001 testscript
2022-11-09 14:09:59 +09:00
손승우
1267c96de9 feat: add QTT-001 testscript 2022-11-09 14:09:15 +09:00
SA K
465f58092c [FE] Add loading screen where does not appear in some required places #253 2022-11-09 13:40:02 +09:00
HeeseonYoon
7fa7f6b7ea Merge pull request #254 from yathoo88/develop_backend_yhs
[BE-test] Add sample test file ( QTT-05, QTT-06 )
2022-11-09 13:38:20 +09:00
HeeseonYoon
11c45b7766 [BE-test] Add sample test file ( QTT-05, QTT-06 ) 2022-11-09 13:30:38 +09:00
Dosun Yun
c29d639c0d [BE-front] Update API URL 2022-11-09 07:51:52 +09:00
Dosun Yun
ea8f1bc5f6 [BE-setup] Remove IBM Db2 2022-11-09 07:09:06 +09:00
Dosun Yun
0ed2b8176f [BE-setup] Update dockerfile 2022-11-09 03:58:18 +09:00
SA K
8fa19cac4c Merge pull request #252 from sakang07/develop
Add db connection of snowflake and fix bugs
2022-11-08 21:29:18 +09:00
SA K
67a8840c61 [FE-chart] Fix issue with color initialization when modifying color in pie series chart #251 2022-11-08 21:27:09 +09:00
SA K
b511031eea Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-08 21:01:06 +09:00
SA K
b70b1e835b [FE-data] Add initial value setting when no data source is selected #250 2022-11-08 21:00:55 +09:00
SA K
ca239605fb [FE-data] Add connection of snowflake #207 2022-11-08 20:26:44 +09:00
HeeseonYoon
762a99cc27 Merge pull request #249 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-08 18:48:02 +09:00
HeeseonYoon
c719791d72 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-08 18:47:06 +09:00
HeeseonYoon
b50e1b644b [BE-common] Jest Set up 2022-11-08 18:46:49 +09:00
SA K
190a4a9a62 Merge pull request #248 from sakang07/develop
Fix bugs and add a feature of snackbar alert
2022-11-08 18:09:06 +09:00
SA K
a6518658cf [FE] Replace some pop-up alert messages with snack bars 2022-11-08 18:03:51 +09:00
SA K
19f14ef4d8 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-08 16:02:44 +09:00
SA K
372997ec0f [FE-data] Add error handling when executing query on dataset with snackbar alert #244 2022-11-08 16:02:31 +09:00
HeeseonYoon
22090ad3da Merge pull request #247 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-08 14:49:22 +09:00
HeeseonYoon
b4088b64ae [BE-database] Fixed connect snowflake 2022-11-08 14:48:14 +09:00
HeeseonYoon
1d0ecdeec8 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs
# Conflicts:
#	backend-api/src/database/database.service.ts
2022-11-08 14:22:40 +09:00
HeeseonYoon
795534a8dc [BE-database] Fixed delete logic - remove relative widgets, table queries and datasets 2022-11-08 14:21:24 +09:00
godyuo
a7843b1b8b Merge pull request #246 from godyuo/develop
feat: add snowflake connection
2022-11-08 13:47:37 +09:00
손승우
8afb791fef feat: add snowflake connection 2022-11-08 13:46:54 +09:00
SA K
89b4ea5ae7 [FE-data] Fix a bug that failed to get database id when creating dataset #245 2022-11-08 11:51:10 +09:00
godyuo
38e0f2a0d6 Merge pull request #243 from godyuo/develop
fix: database Invalid table name
2022-11-08 09:15:04 +09:00
손승우
91ae5ea3b0 fix: database Invalid table name 2022-11-08 09:14:07 +09:00
Jeon Jae Yeoul
29c9ed688e Merge pull request #242 from jyjeun/develop
대시보드 수정 후 대시보드 조회 화면으로 이동
2022-11-07 23:42:56 +09:00
jyjeun
203b4a6ea1 대시보드 수정 후 대시보드 조회 화면으로 이동 2022-11-07 23:41:53 +09:00
Dosun Yun
64415afb8e [BE-database] Add snowflake knex dialect 2022-11-07 23:27:56 +09:00
SA K
e3d37f792b Merge pull request #241 from sakang07/develop
Fix bugs
2022-11-07 19:08:20 +09:00
SA K
17d055b77b Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into dev 2022-11-07 19:05:57 +09:00
SA K
ce165d3ae7 [FE-data] Fix a bug that tooltip is not visible when mixed donut chart and score board mouse over #240 2022-11-07 19:05:16 +09:00
SA K
7dc719e3e6 [FE-data] Add error handling when database and dataset creation or modification fails #239 2022-11-07 18:47:04 +09:00
SA K
69a5b9ff65 Merge pull request #238 from sakang07/develop
Add bigquery and fix bugs
2022-11-07 17:33:51 +09:00
SA K
24d70e3892 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-07 17:28:56 +09:00
SA K
0b0dce3334 [FE-data] Modify engine values to be taken from db 2022-11-07 17:28:36 +09:00
godyuo
d11f74058e Merge pull request #237 from godyuo/develop
style: update cockroach connections database.service
2022-11-07 17:10:19 +09:00
손승우
1752c2b6fa style: update cockroach connections database.service 2022-11-07 17:05:43 +09:00
SA K
41d4386ca7 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-07 17:05:07 +09:00
SA K
3cee7fff91 [FE-data] Fix a bug with engine incorrectly entering 2022-11-07 16:58:00 +09:00
SA K
be67b54371 [FE-data] Fix the bigQuery connection bug #207 2022-11-07 16:51:33 +09:00
SA K
c50f224cfa [FE-data] Add connection of bigQuery #207 2022-11-07 16:42:52 +09:00
godyuo
2480fa8888 Merge pull request #236 from godyuo/develop
fix cockroachdb config
2022-11-07 16:41:02 +09:00
손승우
b9e5b76ec9 fix connection.service cockroachdb config 2022-11-07 16:39:39 +09:00
HeeseonYoon
f4b988d24c Merge pull request #235 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-07 15:26:34 +09:00
HeeseonYoon
0d9b0904b6 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-07 15:23:45 +09:00
HeeseonYoon
63b91a1064 [BE-common] gitignore update (add bigquery-key json file) 2022-11-07 15:23:31 +09:00
SA K
2a59e8b4c4 Merge pull request #234 from sakang07/develop
Fix a bug with incorrect entry of table parameters when creating widget charts
2022-11-07 15:11:14 +09:00
SA K
68aaa7bfeb [FE-widget] Fix a bug with incorrect entry of table parameters when creating widget charts 2022-11-07 15:08:55 +09:00
SA K
072849b577 [FE-data] Add icons of cockroachDB, postGIS 2022-11-07 14:24:37 +09:00
SA K
b7a847e2a7 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-07 13:27:35 +09:00
SA K
17fcd7f44c [FE] Add favicon, modify the widget card style, fix a bug in the gauge chart 2022-11-07 13:27:26 +09:00
BongheeCha
8a7a4f4286 Update README.md 2022-11-07 02:02:59 +09:00
BongheeCha
1b51436770 Upload Logo File 2022-11-07 02:01:33 +09:00
BongheeCha
cabfaae464 Upload Readme Images 2022-11-07 01:50:59 +09:00
Gaedong Kim
c4ee702da3 Update README.md
modified DB2 to Db2
2022-11-05 12:24:56 +09:00
SA K
64159665ab [FE-widget] Modify the table option to receive the string 2022-11-04 18:02:31 +09:00
SA K
719c9723e3 [FE-widget] Modify chart layout 2022-11-04 17:56:48 +09:00
SA K
3ee14ed7ca [FE-widget] Fix a bug that options were duplicated when fixing the scoreboard #232 2022-11-04 17:43:08 +09:00
SA K
f327390765 Merge pull request #231 from sakang07/develop
Fix bugs about widget
2022-11-04 15:36:59 +09:00
SA K
3aa422c127 [FE-widget] Fix a bug that do not return to the widget view page when editing on the widget view page #230 2022-11-04 15:25:54 +09:00
SA K
92a5786974 [FE-widget/theme] Add sort to chart creation, add link in footer copyright, modify theme 2022-11-04 15:25:45 +09:00
SA K
8ab3f49690 [FE-widget] Fix problems that do not receive new lists after adding widgets, add a loading spinner in dashboard page #229 2022-11-04 15:25:25 +09:00
Sangwon Lee
2aabd45efa Merge pull request #228 from e8133/develop
Add jest lib to test Front-end
2022-11-04 13:04:55 +09:00
lsw
d62d9baedf Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-04 13:02:56 +09:00
lsw
796a576b8a Add jest for Front-end test 2022-11-04 13:02:50 +09:00
HeeseonYoon
d332dfb9db Merge pull request #226 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-03 19:04:31 +09:00
HeeseonYoon
6feae672fe Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-03 19:02:39 +09:00
HeeseonYoon
033979fd39 [BE-template] Modify template layout setting #225 - Change the priority of widget items 'widgetList' that are exceeded in the template 2022-11-03 19:02:14 +09:00
HeeseonYoon
6051f8b1e6 Merge pull request #224 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-03 18:22:32 +09:00
HeeseonYoon
7df10f97cf Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-03 18:19:31 +09:00
HeeseonYoon
466c3bacd7 [BE-database] Add Connect db: connect oracle #167 2022-11-03 18:19:19 +09:00
godyuo
df4016f9f9 Merge pull request #223 from godyuo/develop
update redshift table
2022-11-03 16:33:02 +09:00
손승우
d5cd5b7b40 update redshift table 2022-11-03 16:31:36 +09:00
SA K
f9c3307426 Merge pull request #222 from sakang07/develop
Develop
2022-11-03 13:36:28 +09:00
SA K
a621288e5c [FE-layout] Fix layout 2022-11-03 13:35:05 +09:00
SA K
48ba06580f [FE-login] Change login background image 2022-11-03 12:57:29 +09:00
SA K
0a47bcb096 [FE-login] Add features to log in continuously during a session #221 2022-11-03 12:56:51 +09:00
HeeseonYoon
60fed38eb5 Merge pull request #220 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-03 11:47:27 +09:00
HeeseonYoon
b62a75b2e6 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-03 11:46:37 +09:00
HeeseonYoon
bb535ced21 [BE-database] Add Connect db: connect Bigquery #193 2022-11-03 11:46:21 +09:00
Dosun Yun
ee7c75ed0c oracle driver 설치 스크립트 2022-11-03 00:27:34 +09:00
Dosun Yun
e3e231c011 oracle-db test query 추가 2022-11-03 00:00:38 +09:00
Dosun Yun
fff462be1b oracle-db test query 추가 2022-11-02 23:50:10 +09:00
SA K
d49df5b747 Merge pull request #219 from sakang07/develop
Fix bugs and apply design
2022-11-02 19:16:39 +09:00
SA K
c1c181229d Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-02 19:13:21 +09:00
SA K
f0d73555b4 [FE-login] Modify design of login page #218 2022-11-02 19:13:11 +09:00
HeeseonYoon
c21bf84f37 Merge pull request #217 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-02 19:08:28 +09:00
HeeseonYoon
13e306b9d4 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-02 19:07:40 +09:00
HeeseonYoon
fe5f8922e9 [BE-database] Add Connect db: connect Bigquery #193 2022-11-02 19:07:27 +09:00
SA K
65b217518f [FE-data] Fix problem of not getting id of db when modifying dataset #208 2022-11-02 17:48:23 +09:00
SA K
09bbb1d53d [FE-data] Fix missing parameters when saving database 2022-11-02 17:37:44 +09:00
SA K
614863bf9d [FE-data] Edit database api parameter and fix bugs 2022-11-02 17:20:38 +09:00
HeeseonYoon
eba1fab8cc Merge pull request #216 from yathoo88/develop_backend_yhs
[BE-database] Add databaseType column #215
2022-11-02 14:34:34 +09:00
HeeseonYoon
dc53fe51db [BE-database] Add databaseType column #215 2022-11-02 14:33:39 +09:00
Jeon Jae Yeoul
2649a88731 Merge pull request #214 from jyjeun/develop
Develop
2022-11-02 13:44:27 +09:00
jjy
4c79e17ce0 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop_jyjeun 2022-11-02 13:43:30 +09:00
jjy
3ae9542666 TextField
- label : 대시보드 이름
2022-11-02 13:43:18 +09:00
jjy
9bdfaace16 위젯 배치 로직 수정
- 중복로직 제거
2022-11-02 13:41:21 +09:00
godyuo
a8244eb40f Merge pull request #213 from godyuo/develop
add connect Redshift #192
2022-11-02 11:45:58 +09:00
손승우
5a186ebe14 add connect Redshift #192 2022-11-02 11:43:43 +09:00
HeeseonYoon
560329410e Merge pull request #212 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-11-02 11:10:05 +09:00
HeeseonYoon
4473e1250e Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-02 11:08:54 +09:00
HeeseonYoon
dac910fbf0 [BE-database] Fixed bug #211 - Can not read table list 2022-11-02 11:08:41 +09:00
Jeon Jae Yeoul
cb38228906 Merge pull request #210 from jyjeun/develop
대시보드에 위젯 추가시 비어있는 공간으로 추가되게 수정
2022-11-02 01:38:47 +09:00
jyjeun
01479160d5 대시보드 위젯 추가시 빈공간에 추가되는 위젯 들어가게 변경.
- 신규 위젯 기본크기 : w -> 6, h -> 5
 - 신규 위젯 기본크기 변경하고 싶을 시 getCalculatorPosition 함수에서 기본크기 변경 가능.
 - layout 최대크기(width) 변경하고 싶을 시 (현재 최대크기 12) getCalculatorPosition 함수에서 최대 width 값 변경 가능
2022-11-02 01:37:34 +09:00
jyjeun
0433dcccdb Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop_jyjeun 2022-11-01 22:52:49 +09:00
SA K
1a2bb1b22c Merge pull request #209 from sakang07/develop
Add a feature in data page
2022-11-01 22:07:38 +09:00
SA K
ad1f7c659c Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-01 21:55:58 +09:00
SA K
41c55d97c2 [FE-data] Invoke form differently depending on db source and whether it is created or modified: mysql, mariaDb, pg, mssql, sqlite #207 2022-11-01 21:55:45 +09:00
HeeseonYoon
7fbf4d3530 Merge pull request #206 from yathoo88/develop_backend_yhs
[BE-database] Fixed data load Error #205 - can not load table info when datasetType is TABLE
2022-11-01 17:48:50 +09:00
HeeseonYoon
2c7ae3c9f0 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-11-01 17:46:52 +09:00
HeeseonYoon
b68365c99b [BE-database] Fixed data load Error #205 - can not load table info when datasetType is TABLE 2022-11-01 17:46:34 +09:00
Sangwon Lee
c8730bc587 Merge pull request #204 from e8133/develop
Add login
2022-11-01 15:11:06 +09:00
lsw
1fa0d95cb0 Add Login 2022-11-01 15:10:14 +09:00
lsw
2da217f3d0 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-11-01 10:33:38 +09:00
jyjeun
4b70915182 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop_jyjeun 2022-10-30 17:39:29 +09:00
jyjeun
a3f25ae2ad 레이아웃 작업중 2022-10-30 17:37:22 +09:00
lsw
29807adc97 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-28 13:54:32 +09:00
lsw
17c9bc5463 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-28 13:18:12 +09:00
lsw
43ed27163e Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop
 Conflicts:
	backend-api/package-lock.json
2022-10-27 17:03:43 +09:00
lsw
3eca3291c7 Modify widget button 2022-10-27 17:03:21 +09:00
godyuo
28adae9429 Merge pull request #65 from godyuo/develop_backend
add db connect
2022-10-12 15:47:48 +09:00
손승우
678899b209 add db connect 2022-10-12 15:45:28 +09:00
313 changed files with 123177 additions and 28748 deletions

6
.idea/misc.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

6
.idea/modules.xml generated
View File

@@ -2,8 +2,10 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/backend-libs-lambda-layer/backend-libs-lambda-layer.iml" filepath="$PROJECT_DIR$/backend-libs-lambda-layer/backend-libs-lambda-layer.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/vanillameta.iml" filepath="$PROJECT_DIR$/.idea/vanillameta.iml" />
<module fileurl="file://$PROJECT_DIR$/backend-api/backend-api.iml" filepath="$PROJECT_DIR$/backend-api/backend-api.iml" />
<module fileurl="file://$PROJECT_DIR$/backend-api-libs-lambda-layer/backend-api-libs-lambda-layer.iml" filepath="$PROJECT_DIR$/backend-libs-lambda-layer/backend-libs-lambda-layer.iml" />
<module fileurl="file://$PROJECT_DIR$/frontend-web/frontend-web.iml" filepath="$PROJECT_DIR$/frontend-web/frontend-web.iml" />
<module fileurl="file://$PROJECT_DIR$/landing-page/landing-page.iml" filepath="$PROJECT_DIR$/landing-page/landing-page.iml" />
</modules>
</component>
</project>

875
LICENSE
View File

@@ -1,674 +1,201 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@@ -1,5 +1,7 @@
# VanillaMeta
<img title="VanillaMeta Logo" src="design/vanillameta-logo.png"/><br/>
최신 엔터프라이즈용 비즈니스 인텔리전스 웹 애플리케이션입니다.
# 바닐라메타를 사용해야 하는 이유
@@ -8,19 +10,26 @@
## 바닐라메타의 기능
- 코딩없이 차트 위젯 제작
- 50개 이상의 차트지원
- 코딩없이 차트 위젯 제작.
- 50개 이상의 차트 지원
- 사용자 맞춤형 대시보드 편집 및 공유
- 대시보드 템플릿 디자인 추천
- 고급 SQL 쿼리 편집기 및 데이터 미리보기
- 고급 SQL 쿼리 편집기 및 데이터 미리보기 제공
- 다양한 SQL 데이터베이스에 대한 즉시 지원
## 스크린샷
## 주요기능 화면
- 다양한 시각화 차트
- 강력한 SQL 편집기
- 코딩없이 차트 제작
- 템플릿 추천
- **다양한 시각화 차트**
<kbd><img title="Chart" src="design/feature-01.png"/></kbd><br/>
- **강력한 SQL 편집기**
<kbd><img title="Chart" src="design/feature-02.png"/></kbd><br/>
- **코딩없이 차트 제작**
<kbd><img title="Chart" src="design/feature-03.png"/></kbd><br/>
- **템플릿 추천**
<kbd><img title="Chart" src="design/feature-04.png"/></kbd><br/>
## 지원하는 데이터베이스
@@ -30,6 +39,65 @@
- SQLServer
- SQLite
- Oracle
- DB2
- Amazon Redshift
- Big Query
- Cockroachdb
- Snowflake
## 설치하기
```
cd ~/vanillameta/backend-api/ npm install
cd ~/vanillameta/frontend-web/ npm install
```
## 시작하기
```
cd 현재위치/vanillameta/backend-api/ npm run seed:run 완료 후
cd 현재위치/vanillameta/backend-api/ npm run start
새로운 터미널에서
cd 현재위치/vanillameta/frontend-web/ npm run start
```
실행 후 localhost:3000경로에서
![로그인 화면](https://user-images.githubusercontent.com/83908329/219256208-2c8fab3e-751d-4612-bda0-158dd4309032.png)
화면이 뜬다면 성공 !
```
현재 default 계정정보는
ID: guest
PW: Admin!@12
```
입니다. 이후 회원정보 변경하기 페이지에서 비밀번호를 바꿔서 사용하시면 됩니다
## db연동하기
사용하고 계신 MySql의 연결을 확인한 후 저장해 주세요.
![db연결 확인 및 저장](https://user-images.githubusercontent.com/83908329/219614086-9bb4545f-1306-48bb-9613-c78cfa968430.png)
## 데이터셋 설정하기
위젯에 적용할 데이터를 query문을 사용하여 선택하시고 저장해 주세요.
![데이터셋 설정](https://user-images.githubusercontent.com/83908329/219614709-e4621672-b4c5-4b17-bcbc-117f9145e555.png)
## 위젯 생성하기
1. 생성한 데이터 셋을 선택하고 다음으로 넘어가 주세요.
![위젯 데이터 선택 이미지](https://user-images.githubusercontent.com/83908329/219615999-745dcbf7-6e6d-4d7f-8100-9d34bb0b0654.png)
2. 원하는 타입의 위젯을 선택하고 다음으로 넘어가 주세요.
![위젯 타입 선택 이미지](https://user-images.githubusercontent.com/83908329/219616299-a571ab00-5bab-454c-9a96-2e70caefd33d.png)
3. 원하는 위젯의 속성을 선택하시고 저장을 눌러주세요.
![위젯 속성 이미지](https://user-images.githubusercontent.com/83908329/219616483-48551fb9-d123-4c87-b8d7-42d37219fe48.png)
생성한 위젯들로 대시보드를 구성해 보세요!

119
backend-api/.dockerignore Normal file
View File

@@ -0,0 +1,119 @@
# Created by .ignore support plugin (hsz.mobi)
### Node template
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
# Runtime data
pids
*.pid
*.seed
*.pid.lock
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
*.lcov
# nyc test coverage
.nyc_output
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Bower dependency directory (https://bower.io/)
bower_components
# node-waf configuration
.lock-wscript
# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
# Dependency directories
node_modules/
jspm_packages/
# Snowpack dependency directory (https://snowpack.dev/)
web_modules/
# TypeScript cache
*.tsbuildinfo
# Optional npm cache directory
.npm
# Optional eslint cache
.eslintcache
# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/
# Optional REPL history
.node_repl_history
# Output of 'npm pack'
*.tgz
# Yarn Integrity file
.yarn-integrity
# dotenv environment variables file
.env
.env.test
# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache
# Next.js build output
.next
out
# Nuxt.js build / generate output
.nuxt
dist
# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public
# vuepress build output
.vuepress/dist
# Serverless directories
.serverless/
# FuseBox cache
.fusebox/
# DynamoDB Local files
.dynamodb/
# TernJS port file
.tern-port
# Stores VSCode versions used for testing VSCode extensions
.vscode-test
# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*

View File

@@ -1,2 +1,7 @@
DOCKER_LOCAL_VOLUME=/home/vanilla/data/jenkins-workspace/workspace/sellerking-dev/vanillameta-dev-serverless-api/backend-api/
DOCKER_LOCAL_AWS=/home/vanilla/.aws
ACCESS_SECRET=plzInsert
REFRESH_SECRET=plzInsert
JWT_ACCESS_SECRET=true
URL_ACCESS_SECRET=plzInsert
CORS_ORIGIN = [http://localhost:3000', 'undefined', 'https://vanillameta.vanillabrain.com/']

View File

@@ -1,10 +0,0 @@
DB_TYPE='mysql'
DB_HOST='localhost'
DB_PORT=3306
DB_USERNAME='vanillameta'
DB_PASSWORD='pw'
DB_NAME='vanillameta'
CORS_ORIGIN='*'
api propertyfile fix

View File

@@ -1,8 +1,8 @@
module.exports = {
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'tsconfig.json',
tsconfigRootDir : __dirname,
project: './tsconfig.json',
tsconfigRootDir : __dirname,
sourceType: 'module',
},
plugins: ['@typescript-eslint/eslint-plugin'],
@@ -22,4 +22,4 @@ module.exports = {
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
};
};

View File

@@ -4,6 +4,10 @@ config.serverless.yml
.env.prod
.ormconfig.json
vanillameta
bigquery-key.json
test-connect-info.json
cert.pem
key.pem
.
# compiled output
/dist

View File

@@ -1,24 +1,19 @@
FROM ubuntu:18.04
RUN apt-get -qq update
RUN apt-get -qq upgrade --yes
RUN apt-get -qq install curl --yes
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN apt-get -qq install nodejs --yes
RUN apt-get install chromium-browser --yes
FROM node:14-slim
# ORACLE 설치
RUN apt-get update && apt-get install -y libaio1 wget unzip
WORKDIR /opt/oracle
RUN wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip && \
unzip instantclient-basiclite-linuxx64.zip && rm -f instantclient-basiclite-linuxx64.zip && \
cd /opt/oracle/instantclient* && rm -f *jdbc* *occi* *mysql* *mql1* *ipc1* *jar uidrvci genezi adrci && \
echo /opt/oracle/instantclient* > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig
WORKDIR /app
COPY package*.json ./
RUN npm install
# ENV NODE_ENV production
# COPY --from=builder /app ./
COPY . .
COPY tsconfig.json .
COPY tsconfig.build.json .
RUN npm install
RUN npm run build
EXPOSE 3000
# expose our default runtime port
EXPOSE 4000
CMD ["npm", "run", "start"]
CMD ["npm","run","start:prod"]

View File

@@ -0,0 +1,95 @@
##FROM mysql:5.7
##
###ENV DEBIAN_FRONTEND noninteractive
##
##RUN apt-get update
###RUN echo "mysql-server mysql-server/root_password password" | debconf-set-selections
###RUN echo "mysql-server mysql-server/root_password_again password" | debconf-set-selections
###RUN apt-get install -y mysql-server
##
##ADD ./mysql-init-files /docker-entrypoint-initdb.d
##
##EXPOSE 3306
##
##CMD ['mysqld']
##FROM mysql:5.7
##
##ADD ./mysql-init-files /docker-entrypoint-initdb.d
###RUN brew install mysql
##RUN ./init.sh
##
##EXPOSE 3306
##
##CMD ["mysqld"]
#FROM ubuntu:18.04
#
#RUN apt-get -qq update
#RUN apt-get -qq upgrade --yes
#RUN apt-get -qq install curl --yes
#RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
#RUN apt-get -qq install nodejs --yes
#
#RUN apt-get install chromium-browser --yes
#RUN useradd -ms /bin/bash frog
#
#WORKDIR /app
#
#COPY package*.json ./
#
#RUN npm install
#COPY . .
#COPY tsconfig.json .
#COPY tsconfig.build.json .
#RUN npm run build
#
#
##ENTRYPOINT ["init.sh"]
#EXPOSE 4000
#CMD ["mysqld"]
#
#
##
##COPY init.sh .
##USER root
##RUN chmod +x init.sh
##ENTRYPOINT ["sh", "init.sh"]
#
#
#
##FROM ubuntu:18.04
##
##RUN apt-get -qq update
##RUN apt-get -qq upgrade --yes
##RUN apt-get -qq install curl --yes
##RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
##RUN apt-get -qq install nodejs --yes
##
##RUN apt-get install chromium-browser --yes
##RUN chmod +x /tmp
##RUN useradd -ms /bin/bash frog
##USER frog
##WORKDIR /home/frog
##
##COPY package*.json ./
##
##RUN npm install
##FROM mysql:5.7
##COPY init.sh .
##EXPOSE 8000
##ENTRYPOINT [ "sh", "init.sh" ]
#
##end of Dockerfile.dev
#
##FROM ubuntu:18.04
##RUN apt-get -qq update
##RUN apt-get -qq upgrade --yes
##RUN apt-get -qq install curl --yes
##RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
##RUN apt-get -qq install nodejs --yes
##
##RUN apt-get install chromium-browser --yes
##RUN chmod +x /tmp
##RUN useradd -ms /bin/bash frog
##USER frog
##WORKDIR /home/frog
##ADD mysql-init-files/dump_data.sql /docker-entrypoint-initdb.d/

View File

@@ -24,7 +24,7 @@
## Description
[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository
## Installation

View File

@@ -1,7 +1,16 @@
[client]
default-character-set = utf8mb4
[mysqldump]
quick
max_allowed_packet = 16M
[mysql]
default-character-set = utf8mb4
[mysqld]
init-connect = 'SET collation_connection = utf8mb4_unicode_ci'
init-connect = 'SET NAMES utf8mb4'
character-set-server = utf8mb4
collation-server = utf8mb4_unicode_ci
default_time_zone='+09:00'

View File

@@ -1,131 +1,213 @@
version: "3.7"
services:
main:
build:
context: ./
dockerfile: ./Dockerfile
ports:
- "4000:4000"
networks:
- vanillameta
depends_on:
- mysql
# - pg
links:
- "mysql:mysqldb"
# - "pg"
env_file:
- .env
- .env.dev
restart: always
mysql:
container_name: vanillameta_mysql
image: mysql
ports:
- "3306:3306"
networks:
- vanillameta
environment:
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
MYSQL_CHARSET: utf8mb4
MYSQL_DATABASE: ${DB_NAME}
MYSQL_USER: ${DB_USERNAME}
MYSQL_PASSWORD: ${DB_PASSWORD}
TZ: Asia/Seoul
restart: always
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
--default_authentication_plugin=mysql_native_password
volumes:
- mysql:/var/lib/mysql
- ./db/conf.d:/etc/mysql/conf.d
# mariadb:
# container_name: vanillameta_mariadb
# extra_hosts:
# - "host.docker.internal:host-gateway"
# image: mariadb
# ports:
# - "3308:3308"
# networks:
# - vanillameta
# environment:
# MYSQL_ROOT_PASSWORD: 'strongpassword'
# MYSQL_CHARSET: utf8mb4
# MYSQL_DATABASE: ${DB_NAME}
# MYSQL_USER: ${DB_USERNAME}
# MYSQL_PASSWORD: ${DB_PASSWORD}
# TZ: Asia/Seoul
# restart: always
# volumes:
# - ./db:/var/lib/maria
# pg:
# container_name: vanillameta_pg
# image: postgres
# ports:
# - "5432:5432"
# networks:
# - vanillameta
# environment:
# POSTGRES_ROOT_PASSWORD: 'strongpassword'
# POSTGRES_CHARSET: utf8mb4
# POSTGRES_DATABASE: ${DB_NAME}
# POSTGRES_USER: ${DB_USERNAME}
# POSTGRES_PASSWORD: ${DB_PASSWORD}
# POSTGRES_HOST_AUTH_METHOD: "trust"
# TZ: Asia/Seoul
# restart: always
# # command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
# volumes:
# - mysql:/var/lib/mysql
# - ./db/conf.d:/etc/porstgressql/data
# oracledb:
# container_name: vanillameta_oracle
# image: oracleinanutshell/oracle-xe-11g
# ports:
# - "1521:1521"
# networks:
# - vanillameta
# environment:
# ORACLE_CHARSET: utf8mb4
# ORACLE_DATABASE: ${DB_NAME}
# ORACLE_USER: ${DB_USERNAME}
# ORACLE_PASSWORD: ${DB_PASSWORD}
# TZ: Asia/Seoul
# restart: always
# # command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
# volumes:
# - mysql:/var/lib/mysql
# - ./db/conf.d:/etc/porstgressql/data
##
##version: '3.3'
##
##services:
## db:
## build:
## context: .
## dockerfile: Dockerfile.dev
## image: mysql:5.7
## # volumes:
## # - ./mysql-init-files/:/docker-entrypoint-initdb.d/
## restart: always
## container_name: mmc
## environment:
## - MYSQL_ALLOW_EMPTY_PASSWORD="true"
## - MYSQL_DATABASE= ${DB_NAME}
## - MYSQL_USER= ${DB_USERNAME}
## - MYSQL_PASSWORD= ${DB_PASSWORD}
## env_file:
## - .env
## ports:
## - '3306:3306'
## expose:
## - '3306'
## command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
## --default_authentication_plugin=mysql_native_password
## volumes:
## - "./mysql-init-files/:/docker-entrypoint-initdb.d/"
## - mysql:/var/lib/mysql
## - ./db/conf.d:/etc/mysql/conf.d
#
# mssql:
# container_name: vanillameta_mssql
# image: mcr.microsoft.com/azure-sql-edge
##version: "3.5"
##services:
## main:
## build:
## context: ./
## dockerfile: ./Dockerfile.dev
## ports:
## - "4000:4000"
## networks:
## - vanillameta
## depends_on:
## - mysql
## links:
## - "mysql"
### - "pg"
## env_file:
## - .env
## tty: true
## environment:
## MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
## restart: always
##
## mysql:
## container_name: vanillameta_mysql
## image: mysql:5.7
## ports:
## - "3306:3306"
## networks:
## - vanillameta
## environment:
## MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
## MYSQL_CHARSET: utf8mb4
## MYSQL_DATABASE: ${DB_NAME}
## MYSQL_USER: ${DB_USERNAME}
## MYSQL_PASSWORD: ${DB_PASSWORD}
## TZ: Asia/Seoul
## restart: always
##
## command:
## --default-authentication-plugin=mysql_native_password
### --init-file /docker-entrypoint-initdb.d/dump_data.sql
## volumes:
## - ./mysql:/var/lib/mysql/
## - ./db/conf.d:/etc/mysql/conf.d
## - ./mysql-init-files/dump_data:/docker-entrypoint-initdb.d/dump_data
#
#
#version: "3.7"
#services:
# main:
# build:
# context: ./
# dockerfile: ./Dockerfile.dev
# image: mysql
# ports:
# - "1433:1433"
# - "4000:4000"
# networks:
# - vanillameta
# depends_on:
# - mysql
# links:
# - "mysql"
# env_file:
# - .env
# tty: true
# environment:
# ACCEPT_EULA: "Y"
# MSSQL_SA_PASSWORD: ${DB_PASSWORD}
# MSSQL_AGENT_ENABLED: "true"
# MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
# restart: always
#
# mysql:
# container_name: vanillameta_mysql
# image: mysql
# ports:
# - "3306:3306"
# networks:
# - vanillameta
#
# environment:
# MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
# MYSQL_CHARSET: utf8mb4
# MYSQL_DATABASE: ${DB_NAME}
# MYSQL_USER: ${DB_USERNAME}
# MYSQL_PASSWORD: ${DB_PASSWORD}
# TZ: Asia/Seoul
# restart: always
# command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
# --default_authentication_plugin=mysql_native_password
#
# volumes:
# - ./vanillameta_mssqldata:/var/opt/mssql
# - mysql:/var/lib/mysql
# - ./db/conf.d:/etc/mysql/conf.d
# - ./mysql-init-files/dump_data:/docker-entrypoint-initdb.d
#
# # mariadb:
# # container_name: vanillameta_mariadb
# # extra_hosts:
# # - "host.docker.internal:host-gateway"
# # image: mariadb
# # ports:
# # - "3308:3308"
# # networks:
# # - vanillameta
# # environment:
# # MYSQL_ROOT_PASSWORD: 'strongpassword'
# # MYSQL_CHARSET: utf8mb4
# # MYSQL_DATABASE: ${DB_NAME}
# # MYSQL_USER: ${DB_USERNAME}
# # MYSQL_PASSWORD: ${DB_PASSWORD}
# # TZ: Asia/Seoul
# # restart: always
# # volumes:
# # - ./db:/var/lib/maria
#
## pg:
## container_name: vanillameta_pg
## image: postgres
## ports:
## - "5432:5432"
## networks:
## - vanillameta
## environment:
## POSTGRES_ROOT_PASSWORD: 'strongpassword'
## POSTGRES_CHARSET: utf8mb4
## POSTGRES_DATABASE: ${DB_NAME}
## POSTGRES_USER: ${DB_USERNAME}
## POSTGRES_PASSWORD: ${DB_PASSWORD}
## POSTGRES_HOST_AUTH_METHOD: "trust"
## TZ: Asia/Seoul
## restart: always
## # command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
## volumes:
## - mysql:/var/lib/mysql
## - ./db/conf.d:/etc/porstgressql/data
#
#
## oracledb:
## container_name: vanillameta_oracle
## image: oracleinanutshell/oracle-xe-11g
## ports:
## - "1521:1521"
## networks:
## - vanillameta
## environment:
## ORACLE_CHARSET: utf8mb4
## ORACLE_DATABASE: ${DB_NAME}
## ORACLE_USER: ${DB_USERNAME}
## ORACLE_PASSWORD: ${DB_PASSWORD}
## TZ: Asia/Seoul
## restart: always
## # command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
## volumes:
## - mysql:/var/lib/mysql
## - ./db/conf.d:/etc/porstgressql/data
#
#
##
## mssql:
## container_name: vanillameta_mssql
## image: mcr.microsoft.com/mssql/server:2019-latest
## user: frog
## ports:
## - "1433:1433"
## networks:
## - vanillameta
## environment:
## ACCEPT_EULA: "Y"
## MSSQL_SA_PASSWORD: 'Qkslffk@123123'
##
##
##
## restart: always
##
## volumes:
## - ./sqlvolume:/home/frog
##
#
##
#volumes:
# mysql:
#networks:
# vanillameta:
#
# - ./db/conf.d:/etc/mysql/conf.d
volumes:
mysql:
networks:
vanillameta:

11
backend-api/init.sh Normal file
View File

@@ -0,0 +1,11 @@
#!/bin/bash
#init.sh
# mysql_config_editor set --login-path=test --host=dev-sellerking-service.cpxfjdgipx1h.ap-northeast-2.rds.amazonaws.com --user=vanillabrain --password
# Enter password: qkslffk123123
mysqldump --single-transaction --databases --column-statistics=0 vanillameta_auth -h localhost -u vanillabrain -pqkslffk123123 < /docker-entrypoint-initdb.d
# mysqldump -h dev-sellerking-service.cpxfjdgipx1h.ap-northeast-2.rds.amazonaws.com -u vanillabrain --password > dump_data.sql
#end of init.sh
# mysqldump --single-transaction --databases --column-statistics=0 vanillameta_auth -h localhost -u vanillabrain -pqkslffk123123 < dump_data.sql

View File

@@ -0,0 +1,10 @@
#!/bin/sh
BASEDIR=$(PWD)
cd $HOME/Downloads
curl -O https://download.oracle.com/otn_software/mac/instantclient/198000/instantclient-basic-macos.x64-19.8.0.0.0dbru.dmg
hdiutil mount instantclient-basic-macos.x64-19.8.0.0.0dbru.dmg
/Volumes/instantclient-basic-macos.x64-19.8.0.0.0dbru/install_ic.sh
hdiutil unmount /Volumes/instantclient-basic-macos.x64-19.8.0.0.0dbru
cd $BASEDIR
cp ~/Downloads/instantclient_19_8/{libclntsh.dylib.19.1,libclntshcore.dylib.19.1,libnnz19.dylib,libociei.dylib} node_modules/oracledb/build/Release
cd node_modules/oracledb/build/Release/ && ln -s libclntsh.dylib.19.1 libclntsh.dylib

View File

@@ -1,9 +0,0 @@
{
"moduleFileExtensions": ["js", "json", "ts"],
"rootDir": ".",
"testEnvironment": "node",
"testRegex": ".*spec.ts$",
"transform": {
"^.+\\.(t|j)s$": "ts-jest"
}
}

View File

@@ -1,29 +0,0 @@
[
{
"name": "default",
"type": "sqlite",
"host" : "127.0.0.1",
"post" : 5432,
"username" : "username",
"password" : "password",
"database" : "db_01",
"entities": [
"dist/**/*.entity.js"
]
},
{
"name": "test_db",
"tpye":
"database" : "vanillameta",
},
{
"name": "db_02",
"type": "mysql",
"host": "localhost",
"port": 3306,
"username": "vanillameta",
"password": "pw",
"database": "vanillameta",
"autoLoadEntities": true
]

18
backend-api/ormconfig.ts Normal file
View File

@@ -0,0 +1,18 @@
import {TypeOrmModuleOptions} from '@nestjs/typeorm';
import * as dotenv from 'dotenv'; // 무조건 상대경로로 가져와야 시딩됨
dotenv.config();
const config: TypeOrmModuleOptions = {
type: 'sqlite',
database: 'sqlite.db',
autoLoadEntities: true,
entities: ['src/**/*.entity{.ts,.js}', 'src/**/*.enum{.ts,.js}'],
synchronize: true, // 자동으로 테이블 생성, 한번 작동 후 false
retryAttempts: 1,
logging: true,
keepConnectionAlive: true,
};
export = config;

File diff suppressed because it is too large Load Diff

View File

@@ -9,10 +9,10 @@
"prebuild": "rimraf dist",
"build": "nest build",
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
"start": "nest start",
"start": "nest start --watch",
"start:dev": "cross-env NODE_ENV=dev nest start --watch",
"start:debug": "nest start --debug --watch",
"start:prod": "node dist/main",
"start:prod": "cross-env NODE_ENV=prod node dist/main",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
"test": "jest",
"test:watch": "jest --watch",
@@ -20,6 +20,8 @@
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "jest --config ./test/jest-e2e.json",
"deploy": "serverless deploy --stage prod",
"seed:config": "ts-node ./node_modules/typeorm-seeding/dist/cli.js config",
"seed:run": "ts-node ./node_modules/typeorm-seeding/dist/cli.js seed",
"deploy:dev": "serverless deploy --stage dev",
"deploy:prod": "serverless deploy --stage prod"
},
@@ -29,11 +31,14 @@
"@nestjs/common": "^9.0.0",
"@nestjs/config": "^2.2.0",
"@nestjs/core": "^9.0.0",
"@nestjs/jwt": "^9.0.0",
"@nestjs/mapped-types": "*",
"@nestjs/passport": "^9.0.0",
"@nestjs/platform-express": "^9.0.0",
"@nestjs/swagger": "^6.1.2",
"@nestjs/swagger": "^6.1.4",
"@nestjs/typeorm": "^9.0.1",
"@nestjsplus/knex": "^1.0.0",
"@types/cookie-parser": "^1.4.3",
"@types/mustache": "^4.2.1",
"@types/winston": "^2.4.4",
"aws-lambda": "^1.0.7",
@@ -42,31 +47,40 @@
"better-sqlite3": "^7.6.2",
"class-transformer": "^0.5.1",
"class-validator": "^0.13.2",
"cookie-parser": "^1.4.5",
"cookie-parser": "^1.4.6",
"cross-env": "^7.0.3",
"dylib-node": "^1.0.10",
"fastify-swagger": "^5.2.0",
"js-joda": "^1.11.0",
"knex": "^2.3.0",
"knex-bigquery": "^2.0.3",
"knex-db2": "^1.0.0",
"knex-schema-inspector": "^2.0.4",
"knex-snowflake-dialect": "^1.0.1",
"mathjs": "^11.3.3",
"mustache": "^4.2.0",
"mysql2": "^2.3.3",
"nest-winston": "^1.7.0",
"odbc": "^2.4.6",
"oracledb": "^5.5.0",
"passport": "^0.6.0",
"passport-jwt": "^4.0.0",
"passport-local": "^1.0.0",
"pg": "^8.8.0",
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"rxjs": "^7.2.0",
"sequelize": "^6.25.0",
"sequelize-oracle": "^3.3.2-0.0",
"sequelize-typescript": "^2.1.3",
"snowflake-sdk": "^1.6.13",
"sqlite3": "^5.1.1",
"sqlite3": "^5.1.4",
"swagger-ui-express": "^4.5.0",
"tedious": "^15.1.0",
"ts-jenum": "^2.2.2",
"typeorm": "^0.3.9",
"typeorm-naming-strategies": "^4.1.0",
"typeorm-seeding": "^1.6.1",
"uuid": "^9.0.0",
"winston": "^3.8.2"
},
"devDependencies": {
@@ -76,10 +90,13 @@
"@types/express": "^4.17.13",
"@types/jest": "28.1.8",
"@types/node": "^16.0.0",
"@types/passport-jwt": "^3.0.7",
"@types/passport-local": "^1.0.34",
"@types/supertest": "^2.0.11",
"@types/uuid": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"eslint": "^8.0.1",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"jest": "28.1.3",
@@ -107,7 +124,8 @@
"json",
"ts"
],
"rootDir": "src",
"testTimeout": 20000,
"rootDir": ".",
"testRegex": ".*\\.spec\\.ts$",
"transform": {
"^.+\\.(t|j)s$": "ts-jest"

Binary file not shown.

View File

@@ -11,26 +11,45 @@ import { TemplateModule } from './template/template.module';
import { CommonModule } from './common/common.module';
import { ComponentModule } from './component/component.module';
import { ConnectionModule } from './connection/connection.module';
import { UserModule } from './user/user.module';
import { AuthModule } from './auth/auth.module';
import { LoginModule } from './login/login.module';
import { ShareUrlModule } from './share-url/share-url.module';
import * as ormconfig from '../ormconfig';
@Module({
imports: [
ConfigModule.forRoot({
isGlobal: true,
envFilePath: process.env.NODE_ENV == 'dev' ? '.env.dev' : '.env.prod',
envFilePath: process.env.NODE_ENV == 'dev' ? '.env.dev' : '.env.ci',
}),
TypeOrmModule.forRoot({
type: 'mysql',
host: process.env.DB_HOST,
port: parseInt(process.env.DB_PORT) || 3306,
username: process.env.DB_USERNAME,
password: process.env.DB_PASSWORD,
database: process.env.DB_NAME,
type: 'sqlite',
database: 'sqlite.db',
autoLoadEntities: true,
entities: [__dirname + '/**/*.entity{.ts,.js}'],
synchronize: false,
synchronize: true,
logging: process.env.NODE_ENV == 'dev',
retryAttempts: 1,
dropSchema: false, // 매번 실행시마다 테이블 drop false
}),
// TypeOrmModule.forRoot({
// type: 'mysql',
// host: process.env.DB_HOST,
// port: parseInt(process.env.DB_PORT) || 3306,
// username: process.env.DB_USERNAME,
// password: process.env.DB_PASSWORD,
// database: process.env.DB_NAME,
// autoLoadEntities: true,
// entities: [__dirname + '/**/*.entity{.ts,.js}'],
// synchronize: false,
// logging: process.env.NODE_ENV == 'dev',
// retryAttempts: 1,
// }),
DatabaseModule,
DatasetModule,
WidgetModule,
@@ -39,6 +58,11 @@ import { ConnectionModule } from './connection/connection.module';
CommonModule,
ComponentModule,
ConnectionModule,
UserModule,
AuthModule,
LoginModule,
ShareUrlModule,
],
controllers: [AppController],
providers: [AppService],

View File

@@ -0,0 +1,21 @@
import { Module } from '@nestjs/common';
import { AuthService } from './auth.service';
import { JwtModule } from '@nestjs/jwt';
import { PassportModule } from '@nestjs/passport';
import { JwtStrategy } from './strategies/jwt.strategy';
import { TypeOrmModule } from '@nestjs/typeorm';
import { User } from '../user/entities/user.entity.js';
import { LocalStrategy } from '../auth/strategies/local.strategy.js';
import { RefreshToken } from './entites/refresh_token.entity';
@Module({
imports: [
TypeOrmModule.forFeature([User, RefreshToken]),
PassportModule,
JwtModule.register({
secret: process.env.JWT_ACCESS_SECRET,
}),
],
providers: [AuthService, JwtStrategy, LocalStrategy],
})
export class AuthModule {}

View File

@@ -0,0 +1,18 @@
import { Test, TestingModule } from '@nestjs/testing';
import { AuthService } from './auth.service';
describe('AuthService', () => {
let service: AuthService;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [AuthService],
}).compile();
service = module.get<AuthService>(AuthService);
});
it('should be defined', () => {
expect(service).toBeDefined();
});
});

View File

@@ -0,0 +1,122 @@
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
import { JwtService } from '@nestjs/jwt';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { User } from 'src/user/entities/user.entity';
import { RefreshToken } from './entites/refresh_token.entity';
@Injectable()
export class AuthService {
constructor(
private jwtService: JwtService,
@InjectRepository(User) private readonly userRepository: Repository<User>,
@InjectRepository(RefreshToken)
private readonly refreshTokenRepository: Repository<RefreshToken>,
) {}
async generateAccessToken(payload: any) {
const accessKeyData = {
userId: payload.userId,
email: payload.email,
id: payload.id,
};
const accessToken = await this.jwtService.sign(
{ accessKeyData },
{
secret: process.env.ACCESS_SECRET,
expiresIn: `21600s`,
},
);
return accessToken;
// accesstoken이 없을때
}
async generateUrlAccessToken(payload: any) {
const accessKeyData = {
userId: payload.userId,
email: payload.email,
id: payload.id,
};
const accessToken = await this.jwtService.sign(
{ accessKeyData },
{
// secret: process.env.URL_ACCESS_SECRET,
secret: 'test1234',
},
);
return accessToken;
// accesstoken이 없을때
}
async generateRefreshToken(payload: any) {
const refreshKeyData = {
userId: payload.userId,
email: payload.email,
id: payload.id,
};
const refreshToken = await this.jwtService.sign(
{ refreshKeyData },
{ secret: process.env.REFRESH_SECRET, expiresIn: '43200s' },
);
return refreshToken;
// accesstoken이 없을때
}
async setRefreshKey(refreshToken: string, jwt_id: number) {
const findToken = await this.refreshTokenRepository.findOne({ where: { id: jwt_id } });
const token = refreshToken.replace('Bearer ', '');
if (!findToken) {
return await this.refreshTokenRepository.save({
refreshToken: token,
});
} else {
findToken.refreshToken = token;
await this.refreshTokenRepository.save(findToken);
}
// 로그인시 갱신된 refreshToken 저장
}
async validateUser(userId: string, pass: string) {
const user = await this.userRepository.findOne({ where: { userId: userId } });
if (user && user.password === pass) {
delete user.password;
return user;
}
// 회원이 존재하는지 확인
}
async deleteRefreshToken(userId: number) {
const refreshTokenInfo = await this.refreshTokenRepository.findOne({
where: { id: userId },
});
refreshTokenInfo.refreshToken = '';
await this.refreshTokenRepository.save(refreshTokenInfo);
}
async verifyAccessToken(token: string) {
try {
const Token = token.replace('Bearer ', '');
const secretKey = process.env.ACCESS_SECRET;
const findUser = await this.jwtService.verify(Token, { secret: secretKey });
return findUser;
} catch (err) {
throw new HttpException({ message: 'accessTokenExpired' }, HttpStatus.UNAUTHORIZED);
}
} // Access 토큰이 유효한지 확인
async verifyRefreshToken(token: string) {
try {
const Token = token.replace('Bearer ', '').split('=')[1];
const secretKey = process.env.REFRESH_SECRET;
const findUser = await this.jwtService.verify(Token, { secret: secretKey });
return findUser;
} catch (err) {
throw new HttpException({ message: 'refreshTokenExpired' }, HttpStatus.UNAUTHORIZED);
}
} // Refresh 토큰이 유효한지 확인
async checkAccess(userId: string, password: string) {
return await this.validateUser(userId, password);
}
}

View File

@@ -0,0 +1,10 @@
import { Column, Entity, PrimaryColumn } from 'typeorm';
@Entity()
export class RefreshToken {
@PrimaryColumn()
id: number;
@Column()
refreshToken: string;
}

View File

@@ -0,0 +1,57 @@
import { ExecutionContext, HttpException, HttpStatus, Injectable } from '@nestjs/common';
import { JwtService } from '@nestjs/jwt';
import { AuthGuard } from '@nestjs/passport';
@Injectable()
export class JwtAuthGuard extends AuthGuard('jwt') {
constructor(private jwtService: JwtService) {
super();
}
async canActivate(context: ExecutionContext): Promise<boolean> {
const request = context.switchToHttp().getRequest();
const { authorization } = request.headers;
const urlAuth = request.headers['authorization-url'];
if (authorization === undefined && urlAuth === undefined) {
throw new HttpException('accessTokenExpired', HttpStatus.UNAUTHORIZED);
}
if (authorization !== undefined) {
const token = authorization.replace('Bearer ', ''); //authorization
const boolean = true; // 일반 대시보드일시
const userInfo = await this.validate(token, boolean);
if (userInfo) request.user = userInfo;
return !!userInfo;
} else if (urlAuth !== undefined) {
const token = urlAuth.replace('Bearer ', ''); //authorization-url
const boolean = false; // 공유대시보드일시
const userInfo = await this.validate(token, boolean);
if (userInfo) request.user = userInfo;
return !!userInfo;
}
}
async validate(payload: any, accessPath: boolean) {
if (accessPath === true) {
try {
const secretKey = process.env.ACCESS_SECRET;
const verify = await this.jwtService.verify(payload, {
secret: secretKey,
});
return verify;
} catch {
throw new HttpException('accessTokenExpired', HttpStatus.UNAUTHORIZED);
}
}
if (accessPath === false) {
try {
// const secretUrlKey = process.env.URL_ACCESS_SECRET;
const secretUrlKey = 'test1234';
const verifyUrl = await this.jwtService.verify(payload, {
secret: secretUrlKey,
});
return verifyUrl;
} catch {
throw new HttpException('accessTokenExpired', HttpStatus.UNAUTHORIZED);
}
}
}
}

View File

@@ -0,0 +1,31 @@
import { ExecutionContext, HttpException, HttpStatus, Injectable } from '@nestjs/common';
import { JwtService } from '@nestjs/jwt';
import { AuthGuard } from '@nestjs/passport';
@Injectable()
export class LocalAuthGuard extends AuthGuard('local') {
constructor(private jwtService: JwtService) {
super();
}
async canActivate(context: ExecutionContext): Promise<boolean> {
const request = context.switchToHttp().getRequest();
const { cookie } = request.headers;
if (cookie === undefined) {
throw new HttpException('Unathorization', HttpStatus.UNAUTHORIZED);
}
const token = cookie.replace('Bearer ', '').split('=')[1];
const userInfo = await this.validate(token);
if (userInfo) request.user = userInfo;
return true;
}
async validate(payload: any) {
try {
const secretKey = process.env.REFRESH_SECRET;
const verify = await this.jwtService.verify(payload, { secret: secretKey });
return verify;
} catch {
throw new HttpException('Unathorization', HttpStatus.UNAUTHORIZED);
}
}
}

View File

@@ -0,0 +1,23 @@
import { Injectable } from '@nestjs/common';
import { PassportStrategy } from '@nestjs/passport';
import { ExtractJwt, Strategy } from 'passport-jwt';
@Injectable()
export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
constructor() {
super({
jwtFromRequest: ExtractJwt.fromExtractors([
ExtractJwt.fromAuthHeaderAsBearerToken(),
ExtractJwt.fromHeader('Authorization'),
]),
ignoreExpiration: false,
secretOrKey: true,
});
}
async validate(req, payload: any) {
console.log('check', req);
// { userId: payload.userId, password: payload.password }
return true;
}
}

View File

@@ -0,0 +1,20 @@
import { Injectable, UnauthorizedException } from '@nestjs/common';
import { PassportStrategy } from '@nestjs/passport';
import { Strategy } from 'passport-local';
import { AuthService } from '../auth.service';
@Injectable()
export class LocalStrategy extends PassportStrategy(Strategy) {
constructor(private readonly authService: AuthService) {
super();
}
async validate(req, payload: any): Promise<any> {
const user = await this.authService.validateUser(payload.userId, payload.password);
console.log(req)
if (!user) {
throw new UnauthorizedException();
}
return user;
}
}

View File

@@ -1,9 +1,12 @@
import { CreateDateColumn, UpdateDateColumn } from 'typeorm';
export abstract class BaseEntity {
@CreateDateColumn({comment:'생성일'})
@CreateDateColumn({
nullable: true,
comment: '생성일',
})
createdAt: Date;
@UpdateDateColumn({comment:'수정일'})
@UpdateDateColumn({ nullable: true, comment: '수정일' })
updatedAt: Date;
}

View File

@@ -1,4 +1,5 @@
export enum YesNo {
YES = 'Y',
NO = 'N'
export const YesNo = {
YES: 'Y',
NO: 'N'
}

View File

@@ -1,8 +1,10 @@
import {Body, Controller, Delete, Get, Param, Patch, Post} from '@nestjs/common';
import {Body, Controller, Delete, Get, Param, Patch, Post, UseGuards} from '@nestjs/common';
import { JwtAuthGuard } from 'src/auth/guards/jwt-auth.guard';
import {ComponentService} from './component.service';
import {CreateComponentDto} from "./dto/create-component.dto";
import {UpdateComponentDto} from "./dto/update-component.dto";
@UseGuards(JwtAuthGuard)
@Controller('component')
export class ComponentController {
constructor(private readonly componentService: ComponentService,

View File

@@ -3,10 +3,11 @@ import { ComponentService } from './component.service';
import { ComponentController } from './component.controller';
import { TypeOrmModule } from "@nestjs/typeorm";
import { Component } from "./entities/component.entity";
import { JwtService } from '@nestjs/jwt';
@Module({
imports: [TypeOrmModule.forFeature([Component])],
controllers: [ComponentController],
providers: [ComponentService]
providers: [ComponentService, JwtService]
})
export class ComponentModule {}

View File

@@ -31,6 +31,6 @@ export class CreateComponentDto {
@IsString()
@IsOptional()
useYn: YesNo
useYn: string
}

View File

@@ -1,41 +1,37 @@
import {Column, Entity, OneToMany, PrimaryGeneratedColumn} from "typeorm";
import {BaseEntity} from "../../common/entities/base.entity";
import {YesNo} from "../../common/enum/yn.enum";
import {Widget} from "../../widget/entities/widget.entity";
import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
import { BaseEntity } from '../../common/entities/base.entity';
import { YesNo } from '../../common/enum/yn.enum';
import { Widget } from '../../widget/entities/widget.entity';
@Entity()
export class Component extends BaseEntity {
@PrimaryGeneratedColumn({comment: '컴포넌트 ID'})
id: number
@PrimaryGeneratedColumn({ comment: '컴포넌트 ID' })
id: number;
@Column({unique: true, length: 45, comment: '타입 코드'})
type: string
@Column({ unique: true, length: 45, comment: '타입 코드' })
type: string;
@Column({length: 100, comment: '타입명'})
title: string
@Column({ length: 100, comment: '타입명' })
title: string;
@Column({length: 300, nullable: true, comment: '설명'})
description: string
@Column({ length: 300, nullable: true, comment: '설명' })
description: string;
@Column({length: 45, nullable: true, comment: '분류'})
category: string
@Column({ length: 45, nullable: true, comment: '분류' })
category: string;
@Column({type: 'text', comment: '컴포넌트 속성'})
option: string
@Column({ type: 'text', comment: '컴포넌트 속성' })
option: string;
@Column({length: 45, nullable: true, comment: '컴포넌트 아이콘 경로'})
icon: string
@Column({ length: 45, nullable: true, comment: '컴포넌트 아이콘 경로' })
icon: string;
@Column({comment: '순서', nullable: true})
seq: number
@Column({ comment: '순서', nullable: true })
seq: number;
@Column({length: 1, comment: '사용여부', default: YesNo.YES})
useYn: YesNo
@Column({ length: 1, comment: '사용여부', default: YesNo.YES })
useYn: string;
@OneToMany(
(type => Widget),
(widget) => widget.componentId
)
widgets!: Widget[]
}
@OneToMany(type => Widget, widget => widget.componentId)
widgets!: Widget[];
}

View File

@@ -7,6 +7,9 @@ import { Database } from '../database/entities/database.entity';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { ResponseStatus } from '../common/enum/response-status.enum';
import { SnowflakeDialect } from './knex-dialects/snowflake';
const { BigQueryClient } = require('knex-bigquery');
const knexConnections = new Map<number, Knex>();
@@ -44,12 +47,17 @@ export class ConnectionService {
/**
* Knex 객체 가져오기 - 만약 없으면 가져오기
* @param id
* @param databaseInfo
*/
async getKnex(id: number): Promise<Knex> {
if (!this.hasKnex(id)) {
const one = await this.databaseRepository.findOne({ where: { id: id } });
one.connectionConfig = JSON.parse(one.connectionConfig);
const knexConfig = one.connectionConfig;
if (knexConfig['client'] == 'bigquery') {
knexConfig['client'] = BigQueryClient;
} else if (knexConfig['client'] == 'snowflake') {
knexConfig['client'] = SnowflakeDialect;
}
this.addKnex(id, one.connectionConfig as Knex.Config);
}
return knexConnections.get(id);
@@ -60,12 +68,30 @@ export class ConnectionService {
* @param createDatabaseDto
*/
async testConnection(createDatabaseDto: CreateDatabaseDto) {
let engine: any = createDatabaseDto.engine;
switch (createDatabaseDto.engine) {
case 'bigquery':
engine = BigQueryClient;
break;
case 'snowflake':
engine = SnowflakeDialect;
break;
}
if (createDatabaseDto.engine === 'cockroachdb') {
const connectioninfo = createDatabaseDto.connectionConfig;
const cockroach_url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`;
connectioninfo['connectionString'] = cockroach_url;
}
const connectionConfig = {
client: createDatabaseDto.engine,
client: engine,
connection: createDatabaseDto.connectionConfig,
useNullAsDefault: true,
};
createDatabaseDto.connectionConfig = JSON.stringify(connectionConfig);
// createDatabaseDto.connectionConfig = JSON.stringify(connectionConfig);
// console.log(createDatabaseDto)
let _knex: Knex;
let returnObj = {};
try {
@@ -76,8 +102,10 @@ export class ConnectionService {
return { status: ResponseStatus.ERROR, message: 'knex not connected' };
}
const testQuery = createDatabaseDto.engine == 'oracledb' ? 'SELECT 1 FROM DUAL' : 'SELECT 1';
try {
await _knex.raw('SELECT 1');
await _knex.raw(testQuery);
returnObj = { status: ResponseStatus.SUCCESS, data: { message: 'success' } };
} catch (e) {
console.log(e);
@@ -98,108 +126,120 @@ export class ConnectionService {
let datas = [];
const fields = [];
const resultObj = { status: ResponseStatus.SUCCESS, message: 'success', datas: [], fields: [] };
const resultObj = { status: null, message: null, datas: [], fields: [] };
try {
const queryRes = await knex.raw(queryExecuteDto.query);
switch (knex.client.config.client) {
case 'mysql2':
if (queryRes && queryRes[0].length > 0) {
datas = queryRes[0];
const tempFields = queryRes[1];
tempFields.map(field => {
const fieldInfo = {
columnName: field.name,
columnType: FieldTypeUtil.mysqlFieldType(field.columnType),
};
fields.push(fieldInfo);
});
// bigquery, snowflake
if (typeof knex.client.config.client === 'function') {
switch (knex.client.config.client.name) {
case 'SnowflakeDialect':
if (queryRes && queryRes.rows && queryRes.rows.length > 0) {
datas = queryRes.rows;
const tempFields = Object.keys(queryRes.rows[0]);
tempFields.map(field => {
const length = [];
const maxCnt = queryRes.rows.length > 100 ? 100 : queryRes.rows.length;
for (let i = 0; i < maxCnt; i++) {
length.push(queryRes.rows[i][field]);
}
const fieldInfo = {
columnName: field,
columnType: FieldTypeUtil.FieldType(length),
};
fields.push(fieldInfo);
});
}
break;
}
case 'BigQueryClient':
if (queryRes && queryRes.length > 0) {
datas = queryRes;
const tempFields = Object.keys(queryRes[0]);
case 'sqlite':
if (queryRes && queryRes.length > 0) {
datas = queryRes;
const tempFields = Object.keys(queryRes[0]);
tempFields.map(field => {
const length = [];
for(let i = 0 ; i < 100; i ++){
length.push(queryRes[i][field])
}
const fieldInfo = {
columnName: field,
columnType: FieldTypeUtil.FieldType(length),
};
fields.push(fieldInfo);
});
tempFields.map(field => {
const length = [];
const maxCnt = queryRes.length > 100 ? 100 : queryRes.length;
for (let i = 0; i < maxCnt; i++) {
length.push(queryRes[i][field]);
}
const fieldInfo = {
columnName: field,
columnType: FieldTypeUtil.FieldType(length),
};
fields.push(fieldInfo);
});
}
break;
}
case 'pg':
if (queryRes && queryRes.rows.length > 0) {
datas = queryRes.rows;
const tempFields = queryRes.fields;
tempFields.map(field => {
const length = [];
for(let i = 0 ; i < 100; i ++){
length.push(queryRes.rows[i][field.name])
}
const fieldInfo = {
columnName: field.name,
columnType: FieldTypeUtil.FieldType(length),
};
fields.push(fieldInfo);
});
}
} else {
switch (knex.client.config.client) {
case 'mysql2':
if (queryRes && queryRes[0].length > 0) {
datas = queryRes[0];
const tempFields = queryRes[1];
tempFields.map(field => {
const fieldInfo = {
columnName: field.name,
columnType: FieldTypeUtil.mysqlFieldType(field.columnType),
};
fields.push(fieldInfo);
});
}
break;
}
case 'Db2Dialect':
if (queryRes && queryRes.length > 0) {
datas = queryRes;
// for (let i = 0; i < Object.keys(queryRes[0]).length; i++) {
// console.log(Object.keys[i]);
// }
const tempFields = queryRes;
tempFields.map(field => {
const fieldInfo = {
columnName: field.name,
columnLength: field.length,
columnType: FieldTypeUtil.mysqlFieldType(field.type),
};
fields.push(fieldInfo);
});
case 'cockroachdb':
case 'pg':
if (queryRes && queryRes.rows && queryRes.rows.length > 0) {
datas = queryRes.rows;
const tempFields = queryRes.fields;
tempFields.map(field => {
const length = [];
const maxCnt = queryRes.rows.length > 100 ? 100 : queryRes.rows.length;
for (let i = 0; i < maxCnt; i++) {
length.push(queryRes.rows[i][field.name]);
}
const fieldInfo = {
columnName: field.name,
columnType: FieldTypeUtil.FieldType(length),
};
fields.push(fieldInfo);
});
}
break;
}
case 'mssql':
if (queryRes && queryRes.length > 0) {
datas = queryRes;
const tempFields = Object.keys(queryRes[0]);
tempFields.map(field => {
const fieldInfo = {
columnName: field,
columnType: FieldTypeUtil.mysqlFieldType(field),
};
fields.push(fieldInfo);
});
}
break;
// case 'sqlite3':
// case 'mssql':
// case 'oracledb':
default:
if (queryRes && queryRes.length > 0) {
datas = queryRes;
const tempFields = Object.keys(queryRes[0]);
tempFields.map(field => {
const length = [];
const maxCnt = queryRes.length > 100 ? 100 : queryRes.length;
for (let i = 0; i < maxCnt; i++) {
length.push(queryRes[i][field]);
}
const fieldInfo = {
columnName: field,
columnType: FieldTypeUtil.FieldType(length),
};
fields.push(fieldInfo);
});
}
break;
}
}
resultObj.status = ResponseStatus.SUCCESS;
resultObj.message = 'success';
resultObj.datas = datas;
resultObj.fields = fields;
} catch (e) {
resultObj.status = ResponseStatus.ERROR;
resultObj.message = e.sqlMessage;
if (e.sqlMessage) resultObj.message = e.sqlMessage;
else if (e.message) resultObj.message = e.message; // bigquery
console.log(e);
console.log(e.sqlMessage);
}
return resultObj;

View File

@@ -0,0 +1,160 @@
// import { Knex, knex } from 'knex';
// import { Database } from 'ibm_db';
// import Client = knex.Client;
// const Promise = require('bluebird');
// const Client = require('knex/lib/client');
//
// class DB2Client extends Client {
// constructor(config) {
// super(config);
// }
//
// get dialect() {
// return 'ibm_db';
// }
//
// get driverName() {
// return 'ibm_db';
// }
//
// get canCancelQuery() {
// return true;
// }
//
// _driver() {
// return Promise.promisifyAll(require(this.driverName));
// }
//
// // transaction() {
// // return new Transaction(this, ...arguments);
// // }
//
// wrapIdentifierImpl(value) {
// // override default wrapper ("). we don't want to use it since
// // it makes identifiers case-sensitive in DB2
// return value;
// }
//
// // printDebug(message) {
// // if (process.env.DEBUG === 1) {
// // this.logger.log(message);
// // }
// // }
//
// // Get a raw connection, called by the pool manager whenever a new
// // connection needs to be added to the pool.
// acquireRawConnection() {
// // this.printDebug('acquiring raw connection.');
// const connectionConfig = this.config.connection;
// return new Promise((resolve, reject) => {
// this.driver.open(this._getConnectionString(connectionConfig), (err, connection) => {
// if (err) {
// return reject(err);
// }
//
// return resolve(connection);
// });
// });
// }
//
// // Used to explicitly close a connection, called internally by the pool manager
// // when a connection times out or the pool is shutdown.
// destroyRawConnection(connection) {
// // this.printDebug('destroying raw connection');
//
// return connection.closeAsync();
// }
//
// validateConnection(connection) {
// return Promise.resolve(connection.connected);
// }
//
// _stream(connection, obj, stream, options) {
// this._stream(connection, obj, stream, options);
// throw new Error('Not yet implemented');
// }
//
// _getConnectionString(connectionConfig = {}) {
// const connectionStringParams = connectionConfig.connectionStringParams || {};
// const connectionStringExtension = Object.keys(connectionStringParams).reduce((result, key) => {
// const value = connectionStringParams[key];
// return `${result}${key}=${value};`;
// }, '');
//
// const connectionString = `${
// `DRIVER=${connectionConfig.driver};SYSTEM=${connectionConfig.host};HOSTNAME=${connectionConfig.host};` +
// `PORT=${connectionConfig.port};DATABASE=${connectionConfig.database};` +
// `UID=${connectionConfig.user};PWD=${connectionConfig.password};`
// }${connectionStringExtension}`;
//
// return connectionString;
// }
//
// // Runs the query on the specified connection, providing the bindings
// // and any other necessary prep work.
// _query(connection, obj) {
// // TODO: verify correctness
// if (!obj || typeof obj === 'string') obj = { sql: obj };
//
// const method = (obj.method !== 'raw' ? obj.method : obj.sql.split(' ')[0]).toLowerCase();
//
// obj.sqlMethod = method;
//
// // Different functions are used since query() doesn't return # of rows affected,
// // which is needed for queries that modify the database
// if (method === 'select' || method === 'first' || method === 'pluck') {
// return connection.queryAsync(obj.sql, obj.bindings).then(rows => {
// obj.response = {
// rows,
// rowCount: rows.length,
// };
//
// return obj;
// });
// }
//
// return connection
// .prepareAsync(obj.sql)
// .then(statement => statement.executeNonQueryAsync(obj.bindings))
// .then(numRowsAffected => {
// obj.response = {
// rowCount: numRowsAffected,
// };
//
// return obj;
// });
// }
//
// // Process / normalize the response as returned from the query
// processResponse(obj, runner) {
// // TODO: verify correctness
//
// if (obj === null) return null;
//
// const resp = obj.response;
// const method = obj.sqlMethod;
// const { rows } = resp;
//
// if (obj.output) return obj.output.call(runner, resp);
//
// switch (method) {
// case 'select':
// case 'pluck':
// case 'first': {
// if (method === 'pluck') return rows.map(obj.pluck);
// return method === 'first' ? rows[0] : rows;
// }
// case 'insert':
// case 'del':
// case 'delete':
// case 'update':
// case 'counter':
// return resp.rowCount;
// default:
// return resp;
// }
// }
// }
//
// module.exports = { DB2Client };

View File

@@ -0,0 +1,17 @@
// import Transaction from 'knex/lib/execution/transaction';
//
// class TransactionDb2 extends Transaction {
// begin(conn) {
// return conn.beginTransactionAsync().then(this._resolver).catch(this._rejecter);
// }
//
// commit(conn, value) {
// this._completed = true;
// return conn
// .commitTransactionAsync()
// .then(() => this._resolver(value))
// .catch(this._rejecter);
// }
// }
//
// module.exports = TransactionDb2;

View File

@@ -0,0 +1,84 @@
// // import Client from "knex/lib/client";
//
// import { Knex, knex } from 'knex';
// import { Database } from 'ibm_db';
// import Client = knex.Client;
//
// export class IbmDbClient extends Client {
// constructor(config) {
// super(config);
// this.dialect = 'ibm_db';
// this.driverName = 'ibm_db';
// this.canCancelQuery = true;
// }
//
// _driver() {
// return new Database();
// }
//
// acquireRawConnection() {
// return Promise.resolve({
// driver: this.driver,
// job: null,
// });
// }
//
// // validateConnection(connection) {
// // return (
// // connection &&
// // !connection._fatalError &&
// // !connection._protocolError &&
// // !connection._closing &&
// // !connection.stream.destroyed
// // );
// // }
//
// destroyRawConnection(connection) {
// return this.cancelJob(connection);
// }
//
// wrapIdentifier(value) {
// return value !== '*' ? `\`${value}\`` : '*';
// }
//
// cancelJob(connection) {
// if (connection.job === null) {
// return Promise.resolve();
// }
// const cancelJobRequest = connection.job.cancel();
// connection.job = null;
// return cancelJobRequest;
// }
//
// _query(connection, obj) {
// const queryConfig = {
// ...obj.options,
// query: obj.sql,
// params: obj.bindings,
// };
//
// return this.createJob(connection, queryConfig)
// .then(connection => this.getJobResults(connection, obj))
// .catch(err => {
// this.cancelJob(connection);
// throw err;
// });
// }
//
// createJob(connection, queryConfig) {
// return Promise.resolve(
// connection.driver.createQueryJob(queryConfig).then(res => {
// connection.job = res[0];
// return connection;
// }),
// );
// }
//
// getJobResults(connection, obj) {
// return connection.job.getQueryResults({ autoPaginate: false }).then(res => {
// obj.response = res[0];
// connection.job = null;
// return obj;
// });
// }
// }

View File

@@ -0,0 +1,238 @@
// import * as Promise from 'bluebird';
import { Knex, knex } from 'knex';
import { defer, fromPairs, isArray, toPairs } from 'lodash';
import * as ColumnBuilder from 'knex/lib/schema/columnbuilder';
import * as ColumnCompiler_MySQL from 'knex/lib/dialects/mysql/schema/mysql-columncompiler';
import * as Transaction from 'knex/lib/execution/transaction';
import { promisify } from 'util';
export class SnowflakeDialect extends knex.Client {
constructor(
config = {
dialect: 'snowflake',
driverName: 'snowflake-sdk',
} as any,
) {
if (config.connection) {
if (config.connection.user && !config.connection.username) {
config.connection.username = config.connection.user;
}
if (config.connection.host) {
const [account, region] = config.connection.host.split('.');
if (!config.connection.account) {
config.connection.account = account;
}
if (!config.connection.region) {
config.connection.region = region;
}
}
}
super(config);
}
transaction(container: any, config: any, outerTx: any): Knex.Transaction {
const transax = new Transaction(this, container, config, outerTx);
transax.savepoint = (conn: any) => {
// @ts-ignore
transax.trxClient.logger('Snowflake does not support savepoints.');
};
transax.release = (conn: any, value: any) => {
// @ts-ignore
transax.trxClient.logger('Snowflake does not support savepoints.');
};
transax.rollbackTo = (conn: any, error: any) => {
// @ts-ignore
this.trxClient.logger('Snowflake does not support savepoints.');
};
return transax;
}
// @ts-ignore
// queryCompiler(builder: any, formatter: any) {
// return new QueryCompiler(this, builder, formatter);
// }
columnBuilder(tableBuilder: any, type: any, args: any) {
// ColumnBuilder methods are created at runtime, so that it does not play well with TypeScript.
// So instead of extending ColumnBuilder, we override methods at runtime here
const columnBuilder = new ColumnBuilder(this, tableBuilder, type, args);
columnBuilder.primary = (constraintName?: string | undefined): Knex.ColumnBuilder => {
// @ts-ignore
columnBuilder.notNullable();
return columnBuilder;
};
columnBuilder.index = (indexName?: string | undefined): Knex.ColumnBuilder => {
// @ts-ignore
columnBuilder.client.logger.warn('Snowflake does not support the creation of indexes.');
return columnBuilder;
};
return columnBuilder;
}
columnCompiler(tableCompiler: any, columnBuilder: any) {
// ColumnCompiler methods are created at runtime, so that it does not play well with TypeScript.
// So instead of extending ColumnCompiler, we override methods at runtime here
const columnCompiler = new ColumnCompiler_MySQL(
this,
tableCompiler.tableBuilder,
columnBuilder,
);
columnCompiler.increments = 'int not null autoincrement primary key';
columnCompiler.bigincrements = 'bigint not null autoincrement primary key';
columnCompiler.mediumint = (colName: string) => 'integer';
columnCompiler.decimal = (colName: string, precision?: number, scale?: number) => {
if (precision) {
return ColumnCompiler_MySQL.prototype.decimal(colName, precision, scale);
}
return 'decimal';
};
columnCompiler.double = (colName: string, precision?: number, scale?: number) => {
if (precision) {
return ColumnCompiler_MySQL.prototype.decimal(colName, precision, scale);
}
return 'double';
};
columnCompiler.enu = (colName: string, values: string[]) => 'varchar';
columnCompiler.json = columnCompiler.jsonb = (colName: string) => 'variant';
return columnCompiler;
}
// tableCompiler(tableBuilder: any) {
// return new TableCompiler(this, tableBuilder);
// }
//
// schemaCompiler(builder: any) {
// return new SchemaCompiler(this, builder);
// }
_driver() {
const Snowflake = require('snowflake-sdk');
return Snowflake;
}
// Get a raw connection, called by the `pool` whenever a new
// connection needs to be added to the pool.
acquireRawConnection() {
return new Promise((resolver, rejecter) => {
// @ts-ignore
const connection = this.driver.createConnection(this.connectionSettings);
connection.on('error', err => {
connection.__knex__disposed = err;
});
connection.connect(err => {
if (err) {
// if connection is rejected, remove listener that was registered above...
connection.removeAllListeners();
return rejecter(err);
}
resolver(connection);
});
});
}
// Used to explicitly close a connection, called internally by the pool
// when a connection times out or the pool is shutdown.
async destroyRawConnection(connection): Promise<void> {
try {
const end = promisify(cb => connection.end(cb));
await end();
} catch (err) {
connection.__knex__disposed = err;
} finally {
// see discussion https://github.com/knex/knex/pull/3483
defer(() => connection.removeAllListeners());
}
}
async validateConnection(connection: any): Promise<boolean> {
if (connection) {
return true;
}
return false;
}
// Runs the query on the specified connection, providing the bindings
// and any other necessary prep work.
_query(connection: any, obj: any) {
if (!obj || typeof obj === 'string') obj = { sql: obj };
return new Promise((resolver: any, rejecter: any) => {
if (!obj.sql) {
resolver();
return;
}
const queryOptions = {
sqlText: obj.sql,
binds: obj.bindings,
complete(err: any, statement: any, rows: any) {
if (err) return rejecter(err);
obj.response = { rows, statement };
resolver(obj);
},
...obj.options,
};
connection.execute(queryOptions);
});
}
// Ensures the response is returned in the same format as other clients.
processResponse(obj: any, runner: any) {
const resp = obj.response;
if (obj.output) return obj.output.call(runner, resp);
if (obj.method === 'raw') return resp;
if (obj.method === 'select') {
// if (obj.method === 'first') return resp.rows[0];
// if (obj.method === 'pluck') return map(resp.rows, obj.pluck);
return resp.rows;
}
if (obj.method === 'insert' || obj.method === 'update' || obj.method === 'delete') {
if (resp.rows) {
const method = obj.method === 'insert' ? 'inserte' : obj.method;
return resp.rows.reduce((count, row) => count + row[`number of rows ${method}d`], 0);
}
return resp;
}
if (resp.statement && resp.rows) {
return resp.rows;
}
return resp;
}
postProcessResponse(result, queryContext) {
if (this.config.postProcessResponse) {
return this.config.postProcessResponse(result, queryContext);
}
// Snowflake returns column names in uppercase, convert to lowercase
// (to conform with knex, e.g. schema migrations)
const lowercaseAttrs = (row: any) => {
return fromPairs(toPairs(row).map(([key, value]) => [key.toLowerCase(), value]));
};
if (result.rows) {
return {
...result,
rows: result.rows.map(lowercaseAttrs),
};
} else if (isArray(result)) {
return result.map(lowercaseAttrs);
}
return result;
}
customWrapIdentifier(value, origImpl, queryContext) {
if (this.config.wrapIdentifier) {
return this.config.wrapIdentifier(value, origImpl, queryContext);
} else if (!value.startsWith('"')) {
return origImpl(value.toUpperCase());
}
return origImpl;
}
}
Object.assign(SnowflakeDialect.prototype, {
// The "dialect", for reference elsewhere.
driverName: 'snowflake-sdk',
});

View File

@@ -0,0 +1,20 @@
// @ts-ignore
import * as QueryCompiler_MySQL from 'knex/lib/dialects/mysql/query/mysql-querycompiler';
export class QueryCompiler extends QueryCompiler_MySQL {
constructor(client: any, builder: any, formatter: any) {
super(client, builder, formatter);
}
forUpdate() {
// @ts-ignore
this.client.logger.warn('table lock is not supported by snowflake dialect');
return '';
}
forShare() {
// @ts-ignore
this.client.logger.warn('lock for share is not supported by snowflake dialect');
return '';
}
}

View File

@@ -0,0 +1,30 @@
// @ts-ignore
import * as SchemaCompiler_MySQL from "knex/lib/dialects/mysql/schema/mysql-compiler";
export class SchemaCompiler extends SchemaCompiler_MySQL {
constructor(client: any, builder: any) {
super(client, builder);
}
// Check whether a table exists on the query.
hasTable(tableName: string) {
const [ schema, table ] = tableName.includes(".") ? tableName.split(".") : [undefined, tableName];
let sql = 'select * from information_schema.tables where table_name = ?';
const bindings = [table.toUpperCase()];
if (schema) {
sql += ' and table_schema = ?';
bindings.push(schema.toUpperCase());
} else {
sql += ' and table_schema = current_schema()';
}
// @ts-ignore
this.pushQuery({
sql,
bindings,
output: (resp) => resp.rows.length > 0
});
}
}

View File

@@ -0,0 +1,18 @@
// @ts-ignore
import * as TableCompiler_MySQL from "knex/lib/dialects/mysql/schema/mysql-tablecompiler";
export class TableCompiler extends TableCompiler_MySQL {
constructor(client: any, builder: any) {
super(client, builder);
}
index(columns, indexName, indexType) {
// @ts-ignore
this.client.logger.warn('Snowflake does not support the creation of indexes.');
};
dropIndex(columns, indexName) {
// @ts-ignore
this.client.logger.warn('Snowflake does not support the deletion of indexes.');
};
}

View File

@@ -0,0 +1,2 @@
export * from "./SchemaCompiler";
export * from "./TableCompiler";

View File

@@ -0,0 +1 @@
declare module "snowflake-sdk";

View File

@@ -38,27 +38,28 @@ export class DashboardWidgetService {
select: {
widgetId: true,
},
where: { dashboardId: dashboardId },
});
const whereInWidgetList = [];
widgetList.map(item => {
whereInWidgetList.push(item.widgetId);
});
const widgetInfo = this.widgetRepository
const widgetInfo = await this.widgetRepository
.createQueryBuilder()
.subQuery()
.select(['widget.*'])
.from(Widget, 'widget')
.where('id in (:ids)')
.where('id in (:...ids)')
.getQuery();
const result = await this.componentRepository
.createQueryBuilder('component')
.select(['widgetInfo.*', 'component.type as componentType'])
.innerJoin(widgetInfo, 'widgetInfo', 'widgetInfo.componentId = component.id')
.setParameter('ids', whereInWidgetList)
.setParameter('ids', whereInWidgetList) // 왜 배열이 안들어가죠 ?
.getRawMany();
result.map(el => {

View File

@@ -1,33 +1,48 @@
import {Controller, Get, Post, Body, Patch, Param, Delete, Put} from '@nestjs/common';
import { Controller, Get, Post, Body, Param, Delete, Put, UseGuards, Req } from '@nestjs/common';
import { JwtAuthGuard } from 'src/auth/guards/jwt-auth.guard';
import { DashboardService } from './dashboard.service';
import { CreateDashboardDto } from './dto/create-dashboard.dto';
import { UpdateDashboardDto } from './dto/update-dashboard.dto';
import { ApiBearerAuth } from '@nestjs/swagger';
@Controller('dashboard')
export class DashboardController {
constructor(private readonly dashboardService: DashboardService) {}
@UseGuards(JwtAuthGuard)
@Post()
create(@Body() createDashboardDto: CreateDashboardDto) {
return this.dashboardService.create(createDashboardDto);
@ApiBearerAuth('AccessKey')
create(@Body() createDashboardDto: CreateDashboardDto, @Req() req) {
const { accessKeyData } = req.user;
console.log('asdf', accessKeyData)
return this.dashboardService.create(createDashboardDto, accessKeyData.id);
}
@UseGuards(JwtAuthGuard)
@Get()
findAll() {
return this.dashboardService.findAll();
@ApiBearerAuth('AccessKey')
findAll(@Req() req) {
const { accessKeyData } = req.user;
return this.dashboardService.findAll(accessKeyData.id);
}
@UseGuards(JwtAuthGuard)
@Get(':id')
@ApiBearerAuth('AccessKey')
findOne(@Param('id') id: string) {
return this.dashboardService.findOne(+id);
}
@UseGuards(JwtAuthGuard)
@Put(':id')
@ApiBearerAuth('AccessKey')
update(@Param('id') id: string, @Body() updateDashboardDto: UpdateDashboardDto) {
return this.dashboardService.update(+id, updateDashboardDto);
}
@UseGuards(JwtAuthGuard)
@Delete(':id')
@ApiBearerAuth('AccessKey')
remove(@Param('id') id: string) {
return this.dashboardService.remove(+id);
}

View File

@@ -5,12 +5,19 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { Dashboard } from './entities/dashboard.entity';
import { DashboardWidget } from './dashboard-widget/entities/dashboard-widget.entity';
import { DashboardWidgetService } from './dashboard-widget/dashboard-widget.service';
import { Widget } from 'src/widget/entities/widget.entity';
import { Widget } from '../widget/entities/widget.entity';
import { Component } from '../component/entities/component.entity';
import { UserService } from 'src/user/user.service';
import { AuthService } from 'src/auth/auth.service';
import { User } from 'src/user/entities/user.entity';
import { UserMapping } from 'src/user/entities/user-mapping.entity';
import { JwtService } from '@nestjs/jwt';
import { RefreshToken } from 'src/auth/entites/refresh_token.entity';
import { DashboardShare } from 'src/dashboard/entities/dashboard_share.entity';
@Module({
imports: [TypeOrmModule.forFeature([Dashboard, DashboardWidget, Widget, Component])],
imports: [TypeOrmModule.forFeature([Dashboard, DashboardWidget, Widget, Component, User, UserMapping, DashboardShare,RefreshToken])],
controllers: [DashboardController],
providers: [DashboardService, DashboardWidgetService],
providers: [DashboardService, DashboardWidgetService, UserService, AuthService, JwtService],
})
export class DashboardModule {}

View File

@@ -1,4 +1,4 @@
import { Injectable } from '@nestjs/common';
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
import { CreateDashboardDto } from './dto/create-dashboard.dto';
import { UpdateDashboardDto } from './dto/update-dashboard.dto';
import { InjectRepository } from '@nestjs/typeorm';
@@ -6,60 +6,138 @@ import { Repository } from 'typeorm';
import { Dashboard } from './entities/dashboard.entity';
import { DashboardWidgetService } from './dashboard-widget/dashboard-widget.service';
import { ResponseStatus } from '../common/enum/response-status.enum';
import { UserService } from 'src/user/user.service';
import { AuthService } from 'src/auth/auth.service';
import { User } from '../user/entities/user.entity.js';
import { YesNo } from 'src/common/enum/yn.enum';
import { DashboardShare } from 'src/dashboard/entities/dashboard_share.entity';
import { UserMapping } from 'src/user/entities/user-mapping.entity';
import { v4 as uuidv4 } from 'uuid';
@Injectable()
export class DashboardService {
constructor(
@InjectRepository(Dashboard)
private dashboardRepository: Repository<Dashboard>,
@InjectRepository(User)
private userRepository: Repository<User>,
@InjectRepository(DashboardShare)
private readonly dashboardShareRepository: Repository<DashboardShare>,
@InjectRepository(UserMapping)
private userMappingRepository: Repository<UserMapping>,
private readonly dashboardWidgetService: DashboardWidgetService,
private readonly userService: UserService,
private readonly authService: AuthService,
) {}
async create(createDashboardDto: CreateDashboardDto) {
let widgetIds = [];
async create(createDashboardDto: CreateDashboardDto, accessToken: number) {
const userData = await this.userRepository.findOne({
where: { id: accessToken },
});
if (!userData) {
return 'Bad Request';
}
const widgetIds = [];
createDashboardDto.layout.map(item => {
widgetIds.push(item.i);
});
const share_id = await this.dashboardShareRepository.save({
uuid: uuidv4(), // uuid의 버전 uuidv1의 결우 mac의 정보등을 담고있음.
createdAt: new Date(),
updatedAt: new Date(),
});
console.log('test', share_id);
const saveObj = {
title: createDashboardDto.title,
layout: JSON.stringify(createDashboardDto.layout),
delYn: YesNo.NO,
shareId: share_id.id,
createdAt: new Date(),
updatedAt: new Date(),
};
const newDashboard = await this.dashboardRepository.save(saveObj);
await this.userMappingRepository.save({
dashboardId: newDashboard.id,
userInfoId: accessToken,
createdAt: new Date(),
});
// const newDashboard = await this.dashboardRepository.save(saveObj);
// user테이블에 대시보드id저장
const { id } = userData;
// const test = await this.dashboardRepository
// .createQueryBuilder()
// .insert()
// .into(Dashboard, ['title', 'layout'])
// .values(saveObj)
// .orUpdate(['title', 'layout'], ['id'])
// .execute();
// console.log('test', test.generatedMaps[0].id);
// 기존 코드
// await this.userService.saveDashboard(newDashboard.id, id);
const saveObjDW = {
dashboardId: newDashboard.id,
widgetIds: widgetIds,
};
await this.dashboardWidgetService.create(saveObjDW);
newDashboard.layout = JSON.parse(newDashboard.layout);
await this.dashboardWidgetService.create(saveObjDW);
return { status: ResponseStatus.SUCCESS, data: newDashboard };
}
async findAll() {
const find_all = await this.dashboardRepository.find({
order: {
updatedAt: 'desc',
},
});
async findAll(userId: number) {
const findUser = await this.userService.findDashboardId(userId);
if (!findUser) {
return 'not exist user';
}
console.log(findUser)
const findId = findUser.map(el => el['dashboardId']);
if (findId === null) {
throw new HttpException('not found', HttpStatus.NOT_FOUND);
}
console.log(findId)
const find_all = [];
for (let i = 0; findId.length > i; i++) {
find_all.push(
await this.dashboardRepository.findOne({
where: { id: findId[i] },
order: {
updatedAt: 'desc',
title: 'asc',
},
}),
);
}
find_all.forEach(el => {
console.log('adf,', el)
el.layout = JSON.parse(el.layout);
});
return { status: ResponseStatus.SUCCESS, data: find_all };
}
// 기존 dashboard all
async findOne(id: number) {
const find_dashboard = await this.dashboardRepository.findOne({ where: { id: id } });
if (!find_dashboard)
if (!find_dashboard) {
return { status: ResponseStatus.ERROR, message: '대시보드가 존재하지 않습니다.' };
const widgetList = await this.dashboardWidgetService.findWidgets(id);
}
const widgetList = await this.dashboardWidgetService.findWidgets(find_dashboard.id);
console.log('widgetList', widgetList)
find_dashboard.layout = JSON.parse(find_dashboard.layout);
const return_obj = Object.assign(find_dashboard, { widgets: widgetList });
return { status: ResponseStatus.SUCCESS, data: return_obj };
const find_share_id = await this.dashboardShareRepository.findOne({
where: { id: find_dashboard.shareId },
});
const return_obj = Object.assign(find_dashboard, find_share_id, { widgets: widgetList });
console.log(return_obj)
return {
status: ResponseStatus.SUCCESS,
data: return_obj,
};
}
async update(id: number, updateDashboardDto: UpdateDashboardDto) {
@@ -84,6 +162,7 @@ export class DashboardService {
dashboardId: id,
widgetIds: widgetIds,
};
// 업데이트할 데이터
await this.dashboardWidgetService.update(id, saveObjDW);
const updatedDashboard = await this.dashboardRepository.save(find_dashboard);
@@ -99,6 +178,11 @@ export class DashboardService {
} else {
await this.dashboardRepository.delete(id);
await this.dashboardWidgetService.remove(id);
const find_dashboardId = await this.userMappingRepository.findOne({
where: { dashboardId: id },
});
await this.userMappingRepository.delete(find_dashboardId.id);
await this.dashboardShareRepository.delete(find_dashboard.shareId);
return {
status: ResponseStatus.SUCCESS,
data: { message: `This action removes a #${id} dashboard` },

View File

@@ -1,25 +1,32 @@
import {Column, Entity, ManyToOne, PrimaryGeneratedColumn} from "typeorm";
import {BaseEntity} from "../../common/entities/base.entity";
import {YesNo} from "../../common/enum/yn.enum";
import { Optional } from '@nestjs/common';
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
import { BaseEntity } from '../../common/entities/base.entity';
import { YesNo } from '../../common/enum/yn.enum';
@Entity()
export class Dashboard extends BaseEntity {
@PrimaryGeneratedColumn({comment: '대시보드 ID'})
id: number
@PrimaryGeneratedColumn({ comment: '대시보드 ID' })
id: number;
@Column({length: 300, comment: '대시보드명'})
title: string
@Column({ length: 300, comment: '대시보드명' })
title: string;
@Column({nullable: true, comment: '템플릿 ID'})
templateId: number
@Optional()
@Column({ nullable: true, comment: '템플릿 ID' })
templateId: number;
@Column({type: 'text', nullable: true, comment: '레이아웃 정보'})
layout: string
@Column({ type: 'text', nullable: true, comment: '레이아웃 정보' })
layout: string;
@Column({comment: '순서', nullable: true})
seq: number
@Optional()
@Column({ comment: '순서', nullable: true })
seq: number;
@Column({length: 1, default: YesNo.NO, comment: '삭제여부'})
delYn: YesNo
@Optional()
@Column({ comment: '공유Id', nullable: true })
shareId: number;
}
@Optional()
@Column({ length: 1, default: YesNo.NO, comment: '삭제여부' })
delYn: string;
}

View File

@@ -0,0 +1,24 @@
import { Optional } from '@nestjs/common';
import { YesNo } from 'src/common/enum/yn.enum';
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
import { BaseEntity } from '../../common/entities/base.entity';
@Entity()
export class DashboardShare extends BaseEntity {
@PrimaryGeneratedColumn({ comment: '대시보드 ID' })
id: number;
@Column({ comment: '랜덤 유저Id'})
uuid: string;
@Column({ nullable: true, length: 300, comment: '공유url 토큰'})
shareToken: string;
@Optional()
@Column({ default: 'N', nullable: false, comment: '공유사용 여브' })
shareYn: string;
@Optional()
@Column({ nullable: true, comment: '유효기한 날짜'})
endDate: Date;
}

View File

@@ -1,12 +1,26 @@
import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query } from '@nestjs/common';
import {
Body,
Controller,
Delete,
Get,
Param,
Patch,
Post,
Put,
Query,
UseGuards,
} from '@nestjs/common';
import { DatabaseService } from './database.service';
import { CreateDatabaseDto } from './dto/create-database.dto';
import { UpdateDatabaseDto } from './dto/update-database.dto';
import { QueryExecuteDto } from './dto/query-execute.dto';
import { ConnectionService } from '../connection/connection.service';
import { DatasetType } from '../common/enum/dataset-type.enum';
import { JwtAuthGuard } from 'src/auth/guards/jwt-auth.guard';
import { ApiTags } from '@nestjs/swagger';
@Controller('database')
@ApiTags('dashboard')
export class DatabaseController {
constructor(
private readonly databaseService: DatabaseService,
@@ -16,25 +30,40 @@ export class DatabaseController {
/**
* database type 목록 조회
*/
@UseGuards(JwtAuthGuard)
@Get('/type')
findTypeList() {
return this.databaseService.findTypeList();
}
@UseGuards(JwtAuthGuard)
@Get('/data')
async findData(
@Query('datasetType') datasetType: DatasetType,
@Query('datasetId') datasetId: number,
@Query('databaseId') databaseId: number,
@Query('datasetId') datasetId?: number,
@Query('tableName') tableName?: string,
) {
const res = await this.databaseService.findData(datasetType, datasetId);
const res = await this.databaseService.findData(datasetType, databaseId, datasetId, tableName);
return res;
}
/**
* 데이터베이스 연결정보 단순조회
* @param id
*/
@UseGuards(JwtAuthGuard)
@Get('/info/:id')
async findOneInfo(@Param('id') id: string) {
const databaseInfo = await this.databaseService.findOneInfo(+id);
return databaseInfo;
}
/**
* 데이터베이스 생성 ( 데이터소스 생성)
* @param createDatabaseDto
*/
@Post()
@UseGuards(JwtAuthGuard)
create(@Body() createDatabaseDto: CreateDatabaseDto) {
return this.databaseService.create(createDatabaseDto);
}

View File

@@ -7,10 +7,11 @@ import { ConnectionService } from '../connection/connection.service';
import { Dataset } from '../dataset/entities/dataset.entity';
import { TableQuery } from '../widget/tabel-query/entity/table-query.entity';
import {DatabaseType} from "./entities/database_type.entity";
import { JwtService } from '@nestjs/jwt';
@Module({
imports: [TypeOrmModule.forFeature([Database, Dataset, TableQuery, DatabaseType])],
controllers: [DatabaseController],
providers: [DatabaseService, ConnectionService],
providers: [DatabaseService, ConnectionService, JwtService],
})
export class DatabaseModule {}

View File

@@ -10,8 +10,8 @@ import { ResponseStatus } from '../common/enum/response-status.enum';
import { DatasetType } from '../common/enum/dataset-type.enum';
import { TableQuery } from '../widget/tabel-query/entity/table-query.entity';
import { QueryExecuteDto } from './dto/query-execute.dto';
import {DatabaseType} from "./entities/database_type.entity";
import {YesNo} from "../common/enum/yn.enum";
import { DatabaseType } from './entities/database_type.entity';
import { YesNo } from '../common/enum/yn.enum';
@Injectable()
export class DatabaseService {
@@ -26,8 +26,8 @@ export class DatabaseService {
/**
* database type 목록 조회
*/
async findTypeList(){
const result = await this.databaseTypeRepository.find({where:{useYn:YesNo.YES}});
async findTypeList() {
const result = await this.databaseTypeRepository.find({ where: { useYn: YesNo.YES } });
return { status: ResponseStatus.SUCCESS, data: result };
}
@@ -37,12 +37,17 @@ export class DatabaseService {
*/
async create(createDatabaseDto: CreateDatabaseDto) {
const databaseDto = Database.toDto(createDatabaseDto);
const connectionConfig = {
client: databaseDto.engine,
connection: databaseDto.connectionConfig,
useNullAsDefault: true,
};
if (connectionConfig.client === 'cockroachdb') {
const connectioninfo = connectionConfig.connection;
const cockroach_url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`;
connectioninfo['connectionString'] = cockroach_url;
}
databaseDto.connectionConfig = JSON.stringify(connectionConfig);
databaseDto.timezone = 'Asia/Seoul';
@@ -72,24 +77,77 @@ export class DatabaseService {
databaseInfo.connectionConfig = JSON.parse(databaseInfo.connectionConfig).connection;
// table 정보 조회
const tablesInfo = await this.connectionService.executeQuery({ id: +id, query: 'show tables' });
let selectTableQuery;
switch (databaseInfo.engine) {
case 'mysql2':
selectTableQuery = 'show tables';
break;
case 'pg':
selectTableQuery = `SELECT table_name FROM information_schema.tables WHERE table_type = 'BASE TABLE' and table_schema not in ('information_schema', 'pg_catalog', 'pg_internal')`;
break;
case 'sqlite3':
selectTableQuery = `SELECT tbl_name FROM sqlite_master WHERE type = 'table'`;
break;
case 'mssql':
selectTableQuery = 'SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES';
break;
case 'bigquery':
selectTableQuery = `select table_id from ${databaseInfo.connectionConfig['schema']}.__TABLES__`;
break;
case 'oracledb':
selectTableQuery = 'SELECT table_name FROM user_tables ORDER BY table_name';
break;
case 'snowflake':
selectTableQuery = `select table_name from information_schema.tables where table_type = 'BASE TABLE'`;
break;
case 'cockroachdb':
selectTableQuery = `SELECT TABLE_NAME FROM information_schema.tables WHERE table_type = 'BASE TABLE'`;
break;
default:
selectTableQuery = 'show tables';
break;
}
const tablesInfo = await this.connectionService.executeQuery({
id: +id,
query: selectTableQuery,
});
const tables = [];
if (tablesInfo && tablesInfo.datas.length > 0) {
tablesInfo.datas.map(tableObj => {
tables.push({ id: Object.values(tableObj)[0], tableName: Object.values(tableObj)[0], databaseId: id, datasetType:DatasetType.TABLE });
tables.push({
id: Object.values(tableObj)[0],
tableName: Object.values(tableObj)[0],
databaseId: id,
datasetType: DatasetType.TABLE,
});
});
} else if (tablesInfo && tablesInfo.status === ResponseStatus.ERROR) {
return tablesInfo;
}
// dataset 정보 조회
const tempDatasets = await this.datasetRepository.find({ where: { databaseId: id } });
const datasets = [];
tempDatasets.map(item => {
datasets.push(Object.assign({datasetType:DatasetType.DATASET}, item));
})
datasets.push(Object.assign({ datasetType: DatasetType.DATASET }, item));
});
return { status: ResponseStatus.SUCCESS, data: { databaseInfo, tables, datasets } };
}
/**
* database 정보 단순 조회
* @param id
*/
async findOneInfo(id: number): Promise<any> {
// 연동 db 정보
const databaseInfo = await this.databaseRepository.findOne({ where: { id } });
databaseInfo.connectionConfig = JSON.parse(databaseInfo.connectionConfig).connection;
delete databaseInfo.connectionConfig['password'];
return { status: ResponseStatus.SUCCESS, data: { databaseInfo } };
}
/**
* db config 정보 단순 조회
* @param id
@@ -109,13 +167,26 @@ export class DatabaseService {
message: `조건에 맞는 데이터베이스를 찾지 못했습니다. id:${id}`,
};
if (updateDatabaseDto.engine === 'cockroachdb') {
const connectioninfo = updateDatabaseDto.connectionConfig;
const cockroach_url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`;
connectioninfo['connectionString'] = cockroach_url;
}
const connectionConfig = {
client: one.engine,
connection: Object(one.connectionConfig).connection,
connection: updateDatabaseDto.connectionConfig,
useNullAsDefault: true,
};
updateDatabaseDto.connectionConfig = JSON.stringify(connectionConfig);
// const connectionConfig = {
// client: one.engine,
// connection: Object(one.connectionConfig).connection,
// useNullAsDefault: true,
// };
// updateDatabaseDto.connectionConfig = JSON.stringify(connectionConfig);
const saveResult = await this.databaseRepository.update(
{ id },
{ name: updateDatabaseDto.name, connectionConfig: updateDatabaseDto.connectionConfig },
@@ -135,21 +206,57 @@ export class DatabaseService {
status: ResponseStatus.ERROR,
message: `조건에 맞는 데이터베이스를 찾지 못했습니다. id:${id}`,
};
// 연관된 widget 제거
const deletedWidget = await this.datasetRepository.query(
`delete from widget
where ((datasetType = 'DATASET' and datasetId in (select id from dataset where databaseId = ?)) or
(datasetType = 'TABLE' and datasetId in (select id from table_query where databaseId = ?)))`,
[id, id],
);
// table query 삭제
await this.tableQueryRepository.delete({ databaseId: id });
// dataset 삭제
const deletedDataset = await this.datasetRepository.delete({ databaseId: id });
// database 삭제
await this.databaseRepository.remove(one);
return { status: ResponseStatus.SUCCESS, data: { message: `${id} 삭제 완료` } };
return {
status: ResponseStatus.SUCCESS,
data: {
message: `${deletedWidget.affected}개의 widget, ${deletedDataset.affected}개의 dataset, databse [${one.name}] 삭제 완료`,
},
};
}
/**
* 데이터 조회
* @param datasetType
* @param databaseId
* @param datasetId
* @param tableName
*/
async findData(datasetType: DatasetType, datasetId: number) {
if (!datasetType || !datasetId)
async findData(
datasetType: DatasetType,
databaseId: number,
datasetId?: number,
tableName?: string,
) {
if (datasetType === DatasetType.DATASET && datasetId === undefined) {
return {
status: ResponseStatus.ERROR,
message: 'datasetType, datasetId 필수 입력 param 입니다',
message: 'DATASET의 경우, datasetId 필수 입력 사항입니다.',
};
} else if (
datasetType === DatasetType.TABLE &&
tableName === undefined &&
datasetId === undefined
) {
return {
status: ResponseStatus.ERROR,
message: 'TABLE의 경우, tableName이나 datasetId 둘 중 하나는 입력해야합니다.',
};
}
const queryExecuteDto = new QueryExecuteDto();
if (datasetType === DatasetType.DATASET) {
@@ -157,14 +264,35 @@ export class DatabaseService {
queryExecuteDto.id = datasetItem.databaseId;
queryExecuteDto.query = datasetItem.query;
} else if (datasetType === DatasetType.TABLE) {
const datasetItem = await this.tableQueryRepository.findOne({ where: { id: datasetId } });
queryExecuteDto.id = datasetItem.databaseId;
queryExecuteDto.query = datasetItem.query;
if (datasetId != undefined) {
const datasetItem = await this.tableQueryRepository.findOne({ where: { id: datasetId } });
queryExecuteDto.id = datasetItem.databaseId;
queryExecuteDto.query = datasetItem.query;
} else {
const databaseOne = await this.databaseRepository.findOne({ where: { id: databaseId } });
let selectQuery;
switch (databaseOne.type) {
case 'bigquery':
const schemaName = JSON.parse(databaseOne.connectionConfig).connection.schema;
selectQuery = `SELECT * FROM ${schemaName}.${tableName}`;
break;
case 'oracle':
selectQuery = `SELECT * FROM "${tableName}"`;
break;
default:
selectQuery = `SELECT * FROM ${tableName}`;
break;
}
queryExecuteDto.id = databaseId;
queryExecuteDto.query = selectQuery;
}
}
const queryResult = await this.connectionService.executeQuery(queryExecuteDto);
return {
status: queryResult.status,
data: { datas: queryResult.datas, fields: queryResult.fields },
};
if (queryResult.status === 'ERROR') return queryResult;
else
return {
status: queryResult.status,
data: { datas: queryResult.datas, fields: queryResult.fields },
};
}
}

View File

@@ -34,6 +34,14 @@ export class CreateDatabaseDto {
})
engine: string;
@IsString()
@IsOptional()
@ApiProperty({
example: 'mysql',
description: '데이터베이스 구분',
})
type: string;
@IsString()
@IsOptional()
@ApiProperty({

View File

@@ -16,9 +16,12 @@ export class Database extends BaseEntity {
@Column({ type: 'text', comment: '속성' })
connectionConfig: string; // 기타 속성 json으로 .. host, schema, filePath...
@Column({ length: 100, comment: '데이터베이스 구분' })
@Column({ length: 100, comment: '데이터베이스 엔진' })
engine: string;
@Column({ length: 100, comment: '데이터베이스 구분' })
type: string;
@Column({ length: 100, comment: '타임존', nullable: true })
timezone: string;
@@ -27,6 +30,7 @@ export class Database extends BaseEntity {
description: string,
details: string,
engine: string,
type: string,
timezone: string,
): Database {
const obj = new Database();
@@ -34,12 +38,20 @@ export class Database extends BaseEntity {
obj.description = description;
obj.connectionConfig = details;
obj.engine = engine;
obj.type = type;
obj.timezone = timezone;
return obj;
}
static toDto(dto: CreateDatabaseDto): Database {
return Database.of(dto.name, dto.description, dto.connectionConfig, dto.engine, dto.timezone);
return Database.of(
dto.name,
dto.description,
dto.connectionConfig,
dto.engine,
dto.type,
dto.timezone,
);
}
getFullDescription(): string {

View File

@@ -20,5 +20,5 @@ export class DatabaseType extends BaseEntity {
seq: number;
@Column({ length: 1, comment: '사용여부', default: YesNo.YES })
useYn: YesNo;
useYn: string;
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
import { Controller, Get, Post, Body, Patch, Param, Delete, Put } from '@nestjs/common';
import { Controller, Get, Post, Body, Param, Delete, Put } from '@nestjs/common';
import { DatasetService } from './dataset.service';
import { CreateDatasetDto } from './dto/create-dataset.dto';
import { UpdateDatasetDto } from './dto/update-dataset.dto';

View File

@@ -5,10 +5,12 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { Dataset } from './entities/dataset.entity';
import { ConnectionService } from '../connection/connection.service';
import { Database } from '../database/entities/database.entity';
import { Widget } from '../widget/entities/widget.entity';
import { JwtService } from '@nestjs/jwt';
@Module({
imports: [TypeOrmModule.forFeature([Dataset, Database])],
imports: [TypeOrmModule.forFeature([Dataset, Database, Widget])],
controllers: [DatasetController],
providers: [DatasetService, ConnectionService],
providers: [DatasetService, ConnectionService, JwtService],
})
export class DatasetModule {}

View File

@@ -6,12 +6,16 @@ import { Repository } from 'typeorm';
import { Dataset } from './entities/dataset.entity';
import { ConnectionService } from '../connection/connection.service';
import { ResponseStatus } from '../common/enum/response-status.enum';
import { Widget } from '../widget/entities/widget.entity';
import { DatasetType } from '../common/enum/dataset-type.enum';
@Injectable()
export class DatasetService {
constructor(
@InjectRepository(Dataset)
private datasetRepository: Repository<Dataset>,
@InjectRepository(Widget)
private widgetRepository: Repository<Widget>,
private readonly connectionService: ConnectionService,
) {}
@@ -51,8 +55,9 @@ export class DatasetService {
let returnObj: any;
const dataObj = await this.datasetRepository.findOne({ where: { id: id } });
if (!dataObj) returnObj = {status: ResponseStatus.ERROR, message: `id ${id}의 값이 존재하지 않습니다.`};
else returnObj = {status:ResponseStatus.SUCCESS, data: dataObj};
if (!dataObj)
returnObj = { status: ResponseStatus.ERROR, message: `id ${id}의 값이 존재하지 않습니다.` };
else returnObj = { status: ResponseStatus.SUCCESS, data: dataObj };
return returnObj;
}
@@ -89,6 +94,10 @@ export class DatasetService {
return 'Not exist dataset';
} else {
await this.datasetRepository.delete(find_dataset.id);
await this.widgetRepository.delete({
datasetType: DatasetType.DATASET,
datasetId: find_dataset.id,
});
}
return `This action removes a #${id} dataset`;
}

View File

@@ -1,26 +1,23 @@
import {Column, Entity, JoinTable, ManyToMany, OneToMany, PrimaryGeneratedColumn} from "typeorm";
import {Database} from "../../database/entities/database.entity";
import {BaseEntity} from "../../common/entities/base.entity";
import {Widget} from "../../widget/entities/widget.entity";
import { Column, Entity, JoinTable, ManyToMany, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
import { BaseEntity } from '../../common/entities/base.entity';
@Entity()
export class Dataset extends BaseEntity {
@PrimaryGeneratedColumn({comment: '데이터셋 ID'})
id: number
@PrimaryGeneratedColumn({ comment: '데이터셋 ID' })
id: number;
@Column({comment: '데이터셋명', nullable: true})
title: string
@Column({ length: 255, type: 'varchar', comment: '데이터셋명', nullable: true })
title: string;
@Column({comment: '데이터베이스 ID'})
databaseId: number
@Column({ comment: '데이터베이스 ID' })
databaseId: number;
@Column({type: 'text', comment: '조회 sql'})
query: string
// @OneToMany(
// (type) => Widget,
// (widget) => widget.datasetId
// )
// widgets!: Widget
@Column({ type: 'text', comment: '조회 sql' })
query: string;
// @OneToMany(
// (type) => Widget,
// (widget) => widget.datasetId
// )
// widgets!: Widget
}

View File

@@ -0,0 +1,16 @@
import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
export class CreateLoginDto {
@IsString()
@IsNotEmpty()
userId: string;
@IsString()
@IsNotEmpty()
password: string;
@IsString()
@IsNotEmpty()
email: string;
}

View File

@@ -0,0 +1,4 @@
import {OmitType, PartialType } from '@nestjs/swagger';
import { CreateUserDto } from '../../user/dto/create-user.dto.js';
export class LoginUserDto extends OmitType(CreateUserDto, ['email'] as const) {}

View File

@@ -0,0 +1,4 @@
import { PartialType } from '@nestjs/swagger';
import { CreateLoginDto } from './create-login.dto';
export class UpdateLoginDto extends PartialType(CreateLoginDto) {}

View File

@@ -0,0 +1 @@
export class Login {}

View File

@@ -0,0 +1,20 @@
import { Test, TestingModule } from '@nestjs/testing';
import { LoginController } from './login.controller';
import { LoginService } from './login.service';
describe('LoginController', () => {
let controller: LoginController;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
controllers: [LoginController],
providers: [LoginService],
}).compile();
controller = module.get<LoginController>(LoginController);
});
it('should be defined', () => {
expect(controller).toBeDefined();
});
});

View File

@@ -0,0 +1,68 @@
import {
Controller,
Get,
Post,
Body,
Patch,
Param,
Delete,
UsePipes,
ValidationPipe,
Res,
Req,
UseGuards,
Query,
} from '@nestjs/common';
import { LoginService } from './login.service';
import { CreateLoginDto } from './dto/create-login.dto';
import { LoginUserDto } from '../login/dto/login-user.dto';
import { AuthService } from 'src/auth/auth.service';
import { LocalAuthGuard } from 'src/auth/guards/local-auth.guard';
import { ApiOperation, ApiTags } from '@nestjs/swagger';
@ApiTags('로그인 관련 API')
@Controller('login')
export class LoginController {
constructor(
private readonly loginService: LoginService,
private readonly authService: AuthService,
) {}
@UsePipes(ValidationPipe)
@Post('signin')
@ApiOperation({ summary: ' 로그인 ' })
async logIn(@Res() res, @Req() req, @Body() loginDto: LoginUserDto) {
const findUser = await this.loginService.signin(loginDto);
// 유저존재여부 확인
const accessToken = await this.authService.generateAccessToken(findUser);
// AccessToken발급
const refreshToken = await this.authService.generateRefreshToken(findUser);
// RefreshToken발급
await this.authService.setRefreshKey(refreshToken, findUser.jwtId);
// RefreshToken 저장
res.cookie('jwt_re', refreshToken, {
httpOnly: true, // 브라우저에서 cookie에 에 접근권한 x
sameSite: 'Lax', // 다른 도메인의 cookie를 허용한 주소만 가져올 수 있음
secure: true, // 보안처리된 https만 허
});
return res.status(201).json({ accessToken: accessToken, message: 'success' });
}
// validationPipe = 들어오는 모든 클라이언트 페이로드에 대한 유효성 검사 규칙을 적용
@UsePipes(ValidationPipe)
@Post('signup')
@ApiOperation({ summary: '회원가입' })
create(@Body() createUserDto: CreateLoginDto) {
return this.loginService.signup(createUserDto);
}
@UseGuards(LocalAuthGuard) //refrshtoken 검사
@Post('signout')
@ApiOperation({ summary: '로그아웃' })
async signOut(@Res() res, @Req() req) {
const { jwtId } = req.user.refreshKeyData;
await this.authService.deleteRefreshToken(jwtId);
return res.status(201).clearCookie('jwt_re').json({ message: 'success' });
}
}

View File

@@ -0,0 +1,22 @@
import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
import { LoginService } from './login.service';
import { LoginController } from './login.controller';
import { TypeOrmModule } from '@nestjs/typeorm';
import { User } from '../user/entities/user.entity';
import { UserMapping } from '../user/entities/user-mapping.entity.js';
import { RefreshToken } from '../auth/entites/refresh_token.entity.js'
import { JwtModule } from '@nestjs/jwt';
import { AuthService } from 'src/auth/auth.service';
import { loginLoggerMiddleware } from 'src/middleware/middleware-log/middleware.login-logger';
import { LoginHistory } from 'src/middleware/entities/login-history.entity';
@Module({
imports: [TypeOrmModule.forFeature([User, RefreshToken, UserMapping, LoginHistory]), JwtModule],
controllers: [LoginController],
providers: [LoginService, AuthService]
})
export class LoginModule implements NestModule {
configure(consumer: MiddlewareConsumer) {
consumer.apply( loginLoggerMiddleware ).forRoutes('login');
}
}

View File

@@ -0,0 +1,18 @@
import { Test, TestingModule } from '@nestjs/testing';
import { LoginService } from './login.service';
describe('LoginService', () => {
let service: LoginService;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [LoginService],
}).compile();
service = module.get<LoginService>(LoginService);
});
it('should be defined', () => {
expect(service).toBeDefined();
});
});

View File

@@ -0,0 +1,56 @@
import { HttpException, HttpStatus, Injectable, UnauthorizedException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { AuthService } from 'src/auth/auth.service';
import { User } from 'src/user/entities/user.entity';
import { Repository } from 'typeorm';
import { CreateLoginDto } from './dto/create-login.dto';
import { LoginUserDto } from './dto/login-user.dto';
import { RefreshToken } from 'src/auth/entites/refresh_token.entity';
const crypto = require('crypto');
@Injectable()
export class LoginService {
constructor(
private authService: AuthService,
@InjectRepository(User) private readonly userRepository: Repository<User>,
@InjectRepository(RefreshToken) private readonly refreshRepository: Repository<RefreshToken>
) {}
async signin(loginDto: LoginUserDto) {
const { userId, password } = loginDto;
const salt = crypto.randomBytes(128).toString('base64');
const hashPassword = crypto.createHash('sha512').update(password).digest('hex');
console.log(hashPassword)
const findUser = await this.authService.validateUser(userId, hashPassword); // 요저의 존재여부 확인
if (!findUser) {
throw new UnauthorizedException(`Unauthorized`);
}
return findUser;
}
async signup(createLoginDto: CreateLoginDto) {
const userInfoEmail = await this.userRepository.findOne({
where: { email: createLoginDto.email },
});
const userInfoId = await this.userRepository.findOne({
where: { userId: createLoginDto.userId },
});
if (!userInfoEmail && !userInfoId) {
const { email, password, userId } = createLoginDto;
const set_retoken = await this.refreshRepository.save({})
const createUserInfo = await this.userRepository.save({
email: email,
password: password,
userId: userId,
jwtId: set_retoken.id,
createdAt: new Date(),
updatedAt: new Date()
});
return 'success';
} else if (!userInfoEmail && userInfoId) {
throw new HttpException('conflict userId', HttpStatus.CONFLICT);
}
throw new HttpException('conflict email', HttpStatus.CONFLICT);
}
}

View File

@@ -3,22 +3,32 @@ import { AppModule } from './app.module';
import express from 'express';
import { ExpressAdapter } from '@nestjs/platform-express';
import { HttpExceptionFilter } from './nest-utils/http-exception.filter';
import { ValidationPipe } from '@nestjs/common';
import cookieParser from 'cookie-parser';
import { setupSwagger } from './utils/swagger.js';
async function bootstrap() {
const expressApp = express();
const app = await NestFactory.create(AppModule, new ExpressAdapter(expressApp), {
logger: console,
cors: {
origin: process.env.CORS_ORIGIN,
origin: function (origin, callback) {
if (process.env.CORS_ORIGIN.indexOf(origin) !== -1) {
callback(null, true);
} else {
callback(new Error('Not Allowed Origin'));
}
},
preflightContinue: false,
methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
optionsSuccessStatus: 200,
exposedHeaders: ['Content-Disposition'],
credentials: true,
},
});
app.useGlobalFilters(new HttpExceptionFilter());
// app.useGlobalPipes(new ValidationPipe({ transform: true }));
// const app = await NestFactory.create(AppModule);
app.use(cookieParser());
setupSwagger(app);
await app.listen(4000);
}

View File

@@ -0,0 +1,35 @@
import { YesNo } from 'src/common/enum/yn.enum';
import {
Column,
CreateDateColumn,
Entity,
Index,
ManyToOne,
PrimaryGeneratedColumn,
} from 'typeorm';
@Entity()
export class LoginHistory {
@PrimaryGeneratedColumn({ comment: '로그인 이력번호', type: 'integer' })
loginNo: number; // 순차적인 번호
@Column({ length: 36, nullable: true, comment: '회원 UID' })
userId: string;
@Column({ length: 20, nullable: true, comment: '로그인 유형' })
loginType: string; // PC, 모바일 접속타입
@Column({ comment: '요청 경로' })
path: string;
@Column({
type: 'varchar',
nullable: true,
length: 1,
comment: '로그인 성공 유무',
})
loginSuccYn: string;
@CreateDateColumn({ nullable: true, comment: '등록 일시' })
createdAt: Date;
}

View File

@@ -0,0 +1,45 @@
import { Injectable, NestMiddleware, Logger, ExecutionContext, CallHandler } from '@nestjs/common';
import { Request, Response, NextFunction } from 'express';
import { InjectRepository } from '@nestjs/typeorm';
import { LoginHistory } from '../entities/login-history.entity.js';
import { Repository } from 'typeorm';
import { YesNo } from '../../common/enum/yn.enum.js';
@Injectable()
export class loginLoggerMiddleware implements NestMiddleware {
private readonly logger = new Logger(loginLoggerMiddleware.name);
constructor(
@InjectRepository(LoginHistory)
private readonly loginHisotryRepository: Repository<LoginHistory>,
) {}
async use(req: Request, res: Response, next: NextFunction) {
if (req.url === '/signin') {
const loginSaveObj = {
userId: req.body?.userId,
path: req?.path,
login_Type: req?.headers['user-agent'],
login_succYn: YesNo.YES,
created_at: new Date(),
};
this.logger.log(loginSaveObj);
await this.loginHisotryRepository.save(loginSaveObj);
return next();
}
if (req.url === '/signout') {
const logoutSaveObj = {
userId: req.body.userId,
path: req.path,
loginType: req.headers['user-agent'],
loginSuccYn: YesNo.NO,
createdAt: new Date(),
};
this.logger.log(logoutSaveObj);
await this.loginHisotryRepository.save(logoutSaveObj);
return next();
}
next();
// await this.loginHisotryRepository.save(saveObj)
// 로그인 시간, 로그아웃 체크, 접속기기..?, explorer 어떤거?
}
}

View File

@@ -0,0 +1,33 @@
import { Injectable, NestMiddleware, Logger, ExecutionContext, CallHandler } from '@nestjs/common';
import { Request, Response, NextFunction } from 'express';
import { NestFactory } from '@nestjs/core';
import { UserController } from '../../user/user.controller.js';
import { InjectRepository } from '@nestjs/typeorm';
import { LoginHistory } from '../entities/login-history.entity.js';
import { Repository } from 'typeorm';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { YesNo } from '../../common/enum/yn.enum.js';
@Injectable()
export class shareUrlLoggerMiddleware implements NestMiddleware {
private readonly logger = new Logger(shareUrlLoggerMiddleware.name);
constructor(
@InjectRepository(LoginHistory) private readonly loginHisotryRepository: Repository<LoginHistory>,
) {}
async use(req: Request, res: Response, next: NextFunction) {
let loginSaveObj = {
userId: req.body.userId,
path: req.path,
login_type: req.headers['user-agent'],
login_succ_tn: YesNo.YES,
created_at: new Date()
}
this.logger.log(loginSaveObj)
await this.loginHisotryRepository.save(loginSaveObj)
next();
// await this.loginHisotryRepository.save(saveObj)
// 로그인 시간, 로그아웃 체크, 접속기기..?, explorer 어떤거?
}
}

View File

@@ -0,0 +1,34 @@
import { Injectable, NestMiddleware, Logger } from '@nestjs/common';
import { Request, Response, NextFunction } from 'express';
import { InjectRepository } from '@nestjs/typeorm';
import { LoginHistory } from '../entities/login-history.entity.js';
import { Repository } from 'typeorm';
import { YesNo } from '../../common/enum/yn.enum.js';
import { ApiBearerAuth } from '@nestjs/swagger';
@Injectable()
export class userLoggerMiddleware implements NestMiddleware {
private readonly logger = new Logger(userLoggerMiddleware.name);
constructor(
@InjectRepository(LoginHistory)
private readonly loginHisotryRepository: Repository<LoginHistory>,
) {}
async use(req: Request, res: Response, next: NextFunction) {
// const { userId } = req.user.accessKeyData;
console.log('확인', req.user);
const loginSaveObj = {
userId: req.body?.userId,
path: req.path,
login_type: req.headers['user-agent'],
login_succyn: YesNo.YES,
created_at: new Date(),
};
this.logger.log(loginSaveObj);
await this.loginHisotryRepository.save(loginSaveObj);
next();
// await this.loginHisotryRepository.save(saveObj)
// 로그인 시간, 로그아웃 체크, 접속기기..?, explorer 어떤거?
}
}

View File

@@ -1,54 +0,0 @@
// import {Connection} from "typeorm";
// import {Seeder, Factory} from 'typeorm-seeding';
// import {Component} from "../component/entities/component.entity";
//
//
// export class CreateInitialData implements Seeder {
// public async run(factory: Factory, connection: Connection): Promise<any> {
// await connection
// .createQueryBuilder()
// .insert()
// .into(Component)
// .values([
// {
// type: 'CHART_LINE',
// title: '선형 차트',
// category: 'LINE',
// icon: 'icon/line-chart.png',
// description: 'Line Chart',
// option: `{
// "title": "test",
// "xField": "",
// "series": [
// {
// "field": "",
// "color": "#5470c6",
// "aggregation": "",
// },
// ],
// "legendPosition": "left",
// }`,
// },
// {
// type: 'CHART_AREA',
// title: '영역형 차트',
// category: 'AREA',
// icon: 'icon/area-chart.png',
// description: 'Area Chart',
// option: `{
// "title": "",
// "xField": "",
// "series": [
// {
// "field": "",
// "color": "#5470c6",
// "aggregation": "",
// },
// ],
// "legendPosition": "left",
// }`,
// }
// ]
// )
// }
// }

View File

@@ -0,0 +1,13 @@
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
export class ShareUrlOnDto {
@IsString()
@IsNotEmpty()
@ApiProperty({ description: '유저Id' })
userId: string;
@IsString()
@IsNotEmpty()
@ApiProperty({ description: '공유 url 공유기간' })
endDate: string;
}

View File

@@ -0,0 +1,4 @@
import { PartialType } from '@nestjs/swagger';
import { ShareUrlOnDto } from './create-share-url.dto';
export class UpdateShareUrlDto extends PartialType(ShareUrlOnDto) {}

View File

@@ -0,0 +1 @@
export class ShareUrl {}

View File

@@ -0,0 +1,20 @@
import { Test, TestingModule } from '@nestjs/testing';
import { ShareUrlController } from './share-url.controller';
import { ShareUrlService } from './share-url.service';
describe('ShareUrlController', () => {
let controller: ShareUrlController;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
controllers: [ShareUrlController],
providers: [ShareUrlService],
}).compile();
controller = module.get<ShareUrlController>(ShareUrlController);
});
it('should be defined', () => {
expect(controller).toBeDefined();
});
});

View File

@@ -0,0 +1,38 @@
import { Controller, Get, Post, Body, Param, UseGuards, Req } from '@nestjs/common';
import { ShareUrlService } from './share-url.service';
import { ShareUrlOnDto } from './dto/create-share-url.dto';
import { JwtAuthGuard } from 'src/auth/guards/jwt-auth.guard';
import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
@Controller('share-url')
@ApiTags('url공유화 API')
export class ShareUrlController {
constructor(private readonly shareUrlService: ShareUrlService) {}
@UseGuards(JwtAuthGuard)
@Post('share-on/:dashboardId')
@ApiOperation({ summary: '공유 url On' })
@ApiBearerAuth('AccessKey')
checkShareUrlOn(@Req() req, @Param() params, @Body() shareUrlOnDto: ShareUrlOnDto) {
const { userId } = req.user.accessKeyData;
const { dashboardId } = params;
return this.shareUrlService.checkShareUrlOn(userId, dashboardId, shareUrlOnDto);
}
@UseGuards(JwtAuthGuard)
@Post('share-off/:dashboardId')
@ApiOperation({ summary: '공유 url Off' })
@ApiBearerAuth('AccessKey')
checkShareUrlOff(@Req() req, @Param() params, @Body() shareUrlOnDto: ShareUrlOnDto) {
const { userId } = req.user.accessKeyData;
const { dashboardId } = params;
return this.shareUrlService.checkShareUrlOff(userId, dashboardId);
}
@Get('share-dashboard/:uuid')
@ApiOperation({ summary: '공유 url 접속' })
async shareDashboardInfo(@Param() param) {
const { uuid } = param;
return await this.shareUrlService.shareDashboardInfo(uuid);
}
}

View File

@@ -0,0 +1,43 @@
import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
import { ShareUrlService } from './share-url.service';
import { ShareUrlController } from './share-url.controller';
import { TypeOrmModule } from '@nestjs/typeorm';
import { User } from '../user/entities/user.entity';
import { Dashboard } from '../dashboard/entities/dashboard.entity';
import { AuthService } from '../auth/auth.service';
import { JwtModule } from '@nestjs/jwt';
import { RefreshToken } from 'src/auth/entites/refresh_token.entity';
import { LoginHistory } from 'src/middleware/entities/login-history.entity';
import { shareUrlLoggerMiddleware } from 'src/middleware/middleware-log/middleware.share-url-logger';
import { DashboardService } from 'src/dashboard/dashboard.service';
import { DashboardWidgetService } from 'src/dashboard/dashboard-widget/dashboard-widget.service';
import { DashboardWidget } from 'src/dashboard/dashboard-widget/entities/dashboard-widget.entity';
import { Widget } from 'src/widget/entities/widget.entity';
import { Component } from 'src/component/entities/component.entity';
import { UserService } from 'src/user/user.service';
import { UserMapping } from 'src/user/entities/user-mapping.entity';
import { DashboardShare } from 'src/dashboard/entities/dashboard_share.entity';
@Module({
imports: [
TypeOrmModule.forFeature([
User,
Dashboard,
RefreshToken,
LoginHistory,
DashboardWidget,
UserMapping,
Widget,
Component,
DashboardShare,
]),
JwtModule,
],
controllers: [ShareUrlController],
providers: [ShareUrlService, AuthService, DashboardService, DashboardWidgetService, UserService],
})
export class ShareUrlModule implements NestModule {
configure(consumer: MiddlewareConsumer) {
consumer.apply(shareUrlLoggerMiddleware).forRoutes('share-url');
}
}

View File

@@ -0,0 +1,18 @@
import { Test, TestingModule } from '@nestjs/testing';
import { ShareUrlService } from './share-url.service';
describe('ShareUrlService', () => {
let service: ShareUrlService;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [ShareUrlService],
}).compile();
service = module.get<ShareUrlService>(ShareUrlService);
});
it('should be defined', () => {
expect(service).toBeDefined();
});
});

View File

@@ -0,0 +1,84 @@
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { AuthService } from '../auth/auth.service.js';
import { Dashboard } from '../dashboard/entities/dashboard.entity.js';
import { User } from '../user/entities/user.entity.js';
import { Repository } from 'typeorm';
import { YesNo } from '../common/enum/yn.enum.js';
import { ShareUrlOnDto } from './dto/create-share-url.dto';
import { DashboardService } from '../dashboard/dashboard.service';
import { DashboardShare } from 'src/dashboard/entities/dashboard_share.entity';
@Injectable()
export class ShareUrlService {
constructor(
@InjectRepository(User) private readonly userRepository: Repository<User>,
@InjectRepository(Dashboard) private dashboardRepository: Repository<Dashboard>,
@InjectRepository(DashboardShare) private dashboardShareRepository: Repository<DashboardShare>,
private readonly authService: AuthService,
private readonly dashboardService: DashboardService,
) {}
async checkShareUrlOn(userId: string, dashboardId: number, shareUrlOnDto: ShareUrlOnDto) {
const findUser = await this.userRepository.findOne({ where: { userId: userId } });
if (!findUser) {
return 'not exist user';
} else {
const split = shareUrlOnDto.endDate.split('/');
const dateForm = `${split[2]}-${split[0]}-${split[1]}`;
const newToken = await this.authService.generateUrlAccessToken(String(dashboardId)); //새로운 공유 토큰 생성
const findDashboard = await this.dashboardRepository.findOne({ where: { id: dashboardId } });
const findDashboardShare = await this.dashboardShareRepository.findOne({
where: { id: findDashboard.shareId },
});
findDashboardShare.shareToken = newToken;
findDashboardShare.shareYn = YesNo.YES;
findDashboardShare.endDate = new Date(dateForm);
await this.dashboardShareRepository.save(findDashboardShare);
return { uuid: findDashboardShare.uuid, message: 'success' };
}
}
// 공유기능 on시 공유토큰과 endDate를 저장
async checkShareUrlOff(userId: string, dashboardId: number) {
const findUser = await this.userRepository.findOne({ where: { userId: userId } });
if (!findUser) {
return 'not exist user';
} else {
const findDashboard = await this.dashboardRepository.findOne({ where: { id: dashboardId } });
const findDashboardShare = await this.dashboardShareRepository.findOne({
where: { id: findDashboard.shareId },
});
findDashboardShare.shareToken = '';
findDashboardShare.shareYn = YesNo.NO;
findDashboardShare.endDate = null;
await this.dashboardShareRepository.save(findDashboardShare);
return { message: 'success' };
}
}
// 공유기능 off시 쉐어토큰, endDate을 없애고 사용가능여부를 N으로 저장
async shareDashboardInfo(uuid: string) {
let findDashboard = null;
let findDashboardShareUrl = null;
try {
findDashboardShareUrl = await this.dashboardShareRepository.findOne({
where: { uuid: uuid },
});
findDashboard = await this.dashboardRepository.findOne({
where: { shareId: findDashboardShareUrl.id },
});
} catch {
throw new HttpException({ message: 'not exist share dashboard' }, HttpStatus.NOT_FOUND);
}
const today = `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${
new Date().getDate() - 1
}`;
if (new Date(today) > findDashboardShareUrl.endDate) {
throw new HttpException({ message: 'expired date' }, HttpStatus.UNAUTHORIZED);
}
return this.dashboardService.findOne(+findDashboard.id);
}
// 공유url로 접속시 대시보드의 정보를 받아오는 코드
}

View File

@@ -19,7 +19,7 @@ export class Template extends BaseEntity {
// layout: string
@Column({length: 1, default: YesNo.YES, comment: '사용여부'})
useYn: YesNo
useYn: string

View File

@@ -1,11 +1,13 @@
import { Body, Controller, Delete, Get, HttpStatus, Param, Post, Put, Res } from '@nestjs/common';
import { Body, Controller, Delete, Get, HttpStatus, Param, Post, Put, Res, UseGuards } from '@nestjs/common';
import { TemplateService } from './template.service';
import { CreateTemplateDto } from './dto/create-template.dto';
import { UpdateTemplateDto } from './dto/update-template.dto';
import { CreateTemplateItemDto } from './dto/create-template-item.dto';
import { UpdateTemplateItemDto } from './dto/update-template-item.dto';
import { TemplateInfoDto } from './dto/template-info.dto';
import { JwtAuthGuard } from 'src/auth/guards/jwt-auth.guard';
@UseGuards(JwtAuthGuard)
@Controller('template')
export class TemplateController {
constructor(private readonly templateService: TemplateService) {}

View File

@@ -6,10 +6,11 @@ import { Template } from './entities/template.entity';
import { TemplateItem } from './entities/template-item.entity';
import { Widget } from '../widget/entities/widget.entity';
import { Component } from '../component/entities/component.entity';
import { JwtService } from '@nestjs/jwt';
@Module({
imports: [TypeOrmModule.forFeature([Template, TemplateItem, Widget, Component])],
controllers: [TemplateController],
providers: [TemplateService],
providers: [TemplateService, JwtService],
})
export class TemplateModule {}

View File

@@ -225,7 +225,6 @@ export class TemplateService {
const result = templateComponentInfoList.sort(
(a, b) => b.totalRecommendScore - a.totalRecommendScore,
);
return { status: ResponseStatus.SUCCESS, data: result };
}
@@ -240,7 +239,7 @@ export class TemplateService {
.subQuery()
.select(['widget.*'])
.from(Widget, 'widget')
.where('id in (:ids)')
.where('id in (:...ids)')
.getQuery();
const widgetList = await this.componentRepository
@@ -289,7 +288,16 @@ export class TemplateService {
// if (templateInfo.layout.length > i && template) templateInfo.layout[i].i = item.id;
});
templateInfo.widgets = widgetList;
const isWidgetList = widgetList.filter(
widgetItem =>
templateInfo.layout.findIndex(templateItem => templateItem.i === widgetItem.id) > -1,
);
const isntWidgetList = widgetList.filter(
widgetItem =>
templateInfo.layout.findIndex(templateItem => templateItem.i === widgetItem.id) === -1,
);
templateInfo.widgets = isWidgetList.concat(isntWidgetList);
return { status: ResponseStatus.SUCCESS, data: templateInfo };
}
@@ -825,16 +833,23 @@ export class TemplateService {
}
}
// template에서 넘친 widget 목록 가져오기
// // template에서 넘친 widget 목록 가져오기
const leastWidgetList = differntWidgetList.filter(item => item.category != 'MAPPED');
// templateInfo.layout에 새로운 layout object 넣어주기(template에서 넘친 widget 목록)
leastWidgetList.forEach((leastWidget, index) => {
const layout = new DashboardLayout();
layout.x = 0;
layout.y =
templateItemList[templateItemList.length - 1].y +
templateItemList[templateItemList.length - 1].h;
layout.w = 5;
if (index % 2 === 0) {
layout.x = 0;
layout.y =
templateItemList[templateItemList.length - 1].y +
templateItemList[templateItemList.length - 1].h;
} else {
layout.x = 6;
layout.y =
templateItemList[templateItemList.length - 2].y +
templateItemList[templateItemList.length - 2].h;
}
layout.w = 6;
layout.h = 5;
layout.i = leastWidget.id;
templateItemList.push(layout);

View File

@@ -0,0 +1,21 @@
import { ApiProperty, ApiTags } from '@nestjs/swagger';
import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
@ApiTags('유저생성 Dto')
export class CreateUserDto {
@IsString()
@IsNotEmpty()
@ApiProperty({ description: '유저Id'})
userId: string;
@IsString()
@IsNotEmpty()
@ApiProperty({ description: '유저password'})
password: string;
@IsString()
@IsNotEmpty()
@ApiProperty({ description: '유저email'})
email: string;
}

View File

@@ -0,0 +1,12 @@
import { PartialType } from '@nestjs/swagger';
import {IsNotEmpty, IsString } from 'class-validator';
import { CreateUserDto } from './create-user.dto';
export class UpdateUserDto extends PartialType(CreateUserDto) {
@IsString()
@IsNotEmpty()
new_password: string;
}

View File

@@ -0,0 +1,24 @@
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsOptional } from 'class-validator';
import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn} from 'typeorm';
import { BaseEntity } from '../../common/entities/base.entity';
@Entity()
export class UserMapping extends BaseEntity {
@PrimaryGeneratedColumn()
@ApiProperty({ description: 'id'})
id: number;
@IsOptional()
@Column()
@ApiProperty({ description: '대시보드id'})
dashboardId: number;
@Column()
@ApiProperty({ description: '유저id'})
userInfoId: number;
// @IsOptional()
// @Column()
// url_copy_id: number;
}

View File

@@ -0,0 +1,40 @@
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty } from 'class-validator';
import {
Entity,
Column,
PrimaryGeneratedColumn,
CreateDateColumn,
UpdateDateColumn,
} from 'typeorm';
@Entity()
export class User {
@PrimaryGeneratedColumn()
@ApiProperty({ description: 'id' })
id: number;
@IsNotEmpty()
@Column({ length: 255, comment: '유저 Id' })
@ApiProperty({ description: '유저Id' })
userId: string;
@Column({nullable: true})
@ApiProperty({ description: 'refreshTokenId' })
jwtId: number;
@IsNotEmpty()
@Column({ length: 255, comment: '유저 email' })
@ApiProperty({ description: '유저 email' })
email: string;
@IsNotEmpty()
@Column({ length: 255, comment: '유저 password' })
@ApiProperty({ description: '유저 password' })
password: string;
@CreateDateColumn({ default: () => 'CURRENT_TIMESTAMP', comment: '생성일' })
createdAt: Date;
@UpdateDateColumn({ default: () => 'CURRENT_TIMESTAMP', comment: '수정일' })
updatedAt: Date;
}

View File

@@ -0,0 +1,20 @@
import { Test, TestingModule } from '@nestjs/testing';
import { UserController } from './user.controller';
import { UserService } from './user.service';
describe('UserController', () => {
let controller: UserController;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
controllers: [UserController],
providers: [UserService],
}).compile();
controller = module.get<UserController>(UserController);
});
it('should be defined', () => {
expect(controller).toBeDefined();
});
});

View File

@@ -0,0 +1,63 @@
import { Controller, Get, Post, Body, Patch, Delete, UseGuards, Res, Req } from '@nestjs/common';
import { UserService } from './user.service';
import { CreateUserDto } from './dto/create-user.dto';
import { UpdateUserDto } from './dto/update-user.dto';
import { JwtAuthGuard } from 'src/auth/guards/jwt-auth.guard';
import { AuthService } from 'src/auth/auth.service';
import { LocalAuthGuard } from 'src/auth/guards/local-auth.guard';
import { ApiBearerAuth, ApiCreatedResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
@Controller('user')
@ApiTags('유저 API')
export class UserController {
constructor(
private readonly userService: UserService,
private readonly authService: AuthService,
) {}
@UseGuards(JwtAuthGuard)
@Get('userinfo')
@ApiOperation({ summary: '해당유저정보 가져오기' })
@ApiBearerAuth('AccessKey')
findOne(@Req() req) {
const { id } = req.user.accessKeyData;
return this.userService.findOne(id);
}
@UseGuards(JwtAuthGuard)
@Patch('change-info')
@ApiOperation({ summary: '유저정보 수정' })
@ApiBearerAuth('AccessKey')
updateUsername(@Req() req, @Body() updateUserDto: UpdateUserDto) {
const { userId } = req.user.accessKeyData;
return this.userService.updateUserInfo(userId, updateUserDto);
}
@UseGuards(JwtAuthGuard)
@Delete('delete-account')
@ApiOperation({ summary: ' 해당유저 삭제 ' })
@ApiBearerAuth('AccessKey')
deleteUser(@Req() req, @Body() createUserDto: CreateUserDto) {
const { userId } = req.user.accessKeyData;
const { password } = createUserDto;
return this.userService.deleteUser(userId, password);
}
@UseGuards(LocalAuthGuard)
@Post('get-access-token')
@ApiOperation({ summary: 'AccessToken 재 발급' })
async reissuanceAccessToken(@Req() req, @Res() res) {
const { userId } = req.user.refreshKeyData;
const accessToken = await this.userService.reissuanceAccessToken(userId);
return res.status(201).json({ accessToken: accessToken, message: 'success' });
}
@UseGuards(JwtAuthGuard)
@Get('get-dashboard')
@ApiOperation({ summary: '해당유정의 대시보드 목록 가져오기' })
@ApiBearerAuth('AccessKey')
async findDashboardId(@Req() req) {
const { id } = req.headers.accessKeyData;
await this.userService.findDashboardId(id);
}
}

View File

@@ -0,0 +1,26 @@
import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
import { UserService } from './user.service';
import { UserController } from './user.controller';
import { User } from './entities/user.entity.js';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AuthService } from 'src/auth/auth.service';
import { JwtModule } from '@nestjs/jwt';
import { RefreshToken } from 'src/auth/entites/refresh_token.entity';
import { UserMapping } from './entities/user-mapping.entity.js';
import { Dashboard } from 'src/dashboard/entities/dashboard.entity';
import { LoginHistory } from 'src/middleware/entities/login-history.entity';
import { userLoggerMiddleware } from 'src/middleware/middleware-log/middleware.user-logger';
@Module({
imports: [
TypeOrmModule.forFeature([User, RefreshToken, UserMapping, Dashboard, LoginHistory]),
JwtModule,
],
controllers: [UserController],
providers: [UserService, AuthService],
})
export class UserModule implements NestModule {
configure(consumer: MiddlewareConsumer) {
consumer.apply(userLoggerMiddleware).forRoutes('user');
}
}

View File

@@ -0,0 +1,18 @@
import { Test, TestingModule } from '@nestjs/testing';
import { UserService } from './user.service';
describe('UserService', () => {
let service: UserService;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [UserService],
}).compile();
service = module.get<UserService>(UserService);
});
it('should be defined', () => {
expect(service).toBeDefined();
});
});

Some files were not shown because too many files have changed in this diff Show More