Compare commits
384 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f3d09c43e | ||
|
|
ef4610a11f | ||
|
|
6fa38b1463 | ||
|
|
23d9b232c8 | ||
|
|
6d295497d9 | ||
|
|
1253ac5f08 | ||
|
|
745883a23b | ||
|
|
775d0e55e6 | ||
|
|
6dad88affe | ||
|
|
d8c5466cc1 | ||
|
|
0b43978d6a | ||
|
|
e9f72b7290 | ||
|
|
3c58d35ed5 | ||
|
|
e9abc4b49f | ||
|
|
750916d49c | ||
|
|
51ae590182 | ||
|
|
c1495716b6 | ||
|
|
b7384113c8 | ||
|
|
fbb1fc35fc | ||
|
|
c0cac23f98 | ||
|
|
dbedadca7e | ||
|
|
427e858786 | ||
|
|
053b8ed28f | ||
|
|
273a2594a2 | ||
|
|
0e302a2d68 | ||
|
|
39aac2dea5 | ||
|
|
04e7d835d6 | ||
|
|
b062f06cb9 | ||
|
|
cf0d8a36fd | ||
|
|
2e96c3a8dc | ||
|
|
469362c664 | ||
|
|
62815a1036 | ||
|
|
0ba8fcdccb | ||
|
|
2a472a5e9e | ||
|
|
ac8f2735c3 | ||
|
|
07a34550c7 | ||
|
|
0d2fe924b9 | ||
|
|
68083e9aa3 | ||
|
|
7988db8d7f | ||
|
|
b1a433d83a | ||
|
|
fe17ace2db | ||
|
|
50da9b2822 | ||
|
|
762fbef35a | ||
|
|
e90e42c134 | ||
|
|
26e57227b0 | ||
|
|
4a3d19a3ec | ||
|
|
c5c7a020af | ||
|
|
d27a97ccfd | ||
|
|
2ccfcfb0ba | ||
|
|
1b623d5257 | ||
|
|
e018dea72e | ||
|
|
454a6115f7 | ||
|
|
5e12b8e375 | ||
|
|
9cc9ae0404 | ||
|
|
a7c986fc52 | ||
|
|
d3e673186a | ||
|
|
04c0715552 | ||
|
|
0d8e807f53 | ||
|
|
7657fdc790 | ||
|
|
eb14caa2fd | ||
|
|
daf29a975f | ||
|
|
09243a0873 | ||
|
|
f10e925411 | ||
|
|
fa014b8643 | ||
|
|
f85435088b | ||
|
|
18547a311b | ||
|
|
ee5287bcbc | ||
|
|
ebe86ec76d | ||
|
|
158691e14b | ||
|
|
d28a86d2df | ||
|
|
6ed9a5e966 | ||
|
|
c6976e17d5 | ||
|
|
c436e8206d | ||
|
|
10d2b3fcc9 | ||
|
|
2657f3b76c | ||
|
|
a2494a8733 | ||
|
|
f4f973cf4f | ||
|
|
351a601762 | ||
|
|
4e878eb3ea | ||
|
|
20f7f2ec46 | ||
|
|
8dd76f9d3d | ||
|
|
f93306298c | ||
|
|
d61425279c | ||
|
|
c880e1b1d7 | ||
|
|
d3cdb04172 | ||
|
|
b124e911db | ||
|
|
5fdf822c7b | ||
|
|
a112843975 | ||
|
|
4766bad6d1 | ||
|
|
15ba3d1faa | ||
|
|
7c413347ba | ||
|
|
020980ada1 | ||
|
|
4613592b9e | ||
|
|
8046f0838e | ||
|
|
7b2e3432b8 | ||
|
|
7360b45b91 | ||
|
|
6eec0fc620 | ||
|
|
740492a5da | ||
|
|
683c5409eb | ||
|
|
535dc6ce42 | ||
|
|
406c6cdf9f | ||
|
|
95a7907f5e | ||
|
|
d647f9172c | ||
|
|
0ef540309d | ||
|
|
d98cefd76a | ||
|
|
83b593b495 | ||
|
|
dba0159912 | ||
|
|
01f5731d6a | ||
|
|
7301dc8118 | ||
|
|
d59a1213d6 | ||
|
|
70c107ff83 | ||
|
|
46ac486cea | ||
|
|
7a1cf206b4 | ||
|
|
86295c75f9 | ||
|
|
e0d7aefdb1 | ||
|
|
604be5f149 | ||
|
|
a49843b31b | ||
|
|
33f2ca0634 | ||
|
|
64b68d27aa | ||
|
|
b31a6dfb94 | ||
|
|
278936bce4 | ||
|
|
178b34d402 | ||
|
|
d7fb5bc075 | ||
|
|
d289aba9f7 | ||
|
|
33e833807d | ||
|
|
4424d88272 | ||
|
|
1997fa8dd6 | ||
|
|
fbfa2cc7a7 | ||
|
|
dcf2039c08 | ||
|
|
642e433d3d | ||
|
|
155e75f140 | ||
|
|
f60e42f514 | ||
|
|
f007f9fd4a | ||
|
|
15a2cc2930 | ||
|
|
8c76bd6e3d | ||
|
|
5e525fc000 | ||
|
|
ba0634e0da | ||
|
|
a40e250bdc | ||
|
|
9d9ff3ceae | ||
|
|
c7381ba825 | ||
|
|
6a8b166896 | ||
|
|
37b72b148a | ||
|
|
fa11f8ffc1 | ||
|
|
c97fc7da9b | ||
|
|
3a175c0c56 | ||
|
|
ac04dc5df9 | ||
|
|
d0471bbcb8 | ||
|
|
2d5719d9bf | ||
|
|
585452b923 | ||
|
|
4c267dbd91 | ||
|
|
79df4c456d | ||
|
|
4399623cdf | ||
|
|
ef8aa2f9bc | ||
|
|
d9b1d48e58 | ||
|
|
b614f37208 | ||
|
|
1f4c0039f3 | ||
|
|
0434798bd0 | ||
|
|
d98a180680 | ||
|
|
c8d592aff9 | ||
|
|
0c33c52a0d | ||
|
|
0fda321195 | ||
|
|
d0ffe58d5a | ||
|
|
4672f1852f | ||
|
|
51d400ff04 | ||
|
|
2338ec5d34 | ||
|
|
398c583116 | ||
|
|
1a6aa5819f | ||
|
|
fb203e654a | ||
|
|
f53b89ec4b | ||
|
|
e4e652fd3a | ||
|
|
74e53252b6 | ||
|
|
94312d9067 | ||
|
|
bab7dd7f84 | ||
|
|
34276b9ce7 | ||
|
|
d2d86b6448 | ||
|
|
60781deefd | ||
|
|
c8b12f2aec | ||
|
|
9f3505a72f | ||
|
|
38ceb994e5 | ||
|
|
0998ee982a | ||
|
|
7346b7cec7 | ||
|
|
2d3ac3086c | ||
|
|
37dc338171 | ||
|
|
30f43d1835 | ||
|
|
5e8999e5ae | ||
|
|
5bd63e14a0 | ||
|
|
624ceb40a8 | ||
|
|
d274d8c453 | ||
|
|
712ff9deba | ||
|
|
52472dfb27 | ||
|
|
e6ec10c62d | ||
|
|
039c24d9e7 | ||
|
|
97c08126a1 | ||
|
|
9810011664 | ||
|
|
8d4ec1dfa0 | ||
|
|
a4da9f12e3 | ||
|
|
949670081f | ||
|
|
97aab02f52 | ||
|
|
13afdc8ec1 | ||
|
|
5d00c398b5 | ||
|
|
a4bd0691b9 | ||
|
|
684f17f072 | ||
|
|
05d5403bdc | ||
|
|
c44c55b235 | ||
|
|
275d4c9062 | ||
|
|
c401c8a673 | ||
|
|
a70c801ab4 | ||
|
|
b721e7dd45 | ||
|
|
b98e6741dd | ||
|
|
0cf821f2bb | ||
|
|
4e907a75b5 | ||
|
|
85f2c2609b | ||
|
|
f21d5643bb | ||
|
|
c1133c3803 | ||
|
|
753109cc6b | ||
|
|
d578efb7c6 | ||
|
|
dc8d853a54 | ||
|
|
958de5da8d | ||
|
|
438ec94717 | ||
|
|
6cca301b69 | ||
|
|
34bcdd8df9 | ||
|
|
5139d8e5ae | ||
|
|
4b804a5aa2 | ||
|
|
a6fbafacdd | ||
|
|
d541d437af | ||
|
|
fb8b5cc8a7 | ||
|
|
f450a1d23c | ||
|
|
dccef038d7 | ||
|
|
0430fe7c77 | ||
|
|
931f33b0e2 | ||
|
|
bf46b6c26d | ||
|
|
98154de24f | ||
|
|
89fef781f7 | ||
|
|
d5053f0132 | ||
|
|
95dd5af82b | ||
|
|
8abc5f27bb | ||
|
|
4e4f2aef75 | ||
|
|
560a355cfe | ||
|
|
e5601a6dd2 | ||
|
|
de7613e57a | ||
|
|
abef60b968 | ||
|
|
5c05cbc795 | ||
|
|
a20cef8ea1 | ||
|
|
eeff56aacc | ||
|
|
dabe1b02a4 | ||
|
|
e61b6ee388 | ||
|
|
5dac280b13 | ||
|
|
8b2a632f71 | ||
|
|
12aba2b83c | ||
|
|
81d2266f7c | ||
|
|
32f66c551e | ||
|
|
fae5aeb74f | ||
|
|
6e01508c10 | ||
|
|
e0f3ab5ec1 | ||
|
|
e0a6f96686 | ||
|
|
0aa64ff13d | ||
|
|
b63577dc86 | ||
|
|
e1a2246230 | ||
|
|
f754a458ed | ||
|
|
a7e39bfc8d | ||
|
|
9f11c88879 | ||
|
|
2a427b4a74 | ||
|
|
c679355891 | ||
|
|
8eb6f337e6 | ||
|
|
a5e14b00c9 | ||
|
|
b826b85d71 | ||
|
|
1b64f4cc95 | ||
|
|
4363fcca1c | ||
|
|
091c866f95 | ||
|
|
b221cab18e | ||
|
|
a06a69535d | ||
|
|
31341d6be6 | ||
|
|
ebd42fae55 | ||
|
|
6fe562ecb6 | ||
|
|
257b478e4e | ||
|
|
5968ca9185 | ||
|
|
c86b440407 | ||
|
|
e7498131d8 | ||
|
|
f429f99e97 | ||
|
|
bdcbad7989 | ||
|
|
598d3cb7dd | ||
|
|
ef971421db | ||
|
|
b675f0adf4 | ||
|
|
009792b753 | ||
|
|
43e0c9bfa8 | ||
|
|
22edc4b3d1 | ||
|
|
6ee5b3a901 | ||
|
|
768a898f4b | ||
|
|
924de9f96d | ||
|
|
b29ff10cf0 | ||
|
|
e99545a684 | ||
|
|
0f7861a468 | ||
|
|
f6d0156961 | ||
|
|
ed5c601d1f | ||
|
|
a3ed959965 | ||
|
|
466419715a | ||
|
|
45359ebd9a | ||
|
|
46e6f6ac5c | ||
|
|
13f50f6f49 | ||
|
|
3f8a94078c | ||
|
|
aef99494a3 | ||
|
|
fe46c1e24d | ||
|
|
c754630207 | ||
|
|
00ac974506 | ||
|
|
86c02d46f3 | ||
|
|
826f6aea21 | ||
|
|
3d934b09f9 | ||
|
|
011f2a032d | ||
|
|
18d9e44711 | ||
|
|
18adb7d4da | ||
|
|
104da16707 | ||
|
|
1538687673 | ||
|
|
9f9a635ab4 | ||
|
|
b53820df94 | ||
|
|
83a3bc1f19 | ||
|
|
3a3c233595 | ||
|
|
ae836dcfbe | ||
|
|
156fb76397 | ||
|
|
974539391c | ||
|
|
6c1aaf8cca | ||
|
|
7d6b6c05ca | ||
|
|
14ac2d9a26 | ||
|
|
0e25acc4df | ||
|
|
f431c276de | ||
|
|
4ad1c87f5d | ||
|
|
6979dac870 | ||
|
|
9cae1ce495 | ||
|
|
9de14d7395 | ||
|
|
63b8d25bf8 | ||
|
|
8e7ab7db46 | ||
|
|
869c57e1b9 | ||
|
|
70b3704ea9 | ||
|
|
c9659e766c | ||
|
|
0abf84a9be | ||
|
|
e694d2217a | ||
|
|
a27d1c1748 | ||
|
|
ca757f4a82 | ||
|
|
005a2a04ee | ||
|
|
bb69234805 | ||
|
|
e2b0132f12 | ||
|
|
8bb1951efb | ||
|
|
d0affbad60 | ||
|
|
ba37818f8b | ||
|
|
075690d39b | ||
|
|
cff1482be3 | ||
|
|
cbde5fa735 | ||
|
|
968775cd71 | ||
|
|
e20bc87ced | ||
|
|
7c354184ce | ||
|
|
042fcf9ecc | ||
|
|
0a1c0db2dd | ||
|
|
f8474cd228 | ||
|
|
388df289cc | ||
|
|
1dc33d82de | ||
|
|
a25fb5606d | ||
|
|
4eb8f127ca | ||
|
|
051367e6ce | ||
|
|
335b479ab0 | ||
|
|
7c5385b343 | ||
|
|
a7f97b7ab6 | ||
|
|
56d543a5f8 | ||
|
|
18709a219e | ||
|
|
8c26a6bcee | ||
|
|
c47e9b2070 | ||
|
|
8852b60492 | ||
|
|
ef1e06a6a0 | ||
|
|
1d629d1535 | ||
|
|
dffdd310aa | ||
|
|
18771185d8 | ||
|
|
54bf5f5927 | ||
|
|
93e4302acb | ||
|
|
5ce2be7f01 | ||
|
|
1a8dea3da9 | ||
|
|
7876d671cd | ||
|
|
100334da92 | ||
|
|
f765d212a1 | ||
|
|
8ce6e85021 | ||
|
|
e816aaade8 | ||
|
|
cc0ba02c05 | ||
|
|
0caef2a24e | ||
|
|
64395cf980 | ||
|
|
c0e43b7679 | ||
|
|
28adae9429 | ||
|
|
678899b209 |
6
.idea/misc.xml
generated
6
.idea/misc.xml
generated
@@ -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
6
.idea/modules.xml
generated
@@ -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
875
LICENSE
@@ -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.
|
||||
|
||||
66
README.md
66
README.md
@@ -10,14 +10,14 @@
|
||||
|
||||
## 바닐라메타의 기능
|
||||
|
||||
- 코딩없이 차트 위젯 제작
|
||||
- 50개 이상의 차트지원
|
||||
- 코딩없이 차트 위젯 제작.
|
||||
- 50개 이상의 차트 지원
|
||||
- 사용자 맞춤형 대시보드 편집 및 공유
|
||||
- 대시보드 템플릿 디자인 추천
|
||||
- 고급 SQL 쿼리 편집기 및 데이터 미리보기
|
||||
- 고급 SQL 쿼리 편집기 및 데이터 미리보기 제공
|
||||
- 다양한 SQL 데이터베이스에 대한 즉시 지원
|
||||
|
||||
## 스크린샷
|
||||
## 주요기능 화면
|
||||
|
||||
- **다양한 시각화 차트**
|
||||
<kbd><img title="Chart" src="design/feature-01.png"/></kbd><br/>
|
||||
@@ -43,3 +43,61 @@
|
||||
- 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경로에서
|
||||

|
||||
화면이 뜬다면 성공 !
|
||||
|
||||
```
|
||||
현재 default 계정정보는
|
||||
ID: guest
|
||||
PW: Admin!@12
|
||||
```
|
||||
입니다. 이후 회원정보 변경하기 페이지에서 비밀번호를 바꿔서 사용하시면 됩니다
|
||||
|
||||
## db연동하기
|
||||
|
||||
사용하고 계신 MySql의 연결을 확인한 후 저장해 주세요.
|
||||

|
||||
|
||||
## 데이터셋 설정하기
|
||||
위젯에 적용할 데이터를 query문을 사용하여 선택하시고 저장해 주세요.
|
||||

|
||||
|
||||
|
||||
|
||||
## 위젯 생성하기
|
||||
|
||||
1. 생성한 데이터 셋을 선택하고 다음으로 넘어가 주세요.
|
||||

|
||||
|
||||
|
||||
2. 원하는 타입의 위젯을 선택하고 다음으로 넘어가 주세요.
|
||||

|
||||
|
||||
|
||||
3. 원하는 위젯의 속성을 선택하시고 저장을 눌러주세요.
|
||||

|
||||
|
||||
|
||||
|
||||
생성한 위젯들로 대시보드를 구성해 보세요!
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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/']
|
||||
|
||||
@@ -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
|
||||
2
backend-api/.gitignore
vendored
2
backend-api/.gitignore
vendored
@@ -6,6 +6,8 @@ config.serverless.yml
|
||||
vanillameta
|
||||
bigquery-key.json
|
||||
test-connect-info.json
|
||||
cert.pem
|
||||
key.pem
|
||||
.
|
||||
# compiled output
|
||||
/dist
|
||||
|
||||
@@ -1,30 +1,95 @@
|
||||
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
|
||||
USER frog
|
||||
WORKDIR /home/frog
|
||||
|
||||
COPY package*.json ./
|
||||
|
||||
RUN npm install
|
||||
|
||||
COPY . .
|
||||
COPY tsconfig.json .
|
||||
COPY tsconfig.build.json .
|
||||
|
||||
|
||||
RUN npm run build
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
CMD ["npm", "run", "start"]
|
||||
##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/
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -1,33 +1,110 @@
|
||||
version: "3.7"
|
||||
services:
|
||||
main:
|
||||
build:
|
||||
context: ./
|
||||
dockerfile: ./Dockerfile.dev
|
||||
ports:
|
||||
- "4000:4000"
|
||||
networks:
|
||||
- vanillameta
|
||||
depends_on:
|
||||
##
|
||||
##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
|
||||
#
|
||||
##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:
|
||||
# - "4000:4000"
|
||||
# networks:
|
||||
# - vanillameta
|
||||
# depends_on:
|
||||
# - mysql
|
||||
# - pg
|
||||
- mssql
|
||||
links:
|
||||
# - "mysql:mysqldb"
|
||||
# - "pg"
|
||||
- mssql
|
||||
env_file:
|
||||
- .env
|
||||
- .env.dev
|
||||
restart: always
|
||||
|
||||
# links:
|
||||
# - "mysql"
|
||||
# env_file:
|
||||
# - .env
|
||||
# tty: true
|
||||
# environment:
|
||||
# MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
|
||||
# restart: always
|
||||
#
|
||||
# mysql:
|
||||
# container_name: vanillameta_mysql
|
||||
# image: mysql
|
||||
# ports:
|
||||
# - "3306:3306"
|
||||
# networks:
|
||||
# - vanillameta
|
||||
# - vanillameta
|
||||
#
|
||||
# environment:
|
||||
# MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
|
||||
@@ -41,95 +118,96 @@ services:
|
||||
# --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
|
||||
|
||||
|
||||
|
||||
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:
|
||||
|
||||
# - 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:
|
||||
#
|
||||
|
||||
11
backend-api/init.sh
Normal file
11
backend-api/init.sh
Normal 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
|
||||
18
backend-api/ormconfig.ts
Normal file
18
backend-api/ormconfig.ts
Normal 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;
|
||||
1119
backend-api/package-lock.json
generated
1119
backend-api/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -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,9 +47,10 @@
|
||||
"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",
|
||||
@@ -56,17 +62,25 @@
|
||||
"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",
|
||||
|
||||
Binary file not shown.
@@ -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],
|
||||
|
||||
21
backend-api/src/auth/auth.module.ts
Normal file
21
backend-api/src/auth/auth.module.ts
Normal 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 {}
|
||||
18
backend-api/src/auth/auth.service.spec.ts
Normal file
18
backend-api/src/auth/auth.service.spec.ts
Normal 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();
|
||||
});
|
||||
});
|
||||
122
backend-api/src/auth/auth.service.ts
Normal file
122
backend-api/src/auth/auth.service.ts
Normal 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);
|
||||
}
|
||||
}
|
||||
10
backend-api/src/auth/entites/refresh_token.entity.ts
Normal file
10
backend-api/src/auth/entites/refresh_token.entity.ts
Normal file
@@ -0,0 +1,10 @@
|
||||
import { Column, Entity, PrimaryColumn } from 'typeorm';
|
||||
|
||||
@Entity()
|
||||
export class RefreshToken {
|
||||
@PrimaryColumn()
|
||||
id: number;
|
||||
|
||||
@Column()
|
||||
refreshToken: string;
|
||||
}
|
||||
57
backend-api/src/auth/guards/jwt-auth.guard.ts
Normal file
57
backend-api/src/auth/guards/jwt-auth.guard.ts
Normal 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
31
backend-api/src/auth/guards/local-auth.guard.ts
Normal file
31
backend-api/src/auth/guards/local-auth.guard.ts
Normal 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
23
backend-api/src/auth/strategies/jwt.strategy.ts
Normal file
23
backend-api/src/auth/strategies/jwt.strategy.ts
Normal 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;
|
||||
}
|
||||
}
|
||||
20
backend-api/src/auth/strategies/local.strategy.ts
Normal file
20
backend-api/src/auth/strategies/local.strategy.ts
Normal 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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
export enum YesNo {
|
||||
YES = 'Y',
|
||||
NO = 'N'
|
||||
export const YesNo = {
|
||||
YES: 'Y',
|
||||
NO: 'N'
|
||||
}
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 {}
|
||||
|
||||
@@ -31,6 +31,6 @@ export class CreateComponentDto {
|
||||
|
||||
@IsString()
|
||||
@IsOptional()
|
||||
useYn: YesNo
|
||||
useYn: string
|
||||
|
||||
}
|
||||
@@ -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[];
|
||||
}
|
||||
|
||||
@@ -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 => {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -7,10 +7,17 @@ import { DashboardWidget } from './dashboard-widget/entities/dashboard-widget.en
|
||||
import { DashboardWidgetService } from './dashboard-widget/dashboard-widget.service';
|
||||
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 {}
|
||||
|
||||
@@ -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,61 +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',
|
||||
title: 'asc',
|
||||
},
|
||||
});
|
||||
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) {
|
||||
@@ -85,6 +162,7 @@ export class DashboardService {
|
||||
dashboardId: id,
|
||||
widgetIds: widgetIds,
|
||||
};
|
||||
// 업데이트할 데이터
|
||||
await this.dashboardWidgetService.update(id, saveObjDW);
|
||||
const updatedDashboard = await this.dashboardRepository.save(find_dashboard);
|
||||
|
||||
@@ -100,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` },
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
24
backend-api/src/dashboard/entities/dashboard_share.entity.ts
Normal file
24
backend-api/src/dashboard/entities/dashboard_share.entity.ts
Normal 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;
|
||||
}
|
||||
@@ -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,11 +30,12 @@ export class DatabaseController {
|
||||
/**
|
||||
* database type 목록 조회
|
||||
*/
|
||||
@UseGuards(JwtAuthGuard)
|
||||
@Get('/type')
|
||||
findTypeList() {
|
||||
return this.databaseService.findTypeList();
|
||||
}
|
||||
|
||||
@UseGuards(JwtAuthGuard)
|
||||
@Get('/data')
|
||||
async findData(
|
||||
@Query('datasetType') datasetType: DatasetType,
|
||||
@@ -36,6 +51,7 @@ export class DatabaseController {
|
||||
* 데이터베이스 연결정보 단순조회
|
||||
* @param id
|
||||
*/
|
||||
@UseGuards(JwtAuthGuard)
|
||||
@Get('/info/:id')
|
||||
async findOneInfo(@Param('id') id: string) {
|
||||
const databaseInfo = await this.databaseService.findOneInfo(+id);
|
||||
@@ -47,6 +63,7 @@ export class DatabaseController {
|
||||
* @param createDatabaseDto
|
||||
*/
|
||||
@Post()
|
||||
@UseGuards(JwtAuthGuard)
|
||||
create(@Body() createDatabaseDto: CreateDatabaseDto) {
|
||||
return this.databaseService.create(createDatabaseDto);
|
||||
}
|
||||
|
||||
@@ -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 {}
|
||||
|
||||
@@ -37,7 +37,6 @@ export class DatabaseService {
|
||||
*/
|
||||
async create(createDatabaseDto: CreateDatabaseDto) {
|
||||
const databaseDto = Database.toDto(createDatabaseDto);
|
||||
|
||||
const connectionConfig = {
|
||||
client: databaseDto.engine,
|
||||
connection: databaseDto.connectionConfig,
|
||||
@@ -145,6 +144,7 @@ export class DatabaseService {
|
||||
// 연동 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 } };
|
||||
}
|
||||
|
||||
|
||||
@@ -20,5 +20,5 @@ export class DatabaseType extends BaseEntity {
|
||||
seq: number;
|
||||
|
||||
@Column({ length: 1, comment: '사용여부', default: YesNo.YES })
|
||||
useYn: YesNo;
|
||||
useYn: string;
|
||||
}
|
||||
|
||||
1502
backend-api/src/database/seeds/create-initial-data.ts
Normal file
1502
backend-api/src/database/seeds/create-initial-data.ts
Normal file
File diff suppressed because it is too large
Load Diff
@@ -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';
|
||||
|
||||
@@ -6,10 +6,11 @@ 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, Widget])],
|
||||
controllers: [DatasetController],
|
||||
providers: [DatasetService, ConnectionService],
|
||||
providers: [DatasetService, ConnectionService, JwtService],
|
||||
})
|
||||
export class DatasetModule {}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
16
backend-api/src/login/dto/create-login.dto.ts
Normal file
16
backend-api/src/login/dto/create-login.dto.ts
Normal 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;
|
||||
}
|
||||
4
backend-api/src/login/dto/login-user.dto.ts
Normal file
4
backend-api/src/login/dto/login-user.dto.ts
Normal 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) {}
|
||||
4
backend-api/src/login/dto/update-login.dto.ts
Normal file
4
backend-api/src/login/dto/update-login.dto.ts
Normal file
@@ -0,0 +1,4 @@
|
||||
import { PartialType } from '@nestjs/swagger';
|
||||
import { CreateLoginDto } from './create-login.dto';
|
||||
|
||||
export class UpdateLoginDto extends PartialType(CreateLoginDto) {}
|
||||
1
backend-api/src/login/entities/login.entity.ts
Normal file
1
backend-api/src/login/entities/login.entity.ts
Normal file
@@ -0,0 +1 @@
|
||||
export class Login {}
|
||||
20
backend-api/src/login/login.controller.spec.ts
Normal file
20
backend-api/src/login/login.controller.spec.ts
Normal 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();
|
||||
});
|
||||
});
|
||||
68
backend-api/src/login/login.controller.ts
Normal file
68
backend-api/src/login/login.controller.ts
Normal 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' });
|
||||
}
|
||||
}
|
||||
22
backend-api/src/login/login.module.ts
Normal file
22
backend-api/src/login/login.module.ts
Normal 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');
|
||||
}
|
||||
}
|
||||
18
backend-api/src/login/login.service.spec.ts
Normal file
18
backend-api/src/login/login.service.spec.ts
Normal 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();
|
||||
});
|
||||
});
|
||||
56
backend-api/src/login/login.service.ts
Normal file
56
backend-api/src/login/login.service.ts
Normal 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);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
35
backend-api/src/middleware/entities/login-history.entity.ts
Normal file
35
backend-api/src/middleware/entities/login-history.entity.ts
Normal 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;
|
||||
}
|
||||
@@ -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 어떤거?
|
||||
}
|
||||
}
|
||||
@@ -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 어떤거?
|
||||
}
|
||||
}
|
||||
@@ -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 어떤거?
|
||||
}
|
||||
}
|
||||
13
backend-api/src/share-url/dto/create-share-url.dto.ts
Normal file
13
backend-api/src/share-url/dto/create-share-url.dto.ts
Normal 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;
|
||||
}
|
||||
4
backend-api/src/share-url/dto/update-share-url.dto.ts
Normal file
4
backend-api/src/share-url/dto/update-share-url.dto.ts
Normal file
@@ -0,0 +1,4 @@
|
||||
import { PartialType } from '@nestjs/swagger';
|
||||
import { ShareUrlOnDto } from './create-share-url.dto';
|
||||
|
||||
export class UpdateShareUrlDto extends PartialType(ShareUrlOnDto) {}
|
||||
1
backend-api/src/share-url/entities/share-url.entity.ts
Normal file
1
backend-api/src/share-url/entities/share-url.entity.ts
Normal file
@@ -0,0 +1 @@
|
||||
export class ShareUrl {}
|
||||
20
backend-api/src/share-url/share-url.controller.spec.ts
Normal file
20
backend-api/src/share-url/share-url.controller.spec.ts
Normal 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();
|
||||
});
|
||||
});
|
||||
38
backend-api/src/share-url/share-url.controller.ts
Normal file
38
backend-api/src/share-url/share-url.controller.ts
Normal 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);
|
||||
}
|
||||
}
|
||||
43
backend-api/src/share-url/share-url.module.ts
Normal file
43
backend-api/src/share-url/share-url.module.ts
Normal 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');
|
||||
}
|
||||
}
|
||||
18
backend-api/src/share-url/share-url.service.spec.ts
Normal file
18
backend-api/src/share-url/share-url.service.spec.ts
Normal 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();
|
||||
});
|
||||
});
|
||||
84
backend-api/src/share-url/share-url.service.ts
Normal file
84
backend-api/src/share-url/share-url.service.ts
Normal 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로 접속시 대시보드의 정보를 받아오는 코드
|
||||
}
|
||||
@@ -19,7 +19,7 @@ export class Template extends BaseEntity {
|
||||
// layout: string
|
||||
|
||||
@Column({length: 1, default: YesNo.YES, comment: '사용여부'})
|
||||
useYn: YesNo
|
||||
useYn: string
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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) {}
|
||||
|
||||
@@ -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 {}
|
||||
|
||||
@@ -239,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
|
||||
|
||||
21
backend-api/src/user/dto/create-user.dto.ts
Normal file
21
backend-api/src/user/dto/create-user.dto.ts
Normal 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;
|
||||
}
|
||||
12
backend-api/src/user/dto/update-user.dto.ts
Normal file
12
backend-api/src/user/dto/update-user.dto.ts
Normal 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;
|
||||
}
|
||||
|
||||
|
||||
24
backend-api/src/user/entities/user-mapping.entity.ts
Normal file
24
backend-api/src/user/entities/user-mapping.entity.ts
Normal 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;
|
||||
}
|
||||
40
backend-api/src/user/entities/user.entity.ts
Normal file
40
backend-api/src/user/entities/user.entity.ts
Normal 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;
|
||||
}
|
||||
20
backend-api/src/user/user.controller.spec.ts
Normal file
20
backend-api/src/user/user.controller.spec.ts
Normal 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();
|
||||
});
|
||||
});
|
||||
63
backend-api/src/user/user.controller.ts
Normal file
63
backend-api/src/user/user.controller.ts
Normal 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);
|
||||
}
|
||||
}
|
||||
26
backend-api/src/user/user.module.ts
Normal file
26
backend-api/src/user/user.module.ts
Normal 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');
|
||||
}
|
||||
}
|
||||
18
backend-api/src/user/user.service.spec.ts
Normal file
18
backend-api/src/user/user.service.spec.ts
Normal 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();
|
||||
});
|
||||
});
|
||||
80
backend-api/src/user/user.service.ts
Normal file
80
backend-api/src/user/user.service.ts
Normal file
@@ -0,0 +1,80 @@
|
||||
import { HttpException, HttpStatus, Injectable, UnauthorizedException } from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { AuthService } from '../auth/auth.service.js';
|
||||
import { Repository } from 'typeorm';
|
||||
import { UpdateUserDto } from './dto/update-user.dto';
|
||||
import { User } from './entities/user.entity';
|
||||
import { UserMapping } from './entities/user-mapping.entity.js';
|
||||
const crypto = require('crypto');
|
||||
|
||||
@Injectable()
|
||||
export class UserService {
|
||||
constructor(
|
||||
@InjectRepository(User) private readonly userRepository: Repository<User>,
|
||||
@InjectRepository(UserMapping) private readonly userMappingRepository: Repository<UserMapping>,
|
||||
private authService: AuthService,
|
||||
) {}
|
||||
|
||||
async findOne(userId: number) {
|
||||
const userData = await this.userRepository.findOne({
|
||||
where: { id: userId },
|
||||
});
|
||||
if (!userData) {
|
||||
return 'Bad Request';
|
||||
} else {
|
||||
delete userData.password;
|
||||
return { data: userData, message: 'success' };
|
||||
}
|
||||
}
|
||||
|
||||
async updateUserInfo(userId: string, updateUserDto: UpdateUserDto) {
|
||||
|
||||
const hashPassword = crypto.createHash('sha512').update(String(updateUserDto.password)).digest('hex');
|
||||
const findUser = await this.authService.checkAccess(userId, hashPassword);
|
||||
if (!findUser) {
|
||||
throw new HttpException('not exist user', HttpStatus.CONFLICT);
|
||||
} else {
|
||||
|
||||
const newHashPassword = crypto.createHash('sha512').update(String(updateUserDto.new_password)).digest('hex');
|
||||
findUser.email = String(updateUserDto.email);
|
||||
findUser.password = newHashPassword;
|
||||
await this.userRepository.save(findUser);
|
||||
return `success`;
|
||||
}
|
||||
}
|
||||
|
||||
async deleteUser(userId: string, password: string) {
|
||||
const findUser = await this.authService.checkAccess(userId, password);
|
||||
if (!findUser) {
|
||||
return 'Unauthorized';
|
||||
} else {
|
||||
await this.userRepository.delete(findUser.id);
|
||||
return `success`;
|
||||
}
|
||||
}
|
||||
|
||||
async reissuanceAccessToken(userId: string) {
|
||||
const payload = await this.userRepository.findOne({ where: { userId: userId } });
|
||||
return await this.authService.generateAccessToken(payload);
|
||||
}
|
||||
// AccessToken 만료시 재발급 코드
|
||||
|
||||
async saveDashboard(dashboardId: number, userInfoId: number) {
|
||||
const saveObj = {
|
||||
dashboardId: dashboardId,
|
||||
userInfoId: userInfoId,
|
||||
};
|
||||
await this.userMappingRepository.save(saveObj);
|
||||
}
|
||||
// mapping table 대시보드id, 유저id 저장
|
||||
|
||||
async findDashboardId(id: number) {
|
||||
const findDashboard = await this.userMappingRepository
|
||||
.createQueryBuilder('user_mapping')
|
||||
.select('dashboardId')
|
||||
.where('user_mapping.userInfoId = :userInfoId', { userInfoId: id })
|
||||
.getRawMany();
|
||||
return findDashboard;
|
||||
}
|
||||
// 대시보드id찾는 코드
|
||||
}
|
||||
13
backend-api/src/utils/authDto.ts
Normal file
13
backend-api/src/utils/authDto.ts
Normal 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;
|
||||
}
|
||||
29
backend-api/src/utils/swagger-APIhelper.ts
Normal file
29
backend-api/src/utils/swagger-APIhelper.ts
Normal file
@@ -0,0 +1,29 @@
|
||||
import { OpenAPIObject } from '@nestjs/swagger';
|
||||
import { PathsObject } from '@nestjs/swagger/dist/interfaces/open-api-spec.interface';
|
||||
|
||||
const arrayIntersect = (array1: string[], array2: string[]): string[] =>
|
||||
array1.filter(item => array2.includes(item));
|
||||
|
||||
export const filterDocumentsPathsByTags = (publicDocument: OpenAPIObject): PathsObject => {
|
||||
const result: PathsObject = {};
|
||||
|
||||
const tags = publicDocument.tags.map(({ name }) => name); // 모든 tage의 이름
|
||||
for (const path of Object.keys(publicDocument.paths)) {
|
||||
const pathMethods = {};
|
||||
|
||||
for (const method of Object.keys(publicDocument.paths[path])) {
|
||||
const endpointTags = publicDocument.paths[path][method].tags; //addTag로 경로 설정한 테그이름
|
||||
console.log(publicDocument.components);
|
||||
if (!Array.isArray(endpointTags)) {
|
||||
continue;
|
||||
}
|
||||
if (arrayIntersect(tags, endpointTags).length > 0) {
|
||||
pathMethods[method] = publicDocument.paths[path][method]; // 모든 tag의 이름과 경로 설정한 테그이름이 같은것.
|
||||
}
|
||||
}
|
||||
|
||||
result[path] = pathMethods;
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
40
backend-api/src/utils/swagger.ts
Normal file
40
backend-api/src/utils/swagger.ts
Normal file
@@ -0,0 +1,40 @@
|
||||
import { INestApplication } from '@nestjs/common';
|
||||
import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger';
|
||||
import { filterDocumentsPathsByTags } from './swagger-APIhelper';
|
||||
import { filterDocumentsDtoPathsByTags } from './swagger/Dtohelper';
|
||||
import * as fs from 'fs';
|
||||
|
||||
/**
|
||||
* Swagger 세팅
|
||||
*
|
||||
* @param {INestApplication} app
|
||||
*/
|
||||
export function setupSwagger(app: INestApplication): void {
|
||||
const options = new DocumentBuilder()
|
||||
.setTitle('NestJS Study API Docs')
|
||||
.setDescription('NestJS Study API description')
|
||||
.setVersion('1.0.0')
|
||||
.addBearerAuth(
|
||||
{
|
||||
type: 'http',
|
||||
scheme: 'bearer',
|
||||
bearerFormat: 'JWT',
|
||||
description: 'Enter jwt token',
|
||||
in: 'header',
|
||||
},
|
||||
'AccessKey',
|
||||
)
|
||||
.addTag('유저 API')
|
||||
.addTag('url공유화 API')
|
||||
.addTag('로그인 관련 API')
|
||||
.addTag('dashboard')
|
||||
.build();
|
||||
|
||||
const document = SwaggerModule.createDocument(app, options);
|
||||
document.paths = filterDocumentsPathsByTags(document);
|
||||
// document.paths = filterDocumentsDtoPathsByTags(document);
|
||||
fs.writeFileSync('./swagger-spec.json', JSON.stringify(document));
|
||||
SwaggerModule.setup('api-docs', app, document, {
|
||||
swaggerOptions: { defaultModelsExpandDepth: -1 },
|
||||
});
|
||||
}
|
||||
30
backend-api/src/utils/swagger/Dtohelper.ts
Normal file
30
backend-api/src/utils/swagger/Dtohelper.ts
Normal file
@@ -0,0 +1,30 @@
|
||||
import { OpenAPIObject } from '@nestjs/swagger';
|
||||
import { ComponentsObject } from '@nestjs/swagger/dist/interfaces/open-api-spec.interface';
|
||||
|
||||
const arrayIntersect = (array1: string[], array2: string[]): string[] => array1.filter((item) => array2.includes(item));
|
||||
|
||||
export const filterDocumentsDtoPathsByTags = (publicDocument: OpenAPIObject): ComponentsObject => {
|
||||
const result: ComponentsObject = {};
|
||||
|
||||
const tags = publicDocument.tags.map(({ name }) => name); // 모든 tage의 이름
|
||||
console.log(tags)
|
||||
for (const path of Object.keys(publicDocument.paths)) {
|
||||
const pathMethods = {};
|
||||
|
||||
for (const method of Object.keys(publicDocument.paths[path])) {
|
||||
const endpointTags = publicDocument.paths[path][method].tags; //addTag로 경로 설정한 테그이름
|
||||
|
||||
if (!Array.isArray(endpointTags)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (arrayIntersect(tags, endpointTags).length > 0) {
|
||||
pathMethods[method] = publicDocument.paths[path][method]; // 모든 tag의 이름과 경로 설정한 테그이름이 같은것.
|
||||
}
|
||||
}
|
||||
console.log(result)
|
||||
result[path] = pathMethods;
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
@@ -37,5 +37,5 @@ export class CreateWidgetDto {
|
||||
|
||||
@IsString()
|
||||
@IsOptional()
|
||||
delYn: YesNo;
|
||||
delYn: string;
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ export class Widget extends BaseEntity {
|
||||
@Column({ comment: '컴포넌트 ID' })
|
||||
componentId: number;
|
||||
|
||||
@Column({ comment: '데이터셋 구분(데이터셋, 위젯 뷰)', default: DatasetType.TABLE })
|
||||
@Column({ length: 255, comment: '데이터셋 구분(데이터셋, 위젯 뷰)', default: DatasetType.TABLE })
|
||||
datasetType: DatasetType;
|
||||
|
||||
@Column({ comment: '데이터셋 ID' })
|
||||
@@ -29,22 +29,22 @@ export class Widget extends BaseEntity {
|
||||
option: string;
|
||||
|
||||
@Column({ length: 1, default: YesNo.NO, comment: '삭제여부' })
|
||||
delYn: YesNo;
|
||||
delYn: string;
|
||||
|
||||
@ManyToMany(type => Dashboard)
|
||||
@JoinTable({
|
||||
name: 'dashboard_widget',
|
||||
// joinColumn: {
|
||||
// name: 'widgetId',
|
||||
// referencedColumnName: 'id'
|
||||
// },
|
||||
inverseJoinColumn: {
|
||||
name: 'dashboardId',
|
||||
referencedColumnName: 'id',
|
||||
},
|
||||
})
|
||||
databases: Dashboard[];
|
||||
|
||||
@ManyToOne(type => Component, component => component)
|
||||
component!: Component;
|
||||
// @ManyToMany(type => Dashboard)
|
||||
// @JoinTable({
|
||||
// name: 'dashboard_widget',
|
||||
// // joinColumn: {
|
||||
// // name: 'widgetId',
|
||||
// // referencedColumnName: 'id'
|
||||
// // },
|
||||
// inverseJoinColumn: {
|
||||
// name: 'dashboardId',
|
||||
// referencedColumnName: 'id',
|
||||
// },
|
||||
// })
|
||||
// databases: Dashboard[];
|
||||
//
|
||||
// @ManyToOne(type => Component, component => component)
|
||||
// component!: Component;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import {Controller, Get, Post, Body, Patch, Param, Delete, Put} from '@nestjs/common';
|
||||
import { Controller, Get, Post, Body, Param, Delete, Put, UseGuards } from '@nestjs/common';
|
||||
import { WidgetService } from './widget.service';
|
||||
import { CreateWidgetDto } from './dto/create-widget.dto';
|
||||
import { UpdateWidgetDto } from './dto/update-widget.dto';
|
||||
import { JwtAuthGuard } from 'src/auth/guards/jwt-auth.guard';
|
||||
|
||||
@UseGuards(JwtAuthGuard)
|
||||
@Controller('widget')
|
||||
export class WidgetController {
|
||||
constructor(private readonly widgetService: WidgetService) {}
|
||||
|
||||
@@ -7,10 +7,11 @@ import { Component } from '../component/entities/component.entity';
|
||||
import { TableQueryService } from './tabel-query/table-query.service';
|
||||
import { TableQuery } from './tabel-query/entity/table-query.entity';
|
||||
import { Database } from '../database/entities/database.entity';
|
||||
import { JwtService } from '@nestjs/jwt';
|
||||
|
||||
@Module({
|
||||
imports: [TypeOrmModule.forFeature([Widget, Component, TableQuery, Database])],
|
||||
controllers: [WidgetController],
|
||||
providers: [WidgetService, TableQueryService],
|
||||
providers: [WidgetService, TableQueryService, JwtService],
|
||||
})
|
||||
export class WidgetModule {}
|
||||
|
||||
1
backend-api/swagger-spec.json
Normal file
1
backend-api/swagger-spec.json
Normal file
File diff suppressed because one or more lines are too long
@@ -9,7 +9,7 @@ import * as widgetTestoption from './widgetTestOption.json';
|
||||
import { Widget } from '../../src/widget/entities/widget.entity';
|
||||
import { Component } from '../../src/component/entities/component.entity';
|
||||
import { TableQueryService } from '../../src/widget/tabel-query/table-query.service';
|
||||
import { Connection, DataSource, getConnection, getRepository } from 'typeorm';
|
||||
import { Connection, DataSource } from 'typeorm';
|
||||
import { ResponseStatus } from '../../src/common/enum/response-status.enum';
|
||||
import { DatasetType } from '../../src/common/enum/dataset-type.enum';
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
"description": "Score Board",
|
||||
"databaseId": 113,
|
||||
"componentId": 12,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 27,
|
||||
"option": {
|
||||
"header": {
|
||||
@@ -27,7 +27,7 @@
|
||||
"description": "Data Grid",
|
||||
"databaseId": 114,
|
||||
"componentId": 13,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"columns": [
|
||||
@@ -57,7 +57,7 @@
|
||||
"description": "Line Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 1,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -92,7 +92,7 @@
|
||||
"description": "Area Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 2,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -127,7 +127,7 @@
|
||||
"description": "Bar Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 3,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -162,7 +162,7 @@
|
||||
"description": "Column Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 4,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -197,7 +197,7 @@
|
||||
"description": "Mixed Line and Bar Chart",
|
||||
"databaseId": 114,
|
||||
"componentId": 5,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -231,7 +231,7 @@
|
||||
"description": "Stacked Line Chart",
|
||||
"databaseId": 113,
|
||||
"componentId": 14,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 30,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -272,7 +272,7 @@
|
||||
"description": "Stacked Area Chart",
|
||||
"databaseId": 113,
|
||||
"componentId": 15,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 30,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -313,7 +313,7 @@
|
||||
"description": "Stacked Column Chart",
|
||||
"databaseId": 113,
|
||||
"componentId": 16,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 30,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -354,7 +354,7 @@
|
||||
"description": "Stacked Bar Chart",
|
||||
"databaseId": 113,
|
||||
"componentId": 17,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 30,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -395,7 +395,7 @@
|
||||
"description": "Mixed Line and Stacked-Bar Chart",
|
||||
"databaseId": 113,
|
||||
"componentId": 43,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 30,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -435,7 +435,7 @@
|
||||
"description": "Pie Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 6,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -453,7 +453,7 @@
|
||||
"description": "Donut Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 11,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 29,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -523,7 +523,7 @@
|
||||
"description": "Nightingale Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 7,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 29,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -593,7 +593,7 @@
|
||||
"description": "Radar Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 9,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -623,7 +623,7 @@
|
||||
"description": "Scatter Chart",
|
||||
"databaseId": 114,
|
||||
"componentId": 10,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -658,7 +658,7 @@
|
||||
"description": "Bubble Chart",
|
||||
"databaseId": 113,
|
||||
"componentId": 8,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 30,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -685,7 +685,7 @@
|
||||
"description": "Treemap Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 19,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -702,7 +702,7 @@
|
||||
"description": "Sunburst Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 22,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -719,7 +719,7 @@
|
||||
"description": "Heatmap Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 23,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"color": ["#2870c4", "#4ecef6", "#ffd43b", "#fa5a5a"],
|
||||
@@ -734,7 +734,7 @@
|
||||
"description": "Candlestick Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 20,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 37,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -767,7 +767,7 @@
|
||||
"description": "Gauge Chart",
|
||||
"databaseId": 88,
|
||||
"componentId": 21,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 31,
|
||||
"option": {
|
||||
"color": "#6aa7eb",
|
||||
@@ -781,7 +781,7 @@
|
||||
"description": "Funnel Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 24,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -799,7 +799,7 @@
|
||||
"description": "Polar Bar Chart",
|
||||
"databaseId": 88,
|
||||
"componentId": 31,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 31,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -830,7 +830,7 @@
|
||||
"description": "Polar Stacked Bar Chart",
|
||||
"databaseId": 88,
|
||||
"componentId": 33,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 31,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -861,7 +861,7 @@
|
||||
"description": "3D Line Chart",
|
||||
"databaseId": 113,
|
||||
"componentId": 26,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 27,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -885,7 +885,7 @@
|
||||
"description": "3D Bar Chart",
|
||||
"databaseId": 113,
|
||||
"componentId": 25,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 30,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -912,7 +912,7 @@
|
||||
"description": "3D Scatter Chart",
|
||||
"databaseId": 113,
|
||||
"componentId": 27,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 30,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -940,7 +940,7 @@
|
||||
"description": "3D Bubble Chart",
|
||||
"databaseId": 108,
|
||||
"componentId": 28,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 26,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -968,7 +968,7 @@
|
||||
"description": "Mixed Line and Pie Chart",
|
||||
"databaseId": 83,
|
||||
"componentId": 32,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 25,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1007,7 +1007,7 @@
|
||||
"description": "Mixed Area and Pie Chart",
|
||||
"databaseId": 83,
|
||||
"componentId": 34,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 25,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1046,7 +1046,7 @@
|
||||
"description": "Mixed Bar and Pie Chart",
|
||||
"databaseId": 83,
|
||||
"componentId": 35,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 25,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1085,7 +1085,7 @@
|
||||
"description": "Mixed Column and Pie Chart",
|
||||
"databaseId": 83,
|
||||
"componentId": 36,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 25,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1124,7 +1124,7 @@
|
||||
"description": "Mixed Stacked-Bar and Pie Chart",
|
||||
"databaseId": 88,
|
||||
"componentId": 37,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 31,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1169,7 +1169,7 @@
|
||||
"description": "Mixed Stacked-Column and Pie Chart",
|
||||
"databaseId": 88,
|
||||
"componentId": 38,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 31,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1214,7 +1214,7 @@
|
||||
"description": "Mixed Stacked-Line and Pie Chart",
|
||||
"databaseId": 88,
|
||||
"componentId": 39,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 31,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1259,7 +1259,7 @@
|
||||
"description": "Mixed Stacked-Area and Pie Chart",
|
||||
"databaseId": 88,
|
||||
"componentId": 40,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 31,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1304,7 +1304,7 @@
|
||||
"description": "Mixed Donut and Pie Chart",
|
||||
"databaseId": 83,
|
||||
"componentId": 41,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 25,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -1349,7 +1349,7 @@
|
||||
"description": "Mixed Nightingale and Pie Chart",
|
||||
"databaseId": 83,
|
||||
"componentId": 42,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 25,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -1394,7 +1394,7 @@
|
||||
"description": "Line Chart and Score Board",
|
||||
"databaseId": 114,
|
||||
"componentId": 44,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1438,7 +1438,7 @@
|
||||
"description": "Area Chart and Score Board",
|
||||
"databaseId": 114,
|
||||
"componentId": 45,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1482,7 +1482,7 @@
|
||||
"description": "Bar Chart and Score Board",
|
||||
"databaseId": 114,
|
||||
"componentId": 46,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1526,7 +1526,7 @@
|
||||
"description": "Column Chart and Score Board",
|
||||
"databaseId": 114,
|
||||
"componentId": 47,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1570,7 +1570,7 @@
|
||||
"description": "Stacked Line Chart and Score Board",
|
||||
"databaseId": 114,
|
||||
"componentId": 48,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1614,7 +1614,7 @@
|
||||
"description": "Stacked Area Chart and Score Board",
|
||||
"databaseId": 114,
|
||||
"componentId": 49,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1658,7 +1658,7 @@
|
||||
"description": "Stacked Bar Chart and Score Board",
|
||||
"databaseId": 114,
|
||||
"componentId": 50,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1702,7 +1702,7 @@
|
||||
"description": "Stacked Column Chart and Score Board",
|
||||
"databaseId": 114,
|
||||
"componentId": 51,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 28,
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1746,7 +1746,7 @@
|
||||
"description": "Donut Chart and Score Board",
|
||||
"databaseId": 113,
|
||||
"componentId": 52,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 27,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -1776,7 +1776,7 @@
|
||||
"description": "Nightingale Chart and Score Board",
|
||||
"databaseId": 113,
|
||||
"componentId": 53,
|
||||
"datasetType": "DATASET",
|
||||
"datasetType": DatasetType.DATASET,
|
||||
"datasetId": 27,
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -1807,7 +1807,7 @@
|
||||
"databaseId": 119,
|
||||
"componentId": 12,
|
||||
"datasetId": 1,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "SportsCards",
|
||||
"option": {
|
||||
"header": {
|
||||
@@ -1829,7 +1829,7 @@
|
||||
"databaseId": 108,
|
||||
"componentId": 13,
|
||||
"datasetId": 2,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "TravelMode",
|
||||
"option": {
|
||||
"columns": [
|
||||
@@ -1860,7 +1860,7 @@
|
||||
"databaseId": 119,
|
||||
"componentId": 1,
|
||||
"datasetId": 3,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "memberInfo",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1906,7 +1906,7 @@
|
||||
"databaseId": 119,
|
||||
"componentId": 2,
|
||||
"datasetId": 4,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "memberInfo",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1952,7 +1952,7 @@
|
||||
"databaseId": 119,
|
||||
"componentId": 3,
|
||||
"datasetId": 5,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "memberInfo",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -1998,7 +1998,7 @@
|
||||
"databaseId": 119,
|
||||
"componentId": 4,
|
||||
"datasetId": 6,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "memberInfo",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2044,7 +2044,7 @@
|
||||
"databaseId": 118,
|
||||
"componentId": 5,
|
||||
"datasetId": 7,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "french_fries",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2078,7 +2078,7 @@
|
||||
"databaseId": 119,
|
||||
"componentId": 14,
|
||||
"datasetId": 8,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "memberInfo",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2124,7 +2124,7 @@
|
||||
"databaseId": 119,
|
||||
"componentId": 15,
|
||||
"datasetId": 9,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "memberInfo",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2170,7 +2170,7 @@
|
||||
"databaseId": 119,
|
||||
"componentId": 16,
|
||||
"datasetId": 10,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "memberInfo",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2216,7 +2216,7 @@
|
||||
"databaseId": 119,
|
||||
"componentId": 17,
|
||||
"datasetId": 11,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "memberInfo",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2262,7 +2262,7 @@
|
||||
"databaseId": 118,
|
||||
"componentId": 43,
|
||||
"datasetId": 12,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "french_fries",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2296,7 +2296,7 @@
|
||||
"databaseId": 118,
|
||||
"componentId": 6,
|
||||
"datasetId": 13,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "confirmation",
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -2366,7 +2366,7 @@
|
||||
"databaseId": 108,
|
||||
"componentId": 11,
|
||||
"datasetId": 14,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "TravelMode",
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -2386,7 +2386,7 @@
|
||||
"databaseId": 108,
|
||||
"componentId": 7,
|
||||
"datasetId": 15,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "TravelMode",
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -2406,7 +2406,7 @@
|
||||
"databaseId": 108,
|
||||
"componentId": 9,
|
||||
"datasetId": 16,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "TravelMode",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2437,7 +2437,7 @@
|
||||
"databaseId": 113,
|
||||
"componentId": 10,
|
||||
"datasetId": 17,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "crime",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2480,7 +2480,7 @@
|
||||
"databaseId": 108,
|
||||
"componentId": 8,
|
||||
"datasetId": 18,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "CPS1985",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2509,7 +2509,7 @@
|
||||
"databaseId": 137,
|
||||
"componentId": 19,
|
||||
"datasetId": 19,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "boston",
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -2527,7 +2527,7 @@
|
||||
"databaseId": 139,
|
||||
"componentId": 22,
|
||||
"datasetId": 20,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "SEATBELTS",
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -2545,7 +2545,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 23,
|
||||
"datasetId": 21,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NCBIRTHS",
|
||||
"option": {
|
||||
"color": ["#2870c4", "#4ecef6", "#ffd43b", "#fa5a5a"],
|
||||
@@ -2562,7 +2562,7 @@
|
||||
"databaseId": 108,
|
||||
"componentId": 20,
|
||||
"datasetId": 22,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "candlestickData",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2598,7 +2598,7 @@
|
||||
"databaseId": 139,
|
||||
"componentId": 21,
|
||||
"datasetId": 23,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "SEATBELTS",
|
||||
"option": {
|
||||
"color": "#6aa7eb",
|
||||
@@ -2613,7 +2613,7 @@
|
||||
"databaseId": 113,
|
||||
"componentId": 24,
|
||||
"datasetId": 24,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "employee",
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -2631,7 +2631,7 @@
|
||||
"databaseId": 118,
|
||||
"componentId": 31,
|
||||
"datasetId": 25,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "french_fries",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2662,7 +2662,7 @@
|
||||
"databaseId": 118,
|
||||
"componentId": 33,
|
||||
"datasetId": 26,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "french_fries",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2693,7 +2693,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 26,
|
||||
"datasetId": 27,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NYCFLIGHTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2723,7 +2723,7 @@
|
||||
"databaseId": 113,
|
||||
"componentId": 25,
|
||||
"datasetId": 28,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "crime",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2750,7 +2750,7 @@
|
||||
"databaseId": 114,
|
||||
"componentId": 27,
|
||||
"datasetId": 29,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "auto",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2779,7 +2779,7 @@
|
||||
"databaseId": 88,
|
||||
"componentId": 28,
|
||||
"datasetId": 30,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "fishing",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2809,7 +2809,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 32,
|
||||
"datasetId": 31,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NYCFLIGHTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2862,7 +2862,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 34,
|
||||
"datasetId": 32,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NYCFLIGHTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2915,7 +2915,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 35,
|
||||
"datasetId": 33,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NYCFLIGHTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -2968,7 +2968,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 36,
|
||||
"datasetId": 34,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NYCFLIGHTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3021,7 +3021,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 37,
|
||||
"datasetId": 35,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NYCFLIGHTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3074,7 +3074,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 38,
|
||||
"datasetId": 36,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NYCFLIGHTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3127,7 +3127,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 39,
|
||||
"datasetId": 37,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NYCFLIGHTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3180,7 +3180,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 40,
|
||||
"datasetId": 38,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NYCFLIGHTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3233,7 +3233,7 @@
|
||||
"databaseId": 139,
|
||||
"componentId": 41,
|
||||
"datasetId": 39,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "TINTING",
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -3290,7 +3290,7 @@
|
||||
"databaseId": 139,
|
||||
"componentId": 42,
|
||||
"datasetId": 40,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "TINTING",
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -3347,7 +3347,7 @@
|
||||
"databaseId": 118,
|
||||
"componentId": 44,
|
||||
"datasetId": 41,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "french_fries",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3385,7 +3385,7 @@
|
||||
"databaseId": 118,
|
||||
"componentId": 45,
|
||||
"datasetId": 42,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "french_fries",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3423,7 +3423,7 @@
|
||||
"databaseId": 118,
|
||||
"componentId": 46,
|
||||
"datasetId": 43,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "french_fries",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3461,7 +3461,7 @@
|
||||
"databaseId": 118,
|
||||
"componentId": 47,
|
||||
"datasetId": 44,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "french_fries",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3499,7 +3499,7 @@
|
||||
"databaseId": 139,
|
||||
"componentId": 48,
|
||||
"datasetId": 45,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "SEATBELTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3542,7 +3542,7 @@
|
||||
"databaseId": 139,
|
||||
"componentId": 49,
|
||||
"datasetId": 46,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "SEATBELTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3585,7 +3585,7 @@
|
||||
"databaseId": 139,
|
||||
"componentId": 50,
|
||||
"datasetId": 47,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "SEATBELTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3628,7 +3628,7 @@
|
||||
"databaseId": 139,
|
||||
"componentId": 51,
|
||||
"datasetId": 48,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "SEATBELTS",
|
||||
"option": {
|
||||
"series": [
|
||||
@@ -3671,7 +3671,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 52,
|
||||
"datasetId": 49,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NCBIRTHS",
|
||||
"option": {
|
||||
"series": {
|
||||
@@ -3702,7 +3702,7 @@
|
||||
"databaseId": 138,
|
||||
"componentId": 53,
|
||||
"datasetId": 50,
|
||||
"datasetType": "TABLE",
|
||||
"datasetType": DatasetType.TABLE,
|
||||
"tableName": "NCBIRTHS",
|
||||
"option": {
|
||||
"series": {
|
||||
|
||||
@@ -19,7 +19,7 @@ export function getTestMysqlModule(): DynamicModule {
|
||||
autoLoadEntities: true,
|
||||
entities: [entityUrl],
|
||||
synchronize: false,
|
||||
logging: process.env.NODE_ENV == 'dev',
|
||||
logging: true,
|
||||
retryAttempts: 1,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
"incremental": true,
|
||||
"resolveJsonModule": true,
|
||||
"esModuleInterop": true,
|
||||
"allowSyntheticDefaultImports": true
|
||||
"allowSyntheticDefaultImports": true,
|
||||
},
|
||||
"exclude": ["node_modules", "dist"]
|
||||
}
|
||||
|
||||
@@ -1,5 +1,2 @@
|
||||
REACT_APP_MODE=prod
|
||||
REACT_APP_API_URL='http://localhost:4000'
|
||||
REACT_APP_ID=vanillameta
|
||||
REACT_APP_PWD=vanillameta
|
||||
REACT_APP_TOKEN=TOKEN1VB2GS3SWJYDS
|
||||
REACT_APP_API_URL='http://localhost:4000'
|
||||
@@ -1,5 +1,2 @@
|
||||
REACT_APP_MODE=dev
|
||||
REACT_APP_API_URL='https://vanillameta-api.vanillabrain.com'
|
||||
REACT_APP_ID=vanillameta
|
||||
REACT_APP_PWD=vanillameta
|
||||
REACT_APP_TOKEN=TOKEN1VB2GS3SWJYDS
|
||||
REACT_APP_API_URL='https://vanillameta-api.vanillabrain.com'
|
||||
2
frontend-web/.env.feature
Normal file
2
frontend-web/.env.feature
Normal file
@@ -0,0 +1,2 @@
|
||||
REACT_APP_MODE=dev
|
||||
REACT_APP_API_URL='https://vanillameta-dev-api.vanillabrain.com'
|
||||
@@ -1,5 +1,2 @@
|
||||
REACT_APP_MODE=local
|
||||
REACT_APP_API_URL='http://localhost:4000'
|
||||
REACT_APP_ID=vanillameta
|
||||
REACT_APP_PWD=vanillameta
|
||||
REACT_APP_TOKEN=TOKEN1VB2GS3SWJYDS
|
||||
REACT_APP_API_URL='http://localhost:4000'
|
||||
@@ -1,12 +0,0 @@
|
||||
module.exports = {
|
||||
"stories": [
|
||||
"../src/**/*.stories.mdx",
|
||||
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
||||
],
|
||||
"addons": [
|
||||
"@storybook/addon-links",
|
||||
"@storybook/addon-essentials",
|
||||
"@storybook/addon-interactions"
|
||||
],
|
||||
"framework": "@storybook/react"
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
export const parameters = {
|
||||
actions: { argTypesRegex: "^on[A-Z].*" },
|
||||
controls: {
|
||||
matchers: {
|
||||
color: /(background|color)$/i,
|
||||
date: /Date$/,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -2,9 +2,8 @@
|
||||
<module type="WEB_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
</content>
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user