Compare commits
53 Commits
plan-histo
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 59b085dd34 | |||
|
3eaaa2ef10 | ||
|
|
4091525f61 | ||
| 67a8281aa1 | |||
|
|
4ac917649a | ||
| c83f839705 | |||
|
|
f319e022fe | ||
|
62d73fcbe3 | ||
|
|
0ecdc6db20 | ||
|
|
a229f0cd6d | ||
|
|
a72fb6b12c | ||
|
|
8ff51a6598 | ||
|
|
49d9c6acdd | ||
|
|
cf042413d6 | ||
|
954e0a751f | ||
|
|
52d4a384d9 | ||
|
|
2c77eb47a9 | ||
|
|
d1fb48f7fe | ||
|
|
a5d3beddb5 | ||
|
|
adaf44f2f7 | ||
|
|
f013ef54ee | ||
|
|
084fe15d38 | ||
|
|
13fce200bf | ||
|
|
4d5c2f8d28 | ||
|
|
ec1012b3a0 | ||
|
|
e16caff82f | ||
|
|
62f50cc9a6 | ||
|
|
1235484538 | ||
|
|
b2e5a16e7d | ||
|
|
69d05b7a78 | ||
|
|
34f85561c3 | ||
|
|
edda909c66 | ||
|
|
aedc0ea708 | ||
|
|
135deb56c6 | ||
|
|
6748309fbd | ||
|
|
f9fa6412ef | ||
|
|
26a54912cd | ||
|
|
df1d26f653 | ||
|
|
8b563d3e70 | ||
|
|
429c58befb | ||
|
|
31a85db790 | ||
|
|
b7424826ad | ||
|
|
6db69f95fb | ||
|
|
88899d9703 | ||
|
|
0d433c12ad | ||
|
|
64869bbd51 | ||
7fbf7e3fad
|
|||
|
|
80672b24d7 | ||
|
|
afd809a9ec | ||
|
|
78e63ce587 | ||
|
|
57cb77e643 | ||
|
|
b06a6ec07e | ||
|
|
b8ef87fc83 |
63
package-lock.json
generated
63
package-lock.json
generated
@ -4510,6 +4510,12 @@
|
|||||||
"to-regex-range": "^5.0.1"
|
"to-regex-range": "^5.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"fsevents": {
|
||||||
|
"version": "2.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
|
||||||
|
"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
"is-number": {
|
"is-number": {
|
||||||
"version": "7.0.0",
|
"version": "7.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
|
||||||
@ -5382,6 +5388,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"date-fns": {
|
||||||
|
"version": "2.16.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz",
|
||||||
|
"integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ=="
|
||||||
|
},
|
||||||
"debug": {
|
"debug": {
|
||||||
"version": "4.3.1",
|
"version": "4.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
|
||||||
@ -7295,10 +7306,14 @@
|
|||||||
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
|
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
|
||||||
},
|
},
|
||||||
"fsevents": {
|
"fsevents": {
|
||||||
"version": "2.1.2",
|
"version": "1.2.13",
|
||||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
|
||||||
"integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
|
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
|
||||||
"optional": true
|
"optional": true,
|
||||||
|
"requires": {
|
||||||
|
"bindings": "^1.5.0",
|
||||||
|
"nan": "^2.12.1"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"function-bind": {
|
"function-bind": {
|
||||||
"version": "1.1.1",
|
"version": "1.1.1",
|
||||||
@ -8627,18 +8642,6 @@
|
|||||||
"micromatch": "^3.1.10",
|
"micromatch": "^3.1.10",
|
||||||
"sane": "^4.0.3",
|
"sane": "^4.0.3",
|
||||||
"walker": "^1.0.7"
|
"walker": "^1.0.7"
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"fsevents": {
|
|
||||||
"version": "1.2.13",
|
|
||||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
|
|
||||||
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
|
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
|
||||||
"bindings": "^1.5.0",
|
|
||||||
"nan": "^2.12.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"jest-jasmine2": {
|
"jest-jasmine2": {
|
||||||
@ -12338,6 +12341,12 @@
|
|||||||
"pinkie-promise": "^2.0.0"
|
"pinkie-promise": "^2.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"fsevents": {
|
||||||
|
"version": "2.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
|
||||||
|
"integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
"path-exists": {
|
"path-exists": {
|
||||||
"version": "2.1.0",
|
"version": "2.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
|
||||||
@ -14890,16 +14899,6 @@
|
|||||||
"upath": "^1.1.1"
|
"upath": "^1.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"fsevents": {
|
|
||||||
"version": "1.2.13",
|
|
||||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
|
|
||||||
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
|
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
|
||||||
"bindings": "^1.5.0",
|
|
||||||
"nan": "^2.12.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"glob-parent": {
|
"glob-parent": {
|
||||||
"version": "3.1.0",
|
"version": "3.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
|
||||||
@ -15207,16 +15206,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"fsevents": {
|
|
||||||
"version": "1.2.13",
|
|
||||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
|
|
||||||
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
|
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
|
||||||
"bindings": "^1.5.0",
|
|
||||||
"nan": "^2.12.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"get-caller-file": {
|
"get-caller-file": {
|
||||||
"version": "1.0.3",
|
"version": "1.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
|
||||||
@ -15846,4 +15835,4 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
"@material-ui/icons": "^4.9.1",
|
"@material-ui/icons": "^4.9.1",
|
||||||
"@material-ui/lab": "^4.0.0-alpha.56",
|
"@material-ui/lab": "^4.0.0-alpha.56",
|
||||||
"axios": "^0.19.2",
|
"axios": "^0.19.2",
|
||||||
|
"date-fns": "^2.16.1",
|
||||||
"notistack": "^1.0.1",
|
"notistack": "^1.0.1",
|
||||||
"react": "16.9.0",
|
"react": "16.9.0",
|
||||||
"react-click-away-listener": "^1.4.3",
|
"react-click-away-listener": "^1.4.3",
|
||||||
@ -58,4 +59,4 @@
|
|||||||
"last 1 safari version"
|
"last 1 safari version"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
44
src/assets/information.svg
Normal file
44
src/assets/information.svg
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 330 330" style="enable-background:new 0 0 330 330;" xml:space="preserve">
|
||||||
|
<g>
|
||||||
|
<path d="M165,0C74.019,0,0,74.02,0,165.001C0,255.982,74.019,330,165,330s165-74.018,165-164.999C330,74.02,255.981,0,165,0z
|
||||||
|
M165,300c-74.44,0-135-60.56-135-134.999C30,90.562,90.56,30,165,30s135,60.562,135,135.001C300,239.44,239.439,300,165,300z"/>
|
||||||
|
<path d="M164.998,70c-11.026,0-19.996,8.976-19.996,20.009c0,11.023,8.97,19.991,19.996,19.991
|
||||||
|
c11.026,0,19.996-8.968,19.996-19.991C184.994,78.976,176.024,70,164.998,70z"/>
|
||||||
|
<path d="M165,140c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15c8.284,0,15-6.716,15-15v-90C180,146.716,173.284,140,165,140z
|
||||||
|
"/>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.1 KiB |
51
src/assets/logout.svg
Normal file
51
src/assets/logout.svg
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||||
|
<g>
|
||||||
|
<g>
|
||||||
|
<path d="M255.15,468.625H63.787c-11.737,0-21.262-9.526-21.262-21.262V64.638c0-11.737,9.526-21.262,21.262-21.262H255.15
|
||||||
|
c11.758,0,21.262-9.504,21.262-21.262S266.908,0.85,255.15,0.85H63.787C28.619,0.85,0,29.47,0,64.638v382.724
|
||||||
|
c0,35.168,28.619,63.787,63.787,63.787H255.15c11.758,0,21.262-9.504,21.262-21.262
|
||||||
|
C276.412,478.129,266.908,468.625,255.15,468.625z"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
<g>
|
||||||
|
<path d="M505.664,240.861L376.388,113.286c-8.335-8.25-21.815-8.143-30.065,0.213s-8.165,21.815,0.213,30.065l92.385,91.173
|
||||||
|
H191.362c-11.758,0-21.262,9.504-21.262,21.262c0,11.758,9.504,21.263,21.262,21.263h247.559l-92.385,91.173
|
||||||
|
c-8.377,8.25-8.441,21.709-0.213,30.065c4.167,4.21,9.653,6.336,15.139,6.336c5.401,0,10.801-2.041,14.926-6.124l129.276-127.575
|
||||||
|
c4.04-3.997,6.336-9.441,6.336-15.139C512,250.302,509.725,244.88,505.664,240.861z"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.3 KiB |
1
src/assets/switch.svg
Normal file
1
src/assets/switch.svg
Normal file
@ -0,0 +1 @@
|
|||||||
|
<svg id="bold" enable-background="new 0 0 24 24" height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path d="m23.25 15c-.414 0-.75-.336-.75-.75 0-2.895-2.355-5.25-5.25-5.25h-7.25v3.25c0 .66-.794.994-1.268.542l-5.5-5.25c-.148-.141-.232-.337-.232-.542s.084-.401.232-.542l5.5-5.25c.476-.454 1.268-.116 1.268.542v3.25h6.25c4.273 0 7.75 3.477 7.75 7.75v1.5c0 .414-.336.75-.75.75z"/><path d="m14 22.25v-3.25h-6.25c-4.273 0-7.75-3.477-7.75-7.75v-1.5c0-.414.336-.75.75-.75s.75.336.75.75c0 2.895 2.355 5.25 5.25 5.25h7.25v-3.25c0-.657.791-.998 1.268-.542l5.5 5.25c.148.141.232.337.232.542s-.084.401-.232.542l-5.5 5.25c-.477.454-1.268.116-1.268-.542z"/></svg>
|
||||||
|
After Width: | Height: | Size: 678 B |
38
src/assets/tick.svg
Normal file
38
src/assets/tick.svg
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 468.293 468.293" style="enable-background:new 0 0 468.293 468.293;" xml:space="preserve">
|
||||||
|
<circle style="fill:#44C4A1;" cx="234.146" cy="234.146" r="234.146"/>
|
||||||
|
<polygon style="fill:#EBF0F3;" points="357.52,110.145 191.995,275.67 110.773,194.451 69.534,235.684 191.995,358.148
|
||||||
|
398.759,151.378 "/>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 719 B |
1
src/assets/transfer.svg
Normal file
1
src/assets/transfer.svg
Normal file
@ -0,0 +1 @@
|
|||||||
|
<svg id="bold" enable-background="new 0 0 24 24" height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path d="m20.25 11c-.414 0-.75-.336-.75-.75v-4.5c0-.689-.561-1.25-1.25-1.25h-7.5c-.414 0-.75-.336-.75-.75s.336-.75.75-.75h7.5c1.517 0 2.75 1.233 2.75 2.75v4.5c0 .414-.336.75-.75.75z"/><path d="m20.25 11c-.192 0-.384-.073-.53-.22l-1.75-1.75c-.214-.214-.279-.537-.163-.817s.39-.463.693-.463h3.5c.303 0 .577.183.693.463s.052.603-.163.817l-1.75 1.75c-.146.147-.338.22-.53.22z"/><path d="m11.25 21h-5.5c-1.517 0-2.75-1.233-2.75-2.75v-4.5c0-.414.336-.75.75-.75s.75.336.75.75v4.5c0 .689.561 1.25 1.25 1.25h5.5c.414 0 .75.336.75.75s-.336.75-.75.75z"/><path d="m5.5 16.25h-3.5c-.303 0-.577-.183-.693-.463s-.052-.603.163-.817l1.75-1.75c.293-.293.768-.293 1.061 0l1.75 1.75c.214.214.279.537.163.817s-.391.463-.694.463z"/><circle cx="5" cy="2.5" r="2.5"/><path d="m7.25 6h-4.5c-1.517 0-2.75 1.233-2.75 2.75v.5c0 .414.336.75.75.75h8.5c.414 0 .75-.336.75-.75v-.5c0-1.517-1.233-2.75-2.75-2.75z"/><path d="m19 19c-1.378 0-2.5-1.122-2.5-2.5s1.122-2.5 2.5-2.5 2.5 1.122 2.5 2.5-1.122 2.5-2.5 2.5z"/><path d="m23.25 24h-8.5c-.414 0-.75-.336-.75-.75v-.5c0-1.517 1.233-2.75 2.75-2.75h4.5c1.517 0 2.75 1.233 2.75 2.75v.5c0 .414-.336.75-.75.75z"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.2 KiB |
@ -1,10 +1,13 @@
|
|||||||
import { format } from 'date-fns';
|
import { format } from 'date-fns';
|
||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect, useState, useContext } from 'react';
|
||||||
import styled from 'styled-components/macro';
|
import styled from 'styled-components/macro';
|
||||||
import { axiosInstance } from '../utils/axiosInstance';
|
import { axiosInstance } from '../utils/axiosInstance';
|
||||||
import { useSnackbar } from 'notistack';
|
import { useSnackbar } from 'notistack';
|
||||||
import CloseIcon from '@material-ui/icons/Close';
|
import CloseIcon from '@material-ui/icons/Close';
|
||||||
import { SyncLoader } from 'react-spinners';
|
import { SyncLoader } from 'react-spinners';
|
||||||
|
import { CASContext } from '../contexts/CASProvider';
|
||||||
|
import LogoutIcon from '../assets/logout.svg';
|
||||||
|
import LogoPlanNaPlan from '../assets/logo.svg';
|
||||||
|
|
||||||
const StyledCloseIcon = styled(CloseIcon)`
|
const StyledCloseIcon = styled(CloseIcon)`
|
||||||
color: #000000;
|
color: #000000;
|
||||||
@ -14,6 +17,18 @@ const StyledCloseIcon = styled(CloseIcon)`
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const Icon = styled.img`
|
||||||
|
width: 40px;
|
||||||
|
margin-left: 40px;
|
||||||
|
cursor: pointer;
|
||||||
|
@media only screen and (max-width: 670px) {
|
||||||
|
width: 35px;
|
||||||
|
}
|
||||||
|
position:absolute;
|
||||||
|
top:10px;
|
||||||
|
right:10px;
|
||||||
|
`;
|
||||||
|
|
||||||
const SaveButton = styled.button`
|
const SaveButton = styled.button`
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
@ -24,6 +39,7 @@ const SaveButton = styled.button`
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
height: 40px;
|
height: 40px;
|
||||||
|
margin:10px;
|
||||||
&:hover {
|
&:hover {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
box-shadow: 0px 5px 4px 0px rgba(0, 0, 0, 0.24);
|
box-shadow: 0px 5px 4px 0px rgba(0, 0, 0, 0.24);
|
||||||
@ -44,20 +60,22 @@ const Wrap = styled.div`
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
margin:20px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const LogoWrapper = styled.div`
|
const LogoWrapper = styled.div`
|
||||||
display: flex;
|
display: flex;
|
||||||
flex: 1;
|
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
margin-top:-50px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const Text = styled.div`
|
const Text = styled.div`
|
||||||
font-family: 'Roboto', sans-serif;
|
font-family: 'Roboto', sans-serif;
|
||||||
font-size: 5rem;
|
font-size: 5rem;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
|
margin-bottom:60px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const Logo = styled.img`
|
const Logo = styled.img`
|
||||||
@ -80,7 +98,22 @@ const Form = styled.form`
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const DownloadSection = styled.div`
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
|
input {
|
||||||
|
padding: 5px;
|
||||||
|
margin-top: 10px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
width: 210px;
|
||||||
|
}
|
||||||
|
`;
|
||||||
export const Administrator = () => {
|
export const Administrator = () => {
|
||||||
|
const { logout } = useContext(CASContext)!;
|
||||||
const { enqueueSnackbar } = useSnackbar();
|
const { enqueueSnackbar } = useSnackbar();
|
||||||
const { closeSnackbar } = useSnackbar();
|
const { closeSnackbar } = useSnackbar();
|
||||||
|
|
||||||
@ -98,11 +131,25 @@ export const Administrator = () => {
|
|||||||
const [endSecondDate, setEndSecondDate] = useState<Date | null>(null);
|
const [endSecondDate, setEndSecondDate] = useState<Date | null>(null);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
|
|
||||||
useEffect(() => {
|
const downloadFile = async () => {
|
||||||
if (startFirstDate !== null) {
|
|
||||||
console.log(format(startFirstDate, 'dd.MM.yyyy'));
|
const {data} = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/commisions/export/csv`,{responseType:"blob"});
|
||||||
}
|
|
||||||
}, [startFirstDate]);
|
const downloadUrl = window.URL.createObjectURL(new Blob([data]));
|
||||||
|
|
||||||
|
const link = document.createElement('a');
|
||||||
|
|
||||||
|
link.href = downloadUrl;
|
||||||
|
|
||||||
|
link.setAttribute('download', 'file.csv');
|
||||||
|
|
||||||
|
document.body.appendChild(link);
|
||||||
|
|
||||||
|
link.click();
|
||||||
|
|
||||||
|
link.remove();
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
const uploadFile = async (event: React.FormEvent<HTMLFormElement>) => {
|
const uploadFile = async (event: React.FormEvent<HTMLFormElement>) => {
|
||||||
const action = (key: any) => (
|
const action = (key: any) => (
|
||||||
@ -143,13 +190,12 @@ export const Administrator = () => {
|
|||||||
formData,
|
formData,
|
||||||
config,
|
config,
|
||||||
);
|
);
|
||||||
enqueueSnackbar('Plan został zapisany', {
|
enqueueSnackbar('Ustawienia zostały zapisane', {
|
||||||
variant: 'success',
|
variant: 'success',
|
||||||
action,
|
action,
|
||||||
});
|
});
|
||||||
console.log(response);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
enqueueSnackbar('Zapisywanie planu nie powiodło się', {
|
enqueueSnackbar('Ustawienia nie zostały zapisane', {
|
||||||
variant: 'error',
|
variant: 'error',
|
||||||
action,
|
action,
|
||||||
});
|
});
|
||||||
@ -158,13 +204,18 @@ export const Administrator = () => {
|
|||||||
setLoading(false);
|
setLoading(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const xd = true;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AdministratorWrapper>
|
<AdministratorWrapper>
|
||||||
|
<Icon alt="logout" src={LogoutIcon} onClick={logout}/>
|
||||||
<Wrap>
|
<Wrap>
|
||||||
<LogoWrapper>
|
<LogoWrapper>
|
||||||
<Logo alt="logo" src="https://plannaplan.pl/img/logo.svg" />
|
<Logo alt="logo" src={LogoPlanNaPlan} />
|
||||||
<Text> plan na plan </Text>
|
<Text> plan na plan </Text>
|
||||||
</LogoWrapper>
|
</LogoWrapper>
|
||||||
|
{xd === true ? (
|
||||||
|
<div>
|
||||||
<Form onSubmit={uploadFile}>
|
<Form onSubmit={uploadFile}>
|
||||||
<div>
|
<div>
|
||||||
<div>Start pierwszej tury:</div>{' '}
|
<div>Start pierwszej tury:</div>{' '}
|
||||||
@ -203,6 +254,12 @@ export const Administrator = () => {
|
|||||||
<SaveButton type="submit">{loading === false ? 'Zapisz' : <SyncLoader />} </SaveButton>
|
<SaveButton type="submit">{loading === false ? 'Zapisz' : <SyncLoader />} </SaveButton>
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
|
<DownloadSection>
|
||||||
|
<SaveButton onClick={downloadFile}>Pobierz dane.csv</SaveButton>
|
||||||
|
</DownloadSection>
|
||||||
|
</div>
|
||||||
|
) : (<div></div>
|
||||||
|
)}
|
||||||
</Wrap>
|
</Wrap>
|
||||||
</AdministratorWrapper>
|
</AdministratorWrapper>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -37,7 +37,7 @@ export const App = () => {
|
|||||||
{userPrivilige !== 'ADMIN' && (
|
{userPrivilige !== 'ADMIN' && (
|
||||||
<>
|
<>
|
||||||
<Topbar handleTransfer={handleTransfer} />
|
<Topbar handleTransfer={handleTransfer} />
|
||||||
<Transfer isOpen={isOpenTransfer} handleClose={handleTransfer} />
|
<Transfer isTransferOpen={isOpenTransfer} handleClose={handleTransfer} />
|
||||||
<Wrapper>
|
<Wrapper>
|
||||||
{userPrivilige === 'STUDENT' && (
|
{userPrivilige === 'STUDENT' && (
|
||||||
<>
|
<>
|
||||||
@ -49,9 +49,7 @@ export const App = () => {
|
|||||||
</Wrapper>
|
</Wrapper>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{userPrivilige === 'ADMIN' && (
|
{userPrivilige === 'ADMIN' && <Administrator></Administrator>}
|
||||||
<Administrator></Administrator>
|
|
||||||
)}
|
|
||||||
</LoadingOverlay>
|
</LoadingOverlay>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -21,7 +21,7 @@ const CourseCardWrapper = styled.div`
|
|||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
align-items: stretch;
|
align-items: stretch;
|
||||||
box-shadow: 3px 3px 3px 0px rgba(0, 0, 0, 0.75);
|
box-shadow: 3px 3px 5px 0px rgba(189,189,189,1);
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const TitleWrapper = styled.div`
|
const TitleWrapper = styled.div`
|
||||||
@ -158,7 +158,7 @@ export const CourseCard = ({ course }: CourseCardProps) => {
|
|||||||
} = useContext(coursesContext)!;
|
} = useContext(coursesContext)!;
|
||||||
const [isSelected, setSelected] = useState(true);
|
const [isSelected, setSelected] = useState(true);
|
||||||
const groups = [...course.lectures!, ...course.classes!];
|
const groups = [...course.lectures!, ...course.classes!];
|
||||||
const basketCourseGroups = useMemo(() => selectBasketCourseGroups(course.id), []);
|
const basketCourseGroups = useMemo(() => selectBasketCourseGroups(course.name), []);
|
||||||
const [previous, setPrevious] = useState(basketCourseGroups);
|
const [previous, setPrevious] = useState(basketCourseGroups);
|
||||||
|
|
||||||
const onGroupClick = (group: Group, courseId: number) => {
|
const onGroupClick = (group: Group, courseId: number) => {
|
||||||
|
|||||||
@ -2,7 +2,8 @@ import React, { useState, MouseEvent,useContext } from 'react';
|
|||||||
import styled from 'styled-components/macro';
|
import styled from 'styled-components/macro';
|
||||||
import Plan from '../assets/plan.svg';
|
import Plan from '../assets/plan.svg';
|
||||||
import History from '../assets/history.svg';
|
import History from '../assets/history.svg';
|
||||||
import Statistics from '../assets/statistics.svg';
|
import StatisticsIcon from '../assets/statistics.svg';
|
||||||
|
import { Statistics } from './Statistics';
|
||||||
import { Scheduler } from './Scheduler';
|
import { Scheduler } from './Scheduler';
|
||||||
import { Rightbar } from './Rightbar';
|
import { Rightbar } from './Rightbar';
|
||||||
import { SchedulerHistory } from './SchedulerHistory';
|
import { SchedulerHistory } from './SchedulerHistory';
|
||||||
@ -124,7 +125,7 @@ export const Deanery = ({ schedulerEvents }: Deanery) => {
|
|||||||
Historia Zmian
|
Historia Zmian
|
||||||
</LeftPanelElement>
|
</LeftPanelElement>
|
||||||
<LeftPanelElement id={'3'} isCurrentTab={currentTab === 3} onClick={handleClick}>
|
<LeftPanelElement id={'3'} isCurrentTab={currentTab === 3} onClick={handleClick}>
|
||||||
<Icon alt="statistics" src={Statistics} />
|
<Icon alt="statistics" src={StatisticsIcon} />
|
||||||
Statystyki
|
Statystyki
|
||||||
</LeftPanelElement>
|
</LeftPanelElement>
|
||||||
</LeftSide>
|
</LeftSide>
|
||||||
@ -137,7 +138,7 @@ export const Deanery = ({ schedulerEvents }: Deanery) => {
|
|||||||
) : currentTab === 2 ? (
|
) : currentTab === 2 ? (
|
||||||
<SchedulerHistory schedulerHistoryEvents={schedulerHistoryEvents}/>
|
<SchedulerHistory schedulerHistoryEvents={schedulerHistoryEvents}/>
|
||||||
) : currentTab === 3 ? (
|
) : currentTab === 3 ? (
|
||||||
<StatsDiv />
|
<StatsDiv><Statistics/></StatsDiv>
|
||||||
) : (
|
) : (
|
||||||
<LogoWrapper>
|
<LogoWrapper>
|
||||||
<Logo alt="logo" src="https://plannaplan.pl/img/logo.svg" />
|
<Logo alt="logo" src="https://plannaplan.pl/img/logo.svg" />
|
||||||
|
|||||||
@ -105,7 +105,8 @@ export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: D
|
|||||||
input
|
input
|
||||||
.toLowerCase()
|
.toLowerCase()
|
||||||
.normalize('NFD')
|
.normalize('NFD')
|
||||||
.replace(/[\u0300-\u036f]/g, ''),
|
.replace(/[\u0300-\u036f]/g, '')
|
||||||
|
.replace(/\s/g, ''),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
setFilteredStudents(filteredUsers);
|
setFilteredStudents(filteredUsers);
|
||||||
@ -119,9 +120,10 @@ export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: D
|
|||||||
<>
|
<>
|
||||||
{selectedOption === 'studenci' ? (
|
{selectedOption === 'studenci' ? (
|
||||||
<div>
|
<div>
|
||||||
{filteredStudents.map(({ email, id }, index) => (
|
{filteredStudents.map(({ surname, name, email, id }, index) => (
|
||||||
<CourseContainer key={index} id={id.toString()} onClick={onUserClick}>
|
<CourseContainer key={index} id={id.toString()} onClick={onUserClick}>
|
||||||
<p>{email}</p>
|
{name=== ''? <p>{email}</p> :<p>{name} {surname}</p>}
|
||||||
|
|
||||||
</CourseContainer>
|
</CourseContainer>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
111
src/components/DropdownModal.tsx
Normal file
111
src/components/DropdownModal.tsx
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
import React, { useState, useContext, useEffect, MouseEvent, useMemo } from 'react';
|
||||||
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
|
import { studentsContext } from '../contexts/StudentsProvider';
|
||||||
|
import { Course, Student } from '../types';
|
||||||
|
import styled from 'styled-components';
|
||||||
|
|
||||||
|
const DropdownContainer = styled.div`
|
||||||
|
position: relative;
|
||||||
|
z-index: 99999999;
|
||||||
|
max-height: 396px;
|
||||||
|
border-radius: 3px;
|
||||||
|
overflow-y: auto;
|
||||||
|
opacity: 0.97;
|
||||||
|
box-shadow: 0.05em 0.2em 0.6em rgba(0, 0, 0, 0.2);
|
||||||
|
scroll-snap-type: y mandatory;
|
||||||
|
scroll-behavior: smooth;
|
||||||
|
::-webkit-scrollbar-track {
|
||||||
|
background-color: #f2f4f7;
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
background-color: #f2f4f7;
|
||||||
|
width: 5px;
|
||||||
|
border-style: none;
|
||||||
|
}
|
||||||
|
::-webkit-scrollbar-thumb {
|
||||||
|
border-radius: 10px;
|
||||||
|
background-color: #4b4b4b;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const CourseContainer = styled.div`
|
||||||
|
padding: 5px;
|
||||||
|
padding-left: 20px;
|
||||||
|
background-color: #f2f4f7;
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 500;
|
||||||
|
scroll-snap-align: end;
|
||||||
|
:hover {
|
||||||
|
background-color: #eceef4;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
interface DropdownProps {
|
||||||
|
open: boolean;
|
||||||
|
input: string;
|
||||||
|
handleCloseDropdown: () => void;
|
||||||
|
handleSelectedGroupChange: (event: React.ChangeEvent<{ value: unknown }>) => void;
|
||||||
|
selectedOption: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const DropdownModal = ({
|
||||||
|
open,
|
||||||
|
input,
|
||||||
|
handleCloseDropdown,
|
||||||
|
selectedOption,
|
||||||
|
handleSelectedGroupChange,
|
||||||
|
}: DropdownProps) => {
|
||||||
|
const { courses, selectBasketNames } = useContext(coursesContext)!;
|
||||||
|
const basketNames = useMemo(() => selectBasketNames(), [selectBasketNames]);
|
||||||
|
const [filteredCourses, setFilteredCourses] = useState<Array<Course>>([]);
|
||||||
|
|
||||||
|
const onCourseClick = (event: MouseEvent) => {
|
||||||
|
const target = event.currentTarget;
|
||||||
|
if (target.id && target.textContent) {
|
||||||
|
const course = filteredCourses.find(({ id }) => id.toString() === target.id)!;
|
||||||
|
|
||||||
|
handleSelectedGroupChange((course as unknown) as any);
|
||||||
|
handleCloseDropdown();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const filterCourses = (input: string) => {
|
||||||
|
const filteredCourses = courses.filter(
|
||||||
|
({ name }) =>
|
||||||
|
name
|
||||||
|
.toLowerCase()
|
||||||
|
.normalize('NFD')
|
||||||
|
.replace(/[\u0300-\u036f]/g, '')
|
||||||
|
.includes(
|
||||||
|
input
|
||||||
|
.toLowerCase()
|
||||||
|
.normalize('NFD')
|
||||||
|
.replace(/[\u0300-\u036f]/g, ''),
|
||||||
|
) && !basketNames.includes(name),
|
||||||
|
);
|
||||||
|
setFilteredCourses(filteredCourses);
|
||||||
|
};
|
||||||
|
filterCourses(input);
|
||||||
|
}, [basketNames, courses, input]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<DropdownContainer>
|
||||||
|
{open && (
|
||||||
|
<>
|
||||||
|
{
|
||||||
|
<div>
|
||||||
|
{filteredCourses.map(({ name, id }, index) => (
|
||||||
|
<CourseContainer key={index} id={id.toString()} onClick={onCourseClick}>
|
||||||
|
<p>{name} </p>
|
||||||
|
</CourseContainer>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</DropdownContainer>
|
||||||
|
);
|
||||||
|
};
|
||||||
@ -3,6 +3,7 @@ import { CourseCard } from './CourseCard';
|
|||||||
import { coursesContext } from '../contexts/CoursesProvider';
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
import { debounce } from '../utils/index';
|
import { debounce } from '../utils/index';
|
||||||
|
import { SyncLoader } from 'react-spinners';
|
||||||
|
|
||||||
const RightbarWrapper = styled.div`
|
const RightbarWrapper = styled.div`
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
@ -37,24 +38,22 @@ const SaveButton = styled.div`
|
|||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
&:hover {
|
&:hover {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
box-shadow: 0px 5px 4px 0px rgba(0, 0, 0, 0.24);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&:active {
|
&:active {
|
||||||
background-color: #54c457;
|
background-color: #54c457;
|
||||||
}
|
}
|
||||||
|
|
||||||
box-shadow: 3px 3px 3px 0px rgba(0, 0, 0, 0.75);
|
box-shadow: 3px 3px 5px 0px rgba(189,189,189,1);
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const Rightbar = () => {
|
export const Rightbar = () => {
|
||||||
const { selectBasketCourses, saveBasket, userID } = useContext(coursesContext)!;
|
const { selectBasketCourses, saveBasket, userID, isSavingLoading } = useContext(coursesContext)!;
|
||||||
|
|
||||||
const basketCourses = selectBasketCourses();
|
const basketCourses = selectBasketCourses();
|
||||||
const handleSave = debounce(() => saveBasket(userID), 500);
|
const handleSave = debounce(() => saveBasket(userID), 500);
|
||||||
return (
|
return (
|
||||||
<RightbarWrapper>
|
<RightbarWrapper>
|
||||||
<SaveButton onClick={handleSave}>ZAPISZ</SaveButton>
|
<SaveButton onClick={()=> {!isSavingLoading && handleSave() }}> {isSavingLoading ? <SyncLoader size={9}/> : "ZAPISZ"}</SaveButton>
|
||||||
{basketCourses.map((course) => (
|
{basketCourses.map((course) => (
|
||||||
<CourseCard course={course} key={course.id} />
|
<CourseCard course={course} key={course.id} />
|
||||||
))}
|
))}
|
||||||
|
|||||||
@ -1,9 +1,11 @@
|
|||||||
import React, { useLayoutEffect, useRef } from 'react';
|
import React, { useContext, useLayoutEffect, useRef } from 'react';
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import { SchedulerEvents } from './SchedulerEvents';
|
import { SchedulerEvents } from './SchedulerEvents';
|
||||||
import { days, hours } from '../constants/index';
|
import { days, hours } from '../constants/index';
|
||||||
import styled from 'styled-components/macro';
|
import styled from 'styled-components/macro';
|
||||||
import { SchedulerEvent } from '../types';
|
import { SchedulerEvent } from '../types';
|
||||||
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
|
import Tooltip from '@material-ui/core/Tooltip';
|
||||||
|
|
||||||
const SchedulerWrapper = styled.div`
|
const SchedulerWrapper = styled.div`
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
@ -17,6 +19,7 @@ const SchedulerWrapper = styled.div`
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
box-shadow: 3px 3px 3px -2px rgba(0, 0, 0, 0.59);
|
box-shadow: 3px 3px 3px -2px rgba(0, 0, 0, 0.59);
|
||||||
|
position:relative;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const TableBody = styled.div`
|
const TableBody = styled.div`
|
||||||
@ -62,6 +65,27 @@ const TableCell = styled.div<TableCellProps>`
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const TourWrapper = styled.div`
|
||||||
|
display: flex;
|
||||||
|
justify-content:center;
|
||||||
|
align-items:center;
|
||||||
|
position:absolute;
|
||||||
|
top:8px;
|
||||||
|
right:8px;
|
||||||
|
min-width: 10px;
|
||||||
|
padding: 3px 7px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: black;
|
||||||
|
line-height: 1;
|
||||||
|
vertical-align: middle;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-align: center;
|
||||||
|
background-color: #FFDC61;
|
||||||
|
border-radius: 10px;
|
||||||
|
font-size:18px;
|
||||||
|
`;
|
||||||
|
|
||||||
interface SchedulerProps {
|
interface SchedulerProps {
|
||||||
schedulerEvents: Array<SchedulerEvent>;
|
schedulerEvents: Array<SchedulerEvent>;
|
||||||
}
|
}
|
||||||
@ -70,6 +94,7 @@ export const Scheduler = ({ schedulerEvents }: SchedulerProps) => {
|
|||||||
const cellRef = useRef<HTMLDivElement>(null);
|
const cellRef = useRef<HTMLDivElement>(null);
|
||||||
const [cellWidth, setCellWidth] = useState(0);
|
const [cellWidth, setCellWidth] = useState(0);
|
||||||
const [cellHeight, setCellHeight] = useState(0);
|
const [cellHeight, setCellHeight] = useState(0);
|
||||||
|
const { tour } = useContext(coursesContext)!;
|
||||||
|
|
||||||
useLayoutEffect(() => {
|
useLayoutEffect(() => {
|
||||||
const handleResize = () => {
|
const handleResize = () => {
|
||||||
@ -130,6 +155,19 @@ export const Scheduler = ({ schedulerEvents }: SchedulerProps) => {
|
|||||||
))}
|
))}
|
||||||
<SchedulerEvents cellWidth={cellWidth} cellHeight={cellHeight} schedulerEvents={schedulerEvents} />
|
<SchedulerEvents cellWidth={cellWidth} cellHeight={cellHeight} schedulerEvents={schedulerEvents} />
|
||||||
</TableBody>
|
</TableBody>
|
||||||
|
<TourWrapper>
|
||||||
|
<Tooltip title="Pierwsza Tura Zapisów">
|
||||||
|
<div style={{cursor: 'help'}}>{tour === 'FIRST_TOUR' && '1'}</div>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip title="Druga Tura Zapisów">
|
||||||
|
<div style={{cursor: 'help'}}>{tour === 'SECOND_TOUR' && '2'}</div>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip title="Zapisywanie wyłączone">
|
||||||
|
<div style={{cursor: 'help'}}>{tour === 'NO_TOUR' && 'X'}</div>
|
||||||
|
</Tooltip>
|
||||||
|
|
||||||
|
|
||||||
|
</TourWrapper>
|
||||||
</SchedulerWrapper>
|
</SchedulerWrapper>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -70,7 +70,6 @@ export const SchedulerHistoryNavigation = ({
|
|||||||
<StyledButton
|
<StyledButton
|
||||||
direction="left"
|
direction="left"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
console.log('left clicked');
|
|
||||||
SubstractCurrentTimetable(-1);
|
SubstractCurrentTimetable(-1);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -80,7 +79,6 @@ export const SchedulerHistoryNavigation = ({
|
|||||||
<StyledButton
|
<StyledButton
|
||||||
direction="right"
|
direction="right"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
console.log('right clicked');
|
|
||||||
AddCurrentTimetable(1);
|
AddCurrentTimetable(1);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import Popover from '@material-ui/core/Popover';
|
|||||||
import { makeStyles, createStyles, Theme } from '@material-ui/core/styles';
|
import { makeStyles, createStyles, Theme } from '@material-ui/core/styles';
|
||||||
import { MONDAY_TO_FRIDAY } from '../constants';
|
import { MONDAY_TO_FRIDAY } from '../constants';
|
||||||
import { coursesContext } from '../contexts/CoursesProvider';
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
|
import TickIcon from '../assets/tick.svg';
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
createStyles({
|
createStyles({
|
||||||
@ -57,7 +58,7 @@ const StyledSchedulerEvent = styled.div<SchedulerEventProps>`
|
|||||||
z-index: 20000;
|
z-index: 20000;
|
||||||
font-size: 0.65vw;
|
font-size: 0.65vw;
|
||||||
line-height: normal;
|
line-height: normal;
|
||||||
border-radius: 10px;
|
border-radius: 2px;
|
||||||
height: ${({ cellHeight }) => cellHeight * 3}px;
|
height: ${({ cellHeight }) => cellHeight * 3}px;
|
||||||
width: ${({ cellWidth }) => (cellWidth * 3) / 4}px;
|
width: ${({ cellWidth }) => (cellWidth * 3) / 4}px;
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
@ -76,7 +77,9 @@ const StyledSchedulerEvent = styled.div<SchedulerEventProps>`
|
|||||||
transition: background-color ease-in 0.4s;
|
transition: background-color ease-in 0.4s;
|
||||||
`}
|
`}
|
||||||
transition: background-color ease-out 0.4s;
|
transition: background-color ease-out 0.4s;
|
||||||
box-shadow: 3px 3px 3px 0px rgba(0, 0, 0, 0.75);
|
box-shadow: 3px 3px 5px 0px rgba(189,189,189,1);
|
||||||
|
|
||||||
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
@ -125,6 +128,13 @@ interface SchedulerRowProps {
|
|||||||
cellHeight: number;
|
cellHeight: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const Icon = styled.img`
|
||||||
|
width: 15px;
|
||||||
|
position:absolute;
|
||||||
|
top:5px;
|
||||||
|
left:15px;
|
||||||
|
`;
|
||||||
|
|
||||||
const getGroupsPerDay = (groups: Array<SchedulerEvent>) => {
|
const getGroupsPerDay = (groups: Array<SchedulerEvent>) => {
|
||||||
const groupsPerDay: any = { 0: 0, 1: 0, 2: 0, 3: 0, 4: 0 };
|
const groupsPerDay: any = { 0: 0, 1: 0, 2: 0, 3: 0, 4: 0 };
|
||||||
for (const group of groups) {
|
for (const group of groups) {
|
||||||
@ -185,13 +195,16 @@ export const SchedulerRow = ({ groups, indexRow, rowTop, cellWidth, cellHeight }
|
|||||||
<BoldParagraph isThree={groupsPerDay[group.day] >= 3}>{groups[index].name}</BoldParagraph>
|
<BoldParagraph isThree={groupsPerDay[group.day] >= 3}>{groups[index].name}</BoldParagraph>
|
||||||
{groupsPerDay[group.day] < 3 ? (
|
{groupsPerDay[group.day] < 3 ? (
|
||||||
<TextWrapper>
|
<TextWrapper>
|
||||||
|
{groups[index].isAccepted===true && <Icon alt="transfer" src={TickIcon} />}
|
||||||
<div>{`${groups[index].time}-${groups[index].endTime}`}</div>
|
<div>{`${groups[index].time}-${groups[index].endTime}`}</div>
|
||||||
<div>
|
<div>
|
||||||
{groups[index].takenPlaces}/{groups[index].capacity}
|
{groups[index].takenPlaces}/{groups[index].capacity}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</TextWrapper>
|
</TextWrapper>
|
||||||
) : (
|
) : (
|
||||||
<TextWrapper style={{ flexDirection: 'column' }}>
|
<TextWrapper style={{ flexDirection: 'column' }}>
|
||||||
|
{groups[index].isAccepted===true && <Icon alt="transfer" src={TickIcon} />}
|
||||||
<div style={{ alignSelf: 'flex-end' }}>
|
<div style={{ alignSelf: 'flex-end' }}>
|
||||||
{groups[index].takenPlaces}/{groups[index].capacity}
|
{groups[index].takenPlaces}/{groups[index].capacity}
|
||||||
</div>
|
</div>
|
||||||
@ -227,14 +240,15 @@ export const SchedulerRow = ({ groups, indexRow, rowTop, cellWidth, cellHeight }
|
|||||||
<PopoverSpan>Sala zajęć</PopoverSpan>: {groups[index].room}
|
<PopoverSpan>Sala zajęć</PopoverSpan>: {groups[index].room}
|
||||||
</p>
|
</p>
|
||||||
<p style={{ margin: '2px 0 2px 0' }}>
|
<p style={{ margin: '2px 0 2px 0' }}>
|
||||||
<PopoverSpan>Kod przedmiotu: </PopoverSpan>ACB129
|
<PopoverSpan>Kod przedmiotu: </PopoverSpan> {groups[index].symbol}
|
||||||
</p>
|
</p>
|
||||||
<p style={{ margin: '2px 0 2px 0' }}>
|
<p style={{ margin: '2px 0 2px 0' }}>
|
||||||
<PopoverSpan>Kod grupy: </PopoverSpan>FVJ753
|
<PopoverSpan>Numer grupy: </PopoverSpan> {groups[index].grNr}
|
||||||
</p>
|
</p>
|
||||||
<p style={{ margin: '2px 0 2px 0' }}>
|
<p style={{ margin: '2px 0 2px 0', color:"green"}}>
|
||||||
<PopoverSpan>Punkty ECTS:</PopoverSpan> 2
|
<b>{groups[index].isAccepted===true && "Przedmiot został zaakceptowany"}</b>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</Popover>
|
</Popover>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
|
|||||||
@ -24,6 +24,7 @@ const Wrapper = styled.div`
|
|||||||
border-top-left-radius: 6px;
|
border-top-left-radius: 6px;
|
||||||
border-bottom-left-radius: 6px;
|
border-bottom-left-radius: 6px;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
|
z-index:100;
|
||||||
`;
|
`;
|
||||||
const Header = styled.div`
|
const Header = styled.div`
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -84,7 +85,6 @@ export const SelectMenu = ({changeSelectedOption,changeDropdownOpen, selectedOpt
|
|||||||
<Wrapper onClick={() => {changeDropdownOpen(false)}}>
|
<Wrapper onClick={() => {changeDropdownOpen(false)}}>
|
||||||
<Header
|
<Header
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
console.log('clicked');
|
|
||||||
setIsOpen(!isOpen);
|
setIsOpen(!isOpen);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
170
src/components/Statistics.tsx
Normal file
170
src/components/Statistics.tsx
Normal file
@ -0,0 +1,170 @@
|
|||||||
|
import React, { useState, useContext, useEffect } from 'react';
|
||||||
|
import Collapse from '@material-ui/core/Collapse';
|
||||||
|
import { ReactComponent as Expand } from '../assets/expand.svg';
|
||||||
|
import { Course, Group, GroupType } from '../types/index';
|
||||||
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
|
import styled, { css } from 'styled-components';
|
||||||
|
import { makeStyles } from '@material-ui/core/styles';
|
||||||
|
import DeleteIcon from '@material-ui/icons/Delete';
|
||||||
|
import { useMemo } from 'react';
|
||||||
|
import { dayMapping } from '../constants';
|
||||||
|
import { axiosInstance } from '../utils/axiosInstance';
|
||||||
|
import { SyncLoader } from 'react-spinners';
|
||||||
|
|
||||||
|
const StatisticsWrapper = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Row = styled.div`
|
||||||
|
display: flex;
|
||||||
|
width: 100%;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const StatisticBox = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
z-index: 20000;
|
||||||
|
font-size: 0.65vw;
|
||||||
|
line-height: normal;
|
||||||
|
border-radius: 2px;
|
||||||
|
width: 200px;
|
||||||
|
height: 200px;
|
||||||
|
margin: 5px;
|
||||||
|
padding: 5px 5px 0 5px;
|
||||||
|
text-align: center;
|
||||||
|
background-color: #ffe485;
|
||||||
|
box-shadow: 3px 3px 5px 0px rgba(189, 189, 189, 1);
|
||||||
|
`;
|
||||||
|
|
||||||
|
const StatisticNumber = styled.p`
|
||||||
|
font-size: 52px;
|
||||||
|
margin-top: 40px;
|
||||||
|
margin-bottom: 0px;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const StatisticText = styled.p`
|
||||||
|
font-size: 18px;
|
||||||
|
text-align: center;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
`;
|
||||||
|
|
||||||
|
export const Statistics = () => {
|
||||||
|
const [createdGroupsNumber, setCreatedGroupsNumber] = useState('');
|
||||||
|
const [fullGroupsNumber, setFullGroupsNumber] = useState('');
|
||||||
|
const [registeredStudentsNumber, setRegisteredStudentsNumber] = useState('');
|
||||||
|
const [notRegisteredStudentsNumber, setNotRegisteredStudentsNumber] = useState('');
|
||||||
|
const [acceptedStudentsNumber, setAcceptedStudentsNumber] = useState('');
|
||||||
|
const [partlyAcceptedStudentsNumber, setPartlyAcceptedStudentsNumber] = useState('');
|
||||||
|
const [loaded, setLoaded] = useState(false);
|
||||||
|
|
||||||
|
const getCreatedGroupsNumber = async () => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/statistics/groups/created`);
|
||||||
|
setCreatedGroupsNumber(data.ammount);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getFullGroupsNumber = async () => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/statistics/groups/full`);
|
||||||
|
setFullGroupsNumber(data.ammount);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getRegisteredStudentsNumber = async () => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/statistics/groups/full`);
|
||||||
|
setRegisteredStudentsNumber(data.ammount);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getNotRegisteredStudentsNumber = async () => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/statistics/groups/full`);
|
||||||
|
setNotRegisteredStudentsNumber(data.ammount);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getAcceptedStudentsNumber = async () => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/statistics/groups/full`);
|
||||||
|
setAcceptedStudentsNumber(data.ammount);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getPartlyAcceptedStudentsNumber = async () => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/statistics/groups/full`);
|
||||||
|
setPartlyAcceptedStudentsNumber(data.ammount);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
Promise.all([
|
||||||
|
getCreatedGroupsNumber(),
|
||||||
|
getFullGroupsNumber(),
|
||||||
|
getRegisteredStudentsNumber(),
|
||||||
|
getNotRegisteredStudentsNumber(),
|
||||||
|
getAcceptedStudentsNumber(),
|
||||||
|
getPartlyAcceptedStudentsNumber(),
|
||||||
|
]).then(()=>{setLoaded(true);});
|
||||||
|
|
||||||
|
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return <StatisticsWrapper>{loaded === false ? <SyncLoader />:<><Row>
|
||||||
|
<StatisticBox>
|
||||||
|
<StatisticNumber>{createdGroupsNumber}</StatisticNumber>
|
||||||
|
<StatisticText>Utworzonych grup</StatisticText>
|
||||||
|
</StatisticBox>
|
||||||
|
<StatisticBox>
|
||||||
|
{' '}
|
||||||
|
<StatisticNumber>{registeredStudentsNumber}</StatisticNumber>
|
||||||
|
<StatisticText>Zapisanych studentów do grup</StatisticText>
|
||||||
|
</StatisticBox>
|
||||||
|
<StatisticBox>
|
||||||
|
{' '}
|
||||||
|
<StatisticNumber>{notRegisteredStudentsNumber}</StatisticNumber>
|
||||||
|
<StatisticText>Studentów niezapisanych do żadnej grupy</StatisticText>
|
||||||
|
</StatisticBox>
|
||||||
|
</Row>
|
||||||
|
<Row>
|
||||||
|
<StatisticBox>
|
||||||
|
{' '}
|
||||||
|
<StatisticNumber>{acceptedStudentsNumber}</StatisticNumber>
|
||||||
|
<StatisticText>Studentów z zaakceptowanym planem</StatisticText>
|
||||||
|
</StatisticBox>
|
||||||
|
<StatisticBox>
|
||||||
|
{' '}
|
||||||
|
<StatisticNumber>{partlyAcceptedStudentsNumber}</StatisticNumber>
|
||||||
|
<StatisticText>Studentów bez zaakceptowanego pełengo planu</StatisticText>
|
||||||
|
</StatisticBox>
|
||||||
|
<StatisticBox>
|
||||||
|
{' '}
|
||||||
|
<StatisticNumber>{fullGroupsNumber}</StatisticNumber>
|
||||||
|
<StatisticText>Grup z zajętymi wszystkimi miejscami</StatisticText>
|
||||||
|
</StatisticBox>
|
||||||
|
</Row></>}
|
||||||
|
</StatisticsWrapper>;
|
||||||
|
};
|
||||||
@ -1,16 +1,16 @@
|
|||||||
import React, { useState, MouseEvent, ChangeEvent, useEffect, useCallback, useContext, useRef } from 'react';
|
import React, { useState, MouseEvent, ChangeEvent, useEffect, useCallback, useContext, useRef } from 'react';
|
||||||
import { ReactComponent as Close } from '../assets/close.svg';
|
import { ReactComponent as Close } from '../assets/close.svg';
|
||||||
import ProfileIcon from '../assets/account.svg';
|
import LogoutIcon from '../assets/logout.svg';
|
||||||
|
import TransferIcon from '../assets/transfer.svg';
|
||||||
import { Profile } from './Profile';
|
import { Profile } from './Profile';
|
||||||
import { Dropdown } from './Dropdown';
|
import { Dropdown } from './Dropdown';
|
||||||
import PolishIcon from '../assets/poland.svg';
|
|
||||||
import EnglishIcon from '../assets/united-kingdom.svg';
|
|
||||||
import styled from 'styled-components/macro';
|
import styled from 'styled-components/macro';
|
||||||
import ClickAwayListener from 'react-click-away-listener';
|
import ClickAwayListener from 'react-click-away-listener';
|
||||||
import { SelectMenu } from './SelectMenu';
|
import { SelectMenu } from './SelectMenu';
|
||||||
import { studentsContext } from '../contexts/StudentsProvider';
|
import { studentsContext } from '../contexts/StudentsProvider';
|
||||||
import { CASContext } from '../contexts/CASProvider';
|
import { CASContext } from '../contexts/CASProvider';
|
||||||
import { render } from 'react-dom';
|
import Tooltip from '@material-ui/core/Tooltip';
|
||||||
|
import LogoPlanNaPlan from '../assets/logo.svg';
|
||||||
|
|
||||||
const Topbar = styled.div`
|
const Topbar = styled.div`
|
||||||
background-color: #e3e5ed;
|
background-color: #e3e5ed;
|
||||||
@ -115,7 +115,7 @@ const IconWrapper = styled.div`
|
|||||||
|
|
||||||
const Icon = styled.img`
|
const Icon = styled.img`
|
||||||
width: 40px;
|
width: 40px;
|
||||||
margin: 5px;
|
margin-left: 40px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
@media only screen and (max-width: 670px) {
|
@media only screen and (max-width: 670px) {
|
||||||
width: 35px;
|
width: 35px;
|
||||||
@ -139,6 +139,7 @@ interface TopbarProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function ({ handleTransfer }: TopbarProps) {
|
export default function ({ handleTransfer }: TopbarProps) {
|
||||||
|
const { logout } = useContext(CASContext)!;
|
||||||
const { selectedStudent } = useContext(studentsContext)!;
|
const { selectedStudent } = useContext(studentsContext)!;
|
||||||
const { role } = useContext(CASContext)!;
|
const { role } = useContext(CASContext)!;
|
||||||
const [clearInput, setClearInput] = useState(false);
|
const [clearInput, setClearInput] = useState(false);
|
||||||
@ -175,10 +176,12 @@ export default function ({ handleTransfer }: TopbarProps) {
|
|||||||
}
|
}
|
||||||
}, [clearInput, handleClearInput]);
|
}, [clearInput, handleClearInput]);
|
||||||
|
|
||||||
|
const userPrivilige = localStorage.getItem('userPrivilige');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Topbar>
|
<Topbar>
|
||||||
<LogoWrapper>
|
<LogoWrapper>
|
||||||
<Logo alt="logo" src="https://plannaplan.pl/img/logo.svg" />
|
<Logo alt="logo" src={LogoPlanNaPlan} />
|
||||||
<Text> plan na plan </Text>
|
<Text> plan na plan </Text>
|
||||||
</LogoWrapper>
|
</LogoWrapper>
|
||||||
<FlexboxColumn>
|
<FlexboxColumn>
|
||||||
@ -212,13 +215,19 @@ export default function ({ handleTransfer }: TopbarProps) {
|
|||||||
</ClickAwayListener>
|
</ClickAwayListener>
|
||||||
</FlexboxColumn>
|
</FlexboxColumn>
|
||||||
<IconWrapper>
|
<IconWrapper>
|
||||||
<SelectedStudent>{selectedStudent?.email.replace(/@st.amu.edu.pl/, '')}</SelectedStudent>
|
<SelectedStudent>{selectedStudent?.surname === '' ? selectedStudent?.email.replace(/@st.amu.edu.pl/, '') : selectedStudent?.surname}</SelectedStudent>
|
||||||
|
|
||||||
{/* <Text>Maciej Głowacki</Text> */}
|
{/* <Text>Maciej Głowacki</Text> */}
|
||||||
{/* <Icon alt="transfer" src={Transfer} onClick={handleTransfer} /> */}
|
{userPrivilige === 'STUDENT' && (
|
||||||
|
<Tooltip title="Wymiana grupami">
|
||||||
|
<Icon alt="transfer" src={TransferIcon} onClick={handleTransfer} />
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
{/* <Icon alt="change_language" src={isPolish ? EnglishIcon : PolishIcon} onClick={onLangChange} /> */}
|
{/* <Icon alt="change_language" src={isPolish ? EnglishIcon : PolishIcon} onClick={onLangChange} /> */}
|
||||||
<Icon alt="profile" src={ProfileIcon} onClick={handleProfile} />
|
<Tooltip title="Wyloguj">
|
||||||
<Profile anchorEl={anchorEl} handleClose={handleCloseProfile} />
|
<Icon alt="logout" src={LogoutIcon} onClick={logout} />
|
||||||
|
</Tooltip>
|
||||||
|
|
||||||
|
{/* <Profile anchorEl={anchorEl} handleClose={handleCloseProfile} /> */}
|
||||||
</IconWrapper>
|
</IconWrapper>
|
||||||
</Topbar>
|
</Topbar>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -1,13 +1,22 @@
|
|||||||
import React from 'react';
|
import React, { ChangeEvent, useContext, useEffect, MouseEvent, useState } from 'react';
|
||||||
import Modal from '@material-ui/core/Modal';
|
import Modal from '@material-ui/core/Modal';
|
||||||
import Fade from '@material-ui/core/Fade';
|
import Fade from '@material-ui/core/Fade';
|
||||||
import Input from '@material-ui/core/Input';
|
|
||||||
import { makeStyles } from '@material-ui/core/styles';
|
import { makeStyles } from '@material-ui/core/styles';
|
||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
|
import { FormControl, MenuItem, Select, useControlled, useEventCallback } from '@material-ui/core';
|
||||||
|
import { axiosInstance } from '../utils/axiosInstance';
|
||||||
|
import { Group } from '../types';
|
||||||
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
|
import { Dropdown } from './Dropdown';
|
||||||
|
import { DropdownModal } from './DropdownModal';
|
||||||
|
import { dayMapping } from '../constants';
|
||||||
|
import TransferIcon from '../assets/switch.svg';
|
||||||
|
import DeleteIcon from '@material-ui/icons/Delete';
|
||||||
|
import InformationIcon from '../assets/information.svg';
|
||||||
|
|
||||||
interface TransferProps {
|
interface TransferProps {
|
||||||
handleClose: (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
|
handleClose: (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
|
||||||
isOpen: boolean;
|
isTransferOpen: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const useStyles = makeStyles({
|
const useStyles = makeStyles({
|
||||||
@ -21,35 +30,47 @@ const useStyles = makeStyles({
|
|||||||
|
|
||||||
const TransferStyled = styled.div`
|
const TransferStyled = styled.div`
|
||||||
display: flex;
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
flex-direction: row;
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
outline: none;
|
outline: none;
|
||||||
min-width: 35%;
|
min-width: 35%;
|
||||||
height: 70%;
|
height: 70%;
|
||||||
padding-top: 40px;
|
background: white;
|
||||||
background: #006b96;
|
|
||||||
box-shadow: 0px 0px 0px 4px #006b96;
|
|
||||||
border: 4px solid #ffc400;
|
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
border-top-left-radius: 5px;
|
border-radius: 5px;
|
||||||
border-bottom-right-radius: 5px;
|
`;
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.3ch;
|
const BinIcon = styled(DeleteIcon)`
|
||||||
|
max-width: 30px;
|
||||||
|
min-width: 30px;
|
||||||
|
cursor: pointer;
|
||||||
|
&:hover {
|
||||||
|
fill: white;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const InputWrapper = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
flex: 1;
|
||||||
|
margin-top:40px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const TransferGiveStyled = styled.div`
|
const TransferGiveStyled = styled.div`
|
||||||
flex-grow: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
text-transform: uppercase;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const TransferReceiveStyled = styled.div`
|
const TransferReceiveStyled = styled.div`
|
||||||
flex-grow: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
text-transform: uppercase;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const TransferTextStyled = styled.div`
|
const TransferTextStyled = styled.div`
|
||||||
@ -68,45 +89,323 @@ const TransferInputStyled = styled.div`
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
text-transform: none;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const Transfer = ({ handleClose, isOpen }: TransferProps) => {
|
const SaveWrapper = styled.div`
|
||||||
|
margin-top: 40px;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const SaveButton = styled.div`
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
user-select: none;
|
||||||
|
background-color: #43a047;
|
||||||
|
border-radius: 10px;
|
||||||
|
cursor: pointer;
|
||||||
|
height: 40px;
|
||||||
|
width: 150px;
|
||||||
|
font-size: 12px;
|
||||||
|
letter-spacing: 0.1ch;
|
||||||
|
line-height: normal;
|
||||||
|
&:hover {
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:active {
|
||||||
|
background-color: #54c457;
|
||||||
|
}
|
||||||
|
|
||||||
|
text-transform: uppercase;
|
||||||
|
box-shadow: 3px 3px 5px 0px rgba(189,189,189,1);
|
||||||
|
`;
|
||||||
|
|
||||||
|
const ExchangesWrapper = styled.div`
|
||||||
|
flex: 4;
|
||||||
|
overflow-y: scroll;
|
||||||
|
width: 100%;
|
||||||
|
::-webkit-scrollbar-track {
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
width: 5px;
|
||||||
|
border-style: none;
|
||||||
|
}
|
||||||
|
::-webkit-scrollbar-thumb {
|
||||||
|
border-radius: 10px;
|
||||||
|
background-color: #4b4b4b;
|
||||||
|
}
|
||||||
|
border-top: 1px solid #b8b8b8;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const ExchangesRow = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Icon = styled.img`
|
||||||
|
width: 20px;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Information = styled.img`
|
||||||
|
width: 35px;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Exchange = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
background-color: #b5d2e0;
|
||||||
|
border-radius: 2px;
|
||||||
|
width: 280px;
|
||||||
|
margin: 10px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0.5rem;
|
||||||
|
line-height:2;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const ExchangeTitle = styled.p`
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: bold;
|
||||||
|
|
||||||
|
margin:0;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const ExchangeParagraph = styled.p`
|
||||||
|
font-size: 13px;
|
||||||
|
color: #1a1a1a;
|
||||||
|
margin:0;
|
||||||
|
`;
|
||||||
|
|
||||||
|
export const Transfer = ({ handleClose, isTransferOpen }: TransferProps) => {
|
||||||
|
const { basket, tour, selectBasketCourses } = useContext(coursesContext)!;
|
||||||
|
// const basketCourseGroups = useMemo(() => selectBasketCourseGroups(course.name), []);
|
||||||
|
const basketCourses = selectBasketCourses();
|
||||||
|
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
|
// const groups = selectGroups();
|
||||||
|
const [input, setInput] = useState('');
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
|
||||||
|
const [assignmentsClasses, setAssignmentsClasses] = useState<Array<any>>([]);
|
||||||
|
const [selectedAssignmentsClasses, setSelectedAssignmentsClasses] = useState<any>('');
|
||||||
|
const [selectedGroup, setSelectedGroup] = useState<any>('');
|
||||||
|
const [groups, setGroups] = useState<any>([]);
|
||||||
|
const [exchanges, setExchanges] = useState<any>(null);
|
||||||
|
const [save, setSave] = useState(false);
|
||||||
|
// const allGroups
|
||||||
|
const handleSelectedAssignmentsGroupChange = (event: React.ChangeEvent<{ value: unknown }>) => {
|
||||||
|
setSelectedAssignmentsClasses(event.target.value as any);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleGroupsChange = (event: React.ChangeEvent<{ value: unknown }>) => {
|
||||||
|
setSelectedGroup(event.target.value as any);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleChange = (event: ChangeEvent<HTMLInputElement>) => setInput(event.target.value);
|
||||||
|
const handleShowDropdown = () => setOpen(true);
|
||||||
|
|
||||||
|
const handleCloseDropdown = () => setOpen(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (selectedAssignmentsClasses) {
|
||||||
|
const allGroups = basketCourses.filter((el) => el.name === selectedAssignmentsClasses.name);
|
||||||
|
const allClasses = allGroups[0]?.classes;
|
||||||
|
if (allClasses) {
|
||||||
|
const filteredClasses = allClasses.filter((el: any) => {
|
||||||
|
return el.time !== selectedAssignmentsClasses.time;
|
||||||
|
});
|
||||||
|
setGroups(filteredClasses);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [selectedAssignmentsClasses]);
|
||||||
|
|
||||||
|
const getExchanges = async () => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/exchanges/exchange/all`);
|
||||||
|
setExchanges(data);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const getAssignmentsGroups = async () => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/assignments`);
|
||||||
|
const classes = data.filter((el: any) => el.type === 'CLASS');
|
||||||
|
setAssignmentsClasses(classes);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
getExchanges();
|
||||||
|
getAssignmentsGroups();
|
||||||
|
}, [isTransferOpen, save]);
|
||||||
|
|
||||||
|
const createExchange = async (groupsIds: Array<number>) => {
|
||||||
|
try {
|
||||||
|
const response = await axiosInstance.post(
|
||||||
|
`${process.env.REACT_APP_API_URL}/api/v1/exchanges/exchange`,
|
||||||
|
JSON.stringify({ assignment: groupsIds[0], group: groupsIds[1] }),
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
setSelectedGroup('');
|
||||||
|
setSelectedAssignmentsClasses('');
|
||||||
|
setSave(!save);
|
||||||
|
};
|
||||||
|
|
||||||
|
const deleteExchange = async (id: number) => {
|
||||||
|
try {
|
||||||
|
const response = await axiosInstance.delete(`${process.env.REACT_APP_API_URL}/api/v1/exchanges/exchange/${id}`);
|
||||||
|
getExchanges();
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Modal
|
<Modal
|
||||||
className={classes.wrapper}
|
className={classes.wrapper}
|
||||||
open={isOpen}
|
open={isTransferOpen}
|
||||||
onClose={handleClose}
|
onClose={handleClose}
|
||||||
aria-labelledby="simple-modal-title"
|
aria-labelledby="simple-modal-title"
|
||||||
aria-describedby="simple-modal-description"
|
aria-describedby="simple-modal-description"
|
||||||
>
|
>
|
||||||
<Fade in={isOpen}>
|
<Fade in={isTransferOpen}>
|
||||||
|
{tour === 'FIRST_TOUR' ? (
|
||||||
<TransferStyled>
|
<TransferStyled>
|
||||||
|
<Information src={InformationIcon}></Information>
|
||||||
|
<p>Wymiana przedmiotami jest dostępna dopiero podczas drugiej tury</p>
|
||||||
|
<p>Wymianie podlegają tylko zaakceptowane grupy przedmiotów</p>
|
||||||
|
<p>Wymiana grupami odbywa się tylko w obrębie danego przedmiotu</p></TransferStyled>
|
||||||
|
) : (
|
||||||
|
<TransferStyled>
|
||||||
|
<InputWrapper>
|
||||||
<TransferGiveStyled>
|
<TransferGiveStyled>
|
||||||
<TransferTextStyled>Oddam</TransferTextStyled>
|
<TransferTextStyled>Oddam</TransferTextStyled>
|
||||||
<TransferInputStyled>
|
<TransferInputStyled>
|
||||||
{' '}
|
<FormControl>
|
||||||
<Input
|
<Select
|
||||||
|
labelId="demo-simple-select-label"
|
||||||
|
id="assignments-groups"
|
||||||
|
value={selectedAssignmentsClasses}
|
||||||
|
onChange={handleSelectedAssignmentsGroupChange}
|
||||||
placeholder="Wyszukaj..."
|
placeholder="Wyszukaj..."
|
||||||
inputProps={{ 'aria-label': 'description' }}
|
style={{ width: '200px' }}
|
||||||
className="top-bar__input-field"
|
>
|
||||||
/>
|
{assignmentsClasses.map((el: any, index: number) => {
|
||||||
|
return (
|
||||||
|
<MenuItem
|
||||||
|
key={index}
|
||||||
|
value={el}
|
||||||
|
style={{
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
textAlign: 'center',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{`${el.name} `}
|
||||||
|
<br></br>
|
||||||
|
{`(${dayMapping[el.day]} ${el.time} - ${el.endTime})`}
|
||||||
|
</MenuItem>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Select>
|
||||||
|
</FormControl>
|
||||||
</TransferInputStyled>
|
</TransferInputStyled>
|
||||||
</TransferGiveStyled>
|
</TransferGiveStyled>
|
||||||
|
<SaveWrapper>
|
||||||
|
{' '}
|
||||||
|
<SaveButton
|
||||||
|
onClick={() => {
|
||||||
|
createExchange([selectedAssignmentsClasses.id, selectedGroup.id]);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Zaproponuj wymianę
|
||||||
|
</SaveButton>
|
||||||
|
</SaveWrapper>
|
||||||
<TransferReceiveStyled>
|
<TransferReceiveStyled>
|
||||||
<TransferTextStyled>Przyjmę</TransferTextStyled>
|
<TransferTextStyled>Przyjmę</TransferTextStyled>
|
||||||
<TransferInputStyled>
|
<TransferInputStyled>
|
||||||
{' '}
|
<FormControl disabled={selectedAssignmentsClasses ? false : true}>
|
||||||
<Input
|
<Select
|
||||||
|
labelId="demo-simple-select-label"
|
||||||
|
id="assignments-groups"
|
||||||
|
value={selectedGroup}
|
||||||
|
onChange={handleGroupsChange}
|
||||||
placeholder="Wyszukaj..."
|
placeholder="Wyszukaj..."
|
||||||
inputProps={{ 'aria-label': 'description' }}
|
style={{ width: '200px' }}
|
||||||
className="top-bar__input-field"
|
>
|
||||||
/>
|
{groups.map((el: any, index: number) => {
|
||||||
|
return (
|
||||||
|
<MenuItem
|
||||||
|
key={index}
|
||||||
|
value={el}
|
||||||
|
style={{
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
textAlign: 'center',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{`${selectedAssignmentsClasses.name} `}
|
||||||
|
<br></br>
|
||||||
|
{`(${dayMapping[el.day]} ${el.time} - ${el.endTime})`}
|
||||||
|
</MenuItem>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Select>
|
||||||
|
</FormControl>
|
||||||
</TransferInputStyled>
|
</TransferInputStyled>
|
||||||
</TransferReceiveStyled>
|
</TransferReceiveStyled>
|
||||||
|
</InputWrapper>
|
||||||
|
<ExchangesWrapper>
|
||||||
|
{exchanges ? (
|
||||||
|
exchanges.map((name: any, index: number) => (
|
||||||
|
<ExchangesRow key={index}>
|
||||||
|
{' '}
|
||||||
|
<Exchange>
|
||||||
|
<ExchangeTitle>{name.courseName}</ExchangeTitle>
|
||||||
|
<ExchangeParagraph>{name.ownedAssignment.lecturer} </ExchangeParagraph>
|
||||||
|
<ExchangeParagraph> {dayMapping[name.ownedAssignment.day]} </ExchangeParagraph>
|
||||||
|
<ExchangeParagraph>
|
||||||
|
{name.ownedAssignment.time} - {name.ownedAssignment.endTime}
|
||||||
|
</ExchangeParagraph>
|
||||||
|
</Exchange>
|
||||||
|
<Icon alt="transfer" src={TransferIcon} />
|
||||||
|
<Exchange>
|
||||||
|
<ExchangeTitle>{name.courseName}</ExchangeTitle>
|
||||||
|
<ExchangeParagraph>{name.desiredGroup.lecturer} </ExchangeParagraph>
|
||||||
|
<ExchangeParagraph> {dayMapping[name.desiredGroup.day]} </ExchangeParagraph>
|
||||||
|
<ExchangeParagraph>
|
||||||
|
{name.desiredGroup.time} - {name.desiredGroup.endTime}
|
||||||
|
</ExchangeParagraph>
|
||||||
|
</Exchange>{' '}
|
||||||
|
<BinIcon
|
||||||
|
onClick={(e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
const id = Number(e.currentTarget.id);
|
||||||
|
deleteExchange(id);
|
||||||
|
}}
|
||||||
|
id={name.id}
|
||||||
|
></BinIcon>
|
||||||
|
</ExchangesRow>
|
||||||
|
))
|
||||||
|
) : (
|
||||||
|
<div></div>
|
||||||
|
)}
|
||||||
|
</ExchangesWrapper>
|
||||||
</TransferStyled>
|
</TransferStyled>
|
||||||
|
)}
|
||||||
</Fade>
|
</Fade>
|
||||||
</Modal>
|
</Modal>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
20
src/components/__tests__/Admin.test.jsx
Normal file
20
src/components/__tests__/Admin.test.jsx
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { cleanup, fireEvent, screen } from '@testing-library/react';
|
||||||
|
import '@testing-library/jest-dom/extend-expect';
|
||||||
|
import { customRender } from '../../customRender';
|
||||||
|
import { Admin } from '../Admin';
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
delete window.location;
|
||||||
|
window.location = { replace: jest.fn() };
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
window.location = location;
|
||||||
|
});
|
||||||
|
|
||||||
|
test('renders component', async () => {
|
||||||
|
const addItem = jest.fn();
|
||||||
|
customRender(<Admin />);
|
||||||
|
expect(screen.getByText(/Pokaż plan/i)).toBeInTheDocument();
|
||||||
|
});
|
||||||
21
src/components/__tests__/App.test.jsx
Normal file
21
src/components/__tests__/App.test.jsx
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { cleanup, fireEvent, screen } from '@testing-library/react';
|
||||||
|
import '@testing-library/jest-dom/extend-expect';
|
||||||
|
import { customRender } from '../../customRender';
|
||||||
|
import { App } from '../App';
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
delete window.location;
|
||||||
|
window.location = { replace: jest.fn() };
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
window.location = location;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(cleanup);
|
||||||
|
|
||||||
|
test('renders application', async () => {
|
||||||
|
customRender(<App />);
|
||||||
|
expect(screen.getByText(/plan na plan/i)).toBeInTheDocument();
|
||||||
|
});
|
||||||
29
src/components/__tests__/Rightbar.test.jsx
Normal file
29
src/components/__tests__/Rightbar.test.jsx
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { cleanup, fireEvent, waitForElement, screen, waitFor } from '@testing-library/react';
|
||||||
|
import '@testing-library/jest-dom/extend-expect';
|
||||||
|
import { customRender } from '../../customRender';
|
||||||
|
import Topbar from '../Topbar';
|
||||||
|
import { Rightbar } from '../Rightbar';
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
delete window.location;
|
||||||
|
window.location = { replace: jest.fn() };
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
window.location = location;
|
||||||
|
});
|
||||||
|
|
||||||
|
test('renders component', async () => {
|
||||||
|
const addItem = jest.fn();
|
||||||
|
customRender(<Rightbar handrleTransfer={() => {}} />);
|
||||||
|
expect(screen.getByText(/zapisz/i)).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('component handles button click', async () => {
|
||||||
|
customRender(<Rightbar />);
|
||||||
|
fireEvent.click(screen.getByText(/zapisz/i));
|
||||||
|
// await waitFor(() => {
|
||||||
|
// expect(screen.getByText(/zapisywanie planu nie powiodło się/i)).toBeInTheDocument();
|
||||||
|
// });
|
||||||
|
});
|
||||||
20
src/components/__tests__/Scheduler.test.jsx
Normal file
20
src/components/__tests__/Scheduler.test.jsx
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { cleanup, fireEvent, waitForElement, screen } from '@testing-library/react';
|
||||||
|
import '@testing-library/jest-dom/extend-expect';
|
||||||
|
import { customRender,customRenderCAS } from '../../customRender';
|
||||||
|
import {Scheduler} from '../Scheduler';
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
delete window.location;
|
||||||
|
window.location = { replace: jest.fn() };
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
window.location = location;
|
||||||
|
});
|
||||||
|
|
||||||
|
test('renders component', async () => {
|
||||||
|
const addItem = jest.fn();
|
||||||
|
customRender(<Scheduler/>);
|
||||||
|
expect(screen.getByText(/Poniedziałek/i)).toBeInTheDocument();
|
||||||
|
});
|
||||||
25
src/components/__tests__/SelectMenu.test.jsx
Normal file
25
src/components/__tests__/SelectMenu.test.jsx
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { cleanup, fireEvent, waitForElement, screen } from '@testing-library/react';
|
||||||
|
import '@testing-library/jest-dom/extend-expect';
|
||||||
|
import { customRender,customRenderCAS } from '../../customRender';
|
||||||
|
import {SelectMenu} from '../SelectMenu';
|
||||||
|
import { Select } from '@material-ui/core';
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
delete window.location;
|
||||||
|
window.location = { replace: jest.fn() };
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
window.location = location;
|
||||||
|
});
|
||||||
|
|
||||||
|
test('not render component for student', async () => {
|
||||||
|
customRender(<SelectMenu/>);
|
||||||
|
expect(screen.queryByText(/przedmioty/i)).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('not render component for deanery', async () => {
|
||||||
|
customRenderCAS(<SelectMenu/>);
|
||||||
|
expect(screen.queryByText(/przedmioty/i)).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
26
src/components/__tests__/Statistics.test.jsx
Normal file
26
src/components/__tests__/Statistics.test.jsx
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { cleanup, fireEvent, waitForElement, screen } from '@testing-library/react';
|
||||||
|
import '@testing-library/jest-dom/extend-expect';
|
||||||
|
import { customRender } from '../../customRender';
|
||||||
|
import Topbar from '../Topbar';
|
||||||
|
import { Statistics } from '../Statistics';
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
delete window.location;
|
||||||
|
window.location = { replace: jest.fn() };
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
window.location = location;
|
||||||
|
});
|
||||||
|
|
||||||
|
test('renders component', async () => {
|
||||||
|
customRender(<Statistics/>);
|
||||||
|
expect(screen.getByText(/Studentów bez zaakceptowanego pełengo planu/i)).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('renders component', async () => {
|
||||||
|
customRender(<Statistics/>);
|
||||||
|
expect(screen.getByText(/Zapisanych sutdentów do grup/i)).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
31
src/components/__tests__/Topbar.test.jsx
Normal file
31
src/components/__tests__/Topbar.test.jsx
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { cleanup, fireEvent, waitForElement, screen } from '@testing-library/react';
|
||||||
|
import '@testing-library/jest-dom/extend-expect';
|
||||||
|
import { customRender } from '../../customRender';
|
||||||
|
import Topbar from '../Topbar';
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
delete window.location;
|
||||||
|
window.location = { replace: jest.fn() };
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
window.location = location;
|
||||||
|
});
|
||||||
|
|
||||||
|
test('renders component', async () => {
|
||||||
|
customRender(<Topbar handrleTransfer={() => {}} />);
|
||||||
|
expect(screen.getByText(/plan na plan/i)).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('input should display default placeholder for student', async () => {
|
||||||
|
const { getByPlaceholderText, getByText, debug } = customRender(<Topbar handleTransfer={() => {}} />);
|
||||||
|
setTimeout(()=>{const input = getByPlaceholderText('Wyszukaj przedmioty...');
|
||||||
|
expect(input).toBeInTheDocument();},2000);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('input should display changed value', async () => {
|
||||||
|
const { getByPlaceholderText, getByText, debug } = customRender(<Topbar handleTransfer={() => {}} />);
|
||||||
|
setTimeout(()=>{ const input = getByPlaceholderText('Wyszukaj przedmioty...');
|
||||||
|
fireEvent.change(input, { target: { value: '122' } });expect(input.value).toBe("122");},2000);
|
||||||
|
});
|
||||||
@ -1,6 +1,7 @@
|
|||||||
import React, { useState, useEffect, createContext, ReactNode } from 'react';
|
import React, { useState, useEffect, createContext, ReactNode } from 'react';
|
||||||
import { LoggedUser } from '../types';
|
import { LoggedUser } from '../types';
|
||||||
import { axiosInstance } from '../utils/axiosInstance';
|
import { axiosInstance, getNewTokens } from '../utils/axiosInstance';
|
||||||
|
|
||||||
|
|
||||||
export interface CASContext {
|
export interface CASContext {
|
||||||
user: LoggedUser | undefined;
|
user: LoggedUser | undefined;
|
||||||
@ -42,6 +43,9 @@ export const CASProvider = ({ children }: CASProviderProps) => {
|
|||||||
localStorage.setItem('refreshToken', user.refreshToken);
|
localStorage.setItem('refreshToken', user.refreshToken);
|
||||||
setIsFetchingToken(false);
|
setIsFetchingToken(false);
|
||||||
}
|
}
|
||||||
|
else{
|
||||||
|
getNewTokens();
|
||||||
|
}
|
||||||
const token = localStorage.getItem('userToken');
|
const token = localStorage.getItem('userToken');
|
||||||
const refreshToken = localStorage.getItem('refreshToken');
|
const refreshToken = localStorage.getItem('refreshToken');
|
||||||
const role = localStorage.getItem('userPrivilige');
|
const role = localStorage.getItem('userPrivilige');
|
||||||
|
|||||||
@ -21,6 +21,9 @@ interface CourseContext {
|
|||||||
userID: string;
|
userID: string;
|
||||||
isDataLoading: boolean;
|
isDataLoading: boolean;
|
||||||
historyBasket: Array<Basket>;
|
historyBasket: Array<Basket>;
|
||||||
|
tour: string;
|
||||||
|
isSavingLoading: boolean;
|
||||||
|
getCurrentTour: () => void;
|
||||||
addCourseToBasket: (courses: Course) => void;
|
addCourseToBasket: (courses: Course) => void;
|
||||||
changeHoveredGroup: (group: Group | null) => void;
|
changeHoveredGroup: (group: Group | null) => void;
|
||||||
changeGroupInBasket: (group: any, courseId: number) => void;
|
changeGroupInBasket: (group: any, courseId: number) => void;
|
||||||
@ -32,7 +35,8 @@ interface CourseContext {
|
|||||||
selectHistorySchedulerEvents: () => Array<SchedulerEvent>;
|
selectHistorySchedulerEvents: () => Array<SchedulerEvent>;
|
||||||
selectBasketNames: () => Array<string>;
|
selectBasketNames: () => Array<string>;
|
||||||
selectBasketCourses: () => Array<Course>;
|
selectBasketCourses: () => Array<Course>;
|
||||||
selectBasketCourseGroups: (courseId: number) => { lecture: Group | undefined; classes: Group | undefined };
|
selectBasketCourseGroups: (courseName: string) => { lecture: Group | undefined; classes: Group | undefined };
|
||||||
|
selectGroups: () => Array<Group>;
|
||||||
getNewestStudentTimetable: (studentId: string) => void;
|
getNewestStudentTimetable: (studentId: string) => void;
|
||||||
getStudentTimetablesHistory: (studentId: string) => void;
|
getStudentTimetablesHistory: (studentId: string) => void;
|
||||||
changeDataLoading: (isLoading: boolean) => void;
|
changeDataLoading: (isLoading: boolean) => void;
|
||||||
@ -56,6 +60,8 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
const [userID, setUserID] = useState('');
|
const [userID, setUserID] = useState('');
|
||||||
const [hoveredGroup, setHoveredGroup] = useState<Group | undefined | null>(null);
|
const [hoveredGroup, setHoveredGroup] = useState<Group | undefined | null>(null);
|
||||||
const [isDataLoading, setIsDataLoading] = useState(false);
|
const [isDataLoading, setIsDataLoading] = useState(false);
|
||||||
|
const [tour, setTour] = useState('');
|
||||||
|
const [isSavingLoading, setIsSavingLoading] = useState(false);
|
||||||
|
|
||||||
const selectBasketIds = () => {
|
const selectBasketIds = () => {
|
||||||
const classesIds = basket.map((course) => course?.classes?.id).filter((course) => course !== undefined);
|
const classesIds = basket.map((course) => course?.classes?.id).filter((course) => course !== undefined);
|
||||||
@ -75,12 +81,12 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
|
|
||||||
const selectSchedulerEvents = () => {
|
const selectSchedulerEvents = () => {
|
||||||
return basket.reduce((res, el) => {
|
return basket.reduce((res, el) => {
|
||||||
const { name } = el;
|
const { name, symbol } = el;
|
||||||
if (el.classes) {
|
if (el.classes) {
|
||||||
res.push({ ...el.classes, name });
|
res.push({ ...el.classes, name, symbol});
|
||||||
}
|
}
|
||||||
if (el.lecture) {
|
if (el.lecture) {
|
||||||
res.push({ ...el.lecture, name });
|
res.push({ ...el.lecture, name, symbol });
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}, [] as Array<SchedulerEvent>);
|
}, [] as Array<SchedulerEvent>);
|
||||||
@ -99,9 +105,8 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
}, [] as Array<SchedulerEvent>);
|
}, [] as Array<SchedulerEvent>);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const selectBasketCourseGroups = (courseName: string) => {
|
||||||
const selectBasketCourseGroups = (courseId: number) => {
|
const course = basket.find(({ name }) => name === courseName);
|
||||||
const course = basket.find(({ id }) => id === courseId);
|
|
||||||
if (course !== undefined) {
|
if (course !== undefined) {
|
||||||
return { lecture: course.lecture, classes: course.classes };
|
return { lecture: course.lecture, classes: course.classes };
|
||||||
} else {
|
} else {
|
||||||
@ -109,6 +114,11 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const selectGroups = () => {
|
||||||
|
const groups = [];
|
||||||
|
return (courses as unknown) as Array<Group>;
|
||||||
|
};
|
||||||
|
|
||||||
const changeHoveredGroup = (group: Group | null) => setHoveredGroup(group);
|
const changeHoveredGroup = (group: Group | null) => setHoveredGroup(group);
|
||||||
|
|
||||||
const changeDataLoading = (isLoading: boolean) => setIsDataLoading(isLoading);
|
const changeDataLoading = (isLoading: boolean) => setIsDataLoading(isLoading);
|
||||||
@ -117,6 +127,7 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
const courseToBasket: Basket = {
|
const courseToBasket: Basket = {
|
||||||
name: course.name,
|
name: course.name,
|
||||||
id: course.id,
|
id: course.id,
|
||||||
|
symbol: course.symbol,
|
||||||
classes: course.classes !== undefined ? course.classes[0] : undefined,
|
classes: course.classes !== undefined ? course.classes[0] : undefined,
|
||||||
lecture: course.lectures !== undefined ? course.lectures[0] : undefined,
|
lecture: course.lectures !== undefined ? course.lectures[0] : undefined,
|
||||||
};
|
};
|
||||||
@ -134,6 +145,7 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const saveBasket = async (userID: string) => {
|
const saveBasket = async (userID: string) => {
|
||||||
|
setIsSavingLoading(true);
|
||||||
const basketIds = selectBasketIds();
|
const basketIds = selectBasketIds();
|
||||||
const action = (key: any) => (
|
const action = (key: any) => (
|
||||||
<>
|
<>
|
||||||
@ -150,27 +162,31 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/${userID}`,
|
`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/${userID}`,
|
||||||
JSON.stringify(basketIds),
|
JSON.stringify(basketIds),
|
||||||
);
|
);
|
||||||
enqueueSnackbar('Ustawienia zostały zapisane', {
|
enqueueSnackbar('Plan został zapisany', {
|
||||||
variant: 'success',
|
variant: 'success',
|
||||||
action,
|
action,
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('error: ', e);
|
console.log('error: ', e);
|
||||||
enqueueSnackbar('Ustawienia nie zostały zapisane', {
|
enqueueSnackbar('Zapisywanie niemożliwe w czasie bezturowym', {
|
||||||
variant: 'error',
|
variant: 'error',
|
||||||
action,
|
action,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
getStudentTimetablesHistory(userID);
|
getStudentTimetablesHistory(userID);
|
||||||
|
setIsSavingLoading(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeGroupInBasket = (choosenGroup: any, courseId: number) => {
|
const changeGroupInBasket = (choosenGroup: any, courseId: number) => {
|
||||||
const basketCourse = basket.filter((course) => course.id === courseId)[0];
|
const basketCourse = basket.filter((course) => course.id === courseId)[0];
|
||||||
if (choosenGroup.lecture && choosenGroup.classes)
|
if (choosenGroup.lecture && choosenGroup.classes) {
|
||||||
{
|
const prev = choosenGroup.prev === 'lecture' ? choosenGroup.lecture : choosenGroup.classes;
|
||||||
const prev = choosenGroup.prev==="lecture"?choosenGroup.lecture : choosenGroup.classes
|
|
||||||
setBasket(
|
setBasket(
|
||||||
basket.map((basket) => (basket.id === basketCourse.id ? { ...basket, lecture: choosenGroup.lecture, classes:choosenGroup.classes } : basket)),
|
basket.map((basket) =>
|
||||||
|
basket.id === basketCourse.id
|
||||||
|
? { ...basket, lecture: choosenGroup.lecture, classes: choosenGroup.classes }
|
||||||
|
: basket,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
changeHoveredGroup(prev);
|
changeHoveredGroup(prev);
|
||||||
}
|
}
|
||||||
@ -220,7 +236,6 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
const { data } = await axiosInstance.get<Array<TimetableHistory> | []>(
|
const { data } = await axiosInstance.get<Array<TimetableHistory> | []>(
|
||||||
`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/${studentId}?groups=true`,
|
`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/${studentId}?groups=true`,
|
||||||
);
|
);
|
||||||
console.log('data is mordo: ', data);
|
|
||||||
setTimetableHistory(data);
|
setTimetableHistory(data);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e);
|
console.log(e);
|
||||||
@ -264,13 +279,22 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log('baskeeeeeet: ', basket);
|
|
||||||
setHistoryBasket(basket);
|
setHistoryBasket(basket);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getCurrentTour = async () => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/configurator/config/tour`);
|
||||||
|
setTour(data.currentTour);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setIsDataLoading(true);
|
setIsDataLoading(true);
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
getCurrentTour();
|
||||||
fetchCourses();
|
fetchCourses();
|
||||||
getNewestTimetable();
|
getNewestTimetable();
|
||||||
setIsDataLoading(false);
|
setIsDataLoading(false);
|
||||||
@ -287,6 +311,9 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
timetableHistory,
|
timetableHistory,
|
||||||
isDataLoading,
|
isDataLoading,
|
||||||
historyBasket,
|
historyBasket,
|
||||||
|
tour,
|
||||||
|
isSavingLoading,
|
||||||
|
getCurrentTour,
|
||||||
addCourseToBasket,
|
addCourseToBasket,
|
||||||
changeHoveredGroup,
|
changeHoveredGroup,
|
||||||
changeGroupInBasket,
|
changeGroupInBasket,
|
||||||
@ -298,6 +325,7 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
selectBasketNames,
|
selectBasketNames,
|
||||||
selectBasketCourses,
|
selectBasketCourses,
|
||||||
selectBasketCourseGroups,
|
selectBasketCourseGroups,
|
||||||
|
selectGroups,
|
||||||
getNewestStudentTimetable,
|
getNewestStudentTimetable,
|
||||||
changeStudent,
|
changeStudent,
|
||||||
getStudentTimetablesHistory,
|
getStudentTimetablesHistory,
|
||||||
|
|||||||
33
src/customRender.jsx
Normal file
33
src/customRender.jsx
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { render, screen } from '@testing-library/react';
|
||||||
|
import { CASProvider } from './contexts/CASProvider';
|
||||||
|
import { CoursesProvider } from './contexts/CoursesProvider';
|
||||||
|
import { StudentsProvider } from './contexts/StudentsProvider';
|
||||||
|
import { SnackbarProvider } from 'notistack';
|
||||||
|
|
||||||
|
export const customRender = (ui, CASValue = {}, studentsValue = {}, coursesValue = {}) => {
|
||||||
|
return render(
|
||||||
|
<SnackbarProvider>
|
||||||
|
<CASProvider value={20}>
|
||||||
|
<StudentsProvider value={50}>
|
||||||
|
<CoursesProvider value={100}>{ui}</CoursesProvider>
|
||||||
|
</StudentsProvider>
|
||||||
|
</CASProvider>
|
||||||
|
</SnackbarProvider>,
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const customRenderCAS = (ui, CASValue = {}, studentsValue = {}, coursesValue = {}) => {
|
||||||
|
|
||||||
|
const user={authorityRole: "DEANERY", email: "test@test.pl", id: "123"}
|
||||||
|
|
||||||
|
return render(
|
||||||
|
<SnackbarProvider>
|
||||||
|
<CASProvider value={{user}}>
|
||||||
|
<StudentsProvider value={50}>
|
||||||
|
<CoursesProvider value={100}>{ui}</CoursesProvider>
|
||||||
|
</StudentsProvider>
|
||||||
|
</CASProvider>
|
||||||
|
</SnackbarProvider>,
|
||||||
|
);
|
||||||
|
};
|
||||||
@ -6,6 +6,7 @@ export enum GroupType {
|
|||||||
export interface Basket {
|
export interface Basket {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
|
symbol?:string;
|
||||||
lecture?: Group;
|
lecture?: Group;
|
||||||
classes?: Group;
|
classes?: Group;
|
||||||
}
|
}
|
||||||
@ -20,11 +21,14 @@ export interface Group {
|
|||||||
type: GroupType;
|
type: GroupType;
|
||||||
capacity?: number;
|
capacity?: number;
|
||||||
takenPlaces: number;
|
takenPlaces: number;
|
||||||
|
isAccepted:boolean;
|
||||||
|
grNr: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Course {
|
export interface Course {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
|
symbol:string;
|
||||||
lectures?: Array<Group>;
|
lectures?: Array<Group>;
|
||||||
classes?: Array<Group>;
|
classes?: Array<Group>;
|
||||||
}
|
}
|
||||||
@ -53,6 +57,9 @@ export interface SchedulerEvent {
|
|||||||
capacity?: number;
|
capacity?: number;
|
||||||
takenPlaces: number;
|
takenPlaces: number;
|
||||||
name: string;
|
name: string;
|
||||||
|
isAccepted:boolean;
|
||||||
|
grNr?: number;
|
||||||
|
symbol?:string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface TimetableHistory {
|
export interface TimetableHistory {
|
||||||
|
|||||||
@ -3,12 +3,13 @@ import axios from 'axios';
|
|||||||
export const axiosInstance = axios.create();
|
export const axiosInstance = axios.create();
|
||||||
|
|
||||||
//getting new tokens
|
//getting new tokens
|
||||||
const getNewTokens = async () => {
|
export const getNewTokens = async () => {
|
||||||
try {
|
try {
|
||||||
const refreshToken = localStorage.getItem('refreshToken');
|
const refreshToken = localStorage.getItem('refreshToken');
|
||||||
const { data } = await axiosInstance.get(
|
const { data } = await axiosInstance.get(
|
||||||
`${process.env.REACT_APP_API_URL}/token/refresh?refreshToken=${refreshToken}`,
|
`${process.env.REACT_APP_API_URL}/token/refresh?refreshToken=${refreshToken}`,
|
||||||
);
|
);
|
||||||
|
localStorage.setItem('userPrivilige',data.authorityRole);
|
||||||
localStorage.setItem('userToken', data.token);
|
localStorage.setItem('userToken', data.token);
|
||||||
localStorage.setItem('refreshToken', data.refreshToken);
|
localStorage.setItem('refreshToken', data.refreshToken);
|
||||||
return data.token;
|
return data.token;
|
||||||
|
|||||||
301
yarn.lock
301
yarn.lock
@ -1138,7 +1138,7 @@
|
|||||||
"@babel/helper-plugin-utils" "^7.8.3"
|
"@babel/helper-plugin-utils" "^7.8.3"
|
||||||
"@babel/plugin-transform-typescript" "^7.9.0"
|
"@babel/plugin-transform-typescript" "^7.9.0"
|
||||||
|
|
||||||
"@babel/runtime-corejs3@^7.12.1":
|
"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.12.1":
|
||||||
version "7.12.5"
|
version "7.12.5"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz#ffee91da0eb4c6dae080774e94ba606368e414f4"
|
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz#ffee91da0eb4c6dae080774e94ba606368e414f4"
|
||||||
integrity sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==
|
integrity sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==
|
||||||
@ -1153,7 +1153,7 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
regenerator-runtime "^0.13.4"
|
regenerator-runtime "^0.13.4"
|
||||||
|
|
||||||
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7":
|
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
|
||||||
version "7.12.5"
|
version "7.12.5"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
|
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
|
||||||
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
|
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
|
||||||
@ -1515,6 +1515,17 @@
|
|||||||
"@types/istanbul-reports" "^1.1.1"
|
"@types/istanbul-reports" "^1.1.1"
|
||||||
"@types/yargs" "^13.0.0"
|
"@types/yargs" "^13.0.0"
|
||||||
|
|
||||||
|
"@jest/types@^26.6.2":
|
||||||
|
version "26.6.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
|
||||||
|
integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
|
||||||
|
dependencies:
|
||||||
|
"@types/istanbul-lib-coverage" "^2.0.0"
|
||||||
|
"@types/istanbul-reports" "^3.0.0"
|
||||||
|
"@types/node" "*"
|
||||||
|
"@types/yargs" "^15.0.0"
|
||||||
|
chalk "^4.0.0"
|
||||||
|
|
||||||
"@material-ui/core@^4.10.0":
|
"@material-ui/core@^4.10.0":
|
||||||
version "4.11.0"
|
version "4.11.0"
|
||||||
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a"
|
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a"
|
||||||
@ -1734,6 +1745,47 @@
|
|||||||
"@svgr/plugin-svgo" "^4.3.1"
|
"@svgr/plugin-svgo" "^4.3.1"
|
||||||
loader-utils "^1.2.3"
|
loader-utils "^1.2.3"
|
||||||
|
|
||||||
|
"@testing-library/dom@^7.28.1":
|
||||||
|
version "7.29.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.29.0.tgz#60b18065bab50a5cde21fe80275a47a43024d9cc"
|
||||||
|
integrity sha512-0hhuJSmw/zLc6ewR9cVm84TehuTd7tbqBX9pRNSp8znJ9gTmSgesdbiGZtt8R6dL+2rgaPFp9Yjr7IU1HWm49w==
|
||||||
|
dependencies:
|
||||||
|
"@babel/code-frame" "^7.10.4"
|
||||||
|
"@babel/runtime" "^7.12.5"
|
||||||
|
"@types/aria-query" "^4.2.0"
|
||||||
|
aria-query "^4.2.2"
|
||||||
|
chalk "^4.1.0"
|
||||||
|
dom-accessibility-api "^0.5.4"
|
||||||
|
lz-string "^1.4.4"
|
||||||
|
pretty-format "^26.6.2"
|
||||||
|
|
||||||
|
"@testing-library/jest-dom@^5.11.6":
|
||||||
|
version "5.11.6"
|
||||||
|
resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.6.tgz#782940e82e5cd17bc0a36f15156ba16f3570ac81"
|
||||||
|
integrity sha512-cVZyUNRWwUKI0++yepYpYX7uhrP398I+tGz4zOlLVlUYnZS+Svuxv4fwLeCIy7TnBYKXUaOlQr3vopxL8ZfEnA==
|
||||||
|
dependencies:
|
||||||
|
"@babel/runtime" "^7.9.2"
|
||||||
|
"@types/testing-library__jest-dom" "^5.9.1"
|
||||||
|
aria-query "^4.2.2"
|
||||||
|
chalk "^3.0.0"
|
||||||
|
css "^3.0.0"
|
||||||
|
css.escape "^1.5.1"
|
||||||
|
lodash "^4.17.15"
|
||||||
|
redent "^3.0.0"
|
||||||
|
|
||||||
|
"@testing-library/react@^11.2.2":
|
||||||
|
version "11.2.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.2.tgz#099c6c195140ff069211143cb31c0f8337bdb7b7"
|
||||||
|
integrity sha512-jaxm0hwUjv+hzC+UFEywic7buDC9JQ1q3cDsrWVSDAPmLotfA6E6kUHlYm/zOeGCac6g48DR36tFHxl7Zb+N5A==
|
||||||
|
dependencies:
|
||||||
|
"@babel/runtime" "^7.12.5"
|
||||||
|
"@testing-library/dom" "^7.28.1"
|
||||||
|
|
||||||
|
"@types/aria-query@^4.2.0":
|
||||||
|
version "4.2.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
|
||||||
|
integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
|
||||||
|
|
||||||
"@types/babel__core@^7.1.0":
|
"@types/babel__core@^7.1.0":
|
||||||
version "7.1.12"
|
version "7.1.12"
|
||||||
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
|
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
|
||||||
@ -1808,6 +1860,21 @@
|
|||||||
"@types/istanbul-lib-coverage" "*"
|
"@types/istanbul-lib-coverage" "*"
|
||||||
"@types/istanbul-lib-report" "*"
|
"@types/istanbul-lib-report" "*"
|
||||||
|
|
||||||
|
"@types/istanbul-reports@^3.0.0":
|
||||||
|
version "3.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
|
||||||
|
integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
|
||||||
|
dependencies:
|
||||||
|
"@types/istanbul-lib-report" "*"
|
||||||
|
|
||||||
|
"@types/jest@*", "@types/jest@26.x", "@types/jest@^26.0.19":
|
||||||
|
version "26.0.19"
|
||||||
|
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.19.tgz#e6fa1e3def5842ec85045bd5210e9bb8289de790"
|
||||||
|
integrity sha512-jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ==
|
||||||
|
dependencies:
|
||||||
|
jest-diff "^26.0.0"
|
||||||
|
pretty-format "^26.0.0"
|
||||||
|
|
||||||
"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5":
|
"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5":
|
||||||
version "7.0.6"
|
version "7.0.6"
|
||||||
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
|
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
|
||||||
@ -1889,6 +1956,13 @@
|
|||||||
"@types/react-native" "*"
|
"@types/react-native" "*"
|
||||||
csstype "^3.0.2"
|
csstype "^3.0.2"
|
||||||
|
|
||||||
|
"@types/testing-library__jest-dom@^5.9.1":
|
||||||
|
version "5.9.5"
|
||||||
|
resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz#5bf25c91ad2d7b38f264b12275e5c92a66d849b0"
|
||||||
|
integrity sha512-ggn3ws+yRbOHog9GxnXiEZ/35Mow6YtPZpd7Z5mKDeZS/o7zx3yAle0ov/wjhVB5QT4N2Dt+GNoGCdqkBGCajQ==
|
||||||
|
dependencies:
|
||||||
|
"@types/jest" "*"
|
||||||
|
|
||||||
"@types/yargs-parser@*":
|
"@types/yargs-parser@*":
|
||||||
version "15.0.0"
|
version "15.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
|
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
|
||||||
@ -1901,6 +1975,13 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
"@types/yargs-parser" "*"
|
"@types/yargs-parser" "*"
|
||||||
|
|
||||||
|
"@types/yargs@^15.0.0":
|
||||||
|
version "15.0.12"
|
||||||
|
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74"
|
||||||
|
integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==
|
||||||
|
dependencies:
|
||||||
|
"@types/yargs-parser" "*"
|
||||||
|
|
||||||
"@typescript-eslint/eslint-plugin@^2.10.0":
|
"@typescript-eslint/eslint-plugin@^2.10.0":
|
||||||
version "2.34.0"
|
version "2.34.0"
|
||||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
|
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
|
||||||
@ -2319,7 +2400,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
color-convert "^1.9.0"
|
color-convert "^1.9.0"
|
||||||
|
|
||||||
ansi-styles@^4.1.0:
|
ansi-styles@^4.0.0, ansi-styles@^4.1.0:
|
||||||
version "4.3.0"
|
version "4.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
|
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
|
||||||
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
|
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
|
||||||
@ -2362,6 +2443,14 @@ aria-query@^3.0.0:
|
|||||||
ast-types-flow "0.0.7"
|
ast-types-flow "0.0.7"
|
||||||
commander "^2.11.0"
|
commander "^2.11.0"
|
||||||
|
|
||||||
|
aria-query@^4.2.2:
|
||||||
|
version "4.2.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
|
||||||
|
integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==
|
||||||
|
dependencies:
|
||||||
|
"@babel/runtime" "^7.10.2"
|
||||||
|
"@babel/runtime-corejs3" "^7.10.2"
|
||||||
|
|
||||||
arity-n@^1.0.4:
|
arity-n@^1.0.4:
|
||||||
version "1.0.4"
|
version "1.0.4"
|
||||||
resolved "https://registry.yarnpkg.com/arity-n/-/arity-n-1.0.4.tgz#d9e76b11733e08569c0847ae7b39b2860b30b745"
|
resolved "https://registry.yarnpkg.com/arity-n/-/arity-n-1.0.4.tgz#d9e76b11733e08569c0847ae7b39b2860b30b745"
|
||||||
@ -2996,6 +3085,13 @@ browserslist@^4.14.5, browserslist@^4.14.6, browserslist@^4.9.1:
|
|||||||
escalade "^3.1.1"
|
escalade "^3.1.1"
|
||||||
node-releases "^1.1.66"
|
node-releases "^1.1.66"
|
||||||
|
|
||||||
|
bs-logger@0.x:
|
||||||
|
version "0.2.6"
|
||||||
|
resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
|
||||||
|
integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
|
||||||
|
dependencies:
|
||||||
|
fast-json-stable-stringify "2.x"
|
||||||
|
|
||||||
bser@2.1.1:
|
bser@2.1.1:
|
||||||
version "2.1.1"
|
version "2.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
|
resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
|
||||||
@ -3003,7 +3099,7 @@ bser@2.1.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
node-int64 "^0.4.0"
|
node-int64 "^0.4.0"
|
||||||
|
|
||||||
buffer-from@^1.0.0:
|
buffer-from@1.x, buffer-from@^1.0.0:
|
||||||
version "1.1.1"
|
version "1.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
|
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
|
||||||
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
|
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
|
||||||
@ -3219,7 +3315,15 @@ chalk@^1.1.3:
|
|||||||
strip-ansi "^3.0.0"
|
strip-ansi "^3.0.0"
|
||||||
supports-color "^2.0.0"
|
supports-color "^2.0.0"
|
||||||
|
|
||||||
chalk@^4.1.0:
|
chalk@^3.0.0:
|
||||||
|
version "3.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
|
||||||
|
integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
|
||||||
|
dependencies:
|
||||||
|
ansi-styles "^4.1.0"
|
||||||
|
supports-color "^7.1.0"
|
||||||
|
|
||||||
|
chalk@^4.0.0, chalk@^4.1.0:
|
||||||
version "4.1.0"
|
version "4.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
|
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
|
||||||
integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
|
integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
|
||||||
@ -3856,6 +3960,11 @@ css-what@^3.2.1:
|
|||||||
resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
|
resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
|
||||||
integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
|
integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
|
||||||
|
|
||||||
|
css.escape@^1.5.1:
|
||||||
|
version "1.5.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
|
||||||
|
integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
|
||||||
|
|
||||||
css@^2.0.0:
|
css@^2.0.0:
|
||||||
version "2.2.4"
|
version "2.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
|
resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
|
||||||
@ -3866,6 +3975,15 @@ css@^2.0.0:
|
|||||||
source-map-resolve "^0.5.2"
|
source-map-resolve "^0.5.2"
|
||||||
urix "^0.1.0"
|
urix "^0.1.0"
|
||||||
|
|
||||||
|
css@^3.0.0:
|
||||||
|
version "3.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
|
||||||
|
integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
|
||||||
|
dependencies:
|
||||||
|
inherits "^2.0.4"
|
||||||
|
source-map "^0.6.1"
|
||||||
|
source-map-resolve "^0.6.0"
|
||||||
|
|
||||||
cssdb@^4.4.0:
|
cssdb@^4.4.0:
|
||||||
version "4.4.0"
|
version "4.4.0"
|
||||||
resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
|
resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
|
||||||
@ -4012,6 +4130,11 @@ data-urls@^1.0.0, data-urls@^1.1.0:
|
|||||||
whatwg-mimetype "^2.2.0"
|
whatwg-mimetype "^2.2.0"
|
||||||
whatwg-url "^7.0.0"
|
whatwg-url "^7.0.0"
|
||||||
|
|
||||||
|
date-fns@^2.16.1:
|
||||||
|
version "2.16.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
|
||||||
|
integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==
|
||||||
|
|
||||||
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
|
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
|
||||||
version "2.6.9"
|
version "2.6.9"
|
||||||
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
|
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
|
||||||
@ -4163,6 +4286,11 @@ diff-sequences@^24.9.0:
|
|||||||
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
|
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
|
||||||
integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
|
integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
|
||||||
|
|
||||||
|
diff-sequences@^26.6.2:
|
||||||
|
version "26.6.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
|
||||||
|
integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
|
||||||
|
|
||||||
diffie-hellman@^5.0.0:
|
diffie-hellman@^5.0.0:
|
||||||
version "5.0.3"
|
version "5.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
|
resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
|
||||||
@ -4229,6 +4357,11 @@ doctrine@^3.0.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
esutils "^2.0.2"
|
esutils "^2.0.2"
|
||||||
|
|
||||||
|
dom-accessibility-api@^0.5.4:
|
||||||
|
version "0.5.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz#b06d059cdd4a4ad9a79275f9d414a5c126241166"
|
||||||
|
integrity sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ==
|
||||||
|
|
||||||
dom-converter@^0.2:
|
dom-converter@^0.2:
|
||||||
version "0.2.0"
|
version "0.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
|
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
|
||||||
@ -5035,7 +5168,7 @@ fast-glob@^3.1.1:
|
|||||||
micromatch "^4.0.2"
|
micromatch "^4.0.2"
|
||||||
picomatch "^2.2.1"
|
picomatch "^2.2.1"
|
||||||
|
|
||||||
fast-json-stable-stringify@^2.0.0:
|
fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
|
||||||
version "2.1.0"
|
version "2.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
|
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
|
||||||
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
|
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
|
||||||
@ -5537,7 +5670,7 @@ globby@^6.1.0:
|
|||||||
pify "^2.0.0"
|
pify "^2.0.0"
|
||||||
pinkie-promise "^2.0.0"
|
pinkie-promise "^2.0.0"
|
||||||
|
|
||||||
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
|
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
|
||||||
version "4.2.4"
|
version "4.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
|
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
|
||||||
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
|
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
|
||||||
@ -6531,6 +6664,16 @@ jest-diff@^24.9.0:
|
|||||||
jest-get-type "^24.9.0"
|
jest-get-type "^24.9.0"
|
||||||
pretty-format "^24.9.0"
|
pretty-format "^24.9.0"
|
||||||
|
|
||||||
|
jest-diff@^26.0.0:
|
||||||
|
version "26.6.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
|
||||||
|
integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
|
||||||
|
dependencies:
|
||||||
|
chalk "^4.0.0"
|
||||||
|
diff-sequences "^26.6.2"
|
||||||
|
jest-get-type "^26.3.0"
|
||||||
|
pretty-format "^26.6.2"
|
||||||
|
|
||||||
jest-docblock@^24.3.0:
|
jest-docblock@^24.3.0:
|
||||||
version "24.9.0"
|
version "24.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
|
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
|
||||||
@ -6589,6 +6732,11 @@ jest-get-type@^24.9.0:
|
|||||||
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
|
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
|
||||||
integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
|
integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
|
||||||
|
|
||||||
|
jest-get-type@^26.3.0:
|
||||||
|
version "26.3.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
|
||||||
|
integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
|
||||||
|
|
||||||
jest-haste-map@^24.9.0:
|
jest-haste-map@^24.9.0:
|
||||||
version "24.9.0"
|
version "24.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
|
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
|
||||||
@ -6795,6 +6943,18 @@ jest-util@^24.0.0, jest-util@^24.9.0:
|
|||||||
slash "^2.0.0"
|
slash "^2.0.0"
|
||||||
source-map "^0.6.0"
|
source-map "^0.6.0"
|
||||||
|
|
||||||
|
jest-util@^26.1.0:
|
||||||
|
version "26.6.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
|
||||||
|
integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
|
||||||
|
dependencies:
|
||||||
|
"@jest/types" "^26.6.2"
|
||||||
|
"@types/node" "*"
|
||||||
|
chalk "^4.0.0"
|
||||||
|
graceful-fs "^4.2.4"
|
||||||
|
is-ci "^2.0.0"
|
||||||
|
micromatch "^4.0.2"
|
||||||
|
|
||||||
jest-validate@^24.9.0:
|
jest-validate@^24.9.0:
|
||||||
version "24.9.0"
|
version "24.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
|
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
|
||||||
@ -6996,6 +7156,13 @@ json3@^3.3.2:
|
|||||||
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
|
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
|
||||||
integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
|
integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
|
||||||
|
|
||||||
|
json5@2.x, json5@^2.1.2:
|
||||||
|
version "2.1.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
|
||||||
|
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
|
||||||
|
dependencies:
|
||||||
|
minimist "^1.2.5"
|
||||||
|
|
||||||
json5@^1.0.1:
|
json5@^1.0.1:
|
||||||
version "1.0.1"
|
version "1.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
|
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
|
||||||
@ -7003,13 +7170,6 @@ json5@^1.0.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
minimist "^1.2.0"
|
minimist "^1.2.0"
|
||||||
|
|
||||||
json5@^2.1.2:
|
|
||||||
version "2.1.3"
|
|
||||||
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
|
|
||||||
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
|
|
||||||
dependencies:
|
|
||||||
minimist "^1.2.5"
|
|
||||||
|
|
||||||
jsonfile@^4.0.0:
|
jsonfile@^4.0.0:
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
|
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
|
||||||
@ -7303,7 +7463,7 @@ lodash._reinterpolate@^3.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
|
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
|
||||||
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
|
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
|
||||||
|
|
||||||
lodash.memoize@^4.1.2:
|
lodash.memoize@4.x, lodash.memoize@^4.1.2:
|
||||||
version "4.1.2"
|
version "4.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
|
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
|
||||||
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
|
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
|
||||||
@ -7364,6 +7524,18 @@ lru-cache@^5.1.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
yallist "^3.0.2"
|
yallist "^3.0.2"
|
||||||
|
|
||||||
|
lru-cache@^6.0.0:
|
||||||
|
version "6.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
|
||||||
|
integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
|
||||||
|
dependencies:
|
||||||
|
yallist "^4.0.0"
|
||||||
|
|
||||||
|
lz-string@^1.4.4:
|
||||||
|
version "1.4.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
|
||||||
|
integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
|
||||||
|
|
||||||
make-dir@^2.0.0, make-dir@^2.1.0:
|
make-dir@^2.0.0, make-dir@^2.1.0:
|
||||||
version "2.1.0"
|
version "2.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
|
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
|
||||||
@ -7379,6 +7551,11 @@ make-dir@^3.0.2:
|
|||||||
dependencies:
|
dependencies:
|
||||||
semver "^6.0.0"
|
semver "^6.0.0"
|
||||||
|
|
||||||
|
make-error@1.x:
|
||||||
|
version "1.3.6"
|
||||||
|
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
|
||||||
|
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
|
||||||
|
|
||||||
makeerror@1.0.x:
|
makeerror@1.0.x:
|
||||||
version "1.0.11"
|
version "1.0.11"
|
||||||
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
|
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
|
||||||
@ -7560,6 +7737,11 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0:
|
|||||||
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
|
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
|
||||||
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
|
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
|
||||||
|
|
||||||
|
min-indent@^1.0.0:
|
||||||
|
version "1.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
|
||||||
|
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
|
||||||
|
|
||||||
mini-css-extract-plugin@0.9.0:
|
mini-css-extract-plugin@0.9.0:
|
||||||
version "0.9.0"
|
version "0.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
|
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
|
||||||
@ -7652,6 +7834,11 @@ mixin-object@^2.0.1:
|
|||||||
for-in "^0.1.3"
|
for-in "^0.1.3"
|
||||||
is-extendable "^0.1.1"
|
is-extendable "^0.1.1"
|
||||||
|
|
||||||
|
mkdirp@1.x:
|
||||||
|
version "1.0.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
|
||||||
|
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
|
||||||
|
|
||||||
mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
|
mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
|
||||||
version "0.5.5"
|
version "0.5.5"
|
||||||
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
|
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
|
||||||
@ -9191,6 +9378,16 @@ pretty-format@^24.9.0:
|
|||||||
ansi-styles "^3.2.0"
|
ansi-styles "^3.2.0"
|
||||||
react-is "^16.8.4"
|
react-is "^16.8.4"
|
||||||
|
|
||||||
|
pretty-format@^26.0.0, pretty-format@^26.6.2:
|
||||||
|
version "26.6.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
|
||||||
|
integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
|
||||||
|
dependencies:
|
||||||
|
"@jest/types" "^26.6.2"
|
||||||
|
ansi-regex "^5.0.0"
|
||||||
|
ansi-styles "^4.0.0"
|
||||||
|
react-is "^17.0.1"
|
||||||
|
|
||||||
process-nextick-args@~2.0.0:
|
process-nextick-args@~2.0.0:
|
||||||
version "2.0.1"
|
version "2.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
|
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
|
||||||
@ -9447,6 +9644,11 @@ react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.4:
|
|||||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
||||||
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
||||||
|
|
||||||
|
react-is@^17.0.1:
|
||||||
|
version "17.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
|
||||||
|
integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
|
||||||
|
|
||||||
react-lifecycles-compat@^3.0.4:
|
react-lifecycles-compat@^3.0.4:
|
||||||
version "3.0.4"
|
version "3.0.4"
|
||||||
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
|
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
|
||||||
@ -9548,15 +9750,14 @@ react-transition-group@^4.4.0:
|
|||||||
loose-envify "^1.4.0"
|
loose-envify "^1.4.0"
|
||||||
prop-types "^15.6.2"
|
prop-types "^15.6.2"
|
||||||
|
|
||||||
react@16.8.0:
|
react@16.9.0:
|
||||||
version "16.8.0"
|
version "16.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/react/-/react-16.8.0.tgz#8533f0e4af818f448a276eae71681d09e8dd970a"
|
resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
|
||||||
integrity sha512-g+nikW2D48kqgWSPwNo0NH9tIGG3DsQFlrtrQ1kj6W77z5ahyIHG0w8kPpz4Sdj6gyLnz0lEd/xsjOoGge2MYQ==
|
integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
|
||||||
dependencies:
|
dependencies:
|
||||||
loose-envify "^1.1.0"
|
loose-envify "^1.1.0"
|
||||||
object-assign "^4.1.1"
|
object-assign "^4.1.1"
|
||||||
prop-types "^15.6.2"
|
prop-types "^15.6.2"
|
||||||
scheduler "^0.13.0"
|
|
||||||
|
|
||||||
read-pkg-up@^2.0.0:
|
read-pkg-up@^2.0.0:
|
||||||
version "2.0.0"
|
version "2.0.0"
|
||||||
@ -9644,6 +9845,14 @@ recursive-readdir@2.2.2:
|
|||||||
dependencies:
|
dependencies:
|
||||||
minimatch "3.0.4"
|
minimatch "3.0.4"
|
||||||
|
|
||||||
|
redent@^3.0.0:
|
||||||
|
version "3.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
|
||||||
|
integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
|
||||||
|
dependencies:
|
||||||
|
indent-string "^4.0.0"
|
||||||
|
strip-indent "^3.0.0"
|
||||||
|
|
||||||
regenerate-unicode-properties@^8.2.0:
|
regenerate-unicode-properties@^8.2.0:
|
||||||
version "8.2.0"
|
version "8.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
|
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
|
||||||
@ -10049,14 +10258,6 @@ saxes@^3.1.9:
|
|||||||
dependencies:
|
dependencies:
|
||||||
xmlchars "^2.1.1"
|
xmlchars "^2.1.1"
|
||||||
|
|
||||||
scheduler@^0.13.0:
|
|
||||||
version "0.13.6"
|
|
||||||
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
|
|
||||||
integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
|
|
||||||
dependencies:
|
|
||||||
loose-envify "^1.1.0"
|
|
||||||
object-assign "^4.1.1"
|
|
||||||
|
|
||||||
scheduler@^0.19.1:
|
scheduler@^0.19.1:
|
||||||
version "0.19.1"
|
version "0.19.1"
|
||||||
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
|
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
|
||||||
@ -10110,6 +10311,13 @@ semver@7.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
|
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
|
||||||
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
|
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
|
||||||
|
|
||||||
|
semver@7.x:
|
||||||
|
version "7.3.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
|
||||||
|
integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
|
||||||
|
dependencies:
|
||||||
|
lru-cache "^6.0.0"
|
||||||
|
|
||||||
semver@^7.3.2:
|
semver@^7.3.2:
|
||||||
version "7.3.2"
|
version "7.3.2"
|
||||||
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
|
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
|
||||||
@ -10385,6 +10593,14 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
|
|||||||
source-map-url "^0.4.0"
|
source-map-url "^0.4.0"
|
||||||
urix "^0.1.0"
|
urix "^0.1.0"
|
||||||
|
|
||||||
|
source-map-resolve@^0.6.0:
|
||||||
|
version "0.6.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
|
||||||
|
integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
|
||||||
|
dependencies:
|
||||||
|
atob "^2.1.2"
|
||||||
|
decode-uri-component "^0.2.0"
|
||||||
|
|
||||||
source-map-support@^0.5.6, source-map-support@~0.5.12:
|
source-map-support@^0.5.6, source-map-support@~0.5.12:
|
||||||
version "0.5.19"
|
version "0.5.19"
|
||||||
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
|
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
|
||||||
@ -10714,6 +10930,13 @@ strip-eof@^1.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
|
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
|
||||||
integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
|
integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
|
||||||
|
|
||||||
|
strip-indent@^3.0.0:
|
||||||
|
version "3.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
|
||||||
|
integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
|
||||||
|
dependencies:
|
||||||
|
min-indent "^1.0.0"
|
||||||
|
|
||||||
strip-json-comments@^3.0.1:
|
strip-json-comments@^3.0.1:
|
||||||
version "3.1.1"
|
version "3.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
|
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
|
||||||
@ -10995,6 +11218,23 @@ tr46@^1.0.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
punycode "^2.1.0"
|
punycode "^2.1.0"
|
||||||
|
|
||||||
|
ts-jest@^26.4.4:
|
||||||
|
version "26.4.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.4.tgz#61f13fb21ab400853c532270e52cc0ed7e502c49"
|
||||||
|
integrity sha512-3lFWKbLxJm34QxyVNNCgXX1u4o/RV0myvA2y2Bxm46iGIjKlaY0own9gIckbjZJPn+WaJEnfPPJ20HHGpoq4yg==
|
||||||
|
dependencies:
|
||||||
|
"@types/jest" "26.x"
|
||||||
|
bs-logger "0.x"
|
||||||
|
buffer-from "1.x"
|
||||||
|
fast-json-stable-stringify "2.x"
|
||||||
|
jest-util "^26.1.0"
|
||||||
|
json5 "2.x"
|
||||||
|
lodash.memoize "4.x"
|
||||||
|
make-error "1.x"
|
||||||
|
mkdirp "1.x"
|
||||||
|
semver "7.x"
|
||||||
|
yargs-parser "20.x"
|
||||||
|
|
||||||
ts-pnp@1.1.6:
|
ts-pnp@1.1.6:
|
||||||
version "1.1.6"
|
version "1.1.6"
|
||||||
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz#389a24396d425a0d3162e96d2b4638900fdc289a"
|
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz#389a24396d425a0d3162e96d2b4638900fdc289a"
|
||||||
@ -11769,6 +12009,11 @@ yaml@^1.7.2:
|
|||||||
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
|
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
|
||||||
integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
|
integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
|
||||||
|
|
||||||
|
yargs-parser@20.x:
|
||||||
|
version "20.2.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
|
||||||
|
integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
|
||||||
|
|
||||||
yargs-parser@^11.1.1:
|
yargs-parser@^11.1.1:
|
||||||
version "11.1.1"
|
version "11.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
|
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user