From e1ac0202528eb9e7edb4736b9940786b7728c5df Mon Sep 17 00:00:00 2001 From: beguille Date: Sat, 9 Apr 2022 16:23:39 +0200 Subject: [PATCH 001/649] started email history --- frontend/src/Router.tsx | 8 +- .../StudentMailHistoryPage.tsx | 7 + .../src/views/StudentMailHistoryPage/index.ts | 1 + frontend/src/views/index.ts | 1 + frontend/yarn.lock | 1356 ++++++++--------- 5 files changed, 643 insertions(+), 730 deletions(-) create mode 100644 frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx create mode 100644 frontend/src/views/StudentMailHistoryPage/index.ts diff --git a/frontend/src/Router.tsx b/frontend/src/Router.tsx index 368bfaaea..fe1fdff17 100644 --- a/frontend/src/Router.tsx +++ b/frontend/src/Router.tsx @@ -11,6 +11,7 @@ import { StudentsPage, UsersPage, VerifyingTokenPage, + StudentMailHistoryPage, } from "./views"; import { ForbiddenPage, NotFoundPage } from "./views/errors"; @@ -68,8 +69,11 @@ export default function Router() { } /> {/* TODO student page */} } /> - {/* TODO student emails page */} - } /> + {/* student emails page */} + } + /> {/* Users routes */} }> diff --git a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx new file mode 100644 index 000000000..d2b4eef6b --- /dev/null +++ b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx @@ -0,0 +1,7 @@ +import React from "react"; + +function MailHistory() { + return
This needs to show the mail history of a student
; +} + +export default MailHistory; diff --git a/frontend/src/views/StudentMailHistoryPage/index.ts b/frontend/src/views/StudentMailHistoryPage/index.ts new file mode 100644 index 000000000..515a65842 --- /dev/null +++ b/frontend/src/views/StudentMailHistoryPage/index.ts @@ -0,0 +1 @@ +export { default } from "./StudentMailHistoryPage"; diff --git a/frontend/src/views/index.ts b/frontend/src/views/index.ts index 72c6efdc9..998188aed 100644 --- a/frontend/src/views/index.ts +++ b/frontend/src/views/index.ts @@ -6,3 +6,4 @@ export { default as RegisterPage } from "./RegisterPage"; export { default as StudentsPage } from "./StudentsPage"; export { default as UsersPage } from "./UsersPage"; export { default as VerifyingTokenPage } from "./VerifyingTokenPage"; +export { default as StudentMailHistoryPage } from "./StudentMailHistoryPage"; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 1fb299499..c72b464e5 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -31,24 +31,24 @@ integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== "@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" - integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe" + integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.7" + "@babel/generator" "^7.17.9" "@babel/helper-compilation-targets" "^7.17.7" "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.8" - "@babel/parser" "^7.17.8" + "@babel/helpers" "^7.17.9" + "@babel/parser" "^7.17.9" "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" + "@babel/traverse" "^7.17.9" "@babel/types" "^7.17.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.1.2" + json5 "^2.2.1" semver "^6.3.0" "@babel/eslint-parser@^7.16.3": @@ -60,10 +60,10 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.7.2": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" - integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w== +"@babel/generator@^7.17.9", "@babel/generator@^7.7.2": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc" + integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ== dependencies: "@babel/types" "^7.17.0" jsesc "^2.5.1" @@ -94,15 +94,15 @@ browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6": - version "7.17.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9" - integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg== +"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d" + integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-member-expression-to-functions" "^7.16.7" + "@babel/helper-function-name" "^7.17.9" + "@babel/helper-member-expression-to-functions" "^7.17.7" "@babel/helper-optimise-call-expression" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" @@ -143,21 +143,13 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" - integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== +"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12" + integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== dependencies: - "@babel/helper-get-function-arity" "^7.16.7" "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-get-function-arity@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== - dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.17.0" "@babel/helper-hoist-variables@^7.16.7": version "7.16.7" @@ -166,7 +158,7 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-member-expression-to-functions@^7.16.7": +"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw== @@ -267,28 +259,28 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.17.8": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106" - integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw== +"@babel/helpers@^7.17.9": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a" + integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q== dependencies: "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" + "@babel/traverse" "^7.17.9" "@babel/types" "^7.17.0" "@babel/highlight@^7.16.7": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" - integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3" + integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg== dependencies: "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240" - integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef" + integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" @@ -333,13 +325,14 @@ "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-decorators@^7.16.4": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.8.tgz#4f0444e896bee85d35cf714a006fc5418f87ff00" - integrity sha512-U69odN4Umyyx1xO1rTII0IDkAEC+RNlcKXtqOblfpzqy1C+aOplb76BQNq0+XdpVkOaPlpEDwd++joY8FNFJKA== + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz#67a1653be9c77ce5b6c318aa90c8287b87831619" + integrity sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.17.6" + "@babel/helper-create-class-features-plugin" "^7.17.9" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" "@babel/plugin-syntax-decorators" "^7.17.0" charcodes "^0.2.0" @@ -714,9 +707,9 @@ babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-commonjs@^7.16.8": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19" - integrity sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA== + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6" + integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw== dependencies: "@babel/helper-module-transforms" "^7.17.7" "@babel/helper-plugin-utils" "^7.16.7" @@ -819,11 +812,11 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-regenerator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" - integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c" + integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ== dependencies: - regenerator-transform "^0.14.2" + regenerator-transform "^0.15.0" "@babel/plugin-transform-reserved-words@^7.16.7": version "7.16.7" @@ -1017,17 +1010,17 @@ "@babel/plugin-transform-typescript" "^7.16.7" "@babel/runtime-corejs3@^7.10.2": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.8.tgz#d7dd49fb812f29c61c59126da3792d8740d4e284" - integrity sha512-ZbYSUvoSF6dXZmMl/CYTMOvzIFnbGfv4W3SEHYgMvNsFTeLaF2gkGAF4K2ddmtSK4Emej+0aYcnSC6N5dPCXUQ== + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.9.tgz#3d02d0161f0fbf3ada8e88159375af97690f4055" + integrity sha512-WxYHHUWF2uZ7Hp1K+D1xQgbgkGUfA+5UPOegEXGt2Y5SMog/rYCVaifLZDbw8UkNXozEqqrZTy6bglL7xTaCOw== dependencies: core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.16", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" - integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" + integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== dependencies: regenerator-runtime "^0.13.4" @@ -1040,18 +1033,18 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" - integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d" + integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw== dependencies: "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" + "@babel/generator" "^7.17.9" "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" + "@babel/helper-function-name" "^7.17.9" "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.3" + "@babel/parser" "^7.17.9" "@babel/types" "^7.17.0" debug "^4.1.0" globals "^11.1.0" @@ -1075,9 +1068,9 @@ integrity sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg== "@csstools/postcss-color-function@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.0.3.tgz#251c961a852c99e9aabdbbdbefd50e9a96e8a9ff" - integrity sha512-J26I69pT2B3MYiLY/uzCGKVJyMYVg9TCpXkWsRlt+Yfq+nELUEm72QXIMYXs4xA9cJA4Oqs2EylrfokKl3mJEQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.0.tgz#229966327747f58fbe586de35daa139db3ce1e5d" + integrity sha512-5D5ND/mZWcQoSfYnSPsXtuiFxhzmhxt6pcjrFLJyldj+p0ZN2vvRpYNX+lahFTtMhAYOa2WmkdGINr0yP0CvGA== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" postcss-value-parser "^4.2.0" @@ -1105,11 +1098,11 @@ postcss-value-parser "^4.2.0" "@csstools/postcss-is-pseudo-class@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.1.tgz#472fff2cf434bdf832f7145b2a5491587e790c9e" - integrity sha512-Og5RrTzwFhrKoA79c3MLkfrIBYmwuf/X83s+JQtz/Dkk/MpsaKtqHV1OOzYkogQ+tj3oYp5Mq39XotBXNqVc3Q== + version "2.0.2" + resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.2.tgz#a834ca11a43d6ed9bc9e3ff53c80d490a4b1aaad" + integrity sha512-L9h1yxXMj7KpgNzlMrw3isvHJYkikZgZE4ASwssTnGEH8tm50L6QsM9QQT5wR4/eO5mU0rN5axH7UzNxEYg5CA== dependencies: - postcss-selector-parser "^6.0.9" + postcss-selector-parser "^6.0.10" "@csstools/postcss-normalize-display-values@^1.0.0": version "1.0.0" @@ -1119,9 +1112,9 @@ postcss-value-parser "^4.2.0" "@csstools/postcss-oklab-function@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.0.2.tgz#87cd646e9450347a5721e405b4f7cc35157b7866" - integrity sha512-QwhWesEkMlp4narAwUi6pgc6kcooh8cC7zfxa9LSQNYXqzcdNUtNBzbGc5nuyAVreb7uf5Ox4qH1vYT3GA1wOg== + version "1.1.0" + resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.0.tgz#e9a269487a292e0930760948e923e1d46b638ee6" + integrity sha512-e/Q5HopQzmnQgqimG9v3w2IG4VRABsBq3itOcn4bnm+j4enTgQZ0nWsaH/m9GV2otWGQ0nwccYL5vmLKyvP1ww== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" postcss-value-parser "^4.2.0" @@ -1133,17 +1126,17 @@ dependencies: postcss-value-parser "^4.2.0" -"@emotion/is-prop-valid@^0.8.8": - version "0.8.8" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" - integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== +"@emotion/is-prop-valid@^1.1.0": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" + integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== dependencies: - "@emotion/memoize" "0.7.4" + "@emotion/memoize" "^0.7.4" -"@emotion/memoize@0.7.4": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" - integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== +"@emotion/memoize@^0.7.4": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" + integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== "@emotion/stylis@^0.8.4": version "0.8.5" @@ -1170,10 +1163,10 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fortawesome/fontawesome-common-types@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.0.tgz#5a9468da0e5c2a3ccc161882ef5ffafbd3d4882f" - integrity sha512-lFIJ5opxOKG9q88xOsuJJAdRZ+2WRldsZwUR/7MJoOMUMhF/LkHUjwWACIEPTa5Wo6uTDHvGRIX+XutdN7zYxA== +"@fortawesome/fontawesome-common-types@6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz#7dc996042d21fc1ae850e3173b5c67b0549f9105" + integrity sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA== "@fortawesome/fontawesome-common-types@^0.3.0": version "0.3.0" @@ -1188,11 +1181,11 @@ "@fortawesome/fontawesome-common-types" "^0.3.0" "@fortawesome/free-solid-svg-icons@^6.0.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.0.tgz#1bdc3ce6ddd2336348ba324ac4a72161725b0d95" - integrity sha512-OOr0jRHl5d41RzBS3sZh5Z3HmdPjMr43PxxKlYeLtQxFSixPf4sJFVM12/rTepB2m0rVShI0vtjHQmzOTlBaXg== + version "6.1.1" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.1.tgz#3369e673f8fe8be2fba30b1ec274d47490a830a6" + integrity sha512-0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg== dependencies: - "@fortawesome/fontawesome-common-types" "6.1.0" + "@fortawesome/fontawesome-common-types" "6.1.1" "@fortawesome/react-fontawesome@^0.1.17": version "0.1.18" @@ -1418,6 +1411,11 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@leichtgewicht/ip-codec@^2.0.1": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0" + integrity sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg== + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1440,9 +1438,9 @@ fastq "^1.6.0" "@pmmmwh/react-refresh-webpack-plugin@^0.5.3": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz#df0d0d855fc527db48aac93c218a0bf4ada41f99" - integrity sha512-zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw== + version "0.5.5" + resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.5.tgz#e77aac783bd079f548daa0a7f080ab5b5a9741ca" + integrity sha512-RbG7h6TuP6nFFYKJwbcToA1rjC1FyPg25NR2noAZ0vKI+la01KTSRPkuVPE+U88jXv7javx2JHglUcL1MHcshQ== dependencies: ansi-html-community "^0.0.8" common-path-prefix "^3.0.0" @@ -1455,9 +1453,9 @@ source-map "^0.7.3" "@popperjs/core@^2.10.1": - version "2.11.4" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" - integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg== + version "2.11.5" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64" + integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw== "@react-aria/ssr@^3.0.1": version "3.1.2" @@ -1466,17 +1464,17 @@ dependencies: "@babel/runtime" "^7.6.2" -"@restart/hooks@^0.4.0", "@restart/hooks@^0.4.5": - version "0.4.5" - resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.4.5.tgz#e7acbea237bfc9e479970500cf87538b41a1ed02" - integrity sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A== +"@restart/hooks@^0.4.0", "@restart/hooks@^0.4.6": + version "0.4.6" + resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.4.6.tgz#15dcf34631a618c513efc924705c7cbe349a4a0c" + integrity sha512-FzpEzy6QeLB3OpUrC9OQD/lWCluQmilLfRGa/DqbB6OmV05AEt/0Lgn3Jf6l27UIJMK0qFmNcps6p8DNLXa6Pw== dependencies: dequal "^2.0.2" -"@restart/ui@^1.0.2": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@restart/ui/-/ui-1.1.0.tgz#46d436225162b47ecccdf191cfbcf9ec3d1d5f47" - integrity sha512-sYAO1LP78Suz5cT2VEkU4U/mvdjFXNg69QHanc5OAFTWyhCBG2lFJ9FITZ7hT8P8LPqcWXcwEGzHhuxPUDDDYQ== +"@restart/ui@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@restart/ui/-/ui-1.2.0.tgz#fb90251aa25f99b41ccedc78a91d2a15f3c5e0fb" + integrity sha512-oIh2t3tG8drZtZ9SlaV5CY6wGsUViHk8ZajjhcI+74IQHyWy+AnxDv8rJR5wVgsgcgrPBUvGNkC1AEdcGNPaLQ== dependencies: "@babel/runtime" "^7.13.16" "@popperjs/core" "^2.10.1" @@ -1485,7 +1483,6 @@ "@types/warning" "^3.0.0" dequal "^2.0.2" dom-helpers "^5.2.0" - prop-types "^15.7.2" uncontrollable "^7.2.1" warning "^4.0.3" @@ -1527,9 +1524,9 @@ picomatch "^2.2.2" "@rushstack/eslint-patch@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz#782fa5da44c4f38ae9fd38e9184b54e451936118" - integrity sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg== + version "1.1.2" + resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.2.tgz#7a26e63b1bdaf654bcce2176a38b83f7f576327e" + integrity sha512-oe5WJEDaVsW8fBlGT7udrSCgOwWfoYHQOmSpnh8X+0GXpqqcRCP8k4y+Dxb0taWJDPpB+rdDUtumIiBwkY9qGA== "@sinonjs/commons@^1.7.0": version "1.8.3" @@ -1659,9 +1656,9 @@ loader-utils "^2.0.0" "@testing-library/dom@^8.0.0": - version "8.11.3" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.11.3.tgz#38fd63cbfe14557021e88982d931e33fb7c1a808" - integrity sha512-9LId28I+lx70wUiZjLvi1DB/WT2zGOxUh46glrSNMaWVx849kKAluezVzZrXJfTKKoQTmEOutLes/bHg4Bj3aA== + version "8.13.0" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.13.0.tgz#bc00bdd64c7d8b40841e27a70211399ad3af46f5" + integrity sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" @@ -1673,9 +1670,9 @@ pretty-format "^27.0.2" "@testing-library/jest-dom@^5.14.1": - version "5.16.2" - resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.2.tgz#f329b36b44aa6149cd6ced9adf567f8b6aa1c959" - integrity sha512-6ewxs1MXWwsBFZXIk4nKKskWANelkdUehchEOokHsN8X7c2eKXGw+77aRV63UU8f/DTSVUPLaGxdrj4lN7D/ug== + version "5.16.4" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz#938302d7b8b483963a3ae821f1c0808f872245cd" + integrity sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA== dependencies: "@babel/runtime" "^7.9.2" "@types/testing-library__jest-dom" "^5.9.1" @@ -1928,9 +1925,9 @@ pretty-format "^27.0.0" "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.10" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23" - integrity sha512-BLO9bBq59vW3fxCpD4o0N4U+DXsvwvIcl+jofw0frQo/GrBFC+/jRZj1E7kgp6dvTyNmA4y6JCV5Id/r3mNP5A== + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@types/json5@^0.0.29": version "0.0.29" @@ -1943,9 +1940,9 @@ integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/node@*": - version "17.0.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" - integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== + version "17.0.23" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" + integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== "@types/node@^16.7.13": version "16.11.26" @@ -1963,9 +1960,9 @@ integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA== "@types/prop-types@*", "@types/prop-types@^15.7.4": - version "15.7.4" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" - integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + version "15.7.5" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" + integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== "@types/q@^1.5.1": version "1.5.5" @@ -1982,13 +1979,20 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@*", "@types/react-dom@^17.0.9": - version "17.0.14" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" - integrity sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ== +"@types/react-dom@*": + version "18.0.0" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.0.tgz#b13f8d098e4b0c45df4f1ed123833143b0c71141" + integrity sha512-49897Y0UiCGmxZqpC8Blrf6meL8QUla6eb+BBhn69dTXlmuOlzkfr7HHY/O8J25e1lTUMs+YYxSlVDAaGHCOLg== dependencies: "@types/react" "*" +"@types/react-dom@^17.0.9": + version "17.0.15" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.15.tgz#f2c8efde11521a4b7991e076cb9c70ba3bb0d156" + integrity sha512-Tr9VU9DvNoHDWlmecmcsE5ZZiUkYx+nKBzum4Oxe1K0yJVyBlfbq7H3eXjxXqJczBKqPGq3EgfTru4MgKb9+Yw== + dependencies: + "@types/react" "^17" + "@types/react-router-bootstrap@^0.24.5": version "0.24.5" resolved "https://registry.yarnpkg.com/@types/react-router-bootstrap/-/react-router-bootstrap-0.24.5.tgz#9257ba3dfb01cda201aac9fa05cde3eb09ea5b27" @@ -2021,10 +2025,19 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^17.0.20": - version "17.0.41" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.41.tgz#6e179590d276394de1e357b3f89d05d7d3da8b85" - integrity sha512-chYZ9ogWUodyC7VUTRBfblysKLjnohhFY9bGLwvnUFFy48+vB9DikmB3lW0qTFmBcKSzmdglcvkHK71IioOlDA== +"@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11": + version "18.0.0" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.0.tgz#4be8aa3a2d04afc3ac2cc1ca43d39b0bd412890c" + integrity sha512-7+K7zEQYu7NzOwQGLR91KwWXXDzmTFODRVizJyIALf6RfLv2GDpqpknX64pvRVILXCpXi7O/pua8NGk44dLvJw== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/react@^17", "@types/react@^17.0.20": + version "17.0.44" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.44.tgz#c3714bd34dd551ab20b8015d9d0dbec812a51ec7" + integrity sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2075,9 +2088,9 @@ integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== "@types/styled-components@^5.1.24": - version "5.1.24" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.24.tgz#b52ae677f03ea8a6018aa34c6c96b7018b7a3571" - integrity sha512-mz0fzq2nez+Lq5IuYammYwWgyLUE6OMAJTQL9D8hFLP4Pkh7gVYJii/VQWxq8/TK34g/OrkehXaFNdcEKcItug== + version "5.1.25" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.25.tgz#0177c4ab5fa7c6ed0565d36f597393dae3f380ad" + integrity sha512-fgwl+0Pa8pdkwXRoVPP9JbqF0Ivo9llnmsm+7TCI330kbPIFd9qv1Lrhr37shf4tnxCOSu+/IgqM7uJXLWZZNQ== dependencies: "@types/hoist-non-react-statics" "*" "@types/react" "*" @@ -2100,7 +2113,7 @@ resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI= -"@types/ws@^8.2.2": +"@types/ws@^8.5.1": version "8.5.3" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== @@ -2120,13 +2133,13 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^5.12.0", "@typescript-eslint/eslint-plugin@^5.5.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.15.0.tgz#c28ef7f2e688066db0b6a9d95fb74185c114fb9a" - integrity sha512-u6Db5JfF0Esn3tiAKELvoU5TpXVSkOpZ78cEGn/wXtT2RVqs2vkt4ge6N8cRCyw7YVKhmmLDbwI2pg92mlv7cA== + version "5.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz#950df411cec65f90d75d6320a03b2c98f6c3af7d" + integrity sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A== dependencies: - "@typescript-eslint/scope-manager" "5.15.0" - "@typescript-eslint/type-utils" "5.15.0" - "@typescript-eslint/utils" "5.15.0" + "@typescript-eslint/scope-manager" "5.18.0" + "@typescript-eslint/type-utils" "5.18.0" + "@typescript-eslint/utils" "5.18.0" debug "^4.3.2" functional-red-black-tree "^1.0.1" ignore "^5.1.8" @@ -2135,75 +2148,75 @@ tsutils "^3.21.0" "@typescript-eslint/experimental-utils@^5.0.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.15.0.tgz#407bbbdf1d11d24de81cfdf556b3a9f4252ba4ae" - integrity sha512-AJOOaBrVqKYWaYDBtgMi9XVDB3YHXlffto/3A4VQ39VVaNqosSOp/nW09G4N/ej8WlzHQB2jTnSfP5wWsXSQJA== + version "5.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.18.0.tgz#a6b5662e6b0452cb0e75a13662ce3b33cd1be59d" + integrity sha512-hypiw5N0aM2aH91/uMmG7RpyUH3PN/iOhilMwkMFZIbm/Bn/G3ZnbaYdSoAN4PG/XHQjdhBYLi0ZoRZsRYT4hA== dependencies: - "@typescript-eslint/utils" "5.15.0" + "@typescript-eslint/utils" "5.18.0" "@typescript-eslint/parser@^5.12.0", "@typescript-eslint/parser@^5.5.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.15.0.tgz#95f603f8fe6eca7952a99bfeef9b85992972e728" - integrity sha512-NGAYP/+RDM2sVfmKiKOCgJYPstAO40vPAgACoWPO/+yoYKSgAXIFaBKsV8P0Cc7fwKgvj27SjRNX4L7f4/jCKQ== + version "5.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.18.0.tgz#2bcd4ff21df33621df33e942ccb21cb897f004c6" + integrity sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ== dependencies: - "@typescript-eslint/scope-manager" "5.15.0" - "@typescript-eslint/types" "5.15.0" - "@typescript-eslint/typescript-estree" "5.15.0" + "@typescript-eslint/scope-manager" "5.18.0" + "@typescript-eslint/types" "5.18.0" + "@typescript-eslint/typescript-estree" "5.18.0" debug "^4.3.2" -"@typescript-eslint/scope-manager@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz#d97afab5e0abf4018d1289bd711be21676cdd0ee" - integrity sha512-EFiZcSKrHh4kWk0pZaa+YNJosvKE50EnmN4IfgjkA3bTHElPtYcd2U37QQkNTqwMCS7LXeDeZzEqnsOH8chjSg== +"@typescript-eslint/scope-manager@5.18.0": + version "5.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz#a7d7b49b973ba8cebf2a3710eefd457ef2fb5505" + integrity sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ== dependencies: - "@typescript-eslint/types" "5.15.0" - "@typescript-eslint/visitor-keys" "5.15.0" + "@typescript-eslint/types" "5.18.0" + "@typescript-eslint/visitor-keys" "5.18.0" -"@typescript-eslint/type-utils@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.15.0.tgz#d2c02eb2bdf54d0a645ba3a173ceda78346cf248" - integrity sha512-KGeDoEQ7gHieLydujGEFLyLofipe9PIzfvA/41urz4hv+xVxPEbmMQonKSynZ0Ks2xDhJQ4VYjB3DnRiywvKDA== +"@typescript-eslint/type-utils@5.18.0": + version "5.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz#62dbfc8478abf36ba94a90ddf10be3cc8e471c74" + integrity sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA== dependencies: - "@typescript-eslint/utils" "5.15.0" + "@typescript-eslint/utils" "5.18.0" debug "^4.3.2" tsutils "^3.21.0" -"@typescript-eslint/types@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501" - integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA== +"@typescript-eslint/types@5.18.0": + version "5.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.18.0.tgz#4f0425d85fdb863071680983853c59a62ce9566e" + integrity sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw== -"@typescript-eslint/typescript-estree@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz#81513a742a9c657587ad1ddbca88e76c6efb0aac" - integrity sha512-Hb0e3dGc35b75xLzixM3cSbG1sSbrTBQDfIScqdyvrfJZVEi4XWAT+UL/HMxEdrJNB8Yk28SKxPLtAhfCbBInA== +"@typescript-eslint/typescript-estree@5.18.0": + version "5.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz#6498e5ee69a32e82b6e18689e2f72e4060986474" + integrity sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ== dependencies: - "@typescript-eslint/types" "5.15.0" - "@typescript-eslint/visitor-keys" "5.15.0" + "@typescript-eslint/types" "5.18.0" + "@typescript-eslint/visitor-keys" "5.18.0" debug "^4.3.2" globby "^11.0.4" is-glob "^4.0.3" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/utils@5.15.0", "@typescript-eslint/utils@^5.13.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.15.0.tgz#468510a0974d3ced8342f37e6c662778c277f136" - integrity sha512-081rWu2IPKOgTOhHUk/QfxuFog8m4wxW43sXNOMSCdh578tGJ1PAaWPsj42LOa7pguh173tNlMigsbrHvh/mtA== +"@typescript-eslint/utils@5.18.0", "@typescript-eslint/utils@^5.13.0": + version "5.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.18.0.tgz#27fc84cf95c1a96def0aae31684cb43a37e76855" + integrity sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.15.0" - "@typescript-eslint/types" "5.15.0" - "@typescript-eslint/typescript-estree" "5.15.0" + "@typescript-eslint/scope-manager" "5.18.0" + "@typescript-eslint/types" "5.18.0" + "@typescript-eslint/typescript-estree" "5.18.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz#5669739fbf516df060f978be6a6dce75855a8027" - integrity sha512-+vX5FKtgvyHbmIJdxMJ2jKm9z2BIlXJiuewI8dsDYMp5LzPUcuTT78Ya5iwvQg3VqSVdmxyM8Anj1Jeq7733ZQ== +"@typescript-eslint/visitor-keys@5.18.0": + version "5.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz#c7c07709823804171d569017f3b031ced7253e60" + integrity sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg== dependencies: - "@typescript-eslint/types" "5.15.0" + "@typescript-eslint/types" "5.18.0" eslint-visitor-keys "^3.0.0" "@webassemblyjs/ast@1.11.1": @@ -2412,14 +2425,6 @@ agent-base@6: dependencies: debug "4" -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - airbnb-prop-types@^2.16.0: version "2.16.0" resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2" @@ -2465,9 +2470,9 @@ ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" - integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw== + version "8.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" + integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -2558,12 +2563,12 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-flatten@^2.1.0: +array-flatten@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.1.3, array-includes@^3.1.4: +array-includes@^3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== @@ -2698,12 +2703,12 @@ babel-jest@^27.4.2, babel-jest@^27.5.1: slash "^3.0.0" babel-loader@^8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" - integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== + version "8.2.4" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b" + integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A== dependencies: find-cache-dir "^3.3.1" - loader-utils "^1.4.0" + loader-utils "^2.0.0" make-dir "^3.1.0" schema-utils "^2.6.5" @@ -2774,9 +2779,9 @@ babel-plugin-polyfill-regenerator@^0.3.0: "@babel/helper-define-polyfill-provider" "^0.3.1" "babel-plugin-styled-components@>= 1.12.0": - version "2.0.6" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz#6f76c7f7224b7af7edc24a4910351948c691fc90" - integrity sha512-Sk+7o/oa2HfHv3Eh8sxoz75/fFvEdHsXV4grdeHufX0nauCmymlnN0rGhIvfpMQSJMvGutJ85gvCGea4iqmDpg== + version "2.0.7" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086" + integrity sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" "@babel/helper-module-imports" "^7.16.0" @@ -2893,17 +2898,15 @@ body-parser@1.19.2: raw-body "2.4.3" type-is "~1.6.18" -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= +bonjour-service@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.11.tgz#5418e5c1ac91c89a406f853a942e7892829c0d89" + integrity sha512-drMprzr2rDTCtgEE3VgdA9uUFaUHF+jXduwYSThHJnKMYM+FhI9Z3ph+TX3xy0LtgYHae6CHYPJ/2UnK8nQHcA== dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" + array-flatten "^2.1.2" dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" + fast-deep-equal "^3.1.3" + multicast-dns "^7.2.4" boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" @@ -2930,7 +2933,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^3.0.1, braces@~3.0.2: +braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -2965,11 +2968,6 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== - builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -3037,9 +3035,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317: - version "1.0.30001319" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz#eb4da4eb3ecdd409f7ba1907820061d56096e88f" - integrity sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw== + version "1.0.30001327" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz#c1546d7d7bb66506f0ccdad6a7d07fc6d668c858" + integrity sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w== case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" @@ -3092,15 +3090,15 @@ check-types@^11.1.1: integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ== cheerio-select@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823" - integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg== + version "1.6.0" + resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.6.0.tgz#489f36604112c722afa147dedd0d4609c09e1696" + integrity sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g== dependencies: - css-select "^4.1.3" - css-what "^5.0.1" + css-select "^4.3.0" + css-what "^6.0.1" domelementtype "^2.2.0" - domhandler "^4.2.0" - domutils "^2.7.0" + domhandler "^4.3.1" + domutils "^2.8.0" cheerio@^1.0.0-rc.3: version "1.0.0-rc.10" @@ -3151,17 +3149,12 @@ classnames@^2.3.1: integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== clean-css@^5.2.2: - version "5.2.4" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.4.tgz#982b058f8581adb2ae062520808fb2429bd487a4" - integrity sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg== + version "5.3.0" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz#ad3d8238d5f3549e83d5f87205189494bc7cbb59" + integrity sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ== dependencies: source-map "~0.6.0" -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -3396,12 +3389,10 @@ css-color-keywords@^1.0.0: resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= -css-declaration-sorter@^6.0.3: - version "6.1.4" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4" - integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw== - dependencies: - timsort "^0.3.0" +css-declaration-sorter@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz#bfd2f6f50002d6a3ae779a87d3a0c5d5b10e0f02" + integrity sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg== css-has-pseudo@^3.0.4: version "3.0.4" @@ -3456,14 +3447,14 @@ css-select@^2.0.0: domutils "^1.7.0" nth-check "^1.0.2" -css-select@^4.1.3: - version "4.2.1" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" - integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== +css-select@^4.1.3, css-select@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" + integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== dependencies: boolbase "^1.0.0" - css-what "^5.1.0" - domhandler "^4.3.0" + css-what "^6.0.1" + domhandler "^4.3.1" domutils "^2.8.0" nth-check "^2.0.1" @@ -3497,10 +3488,10 @@ css-what@^3.2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== -css-what@^5.0.1, css-what@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" - integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== +css-what@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== css.escape@^1.5.1: version "1.5.1" @@ -3526,52 +3517,52 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^*: - version "5.2.4" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.4.tgz#eced79bbc1ab7270337c4038a21891daac2329bc" - integrity sha512-w1Gg8xsebln6/axZ6qDFQHuglrGfbIHOIx0g4y9+etRlRab8CGpSpe6UMsrgJe4zhCaJ0LwLmc+PhdLRTwnhIA== +cssnano-preset-default@^5.2.7: + version "5.2.7" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz#791e3603fb8f1b46717ac53b47e3c418e950f5f3" + integrity sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA== dependencies: - css-declaration-sorter "^6.0.3" - cssnano-utils "^*" + css-declaration-sorter "^6.2.2" + cssnano-utils "^3.1.0" postcss-calc "^8.2.3" - postcss-colormin "^*" - postcss-convert-values "^*" - postcss-discard-comments "^*" - postcss-discard-duplicates "^*" - postcss-discard-empty "^*" - postcss-discard-overridden "^*" - postcss-merge-longhand "^*" - postcss-merge-rules "^*" - postcss-minify-font-values "^*" - postcss-minify-gradients "^*" - postcss-minify-params "^*" - postcss-minify-selectors "^*" - postcss-normalize-charset "^*" - postcss-normalize-display-values "^*" - postcss-normalize-positions "^*" - postcss-normalize-repeat-style "^*" - postcss-normalize-string "^*" - postcss-normalize-timing-functions "^*" - postcss-normalize-unicode "^*" - postcss-normalize-url "^*" - postcss-normalize-whitespace "^*" - postcss-ordered-values "^*" - postcss-reduce-initial "^*" - postcss-reduce-transforms "^*" - postcss-svgo "^*" - postcss-unique-selectors "^*" - -cssnano-utils@^*, cssnano-utils@^3.1.0: + postcss-colormin "^5.3.0" + postcss-convert-values "^5.1.0" + postcss-discard-comments "^5.1.1" + postcss-discard-duplicates "^5.1.0" + postcss-discard-empty "^5.1.1" + postcss-discard-overridden "^5.1.0" + postcss-merge-longhand "^5.1.4" + postcss-merge-rules "^5.1.1" + postcss-minify-font-values "^5.1.0" + postcss-minify-gradients "^5.1.1" + postcss-minify-params "^5.1.2" + postcss-minify-selectors "^5.2.0" + postcss-normalize-charset "^5.1.0" + postcss-normalize-display-values "^5.1.0" + postcss-normalize-positions "^5.1.0" + postcss-normalize-repeat-style "^5.1.0" + postcss-normalize-string "^5.1.0" + postcss-normalize-timing-functions "^5.1.0" + postcss-normalize-unicode "^5.1.0" + postcss-normalize-url "^5.1.0" + postcss-normalize-whitespace "^5.1.1" + postcss-ordered-values "^5.1.1" + postcss-reduce-initial "^5.1.0" + postcss-reduce-transforms "^5.1.0" + postcss-svgo "^5.1.0" + postcss-unique-selectors "^5.1.1" + +cssnano-utils@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== cssnano@^5.0.6: - version "5.1.4" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.4.tgz#c648192e8e2f1aacb7d839e6aa3706b50cc7f8e4" - integrity sha512-hbfhVZreEPyzl+NbvRsjNo54JOX80b+j6nqG2biLVLaZHJEiqGyMh4xDGHtwhUKd5p59mj2GlDqlUBwJUuIu5A== + version "5.1.7" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.7.tgz#99858bef6c76c9240f0cdc9239570bc7db8368be" + integrity sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg== dependencies: - cssnano-preset-default "^*" + cssnano-preset-default "^5.2.7" lilconfig "^2.0.3" yaml "^1.10.2" @@ -3654,18 +3645,6 @@ dedent@^0.7.0: resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= -deep-equal@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== - dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" - deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -3700,20 +3679,6 @@ defined@^1.0.0: resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= -del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== - dependencies: - globby "^11.0.1" - graceful-fs "^4.2.4" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.2" - p-map "^4.0.0" - rimraf "^3.0.2" - slash "^3.0.0" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -3793,20 +3758,12 @@ dns-equal@^1.0.0: resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= -dns-packet@^1.3.1: - version "1.3.4" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" - integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== - dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" - -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= +dns-packet@^5.2.2: + version "5.3.1" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.3.1.tgz#eb94413789daec0f0ebe2fcc230bdc9d7c91b43d" + integrity sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw== dependencies: - buffer-indexof "^1.0.0" + "@leichtgewicht/ip-codec" "^2.0.1" doctrine@^2.1.0: version "2.1.0" @@ -3865,9 +3822,9 @@ domelementtype@1: integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== domexception@^2.0.1: version "2.0.1" @@ -3876,7 +3833,7 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: +domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== @@ -3891,7 +3848,7 @@ domutils@^1.7.0: dom-serializer "0" domelementtype "1" -domutils@^2.5.2, domutils@^2.7.0, domutils@^2.8.0: +domutils@^2.5.2, domutils@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== @@ -3936,9 +3893,9 @@ ejs@^3.1.6: jake "^10.6.1" electron-to-chromium@^1.4.84: - version "1.4.88" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.88.tgz#ebe6a2573b563680c7a7bf3a51b9e465c9c501db" - integrity sha512-oA7mzccefkvTNi9u7DXmT0LqvhnOiN2BhSrKerta7HeUC1cLoIwtbf2wL+Ah2ozh5KQd3/1njrGrwDBXx6d14Q== + version "1.4.106" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a" + integrity sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg== emittery@^0.8.1: version "0.8.1" @@ -4057,9 +4014,9 @@ error-stack-parser@^2.0.6: stackframe "^1.1.1" es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" - integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== + version "1.19.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f" + integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -4067,15 +4024,15 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: get-intrinsic "^1.1.1" get-symbol-description "^1.0.0" has "^1.0.3" - has-symbols "^1.0.2" + has-symbols "^1.0.3" internal-slot "^1.0.3" is-callable "^1.2.4" - is-negative-zero "^2.0.1" + is-negative-zero "^2.0.2" is-regex "^1.1.4" is-shared-array-buffer "^1.0.1" is-string "^1.0.7" - is-weakref "^1.0.1" - object-inspect "^1.11.0" + is-weakref "^1.0.2" + object-inspect "^1.12.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" @@ -4176,7 +4133,7 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^2.7.2: +eslint-module-utils@^2.7.3: version "2.7.3" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== @@ -4201,23 +4158,23 @@ eslint-plugin-flowtype@^8.0.3: string-natural-compare "^3.0.1" eslint-plugin-import@^2.25.3: - version "2.25.4" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" - integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== + version "2.26.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" + integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.2" + eslint-module-utils "^2.7.3" has "^1.0.3" - is-core-module "^2.8.0" + is-core-module "^2.8.1" is-glob "^4.0.3" - minimatch "^3.0.4" + minimatch "^3.1.2" object.values "^1.1.5" - resolve "^1.20.0" - tsconfig-paths "^3.12.0" + resolve "^1.22.0" + tsconfig-paths "^3.14.1" eslint-plugin-jest@^25.3.0: version "25.7.0" @@ -4269,9 +4226,9 @@ eslint-plugin-promise@^6.0.0: integrity sha512-7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw== eslint-plugin-react-hooks@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" - integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== + version "4.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.4.0.tgz#71c39e528764c848d8253e1aa2c7024ed505f6c4" + integrity sha512-U3RVIfdzJaeKDQKEJbz5p3NW8/L80PCATJAfuojwbaEL+gBjfGdhUcGde+WGUW46Q5sr/NgxevsIiDtNXrvZaQ== eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.28.0: version "7.29.4" @@ -4299,9 +4256,9 @@ eslint-plugin-standard@^5.0.0: integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg== eslint-plugin-testing-library@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.1.0.tgz#6ad539a53d4e897d3045902f8e534e07cebd4e8b" - integrity sha512-YSNzasJUbyhOTe14ZPygeOBvcPvcaNkwHwrj4vdf+uirr2D32JTDaKi6CP5Os2aWtOcvt4uBSPXp9h5xGoqvWQ== + version "5.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.2.1.tgz#3f89cd28ade81329a11584e0bbea129bede01619" + integrity sha512-88qJv6uzYALtiYJDzhelP3ov0Px/GLgnu+UekjjDxL2nMyvgdTyboKqcDBsvFPmAeizlCoSWOjeBN4DxO0BxaA== dependencies: "@typescript-eslint/utils" "^5.13.0" @@ -4362,9 +4319,9 @@ eslint-webpack-plugin@^3.1.1: schema-utils "^3.1.1" eslint@^8.3.0, eslint@^8.9.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37" - integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA== + version "8.13.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.13.0.tgz#6fcea43b6811e655410f5626cfcf328016badcd7" + integrity sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ== dependencies: "@eslint/eslintrc" "^1.2.1" "@humanwhocodes/config-array" "^0.9.2" @@ -4495,7 +4452,7 @@ expect@^27.5.1: jest-matcher-utils "^27.5.1" jest-message-util "^27.5.1" -express@^4.17.1: +express@^4.17.3: version "4.17.3" resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== @@ -4688,9 +4645,9 @@ follow-redirects@^1.0.0, follow-redirects@^1.14.8: integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== fork-ts-checker-webpack-plugin@^6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz#0282b335fa495a97e167f69018f566ea7d2a2b5e" - integrity sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw== + version "6.5.1" + resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.1.tgz#fd689e2d9de6ac76abb620909eea56438cd0f232" + integrity sha512-x1wumpHOEf4gDROmKTaB6i4/Q6H3LwmjVO7fIX47vBwlZbtPjU33hgoMuD/Q/y6SU8bnuYSoN6ZQOLshGp0T/g== dependencies: "@babel/code-frame" "^7.8.3" "@types/json-schema" "^7.0.5" @@ -4890,7 +4847,7 @@ globals@^13.6.0, globals@^13.9.0: dependencies: type-fest "^0.20.2" -globby@^11.0.1, globby@^11.0.4: +globby@^11.0.4: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -4903,9 +4860,9 @@ globby@^11.0.1, globby@^11.0.4: slash "^3.0.0" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== gzip-size@^6.0.0: version "6.0.0" @@ -5008,9 +4965,9 @@ html-encoding-sniffer@^2.0.1: whatwg-encoding "^1.0.5" html-entities@^2.1.0, html-entities@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" - integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== + version "2.3.3" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" + integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== html-escaper@^2.0.0: version "2.0.2" @@ -5091,7 +5048,7 @@ http-proxy-agent@^4.0.1: agent-base "6" debug "4" -http-proxy-middleware@^2.0.0: +http-proxy-middleware@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a" integrity sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg== @@ -5230,11 +5187,6 @@ invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -ip@^1.1.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= - ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -5245,14 +5197,6 @@ ipaddr.js@^2.0.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== -is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -5285,7 +5229,7 @@ is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-core-module@^2.2.0, is-core-module@^2.8.0, is-core-module@^2.8.1: +is-core-module@^2.2.0, is-core-module@^2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== @@ -5331,15 +5275,15 @@ is-module@^1.0.0: resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= -is-negative-zero@^2.0.1: +is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-number-object@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" - integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== dependencies: has-tostringtag "^1.0.0" @@ -5353,16 +5297,6 @@ is-obj@^1.0.1: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= -is-path-cwd@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" - integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== - -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - is-plain-obj@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" @@ -5373,7 +5307,7 @@ is-potential-custom-element-name@^1.0.1: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.4: +is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== @@ -5392,9 +5326,11 @@ is-root@^2.1.0: integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== is-shared-array-buffer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" - integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" + integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + dependencies: + call-bind "^1.0.2" is-stream@^2.0.0: version "2.0.1" @@ -5425,7 +5361,7 @@ is-typedarray@^1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-weakref@^1.0.1: +is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== @@ -6028,12 +5964,10 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" +json5@^2.1.2, json5@^2.2.0, json5@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== jsonc-parser@^3.0.0: version "3.0.0" @@ -6055,11 +5989,11 @@ jsonpointer@^5.0.0: integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg== "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" - integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== + version "3.2.2" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.2.tgz#6ab1e52c71dfc0c0707008a91729a9491fe9f76c" + integrity sha512-HDAyJ4MNQBboGpUnHAVUNJs6X0lh058s6FuixsFGP7MgJYpD6Vasd6nzSG5iIfXu1zAYlHJ/zsOKNlrenTUBnw== dependencies: - array-includes "^3.1.3" + array-includes "^3.1.4" object.assign "^4.1.2" kind-of@^6.0.2: @@ -6110,10 +6044,10 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lilconfig@^2.0.3, lilconfig@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" - integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== +lilconfig@^2.0.3, lilconfig@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25" + integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg== lines-and-columns@^1.1.6: version "1.2.4" @@ -6125,15 +6059,6 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== -loader-utils@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - loader-utils@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" @@ -6237,12 +6162,10 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" -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" +lru-cache@^7.4.0: + version "7.8.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.8.0.tgz#649aaeb294a56297b5cbc5d70f198dcc5ebe5747" + integrity sha512-AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg== lunr@^2.3.9: version "2.3.9" @@ -6276,9 +6199,9 @@ makeerror@1.0.12: tmpl "1.0.5" marked@^4.0.12: - version "4.0.12" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.12.tgz#2262a4e6fd1afd2f13557726238b69a48b982f7d" - integrity sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ== + version "4.0.13" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.13.tgz#4fd46ca93da46448f3d83f054d938c4f905a258d" + integrity sha512-lS/ZCa4X0gsRcfWs1eoh6dLnHr9kVH3K1t2X4M/tTtNouhZ7anS1Csb6464VGLQHv8b2Tw1cLeZQs58Jav8Rzw== mdn-data@2.0.14: version "2.0.14" @@ -6323,12 +6246,12 @@ methods@~1.1.2: integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + braces "^3.0.2" + picomatch "^2.3.1" mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" @@ -6390,17 +6313,17 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mkdirp@^0.5.5, mkdirp@~0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - minimist "^1.2.5" + minimist "^1.2.6" moo@^0.5.0: version "0.5.1" @@ -6422,23 +6345,18 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= - -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== +multicast-dns@^7.2.4: + version "7.2.4" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.4.tgz#cf0b115c31e922aeb20b64e6556cbeb34cf0dd19" + integrity sha512-XkCYOU+rr2Ft3LI6w4ye51M3VK31qJXFIxu0XLw169PtKG0Zx47OrXeVW/GCYOfpC9s1yyyf1S+L8/4LY0J9Zw== dependencies: - dns-packet "^1.3.1" + dns-packet "^5.2.2" thunky "^1.0.2" nanoid@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" - integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== + version "3.3.2" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557" + integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA== natural-compare@^1.4.0: version "1.4.0" @@ -6473,10 +6391,10 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-forge@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2" - integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA== +node-forge@^1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" + integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== node-int64@^0.4.0: version "0.4.0" @@ -6539,12 +6457,12 @@ object-hash@^2.2.0: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== -object-inspect@^1.11.0, object-inspect@^1.7.0, object-inspect@^1.9.0: +object-inspect@^1.12.0, object-inspect@^1.7.0, object-inspect@^1.9.0: version "1.12.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== -object-is@^1.0.1, object-is@^1.0.2, object-is@^1.1.2: +object-is@^1.0.2, object-is@^1.1.2: version "1.1.5" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== @@ -6724,13 +6642,6 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - p-retry@^4.5.0: version "4.6.1" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" @@ -6849,7 +6760,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -6930,7 +6841,7 @@ postcss-color-rebeccapurple@^7.0.2: dependencies: postcss-value-parser "^4.2.0" -postcss-colormin@^*: +postcss-colormin@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a" integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg== @@ -6940,7 +6851,7 @@ postcss-colormin@^*: colord "^2.9.1" postcss-value-parser "^4.2.0" -postcss-convert-values@^*: +postcss-convert-values@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10" integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g== @@ -6953,9 +6864,9 @@ postcss-custom-media@^8.0.0: integrity sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g== postcss-custom-properties@^12.1.5: - version "12.1.5" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.5.tgz#e669cfff89b0ea6fc85c45864a32b450cb6b196f" - integrity sha512-FHbbB/hRo/7cxLGkc2NS7cDRIDN1oFqQnUKBiyh4b/gwk8DD8udvmRDpUhEK836kB8ggUCieHVOvZDnF9XhI3g== + version "12.1.7" + resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.7.tgz#ca470fd4bbac5a87fd868636dafc084bc2a78b41" + integrity sha512-N/hYP5gSoFhaqxi2DPCmvto/ZcRDVjE3T1LiAMzc/bg53hvhcHOLpXOHb526LzBBp5ZlAUhkuot/bfpmpgStJg== dependencies: postcss-value-parser "^4.2.0" @@ -6973,22 +6884,22 @@ postcss-dir-pseudo-class@^6.0.4: dependencies: postcss-selector-parser "^6.0.9" -postcss-discard-comments@^*: +postcss-discard-comments@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369" integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ== -postcss-discard-duplicates@^*: +postcss-discard-duplicates@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== -postcss-discard-empty@^*: +postcss-discard-empty@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== -postcss-discard-overridden@^*: +postcss-discard-overridden@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw== @@ -7057,19 +6968,19 @@ postcss-js@^4.0.0: camelcase-css "^2.0.1" postcss-lab-function@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.1.2.tgz#b75afe43ba9c1f16bfe9bb12c8109cabd55b5fc2" - integrity sha512-isudf5ldhg4fk16M8viAwAbg6Gv14lVO35N3Z/49NhbwPQ2xbiEoHgrRgpgQojosF4vF7jY653ktB6dDrUOR8Q== + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.0.tgz#e054e662c6480202f5760887ec1ae0d153357123" + integrity sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" postcss-value-parser "^4.2.0" postcss-load-config@^3.1.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.3.tgz#21935b2c43b9a86e6581a576ca7ee1bde2bd1d23" - integrity sha512-5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw== + version "3.1.4" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" + integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== dependencies: - lilconfig "^2.0.4" + lilconfig "^2.0.5" yaml "^1.10.2" postcss-loader@^6.2.1: @@ -7091,50 +7002,50 @@ postcss-media-minmax@^5.0.0: resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5" integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ== -postcss-merge-longhand@^*: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.2.tgz#fe3002f38ad5827c1d6f7d5bb3f71d2566a2a138" - integrity sha512-18/bp9DZnY1ai9RlahOfLBbmIUKfKFPASxRCiZ1vlpZqWPCn8qWPFlEozqmWL+kBtcEQmG8W9YqGCstDImvp/Q== +postcss-merge-longhand@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz#0f46f8753989a33260efc47de9a0cdc571f2ec5c" + integrity sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA== dependencies: postcss-value-parser "^4.2.0" - stylehacks "^*" + stylehacks "^5.1.0" -postcss-merge-rules@^*: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz#a2d5117eba09c8686a5471d97bd9afcf30d1b41f" - integrity sha512-NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ== +postcss-merge-rules@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz#d327b221cd07540bcc8d9ff84446d8b404d00162" + integrity sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" cssnano-utils "^3.1.0" postcss-selector-parser "^6.0.5" -postcss-minify-font-values@^*: +postcss-minify-font-values@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== dependencies: postcss-value-parser "^4.2.0" -postcss-minify-gradients@^*: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz#de0260a67a13b7b321a8adc3150725f2c6612377" - integrity sha512-J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg== +postcss-minify-gradients@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c" + integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw== dependencies: colord "^2.9.1" cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-params@^*: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.1.tgz#c5f8e7dac565e577dd99904787fbec576cbdbfb2" - integrity sha512-WCpr+J9Uz8XzMpAfg3UL8z5rde6MifBbh5L8bn8S2F5hq/YDJJzASYCnCHvAB4Fqb94ys8v95ULQkW2EhCFvNg== +postcss-minify-params@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz#77e250780c64198289c954884ebe3ee4481c3b1c" + integrity sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g== dependencies: browserslist "^4.16.6" cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-selectors@^*: +postcss-minify-selectors@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c" integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA== @@ -7177,53 +7088,53 @@ postcss-nested@5.0.6: postcss-selector-parser "^6.0.6" postcss-nesting@^10.1.3: - version "10.1.3" - resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.3.tgz#f0b1cd7ae675c697ab6a5a5ca1feea4784a2ef77" - integrity sha512-wUC+/YCik4wH3StsbC5fBG1s2Z3ZV74vjGqBFYtmYKlVxoio5TYGM06AiaKkQPPlkXWn72HKfS7Cw5PYxnoXSw== + version "10.1.4" + resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.4.tgz#80de9d1c2717bc44df918dd7f118929300192a7a" + integrity sha512-2ixdQ59ik/Gt1+oPHiI1kHdwEI8lLKEmui9B1nl6163ANLC+GewQn7fXMxJF2JSb4i2MKL96GU8fIiQztK4TTA== dependencies: - postcss-selector-parser "^6.0.9" + postcss-selector-parser "^6.0.10" -postcss-normalize-charset@^*: +postcss-normalize-charset@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== -postcss-normalize-display-values@^*: +postcss-normalize-display-values@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-positions@^*: +postcss-normalize-positions@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458" integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^*: +postcss-normalize-repeat-style@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398" integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-string@^*: +postcss-normalize-string@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-timing-functions@^*: +postcss-normalize-timing-functions@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-unicode@^*: +postcss-normalize-unicode@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75" integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ== @@ -7231,7 +7142,7 @@ postcss-normalize-unicode@^*: browserslist "^4.16.6" postcss-value-parser "^4.2.0" -postcss-normalize-url@^*: +postcss-normalize-url@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== @@ -7239,7 +7150,7 @@ postcss-normalize-url@^*: normalize-url "^6.0.1" postcss-value-parser "^4.2.0" -postcss-normalize-whitespace@^*: +postcss-normalize-whitespace@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== @@ -7260,10 +7171,10 @@ postcss-opacity-percentage@^1.1.2: resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz#bd698bb3670a0a27f6d657cc16744b3ebf3b1145" integrity sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w== -postcss-ordered-values@^*: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz#04ef429e0991b0292bc918b135cd4c038f7b889f" - integrity sha512-wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA== +postcss-ordered-values@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz#0b41b610ba02906a3341e92cab01ff8ebc598adb" + integrity sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw== dependencies: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" @@ -7335,13 +7246,13 @@ postcss-preset-env@^7.0.1: postcss-value-parser "^4.2.0" postcss-pseudo-class-any-link@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.1.tgz#534eb1dadd9945eb07830dbcc06fb4d5d865b8e0" - integrity sha512-JRoLFvPEX/1YTPxRxp1JO4WxBVXJYrSY7NHeak5LImwJ+VobFMwYDQHvfTXEpcn+7fYIeGkC29zYFhFWIZD8fg== + version "7.1.2" + resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.2.tgz#81ec491aa43f97f9015e998b7a14263b4630bdf0" + integrity sha512-76XzEQv3g+Vgnz3tmqh3pqQyRojkcJ+pjaePsyhcyf164p9aZsu3t+NWxkZYbcHLK1ju5Qmalti2jPI5IWCe5w== dependencies: - postcss-selector-parser "^6.0.9" + postcss-selector-parser "^6.0.10" -postcss-reduce-initial@^*: +postcss-reduce-initial@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6" integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw== @@ -7349,7 +7260,7 @@ postcss-reduce-initial@^*: browserslist "^4.16.6" caniuse-api "^3.0.0" -postcss-reduce-transforms@^*: +postcss-reduce-transforms@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== @@ -7368,15 +7279,15 @@ postcss-selector-not@^5.0.0: dependencies: balanced-match "^1.0.0" -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: - version "6.0.9" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" - integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== +postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: + version "6.0.10" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" + integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^*: +postcss-svgo@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== @@ -7384,7 +7295,7 @@ postcss-svgo@^*: postcss-value-parser "^4.2.0" svgo "^2.7.0" -postcss-unique-selectors@^*: +postcss-unique-selectors@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== @@ -7431,9 +7342,9 @@ prettier-linter-helpers@^1.0.0: fast-diff "^1.1.2" prettier@^2.5.1: - version "2.6.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4" - integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A== + version "2.6.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" + integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0" @@ -7596,13 +7507,13 @@ react-app-polyfill@^3.0.0: whatwg-fetch "^3.6.2" react-bootstrap@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-2.2.1.tgz#2a6ad0931e9367882ec3fc88a70ed0b8ace90b26" - integrity sha512-x8lpVQflsbevphuWbTnTNCatcbKyPJNrP2WyQ1MJYmFEcVjbTbai1yZhdlXr0QUxLQLxA8g5hQWb5TwJtaZoCA== + version "2.2.3" + resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-2.2.3.tgz#1c563018c8b856071334dd5a35f25507185136e2" + integrity sha512-gXsAEBdDUHnOpJ2C+DDQ4mFt7tN6u6qWnTH3tqiE9jUvV6gGY8uHFp0iGBsM+yjrBwmR6bqCBFh8Z82aQj1LSw== dependencies: "@babel/runtime" "^7.17.2" - "@restart/hooks" "^0.4.5" - "@restart/ui" "^1.0.2" + "@restart/hooks" "^0.4.6" + "@restart/ui" "^1.2.0" "@types/invariant" "^2.2.35" "@types/prop-types" "^15.7.4" "@types/react" ">=16.14.8" @@ -7694,17 +7605,17 @@ react-router-bootstrap@^0.26.1: prop-types "^15.7.2" react-router-dom@^6.2.1: - version "6.2.2" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.2.tgz#f1a2c88365593c76b9612ae80154a13fcb72e442" - integrity sha512-AtYEsAST7bDD4dLSQHDnk/qxWLJdad5t1HFa1qJyUrCeGgEuCSw0VB/27ARbF9Fi/W5598ujvJOm3ujUCVzuYQ== + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" + integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw== dependencies: history "^5.2.0" - react-router "6.2.2" + react-router "6.3.0" -react-router@6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.2.tgz#495e683a0c04461eeb3d705fe445d6cf42f0c249" - integrity sha512-/MbxyLzd7Q7amp4gDOGaYvXwhEojkJD5BtExkuKmj39VEE0m3l/zipf6h2WIB2jyAO0lI6NGETh4RDcktRm4AQ== +react-router@6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557" + integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ== dependencies: history "^5.2.0" @@ -7862,10 +7773,10 @@ regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== -regenerator-transform@^0.14.2: - version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" - integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== +regenerator-transform@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" + integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg== dependencies: "@babel/runtime" "^7.8.4" @@ -7874,7 +7785,7 @@ regex-parser@^2.2.11: resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58" integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== -regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.1: +regexp.prototype.flags@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== @@ -8051,7 +7962,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -8144,12 +8055,12 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selfsigned@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b" - integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ== +selfsigned@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56" + integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ== dependencies: - node-forge "^1.2.0" + node-forge "^1" semver@7.0.0: version "7.0.0" @@ -8167,11 +8078,11 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.3.2, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + version "7.3.6" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b" + integrity sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w== dependencies: - lru-cache "^6.0.0" + lru-cache "^7.4.0" send@0.17.2: version "0.17.2" @@ -8519,7 +8430,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.0, strip-ansi@^7.0.1: +strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== @@ -8564,13 +8475,13 @@ style-loader@^3.3.1: integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ== styled-components@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.3.tgz#312a3d9a549f4708f0fb0edc829eb34bde032743" - integrity sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw== + version "5.3.5" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.5.tgz#a750a398d01f1ca73af16a241dec3da6deae5ec4" + integrity sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/traverse" "^7.4.5" - "@emotion/is-prop-valid" "^0.8.8" + "@emotion/is-prop-valid" "^1.1.0" "@emotion/stylis" "^0.8.4" "@emotion/unitless" "^0.7.4" babel-plugin-styled-components ">= 1.12.0" @@ -8579,7 +8490,7 @@ styled-components@^5.3.3: shallowequal "^1.1.0" supports-color "^5.5.0" -stylehacks@^*: +stylehacks@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520" integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q== @@ -8768,11 +8679,6 @@ thunky@^1.0.2: resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== -timsort@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= - tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -8823,14 +8729,14 @@ tryer@^1.0.1: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== -tsconfig-paths@^3.12.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz#4fcc48f9ccea8826c41b9ca093479de7f5018976" - integrity sha512-cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g== +tsconfig-paths@^3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" + integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" - minimist "^1.2.0" + minimist "^1.2.6" strip-bom "^3.0.0" tslib@^1.8.1: @@ -8900,9 +8806,9 @@ typedarray-to-buffer@^3.1.5: is-typedarray "^1.0.0" typedoc@^0.22.13: - version "0.22.13" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.22.13.tgz#d061f8f0fb7c9d686e48814f245bddeea4564e66" - integrity sha512-NHNI7Dr6JHa/I3+c62gdRNXBIyX7P33O9TafGLd07ur3MqzcKgwTvpg18EtvCLHJyfeSthAtCLpM7WkStUmDuQ== + version "0.22.14" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.22.14.tgz#c690677c31bc1dd5618caffc001bfa8554c4c02f" + integrity sha512-tlf9wIcsrnQSjetStrnRutuy2RjZkG5PK2umwveZLTkuC2K9VywOZTdu2G19BdOPzGrhZjf9WK7pthXqnFQejg== dependencies: glob "^7.2.0" lunr "^2.3.9" @@ -8911,9 +8817,9 @@ typedoc@^0.22.13: shiki "^0.10.1" typescript@^4.4.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4" - integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg== + version "4.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" + integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== unbox-primitive@^1.0.1: version "1.0.1" @@ -9131,38 +9037,37 @@ webpack-dev-middleware@^5.3.1: schema-utils "^4.0.0" webpack-dev-server@^4.6.0: - version "4.7.4" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945" - integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A== + version "4.8.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.8.1.tgz#58f9d797710d6e25fa17d6afab8708f958c11a29" + integrity sha512-dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" "@types/express" "^4.17.13" "@types/serve-index" "^1.9.1" "@types/sockjs" "^0.3.33" - "@types/ws" "^8.2.2" + "@types/ws" "^8.5.1" ansi-html-community "^0.0.8" - bonjour "^3.5.0" + bonjour-service "^1.0.11" chokidar "^3.5.3" colorette "^2.0.10" compression "^1.7.4" connect-history-api-fallback "^1.6.0" default-gateway "^6.0.3" - del "^6.0.0" - express "^4.17.1" + express "^4.17.3" graceful-fs "^4.2.6" html-entities "^2.3.2" - http-proxy-middleware "^2.0.0" + http-proxy-middleware "^2.0.3" ipaddr.js "^2.0.1" open "^8.0.9" p-retry "^4.5.0" portfinder "^1.0.28" + rimraf "^3.0.2" schema-utils "^4.0.0" - selfsigned "^2.0.0" + selfsigned "^2.0.1" serve-index "^1.9.1" sockjs "^0.3.21" spdy "^4.0.2" - strip-ansi "^7.0.0" webpack-dev-middleware "^5.3.1" ws "^8.4.2" @@ -9196,9 +9101,9 @@ webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@^5.64.4: - version "5.70.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d" - integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw== + version "5.72.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28" + integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" @@ -9304,25 +9209,25 @@ word-wrap@^1.2.3, word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -workbox-background-sync@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.1.tgz#df79c6a4a22945d8a44493a4947a6ed0f720ef86" - integrity sha512-T5a35fagLXQvV8Dr4+bDU+XYsP90jJ3eBLjZMKuCNELMQZNj+VekCODz1QK44jgoBeQk+vp94pkZV6G+e41pgg== +workbox-background-sync@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.2.tgz#28be9bf89b8e4e0379d45903280c7c12f4df836f" + integrity sha512-EjG37LSMDJ1TFlFg56wx6YXbH4/NkG09B9OHvyxx+cGl2gP5OuOzsCY3rOPJSpbcz6jpuA40VIC3HzSD4OvE1g== dependencies: idb "^6.1.4" - workbox-core "6.5.1" + workbox-core "6.5.2" -workbox-broadcast-update@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.1.tgz#9aecb116979b0709480b84cfd1beca7a901d01d4" - integrity sha512-mb/oyblyEpDbw167cCTyHnC3RqCnCQHtFYuYZd+QTpuExxM60qZuBH1AuQCgvLtDcztBKdEYK2VFD9SZYgRbaQ== +workbox-broadcast-update@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.2.tgz#b1f32bb40a9dcb5b05ca27e09fb7c01a0a126182" + integrity sha512-DjJYraYnprTZE/AQNoeogaxI1dPuYmbw+ZJeeP8uXBSbg9SNv5wLYofQgywXeRepv4yr/vglMo9yaHUmBMc+4Q== dependencies: - workbox-core "6.5.1" + workbox-core "6.5.2" -workbox-build@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.1.tgz#6b5e8f090bb608267868540d3072b44b8531b3bc" - integrity sha512-coDUDzHvFZ1ADOl3wKCsCSyOBvkPKlPgcQDb6LMMShN1zgF31Mev/1HzN3+9T2cjjWAgFwZKkuRyExqc1v21Zw== +workbox-build@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.2.tgz#774faafd84b1dc94b74739ceb5d8ff367748523b" + integrity sha512-TVi4Otf6fgwikBeMpXF9n0awHfZTMNu/nwlMIT9W+c13yvxkmDFMPb7vHYK6RUmbcxwPnz4I/R+uL76+JxG4JQ== dependencies: "@apideck/better-ajv-errors" "^0.3.1" "@babel/core" "^7.11.1" @@ -9346,132 +9251,132 @@ workbox-build@6.5.1: strip-comments "^2.0.1" tempy "^0.6.0" upath "^1.2.0" - workbox-background-sync "6.5.1" - workbox-broadcast-update "6.5.1" - workbox-cacheable-response "6.5.1" - workbox-core "6.5.1" - workbox-expiration "6.5.1" - workbox-google-analytics "6.5.1" - workbox-navigation-preload "6.5.1" - workbox-precaching "6.5.1" - workbox-range-requests "6.5.1" - workbox-recipes "6.5.1" - workbox-routing "6.5.1" - workbox-strategies "6.5.1" - workbox-streams "6.5.1" - workbox-sw "6.5.1" - workbox-window "6.5.1" - -workbox-cacheable-response@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.1.tgz#f71d0a75b3d6846e39594955e99ac42fd26f8693" - integrity sha512-3TdtH/luDiytmM+Cn72HCBLZXmbeRNJqZx2yaVOfUZhj0IVwZqQXhNarlGE9/k6U5Jelb+TtpH2mLVhnzfiSMg== - dependencies: - workbox-core "6.5.1" - -workbox-core@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.1.tgz#0dba3bccf883a46dfa61cc412eaa3cb09bb549e6" - integrity sha512-qObXZ39aFJ2N8X7IUbGrJHKWguliCuU1jOXM/I4MTT84u9BiKD2rHMkIzgeRP1Ixu9+cXU4/XHJq3Cy0Qqc5hw== - -workbox-expiration@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.1.tgz#9f105fcf3362852754884ad153888070ce98b692" - integrity sha512-iY/cTADAQATMmPkUBRmQdacqq0TJd2wMHimBQz+tRnPGHSMH+/BoLPABPnu7O7rT/g/s59CUYYRGxe3mEgoJCA== + workbox-background-sync "6.5.2" + workbox-broadcast-update "6.5.2" + workbox-cacheable-response "6.5.2" + workbox-core "6.5.2" + workbox-expiration "6.5.2" + workbox-google-analytics "6.5.2" + workbox-navigation-preload "6.5.2" + workbox-precaching "6.5.2" + workbox-range-requests "6.5.2" + workbox-recipes "6.5.2" + workbox-routing "6.5.2" + workbox-strategies "6.5.2" + workbox-streams "6.5.2" + workbox-sw "6.5.2" + workbox-window "6.5.2" + +workbox-cacheable-response@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.2.tgz#d9252eb99f0d0fceb70f63866172f4eaac56a3e8" + integrity sha512-UnHGih6xqloV808T7ve1iNKZMbpML0jGLqkkmyXkJbZc5j16+HRSV61Qrh+tiq3E3yLvFMGJ3AUBODOPNLWpTg== + dependencies: + workbox-core "6.5.2" + +workbox-core@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.2.tgz#f5e06a22c6cb4651d3e13107443d972fdbd47364" + integrity sha512-IlxLGQf+wJHCR+NM0UWqDh4xe/Gu6sg2i4tfZk6WIij34IVk9BdOQgi6WvqSHd879jbQIUgL2fBdJUJyAP5ypQ== + +workbox-expiration@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.2.tgz#ee6ed755a220a0b375d67831f9237e4dcbccb59c" + integrity sha512-5Hfp0uxTZJrgTiy9W7AjIIec+9uTOtnxY/tRBm4DbqcWKaWbVTa+izrKzzOT4MXRJJIJUmvRhWw4oo8tpmMouw== dependencies: idb "^6.1.4" - workbox-core "6.5.1" + workbox-core "6.5.2" -workbox-google-analytics@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.1.tgz#685224d439c1e7a943f8241d65e2a34ee95a4ba0" - integrity sha512-qZU46/h4dbionYT6Yk6iBkUwpiEzAfnO1W7KkI+AMmY7G9/gA03dQQ7rpTw8F4vWrG7ahTUGWDFv6fERtaw1BQ== +workbox-google-analytics@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.2.tgz#a79fa7a40824873baaa333dcd72d1fdf1c53adf5" + integrity sha512-8SMar+N0xIreP5/2we3dwtN1FUmTMScoopL86aKdXBpio8vXc8Oqb5fCJG32ialjN8BAOzDqx/FnGeCtkIlyvw== dependencies: - workbox-background-sync "6.5.1" - workbox-core "6.5.1" - workbox-routing "6.5.1" - workbox-strategies "6.5.1" + workbox-background-sync "6.5.2" + workbox-core "6.5.2" + workbox-routing "6.5.2" + workbox-strategies "6.5.2" -workbox-navigation-preload@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.1.tgz#a244e3bdf99ce86da7210315ca1ba5aef3710825" - integrity sha512-aKrgAbn2IMgzTowTi/ZyKdQUcES2m++9aGtpxqsX7Gn9ovCY8zcssaMEAMMwrIeveij5HiWNBrmj6MWDHi+0rg== +workbox-navigation-preload@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.2.tgz#ffb3d9d5cdb881a3824851707da221dbb0bb3f23" + integrity sha512-iqDNWWMswjCsZuvGFDpcX1Z8InBVAlVBELJ28xShsWWntALzbtr0PXMnm2WHkXCc56JimmGldZi1N5yDPiTPOg== dependencies: - workbox-core "6.5.1" + workbox-core "6.5.2" -workbox-precaching@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.1.tgz#177b6424f1e71e601b9c3d6864decad2655f9ff9" - integrity sha512-EzlPBxvmjGfE56YZzsT/vpVkpLG1XJhoplgXa5RPyVWLUL1LbwEAxhkrENElSS/R9tgiTw80IFwysidfUqLihg== +workbox-precaching@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.2.tgz#a3117b4d3eb61ce8d01b9dfc063c48155bd7f9d3" + integrity sha512-OZAlQ8AAT20KugGKKuJMHdQ8X1IyNQaLv+mPTHj+8Dmv8peBq5uWNzs4g/1OSFmXsbXZ6a1CBC6YtQWVPhJQ9w== dependencies: - workbox-core "6.5.1" - workbox-routing "6.5.1" - workbox-strategies "6.5.1" + workbox-core "6.5.2" + workbox-routing "6.5.2" + workbox-strategies "6.5.2" -workbox-range-requests@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.1.tgz#f40f84aa8765940543eba16131d02f12b38e2fdc" - integrity sha512-57Da/qRbd9v33YlHX0rlSUVFmE4THCjKqwkmfhY3tNLnSKN2L5YBS3qhWeDO0IrMNgUj+rGve2moKYXeUqQt4A== +workbox-range-requests@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.2.tgz#b8b7e5b5830fecc22f0a1d8815457921df2e5bf9" + integrity sha512-zi5VqF1mWqfCyJLTMXn1EuH/E6nisqWDK1VmOJ+TnjxGttaQrseOhMn+BMvULFHeF8AvrQ0ogfQ6bSv0rcfAlg== dependencies: - workbox-core "6.5.1" + workbox-core "6.5.2" -workbox-recipes@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.1.tgz#d2fb21743677cc3ca9e1fc9e3b68f0d1587df205" - integrity sha512-DGsyKygHggcGPQpWafC/Nmbm1Ny3sB2vE9r//3UbeidXiQ+pLF14KEG1/0NNGRaY+lfOXOagq6d1H7SC8KA+rA== +workbox-recipes@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.2.tgz#19f47ec25a8788c65d0cc8d217cbebc0bbbb5c63" + integrity sha512-2lcUKMYDiJKvuvRotOxLjH2z9K7jhj8GNUaHxHNkJYbTCUN3LsX1cWrsgeJFDZ/LgI565t3fntpbG9J415ZBXA== dependencies: - workbox-cacheable-response "6.5.1" - workbox-core "6.5.1" - workbox-expiration "6.5.1" - workbox-precaching "6.5.1" - workbox-routing "6.5.1" - workbox-strategies "6.5.1" + workbox-cacheable-response "6.5.2" + workbox-core "6.5.2" + workbox-expiration "6.5.2" + workbox-precaching "6.5.2" + workbox-routing "6.5.2" + workbox-strategies "6.5.2" -workbox-routing@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.1.tgz#5488795ae850fe3ae435241143b54ff25ab0db70" - integrity sha512-yAAncdTwanvlR8KPjubyvFKeAok8ZcIws6UKxvIAg0I+wsf7UYi93DXNuZr6RBSQrByrN6HkCyjuhmk8P63+PA== +workbox-routing@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.2.tgz#e0ad46246ba51224fd57eff0dd46891b3220cb9a" + integrity sha512-nR1w5PjF6IVwo0SX3oE88LhmGFmTnqqU7zpGJQQPZiKJfEKgDENQIM9mh3L1ksdFd9Y3CZVkusopHfxQvit/BA== dependencies: - workbox-core "6.5.1" + workbox-core "6.5.2" -workbox-strategies@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.1.tgz#51cabbddad5a1956eb9d51cf6ce01ab0a6372756" - integrity sha512-JNaTXPy8wXzKkr+6za7/eJX9opoZk7UgY261I2kPxl80XQD8lMjz0vo9EOcBwvD72v3ZhGJbW84ZaDwFEhFvWA== +workbox-strategies@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.2.tgz#56b02e6959c6391351011fc2e5b0829aff1ed859" + integrity sha512-fgbwaUMxbG39BHjJIs2y2X21C0bmf1Oq3vMQxJ1hr6y5JMJIm8rvKCcf1EIdAr+PjKdSk4ddmgyBQ4oO8be4Uw== dependencies: - workbox-core "6.5.1" + workbox-core "6.5.2" -workbox-streams@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.1.tgz#12036817385fa4449a86a3ef77fce1cb00ecad9f" - integrity sha512-7jaTWm6HRGJ/ewECnhb+UgjTT50R42E0/uNCC4eTKQwnLO/NzNGjoXTdQgFjo4zteR+L/K6AtFAiYKH3ZJbAYw== +workbox-streams@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.2.tgz#2fb6ba307f7d2cbda63f64522a197be868b4ea25" + integrity sha512-ovD0P4UrgPtZ2Lfc/8E8teb1RqNOSZr+1ZPqLR6sGRZnKZviqKbQC3zVvvkhmOIwhWbpL7bQlWveLVONHjxd5w== dependencies: - workbox-core "6.5.1" - workbox-routing "6.5.1" + workbox-core "6.5.2" + workbox-routing "6.5.2" -workbox-sw@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.1.tgz#f9256b40f0a7e94656ccd06f127ba19a92cd23c5" - integrity sha512-hVrQa19yo9wzN1fQQ/h2JlkzFpkuH2qzYT2/rk7CLaWt6tLnTJVFCNHlGRRPhytZSf++LoIy7zThT714sowT/Q== +workbox-sw@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.2.tgz#2f5dca0e96c61a450fccf0405095ddf1b6f43bc7" + integrity sha512-2KhlYqtkoqlnPdllj2ujXUKRuEFsRDIp6rdE4l1PsxiFHRAFaRTisRQpGvRem5yxgXEr+fcEKiuZUW2r70KZaw== workbox-webpack-plugin@^6.4.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.1.tgz#da88b4b6d8eff855958f0e7ebb7aa3eea50a8282" - integrity sha512-SHtlQBpKruI16CAYhICDMkgjXE2fH5Yp+D+1UmBfRVhByZYzusVOykvnPm8ObJb9d/tXgn9yoppoxafFS7D4vQ== + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.2.tgz#0cf6e1d23d5107a88fd8502fd4f534215e1dd298" + integrity sha512-StrJ7wKp5tZuGVcoKLVjFWlhDy+KT7ZWsKnNcD6F08wA9Cpt6JN+PLIrplcsTHbQpoAV8+xg6RvcG0oc9z+RpQ== dependencies: fast-json-stable-stringify "^2.1.0" pretty-bytes "^5.4.1" upath "^1.2.0" webpack-sources "^1.4.3" - workbox-build "6.5.1" + workbox-build "6.5.2" -workbox-window@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.1.tgz#7b5ca29467b1da45dc9e2b5a1b89159d3eb9957a" - integrity sha512-oRlun9u7b7YEjo2fIDBqJkU2hXtrEljXcOytRhfeQRbqXxjUOpFgXSGRSAkmDx1MlKUNOSbr+zfi8h5n7In3yA== +workbox-window@6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.2.tgz#46d6412cd57039bdf3d5dd914ad21fb3f98fe980" + integrity sha512-2kZH37r9Wx8swjEOL4B8uGM53lakMxsKkQ7mOKzGA/QAn/DQTEZGrdHWtypk2tbhKY5S0jvPS+sYDnb2Z3378A== dependencies: "@types/trusted-types" "^2.0.2" - workbox-core "6.5.1" + workbox-core "6.5.2" wrap-ansi@^7.0.0: version "7.0.0" @@ -9527,11 +9432,6 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" From 92a40684822a790592fdfb7819b1c312dec2806a Mon Sep 17 00:00:00 2001 From: beguille Date: Sat, 9 Apr 2022 16:57:08 +0200 Subject: [PATCH 002/649] possible fix --- frontend/yarn.lock | 1356 ++++++++++++++++++++++++-------------------- 1 file changed, 728 insertions(+), 628 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index c72b464e5..1fb299499 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -31,24 +31,24 @@ integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== "@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe" - integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" + integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.9" + "@babel/generator" "^7.17.7" "@babel/helper-compilation-targets" "^7.17.7" "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.9" - "@babel/parser" "^7.17.9" + "@babel/helpers" "^7.17.8" + "@babel/parser" "^7.17.8" "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.9" + "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.1" + json5 "^2.1.2" semver "^6.3.0" "@babel/eslint-parser@^7.16.3": @@ -60,10 +60,10 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.17.9", "@babel/generator@^7.7.2": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc" - integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ== +"@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.7.2": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" + integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w== dependencies: "@babel/types" "^7.17.0" jsesc "^2.5.1" @@ -94,15 +94,15 @@ browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d" - integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ== +"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6": + version "7.17.6" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9" + integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.17.9" - "@babel/helper-member-expression-to-functions" "^7.17.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-member-expression-to-functions" "^7.16.7" "@babel/helper-optimise-call-expression" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" @@ -143,13 +143,21 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12" - integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== +"@babel/helper-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" + integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== dependencies: + "@babel/helper-get-function-arity" "^7.16.7" "@babel/template" "^7.16.7" - "@babel/types" "^7.17.0" + "@babel/types" "^7.16.7" + +"@babel/helper-get-function-arity@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" + integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== + dependencies: + "@babel/types" "^7.16.7" "@babel/helper-hoist-variables@^7.16.7": version "7.16.7" @@ -158,7 +166,7 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7": +"@babel/helper-member-expression-to-functions@^7.16.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw== @@ -259,28 +267,28 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a" - integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q== +"@babel/helpers@^7.17.8": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106" + integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw== dependencies: "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.9" + "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" "@babel/highlight@^7.16.7": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3" - integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg== + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" + integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== dependencies: "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef" - integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240" + integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" @@ -325,14 +333,13 @@ "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-decorators@^7.16.4": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz#67a1653be9c77ce5b6c318aa90c8287b87831619" - integrity sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.8.tgz#4f0444e896bee85d35cf714a006fc5418f87ff00" + integrity sha512-U69odN4Umyyx1xO1rTII0IDkAEC+RNlcKXtqOblfpzqy1C+aOplb76BQNq0+XdpVkOaPlpEDwd++joY8FNFJKA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.17.9" + "@babel/helper-create-class-features-plugin" "^7.17.6" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" "@babel/plugin-syntax-decorators" "^7.17.0" charcodes "^0.2.0" @@ -707,9 +714,9 @@ babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-commonjs@^7.16.8": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6" - integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw== + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19" + integrity sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA== dependencies: "@babel/helper-module-transforms" "^7.17.7" "@babel/helper-plugin-utils" "^7.16.7" @@ -812,11 +819,11 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-regenerator@^7.16.7": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c" - integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ== + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" + integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== dependencies: - regenerator-transform "^0.15.0" + regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.16.7": version "7.16.7" @@ -1010,17 +1017,17 @@ "@babel/plugin-transform-typescript" "^7.16.7" "@babel/runtime-corejs3@^7.10.2": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.9.tgz#3d02d0161f0fbf3ada8e88159375af97690f4055" - integrity sha512-WxYHHUWF2uZ7Hp1K+D1xQgbgkGUfA+5UPOegEXGt2Y5SMog/rYCVaifLZDbw8UkNXozEqqrZTy6bglL7xTaCOw== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.8.tgz#d7dd49fb812f29c61c59126da3792d8740d4e284" + integrity sha512-ZbYSUvoSF6dXZmMl/CYTMOvzIFnbGfv4W3SEHYgMvNsFTeLaF2gkGAF4K2ddmtSK4Emej+0aYcnSC6N5dPCXUQ== dependencies: core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.16", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" - integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" + integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== dependencies: regenerator-runtime "^0.13.4" @@ -1033,18 +1040,18 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d" - integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw== +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" + integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== dependencies: "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.9" + "@babel/generator" "^7.17.3" "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.17.9" + "@babel/helper-function-name" "^7.16.7" "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.9" + "@babel/parser" "^7.17.3" "@babel/types" "^7.17.0" debug "^4.1.0" globals "^11.1.0" @@ -1068,9 +1075,9 @@ integrity sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg== "@csstools/postcss-color-function@^1.0.3": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.0.tgz#229966327747f58fbe586de35daa139db3ce1e5d" - integrity sha512-5D5ND/mZWcQoSfYnSPsXtuiFxhzmhxt6pcjrFLJyldj+p0ZN2vvRpYNX+lahFTtMhAYOa2WmkdGINr0yP0CvGA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.0.3.tgz#251c961a852c99e9aabdbbdbefd50e9a96e8a9ff" + integrity sha512-J26I69pT2B3MYiLY/uzCGKVJyMYVg9TCpXkWsRlt+Yfq+nELUEm72QXIMYXs4xA9cJA4Oqs2EylrfokKl3mJEQ== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" postcss-value-parser "^4.2.0" @@ -1098,11 +1105,11 @@ postcss-value-parser "^4.2.0" "@csstools/postcss-is-pseudo-class@^2.0.1": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.2.tgz#a834ca11a43d6ed9bc9e3ff53c80d490a4b1aaad" - integrity sha512-L9h1yxXMj7KpgNzlMrw3isvHJYkikZgZE4ASwssTnGEH8tm50L6QsM9QQT5wR4/eO5mU0rN5axH7UzNxEYg5CA== + version "2.0.1" + resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.1.tgz#472fff2cf434bdf832f7145b2a5491587e790c9e" + integrity sha512-Og5RrTzwFhrKoA79c3MLkfrIBYmwuf/X83s+JQtz/Dkk/MpsaKtqHV1OOzYkogQ+tj3oYp5Mq39XotBXNqVc3Q== dependencies: - postcss-selector-parser "^6.0.10" + postcss-selector-parser "^6.0.9" "@csstools/postcss-normalize-display-values@^1.0.0": version "1.0.0" @@ -1112,9 +1119,9 @@ postcss-value-parser "^4.2.0" "@csstools/postcss-oklab-function@^1.0.2": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.0.tgz#e9a269487a292e0930760948e923e1d46b638ee6" - integrity sha512-e/Q5HopQzmnQgqimG9v3w2IG4VRABsBq3itOcn4bnm+j4enTgQZ0nWsaH/m9GV2otWGQ0nwccYL5vmLKyvP1ww== + version "1.0.2" + resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.0.2.tgz#87cd646e9450347a5721e405b4f7cc35157b7866" + integrity sha512-QwhWesEkMlp4narAwUi6pgc6kcooh8cC7zfxa9LSQNYXqzcdNUtNBzbGc5nuyAVreb7uf5Ox4qH1vYT3GA1wOg== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" postcss-value-parser "^4.2.0" @@ -1126,17 +1133,17 @@ dependencies: postcss-value-parser "^4.2.0" -"@emotion/is-prop-valid@^1.1.0": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" - integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== +"@emotion/is-prop-valid@^0.8.8": + version "0.8.8" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" + integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== dependencies: - "@emotion/memoize" "^0.7.4" + "@emotion/memoize" "0.7.4" -"@emotion/memoize@^0.7.4": - version "0.7.5" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" - integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== +"@emotion/memoize@0.7.4": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" + integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== "@emotion/stylis@^0.8.4": version "0.8.5" @@ -1163,10 +1170,10 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fortawesome/fontawesome-common-types@6.1.1": - version "6.1.1" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz#7dc996042d21fc1ae850e3173b5c67b0549f9105" - integrity sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA== +"@fortawesome/fontawesome-common-types@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.0.tgz#5a9468da0e5c2a3ccc161882ef5ffafbd3d4882f" + integrity sha512-lFIJ5opxOKG9q88xOsuJJAdRZ+2WRldsZwUR/7MJoOMUMhF/LkHUjwWACIEPTa5Wo6uTDHvGRIX+XutdN7zYxA== "@fortawesome/fontawesome-common-types@^0.3.0": version "0.3.0" @@ -1181,11 +1188,11 @@ "@fortawesome/fontawesome-common-types" "^0.3.0" "@fortawesome/free-solid-svg-icons@^6.0.0": - version "6.1.1" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.1.tgz#3369e673f8fe8be2fba30b1ec274d47490a830a6" - integrity sha512-0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg== + version "6.1.0" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.0.tgz#1bdc3ce6ddd2336348ba324ac4a72161725b0d95" + integrity sha512-OOr0jRHl5d41RzBS3sZh5Z3HmdPjMr43PxxKlYeLtQxFSixPf4sJFVM12/rTepB2m0rVShI0vtjHQmzOTlBaXg== dependencies: - "@fortawesome/fontawesome-common-types" "6.1.1" + "@fortawesome/fontawesome-common-types" "6.1.0" "@fortawesome/react-fontawesome@^0.1.17": version "0.1.18" @@ -1411,11 +1418,6 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@leichtgewicht/ip-codec@^2.0.1": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0" - integrity sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg== - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1438,9 +1440,9 @@ fastq "^1.6.0" "@pmmmwh/react-refresh-webpack-plugin@^0.5.3": - version "0.5.5" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.5.tgz#e77aac783bd079f548daa0a7f080ab5b5a9741ca" - integrity sha512-RbG7h6TuP6nFFYKJwbcToA1rjC1FyPg25NR2noAZ0vKI+la01KTSRPkuVPE+U88jXv7javx2JHglUcL1MHcshQ== + version "0.5.4" + resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz#df0d0d855fc527db48aac93c218a0bf4ada41f99" + integrity sha512-zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw== dependencies: ansi-html-community "^0.0.8" common-path-prefix "^3.0.0" @@ -1453,9 +1455,9 @@ source-map "^0.7.3" "@popperjs/core@^2.10.1": - version "2.11.5" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64" - integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw== + version "2.11.4" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" + integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg== "@react-aria/ssr@^3.0.1": version "3.1.2" @@ -1464,17 +1466,17 @@ dependencies: "@babel/runtime" "^7.6.2" -"@restart/hooks@^0.4.0", "@restart/hooks@^0.4.6": - version "0.4.6" - resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.4.6.tgz#15dcf34631a618c513efc924705c7cbe349a4a0c" - integrity sha512-FzpEzy6QeLB3OpUrC9OQD/lWCluQmilLfRGa/DqbB6OmV05AEt/0Lgn3Jf6l27UIJMK0qFmNcps6p8DNLXa6Pw== +"@restart/hooks@^0.4.0", "@restart/hooks@^0.4.5": + version "0.4.5" + resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.4.5.tgz#e7acbea237bfc9e479970500cf87538b41a1ed02" + integrity sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A== dependencies: dequal "^2.0.2" -"@restart/ui@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@restart/ui/-/ui-1.2.0.tgz#fb90251aa25f99b41ccedc78a91d2a15f3c5e0fb" - integrity sha512-oIh2t3tG8drZtZ9SlaV5CY6wGsUViHk8ZajjhcI+74IQHyWy+AnxDv8rJR5wVgsgcgrPBUvGNkC1AEdcGNPaLQ== +"@restart/ui@^1.0.2": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@restart/ui/-/ui-1.1.0.tgz#46d436225162b47ecccdf191cfbcf9ec3d1d5f47" + integrity sha512-sYAO1LP78Suz5cT2VEkU4U/mvdjFXNg69QHanc5OAFTWyhCBG2lFJ9FITZ7hT8P8LPqcWXcwEGzHhuxPUDDDYQ== dependencies: "@babel/runtime" "^7.13.16" "@popperjs/core" "^2.10.1" @@ -1483,6 +1485,7 @@ "@types/warning" "^3.0.0" dequal "^2.0.2" dom-helpers "^5.2.0" + prop-types "^15.7.2" uncontrollable "^7.2.1" warning "^4.0.3" @@ -1524,9 +1527,9 @@ picomatch "^2.2.2" "@rushstack/eslint-patch@^1.1.0": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.2.tgz#7a26e63b1bdaf654bcce2176a38b83f7f576327e" - integrity sha512-oe5WJEDaVsW8fBlGT7udrSCgOwWfoYHQOmSpnh8X+0GXpqqcRCP8k4y+Dxb0taWJDPpB+rdDUtumIiBwkY9qGA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz#782fa5da44c4f38ae9fd38e9184b54e451936118" + integrity sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg== "@sinonjs/commons@^1.7.0": version "1.8.3" @@ -1656,9 +1659,9 @@ loader-utils "^2.0.0" "@testing-library/dom@^8.0.0": - version "8.13.0" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.13.0.tgz#bc00bdd64c7d8b40841e27a70211399ad3af46f5" - integrity sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ== + version "8.11.3" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.11.3.tgz#38fd63cbfe14557021e88982d931e33fb7c1a808" + integrity sha512-9LId28I+lx70wUiZjLvi1DB/WT2zGOxUh46glrSNMaWVx849kKAluezVzZrXJfTKKoQTmEOutLes/bHg4Bj3aA== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" @@ -1670,9 +1673,9 @@ pretty-format "^27.0.2" "@testing-library/jest-dom@^5.14.1": - version "5.16.4" - resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz#938302d7b8b483963a3ae821f1c0808f872245cd" - integrity sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA== + version "5.16.2" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.2.tgz#f329b36b44aa6149cd6ced9adf567f8b6aa1c959" + integrity sha512-6ewxs1MXWwsBFZXIk4nKKskWANelkdUehchEOokHsN8X7c2eKXGw+77aRV63UU8f/DTSVUPLaGxdrj4lN7D/ug== dependencies: "@babel/runtime" "^7.9.2" "@types/testing-library__jest-dom" "^5.9.1" @@ -1925,9 +1928,9 @@ pretty-format "^27.0.0" "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== + version "7.0.10" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23" + integrity sha512-BLO9bBq59vW3fxCpD4o0N4U+DXsvwvIcl+jofw0frQo/GrBFC+/jRZj1E7kgp6dvTyNmA4y6JCV5Id/r3mNP5A== "@types/json5@^0.0.29": version "0.0.29" @@ -1940,9 +1943,9 @@ integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/node@*": - version "17.0.23" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" - integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== + version "17.0.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" + integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== "@types/node@^16.7.13": version "16.11.26" @@ -1960,9 +1963,9 @@ integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA== "@types/prop-types@*", "@types/prop-types@^15.7.4": - version "15.7.5" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" - integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== "@types/q@^1.5.1": version "1.5.5" @@ -1979,20 +1982,13 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@*": - version "18.0.0" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.0.tgz#b13f8d098e4b0c45df4f1ed123833143b0c71141" - integrity sha512-49897Y0UiCGmxZqpC8Blrf6meL8QUla6eb+BBhn69dTXlmuOlzkfr7HHY/O8J25e1lTUMs+YYxSlVDAaGHCOLg== +"@types/react-dom@*", "@types/react-dom@^17.0.9": + version "17.0.14" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" + integrity sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ== dependencies: "@types/react" "*" -"@types/react-dom@^17.0.9": - version "17.0.15" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.15.tgz#f2c8efde11521a4b7991e076cb9c70ba3bb0d156" - integrity sha512-Tr9VU9DvNoHDWlmecmcsE5ZZiUkYx+nKBzum4Oxe1K0yJVyBlfbq7H3eXjxXqJczBKqPGq3EgfTru4MgKb9+Yw== - dependencies: - "@types/react" "^17" - "@types/react-router-bootstrap@^0.24.5": version "0.24.5" resolved "https://registry.yarnpkg.com/@types/react-router-bootstrap/-/react-router-bootstrap-0.24.5.tgz#9257ba3dfb01cda201aac9fa05cde3eb09ea5b27" @@ -2025,19 +2021,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11": - version "18.0.0" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.0.tgz#4be8aa3a2d04afc3ac2cc1ca43d39b0bd412890c" - integrity sha512-7+K7zEQYu7NzOwQGLR91KwWXXDzmTFODRVizJyIALf6RfLv2GDpqpknX64pvRVILXCpXi7O/pua8NGk44dLvJw== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^17", "@types/react@^17.0.20": - version "17.0.44" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.44.tgz#c3714bd34dd551ab20b8015d9d0dbec812a51ec7" - integrity sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g== +"@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^17.0.20": + version "17.0.41" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.41.tgz#6e179590d276394de1e357b3f89d05d7d3da8b85" + integrity sha512-chYZ9ogWUodyC7VUTRBfblysKLjnohhFY9bGLwvnUFFy48+vB9DikmB3lW0qTFmBcKSzmdglcvkHK71IioOlDA== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2088,9 +2075,9 @@ integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== "@types/styled-components@^5.1.24": - version "5.1.25" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.25.tgz#0177c4ab5fa7c6ed0565d36f597393dae3f380ad" - integrity sha512-fgwl+0Pa8pdkwXRoVPP9JbqF0Ivo9llnmsm+7TCI330kbPIFd9qv1Lrhr37shf4tnxCOSu+/IgqM7uJXLWZZNQ== + version "5.1.24" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.24.tgz#b52ae677f03ea8a6018aa34c6c96b7018b7a3571" + integrity sha512-mz0fzq2nez+Lq5IuYammYwWgyLUE6OMAJTQL9D8hFLP4Pkh7gVYJii/VQWxq8/TK34g/OrkehXaFNdcEKcItug== dependencies: "@types/hoist-non-react-statics" "*" "@types/react" "*" @@ -2113,7 +2100,7 @@ resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI= -"@types/ws@^8.5.1": +"@types/ws@^8.2.2": version "8.5.3" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== @@ -2133,13 +2120,13 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^5.12.0", "@typescript-eslint/eslint-plugin@^5.5.0": - version "5.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz#950df411cec65f90d75d6320a03b2c98f6c3af7d" - integrity sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A== + version "5.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.15.0.tgz#c28ef7f2e688066db0b6a9d95fb74185c114fb9a" + integrity sha512-u6Db5JfF0Esn3tiAKELvoU5TpXVSkOpZ78cEGn/wXtT2RVqs2vkt4ge6N8cRCyw7YVKhmmLDbwI2pg92mlv7cA== dependencies: - "@typescript-eslint/scope-manager" "5.18.0" - "@typescript-eslint/type-utils" "5.18.0" - "@typescript-eslint/utils" "5.18.0" + "@typescript-eslint/scope-manager" "5.15.0" + "@typescript-eslint/type-utils" "5.15.0" + "@typescript-eslint/utils" "5.15.0" debug "^4.3.2" functional-red-black-tree "^1.0.1" ignore "^5.1.8" @@ -2148,75 +2135,75 @@ tsutils "^3.21.0" "@typescript-eslint/experimental-utils@^5.0.0": - version "5.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.18.0.tgz#a6b5662e6b0452cb0e75a13662ce3b33cd1be59d" - integrity sha512-hypiw5N0aM2aH91/uMmG7RpyUH3PN/iOhilMwkMFZIbm/Bn/G3ZnbaYdSoAN4PG/XHQjdhBYLi0ZoRZsRYT4hA== + version "5.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.15.0.tgz#407bbbdf1d11d24de81cfdf556b3a9f4252ba4ae" + integrity sha512-AJOOaBrVqKYWaYDBtgMi9XVDB3YHXlffto/3A4VQ39VVaNqosSOp/nW09G4N/ej8WlzHQB2jTnSfP5wWsXSQJA== dependencies: - "@typescript-eslint/utils" "5.18.0" + "@typescript-eslint/utils" "5.15.0" "@typescript-eslint/parser@^5.12.0", "@typescript-eslint/parser@^5.5.0": - version "5.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.18.0.tgz#2bcd4ff21df33621df33e942ccb21cb897f004c6" - integrity sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ== + version "5.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.15.0.tgz#95f603f8fe6eca7952a99bfeef9b85992972e728" + integrity sha512-NGAYP/+RDM2sVfmKiKOCgJYPstAO40vPAgACoWPO/+yoYKSgAXIFaBKsV8P0Cc7fwKgvj27SjRNX4L7f4/jCKQ== dependencies: - "@typescript-eslint/scope-manager" "5.18.0" - "@typescript-eslint/types" "5.18.0" - "@typescript-eslint/typescript-estree" "5.18.0" + "@typescript-eslint/scope-manager" "5.15.0" + "@typescript-eslint/types" "5.15.0" + "@typescript-eslint/typescript-estree" "5.15.0" debug "^4.3.2" -"@typescript-eslint/scope-manager@5.18.0": - version "5.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz#a7d7b49b973ba8cebf2a3710eefd457ef2fb5505" - integrity sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ== +"@typescript-eslint/scope-manager@5.15.0": + version "5.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz#d97afab5e0abf4018d1289bd711be21676cdd0ee" + integrity sha512-EFiZcSKrHh4kWk0pZaa+YNJosvKE50EnmN4IfgjkA3bTHElPtYcd2U37QQkNTqwMCS7LXeDeZzEqnsOH8chjSg== dependencies: - "@typescript-eslint/types" "5.18.0" - "@typescript-eslint/visitor-keys" "5.18.0" + "@typescript-eslint/types" "5.15.0" + "@typescript-eslint/visitor-keys" "5.15.0" -"@typescript-eslint/type-utils@5.18.0": - version "5.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz#62dbfc8478abf36ba94a90ddf10be3cc8e471c74" - integrity sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA== +"@typescript-eslint/type-utils@5.15.0": + version "5.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.15.0.tgz#d2c02eb2bdf54d0a645ba3a173ceda78346cf248" + integrity sha512-KGeDoEQ7gHieLydujGEFLyLofipe9PIzfvA/41urz4hv+xVxPEbmMQonKSynZ0Ks2xDhJQ4VYjB3DnRiywvKDA== dependencies: - "@typescript-eslint/utils" "5.18.0" + "@typescript-eslint/utils" "5.15.0" debug "^4.3.2" tsutils "^3.21.0" -"@typescript-eslint/types@5.18.0": - version "5.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.18.0.tgz#4f0425d85fdb863071680983853c59a62ce9566e" - integrity sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw== +"@typescript-eslint/types@5.15.0": + version "5.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501" + integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA== -"@typescript-eslint/typescript-estree@5.18.0": - version "5.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz#6498e5ee69a32e82b6e18689e2f72e4060986474" - integrity sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ== +"@typescript-eslint/typescript-estree@5.15.0": + version "5.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz#81513a742a9c657587ad1ddbca88e76c6efb0aac" + integrity sha512-Hb0e3dGc35b75xLzixM3cSbG1sSbrTBQDfIScqdyvrfJZVEi4XWAT+UL/HMxEdrJNB8Yk28SKxPLtAhfCbBInA== dependencies: - "@typescript-eslint/types" "5.18.0" - "@typescript-eslint/visitor-keys" "5.18.0" + "@typescript-eslint/types" "5.15.0" + "@typescript-eslint/visitor-keys" "5.15.0" debug "^4.3.2" globby "^11.0.4" is-glob "^4.0.3" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/utils@5.18.0", "@typescript-eslint/utils@^5.13.0": - version "5.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.18.0.tgz#27fc84cf95c1a96def0aae31684cb43a37e76855" - integrity sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA== +"@typescript-eslint/utils@5.15.0", "@typescript-eslint/utils@^5.13.0": + version "5.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.15.0.tgz#468510a0974d3ced8342f37e6c662778c277f136" + integrity sha512-081rWu2IPKOgTOhHUk/QfxuFog8m4wxW43sXNOMSCdh578tGJ1PAaWPsj42LOa7pguh173tNlMigsbrHvh/mtA== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.18.0" - "@typescript-eslint/types" "5.18.0" - "@typescript-eslint/typescript-estree" "5.18.0" + "@typescript-eslint/scope-manager" "5.15.0" + "@typescript-eslint/types" "5.15.0" + "@typescript-eslint/typescript-estree" "5.15.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.18.0": - version "5.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz#c7c07709823804171d569017f3b031ced7253e60" - integrity sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg== +"@typescript-eslint/visitor-keys@5.15.0": + version "5.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz#5669739fbf516df060f978be6a6dce75855a8027" + integrity sha512-+vX5FKtgvyHbmIJdxMJ2jKm9z2BIlXJiuewI8dsDYMp5LzPUcuTT78Ya5iwvQg3VqSVdmxyM8Anj1Jeq7733ZQ== dependencies: - "@typescript-eslint/types" "5.18.0" + "@typescript-eslint/types" "5.15.0" eslint-visitor-keys "^3.0.0" "@webassemblyjs/ast@1.11.1": @@ -2425,6 +2412,14 @@ agent-base@6: dependencies: debug "4" +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + airbnb-prop-types@^2.16.0: version "2.16.0" resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2" @@ -2470,9 +2465,9 @@ ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== + version "8.10.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" + integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -2563,12 +2558,12 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-flatten@^2.1.2: +array-flatten@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.1.4: +array-includes@^3.1.3, array-includes@^3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== @@ -2703,12 +2698,12 @@ babel-jest@^27.4.2, babel-jest@^27.5.1: slash "^3.0.0" babel-loader@^8.2.3: - version "8.2.4" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b" - integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A== + version "8.2.3" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== dependencies: find-cache-dir "^3.3.1" - loader-utils "^2.0.0" + loader-utils "^1.4.0" make-dir "^3.1.0" schema-utils "^2.6.5" @@ -2779,9 +2774,9 @@ babel-plugin-polyfill-regenerator@^0.3.0: "@babel/helper-define-polyfill-provider" "^0.3.1" "babel-plugin-styled-components@>= 1.12.0": - version "2.0.7" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086" - integrity sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA== + version "2.0.6" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz#6f76c7f7224b7af7edc24a4910351948c691fc90" + integrity sha512-Sk+7o/oa2HfHv3Eh8sxoz75/fFvEdHsXV4grdeHufX0nauCmymlnN0rGhIvfpMQSJMvGutJ85gvCGea4iqmDpg== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" "@babel/helper-module-imports" "^7.16.0" @@ -2898,15 +2893,17 @@ body-parser@1.19.2: raw-body "2.4.3" type-is "~1.6.18" -bonjour-service@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.11.tgz#5418e5c1ac91c89a406f853a942e7892829c0d89" - integrity sha512-drMprzr2rDTCtgEE3VgdA9uUFaUHF+jXduwYSThHJnKMYM+FhI9Z3ph+TX3xy0LtgYHae6CHYPJ/2UnK8nQHcA== +bonjour@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" + integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= dependencies: - array-flatten "^2.1.2" + array-flatten "^2.1.0" + deep-equal "^1.0.1" dns-equal "^1.0.0" - fast-deep-equal "^3.1.3" - multicast-dns "^7.2.4" + dns-txt "^2.0.2" + multicast-dns "^6.0.1" + multicast-dns-service-types "^1.1.0" boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" @@ -2933,7 +2930,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^3.0.2, braces@~3.0.2: +braces@^3.0.1, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -2968,6 +2965,11 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== +buffer-indexof@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" + integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== + builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -3035,9 +3037,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317: - version "1.0.30001327" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz#c1546d7d7bb66506f0ccdad6a7d07fc6d668c858" - integrity sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w== + version "1.0.30001319" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz#eb4da4eb3ecdd409f7ba1907820061d56096e88f" + integrity sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw== case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" @@ -3090,15 +3092,15 @@ check-types@^11.1.1: integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ== cheerio-select@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.6.0.tgz#489f36604112c722afa147dedd0d4609c09e1696" - integrity sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g== + version "1.5.0" + resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823" + integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg== dependencies: - css-select "^4.3.0" - css-what "^6.0.1" + css-select "^4.1.3" + css-what "^5.0.1" domelementtype "^2.2.0" - domhandler "^4.3.1" - domutils "^2.8.0" + domhandler "^4.2.0" + domutils "^2.7.0" cheerio@^1.0.0-rc.3: version "1.0.0-rc.10" @@ -3149,12 +3151,17 @@ classnames@^2.3.1: integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== clean-css@^5.2.2: - version "5.3.0" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz#ad3d8238d5f3549e83d5f87205189494bc7cbb59" - integrity sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ== + version "5.2.4" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.4.tgz#982b058f8581adb2ae062520808fb2429bd487a4" + integrity sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg== dependencies: source-map "~0.6.0" +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -3389,10 +3396,12 @@ css-color-keywords@^1.0.0: resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= -css-declaration-sorter@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz#bfd2f6f50002d6a3ae779a87d3a0c5d5b10e0f02" - integrity sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg== +css-declaration-sorter@^6.0.3: + version "6.1.4" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4" + integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw== + dependencies: + timsort "^0.3.0" css-has-pseudo@^3.0.4: version "3.0.4" @@ -3447,14 +3456,14 @@ css-select@^2.0.0: domutils "^1.7.0" nth-check "^1.0.2" -css-select@^4.1.3, css-select@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" - integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== +css-select@^4.1.3: + version "4.2.1" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" + integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== dependencies: boolbase "^1.0.0" - css-what "^6.0.1" - domhandler "^4.3.1" + css-what "^5.1.0" + domhandler "^4.3.0" domutils "^2.8.0" nth-check "^2.0.1" @@ -3488,10 +3497,10 @@ css-what@^3.2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== -css-what@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" - integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== +css-what@^5.0.1, css-what@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== css.escape@^1.5.1: version "1.5.1" @@ -3517,52 +3526,52 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^5.2.7: - version "5.2.7" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz#791e3603fb8f1b46717ac53b47e3c418e950f5f3" - integrity sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA== +cssnano-preset-default@^*: + version "5.2.4" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.4.tgz#eced79bbc1ab7270337c4038a21891daac2329bc" + integrity sha512-w1Gg8xsebln6/axZ6qDFQHuglrGfbIHOIx0g4y9+etRlRab8CGpSpe6UMsrgJe4zhCaJ0LwLmc+PhdLRTwnhIA== dependencies: - css-declaration-sorter "^6.2.2" - cssnano-utils "^3.1.0" + css-declaration-sorter "^6.0.3" + cssnano-utils "^*" postcss-calc "^8.2.3" - postcss-colormin "^5.3.0" - postcss-convert-values "^5.1.0" - postcss-discard-comments "^5.1.1" - postcss-discard-duplicates "^5.1.0" - postcss-discard-empty "^5.1.1" - postcss-discard-overridden "^5.1.0" - postcss-merge-longhand "^5.1.4" - postcss-merge-rules "^5.1.1" - postcss-minify-font-values "^5.1.0" - postcss-minify-gradients "^5.1.1" - postcss-minify-params "^5.1.2" - postcss-minify-selectors "^5.2.0" - postcss-normalize-charset "^5.1.0" - postcss-normalize-display-values "^5.1.0" - postcss-normalize-positions "^5.1.0" - postcss-normalize-repeat-style "^5.1.0" - postcss-normalize-string "^5.1.0" - postcss-normalize-timing-functions "^5.1.0" - postcss-normalize-unicode "^5.1.0" - postcss-normalize-url "^5.1.0" - postcss-normalize-whitespace "^5.1.1" - postcss-ordered-values "^5.1.1" - postcss-reduce-initial "^5.1.0" - postcss-reduce-transforms "^5.1.0" - postcss-svgo "^5.1.0" - postcss-unique-selectors "^5.1.1" - -cssnano-utils@^3.1.0: + postcss-colormin "^*" + postcss-convert-values "^*" + postcss-discard-comments "^*" + postcss-discard-duplicates "^*" + postcss-discard-empty "^*" + postcss-discard-overridden "^*" + postcss-merge-longhand "^*" + postcss-merge-rules "^*" + postcss-minify-font-values "^*" + postcss-minify-gradients "^*" + postcss-minify-params "^*" + postcss-minify-selectors "^*" + postcss-normalize-charset "^*" + postcss-normalize-display-values "^*" + postcss-normalize-positions "^*" + postcss-normalize-repeat-style "^*" + postcss-normalize-string "^*" + postcss-normalize-timing-functions "^*" + postcss-normalize-unicode "^*" + postcss-normalize-url "^*" + postcss-normalize-whitespace "^*" + postcss-ordered-values "^*" + postcss-reduce-initial "^*" + postcss-reduce-transforms "^*" + postcss-svgo "^*" + postcss-unique-selectors "^*" + +cssnano-utils@^*, cssnano-utils@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== cssnano@^5.0.6: - version "5.1.7" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.7.tgz#99858bef6c76c9240f0cdc9239570bc7db8368be" - integrity sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg== + version "5.1.4" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.4.tgz#c648192e8e2f1aacb7d839e6aa3706b50cc7f8e4" + integrity sha512-hbfhVZreEPyzl+NbvRsjNo54JOX80b+j6nqG2biLVLaZHJEiqGyMh4xDGHtwhUKd5p59mj2GlDqlUBwJUuIu5A== dependencies: - cssnano-preset-default "^5.2.7" + cssnano-preset-default "^*" lilconfig "^2.0.3" yaml "^1.10.2" @@ -3645,6 +3654,18 @@ dedent@^0.7.0: resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= +deep-equal@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== + dependencies: + is-arguments "^1.0.4" + is-date-object "^1.0.1" + is-regex "^1.0.4" + object-is "^1.0.1" + object-keys "^1.1.1" + regexp.prototype.flags "^1.2.0" + deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -3679,6 +3700,20 @@ defined@^1.0.0: resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= +del@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== + dependencies: + globby "^11.0.1" + graceful-fs "^4.2.4" + is-glob "^4.0.1" + is-path-cwd "^2.2.0" + is-path-inside "^3.0.2" + p-map "^4.0.0" + rimraf "^3.0.2" + slash "^3.0.0" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -3758,12 +3793,20 @@ dns-equal@^1.0.0: resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= -dns-packet@^5.2.2: - version "5.3.1" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.3.1.tgz#eb94413789daec0f0ebe2fcc230bdc9d7c91b43d" - integrity sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw== +dns-packet@^1.3.1: + version "1.3.4" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== dependencies: - "@leichtgewicht/ip-codec" "^2.0.1" + ip "^1.1.0" + safe-buffer "^5.0.1" + +dns-txt@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= + dependencies: + buffer-indexof "^1.0.0" doctrine@^2.1.0: version "2.1.0" @@ -3822,9 +3865,9 @@ domelementtype@1: integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== domexception@^2.0.1: version "2.0.1" @@ -3833,7 +3876,7 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: +domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: version "4.3.1" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== @@ -3848,7 +3891,7 @@ domutils@^1.7.0: dom-serializer "0" domelementtype "1" -domutils@^2.5.2, domutils@^2.8.0: +domutils@^2.5.2, domutils@^2.7.0, domutils@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== @@ -3893,9 +3936,9 @@ ejs@^3.1.6: jake "^10.6.1" electron-to-chromium@^1.4.84: - version "1.4.106" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a" - integrity sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg== + version "1.4.88" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.88.tgz#ebe6a2573b563680c7a7bf3a51b9e465c9c501db" + integrity sha512-oA7mzccefkvTNi9u7DXmT0LqvhnOiN2BhSrKerta7HeUC1cLoIwtbf2wL+Ah2ozh5KQd3/1njrGrwDBXx6d14Q== emittery@^0.8.1: version "0.8.1" @@ -4014,9 +4057,9 @@ error-stack-parser@^2.0.6: stackframe "^1.1.1" es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: - version "1.19.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f" - integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w== + version "1.19.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -4024,15 +4067,15 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: get-intrinsic "^1.1.1" get-symbol-description "^1.0.0" has "^1.0.3" - has-symbols "^1.0.3" + has-symbols "^1.0.2" internal-slot "^1.0.3" is-callable "^1.2.4" - is-negative-zero "^2.0.2" + is-negative-zero "^2.0.1" is-regex "^1.1.4" is-shared-array-buffer "^1.0.1" is-string "^1.0.7" - is-weakref "^1.0.2" - object-inspect "^1.12.0" + is-weakref "^1.0.1" + object-inspect "^1.11.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" @@ -4133,7 +4176,7 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^2.7.3: +eslint-module-utils@^2.7.2: version "2.7.3" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== @@ -4158,23 +4201,23 @@ eslint-plugin-flowtype@^8.0.3: string-natural-compare "^3.0.1" eslint-plugin-import@^2.25.3: - version "2.26.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" - integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== + version "2.25.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" + integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.3" + eslint-module-utils "^2.7.2" has "^1.0.3" - is-core-module "^2.8.1" + is-core-module "^2.8.0" is-glob "^4.0.3" - minimatch "^3.1.2" + minimatch "^3.0.4" object.values "^1.1.5" - resolve "^1.22.0" - tsconfig-paths "^3.14.1" + resolve "^1.20.0" + tsconfig-paths "^3.12.0" eslint-plugin-jest@^25.3.0: version "25.7.0" @@ -4226,9 +4269,9 @@ eslint-plugin-promise@^6.0.0: integrity sha512-7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw== eslint-plugin-react-hooks@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.4.0.tgz#71c39e528764c848d8253e1aa2c7024ed505f6c4" - integrity sha512-U3RVIfdzJaeKDQKEJbz5p3NW8/L80PCATJAfuojwbaEL+gBjfGdhUcGde+WGUW46Q5sr/NgxevsIiDtNXrvZaQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" + integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.28.0: version "7.29.4" @@ -4256,9 +4299,9 @@ eslint-plugin-standard@^5.0.0: integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg== eslint-plugin-testing-library@^5.0.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.2.1.tgz#3f89cd28ade81329a11584e0bbea129bede01619" - integrity sha512-88qJv6uzYALtiYJDzhelP3ov0Px/GLgnu+UekjjDxL2nMyvgdTyboKqcDBsvFPmAeizlCoSWOjeBN4DxO0BxaA== + version "5.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.1.0.tgz#6ad539a53d4e897d3045902f8e534e07cebd4e8b" + integrity sha512-YSNzasJUbyhOTe14ZPygeOBvcPvcaNkwHwrj4vdf+uirr2D32JTDaKi6CP5Os2aWtOcvt4uBSPXp9h5xGoqvWQ== dependencies: "@typescript-eslint/utils" "^5.13.0" @@ -4319,9 +4362,9 @@ eslint-webpack-plugin@^3.1.1: schema-utils "^3.1.1" eslint@^8.3.0, eslint@^8.9.0: - version "8.13.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.13.0.tgz#6fcea43b6811e655410f5626cfcf328016badcd7" - integrity sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ== + version "8.11.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37" + integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA== dependencies: "@eslint/eslintrc" "^1.2.1" "@humanwhocodes/config-array" "^0.9.2" @@ -4452,7 +4495,7 @@ expect@^27.5.1: jest-matcher-utils "^27.5.1" jest-message-util "^27.5.1" -express@^4.17.3: +express@^4.17.1: version "4.17.3" resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== @@ -4645,9 +4688,9 @@ follow-redirects@^1.0.0, follow-redirects@^1.14.8: integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== fork-ts-checker-webpack-plugin@^6.5.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.1.tgz#fd689e2d9de6ac76abb620909eea56438cd0f232" - integrity sha512-x1wumpHOEf4gDROmKTaB6i4/Q6H3LwmjVO7fIX47vBwlZbtPjU33hgoMuD/Q/y6SU8bnuYSoN6ZQOLshGp0T/g== + version "6.5.0" + resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz#0282b335fa495a97e167f69018f566ea7d2a2b5e" + integrity sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw== dependencies: "@babel/code-frame" "^7.8.3" "@types/json-schema" "^7.0.5" @@ -4847,7 +4890,7 @@ globals@^13.6.0, globals@^13.9.0: dependencies: type-fest "^0.20.2" -globby@^11.0.4: +globby@^11.0.1, globby@^11.0.4: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -4860,9 +4903,9 @@ globby@^11.0.4: slash "^3.0.0" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== gzip-size@^6.0.0: version "6.0.0" @@ -4965,9 +5008,9 @@ html-encoding-sniffer@^2.0.1: whatwg-encoding "^1.0.5" html-entities@^2.1.0, html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== + version "2.3.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== html-escaper@^2.0.0: version "2.0.2" @@ -5048,7 +5091,7 @@ http-proxy-agent@^4.0.1: agent-base "6" debug "4" -http-proxy-middleware@^2.0.3: +http-proxy-middleware@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a" integrity sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg== @@ -5187,6 +5230,11 @@ invariant@^2.2.4: dependencies: loose-envify "^1.0.0" +ip@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -5197,6 +5245,14 @@ ipaddr.js@^2.0.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== +is-arguments@^1.0.4: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -5229,7 +5285,7 @@ is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-core-module@^2.2.0, is-core-module@^2.8.1: +is-core-module@^2.2.0, is-core-module@^2.8.0, is-core-module@^2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== @@ -5275,15 +5331,15 @@ is-module@^1.0.0: resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= -is-negative-zero@^2.0.2: +is-negative-zero@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== dependencies: has-tostringtag "^1.0.0" @@ -5297,6 +5353,16 @@ is-obj@^1.0.1: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= +is-path-cwd@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" + integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== + +is-path-inside@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + is-plain-obj@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" @@ -5307,7 +5373,7 @@ is-potential-custom-element-name@^1.0.1: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.4: +is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== @@ -5326,11 +5392,9 @@ is-root@^2.1.0: integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== is-shared-array-buffer@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== - dependencies: - call-bind "^1.0.2" + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== is-stream@^2.0.0: version "2.0.1" @@ -5361,7 +5425,7 @@ is-typedarray@^1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-weakref@^1.0.2: +is-weakref@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== @@ -5964,10 +6028,12 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.0, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== +json5@^2.1.2, json5@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" jsonc-parser@^3.0.0: version "3.0.0" @@ -5989,11 +6055,11 @@ jsonpointer@^5.0.0: integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg== "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.2.tgz#6ab1e52c71dfc0c0707008a91729a9491fe9f76c" - integrity sha512-HDAyJ4MNQBboGpUnHAVUNJs6X0lh058s6FuixsFGP7MgJYpD6Vasd6nzSG5iIfXu1zAYlHJ/zsOKNlrenTUBnw== + version "3.2.1" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" + integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== dependencies: - array-includes "^3.1.4" + array-includes "^3.1.3" object.assign "^4.1.2" kind-of@^6.0.2: @@ -6044,10 +6110,10 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lilconfig@^2.0.3, lilconfig@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25" - integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg== +lilconfig@^2.0.3, lilconfig@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== lines-and-columns@^1.1.6: version "1.2.4" @@ -6059,6 +6125,15 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== +loader-utils@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + loader-utils@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" @@ -6162,10 +6237,12 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" -lru-cache@^7.4.0: - version "7.8.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.8.0.tgz#649aaeb294a56297b5cbc5d70f198dcc5ebe5747" - integrity sha512-AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg== +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" lunr@^2.3.9: version "2.3.9" @@ -6199,9 +6276,9 @@ makeerror@1.0.12: tmpl "1.0.5" marked@^4.0.12: - version "4.0.13" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.13.tgz#4fd46ca93da46448f3d83f054d938c4f905a258d" - integrity sha512-lS/ZCa4X0gsRcfWs1eoh6dLnHr9kVH3K1t2X4M/tTtNouhZ7anS1Csb6464VGLQHv8b2Tw1cLeZQs58Jav8Rzw== + version "4.0.12" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.12.tgz#2262a4e6fd1afd2f13557726238b69a48b982f7d" + integrity sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ== mdn-data@2.0.14: version "2.0.14" @@ -6246,12 +6323,12 @@ methods@~1.1.2: integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: - braces "^3.0.2" - picomatch "^2.3.1" + braces "^3.0.1" + picomatch "^2.2.3" mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" @@ -6313,17 +6390,17 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.6: +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mkdirp@^0.5.5, mkdirp@~0.5.1: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: - minimist "^1.2.6" + minimist "^1.2.5" moo@^0.5.0: version "0.5.1" @@ -6345,18 +6422,23 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multicast-dns@^7.2.4: - version "7.2.4" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.4.tgz#cf0b115c31e922aeb20b64e6556cbeb34cf0dd19" - integrity sha512-XkCYOU+rr2Ft3LI6w4ye51M3VK31qJXFIxu0XLw169PtKG0Zx47OrXeVW/GCYOfpC9s1yyyf1S+L8/4LY0J9Zw== +multicast-dns-service-types@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" + integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= + +multicast-dns@^6.0.1: + version "6.2.3" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== dependencies: - dns-packet "^5.2.2" + dns-packet "^1.3.1" thunky "^1.0.2" nanoid@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557" - integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA== + version "3.3.1" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" + integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== natural-compare@^1.4.0: version "1.4.0" @@ -6391,10 +6473,10 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-forge@^1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" - integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== +node-forge@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2" + integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA== node-int64@^0.4.0: version "0.4.0" @@ -6457,12 +6539,12 @@ object-hash@^2.2.0: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== -object-inspect@^1.12.0, object-inspect@^1.7.0, object-inspect@^1.9.0: +object-inspect@^1.11.0, object-inspect@^1.7.0, object-inspect@^1.9.0: version "1.12.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== -object-is@^1.0.2, object-is@^1.1.2: +object-is@^1.0.1, object-is@^1.0.2, object-is@^1.1.2: version "1.1.5" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== @@ -6642,6 +6724,13 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-retry@^4.5.0: version "4.6.1" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" @@ -6760,7 +6849,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -6841,7 +6930,7 @@ postcss-color-rebeccapurple@^7.0.2: dependencies: postcss-value-parser "^4.2.0" -postcss-colormin@^5.3.0: +postcss-colormin@^*: version "5.3.0" resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a" integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg== @@ -6851,7 +6940,7 @@ postcss-colormin@^5.3.0: colord "^2.9.1" postcss-value-parser "^4.2.0" -postcss-convert-values@^5.1.0: +postcss-convert-values@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10" integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g== @@ -6864,9 +6953,9 @@ postcss-custom-media@^8.0.0: integrity sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g== postcss-custom-properties@^12.1.5: - version "12.1.7" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.7.tgz#ca470fd4bbac5a87fd868636dafc084bc2a78b41" - integrity sha512-N/hYP5gSoFhaqxi2DPCmvto/ZcRDVjE3T1LiAMzc/bg53hvhcHOLpXOHb526LzBBp5ZlAUhkuot/bfpmpgStJg== + version "12.1.5" + resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.5.tgz#e669cfff89b0ea6fc85c45864a32b450cb6b196f" + integrity sha512-FHbbB/hRo/7cxLGkc2NS7cDRIDN1oFqQnUKBiyh4b/gwk8DD8udvmRDpUhEK836kB8ggUCieHVOvZDnF9XhI3g== dependencies: postcss-value-parser "^4.2.0" @@ -6884,22 +6973,22 @@ postcss-dir-pseudo-class@^6.0.4: dependencies: postcss-selector-parser "^6.0.9" -postcss-discard-comments@^5.1.1: +postcss-discard-comments@^*: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369" integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ== -postcss-discard-duplicates@^5.1.0: +postcss-discard-duplicates@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== -postcss-discard-empty@^5.1.1: +postcss-discard-empty@^*: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== -postcss-discard-overridden@^5.1.0: +postcss-discard-overridden@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw== @@ -6968,19 +7057,19 @@ postcss-js@^4.0.0: camelcase-css "^2.0.1" postcss-lab-function@^4.1.2: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.0.tgz#e054e662c6480202f5760887ec1ae0d153357123" - integrity sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w== + version "4.1.2" + resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.1.2.tgz#b75afe43ba9c1f16bfe9bb12c8109cabd55b5fc2" + integrity sha512-isudf5ldhg4fk16M8viAwAbg6Gv14lVO35N3Z/49NhbwPQ2xbiEoHgrRgpgQojosF4vF7jY653ktB6dDrUOR8Q== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" postcss-value-parser "^4.2.0" postcss-load-config@^3.1.0: - version "3.1.4" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" - integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== + version "3.1.3" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.3.tgz#21935b2c43b9a86e6581a576ca7ee1bde2bd1d23" + integrity sha512-5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw== dependencies: - lilconfig "^2.0.5" + lilconfig "^2.0.4" yaml "^1.10.2" postcss-loader@^6.2.1: @@ -7002,50 +7091,50 @@ postcss-media-minmax@^5.0.0: resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5" integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ== -postcss-merge-longhand@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz#0f46f8753989a33260efc47de9a0cdc571f2ec5c" - integrity sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA== +postcss-merge-longhand@^*: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.2.tgz#fe3002f38ad5827c1d6f7d5bb3f71d2566a2a138" + integrity sha512-18/bp9DZnY1ai9RlahOfLBbmIUKfKFPASxRCiZ1vlpZqWPCn8qWPFlEozqmWL+kBtcEQmG8W9YqGCstDImvp/Q== dependencies: postcss-value-parser "^4.2.0" - stylehacks "^5.1.0" + stylehacks "^*" -postcss-merge-rules@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz#d327b221cd07540bcc8d9ff84446d8b404d00162" - integrity sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww== +postcss-merge-rules@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz#a2d5117eba09c8686a5471d97bd9afcf30d1b41f" + integrity sha512-NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" cssnano-utils "^3.1.0" postcss-selector-parser "^6.0.5" -postcss-minify-font-values@^5.1.0: +postcss-minify-font-values@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== dependencies: postcss-value-parser "^4.2.0" -postcss-minify-gradients@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c" - integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw== +postcss-minify-gradients@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz#de0260a67a13b7b321a8adc3150725f2c6612377" + integrity sha512-J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg== dependencies: colord "^2.9.1" cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-params@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz#77e250780c64198289c954884ebe3ee4481c3b1c" - integrity sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g== +postcss-minify-params@^*: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.1.tgz#c5f8e7dac565e577dd99904787fbec576cbdbfb2" + integrity sha512-WCpr+J9Uz8XzMpAfg3UL8z5rde6MifBbh5L8bn8S2F5hq/YDJJzASYCnCHvAB4Fqb94ys8v95ULQkW2EhCFvNg== dependencies: browserslist "^4.16.6" cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-selectors@^5.2.0: +postcss-minify-selectors@^*: version "5.2.0" resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c" integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA== @@ -7088,53 +7177,53 @@ postcss-nested@5.0.6: postcss-selector-parser "^6.0.6" postcss-nesting@^10.1.3: - version "10.1.4" - resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.4.tgz#80de9d1c2717bc44df918dd7f118929300192a7a" - integrity sha512-2ixdQ59ik/Gt1+oPHiI1kHdwEI8lLKEmui9B1nl6163ANLC+GewQn7fXMxJF2JSb4i2MKL96GU8fIiQztK4TTA== + version "10.1.3" + resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.3.tgz#f0b1cd7ae675c697ab6a5a5ca1feea4784a2ef77" + integrity sha512-wUC+/YCik4wH3StsbC5fBG1s2Z3ZV74vjGqBFYtmYKlVxoio5TYGM06AiaKkQPPlkXWn72HKfS7Cw5PYxnoXSw== dependencies: - postcss-selector-parser "^6.0.10" + postcss-selector-parser "^6.0.9" -postcss-normalize-charset@^5.1.0: +postcss-normalize-charset@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== -postcss-normalize-display-values@^5.1.0: +postcss-normalize-display-values@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-positions@^5.1.0: +postcss-normalize-positions@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458" integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^5.1.0: +postcss-normalize-repeat-style@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398" integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-string@^5.1.0: +postcss-normalize-string@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-timing-functions@^5.1.0: +postcss-normalize-timing-functions@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-unicode@^5.1.0: +postcss-normalize-unicode@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75" integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ== @@ -7142,7 +7231,7 @@ postcss-normalize-unicode@^5.1.0: browserslist "^4.16.6" postcss-value-parser "^4.2.0" -postcss-normalize-url@^5.1.0: +postcss-normalize-url@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== @@ -7150,7 +7239,7 @@ postcss-normalize-url@^5.1.0: normalize-url "^6.0.1" postcss-value-parser "^4.2.0" -postcss-normalize-whitespace@^5.1.1: +postcss-normalize-whitespace@^*: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== @@ -7171,10 +7260,10 @@ postcss-opacity-percentage@^1.1.2: resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz#bd698bb3670a0a27f6d657cc16744b3ebf3b1145" integrity sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w== -postcss-ordered-values@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz#0b41b610ba02906a3341e92cab01ff8ebc598adb" - integrity sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw== +postcss-ordered-values@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz#04ef429e0991b0292bc918b135cd4c038f7b889f" + integrity sha512-wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA== dependencies: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" @@ -7246,13 +7335,13 @@ postcss-preset-env@^7.0.1: postcss-value-parser "^4.2.0" postcss-pseudo-class-any-link@^7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.2.tgz#81ec491aa43f97f9015e998b7a14263b4630bdf0" - integrity sha512-76XzEQv3g+Vgnz3tmqh3pqQyRojkcJ+pjaePsyhcyf164p9aZsu3t+NWxkZYbcHLK1ju5Qmalti2jPI5IWCe5w== + version "7.1.1" + resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.1.tgz#534eb1dadd9945eb07830dbcc06fb4d5d865b8e0" + integrity sha512-JRoLFvPEX/1YTPxRxp1JO4WxBVXJYrSY7NHeak5LImwJ+VobFMwYDQHvfTXEpcn+7fYIeGkC29zYFhFWIZD8fg== dependencies: - postcss-selector-parser "^6.0.10" + postcss-selector-parser "^6.0.9" -postcss-reduce-initial@^5.1.0: +postcss-reduce-initial@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6" integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw== @@ -7260,7 +7349,7 @@ postcss-reduce-initial@^5.1.0: browserslist "^4.16.6" caniuse-api "^3.0.0" -postcss-reduce-transforms@^5.1.0: +postcss-reduce-transforms@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== @@ -7279,15 +7368,15 @@ postcss-selector-not@^5.0.0: dependencies: balanced-match "^1.0.0" -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: - version "6.0.10" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: + version "6.0.9" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" + integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^5.1.0: +postcss-svgo@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== @@ -7295,7 +7384,7 @@ postcss-svgo@^5.1.0: postcss-value-parser "^4.2.0" svgo "^2.7.0" -postcss-unique-selectors@^5.1.1: +postcss-unique-selectors@^*: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== @@ -7342,9 +7431,9 @@ prettier-linter-helpers@^1.0.0: fast-diff "^1.1.2" prettier@^2.5.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" - integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== + version "2.6.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4" + integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0" @@ -7507,13 +7596,13 @@ react-app-polyfill@^3.0.0: whatwg-fetch "^3.6.2" react-bootstrap@^2.2.1: - version "2.2.3" - resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-2.2.3.tgz#1c563018c8b856071334dd5a35f25507185136e2" - integrity sha512-gXsAEBdDUHnOpJ2C+DDQ4mFt7tN6u6qWnTH3tqiE9jUvV6gGY8uHFp0iGBsM+yjrBwmR6bqCBFh8Z82aQj1LSw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-2.2.1.tgz#2a6ad0931e9367882ec3fc88a70ed0b8ace90b26" + integrity sha512-x8lpVQflsbevphuWbTnTNCatcbKyPJNrP2WyQ1MJYmFEcVjbTbai1yZhdlXr0QUxLQLxA8g5hQWb5TwJtaZoCA== dependencies: "@babel/runtime" "^7.17.2" - "@restart/hooks" "^0.4.6" - "@restart/ui" "^1.2.0" + "@restart/hooks" "^0.4.5" + "@restart/ui" "^1.0.2" "@types/invariant" "^2.2.35" "@types/prop-types" "^15.7.4" "@types/react" ">=16.14.8" @@ -7605,17 +7694,17 @@ react-router-bootstrap@^0.26.1: prop-types "^15.7.2" react-router-dom@^6.2.1: - version "6.3.0" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" - integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw== + version "6.2.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.2.tgz#f1a2c88365593c76b9612ae80154a13fcb72e442" + integrity sha512-AtYEsAST7bDD4dLSQHDnk/qxWLJdad5t1HFa1qJyUrCeGgEuCSw0VB/27ARbF9Fi/W5598ujvJOm3ujUCVzuYQ== dependencies: history "^5.2.0" - react-router "6.3.0" + react-router "6.2.2" -react-router@6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557" - integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ== +react-router@6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.2.tgz#495e683a0c04461eeb3d705fe445d6cf42f0c249" + integrity sha512-/MbxyLzd7Q7amp4gDOGaYvXwhEojkJD5BtExkuKmj39VEE0m3l/zipf6h2WIB2jyAO0lI6NGETh4RDcktRm4AQ== dependencies: history "^5.2.0" @@ -7773,10 +7862,10 @@ regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== -regenerator-transform@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" - integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg== +regenerator-transform@^0.14.2: + version "0.14.5" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" + integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== dependencies: "@babel/runtime" "^7.8.4" @@ -7785,7 +7874,7 @@ regex-parser@^2.2.11: resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58" integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== -regexp.prototype.flags@^1.4.1: +regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== @@ -7962,7 +8051,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -8055,12 +8144,12 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selfsigned@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56" - integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ== +selfsigned@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b" + integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ== dependencies: - node-forge "^1" + node-forge "^1.2.0" semver@7.0.0: version "7.0.0" @@ -8078,11 +8167,11 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.3.2, semver@^7.3.5: - version "7.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b" - integrity sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w== + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: - lru-cache "^7.4.0" + lru-cache "^6.0.0" send@0.17.2: version "0.17.2" @@ -8430,7 +8519,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: +strip-ansi@^7.0.0, strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== @@ -8475,13 +8564,13 @@ style-loader@^3.3.1: integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ== styled-components@^5.3.3: - version "5.3.5" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.5.tgz#a750a398d01f1ca73af16a241dec3da6deae5ec4" - integrity sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg== + version "5.3.3" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.3.tgz#312a3d9a549f4708f0fb0edc829eb34bde032743" + integrity sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/traverse" "^7.4.5" - "@emotion/is-prop-valid" "^1.1.0" + "@emotion/is-prop-valid" "^0.8.8" "@emotion/stylis" "^0.8.4" "@emotion/unitless" "^0.7.4" babel-plugin-styled-components ">= 1.12.0" @@ -8490,7 +8579,7 @@ styled-components@^5.3.3: shallowequal "^1.1.0" supports-color "^5.5.0" -stylehacks@^5.1.0: +stylehacks@^*: version "5.1.0" resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520" integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q== @@ -8679,6 +8768,11 @@ thunky@^1.0.2: resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== +timsort@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= + tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -8729,14 +8823,14 @@ tryer@^1.0.1: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== -tsconfig-paths@^3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" - integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== +tsconfig-paths@^3.12.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz#4fcc48f9ccea8826c41b9ca093479de7f5018976" + integrity sha512-cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" - minimist "^1.2.6" + minimist "^1.2.0" strip-bom "^3.0.0" tslib@^1.8.1: @@ -8806,9 +8900,9 @@ typedarray-to-buffer@^3.1.5: is-typedarray "^1.0.0" typedoc@^0.22.13: - version "0.22.14" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.22.14.tgz#c690677c31bc1dd5618caffc001bfa8554c4c02f" - integrity sha512-tlf9wIcsrnQSjetStrnRutuy2RjZkG5PK2umwveZLTkuC2K9VywOZTdu2G19BdOPzGrhZjf9WK7pthXqnFQejg== + version "0.22.13" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.22.13.tgz#d061f8f0fb7c9d686e48814f245bddeea4564e66" + integrity sha512-NHNI7Dr6JHa/I3+c62gdRNXBIyX7P33O9TafGLd07ur3MqzcKgwTvpg18EtvCLHJyfeSthAtCLpM7WkStUmDuQ== dependencies: glob "^7.2.0" lunr "^2.3.9" @@ -8817,9 +8911,9 @@ typedoc@^0.22.13: shiki "^0.10.1" typescript@^4.4.2: - version "4.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" - integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== + version "4.6.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4" + integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg== unbox-primitive@^1.0.1: version "1.0.1" @@ -9037,37 +9131,38 @@ webpack-dev-middleware@^5.3.1: schema-utils "^4.0.0" webpack-dev-server@^4.6.0: - version "4.8.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.8.1.tgz#58f9d797710d6e25fa17d6afab8708f958c11a29" - integrity sha512-dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg== + version "4.7.4" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945" + integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" "@types/express" "^4.17.13" "@types/serve-index" "^1.9.1" "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" + "@types/ws" "^8.2.2" ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" + bonjour "^3.5.0" chokidar "^3.5.3" colorette "^2.0.10" compression "^1.7.4" connect-history-api-fallback "^1.6.0" default-gateway "^6.0.3" - express "^4.17.3" + del "^6.0.0" + express "^4.17.1" graceful-fs "^4.2.6" html-entities "^2.3.2" - http-proxy-middleware "^2.0.3" + http-proxy-middleware "^2.0.0" ipaddr.js "^2.0.1" open "^8.0.9" p-retry "^4.5.0" portfinder "^1.0.28" - rimraf "^3.0.2" schema-utils "^4.0.0" - selfsigned "^2.0.1" + selfsigned "^2.0.0" serve-index "^1.9.1" sockjs "^0.3.21" spdy "^4.0.2" + strip-ansi "^7.0.0" webpack-dev-middleware "^5.3.1" ws "^8.4.2" @@ -9101,9 +9196,9 @@ webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@^5.64.4: - version "5.72.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28" - integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w== + version "5.70.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d" + integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" @@ -9209,25 +9304,25 @@ word-wrap@^1.2.3, word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -workbox-background-sync@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.2.tgz#28be9bf89b8e4e0379d45903280c7c12f4df836f" - integrity sha512-EjG37LSMDJ1TFlFg56wx6YXbH4/NkG09B9OHvyxx+cGl2gP5OuOzsCY3rOPJSpbcz6jpuA40VIC3HzSD4OvE1g== +workbox-background-sync@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.1.tgz#df79c6a4a22945d8a44493a4947a6ed0f720ef86" + integrity sha512-T5a35fagLXQvV8Dr4+bDU+XYsP90jJ3eBLjZMKuCNELMQZNj+VekCODz1QK44jgoBeQk+vp94pkZV6G+e41pgg== dependencies: idb "^6.1.4" - workbox-core "6.5.2" + workbox-core "6.5.1" -workbox-broadcast-update@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.2.tgz#b1f32bb40a9dcb5b05ca27e09fb7c01a0a126182" - integrity sha512-DjJYraYnprTZE/AQNoeogaxI1dPuYmbw+ZJeeP8uXBSbg9SNv5wLYofQgywXeRepv4yr/vglMo9yaHUmBMc+4Q== +workbox-broadcast-update@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.1.tgz#9aecb116979b0709480b84cfd1beca7a901d01d4" + integrity sha512-mb/oyblyEpDbw167cCTyHnC3RqCnCQHtFYuYZd+QTpuExxM60qZuBH1AuQCgvLtDcztBKdEYK2VFD9SZYgRbaQ== dependencies: - workbox-core "6.5.2" + workbox-core "6.5.1" -workbox-build@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.2.tgz#774faafd84b1dc94b74739ceb5d8ff367748523b" - integrity sha512-TVi4Otf6fgwikBeMpXF9n0awHfZTMNu/nwlMIT9W+c13yvxkmDFMPb7vHYK6RUmbcxwPnz4I/R+uL76+JxG4JQ== +workbox-build@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.1.tgz#6b5e8f090bb608267868540d3072b44b8531b3bc" + integrity sha512-coDUDzHvFZ1ADOl3wKCsCSyOBvkPKlPgcQDb6LMMShN1zgF31Mev/1HzN3+9T2cjjWAgFwZKkuRyExqc1v21Zw== dependencies: "@apideck/better-ajv-errors" "^0.3.1" "@babel/core" "^7.11.1" @@ -9251,132 +9346,132 @@ workbox-build@6.5.2: strip-comments "^2.0.1" tempy "^0.6.0" upath "^1.2.0" - workbox-background-sync "6.5.2" - workbox-broadcast-update "6.5.2" - workbox-cacheable-response "6.5.2" - workbox-core "6.5.2" - workbox-expiration "6.5.2" - workbox-google-analytics "6.5.2" - workbox-navigation-preload "6.5.2" - workbox-precaching "6.5.2" - workbox-range-requests "6.5.2" - workbox-recipes "6.5.2" - workbox-routing "6.5.2" - workbox-strategies "6.5.2" - workbox-streams "6.5.2" - workbox-sw "6.5.2" - workbox-window "6.5.2" - -workbox-cacheable-response@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.2.tgz#d9252eb99f0d0fceb70f63866172f4eaac56a3e8" - integrity sha512-UnHGih6xqloV808T7ve1iNKZMbpML0jGLqkkmyXkJbZc5j16+HRSV61Qrh+tiq3E3yLvFMGJ3AUBODOPNLWpTg== - dependencies: - workbox-core "6.5.2" - -workbox-core@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.2.tgz#f5e06a22c6cb4651d3e13107443d972fdbd47364" - integrity sha512-IlxLGQf+wJHCR+NM0UWqDh4xe/Gu6sg2i4tfZk6WIij34IVk9BdOQgi6WvqSHd879jbQIUgL2fBdJUJyAP5ypQ== - -workbox-expiration@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.2.tgz#ee6ed755a220a0b375d67831f9237e4dcbccb59c" - integrity sha512-5Hfp0uxTZJrgTiy9W7AjIIec+9uTOtnxY/tRBm4DbqcWKaWbVTa+izrKzzOT4MXRJJIJUmvRhWw4oo8tpmMouw== + workbox-background-sync "6.5.1" + workbox-broadcast-update "6.5.1" + workbox-cacheable-response "6.5.1" + workbox-core "6.5.1" + workbox-expiration "6.5.1" + workbox-google-analytics "6.5.1" + workbox-navigation-preload "6.5.1" + workbox-precaching "6.5.1" + workbox-range-requests "6.5.1" + workbox-recipes "6.5.1" + workbox-routing "6.5.1" + workbox-strategies "6.5.1" + workbox-streams "6.5.1" + workbox-sw "6.5.1" + workbox-window "6.5.1" + +workbox-cacheable-response@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.1.tgz#f71d0a75b3d6846e39594955e99ac42fd26f8693" + integrity sha512-3TdtH/luDiytmM+Cn72HCBLZXmbeRNJqZx2yaVOfUZhj0IVwZqQXhNarlGE9/k6U5Jelb+TtpH2mLVhnzfiSMg== + dependencies: + workbox-core "6.5.1" + +workbox-core@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.1.tgz#0dba3bccf883a46dfa61cc412eaa3cb09bb549e6" + integrity sha512-qObXZ39aFJ2N8X7IUbGrJHKWguliCuU1jOXM/I4MTT84u9BiKD2rHMkIzgeRP1Ixu9+cXU4/XHJq3Cy0Qqc5hw== + +workbox-expiration@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.1.tgz#9f105fcf3362852754884ad153888070ce98b692" + integrity sha512-iY/cTADAQATMmPkUBRmQdacqq0TJd2wMHimBQz+tRnPGHSMH+/BoLPABPnu7O7rT/g/s59CUYYRGxe3mEgoJCA== dependencies: idb "^6.1.4" - workbox-core "6.5.2" + workbox-core "6.5.1" -workbox-google-analytics@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.2.tgz#a79fa7a40824873baaa333dcd72d1fdf1c53adf5" - integrity sha512-8SMar+N0xIreP5/2we3dwtN1FUmTMScoopL86aKdXBpio8vXc8Oqb5fCJG32ialjN8BAOzDqx/FnGeCtkIlyvw== +workbox-google-analytics@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.1.tgz#685224d439c1e7a943f8241d65e2a34ee95a4ba0" + integrity sha512-qZU46/h4dbionYT6Yk6iBkUwpiEzAfnO1W7KkI+AMmY7G9/gA03dQQ7rpTw8F4vWrG7ahTUGWDFv6fERtaw1BQ== dependencies: - workbox-background-sync "6.5.2" - workbox-core "6.5.2" - workbox-routing "6.5.2" - workbox-strategies "6.5.2" + workbox-background-sync "6.5.1" + workbox-core "6.5.1" + workbox-routing "6.5.1" + workbox-strategies "6.5.1" -workbox-navigation-preload@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.2.tgz#ffb3d9d5cdb881a3824851707da221dbb0bb3f23" - integrity sha512-iqDNWWMswjCsZuvGFDpcX1Z8InBVAlVBELJ28xShsWWntALzbtr0PXMnm2WHkXCc56JimmGldZi1N5yDPiTPOg== +workbox-navigation-preload@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.1.tgz#a244e3bdf99ce86da7210315ca1ba5aef3710825" + integrity sha512-aKrgAbn2IMgzTowTi/ZyKdQUcES2m++9aGtpxqsX7Gn9ovCY8zcssaMEAMMwrIeveij5HiWNBrmj6MWDHi+0rg== dependencies: - workbox-core "6.5.2" + workbox-core "6.5.1" -workbox-precaching@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.2.tgz#a3117b4d3eb61ce8d01b9dfc063c48155bd7f9d3" - integrity sha512-OZAlQ8AAT20KugGKKuJMHdQ8X1IyNQaLv+mPTHj+8Dmv8peBq5uWNzs4g/1OSFmXsbXZ6a1CBC6YtQWVPhJQ9w== +workbox-precaching@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.1.tgz#177b6424f1e71e601b9c3d6864decad2655f9ff9" + integrity sha512-EzlPBxvmjGfE56YZzsT/vpVkpLG1XJhoplgXa5RPyVWLUL1LbwEAxhkrENElSS/R9tgiTw80IFwysidfUqLihg== dependencies: - workbox-core "6.5.2" - workbox-routing "6.5.2" - workbox-strategies "6.5.2" + workbox-core "6.5.1" + workbox-routing "6.5.1" + workbox-strategies "6.5.1" -workbox-range-requests@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.2.tgz#b8b7e5b5830fecc22f0a1d8815457921df2e5bf9" - integrity sha512-zi5VqF1mWqfCyJLTMXn1EuH/E6nisqWDK1VmOJ+TnjxGttaQrseOhMn+BMvULFHeF8AvrQ0ogfQ6bSv0rcfAlg== +workbox-range-requests@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.1.tgz#f40f84aa8765940543eba16131d02f12b38e2fdc" + integrity sha512-57Da/qRbd9v33YlHX0rlSUVFmE4THCjKqwkmfhY3tNLnSKN2L5YBS3qhWeDO0IrMNgUj+rGve2moKYXeUqQt4A== dependencies: - workbox-core "6.5.2" + workbox-core "6.5.1" -workbox-recipes@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.2.tgz#19f47ec25a8788c65d0cc8d217cbebc0bbbb5c63" - integrity sha512-2lcUKMYDiJKvuvRotOxLjH2z9K7jhj8GNUaHxHNkJYbTCUN3LsX1cWrsgeJFDZ/LgI565t3fntpbG9J415ZBXA== +workbox-recipes@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.1.tgz#d2fb21743677cc3ca9e1fc9e3b68f0d1587df205" + integrity sha512-DGsyKygHggcGPQpWafC/Nmbm1Ny3sB2vE9r//3UbeidXiQ+pLF14KEG1/0NNGRaY+lfOXOagq6d1H7SC8KA+rA== dependencies: - workbox-cacheable-response "6.5.2" - workbox-core "6.5.2" - workbox-expiration "6.5.2" - workbox-precaching "6.5.2" - workbox-routing "6.5.2" - workbox-strategies "6.5.2" + workbox-cacheable-response "6.5.1" + workbox-core "6.5.1" + workbox-expiration "6.5.1" + workbox-precaching "6.5.1" + workbox-routing "6.5.1" + workbox-strategies "6.5.1" -workbox-routing@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.2.tgz#e0ad46246ba51224fd57eff0dd46891b3220cb9a" - integrity sha512-nR1w5PjF6IVwo0SX3oE88LhmGFmTnqqU7zpGJQQPZiKJfEKgDENQIM9mh3L1ksdFd9Y3CZVkusopHfxQvit/BA== +workbox-routing@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.1.tgz#5488795ae850fe3ae435241143b54ff25ab0db70" + integrity sha512-yAAncdTwanvlR8KPjubyvFKeAok8ZcIws6UKxvIAg0I+wsf7UYi93DXNuZr6RBSQrByrN6HkCyjuhmk8P63+PA== dependencies: - workbox-core "6.5.2" + workbox-core "6.5.1" -workbox-strategies@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.2.tgz#56b02e6959c6391351011fc2e5b0829aff1ed859" - integrity sha512-fgbwaUMxbG39BHjJIs2y2X21C0bmf1Oq3vMQxJ1hr6y5JMJIm8rvKCcf1EIdAr+PjKdSk4ddmgyBQ4oO8be4Uw== +workbox-strategies@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.1.tgz#51cabbddad5a1956eb9d51cf6ce01ab0a6372756" + integrity sha512-JNaTXPy8wXzKkr+6za7/eJX9opoZk7UgY261I2kPxl80XQD8lMjz0vo9EOcBwvD72v3ZhGJbW84ZaDwFEhFvWA== dependencies: - workbox-core "6.5.2" + workbox-core "6.5.1" -workbox-streams@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.2.tgz#2fb6ba307f7d2cbda63f64522a197be868b4ea25" - integrity sha512-ovD0P4UrgPtZ2Lfc/8E8teb1RqNOSZr+1ZPqLR6sGRZnKZviqKbQC3zVvvkhmOIwhWbpL7bQlWveLVONHjxd5w== +workbox-streams@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.1.tgz#12036817385fa4449a86a3ef77fce1cb00ecad9f" + integrity sha512-7jaTWm6HRGJ/ewECnhb+UgjTT50R42E0/uNCC4eTKQwnLO/NzNGjoXTdQgFjo4zteR+L/K6AtFAiYKH3ZJbAYw== dependencies: - workbox-core "6.5.2" - workbox-routing "6.5.2" + workbox-core "6.5.1" + workbox-routing "6.5.1" -workbox-sw@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.2.tgz#2f5dca0e96c61a450fccf0405095ddf1b6f43bc7" - integrity sha512-2KhlYqtkoqlnPdllj2ujXUKRuEFsRDIp6rdE4l1PsxiFHRAFaRTisRQpGvRem5yxgXEr+fcEKiuZUW2r70KZaw== +workbox-sw@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.1.tgz#f9256b40f0a7e94656ccd06f127ba19a92cd23c5" + integrity sha512-hVrQa19yo9wzN1fQQ/h2JlkzFpkuH2qzYT2/rk7CLaWt6tLnTJVFCNHlGRRPhytZSf++LoIy7zThT714sowT/Q== workbox-webpack-plugin@^6.4.1: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.2.tgz#0cf6e1d23d5107a88fd8502fd4f534215e1dd298" - integrity sha512-StrJ7wKp5tZuGVcoKLVjFWlhDy+KT7ZWsKnNcD6F08wA9Cpt6JN+PLIrplcsTHbQpoAV8+xg6RvcG0oc9z+RpQ== + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.1.tgz#da88b4b6d8eff855958f0e7ebb7aa3eea50a8282" + integrity sha512-SHtlQBpKruI16CAYhICDMkgjXE2fH5Yp+D+1UmBfRVhByZYzusVOykvnPm8ObJb9d/tXgn9yoppoxafFS7D4vQ== dependencies: fast-json-stable-stringify "^2.1.0" pretty-bytes "^5.4.1" upath "^1.2.0" webpack-sources "^1.4.3" - workbox-build "6.5.2" + workbox-build "6.5.1" -workbox-window@6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.2.tgz#46d6412cd57039bdf3d5dd914ad21fb3f98fe980" - integrity sha512-2kZH37r9Wx8swjEOL4B8uGM53lakMxsKkQ7mOKzGA/QAn/DQTEZGrdHWtypk2tbhKY5S0jvPS+sYDnb2Z3378A== +workbox-window@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.1.tgz#7b5ca29467b1da45dc9e2b5a1b89159d3eb9957a" + integrity sha512-oRlun9u7b7YEjo2fIDBqJkU2hXtrEljXcOytRhfeQRbqXxjUOpFgXSGRSAkmDx1MlKUNOSbr+zfi8h5n7In3yA== dependencies: "@types/trusted-types" "^2.0.2" - workbox-core "6.5.2" + workbox-core "6.5.1" wrap-ansi@^7.0.0: version "7.0.0" @@ -9432,6 +9527,11 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" From aa28e72401ad5b021de829c23613945fb3b2ee4f Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 11 Apr 2022 15:38:11 +0200 Subject: [PATCH 003/649] basic email history of a student --- frontend/src/data/interfaces/email.ts | 7 ++++ frontend/src/data/interfaces/index.ts | 1 + .../src/utils/api/student_email_history.ts | 16 +++++++++ .../StudentMailHistoryPage.tsx | 34 ++++++++++++++++--- .../views/StudentMailHistoryPage/styles.ts | 9 +++++ 5 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 frontend/src/data/interfaces/email.ts create mode 100644 frontend/src/utils/api/student_email_history.ts create mode 100644 frontend/src/views/StudentMailHistoryPage/styles.ts diff --git a/frontend/src/data/interfaces/email.ts b/frontend/src/data/interfaces/email.ts new file mode 100644 index 000000000..ac1b4226c --- /dev/null +++ b/frontend/src/data/interfaces/email.ts @@ -0,0 +1,7 @@ +/** + * A sent email + */ +export interface Email { + date: String; + type: String; +} diff --git a/frontend/src/data/interfaces/index.ts b/frontend/src/data/interfaces/index.ts index 6d7c3694d..ab7f76cf0 100644 --- a/frontend/src/data/interfaces/index.ts +++ b/frontend/src/data/interfaces/index.ts @@ -1 +1,2 @@ export type { User } from "./users"; +export type { Email } from "./email"; diff --git a/frontend/src/utils/api/student_email_history.ts b/frontend/src/utils/api/student_email_history.ts new file mode 100644 index 000000000..5de83db9d --- /dev/null +++ b/frontend/src/utils/api/student_email_history.ts @@ -0,0 +1,16 @@ +import { axiosInstance } from "./api"; +import { Email } from "../../data/interfaces"; + +/** + * A list of emails + */ +interface EmailHistoryList { + emails: Email[]; +} +/** + * Get the full email history for a student + */ +export async function getEmails(): Promise { + const response = await axiosInstance.get("/edition/student/1/"); + return response as unknown as EmailHistoryList; +} diff --git a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx index d2b4eef6b..b4328b86d 100644 --- a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx +++ b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx @@ -1,7 +1,33 @@ import React from "react"; +import { MailHistoryPage } from "./styles"; +import Table from "react-bootstrap/Table"; -function MailHistory() { - return
This needs to show the mail history of a student
; +/** + * Page that shows the email history of a student in a table + */ +export default function StudentMailHistoryPage() { + const data = [ + { date: "Tuesday, 12-Apr-22 13:52:31", type: "Practical Information" }, + { date: "Monday, 11-Apr-22 12:52:31", type: "Accepted" }, + { date: "Sunday, 10-Apr-22 12:51:01", type: "Maybe" }, + ]; + const tableItems = data.map(d => ( + + {d.date} + {d.type} + + )); + return ( + + + + + + + + + {tableItems} +
SentType
+ + ); } - -export default MailHistory; diff --git a/frontend/src/views/StudentMailHistoryPage/styles.ts b/frontend/src/views/StudentMailHistoryPage/styles.ts new file mode 100644 index 000000000..cbcf44bbd --- /dev/null +++ b/frontend/src/views/StudentMailHistoryPage/styles.ts @@ -0,0 +1,9 @@ +import styled from "styled-components"; + +export const MailHistoryPage = styled.div` + background-color: white; + margin: auto; + margin-top: 50px; + margin-bottom: 50px; + width: fit-content; +`; From 8948409a6f002af23e7fe59ce65f068bf124f1fa Mon Sep 17 00:00:00 2001 From: beguille Date: Tue, 12 Apr 2022 15:48:44 +0200 Subject: [PATCH 004/649] refactored emails, API logic implemented --- frontend/src/data/enums/emailtype.ts | 9 ++++ frontend/src/data/enums/index.ts | 1 + frontend/src/data/interfaces/email.ts | 3 +- .../src/utils/api/student_email_history.ts | 17 ++++++-- .../StudentMailHistoryPage.tsx | 41 ++++++++++++------- 5 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 frontend/src/data/enums/emailtype.ts diff --git a/frontend/src/data/enums/emailtype.ts b/frontend/src/data/enums/emailtype.ts new file mode 100644 index 000000000..43f722bbe --- /dev/null +++ b/frontend/src/data/enums/emailtype.ts @@ -0,0 +1,9 @@ +/** + * Enum for the different types of emails that can be sent + */ +export const enum EmailType { + UNDECIDED = "Undecided", + YES = "Accepted", + MAYBE = "Maybe", + NO = "Denied", +} diff --git a/frontend/src/data/enums/index.ts b/frontend/src/data/enums/index.ts index ad56fccf6..b51cacd96 100644 --- a/frontend/src/data/enums/index.ts +++ b/frontend/src/data/enums/index.ts @@ -1,2 +1,3 @@ export { StorageKey } from "./local-storage"; export { Role } from "./role"; +export { EmailType } from "./emailtype"; diff --git a/frontend/src/data/interfaces/email.ts b/frontend/src/data/interfaces/email.ts index ac1b4226c..91d113681 100644 --- a/frontend/src/data/interfaces/email.ts +++ b/frontend/src/data/interfaces/email.ts @@ -1,7 +1,8 @@ +import { EmailType } from "../enums"; /** * A sent email */ export interface Email { date: String; - type: String; + type: EmailType; } diff --git a/frontend/src/utils/api/student_email_history.ts b/frontend/src/utils/api/student_email_history.ts index 5de83db9d..11a2443df 100644 --- a/frontend/src/utils/api/student_email_history.ts +++ b/frontend/src/utils/api/student_email_history.ts @@ -1,16 +1,25 @@ -import { axiosInstance } from "./api"; import { Email } from "../../data/interfaces"; +import { EmailType } from "../../data/enums"; /** * A list of emails */ -interface EmailHistoryList { +export interface EmailHistoryList { emails: Email[]; } /** * Get the full email history for a student */ export async function getEmails(): Promise { - const response = await axiosInstance.get("/edition/student/1/"); - return response as unknown as EmailHistoryList; + // const response = await axiosInstance.get("/edition/student/1/"); + // return response.data as EmailHistoryList; + + // placeholder while the real API call is not available + return { + emails: [ + { date: "Tuesday, 12-Apr-22 13:52:31", type: EmailType.YES }, + { date: "Monday, 11-Apr-22 12:52:31", type: EmailType.MAYBE }, + { date: "Sunday, 10-Apr-22 12:51:01", type: EmailType.NO }, + ], + }; } diff --git a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx index b4328b86d..257afd070 100644 --- a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx +++ b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx @@ -1,22 +1,28 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import { MailHistoryPage } from "./styles"; import Table from "react-bootstrap/Table"; - +import { getEmails, EmailHistoryList } from "../../utils/api/student_email_history"; /** * Page that shows the email history of a student in a table */ export default function StudentMailHistoryPage() { - const data = [ - { date: "Tuesday, 12-Apr-22 13:52:31", type: "Practical Information" }, - { date: "Monday, 11-Apr-22 12:52:31", type: "Accepted" }, - { date: "Sunday, 10-Apr-22 12:51:01", type: "Maybe" }, - ]; - const tableItems = data.map(d => ( - - {d.date} - {d.type} - - )); + const init: EmailHistoryList = { + emails: [], + }; + const [table, setTable] = useState(init); + + useEffect(() => { + const updateEmailList = async () => { + try { + const emails = await getEmails(); + setTable(emails); + } catch (exception) { + console.log(exception); + } + }; + updateEmailList(); + }, []); + return ( @@ -26,7 +32,14 @@ export default function StudentMailHistoryPage() { - {tableItems} + + {table.emails.map(d => ( + + + + + ))} +
Type
{d.date}{d.type}
); From 159c8d99a3cadc03d3863bf89a693ec5befcc45f Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 14 Apr 2022 12:33:42 +0200 Subject: [PATCH 005/649] added id --- frontend/src/data/interfaces/email.ts | 1 + frontend/src/utils/api/student_email_history.ts | 6 +++--- .../views/StudentMailHistoryPage/StudentMailHistoryPage.tsx | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/data/interfaces/email.ts b/frontend/src/data/interfaces/email.ts index 91d113681..99ff5c0e0 100644 --- a/frontend/src/data/interfaces/email.ts +++ b/frontend/src/data/interfaces/email.ts @@ -3,6 +3,7 @@ import { EmailType } from "../enums"; * A sent email */ export interface Email { + email_id: number; date: String; type: EmailType; } diff --git a/frontend/src/utils/api/student_email_history.ts b/frontend/src/utils/api/student_email_history.ts index 11a2443df..404b0997a 100644 --- a/frontend/src/utils/api/student_email_history.ts +++ b/frontend/src/utils/api/student_email_history.ts @@ -17,9 +17,9 @@ export async function getEmails(): Promise { // placeholder while the real API call is not available return { emails: [ - { date: "Tuesday, 12-Apr-22 13:52:31", type: EmailType.YES }, - { date: "Monday, 11-Apr-22 12:52:31", type: EmailType.MAYBE }, - { date: "Sunday, 10-Apr-22 12:51:01", type: EmailType.NO }, + { email_id: 1, date: "Tuesday, 12-Apr-22 13:52:31", type: EmailType.YES }, + { email_id: 2, date: "Monday, 11-Apr-22 12:52:31", type: EmailType.MAYBE }, + { email_id: 3, date: "Sunday, 10-Apr-22 12:51:01", type: EmailType.NO }, ], }; } diff --git a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx index 257afd070..5fe7c81fb 100644 --- a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx +++ b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx @@ -34,7 +34,7 @@ export default function StudentMailHistoryPage() { {table.emails.map(d => ( - + {d.date} {d.type} From f6b5817063df5e5abe3be40c7c559203238ec03e Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 14 Apr 2022 13:22:44 +0200 Subject: [PATCH 006/649] fixed types --- frontend/src/data/enums/emailtype.ts | 2 +- frontend/src/data/interfaces/email.ts | 5 ++--- frontend/src/utils/api/student_email_history.ts | 11 +++++------ .../StudentMailHistoryPage/StudentMailHistoryPage.tsx | 7 ++++--- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/frontend/src/data/enums/emailtype.ts b/frontend/src/data/enums/emailtype.ts index 43f722bbe..28070578a 100644 --- a/frontend/src/data/enums/emailtype.ts +++ b/frontend/src/data/enums/emailtype.ts @@ -1,7 +1,7 @@ /** * Enum for the different types of emails that can be sent */ -export const enum EmailType { +export enum EmailType { UNDECIDED = "Undecided", YES = "Accepted", MAYBE = "Maybe", diff --git a/frontend/src/data/interfaces/email.ts b/frontend/src/data/interfaces/email.ts index 99ff5c0e0..49356610b 100644 --- a/frontend/src/data/interfaces/email.ts +++ b/frontend/src/data/interfaces/email.ts @@ -1,9 +1,8 @@ -import { EmailType } from "../enums"; /** * A sent email */ export interface Email { - email_id: number; + emailId: number; date: String; - type: EmailType; + type: number; } diff --git a/frontend/src/utils/api/student_email_history.ts b/frontend/src/utils/api/student_email_history.ts index 404b0997a..725baf7ad 100644 --- a/frontend/src/utils/api/student_email_history.ts +++ b/frontend/src/utils/api/student_email_history.ts @@ -1,6 +1,4 @@ import { Email } from "../../data/interfaces"; -import { EmailType } from "../../data/enums"; - /** * A list of emails */ @@ -15,11 +13,12 @@ export async function getEmails(): Promise { // return response.data as EmailHistoryList; // placeholder while the real API call is not available - return { + const data = { emails: [ - { email_id: 1, date: "Tuesday, 12-Apr-22 13:52:31", type: EmailType.YES }, - { email_id: 2, date: "Monday, 11-Apr-22 12:52:31", type: EmailType.MAYBE }, - { email_id: 3, date: "Sunday, 10-Apr-22 12:51:01", type: EmailType.NO }, + { emailId: 1, date: "2022-04-14T12:36:28.641337", type: 0 }, + { emailId: 2, date: "2022-04-14T12:36:28.641337", type: 1 }, + { emailId: 3, date: "2022-04-14T12:36:28.641337", type: 2 }, ], }; + return data as EmailHistoryList; } diff --git a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx index 5fe7c81fb..7d2152611 100644 --- a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx +++ b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx @@ -2,6 +2,7 @@ import React, { useEffect, useState } from "react"; import { MailHistoryPage } from "./styles"; import Table from "react-bootstrap/Table"; import { getEmails, EmailHistoryList } from "../../utils/api/student_email_history"; +import { EmailType } from "../../data/enums"; /** * Page that shows the email history of a student in a table */ @@ -34,9 +35,9 @@ export default function StudentMailHistoryPage() { {table.emails.map(d => ( - - {d.date} - {d.type} + + {new Date(String(d.date)).toLocaleString("nl-be")} + {Object.values(EmailType)[d.type]} ))} From 16963f74d65927c3309498f2f5b873c2afd60ef1 Mon Sep 17 00:00:00 2001 From: beguille Date: Sat, 16 Apr 2022 17:02:53 +0200 Subject: [PATCH 007/649] added extra email types --- frontend/src/data/enums/emailtype.ts | 16 ++++++++++++---- frontend/src/utils/api/student_email_history.ts | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/frontend/src/data/enums/emailtype.ts b/frontend/src/data/enums/emailtype.ts index 28070578a..ede29357b 100644 --- a/frontend/src/data/enums/emailtype.ts +++ b/frontend/src/data/enums/emailtype.ts @@ -2,8 +2,16 @@ * Enum for the different types of emails that can be sent */ export enum EmailType { - UNDECIDED = "Undecided", - YES = "Accepted", - MAYBE = "Maybe", - NO = "Denied", + // Nothing happened (undecided/screening) + APPLIED = "Applied", + // We're looking for a project (maybe) + AWAITING_PROJECT = "Awaiting Project", + // Can participate (yes) + APPROVED = "Approved", + // Student signed the contract + CONTRACT_CONFIRMED = "Contract Confirmed", + // Student indicated they don't want to participate anymore + CONTRACT_DECLINED = "Contract Declined", + // We've rejected the student ourselves (no) + REJECTED = "Rejected", } diff --git a/frontend/src/utils/api/student_email_history.ts b/frontend/src/utils/api/student_email_history.ts index 725baf7ad..f364e0216 100644 --- a/frontend/src/utils/api/student_email_history.ts +++ b/frontend/src/utils/api/student_email_history.ts @@ -15,9 +15,9 @@ export async function getEmails(): Promise { // placeholder while the real API call is not available const data = { emails: [ - { emailId: 1, date: "2022-04-14T12:36:28.641337", type: 0 }, + { emailId: 1, date: "2022-04-13T11:46:28.641337", type: 0 }, { emailId: 2, date: "2022-04-14T12:36:28.641337", type: 1 }, - { emailId: 3, date: "2022-04-14T12:36:28.641337", type: 2 }, + { emailId: 3, date: "2022-04-15T13:38:38.641337", type: 2 }, ], }; return data as EmailHistoryList; From 65038c10acfdc1ee8921568a7f33a79c3e6ab846 Mon Sep 17 00:00:00 2001 From: beguille Date: Sat, 16 Apr 2022 18:23:24 +0200 Subject: [PATCH 008/649] started overview page of emails of all students --- frontend/src/Router.tsx | 6 +++ frontend/src/data/interfaces/email.ts | 6 +++ frontend/src/data/interfaces/index.ts | 3 +- frontend/src/data/interfaces/student.ts | 8 +++ frontend/src/utils/api/mail_overview.ts | 33 ++++++++++++ .../src/utils/api/student_email_history.ts | 8 +-- .../MailOverviewPage/MailOverviewPage.tsx | 53 +++++++++++++++++++ frontend/src/views/MailOverviewPage/index.ts | 1 + frontend/src/views/MailOverviewPage/styles.ts | 9 ++++ .../StudentMailHistoryPage.tsx | 3 +- frontend/src/views/index.ts | 1 + 11 files changed, 122 insertions(+), 9 deletions(-) create mode 100644 frontend/src/data/interfaces/student.ts create mode 100644 frontend/src/utils/api/mail_overview.ts create mode 100644 frontend/src/views/MailOverviewPage/MailOverviewPage.tsx create mode 100644 frontend/src/views/MailOverviewPage/index.ts create mode 100644 frontend/src/views/MailOverviewPage/styles.ts diff --git a/frontend/src/Router.tsx b/frontend/src/Router.tsx index fe1fdff17..9c4c99f2b 100644 --- a/frontend/src/Router.tsx +++ b/frontend/src/Router.tsx @@ -12,6 +12,7 @@ import { UsersPage, VerifyingTokenPage, StudentMailHistoryPage, + MailOverviewPage, } from "./views"; import { ForbiddenPage, NotFoundPage } from "./views/errors"; @@ -54,6 +55,11 @@ export default function Router() { {/* TODO edition page? do we need? maybe just some nav/links? */} } /> + {/* Mail Overview */} + }> + } /> + + {/* Projects routes */} }> } /> diff --git a/frontend/src/data/interfaces/email.ts b/frontend/src/data/interfaces/email.ts index 49356610b..588d217d0 100644 --- a/frontend/src/data/interfaces/email.ts +++ b/frontend/src/data/interfaces/email.ts @@ -6,3 +6,9 @@ export interface Email { date: String; type: number; } +/** + * A list of sent emails + */ +export interface EmailHistoryList { + emails: Email[]; +} diff --git a/frontend/src/data/interfaces/index.ts b/frontend/src/data/interfaces/index.ts index ab7f76cf0..3f55162fe 100644 --- a/frontend/src/data/interfaces/index.ts +++ b/frontend/src/data/interfaces/index.ts @@ -1,2 +1,3 @@ export type { User } from "./users"; -export type { Email } from "./email"; +export type { Email, EmailHistoryList } from "./email"; +export type { Student } from "./student"; diff --git a/frontend/src/data/interfaces/student.ts b/frontend/src/data/interfaces/student.ts new file mode 100644 index 000000000..18b016e72 --- /dev/null +++ b/frontend/src/data/interfaces/student.ts @@ -0,0 +1,8 @@ +/** + * Data about a student in the application + */ +export interface Student { + studentId: number; + firstName: string; + lastName: string; +} diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts new file mode 100644 index 000000000..32fddfac0 --- /dev/null +++ b/frontend/src/utils/api/mail_overview.ts @@ -0,0 +1,33 @@ +import { Email, Student } from "../../data/interfaces"; + +/** + * A student together with its email history + */ +interface StudentEmail { + student: Student; + emails: Email[]; +} + +export interface StudentEmails { + studentEmails: StudentEmail[]; +} + +export async function getMailOverview(): Promise { + // const response = await axiosInstance.get("/editions/1/emails/"); + // return response.data as StudentEmails; + + // placeholder while the real API call is not available + const data = { + studentEmails: [ + { + student: { studentId: 1, firstName: "Bert", lastName: "Guillemyn" }, + emails: [ + { emailId: 1, date: "2022-04-13T11:46:28.641337", type: 0 }, + { emailId: 2, date: "2022-04-14T12:36:28.641337", type: 1 }, + { emailId: 3, date: "2022-04-15T13:38:38.641337", type: 2 }, + ], + }, + ], + }; + return data as StudentEmails; +} diff --git a/frontend/src/utils/api/student_email_history.ts b/frontend/src/utils/api/student_email_history.ts index f364e0216..673b43aa9 100644 --- a/frontend/src/utils/api/student_email_history.ts +++ b/frontend/src/utils/api/student_email_history.ts @@ -1,10 +1,4 @@ -import { Email } from "../../data/interfaces"; -/** - * A list of emails - */ -export interface EmailHistoryList { - emails: Email[]; -} +import { EmailHistoryList } from "../../data/interfaces"; /** * Get the full email history for a student */ diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx new file mode 100644 index 000000000..5b216fb65 --- /dev/null +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -0,0 +1,53 @@ +import React, { useEffect, useState } from "react"; +import { getMailOverview, StudentEmails } from "../../utils/api/mail_overview"; +import Table from "react-bootstrap/Table"; +// import BootstrapTable from "react-bootstrap-table-next"; +import { EmailType } from "../../data/enums"; +import { MailOverviewPageDiv } from "./styles"; +// TODO: convert to react-bootstrap-table-next +// TODO: add comments to created functions and interfaces +/** + * Page that shows the email status of all students, with the possibility to change the status + */ +export default function MailOverviewPage() { + const init: StudentEmails = { + studentEmails: [], + }; + const [table, setTable] = useState(init); + + useEffect(() => { + const updateMailOverview = async () => { + try { + const studentEmails = await getMailOverview(); + setTable(studentEmails); + } catch (exception) { + console.log(exception); + } + }; + updateMailOverview(); + }, []); + return ( + + + + + + + + + + + + {table.studentEmails.map(d => ( + + + + + + + ))} + +
Fist nameLast nameEmail IDLast Email Status
{d.student.firstName}{d.student.lastName}{d.emails[0].emailId}{Object.values(EmailType)[d.emails[0].type]}
+ + ); +} diff --git a/frontend/src/views/MailOverviewPage/index.ts b/frontend/src/views/MailOverviewPage/index.ts new file mode 100644 index 000000000..b955d779b --- /dev/null +++ b/frontend/src/views/MailOverviewPage/index.ts @@ -0,0 +1 @@ +export { default } from "./MailOverviewPage"; diff --git a/frontend/src/views/MailOverviewPage/styles.ts b/frontend/src/views/MailOverviewPage/styles.ts new file mode 100644 index 000000000..0d9febdb7 --- /dev/null +++ b/frontend/src/views/MailOverviewPage/styles.ts @@ -0,0 +1,9 @@ +import styled from "styled-components"; + +export const MailOverviewPageDiv = styled.div` + background-color: white; + margin: auto; + margin-top: 50px; + margin-bottom: 50px; + width: fit-content; +`; diff --git a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx index 7d2152611..fcd212285 100644 --- a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx +++ b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx @@ -1,7 +1,8 @@ import React, { useEffect, useState } from "react"; import { MailHistoryPage } from "./styles"; import Table from "react-bootstrap/Table"; -import { getEmails, EmailHistoryList } from "../../utils/api/student_email_history"; +import { getEmails } from "../../utils/api/student_email_history"; +import { EmailHistoryList } from "../../data/interfaces"; import { EmailType } from "../../data/enums"; /** * Page that shows the email history of a student in a table diff --git a/frontend/src/views/index.ts b/frontend/src/views/index.ts index 998188aed..893017e42 100644 --- a/frontend/src/views/index.ts +++ b/frontend/src/views/index.ts @@ -7,3 +7,4 @@ export { default as StudentsPage } from "./StudentsPage"; export { default as UsersPage } from "./UsersPage"; export { default as VerifyingTokenPage } from "./VerifyingTokenPage"; export { default as StudentMailHistoryPage } from "./StudentMailHistoryPage"; +export { default as MailOverviewPage } from "./MailOverviewPage"; From aaf3b7f0aee3fda4670a72e8f608de897e0fe55d Mon Sep 17 00:00:00 2001 From: beguille Date: Sun, 17 Apr 2022 17:30:16 +0200 Subject: [PATCH 009/649] added selection to table, added update status button --- frontend/package.json | 2 + frontend/src/utils/api/mail_overview.ts | 34 +++++++ .../MailOverviewPage/MailOverviewPage.tsx | 97 +++++++++++++------ frontend/src/views/MailOverviewPage/styles.ts | 10 +- frontend/yarn.lock | 25 ++++- 5 files changed, 137 insertions(+), 31 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index e13e51780..b9a2faffd 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,10 +6,12 @@ "@fortawesome/fontawesome-svg-core": "^1.3.0", "@fortawesome/free-solid-svg-icons": "^6.0.0", "@fortawesome/react-fontawesome": "^0.1.17", + "@types/react-bootstrap-table-next": "^4.0.17", "axios": "^0.26.1", "bootstrap": "5.1.3", "react": "^17.0.2", "react-bootstrap": "^2.2.1", + "react-bootstrap-table-next": "^4.0.3", "react-dom": "^17.0.2", "react-icons": "^4.3.1", "react-router-bootstrap": "^0.26.1", diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts index 32fddfac0..2f13c4097 100644 --- a/frontend/src/utils/api/mail_overview.ts +++ b/frontend/src/utils/api/mail_overview.ts @@ -27,7 +27,41 @@ export async function getMailOverview(): Promise { { emailId: 3, date: "2022-04-15T13:38:38.641337", type: 2 }, ], }, + { + student: { studentId: 2, firstName: "Test", lastName: "Person" }, + emails: [ + { emailId: 1, date: "2022-04-13T08:25:46.641337", type: 4 }, + { emailId: 2, date: "2022-04-14T12:36:28.641337", type: 1 }, + { emailId: 3, date: "2022-04-15T13:38:38.641337", type: 2 }, + ], + }, ], }; return data as StudentEmails; } + +const selectedRows: number[] = []; + +export function handleSelect(row: StudentEmail, isSelect: boolean) { + if (isSelect) { + selectedRows.push(row.student.studentId); + } else { + selectedRows.splice( + selectedRows.findIndex(item => item === row.student.studentId), + 1 + ); + } +} +export function handleSelectAll(isSelect: boolean, rows: StudentEmail[]) { + for (const row of rows) { + handleSelect(row, isSelect); + } +} + +export function handleSetState(eventKey: string | null) { + console.log(eventKey); + console.log(selectedRows); + // TODO do post request with selected data + + // update table contents ? +} diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index 5b216fb65..2cc81137f 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -1,11 +1,18 @@ import React, { useEffect, useState } from "react"; -import { getMailOverview, StudentEmails } from "../../utils/api/mail_overview"; -import Table from "react-bootstrap/Table"; -// import BootstrapTable from "react-bootstrap-table-next"; +import { + getMailOverview, + StudentEmails, + handleSelect, + handleSelectAll, + handleSetState, +} from "../../utils/api/mail_overview"; +import BootstrapTable from "react-bootstrap-table-next"; +import DropdownButton from "react-bootstrap/DropdownButton"; +import Dropdown from "react-bootstrap/Dropdown"; +import { TableDiv, DropDownButtonDiv } from "./styles"; import { EmailType } from "../../data/enums"; -import { MailOverviewPageDiv } from "./styles"; -// TODO: convert to react-bootstrap-table-next // TODO: add comments to created functions and interfaces +// TODO: add search and filter fields /** * Page that shows the email status of all students, with the possibility to change the status */ @@ -26,28 +33,64 @@ export default function MailOverviewPage() { }; updateMailOverview(); }, []); + + const columns = [ + { + dataField: "student.firstName", + text: "First Name", + }, + { + dataField: "student.lastName", + text: "Last Name", + }, + { + dataField: "emails[0].type", + text: "Current Email State", + formatter: (cellContent: number) => { + return Object.values(EmailType)[cellContent]; + }, + }, + { + dataField: "emails[0].date", + text: "Date Of Last Email", + formatter: (cellContent: number) => { + return new Date(String(cellContent)).toLocaleString("nl-be"); + }, + }, + ]; + return ( - - - - - - - - - - - - {table.studentEmails.map(d => ( - - - - - - - ))} - -
Fist nameLast nameEmail IDLast Email Status
{d.student.firstName}{d.student.lastName}{d.emails[0].emailId}{Object.values(EmailType)[d.emails[0].type]}
- + <> + + + Applied + Awaiting project + Approved + Contract confirmed + Contract declined + Rejected + + + + + + ); } diff --git a/frontend/src/views/MailOverviewPage/styles.ts b/frontend/src/views/MailOverviewPage/styles.ts index 0d9febdb7..6a6b6ba83 100644 --- a/frontend/src/views/MailOverviewPage/styles.ts +++ b/frontend/src/views/MailOverviewPage/styles.ts @@ -1,9 +1,15 @@ import styled from "styled-components"; -export const MailOverviewPageDiv = styled.div` +export const TableDiv = styled.div` background-color: white; margin: auto; - margin-top: 50px; + margin-top: 20px; margin-bottom: 50px; width: fit-content; `; + +export const DropDownButtonDiv = styled.div` + margin: auto; + margin-top: 50px; + width: fit-content; +`; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 1fb299499..3bf5f313f 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1982,6 +1982,13 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== +"@types/react-bootstrap-table-next@^4.0.17": + version "4.0.17" + resolved "https://registry.yarnpkg.com/@types/react-bootstrap-table-next/-/react-bootstrap-table-next-4.0.17.tgz#226a94769c89c8eabb3d59e91d7723c004669b05" + integrity sha512-cUEdFwljyxqErlt1WU1fT+OILXZrM2JrJgEQb2XNo+7CUJdGAEwVQ5MRDs6jAoh3OX/noPkylfUPDTGIcqvhrQ== + dependencies: + "@types/react" "*" + "@types/react-dom@*", "@types/react-dom@^17.0.9": version "17.0.14" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" @@ -3145,7 +3152,7 @@ cjs-module-lexer@^1.0.0: resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== -classnames@^2.3.1: +classnames@^2.2.5, classnames@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== @@ -7595,6 +7602,15 @@ react-app-polyfill@^3.0.0: regenerator-runtime "^0.13.9" whatwg-fetch "^3.6.2" +react-bootstrap-table-next@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/react-bootstrap-table-next/-/react-bootstrap-table-next-4.0.3.tgz#b55873b01adfe22a7181904b784a9d24ac2822cf" + integrity sha512-uKxC73qUdUfusRf2uzDfMiF9LvTG5vuhTZa0lbAgHWSLLLaKTsI0iHf1e4+c7gP71q8dFsp7StvkP65SxC1JRg== + dependencies: + classnames "^2.2.5" + react-transition-group "^4.2.0" + underscore "1.9.1" + react-bootstrap@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-2.2.1.tgz#2a6ad0931e9367882ec3fc88a70ed0b8ace90b26" @@ -7778,7 +7794,7 @@ react-test-renderer@^16.0.0-0: react-is "^16.8.6" scheduler "^0.19.1" -react-transition-group@^4.4.2: +react-transition-group@^4.2.0, react-transition-group@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== @@ -8935,6 +8951,11 @@ uncontrollable@^7.2.1: invariant "^2.2.4" react-lifecycles-compat "^3.0.4" +underscore@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" + integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== + unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" From 01d23e68fce0ff1af9cb74e372edeb420c093c89 Mon Sep 17 00:00:00 2001 From: beguille Date: Sun, 17 Apr 2022 19:24:57 +0200 Subject: [PATCH 010/649] added searchbar and filter dropdown --- frontend/package.json | 2 ++ frontend/src/utils/api/mail_overview.ts | 22 ++++++++++++ .../MailOverviewPage/MailOverviewPage.tsx | 35 +++++++++++++++---- frontend/src/views/MailOverviewPage/styles.ts | 21 ++++++++++- frontend/yarn.lock | 22 +++++++++++- 5 files changed, 94 insertions(+), 8 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index b9a2faffd..6462a569a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,11 +7,13 @@ "@fortawesome/free-solid-svg-icons": "^6.0.0", "@fortawesome/react-fontawesome": "^0.1.17", "@types/react-bootstrap-table-next": "^4.0.17", + "@types/react-bootstrap-table2-toolkit": "^2.1.6", "axios": "^0.26.1", "bootstrap": "5.1.3", "react": "^17.0.2", "react-bootstrap": "^2.2.1", "react-bootstrap-table-next": "^4.0.3", + "react-bootstrap-table2-toolkit": "^2.1.3", "react-dom": "^17.0.2", "react-icons": "^4.3.1", "react-router-bootstrap": "^0.26.1", diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts index 2f13c4097..a52b94261 100644 --- a/frontend/src/utils/api/mail_overview.ts +++ b/frontend/src/utils/api/mail_overview.ts @@ -8,10 +8,16 @@ interface StudentEmail { emails: Email[]; } +/** + * Multiple studentEmails in a list + */ export interface StudentEmails { studentEmails: StudentEmail[]; } +/** + * Get the sent emails of all students + */ export async function getMailOverview(): Promise { // const response = await axiosInstance.get("/editions/1/emails/"); // return response.data as StudentEmails; @@ -42,6 +48,11 @@ export async function getMailOverview(): Promise { const selectedRows: number[] = []; +/** + * Keeps the selectedRows list up-to-date when a student is selected/unselected in the table + * @param row + * @param isSelect + */ export function handleSelect(row: StudentEmail, isSelect: boolean) { if (isSelect) { selectedRows.push(row.student.studentId); @@ -52,12 +63,23 @@ export function handleSelect(row: StudentEmail, isSelect: boolean) { ); } } + +/** + * Does the same as handleSelect, but for multiple rows at the same time + * @param isSelect + * @param rows + */ export function handleSelectAll(isSelect: boolean, rows: StudentEmail[]) { for (const row of rows) { handleSelect(row, isSelect); } } +/** + * Updates the Email state of the currently selected students in the table to the selected state + * from the dropdown menu + * @param eventKey + */ export function handleSetState(eventKey: string | null) { console.log(eventKey); console.log(selectedRows); diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index 2cc81137f..11d2c1fa8 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -9,10 +9,11 @@ import { import BootstrapTable from "react-bootstrap-table-next"; import DropdownButton from "react-bootstrap/DropdownButton"; import Dropdown from "react-bootstrap/Dropdown"; -import { TableDiv, DropDownButtonDiv } from "./styles"; +import InputGroup from "react-bootstrap/InputGroup"; +import FormControl from "react-bootstrap/FormControl"; +import { TableDiv, DropDownButtonDiv, SearchDiv, FilterDiv, SearchAndFilterDiv } from "./styles"; import { EmailType } from "../../data/enums"; -// TODO: add comments to created functions and interfaces -// TODO: add search and filter fields + /** * Page that shows the email status of all students, with the possibility to change the status */ @@ -76,19 +77,41 @@ export default function MailOverviewPage() { Rejected + + + + + + + + + Applied + Awaiting project + Approved + Contract confirmed + Contract declined + Rejected + + + diff --git a/frontend/src/views/MailOverviewPage/styles.ts b/frontend/src/views/MailOverviewPage/styles.ts index 6a6b6ba83..deafe6a4f 100644 --- a/frontend/src/views/MailOverviewPage/styles.ts +++ b/frontend/src/views/MailOverviewPage/styles.ts @@ -3,7 +3,7 @@ import styled from "styled-components"; export const TableDiv = styled.div` background-color: white; margin: auto; - margin-top: 20px; + margin-top: 5px; margin-bottom: 50px; width: fit-content; `; @@ -13,3 +13,22 @@ export const DropDownButtonDiv = styled.div` margin-top: 50px; width: fit-content; `; + +export const SearchDiv = styled.div` + margin: auto; + margin-top: 50px; + width: fit-content; + display: inline-block; +`; + +export const FilterDiv = styled.div` + margin: auto; + margin-top: 50px; + width: fit-content; + display: inline-block; +`; + +export const SearchAndFilterDiv = styled.div` + margin: auto; + width: fit-content; +`; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 3bf5f313f..e92788d9e 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1982,13 +1982,21 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-bootstrap-table-next@^4.0.17": +"@types/react-bootstrap-table-next@*", "@types/react-bootstrap-table-next@^4.0.17": version "4.0.17" resolved "https://registry.yarnpkg.com/@types/react-bootstrap-table-next/-/react-bootstrap-table-next-4.0.17.tgz#226a94769c89c8eabb3d59e91d7723c004669b05" integrity sha512-cUEdFwljyxqErlt1WU1fT+OILXZrM2JrJgEQb2XNo+7CUJdGAEwVQ5MRDs6jAoh3OX/noPkylfUPDTGIcqvhrQ== dependencies: "@types/react" "*" +"@types/react-bootstrap-table2-toolkit@^2.1.6": + version "2.1.6" + resolved "https://registry.yarnpkg.com/@types/react-bootstrap-table2-toolkit/-/react-bootstrap-table2-toolkit-2.1.6.tgz#e9497aa6faacbddcf4d918f552a736bee28c0cb3" + integrity sha512-bu4naldgN6KYuKl3Dca0SDYkf610nurbSxm3kwcol2MUW3QFc1KgBynhNtCgvZJByGpiUAmvt0nmC14o7/T0Iw== + dependencies: + "@types/react" "*" + "@types/react-bootstrap-table-next" "*" + "@types/react-dom@*", "@types/react-dom@^17.0.9": version "17.0.14" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" @@ -4605,6 +4613,11 @@ file-loader@^6.2.0: loader-utils "^2.0.0" schema-utils "^3.0.0" +file-saver@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.2.tgz#06d6e728a9ea2df2cce2f8d9e84dfcdc338ec17a" + integrity sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw== + filelist@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" @@ -7611,6 +7624,13 @@ react-bootstrap-table-next@^4.0.3: react-transition-group "^4.2.0" underscore "1.9.1" +react-bootstrap-table2-toolkit@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/react-bootstrap-table2-toolkit/-/react-bootstrap-table2-toolkit-2.1.3.tgz#554df765c3a4ab9d650b6686f55a5256e2509fab" + integrity sha512-nKBSezHTOkO9k8YMMuJfPEZtBVfIYrJbmP8n3u7+AXRcOrOGygXyauNVKWqdKLchQlG/cW5QR0sPkFknpp5rjQ== + dependencies: + file-saver "2.0.2" + react-bootstrap@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-2.2.1.tgz#2a6ad0931e9367882ec3fc88a70ed0b8ace90b26" From 78e5ee7dcb8b4a67507b4aadf6e27b0dd412567c Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 18 Apr 2022 15:50:45 +0200 Subject: [PATCH 011/649] added search and filters --- frontend/package.json | 1 + frontend/src/utils/api/mail_overview.ts | 22 ++++++- .../MailOverviewPage/MailOverviewPage.tsx | 64 ++++++++++++------- frontend/src/views/MailOverviewPage/styles.ts | 12 ++++ frontend/yarn.lock | 5 ++ 5 files changed, 81 insertions(+), 23 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 6462a569a..eaf957a70 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,6 +10,7 @@ "@types/react-bootstrap-table2-toolkit": "^2.1.6", "axios": "^0.26.1", "bootstrap": "5.1.3", + "multiselect-react-dropdown": "^2.0.21", "react": "^17.0.2", "react-bootstrap": "^2.2.1", "react-bootstrap-table-next": "^4.0.3", diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts index a52b94261..fc2d99ffa 100644 --- a/frontend/src/utils/api/mail_overview.ts +++ b/frontend/src/utils/api/mail_overview.ts @@ -1,5 +1,5 @@ import { Email, Student } from "../../data/interfaces"; - +import { ChangeEvent } from "react"; /** * A student together with its email history */ @@ -87,3 +87,23 @@ export function handleSetState(eventKey: string | null) { // update table contents ? } + +let selectedFilters: string[] = []; +/** + * Filters the table + * @param selectedList + */ +export function handleFilterSelect(selectedList: string[]) { + selectedFilters = selectedList; +} + +let searchTerm: string = ""; +export function handleSetSearch(event: ChangeEvent<{ value: string }>) { + searchTerm = event.target.value; +} + +export function handleDoSearch() { + console.log(selectedFilters); + console.log(searchTerm); + // TODO: make get request with filters and searchterm +} diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index 11d2c1fa8..d81c4713d 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -5,13 +5,25 @@ import { handleSelect, handleSelectAll, handleSetState, + handleFilterSelect, + handleSetSearch, + handleDoSearch, } from "../../utils/api/mail_overview"; import BootstrapTable from "react-bootstrap-table-next"; import DropdownButton from "react-bootstrap/DropdownButton"; import Dropdown from "react-bootstrap/Dropdown"; import InputGroup from "react-bootstrap/InputGroup"; +import Button from "react-bootstrap/Button"; import FormControl from "react-bootstrap/FormControl"; -import { TableDiv, DropDownButtonDiv, SearchDiv, FilterDiv, SearchAndFilterDiv } from "./styles"; +import { Multiselect } from "multiselect-react-dropdown"; +import { + TableDiv, + DropDownButtonDiv, + SearchDiv, + FilterDiv, + SearchAndFilterDiv, + ButtonDiv, +} from "./styles"; import { EmailType } from "../../data/enums"; /** @@ -22,7 +34,6 @@ export default function MailOverviewPage() { studentEmails: [], }; const [table, setTable] = useState(init); - useEffect(() => { const updateMailOverview = async () => { try { @@ -69,35 +80,44 @@ export default function MailOverviewPage() { menuVariant="dark" onSelect={handleSetState} > - Applied - Awaiting project - Approved - Contract confirmed - Contract declined - Rejected + {Object.values(EmailType).map((type, index) => ( + + {type} + + ))} - + - - Applied - Awaiting project - Approved - Contract confirmed - Contract declined - Rejected - + + + + Date: Mon, 18 Apr 2022 15:52:07 +0200 Subject: [PATCH 012/649] added comments --- frontend/src/utils/api/mail_overview.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts index fc2d99ffa..e068b9b3a 100644 --- a/frontend/src/utils/api/mail_overview.ts +++ b/frontend/src/utils/api/mail_overview.ts @@ -90,7 +90,7 @@ export function handleSetState(eventKey: string | null) { let selectedFilters: string[] = []; /** - * Filters the table + * Keeps track of the selected filters * @param selectedList */ export function handleFilterSelect(selectedList: string[]) { @@ -98,10 +98,18 @@ export function handleFilterSelect(selectedList: string[]) { } let searchTerm: string = ""; + +/** + * Keeps track of the search value + * @param event + */ export function handleSetSearch(event: ChangeEvent<{ value: string }>) { searchTerm = event.target.value; } +/** + * Sends the get request with the filters and the searchterm + */ export function handleDoSearch() { console.log(selectedFilters); console.log(searchTerm); From a5e7831ccf0c00ade6e6635b61f617338e9f1a55 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 21 Apr 2022 14:51:52 +0200 Subject: [PATCH 013/649] added real api call for email history of student --- frontend/src/data/interfaces/email.ts | 3 ++- frontend/src/utils/api/mail_overview.ts | 12 +++++------ .../src/utils/api/student_email_history.ts | 20 +++++++------------ .../MailOverviewPage/MailOverviewPage.tsx | 2 +- .../StudentMailHistoryPage.tsx | 10 ++++++---- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/frontend/src/data/interfaces/email.ts b/frontend/src/data/interfaces/email.ts index 588d217d0..9926a4071 100644 --- a/frontend/src/data/interfaces/email.ts +++ b/frontend/src/data/interfaces/email.ts @@ -3,8 +3,9 @@ */ export interface Email { emailId: number; + studentId: number; + decision: number; date: String; - type: number; } /** * A list of sent emails diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts index e068b9b3a..68a09ccaa 100644 --- a/frontend/src/utils/api/mail_overview.ts +++ b/frontend/src/utils/api/mail_overview.ts @@ -28,17 +28,17 @@ export async function getMailOverview(): Promise { { student: { studentId: 1, firstName: "Bert", lastName: "Guillemyn" }, emails: [ - { emailId: 1, date: "2022-04-13T11:46:28.641337", type: 0 }, - { emailId: 2, date: "2022-04-14T12:36:28.641337", type: 1 }, - { emailId: 3, date: "2022-04-15T13:38:38.641337", type: 2 }, + { emailId: 1, studentId: 1, date: "2022-04-13T11:46:28.641337", decision: 0 }, + { emailId: 2, studentId: 1, date: "2022-04-14T12:36:28.641337", decision: 1 }, + { emailId: 3, studentId: 1, date: "2022-04-15T13:38:38.641337", decision: 2 }, ], }, { student: { studentId: 2, firstName: "Test", lastName: "Person" }, emails: [ - { emailId: 1, date: "2022-04-13T08:25:46.641337", type: 4 }, - { emailId: 2, date: "2022-04-14T12:36:28.641337", type: 1 }, - { emailId: 3, date: "2022-04-15T13:38:38.641337", type: 2 }, + { emailId: 1, studentId: 2, date: "2022-04-13T08:25:46.641337", decision: 4 }, + { emailId: 2, studentId: 2, date: "2022-04-14T12:36:28.641337", decision: 1 }, + { emailId: 3, studentId: 2, date: "2022-04-15T13:38:38.641337", decision: 2 }, ], }, ], diff --git a/frontend/src/utils/api/student_email_history.ts b/frontend/src/utils/api/student_email_history.ts index 673b43aa9..dd9b2b951 100644 --- a/frontend/src/utils/api/student_email_history.ts +++ b/frontend/src/utils/api/student_email_history.ts @@ -1,18 +1,12 @@ import { EmailHistoryList } from "../../data/interfaces"; +import { axiosInstance } from "./api"; /** * Get the full email history for a student */ -export async function getEmails(): Promise { - // const response = await axiosInstance.get("/edition/student/1/"); - // return response.data as EmailHistoryList; - - // placeholder while the real API call is not available - const data = { - emails: [ - { emailId: 1, date: "2022-04-13T11:46:28.641337", type: 0 }, - { emailId: 2, date: "2022-04-14T12:36:28.641337", type: 1 }, - { emailId: 3, date: "2022-04-15T13:38:38.641337", type: 2 }, - ], - }; - return data as EmailHistoryList; +export async function getEmails( + editionId: string | undefined, + studentId: string | undefined +): Promise { + const response = await axiosInstance.get(`/edition/${editionId}/student/${studentId}/emails`); + return response.data as EmailHistoryList; } diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index d81c4713d..fb539ae1a 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -56,7 +56,7 @@ export default function MailOverviewPage() { text: "Last Name", }, { - dataField: "emails[0].type", + dataField: "emails[0].decision", text: "Current Email State", formatter: (cellContent: number) => { return Object.values(EmailType)[cellContent]; diff --git a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx index fcd212285..d951f130d 100644 --- a/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx +++ b/frontend/src/views/StudentMailHistoryPage/StudentMailHistoryPage.tsx @@ -4,6 +4,8 @@ import Table from "react-bootstrap/Table"; import { getEmails } from "../../utils/api/student_email_history"; import { EmailHistoryList } from "../../data/interfaces"; import { EmailType } from "../../data/enums"; +import { useParams } from "react-router-dom"; + /** * Page that shows the email history of a student in a table */ @@ -12,18 +14,18 @@ export default function StudentMailHistoryPage() { emails: [], }; const [table, setTable] = useState(init); - + const { editionId, id } = useParams(); useEffect(() => { const updateEmailList = async () => { try { - const emails = await getEmails(); + const emails = await getEmails(editionId, id); setTable(emails); } catch (exception) { console.log(exception); } }; updateEmailList(); - }, []); + }, [editionId, id]); return ( @@ -38,7 +40,7 @@ export default function StudentMailHistoryPage() { {table.emails.map(d => ( {new Date(String(d.date)).toLocaleString("nl-be")} - {Object.values(EmailType)[d.type]} + {Object.values(EmailType)[d.decision]} ))} From 072cafa36386539136da6b5c9c59c9e3fe52cc81 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 21 Apr 2022 15:58:03 +0200 Subject: [PATCH 014/649] fixed stupid bug --- frontend/src/utils/api/student_email_history.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/utils/api/student_email_history.ts b/frontend/src/utils/api/student_email_history.ts index dd9b2b951..64c9fa1a0 100644 --- a/frontend/src/utils/api/student_email_history.ts +++ b/frontend/src/utils/api/student_email_history.ts @@ -7,6 +7,6 @@ export async function getEmails( editionId: string | undefined, studentId: string | undefined ): Promise { - const response = await axiosInstance.get(`/edition/${editionId}/student/${studentId}/emails`); + const response = await axiosInstance.get(`/editions/${editionId}/students/${studentId}/emails`); return response.data as EmailHistoryList; } From 974d20f9df455b0c97a6b84f1d61d1ca542168a4 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 21 Apr 2022 19:24:42 +0200 Subject: [PATCH 015/649] added pagination --- frontend/package.json | 4 +- frontend/src/utils/api/mail_overview.ts | 23 ++++-- .../MailOverviewPage/MailOverviewPage.tsx | 79 +++++++++++++------ frontend/yarn.lock | 16 +++- 4 files changed, 90 insertions(+), 32 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 0844f3e22..6c5e9d7f4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,16 +8,18 @@ "@fortawesome/react-fontawesome": "^0.1.17", "@types/react-bootstrap-table-next": "^4.0.17", "@types/react-bootstrap-table2-toolkit": "^2.1.6", + "@types/react-infinite-scroller": "^1.2.3", "axios": "^0.26.1", "bootstrap": "5.1.3", - "multiselect-react-dropdown": "^2.0.21", "buffer": "^6.0.3", + "multiselect-react-dropdown": "^2.0.21", "react": "^17.0.2", "react-bootstrap": "^2.2.1", "react-bootstrap-table-next": "^4.0.3", "react-bootstrap-table2-toolkit": "^2.1.3", "react-dom": "^17.0.2", "react-icons": "^4.3.1", + "react-infinite-scroller": "^1.2.6", "react-router-bootstrap": "^0.26.1", "react-router-dom": "^6.2.1", "react-scripts": "^5.0.0", diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts index 68a09ccaa..43e45a4be 100644 --- a/frontend/src/utils/api/mail_overview.ts +++ b/frontend/src/utils/api/mail_overview.ts @@ -18,11 +18,18 @@ export interface StudentEmails { /** * Get the sent emails of all students */ -export async function getMailOverview(): Promise { +export async function getMailOverview( + edition: string | undefined, + page: number +): Promise { // const response = await axiosInstance.get("/editions/1/emails/"); // return response.data as StudentEmails; - + console.log(finalFilters); + console.log(finalSearch); // placeholder while the real API call is not available + if (page > 0) { + return { studentEmails: [] } as StudentEmails; + } const data = { studentEmails: [ { @@ -107,11 +114,13 @@ export function handleSetSearch(event: ChangeEvent<{ value: string }>) { searchTerm = event.target.value; } +let finalFilters: string[] = []; +let finalSearch: string = ""; + /** - * Sends the get request with the filters and the searchterm + * Sets the definitive searchterm and filters to be sent */ -export function handleDoSearch() { - console.log(selectedFilters); - console.log(searchTerm); - // TODO: make get request with filters and searchterm +export function setFinalFilters() { + finalFilters = selectedFilters; + finalSearch = searchTerm; } diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index fb539ae1a..6c7a2e6a0 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -7,7 +7,7 @@ import { handleSetState, handleFilterSelect, handleSetSearch, - handleDoSearch, + setFinalFilters, } from "../../utils/api/mail_overview"; import BootstrapTable from "react-bootstrap-table-next"; import DropdownButton from "react-bootstrap/DropdownButton"; @@ -15,6 +15,7 @@ import Dropdown from "react-bootstrap/Dropdown"; import InputGroup from "react-bootstrap/InputGroup"; import Button from "react-bootstrap/Button"; import FormControl from "react-bootstrap/FormControl"; +import InfiniteScroll from "react-infinite-scroller"; import { Multiselect } from "multiselect-react-dropdown"; import { TableDiv, @@ -25,6 +26,7 @@ import { ButtonDiv, } from "./styles"; import { EmailType } from "../../data/enums"; +import { useParams } from "react-router-dom"; /** * Page that shows the email status of all students, with the possibility to change the status @@ -34,17 +36,41 @@ export default function MailOverviewPage() { studentEmails: [], }; const [table, setTable] = useState(init); - useEffect(() => { - const updateMailOverview = async () => { - try { - const studentEmails = await getMailOverview(); + const [gotData, setGotData] = useState(false); // Received data + const [moreEmailsAvailable, setMoreEmailsAvailable] = useState(true); // Endpoint has more emails available + const { editionId } = useParams(); + + async function updateMailOverview(page: number) { + try { + const studentEmails = await getMailOverview(editionId, page); + if (studentEmails.studentEmails.length === 0) { + setMoreEmailsAvailable(false); + } + if (page === 0) { setTable(studentEmails); - } catch (exception) { - console.log(exception); + } else { + setTable({ + studentEmails: table.studentEmails.concat(studentEmails.studentEmails), + }); } - }; - updateMailOverview(); - }, []); + setGotData(true); + } catch (exception) { + console.log(exception); + } + } + + useEffect(() => { + if (!gotData) { + updateMailOverview(0); + } + }); + + function handleDoSearch() { + setFinalFilters(); + setGotData(false); + setMoreEmailsAvailable(true); + updateMailOverview(0); + } const columns = [ { @@ -120,19 +146,26 @@ export default function MailOverviewPage() { - + + + ); diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 1e6bfdd29..eaa72ab73 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2004,6 +2004,13 @@ dependencies: "@types/react" "*" +"@types/react-infinite-scroller@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@types/react-infinite-scroller/-/react-infinite-scroller-1.2.3.tgz#b8dcb0e5762c3f79cc92e574d2c77402524cab71" + integrity sha512-l60JckVoO+dxmKW2eEG7jbliEpITsTJvRPTe97GazjF5+ylagAuyYdXl8YY9DQsTP9QjhqGKZROknzgscGJy0A== + dependencies: + "@types/react" "*" + "@types/react-router-bootstrap@^0.24.5": version "0.24.5" resolved "https://registry.yarnpkg.com/@types/react-router-bootstrap/-/react-router-bootstrap-0.24.5.tgz#9257ba3dfb01cda201aac9fa05cde3eb09ea5b27" @@ -7537,7 +7544,7 @@ prop-types-extra@^1.1.0: react-is "^16.3.2" warning "^4.0.0" -prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -7725,6 +7732,13 @@ react-icons@^4.3.1: resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.3.1.tgz#2fa92aebbbc71f43d2db2ed1aed07361124e91ca" integrity sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ== +react-infinite-scroller@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.2.6.tgz#8b80233226dc753a597a0eb52621247f49b15f18" + integrity sha512-mGdMyOD00YArJ1S1F3TVU9y4fGSfVVl6p5gh/Vt4u99CJOptfVu/q5V/Wlle72TMgYlBwIhbxK5wF0C/R33PXQ== + dependencies: + prop-types "^15.5.8" + react-is@^16.13.1, react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.6: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" From 503ffaa7ff578df607a74383cf3a71da2e9b73a0 Mon Sep 17 00:00:00 2001 From: beguille Date: Fri, 22 Apr 2022 14:22:09 +0200 Subject: [PATCH 016/649] prepared api calls --- frontend/src/utils/api/mail_overview.ts | 21 ++++++++++------ .../MailOverviewPage/MailOverviewPage.tsx | 25 ++++++++++++------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts index 43e45a4be..06feb9028 100644 --- a/frontend/src/utils/api/mail_overview.ts +++ b/frontend/src/utils/api/mail_overview.ts @@ -1,5 +1,6 @@ import { Email, Student } from "../../data/interfaces"; import { ChangeEvent } from "react"; +import { EmailType } from "../../data/enums"; /** * A student together with its email history */ @@ -22,7 +23,12 @@ export async function getMailOverview( edition: string | undefined, page: number ): Promise { - // const response = await axiosInstance.get("/editions/1/emails/"); + // const FormatFilters: number[] = finalFilters.map(filter => { + // return Object.values(EmailType).indexOf(filter); + // }); + // const response = await axiosInstance.get( + // `/editions/${edition}/emails/?page=${page}&first_name=${finalSearch}&email_status=${FormatFilters}` + // ); // return response.data as StudentEmails; console.log(finalFilters); console.log(finalSearch); @@ -86,21 +92,22 @@ export function handleSelectAll(isSelect: boolean, rows: StudentEmail[]) { * Updates the Email state of the currently selected students in the table to the selected state * from the dropdown menu * @param eventKey + * @param edition */ -export function handleSetState(eventKey: string | null) { +export function setStateRequest(eventKey: string | null, edition: string | undefined) { console.log(eventKey); console.log(selectedRows); // TODO do post request with selected data - - // update table contents ? + // const response = await axiosInstance.post(`/editions/${edition}/emails/`, + // {student_ids: selectedRows, email_status: eventKey}); } -let selectedFilters: string[] = []; +let selectedFilters: EmailType[] = []; /** * Keeps track of the selected filters * @param selectedList */ -export function handleFilterSelect(selectedList: string[]) { +export function handleFilterSelect(selectedList: EmailType[]) { selectedFilters = selectedList; } @@ -118,7 +125,7 @@ let finalFilters: string[] = []; let finalSearch: string = ""; /** - * Sets the definitive searchterm and filters to be sent + * Sets the definitive search term and filters to be sent */ export function setFinalFilters() { finalFilters = selectedFilters; diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index 6c7a2e6a0..166b5c9a3 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -4,7 +4,7 @@ import { StudentEmails, handleSelect, handleSelectAll, - handleSetState, + setStateRequest, handleFilterSelect, handleSetSearch, setFinalFilters, @@ -65,6 +65,9 @@ export default function MailOverviewPage() { } }); + /** + * update the table with the search term and filters + */ function handleDoSearch() { setFinalFilters(); setGotData(false); @@ -72,6 +75,17 @@ export default function MailOverviewPage() { updateMailOverview(0); } + /** + * handle selecting a new email state + * @param eventKey + */ + function handleSetState(eventKey: string | null) { + setStateRequest(eventKey, editionId); + setGotData(false); + setMoreEmailsAvailable(true); + updateMailOverview(0); + } + const columns = [ { dataField: "student.firstName", @@ -131,14 +145,7 @@ export default function MailOverviewPage() { isObject={false} onRemove={handleFilterSelect} onSelect={handleFilterSelect} - options={[ - "Applied", - "Awaiting project", - "Approved", - "Contract confirmed", - "Contract declined", - "Rejected", - ]} + options={Object.values(EmailType)} /> From 732c0134e287dc6b59fd13e48d6b08f2f381957c Mon Sep 17 00:00:00 2001 From: beguille Date: Fri, 22 Apr 2022 14:22:49 +0200 Subject: [PATCH 017/649] added comment --- frontend/src/views/MailOverviewPage/MailOverviewPage.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index 166b5c9a3..f25097687 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -40,6 +40,10 @@ export default function MailOverviewPage() { const [moreEmailsAvailable, setMoreEmailsAvailable] = useState(true); // Endpoint has more emails available const { editionId } = useParams(); + /** + * update the table with new values + * @param page + */ async function updateMailOverview(page: number) { try { const studentEmails = await getMailOverview(editionId, page); From 696b21b5cc506b1a0adb890e143dcce4d221931b Mon Sep 17 00:00:00 2001 From: beguille Date: Fri, 22 Apr 2022 15:52:07 +0200 Subject: [PATCH 018/649] update user manual --- files/user_manual.md | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/files/user_manual.md b/files/user_manual.md index 2756901d7..b1f5ec784 100644 --- a/files/user_manual.md +++ b/files/user_manual.md @@ -8,12 +8,42 @@ After you have registered yourself and have been approved by one of the administ There are different ways to log in, depending on the way in which you have registered yourself. **Please note: you can only log in through the method you have registered yourself with.** -## Email +### Email 1. Fill in your email address and password in the corresponding fields. 2. Click the "Log in" button. -## GitHub +### GitHub 1. Click the "Log in" button with the GitHub logo. -## Google +### Google 1. Click the "Log in" button with the Google logo. + + +## Email history of a student + +To view a student's email history (i.e. all the emails that have ever been sent to that student), navigate to the page with the student's details, and click on the "See Email History" button. + +The email history will be shown in a table, with the most recent email at the top. + +## Overview of email states + +The overview of the email states is a table of all students of an edition, together with the most recent email type that has been sent to them. + +This table needs to be manually maintained (i.e. when an email is sent, someone has to update this list). + +### Searching and Filtering + +The overview table allows you to search for a particular student or filter based on one or more email states. + +To search for a student: type (the beginning of) a student's name in the search bar and click on the "search" button. + +To filter based on email states: select one or more states from the list and click on the "search" button. + +These two things (searching and filtering) can also be combined. + +### Updating the email overview + +When a new email is sent to one or more students, the list needs to be updated. + +This can be done by selecting these students in the table, clicking on the "Set state of selected students", and choosing the new email state from the dropdown. + From 894c6879688775ad6fc264a6376e150a519b4ff1 Mon Sep 17 00:00:00 2001 From: cledloof Date: Sun, 24 Apr 2022 16:11:37 +0200 Subject: [PATCH 019/649] progress on students page --- backend/fill_database.py | 297 ++++++++++++++++++ frontend/package.json | 1 + frontend/src/Router.tsx | 3 +- .../StudentInfoComponents/StudentInfo.tsx | 28 ++ .../StudentInformation/StudentInformation.tsx | 79 +++++ .../StudentInformation/styles.ts | 61 ++++ .../AdminDecisionContainer.tsx | 22 ++ .../AdminDecisionContainer/index.ts | 1 + .../CoachSuggestionContainer.tsx | 21 ++ .../CoachSuggestionContainer/index.ts | 1 + .../SuggestionComponents/index.ts | 2 + .../StudentInfoComponents/styles.ts | 16 + .../StudentList/StudentCard/StudentCard.tsx | 56 ++++ .../StudentList/StudentCard/index.ts | 1 + .../StudentList/StudentCard/styles.ts | 86 +++++ .../StudentList/StudentList.tsx | 23 ++ .../StudentsComponents/StudentList/index.ts | 2 + .../StudentsComponents/StudentList/styles.ts | 7 + .../AlumniFilter/AlumniFilter.tsx | 25 ++ .../StudentListFilters/AlumniFilter/index.ts | 1 + .../ApplyFilterButton/ApplyFilterButton.tsx | 6 + .../ApplyFilterButton/index.ts | 1 + .../NameFilter/NameFilter.tsx | 35 +++ .../StudentListFilters/NameFilter/index.ts | 1 + .../ResetFiltersButton/ResetFiltersButton.tsx | 18 ++ .../ResetFiltersButton/index.ts | 1 + .../RolesFilter/RolesFilter.tsx | 50 +++ .../StudentListFilters/RolesFilter/index.ts | 1 + .../StudentCoachVolunteerFilter.tsx | 25 ++ .../StudentCoachVolunteerFilter/index.ts | 1 + .../StudentListFilters/StudentListFilters.css | 4 + .../StudentListFilters/StudentListFilters.tsx | 58 ++++ .../StudentListFilters/index.ts | 7 + .../StudentListFilters/styles.ts | 105 +++++++ .../components/StudentsComponents/index.ts | 3 + frontend/src/data/interfaces/students.ts | 16 + frontend/src/utils/api/students.ts | 34 ++ .../views/StudentInfoPage/StudentInfoPage.tsx | 46 +++ frontend/src/views/StudentInfoPage/index.ts | 1 + frontend/src/views/StudentInfoPage/styles.ts | 1 + .../src/views/StudentsPage/StudentsPage.css | 0 .../src/views/StudentsPage/StudentsPage.tsx | 39 ++- frontend/src/views/StudentsPage/styles.ts | 1 + frontend/yarn.lock | 140 ++++++++- 44 files changed, 1312 insertions(+), 15 deletions(-) create mode 100644 backend/fill_database.py create mode 100644 frontend/src/components/StudentInfoComponents/StudentInfo.tsx create mode 100644 frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx create mode 100644 frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts create mode 100644 frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx create mode 100644 frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/index.ts create mode 100644 frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx create mode 100644 frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/index.ts create mode 100644 frontend/src/components/StudentInfoComponents/SuggestionComponents/index.ts create mode 100644 frontend/src/components/StudentInfoComponents/styles.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentList/StudentCard/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/StudentList.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentList/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/styles.ts create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/ApplyFilterButton.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/styles.ts create mode 100644 frontend/src/components/StudentsComponents/index.ts create mode 100644 frontend/src/data/interfaces/students.ts create mode 100644 frontend/src/utils/api/students.ts create mode 100644 frontend/src/views/StudentInfoPage/StudentInfoPage.tsx create mode 100644 frontend/src/views/StudentInfoPage/index.ts create mode 100644 frontend/src/views/StudentInfoPage/styles.ts delete mode 100644 frontend/src/views/StudentsPage/StudentsPage.css create mode 100644 frontend/src/views/StudentsPage/styles.ts diff --git a/backend/fill_database.py b/backend/fill_database.py new file mode 100644 index 000000000..930e2577a --- /dev/null +++ b/backend/fill_database.py @@ -0,0 +1,297 @@ +from datetime import date +from sqlalchemy.orm import Session + +from src.database.models import (User, AuthEmail, Skill, Student, + Edition, CoachRequest, DecisionEmail, InviteLink, Partner, + Project, ProjectRole, Suggestion) +from src.database.enums import DecisionEnum, EmailStatusEnum +from src.app.logic.security import get_password_hash + + +def fill_database(db: Session): + """A function to fill the database with fake data that can easly be used when testing""" + # Editions + edition: Edition = Edition(year=2022, name="ed2022") + db.add(edition) + db.commit() + + # Users + admin: User = User(name="admin", admin=True) + coach1: User = User(name="coach1") + coach2: User = User(name="coach2") + request: User = User(name="request") + db.add(admin) + db.add(coach1) + db.add(coach2) + db.add(request) + db.commit() + + # AuthEmail + pw_hash = get_password_hash("wachtwoord") + auth_email_admin: AuthEmail = AuthEmail(user=admin, email="admin@ngmail.com", pw_hash=pw_hash) + auth_email_coach1: AuthEmail = AuthEmail(user=coach1, email="coach1@noutlook.be", pw_hash=pw_hash) + auth_email_coach2: AuthEmail = AuthEmail(user=coach2, email="coach2@noutlook.be", pw_hash=pw_hash) + auth_email_request: AuthEmail = AuthEmail(user=request, email="request@ngmail.com", pw_hash=pw_hash) + db.add(auth_email_admin) + db.add(auth_email_coach1) + db.add(auth_email_coach2) + db.add(auth_email_request) + db.commit() + + # Skill + skill1: Skill = Skill(name="skill1", description="something about skill1") + skill2: Skill = Skill(name="skill2", description="something about skill2") + skill3: Skill = Skill(name="skill3", description="something about skill3") + skill4: Skill = Skill(name="skill4", description="something about skill4") + skill5: Skill = Skill(name="skill5", description="something about skill5") + skill6: Skill = Skill(name="skill6", description="something about skill6") + db.add(skill1) + db.add(skill2) + db.add(skill3) + db.add(skill4) + db.add(skill5) + db.add(skill6) + db.commit() + + # Student + student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", + email_address="josvermeulen@mail.com", phone_number="0487/86.24.45", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill1, skill3, skill6]) + student02: Student = Student(first_name="Isabella", last_name="Christensen", preferred_name="Isabella", + email_address="isabella.christensen@example.com", phone_number="98389723", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) + student03: Student = Student(first_name="Lotte", last_name="Buss", preferred_name="Lotte", + email_address="lotte.buss@example.com", phone_number="0284-0749932", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student04: Student = Student(first_name="Délano", last_name="Van Lienden", preferred_name="Délano", + email_address="delano.vanlienden@mail.com", phone_number="128-049-9143", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student05: Student = Student(first_name="Einar", last_name="Rossebø", preferred_name="Einar", + email_address="einar.rossebo@example.com", phone_number="61491822", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) + student06: Student = Student(first_name="Dave", last_name="Johnston", preferred_name="Dave", + email_address="dave.johnston@example.com", phone_number="031-156-2869", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) + student07: Student = Student(first_name="Fernando", last_name="Stone", preferred_name="Fernando", + email_address="fernando.stone@mail.com", phone_number="(441)-156-4776", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student08: Student = Student(first_name="Isabelle", last_name="Singh", preferred_name="Isabelle", + email_address="isabelle.singh@example.com", phone_number="(338)-531-9957", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) + student09: Student = Student(first_name="Blake", last_name="Martin", preferred_name="Blake", + email_address="blake.martin@example.com", phone_number="404-060-5843", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student10: Student = Student(first_name="Mehmet", last_name="Dizdar", preferred_name="Mehmet", + email_address="mehmet.dizdar@example.com", phone_number="(787)-938-6216", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill2]) + student11: Student = Student(first_name="Mehmet", last_name="Balci", preferred_name="Mehmet", + email_address="mehmet.balci@example.com", phone_number="(496)-221-8222", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student12: Student = Student(first_name="Óscar", last_name="das Neves", preferred_name="Óscar", + email_address="oscar.dasneves@example.com", phone_number="(47) 6646-0730", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill4]) + student13: Student = Student(first_name="Melike", last_name="Süleymanoğlu", preferred_name="Melike", + email_address="melike.suleymanoglu@mail.com", phone_number="274-545-3055", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) + student14: Student = Student(first_name="Magnus", last_name="Schanke", preferred_name="Magnus", + email_address="magnus.schanke@example.com", phone_number="63507430", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) + student15: Student = Student(first_name="Tara", last_name="Howell", preferred_name="Tara", + email_address="tara.howell@example.com", phone_number="07-9111-0958", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student16: Student = Student(first_name="Hanni", last_name="Ewers", preferred_name="Hanni", + email_address="hanni.ewers@example.com", phone_number="0241-5176890", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill1, skill6, skill5]) + student17: Student = Student(first_name="آیناز", last_name="کریمی", preferred_name="آیناز", + email_address="aynz.khrymy@example.com", phone_number="009-26345191", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) + student18: Student = Student(first_name="Vicente", last_name="Garrido", preferred_name="Vicente", + email_address="vicente.garrido@example.com", phone_number="987-381-670", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student19: Student = Student(first_name="Elmer", last_name="Morris", preferred_name="Elmer", + email_address="elmer.morris@example.com", phone_number="(611)-832-8108", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student20: Student = Student(first_name="Alexis", last_name="Roy", preferred_name="Alexis", + email_address="alexis.roy@example.com", phone_number="566-546-7642", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student21: Student = Student(first_name="Lillie", last_name="Kelly", preferred_name="Lillie", + email_address="lillie.kelly@example.com", phone_number="(983)-560-1392", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student22: Student = Student(first_name="Karola", last_name="Andersen", preferred_name="Karola", + email_address="karola.andersen@example.com", phone_number="0393-3219328", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student23: Student = Student(first_name="Elvine", last_name="Andvik", preferred_name="Elvine", + email_address="elvine.andvik@example.com", phone_number="30454610", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) + student24: Student = Student(first_name="Chris", last_name="Kelly", preferred_name="Chris", + email_address="chris.kelly@example.com", phone_number="061-399-0053", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill4]) + student25: Student = Student(first_name="Aada", last_name="Pollari", preferred_name="Aada", + email_address="aada.pollari@example.com", phone_number="02-908-609", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student26: Student = Student(first_name="Sofia", last_name="Haataja", preferred_name="Sofia", + email_address="sofia.haataja@example.com", phone_number="06-373-889", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student27: Student = Student(first_name="Charlene", last_name="Gregory", preferred_name="Charlene", + email_address="charlene.gregory@mail.com", phone_number="(991)-378-7095", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student28: Student = Student(first_name="Danielle", last_name="Chavez", preferred_name="Danielle", + email_address="danielle.chavez@example.com", phone_number="01435 91142", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student29: Student = Student(first_name="Nikolaj", last_name="Poulsen", preferred_name="Nikolaj", + email_address="nikolaj.poulsen@example.com", phone_number="20525141", alumni=False, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student30: Student = Student(first_name="Marta", last_name="Marquez", preferred_name="Marta", + email_address="marta.marquez@example.com", phone_number="967-895-285", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + student31: Student = Student(first_name="Gül", last_name="Barbarosoğlu", preferred_name="Gül", + email_address="gul.barbarosoglu@mail.com", phone_number="(008)-316-3264", alumni=True, + wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) + + db.add(student01) + db.add(student02) + db.add(student03) + db.add(student04) + db.add(student05) + db.add(student06) + db.add(student07) + db.add(student08) + db.add(student09) + db.add(student10) + db.add(student11) + db.add(student12) + db.add(student13) + db.add(student14) + db.add(student15) + db.add(student16) + db.add(student17) + db.add(student18) + db.add(student19) + db.add(student20) + db.add(student21) + db.add(student22) + db.add(student23) + db.add(student24) + db.add(student25) + db.add(student26) + db.add(student27) + db.add(student28) + db.add(student29) + db.add(student30) + db.add(student31) + db.commit() + + # CoachRequest + coach_request: CoachRequest = CoachRequest(edition=edition, user=request) + db.add(coach_request) + db.commit() + + # DecisionEmail + decision_email1: DecisionEmail = DecisionEmail( + decision=EmailStatusEnum.REJECTED, student=student29, date=date.today()) + decision_email2: DecisionEmail = DecisionEmail( + decision=EmailStatusEnum.APPROVED, student=student09, date=date.today()) + decision_email3: DecisionEmail = DecisionEmail( + decision=EmailStatusEnum.APPROVED, student=student10, date=date.today()) + decision_email4: DecisionEmail = DecisionEmail( + decision=EmailStatusEnum.APPROVED, student=student11, date=date.today()) + decision_email5: DecisionEmail = DecisionEmail( + decision=EmailStatusEnum.APPROVED, student=student12, date=date.today()) + decision_email6: DecisionEmail = DecisionEmail( + decision=EmailStatusEnum.AWAITING_PROJECT, student=student06, date=date.today()) + decision_email7: DecisionEmail = DecisionEmail( + decision=EmailStatusEnum.AWAITING_PROJECT, student=student26, date=date.today()) + db.add(decision_email1) + db.add(decision_email2) + db.add(decision_email3) + db.add(decision_email4) + db.add(decision_email5) + db.add(decision_email6) + db.add(decision_email7) + db.commit() + + # InviteLink + invite_link1: InviteLink = InviteLink( + target_email="newuser1@email.com", edition=edition) + invite_link2: InviteLink = InviteLink( + target_email="newuser2@email.com", edition=edition) + db.add(invite_link1) + db.add(invite_link2) + db.commit() + + # Partner + partner1: Partner = Partner(name="Partner1") + partner2: Partner = Partner(name="Partner2") + partner3: Partner = Partner(name="Partner3") + db.add(partner1) + db.add(partner2) + db.add(partner3) + db.commit() + + # Project + project1: Project = Project( + name="project1", number_of_students=3, edition=edition, partners=[partner1]) + project2: Project = Project( + name="project2", number_of_students=6, edition=edition, partners=[partner2]) + project3: Project = Project( + name="project3", number_of_students=2, edition=edition, partners=[partner3]) + project4: Project = Project( + name="project4", number_of_students=9, edition=edition, partners=[partner1, partner3]) + db.add(project1) + db.add(project2) + db.add(project3) + db.add(project4) + db.commit() + + # Suggestion + suggestion1: Suggestion = Suggestion( + student=student01, coach=coach1, argumentation="Good student", suggestion=DecisionEnum.YES) + suggestion2: Suggestion = Suggestion( + student=student01, coach=coach2, argumentation="Good student", suggestion=DecisionEnum.YES) + suggestion3: Suggestion = Suggestion( + student=student12, coach=coach1, argumentation="Not a good student", suggestion=DecisionEnum.NO) + suggestion4: Suggestion = Suggestion( + student=student03, coach=coach2, argumentation="Maybe a student", suggestion=DecisionEnum.MAYBE) + suggestion5: Suggestion = Suggestion( + student=student04, coach=coach1, argumentation="Not a good student", suggestion=DecisionEnum.NO) + suggestion6: Suggestion = Suggestion( + student=student13, coach=coach1, argumentation="Good student", suggestion=DecisionEnum.YES) + suggestion7: Suggestion = Suggestion( + student=student01, coach=admin, argumentation="Not a good student", suggestion=DecisionEnum.NO) + suggestion8: Suggestion = Suggestion( + student=student12, coach=admin, argumentation="Good student", suggestion=DecisionEnum.YES) + db.add(suggestion1) + db.add(suggestion2) + db.add(suggestion3) + db.add(suggestion4) + db.add(suggestion5) + db.add(suggestion6) + db.add(suggestion7) + db.add(suggestion8) + db.commit() + + # ProjectRole + project_role1: ProjectRole = ProjectRole( + student=student01, project=project1, skill=skill1, drafter=coach1, argumentation="argmunet") + project_role2: ProjectRole = ProjectRole( # This brings a confict + student=student01, project=project2, skill=skill2, drafter=coach2, argumentation="argmunet") + project_role3: ProjectRole = ProjectRole( + student=student09, project=project2, skill=skill3, drafter=coach1, argumentation="argmunet") + project_role3: ProjectRole = ProjectRole( + student=student05, project=project1, skill=skill4, drafter=coach1, argumentation="argmunet") + project_role4: ProjectRole = ProjectRole( + student=student25, project=project3, skill=skill5, drafter=coach1, argumentation="argmunet") + project_role5: ProjectRole = ProjectRole( + student=student29, project=project3, skill=skill6, drafter=coach1, argumentation="argmunet") + project_role6: ProjectRole = ProjectRole( + student=student03, project=project4, skill=skill5, drafter=coach1, argumentation="argmunet") + project_role7: ProjectRole = ProjectRole( + student=student13, project=project4, skill=skill4, drafter=coach1, argumentation="argmunet") + db.add(project_role1) + db.add(project_role2) + db.add(project_role3) + db.add(project_role4) + db.add(project_role5) + db.add(project_role6) + db.add(project_role7) + db.commit() diff --git a/frontend/package.json b/frontend/package.json index 5b835baaf..46d9aed4a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -16,6 +16,7 @@ "react-router-bootstrap": "^0.26.1", "react-router-dom": "^6.2.1", "react-scripts": "^5.0.0", + "react-select": "^5.3.0", "react-social-login-buttons": "^3.6.0", "styled-components": "^5.3.3", "typescript": "^4.4.2", diff --git a/frontend/src/Router.tsx b/frontend/src/Router.tsx index a275eebae..21e3b413f 100644 --- a/frontend/src/Router.tsx +++ b/frontend/src/Router.tsx @@ -16,6 +16,7 @@ import { import { ForbiddenPage, NotFoundPage } from "./views/errors"; import CreateEditionPage from "./views/CreateEditionPage"; import { Role } from "./data/enums"; +import StudentInfoPage from "./views/StudentInfoPage"; /** * Router component to render different pages depending on the current url. Renders @@ -73,7 +74,7 @@ export default function Router() { {/* Students routes */} } /> {/* TODO student page */} - } /> + } /> {/* TODO student emails page */} } /> diff --git a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx new file mode 100644 index 000000000..d5bf254d5 --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx @@ -0,0 +1,28 @@ +import React from "react"; +import { StudentListFilters } from "../StudentsComponents"; +import StudentInformation from "./StudentInformation/StudentInformation"; +import { StudentRemoveButton, StudentInfoPageContent } from "./styles"; +import {Student} from "../../data/interfaces/students"; + +interface Props { + students: Student[]; + currentStudent: Student; + nameFilter: string; + setNameFilter: (value: string) => void; + rolesFilter: number[]; + setRolesFilter: (value: number[]) => void; + alumniFilter: boolean; + setAlumniFilter: (value: boolean) => void; + studentCoachVolunteerFilter: boolean; + setStudentCoachVolunteerFilter: (value: boolean) => void; +} + +export default function StudentInfo(props: Props) { + return ( + + + Remove Student + + + ); +} diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx new file mode 100644 index 000000000..0c5e812b0 --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -0,0 +1,79 @@ +import React, {useEffect} from "react"; +import { + FullName, + FirstName, + LastName, + LineBreak, + PreferedName, + StudentInfoTitle, + Suggestion, + StudentInformationContainer, + PersonalInfoField, + PersonalInfoFieldValue, + RolesField, + RolesValues, + Role, +} from "./styles"; +import { AdminDecisionContainer, CoachSuggestionContainer } from "../SuggestionComponents"; +import {Student} from "../../../data/interfaces/students"; + +interface Props { + currentStudent: Student; +} + +export default function StudentInformation(props: Props) { + + useEffect(() => { + console.log(props) + }, [props]); + + return ( + + + "Riley" + "Pacocha" + + Prefered name: "Rey" + + Suggestions + + Wow this student is really incredible! We should give her a project! + + + Wow this student is really incredible! We should give her a project! + + + Wow this student is really incredible! We should give her a project! + + + Personal information + + Email riley.pacocha@test.com + + + Phone number 0123 456 789 + + + Is an alumni? Yes + + + Wants to be student coach? Yes + + + Skills + + Roles: + + Frontend + Design + Communication + + + +
+ + +
+ + ); +} diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts new file mode 100644 index 000000000..5900d72fb --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -0,0 +1,61 @@ +import styled from "styled-components"; + +export const StudentInformationContainer = styled.div` + padding: 20px; +`; + +export const FullName = styled.div` + display: flex; +`; + +export const FirstName = styled.h1` + padding-right: 10px; + color: var(--osoc_orange); +`; + +export const LastName = styled.h1` + color: var(--osoc_orange); +`; + +export const PreferedName = styled.p` + font-size: 20px; +`; + +export const StudentInfoTitle = styled.h4` + color: var(--osoc_orange); +`; + +export const Suggestion = styled.p` + font-size: 20px; +`; + +export const PersonalInfoField = styled.p` + display: flex; +`; + +export const PersonalInfoFieldValue = styled.p` + position: absolute; + margin-left: 250px; +`; + +export const RolesField = styled.div` + display: flex; +`; + +export const RolesValues = styled.ul` + margin-left: 5%; +`; + +export const Role = styled.li``; + +export const LineBreak = styled.div` + background-color: #163542; + height: 3px; + width: 420px; + margin-bottom: 30px; + margin-top: 30px; +`; + +export const DefinitiveDecisionContainer = styled.div` + width: 40%; +`; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx new file mode 100644 index 000000000..e15249fa6 --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -0,0 +1,22 @@ +import React from "react"; +import { Button, Form } from "react-bootstrap"; +import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; + +export default function AdminDecisionContainer() { + return ( +
+

Definitive decision by admin

+ + + + + + + + + +
+ ); +} diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/index.ts b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/index.ts new file mode 100644 index 000000000..cc355e060 --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/index.ts @@ -0,0 +1 @@ +export { default } from "./AdminDecisionContainer"; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx new file mode 100644 index 000000000..11339ba16 --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx @@ -0,0 +1,21 @@ +import React from "react"; +import { Button, ButtonGroup } from "react-bootstrap"; + +export default function CoachSuggestionContainer() { + return ( +
+

Make a suggestion on this student

+ + + + + +
+ ); +} diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/index.ts b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/index.ts new file mode 100644 index 000000000..fd6e1cdc7 --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/index.ts @@ -0,0 +1 @@ +export { default } from "./CoachSuggestionContainer"; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/index.ts b/frontend/src/components/StudentInfoComponents/SuggestionComponents/index.ts new file mode 100644 index 000000000..0c2fa27fb --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/index.ts @@ -0,0 +1,2 @@ +export { default as AdminDecisionContainer } from "./AdminDecisionContainer"; +export { default as CoachSuggestionContainer } from "./CoachSuggestionContainer"; diff --git a/frontend/src/components/StudentInfoComponents/styles.ts b/frontend/src/components/StudentInfoComponents/styles.ts new file mode 100644 index 000000000..b8c822ed1 --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/styles.ts @@ -0,0 +1,16 @@ +import styled from "styled-components"; + +export const StudentRemoveButton = styled.button` + position: absolute; + width: 150px; + height: 35px; + right: 5%; + top: 12%; + color: white; + background-color: var(--osoc_red); + border: 4px solid var(--osoc_red); +`; + +export const StudentInfoPageContent = styled.div` + display: flex; +`; diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx new file mode 100644 index 000000000..7b1285a6f --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx @@ -0,0 +1,56 @@ +import React from "react"; +import { + CardStudent, + CardStudentInfo, + CardVerticalContainer, + CardHorizontalContainer, + CardSuggestionBar, + CardStudentName, + CardAmountSuggestions, + AllSuggestions, + SuggestionSignYes, + SuggestionSignMaybe, + SuggestionSignNo +} from "./styles"; +import { useNavigate } from "react-router-dom"; +import {NrSuggestions} from "../../../../data/interfaces/students"; + +interface Props { + firstName: string; + nrOfSuggestions: NrSuggestions; + studentId: number; +} + +export default function StudentCard(props: Props) { + const navigate = useNavigate(); + + return ( + <> + navigate(`/editions/2022/students/${props.studentId}`)}> + {/* */} + + + + {props.firstName} + + V + + {props.nrOfSuggestions.yes} + + ? + + {props.nrOfSuggestions.maybe} + + X + + {props.nrOfSuggestions.no} + + + + + + + + + ); +} diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/index.ts b/frontend/src/components/StudentsComponents/StudentList/StudentCard/index.ts new file mode 100644 index 000000000..1ec94794f --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/index.ts @@ -0,0 +1 @@ +export { default } from "./StudentCard"; diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts new file mode 100644 index 000000000..b64a2feef --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts @@ -0,0 +1,86 @@ +import styled from "styled-components"; + +export const CardStudent = styled.div` + display: flex; + flex-direction: row; + margin: 10px; + &:hover { + cursor: pointer; + } + background-color: #15343f; + border-radius: 15px; + border: 1px solid #15202b; +`; + +export const CardConfirmColorBlock = styled.div` + position: sticky; + height: 75px; + background-color: var(--osoc_green); + border: 1px solid var(--osoc_green); + width: 30px; + z-index: 1; +`; + +export const CardSuggestionBar = styled.div` + height: 2px; + width: 90%; + background: var(--osoc_green); + margin-left: 5%; + margin-bottom: 15px; +`; + +export const CardStudentInfo = styled.div` + display: flex; + width: 100%; + min-height: 75px; + flex-direction: row; +`; + +export const CardVerticalContainer = styled.div` + width: 100%; + display: flex; + flex-direction: column; + margin-top: 11px; +`; + +export const CardHorizontalContainer = styled.div` + display: flex; + width: 100%; + flex-direction: row; +`; + +export const CardStudentName = styled.p` + width: 80%; + font-size: 20px; + margin-left: 5%; +`; + +export const CardAmountSuggestions = styled.p` + font-size: 20px; + margin-right: 10px; +`; + +export const SuggestionSignYes = styled.p` + font-size: 20px; + margin-right: 3px; + color: var(--osoc_green) +`; + +export const SuggestionSignMaybe = styled.p` + font-size: 20px; + margin-right: 3px; + color: var(--osoc_orange) +`; + +export const SuggestionSignNo = styled.p` + font-size: 20px; + margin-right: 3px; + color: var(--osoc_red); +`; + +export const AllSuggestions = styled.div` + display: flex; + width: fit-content; + flex-direction: row; + margin-right: 2%; +`; diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx new file mode 100644 index 000000000..19b43aa9f --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx @@ -0,0 +1,23 @@ +import React from "react"; +import { StudentCard } from "../index"; +import { StudentCardsList } from "./styles"; +import {Student} from "../../../data/interfaces/students"; + +interface Props { + students: Student[]; +} + +export default function StudentList(props: Props) { + return ( + + {props.students.map(student => ( + + ))} + + ); +} diff --git a/frontend/src/components/StudentsComponents/StudentList/index.ts b/frontend/src/components/StudentsComponents/StudentList/index.ts new file mode 100644 index 000000000..307a2dade --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/index.ts @@ -0,0 +1,2 @@ +export { default as StudentCard } from "./StudentCard"; +export { default } from "./StudentList"; diff --git a/frontend/src/components/StudentsComponents/StudentList/styles.ts b/frontend/src/components/StudentsComponents/StudentList/styles.ts new file mode 100644 index 000000000..3f240f5a8 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/styles.ts @@ -0,0 +1,7 @@ +import styled from "styled-components"; + +export const StudentCardsList = styled.div` + height: 60%; + overflow-y: scroll; + border-bottom: 1px solid white; +`; diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx new file mode 100644 index 000000000..58b7f96f7 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx @@ -0,0 +1,25 @@ +import { Form } from "react-bootstrap"; +import React from "react"; + +export default function AlumniFilter({ + alumniFilter, + setAlumniFilter, +}: { + alumniFilter: boolean; + setAlumniFilter: (value: boolean) => void; +}) { + return ( +
+ { + setAlumniFilter(e.target.checked); + e.target.checked = alumniFilter; + }} + /> +
+ ); +} diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/index.ts b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/index.ts new file mode 100644 index 000000000..93675ced5 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/index.ts @@ -0,0 +1 @@ +export { default } from "./AlumniFilter"; diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/ApplyFilterButton.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/ApplyFilterButton.tsx new file mode 100644 index 000000000..ad40fb9d9 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/ApplyFilterButton.tsx @@ -0,0 +1,6 @@ +import React from "react"; +import { FilterApplyButton } from "../styles"; + +export default function ApplyFilterButton() { + return Apply; +} diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/index.ts b/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/index.ts new file mode 100644 index 000000000..388f9c077 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/index.ts @@ -0,0 +1 @@ +export { default } from "./ApplyFilterButton"; diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx new file mode 100644 index 000000000..5b08625c7 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx @@ -0,0 +1,35 @@ +import React from "react"; +import { + FilterStudentName, + FilterStudentNameInputContainer, + FilterStudentNameLabel, + FilterStudentNameLabelContainer, +} from "../styles"; +import { Form } from "react-bootstrap"; + +export default function NameFilter({ + nameFilter, + setNameFilter, +}: { + nameFilter: string; + setNameFilter: (value: string) => void; +}) { + return ( + + + Search: + + + { + setNameFilter(e.target.value); + }} + /> + + + ); +} diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/index.ts b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/index.ts new file mode 100644 index 000000000..a5e14d8f0 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/index.ts @@ -0,0 +1 @@ +export { default } from "./NameFilter"; diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx new file mode 100644 index 000000000..dc8e923ad --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx @@ -0,0 +1,18 @@ +import React from "react"; +import { FilterResetButton } from "../styles"; + +interface Props { + setNameFilter: (name: string) => void; + setAlumniFilter: (alumni: boolean) => void; + setStudentCoachVolunteerFilter: (studentCoachVolunteer: boolean) => void; +} + +export default function ResetFiltersButton(props: Props) { + function resetFilters() { + props.setNameFilter(""); + props.setAlumniFilter(false); + props.setStudentCoachVolunteerFilter(false); + } + + return resetFilters()}>Reset filters; +} diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/index.ts b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/index.ts new file mode 100644 index 000000000..185d4dd2b --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/index.ts @@ -0,0 +1 @@ +export { default } from "./ResetFiltersButton"; diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx new file mode 100644 index 000000000..af52bd601 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -0,0 +1,50 @@ +import React from "react"; +import { + FilterRoles, + FilterRolesDropdownContainer, + FilterRolesLabel, + FilterRolesLabelContainer, +} from "../styles"; +import Select from "react-select"; + +export default function RolesFilter({ + rolesFilter, + setRolesFilter, +}: { + rolesFilter: number[]; + setRolesFilter: (value: number[]) => void; +}) { + const roles = [ + { value: 0, label: "Frontend" }, + { value: 1, label: "Backend" }, + { value: 2, label: "Communication" }, + ]; + + function handleRolesChange( + clickedRoles: () => IterableIterator<{ value: number; label: string }> + ): void { + const newRoles: number[] = []; + for (const role of roles) { + newRoles.push(role.value); + } + setRolesFilter(newRoles); + console.log(rolesFilter); + } + + return ( + + + Roles: + + + { + const newProject: Project = { ...project, name: e.target.value }; + setEditedProject(newProject); + }} + > + )} + {!editing ? ( + setEditing(true)} /> + ) : ( + <> + { + await editProject(); + setEditing(false); + }} + > + Save + + setEditing(false)}>Cancel + + )} + {project.partners.map((element, _index) => ( diff --git a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts index 914cfd91b..caa06c32a 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts +++ b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts @@ -8,15 +8,40 @@ export const GoBack = styled.div` display: flex; align-items: center; margin-bottom: 5px; + max-width: max-content; :hover { cursor: pointer; } `; +export const TitleContainer = styled.div` + display: flex; + align-items: center; +`; + export const Title = styled.h2` text-overflow: ellipsis; overflow: hidden; + margin-right: 10px; +`; + +export const Save = styled.button` + padding: 5px 10px; + background-color: #44dba4; + color: white; + border: none; + margin-left: 5px; + border-radius: 5px; +`; + +export const Cancel = styled.button` + padding: 5px 10px; + background-color: #131329; + color: white; + border: none; + margin-left: 5px; + border-radius: 5px; `; export const ClientContainer = styled.div` diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index 1fe9daae8..91bb9d3ce 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -126,7 +126,7 @@ export default function ProjectPage() { - {moreProjectsAvailable && ( + {moreProjectsAvailable && !loading && ( { diff --git a/frontend/src/views/projectViews/ProjectsPage/styles.ts b/frontend/src/views/projectViews/ProjectsPage/styles.ts index 75f3b4804..ab42af1e9 100644 --- a/frontend/src/views/projectViews/ProjectsPage/styles.ts +++ b/frontend/src/views/projectViews/ProjectsPage/styles.ts @@ -53,5 +53,5 @@ export const LoadMoreButton = styled.button` border: 0px; padding: 5px 10px; color: white; - background-color: gray; + background-color: #131329; `; From 48551dfd414e1d97d072f7cca32c983962ebbeaa Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Tue, 3 May 2022 21:56:32 +0200 Subject: [PATCH 066/649] delete project on project detail page --- .../ProjectDetailPage/ProjectDetailPage.tsx | 33 ++++++++++++++++++- .../projectViews/ProjectDetailPage/styles.ts | 17 ++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 3df5609a8..4d0e5f7c8 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { useNavigate, useParams } from "react-router-dom"; import { Project } from "../../../data/interfaces"; -import { getProject, patchProject } from "../../../utils/api/projects"; +import { deleteProject, getProject, patchProject } from "../../../utils/api/projects"; import { GoBack, ProjectContainer, @@ -13,6 +13,7 @@ import { TitleContainer, Save, Cancel, + Delete, } from "./styles"; import { BiArrowBack } from "react-icons/bi"; @@ -26,6 +27,10 @@ import { CoachesContainer, CoachText, } from "../../../components/ProjectsComponents/ProjectCard/styles"; +import { Role } from "../../../data/enums/role"; +import { useAuth } from "../../../contexts"; +import { HiOutlineTrash } from "react-icons/hi"; +import ConfirmDelete from "../../../components/ProjectsComponents/ConfirmDelete"; /** * @returns the detailed page of a project. Here you can add or remove students from the project. @@ -41,10 +46,24 @@ export default function ProjectDetailPage() { const navigate = useNavigate(); + const { role } = useAuth(); + const [students, setStudents] = useState([]); const [editing, setEditing] = useState(false); + // Used for the confirm screen. + const [show, setShow] = useState(false); + const handleClose = () => setShow(false); + const handleShow = () => setShow(true); + + // What to do when deleting a project. + const handleDelete = () => { + deleteProject(project!.editionName, project!.projectId); + setShow(false); + navigate("/editions/" + editionId + "/projects/"); + }; + useEffect(() => { async function callProjects(): Promise { if (projectId) { @@ -116,8 +135,20 @@ export default function ProjectDetailPage() { setEditing(false)}>Cancel )} + {role === Role.ADMIN && ( + + + + )} + + {project.partners.map((element, _index) => ( {element.name} diff --git a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts index caa06c32a..2c4d0364b 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts +++ b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts @@ -27,7 +27,8 @@ export const Title = styled.h2` `; export const Save = styled.button` - padding: 5px 10px; + padding: 2px 10px; + max-height: 30px; background-color: #44dba4; color: white; border: none; @@ -36,7 +37,8 @@ export const Save = styled.button` `; export const Cancel = styled.button` - padding: 5px 10px; + padding: 2px 10px; + max-height: 30px; background-color: #131329; color: white; border: none; @@ -44,6 +46,17 @@ export const Cancel = styled.button` border-radius: 5px; `; +export const Delete = styled.button` + background-color: #f14a3b; + padding: 5px 5px; + border: 0; + border-radius: 1px; + max-height: 30; + margin-left: 5px; + display: flex; + align-items: center; +`; + export const ClientContainer = styled.div` display: flex; align-items: center; From f4cb5e7c596858fc30d0f8b989f58a34970f94e0 Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 4 May 2022 00:07:26 +0200 Subject: [PATCH 067/649] editionId + api call --- frontend/src/utils/api/students.ts | 4 ++-- frontend/src/views/StudentInfoPage/StudentInfoPage.tsx | 4 ++-- frontend/src/views/StudentsPage/StudentsPage.tsx | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/src/utils/api/students.ts b/frontend/src/utils/api/students.ts index 4f984fdaf..bb0233ecd 100644 --- a/frontend/src/utils/api/students.ts +++ b/frontend/src/utils/api/students.ts @@ -45,7 +45,7 @@ export async function removeStudent(edition: string, studentId: string){ } } -/* export async function makeSuggestion(edition: string, studentId: string, suggestionArg: number, argumentationArg: string){ +export async function makeSuggestion(edition: string, studentId: string, suggestionArg: number, argumentationArg: string){ try { const request = "/editions/" + edition + "/students/" + studentId.toString() + "/suggestions" const response = await axiosInstance.post(request, { suggestion: suggestionArg, argumentation: argumentationArg }); @@ -57,4 +57,4 @@ export async function removeStudent(edition: string, studentId: string){ throw error; } } -} */ +} diff --git a/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx b/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx index 8ce762055..7ceab2fe8 100644 --- a/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx +++ b/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx @@ -14,7 +14,7 @@ function StudentInfoPage() { const [currentStudent, setCurrentStudent] = useState(); async function callGetStudents() { try { - const response = await getStudents("OSOC_2022", nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); + const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); setStudents(response.students); } catch (error) { console.log(error); @@ -23,7 +23,7 @@ function StudentInfoPage() { async function callGetStudent() { try { - const response = await getStudent("OSOC_2022", params.id!); + const response = await getStudent(params.editionId!, params.id!); setCurrentStudent(response) } catch (error) { console.log(error); diff --git a/frontend/src/views/StudentsPage/StudentsPage.tsx b/frontend/src/views/StudentsPage/StudentsPage.tsx index 976c30625..afbf82b75 100644 --- a/frontend/src/views/StudentsPage/StudentsPage.tsx +++ b/frontend/src/views/StudentsPage/StudentsPage.tsx @@ -2,8 +2,10 @@ import React, { useEffect, useState } from "react"; import { StudentListFilters } from "../../components/StudentsComponents"; import { getStudents } from "../../utils/api/students"; import {Student} from "../../data/interfaces/students"; +import {useParams} from "react-router-dom"; function StudentsPage() { + const params = useParams() const [students, setStudents] = useState([]); const [nameFilter, setNameFilter] = useState(""); const [rolesFilter, setRolesFilter] = useState([]); @@ -12,7 +14,7 @@ function StudentsPage() { async function callGetStudents() { try { - const response = await getStudents("OSOC_2022", nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); + const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); if (response) { setStudents(response.students); } From 7816464d04235e03a5d85678897da627638f8ce9 Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 4 May 2022 05:31:10 +0200 Subject: [PATCH 068/649] all suggestion and confirm logic + popups --- .../RemoveStudentButton.tsx | 2 +- .../StudentInfoComponents/StudentInfo.tsx | 2 - .../StudentInformation/styles.ts | 2 +- .../AdminDecisionContainer.tsx | 64 ++++++++++++++++--- .../AdminDecisionContainer/styles.ts | 15 +++++ .../CoachSuggestionContainer.tsx | 33 ++++++++-- .../StudentInfoComponents/styles.ts | 1 - .../StudentList/StudentCard/StudentCard.tsx | 28 ++------ .../StudentList/StudentCard/styles.ts | 8 --- .../SuggestionProgressBar.tsx | 34 ++++++++++ .../SuggestionProgressBar/index.ts | 1 + .../SuggestionProgressBar/styles.ts | 7 ++ frontend/src/data/interfaces/suggestions.ts | 23 +++++++ frontend/src/utils/api/suggestions.ts | 29 +++++++++ 14 files changed, 199 insertions(+), 50 deletions(-) create mode 100644 frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts create mode 100644 frontend/src/data/interfaces/suggestions.ts create mode 100644 frontend/src/utils/api/suggestions.ts diff --git a/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx b/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx index e5d93dfd5..750d6fc52 100644 --- a/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx +++ b/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx @@ -10,7 +10,7 @@ export default function RemoveStudentButton() { function handleRemoveStudent() { removeStudent(params.editionId!, params.id!) - navigate(`/editions/2022/students/`) + navigate(`/editions/${params.editionId}/students/`) } return ( diff --git a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx index f9e601627..1099c7543 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx @@ -3,7 +3,6 @@ import { StudentListFilters } from "../StudentsComponents"; import StudentInformation from "./StudentInformation/StudentInformation"; import { StudentInfoPageContent } from "./styles"; import {Student} from "../../data/interfaces/students"; -import RemoveStudentButton from "./RemoveStudentButton/RemoveStudentButton"; interface Props { students: Student[]; @@ -22,7 +21,6 @@ export default function StudentInfo(props: Props) { return ( - ); diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index 6d816ef4b..994713758 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -25,7 +25,7 @@ export const StudentInfoTitle = styled.h4` color: var(--osoc_orange); `; -export const Suggestion = styled.p` +export const SuggestionField = styled.p` font-size: 20px; `; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx index e15249fa6..bad5b8c2f 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -1,19 +1,65 @@ -import React from "react"; -import { Button, Form } from "react-bootstrap"; +import React, {useState} from "react"; +import {Button, Modal} from "react-bootstrap"; import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; +import { SuggestionButtons, ConfirmButton } from "./styles"; export default function AdminDecisionContainer() { + const [show, setShow] = useState(false); + const [clickedButtonText, setClickedButtonText] = useState("") + function handleClose(){ + setShow(false) + setClickedButtonText("") + } + function handleShow(event: React.MouseEvent) { + event.preventDefault(); + setShow(true); + } + + function handleClick(event: React.MouseEvent) { + event.preventDefault(); + const button: HTMLButtonElement = event.currentTarget; + setClickedButtonText(button.innerText) + } + return (
+ + + Definitive decision on student + + Click on one of the buttons to mark your decision + + ) => handleClick(e)}> + Yes + + ) => handleClick(e)}> + Maybe + + ) => handleClick(e)}> + No + + + + + +
+ { clickedButtonText? ( + + ) : ( + + )} +
+ +

Definitive decision by admin

- - - - - - - diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts new file mode 100644 index 000000000..414eba1ad --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts @@ -0,0 +1,15 @@ +import styled from "styled-components"; +import {Button} from "react-bootstrap"; + +export const SuggestionButtons = styled.div` + display: flex; + flex-direction: row; + width: 100%; + margin-top: 2%; +`; + +export const ConfirmButton = styled(Button)` + width: 29.33%; + margin-left: 2%; + margin-right: 2%; +`; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx index 4c696ec56..122f5014a 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx @@ -1,16 +1,21 @@ import {Button, ButtonGroup, Form, Modal} from "react-bootstrap"; import React, { useState } from "react"; import {Student} from "../../../../data/interfaces/students"; +import {makeSuggestion} from "../../../../utils/api/students"; +import {useParams} from "react-router-dom"; interface Props { student: Student; } export default function CoachSuggestionContainer(props: Props) { + const params = useParams() const [show, setShow] = useState(false); + const [argumentation, setArgumentation] = useState(""); const [clickedButtonText, setClickedButtonText] = useState("") const handleClose = () => setShow(false); + function handleShow(event: React.MouseEvent) { event.preventDefault(); const button: HTMLButtonElement = event.currentTarget; @@ -18,6 +23,20 @@ export default function CoachSuggestionContainer(props: Props) { setShow(true); } + function doSuggestion() { + let suggestionNum: number = 0 + if (clickedButtonText === "Yes") { + suggestionNum = 1; + } else if (clickedButtonText === "Maybe") { + suggestionNum = 2; + } else { + suggestionNum = 3; + } + makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation) + setArgumentation("") + setShow(false) + } + return (
@@ -26,16 +45,20 @@ export default function CoachSuggestionContainer(props: Props) { Why are you giving this decision for this student? + type="text" + name="nameFilter" + value={argumentation} + onChange={e => { + setArgumentation(e.target.value); + }} + placeholder="Place your argumentation here..."/> * This field isn't required - @@ -54,4 +77,4 @@ export default function CoachSuggestionContainer(props: Props) {
); -} +} \ No newline at end of file diff --git a/frontend/src/components/StudentInfoComponents/styles.ts b/frontend/src/components/StudentInfoComponents/styles.ts index b8c822ed1..ee8d68c10 100644 --- a/frontend/src/components/StudentInfoComponents/styles.ts +++ b/frontend/src/components/StudentInfoComponents/styles.ts @@ -1,7 +1,6 @@ import styled from "styled-components"; export const StudentRemoveButton = styled.button` - position: absolute; width: 150px; height: 35px; right: 5%; diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx index 7b1285a6f..66054d1b4 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx @@ -4,16 +4,11 @@ import { CardStudentInfo, CardVerticalContainer, CardHorizontalContainer, - CardSuggestionBar, CardStudentName, - CardAmountSuggestions, - AllSuggestions, - SuggestionSignYes, - SuggestionSignMaybe, - SuggestionSignNo } from "./styles"; -import { useNavigate } from "react-router-dom"; +import {useNavigate, useParams} from "react-router-dom"; import {NrSuggestions} from "../../../../data/interfaces/students"; +import SuggestionProgressBar from "../SuggestionProgressBar"; interface Props { firstName: string; @@ -22,32 +17,19 @@ interface Props { } export default function StudentCard(props: Props) { + const params = useParams() const navigate = useNavigate(); return ( <> - navigate(`/editions/2022/students/${props.studentId}`)}> + navigate(`/editions/${params.editionId}/students/${props.studentId}`)}> {/* */} {props.firstName} - - V - - {props.nrOfSuggestions.yes} - - ? - - {props.nrOfSuggestions.maybe} - - X - - {props.nrOfSuggestions.no} - - - + diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts index b64a2feef..64d2dac34 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts @@ -21,14 +21,6 @@ export const CardConfirmColorBlock = styled.div` z-index: 1; `; -export const CardSuggestionBar = styled.div` - height: 2px; - width: 90%; - background: var(--osoc_green); - margin-left: 5%; - margin-bottom: 15px; -`; - export const CardStudentInfo = styled.div` display: flex; width: 100%; diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx new file mode 100644 index 000000000..4909b16af --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx @@ -0,0 +1,34 @@ +import React from "react"; +import {NrSuggestions} from "../../../../data/interfaces/students"; +import { + SuggestionBarContainer +} from "./styles"; +import { ProgressBar } from "react-bootstrap"; + + +interface Props { + nrOfSuggestions: NrSuggestions; +} + +function totalSuggestions(suggestions: NrSuggestions) { + let total: number = 0; + Object.entries(suggestions).forEach(([key, value]) => {total += value}) + return total +} + +export default function SuggestionProgressBar(props: Props) { + const amountSuggestions = totalSuggestions(props.nrOfSuggestions) + const frequencyYes = props.nrOfSuggestions.yes * 100/amountSuggestions + const frequencyMaybe = props.nrOfSuggestions.maybe * 100/amountSuggestions + const frequencyNo = props.nrOfSuggestions.no * 100/amountSuggestions + console.log(props.nrOfSuggestions) + return ( + + + + + + + + ); +} diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts new file mode 100644 index 000000000..ad83f01df --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts @@ -0,0 +1 @@ +export { default } from "./SuggestionProgressBar"; \ No newline at end of file diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts new file mode 100644 index 000000000..202a0f2a9 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts @@ -0,0 +1,7 @@ +import styled from "styled-components"; + +export const SuggestionBarContainer = styled.div` + width: 90%; + background: transparent; + margin-left: 5%; +`; diff --git a/frontend/src/data/interfaces/suggestions.ts b/frontend/src/data/interfaces/suggestions.ts new file mode 100644 index 000000000..6db8d905e --- /dev/null +++ b/frontend/src/data/interfaces/suggestions.ts @@ -0,0 +1,23 @@ +export interface Suggestion { + suggestionId: number; + coach: OsocCoach; + suggestion: number; + argumentation: string; +} + +export interface OsocCoach { + userId: number; + name: string; + admin: boolean; + auth: Authentication; +} + +export interface Authentication { + authType: string; + email: string; +} + +export interface Suggestions { + /** A list of projects */ + suggestions: Suggestion[]; +} \ No newline at end of file diff --git a/frontend/src/utils/api/suggestions.ts b/frontend/src/utils/api/suggestions.ts new file mode 100644 index 000000000..c41baf491 --- /dev/null +++ b/frontend/src/utils/api/suggestions.ts @@ -0,0 +1,29 @@ +import axios from "axios"; +import {axiosInstance} from "./api"; +import {Suggestions} from "../../data/interfaces/suggestions"; + +export async function getSuggestions(edition: string, studentId: string){ + try { + const response = await axiosInstance.get("/editions/" + edition + "/students/" + studentId.toString() + "/suggestions"); + return response.data as Suggestions; + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} + +export async function confirmStudent(edition: string, studentId: string, confirmValue: number) { + try { + const response = await axiosInstance.put("/editions/" + edition + "/students/" + studentId.toString() + "/decision", { decision: confirmValue }); + return response.status === 204 + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} \ No newline at end of file From 02ea3da69aed4e314f62c37facfba93c80602db7 Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 4 May 2022 05:31:26 +0200 Subject: [PATCH 069/649] forgot one file --- .../StudentInformation/StudentInformation.tsx | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index b04a570f3..a3d4a5931 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, {useEffect, useState} from "react"; import { FullName, FirstName, @@ -6,7 +6,7 @@ import { LineBreak, PreferedName, StudentInfoTitle, - Suggestion, + SuggestionField, StudentInformationContainer, PersonalInfoField, PersonalInfoFieldValue, @@ -17,18 +17,51 @@ import { } from "./styles"; import { AdminDecisionContainer, CoachSuggestionContainer } from "../SuggestionComponents"; import {Student} from "../../../data/interfaces/students"; +import {Suggestion} from "../../../data/interfaces/suggestions"; +import {getSuggestions} from "../../../utils/api/suggestions"; +import {useParams} from "react-router-dom"; +import RemoveStudentButton from "../RemoveStudentButton/RemoveStudentButton"; interface Props { currentStudent: Student; } export default function StudentInformation(props: Props) { + const [suggestions, setSuggestions] = useState([]); + const params = useParams() + + async function callGetSuggestions() { + try { + const response = await getSuggestions(params.editionId!, params.id!); + setSuggestions(response.suggestions); + } catch (error) { + console.log(error); + } + } + + function suggestionToText(suggestion: number) { + if (suggestion === 0) { + return "Undecided" + } else if (suggestion === 1) { + return "Yes" + } else if (suggestion === 2) { + return "Maybe" + } else if (suggestion === 3) { + return "No" + } + } + + useEffect(() => { + callGetSuggestions(); + console.log("fetched suggestion") + }, [params.editionId!, params.id!]); if (!props.currentStudent) { return

loading

} else { return ( + {props.currentStudent.firstName} {props.currentStudent.lastName} @@ -36,15 +69,9 @@ export default function StudentInformation(props: Props) { Prefered name: {props.currentStudent.preferredName} Suggestions - - Wow this student is really incredible! We should give her a project! - - - Wow this student is really incredible! We should give her a project! - - - Wow this student is really incredible! We should give her a project! - + {suggestions.map(suggestion => ( + {suggestionToText(suggestion.suggestion)}: {suggestion.argumentation} + ))} Personal information From 4e46abac57d9f14a994d49332577bb1a016c2e7b Mon Sep 17 00:00:00 2001 From: FKD13 Date: Wed, 4 May 2022 12:35:53 +0200 Subject: [PATCH 070/649] router tests pr_suggestion --- .../test_students/test_students.py | 470 ++++++++---------- 1 file changed, 202 insertions(+), 268 deletions(-) diff --git a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py index a2c431e61..01f307026 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py @@ -1,299 +1,274 @@ -import pytest -from fastapi.testclient import TestClient from sqlalchemy.orm import Session from starlette import status -from src.database.models import Edition, Project, User, Skill, ProjectRole, Student +from src.database.models import Edition, Project, User, Skill, ProjectRole, Student, ProjectRoleSuggestion from tests.utils.authorization import AuthClient -@pytest.fixture -def database_with_data(database_session: Session) -> Session: - """fixture for adding data to the database""" +def test_add_pr_suggestion(database_session: Session, auth_client: AuthClient): + """tests add a student to a project""" edition: Edition = Edition(year=2022, name="ed2022") - database_session.add(edition) - skill1: Skill = Skill(name="skill1", description="something about skill1") - skill2: Skill = Skill(name="skill2", description="something about skill2") - skill3: Skill = Skill(name="skill3", description="something about skill3") - skill4: Skill = Skill(name="skill4", description="something about skill4") - skill5: Skill = Skill(name="skill5", description="something about skill5") - database_session.add(skill1) - database_session.add(skill2) - database_session.add(skill3) - database_session.add(skill4) - database_session.add(skill5) - project1 = Project(name="project1", edition=edition, number_of_students=4, skills=[skill1, skill2, skill3, skill4, skill5]) - project2 = Project(name="project2", edition=edition, number_of_students=3, skills=[skill1, skill2, skill3, skill4]) - project3 = Project(name="project3", edition=edition, number_of_students=3, skills=[skill1, skill2, skill3]) - database_session.add(project1) - database_session.add(project2) - database_session.add(project3) - user: User = User(name="coach1") - database_session.add(user) - student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", - email_address="josvermeulen@mail.com", phone_number="0487/86.24.45", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill1, skill3, skill4]) - student02: Student = Student(first_name="Isabella", last_name="Christensen", preferred_name="Isabella", - email_address="isabella.christensen@example.com", phone_number="98389723", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4]) - student03: Student = Student(first_name="Lotte", last_name="Buss", preferred_name="Lotte", - email_address="lotte.buss@example.com", phone_number="0284-0749932", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill3, skill4]) - student04: Student = Student(first_name="Max", last_name="Tester", preferred_name="Mxa", - email_address="max.test@example.com", phone_number="0284-1356832", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill5]) - database_session.add(student01) - database_session.add(student02) - database_session.add(student03) - database_session.add(student04) - project_role1: ProjectRole = ProjectRole( - student=student01, project=project1, skill=skill1, drafter=user, argumentation="argmunet") - project_role2: ProjectRole = ProjectRole( - student=student01, project=project2, skill=skill3, drafter=user, argumentation="argmunet") - project_role3: ProjectRole = ProjectRole( - student=student02, project=project1, skill=skill2, drafter=user, argumentation="argmunet") - project_role4: ProjectRole = ProjectRole( - student=student04, project=project1, skill=skill5, drafter=user, argumentation="argmunet", definitive=True) - database_session.add(project_role1) - database_session.add(project_role2) - database_session.add(project_role3) - database_session.add(project_role4) + project: Project = Project(name="project 1", edition=edition) + skill: Skill = Skill(name="skill 1") + project_role: ProjectRole = ProjectRole(project=project, skill=skill, slots=1) + student: Student = Student( + first_name="Jos", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@mail.com", + phone_number="0487/86.24.45", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + ) + database_session.add(project_role) + database_session.add(student) database_session.commit() - return database_session - - -@pytest.fixture -def current_edition(database_with_data: Session) -> Edition: - """fixture to get the latest edition""" - return database_with_data.query(Edition).all()[-1] - - -def test_add_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): - """tests add a student to a project""" - auth_client.coach(current_edition) + auth_client.coach(edition) resp = auth_client.post( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 3}) + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) assert resp.status_code == status.HTTP_201_CREATED - response2 = auth_client.get('/editions/ed2022/projects') + response2 = auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') json = response2.json() - - assert len(json['projects'][0]['projectRoles']) == 4 - assert json['projects'][0]['projectRoles'][3]['skillId'] == 3 + assert len(json['projectRoles']) == 1 + assert len(json['projectRoles'][0]['suggestions']) == 1 + assert json['projectRoles'][0]['suggestions'][0]['argumentation'] == 'argumentation' -def test_add_ghost_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +def test_add_pr_suggestion_non_existing_student(database_session: Session, auth_client: AuthClient): """Tests adding a non-existing student to a project""" - auth_client.coach(current_edition) + edition: Edition = Edition(year=2022, name="ed2022") + project: Project = Project(name="project 1", edition=edition) + skill: Skill = Skill(name="skill 1") + project_role: ProjectRole = ProjectRole(project=project, skill=skill, slots=1) + database_session.add(project_role) + database_session.commit() - student10: list[Student] = database_with_data.query( - Student).where(Student.student_id == 10).all() - assert len(student10) == 0 - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + auth_client.coach(edition) resp = auth_client.post( - "/editions/ed2022/projects/1/students/10", json={"skill_id": 3}) + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/0", + json={"argumentation": "argumentation"} + ) assert resp.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get('/editions/ed2022/projects/1') + response = auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') json = response.json() - assert len(json['projectRoles']) == 3 + assert len(json['projectRoles']) == 1 + assert len(json['projectRoles'][0]['suggestions']) == 0 -def test_add_student_project_non_existing_skill(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +def test_add_pr_suggestion_non_existing_pr(database_session: Session, auth_client: AuthClient): """Tests adding a non-existing student to a project""" - auth_client.coach(current_edition) - - skill10: list[Skill] = database_with_data.query( - Skill).where(Skill.skill_id == 10).all() - assert len(skill10) == 0 - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 - - resp = auth_client.post( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 10}) - assert resp.status_code == status.HTTP_404_NOT_FOUND - - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 - + edition: Edition = Edition(year=2022, name="ed2022") + project: Project = Project(name="project 1", edition=edition) + skill: Skill = Skill(name="skill 1") + student: Student = Student( + first_name="Jos", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@mail.com", + phone_number="0487/86.24.45", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + ) + database_session.add(project) + database_session.add(student) + database_session.add(skill) + database_session.commit() -def test_add_student_to_ghost_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): - """Tests adding a student to a project that doesn't exist""" - auth_client.coach(current_edition) - project10: list[Project] = database_with_data.query( - Project).where(Project.project_id == 10).all() - assert len(project10) == 0 + auth_client.coach(edition) resp = auth_client.post( - "/editions/ed2022/projects/10/students/1", json={"skill_id": 1}) + f"/editions/{edition.name}/projects/{project.project_id}/roles/0/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) assert resp.status_code == status.HTTP_404_NOT_FOUND + assert len(database_session.query(ProjectRoleSuggestion).all()) == 0 -def test_add_incomplete_data_student_project(database_session: Session, auth_client: AuthClient): - """Tests adding a student with incomplete data""" - - edition = Edition(year=2022, name="ed2022") - database_session.add(edition) - project = Project(name="project", edition_id=1, - project_id=1, number_of_students=2) - database_session.add(project) +def test_add_pr_suggestion_old_edition(database_session: Session, auth_client: AuthClient): + """tests add a student to a project from an old edition""" + edition: Edition = Edition(year=2022, name="ed2022") + project: Project = Project(name="project 1", edition=edition) + skill: Skill = Skill(name="skill 1") + project_role: ProjectRole = ProjectRole(project=project, skill=skill, slots=1) + student: Student = Student( + first_name="Jos", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@mail.com", + phone_number="0487/86.24.45", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + ) + database_session.add(project_role) + database_session.add(student) + database_session.add(Edition(year=2023, name="ed2023")) database_session.commit() auth_client.coach(edition) - resp = auth_client.post( - "/editions/ed2022/projects/1/students/1", json={}) - - assert resp.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - response2 = auth_client.get('/editions/ed2022/projects') - json = response2.json() + database_session.commit() - assert len(json['projects'][0]['projectRoles']) == 0 + resp = auth_client.post( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) + assert resp.status_code == status.HTTP_405_METHOD_NOT_ALLOWED -def test_change_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +def test_change_pr_suggestion(database_session: Session, auth_client: AuthClient): """Tests changing a student's project""" - auth_client.coach(current_edition) - - resp1 = auth_client.patch( - "/editions/ed2022/projects/1/students/1", json={"skill_id": 4}) - - assert resp1.status_code == status.HTTP_204_NO_CONTENT - - response2 = auth_client.get('/editions/ed2022/projects') - json = response2.json() - - assert len(json['projects'][0]['projectRoles']) == 3 - assert json['projects'][0]['projectRoles'][0]['skillId'] == 4 - - -def test_change_incomplete_data_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): - """Tests changing a student's project with incomplete data""" - auth_client.coach(current_edition) + edition: Edition = Edition(year=2022, name="ed2022") + project: Project = Project(name="project 1", edition=edition) + skill: Skill = Skill(name="skill 1") + project_role: ProjectRole = ProjectRole(project=project, skill=skill, slots=1) + student: Student = Student( + first_name="Jos", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@mail.com", + phone_number="0487/86.24.45", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + ) + pr_suggestion: ProjectRoleSuggestion = ProjectRoleSuggestion(project_role=project_role, student=student) + database_session.add(pr_suggestion) + database_session.commit() - resp1 = auth_client.patch( - "/editions/ed2022/projects/1/students/1", json={}) + auth_client.coach(edition) - assert resp1.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + resp = auth_client.patch( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) + assert resp.status_code == status.HTTP_204_NO_CONTENT - response2 = auth_client.get('/editions/ed2022/projects') + response2 = auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') json = response2.json() + assert len(json['projectRoles']) == 1 + assert len(json['projectRoles'][0]['suggestions']) == 1 + assert json['projectRoles'][0]['suggestions'][0]['argumentation'] == 'argumentation' - assert len(json['projects'][0]['projectRoles']) == 3 - assert json['projects'][0]['projectRoles'][0]['skillId'] == 1 - -def test_change_ghost_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +def test_change_pr_suggestion_non_existing_student(database_session: Session, auth_client: AuthClient): """Tests changing a non-existing student of a project""" - auth_client.coach(current_edition) + edition: Edition = Edition(year=2022, name="ed2022") + project: Project = Project(name="project 1", edition=edition) + skill: Skill = Skill(name="skill 1") + project_role: ProjectRole = ProjectRole(project=project, skill=skill, slots=1) + database_session.add(project_role) + database_session.commit() - student10: list[Student] = database_with_data.query( - Student).where(Student.student_id == 10).all() - assert len(student10) == 0 - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + auth_client.coach(edition) resp = auth_client.patch( - "/editions/ed2022/projects/1/students/10", json={"skill_id": 4}) + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/0", + json={"argumentation": "argumentation"} + ) assert resp.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 - -def test_change_student_project_non_existing_skill(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +def test_change_pr_suggestion_non_existing_pr(database_session: Session, auth_client: AuthClient): """Tests deleting a student from a project that isn't assigned""" - auth_client.coach(current_edition) - - skill10: list[Skill] = database_with_data.query( - Skill).where(Skill.skill_id == 10).all() - assert len(skill10) == 0 - - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 - - resp = auth_client.patch( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 10}) - assert resp.status_code == status.HTTP_404_NOT_FOUND - - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 - - -def test_change_student_project_ghost_drafter(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): - """Tests changing a drafter of a ProjectRole to a non-existing one""" - auth_client.coach(current_edition) - user10: list[User] = database_with_data.query( - User).where(User.user_id == 10).all() - assert len(user10) == 0 - - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 - - resp = auth_client.patch( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 4}) - assert resp.status_code == status.HTTP_404_NOT_FOUND - - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 - + edition: Edition = Edition(year=2022, name="ed2022") + project: Project = Project(name="project 1", edition=edition) + skill: Skill = Skill(name="skill 1") + student: Student = Student( + first_name="Jos", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@mail.com", + phone_number="0487/86.24.45", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + ) + database_session.add(project) + database_session.add(student) + database_session.add(skill) + database_session.commit() -def test_change_student_to_ghost_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): - """Tests changing a student of a project that doesn't exist""" - auth_client.coach(current_edition) - project10: list[Project] = database_with_data.query( - Project).where(Project.project_id == 10).all() - assert len(project10) == 0 + auth_client.coach(edition) resp = auth_client.patch( - "/editions/ed2022/projects/10/students/1", json={"skill_id": 1}) + f"/editions/{edition.name}/projects/{project.project_id}/roles/0/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_delete_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +def test_delete_pr_suggestion(database_session: Session, auth_client: AuthClient): """Tests deleting a student from a project""" - auth_client.coach(current_edition) - resp = auth_client.delete("/editions/ed2022/projects/1/students/1") + edition: Edition = Edition(year=2022, name="ed2022") + project: Project = Project(name="project 1", edition=edition) + skill: Skill = Skill(name="skill 1") + project_role: ProjectRole = ProjectRole(project=project, skill=skill, slots=1) + student: Student = Student( + first_name="Jos", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@mail.com", + phone_number="0487/86.24.45", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + ) + pr_suggestion: ProjectRoleSuggestion = ProjectRoleSuggestion(project_role=project_role, student=student) + database_session.add(pr_suggestion) + database_session.commit() + auth_client.coach(edition) + resp = auth_client.delete( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}" + ) assert resp.status_code == status.HTTP_204_NO_CONTENT - response2 = auth_client.get('/editions/ed2022/projects') + response2 = auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') json = response2.json() + assert len(json['projectRoles']) == 1 + assert len(json['projectRoles'][0]['suggestions']) == 0 - assert len(json['projects'][0]['projectRoles']) == 2 - - -def test_delete_student_project_empty(database_session: Session, auth_client: AuthClient): - """Tests deleting a student from a project that isn't assigned""" - edition = Edition(year=2022, name="ed2022") - database_session.add(edition) - project = Project(name="project", edition_id=1, - project_id=1, number_of_students=2) - database_session.add(project) +def test_delete_pr_suggestion_non_existing_pr_suggestion(database_session: Session, auth_client: AuthClient): + """Tests deleting a pr_suggestion that doesn't exist""" + edition: Edition = Edition(year=2022, name="ed2022") + project: Project = Project(name="project 1", edition=edition) + skill: Skill = Skill(name="skill 1") + project_role: ProjectRole = ProjectRole(project=project, skill=skill, slots=1) + student: Student = Student( + first_name="Jos", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@mail.com", + phone_number="0487/86.24.45", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + ) + database_session.add(project_role) + database_session.add(student) database_session.commit() auth_client.coach(edition) - resp = auth_client.delete("/editions/ed2022/projects/1/students/1") + resp = auth_client.delete( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}" + ) assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_get_conflicts(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +def test_get_conflicts(database_session: Session, current_edition: Edition, auth_client: AuthClient): """Test getting the conflicts""" auth_client.coach(current_edition) response = auth_client.get("/editions/ed2022/projects/conflicts") @@ -303,50 +278,9 @@ def test_get_conflicts(database_with_data: Session, current_edition: Edition, au assert len(json['conflictStudents'][0]['projects']) == 2 -def test_add_student_project_old_edition(database_with_data: Session, auth_client: AuthClient): - """tests add a student to a project from an old edition""" - auth_client.admin() - database_with_data.add(Edition(year=2023, name="ed2023")) - database_with_data.commit() - - resp = auth_client.post( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 1, "drafter_id": 1}) - - assert resp.status_code == status.HTTP_405_METHOD_NOT_ALLOWED - - -def test_add_student_same_project_role(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): - """Two different students can't have the same project_role""" - auth_client.coach(current_edition) - - resp = auth_client.post( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 2}) - - assert resp.status_code == status.HTTP_400_BAD_REQUEST - - -def test_add_student_project_wrong_project_skill(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): - """A project_role can't be created if the project doesn't require the skill""" - auth_client.coach(current_edition) - - resp = auth_client.post( - "/editions/ed2022/projects/3/students/3", json={"skill_id": 4}) - - assert resp.status_code == status.HTTP_400_BAD_REQUEST - - -def test_add_student_project_wrong_student_skill(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): - """A project_role can't be created if the student doesn't have the skill""" - auth_client.coach(current_edition) - - resp = auth_client.post( - "/editions/ed2022/projects/1/students/2", json={"skill_id": 1}) - - assert resp.status_code == status.HTTP_400_BAD_REQUEST - - -def test_add_student_project_already_confirmed(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): - """A project_role can't be cre created if the student involved has already been confirmed elsewhere""" +def test_add_student_project_already_confirmed(database_session: Session, current_edition: Edition, + auth_client: AuthClient): + """A project_role can't be created if the student involved has already been confirmed elsewhere""" auth_client.coach(current_edition) resp = auth_client.post("/editions/ed2022/projects/1/students/4", json={"skill_id": 3}) @@ -354,7 +288,7 @@ def test_add_student_project_already_confirmed(database_with_data: Session, curr assert resp.status_code == status.HTTP_400_BAD_REQUEST -def test_confirm_project_role(database_with_data: Session, auth_client: AuthClient): +def test_confirm_project_role(database_session: Session, auth_client: AuthClient): """Confirm a project role for a student without conflicts""" auth_client.admin() resp = auth_client.post( @@ -366,12 +300,12 @@ def test_confirm_project_role(database_with_data: Session, auth_client: AuthClie "/editions/ed2022/projects/1/students/3/confirm") assert response2.status_code == status.HTTP_204_NO_CONTENT - pr = database_with_data.query(ProjectRole).where(ProjectRole.student_id == 3) \ + pr = database_session.query(ProjectRole).where(ProjectRole.student_id == 3) \ .where(ProjectRole.project_id == 1).one() assert pr.definitive is True -def test_confirm_project_role_conflict(database_with_data: Session, auth_client: AuthClient): +def test_confirm_project_role_conflict(database_session: Session, auth_client: AuthClient): """A student who is part of a conflict can't have their project_role confirmed""" auth_client.admin() response2 = auth_client.post( From 362b968e6e411b49186665148bae698c93c62a7c Mon Sep 17 00:00:00 2001 From: stijndcl Date: Wed, 4 May 2022 17:13:52 +0200 Subject: [PATCH 071/649] Remove google buttons --- .../LoginComponents/SocialButtons/SocialButtons.tsx | 9 +++------ .../components/LoginComponents/SocialButtons/styles.ts | 3 --- .../RegisterComponents/SocialButtons/SocialButtons.tsx | 3 +-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/LoginComponents/SocialButtons/SocialButtons.tsx b/frontend/src/components/LoginComponents/SocialButtons/SocialButtons.tsx index 8ce39a557..ebf588a5a 100644 --- a/frontend/src/components/LoginComponents/SocialButtons/SocialButtons.tsx +++ b/frontend/src/components/LoginComponents/SocialButtons/SocialButtons.tsx @@ -1,16 +1,13 @@ -import { GoogleLoginButton, GithubLoginButton } from "react-social-login-buttons"; -import { SocialsContainer, Socials, GoogleLoginContainer } from "./styles"; +import { GithubLoginButton } from "react-social-login-buttons"; +import { SocialsContainer, Socials } from "./styles"; /** - * Container for the _Sign in with Google_ and _Sign in with GitHub_ buttons. + * Container for the _Sign in with GitHub_ button. */ export default function SocialButtons() { return ( - - - diff --git a/frontend/src/components/LoginComponents/SocialButtons/styles.ts b/frontend/src/components/LoginComponents/SocialButtons/styles.ts index 8ed2a53d5..53949804f 100644 --- a/frontend/src/components/LoginComponents/SocialButtons/styles.ts +++ b/frontend/src/components/LoginComponents/SocialButtons/styles.ts @@ -10,6 +10,3 @@ export const Socials = styled.div` min-width: 230px; height: fit-content; `; -export const GoogleLoginContainer = styled.div` - margin-bottom: 15px; -`; diff --git a/frontend/src/components/RegisterComponents/SocialButtons/SocialButtons.tsx b/frontend/src/components/RegisterComponents/SocialButtons/SocialButtons.tsx index 6d19ea288..b36bc5501 100644 --- a/frontend/src/components/RegisterComponents/SocialButtons/SocialButtons.tsx +++ b/frontend/src/components/RegisterComponents/SocialButtons/SocialButtons.tsx @@ -1,11 +1,10 @@ -import { GoogleLoginButton, GithubLoginButton } from "react-social-login-buttons"; +import { GithubLoginButton } from "react-social-login-buttons"; import { SocialsContainer, Socials } from "./styles"; export default function SocialButtons() { return ( - From d7121a3480a41a104fc8078f34861e9cc1b00d00 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 4 May 2022 17:33:03 +0200 Subject: [PATCH 072/649] navigate to newly created project page --- .../views/projectViews/CreateProjectPage/CreateProjectPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index 33d800399..4afcd204a 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -97,7 +97,7 @@ export default function CreateProjectPage() { coachIds ); if (response) { - navigate("/editions/" + editionId + "/projects/"); + navigate("/editions/" + editionId + "/projects/" + response.projectId); } else alert("Something went wrong :("); }} > From 1a050c2d01b00b960da933d903ee56ec2abe8b18 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 4 May 2022 19:12:21 +0200 Subject: [PATCH 073/649] Center create project page --- .../AddedSkills/styles.ts | 2 +- .../InputFields/Coach/Coach.tsx | 2 +- .../InputFields/Partner/Partner.tsx | 2 +- .../InputFields/Skill/Skill.tsx | 2 +- .../CreateProjectComponents/styles.ts | 2 + .../CreateProjectPage/CreateProjectPage.tsx | 133 ++++++++++-------- .../projectViews/CreateProjectPage/styles.ts | 30 +++- 7 files changed, 110 insertions(+), 63 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts index 9b4a4b069..a6b799cea 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts @@ -6,7 +6,7 @@ export const SkillContainer = styled.div` background-color: #1a1a36; padding: 5px 10px; width: min-content; - max-width: 75%; + max-width: 100%; `; export const TopContainer = styled.div` diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Coach/Coach.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Coach/Coach.tsx index ab5a1ec47..0af408194 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Coach/Coach.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Coach/Coach.tsx @@ -63,7 +63,7 @@ export default function Coach({ setCoach(""); }} > - Add coach + Add diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx index a6096de81..27e94ce67 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx @@ -38,7 +38,7 @@ export default function Partner({ setPartner(""); }} > - Add partner + Add
); diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx index 588e846d4..9fc0d759d 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx @@ -43,7 +43,7 @@ export default function Skill({ setSkill(""); }} > - Add skill + Add ); diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/styles.ts b/frontend/src/components/ProjectsComponents/CreateProjectComponents/styles.ts index d40fefa38..44847f47b 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/styles.ts +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/styles.ts @@ -7,6 +7,8 @@ export const Input = styled.input` color: white; border: none; border-radius: 5px; + width: 35vw; + min-width: 300px; `; export const AddButton = styled.button` diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index 4afcd204a..60237f313 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -1,8 +1,15 @@ -import { CreateProjectContainer, CreateButton, Label } from "./styles"; +import { + CreateProjectContainer, + CreateButton, + Label, + CenterContainer, + Center, + CancelButton, + CenterTitle +} from "./styles"; import { createProject } from "../../../utils/api/projects"; import { useState } from "react"; import { useNavigate, useParams } from "react-router-dom"; -import { GoBack } from "../ProjectDetailPage/styles"; import { BiArrowBack } from "react-icons/bi"; import { NameInput, @@ -43,66 +50,78 @@ export default function CreateProjectPage() { const editionId = params.editionId!; return ( - - navigate("/editions/" + editionId + "/projects/")}> - - Cancel - -

New Project

- - - + + + +

New Project

+ - - + + - - - + + - - - + + + - - - + + + - { - const coachIds: number[] = []; - coaches.forEach(coachToAdd => { - coachIds.push(coachToAdd.userId); - }); + + + +
+ navigate("/editions/" + editionId + "/projects/")}> + + Cancel + + { + const coachIds: number[] = []; + coaches.forEach(coachToAdd => { + coachIds.push(coachToAdd.userId); + }); - const response = await createProject( - editionId, - name, - numberOfStudents!, - [], // Empty skills for now TODO - partners, - coachIds - ); - if (response) { - navigate("/editions/" + editionId + "/projects/" + response.projectId); - } else alert("Something went wrong :("); - }} - > - Create Project - - + const response = await createProject( + editionId, + name, + numberOfStudents!, + [], // Empty skills for now TODO + partners, + coachIds + ); + if (response) { + navigate( + "/editions/" + editionId + "/projects/" + response.projectId + ); + } else alert("Something went wrong :("); + }} + > + Create Project + +
+ + ); } diff --git a/frontend/src/views/projectViews/CreateProjectPage/styles.ts b/frontend/src/views/projectViews/CreateProjectPage/styles.ts index 6cbd8c1c3..fe74fcbd2 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/styles.ts +++ b/frontend/src/views/projectViews/CreateProjectPage/styles.ts @@ -1,7 +1,12 @@ import styled from "styled-components"; +export const CenterContainer = styled.div` + width: 100%; +`; + export const CreateProjectContainer = styled.div` - margin: 20px; + width: fit-content; + margin: 20px auto; `; export const Input = styled.input` @@ -33,12 +38,33 @@ export const RemoveButton = styled.button` align-items: center; `; +export const Center = styled.div` + display: flex; + align-items: center; + vertical-align: middle; + margin: 15px auto; + width: fit-content; +`; + +export const CenterTitle = styled.div` + margin: 5px auto; + width: fit-content; +`; + export const CreateButton = styled.button` padding: 5px 10px; background-color: #44dba4; color: white; border: none; - margin-top: 30px; + border-radius: 5px; +`; + +export const CancelButton = styled.button` + padding: 5px 10px; + margin-right: 5px; + background-color: #131329; + color: white; + border: none; border-radius: 5px; `; From e2ec4ce2f90884c0503524ecaf7ca6e36babf1c9 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 4 May 2022 20:42:25 +0200 Subject: [PATCH 074/649] now correctly updating skills fixes #334 --- .../AddedSkills/AddedSkills.tsx | 26 +++++++++++-------- .../AddedSkills/styles.ts | 5 ++++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx index 1194c5c87..dca253f83 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx @@ -7,6 +7,7 @@ import { Delete, TopContainer, SkillName, + TopLeftContainer, } from "./styles"; import { TiDeleteOutline } from "react-icons/ti"; import React from "react"; @@ -38,7 +39,8 @@ export default function AddedSkills({ ) { const newList = skills.map((item, otherIndex) => { if (index === otherIndex) { - if (amount && !isNaN(event.target.valueAsNumber)) { + if (amount) { + if (event.target.valueAsNumber < 1) return item; return { ...item, amount: event.target.valueAsNumber, @@ -59,17 +61,19 @@ export default function AddedSkills({ {skills.map((skill, index) => ( - {skill.skill} + + {skill.skill} - { - updateSkills(event, index, true); - }} - /> + { + updateSkills(event, index, true); + }} + /> + { const newSkills = [...skills]; diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts index a6b799cea..27d525b8e 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts @@ -15,6 +15,11 @@ export const TopContainer = styled.div` justify-content: space-between; `; +export const TopLeftContainer = styled.div` + display: flex; + align-items: center; +`; + export const SkillName = styled.div` overflow-x: auto; text-overflow: ellipsis; From 71fa494bcd6714d46102585e966a4594832a36f9 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 4 May 2022 20:53:30 +0200 Subject: [PATCH 075/649] better number input fields --- .../CreateProjectComponents/AddedSkills/AddedSkills.tsx | 2 +- .../InputFields/NumberOfStudents/NumberOfStudents.tsx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx index dca253f83..2a420b57d 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx @@ -66,7 +66,7 @@ export default function AddedSkills({ { diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/NumberOfStudents.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/NumberOfStudents.tsx index 7586d250b..741d3148f 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/NumberOfStudents.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/NumberOfStudents.tsx @@ -12,9 +12,10 @@ export default function NumberOfStudents({ { - setNumberOfStudents(e.target.valueAsNumber); + if (e.target.valueAsNumber > 0 || isNaN(e.target.valueAsNumber)) + setNumberOfStudents(e.target.valueAsNumber); }} placeholder="Number of students" /> From 8f6344f489582018deb778a9f3ba0dbaa8476776 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 4 May 2022 22:03:03 +0200 Subject: [PATCH 076/649] only show create project on latest edition --- frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index 1fe9daae8..a22fd0125 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -36,7 +36,7 @@ export default function ProjectPage() { const params = useParams(); const editionId = params.editionId!; - const { role } = useAuth(); + const { role, editions } = useAuth(); /** * Used to fetch the projects @@ -83,7 +83,7 @@ export default function ProjectPage() { }} /> Search - {role === Role.ADMIN && ( + {role === Role.ADMIN && editionId === editions[0] && ( navigate("/editions/" + editionId + "/projects/new")} > From bedcf84d5f48647af5e2a9bd938688cf0d4b2760 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 4 May 2022 22:19:08 +0200 Subject: [PATCH 077/649] created an current edition only route --- frontend/src/Router.tsx | 4 +-- .../CurrentEditionRoute.tsx | 30 +++++++++++++++++++ .../components/CurrentEditionRoute/index.ts | 1 + frontend/src/components/index.ts | 1 + 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 frontend/src/components/CurrentEditionRoute/CurrentEditionRoute.tsx create mode 100644 frontend/src/components/CurrentEditionRoute/index.ts diff --git a/frontend/src/Router.tsx b/frontend/src/Router.tsx index 407393242..e5c39c5ab 100644 --- a/frontend/src/Router.tsx +++ b/frontend/src/Router.tsx @@ -2,7 +2,7 @@ import React from "react"; import { Container, ContentWrapper } from "./app.styles"; import { BrowserRouter, Navigate, Outlet, Route, Routes } from "react-router-dom"; -import { AdminRoute, Footer, Navbar, PrivateRoute } from "./components"; +import { AdminRoute, Footer, Navbar, PrivateRoute, CurrentEditionRoute } from "./components"; import { useAuth } from "./contexts"; import { EditionsPage, @@ -68,7 +68,7 @@ export default function Router() { {/* Projects routes */} }> } /> - }> + }> {/* create project page */} } /> diff --git a/frontend/src/components/CurrentEditionRoute/CurrentEditionRoute.tsx b/frontend/src/components/CurrentEditionRoute/CurrentEditionRoute.tsx new file mode 100644 index 000000000..bd9c8ee99 --- /dev/null +++ b/frontend/src/components/CurrentEditionRoute/CurrentEditionRoute.tsx @@ -0,0 +1,30 @@ +import { Navigate, Outlet, useParams } from "react-router-dom"; +import { useAuth } from "../../contexts/auth-context"; +import { Role } from "../../data/enums"; + +/** + * React component for current edition and admin-only routes. + * Redirects to the [[LoginPage]] (status 401) if not authenticated, + * and to the [[ForbiddenPage]] (status 403) if not admin or not the current edition. + * + * Example usage: + * ```ts + * }> + * // These routes will only render if the user is an admin and is on the current edition + * + * + * + * ``` + */ +export default function CurrentEditionRoute() { + const { isLoggedIn, role, editions } = useAuth(); + const params = useParams(); + const editionId = params.editionId; + return !isLoggedIn ? ( + + ) : role === Role.COACH || editionId !== editions[0] ? ( + + ) : ( + + ); +} diff --git a/frontend/src/components/CurrentEditionRoute/index.ts b/frontend/src/components/CurrentEditionRoute/index.ts new file mode 100644 index 000000000..f760809b8 --- /dev/null +++ b/frontend/src/components/CurrentEditionRoute/index.ts @@ -0,0 +1 @@ +export { default } from "./CurrentEditionRoute"; diff --git a/frontend/src/components/index.ts b/frontend/src/components/index.ts index bd4445e73..9264eea45 100644 --- a/frontend/src/components/index.ts +++ b/frontend/src/components/index.ts @@ -1,4 +1,5 @@ export { default as AdminRoute } from "./AdminRoute"; +export { default as CurrentEditionRoute } from "./CurrentEditionRoute"; export { default as Footer } from "./Footer"; export * as LoginComponents from "./LoginComponents"; export { default as Navbar } from "./Navbar"; From 448576540d9aaef3c5c9f731d3f34aab7100061f Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 4 May 2022 22:19:24 +0200 Subject: [PATCH 078/649] make the create button invisible when not on the current edition --- frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index 1fe9daae8..9d2a8611b 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -36,7 +36,7 @@ export default function ProjectPage() { const params = useParams(); const editionId = params.editionId!; - const { role } = useAuth(); + const { role, editions } = useAuth(); /** * Used to fetch the projects @@ -83,7 +83,7 @@ export default function ProjectPage() { }} /> Search - {role === Role.ADMIN && ( + {role === Role.ADMIN && editionId === editions[0] && ( navigate("/editions/" + editionId + "/projects/new")} > From 92c0a04df88fb5ca0df3512de70c490baa372d6d Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 4 May 2022 22:30:34 +0200 Subject: [PATCH 079/649] removed some more google stuff --- files/Assignment.md | 22 +++++++-------- files/user_manual.md | 6 +--- files/uses_cases/use_cases_users.md | 28 +++++++++---------- .../GeneralComponents/AuthTypeIcon.tsx | 4 +-- frontend/src/data/enums/authType.ts | 1 - 5 files changed, 27 insertions(+), 34 deletions(-) diff --git a/files/Assignment.md b/files/Assignment.md index ef7c9f758..3188dcc96 100644 --- a/files/Assignment.md +++ b/files/Assignment.md @@ -8,7 +8,7 @@ Import data from selection form in the tool via the webhook - Receive invitation link -- Sign up via mail account, Google or GitHub +- Sign up via mail account or GitHub - Admin approves @@ -16,11 +16,11 @@ Import data from selection form in the tool via the webhook - Restricted access for coaches - - Can’t see “manage users” + - Can’t see “manage users” - - Can’t confirm student selection, only suggest - - - Can't see multiple editions + - Can’t confirm student selection, only suggest + + - Can't see multiple editions - Partners do not have access, and are not involved in selection @@ -36,17 +36,17 @@ Import data from selection form in the tool via the webhook - Filter & search: - - By name + - By name - - By skill + - By skill - - Alumni + - Alumni - - Student coach volunteer + - Student coach volunteer - - Decided on “yes, maybe, no” or undecided + - Decided on “yes, maybe, no” or undecided - - Reset (remove all filters) + - Reset (remove all filters) ### BONUS: diff --git a/files/user_manual.md b/files/user_manual.md index 5baf11504..92d8a2bd7 100644 --- a/files/user_manual.md +++ b/files/user_manual.md @@ -17,10 +17,6 @@ There are different ways to log in, depending on the way in which you have regis 1. Click the "Log in" button with the GitHub logo. -### Google - -1. Click the "Log in" button with the Google logo. - ## Admins This section is for admins. It contains all features to manage users. A user is someone who uses the tool (this does not include students). A user can be coach of one or more editions. He can only see data and work (making suggestions...) on these editions. A user can be admin of the tool. An admin can see/edit/delete all data from all editions and manage other users. This role is only for fully trusted people. An admin doesn't need to be coach from an edition to participate in the selection process. @@ -44,7 +40,7 @@ At the top middle of the page, you find a dropdown labeled **Requests**. When yo Note: the list only contains requests from the current selected edition. Each edition has its own requests. -The list can be filtered by name. Each row of the table contains the name and email address of a person. The email contains an icon indicating whether the person registered via email, GitHub or Google. Next to each row there are two buttons to accept or reject the person. When a person is accepted, he will automatically be added as coach to the current edition. +The list can be filtered by name. Each row of the table contains the name and email address of a person. The email contains an icon indicating whether the person registered via email, GitHub. Next to each row there are two buttons to accept or reject the person. When a person is accepted, he will automatically be added as coach to the current edition. #### Coaches diff --git a/files/uses_cases/use_cases_users.md b/files/uses_cases/use_cases_users.md index 1e372d1d1..afb465b90 100644 --- a/files/uses_cases/use_cases_users.md +++ b/files/uses_cases/use_cases_users.md @@ -4,22 +4,22 @@ A new user must create an account in order to use the tool. -| Create Account || -| --- | --- | -| Preconditions | The user has never before created an account and is not known to the tool.
The user is invited by an admin. | -| Postconditions | The user has an account, but this is yet to be approved by an admin.
An email is sent to all admins to request approval.
Admins can see this in the manage users tab. | -| Actors| User | -| Description of steps |
  1. Fill in name
  2. Fill in your email
  3. Fill in your password
  4. Confirm your password
  5. Click a "create account" button
  6. A "hold on tight" window is shown
  7. You receive an email once you've been verified
| -| Alternative flow| The person is the first to ever create an account
  • Automatically accept this user as an admin
  • The main window is shown instead of the "hold on tight" window
Signup via Github/Google instead of filling in username/password:
  • You click the login with Github/Google button
  • You give the tool access to your account
| +| Create Account | | +| -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Preconditions | The user has never before created an account and is not known to the tool.
The user is invited by an admin. | +| Postconditions | The user has an account, but this is yet to be approved by an admin.
An email is sent to all admins to request approval.
Admins can see this in the manage users tab. | +| Actors | User | +| Description of steps |
  1. Fill in name
  2. Fill in your email
  3. Fill in your password
  4. Confirm your password
  5. Click a "create account" button
  6. A "hold on tight" window is shown
  7. You receive an email once you've been verified
| +| Alternative flow | The person is the first to ever create an account
  • Automatically accept this user as an admin
  • The main window is shown instead of the "hold on tight" window
Signup via Github instead of filling in username/password:
  • You click the login with Github button
  • You give the tool access to your account
| ## Login Every time a recurring user returns, the user must be reauthenticated in order to use the tool. -| Login || -| --- | --- | -| Preconditions | The user has previously created an account. | -| Postconditions | The user has acces to the tool. | -| Actors| User | -| Description of steps |
  1. Fill in your name or email
  2. Fill in your password
  3. Click the login button
  4. The main window is shown, you have access to the tool
| -| Alternative flow| Password incorrect/user unknown:
  • You get an error message saying your username/password combination is incorrect
Not yet verified:
  • You get an error message saying your account has not been verified yet
Login via github instead of filling in username/password:
  • You click the login with github button
| +| Login | | +| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Preconditions | The user has previously created an account. | +| Postconditions | The user has acces to the tool. | +| Actors | User | +| Description of steps |
  1. Fill in your name or email
  2. Fill in your password
  3. Click the login button
  4. The main window is shown, you have access to the tool
| +| Alternative flow | Password incorrect/user unknown:
  • You get an error message saying your username/password combination is incorrect
Not yet verified:
  • You get an error message saying your account has not been verified yet
Login via github instead of filling in username/password:
  • You click the login with github button
| diff --git a/frontend/src/components/GeneralComponents/AuthTypeIcon.tsx b/frontend/src/components/GeneralComponents/AuthTypeIcon.tsx index 9f38b8d1a..3a2443d5a 100644 --- a/frontend/src/components/GeneralComponents/AuthTypeIcon.tsx +++ b/frontend/src/components/GeneralComponents/AuthTypeIcon.tsx @@ -1,5 +1,5 @@ import { HiOutlineMail } from "react-icons/hi"; -import { AiFillGithub, AiFillGoogleCircle, AiOutlineQuestionCircle } from "react-icons/ai"; +import { AiFillGithub, AiOutlineQuestionCircle } from "react-icons/ai"; import { AuthType } from "../../data/enums"; /** @@ -11,8 +11,6 @@ export default function AuthTypeIcon(props: { type: AuthType }) { return ; case AuthType.GitHub: return ; - case AuthType.Google: - return ; } return ; } diff --git a/frontend/src/data/enums/authType.ts b/frontend/src/data/enums/authType.ts index 53e5ffd73..efa8f7602 100644 --- a/frontend/src/data/enums/authType.ts +++ b/frontend/src/data/enums/authType.ts @@ -4,5 +4,4 @@ export enum AuthType { Email = "email", GitHub = "github", - Google = "google", } From 6e39e712c71507f3f02d3e5beeda8fc10ff54939 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 4 May 2022 22:40:02 +0200 Subject: [PATCH 080/649] better checks for input fields of create project --- .../CreateProjectPage/CreateProjectPage.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index 60237f313..4aa5d304b 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -5,7 +5,7 @@ import { CenterContainer, Center, CancelButton, - CenterTitle + CenterTitle, } from "./styles"; import { createProject } from "../../../utils/api/projects"; import { useState } from "react"; @@ -98,6 +98,16 @@ export default function CreateProjectPage() { { + if (name === "") { + alert("Project name must be filled in"); + return; + } + + if (isNaN(numberOfStudents)) { + alert("Number of students must be filled in"); + return; + } + const coachIds: number[] = []; coaches.forEach(coachToAdd => { coachIds.push(coachToAdd.userId); From db2bd5f4cef77348e00dfca3b465c623f9e9b40f Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 5 May 2022 15:12:34 +0200 Subject: [PATCH 081/649] Live filtering. No request when all data was already fetched. --- .../ProjectsComponents/ProjectTable.tsx | 2 +- .../ProjectsPage/ProjectsPage.tsx | 57 ++++++++++++++++--- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/ProjectTable.tsx b/frontend/src/components/ProjectsComponents/ProjectTable.tsx index bf4c21eaf..96bc19100 100644 --- a/frontend/src/components/ProjectsComponents/ProjectTable.tsx +++ b/frontend/src/components/ProjectsComponents/ProjectTable.tsx @@ -20,7 +20,7 @@ export default function ProjectTable(props: { projects: Project[]; loading: boolean; gotData: boolean; - getMoreProjects: (page: number) => void; + getMoreProjects: () => void; moreProjectsAvailable: boolean; removeProject: (project: Project) => void; error: string | undefined; diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index 9da93683c..d1b4e94f1 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -1,6 +1,6 @@ import { useState } from "react"; import { getProjects } from "../../../utils/api/projects"; -import { CreateButton, SearchButton, SearchField, OwnProject } from "./styles"; +import { CreateButton, SearchField, OwnProject } from "./styles"; import { Project } from "../../../data/interfaces"; import ProjectTable from "../../../components/ProjectsComponents/ProjectTable"; import { useNavigate, useParams } from "react-router-dom"; @@ -12,10 +12,12 @@ import { Role } from "../../../data/enums"; * You can filter on your own projects or filter on project name. */ export default function ProjectPage() { + const [allProjects, setAllProjects] = useState([]); const [projects, setProjects] = useState([]); const [gotProjects, setGotProjects] = useState(false); const [loading, setLoading] = useState(false); const [moreProjectsAvailable, setMoreProjectsAvailable] = useState(true); // Endpoint has more coaches available + const [allProjectsFetched, setAllProjectsFetched] = useState(false); const [error, setError] = useState(undefined); // Keep track of the set filters @@ -33,10 +35,21 @@ export default function ProjectPage() { /** * Used to fetch the projects */ - async function callProjects() { + async function loadProjects() { if (loading) { return; } + + if (allProjectsFetched) { + setProjects( + allProjects.filter(project => + project.name.toUpperCase().includes(searchString.toUpperCase()) + ) + ); + setMoreProjectsAvailable(false); + return; + } + setLoading(true); try { const response = await getProjects(editionId, searchString, ownProjects, page); @@ -49,6 +62,18 @@ export default function ProjectPage() { } else { setProjects(projects.concat(response.projects)); } + + if (searchString === "") { + if (response.projects.length === 0) { + setAllProjectsFetched(true); + } + if (page === 0) { + setAllProjects(response.projects); + } else { + setAllProjects(allProjects.concat(response.projects)); + } + } + setPage(page + 1); setGotProjects(true); } else { @@ -60,10 +85,14 @@ export default function ProjectPage() { setLoading(false); } - async function refreshProjects() { + /** + * Reset fetched projects + */ + function refreshProjects() { setProjects([]); setPage(0); setMoreProjectsAvailable(true); + setAllProjectsFetched(false); setGotProjects(false); } @@ -79,18 +108,28 @@ export default function ProjectPage() { ); } + /** + * Filter the projects by name + * @param searchTerm + */ + function filter(searchTerm: string) { + setPage(0); + setGotProjects(false); + setMoreProjectsAvailable(true); + setSearchString(searchTerm); + setProjects([]); + } + return (
setSearchString(e.target.value)} - placeholder="project name" - onKeyDown={e => { - if (e.key === "Enter") refreshProjects(); + onChange={e => { + filter(e.target.value); }} + placeholder="project name" /> - Search {role === Role.ADMIN && ( navigate("/editions/" + editionId + "/projects/new")} @@ -113,7 +152,7 @@ export default function ProjectPage() { projects={projects} loading={loading} gotData={gotProjects} - getMoreProjects={callProjects} + getMoreProjects={loadProjects} moreProjectsAvailable={moreProjectsAvailable} removeProject={removeProject} error={error} From a432eae92b06ddd9ba53b00c41b712092b4535ed Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 5 May 2022 15:56:04 +0200 Subject: [PATCH 082/649] Live filtering. No request when all data was already fetched. --- .../UsersComponents/Coaches/Coaches.tsx | 6 +-- frontend/src/utils/api/users/users.ts | 1 - frontend/src/views/UsersPage/UsersPage.tsx | 43 +++++++++++++++---- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/UsersComponents/Coaches/Coaches.tsx b/frontend/src/components/UsersComponents/Coaches/Coaches.tsx index eb8b0fd3b..745050ae7 100644 --- a/frontend/src/components/UsersComponents/Coaches/Coaches.tsx +++ b/frontend/src/components/UsersComponents/Coaches/Coaches.tsx @@ -1,7 +1,7 @@ import React from "react"; import { CoachesTitle, CoachesContainer } from "./styles"; import { User } from "../../../utils/api/users/users"; -import { Error, SearchButton } from "../Requests/styles"; +import { Error } from "../Requests/styles"; import { CoachList, AddCoach } from "./CoachesComponents"; import { SearchInput } from "../../styles"; @@ -54,11 +54,7 @@ export default function Coaches(props: { props.searchCoaches(e.target.value)} - onKeyDown={e => { - if (e.key === "Enter") props.refreshCoaches(); - }} /> - Search {table} diff --git a/frontend/src/utils/api/users/users.ts b/frontend/src/utils/api/users/users.ts index bf790f2c6..acde5f1eb 100644 --- a/frontend/src/utils/api/users/users.ts +++ b/frontend/src/utils/api/users/users.ts @@ -54,7 +54,6 @@ export async function getUsersExcludeEdition( const response = await axiosInstance.get( `/users/?page=${page}&exclude_edition=${edition}&name=${name}` ); - console.log(response.data); return response.data as UsersList; } const response = await axiosInstance.get(`/users/?exclude_edition=${edition}&page=${page}`); diff --git a/frontend/src/views/UsersPage/UsersPage.tsx b/frontend/src/views/UsersPage/UsersPage.tsx index 98e84f11d..13fde5a42 100644 --- a/frontend/src/views/UsersPage/UsersPage.tsx +++ b/frontend/src/views/UsersPage/UsersPage.tsx @@ -12,11 +12,13 @@ import { getCoaches } from "../../utils/api/users/coaches"; */ function UsersPage() { // Note: The coaches are not in the coaches component because accepting a request needs to refresh the coaches list. + const [allCoaches, setAllCoaches] = useState([]); const [coaches, setCoaches] = useState([]); // All coaches from the selected edition const [loading, setLoading] = useState(false); // Waiting for data (used for spinner) const [gotData, setGotData] = useState(false); // Received data const [error, setError] = useState(""); // Error message const [moreCoachesAvailable, setMoreCoachesAvailable] = useState(true); // Endpoint has more coaches available + const [allCoachesFetched, setAllCoachesFetched] = useState(false); const [searchTerm, setSearchTerm] = useState(""); // The word set in filter for coachlist const [page, setPage] = useState(0); // The next page to request @@ -30,18 +32,41 @@ function UsersPage() { if (loading) { return; } + + if (allCoachesFetched) { + setCoaches( + allCoaches.filter(coach => + coach.name.toUpperCase().includes(searchTerm.toUpperCase()) + ) + ); + setMoreCoachesAvailable(false); + return; + } + setLoading(true); setError(""); try { - const coachResponse = await getCoaches(params.editionId as string, searchTerm, page); - if (coachResponse.users.length === 0) { + const response = await getCoaches(params.editionId as string, searchTerm, page); + if (response.users.length === 0) { setMoreCoachesAvailable(false); } if (page === 0) { - setCoaches(coachResponse.users); + setCoaches(response.users); } else { - setCoaches(coaches.concat(coachResponse.users)); + setCoaches(coaches.concat(response.users)); } + + if (searchTerm === "") { + if (response.users.length === 0) { + setAllCoachesFetched(true); + } + if (page === 0) { + setAllCoaches(response.users); + } else { + setAllCoaches(allCoaches.concat(response.users)); + } + } + setPage(page + 1); setGotData(true); } catch (exception) { @@ -56,10 +81,11 @@ function UsersPage() { * @param searchTerm The string to filter coaches with by username. */ function filterCoachesData(searchTerm: string) { + setPage(0); + setGotData(false); + setMoreCoachesAvailable(true); setSearchTerm(searchTerm); - if (searchTerm === "") { - refreshCoaches(); - } + setCoaches([]); } /** @@ -69,8 +95,9 @@ function UsersPage() { function refreshCoaches() { setCoaches([]); setPage(0); - setMoreCoachesAvailable(true); + setAllCoachesFetched(false); setGotData(false); + setMoreCoachesAvailable(true); } /** From e029ae9bd3fefdf9ec18ce072ce4c7f417bff103 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 5 May 2022 16:16:20 +0200 Subject: [PATCH 083/649] Live filtering. No request when all data was already fetched. --- .../UsersComponents/Requests/Requests.tsx | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/UsersComponents/Requests/Requests.tsx b/frontend/src/components/UsersComponents/Requests/Requests.tsx index f42994ac2..66a66c7a2 100644 --- a/frontend/src/components/UsersComponents/Requests/Requests.tsx +++ b/frontend/src/components/UsersComponents/Requests/Requests.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import Collapsible from "react-collapsible"; -import { RequestsContainer, Error, RequestListContainer, SearchButton } from "./styles"; +import { RequestsContainer, Error, RequestListContainer } from "./styles"; import { getRequests, Request } from "../../../utils/api/users/requests"; import { RequestList, RequestsHeader } from "./RequestsComponents"; import { SearchInput } from "../../styles"; @@ -12,6 +12,7 @@ import { SearchInput } from "../../styles"; * @param props.refreshCoaches A function which will be called when a new coach is added */ export default function Requests(props: { edition: string; refreshCoaches: () => void }) { + const [allRequests, setAllRequests] = useState([]); const [requests, setRequests] = useState([]); // All requests after filter const [loading, setLoading] = useState(false); // Waiting for data const [searchTerm, setSearchTerm] = useState(""); // The word set in the filter @@ -19,6 +20,7 @@ export default function Requests(props: { edition: string; refreshCoaches: () => const [open, setOpen] = useState(false); // Collapsible is open const [error, setError] = useState(""); // Error message const [moreRequestsAvailable, setMoreRequestsAvailable] = useState(true); // Endpoint has more requests available + const [allRequestsFetched, setAllRequestsFetched] = useState(false); const [page, setPage] = useState(0); // The next page which needs to be fetched /** @@ -33,6 +35,11 @@ export default function Requests(props: { edition: string; refreshCoaches: () => return object !== request; }) ); + setAllRequests( + allRequests.filter(object => { + return object !== request; + }) + ); if (accepted) { props.refreshCoaches(); } @@ -46,6 +53,17 @@ export default function Requests(props: { edition: string; refreshCoaches: () => if (loading) { return; } + + if (allRequestsFetched) { + setRequests( + allRequests.filter(request => + request.user.name.toUpperCase().includes(searchTerm.toUpperCase()) + ) + ); + setMoreRequestsAvailable(false); + return; + } + setLoading(true); setError(""); try { @@ -58,6 +76,18 @@ export default function Requests(props: { edition: string; refreshCoaches: () => } else { setRequests(requests.concat(response.requests)); } + + if (searchTerm === "") { + if (response.requests.length === 0) { + setAllRequestsFetched(true); + } + if (page === 0) { + setAllRequests(response.requests); + } else { + setAllRequests(allRequests.concat(response.requests)); + } + } + setPage(page + 1); setGotData(true); } catch (exception) { @@ -66,14 +96,12 @@ export default function Requests(props: { edition: string; refreshCoaches: () => setLoading(false); } - /** - * Delete all found request and reset searching - */ - function refresh() { - setRequests([]); + function filter(searchTerm: string) { setPage(0); - setMoreRequestsAvailable(true); setGotData(false); + setMoreRequestsAvailable(true); + setSearchTerm(searchTerm); + setRequests([]); } let list; @@ -102,16 +130,9 @@ export default function Requests(props: { edition: string; refreshCoaches: () => { - setSearchTerm(e.target.value); - if (e.target.value === "") { - refresh(); - } - }} - onKeyDown={e => { - if (e.key === "Enter") refresh(); + filter(e.target.value); }} /> - Search {list} From 6cc4b15f0c35c563eff617c50c93edc8fb75b6f1 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 5 May 2022 22:53:14 +0200 Subject: [PATCH 084/649] Infinite scroll and filters --- frontend/src/utils/api/mail_overview.ts | 78 ++----- .../MailOverviewPage/MailOverviewPage.tsx | 197 ++++++++++-------- 2 files changed, 126 insertions(+), 149 deletions(-) diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts index 6316ec8de..b8a565a64 100644 --- a/frontend/src/utils/api/mail_overview.ts +++ b/frontend/src/utils/api/mail_overview.ts @@ -1,11 +1,11 @@ import { Email, Student } from "../../data/interfaces"; -import { ChangeEvent } from "react"; import { EmailType } from "../../data/enums"; import { axiosInstance } from "./api"; + /** * A student together with its email history */ -interface StudentEmail { +export interface StudentEmail { student: Student; emails: Email[]; } @@ -22,54 +22,32 @@ export interface StudentEmails { */ export async function getMailOverview( edition: string | undefined, - page: number + page: number, + name: string, + filters: EmailType[] ): Promise { - const FormatFilters: string[] = finalFilters.map(filter => { + const FormatFilters: string[] = filters.map(filter => { return `&email_status=${Object.values(EmailType).indexOf(filter)}`; }); const concatted: string = FormatFilters.join(""); + const response = await axiosInstance.get( - `/editions/${edition}/students/emails?page=${page}&name=${finalSearch}${concatted}` + `/editions/${edition}/students/emails?page=${page}&name=${name}${concatted}` ); return response.data as StudentEmails; } -const selectedRows: number[] = []; - -/** - * Keeps the selectedRows list up-to-date when a student is selected/unselected in the table - * @param row - * @param isSelect - */ -export function handleSelect(row: StudentEmail, isSelect: boolean) { - if (isSelect) { - selectedRows.push(row.student.studentId); - } else { - selectedRows.splice( - selectedRows.findIndex(item => item === row.student.studentId), - 1 - ); - } -} - -/** - * Does the same as handleSelect, but for multiple rows at the same time - * @param isSelect - * @param rows - */ -export function handleSelectAll(isSelect: boolean, rows: StudentEmail[]) { - for (const row of rows) { - handleSelect(row, isSelect); - } -} - /** * Updates the Email state of the currently selected students in the table to the selected state * from the dropdown menu * @param eventKey * @param edition */ -export async function setStateRequest(eventKey: string | null, edition: string | undefined) { +export async function setStateRequest( + eventKey: string | null, + edition: string | undefined, + selectedRows: number[] +) { // post request with selected data console.log(selectedRows); await axiosInstance.post(`/editions/${edition}/students/emails`, { @@ -79,33 +57,3 @@ export async function setStateRequest(eventKey: string | null, edition: string | // remove all selections selectedRows.splice(0, selectedRows.length); } - -let selectedFilters: EmailType[] = []; -/** - * Keeps track of the selected filters - * @param selectedList - */ -export function handleFilterSelect(selectedList: EmailType[]) { - selectedFilters = selectedList; -} - -let searchTerm: string = ""; - -/** - * Keeps track of the search value - * @param event - */ -export function handleSetSearch(event: ChangeEvent<{ value: string }>) { - searchTerm = event.target.value; -} - -let finalFilters: EmailType[] = []; -let finalSearch: string = ""; - -/** - * Sets the definitive search term and filters to be sent - */ -export function setFinalFilters() { - finalFilters = selectedFilters; - finalSearch = searchTerm; -} diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index 84cf687ae..7c0858f9c 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -1,89 +1,101 @@ import React, { useState } from "react"; -import { - getMailOverview, - StudentEmails, - handleSelect, - handleSelectAll, - setStateRequest, - handleFilterSelect, - handleSetSearch, - setFinalFilters, -} from "../../utils/api/mail_overview"; +import { getMailOverview, setStateRequest, StudentEmail } from "../../utils/api/mail_overview"; import BootstrapTable from "react-bootstrap-table-next"; import DropdownButton from "react-bootstrap/DropdownButton"; import Dropdown from "react-bootstrap/Dropdown"; import InputGroup from "react-bootstrap/InputGroup"; -import Button from "react-bootstrap/Button"; import FormControl from "react-bootstrap/FormControl"; import InfiniteScroll from "react-infinite-scroller"; import { Multiselect } from "multiselect-react-dropdown"; -import { - TableDiv, - DropDownButtonDiv, - SearchDiv, - FilterDiv, - SearchAndFilterDiv, - ButtonDiv, -} from "./styles"; +import { TableDiv, DropDownButtonDiv, SearchDiv, FilterDiv, SearchAndFilterDiv } from "./styles"; import { EmailType } from "../../data/enums"; +import { SpinnerContainer, Error } from "../../components/UsersComponents/Requests/styles"; import { useParams } from "react-router-dom"; +import { Spinner } from "react-bootstrap"; /** * Page that shows the email status of all students, with the possibility to change the status */ export default function MailOverviewPage() { - const init: StudentEmails = { - studentEmails: [], - }; - const [table, setTable] = useState(init); - const [keyval, setKeyval] = useState(0); + const [emails, setEmails] = useState([]); + const [gotEmails, setGotEmails] = useState(false); + const [loading, setLoading] = useState(false); const [moreEmailsAvailable, setMoreEmailsAvailable] = useState(true); // Endpoint has more emails available + const [error, setError] = useState(undefined); + const [page, setPage] = useState(0); + + // Keep track of the set filters + const [searhTerm, setSearchTerm] = useState(""); + const [filters, setFilters] = useState([]); + + const [selectedRows, setSelectedRows] = useState([]); + const { editionId } = useParams(); /** * update the table with new values * @param page */ - async function updateMailOverview(page: number) { + async function updateMailOverview() { + if (loading) { + return; + } + + setLoading(true); + try { - const studentEmails = await getMailOverview(editionId, page); - if (studentEmails.studentEmails.length === 0) { + const response = await getMailOverview(editionId, page, searhTerm, filters); + + if (response.studentEmails.length === 0) { setMoreEmailsAvailable(false); } - if (page === 0) { - setTable(studentEmails); + setEmails(response.studentEmails); } else { - setTable(prevState => ({ - studentEmails: [...prevState.studentEmails, ...studentEmails.studentEmails], - })); + setEmails(emails.concat(response.studentEmails)); } + + setPage(page + 1); + setGotEmails(true); } catch (exception) { - console.log(exception); + setError("Oops, something went wrong..."); } + setLoading(false); } - /** - * update the table with the search term and filters - */ - function handleDoSearch() { - setFinalFilters(); - // need to update the key of the component to refresh it - setKeyval(keyval + 2); + function searchName(newSearchTerm: string) { + setPage(0); + setGotEmails(false); setMoreEmailsAvailable(true); - updateMailOverview(0); + setSearchTerm(newSearchTerm); + setEmails([]); + } + + function changeFilter(newFilter: EmailType[]) { + setPage(0); + setGotEmails(false); + setMoreEmailsAvailable(true); + setFilters(newFilter); + setEmails([]); } /** - * handle selecting a new email state - * @param eventKey + * Keeps the selectedRows list up-to-date when a student is selected/unselected in the table + * @param row + * @param isSelect */ - async function handleSetState(eventKey: string | null) { - await setStateRequest(eventKey, editionId); - // need to update the key of the component to refresh it - setKeyval(keyval + 2); - setMoreEmailsAvailable(true); - updateMailOverview(0); + function selectNewRow(row: StudentEmail, isSelect: boolean) { + if (isSelect) { + setSelectedRows(selectedRows.concat(row.student.studentId)); + } else { + setSelectedRows(selectedRows.filter(item => item !== row.student.studentId)); + } + } + + function selectAll(isSelect: boolean, rows: StudentEmail[]) { + for (const row of rows) { + selectNewRow(row, isSelect); + } } const columns = [ @@ -111,6 +123,46 @@ export default function MailOverviewPage() { }, ]; + let table; + if (error) { + table = {error}; + } else if (gotEmails && emails.length === 0) { + table =
No emails found.
; + } else { + table = ( + + + + + } + initialLoad={true} + useWindow={false} + getScrollParent={() => document.getElementById("root")} + > + + + + ); + } + + // TODO: Change state + return ( <> @@ -118,10 +170,15 @@ export default function MailOverviewPage() { id="dropdown-setstate-button" title="Set state of selected students" menuVariant="dark" - onSelect={handleSetState} > {Object.values(EmailType).map((type, index) => ( - + + setStateRequest(index.toString(), editionId, selectedRows) + } + > {type} ))} @@ -133,11 +190,8 @@ export default function MailOverviewPage() { { - if (event.key === "Enter") { - return handleDoSearch(); - } + onChange={e => { + searchName(e.target.value); }} /> @@ -147,38 +201,13 @@ export default function MailOverviewPage() { placeholder="Filter on Email State" showArrow={true} isObject={false} - onRemove={handleFilterSelect} - onSelect={handleFilterSelect} + onRemove={changeFilter} + onSelect={changeFilter} options={Object.values(EmailType)} /> - - - - - - - - + {table} ); } From 5b3066259fab9f3c01bbdb4d60073f73bdc2b8f0 Mon Sep 17 00:00:00 2001 From: beguille Date: Fri, 6 May 2022 11:58:20 +0200 Subject: [PATCH 085/649] all functions use async db calls --- backend/src/app/logic/invites.py | 17 +-- backend/src/app/logic/projects.py | 24 ++-- backend/src/app/logic/projects_students.py | 56 ++++---- backend/src/app/logic/register.py | 18 +-- backend/src/app/logic/security.py | 6 +- backend/src/app/logic/skills.py | 15 +- backend/src/app/logic/students.py | 29 ++-- backend/src/app/logic/suggestions.py | 25 ++-- backend/src/app/logic/users.py | 44 +++--- backend/src/app/logic/webhooks.py | 8 +- .../app/routers/editions/invites/invites.py | 14 +- .../app/routers/editions/projects/projects.py | 26 ++-- .../projects/students/projects_students.py | 18 +-- .../app/routers/editions/register/register.py | 6 +- .../app/routers/editions/students/students.py | 33 ++--- .../students/suggestions/suggestions.py | 18 +-- .../app/routers/editions/webhooks/webhooks.py | 14 +- backend/src/app/routers/login/login.py | 12 +- backend/src/app/routers/skills/skills.py | 14 +- backend/src/app/routers/users/users.py | 38 +++--- backend/src/app/utils/dependencies.py | 26 ++-- backend/src/database/crud/editions.py | 7 +- backend/src/database/crud/invites.py | 45 +++--- backend/src/database/crud/projects.py | 100 +++++++++----- .../src/database/crud/projects_students.py | 44 +++--- backend/src/database/crud/register.py | 14 +- backend/src/database/crud/skills.py | 23 ++-- backend/src/database/crud/students.py | 67 +++++---- backend/src/database/crud/suggestions.py | 50 ++++--- backend/src/database/crud/users.py | 128 ++++++++++-------- backend/src/database/crud/webhooks.py | 11 +- 31 files changed, 513 insertions(+), 437 deletions(-) diff --git a/backend/src/app/logic/invites.py b/backend/src/app/logic/invites.py index 028a0b121..408b0b374 100644 --- a/backend/src/app/logic/invites.py +++ b/backend/src/app/logic/invites.py @@ -1,6 +1,6 @@ import base64 -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession import settings import src.database.crud.invites as crud @@ -9,22 +9,23 @@ from src.database.models import Edition, InviteLink as InviteLinkDB -def delete_invite_link(db: Session, invite_link: InviteLinkDB): +async def delete_invite_link(db: AsyncSession, invite_link: InviteLinkDB): """Delete an invite link from the database""" - crud.delete_invite_link(db, invite_link) + await crud.delete_invite_link(db, invite_link) -def get_pending_invites_page(db: Session, edition: Edition, page: int) -> InvitesLinkList: +async def get_pending_invites_page(db: AsyncSession, edition: Edition, page: int) -> InvitesLinkList: """Query the database for a list of invite links and wrap the result in a pydantic model""" - return InvitesLinkList(invite_links=crud.get_pending_invites_for_edition_page(db, edition, page)) + invite_page = await crud.get_pending_invites_for_edition_page(db, edition, page) + return InvitesLinkList(invite_links=invite_page) -def create_mailto_link(db: Session, edition: Edition, email_address: EmailAddress) -> NewInviteLink: +async def create_mailto_link(db: AsyncSession, edition: Edition, email_address: EmailAddress) -> NewInviteLink: """Add a new invite link into the database & return a mailto link for it""" # Create db entry, drop existing. - invite = crud.get_optional_invite_link_by_edition_and_email(db, edition, email_address.email) + invite = await crud.get_optional_invite_link_by_edition_and_email(db, edition, email_address.email) if invite is None: - invite = crud.create_invite_link(db, edition, email_address.email) + invite = await crud.create_invite_link(db, edition, email_address.email) # Add edition name & encode with base64 encoded_uuid = f"{invite.edition.name}/{invite.uuid}".encode("utf-8") diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index a733f143f..338e62998 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession import src.database.crud.projects as crud from src.app.schemas.projects import ( @@ -7,29 +7,31 @@ from src.database.models import Edition, Project, User -def get_project_list(db: Session, edition: Edition, search_params: QueryParamsProjects, user: User) -> ProjectList: +async def get_project_list(db: AsyncSession, edition: Edition, search_params: QueryParamsProjects, + user: User) -> ProjectList: """Returns a list of all projects from a certain edition""" - return ProjectList(projects=crud.get_projects_for_edition_page(db, edition, search_params, user)) + proj_page = await crud.get_projects_for_edition_page(db, edition, search_params, user) + return ProjectList(projects=proj_page) -def create_project(db: Session, edition: Edition, input_project: InputProject) -> Project: +async def create_project(db: AsyncSession, edition: Edition, input_project: InputProject) -> Project: """Create a new project""" - return crud.add_project(db, edition, input_project) + return await crud.add_project(db, edition, input_project) -def delete_project(db: Session, project_id: int): +async def delete_project(db: AsyncSession, project_id: int): """Delete a project""" - crud.delete_project(db, project_id) + await crud.delete_project(db, project_id) -def patch_project(db: Session, project_id: int, input_project: InputProject): +async def patch_project(db: AsyncSession, project_id: int, input_project: InputProject): """Make changes to a project""" - crud.patch_project(db, project_id, input_project) + await crud.patch_project(db, project_id, input_project) -def get_conflicts(db: Session, edition: Edition) -> ConflictStudentList: +async def get_conflicts(db: AsyncSession, edition: Edition) -> ConflictStudentList: """Returns a list of all students together with the projects they are causing a conflict for""" - conflicts = crud.get_conflict_students(db, edition) + conflicts = await crud.get_conflict_students(db, edition) conflicts_model = [] for student, projects in conflicts: conflicts_model.append(ConflictStudent(student=student, projects=projects)) diff --git a/backend/src/app/logic/projects_students.py b/backend/src/app/logic/projects_students.py index 12abaf612..e05bfe0e0 100644 --- a/backend/src/app/logic/projects_students.py +++ b/backend/src/app/logic/projects_students.py @@ -1,4 +1,5 @@ -from sqlalchemy.orm import Session +from sqlalchemy import select, func +from sqlalchemy.ext.asyncio import AsyncSession import src.app.logic.projects as logic_projects import src.database.crud.projects_students as crud @@ -7,62 +8,71 @@ from src.database.models import Project, ProjectRole, Student, Skill -def remove_student_project(db: Session, project: Project, student_id: int): +async def remove_student_project(db: AsyncSession, project: Project, student_id: int): """Remove a student from a project""" - crud.remove_student_project(db, project, student_id) + await crud.remove_student_project(db, project, student_id) -def add_student_project(db: Session, project: Project, student_id: int, skill_id: int, drafter_id: int): +async def add_student_project(db: AsyncSession, project: Project, student_id: int, skill_id: int, drafter_id: int): """Add a student to a project""" # check this project-skill combination does not exist yet - if db.query(ProjectRole).where(ProjectRole.skill_id == skill_id).where(ProjectRole.project == project) \ - .count() > 0: + subquery = select(ProjectRole).where(ProjectRole.skill_id == skill_id).where(ProjectRole.project == project)\ + .subquery() + count = (await db.execute(select(func.count()).select_from(subquery))).scalar_one() + if count > 0: raise FailedToAddProjectRoleException # check that the student has the skill - student = db.query(Student).where(Student.student_id == student_id).one() - skill = db.query(Skill).where(Skill.skill_id == skill_id).one() + student = (await db.execute(select(Student).where(Student.student_id == student_id))).scalar_one() + skill = (await db.execute(select(Skill).where(Skill.skill_id == skill_id))).scalar_one() if skill not in student.skills: raise FailedToAddProjectRoleException # check that the student has not been confirmed in another project yet - if db.query(ProjectRole).where(ProjectRole.student == student).where(ProjectRole.definitive.is_(True)).count() > 0: + subquery_proj_definitive = select(ProjectRole).where(ProjectRole.student == student)\ + .where(ProjectRole.definitive.is_(True)).subquery() + count_proj_definitive = (await db.execute(select(func.count()).select_from(subquery_proj_definitive))).scalar_one() + if count_proj_definitive > 0: raise FailedToAddProjectRoleException # check that the project requires the skill - project = db.query(Project).where(Project.project_id == project.project_id).one() + project = (await db.execute(select(Project).where(Project.project_id == project.project_id))).scalar_one() if skill not in project.skills: raise FailedToAddProjectRoleException - crud.add_student_project(db, project, student_id, skill_id, drafter_id) + await crud.add_student_project(db, project, student_id, skill_id, drafter_id) -def change_project_role(db: Session, project: Project, student_id: int, skill_id: int, drafter_id: int): +async def change_project_role(db: AsyncSession, project: Project, student_id: int, skill_id: int, drafter_id: int): """Change the role of the student in the project""" # check this project-skill combination does not exist yet - if db.query(ProjectRole).where(ProjectRole.skill_id == skill_id).where(ProjectRole.project == project) \ - .count() > 0: + subquery = select(ProjectRole).where(ProjectRole.skill_id == skill_id).where(ProjectRole.project == project) \ + .subquery() + count = (await db.execute(select(func.count()).select_from(subquery))).scalar_one() + if count > 0: raise FailedToAddProjectRoleException # check that the student has the skill - student = db.query(Student).where(Student.student_id == student_id).one() - skill = db.query(Skill).where(Skill.skill_id == skill_id).one() + student = (await db.execute(select(Student).where(Student.student_id == student_id))).scalar_one() + skill = (await db.execute(select(Skill).where(Skill.skill_id == skill_id))).scalar_one() if skill not in student.skills: raise FailedToAddProjectRoleException # check that the student has not been confirmed in another project yet - if db.query(ProjectRole).where(ProjectRole.student == student).where( - ProjectRole.definitive.is_(True)).count() > 0: + subquery_proj_definitive = select(ProjectRole).where(ProjectRole.student == student) \ + .where(ProjectRole.definitive.is_(True)).subquery() + count_proj_definitive = (await db.execute(select(func.count()).select_from(subquery_proj_definitive))).scalar_one() + if count_proj_definitive > 0: raise FailedToAddProjectRoleException # check that the project requires the skill - project = db.query(Project).where(Project.project_id == project.project_id).one() + project = (await db.execute(select(Project).where(Project.project_id == project.project_id))).scalar_one() if skill not in project.skills: raise FailedToAddProjectRoleException - crud.change_project_role(db, project, student_id, skill_id, drafter_id) + await crud.change_project_role(db, project, student_id, skill_id, drafter_id) -def confirm_project_role(db: Session, project: Project, student_id: int): +async def confirm_project_role(db: AsyncSession, project: Project, student_id: int): """Definitively bind this student to the project""" # check if there are any conflicts concerning this student - conflict_list: ConflictStudentList = logic_projects.get_conflicts(db, project.edition) + conflict_list: ConflictStudentList = await logic_projects.get_conflicts(db, project.edition) for conflict in conflict_list.conflict_students: if conflict.student.student_id == student_id: raise StudentInConflictException - crud.confirm_project_role(db, project, student_id) + await crud.confirm_project_role(db, project, student_id) diff --git a/backend/src/app/logic/register.py b/backend/src/app/logic/register.py index 9a48ffa95..888f7a29a 100644 --- a/backend/src/app/logic/register.py +++ b/backend/src/app/logic/register.py @@ -1,5 +1,5 @@ import sqlalchemy.exc -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from src.app.exceptions.register import FailedToAddNewUserException from src.app.logic.security import get_password_hash @@ -9,19 +9,19 @@ from src.database.models import Edition, InviteLink -def create_request(db: Session, new_user: NewUser, edition: Edition) -> None: +async def create_request(db: AsyncSession, new_user: NewUser, edition: Edition) -> None: """Create a coach request. If something fails, the changes aren't committed""" - invite_link: InviteLink = get_invite_link_by_uuid(db, new_user.uuid) + invite_link: InviteLink = await get_invite_link_by_uuid(db, new_user.uuid) try: # Make all functions in here not commit anymore, # so we can roll back at the end if we have to - user = create_user(db, new_user.name, commit=False) - create_auth_email(db, user, get_password_hash(new_user.pw), new_user.email, commit=False) - create_coach_request(db, user, edition, commit=False) - delete_invite_link(db, invite_link, commit=False) + user = await create_user(db, new_user.name, commit=False) + await create_auth_email(db, user, get_password_hash(new_user.pw), new_user.email, commit=False) + await create_coach_request(db, user, edition, commit=False) + await delete_invite_link(db, invite_link, commit=False) - db.commit() + await db.commit() except sqlalchemy.exc.SQLAlchemyError as exception: - db.rollback() + await db.rollback() raise FailedToAddNewUserException from exception diff --git a/backend/src/app/logic/security.py b/backend/src/app/logic/security.py index 22fd39d60..1a25c8914 100644 --- a/backend/src/app/logic/security.py +++ b/backend/src/app/logic/security.py @@ -3,7 +3,7 @@ from jose import jwt from passlib.context import CryptContext -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession import settings from src.app.exceptions.authentication import InvalidCredentialsException @@ -54,9 +54,9 @@ def get_password_hash(password: str) -> str: return pwd_context.hash(password) -def authenticate_user(db: Session, email: str, password: str) -> models.User: +async def authenticate_user(db: AsyncSession, email: str, password: str) -> models.User: """Match an email/password combination to a User model""" - user = get_user_by_email(db, email) + user = await get_user_by_email(db, email) if user.email_auth.pw_hash is None or not verify_password(password, user.email_auth.pw_hash): raise InvalidCredentialsException() diff --git a/backend/src/app/logic/skills.py b/backend/src/app/logic/skills.py index 19a86d308..7440c6376 100644 --- a/backend/src/app/logic/skills.py +++ b/backend/src/app/logic/skills.py @@ -1,11 +1,11 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession import src.database.crud.skills as crud_skills from src.app.schemas.skills import SkillBase, SkillList from src.database.models import Skill -def get_skills(db: Session) -> SkillList: +async def get_skills(db: AsyncSession) -> SkillList: """Get a list of all the base skills that can be added to a student or project. Args: @@ -14,10 +14,11 @@ def get_skills(db: Session) -> SkillList: Returns: SkillList: an object with a list of all the skills. """ - return SkillList(skills=crud_skills.get_skills(db)) + skills = await crud_skills.get_skills(db) + return SkillList(skills=skills) -def create_skill(db: Session, skill: SkillBase) -> Skill: +async def create_skill(db: AsyncSession, skill: SkillBase) -> Skill: """Add a new skill into the database. Args: @@ -27,14 +28,14 @@ def create_skill(db: Session, skill: SkillBase) -> Skill: Returns: Skill: returns the new skill. """ - return crud_skills.create_skill(db, skill) + return await crud_skills.create_skill(db, skill) -def delete_skill(db: Session, skill_id: int): +async def delete_skill(db: AsyncSession, skill_id: int): """Delete an existing skill. Args: skill_id (int): the id of the skill. db (Session): connection with the database. """ - crud_skills.delete_skill(db, skill_id) + await crud_skills.delete_skill(db, skill_id) diff --git a/backend/src/app/logic/students.py b/backend/src/app/logic/students.py index d506fbe8d..369bcc0e3 100644 --- a/backend/src/app/logic/students.py +++ b/backend/src/app/logic/students.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm.exc import NoResultFound from src.app.schemas.students import NewDecision @@ -17,25 +17,26 @@ ListReturnStudentMailList) -def definitive_decision_on_student(db: Session, student: Student, decision: NewDecision) -> None: +async def definitive_decision_on_student(db: AsyncSession, student: Student, decision: NewDecision) -> None: """Set a definitive decion on a student""" - set_definitive_decision_on_student(db, student, decision.decision) + await set_definitive_decision_on_student(db, student, decision.decision) -def remove_student(db: Session, student: Student) -> None: +async def remove_student(db: AsyncSession, student: Student) -> None: """delete a student""" - delete_student(db, student) + await delete_student(db, student) -def get_students_search(db: Session, edition: Edition, commons: CommonQueryParams) -> ReturnStudentList: +async def get_students_search(db: AsyncSession, edition: Edition, commons: CommonQueryParams) -> ReturnStudentList: """return all students""" if commons.skill_ids: + # TODO: make skills async skills: list[Skill] = get_skills_by_ids(db, commons.skill_ids) if len(skills) != len(commons.skill_ids): return ReturnStudentList(students=[]) else: skills = [] - students_orm = get_students(db, edition, commons, skills) + students_orm = await get_students(db, edition, commons, skills) students: list[StudentModel] = [] for student in students_orm: @@ -70,31 +71,31 @@ def get_student_return(student: Student, edition: Edition) -> ReturnStudent: raise NoResultFound -def get_emails_of_student(db: Session, edition: Edition, student: Student) -> ReturnStudentMailList: +async def get_emails_of_student(db: AsyncSession, edition: Edition, student: Student) -> ReturnStudentMailList: """returns all mails of a student""" if student.edition != edition: raise NoResultFound - emails: list[DecisionEmail] = get_emails(db, student) + emails: list[DecisionEmail] = await get_emails(db, student) return ReturnStudentMailList(emails=emails, student=student) -def make_new_email(db: Session, edition: Edition, new_email: NewEmail) -> ListReturnStudentMailList: +async def make_new_email(db: AsyncSession, edition: Edition, new_email: NewEmail) -> ListReturnStudentMailList: """make a new email""" student_emails: list[ReturnStudentMailList] = [] for student_id in new_email.students_id: - student: Student = get_student_by_id(db, student_id) + student: Student = await get_student_by_id(db, student_id) if student.edition == edition: - email: DecisionEmail = create_email(db, student, new_email.email_status) + email: DecisionEmail = await create_email(db, student, new_email.email_status) student_emails.append( ReturnStudentMailList(student=student, emails=[email]) ) return ListReturnStudentMailList(student_emails=student_emails) -def last_emails_of_students(db: Session, edition: Edition, +async def last_emails_of_students(db: AsyncSession, edition: Edition, commons: EmailsSearchQueryParams) -> ListReturnStudentMailList: """get last emails of students with search params""" - emails: list[DecisionEmail] = get_last_emails_of_students( + emails: list[DecisionEmail] = await get_last_emails_of_students( db, edition, commons) student_emails: list[ReturnStudentMailList] = [] for email in emails: diff --git a/backend/src/app/logic/suggestions.py b/backend/src/app/logic/suggestions.py index d2b0a6771..f5f1423db 100644 --- a/backend/src/app/logic/suggestions.py +++ b/backend/src/app/logic/suggestions.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from src.app.schemas.suggestion import NewSuggestion from src.database.crud.suggestions import ( @@ -8,49 +8,50 @@ from src.app.exceptions.authentication import MissingPermissionsException -def make_new_suggestion(db: Session, new_suggestion: NewSuggestion, - user: User, student_id: int | None) -> SuggestionResponse: +async def make_new_suggestion(db: AsyncSession, new_suggestion: NewSuggestion, + user: User, student_id: int | None) -> SuggestionResponse: """"Make a new suggestion""" - own_suggestion = get_own_suggestion(db, student_id, user.user_id) + own_suggestion = await get_own_suggestion(db, student_id, user.user_id) if own_suggestion is None: - suggestion_orm = create_suggestion( + suggestion_orm = await create_suggestion( db, user.user_id, student_id, new_suggestion.suggestion, new_suggestion.argumentation) else: - update_suggestion(db, own_suggestion, new_suggestion.suggestion, new_suggestion.argumentation) + await update_suggestion(db, own_suggestion, new_suggestion.suggestion, new_suggestion.argumentation) suggestion_orm = own_suggestion suggestion = suggestion_model_to_schema(suggestion_orm) return SuggestionResponse(suggestion=suggestion) -def all_suggestions_of_student(db: Session, student_id: int | None) -> SuggestionListResponse: +async def all_suggestions_of_student(db: AsyncSession, student_id: int | None) -> SuggestionListResponse: """Get all suggestions of a student""" - suggestions_orm = get_suggestions_of_student(db, student_id) + suggestions_orm = await get_suggestions_of_student(db, student_id) all_suggestions = [] for suggestion in suggestions_orm: all_suggestions.append(suggestion_model_to_schema(suggestion)) return SuggestionListResponse(suggestions=all_suggestions) -def remove_suggestion(db: Session, suggestion: Suggestion, user: User) -> None: +async def remove_suggestion(db: AsyncSession, suggestion: Suggestion, user: User) -> None: """ Delete a suggestion Admins can delete all suggestions, coaches only their own suggestions """ if user.admin or suggestion.coach == user: - delete_suggestion(db, suggestion) + await delete_suggestion(db, suggestion) else: raise MissingPermissionsException -def change_suggestion(db: Session, new_suggestion: NewSuggestion, suggestion: Suggestion, user: User) -> None: +async def change_suggestion(db: AsyncSession, new_suggestion: NewSuggestion, suggestion: Suggestion, + user: User) -> None: """ Update a suggestion Admins can update all suggestions, coaches only their own suggestions """ if user.admin or suggestion.coach == user: - update_suggestion( + await update_suggestion( db, suggestion, new_suggestion.suggestion, new_suggestion.argumentation) else: raise MissingPermissionsException diff --git a/backend/src/app/logic/users.py b/backend/src/app/logic/users.py index 52ded0361..5f31d027d 100644 --- a/backend/src/app/logic/users.py +++ b/backend/src/app/logic/users.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession import src.database.crud.users as users_crud from src.app.schemas.users import UsersListResponse, AdminPatch, UserRequestsResponse, user_model_to_schema, \ @@ -6,8 +6,8 @@ from src.database.models import User -def get_users_list( - db: Session, +async def get_users_list( + db: AsyncSession, params: FilterParameters ) -> UsersListResponse: """ @@ -15,46 +15,46 @@ def get_users_list( and wrap the result in a pydantic model """ - users_orm = users_crud.get_users_filtered_page(db, params) + users_orm = await users_crud.get_users_filtered_page(db, params) return UsersListResponse(users=[user_model_to_schema(user) for user in users_orm]) -def get_user_editions(db: Session, user: User) -> list[str]: +async def get_user_editions(db: AsyncSession, user: User) -> list[str]: """Get all names of the editions this user is coach in""" - return users_crud.get_user_edition_names(db, user) + return await users_crud.get_user_edition_names(db, user) -def edit_admin_status(db: Session, user_id: int, admin: AdminPatch): +async def edit_admin_status(db: AsyncSession, user_id: int, admin: AdminPatch): """ Edit the admin-status of a user """ - users_crud.edit_admin_status(db, user_id, admin.admin) + await users_crud.edit_admin_status(db, user_id, admin.admin) -def add_coach(db: Session, user_id: int, edition_name: str): +async def add_coach(db: AsyncSession, user_id: int, edition_name: str): """ Add user as coach for the given edition """ - users_crud.add_coach(db, user_id, edition_name) - users_crud.remove_request_if_exists(db, user_id, edition_name) + await users_crud.add_coach(db, user_id, edition_name) + await users_crud.remove_request_if_exists(db, user_id, edition_name) -def remove_coach(db: Session, user_id: int, edition_name: str): +async def remove_coach(db: AsyncSession, user_id: int, edition_name: str): """ Remove user as coach for the given edition """ - users_crud.remove_coach(db, user_id, edition_name) + await users_crud.remove_coach(db, user_id, edition_name) -def remove_coach_all_editions(db: Session, user_id: int): +async def remove_coach_all_editions(db: AsyncSession, user_id: int): """ Remove user as coach from all editions """ - users_crud.remove_coach_all_editions(db, user_id) + await users_crud.remove_coach_all_editions(db, user_id) -def get_request_list(db: Session, edition_name: str | None, user_name: str | None, page: int) -> UserRequestsResponse: +async def get_request_list(db: AsyncSession, edition_name: str | None, user_name: str | None, page: int) -> UserRequestsResponse: """ Query the database for a list of all user requests and wrap the result in a pydantic model @@ -64,9 +64,9 @@ def get_request_list(db: Session, edition_name: str | None, user_name: str | Non user_name = "" if edition_name is None: - requests = users_crud.get_requests_page(db, page, user_name) + requests = await users_crud.get_requests_page(db, page, user_name) else: - requests = users_crud.get_requests_for_edition_page(db, edition_name, page, user_name) + requests = await users_crud.get_requests_for_edition_page(db, edition_name, page, user_name) requests_model = [] for request in requests: @@ -76,15 +76,15 @@ def get_request_list(db: Session, edition_name: str | None, user_name: str | Non return UserRequestsResponse(requests=requests_model) -def accept_request(db: Session, request_id: int): +async def accept_request(db: AsyncSession, request_id: int): """ Accept user request """ - users_crud.accept_request(db, request_id) + await users_crud.accept_request(db, request_id) -def reject_request(db: Session, request_id: int): +async def reject_request(db: AsyncSession, request_id: int): """ Reject user request """ - users_crud.reject_request(db, request_id) + await users_crud.reject_request(db, request_id) diff --git a/backend/src/app/logic/webhooks.py b/backend/src/app/logic/webhooks.py index 15f89db6f..e58983b7f 100644 --- a/backend/src/app/logic/webhooks.py +++ b/backend/src/app/logic/webhooks.py @@ -1,7 +1,7 @@ from typing import cast import sqlalchemy.exc -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from settings import FormMapping from src.app.exceptions.webhooks import WebhookProcessException @@ -10,7 +10,7 @@ from src.database.models import Question as QuestionModel, QuestionAnswer, QuestionFileAnswer, Student, Edition -def process_webhook(edition: Edition, data: WebhookEvent, database: Session): +async def process_webhook(edition: Edition, data: WebhookEvent, database: AsyncSession): """ Process webhook data @@ -65,12 +65,12 @@ def process_webhook(edition: Edition, data: WebhookEvent, database: Session): process_remaining_questions(student, extra_questions, database) try: - database.commit() + await database.commit() except sqlalchemy.exc.IntegrityError as error: raise WebhookProcessException('Unique Check Failed') from error -def process_remaining_questions(student: Student, questions: list[Question], database: Session): +def process_remaining_questions(student: Student, questions: list[Question], database: AsyncSession): """Process all remaining questions""" for question in questions: diff --git a/backend/src/app/routers/editions/invites/invites.py b/backend/src/app/routers/editions/invites/invites.py index 4f2bc798d..9e756243b 100644 --- a/backend/src/app/routers/editions/invites/invites.py +++ b/backend/src/app/routers/editions/invites/invites.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, Depends -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from starlette.responses import Response @@ -14,30 +14,30 @@ @invites_router.get("/", response_model=InvitesLinkList, dependencies=[Depends(require_admin)]) -async def get_invites(db: Session = Depends(get_session), edition: Edition = Depends(get_edition), page: int = 0): +async def get_invites(db: AsyncSession = Depends(get_session), edition: Edition = Depends(get_edition), page: int = 0): """ Get a list of all pending invitation links. """ - return get_pending_invites_page(db, edition, page) + return await get_pending_invites_page(db, edition, page) @invites_router.post("/", status_code=status.HTTP_201_CREATED, response_model=NewInviteLink, dependencies=[Depends(require_admin)]) -async def create_invite(email: EmailAddress, db: Session = Depends(get_session), +async def create_invite(email: EmailAddress, db: AsyncSession = Depends(get_session), edition: Edition = Depends(get_latest_edition)): """ Create a new invitation link for the current edition. """ - return create_mailto_link(db, edition, email) + return await create_mailto_link(db, edition, email) @invites_router.delete("/{invite_uuid}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response, dependencies=[Depends(require_admin), Depends(get_edition)]) -async def delete_invite(invite_link: InviteLinkDB = Depends(get_invite_link), db: Session = Depends(get_session)): +async def delete_invite(invite_link: InviteLinkDB = Depends(get_invite_link), db: AsyncSession = Depends(get_session)): """ Delete an existing invitation link manually so that it can't be used anymore. """ - delete_invite_link(db, invite_link) + await delete_invite_link(db, invite_link) @invites_router.get("/{invite_uuid}", response_model=InviteLinkModel, dependencies=[Depends(get_edition)]) diff --git a/backend/src/app/routers/editions/projects/projects.py b/backend/src/app/routers/editions/projects/projects.py index 0c55a326c..808c33d26 100644 --- a/backend/src/app/routers/editions/projects/projects.py +++ b/backend/src/app/routers/editions/projects/projects.py @@ -1,13 +1,13 @@ from fastapi import APIRouter, Depends -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from starlette.responses import Response import src.app.logic.projects as logic from src.app.routers.tags import Tags -from src.app.utils.dependencies import get_edition, get_project, require_admin, require_coach, get_latest_edition from src.app.schemas.projects import (ProjectList, Project, InputProject, ConflictStudentList, QueryParamsProjects) +from src.app.utils.dependencies import get_edition, get_project, require_admin, require_coach, get_latest_edition from src.database.database import get_session from src.database.models import Edition, Project as ProjectModel, User from .students import project_students_router @@ -17,42 +17,42 @@ @projects_router.get("/", response_model=ProjectList) -async def get_projects(db: Session = Depends(get_session), edition: Edition = Depends(get_edition), +async def get_projects(db: AsyncSession = Depends(get_session), edition: Edition = Depends(get_edition), search_params: QueryParamsProjects = Depends(QueryParamsProjects), user: User = Depends(require_coach)): """ Get a list of all projects. """ - return logic.get_project_list(db, edition, search_params, user) + return await logic.get_project_list(db, edition, search_params, user) @projects_router.post("/", status_code=status.HTTP_201_CREATED, response_model=Project, dependencies=[Depends(require_admin)]) async def create_project(input_project: InputProject, - db: Session = Depends(get_session), edition: Edition = Depends(get_latest_edition)): + db: AsyncSession = Depends(get_session), edition: Edition = Depends(get_latest_edition)): """ Create a new project """ - return logic.create_project(db, edition, - input_project) + return await logic.create_project(db, edition, + input_project) @projects_router.get("/conflicts", response_model=ConflictStudentList, dependencies=[Depends(require_coach)]) -async def get_conflicts(db: Session = Depends(get_session), edition: Edition = Depends(get_edition)): +async def get_conflicts(db: AsyncSession = Depends(get_session), edition: Edition = Depends(get_edition)): """ Get a list of all projects with conflicts, and the users that are causing those conflicts. """ - return logic.get_conflicts(db, edition) + return await logic.get_conflicts(db, edition) @projects_router.delete("/{project_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response, dependencies=[Depends(require_admin)]) -async def delete_project(project_id: int, db: Session = Depends(get_session)): +async def delete_project(project_id: int, db: AsyncSession = Depends(get_session)): """ Delete a specific project. """ - return logic.delete_project(db, project_id) + return await logic.delete_project(db, project_id) @projects_router.get("/{project_id}", status_code=status.HTTP_200_OK, response_model=Project, @@ -66,8 +66,8 @@ async def get_project_route(project: ProjectModel = Depends(get_project)): @projects_router.patch("/{project_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response, dependencies=[Depends(require_admin), Depends(get_latest_edition)]) -async def patch_project(project_id: int, input_project: InputProject, db: Session = Depends(get_session)): +async def patch_project(project_id: int, input_project: InputProject, db: AsyncSession = Depends(get_session)): """ Update a project, changing some fields. """ - logic.patch_project(db, project_id, input_project) + await logic.patch_project(db, project_id, input_project) diff --git a/backend/src/app/routers/editions/projects/students/projects_students.py b/backend/src/app/routers/editions/projects/students/projects_students.py index 9839ed979..186be4f9b 100644 --- a/backend/src/app/routers/editions/projects/students/projects_students.py +++ b/backend/src/app/routers/editions/projects/students/projects_students.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, Depends -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from starlette.responses import Response @@ -15,42 +15,42 @@ @project_students_router.delete("/{student_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response, dependencies=[Depends(require_coach)]) -async def remove_student_from_project(student_id: int, db: Session = Depends(get_session), +async def remove_student_from_project(student_id: int, db: AsyncSession = Depends(get_session), project: Project = Depends(get_project)): """ Remove a student from a project. """ - logic.remove_student_project(db, project, student_id) + await logic.remove_student_project(db, project, student_id) @project_students_router.patch("/{student_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response, dependencies=[Depends(get_latest_edition)]) -async def change_project_role(student_id: int, input_sr: InputStudentRole, db: Session = Depends(get_session), +async def change_project_role(student_id: int, input_sr: InputStudentRole, db: AsyncSession = Depends(get_session), project: Project = Depends(get_project), user: User = Depends(require_coach)): """ Change the role a student is drafted for in a project. """ - logic.change_project_role(db, project, student_id, input_sr.skill_id, user.user_id) + await logic.change_project_role(db, project, student_id, input_sr.skill_id, user.user_id) @project_students_router.post("/{student_id}", status_code=status.HTTP_201_CREATED, response_class=Response, dependencies=[Depends(get_latest_edition)]) -async def add_student_to_project(student_id: int, input_sr: InputStudentRole, db: Session = Depends(get_session), +async def add_student_to_project(student_id: int, input_sr: InputStudentRole, db: AsyncSession = Depends(get_session), project: Project = Depends(get_project), user: User = Depends(require_coach)): """ Add a student to a project. This is not a definitive decision, but represents a coach drafting the student. """ - logic.add_student_project(db, project, student_id, input_sr.skill_id, user.user_id) + await logic.add_student_project(db, project, student_id, input_sr.skill_id, user.user_id) @project_students_router.post("/{student_id}/confirm", status_code=status.HTTP_204_NO_CONTENT, response_class=Response, dependencies=[Depends(require_admin), Depends(get_latest_edition)]) -async def confirm_project_role(student_id: int, db: Session = Depends(get_session), +async def confirm_project_role(student_id: int, db: AsyncSession = Depends(get_session), project: Project = Depends(get_project)): """ Definitively add a student to a project (confirm its role). This can only be performed by an admin. """ - logic.confirm_project_role(db, project, student_id) + await logic.confirm_project_role(db, project, student_id) diff --git a/backend/src/app/routers/editions/register/register.py b/backend/src/app/routers/editions/register/register.py index e008c13b6..685ee51d0 100644 --- a/backend/src/app/routers/editions/register/register.py +++ b/backend/src/app/routers/editions/register/register.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, Depends -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.app.logic.register import create_request @@ -13,9 +13,9 @@ @registration_router.post("/email", status_code=status.HTTP_201_CREATED) -async def register_email(user: NewUser, db: Session = Depends(get_session), +async def register_email(user: NewUser, db: AsyncSession = Depends(get_session), edition: Edition = Depends(get_latest_edition)): """ Register a new account using the email/password format. """ - create_request(db, user, edition) + await create_request(db, user, edition) diff --git a/backend/src/app/routers/editions/students/students.py b/backend/src/app/routers/editions/students/students.py index 076b43222..791664658 100644 --- a/backend/src/app/routers/editions/students/students.py +++ b/backend/src/app/routers/editions/students/students.py @@ -1,16 +1,16 @@ from fastapi import APIRouter, Depends -from sqlalchemy.orm import Session - +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status -from src.app.routers.tags import Tags -from src.app.utils.dependencies import get_student, get_edition, require_admin, require_auth + from src.app.logic.students import ( definitive_decision_on_student, remove_student, get_student_return, get_students_search, get_emails_of_student, make_new_email, last_emails_of_students) +from src.app.routers.tags import Tags from src.app.schemas.students import (NewDecision, CommonQueryParams, ReturnStudent, ReturnStudentList, ReturnStudentMailList, NewEmail, EmailsSearchQueryParams, ListReturnStudentMailList) +from src.app.utils.dependencies import get_student, get_edition, require_admin, require_auth from src.database.database import get_session from src.database.models import Student, Edition from .suggestions import students_suggestions_router @@ -21,40 +21,41 @@ @students_router.get("/", dependencies=[Depends(require_auth)], response_model=ReturnStudentList) -async def get_students(db: Session = Depends(get_session), +async def get_students(db: AsyncSession = Depends(get_session), commons: CommonQueryParams = Depends(CommonQueryParams), edition: Edition = Depends(get_edition)): """ Get a list of all students. """ - return get_students_search(db, edition, commons) + return await get_students_search(db, edition, commons) @students_router.post("/emails", dependencies=[Depends(require_admin)], status_code=status.HTTP_201_CREATED, response_model=ListReturnStudentMailList) -async def send_emails(new_email: NewEmail, db: Session = Depends(get_session), edition: Edition = Depends(get_edition)): +async def send_emails(new_email: NewEmail, db: AsyncSession = Depends(get_session), + edition: Edition = Depends(get_edition)): """ Send a email to a list of students. """ - return make_new_email(db, edition, new_email) + return await make_new_email(db, edition, new_email) @students_router.get("/emails", dependencies=[Depends(require_admin)], response_model=ListReturnStudentMailList) -async def get_emails(db: Session = Depends(get_session), edition: Edition = Depends(get_edition), +async def get_emails(db: AsyncSession = Depends(get_session), edition: Edition = Depends(get_edition), commons: EmailsSearchQueryParams = Depends(EmailsSearchQueryParams)): """ Get last emails of students """ - return last_emails_of_students(db, edition, commons) + return await last_emails_of_students(db, edition, commons) @students_router.delete("/{student_id}", dependencies=[Depends(require_admin)], status_code=status.HTTP_204_NO_CONTENT) -async def delete_student(student: Student = Depends(get_student), db: Session = Depends(get_session)): +async def delete_student(student: Student = Depends(get_student), db: AsyncSession = Depends(get_session)): """ Delete all information stored about a specific student. """ - remove_student(db, student) + await remove_student(db, student) @students_router.get("/{student_id}", dependencies=[Depends(require_auth)], response_model=ReturnStudent) @@ -68,21 +69,21 @@ async def get_student_by_id(edition: Edition = Depends(get_edition), student: St @students_router.put("/{student_id}/decision", dependencies=[Depends(require_admin)], status_code=status.HTTP_204_NO_CONTENT) async def make_decision(decision: NewDecision, student: Student = Depends(get_student), - db: Session = Depends(get_session)): + db: AsyncSession = Depends(get_session)): """ Make a finalized Yes/Maybe/No decision about a student. This action can only be performed by an admin. """ - definitive_decision_on_student(db, student, decision) + await definitive_decision_on_student(db, student, decision) @students_router.get("/{student_id}/emails", dependencies=[Depends(require_admin)], response_model=ReturnStudentMailList) async def get_student_email_history(edition: Edition = Depends(get_edition), student: Student = Depends(get_student), - db: Session = Depends(get_session)): + db: AsyncSession = Depends(get_session)): """ Get the history of all Yes/Maybe/No emails that have been sent to a specific student so far. """ - return get_emails_of_student(db, edition, student) + return await get_emails_of_student(db, edition, student) diff --git a/backend/src/app/routers/editions/students/suggestions/suggestions.py b/backend/src/app/routers/editions/students/suggestions/suggestions.py index 7fa06def7..980c36194 100644 --- a/backend/src/app/routers/editions/students/suggestions/suggestions.py +++ b/backend/src/app/routers/editions/students/suggestions/suggestions.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, Depends -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.app.routers.tags import Tags @@ -17,39 +17,39 @@ @students_suggestions_router.post("/", status_code=status.HTTP_201_CREATED, response_model=SuggestionResponse) async def create_suggestion(new_suggestion: NewSuggestion, student: Student = Depends(get_student), - db: Session = Depends(get_session), user: User = Depends(require_auth)): + db: AsyncSession = Depends(get_session), user: User = Depends(require_auth)): """ Make a suggestion about a student. In case you've already made a suggestion previously, this replaces the existing suggestion. This simplifies the process in frontend, so we can just send a new request without making an edit interface. """ - return make_new_suggestion(db, new_suggestion, user, student.student_id) + return await make_new_suggestion(db, new_suggestion, user, student.student_id) @students_suggestions_router.delete("/{suggestion_id}", status_code=status.HTTP_204_NO_CONTENT) -async def delete_suggestion(db: Session = Depends(get_session), user: User = Depends(require_auth), +async def delete_suggestion(db: AsyncSession = Depends(get_session), user: User = Depends(require_auth), suggestion: Suggestion = Depends(get_suggestion)): """ Delete a suggestion you made about a student. """ - remove_suggestion(db, suggestion, user) + await remove_suggestion(db, suggestion, user) @students_suggestions_router.put("/{suggestion_id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(get_student)]) -async def edit_suggestion(new_suggestion: NewSuggestion, db: Session = Depends(get_session), +async def edit_suggestion(new_suggestion: NewSuggestion, db: AsyncSession = Depends(get_session), user: User = Depends(require_auth), suggestion: Suggestion = Depends(get_suggestion)): """ Edit a suggestion you made about a student. """ - change_suggestion(db, new_suggestion, suggestion, user) + await change_suggestion(db, new_suggestion, suggestion, user) @students_suggestions_router.get("/", dependencies=[Depends(require_auth)], status_code=status.HTTP_200_OK, response_model=SuggestionListResponse) -async def get_suggestions(student: Student = Depends(get_student), db: Session = Depends(get_session)): +async def get_suggestions(student: Student = Depends(get_student), db: AsyncSession = Depends(get_session)): """ Get all suggestions of a student. """ - return all_suggestions_of_student(db, student.student_id) + return await all_suggestions_of_student(db, student.student_id) diff --git a/backend/src/app/routers/editions/webhooks/webhooks.py b/backend/src/app/routers/editions/webhooks/webhooks.py index 9a687aa7f..8414517ce 100644 --- a/backend/src/app/routers/editions/webhooks/webhooks.py +++ b/backend/src/app/routers/editions/webhooks/webhooks.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, Depends -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.app.logic.webhooks import process_webhook @@ -13,23 +13,23 @@ webhooks_router = APIRouter(prefix="/webhooks", tags=[Tags.WEBHOOKS]) -def valid_uuid(uuid: str, database: Session = Depends(get_session)): +async def valid_uuid(uuid: str, database: AsyncSession = Depends(get_session)): """Verify if uuid is a valid uuid""" - get_webhook(database, uuid) + await get_webhook(database, uuid) @webhooks_router.post("/", response_model=WebhookUrlResponse, status_code=status.HTTP_201_CREATED, dependencies=[Depends(require_admin)]) -def new(edition: Edition = Depends(get_latest_edition), database: Session = Depends(get_session)): +async def new(edition: Edition = Depends(get_latest_edition), database: AsyncSession = Depends(get_session)): """Create a new webhook for an edition""" - return create_webhook(database, edition) + return await create_webhook(database, edition) @webhooks_router.post("/{uuid}", dependencies=[Depends(valid_uuid)], status_code=status.HTTP_201_CREATED) -def webhook(data: WebhookEvent, edition: Edition = Depends(get_edition), database: Session = Depends(get_session)): +async def webhook(data: WebhookEvent, edition: Edition = Depends(get_edition), database: AsyncSession = Depends(get_session)): """Receive a webhook event, This is triggered by Tally""" try: - process_webhook(edition, data, database) + await process_webhook(edition, data, database) except Exception as exception: # When processing fails, write the webhook data to a file to make sure it is not lost. with open(f'failed-webhook-{data.event_id}.json', 'w', encoding='utf-8') as file: diff --git a/backend/src/app/routers/login/login.py b/backend/src/app/routers/login/login.py index 093f5cd13..72ee813d7 100644 --- a/backend/src/app/routers/login/login.py +++ b/backend/src/app/routers/login/login.py @@ -2,7 +2,7 @@ from fastapi import APIRouter from fastapi import Depends from fastapi.security import OAuth2PasswordRequestForm -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from src.app.exceptions.authentication import InvalidCredentialsException from src.app.logic.security import authenticate_user, create_tokens @@ -18,10 +18,10 @@ @login_router.post("/token", response_model=Token) -async def login_for_access_token(db: Session = Depends(get_session), form_data: OAuth2PasswordRequestForm = Depends()): +async def login_for_access_token(db: AsyncSession = Depends(get_session), form_data: OAuth2PasswordRequestForm = Depends()): """Called when logging in, generates an access token to use in other functions""" try: - user = authenticate_user(db, form_data.username, form_data.password) + user = await authenticate_user(db, form_data.username, form_data.password) except sqlalchemy.exc.NoResultFound as not_found: # Don't use our own error handler here because this should # be a 401 instead of a 404 @@ -31,7 +31,7 @@ async def login_for_access_token(db: Session = Depends(get_session), form_data: @login_router.post("/refresh", response_model=Token) -async def refresh_access_token(db: Session = Depends(get_session), user: User = Depends(get_user_from_refresh_token)): +async def refresh_access_token(db: AsyncSession = Depends(get_session), user: User = Depends(get_user_from_refresh_token)): """ Return a new access & refresh token using on the old refresh token @@ -40,14 +40,14 @@ async def refresh_access_token(db: Session = Depends(get_session), user: User = return await generate_token_response_for_user(db, user) -async def generate_token_response_for_user(db: Session, user: User) -> Token: +async def generate_token_response_for_user(db: AsyncSession, user: User) -> Token: """ Generate new tokens for a user and put them in the Token response schema. """ access_token, refresh_token = create_tokens(user) user_data: dict = user_model_to_schema(user).__dict__ - user_data["editions"] = get_user_editions(db, user) + user_data["editions"] = await get_user_editions(db, user) return Token( access_token=access_token, diff --git a/backend/src/app/routers/skills/skills.py b/backend/src/app/routers/skills/skills.py index 2da8892b5..8ed2c9afd 100644 --- a/backend/src/app/routers/skills/skills.py +++ b/backend/src/app/routers/skills/skills.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, Depends -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.app.logic import skills as logic_skills @@ -12,7 +12,7 @@ @skills_router.get("/", response_model=SkillList, tags=[Tags.SKILLS], dependencies=[Depends(require_auth)]) -async def get_skills(db: Session = Depends(get_session)): +async def get_skills(db: AsyncSession = Depends(get_session)): """Get a list of all the base skills that can be added to a student or project. Args: @@ -21,12 +21,12 @@ async def get_skills(db: Session = Depends(get_session)): Returns: SkillList: an object with a list of all the skills. """ - return logic_skills.get_skills(db) + return await logic_skills.get_skills(db) @skills_router.post("/", status_code=status.HTTP_201_CREATED, response_model=Skill, tags=[Tags.SKILLS], dependencies=[Depends(require_auth)]) -async def create_skill(skill: SkillBase, db: Session = Depends(get_session)): +async def create_skill(skill: SkillBase, db: AsyncSession = Depends(get_session)): """Add a new skill into the database. Args: @@ -36,16 +36,16 @@ async def create_skill(skill: SkillBase, db: Session = Depends(get_session)): Returns: Skill: returns the new skill. """ - return logic_skills.create_skill(db, skill) + return await logic_skills.create_skill(db, skill) @skills_router.delete("/{skill_id}", status_code=status.HTTP_204_NO_CONTENT, tags=[Tags.SKILLS], dependencies=[Depends(require_auth)]) -async def delete_skill(skill_id: int, db: Session = Depends(get_session)): +async def delete_skill(skill_id: int, db: AsyncSession = Depends(get_session)): """Delete an existing skill. Args: skill_id (int): the id of the skill. db (Session, optional): connection with the database. Defaults to Depends(get_session). """ - logic_skills.delete_skill(db, skill_id) + await logic_skills.delete_skill(db, skill_id) diff --git a/backend/src/app/routers/users/users.py b/backend/src/app/routers/users/users.py index 04452dc5d..b0e830913 100644 --- a/backend/src/app/routers/users/users.py +++ b/backend/src/app/routers/users/users.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, Query, Depends -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status import src.app.logic.users as logic @@ -17,58 +17,58 @@ @users_router.get("/", response_model=UsersListResponse, dependencies=[Depends(require_admin)]) async def get_users( params: FilterParameters = Depends(), - db: Session = Depends(get_session)): + db: AsyncSession = Depends(get_session)): """ Get users When the admin parameter is True, the edition and exclude_edition parameter will have no effect. Since admins have access to all editions. """ - return logic.get_users_list(db, params) + return await logic.get_users_list(db, params) @users_router.get("/current", response_model=UserData) -async def get_current_user(db: Session = Depends(get_session), user: UserDB = Depends(get_user_from_access_token)): +async def get_current_user(db: AsyncSession = Depends(get_session), user: UserDB = Depends(get_user_from_access_token)): """Get a user based on their authorization credentials""" user_data = user_model_to_schema(user).__dict__ - user_data["editions"] = logic.get_user_editions(db, user) + user_data["editions"] = await logic.get_user_editions(db, user) return user_data @users_router.patch("/{user_id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_admin)]) -async def patch_admin_status(user_id: int, admin: AdminPatch, db: Session = Depends(get_session)): +async def patch_admin_status(user_id: int, admin: AdminPatch, db: AsyncSession = Depends(get_session)): """ Set admin-status of user """ - logic.edit_admin_status(db, user_id, admin) + await logic.edit_admin_status(db, user_id, admin) @users_router.post("/{user_id}/editions/{edition_name}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_admin)]) -async def add_to_edition(user_id: int, edition_name: str, db: Session = Depends(get_session)): +async def add_to_edition(user_id: int, edition_name: str, db: AsyncSession = Depends(get_session)): """ Add user as coach of the given edition """ - logic.add_coach(db, user_id, edition_name) + await logic.add_coach(db, user_id, edition_name) @users_router.delete("/{user_id}/editions/{edition_name}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_admin)]) -async def remove_from_edition(user_id: int, edition_name: str, db: Session = Depends(get_session)): +async def remove_from_edition(user_id: int, edition_name: str, db: AsyncSession = Depends(get_session)): """ Remove user as coach of the given edition """ - logic.remove_coach(db, user_id, edition_name) + await logic.remove_coach(db, user_id, edition_name) @users_router.delete("/{user_id}/editions", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_admin)]) -async def remove_from_all_editions(user_id: int, db: Session = Depends(get_session)): +async def remove_from_all_editions(user_id: int, db: AsyncSession = Depends(get_session)): """ Remove user as coach from all editions """ - logic.remove_coach_all_editions(db, user_id) + await logic.remove_coach_all_editions(db, user_id) @users_router.get("/requests", response_model=UserRequestsResponse, dependencies=[Depends(require_admin)]) @@ -76,26 +76,26 @@ async def get_requests( edition: str | None = Query(None), user: str | None = Query(None), page: int = 0, - db: Session = Depends(get_session)): + db: AsyncSession = Depends(get_session)): """ Get pending userrequests """ - return logic.get_request_list(db, edition, user, page) + return await logic.get_request_list(db, edition, user, page) @users_router.post("/requests/{request_id}/accept", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_admin)]) -async def accept_request(request_id: int, db: Session = Depends(get_session)): +async def accept_request(request_id: int, db: AsyncSession = Depends(get_session)): """ Accept a coach request """ - logic.accept_request(db, request_id) + await logic.accept_request(db, request_id) @users_router.post("/requests/{request_id}/reject", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_admin)]) -async def reject_request(request_id: int, db: Session = Depends(get_session)): +async def reject_request(request_id: int, db: AsyncSession = Depends(get_session)): """ Reject a coach request """ - logic.reject_request(db, request_id) + await logic.reject_request(db, request_id) diff --git a/backend/src/app/utils/dependencies.py b/backend/src/app/utils/dependencies.py index 52d247bbb..003b44655 100644 --- a/backend/src/app/utils/dependencies.py +++ b/backend/src/app/utils/dependencies.py @@ -3,7 +3,6 @@ from fastapi.security import OAuth2PasswordBearer from jose import jwt, ExpiredSignatureError, JWTError from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import Session import settings import src.database.crud.projects as crud_projects @@ -26,19 +25,19 @@ async def get_edition(edition_name: str, database: AsyncSession = Depends(get_se return await get_edition_by_name(database, edition_name) -def get_student(student_id: int, database: Session = Depends(get_session)) -> Student: +async def get_student(student_id: int, database: AsyncSession = Depends(get_session)) -> Student: """Get the student from the database, given the id in the path""" - return get_student_by_id(database, student_id) + return await get_student_by_id(database, student_id) -def get_suggestion(suggestion_id: int, database: Session = Depends(get_session)) -> Suggestion: +async def get_suggestion(suggestion_id: int, database: AsyncSession = Depends(get_session)) -> Suggestion: """Get the suggestion from the database, given the id in the path""" - return get_suggestion_by_id(database, suggestion_id) + return await get_suggestion_by_id(database, suggestion_id) -def get_latest_edition(edition: Edition = Depends(get_edition), database: Session = Depends(get_session)) -> Edition: +async def get_latest_edition(edition: Edition = Depends(get_edition), database: AsyncSession = Depends(get_session)) -> Edition: """Checks if the given edition is the latest one (others are read-only) and returns it if it is""" - latest = latest_edition(database) + latest = await latest_edition(database) if edition != latest: raise ReadOnlyEditionException return latest @@ -72,14 +71,15 @@ async def _get_user_from_token(token_type: TokenType, db: AsyncSession, token: s raise InvalidCredentialsException() from jwt_err -async def get_user_from_access_token(db: AsyncSession = Depends(get_session), token: str = Depends(oauth2_scheme)) -> User: +async def get_user_from_access_token(db: AsyncSession = Depends(get_session), + token: str = Depends(oauth2_scheme)) -> User: """Check which user is making a request by decoding its access token This function is used as a dependency for other functions """ return await _get_user_from_token(TokenType.ACCESS, db, token) -async def get_user_from_refresh_token(db: Session = Depends(get_session), token: str = Depends(oauth2_scheme)) -> User: +async def get_user_from_refresh_token(db: AsyncSession = Depends(get_session), token: str = Depends(oauth2_scheme)) -> User: """Check which user is making a request by decoding its refresh token This function is used as a dependency for other functions """ @@ -129,11 +129,11 @@ async def require_coach(edition: Edition = Depends(get_edition), return user -def get_invite_link(invite_uuid: str, db: Session = Depends(get_session)) -> InviteLink: +async def get_invite_link(invite_uuid: str, db: AsyncSession = Depends(get_session)) -> InviteLink: """Get an invite link from the database, given the id in the path""" - return get_invite_link_by_uuid(db, invite_uuid) + return await get_invite_link_by_uuid(db, invite_uuid) -def get_project(project_id: int, db: Session = Depends(get_session)) -> Project: +async def get_project(project_id: int, db: AsyncSession = Depends(get_session)) -> Project: """Get a project from het database, given the id in the path""" - return crud_projects.get_project(db, project_id) + return await crud_projects.get_project(db, project_id) diff --git a/backend/src/database/crud/editions.py b/backend/src/database/crud/editions.py index 9baaffc26..90baf559b 100644 --- a/backend/src/database/crud/editions.py +++ b/backend/src/database/crud/editions.py @@ -1,6 +1,5 @@ -from sqlalchemy import exc, func, select +from sqlalchemy import exc, func, select, desc from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import Session from sqlalchemy.sql import Select from src.app.exceptions.editions import DuplicateInsertException @@ -19,13 +18,13 @@ async def get_edition_by_name(db: AsyncSession, edition_name: str) -> Edition: Returns: Edition: an edition if found else an exception is raised """ - query = select(Edition).where(Edition.name == edition_name) + query = select(Edition).where(Edition.name == edition_name).order_by(desc(Edition.edition_id)) result = await db.execute(query) return result.scalars().one() def _get_editions_query() -> Select: - return select(Edition) + return select(Edition).order_by(desc(Edition.edition_id)) async def get_editions(db: AsyncSession) -> list[Edition]: diff --git a/backend/src/database/crud/invites.py b/backend/src/database/crud/invites.py index 9a794832b..14b1965b0 100644 --- a/backend/src/database/crud/invites.py +++ b/backend/src/database/crud/invites.py @@ -1,53 +1,56 @@ from uuid import UUID - -from sqlalchemy.orm import Session, Query +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.sql import Select from src.app.exceptions.parsing import MalformedUUIDError from src.database.crud.util import paginate from src.database.models import Edition, InviteLink -def create_invite_link(db: Session, edition: Edition, email_address: str) -> InviteLink: +async def create_invite_link(db: AsyncSession, edition: Edition, email_address: str) -> InviteLink: """Create a new invite link""" link = InviteLink(target_email=email_address, edition=edition) db.add(link) - db.commit() + await db.commit() return link -def delete_invite_link(db: Session, invite_link: InviteLink, commit: bool = True): +async def delete_invite_link(db: AsyncSession, invite_link: InviteLink, commit: bool = True): """Delete an invite link from the database""" - db.delete(invite_link) + await db.delete(invite_link) if commit: - db.commit() + await db.commit() -def _get_pending_invites_for_edition_query(db: Session, edition: Edition) -> Query: +def _get_pending_invites_for_edition_query(edition: Edition) -> Select: """Return the query for all InviteLinks linked to a given edition""" - return db.query(InviteLink).where(InviteLink.edition == edition).order_by(InviteLink.invite_link_id) + return select(InviteLink).where(InviteLink.edition == edition).order_by(InviteLink.invite_link_id) -def get_pending_invites_for_edition(db: Session, edition: Edition) -> list[InviteLink]: +async def get_pending_invites_for_edition(db: AsyncSession, edition: Edition) -> list[InviteLink]: """Returns a list with all InviteLinks linked to a given edition""" - return _get_pending_invites_for_edition_query(db, edition).all() + result = await db.execute(_get_pending_invites_for_edition_query(edition)) + return result.scalars().all() -def get_pending_invites_for_edition_page(db: Session, edition: Edition, page: int) -> list[InviteLink]: +async def get_pending_invites_for_edition_page(db: AsyncSession, edition: Edition, page: int) -> list[InviteLink]: """Returns a paginated list with all InviteLinks linked to a given edition""" - return paginate(_get_pending_invites_for_edition_query(db, edition), page).all() + result = await db.execute(paginate(_get_pending_invites_for_edition_query(edition), page)) + return result.scalars().all() -def get_optional_invite_link_by_edition_and_email(db: Session, edition: Edition, email: str) -> InviteLink | None: +async def get_optional_invite_link_by_edition_and_email(db: AsyncSession, edition: Edition, email: str) -> InviteLink | None: """Return an optional invite link by edition and target_email""" - return db\ - .query(InviteLink)\ + query = select(InviteLink)\ .where(InviteLink.edition == edition)\ - .where(InviteLink.target_email == email)\ - .one_or_none() + .where(InviteLink.target_email == email) + result = await db.execute(query) + return result.scalars().one_or_none() -def get_invite_link_by_uuid(db: Session, invite_uuid: str | UUID) -> InviteLink: +async def get_invite_link_by_uuid(db: AsyncSession, invite_uuid: str | UUID) -> InviteLink: """Get an invite link by its id As the ids are auto-generated per row, there's no need to use the Edition from the path parameters as an extra filter @@ -60,4 +63,6 @@ def get_invite_link_by_uuid(db: Session, invite_uuid: str | UUID) -> InviteLink: # If conversion failed, then the input string was not a valid uuid raise MalformedUUIDError(str(invite_uuid)) from value_error - return db.query(InviteLink).where(InviteLink.uuid == invite_uuid).one() + query = select(InviteLink).where(InviteLink.uuid == invite_uuid) + result = await db.execute(query) + return result.scalars().one() diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index 68ac90f66..d5b103699 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -1,46 +1,64 @@ +from sqlalchemy import select from sqlalchemy.exc import NoResultFound -from sqlalchemy.orm import Session, Query +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.sql import Select from src.app.schemas.projects import InputProject, QueryParamsProjects from src.database.crud.util import paginate from src.database.models import Project, Edition, Student, ProjectRole, Skill, User, Partner -def _get_projects_for_edition_query(db: Session, edition: Edition) -> Query: - return db.query(Project).where(Project.edition == edition).order_by(Project.project_id) +def _get_projects_for_edition_query(edition: Edition) -> Select: + return select(Project).where(Project.edition == edition).order_by(Project.project_id) -def get_projects_for_edition(db: Session, edition: Edition) -> list[Project]: +async def get_projects_for_edition(db: AsyncSession, edition: Edition) -> list[Project]: """Returns a list of all projects from a certain edition from the database""" - return _get_projects_for_edition_query(db, edition).all() + result = await db.execute(_get_projects_for_edition_query(edition)) + return result.scalars().all() -def get_projects_for_edition_page(db: Session, edition: Edition, - search_params: QueryParamsProjects, user: User) -> list[Project]: +async def get_projects_for_edition_page(db: AsyncSession, edition: Edition, + search_params: QueryParamsProjects, user: User) -> list[Project]: """Returns a paginated list of all projects from a certain edition from the database""" - query = _get_projects_for_edition_query(db, edition).where( + query = _get_projects_for_edition_query(edition).where( Project.name.contains(search_params.name)) if search_params.coach: query = query.where(Project.project_id.in_([user_project.project_id for user_project in user.projects])) - projects: list[Project] = paginate(query, search_params.page).all() + result = await db.execute(paginate(query, search_params.page)) + projects: list[Project] = result.scalars().all() return projects -def add_project(db: Session, edition: Edition, input_project: InputProject) -> Project: +async def _get_skill_by_id(db_skill: AsyncSession, skill_id: int) -> Skill: + query_skill = select(Skill).where(Skill.skill_id == skill_id) + result_skill = await db_skill.execute(query_skill) + return result_skill.scalars().one() + + +async def _get_coach_by_id(db_coach: AsyncSession, coach_id: int) -> User: + query_coach = select(User).where(User.user_id == coach_id) + result_coach = await db_coach.execute(query_coach) + return result_coach.scalars().one() + + +async def add_project(db: AsyncSession, edition: Edition, input_project: InputProject) -> Project: """ Add a project to the database If there are partner names that are not already in the database, add them """ - skills_obj = [db.query(Skill).where(Skill.skill_id == skill).one() + + skills_obj = [await _get_skill_by_id(db, skill) for skill in input_project.skills] - coaches_obj = [db.query(User).where(User.user_id == coach).one() + coaches_obj = [await _get_coach_by_id(db, coach) for coach in input_project.coaches] partners_obj = [] for partner in input_project.partners: try: - partners_obj.append(db.query(Partner).where( - Partner.name == partner).one()) + query = select(Partner).where(Partner.name == partner) + result = await db.execute(query) + partners_obj.append(result.scalars().one()) except NoResultFound: partner_obj = Partner(name=partner) db.add(partner_obj) @@ -49,43 +67,47 @@ def add_project(db: Session, edition: Edition, input_project: InputProject) -> P edition_id=edition.edition_id, skills=skills_obj, coaches=coaches_obj, partners=partners_obj) db.add(project) - db.commit() + await db.commit() return project -def get_project(db: Session, project_id: int) -> Project: +async def get_project(db: AsyncSession, project_id: int) -> Project: """Query a specific project from the database through its ID""" - return db.query(Project).where(Project.project_id == project_id).one() + query = select(Project).where(Project.project_id == project_id) + result = await db.execute(query) + return result.scalars().one() -def delete_project(db: Session, project_id: int): +async def delete_project(db: AsyncSession, project_id: int): """Delete a specific project from the database""" - proj_roles = db.query(ProjectRole).where( - ProjectRole.project_id == project_id).all() + query = select(ProjectRole).where(ProjectRole.project_id == project_id) + result = await db.execute(query) + proj_roles = result.scalars().all() for proj_role in proj_roles: - db.delete(proj_role) + await db.delete(proj_role) - project = get_project(db, project_id) - db.delete(project) - db.commit() + project = await get_project(db, project_id) + await db.delete(project) + await db.commit() -def patch_project(db: Session, project_id: int, input_project: InputProject): +async def patch_project(db: AsyncSession, project_id: int, input_project: InputProject): """ Change some fields of a Project in the database If there are partner names that are not already in the database, add them """ - project = db.query(Project).where(Project.project_id == project_id).one() + project = get_project(db, project_id) - skills_obj = [db.query(Skill).where(Skill.skill_id == skill).one() + skills_obj = [await _get_skill_by_id(db, skill) for skill in input_project.skills] - coaches_obj = [db.query(User).where(User.user_id == coach).one() + coaches_obj = [await _get_coach_by_id(db, coach) for coach in input_project.coaches] partners_obj = [] for partner in input_project.partners: try: - partners_obj.append(db.query(Partner).where( - Partner.name == partner).one()) + query = select(Partner).where(Partner.name == partner) + result = await db.execute(query) + partners_obj.append(result.scalars().one()) except NoResultFound: partner_obj = Partner(name=partner) db.add(partner_obj) @@ -96,26 +118,30 @@ def patch_project(db: Session, project_id: int, input_project: InputProject): project.skills = skills_obj project.coaches = coaches_obj project.partners = partners_obj - db.commit() + await db.commit() -def get_conflict_students(db: Session, edition: Edition) -> list[tuple[Student, list[Project]]]: +async def get_conflict_students(db: AsyncSession, edition: Edition) -> list[tuple[Student, list[Project]]]: """ Query all students that are causing conflicts for a certain edition Return a ConflictStudent for each student that causes a conflict This class contains a student together with all projects they are causing a conflict for """ - students = db.query(Student).where(Student.edition == edition).all() + query = select(Student).where(Student.edition == edition) + result = await db.execute(query) + students = result.scalars().all() + conflict_students = [] projs = [] for student in students: if len(student.project_roles) > 1: - proj_ids = db.query(ProjectRole.project_id).where( - ProjectRole.student_id == student.student_id).all() + result_proj_ids = await db.execute(select(ProjectRole.project_id) + .where(ProjectRole.student_id == student.student_id)) + proj_ids = result_proj_ids.scalars().all() for proj_id in proj_ids: proj_id = proj_id[0] - proj = db.query(Project).where( - Project.project_id == proj_id).one() + result_proj = await db.execute(select(Project).where(Project.project_id == proj_id)) + proj = result_proj.scalars().one() projs.append(proj) conflict_student = (student, projs) conflict_students.append(conflict_student) diff --git a/backend/src/database/crud/projects_students.py b/backend/src/database/crud/projects_students.py index 5a3ea28b3..3e550a898 100644 --- a/backend/src/database/crud/projects_students.py +++ b/backend/src/database/crud/projects_students.py @@ -1,49 +1,53 @@ -from sqlalchemy.orm import Session +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from src.database.models import Project, ProjectRole, Skill, User, Student -def remove_student_project(db: Session, project: Project, student_id: int): +async def remove_student_project(db: AsyncSession, project: Project, student_id: int): """Remove a student from a project in the database""" - proj_role = db.query(ProjectRole).where( - ProjectRole.student_id == student_id).where(ProjectRole.project == project).one() - db.delete(proj_role) - db.commit() + query = select(ProjectRole).where(ProjectRole.student_id == student_id).where(ProjectRole.project == project) + result = await db.execute(query) + proj_role = result.scalars().one() + await db.delete(proj_role) + await db.commit() -def add_student_project(db: Session, project: Project, student_id: int, skill_id: int, drafter_id: int): +async def add_student_project(db: AsyncSession, project: Project, student_id: int, skill_id: int, drafter_id: int): """Add a student to a project in the database""" # check if all parameters exist in the database - db.query(Skill).where(Skill.skill_id == skill_id).one() - db.query(User).where(User.user_id == drafter_id).one() - db.query(Student).where(Student.student_id == student_id).one() + (await db.execute(select(Skill).where(Skill.skill_id == skill_id))).scalars().one() + (await db.execute(select(User).where(User.user_id == drafter_id))).one() + (await db.execute(select(Student).where(Student.student_id == student_id))).one() proj_role = ProjectRole(student_id=student_id, project_id=project.project_id, skill_id=skill_id, drafter_id=drafter_id) db.add(proj_role) - db.commit() + await db.commit() -def change_project_role(db: Session, project: Project, student_id: int, skill_id: int, drafter_id: int): +async def change_project_role(db: AsyncSession, project: Project, student_id: int, skill_id: int, drafter_id: int): """Change the role of a student in a project and update the drafter""" # check if all parameters exist in the database - db.query(Skill).where(Skill.skill_id == skill_id).one() - db.query(User).where(User.user_id == drafter_id).one() - db.query(Student).where(Student.student_id == student_id).one() + (await db.execute(select(Skill).where(Skill.skill_id == skill_id))).scalars().one() + (await db.execute(select(User).where(User.user_id == drafter_id))).one() + (await db.execute(select(Student).where(Student.student_id == student_id))).one() proj_role = db.query(ProjectRole).where( ProjectRole.student_id == student_id).where(ProjectRole.project == project).one() proj_role.drafter_id = drafter_id proj_role.skill_id = skill_id - db.commit() + await db.commit() -def confirm_project_role(db: Session, project: Project, student_id: int): +async def confirm_project_role(db: AsyncSession, project: Project, student_id: int): """Confirm a project role""" - proj_role = db.query(ProjectRole).where(ProjectRole.student_id == student_id) \ - .where(ProjectRole.project == project).one() + query = select(ProjectRole).where(ProjectRole.student_id == student_id) \ + .where(ProjectRole.project == project) + result = await db.execute(query) + proj_role = result.scalars().one() proj_role.definitive = True - db.commit() + await db.commit() diff --git a/backend/src/database/crud/register.py b/backend/src/database/crud/register.py index 427a2264a..3897a46b6 100644 --- a/backend/src/database/crud/register.py +++ b/backend/src/database/crud/register.py @@ -1,36 +1,36 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from src.database.models import AuthEmail, CoachRequest, User, Edition -def create_user(db: Session, name: str, commit: bool = True) -> User: +async def create_user(db: AsyncSession, name: str, commit: bool = True) -> User: """Create a user""" new_user: User = User(name=name) db.add(new_user) if commit: - db.commit() + await db.commit() return new_user -def create_coach_request(db: Session, user: User, edition: Edition, commit: bool = True) -> CoachRequest: +async def create_coach_request(db: AsyncSession, user: User, edition: Edition, commit: bool = True) -> CoachRequest: """Create a coach request""" coach_request: CoachRequest = CoachRequest(user=user, edition=edition) db.add(coach_request) if commit: - db.commit() + await db.commit() return coach_request -def create_auth_email(db: Session, user: User, pw_hash: str, email: str, commit: bool = True) -> AuthEmail: +async def create_auth_email(db: AsyncSession, user: User, pw_hash: str, email: str, commit: bool = True) -> AuthEmail: """Create a authentication for email""" auth_email: AuthEmail = AuthEmail(user=user, pw_hash=pw_hash, email=email) db.add(auth_email) if commit: - db.commit() + await db.commit() return auth_email diff --git a/backend/src/database/crud/skills.py b/backend/src/database/crud/skills.py index 4d9e72289..8d66dd402 100644 --- a/backend/src/database/crud/skills.py +++ b/backend/src/database/crud/skills.py @@ -1,10 +1,11 @@ -from sqlalchemy.orm import Session +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from src.app.schemas.skills import SkillBase from src.database.models import Skill -def get_skills(db: Session) -> list[Skill]: +async def get_skills(db: AsyncSession) -> list[Skill]: """Get a list of all the base skills that can be added to a student or project. Args: @@ -13,15 +14,15 @@ def get_skills(db: Session) -> list[Skill]: Returns: SkillList: an object with a list of all the skills. """ - return db.query(Skill).all() + return (await db.execute(select(Skill))).scalars().all() -def get_skills_by_ids(db: Session, skill_ids) -> list[Skill]: +async def get_skills_by_ids(db: AsyncSession, skill_ids) -> list[Skill]: """Get all skills from list of skill ids""" - return db.query(Skill).where(Skill.skill_id.in_(skill_ids)).all() + return (await db.execute(select(Skill).where(Skill.skill_id.in_(skill_ids)))).scalars().all() -def create_skill(db: Session, skill: SkillBase) -> Skill: +async def create_skill(db: AsyncSession, skill: SkillBase) -> Skill: """Add a new skill into the database. Args: @@ -33,12 +34,12 @@ def create_skill(db: Session, skill: SkillBase) -> Skill: """ new_skill: Skill = Skill(name=skill.name, description=skill.description) db.add(new_skill) - db.commit() - db.refresh(new_skill) + await db.commit() + await db.refresh(new_skill) return new_skill -def delete_skill(db: Session, skill_id: int): +async def delete_skill(db: AsyncSession, skill_id: int): """Delete an existing skill. Args: @@ -46,5 +47,5 @@ def delete_skill(db: Session, skill_id: int): skill_id (int): the id of the skill """ skill_to_delete = db.query(Skill).where(Skill.skill_id == skill_id).one() - db.delete(skill_to_delete) - db.commit() + await db.delete(skill_to_delete) + await db.commit() diff --git a/backend/src/database/crud/students.py b/backend/src/database/crud/students.py index 17d61aa43..ae2fe55ea 100644 --- a/backend/src/database/crud/students.py +++ b/backend/src/database/crud/students.py @@ -1,37 +1,41 @@ from datetime import datetime -from sqlalchemy.orm import Session + +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.sql.expression import func + +from src.app.schemas.students import CommonQueryParams, EmailsSearchQueryParams from src.database.crud.util import paginate from src.database.enums import DecisionEnum, EmailStatusEnum from src.database.models import Edition, Skill, Student, DecisionEmail -from src.app.schemas.students import CommonQueryParams, EmailsSearchQueryParams -def get_student_by_id(db: Session, student_id: int) -> Student: +async def get_student_by_id(db: AsyncSession, student_id: int) -> Student: """Get a student by id""" - - return db.query(Student).where(Student.student_id == student_id).one() + query = select(Student).where(Student.student_id == student_id) + result = await db.execute(query) + return result.scalar_one() -def set_definitive_decision_on_student(db: Session, student: Student, decision: DecisionEnum) -> None: +async def set_definitive_decision_on_student(db: AsyncSession, student: Student, decision: DecisionEnum) -> None: """set a definitive decision on a student""" student.decision = decision - db.commit() + await db.commit() -def delete_student(db: Session, student: Student) -> None: +async def delete_student(db: AsyncSession, student: Student) -> None: """Delete a student from the database""" - db.delete(student) - db.commit() + await db.delete(student) + await db.commit() -def get_students(db: Session, edition: Edition, - commons: CommonQueryParams, skills: list[Skill] = None) -> list[Student]: +async def get_students(db: AsyncSession, edition: Edition, + commons: CommonQueryParams, skills: list[Skill] = None) -> list[Student]: """Get students""" - query = db.query(Student)\ - .where(Student.edition == edition)\ - .where((Student.first_name + ' ' + Student.last_name).contains(commons.name))\ + query = select(Student) \ + .where(Student.edition == edition) \ + .where((Student.first_name + ' ' + Student.last_name).contains(commons.name)) if commons.alumni: query = query.where(Student.alumni) @@ -45,37 +49,40 @@ def get_students(db: Session, edition: Edition, for skill in skills: query = query.where(Student.skills.contains(skill)) - return paginate(query, commons.page).all() + return (await db.execute(paginate(query, commons.page))).scalars().all() -def get_emails(db: Session, student: Student) -> list[DecisionEmail]: +async def get_emails(db: AsyncSession, student: Student) -> list[DecisionEmail]: """Get all emails send to a student""" - return db.query(DecisionEmail).where(DecisionEmail.student_id == student.student_id).all() + query = select(DecisionEmail).where(DecisionEmail.student_id == student.student_id) + result = await db.execute(query) + return result.scalars().all() -def create_email(db: Session, student: Student, email_status: EmailStatusEnum) -> DecisionEmail: +async def create_email(db: AsyncSession, student: Student, email_status: EmailStatusEnum) -> DecisionEmail: """Create a new email in the database""" email: DecisionEmail = DecisionEmail( student=student, decision=email_status, date=datetime.now()) db.add(email) - db.commit() + await db.commit() return email -def get_last_emails_of_students(db: Session, edition: Edition, commons: EmailsSearchQueryParams) -> list[DecisionEmail]: +async def get_last_emails_of_students(db: AsyncSession, edition: Edition, commons: EmailsSearchQueryParams) -> list[ + DecisionEmail]: """get last email of all students that got an email""" - last_emails = db.query(DecisionEmail.email_id, func.max(DecisionEmail.date))\ - .join(Student)\ - .where(Student.edition == edition)\ - .where((Student.first_name + ' ' + Student.last_name).contains(commons.name))\ - .group_by(DecisionEmail.student_id).subquery() + last_emails = select(DecisionEmail.email_id, func.max(DecisionEmail.date)) \ + .join(Student) \ + .where(Student.edition == edition) \ + .where((Student.first_name + ' ' + Student.last_name).contains(commons.name)) \ + .group_by(DecisionEmail.student_id).subquery() - emails = db.query(DecisionEmail).join( - last_emails, DecisionEmail.email_id == last_emails.c.email_id - ) + emails = select(DecisionEmail).join( + last_emails, DecisionEmail.email_id == last_emails.c.email_id + ) if commons.email_status: emails = emails.where(DecisionEmail.decision.in_(commons.email_status)) emails = emails.order_by(DecisionEmail.student_id) - return paginate(emails, commons.page).all() + return (await db.execute(paginate(emails, commons.page))).scalars().all() diff --git a/backend/src/database/crud/suggestions.py b/backend/src/database/crud/suggestions.py index be3853b8d..5aba3ccae 100644 --- a/backend/src/database/crud/suggestions.py +++ b/backend/src/database/crud/suggestions.py @@ -1,57 +1,65 @@ -from sqlalchemy.orm import Session +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from src.database.models import Suggestion from src.database.enums import DecisionEnum -def create_suggestion(db: Session, user_id: int | None, student_id: int | None, - decision: DecisionEnum, argumentation: str) -> Suggestion: +async def create_suggestion(db: AsyncSession, user_id: int | None, student_id: int | None, + decision: DecisionEnum, argumentation: str) -> Suggestion: """ Create a new suggestion in the database """ suggestion: Suggestion = Suggestion( student_id=student_id, coach_id=user_id, suggestion=decision, argumentation=argumentation) db.add(suggestion) - db.commit() + await db.commit() return suggestion -def get_suggestions_of_student(db: Session, student_id: int | None) -> list[Suggestion]: +async def get_suggestions_of_student(db: AsyncSession, student_id: int | None) -> list[Suggestion]: """Give all suggestions of a student""" - return db.query(Suggestion).where(Suggestion.student_id == student_id).all() + query = select(Suggestion).where(Suggestion.student_id == student_id) + result = await db.execute(query) + return result.scalars().all() -def get_own_suggestion(db: Session, student_id: int | None, user_id: int | None) -> Suggestion | None: +async def get_own_suggestion(db: AsyncSession, student_id: int | None, user_id: int | None) -> Suggestion | None: """Get the suggestion you made for a student""" # This isn't even possible but it pleases Mypy if student_id is None or user_id is None: return None - return db.query(Suggestion).where(Suggestion.student_id == student_id).where( - Suggestion.coach_id == user_id).one_or_none() + query = select(Suggestion).where(Suggestion.student_id == student_id).where( + Suggestion.coach_id == user_id) + result = await db.execute(query) + return result.scalar_one_or_none() -def get_suggestion_by_id(db: Session, suggestion_id: int) -> Suggestion: +async def get_suggestion_by_id(db: AsyncSession, suggestion_id: int) -> Suggestion: """Give a suggestion based on the ID""" - return db.query(Suggestion).where(Suggestion.suggestion_id == suggestion_id).one() + result = await db.execute(select(Suggestion).where(Suggestion.suggestion_id == suggestion_id)) + return result.scalar_one() -def delete_suggestion(db: Session, suggestion: Suggestion) -> None: +async def delete_suggestion(db: AsyncSession, suggestion: Suggestion) -> None: """Delete a suggestion from the database""" - db.delete(suggestion) - db.commit() + await db.delete(suggestion) + await db.commit() -def update_suggestion(db: Session, suggestion: Suggestion, decision: DecisionEnum, argumentation: str) -> None: +async def update_suggestion(db: AsyncSession, suggestion: Suggestion, decision: DecisionEnum, + argumentation: str) -> None: """Update a suggestion""" suggestion.suggestion = decision suggestion.argumentation = argumentation - db.commit() + await db.commit() -def get_suggestions_of_student_by_type(db: Session, student_id: int | None, - type_suggestion: DecisionEnum) -> list[Suggestion]: +async def get_suggestions_of_student_by_type(db: AsyncSession, student_id: int | None, + type_suggestion: DecisionEnum) -> list[Suggestion]: """Give all suggestions of a student by type""" - return db.query(Suggestion) \ - .where(Suggestion.student_id == student_id) \ - .where(Suggestion.suggestion == type_suggestion).all() + query = select(Suggestion).where(Suggestion.student_id == student_id)\ + .where(Suggestion.suggestion == type_suggestion) + result = await db.execute(query) + return result.scalars().all() diff --git a/backend/src/database/crud/users.py b/backend/src/database/crud/users.py index 1545d5c08..50ef437f4 100644 --- a/backend/src/database/crud/users.py +++ b/backend/src/database/crud/users.py @@ -1,6 +1,6 @@ -from sqlalchemy import select +from sqlalchemy import select, delete from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import Session, Query +from sqlalchemy.sql import Select from src.app.schemas.users import FilterParameters from src.database.crud.editions import get_edition_by_name @@ -9,10 +9,10 @@ from src.database.models import user_editions, User, Edition, CoachRequest, AuthEmail, AuthGitHub, AuthGoogle -def get_user_edition_names(db: Session, user: User) -> list[str]: +async def get_user_edition_names(db: AsyncSession, user: User) -> list[str]: """Get all names of the editions this user can see""" # For admins: return all editions - otherwise, all editions this user is verified coach in - source = user.editions if not user.admin else get_editions(db) + source = user.editions if not user.admin else await get_editions(db) editions = [] # Name & year are non-nullable in the database, so it can never be None, @@ -26,7 +26,7 @@ def get_user_edition_names(db: Session, user: User) -> list[str]: return editions -def get_users_filtered_page(db: Session, params: FilterParameters): +async def get_users_filtered_page(db: AsyncSession, params: FilterParameters): """ Get users and filter by optional parameters: :param admin: only return admins / only return non-admins @@ -38,7 +38,7 @@ def get_users_filtered_page(db: Session, params: FilterParameters): Note: When the admin parameter is set, edition_name and exclude_edition_name will be ignored. """ - query = db.query(User) + query = select(User) if params.name is not None: query = query.where(User.name.contains(params.name)) @@ -46,87 +46,91 @@ def get_users_filtered_page(db: Session, params: FilterParameters): if params.admin is not None: query = query.filter(User.admin.is_(params.admin)) # If admin parameter is set, edition & exclude_edition is ignored - return paginate(query, params.page).all() + return (await db.execute(paginate(query, params.page))).scalars().all() if params.edition is not None: - edition = get_edition_by_name(db, params.edition) + edition = await get_edition_by_name(db, params.edition) query = query \ .join(user_editions) \ .filter(user_editions.c.edition_id == edition.edition_id) if params.exclude_edition is not None: - exclude_edition = get_edition_by_name(db, params.exclude_edition) + exclude_edition = await get_edition_by_name(db, params.exclude_edition) + exclude_user_id = select(user_editions.c.user_id)\ + .where(user_editions.c.edition_id == exclude_edition.edition_id) - query = query.filter( - User.user_id.not_in( - db.query(user_editions.c.user_id).where(user_editions.c.edition_id == exclude_edition.edition_id) - ) - ) + query = query.filter(User.user_id.not_in(exclude_user_id)) - return paginate(query, params.page).all() + return (await db.execute(paginate(query, params.page))).scalars().all() -def edit_admin_status(db: Session, user_id: int, admin: bool): +async def edit_admin_status(db: AsyncSession, user_id: int, admin: bool): """ Edit the admin-status of a user """ - user = db.query(User).where(User.user_id == user_id).one() + result = await db.execute(select(User).where(User.user_id == user_id)) + user = result.scalar_one() user.admin = admin db.add(user) - db.commit() + await db.commit() -def add_coach(db: Session, user_id: int, edition_name: str): +async def add_coach(db: AsyncSession, user_id: int, edition_name: str): """ Add user as coach for the given edition """ - user = db.query(User).where(User.user_id == user_id).one() - edition = db.query(Edition).where(Edition.name == edition_name).one() + user_result = await db.execute(select(User).where(User.user_id == user_id)) + user = user_result.scalar_one() + edition_result = await db.execute(select(Edition).where(Edition.name == edition_name)) + edition = edition_result.scalar_one() user.editions.append(edition) - db.commit() + await db.commit() -def remove_coach(db: Session, user_id: int, edition_name: str): + +async def remove_coach(db: AsyncSession, user_id: int, edition_name: str): """ Remove user as coach for the given edition """ - edition = db.query(Edition).where(Edition.name == edition_name).one() - db.query(user_editions) \ + edition_result = await db.execute(select(Edition).where(Edition.name == edition_name)) + edition = edition_result.scalar_one() + + delete_query = delete(user_editions) \ .where(user_editions.c.user_id == user_id) \ - .where(user_editions.c.edition_id == edition.edition_id) \ - .delete() - db.commit() + .where(user_editions.c.edition_id == edition.edition_id) + await db.execute(delete_query) + await db.commit() -def remove_coach_all_editions(db: Session, user_id: int): +async def remove_coach_all_editions(db: AsyncSession, user_id: int): """ Remove user as coach from all editions """ - db.query(user_editions).where(user_editions.c.user_id == user_id).delete() - db.commit() + await db.execute(delete(user_editions).where(user_editions.c.user_id == user_id)) + await db.commit() -def _get_requests_query(db: Session, user_name: str = "") -> Query: - return db.query(CoachRequest).join(User).where(User.name.contains(user_name)) +def _get_requests_query(user_name: str = "") -> Select: + return select(CoachRequest).join(User).where(User.name.contains(user_name)) -def get_requests(db: Session) -> list[CoachRequest]: +async def get_requests(db: AsyncSession) -> list[CoachRequest]: """ Get all userrequests """ - return _get_requests_query(db).all() + return (await db.execute(_get_requests_query())).scalars().all() -def get_requests_page(db: Session, page: int, user_name: str = "") -> list[CoachRequest]: +async def get_requests_page(db: AsyncSession, page: int, user_name: str = "") -> list[CoachRequest]: """ Get all userrequests """ - return paginate(_get_requests_query(db, user_name), page).all() + return (await db.execute(paginate(_get_requests_query(user_name), page))).scalars().all() -def _get_requests_for_edition_query(db: Session, edition: Edition, user_name: str = "") -> Query: - return db.query(CoachRequest) \ +def _get_requests_for_edition_query(edition: Edition, user_name: str = "") -> Select: + return select(CoachRequest) \ .where(CoachRequest.edition_id == edition.edition_id) \ .join(User) \ .where(User.name.contains(user_name)) \ @@ -135,15 +139,16 @@ def _get_requests_for_edition_query(db: Session, edition: Edition, user_name: st .join(AuthGoogle, isouter=True) -def get_requests_for_edition(db: Session, edition_name: str = "") -> list[CoachRequest]: +async def get_requests_for_edition(db: AsyncSession, edition_name: str = "") -> list[CoachRequest]: """ Get all userrequests from a given edition """ - return _get_requests_for_edition_query(db, get_edition_by_name(db, edition_name)).all() + edition = await get_edition_by_name(db, edition_name) + return (await db.execute(_get_requests_for_edition_query(edition))).scalars().all() -def get_requests_for_edition_page( - db: Session, +async def get_requests_for_edition_page( + db: AsyncSession, edition_name: str, page: int, user_name: str = "" @@ -151,39 +156,42 @@ def get_requests_for_edition_page( """ Get all userrequests from a given edition """ - return paginate(_get_requests_for_edition_query(db, get_edition_by_name(db, edition_name), user_name), page).all() + edition = await get_edition_by_name(db, edition_name) + return (await db.execute(paginate(_get_requests_for_edition_query(edition, user_name), page))).scalars().all() -def accept_request(db: Session, request_id: int): +async def accept_request(db: AsyncSession, request_id: int): """ Remove request and add user as coach """ - request = db.query(CoachRequest).where(CoachRequest.request_id == request_id).one() - edition = db.query(Edition).where(Edition.edition_id == request.edition_id).one() - add_coach(db, request.user_id, edition.name) - db.query(CoachRequest).where(CoachRequest.request_id == request_id).delete() - db.commit() + request = (await db.execute(select(CoachRequest).where(CoachRequest.request_id == request_id))).scalar_one() + edition = (await db.execute(select(Edition).where(Edition.edition_id == request.edition_id))).scalar_one() + await add_coach(db, request.user_id, edition.name) + await db.execute(delete(CoachRequest).where(CoachRequest.request_id == request_id)) + await db.commit() -def reject_request(db: Session, request_id: int): +async def reject_request(db: AsyncSession, request_id: int): """ Remove request """ - db.query(CoachRequest).where(CoachRequest.request_id == request_id).delete() - db.commit() + await db.execute(delete(CoachRequest).where(CoachRequest.request_id == request_id)) + await db.commit() -def remove_request_if_exists(db: Session, user_id: int, edition_name: str): +async def remove_request_if_exists(db: AsyncSession, user_id: int, edition_name: str): """Remove a pending request for a user if there is one, otherwise do nothing""" - edition = db.query(Edition).where(Edition.name == edition_name).one() - db.query(CoachRequest).where(CoachRequest.user_id == user_id)\ - .where(CoachRequest.edition_id == edition.edition_id).delete() + edition = (await db.execute(select(Edition).where(Edition.name == edition_name))).scalar_one() + delete_query = delete(CoachRequest).where(CoachRequest.user_id == user_id)\ + .where(CoachRequest.edition_id == edition.edition_id) + await db.execute(delete_query) + await db.commit() -def get_user_by_email(db: Session, email: str) -> User: +async def get_user_by_email(db: AsyncSession, email: str) -> User: """Find a user by their email address""" - auth_email = db.query(AuthEmail).where(AuthEmail.email == email).one() - return db.query(User).where(User.user_id == auth_email.user_id).one() + auth_email = (await db.execute(select(AuthEmail).where(AuthEmail.email == email))).scalar_one() + return (await db.execute(select(User).where(User.user_id == auth_email.user_id))).scalar_one() async def get_user_by_id(db: AsyncSession, user_id: int) -> User: diff --git a/backend/src/database/crud/webhooks.py b/backend/src/database/crud/webhooks.py index f2e25e98b..cbcfcbda6 100644 --- a/backend/src/database/crud/webhooks.py +++ b/backend/src/database/crud/webhooks.py @@ -1,16 +1,17 @@ -from sqlalchemy.orm import Session +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from src.database.models import WebhookURL, Edition -def get_webhook(database: Session, uuid: str) -> WebhookURL: +async def get_webhook(database: AsyncSession, uuid: str) -> WebhookURL: """Retrieve a webhook by uuid""" - return database.query(WebhookURL).where(WebhookURL.uuid == uuid).one() + return (await database.execute(select(WebhookURL).where(WebhookURL.uuid == uuid))).scalar_one() -def create_webhook(database: Session, edition: Edition) -> WebhookURL: +async def create_webhook(database: AsyncSession, edition: Edition) -> WebhookURL: """Create a webhook for a given edition""" webhook_url: WebhookURL = WebhookURL(edition=edition) database.add(webhook_url) - database.commit() + await database.commit() return webhook_url From 13f3c3f5771b6ac7ccd622536f7b9adf2140dff8 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Fri, 6 May 2022 12:56:32 +0200 Subject: [PATCH 086/649] Press enter to add coach, parnter and skill --- .../InputFields/Coach/Coach.tsx | 43 ++++++++++--------- .../InputFields/Partner/Partner.tsx | 25 +++++------ .../InputFields/Skill/Skill.tsx | 35 +++++++-------- .../ProjectsPage/ProjectsPage.tsx | 2 +- 4 files changed, 54 insertions(+), 51 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Coach/Coach.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Coach/Coach.tsx index 0af408194..f0c1e315a 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Coach/Coach.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Coach/Coach.tsx @@ -35,6 +35,9 @@ export default function Coach({ onChange={e => { setCoach(e.target.value); }} + onKeyDown={e => { + if (e.key === "Enter") addCoach(); + }} list="users" placeholder="Coach" /> @@ -44,32 +47,30 @@ export default function Coach({ })} - { - let coachToAdd = null; - availableCoaches.forEach(availableCoach => { - if (availableCoach.name === coach) { - coachToAdd = availableCoach; - } - }); - if (coachToAdd) { - if (!coaches.some(presentCoach => presentCoach.name === coach)) { - const newCoaches = [...coaches]; - newCoaches.push(coachToAdd); - setCoaches(newCoaches); - setShowAlert(false); - } - } else setShowAlert(true); - setCoach(""); - }} - > - Add - + Add
); + + function addCoach() { + let coachToAdd = null; + availableCoaches.forEach(availableCoach => { + if (availableCoach.name === coach) { + coachToAdd = availableCoach; + } + }); + if (coachToAdd) { + if (!coaches.some(presentCoach => presentCoach.name === coach)) { + const newCoaches = [...coaches]; + newCoaches.push(coachToAdd); + setCoaches(newCoaches); + setShowAlert(false); + } + } else setShowAlert(true); + setCoach(""); + } } function BadCoachAlert({ show, setShow }: { show: boolean; setShow: (state: boolean) => void }) { diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx index 27e94ce67..baec79905 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx @@ -18,6 +18,9 @@ export default function Partner({ setPartner(e.target.value)} + onKeyDown={e => { + if (e.key === "Enter") addPartner(); + }} list="partners" placeholder="Partner" /> @@ -28,18 +31,16 @@ export default function Partner({ })} - { - if (!partners.includes(partner) && partner.length > 0) { - const newPartners = [...partners]; - newPartners.push(partner); - setPartners(newPartners); - } - setPartner(""); - }} - > - Add - + Add
); + + function addPartner() { + if (!partners.includes(partner) && partner.length > 0) { + const newPartners = [...partners]; + newPartners.push(partner); + setPartners(newPartners); + } + setPartner(""); + } } diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx index 9fc0d759d..809b70bfd 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx @@ -19,6 +19,9 @@ export default function Skill({ setSkill(e.target.value)} + onKeyDown={e => { + if (e.key === "Enter") addSkill(); + }} placeholder="Skill" list="skills" /> @@ -28,23 +31,21 @@ export default function Skill({ })} - { - if (availableSkills.some(availableSkill => availableSkill === skill)) { - const newSkills = [...skills]; - const newSkill: SkillProject = { - skill: skill, - description: "", - amount: 1, - }; - newSkills.push(newSkill); - setSkills(newSkills); - } - setSkill(""); - }} - > - Add - + Add ); + + function addSkill() { + if (availableSkills.some(availableSkill => availableSkill === skill)) { + const newSkills = [...skills]; + const newSkill: SkillProject = { + skill: skill, + description: "", + amount: 1, + }; + newSkills.push(newSkill); + setSkills(newSkills); + } + setSkill(""); + } } diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index a22fd0125..9d2a8611b 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -83,7 +83,7 @@ export default function ProjectPage() { }} /> Search - {role === Role.ADMIN && editionId === editions[0] && ( + {role === Role.ADMIN && editionId === editions[0] && ( navigate("/editions/" + editionId + "/projects/new")} > From f4af3f409b2dcc44633ef5e773335b864f228846 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Fri, 6 May 2022 13:27:25 +0200 Subject: [PATCH 087/649] Better styling --- .../AddedSkills/AddedSkills.tsx | 4 ++-- .../AddedSkills/styles.ts | 19 ++++++++++++++++--- .../CreateProjectComponents/styles.ts | 8 +++++--- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx index 2a420b57d..798e525c0 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx @@ -1,5 +1,4 @@ import { SkillProject } from "../../../../data/interfaces/projects"; -import { Input } from "../styles"; import { AmountInput, SkillContainer, @@ -8,6 +7,7 @@ import { TopContainer, SkillName, TopLeftContainer, + DescriptionInput, } from "./styles"; import { TiDeleteOutline } from "react-icons/ti"; import React from "react"; @@ -86,7 +86,7 @@ export default function AddedSkills({ - Date: Fri, 6 May 2022 13:30:17 +0200 Subject: [PATCH 088/649] edition tests async --- backend/src/database/crud/editions.py | 2 +- .../test_editions/test_editions.py | 54 +++++++++++-------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/backend/src/database/crud/editions.py b/backend/src/database/crud/editions.py index 90baf559b..01fb85af7 100644 --- a/backend/src/database/crud/editions.py +++ b/backend/src/database/crud/editions.py @@ -66,7 +66,7 @@ async def delete_edition(db: AsyncSession, edition_name: str): db (Session): connection with the database. edition_name (str): the primary key of the edition that needs to be deleted """ - edition_to_delete = get_edition_by_name(db, edition_name) + edition_to_delete = await get_edition_by_name(db, edition_name) await db.delete(edition_to_delete) await db.commit() diff --git a/backend/tests/test_routers/test_editions/test_editions/test_editions.py b/backend/tests/test_routers/test_editions/test_editions/test_editions.py index e29c3a3bc..d621c4a12 100644 --- a/backend/tests/test_routers/test_editions/test_editions/test_editions.py +++ b/backend/tests/test_routers/test_editions/test_editions/test_editions.py @@ -146,27 +146,29 @@ async def test_create_edition_coach(database_session: AsyncSession, auth_client: await database_session.commit() await auth_client.coach(edition) - - assert auth_client.post("/editions/", json={"year": 2022, "name": "ed2022"}).status_code == status.HTTP_403_FORBIDDEN + async with auth_client: + response = await auth_client.post("/editions/", json={"year": 2022, "name": "ed2022"}) + assert response.status_code == status.HTTP_403_FORBIDDEN async def test_create_edition_existing_year(database_session: AsyncSession, auth_client: AuthClient): """Test that creating an edition for a year that already exists throws an error""" await auth_client.admin() - response = auth_client.post("/editions/", json={"year": 2022, "name": "ed2022"}) - assert response.status_code == status.HTTP_201_CREATED - - # Try to make an edition in the same year - response = auth_client.post("/editions/", json={"year": 2022, "name": "ed2022"}) - assert response.status_code == status.HTTP_409_CONFLICT + async with auth_client: + response = await auth_client.post("/editions/", json={"year": 2022, "name": "ed2022"}) + assert response.status_code == status.HTTP_201_CREATED + # Try to make an edition in the same year + response = await auth_client.post("/editions/", json={"year": 2022, "name": "ed2022"}) + assert response.status_code == status.HTTP_409_CONFLICT async def test_create_edition_malformed(database_session: AsyncSession, auth_client: AuthClient): await auth_client.admin() - response = auth_client.post("/editions/", json={"year": 2023, "name": "Life is fun"}) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + async with auth_client: + response = await auth_client.post("/editions/", json={"year": 2023, "name": "Life is fun"}) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY async def test_delete_edition_admin(database_session: AsyncSession, auth_client: AuthClient): @@ -182,9 +184,10 @@ async def test_delete_edition_admin(database_session: AsyncSession, auth_client: database_session.add(edition) await database_session.commit() - # Make the delete request - response = auth_client.delete(f"/editions/{edition.name}") - assert response.status_code == status.HTTP_204_NO_CONTENT + async with auth_client: + # Make the delete request + response = await auth_client.delete(f"/editions/{edition.name}") + assert response.status_code == status.HTTP_204_NO_CONTENT async def test_delete_edition_unauthorized(database_session: AsyncSession, auth_client: AuthClient): @@ -193,8 +196,9 @@ async def test_delete_edition_unauthorized(database_session: AsyncSession, auth_ database_session.add(edition) await database_session.commit() - # Make the delete request - assert auth_client.delete(f"/editions/{edition.name}").status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + # Make the delete request + assert (await auth_client.delete(f"/editions/{edition.name}")).status_code == status.HTTP_401_UNAUTHORIZED async def test_delete_edition_coach(database_session: AsyncSession, auth_client: AuthClient): @@ -205,16 +209,18 @@ async def test_delete_edition_coach(database_session: AsyncSession, auth_client: await auth_client.coach(edition) - # Make the delete request - assert auth_client.delete(f"/editions/{edition.name}").status_code == status.HTTP_403_FORBIDDEN + async with auth_client: + # Make the delete request + assert (await auth_client.delete(f"/editions/{edition.name}")).status_code == status.HTTP_403_FORBIDDEN async def test_delete_edition_non_existing(database_session: AsyncSession, auth_client: AuthClient): """Delete an edition that doesn't exist""" await auth_client.admin() - response = auth_client.delete("/edition/doesnotexist") - assert response.status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + response = await auth_client.delete("/edition/doesnotexist") + assert response.status_code == status.HTTP_404_NOT_FOUND async def test_get_editions_limited_permission(database_session: AsyncSession, auth_client: AuthClient): @@ -227,8 +233,9 @@ async def test_get_editions_limited_permission(database_session: AsyncSession, a await auth_client.coach(edition) - # Make the get request - response = auth_client.get("/editions/") + async with auth_client: + # Make the get request + response = await auth_client.get("/editions/") assert response.status_code == status.HTTP_200_OK response = response.json() @@ -248,6 +255,7 @@ async def test_get_edition_by_name_coach_not_assigned(database_session: AsyncSes await auth_client.coach(edition) - # Make the get request - response = auth_client.get(f"/editions/{edition2.name}") + async with auth_client: + # Make the get request + response = await auth_client.get(f"/editions/{edition2.name}") assert response.status_code == status.HTTP_403_FORBIDDEN From b2aaea165851138e6b2ea2ed184b96fdceaa0c5b Mon Sep 17 00:00:00 2001 From: beguille Date: Fri, 6 May 2022 13:52:31 +0200 Subject: [PATCH 089/649] invites tests async --- backend/tests/fill_database.py | 2 +- .../test_database/test_crud/test_invites.py | 82 ++++----- .../test_database/test_crud/test_projects.py | 8 +- .../test_crud/test_projects_students.py | 4 +- .../test_database/test_crud/test_register.py | 8 +- .../test_database/test_crud/test_students.py | 4 +- .../test_crud/test_suggestions.py | 4 +- .../test_database/test_crud/test_users.py | 64 +++---- backend/tests/test_database/test_models.py | 6 +- backend/tests/test_fill_database.py | 4 +- backend/tests/test_logic/test_register.py | 10 +- .../test_editions/test_editions.py | 2 +- .../test_invites/test_invites.py | 173 +++++++++--------- .../test_projects/test_projects.py | 8 +- .../test_students/test_students.py | 8 +- .../test_register/test_register.py | 16 +- .../test_students/test_students.py | 4 +- .../test_suggestions/test_suggestions.py | 4 +- .../test_webhooks/test_webhooks.py | 10 +- .../test_routers/test_login/test_login.py | 6 +- .../test_routers/test_skills/test_skills.py | 10 +- .../test_routers/test_users/test_users.py | 58 +++--- 22 files changed, 252 insertions(+), 243 deletions(-) diff --git a/backend/tests/fill_database.py b/backend/tests/fill_database.py index 930e2577a..acf61fd5f 100644 --- a/backend/tests/fill_database.py +++ b/backend/tests/fill_database.py @@ -1,5 +1,5 @@ from datetime import date -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from src.database.models import (User, AuthEmail, Skill, Student, Edition, CoachRequest, DecisionEmail, InviteLink, Partner, diff --git a/backend/tests/test_database/test_crud/test_invites.py b/backend/tests/test_database/test_crud/test_invites.py index 7cead2745..df2a0b9b1 100644 --- a/backend/tests/test_database/test_crud/test_invites.py +++ b/backend/tests/test_database/test_crud/test_invites.py @@ -2,7 +2,7 @@ import pytest import sqlalchemy.exc -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from settings import DB_PAGE_SIZE from src.app.exceptions.parsing import MalformedUUIDError @@ -16,49 +16,49 @@ from src.database.models import Edition, InviteLink -def test_create_invite_link(database_session: Session): +async def test_create_invite_link(database_session: AsyncSession): """Test creation of new invite links""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() # Db empty - assert len(get_pending_invites_for_edition(database_session, edition)) == 0 + assert len(await get_pending_invites_for_edition(database_session, edition)) == 0 # Create new link - create_invite_link(database_session, edition, "test@ema.il") + await create_invite_link(database_session, edition, "test@ema.il") - assert len(get_pending_invites_for_edition(database_session, edition)) == 1 + assert len(await get_pending_invites_for_edition(database_session, edition)) == 1 -def test_delete_invite_link(database_session: Session): +async def test_delete_invite_link(database_session: AsyncSession): """Test deletion of existing invite links""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() # Create new link - new_link = create_invite_link(database_session, edition, "test@ema.il") + new_link = await create_invite_link(database_session, edition, "test@ema.il") - assert len(get_pending_invites_for_edition(database_session, edition)) == 1 - delete_invite_link(database_session, new_link) - assert len(get_pending_invites_for_edition(database_session, edition)) == 0 + assert len(await get_pending_invites_for_edition(database_session, edition)) == 1 + await delete_invite_link(database_session, new_link) + assert len(await get_pending_invites_for_edition(database_session, edition)) == 0 -def test_get_all_pending_invites_empty(database_session: Session): +async def test_get_all_pending_invites_empty(database_session: AsyncSession): """Test fetching all invites for a given edition when db is empty""" edition_one = Edition(year=2022, name="ed2022") edition_two = Edition(year=2023, name="ed2023") database_session.add(edition_one) database_session.add(edition_two) - database_session.commit() + await database_session.commit() # Db empty - assert len(get_pending_invites_for_edition(database_session, edition_one)) == 0 - assert len(get_pending_invites_for_edition(database_session, edition_two)) == 0 + assert len(await get_pending_invites_for_edition(database_session, edition_one)) == 0 + assert len(await get_pending_invites_for_edition(database_session, edition_two)) == 0 -def test_get_all_pending_invites_one_present(database_session: Session): +async def test_get_all_pending_invites_one_present(database_session: AsyncSession): """ Test fetching all invites for two editions when only one of them has valid entries @@ -67,87 +67,87 @@ def test_get_all_pending_invites_one_present(database_session: Session): edition_two = Edition(year=2023, name="ed2023") database_session.add(edition_one) database_session.add(edition_two) - database_session.commit() + await database_session.commit() # Create new link link_one = InviteLink(target_email="test@ema.il", edition=edition_one) database_session.add(link_one) - database_session.commit() + await database_session.commit() - assert len(get_pending_invites_for_edition(database_session, edition_one)) == 1 + assert len(await get_pending_invites_for_edition(database_session, edition_one)) == 1 # Other edition still empty - assert len(get_pending_invites_for_edition(database_session, edition_two)) == 0 + assert len(await get_pending_invites_for_edition(database_session, edition_two)) == 0 -def test_get_all_pending_invites_two_present(database_session: Session): +async def test_get_all_pending_invites_two_present(database_session: AsyncSession): """Test fetching all links for two editions when both of them have data""" edition_one = Edition(year=2022, name="ed2022") edition_two = Edition(year=2023, name="ed2023") database_session.add(edition_one) database_session.add(edition_two) - database_session.commit() + await database_session.commit() # Create new links link_one = InviteLink(target_email="test@ema.il", edition=edition_one) link_two = InviteLink(target_email="test@ema.il", edition=edition_two) database_session.add(link_one) database_session.add(link_two) - database_session.commit() + await database_session.commit() - assert len(get_pending_invites_for_edition(database_session, edition_one)) == 1 - assert len(get_pending_invites_for_edition(database_session, edition_two)) == 1 + assert len(await get_pending_invites_for_edition(database_session, edition_one)) == 1 + assert len(await get_pending_invites_for_edition(database_session, edition_two)) == 1 -def test_get_all_pending_invites_pagination(database_session: Session): +async def test_get_all_pending_invites_pagination(database_session: AsyncSession): """Test fetching all links for two editions when both of them have data""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(InviteLink(target_email=f"{i}@example.com", edition=edition)) - database_session.commit() + await database_session.commit() - assert len(get_pending_invites_for_edition_page(database_session, edition, 0)) == DB_PAGE_SIZE - assert len(get_pending_invites_for_edition_page(database_session, edition, 1)) == round( + assert len(await get_pending_invites_for_edition_page(database_session, edition, 0)) == DB_PAGE_SIZE + assert len(await get_pending_invites_for_edition_page(database_session, edition, 1)) == round( DB_PAGE_SIZE * 1.5 ) - DB_PAGE_SIZE -def test_get_invite_link_by_uuid_existing(database_session: Session): +async def test_get_invite_link_by_uuid_existing(database_session: AsyncSession): """Test fetching links by uuid's when it exists""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() debug_uuid = "123e4567-e89b-12d3-a456-426614174000" new_link = InviteLink(target_email="test@ema.il", edition=edition, uuid=UUID(debug_uuid)) database_session.add(new_link) - database_session.commit() + await database_session.commit() - assert get_invite_link_by_uuid(database_session, debug_uuid).invite_link_id == new_link.invite_link_id + assert (await get_invite_link_by_uuid(database_session, debug_uuid)).invite_link_id == new_link.invite_link_id -def test_get_invite_link_by_uuid_non_existing(database_session: Session): +async def test_get_invite_link_by_uuid_non_existing(database_session: AsyncSession): """Test fetching links by uuid's when they don't exist""" # Db empty with pytest.raises(sqlalchemy.exc.NoResultFound): - get_invite_link_by_uuid(database_session, "123e4567-e89b-12d3-a456-426614174011") + await get_invite_link_by_uuid(database_session, "123e4567-e89b-12d3-a456-426614174011") edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() debug_uuid = "123e4567-e89b-12d3-a456-426614174000" new_link = InviteLink(target_email="test@ema.il", edition=edition, uuid=UUID(debug_uuid)) database_session.add(new_link) - database_session.commit() + await database_session.commit() # Non-existent id with pytest.raises(sqlalchemy.exc.NoResultFound): - get_invite_link_by_uuid(database_session, "123e4567-e89b-12d3-a456-426614174011") + await get_invite_link_by_uuid(database_session, "123e4567-e89b-12d3-a456-426614174011") -def test_get_invite_link_by_uuid_malformed(database_session: Session): +async def test_get_invite_link_by_uuid_malformed(database_session: AsyncSession): """Test fetching a link by its uuid when the id is malformed""" with pytest.raises(MalformedUUIDError): - get_invite_link_by_uuid(database_session, "some malformed string that isn't a UUID") + await get_invite_link_by_uuid(database_session, "some malformed string that isn't a UUID") diff --git a/backend/tests/test_database/test_crud/test_projects.py b/backend/tests/test_database/test_crud/test_projects.py index c9cd146e8..7fddcd8cc 100644 --- a/backend/tests/test_database/test_crud/test_projects.py +++ b/backend/tests/test_database/test_crud/test_projects.py @@ -1,6 +1,6 @@ import pytest from sqlalchemy.exc import NoResultFound -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from settings import DB_PAGE_SIZE from src.app.schemas.projects import InputProject, QueryParamsProjects @@ -9,7 +9,7 @@ @pytest.fixture -def database_with_data(database_session: Session) -> Session: +def database_with_data(database_session: AsyncSession) -> Session: """fixture for adding data to the database""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -54,7 +54,7 @@ def current_edition(database_with_data: Session) -> Edition: return database_with_data.query(Edition).all()[-1] -def test_get_all_projects_empty(database_session: Session): +def test_get_all_projects_empty(database_session: AsyncSession): """test get all projects but there are none""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -71,7 +71,7 @@ def test_get_all_projects(database_with_data: Session, current_edition: Edition) assert len(projects) == 3 -def test_get_all_projects_pagination(database_session: Session): +def test_get_all_projects_pagination(database_session: AsyncSession): """test get all projects paginated""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) diff --git a/backend/tests/test_database/test_crud/test_projects_students.py b/backend/tests/test_database/test_crud/test_projects_students.py index 854637a6c..8b3cdf2a1 100644 --- a/backend/tests/test_database/test_crud/test_projects_students.py +++ b/backend/tests/test_database/test_crud/test_projects_students.py @@ -1,6 +1,6 @@ import pytest from sqlalchemy.exc import NoResultFound -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from src.database.crud.projects_students import ( remove_student_project, add_student_project, change_project_role) @@ -8,7 +8,7 @@ @pytest.fixture -def database_with_data(database_session: Session) -> Session: +def database_with_data(database_session: AsyncSession) -> Session: """fixture for adding data to the database""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) diff --git a/backend/tests/test_database/test_crud/test_register.py b/backend/tests/test_database/test_crud/test_register.py index b4f471b6c..d0ca96f4a 100644 --- a/backend/tests/test_database/test_crud/test_register.py +++ b/backend/tests/test_database/test_crud/test_register.py @@ -1,10 +1,10 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from src.database.crud.register import create_user, create_coach_request, create_auth_email from src.database.models import AuthEmail, CoachRequest, User, Edition -def test_create_user(database_session: Session): +def test_create_user(database_session: AsyncSession): """Tests for creating a user""" create_user(database_session, "jos") @@ -13,7 +13,7 @@ def test_create_user(database_session: Session): assert a[0].name == "jos" -def test_react_coach_request(database_session: Session): +def test_react_coach_request(database_session: AsyncSession): """Tests for creating a coach request""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -27,7 +27,7 @@ def test_react_coach_request(database_session: Session): assert u.coach_request == a[0] -def test_create_auth_email(database_session: Session): +def test_create_auth_email(database_session: AsyncSession): """Tests for creating a auth email""" u = create_user(database_session, "jos") create_auth_email(database_session, u, "wachtwoord", "mail@email.com") diff --git a/backend/tests/test_database/test_crud/test_students.py b/backend/tests/test_database/test_crud/test_students.py index db9001edd..04cd62170 100644 --- a/backend/tests/test_database/test_crud/test_students.py +++ b/backend/tests/test_database/test_crud/test_students.py @@ -1,6 +1,6 @@ import datetime import pytest -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm.exc import NoResultFound from src.database.models import Student, User, Edition, Skill, DecisionEmail from src.database.enums import DecisionEnum, EmailStatusEnum @@ -11,7 +11,7 @@ @pytest.fixture -def database_with_data(database_session: Session): +def database_with_data(database_session: AsyncSession): """A function to fill the database with fake data that can easly be used when testing""" # Editions edition: Edition = Edition(year=2022, name="ed22") diff --git a/backend/tests/test_database/test_crud/test_suggestions.py b/backend/tests/test_database/test_crud/test_suggestions.py index 822663149..788ace81e 100644 --- a/backend/tests/test_database/test_crud/test_suggestions.py +++ b/backend/tests/test_database/test_crud/test_suggestions.py @@ -1,5 +1,5 @@ import pytest -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.exc import IntegrityError from sqlalchemy.orm.exc import NoResultFound @@ -13,7 +13,7 @@ @pytest.fixture -def database_with_data(database_session: Session): +def database_with_data(database_session: AsyncSession): """A function to fill the database with fake data that can easly be used when testing""" # Editions edition: Edition = Edition(year=2022, name="ed22") diff --git a/backend/tests/test_database/test_crud/test_users.py b/backend/tests/test_database/test_crud/test_users.py index df2ce9887..7fc985296 100644 --- a/backend/tests/test_database/test_crud/test_users.py +++ b/backend/tests/test_database/test_crud/test_users.py @@ -1,5 +1,5 @@ import pytest -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession import src.database.crud.users as users_crud from settings import DB_PAGE_SIZE @@ -9,7 +9,7 @@ @pytest.fixture -def data(database_session: Session) -> dict[str, str]: +def data(database_session: AsyncSession) -> dict[str, str]: """Fill database with dummy data""" # Create users @@ -47,7 +47,7 @@ def data(database_session: Session) -> dict[str, str]: } -def test_get_all_users(database_session: Session, data: dict[str, int]): +def test_get_all_users(database_session: AsyncSession, data: dict[str, int]): """Test get request for users""" # get all users @@ -58,7 +58,7 @@ def test_get_all_users(database_session: Session, data: dict[str, int]): assert data["user2"] in user_ids -def test_get_all_users_paginated(database_session: Session): +def test_get_all_users_paginated(database_session: AsyncSession): for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=False)) database_session.commit() @@ -69,7 +69,7 @@ def test_get_all_users_paginated(database_session: Session): ) - DB_PAGE_SIZE -def test_get_all_users_paginated_filter_name(database_session: Session): +def test_get_all_users_paginated_filter_name(database_session: AsyncSession): count = 0 for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=False)) @@ -83,7 +83,7 @@ def test_get_all_users_paginated_filter_name(database_session: Session): DB_PAGE_SIZE * 1.5), 0) -def test_get_all_admins(database_session: Session, data: dict[str, str]): +def test_get_all_admins(database_session: AsyncSession, data: dict[str, str]): """Test get request for admins""" # get all admins @@ -92,7 +92,7 @@ def test_get_all_admins(database_session: Session, data: dict[str, str]): assert data["user1"] == users[0].user_id -def test_get_all_admins_paginated(database_session: Session): +def test_get_all_admins_paginated(database_session: AsyncSession): admins = [] for i in range(round(DB_PAGE_SIZE * 3)): user = models.User(name=f"User {i}", admin=i % 2 == 0) @@ -111,7 +111,7 @@ def test_get_all_admins_paginated(database_session: Session): min(count - DB_PAGE_SIZE, DB_PAGE_SIZE) -def test_get_all_non_admins_paginated(database_session: Session): +def test_get_all_non_admins_paginated(database_session: AsyncSession): non_admins = [] for i in range(round(DB_PAGE_SIZE * 3)): user = models.User(name=f"User {i}", admin=i % 2 == 0) @@ -130,7 +130,7 @@ def test_get_all_non_admins_paginated(database_session: Session): min(count - DB_PAGE_SIZE, DB_PAGE_SIZE) -def test_get_all_admins_paginated_filter_name(database_session: Session): +def test_get_all_admins_paginated_filter_name(database_session: AsyncSession): count = 0 for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=i % 2 == 0)) @@ -146,7 +146,7 @@ def test_get_all_admins_paginated_filter_name(database_session: Session): DB_PAGE_SIZE * 1.5), 0) -def test_get_user_edition_names_empty(database_session: Session): +def test_get_user_edition_names_empty(database_session: AsyncSession): """Test getting all editions from a user when there are none""" user = models.User(name="test") database_session.add(user) @@ -157,7 +157,7 @@ def test_get_user_edition_names_empty(database_session: Session): assert len(editions) == 0 -def test_get_user_edition_names_admin(database_session: Session): +def test_get_user_edition_names_admin(database_session: AsyncSession): """Test getting all editions for an admin""" user = models.User(name="test", admin=True) database_session.add(user) @@ -171,7 +171,7 @@ def test_get_user_edition_names_admin(database_session: Session): assert len(editions) == 1 -def test_get_user_edition_names_coach(database_session: Session): +def test_get_user_edition_names_coach(database_session: AsyncSession): """Test getting all editions for a coach when they aren't empty""" user = models.User(name="test") database_session.add(user) @@ -194,7 +194,7 @@ def test_get_user_edition_names_coach(database_session: Session): assert editions == [edition.name] -def test_get_all_users_from_edition(database_session: Session, data: dict[str, str]): +def test_get_all_users_from_edition(database_session: AsyncSession, data: dict[str, str]): """Test get request for users of a given edition""" # get all users from edition @@ -209,7 +209,7 @@ def test_get_all_users_from_edition(database_session: Session, data: dict[str, s assert data["user2"] == users[0].user_id -def test_get_all_users_for_edition_paginated(database_session: Session): +def test_get_all_users_for_edition_paginated(database_session: AsyncSession): edition_1 = models.Edition(year=2022, name="ed2022") edition_2 = models.Edition(year=2023, name="ed2023") database_session.add(edition_1) @@ -242,7 +242,7 @@ def test_get_all_users_for_edition_paginated(database_session: Session): ) - DB_PAGE_SIZE -def test_get_all_users_for_edition_paginated_filter_name(database_session: Session): +def test_get_all_users_for_edition_paginated_filter_name(database_session: AsyncSession): edition_1 = models.Edition(year=2022, name="ed2022") edition_2 = models.Edition(year=2023, name="ed2023") database_session.add(edition_1) @@ -278,7 +278,7 @@ def test_get_all_users_for_edition_paginated_filter_name(database_session: Sessi max(count - DB_PAGE_SIZE, 0) -def test_get_all_users_excluded_edition_paginated(database_session: Session): +def test_get_all_users_excluded_edition_paginated(database_session: AsyncSession): edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") database_session.add(edition_a) @@ -316,7 +316,7 @@ def test_get_all_users_excluded_edition_paginated(database_session: Session): round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE -def test_get_all_users_excluded_edition_paginated_filter_name(database_session: Session): +def test_get_all_users_excluded_edition_paginated_filter_name(database_session: AsyncSession): edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") database_session.add(edition_a) @@ -357,7 +357,7 @@ def test_get_all_users_excluded_edition_paginated_filter_name(database_session: max(count - DB_PAGE_SIZE, 0) -def test_get_all_users_for_edition_excluded_edition_paginated(database_session: Session): +def test_get_all_users_for_edition_excluded_edition_paginated(database_session: AsyncSession): edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") database_session.add(edition_a) @@ -391,7 +391,7 @@ def test_get_all_users_for_edition_excluded_edition_paginated(database_session: assert user in correct_users -def test_edit_admin_status(database_session: Session): +def test_edit_admin_status(database_session: AsyncSession): """Test changing the admin status of a user""" # Create user @@ -406,7 +406,7 @@ def test_edit_admin_status(database_session: Session): assert not user.admin -def test_add_coach(database_session: Session): +def test_add_coach(database_session: AsyncSession): """Test adding a user as coach""" # Create user @@ -425,7 +425,7 @@ def test_add_coach(database_session: Session): assert coach.edition_id == edition.edition_id -def test_remove_coach(database_session: Session): +def test_remove_coach(database_session: AsyncSession): """Test removing a user as coach""" # Create user @@ -450,7 +450,7 @@ def test_remove_coach(database_session: Session): assert len(database_session.query(user_editions).all()) == 1 -def test_remove_coach_all_editions(database_session: Session): +def test_remove_coach_all_editions(database_session: AsyncSession): """Test removing a user as coach from all editions""" # Create user @@ -481,7 +481,7 @@ def test_remove_coach_all_editions(database_session: Session): assert len(database_session.query(user_editions).all()) == 1 -def test_get_all_requests(database_session: Session): +def test_get_all_requests(database_session: AsyncSession): """Test get request for all userrequests""" # Create user user1 = models.User(name="user1") @@ -514,7 +514,7 @@ def test_get_all_requests(database_session: Session): assert user2 in users -def test_get_requests_paginated(database_session: Session): +def test_get_requests_paginated(database_session: AsyncSession): edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -530,7 +530,7 @@ def test_get_requests_paginated(database_session: Session): ) - DB_PAGE_SIZE -def test_get_requests_paginated_filter_user_name(database_session: Session): +def test_get_requests_paginated_filter_user_name(database_session: AsyncSession): edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -549,7 +549,7 @@ def test_get_requests_paginated_filter_user_name(database_session: Session): max(count - DB_PAGE_SIZE, 0) -def test_get_all_requests_from_edition(database_session: Session): +def test_get_all_requests_from_edition(database_session: AsyncSession): """Test get request for all userrequests of a given edition""" # Create user @@ -583,7 +583,7 @@ def test_get_all_requests_from_edition(database_session: Session): assert requests[0].user == user2 -def test_get_requests_for_edition_paginated(database_session: Session): +def test_get_requests_for_edition_paginated(database_session: AsyncSession): edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -599,7 +599,7 @@ def test_get_requests_for_edition_paginated(database_session: Session): ) - DB_PAGE_SIZE -def test_get_requests_for_edition_paginated_filter_user_name(database_session: Session): +def test_get_requests_for_edition_paginated_filter_user_name(database_session: AsyncSession): edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -618,7 +618,7 @@ def test_get_requests_for_edition_paginated_filter_user_name(database_session: S max(count - DB_PAGE_SIZE, 0) -def test_accept_request(database_session: Session): +def test_accept_request(database_session: AsyncSession): """Test accepting a coach request""" # Create user @@ -645,7 +645,7 @@ def test_accept_request(database_session: Session): assert user1.editions[0].edition_id == edition1.edition_id -def test_reject_request_new_user(database_session: Session): +def test_reject_request_new_user(database_session: AsyncSession): """Test rejecting a coach request""" # Create user @@ -668,7 +668,7 @@ def test_reject_request_new_user(database_session: Session): assert len(requests) == 0 -def test_remove_request_if_exists_exists(database_session: Session): +def test_remove_request_if_exists_exists(database_session: AsyncSession): """Test deleting a request when it exists""" user = models.User(name="user1") database_session.add(user) @@ -689,7 +689,7 @@ def test_remove_request_if_exists_exists(database_session: Session): assert database_session.query(CoachRequest).count() == 0 -def test_remove_request_if_not_exists(database_session: Session): +def test_remove_request_if_not_exists(database_session: AsyncSession): """Test deleting a request when it doesn't exist""" user = models.User(name="user1") database_session.add(user) diff --git a/backend/tests/test_database/test_models.py b/backend/tests/test_database/test_models.py index 662217c4e..506ba0560 100644 --- a/backend/tests/test_database/test_models.py +++ b/backend/tests/test_database/test_models.py @@ -1,9 +1,9 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from src.database import models -def test_user_coach_request(database_session: Session): +def test_user_coach_request(database_session: AsyncSession): """Test sending a coach request""" edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -32,7 +32,7 @@ def test_user_coach_request(database_session: Session): assert req.user_id == user.user_id -def test_project_partners(database_session: Session): +def test_project_partners(database_session: AsyncSession): """Test adding a partner to a project""" project = models.Project(name="project") database_session.add(project) diff --git a/backend/tests/test_fill_database.py b/backend/tests/test_fill_database.py index d68444d8e..78040979c 100644 --- a/backend/tests/test_fill_database.py +++ b/backend/tests/test_fill_database.py @@ -1,6 +1,6 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from tests.fill_database import fill_database -def test_fill_database(database_session: Session): +def test_fill_database(database_session: AsyncSession): """Test that fill_database don't give an error""" fill_database(database_session) diff --git a/backend/tests/test_logic/test_register.py b/backend/tests/test_logic/test_register.py index 02dea4cd5..df24e412d 100644 --- a/backend/tests/test_logic/test_register.py +++ b/backend/tests/test_logic/test_register.py @@ -1,5 +1,5 @@ import pytest -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.exc import NoResultFound from src.app.schemas.register import NewUser @@ -9,7 +9,7 @@ from src.app.exceptions.register import FailedToAddNewUserException -def test_create_request(database_session: Session): +def test_create_request(database_session: AsyncSession): """Tests if a normal request can be created""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -31,7 +31,7 @@ def test_create_request(database_session: Session): assert len(auth_email) == 1 -def test_duplicate_user(database_session: Session): +def test_duplicate_user(database_session: AsyncSession): """Tests if there is a duplicate, it's not created in the database""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -73,7 +73,7 @@ def test_duplicate_user(database_session: Session): assert len(links) == 1 -def test_use_same_uuid_multiple_times(database_session: Session): +def test_use_same_uuid_multiple_times(database_session: AsyncSession): """Tests that you can't use the same UUID multiple times""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -89,7 +89,7 @@ def test_use_same_uuid_multiple_times(database_session: Session): create_request(database_session, new_user2, edition) -def test_not_a_correct_email(database_session: Session): +def test_not_a_correct_email(database_session: AsyncSession): """Tests when the email is not a correct email adress, it's get the right error""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) diff --git a/backend/tests/test_routers/test_editions/test_editions/test_editions.py b/backend/tests/test_routers/test_editions/test_editions/test_editions.py index d621c4a12..9788d5773 100644 --- a/backend/tests/test_routers/test_editions/test_editions/test_editions.py +++ b/backend/tests/test_routers/test_editions/test_editions/test_editions.py @@ -1,5 +1,5 @@ from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from settings import DB_PAGE_SIZE diff --git a/backend/tests/test_routers/test_editions/test_invites/test_invites.py b/backend/tests/test_routers/test_editions/test_invites/test_invites.py index 64f6958b3..0ec345e47 100644 --- a/backend/tests/test_routers/test_editions/test_invites/test_invites.py +++ b/backend/tests/test_routers/test_editions/test_invites/test_invites.py @@ -1,7 +1,7 @@ from json import dumps from uuid import UUID -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from settings import DB_PAGE_SIZE @@ -9,30 +9,31 @@ from tests.utils.authorization import AuthClient -def test_get_empty_invites(database_session: Session, auth_client: AuthClient): +async def test_get_empty_invites(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting invites when db is empty""" - auth_client.admin() + await auth_client.admin() database_session.add(Edition(year=2022, name="ed2022")) - database_session.commit() + await database_session.commit() - response = auth_client.get("/editions/ed2022/invites") + async with auth_client: + response = await auth_client.get("/editions/ed2022/invites", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert response.json() == {"inviteLinks": []} -def test_get_invites(database_session: Session, auth_client: AuthClient): +async def test_get_invites(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting invites when db is not empty""" - auth_client.admin() + await auth_client.admin() edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() database_session.add(InviteLink(target_email="test@ema.il", edition=edition)) - database_session.commit() + await database_session.commit() - response = auth_client.get("/editions/ed2022/invites") + async with auth_client: + response = await auth_client.get("/editions/ed2022/invites", follow_redirects=True) - print(response.json()) assert response.status_code == status.HTTP_200_OK json = response.json() assert len(json["inviteLinks"]) == 1 @@ -41,148 +42,156 @@ def test_get_invites(database_session: Session, auth_client: AuthClient): assert link["email"] == "test@ema.il" -def test_get_invites_paginated(database_session: Session, auth_client: AuthClient): +async def test_get_invites_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting paginated invites when db is not empty""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(InviteLink(target_email=f"{i}@example.com", edition=edition)) - database_session.commit() + await database_session.commit() - auth_client.admin() + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2022/invites?page=0", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['inviteLinks']) == DB_PAGE_SIZE + response = await auth_client.get("/editions/ed2022/invites?page=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['inviteLinks']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE - response = auth_client.get("/editions/ed2022/invites?page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['inviteLinks']) == DB_PAGE_SIZE - response = auth_client.get("/editions/ed2022/invites?page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['inviteLinks']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE - -def test_create_invite_valid(database_session: Session, auth_client: AuthClient): +async def test_create_invite_valid(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for creating invites when data is valid""" - auth_client.admin() + await auth_client.admin() edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() - # Create POST request - response = auth_client.post("/editions/ed2022/invites/", data=dumps({"email": "test@ema.il"})) - assert response.status_code == status.HTTP_201_CREATED - json = response.json() - assert "mailTo" in json - assert json["mailTo"].startswith("mailto:test@ema.il") - assert "inviteLink" in json + async with auth_client: + # Create POST request + response = await auth_client.post("/editions/ed2022/invites/", content=dumps({"email": "test@ema.il"})) + assert response.status_code == status.HTTP_201_CREATED + json = response.json() + assert "mailTo" in json + assert json["mailTo"].startswith("mailto:test@ema.il") + assert "inviteLink" in json - # New entry made in database - json = auth_client.get("/editions/ed2022/invites/").json() - assert len(json["inviteLinks"]) == 1 - new_uuid = json["inviteLinks"][0]["uuid"] - assert auth_client.get(f"/editions/ed2022/invites/{new_uuid}/").status_code == status.HTTP_200_OK + # New entry made in database + json = (await auth_client.get("/editions/ed2022/invites/")).json() + assert len(json["inviteLinks"]) == 1 + new_uuid = json["inviteLinks"][0]["uuid"] + assert (await auth_client.get(f"/editions/ed2022/invites/{new_uuid}")).status_code == status.HTTP_200_OK -def test_create_invite_invalid(database_session: Session, auth_client: AuthClient): +async def test_create_invite_invalid(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for creating invites when data is invalid""" - auth_client.admin() + await auth_client.admin() edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() - # Invalid POST will send invalid status code - response = auth_client.post("/editions/ed2022/invites/", data=dumps({"email": "invalid field"})) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + async with auth_client: + # Invalid POST will send invalid status code + response = await auth_client.post("/editions/ed2022/invites/", content=dumps({"email": "invalid field"}), follow_redirects=True) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - # Verify that no new entry was made after the error - assert len(auth_client.get("/editions/ed2022/invites/").json()["inviteLinks"]) == 0 + # Verify that no new entry was made after the error + assert len((await auth_client.get("/editions/ed2022/invites/", follow_redirects=True)).json()["inviteLinks"]) == 0 -def test_delete_invite_invalid(database_session: Session, auth_client: AuthClient): +async def test_delete_invite_invalid(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for deleting invites when uuid is malformed""" - auth_client.admin() + await auth_client.admin() database_session.add(Edition(year=2022, name="ed2022")) - database_session.commit() + await database_session.commit() - assert auth_client.delete("/editions/ed2022/invites/1").status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + async with auth_client: + assert (await auth_client.delete("/editions/ed2022/invites/1")).status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_delete_invite_valid(database_session: Session, auth_client: AuthClient): +async def test_delete_invite_valid(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for deleting invites when uuid is valid""" - auth_client.admin() + await auth_client.admin() edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() debug_uuid = "123e4567-e89b-12d3-a456-426614174000" - # Not present yet - assert auth_client.delete(f"/editions/ed2022/invites/{debug_uuid}").status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + # Not present yet + assert (await auth_client.delete(f"/editions/ed2022/invites/{debug_uuid}")).status_code == status.HTTP_404_NOT_FOUND - # Create new entry in db - invite_link = InviteLink(target_email="test@ema.il", edition=edition, uuid=UUID(debug_uuid)) - database_session.add(invite_link) - database_session.commit() + # Create new entry in db + invite_link = InviteLink(target_email="test@ema.il", edition=edition, uuid=UUID(debug_uuid)) + database_session.add(invite_link) + await database_session.commit() - # Remove - assert auth_client.delete(f"/editions/ed2022/invites/{invite_link.uuid}").status_code == status.HTTP_204_NO_CONTENT + # Remove + assert (await auth_client.delete(f"/editions/ed2022/invites/{invite_link.uuid}")).status_code == status.HTTP_204_NO_CONTENT - # Not found anymore - assert auth_client.get(f"/editions/ed2022/invites/{invite_link.uuid}/").status_code == status.HTTP_404_NOT_FOUND + # Not found anymore + assert (await auth_client.get(f"/editions/ed2022/invites/{invite_link.uuid}")).status_code == status.HTTP_404_NOT_FOUND -def test_get_invite_malformed_uuid(database_session: Session, auth_client: AuthClient): +async def test_get_invite_malformed_uuid(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for fetching invites when uuid is malformed""" - auth_client.admin() + await auth_client.admin() edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() - # Verify malformed uuid (1) - assert auth_client.get("/editions/ed2022/invites/1/").status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + async with auth_client: + # Verify malformed uuid (1) + assert (await auth_client.get("/editions/ed2022/invites/1")).status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_get_invite_non_existing(database_session: Session, auth_client: AuthClient): +async def test_get_invite_non_existing(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for fetching invites when uuid is valid but doesn't exist""" - auth_client.admin() + await auth_client.admin() edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() - assert auth_client.get( - "/editions/ed2022/invites/123e4567-e89b-12d3-a456-426614174000").status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + assert (await auth_client.get("/editions/ed2022/invites/123e4567-e89b-12d3-a456-426614174000"))\ + .status_code == status.HTTP_404_NOT_FOUND -def test_get_invite_present(database_session: Session, auth_client: AuthClient): +async def test_get_invite_present(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint to fetch an invite when one is present""" - auth_client.admin() + await auth_client.admin() edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() debug_uuid = "123e4567-e89b-12d3-a456-426614174000" # Create new entry in db invite_link = InviteLink(target_email="test@ema.il", edition=edition, uuid=UUID(debug_uuid)) database_session.add(invite_link) - database_session.commit() + await database_session.commit() - # Found the correct result now - response = auth_client.get(f"/editions/ed2022/invites/{debug_uuid}") + async with auth_client: + # Found the correct result now + response = await auth_client.get(f"/editions/ed2022/invites/{debug_uuid}") json = response.json() assert response.status_code == status.HTTP_200_OK assert json["uuid"] == debug_uuid assert json["email"] == "test@ema.il" -def test_create_invite_valid_old_edition(database_session: Session, auth_client: AuthClient): +async def test_create_invite_valid_old_edition(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for creating invites when data is valid, but the edition is read-only""" - auth_client.admin() + await auth_client.admin() edition = Edition(year=2022, name="ed2022") edition2 = Edition(year=2023, name="ed2023") database_session.add(edition) database_session.add(edition2) - database_session.commit() + await database_session.commit() - # Create POST request - response = auth_client.post("/editions/ed2022/invites/", data=dumps({"email": "test@ema.il"})) + async with auth_client: + # Create POST request + response = await auth_client.post("/editions/ed2022/invites/", content=dumps({"email": "test@ema.il"})) assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index 556604c90..e9611502c 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -1,5 +1,5 @@ import pytest -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from settings import DB_PAGE_SIZE @@ -8,7 +8,7 @@ @pytest.fixture -def database_with_data(database_session: Session) -> Session: +def database_with_data(database_session: AsyncSession) -> Session: """fixture for adding data to the database""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -64,7 +64,7 @@ def test_get_projects(database_with_data: Session, auth_client: AuthClient): assert json['projects'][2]['name'] == "super nice project" -def test_get_projects_paginated(database_session: Session, auth_client: AuthClient): +def test_get_projects_paginated(database_session: AsyncSession, auth_client: AuthClient): """test get all projects paginated""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -273,7 +273,7 @@ def test_patch_project_non_existing_coach(database_with_data: Session, auth_clie assert 10 not in json["coaches"] -def test_patch_wrong_project(database_session: Session, auth_client: AuthClient): +def test_patch_wrong_project(database_session: AsyncSession, auth_client: AuthClient): """Tests patching with wrong project info""" auth_client.admin() database_session.add(Edition(year=2022, name="ed2022")) diff --git a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py index a2c431e61..3570235fe 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py @@ -1,6 +1,6 @@ import pytest from fastapi.testclient import TestClient -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.models import Edition, Project, User, Skill, ProjectRole, Student @@ -8,7 +8,7 @@ @pytest.fixture -def database_with_data(database_session: Session) -> Session: +def database_with_data(database_session: AsyncSession) -> Session: """fixture for adding data to the database""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -137,7 +137,7 @@ def test_add_student_to_ghost_project(database_with_data: Session, current_editi assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_add_incomplete_data_student_project(database_session: Session, auth_client: AuthClient): +def test_add_incomplete_data_student_project(database_session: AsyncSession, auth_client: AuthClient): """Tests adding a student with incomplete data""" edition = Edition(year=2022, name="ed2022") @@ -277,7 +277,7 @@ def test_delete_student_project(database_with_data: Session, current_edition: Ed assert len(json['projects'][0]['projectRoles']) == 2 -def test_delete_student_project_empty(database_session: Session, auth_client: AuthClient): +def test_delete_student_project_empty(database_session: AsyncSession, auth_client: AuthClient): """Tests deleting a student from a project that isn't assigned""" edition = Edition(year=2022, name="ed2022") diff --git a/backend/tests/test_routers/test_editions/test_register/test_register.py b/backend/tests/test_routers/test_editions/test_register/test_register.py index 6d75d523c..500cb660a 100644 --- a/backend/tests/test_routers/test_editions/test_register/test_register.py +++ b/backend/tests/test_routers/test_editions/test_register/test_register.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from starlette.testclient import TestClient @@ -6,7 +6,7 @@ from src.database.models import Edition, InviteLink, User, AuthEmail -def test_ok(database_session: Session, test_client: TestClient): +def test_ok(database_session: AsyncSession, test_client: TestClient): """Tests a registeration is made""" edition: Edition = Edition(year=2022, name="ed2022") invite_link: InviteLink = InviteLink( @@ -24,7 +24,7 @@ def test_ok(database_session: Session, test_client: TestClient): assert user.user_id == user_auth.user_id -def test_use_uuid_multiple_times(database_session: Session, test_client: TestClient): +def test_use_uuid_multiple_times(database_session: AsyncSession, test_client: TestClient): """Tests that you can't use the same UUID multiple times""" edition: Edition = Edition(year=2022, name="ed2022") invite_link: InviteLink = InviteLink( @@ -41,7 +41,7 @@ def test_use_uuid_multiple_times(database_session: Session, test_client: TestCli assert response.status_code == status.HTTP_404_NOT_FOUND -def test_no_valid_uuid(database_session: Session, test_client: TestClient): +def test_no_valid_uuid(database_session: AsyncSession, test_client: TestClient): """Tests that no valid uuid, can't make a account""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -55,14 +55,14 @@ def test_no_valid_uuid(database_session: Session, test_client: TestClient): assert len(users) == 0 -def test_no_edition(database_session: Session, test_client: TestClient): +def test_no_edition(database_session: AsyncSession, test_client: TestClient): """Tests if there is no edition it gets the right error code""" response = test_client.post("/editions/ed2022/register/email", json={ "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test"}) assert response.status_code == status.HTTP_404_NOT_FOUND -def test_not_a_correct_email(database_session: Session, test_client: TestClient): +def test_not_a_correct_email(database_session: AsyncSession, test_client: TestClient): """Tests when the email isn't correct, it gets the right error code""" database_session.add(Edition(year=2022, name="ed2022")) database_session.commit() @@ -71,7 +71,7 @@ def test_not_a_correct_email(database_session: Session, test_client: TestClient) assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_duplicate_user(database_session: Session, test_client: TestClient): +def test_duplicate_user(database_session: AsyncSession, test_client: TestClient): """Tests when there is a duplicate, it gets the right error code""" edition: Edition = Edition(year=2022, name="ed2022") invite_link1: InviteLink = InviteLink( @@ -91,7 +91,7 @@ def test_duplicate_user(database_session: Session, test_client: TestClient): assert response.status_code == status.HTTP_400_BAD_REQUEST -def test_old_edition(database_session: Session, test_client: TestClient): +def test_old_edition(database_session: AsyncSession, test_client: TestClient): """Tests trying to make a registration for a read-only edition""" edition: Edition = Edition(year=2022, name="ed2022") edition3: Edition = Edition(year=2023, name="ed2023") diff --git a/backend/tests/test_routers/test_editions/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_students/test_students.py index 59ee28291..7ec635966 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_students/test_students.py @@ -1,6 +1,6 @@ import datetime import pytest -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from settings import DB_PAGE_SIZE from src.database.enums import DecisionEnum, EmailStatusEnum @@ -10,7 +10,7 @@ @pytest.fixture -def database_with_data(database_session: Session) -> Session: +def database_with_data(database_session: AsyncSession) -> Session: """A fixture to fill the database with fake data that can easly be used when testing""" # Editions diff --git a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py index 487af0c5c..600d50f5e 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py +++ b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py @@ -1,5 +1,5 @@ import pytest -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.enums import DecisionEnum from src.database.models import Suggestion, Student, User, Edition, Skill @@ -8,7 +8,7 @@ @pytest.fixture -def database_with_data(database_session: Session) -> Session: +def database_with_data(database_session: AsyncSession) -> Session: """A fixture to fill the database with fake data that can easly be used when testing""" # Editions diff --git a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py index a75d0a789..cfb22069d 100644 --- a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py +++ b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py @@ -3,7 +3,7 @@ import pytest from fastapi.testclient import TestClient -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.models import Edition, WebhookURL, Student @@ -12,7 +12,7 @@ @pytest.fixture -def edition(database_session: Session) -> Edition: +def edition(database_session: AsyncSession) -> Edition: edition = Edition(year=2022, name="ed2022") database_session.add(edition) database_session.commit() @@ -20,7 +20,7 @@ def edition(database_session: Session) -> Edition: @pytest.fixture -def webhook(edition: Edition, database_session: Session) -> WebhookURL: +def webhook(edition: Edition, database_session: AsyncSession) -> WebhookURL: webhook = WebhookURL(edition=edition) database_session.add(webhook) database_session.commit() @@ -41,7 +41,7 @@ def test_new_webhook_invalid_edition(auth_client: AuthClient, edition: Edition): assert response.status_code == status.HTTP_404_NOT_FOUND -def test_webhook(test_client: TestClient, webhook: WebhookURL, database_session: Session): +def test_webhook(test_client: TestClient, webhook: WebhookURL, database_session: AsyncSession): event: dict = create_webhook_event( email_address="test@gmail.com", first_name="Bob", @@ -114,7 +114,7 @@ def test_webhook_missing_question(test_client: TestClient, webhook: WebhookURL, assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_new_webhook_old_edition(database_session: Session, auth_client: AuthClient, edition: Edition): +def test_new_webhook_old_edition(database_session: AsyncSession, auth_client: AuthClient, edition: Edition): database_session.add(Edition(year=2023, name="ed2023")) database_session.commit() diff --git a/backend/tests/test_routers/test_login/test_login.py b/backend/tests/test_routers/test_login/test_login.py index 166098cee..8ca8f4ecb 100644 --- a/backend/tests/test_routers/test_login/test_login.py +++ b/backend/tests/test_routers/test_login/test_login.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from starlette.testclient import TestClient @@ -16,7 +16,7 @@ def test_login_non_existing(test_client: TestClient): assert test_client.post("/login/token", data=form).status_code == status.HTTP_401_UNAUTHORIZED -def test_login_existing(database_session: Session, test_client: TestClient): +def test_login_existing(database_session: AsyncSession, test_client: TestClient): """Test logging in with an existing account""" email = "test@ema.il" password = "password" @@ -41,7 +41,7 @@ def test_login_existing(database_session: Session, test_client: TestClient): assert test_client.post("/login/token", data=form).status_code == status.HTTP_200_OK -def test_login_existing_wrong_credentials(database_session: Session, test_client: TestClient): +def test_login_existing_wrong_credentials(database_session: AsyncSession, test_client: TestClient): """Test logging in with existing, but wrong credentials""" email = "test@ema.il" password = "password" diff --git a/backend/tests/test_routers/test_skills/test_skills.py b/backend/tests/test_routers/test_skills/test_skills.py index a4a93717e..23a1d56c9 100644 --- a/backend/tests/test_routers/test_skills/test_skills.py +++ b/backend/tests/test_routers/test_skills/test_skills.py @@ -1,12 +1,12 @@ from json import dumps -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.models import Skill from tests.utils.authorization import AuthClient -def test_get_skills(database_session: Session, auth_client: AuthClient): +def test_get_skills(database_session: AsyncSession, auth_client: AuthClient): """Performe tests on getting skills Args: @@ -27,7 +27,7 @@ def test_get_skills(database_session: Session, auth_client: AuthClient): assert response["skills"][0]["description"] == "Must know react" -def test_create_skill(database_session: Session, auth_client: AuthClient): +def test_create_skill(database_session: AsyncSession, auth_client: AuthClient): """Performe tests on creating skills Args: @@ -43,7 +43,7 @@ def test_create_skill(database_session: Session, auth_client: AuthClient): assert auth_client.get("/skills/").json()["skills"][0]["description"] == "must know react" -def test_delete_skill(database_session: Session, auth_client: AuthClient): +def test_delete_skill(database_session: AsyncSession, auth_client: AuthClient): """Performe tests on deleting skills Args: @@ -61,7 +61,7 @@ def test_delete_skill(database_session: Session, auth_client: AuthClient): assert response.status_code == status.HTTP_204_NO_CONTENT -def test_delete_skill_non_existing(database_session: Session, auth_client: AuthClient): +def test_delete_skill_non_existing(database_session: AsyncSession, auth_client: AuthClient): """Delete a skill that doesn't exist""" auth_client.admin() diff --git a/backend/tests/test_routers/test_users/test_users.py b/backend/tests/test_routers/test_users/test_users.py index 38db1dfcf..bf850f709 100644 --- a/backend/tests/test_routers/test_users/test_users.py +++ b/backend/tests/test_routers/test_users/test_users.py @@ -1,7 +1,7 @@ from json import dumps import pytest -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status @@ -12,7 +12,7 @@ @pytest.fixture -def data(database_session: Session) -> dict[str, str | int]: +def data(database_session: AsyncSession) -> dict[str, str | int]: """Fill database with dummy data""" # Create users user1 = models.User(name="user1", admin=True) @@ -53,7 +53,7 @@ def data(database_session: Session) -> dict[str, str | int]: } -def test_get_all_users(database_session: Session, auth_client: AuthClient, data: dict[str, str | int]): +def test_get_all_users(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for getting a list of users""" auth_client.admin() # All users @@ -66,7 +66,7 @@ def test_get_all_users(database_session: Session, auth_client: AuthClient, data: assert data["user2"] in user_ids -def test_get_all_users_paginated(database_session: Session, auth_client: AuthClient): +def test_get_all_users_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of users""" for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=False)) @@ -82,7 +82,7 @@ def test_get_all_users_paginated(database_session: Session, auth_client: AuthCli # +1 because Authclient.admin() also creates one user. -def test_get_all_users_paginated_filter_name(database_session: Session, auth_client: AuthClient): +def test_get_all_users_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of users with filter for name""" count = 0 for i in range(round(DB_PAGE_SIZE * 1.5)): @@ -100,7 +100,7 @@ def test_get_all_users_paginated_filter_name(database_session: Session, auth_cli assert len(response.json()['users']) == max(count - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) -def test_get_users_response(database_session: Session, auth_client: AuthClient, data: dict[str, str]): +def test_get_users_response(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str]): """Test the response model of a user""" auth_client.admin() response = auth_client.get("/users") @@ -113,7 +113,7 @@ def test_get_users_response(database_session: Session, auth_client: AuthClient, assert user2["auth"]["authType"] == data["auth_type2"] -def test_get_all_admins(database_session: Session, auth_client: AuthClient, data: dict[str, str | int]): +def test_get_all_admins(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for getting a list of admins""" auth_client.admin() # All admins @@ -124,7 +124,7 @@ def test_get_all_admins(database_session: Session, auth_client: AuthClient, data assert [data["user1"]] == user_ids -def test_get_all_admins_paginated(database_session: Session, auth_client: AuthClient): +def test_get_all_admins_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of paginated admins""" count = 0 for i in range(round(DB_PAGE_SIZE * 3)): @@ -143,7 +143,7 @@ def test_get_all_admins_paginated(database_session: Session, auth_client: AuthCl # +1 because Authclient.admin() also creates one user. -def test_get_all_non_admins_paginated(database_session: Session, auth_client: AuthClient): +def test_get_all_non_admins_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of paginated admins""" non_admins = [] for i in range(round(DB_PAGE_SIZE * 3)): @@ -168,7 +168,7 @@ def test_get_all_non_admins_paginated(database_session: Session, auth_client: Au assert len(response.json()['users']) == max(count - DB_PAGE_SIZE, 0) -def test_get_all_admins_paginated_filter_name(database_session: Session, auth_client: AuthClient): +def test_get_all_admins_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of paginated admins with filter for name""" for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=True)) @@ -183,7 +183,7 @@ def test_get_all_admins_paginated_filter_name(database_session: Session, auth_cl assert len(response.json()['users']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 -def test_get_all_non_admins_paginated_filter_name(database_session: Session, auth_client: AuthClient): +def test_get_all_non_admins_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of paginated admins""" non_admins = [] for i in range(round(DB_PAGE_SIZE * 3)): @@ -208,7 +208,7 @@ def test_get_all_non_admins_paginated_filter_name(database_session: Session, aut assert len(response.json()['users']) == max(count - DB_PAGE_SIZE, 0) -def test_get_users_from_edition(database_session: Session, auth_client: AuthClient, data: dict[str, str | int]): +def test_get_users_from_edition(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for getting a list of users from a given edition""" auth_client.admin() # All users from edition @@ -218,7 +218,7 @@ def test_get_users_from_edition(database_session: Session, auth_client: AuthClie assert [data["user2"]] == user_ids -def test_get_all_users_for_edition_paginated(database_session: Session, auth_client: AuthClient): +def test_get_all_users_for_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of users""" edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -237,7 +237,7 @@ def test_get_all_users_for_edition_paginated(database_session: Session, auth_cli # +1 because Authclient.admin() also creates one user. -def test_get_all_users_for_edition_paginated_filter_user(database_session: Session, auth_client: AuthClient): +def test_get_all_users_for_edition_paginated_filter_user(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of users and filter on name""" edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -258,7 +258,7 @@ def test_get_all_users_for_edition_paginated_filter_user(database_session: Sessi assert len(response.json()['users']) == max(count - DB_PAGE_SIZE, 0) -def test_get_admins_from_edition(database_session: Session, auth_client: AuthClient, data: dict[str, str | int]): +def test_get_admins_from_edition(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for getting a list of admins, edition should be ignored""" auth_client.admin() # All admins from edition @@ -271,7 +271,7 @@ def test_get_admins_from_edition(database_session: Session, auth_client: AuthCli assert len(response.json()['users']) == 2 -def test_get_all_users_excluded_edition_paginated(database_session: Session, auth_client: AuthClient): +def test_get_all_users_excluded_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): auth_client.admin() edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") @@ -306,7 +306,7 @@ def test_get_all_users_excluded_edition_paginated(database_session: Session, aut round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 # auth_client is not a coach -def test_get_all_users_excluded_edition_paginated_filter_name(database_session: Session, auth_client: AuthClient): +def test_get_all_users_excluded_edition_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): auth_client.admin() edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") @@ -344,7 +344,7 @@ def test_get_all_users_excluded_edition_paginated_filter_name(database_session: max(count - DB_PAGE_SIZE, 0) -def test_get_all_users_for_edition_excluded_edition_paginated(database_session: Session, auth_client: AuthClient): +def test_get_all_users_for_edition_excluded_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): auth_client.admin() edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") @@ -378,7 +378,7 @@ def test_get_all_users_for_edition_excluded_edition_paginated(database_session: assert user["userId"] in correct_users_id -def test_get_users_invalid(database_session: Session, auth_client: AuthClient, data: dict[str, str | int]): +def test_get_users_invalid(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for unvalid input""" auth_client.admin() # Invalid input @@ -386,7 +386,7 @@ def test_get_users_invalid(database_session: Session, auth_client: AuthClient, d assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_edit_admin_status(database_session: Session, auth_client: AuthClient): +def test_edit_admin_status(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for editing the admin status of a user""" auth_client.admin() # Create user @@ -405,7 +405,7 @@ def test_edit_admin_status(database_session: Session, auth_client: AuthClient): assert not user.admin -def test_add_coach(database_session: Session, auth_client: AuthClient): +def test_add_coach(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for adding coaches""" auth_client.admin() # Create user @@ -426,7 +426,7 @@ def test_add_coach(database_session: Session, auth_client: AuthClient): assert coach.edition_id == edition.edition_id -def test_remove_coach(database_session: Session, auth_client: AuthClient): +def test_remove_coach(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for removing coaches""" auth_client.admin() # Create user @@ -452,7 +452,7 @@ def test_remove_coach(database_session: Session, auth_client: AuthClient): assert len(coach) == 0 -def test_remove_coach_all_editions(database_session: Session, auth_client: AuthClient): +def test_remove_coach_all_editions(database_session: AsyncSession, auth_client: AuthClient): """Test removing a user as coach from all editions""" auth_client.admin() @@ -486,7 +486,7 @@ def test_remove_coach_all_editions(database_session: Session, auth_client: AuthC assert len(coach) == 1 -def test_get_all_requests(database_session: Session, auth_client: AuthClient): +def test_get_all_requests(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting all userrequests""" auth_client.admin() @@ -520,7 +520,7 @@ def test_get_all_requests(database_session: Session, auth_client: AuthClient): assert user2.user_id in user_ids -def test_get_all_requests_paginated(database_session: Session, auth_client: AuthClient): +def test_get_all_requests_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a paginated list of requests""" edition = models.Edition(year=2022, name="ed2022") @@ -539,7 +539,7 @@ def test_get_all_requests_paginated(database_session: Session, auth_client: Auth assert len(response.json()['requests']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE -def test_get_all_requests_paginated_filter_name(database_session: Session, auth_client: AuthClient): +def test_get_all_requests_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a paginated list of requests""" edition = models.Edition(year=2022, name="ed2022") @@ -561,7 +561,7 @@ def test_get_all_requests_paginated_filter_name(database_session: Session, auth_ assert len(response.json()['requests']) == max(count-DB_PAGE_SIZE, 0) -def test_get_all_requests_from_edition(database_session: Session, auth_client: AuthClient): +def test_get_all_requests_from_edition(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting all userrequests of a given edition""" auth_client.admin() @@ -600,7 +600,7 @@ def test_get_all_requests_from_edition(database_session: Session, auth_client: A assert user2.user_id == requests[0]["user"]["userId"] -def test_get_all_requests_for_edition_paginated(database_session: Session, auth_client: AuthClient): +def test_get_all_requests_for_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a paginated list of requests""" edition = models.Edition(year=2022, name="ed2022") @@ -619,7 +619,7 @@ def test_get_all_requests_for_edition_paginated(database_session: Session, auth_ assert len(response.json()['requests']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE -def test_get_all_requests_for_edition_paginated_filter_name(database_session: Session, auth_client: AuthClient): +def test_get_all_requests_for_edition_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a paginated list of requests""" edition = models.Edition(year=2022, name="ed2022") From c5702d50c758a1d9f70226ccaf4e46312ab863a7 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Fri, 6 May 2022 14:00:16 +0200 Subject: [PATCH 090/649] Post new email --- frontend/src/utils/api/mail_overview.ts | 11 ++--- .../MailOverviewPage/MailOverviewPage.tsx | 43 +++++++++++-------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/frontend/src/utils/api/mail_overview.ts b/frontend/src/utils/api/mail_overview.ts index b8a565a64..67cbc0f49 100644 --- a/frontend/src/utils/api/mail_overview.ts +++ b/frontend/src/utils/api/mail_overview.ts @@ -40,20 +40,15 @@ export async function getMailOverview( /** * Updates the Email state of the currently selected students in the table to the selected state * from the dropdown menu - * @param eventKey - * @param edition */ export async function setStateRequest( - eventKey: string | null, + eventKey: string, edition: string | undefined, - selectedRows: number[] + selectedStudents: number[] ) { // post request with selected data - console.log(selectedRows); await axiosInstance.post(`/editions/${edition}/students/emails`, { - students_id: selectedRows, + students_id: selectedStudents, email_status: eventKey, }); - // remove all selections - selectedRows.splice(0, selectedRows.length); } diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index 7c0858f9c..dbd3ed36f 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -28,13 +28,12 @@ export default function MailOverviewPage() { const [searhTerm, setSearchTerm] = useState(""); const [filters, setFilters] = useState([]); - const [selectedRows, setSelectedRows] = useState([]); + const [selectedStudents, setSelectedStudents] = useState([]); const { editionId } = useParams(); /** * update the table with new values - * @param page */ async function updateMailOverview() { if (loading) { @@ -63,20 +62,21 @@ export default function MailOverviewPage() { setLoading(false); } - function searchName(newSearchTerm: string) { + function refresh() { setPage(0); setGotEmails(false); setMoreEmailsAvailable(true); - setSearchTerm(newSearchTerm); setEmails([]); } + function searchName(newSearchTerm: string) { + setSearchTerm(newSearchTerm); + refresh(); + } + function changeFilter(newFilter: EmailType[]) { - setPage(0); - setGotEmails(false); - setMoreEmailsAvailable(true); setFilters(newFilter); - setEmails([]); + refresh(); } /** @@ -84,17 +84,28 @@ export default function MailOverviewPage() { * @param row * @param isSelect */ - function selectNewRow(row: StudentEmail, isSelect: boolean) { + function selectNewStudent(row: StudentEmail, isSelect: boolean) { if (isSelect) { - setSelectedRows(selectedRows.concat(row.student.studentId)); + setSelectedStudents(selectedStudents.concat(row.student.studentId)); } else { - setSelectedRows(selectedRows.filter(item => item !== row.student.studentId)); + setSelectedStudents(selectedStudents.filter(item => item !== row.student.studentId)); } } function selectAll(isSelect: boolean, rows: StudentEmail[]) { for (const row of rows) { - selectNewRow(row, isSelect); + selectNewStudent(row, isSelect); + } + } + + async function changeState(eventKey: string) { + try { + await setStateRequest(eventKey, editionId, selectedStudents); + setSelectedStudents([]); + alert("Successful changed"); + refresh(); + } catch { + alert("Failed to change state"); } } @@ -152,7 +163,7 @@ export default function MailOverviewPage() { bordered selectRow={{ mode: "checkbox", - onSelect: selectNewRow, + onSelect: selectNewStudent, onSelectAll: selectAll, }} /> @@ -161,8 +172,6 @@ export default function MailOverviewPage() { ); } - // TODO: Change state - return ( <> @@ -175,9 +184,7 @@ export default function MailOverviewPage() { - setStateRequest(index.toString(), editionId, selectedRows) - } + onClick={() => changeState(index.toString())} > {type} From 8717e0ed4d5b19e52fbde1fc82d653df20920466 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Fri, 6 May 2022 14:09:48 +0200 Subject: [PATCH 091/649] Move @types dependencies to devDependencies --- frontend/package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index fac9b24fe..7fd84eb52 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,9 +6,6 @@ "@fortawesome/fontawesome-svg-core": "^1.3.0", "@fortawesome/free-solid-svg-icons": "^6.0.0", "@fortawesome/react-fontawesome": "^0.1.17", - "@types/react-bootstrap-table-next": "^4.0.17", - "@types/react-bootstrap-table2-toolkit": "^2.1.6", - "@types/react-infinite-scroller": "^1.2.3", "axios": "^0.26.1", "bootstrap": "5.1.3", "buffer": "^6.0.3", @@ -46,6 +43,8 @@ "@types/react-router-bootstrap": "^0.24.5", "@types/react-router-dom": "^5.3.3", "@types/styled-components": "^5.1.24", + "@types/react-bootstrap-table-next": "^4.0.17", + "@types/react-bootstrap-table2-toolkit": "^2.1.6", "@typescript-eslint/eslint-plugin": "^5.12.0", "@typescript-eslint/parser": "^5.12.0", "enzyme": "^3.11.0", From 3ee20f9cc7ac0ba41e65d3297571d67f7f0dfc4f Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Fri, 6 May 2022 15:44:18 +0200 Subject: [PATCH 092/649] Replace react-bootstrap-table with Table from react-bootstrap --- frontend/package.json | 4 - .../MailOverviewPage/MailOverviewPage.tsx | 175 +++++++++++------- frontend/src/views/MailOverviewPage/styles.ts | 11 +- frontend/yarn.lock | 45 +---- 4 files changed, 118 insertions(+), 117 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 7fd84eb52..caff877c4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,8 +12,6 @@ "multiselect-react-dropdown": "^2.0.21", "react": "^17.0.2", "react-bootstrap": "^2.2.1", - "react-bootstrap-table-next": "^4.0.3", - "react-bootstrap-table2-toolkit": "^2.1.3", "react-bootstrap-typeahead": "^6.0.0-alpha.11", "react-collapsible": "^2.8.4", "react-dom": "^17.0.2", @@ -43,8 +41,6 @@ "@types/react-router-bootstrap": "^0.24.5", "@types/react-router-dom": "^5.3.3", "@types/styled-components": "^5.1.24", - "@types/react-bootstrap-table-next": "^4.0.17", - "@types/react-bootstrap-table2-toolkit": "^2.1.6", "@typescript-eslint/eslint-plugin": "^5.12.0", "@typescript-eslint/parser": "^5.12.0", "enzyme": "^3.11.0", diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index dbd3ed36f..c2ed4059f 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -1,35 +1,46 @@ import React, { useState } from "react"; import { getMailOverview, setStateRequest, StudentEmail } from "../../utils/api/mail_overview"; -import BootstrapTable from "react-bootstrap-table-next"; import DropdownButton from "react-bootstrap/DropdownButton"; import Dropdown from "react-bootstrap/Dropdown"; import InputGroup from "react-bootstrap/InputGroup"; import FormControl from "react-bootstrap/FormControl"; import InfiniteScroll from "react-infinite-scroller"; import { Multiselect } from "multiselect-react-dropdown"; -import { TableDiv, DropDownButtonDiv, SearchDiv, FilterDiv, SearchAndFilterDiv } from "./styles"; +import { Form, Spinner } from "react-bootstrap"; +import { + TableDiv, + DropDownButtonDiv, + SearchDiv, + FilterDiv, + SearchAndFilterDiv, + EmailsTable, +} from "./styles"; import { EmailType } from "../../data/enums"; import { SpinnerContainer, Error } from "../../components/UsersComponents/Requests/styles"; import { useParams } from "react-router-dom"; -import { Spinner } from "react-bootstrap"; +import { Student } from "../../data/interfaces"; + +interface EmailRow { + email: StudentEmail; + checked: boolean; +} /** * Page that shows the email status of all students, with the possibility to change the status */ export default function MailOverviewPage() { - const [emails, setEmails] = useState([]); + const [emailRows, setEmailRows] = useState([]); const [gotEmails, setGotEmails] = useState(false); const [loading, setLoading] = useState(false); - const [moreEmailsAvailable, setMoreEmailsAvailable] = useState(true); // Endpoint has more emails available + const [moreEmailsAvailable, setMoreEmailsAvailable] = useState(true); // Endpoint has more emailRows available const [error, setError] = useState(undefined); const [page, setPage] = useState(0); + const [allSelected, setAllSelected] = useState(false); // Keep track of the set filters const [searhTerm, setSearchTerm] = useState(""); const [filters, setFilters] = useState([]); - const [selectedStudents, setSelectedStudents] = useState([]); - const { editionId } = useParams(); /** @@ -49,9 +60,25 @@ export default function MailOverviewPage() { setMoreEmailsAvailable(false); } if (page === 0) { - setEmails(response.studentEmails); + setEmailRows( + response.studentEmails.map(email => { + return { + email: email, + checked: false, + }; + }) + ); } else { - setEmails(emails.concat(response.studentEmails)); + setEmailRows( + emailRows.concat( + response.studentEmails.map(email => { + return { + email: email, + checked: false, + }; + }) + ) + ); } setPage(page + 1); @@ -66,7 +93,8 @@ export default function MailOverviewPage() { setPage(0); setGotEmails(false); setMoreEmailsAvailable(true); - setEmails([]); + setEmailRows([]); + setAllSelected(false); } function searchName(newSearchTerm: string) { @@ -81,27 +109,43 @@ export default function MailOverviewPage() { /** * Keeps the selectedRows list up-to-date when a student is selected/unselected in the table - * @param row - * @param isSelect */ - function selectNewStudent(row: StudentEmail, isSelect: boolean) { - if (isSelect) { - setSelectedStudents(selectedStudents.concat(row.student.studentId)); - } else { - setSelectedStudents(selectedStudents.filter(item => item !== row.student.studentId)); - } + function selectNewStudent(student: Student, isSelect: boolean) { + setEmailRows( + emailRows.map(row => { + if (row.email.student === student) { + row.checked = isSelect; + } + return row; + }) + ); + setAllSelected(false); } - function selectAll(isSelect: boolean, rows: StudentEmail[]) { - for (const row of rows) { - selectNewStudent(row, isSelect); - } + function selectAll(isSelect: boolean) { + setAllSelected(isSelect); + setEmailRows( + emailRows.map(row => { + row.checked = isSelect; + return row; + }) + ); } async function changeState(eventKey: string) { + const selectedStudents = emailRows + .filter(row => row.checked) + .map(row => row.email.student.studentId); + try { await setStateRequest(eventKey, editionId, selectedStudents); - setSelectedStudents([]); + setEmailRows( + emailRows.map(row => { + row.checked = false; + return row; + }) + ); + setAllSelected(false); alert("Successful changed"); refresh(); } catch { @@ -109,35 +153,10 @@ export default function MailOverviewPage() { } } - const columns = [ - { - dataField: "student.firstName", - text: "First Name", - }, - { - dataField: "student.lastName", - text: "Last Name", - }, - { - dataField: "emails[0].decision", - text: "Current Email State", - formatter: (cellContent: number) => { - return Object.values(EmailType)[cellContent]; - }, - }, - { - dataField: "emails[0].date", - text: "Date Of Last Email", - formatter: (cellContent: number) => { - return new Date(String(cellContent)).toLocaleString("nl-be"); - }, - }, - ]; - let table; if (error) { table = {error}; - } else if (gotEmails && emails.length === 0) { + } else if (gotEmails && emailRows.length === 0) { table =
No emails found.
; } else { table = ( @@ -154,19 +173,51 @@ export default function MailOverviewPage() { useWindow={false} getScrollParent={() => document.getElementById("root")} > - + + + + + selectAll(e.target.checked)} + checked={allSelected} + /> + + First Name + Last Name + Current Email State + Data Of Last Email + + + + {emailRows.map(row => ( + + + + selectNewStudent( + row.email.student, + e.target.checked + ) + } + checked={row.checked} + /> + + {row.email.student.firstName} + {row.email.student.lastName} + + {Object.values(EmailType)[row.email.emails[0].decision]} + + + {new Date(String(row.email.emails[0].date)).toLocaleString( + "nl-be" + )} + + + ))} + + ); diff --git a/frontend/src/views/MailOverviewPage/styles.ts b/frontend/src/views/MailOverviewPage/styles.ts index 0b992d54f..cade566dc 100644 --- a/frontend/src/views/MailOverviewPage/styles.ts +++ b/frontend/src/views/MailOverviewPage/styles.ts @@ -1,7 +1,7 @@ +import { Table } from "react-bootstrap"; import styled from "styled-components"; export const TableDiv = styled.div` - background-color: white; margin: auto; margin-top: 5px; margin-bottom: 50px; @@ -33,14 +33,9 @@ export const FilterDiv = styled.div` display: inline-block; `; -export const ButtonDiv = styled.div` - margin: auto; - width: fit-content; - margin-left: 5px; - display: inline-block; -`; - export const SearchAndFilterDiv = styled.div` margin: auto; width: fit-content; `; + +export const EmailsTable = styled(Table)``; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 9582db7ec..9819ece94 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2001,21 +2001,6 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-bootstrap-table-next@*", "@types/react-bootstrap-table-next@^4.0.17": - version "4.0.17" - resolved "https://registry.yarnpkg.com/@types/react-bootstrap-table-next/-/react-bootstrap-table-next-4.0.17.tgz#226a94769c89c8eabb3d59e91d7723c004669b05" - integrity sha512-cUEdFwljyxqErlt1WU1fT+OILXZrM2JrJgEQb2XNo+7CUJdGAEwVQ5MRDs6jAoh3OX/noPkylfUPDTGIcqvhrQ== - dependencies: - "@types/react" "*" - -"@types/react-bootstrap-table2-toolkit@^2.1.6": - version "2.1.6" - resolved "https://registry.yarnpkg.com/@types/react-bootstrap-table2-toolkit/-/react-bootstrap-table2-toolkit-2.1.6.tgz#e9497aa6faacbddcf4d918f552a736bee28c0cb3" - integrity sha512-bu4naldgN6KYuKl3Dca0SDYkf610nurbSxm3kwcol2MUW3QFc1KgBynhNtCgvZJByGpiUAmvt0nmC14o7/T0Iw== - dependencies: - "@types/react" "*" - "@types/react-bootstrap-table-next" "*" - "@types/react-dom@*", "@types/react-dom@^17.0.9": version "17.0.14" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" @@ -3199,7 +3184,7 @@ cjs-module-lexer@^1.0.0: resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== -classnames@^2.2.0, classnames@^2.2.5, classnames@^2.3.1: +classnames@^2.2.0, classnames@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== @@ -4657,11 +4642,6 @@ file-loader@^6.2.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -file-saver@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.2.tgz#06d6e728a9ea2df2cce2f8d9e84dfcdc338ec17a" - integrity sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw== - filelist@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.3.tgz#448607750376484932f67ef1b9ff07386b036c83" @@ -7669,22 +7649,6 @@ react-app-polyfill@^3.0.0: regenerator-runtime "^0.13.9" whatwg-fetch "^3.6.2" -react-bootstrap-table-next@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/react-bootstrap-table-next/-/react-bootstrap-table-next-4.0.3.tgz#b55873b01adfe22a7181904b784a9d24ac2822cf" - integrity sha512-uKxC73qUdUfusRf2uzDfMiF9LvTG5vuhTZa0lbAgHWSLLLaKTsI0iHf1e4+c7gP71q8dFsp7StvkP65SxC1JRg== - dependencies: - classnames "^2.2.5" - react-transition-group "^4.2.0" - underscore "1.9.1" - -react-bootstrap-table2-toolkit@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/react-bootstrap-table2-toolkit/-/react-bootstrap-table2-toolkit-2.1.3.tgz#554df765c3a4ab9d650b6686f55a5256e2509fab" - integrity sha512-nKBSezHTOkO9k8YMMuJfPEZtBVfIYrJbmP8n3u7+AXRcOrOGygXyauNVKWqdKLchQlG/cW5QR0sPkFknpp5rjQ== - dependencies: - file-saver "2.0.2" - react-bootstrap-typeahead@^6.0.0-alpha.11: version "6.0.0-alpha.11" resolved "https://registry.yarnpkg.com/react-bootstrap-typeahead/-/react-bootstrap-typeahead-6.0.0-alpha.11.tgz#6476df85256ad6dfe612913db753b52f3c70fef7" @@ -7925,7 +7889,7 @@ react-test-renderer@^16.0.0-0: react-is "^16.8.6" scheduler "^0.19.1" -react-transition-group@^4.2.0, react-transition-group@^4.4.2: +react-transition-group@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== @@ -9094,11 +9058,6 @@ uncontrollable@^7.2.1: invariant "^2.2.4" react-lifecycles-compat "^3.0.4" -underscore@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" - integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" From afd6132a902024706d4d9e1540069a76f31c0f7c Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Fri, 6 May 2022 16:04:06 +0200 Subject: [PATCH 093/649] Center message --- .../MailOverviewPage/MailOverviewPage.tsx | 20 +++++++++++++------ frontend/src/views/MailOverviewPage/styles.ts | 14 ++++++++++++- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index c2ed4059f..a047bd620 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -14,6 +14,8 @@ import { FilterDiv, SearchAndFilterDiv, EmailsTable, + CenterDiv, + MessageDiv, } from "./styles"; import { EmailType } from "../../data/enums"; import { SpinnerContainer, Error } from "../../components/UsersComponents/Requests/styles"; @@ -38,7 +40,7 @@ export default function MailOverviewPage() { const [allSelected, setAllSelected] = useState(false); // Keep track of the set filters - const [searhTerm, setSearchTerm] = useState(""); + const [searchTerm, setSearchTerm] = useState(""); const [filters, setFilters] = useState([]); const { editionId } = useParams(); @@ -54,8 +56,7 @@ export default function MailOverviewPage() { setLoading(true); try { - const response = await getMailOverview(editionId, page, searhTerm, filters); - + const response = await getMailOverview(editionId, page, searchTerm, filters); if (response.studentEmails.length === 0) { setMoreEmailsAvailable(false); } @@ -80,7 +81,6 @@ export default function MailOverviewPage() { ) ); } - setPage(page + 1); setGotEmails(true); } catch (exception) { @@ -155,9 +155,17 @@ export default function MailOverviewPage() { let table; if (error) { - table = {error}; + table = ( + + {error} + + ); } else if (gotEmails && emailRows.length === 0) { - table =
No emails found.
; + table = ( + + No emails found. + + ); } else { table = ( diff --git a/frontend/src/views/MailOverviewPage/styles.ts b/frontend/src/views/MailOverviewPage/styles.ts index cade566dc..1857f0111 100644 --- a/frontend/src/views/MailOverviewPage/styles.ts +++ b/frontend/src/views/MailOverviewPage/styles.ts @@ -38,4 +38,16 @@ export const SearchAndFilterDiv = styled.div` width: fit-content; `; -export const EmailsTable = styled(Table)``; +export const EmailsTable = styled(Table)` + // TODO: Make all tables uniform +`; + +export const CenterDiv = styled.div` + width: 100%; + margin: auto; +`; + +export const MessageDiv = styled.div` + width: fit-content; + margin: auto; +`; From 4b01e8906c02027ba2722aca8beb67251dac750f Mon Sep 17 00:00:00 2001 From: beguille Date: Fri, 6 May 2022 16:28:47 +0200 Subject: [PATCH 094/649] projects tests (not working) --- backend/src/app/logic/projects.py | 7 + backend/src/app/schemas/projects.py | 8 + .../test_projects/test_projects.py | 425 +++++++++--------- 3 files changed, 235 insertions(+), 205 deletions(-) diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index 338e62998..fe2d487e3 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -5,12 +5,19 @@ ProjectList, ConflictStudentList, InputProject, ConflictStudent, QueryParamsProjects ) from src.database.models import Edition, Project, User +from src.app.schemas.projects import Project as ProjectScheme async def get_project_list(db: AsyncSession, edition: Edition, search_params: QueryParamsProjects, user: User) -> ProjectList: """Returns a list of all projects from a certain edition""" proj_page = await crud.get_projects_for_edition_page(db, edition, search_params, user) + # fix to convert from database model to pydantic model + new_proj_page = [] + for proj in proj_page: + new_proj_page.append(await db.run_sync( + lambda sync_conn: ProjectScheme.from_orm(proj))) + return ProjectList(projects=proj_page) diff --git a/backend/src/app/schemas/projects.py b/backend/src/app/schemas/projects.py index 93664116d..93f0bdfe7 100644 --- a/backend/src/app/schemas/projects.py +++ b/backend/src/app/schemas/projects.py @@ -1,4 +1,5 @@ from dataclasses import dataclass + from pydantic import BaseModel from src.app.schemas.utils import CamelCaseModel @@ -60,6 +61,13 @@ class Project(CamelCaseModel): partners: list[Partner] project_roles: list[ProjectRole] + # @classmethod + # async def from_orm(cls, obj): + # async with engine.begin() as conn: + # model = await conn.run_sync( + # lambda sync_conn: super().from_orm(obj)) + # return model + class Config: """Set to ORM mode""" orm_mode = True diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index e9611502c..f49d22830 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -1,4 +1,5 @@ import pytest +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status @@ -8,7 +9,7 @@ @pytest.fixture -def database_with_data(database_session: AsyncSession) -> Session: +async def database_with_data(database_session: AsyncSession) -> AsyncSession: """fixture for adding data to the database""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -41,293 +42,307 @@ def database_with_data(database_session: AsyncSession) -> Session: database_session.add(project_role1) database_session.add(project_role2) database_session.add(project_role3) - database_session.commit() + await database_session.commit() return database_session @pytest.fixture -def current_edition(database_with_data: Session) -> Edition: +async def current_edition(database_with_data: AsyncSession) -> Edition: """fixture to get the latest edition""" - return database_with_data.query(Edition).all()[-1] + return (await database_with_data.execute(select(Edition))).scalars().all()[-1] -def test_get_projects(database_with_data: Session, auth_client: AuthClient): +async def test_get_projects(database_with_data: AsyncSession, auth_client: AuthClient): """Tests get all projects""" - auth_client.admin() - response = auth_client.get("/editions/ed2022/projects") - json = response.json() - - assert len(json['projects']) == 3 - assert json['projects'][0]['name'] == "project1" - assert json['projects'][1]['name'] == "project2" - assert json['projects'][2]['name'] == "super nice project" - - -def test_get_projects_paginated(database_session: AsyncSession, auth_client: AuthClient): + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2022/projects", follow_redirects=True) + print(f"response: {response}") + json = response.json() + print(f"json: {json}") + assert len(json['projects']) == 3 + assert json['projects'][0]['name'] == "project1" + assert json['projects'][1]['name'] == "project2" + assert json['projects'][2]['name'] == "super nice project" + + +async def test_get_projects_paginated(database_session: AsyncSession, auth_client: AuthClient): """test get all projects paginated""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(Project(name=f"Project {i}", edition=edition, number_of_students=5)) - database_session.commit() + await database_session.commit() - auth_client.admin() + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2022/projects?page=0", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['projects']) == DB_PAGE_SIZE + response = await auth_client.get("/editions/ed2022/projects?page=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['projects']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE - response = auth_client.get("/editions/ed2022/projects?page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['projects']) == DB_PAGE_SIZE - response = auth_client.get("/editions/ed2022/projects?page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['projects']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE - -def test_get_project(database_with_data: Session, auth_client: AuthClient): +async def test_get_project(database_with_data: AsyncSession, auth_client: AuthClient): """Tests get a specific project""" - auth_client.admin() - response = auth_client.get("/editions/ed2022/projects/1") + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2022/projects/1") assert response.status_code == status.HTTP_200_OK json = response.json() assert json['name'] == 'project1' -def test_delete_project(database_with_data: Session, auth_client: AuthClient): +async def test_delete_project(database_with_data: AsyncSession, auth_client: AuthClient): """Tests delete a project""" - auth_client.admin() - response = auth_client.get("/editions/ed2022/projects/1") - assert response.status_code == status.HTTP_200_OK - response = auth_client.delete("/editions/ed2022/projects/1") - assert response.status_code == status.HTTP_204_NO_CONTENT - response = auth_client.get("/editions/ed2022/projects/1") - assert response.status_code == status.HTTP_404_NOT_FOUND + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2022/projects/1") + assert response.status_code == status.HTTP_200_OK + response = await auth_client.delete("/editions/ed2022/projects/1") + assert response.status_code == status.HTTP_204_NO_CONTENT + response = await auth_client.get("/editions/ed2022/projects/1") + assert response.status_code == status.HTTP_404_NOT_FOUND -def test_delete_ghost_project(database_with_data: Session, auth_client: AuthClient): +async def test_delete_ghost_project(database_with_data: AsyncSession, auth_client: AuthClient): """Tests delete a project that doesn't exist""" - auth_client.admin() - response = auth_client.get("/editions/ed2022/projects/400") - assert response.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.delete("/editions/ed2022/projects/400") - assert response.status_code == status.HTTP_404_NOT_FOUND + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2022/projects/400") + assert response.status_code == status.HTTP_404_NOT_FOUND + response = await auth_client.delete("/editions/ed2022/projects/400") + assert response.status_code == status.HTTP_404_NOT_FOUND -def test_create_project(database_with_data: Session, auth_client: AuthClient): +async def test_create_project(database_with_data: AsyncSession, auth_client: AuthClient): """Tests creating a project""" - auth_client.admin() - response = auth_client.get('/editions/ed2022/projects') - json = response.json() - assert len(json['projects']) == 3 - assert len(database_with_data.query(Partner).all()) == 0 + await auth_client.admin() + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects') + json = response.json() + assert len(json['projects']) == 3 + assert len(database_with_data.query(Partner).all()) == 0 - response = \ - auth_client.post("/editions/ed2022/projects/", - json={"name": "test", - "number_of_students": 5, - "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [1]}) + response = \ + await auth_client.post("/editions/ed2022/projects/", + json={"name": "test", + "number_of_students": 5, + "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [1]}) - assert response.status_code == status.HTTP_201_CREATED - assert response.json()['name'] == 'test' - assert response.json()["partners"][0]["name"] == "ugent" + assert response.status_code == status.HTTP_201_CREATED + assert response.json()['name'] == 'test' + assert response.json()["partners"][0]["name"] == "ugent" - assert len(database_with_data.query(Partner).all()) == 1 + assert len(database_with_data.query(Partner).all()) == 1 - response = auth_client.get('/editions/ed2022/projects') - json = response.json() + response = await auth_client.get('/editions/ed2022/projects') + json = response.json() - assert len(json['projects']) == 4 - assert json['projects'][3]['name'] == "test" + assert len(json['projects']) == 4 + assert json['projects'][3]['name'] == "test" -def test_create_project_same_partner(database_with_data: Session, auth_client: AuthClient): +async def test_create_project_same_partner(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that creating a project doesn't create a partner if the partner already exists""" - auth_client.admin() - assert len(database_with_data.query(Partner).all()) == 0 - - auth_client.post("/editions/ed2022/projects/", - json={"name": "test1", - "number_of_students": 2, - "skills": [1, 2], "partners": ["ugent"], "coaches": [1]}) - auth_client.post("/editions/ed2022/projects/", - json={"name": "test2", - "number_of_students": 2, - "skills": [1, 2], "partners": ["ugent"], "coaches": [1]}) - assert len(database_with_data.query(Partner).all()) == 1 - - -def test_create_project_non_existing_skills(database_with_data: Session, auth_client: AuthClient): + await auth_client.admin() + assert len((await database_with_data.execute(select(Partner))).scalars().all()) == 0 + + async with auth_client: + await auth_client.post("/editions/ed2022/projects/", + json={"name": "test1", + "number_of_students": 2, + "skills": [1, 2], "partners": ["ugent"], "coaches": [1]}) + await auth_client.post("/editions/ed2022/projects/", + json={"name": "test2", + "number_of_students": 2, + "skills": [1, 2], "partners": ["ugent"], "coaches": [1]}) + assert len((await database_with_data.execute(select(Partner))).scalars().all()) == 1 + + +async def test_create_project_non_existing_skills(database_with_data: AsyncSession, auth_client: AuthClient): """Tests creating a project with non-existing skills""" - auth_client.admin() - response = auth_client.get('/editions/ed2022/projects') + await auth_client.admin() + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects') - json = response.json() - assert len(json['projects']) == 3 + json = response.json() + assert len(json['projects']) == 3 - assert len(database_with_data.query(Skill).where( - Skill.skill_id == 100).all()) == 0 + assert len(database_with_data.query(Skill).where( + Skill.skill_id == 100).all()) == 0 - response = auth_client.post("/editions/ed2022/projects/", - json={"name": "test1", - "number_of_students": 1, - "skills": [100], "partners": ["ugent"], "coaches": [1]}) - assert response.status_code == status.HTTP_404_NOT_FOUND + response = await auth_client.post("/editions/ed2022/projects/", + json={"name": "test1", + "number_of_students": 1, + "skills": [100], "partners": ["ugent"], "coaches": [1]}) + assert response.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get('/editions/ed2022/projects') - json = response.json() - assert len(json['projects']) == 3 + response = await auth_client.get('/editions/ed2022/projects') + json = response.json() + assert len(json['projects']) == 3 -def test_create_project_non_existing_coach(database_with_data: Session, auth_client: AuthClient): +async def test_create_project_non_existing_coach(database_with_data: AsyncSession, auth_client: AuthClient): """Tests creating a project with a coach that doesn't exist""" - auth_client.admin() - response = auth_client.get('/editions/ed2022/projects') + await auth_client.admin() + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects') - json = response.json() - assert len(json['projects']) == 3 + json = response.json() + assert len(json['projects']) == 3 - assert len(database_with_data.query(Student).where( - Student.edition_id == 10).all()) == 0 + assert len(database_with_data.query(Student).where( + Student.edition_id == 10).all()) == 0 - response = auth_client.post("/editions/ed2022/projects/", - json={"name": "test2", - "number_of_students": 1, - "skills": [100], "partners": ["ugent"], "coaches": [10]}) - assert response.status_code == status.HTTP_404_NOT_FOUND + response = await auth_client.post("/editions/ed2022/projects/", + json={"name": "test2", + "number_of_students": 1, + "skills": [100], "partners": ["ugent"], "coaches": [10]}) + assert response.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get('/editions/ed2022/projects') - json = response.json() - assert len(json['projects']) == 3 + response = await auth_client.get('/editions/ed2022/projects') + json = response.json() + assert len(json['projects']) == 3 -def test_create_project_no_name(database_with_data: Session, auth_client: AuthClient): +async def test_create_project_no_name(database_with_data: AsyncSession, auth_client: AuthClient): """Tests creating a project that has no name""" - auth_client.admin() - response = auth_client.get('/editions/ed2022/projects') - json = response.json() - assert len(json['projects']) == 3 - response = \ - auth_client.post("/editions/ed2022/projects/", - # project has no name - json={ - "number_of_students": 5, - "skills": [], "partners": [], "coaches": []}) + await auth_client.admin() + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) + json = response.json() + assert len(json['projects']) == 3 + response = \ + await auth_client.post("/editions/ed2022/projects/", + # project has no name + json={ + "number_of_students": 5, + "skills": [], "partners": [], "coaches": []}) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - response = auth_client.get('/editions/ed2022/projects') - json = response.json() - assert len(json['projects']) == 3 + response = await auth_client.get('/editions/ed2022/projects') + json = response.json() + assert len(json['projects']) == 3 -def test_patch_project(database_with_data: Session, auth_client: AuthClient): +async def test_patch_project(database_with_data: AsyncSession, auth_client: AuthClient): """Tests patching a project""" - auth_client.admin() - response = auth_client.get('/editions/ed2022/projects') - json = response.json() + await auth_client.admin() + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects') + json = response.json() - assert len(json['projects']) == 3 + assert len(json['projects']) == 3 - response = auth_client.patch("/editions/ed2022/projects/1", - json={"name": "patched", - "number_of_students": 5, - "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [1]}) - assert response.status_code == status.HTTP_204_NO_CONTENT + response = await auth_client.patch("/editions/ed2022/projects/1", + json={"name": "patched", + "number_of_students": 5, + "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [1]}) + assert response.status_code == status.HTTP_204_NO_CONTENT - response = auth_client.get('/editions/ed2022/projects') - json = response.json() + response = await auth_client.get('/editions/ed2022/projects') + json = response.json() - assert len(json['projects']) == 3 - assert json['projects'][0]['name'] == 'patched' + assert len(json['projects']) == 3 + assert json['projects'][0]['name'] == 'patched' -def test_patch_project_non_existing_skills(database_with_data: Session, auth_client: AuthClient): +async def test_patch_project_non_existing_skills(database_with_data: AsyncSession, auth_client: AuthClient): """Tests patching a project with non-existing skills""" - auth_client.admin() - assert len(database_with_data.query(Skill).where( - Skill.skill_id == 100).all()) == 0 - - response = auth_client.patch("/editions/ed2022/projects/1", - json={"name": "test1", - "number_of_students": 1, - "skills": [100], "partners": ["ugent"], "coaches": [1]}) - assert response.status_code == status.HTTP_404_NOT_FOUND - - response = auth_client.get("/editions/ed2022/projects/1") - json = response.json() - assert 100 not in json["skills"] - - -def test_patch_project_non_existing_coach(database_with_data: Session, auth_client: AuthClient): + await auth_client.admin() + assert len((await database_with_data.execute(select(Skill).where( + Skill.skill_id == 100))).scalars().all()) == 0 + async with auth_client: + response = await auth_client.patch("/editions/ed2022/projects/1", + json={"name": "test1", + "number_of_students": 1, + "skills": [100], "partners": ["ugent"], "coaches": [1]}) + assert response.status_code == status.HTTP_404_NOT_FOUND + + response = await auth_client.get("/editions/ed2022/projects/1") + json = response.json() + assert 100 not in json["skills"] + + +async def test_patch_project_non_existing_coach(database_with_data: AsyncSession, auth_client: AuthClient): """Tests patching a project with a coach that doesn't exist""" - auth_client.admin() - assert len(database_with_data.query(Student).where( - Student.edition_id == 10).all()) == 0 - - response = auth_client.patch("/editions/ed2022/projects/1", - json={"name": "test2", - "number_of_students": 1, - "skills": [100], "partners": ["ugent"], "coaches": [10]}) - assert response.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get("/editions/ed2022/projects/1") - json = response.json() - assert 10 not in json["coaches"] - - -def test_patch_wrong_project(database_session: AsyncSession, auth_client: AuthClient): + await auth_client.admin() + assert len((await database_with_data.execute(select(Student).where( + Student.edition_id == 10))).scalars().all()) == 0 + + async with auth_client: + response = await auth_client.patch("/editions/ed2022/projects/1", + json={"name": "test2", + "number_of_students": 1, + "skills": [100], "partners": ["ugent"], "coaches": [10]}) + assert response.status_code == status.HTTP_404_NOT_FOUND + response = await auth_client.get("/editions/ed2022/projects/1") + json = response.json() + assert 10 not in json["coaches"] + + +async def test_patch_wrong_project(database_session: AsyncSession, auth_client: AuthClient): """Tests patching with wrong project info""" - auth_client.admin() + await auth_client.admin() database_session.add(Edition(year=2022, name="ed2022")) project = Project(name="project", edition_id=1, project_id=1, number_of_students=2) database_session.add(project) - database_session.commit() + await database_session.commit() - response = \ - auth_client.patch("/editions/ed2022/projects/1", - json={"name": "patched", - "skills": [], "partners": [], "coaches": []}) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + async with auth_client: + response = \ + await auth_client.patch("/editions/ed2022/projects/1", + json={"name": "patched", + "skills": [], "partners": [], "coaches": []}) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - response2 = auth_client.get('/editions/ed2022/projects') - json = response2.json() + response2 = await auth_client.get('/editions/ed2022/projects') + json = response2.json() - assert len(json['projects']) == 1 - assert json['projects'][0]['name'] == 'project' + assert len(json['projects']) == 1 + assert json['projects'][0]['name'] == 'project' -def test_create_project_old_edition(database_with_data: Session, auth_client: AuthClient): +async def test_create_project_old_edition(database_with_data: AsyncSession, auth_client: AuthClient): """test create a project for a readonly edition""" - auth_client.admin() + await auth_client.admin() database_with_data.add(Edition(year=2023, name="ed2023")) - database_with_data.commit() - - response = \ - auth_client.post("/editions/ed2022/projects/", - json={"name": "test", - "number_of_students": 5, - "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [1]}) + await database_with_data.commit() + async with auth_client: + response = \ + await auth_client.post("/editions/ed2022/projects/", + json={"name": "test", + "number_of_students": 5, + "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [1]}) - assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED -def test_search_project_name(database_with_data: Session, auth_client: AuthClient): +async def test_search_project_name(database_with_data: AsyncSession, auth_client: AuthClient): """test search project on name""" - auth_client.admin() - response = auth_client.get("/editions/ed2022/projects/?name=super") - assert len(response.json()["projects"]) == 1 - assert response.json()["projects"][0]["name"] == "super nice project" + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2022/projects/?name=super") + assert len(response.json()["projects"]) == 1 + assert response.json()["projects"][0]["name"] == "super nice project" -def test_search_project_coach(database_with_data: Session, auth_client: AuthClient): +async def test_search_project_coach(database_with_data: AsyncSession, auth_client: AuthClient): """test search project on coach""" - auth_client.admin() - user: User = database_with_data.query(User).where(User.name == "Pytest Admin").one() - auth_client.post("/editions/ed2022/projects/", - json={"name": "test", - "number_of_students": 2, - "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [user.user_id]}) - response = auth_client.get("/editions/ed2022/projects/?coach=true") - print(response.json()) - assert len(response.json()["projects"]) == 1 - assert response.json()["projects"][0]["name"] == "test" - assert response.json()["projects"][0]["coaches"][0]["userId"] == user.user_id + await auth_client.admin() + user: User = (await database_with_data.execute(select(User).where(User.name == "Pytest Admin"))).scalar_one() + async with auth_client: + await auth_client.post("/editions/ed2022/projects/", + json={"name": "test", + "number_of_students": 2, + "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [user.user_id]}) + response = await auth_client.get("/editions/ed2022/projects/?coach=true") + assert len(response.json()["projects"]) == 1 + assert response.json()["projects"][0]["name"] == "test" + assert response.json()["projects"][0]["coaches"][0]["userId"] == user.user_id From 10cc981036cf77f135fc1db2fccf26d6c2e60925 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Fri, 6 May 2022 17:30:23 +0200 Subject: [PATCH 095/649] Added remove and add button for coaches and partners --- .../ProjectsComponents/ProjectCard/styles.ts | 1 + .../ProjectDetailPage/ProjectDetailPage.tsx | 45 ++++++++++++++---- .../projectViews/ProjectDetailPage/styles.ts | 46 +++++++++++++++---- 3 files changed, 76 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts b/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts index d051fba64..1b3ef2ba5 100644 --- a/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts +++ b/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts @@ -70,6 +70,7 @@ export const CoachContainer = styled.div` padding: 7.5px 15px; width: fit-content; max-width: 20vw; + display: flex; `; export const CoachText = styled.div` diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 4d0e5f7c8..6d22fcc8a 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -7,18 +7,23 @@ import { GoBack, ProjectContainer, Client, - ClientContainer, + ClientsContainer, NumberOfStudents, Title, TitleContainer, Save, Cancel, Delete, + TitleInput, + AddButton, + Edit, + ClientContainer, } from "./styles"; import { BiArrowBack } from "react-icons/bi"; import { BsPersonFill } from "react-icons/bs"; import { MdOutlineEditNote } from "react-icons/md"; +import { TiDeleteOutline } from "react-icons/ti"; import { StudentPlace } from "../../../data/interfaces/projects"; import { StudentPlaceholder } from "../../../components/ProjectsComponents"; @@ -31,6 +36,7 @@ import { Role } from "../../../data/enums/role"; import { useAuth } from "../../../contexts"; import { HiOutlineTrash } from "react-icons/hi"; import ConfirmDelete from "../../../components/ProjectsComponents/ConfirmDelete"; +import { RemoveButton } from "../CreateProjectPage/styles"; /** * @returns the detailed page of a project. Here you can add or remove students from the project. @@ -112,16 +118,18 @@ export default function ProjectDetailPage() { {!editing ? ( {project.name} ) : ( - { const newProject: Project = { ...project, name: e.target.value }; setEditedProject(newProject); }} - > + /> )} {!editing ? ( - setEditing(true)} /> + + setEditing(true)} /> + ) : ( <> Save - setEditing(false)}>Cancel + { + setEditing(false); + setEditedProject(project); + }} + > + Cancel + )} {role === Role.ADMIN && ( @@ -149,22 +164,36 @@ export default function ProjectDetailPage() { name={project.name} > - + {project.partners.map((element, _index) => ( - {element.name} + + {element.name} + {editing && ( + {}}> + + + )} + ))} + {editing && Add Partner} {project.numberOfStudents} - + {project.coaches.map((element, _index) => ( {element.name} + {editing && ( + {}}> + + + )} ))} + {editing && Add Coach}
diff --git a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts index 2c4d0364b..28e107c90 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts +++ b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts @@ -7,7 +7,7 @@ export const ProjectContainer = styled.div` export const GoBack = styled.div` display: flex; align-items: center; - margin-bottom: 5px; + margin-bottom: 10px; max-width: max-content; :hover { @@ -18,6 +18,7 @@ export const GoBack = styled.div` export const TitleContainer = styled.div` display: flex; align-items: center; + margin-bottom: 10px; `; export const Title = styled.h2` @@ -26,9 +27,23 @@ export const Title = styled.h2` margin-right: 10px; `; +export const TitleInput = styled.input` + padding: 5px 10px; + background-color: #131329; + color: white; + border: none; + border-radius: 5px; +`; + +export const Edit = styled.div` + :hover { + cursor: pointer; + } +`; + export const Save = styled.button` - padding: 2px 10px; - max-height: 30px; + padding: 5px 10px; + max-height: 35px; background-color: #44dba4; color: white; border: none; @@ -37,8 +52,8 @@ export const Save = styled.button` `; export const Cancel = styled.button` - padding: 2px 10px; - max-height: 30px; + padding: 5px 10px; + max-height: 35px; background-color: #131329; color: white; border: none; @@ -57,19 +72,34 @@ export const Delete = styled.button` align-items: center; `; -export const ClientContainer = styled.div` +export const ClientsContainer = styled.div` display: flex; align-items: center; color: lightgray; overflow-x: auto; `; +export const ClientContainer = styled.div` + display: flex; + margin-right: 2%; +`; + export const Client = styled.h5` - margin-right: 1%; + width: max-content; + margin-bottom: 0; + margin-right: 0; `; export const NumberOfStudents = styled.div` display: flex; align-items: center; - margin-bottom: 4px; +`; + +export const AddButton = styled.button` + padding: 0 10px; + background-color: #00bfff; + color: white; + border: none; + margin-right: 10px; + border-radius: 5px; `; From 339ca1a42cbba5f2e991ff9ae037aa9ba7be3475 Mon Sep 17 00:00:00 2001 From: beguille Date: Fri, 6 May 2022 17:30:37 +0200 Subject: [PATCH 096/649] changed lazy loading in models, fixes some issues --- backend/src/app/logic/projects.py | 7 ----- backend/src/app/schemas/projects.py | 7 ----- backend/src/database/crud/projects.py | 12 ++++---- backend/src/database/models.py | 10 +++---- .../test_projects/test_projects.py | 30 +++++++++---------- 5 files changed, 27 insertions(+), 39 deletions(-) diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index fe2d487e3..0ddd33784 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -5,18 +5,11 @@ ProjectList, ConflictStudentList, InputProject, ConflictStudent, QueryParamsProjects ) from src.database.models import Edition, Project, User -from src.app.schemas.projects import Project as ProjectScheme - async def get_project_list(db: AsyncSession, edition: Edition, search_params: QueryParamsProjects, user: User) -> ProjectList: """Returns a list of all projects from a certain edition""" proj_page = await crud.get_projects_for_edition_page(db, edition, search_params, user) - # fix to convert from database model to pydantic model - new_proj_page = [] - for proj in proj_page: - new_proj_page.append(await db.run_sync( - lambda sync_conn: ProjectScheme.from_orm(proj))) return ProjectList(projects=proj_page) diff --git a/backend/src/app/schemas/projects.py b/backend/src/app/schemas/projects.py index 93f0bdfe7..1060a9b52 100644 --- a/backend/src/app/schemas/projects.py +++ b/backend/src/app/schemas/projects.py @@ -61,13 +61,6 @@ class Project(CamelCaseModel): partners: list[Partner] project_roles: list[ProjectRole] - # @classmethod - # async def from_orm(cls, obj): - # async with engine.begin() as conn: - # model = await conn.run_sync( - # lambda sync_conn: super().from_orm(obj)) - # return model - class Config: """Set to ORM mode""" orm_mode = True diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index d5b103699..13022ef7e 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -26,7 +26,7 @@ async def get_projects_for_edition_page(db: AsyncSession, edition: Edition, if search_params.coach: query = query.where(Project.project_id.in_([user_project.project_id for user_project in user.projects])) result = await db.execute(paginate(query, search_params.page)) - projects: list[Project] = result.scalars().all() + projects: list[Project] = result.unique().scalars().all() return projects @@ -54,6 +54,7 @@ async def add_project(db: AsyncSession, edition: Edition, input_project: InputPr coaches_obj = [await _get_coach_by_id(db, coach) for coach in input_project.coaches] partners_obj = [] + for partner in input_project.partners: try: query = select(Partner).where(Partner.name == partner) @@ -64,10 +65,10 @@ async def add_project(db: AsyncSession, edition: Edition, input_project: InputPr db.add(partner_obj) partners_obj.append(partner_obj) project = Project(name=input_project.name, number_of_students=input_project.number_of_students, - edition_id=edition.edition_id, skills=skills_obj, coaches=coaches_obj, partners=partners_obj) - + edition_id=edition.edition_id, skills=skills_obj, coaches=coaches_obj, partners=partners_obj) db.add(project) await db.commit() + print(project) return project @@ -75,7 +76,7 @@ async def get_project(db: AsyncSession, project_id: int) -> Project: """Query a specific project from the database through its ID""" query = select(Project).where(Project.project_id == project_id) result = await db.execute(query) - return result.scalars().one() + return result.unique().scalars().one() async def delete_project(db: AsyncSession, project_id: int): @@ -96,7 +97,7 @@ async def patch_project(db: AsyncSession, project_id: int, input_project: InputP Change some fields of a Project in the database If there are partner names that are not already in the database, add them """ - project = get_project(db, project_id) + project = await get_project(db, project_id) skills_obj = [await _get_skill_by_id(db, skill) for skill in input_project.skills] @@ -113,6 +114,7 @@ async def patch_project(db: AsyncSession, project_id: int, input_project: InputP db.add(partner_obj) partners_obj.append(partner_obj) + print(input_project.name) project.name = input_project.name project.number_of_students = input_project.number_of_students project.skills = skills_obj diff --git a/backend/src/database/models.py b/backend/src/database/models.py index e09fa58e5..bdbd8e676 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -130,11 +130,11 @@ class Project(Base): number_of_students = Column(Integer, nullable=False, default=0) edition_id = Column(Integer, ForeignKey("editions.edition_id")) - edition: Edition = relationship("Edition", back_populates="projects", uselist=False) - coaches: list[User] = relationship("User", secondary="project_coaches", back_populates="projects") - skills: list[Skill] = relationship("Skill", secondary="project_skills", back_populates="projects") - partners: list[Partner] = relationship("Partner", secondary="project_partners", back_populates="projects") - project_roles: list[ProjectRole] = relationship("ProjectRole", back_populates="project") + edition: Edition = relationship("Edition", back_populates="projects", uselist=False, lazy="joined") + coaches: list[User] = relationship("User", secondary="project_coaches", back_populates="projects", lazy="joined") + skills: list[Skill] = relationship("Skill", secondary="project_skills", back_populates="projects", lazy="joined") + partners: list[Partner] = relationship("Partner", secondary="project_partners", back_populates="projects", lazy="joined") + project_roles: list[ProjectRole] = relationship("ProjectRole", back_populates="project", lazy="joined", cascade="save-update, merge, delete, delete-orphan") project_coaches = Table( diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index f49d22830..33ce67b06 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -122,17 +122,17 @@ async def test_create_project(database_with_data: AsyncSession, auth_client: Aut """Tests creating a project""" await auth_client.admin() async with auth_client: - response = await auth_client.get('/editions/ed2022/projects') + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 3 - assert len(database_with_data.query(Partner).all()) == 0 + assert len((await database_with_data.execute(select(Partner))).scalars().all()) == 0 response = \ await auth_client.post("/editions/ed2022/projects/", json={"name": "test", "number_of_students": 5, "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [1]}) - + print(response.json()) assert response.status_code == status.HTTP_201_CREATED assert response.json()['name'] == 'test' assert response.json()["partners"][0]["name"] == "ugent" @@ -167,13 +167,13 @@ async def test_create_project_non_existing_skills(database_with_data: AsyncSessi """Tests creating a project with non-existing skills""" await auth_client.admin() async with auth_client: - response = await auth_client.get('/editions/ed2022/projects') + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 3 - assert len(database_with_data.query(Skill).where( - Skill.skill_id == 100).all()) == 0 + assert len((await database_with_data.execute(select(Skill).where( + Skill.skill_id == 100))).scalars().all()) == 0 response = await auth_client.post("/editions/ed2022/projects/", json={"name": "test1", @@ -181,7 +181,7 @@ async def test_create_project_non_existing_skills(database_with_data: AsyncSessi "skills": [100], "partners": ["ugent"], "coaches": [1]}) assert response.status_code == status.HTTP_404_NOT_FOUND - response = await auth_client.get('/editions/ed2022/projects') + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 3 @@ -190,13 +190,13 @@ async def test_create_project_non_existing_coach(database_with_data: AsyncSessio """Tests creating a project with a coach that doesn't exist""" await auth_client.admin() async with auth_client: - response = await auth_client.get('/editions/ed2022/projects') + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 3 - assert len(database_with_data.query(Student).where( - Student.edition_id == 10).all()) == 0 + assert len((await database_with_data.execute(select(Student).where( + Student.edition_id == 10))).scalars().all()) == 0 response = await auth_client.post("/editions/ed2022/projects/", json={"name": "test2", @@ -204,7 +204,7 @@ async def test_create_project_non_existing_coach(database_with_data: AsyncSessio "skills": [100], "partners": ["ugent"], "coaches": [10]}) assert response.status_code == status.HTTP_404_NOT_FOUND - response = await auth_client.get('/editions/ed2022/projects') + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 3 @@ -225,7 +225,7 @@ async def test_create_project_no_name(database_with_data: AsyncSession, auth_cli assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - response = await auth_client.get('/editions/ed2022/projects') + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 3 @@ -234,7 +234,7 @@ async def test_patch_project(database_with_data: AsyncSession, auth_client: Auth """Tests patching a project""" await auth_client.admin() async with auth_client: - response = await auth_client.get('/editions/ed2022/projects') + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 3 @@ -245,7 +245,7 @@ async def test_patch_project(database_with_data: AsyncSession, auth_client: Auth "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [1]}) assert response.status_code == status.HTTP_204_NO_CONTENT - response = await auth_client.get('/editions/ed2022/projects') + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 3 @@ -302,7 +302,7 @@ async def test_patch_wrong_project(database_session: AsyncSession, auth_client: "skills": [], "partners": [], "coaches": []}) assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - response2 = await auth_client.get('/editions/ed2022/projects') + response2 = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response2.json() assert len(json['projects']) == 1 From 3c23d01532c6956f6e3cae1bf449f1623b500dbe Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Sat, 7 May 2022 14:03:35 +0200 Subject: [PATCH 097/649] Conflicts --- .../ProjectsComponents/Conflicts/Conflict.tsx | 29 ++++++++ .../Conflicts/ConflictsButton.tsx | 67 +++++++++++++++++++ .../ProjectsComponents/Conflicts/index.ts | 1 + .../ProjectsComponents/Conflicts/styles.ts | 23 +++++++ .../components/ProjectsComponents/index.ts | 2 +- frontend/src/components/index.ts | 1 + frontend/src/data/interfaces/conflicts.ts | 25 +++++++ frontend/src/data/interfaces/index.ts | 1 + frontend/src/utils/api/conflicts.ts | 7 ++ frontend/src/utils/api/index.ts | 1 + .../ProjectsPage/ProjectsPage.tsx | 2 + 11 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 frontend/src/components/ProjectsComponents/Conflicts/Conflict.tsx create mode 100644 frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx create mode 100644 frontend/src/components/ProjectsComponents/Conflicts/index.ts create mode 100644 frontend/src/components/ProjectsComponents/Conflicts/styles.ts create mode 100644 frontend/src/data/interfaces/conflicts.ts create mode 100644 frontend/src/utils/api/conflicts.ts diff --git a/frontend/src/components/ProjectsComponents/Conflicts/Conflict.tsx b/frontend/src/components/ProjectsComponents/Conflicts/Conflict.tsx new file mode 100644 index 000000000..59bbdfecb --- /dev/null +++ b/frontend/src/components/ProjectsComponents/Conflicts/Conflict.tsx @@ -0,0 +1,29 @@ +import { Conflict } from "../../../data/interfaces"; +import { ListLink } from "./styles"; + +/** + * A list-item which contains a student and all his assigned projects + */ +export default function ConflictDiv(props: { editionId: string; conflict: Conflict }) { + return ( +
  • + + {`${props.conflict.student.firstName} ${props.conflict.student.lastName}`} + +
      + {props.conflict.projects.map(conflictProject => ( +
    • + + {conflictProject.name} + +
      • + ))} +
    +
    +
    • + ); +} diff --git a/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx b/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx new file mode 100644 index 000000000..91ebd2a44 --- /dev/null +++ b/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx @@ -0,0 +1,67 @@ +import { ConButton, Loader, SidePanel } from "./styles"; +import { useEffect, useState } from "react"; +import { Offcanvas } from "react-bootstrap"; +import { getConflicts } from "../../../utils/api/conflicts"; +import { Conflict } from "../../../data/interfaces"; +import ConflictDiv from "./Conflict"; + +/** + * A button which opens a side-panel to show all students who are assigned to multiple projects. + */ +export default function ConflictsButton(props: { editionId: string }) { + const [conflicts, setConflicts] = useState(undefined); + const [show, setShow] = useState(false); + + const handleClose = () => setShow(false); + const handleShow = () => setShow(true); + + useEffect(() => { + const fetchConflicts = async () => { + const conflicts = await getConflicts(props.editionId); + setConflicts(conflicts.conflictStudents); + }; + + fetchConflicts().catch(console.error); + }, [props.editionId]); + + if (conflicts === undefined) { + return ; + } + if (show) { + return ( + + + +

    Resolve Conflicts

    +     +     + + The student may be a better fot for a specific team, if they: +
      +
    • are an alumni and the team doesn't have any yet
      • +
    • are an alumni on a team with a half-time coach
      • +
    • are an alumni and provide skills the coach does not have
      • +
    • have pre-existing history with the project in question
      • +
    • enricht the team's diversity
      • +
    • + have a skillset that is tough to find in other applicants, +
      + and matches exceptionally well with the project +
      • +
    +

    Conflicts

    +
      + {conflicts.map(conflict => ( + + ))} +
    +     +     + ); + } + return {`Conflicts (${conflicts.length})`}; +} diff --git a/frontend/src/components/ProjectsComponents/Conflicts/index.ts b/frontend/src/components/ProjectsComponents/Conflicts/index.ts new file mode 100644 index 000000000..555820fd1 --- /dev/null +++ b/frontend/src/components/ProjectsComponents/Conflicts/index.ts @@ -0,0 +1 @@ +export { default } from "./ConflictsButton"; diff --git a/frontend/src/components/ProjectsComponents/Conflicts/styles.ts b/frontend/src/components/ProjectsComponents/Conflicts/styles.ts new file mode 100644 index 000000000..38b80d704 --- /dev/null +++ b/frontend/src/components/ProjectsComponents/Conflicts/styles.ts @@ -0,0 +1,23 @@ +import styled from "styled-components"; +import { Button, Offcanvas, Spinner } from "react-bootstrap"; +import { Link } from "react-router-dom"; + +export const ConButton = styled(Button)` + float: right; + margin: 20px; +`; + +export const SidePanel = styled(Offcanvas)` + background-color: #323252; + width: fit-content; + color: white; +`; + +export const Loader = styled(Spinner)` + float: right; + margin: 20px; +`; + +export const ListLink = styled(Link)` + color: white; +`; diff --git a/frontend/src/components/ProjectsComponents/index.ts b/frontend/src/components/ProjectsComponents/index.ts index 0ef4da7a6..83ec9ff6a 100644 --- a/frontend/src/components/ProjectsComponents/index.ts +++ b/frontend/src/components/ProjectsComponents/index.ts @@ -1,4 +1,4 @@ export { default as ProjectCard } from "./ProjectCard"; export { default as StudentPlaceholder } from "./StudentPlaceholder"; -export { default as LoadSpinner } from "./LoadSpinner"; +export { default as Conflicts } from "./Conflicts"; export { default } from "./ProjectTable"; diff --git a/frontend/src/components/index.ts b/frontend/src/components/index.ts index bd4445e73..5d01e17b4 100644 --- a/frontend/src/components/index.ts +++ b/frontend/src/components/index.ts @@ -9,3 +9,4 @@ export { default as Modal } from "./ProjectsComponents/ConfirmDelete"; export * as UsersComponents from "./UsersComponents"; export * as AdminsComponents from "./AdminsComponents"; export * as GeneralComponents from "./GeneralComponents"; +export * as ProjectsComponenets from "./ProjectsComponents"; diff --git a/frontend/src/data/interfaces/conflicts.ts b/frontend/src/data/interfaces/conflicts.ts new file mode 100644 index 000000000..c90698c72 --- /dev/null +++ b/frontend/src/data/interfaces/conflicts.ts @@ -0,0 +1,25 @@ +export interface ConflictProject { + projectId: number; + name: string; +} + +export interface Student { + firstName: string; + lastName: string; + studentId: number; +} + +/** + * A conflict (student with multiple projects) + */ +export interface Conflict { + student: Student; + projects: ConflictProject[]; +} + +/** + * A list of conflicts + */ +export interface Conflicts { + conflictStudents: Conflict[]; +} diff --git a/frontend/src/data/interfaces/index.ts b/frontend/src/data/interfaces/index.ts index 61fd40869..e7970e8dd 100644 --- a/frontend/src/data/interfaces/index.ts +++ b/frontend/src/data/interfaces/index.ts @@ -1,3 +1,4 @@ export type { Edition } from "./editions"; export type { User } from "./users"; export type { Partner, Coach, Project } from "./projects"; +export type { Conflicts, Conflict, ConflictProject, Student } from "./conflicts"; diff --git a/frontend/src/utils/api/conflicts.ts b/frontend/src/utils/api/conflicts.ts new file mode 100644 index 000000000..03da2a990 --- /dev/null +++ b/frontend/src/utils/api/conflicts.ts @@ -0,0 +1,7 @@ +import { axiosInstance } from "./api"; +import { Conflicts } from "../../data/interfaces"; + +export async function getConflicts(edition: string): Promise { + const response = await axiosInstance.get(`/editions/${edition}/projects/conflicts`); + return response.data; +} diff --git a/frontend/src/utils/api/index.ts b/frontend/src/utils/api/index.ts index c8238c5c6..5ab560e1b 100644 --- a/frontend/src/utils/api/index.ts +++ b/frontend/src/utils/api/index.ts @@ -1,2 +1,3 @@ export { validateRegistrationUrl } from "./auth"; +export * as Conflicts from "./conflicts"; export * as Users from "./users"; diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index d1b4e94f1..840fac28e 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -7,6 +7,7 @@ import { useNavigate, useParams } from "react-router-dom"; import { useAuth } from "../../../contexts"; import { Role } from "../../../data/enums"; +import ConflictsButton from "../../../components/ProjectsComponents/Conflicts/ConflictsButton"; /** * @returns The projects overview page where you can see all the projects. * You can filter on your own projects or filter on project name. @@ -137,6 +138,7 @@ export default function ProjectPage() { Create Project )} +
    Date: Sat, 7 May 2022 15:00:02 +0200 Subject: [PATCH 098/649] move a component to a separate file --- .../TitleAndEdit/TitleAndEdit.tsx | 72 +++++++++++++++++++ .../TitleAndEdit/index.ts | 1 + .../TitleAndEdit/styles.ts | 58 +++++++++++++++ .../ProjectDetailComponents/index.ts | 1 + .../ProjectDetailPage/ProjectDetailPage.tsx | 63 +++------------- .../projectViews/ProjectDetailPage/styles.ts | 57 --------------- 6 files changed, 143 insertions(+), 109 deletions(-) create mode 100644 frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx create mode 100644 frontend/src/components/ProjectDetailComponents/TitleAndEdit/index.ts create mode 100644 frontend/src/components/ProjectDetailComponents/TitleAndEdit/styles.ts create mode 100644 frontend/src/components/ProjectDetailComponents/index.ts diff --git a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx new file mode 100644 index 000000000..c819c99ac --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx @@ -0,0 +1,72 @@ +import React from "react"; +import { Title, TitleContainer, Save, Cancel, Delete, TitleInput, Edit } from "./styles"; + +import { MdOutlineEditNote } from "react-icons/md"; +import { HiOutlineTrash } from "react-icons/hi"; +import { Role } from "../../../data/enums/role"; +import { Project } from "../../../data/interfaces/projects"; + +export default function TitleAndEdit({ + editing, + project, + editedProject, + setEditedProject, + setEditing, + editProject, + role, + handleShow, +}: { + editing: boolean; + project: Project; + editedProject: Project; + setEditedProject: (project: Project) => void; + setEditing: (editing: boolean) => void; + editProject: () => void; + role: Role; + handleShow: () => void; +}) { + return ( + + {!editing ? ( + {project.name} + ) : ( + { + const newProject: Project = { ...project, name: e.target.value }; + setEditedProject(newProject); + }} + /> + )} + {!editing ? ( + + setEditing(true)} /> + + ) : ( + <> + { + await editProject(); + setEditing(false); + }} + > + Save + + { + setEditing(false); + setEditedProject(project); + }} + > + Cancel + + + )} + {role === Role.ADMIN && ( + + + + )} + + ); +} diff --git a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/index.ts b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/index.ts new file mode 100644 index 000000000..e3c7eb47b --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/index.ts @@ -0,0 +1 @@ +export { default } from "./TitleAndEdit"; diff --git a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/styles.ts b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/styles.ts new file mode 100644 index 000000000..9c0b832f6 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/styles.ts @@ -0,0 +1,58 @@ +import styled from "styled-components"; + +export const TitleContainer = styled.div` + display: flex; + align-items: center; + margin-bottom: 10px; +`; + +export const Title = styled.h2` + text-overflow: ellipsis; + overflow: hidden; + margin-right: 10px; +`; + +export const TitleInput = styled.input` + padding: 5px 10px; + background-color: #131329; + color: white; + border: none; + border-radius: 5px; +`; + +export const Edit = styled.div` + :hover { + cursor: pointer; + } +`; + +export const Save = styled.button` + padding: 5px 10px; + max-height: 35px; + background-color: #44dba4; + color: white; + border: none; + margin-left: 5px; + border-radius: 5px; +`; + +export const Cancel = styled.button` + padding: 5px 10px; + max-height: 35px; + background-color: #131329; + color: white; + border: none; + margin-left: 5px; + border-radius: 5px; +`; + +export const Delete = styled.button` + background-color: #f14a3b; + padding: 5px 5px; + border: 0; + border-radius: 1px; + max-height: 30; + margin-left: 5px; + display: flex; + align-items: center; +`; diff --git a/frontend/src/components/ProjectDetailComponents/index.ts b/frontend/src/components/ProjectDetailComponents/index.ts new file mode 100644 index 000000000..883cda3db --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/index.ts @@ -0,0 +1 @@ +export { default as TitleAndEdit } from "./TitleAndEdit"; diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 6d22fcc8a..6d14cb7c4 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -9,20 +9,12 @@ import { Client, ClientsContainer, NumberOfStudents, - Title, - TitleContainer, - Save, - Cancel, - Delete, - TitleInput, AddButton, - Edit, ClientContainer, } from "./styles"; import { BiArrowBack } from "react-icons/bi"; import { BsPersonFill } from "react-icons/bs"; -import { MdOutlineEditNote } from "react-icons/md"; import { TiDeleteOutline } from "react-icons/ti"; import { StudentPlace } from "../../../data/interfaces/projects"; @@ -32,11 +24,10 @@ import { CoachesContainer, CoachText, } from "../../../components/ProjectsComponents/ProjectCard/styles"; -import { Role } from "../../../data/enums/role"; import { useAuth } from "../../../contexts"; -import { HiOutlineTrash } from "react-icons/hi"; import ConfirmDelete from "../../../components/ProjectsComponents/ConfirmDelete"; import { RemoveButton } from "../CreateProjectPage/styles"; +import { TitleAndEdit } from "../../../components/ProjectDetailComponents"; /** * @returns the detailed page of a project. Here you can add or remove students from the project. @@ -114,48 +105,16 @@ export default function ProjectDetailPage() { Overview - - {!editing ? ( - {project.name} - ) : ( - { - const newProject: Project = { ...project, name: e.target.value }; - setEditedProject(newProject); - }} - /> - )} - {!editing ? ( - - setEditing(true)} /> - - ) : ( - <> - { - await editProject(); - setEditing(false); - }} - > - Save - - { - setEditing(false); - setEditedProject(project); - }} - > - Cancel - - - )} - {role === Role.ADMIN && ( - - - - )} - + Date: Wed, 4 May 2022 00:07:26 +0200 Subject: [PATCH 099/649] editionId + api call --- .../src/views/StudentsPage/StudentsPage.tsx | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/frontend/src/views/StudentsPage/StudentsPage.tsx b/frontend/src/views/StudentsPage/StudentsPage.tsx index 74ad961b9..f6b96d3ba 100644 --- a/frontend/src/views/StudentsPage/StudentsPage.tsx +++ b/frontend/src/views/StudentsPage/StudentsPage.tsx @@ -1,37 +1,37 @@ -import React, { useEffect, useState } from "react"; -import { StudentListFilters } from "../../components/StudentsComponents"; -import { getStudents } from "../../utils/api/students"; -import {Student} from "../../data/interfaces/students"; -import {useParams} from "react-router-dom"; - -function StudentsPage() { - const params = useParams(); - const [students, setStudents] = useState([]); - const [nameFilter, setNameFilter] = useState(""); - const [rolesFilter, setRolesFilter] = useState([]); - const [alumniFilter, setAlumniFilter] = useState(false); - const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); - - async function callGetStudents() { - try { - const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); - if (response) { - setStudents(response.students); - } - } catch (error) { - console.log(error); - } - } - - useEffect(() => { - callGetStudents(); - }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); - - return ( -
    - -
    - ); -} - -export default StudentsPage; +import React, { useEffect, useState } from "react"; +import { StudentListFilters } from "../../components/StudentsComponents"; +import { getStudents } from "../../utils/api/students"; +import {Student} from "../../data/interfaces/students"; +import {useParams} from "react-router-dom"; + +function StudentsPage() { + const params = useParams() + const [students, setStudents] = useState([]); + const [nameFilter, setNameFilter] = useState(""); + const [rolesFilter, setRolesFilter] = useState([]); + const [alumniFilter, setAlumniFilter] = useState(false); + const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); + + async function callGetStudents() { + try { + const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); + if (response) { + setStudents(response.students); + } + } catch (error) { + console.log(error); + } + } + + useEffect(() => { + callGetStudents(); + }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); + + return ( +
    + +
    + ); +} + +export default StudentsPage; From 8d6af7c2444be7f657d2815318955313ebc4159a Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 4 May 2022 05:31:10 +0200 Subject: [PATCH 100/649] all suggestion and confirm logic + popups --- .../StudentInfoComponents/StudentInfo.tsx | 2 - .../StudentInformation/styles.ts | 2 +- .../AdminDecisionContainer.tsx | 64 ++++++- .../AdminDecisionContainer/styles.ts | 15 ++ .../CoachSuggestionContainer.tsx | 160 +++++++++--------- .../StudentInfoComponents/styles.ts | 1 - .../StudentList/StudentCard/StudentCard.tsx | 24 +-- .../StudentList/StudentCard/styles.ts | 8 - .../SuggestionProgressBar.tsx | 34 ++++ .../SuggestionProgressBar/index.ts | 1 + .../SuggestionProgressBar/styles.ts | 7 + frontend/src/data/interfaces/suggestions.ts | 23 +++ frontend/src/utils/api/suggestions.ts | 29 ++++ 13 files changed, 248 insertions(+), 122 deletions(-) create mode 100644 frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts create mode 100644 frontend/src/data/interfaces/suggestions.ts create mode 100644 frontend/src/utils/api/suggestions.ts diff --git a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx index f9e601627..1099c7543 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx @@ -3,7 +3,6 @@ import { StudentListFilters } from "../StudentsComponents"; import StudentInformation from "./StudentInformation/StudentInformation"; import { StudentInfoPageContent } from "./styles"; import {Student} from "../../data/interfaces/students"; -import RemoveStudentButton from "./RemoveStudentButton/RemoveStudentButton"; interface Props { students: Student[]; @@ -22,7 +21,6 @@ export default function StudentInfo(props: Props) { return ( - ); diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index 6d816ef4b..994713758 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -25,7 +25,7 @@ export const StudentInfoTitle = styled.h4` color: var(--osoc_orange); `; -export const Suggestion = styled.p` +export const SuggestionField = styled.p` font-size: 20px; `; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx index e15249fa6..bad5b8c2f 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -1,19 +1,65 @@ -import React from "react"; -import { Button, Form } from "react-bootstrap"; +import React, {useState} from "react"; +import {Button, Modal} from "react-bootstrap"; import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; +import { SuggestionButtons, ConfirmButton } from "./styles"; export default function AdminDecisionContainer() { + const [show, setShow] = useState(false); + const [clickedButtonText, setClickedButtonText] = useState("") + function handleClose(){ + setShow(false) + setClickedButtonText("") + } + function handleShow(event: React.MouseEvent) { + event.preventDefault(); + setShow(true); + } + + function handleClick(event: React.MouseEvent) { + event.preventDefault(); + const button: HTMLButtonElement = event.currentTarget; + setClickedButtonText(button.innerText) + } + return (
    + + + Definitive decision on student + + Click on one of the buttons to mark your decision + + ) => handleClick(e)}> + Yes + + ) => handleClick(e)}> + Maybe + + ) => handleClick(e)}> + No + + + + + +
    + { clickedButtonText? ( + + ) : ( + + )} +
    +     +

    Definitive decision by admin

    - - - - - - - diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts new file mode 100644 index 000000000..414eba1ad --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts @@ -0,0 +1,15 @@ +import styled from "styled-components"; +import {Button} from "react-bootstrap"; + +export const SuggestionButtons = styled.div` + display: flex; + flex-direction: row; + width: 100%; + margin-top: 2%; +`; + +export const ConfirmButton = styled(Button)` + width: 29.33%; + margin-left: 2%; + margin-right: 2%; +`; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx index 8dc1ede08..c2e2e6843 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx @@ -1,80 +1,80 @@ -import {Button, ButtonGroup, Form, Modal} from "react-bootstrap"; -import React, { useState } from "react"; -import {Student} from "../../../../data/interfaces/students"; -import {makeSuggestion} from "../../../../utils/api/students"; -import {useParams} from "react-router-dom"; - -interface Props { - student: Student; -} - -export default function CoachSuggestionContainer(props: Props) { - const params = useParams() - const [show, setShow] = useState(false); - const [argumentation, setArgumentation] = useState(""); - const [clickedButtonText, setClickedButtonText] = useState("") - - const handleClose = () => setShow(false); - - function handleShow(event: React.MouseEvent) { - event.preventDefault(); - const button: HTMLButtonElement = event.currentTarget; - setClickedButtonText(button.innerText) - setShow(true); - } - - function doSuggestion() { - let suggestionNum: number = 0 - if (clickedButtonText === "Yes") { - suggestionNum = 1; - } else if (clickedButtonText === "Maybe") { - suggestionNum = 2; - } else { - suggestionNum = 3; - } - makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation) - setArgumentation("") - setShow(false) - } - - return ( -
    - - - Suggestion "{clickedButtonText}" for {props.student.firstName + " " + props.student.lastName} - - Why are you giving this decision for this student? - { - setArgumentation(e.target.value); - }} - placeholder="Place your argumentation here..."/> - * This field isn't required - - - - - - -

    Make a suggestion on this student

    - - - - - -
    - ); -} +import {Button, ButtonGroup, Form, Modal} from "react-bootstrap"; +import React, { useState } from "react"; +import {Student} from "../../../../data/interfaces/students"; +import {makeSuggestion} from "../../../../utils/api/students"; +import {useParams} from "react-router-dom"; + +interface Props { + student: Student; +} + +export default function CoachSuggestionContainer(props: Props) { + const params = useParams() + const [show, setShow] = useState(false); + const [argumentation, setArgumentation] = useState(""); + const [clickedButtonText, setClickedButtonText] = useState("") + + const handleClose = () => setShow(false); + + function handleShow(event: React.MouseEvent) { + event.preventDefault(); + const button: HTMLButtonElement = event.currentTarget; + setClickedButtonText(button.innerText) + setShow(true); + } + + function doSuggestion() { + let suggestionNum: number = 0 + if (clickedButtonText === "Yes") { + suggestionNum = 1; + } else if (clickedButtonText === "Maybe") { + suggestionNum = 2; + } else { + suggestionNum = 3; + } + makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation) + setArgumentation("") + setShow(false) + } + + return ( +
    + + + Suggestion "{clickedButtonText}" for {props.student.firstName + " " + props.student.lastName} + + Why are you giving this decision for this student? + { + setArgumentation(e.target.value); + }} + placeholder="Place your argumentation here..."/> + * This field isn't required + + + + + + +

    Make a suggestion on this student

    + + + + + +
    + ); +} \ No newline at end of file diff --git a/frontend/src/components/StudentInfoComponents/styles.ts b/frontend/src/components/StudentInfoComponents/styles.ts index b8c822ed1..ee8d68c10 100644 --- a/frontend/src/components/StudentInfoComponents/styles.ts +++ b/frontend/src/components/StudentInfoComponents/styles.ts @@ -1,7 +1,6 @@ import styled from "styled-components"; export const StudentRemoveButton = styled.button` - position: absolute; width: 150px; height: 35px; right: 5%; diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx index 1d6d5448d..5033c5e11 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx @@ -4,16 +4,11 @@ import { CardStudentInfo, CardVerticalContainer, CardHorizontalContainer, - CardSuggestionBar, CardStudentName, - CardAmountSuggestions, - AllSuggestions, - SuggestionSignYes, - SuggestionSignMaybe, - SuggestionSignNo } from "./styles"; import {useNavigate, useParams} from "react-router-dom"; import {NrSuggestions} from "../../../../data/interfaces/students"; +import SuggestionProgressBar from "../SuggestionProgressBar"; interface Props { firstName: string; @@ -22,6 +17,7 @@ interface Props { } export default function StudentCard(props: Props) { + const params = useParams() const navigate = useNavigate(); const params = useParams() @@ -33,22 +29,8 @@ export default function StudentCard(props: Props) { {props.firstName} - - V - - {props.nrOfSuggestions.yes} - - ? - - {props.nrOfSuggestions.maybe} - - X - - {props.nrOfSuggestions.no} - - - + diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts index b64a2feef..64d2dac34 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts @@ -21,14 +21,6 @@ export const CardConfirmColorBlock = styled.div` z-index: 1; `; -export const CardSuggestionBar = styled.div` - height: 2px; - width: 90%; - background: var(--osoc_green); - margin-left: 5%; - margin-bottom: 15px; -`; - export const CardStudentInfo = styled.div` display: flex; width: 100%; diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx new file mode 100644 index 000000000..4909b16af --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx @@ -0,0 +1,34 @@ +import React from "react"; +import {NrSuggestions} from "../../../../data/interfaces/students"; +import { + SuggestionBarContainer +} from "./styles"; +import { ProgressBar } from "react-bootstrap"; + + +interface Props { + nrOfSuggestions: NrSuggestions; +} + +function totalSuggestions(suggestions: NrSuggestions) { + let total: number = 0; + Object.entries(suggestions).forEach(([key, value]) => {total += value}) + return total +} + +export default function SuggestionProgressBar(props: Props) { + const amountSuggestions = totalSuggestions(props.nrOfSuggestions) + const frequencyYes = props.nrOfSuggestions.yes * 100/amountSuggestions + const frequencyMaybe = props.nrOfSuggestions.maybe * 100/amountSuggestions + const frequencyNo = props.nrOfSuggestions.no * 100/amountSuggestions + console.log(props.nrOfSuggestions) + return ( + + + + + + + + ); +} diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts new file mode 100644 index 000000000..ad83f01df --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts @@ -0,0 +1 @@ +export { default } from "./SuggestionProgressBar"; \ No newline at end of file diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts new file mode 100644 index 000000000..202a0f2a9 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts @@ -0,0 +1,7 @@ +import styled from "styled-components"; + +export const SuggestionBarContainer = styled.div` + width: 90%; + background: transparent; + margin-left: 5%; +`; diff --git a/frontend/src/data/interfaces/suggestions.ts b/frontend/src/data/interfaces/suggestions.ts new file mode 100644 index 000000000..6db8d905e --- /dev/null +++ b/frontend/src/data/interfaces/suggestions.ts @@ -0,0 +1,23 @@ +export interface Suggestion { + suggestionId: number; + coach: OsocCoach; + suggestion: number; + argumentation: string; +} + +export interface OsocCoach { + userId: number; + name: string; + admin: boolean; + auth: Authentication; +} + +export interface Authentication { + authType: string; + email: string; +} + +export interface Suggestions { + /** A list of projects */ + suggestions: Suggestion[]; +} \ No newline at end of file diff --git a/frontend/src/utils/api/suggestions.ts b/frontend/src/utils/api/suggestions.ts new file mode 100644 index 000000000..c41baf491 --- /dev/null +++ b/frontend/src/utils/api/suggestions.ts @@ -0,0 +1,29 @@ +import axios from "axios"; +import {axiosInstance} from "./api"; +import {Suggestions} from "../../data/interfaces/suggestions"; + +export async function getSuggestions(edition: string, studentId: string){ + try { + const response = await axiosInstance.get("/editions/" + edition + "/students/" + studentId.toString() + "/suggestions"); + return response.data as Suggestions; + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} + +export async function confirmStudent(edition: string, studentId: string, confirmValue: number) { + try { + const response = await axiosInstance.put("/editions/" + edition + "/students/" + studentId.toString() + "/decision", { decision: confirmValue }); + return response.status === 204 + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} \ No newline at end of file From f15fc92e3cd38a8d302a01f56ffb4404f15c8fc9 Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 4 May 2022 05:31:26 +0200 Subject: [PATCH 101/649] forgot one file --- .../StudentInformation/StudentInformation.tsx | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index b04a570f3..a3d4a5931 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, {useEffect, useState} from "react"; import { FullName, FirstName, @@ -6,7 +6,7 @@ import { LineBreak, PreferedName, StudentInfoTitle, - Suggestion, + SuggestionField, StudentInformationContainer, PersonalInfoField, PersonalInfoFieldValue, @@ -17,18 +17,51 @@ import { } from "./styles"; import { AdminDecisionContainer, CoachSuggestionContainer } from "../SuggestionComponents"; import {Student} from "../../../data/interfaces/students"; +import {Suggestion} from "../../../data/interfaces/suggestions"; +import {getSuggestions} from "../../../utils/api/suggestions"; +import {useParams} from "react-router-dom"; +import RemoveStudentButton from "../RemoveStudentButton/RemoveStudentButton"; interface Props { currentStudent: Student; } export default function StudentInformation(props: Props) { + const [suggestions, setSuggestions] = useState([]); + const params = useParams() + + async function callGetSuggestions() { + try { + const response = await getSuggestions(params.editionId!, params.id!); + setSuggestions(response.suggestions); + } catch (error) { + console.log(error); + } + } + + function suggestionToText(suggestion: number) { + if (suggestion === 0) { + return "Undecided" + } else if (suggestion === 1) { + return "Yes" + } else if (suggestion === 2) { + return "Maybe" + } else if (suggestion === 3) { + return "No" + } + } + + useEffect(() => { + callGetSuggestions(); + console.log("fetched suggestion") + }, [params.editionId!, params.id!]); if (!props.currentStudent) { return

    loading

    } else { return ( + {props.currentStudent.firstName} {props.currentStudent.lastName} @@ -36,15 +69,9 @@ export default function StudentInformation(props: Props) { Prefered name: {props.currentStudent.preferredName} Suggestions - - Wow this student is really incredible! We should give her a project! - - - Wow this student is really incredible! We should give her a project! - - - Wow this student is really incredible! We should give her a project! - + {suggestions.map(suggestion => ( + {suggestionToText(suggestion.suggestion)}: {suggestion.argumentation} + ))} Personal information From 0805e90c7faf95ec1c25d3c76dd26b48a4461f76 Mon Sep 17 00:00:00 2001 From: cledloof Date: Sat, 7 May 2022 15:20:07 +0200 Subject: [PATCH 102/649] rebased from develop --- .../StudentsComponents/StudentList/StudentCard/StudentCard.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx index 5033c5e11..fc4a61b41 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx @@ -17,7 +17,6 @@ interface Props { } export default function StudentCard(props: Props) { - const params = useParams() const navigate = useNavigate(); const params = useParams() From 4354d958e55bac39558b7dcd84a2e5b7f4820d26 Mon Sep 17 00:00:00 2001 From: FKD13 Date: Sat, 7 May 2022 19:54:10 +0200 Subject: [PATCH 103/649] add broken code --- backend/src/app/logic/projects.py | 8 +-- .../app/routers/editions/projects/projects.py | 9 ++- backend/src/app/schemas/projects.py | 31 ++++++++-- backend/src/database/crud/projects.py | 26 +++----- backend/src/database/models.py | 4 +- .../test_database/test_crud/test_projects.py | 62 ++++++++++++++++--- .../test_students/test_students.py | 60 ++++++++++++++++-- 7 files changed, 154 insertions(+), 46 deletions(-) diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index b43463e44..976412e2a 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -69,9 +69,5 @@ def patch_project_role(db: Session, project_role_id: int, input_project_role: In def get_conflicts(db: Session, edition: Edition) -> ConflictStudentList: """Returns a list of all students together with the projects they are causing a conflict for""" - conflicts = crud.get_conflict_students(db, edition) - conflicts_model = [] - for student, projects in conflicts: - conflicts_model.append(ConflictStudent(student=student, projects=projects)) - - return ConflictStudentList(conflict_students=conflicts_model) + print(crud.get_conflict_students(db, edition)) + return ConflictStudentList(conflict_students=crud.get_conflict_students(db, edition)) diff --git a/backend/src/app/routers/editions/projects/projects.py b/backend/src/app/routers/editions/projects/projects.py index 930190616..05126e9d3 100644 --- a/backend/src/app/routers/editions/projects/projects.py +++ b/backend/src/app/routers/editions/projects/projects.py @@ -88,7 +88,14 @@ async def get_conflicts(db: Session = Depends(get_session), edition: Edition = D Get a list of all projects with conflicts, and the users that are causing those conflicts. """ - return logic.get_conflicts(db, edition) + print('oi') + try: + a = logic.get_conflicts(db, edition) + print(a) + return a + except Exception as e: + print(e) + raise e @projects_router.get( diff --git a/backend/src/app/schemas/projects.py b/backend/src/app/schemas/projects.py index f17918862..8a0ad7791 100644 --- a/backend/src/app/schemas/projects.py +++ b/backend/src/app/schemas/projects.py @@ -78,6 +78,11 @@ class Config: orm_mode = True +class ProjectList(CamelCaseModel): + """A list of projects""" + projects: list[Project] + + class ConflictProject(CamelCaseModel): """A project to be used in ConflictStudent""" project_id: int @@ -88,15 +93,31 @@ class Config: orm_mode = True -class ProjectList(CamelCaseModel): - """A list of projects""" - projects: list[Project] +class ConflictProjectRole(CamelCaseModel): + """A project to be used in ConflictStudent""" + project_role_id: int + project: ConflictProject + + class Config: + """Config Class""" + orm_mode = True + + +class ConflictRoleSuggestion(CamelCaseModel): + """Represents a ProjectRole from the database""" + project_role_suggestion_id: int + project_role: ConflictProjectRole + + class Config: + """Set to ORM mode""" + orm_mode = True class ConflictStudent(CamelCaseModel): """A student together with the projects they are causing a conflict for""" - student: Student - projects: list[ConflictProject] + student_id: int + name: str + pr_suggestions: list[ConflictRoleSuggestion] class Config: """Config Class""" diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index 256bf3721..18e3ebefb 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -1,4 +1,5 @@ from sqlalchemy.orm import Session, Query +from sqlalchemy.sql.expression import func import src.database.crud.skills as skills_crud from src.app.schemas.projects import InputProject, InputProjectRole, QueryParamsProjects @@ -131,24 +132,11 @@ def patch_project_role( return project_role -def get_conflict_students(db: Session, edition: Edition) -> list[tuple[Student, list[Project]]]: +def get_conflict_students(db: Session, edition: Edition) -> list[Student]: """ - Query all students that are causing conflicts for a certain edition - Return a ConflictStudent for each student that causes a conflict - This class contains a student together with all projects they are causing a conflict for + Return an overview of the students that are assigned to multiple projects """ - students = db.query(Student).where(Student.edition == edition).all() - conflict_students = [] - projs = [] - for student in students: - if len(student.project_roles) > 1: - proj_ids = db.query(ProjectRole.project_id).where( - ProjectRole.student_id == student.student_id).all() - for proj_id in proj_ids: - proj_id = proj_id[0] - proj = db.query(Project).where( - Project.project_id == proj_id).one() - projs.append(proj) - conflict_student = (student, projs) - conflict_students.append(conflict_student) - return conflict_students + return [ + s for s in db.query(Student).where(Student.edition == edition).all() + if len(s.pr_suggestions) > 1 + ] diff --git a/backend/src/database/models.py b/backend/src/database/models.py index 2d9ec0f43..8e2c467ba 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -190,7 +190,7 @@ class ProjectRoleSuggestion(Base): ) student_id = Column(Integer, ForeignKey("students.student_id"), nullable=True) - student: Student | None = relationship("Student", back_populates="project_roles", uselist=False) + student: Student | None = relationship("Student", back_populates="pr_suggestions", uselist=False) drafter_id = Column(Integer, ForeignKey("users.user_id"), nullable=True) drafter: User | None = relationship("User", back_populates="drafted_roles", uselist=False) @@ -230,7 +230,7 @@ class Student(Base): edition_id = Column(Integer, ForeignKey("editions.edition_id")) emails: list[DecisionEmail] = relationship("DecisionEmail", back_populates="student", cascade="all, delete-orphan") - project_roles: list[ProjectRoleSuggestion] = relationship("ProjectRoleSuggestion", back_populates="student") + pr_suggestions: list[ProjectRoleSuggestion] = relationship("ProjectRoleSuggestion", back_populates="student") skills: list[Skill] = relationship("Skill", secondary="student_skills", back_populates="students") suggestions: list[Suggestion] = relationship("Suggestion", back_populates="student") questions: list[Question] = relationship("Question", back_populates="student", cascade="all, delete-orphan") diff --git a/backend/tests/test_database/test_crud/test_projects.py b/backend/tests/test_database/test_crud/test_projects.py index 6c1696aa7..20089f690 100644 --- a/backend/tests/test_database/test_crud/test_projects.py +++ b/backend/tests/test_database/test_crud/test_projects.py @@ -5,7 +5,7 @@ from settings import DB_PAGE_SIZE from src.app.schemas.projects import InputProject, QueryParamsProjects import src.database.crud.projects as crud -from src.database.models import Edition, Partner, Project, User, Skill, ProjectRole, Student +from src.database.models import Edition, Partner, Project, User, Skill, ProjectRole, Student, ProjectRoleSuggestion @pytest.fixture @@ -227,12 +227,58 @@ def test_patch_project(database_session: Session): assert project.coaches[0].user_id == new_user.user_id -def test_get_conflict_students(database_with_data: Session, current_edition: Edition): +def test_get_conflict_students(database_session: Session): """test if the right ConflictStudent is given""" - conflicts: list[(Student, list[Project])] = crud.get_conflict_students( - database_with_data, current_edition) + edition: Edition = Edition(year=2022, name="ed2022") + skill: Skill = Skill(name="skill 1") + student: Student = Student( + first_name="Jos", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@mail.com", + phone_number="0487/86.24.45", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + ) + + database_session.add(Student( + first_name="Jos2", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@gmail.com", + phone_number="0487/86.24.46", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + )) + + database_session.add(ProjectRoleSuggestion( + student=student, + project_role=ProjectRole( + skill=skill, + slots=1, + project=Project( + name="project 1", + edition=edition + ) + ) + )) + + database_session.add(ProjectRoleSuggestion( + student=student, + project_role=ProjectRole( + skill=skill, + slots=1, + project=Project( + name="project 2", + edition=edition + ) + ) + )) + database_session.commit() + + conflicts: list[Student] = crud.get_conflict_students(database_session, edition) assert len(conflicts) == 1 - assert conflicts[0][0].student_id == 1 - assert len(conflicts[0][1]) == 2 - assert conflicts[0][1][0].project_id == 1 - assert conflicts[0][1][1].project_id == 2 + assert conflicts[0].student_id == student.student_id + assert len(conflicts[0].pr_suggestions) == 2 diff --git a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py index 01f307026..29139839a 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py @@ -268,14 +268,64 @@ def test_delete_pr_suggestion_non_existing_pr_suggestion(database_session: Sessi assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_get_conflicts(database_session: Session, current_edition: Edition, auth_client: AuthClient): +def test_get_conflicts(database_session: Session, auth_client: AuthClient): """Test getting the conflicts""" - auth_client.coach(current_edition) - response = auth_client.get("/editions/ed2022/projects/conflicts") + edition: Edition = Edition(year=2022, name="ed2022") + skill: Skill = Skill(name="skill 1") + student: Student = Student( + first_name="Jos", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@mail.com", + phone_number="0487/86.24.45", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + ) + + database_session.add(Student( + first_name="Jos2", + last_name="Vermeulen", + preferred_name="Joske", + email_address="josvermeulen@gmail.com", + phone_number="0487/86.24.46", + alumni=True, + wants_to_be_student_coach=True, + edition=edition + )) + + database_session.add(ProjectRoleSuggestion( + student=student, + project_role=ProjectRole( + skill=skill, + slots=1, + project=Project( + name="project 1", + edition=edition + ) + ) + )) + + database_session.add(ProjectRoleSuggestion( + student=student, + project_role=ProjectRole( + skill=skill, + slots=1, + project=Project( + name="project 2", + edition=edition + ) + ) + )) + database_session.commit() + + auth_client.coach(edition) + response = auth_client.get(f"/editions/{edition.name}/projects/conflicts") json = response.json() + print(json) assert len(json['conflictStudents']) == 1 - assert json['conflictStudents'][0]['student']['studentId'] == 1 - assert len(json['conflictStudents'][0]['projects']) == 2 + assert json['conflictStudents'][0]['studentId'] == student.student_id + assert len(json['conflictStudents'][0]['prSuggestions']) == 2 def test_add_student_project_already_confirmed(database_session: Session, current_edition: Edition, From 2091447b92935809184af6c3f43c6972fcf276fa Mon Sep 17 00:00:00 2001 From: FKD13 Date: Sat, 7 May 2022 20:12:30 +0200 Subject: [PATCH 104/649] tests succeed --- backend/src/app/logic/projects.py | 3 +- .../app/routers/editions/projects/projects.py | 29 ++++++-------- backend/src/app/schemas/projects.py | 3 +- .../test_students/test_students.py | 38 +------------------ 4 files changed, 15 insertions(+), 58 deletions(-) diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index 976412e2a..ccabf1dee 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -3,7 +3,7 @@ import src.app.logic.partners as partners_logic import src.database.crud.projects as crud from src.app.schemas.projects import ( - ProjectList, ConflictStudentList, InputProject, ConflictStudent, InputProjectRole, QueryParamsProjects + ProjectList, ConflictStudentList, InputProject, InputProjectRole, QueryParamsProjects ) from src.database.models import Edition, Project, ProjectRole, User @@ -69,5 +69,4 @@ def patch_project_role(db: Session, project_role_id: int, input_project_role: In def get_conflicts(db: Session, edition: Edition) -> ConflictStudentList: """Returns a list of all students together with the projects they are causing a conflict for""" - print(crud.get_conflict_students(db, edition)) return ConflictStudentList(conflict_students=crud.get_conflict_students(db, edition)) diff --git a/backend/src/app/routers/editions/projects/projects.py b/backend/src/app/routers/editions/projects/projects.py index 05126e9d3..432e970be 100644 --- a/backend/src/app/routers/editions/projects/projects.py +++ b/backend/src/app/routers/editions/projects/projects.py @@ -6,12 +6,12 @@ import src.app.logic.projects as logic from src.app.routers.tags import Tags from src.app.schemas.projects import ( - ProjectList, Project, InputProject, ConflictStudentList, InputProjectRole, + InputProjectRole, ProjectRole as ProjectRoleSchema) -from src.app.utils.dependencies import get_edition, get_project, require_admin, require_coach, get_latest_edition from src.app.schemas.projects import ( ProjectList, Project, InputProject, ConflictStudentList, QueryParamsProjects ) +from src.app.utils.dependencies import get_edition, get_project, require_admin, require_coach, get_latest_edition from src.database.database import get_session from src.database.models import Edition, Project as ProjectModel, User from .students import project_students_router @@ -44,6 +44,15 @@ async def create_project( return logic.create_project(db, edition, input_project) +@projects_router.get("/conflicts", response_model=ConflictStudentList, dependencies=[Depends(require_coach)]) +async def get_conflicts(db: Session = Depends(get_session), edition: Edition = Depends(get_edition)): + """ + Get a list of all projects with conflicts, and the users that + are causing those conflicts. + """ + return logic.get_conflicts(db, edition) + + @projects_router.delete( "/{project_id}", status_code=status.HTTP_204_NO_CONTENT, @@ -82,22 +91,6 @@ async def patch_project( logic.patch_project(db, project, input_project) -@projects_router.get("/conflicts", response_model=ConflictStudentList, dependencies=[Depends(require_coach)]) -async def get_conflicts(db: Session = Depends(get_session), edition: Edition = Depends(get_edition)): - """ - Get a list of all projects with conflicts, and the users that - are causing those conflicts. - """ - print('oi') - try: - a = logic.get_conflicts(db, edition) - print(a) - return a - except Exception as e: - print(e) - raise e - - @projects_router.get( "/{project_id}/roles", response_model=list[ProjectRoleSchema], diff --git a/backend/src/app/schemas/projects.py b/backend/src/app/schemas/projects.py index 8a0ad7791..0d87a71b4 100644 --- a/backend/src/app/schemas/projects.py +++ b/backend/src/app/schemas/projects.py @@ -116,7 +116,8 @@ class Config: class ConflictStudent(CamelCaseModel): """A student together with the projects they are causing a conflict for""" student_id: int - name: str + first_name: str + last_name: str pr_suggestions: list[ConflictRoleSuggestion] class Config: diff --git a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py index 29139839a..7acdd1e25 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py @@ -1,7 +1,7 @@ from sqlalchemy.orm import Session from starlette import status -from src.database.models import Edition, Project, User, Skill, ProjectRole, Student, ProjectRoleSuggestion +from src.database.models import Edition, Project, Skill, ProjectRole, Student, ProjectRoleSuggestion from tests.utils.authorization import AuthClient @@ -326,39 +326,3 @@ def test_get_conflicts(database_session: Session, auth_client: AuthClient): assert len(json['conflictStudents']) == 1 assert json['conflictStudents'][0]['studentId'] == student.student_id assert len(json['conflictStudents'][0]['prSuggestions']) == 2 - - -def test_add_student_project_already_confirmed(database_session: Session, current_edition: Edition, - auth_client: AuthClient): - """A project_role can't be created if the student involved has already been confirmed elsewhere""" - auth_client.coach(current_edition) - - resp = auth_client.post("/editions/ed2022/projects/1/students/4", json={"skill_id": 3}) - - assert resp.status_code == status.HTTP_400_BAD_REQUEST - - -def test_confirm_project_role(database_session: Session, auth_client: AuthClient): - """Confirm a project role for a student without conflicts""" - auth_client.admin() - resp = auth_client.post( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 3}) - - assert resp.status_code == status.HTTP_201_CREATED - - response2 = auth_client.post( - "/editions/ed2022/projects/1/students/3/confirm") - - assert response2.status_code == status.HTTP_204_NO_CONTENT - pr = database_session.query(ProjectRole).where(ProjectRole.student_id == 3) \ - .where(ProjectRole.project_id == 1).one() - assert pr.definitive is True - - -def test_confirm_project_role_conflict(database_session: Session, auth_client: AuthClient): - """A student who is part of a conflict can't have their project_role confirmed""" - auth_client.admin() - response2 = auth_client.post( - "/editions/ed2022/projects/1/students/1/confirm") - - assert response2.status_code == status.HTTP_409_CONFLICT From c6579a2dd0554be8853b9414739c3617d9b0051f Mon Sep 17 00:00:00 2001 From: FKD13 Date: Sat, 7 May 2022 20:19:13 +0200 Subject: [PATCH 105/649] fix typing --- backend/src/app/exceptions/handlers.py | 2 +- backend/src/app/routers/editions/projects/projects.py | 4 ++-- backend/src/app/schemas/suggestion.py | 4 +++- backend/src/app/utils/dependencies.py | 4 ++-- backend/src/database/models.py | 7 ++++--- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/backend/src/app/exceptions/handlers.py b/backend/src/app/exceptions/handlers.py index 0296c2483..23d67fefe 100644 --- a/backend/src/app/exceptions/handlers.py +++ b/backend/src/app/exceptions/handlers.py @@ -65,7 +65,7 @@ def sqlalchemy_exc_no_result_found(_request: Request, _exception: sqlalchemy.exc ) @app.exception_handler(NotFound) - def sqlalchemy_exc_no_result_found(_request: Request, _exception: NotFound): + def not_found(_request: Request, _exception: NotFound): return JSONResponse( status_code=status.HTTP_404_NOT_FOUND, content={'message': 'Not Found'} diff --git a/backend/src/app/routers/editions/projects/projects.py b/backend/src/app/routers/editions/projects/projects.py index 432e970be..558faf603 100644 --- a/backend/src/app/routers/editions/projects/projects.py +++ b/backend/src/app/routers/editions/projects/projects.py @@ -96,7 +96,7 @@ async def patch_project( response_model=list[ProjectRoleSchema], dependencies=[Depends(require_coach), Depends(get_latest_edition)] ) -async def get_project_roles(project: Project = Depends(get_project), db: Session = Depends(get_session)): +async def get_project_roles(project: ProjectModel = Depends(get_project), db: Session = Depends(get_session)): """List all project roles for a project""" return logic.get_project_roles(db, project) @@ -108,7 +108,7 @@ async def get_project_roles(project: Project = Depends(get_project), db: Session ) async def post_project_role( input_project_role: InputProjectRole, - project: Project = Depends(get_project), + project: ProjectModel = Depends(get_project), db: Session = Depends(get_session)): """Create a new project role""" return logic.create_project_role(db, project, input_project_role) diff --git a/backend/src/app/schemas/suggestion.py b/backend/src/app/schemas/suggestion.py index db5b30eec..d6f25b98c 100644 --- a/backend/src/app/schemas/suggestion.py +++ b/backend/src/app/schemas/suggestion.py @@ -42,7 +42,9 @@ class SuggestionResponse(CamelCaseModel): def suggestion_model_to_schema(suggestion_model: Suggestion_model) -> Suggestion: """Create Suggestion Schema from Suggestion Model""" - coach: User = user_model_to_schema(suggestion_model.coach) + coach: User | None = None + if suggestion_model.coach: + coach = user_model_to_schema(suggestion_model.coach) return Suggestion(suggestion_id=suggestion_model.suggestion_id, coach=coach, suggestion=suggestion_model.suggestion, diff --git a/backend/src/app/utils/dependencies.py b/backend/src/app/utils/dependencies.py index da2ede69b..331b5c536 100644 --- a/backend/src/app/utils/dependencies.py +++ b/backend/src/app/utils/dependencies.py @@ -21,7 +21,7 @@ from src.database.crud.suggestions import get_suggestion_by_id from src.database.crud.users import get_user_by_id from src.database.database import get_session -from src.database.models import Edition, InviteLink, Student, Suggestion, User, Project +from src.database.models import Edition, InviteLink, Student, Suggestion, User, Project, ProjectRole def get_edition(edition_name: str, database: Session = Depends(get_session)) -> Edition: @@ -152,7 +152,7 @@ def get_project( def get_project_role( project_role_id: int, project: Project = Depends(get_project), - db: Session = Depends(get_session)) -> Project: + db: Session = Depends(get_session)) -> ProjectRole: """Get a project from het database, given the id in the path""" project_role = crud_projects.get_project_role(db, project_role_id) if project_role.project != project: diff --git a/backend/src/database/models.py b/backend/src/database/models.py index 8e2c467ba..8881c59c1 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -11,6 +11,7 @@ """ from __future__ import annotations +from typing import Optional from uuid import uuid4, UUID from sqlalchemy import Column, Integer, Enum, ForeignKey, Text, Boolean, DateTime, Table, UniqueConstraint @@ -190,10 +191,10 @@ class ProjectRoleSuggestion(Base): ) student_id = Column(Integer, ForeignKey("students.student_id"), nullable=True) - student: Student | None = relationship("Student", back_populates="pr_suggestions", uselist=False) + student: Optional[Student] = relationship("Student", back_populates="pr_suggestions", uselist=False) drafter_id = Column(Integer, ForeignKey("users.user_id"), nullable=True) - drafter: User | None = relationship("User", back_populates="drafted_roles", uselist=False) + drafter: Optional[User] = relationship("User", back_populates="drafted_roles", uselist=False) class Skill(Base): @@ -297,7 +298,7 @@ class Suggestion(Base): argumentation = Column(Text, nullable=True) student: Student = relationship("Student", back_populates="suggestions", uselist=False) - coach: User | None = relationship("User", back_populates="suggestions", uselist=False) + coach: Optional[User] = relationship("User", back_populates="suggestions", uselist=False) class User(Base): From ff63020e059079c9beb5b159dd25f84fccc4fd42 Mon Sep 17 00:00:00 2001 From: FKD13 Date: Sat, 7 May 2022 20:35:25 +0200 Subject: [PATCH 106/649] fix linting --- backend/pyproject.toml | 4 ++++ backend/src/app/exceptions/handlers.py | 3 ++- backend/src/app/logic/projects.py | 3 +++ backend/src/app/logic/projects_students.py | 3 +-- backend/src/app/logic/students.py | 10 ++++++---- backend/src/app/utils/dependencies.py | 1 - backend/src/database/crud/projects.py | 2 +- backend/src/database/crud/projects_students.py | 4 ++++ 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 08cdee05d..948c3c747 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -109,6 +109,9 @@ extension-pkg-whitelist = "pydantic" [tool.pylint.format] max-line-length = 120 +[tool.pylint.similarities] +min-similarity-lines=10 + [tool.pytest.ini_options] asyncio_mode = "auto" filterwarnings = [ @@ -118,6 +121,7 @@ env = [ "DB_USE_SQLITE = 1", ] + [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/backend/src/app/exceptions/handlers.py b/backend/src/app/exceptions/handlers.py index 23d67fefe..1d2bad605 100644 --- a/backend/src/app/exceptions/handlers.py +++ b/backend/src/app/exceptions/handlers.py @@ -16,7 +16,7 @@ from .util import NotFound -def install_handlers(app: FastAPI): +def install_handlers(app: FastAPI): # pylint: disable=R0914 """Install all custom exception handlers""" @app.exception_handler(ExpiredCredentialsException) @@ -114,6 +114,7 @@ async def wrong_token_type_exception(_request: Request, _exception: WrongTokenTy status_code=status.HTTP_401_UNAUTHORIZED, content={'message': 'You used the wrong token to access this resource.'} ) + @app.exception_handler(ReadOnlyEditionException) def read_only_edition_exception(_request: Request, _exception: ReadOnlyEditionException): return JSONResponse( diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index ccabf1dee..e18c08f02 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -56,14 +56,17 @@ def delete_project(db: Session, project: Project): def get_project_roles(db: Session, project: Project) -> list[ProjectRole]: + """Get project roles for a project""" return crud.get_project_roles_for_project(db, project) def create_project_role(db: Session, project: Project, input_project_role: InputProjectRole) -> ProjectRole: + """Create a project role""" return crud.create_project_role(db, project, input_project_role) def patch_project_role(db: Session, project_role_id: int, input_project_role: InputProjectRole) -> ProjectRole: + """Update a project role""" return crud.patch_project_role(db, project_role_id, input_project_role) diff --git a/backend/src/app/logic/projects_students.py b/backend/src/app/logic/projects_students.py index cc8863fc9..333f6fe58 100644 --- a/backend/src/app/logic/projects_students.py +++ b/backend/src/app/logic/projects_students.py @@ -21,8 +21,7 @@ def add_student_project( pr_suggestion = crud.get_optional_pr_suggestion_for_pr_by_student(db, project_role, student) if pr_suggestion is None: return crud.create_pr_suggestion(db, project_role, student, drafter, argumentation) - else: - raise DuplicateInsertException() + raise DuplicateInsertException() def change_project_role_suggestion( diff --git a/backend/src/app/logic/students.py b/backend/src/app/logic/students.py index d506fbe8d..3b98a1fde 100644 --- a/backend/src/app/logic/students.py +++ b/backend/src/app/logic/students.py @@ -3,10 +3,12 @@ from src.app.schemas.students import NewDecision from src.database.crud.skills import get_skills_by_ids -from src.database.crud.students import (get_last_emails_of_students, get_student_by_id, - set_definitive_decision_on_student, - delete_student, get_students, get_emails, - create_email) +from src.database.crud.students import ( + get_last_emails_of_students, get_student_by_id, + set_definitive_decision_on_student, + delete_student, get_students, get_emails, + create_email +) from src.database.crud.suggestions import get_suggestions_of_student_by_type from src.database.enums import DecisionEnum from src.database.models import Edition, Student, Skill, DecisionEmail diff --git a/backend/src/app/utils/dependencies.py b/backend/src/app/utils/dependencies.py index 331b5c536..ec57ae117 100644 --- a/backend/src/app/utils/dependencies.py +++ b/backend/src/app/utils/dependencies.py @@ -31,7 +31,6 @@ def get_edition(edition_name: str, database: Session = Depends(get_session)) -> def get_student(student_id: int, database: Session = Depends(get_session)) -> Student: """Get the student from the database, given the id in the path""" - # TODO: check user in edition! return get_student_by_id(database, student_id) diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index 18e3ebefb..02c0c9fdc 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -1,5 +1,4 @@ from sqlalchemy.orm import Session, Query -from sqlalchemy.sql.expression import func import src.database.crud.skills as skills_crud from src.app.schemas.projects import InputProject, InputProjectRole, QueryParamsProjects @@ -92,6 +91,7 @@ def patch_project( def get_project_role(db: Session, project_role_id: int) -> ProjectRole: + """Get a project role by id""" return db.query(ProjectRole).where(ProjectRole.project_role_id == project_role_id).one() diff --git a/backend/src/database/crud/projects_students.py b/backend/src/database/crud/projects_students.py index 30d8e4afa..b56048134 100644 --- a/backend/src/database/crud/projects_students.py +++ b/backend/src/database/crud/projects_students.py @@ -15,6 +15,7 @@ def get_pr_suggestion_for_pr_by_student( db: Session, project_role: ProjectRole, student: Student) -> ProjectRoleSuggestion: + """Get the project role suggestion for a student""" return _get_pr_suggestion_for_pr_by_student_query(db, project_role, student).one() @@ -22,6 +23,7 @@ def get_optional_pr_suggestion_for_pr_by_student( db: Session, project_role: ProjectRole, student: Student) -> ProjectRoleSuggestion | None: + """Get the project role suggestion for a student, but don't raise an error when none is found""" return _get_pr_suggestion_for_pr_by_student_query(db, project_role, student).one_or_none() @@ -31,6 +33,7 @@ def create_pr_suggestion( student: Student, drafter: User, argumentation: InputArgumentation) -> ProjectRoleSuggestion: + """Create a project role suggestion""" pr_suggestion = ProjectRoleSuggestion( project_role=project_role, student=student, @@ -47,6 +50,7 @@ def update_pr_suggestion( pr_suggestion: ProjectRoleSuggestion, drafter: User, argumentation: InputArgumentation) -> ProjectRoleSuggestion: + """Update a project role suggestion""" pr_suggestion.argumentation = argumentation.argumentation pr_suggestion.drafter = drafter db.commit() From 108a7a096a9e9f05163d1686a41d75d918df0331 Mon Sep 17 00:00:00 2001 From: beguille Date: Sun, 8 May 2022 10:23:13 +0200 Subject: [PATCH 107/649] project tests are passing --- backend/src/app/logic/projects.py | 1 + backend/src/database/crud/projects.py | 14 +++++--------- backend/src/database/crud/users.py | 2 +- backend/src/database/models.py | 16 ++++++++-------- .../test_projects/test_projects.py | 17 +++++++++-------- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index 0ddd33784..0617fa098 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -6,6 +6,7 @@ ) from src.database.models import Edition, Project, User + async def get_project_list(db: AsyncSession, edition: Edition, search_params: QueryParamsProjects, user: User) -> ProjectList: """Returns a list of all projects from a certain edition""" diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index 13022ef7e..07c4d1559 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -24,7 +24,9 @@ async def get_projects_for_edition_page(db: AsyncSession, edition: Edition, query = _get_projects_for_edition_query(edition).where( Project.name.contains(search_params.name)) if search_params.coach: + print("called") query = query.where(Project.project_id.in_([user_project.project_id for user_project in user.projects])) + print("after") result = await db.execute(paginate(query, search_params.page)) projects: list[Project] = result.unique().scalars().all() @@ -40,7 +42,7 @@ async def _get_skill_by_id(db_skill: AsyncSession, skill_id: int) -> Skill: async def _get_coach_by_id(db_coach: AsyncSession, coach_id: int) -> User: query_coach = select(User).where(User.user_id == coach_id) result_coach = await db_coach.execute(query_coach) - return result_coach.scalars().one() + return result_coach.unique().scalars().one() async def add_project(db: AsyncSession, edition: Edition, input_project: InputProject) -> Project: @@ -68,7 +70,8 @@ async def add_project(db: AsyncSession, edition: Edition, input_project: InputPr edition_id=edition.edition_id, skills=skills_obj, coaches=coaches_obj, partners=partners_obj) db.add(project) await db.commit() - print(project) + # query the new project in order to update the relation values (needed for async operation to work correctly) + (await db.execute(select(Project).where(Project.project_id == project.project_id))).unique().scalars().one() return project @@ -81,12 +84,6 @@ async def get_project(db: AsyncSession, project_id: int) -> Project: async def delete_project(db: AsyncSession, project_id: int): """Delete a specific project from the database""" - query = select(ProjectRole).where(ProjectRole.project_id == project_id) - result = await db.execute(query) - proj_roles = result.scalars().all() - for proj_role in proj_roles: - await db.delete(proj_role) - project = await get_project(db, project_id) await db.delete(project) await db.commit() @@ -114,7 +111,6 @@ async def patch_project(db: AsyncSession, project_id: int, input_project: InputP db.add(partner_obj) partners_obj.append(partner_obj) - print(input_project.name) project.name = input_project.name project.number_of_students = input_project.number_of_students project.skills = skills_obj diff --git a/backend/src/database/crud/users.py b/backend/src/database/crud/users.py index 50ef437f4..48415f310 100644 --- a/backend/src/database/crud/users.py +++ b/backend/src/database/crud/users.py @@ -198,4 +198,4 @@ async def get_user_by_id(db: AsyncSession, user_id: int) -> User: """Find a user by their id""" query = select(User).where(User.user_id == user_id) result = await db.execute(query) - return result.scalars().one() + return result.unique().scalars().one() diff --git a/backend/src/database/models.py b/backend/src/database/models.py index bdbd8e676..bfdd720eb 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -299,16 +299,16 @@ class User(Base): name = Column(Text, nullable=False) admin = Column(Boolean, nullable=False, default=False) - coach_request: CoachRequest = relationship("CoachRequest", back_populates="user", uselist=False) - drafted_roles: list[ProjectRole] = relationship("ProjectRole", back_populates="drafter") - editions: list[Edition] = relationship("Edition", secondary="user_editions", back_populates="coaches") - projects: list[Project] = relationship("Project", secondary="project_coaches", back_populates="coaches") - suggestions: list[Suggestion] = relationship("Suggestion", back_populates="coach") + coach_request: CoachRequest = relationship("CoachRequest", back_populates="user", uselist=False, lazy="joined") + drafted_roles: list[ProjectRole] = relationship("ProjectRole", back_populates="drafter", lazy="joined") + editions: list[Edition] = relationship("Edition", secondary="user_editions", back_populates="coaches", lazy="joined") + projects: list[Project] = relationship("Project", secondary="project_coaches", back_populates="coaches", lazy="joined") + suggestions: list[Suggestion] = relationship("Suggestion", back_populates="coach", lazy="joined") # Authentication methods - email_auth: AuthEmail = relationship("AuthEmail", back_populates="user", uselist=False) - github_auth: AuthGitHub = relationship("AuthGitHub", back_populates="user", uselist=False) - google_auth: AuthGoogle = relationship("AuthGoogle", back_populates="user", uselist=False) + email_auth: AuthEmail = relationship("AuthEmail", back_populates="user", uselist=False, lazy="joined") + github_auth: AuthGitHub = relationship("AuthGitHub", back_populates="user", uselist=False, lazy="joined") + google_auth: AuthGoogle = relationship("AuthGoogle", back_populates="user", uselist=False, lazy="joined") user_editions = Table( diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index 33ce67b06..40fad1730 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -137,9 +137,9 @@ async def test_create_project(database_with_data: AsyncSession, auth_client: Aut assert response.json()['name'] == 'test' assert response.json()["partners"][0]["name"] == "ugent" - assert len(database_with_data.query(Partner).all()) == 1 + assert len((await database_with_data.execute(select(Partner))).scalars().all()) == 1 - response = await auth_client.get('/editions/ed2022/projects') + response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 4 @@ -336,13 +336,14 @@ async def test_search_project_name(database_with_data: AsyncSession, auth_client async def test_search_project_coach(database_with_data: AsyncSession, auth_client: AuthClient): """test search project on coach""" await auth_client.admin() - user: User = (await database_with_data.execute(select(User).where(User.name == "Pytest Admin"))).scalar_one() + user: User = (await database_with_data.execute(select(User).where(User.name == "Pytest Admin"))).unique().scalar_one() async with auth_client: - await auth_client.post("/editions/ed2022/projects/", - json={"name": "test", - "number_of_students": 2, - "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [user.user_id]}) - response = await auth_client.get("/editions/ed2022/projects/?coach=true") + postresponse = await auth_client.post("/editions/ed2022/projects/", + json={"name": "test", + "number_of_students": 2, + "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], + "coaches": [user.user_id]}) + response = await auth_client.get("/editions/ed2022/projects/?coach=true", follow_redirects=True) assert len(response.json()["projects"]) == 1 assert response.json()["projects"][0]["name"] == "test" assert response.json()["projects"][0]["coaches"][0]["userId"] == user.user_id From b502e5b7e08567108bc356386971c8e77e24369d Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Sun, 8 May 2022 11:28:22 +0200 Subject: [PATCH 108/649] Style Adminspage --- .../src/components/AdminsComponents/AddAdmin.tsx | 6 ++++-- .../src/components/AdminsComponents/AdminList.tsx | 14 +++++--------- .../src/components/AdminsComponents/styles.ts | 10 +++++++++- .../src/components/GeneralComponents/MenuItem.tsx | 6 +++--- .../src/components/GeneralComponents/styles.ts | 15 ++++++++++----- frontend/src/views/AdminsPage/styles.ts | 4 ++-- 6 files changed, 33 insertions(+), 22 deletions(-) diff --git a/frontend/src/components/AdminsComponents/AddAdmin.tsx b/frontend/src/components/AdminsComponents/AddAdmin.tsx index e73dbeb69..ef60f0d92 100644 --- a/frontend/src/components/AdminsComponents/AddAdmin.tsx +++ b/frontend/src/components/AdminsComponents/AddAdmin.tsx @@ -1,7 +1,7 @@ import { getUsersNonAdmin, User } from "../../utils/api/users/users"; import React, { useState } from "react"; import { addAdmin } from "../../utils/api/users/admins"; -import { AddAdminButton, ModalContentConfirm, Warning } from "./styles"; +import { AddAdminButton, EmailDiv, ModalContentConfirm, Warning } from "./styles"; import { Button, Modal, Spinner } from "react-bootstrap"; import { AsyncTypeahead, Menu } from "react-bootstrap-typeahead"; import { Error } from "../UsersComponents/Requests/styles"; @@ -163,7 +163,9 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { ); }} /> - + + + diff --git a/frontend/src/components/AdminsComponents/AdminList.tsx b/frontend/src/components/AdminsComponents/AdminList.tsx index b383c3de6..5774c077b 100644 --- a/frontend/src/components/AdminsComponents/AdminList.tsx +++ b/frontend/src/components/AdminsComponents/AdminList.tsx @@ -35,14 +35,6 @@ export default function AdminList(props: { } } - const body = ( - - {props.admins.map(admin => ( - - ))} - - ); - return ( @@ -52,7 +44,11 @@ export default function AdminList(props: { Remove - {body} + + {props.admins.map(admin => ( + + ))} + ); } diff --git a/frontend/src/components/AdminsComponents/styles.ts b/frontend/src/components/AdminsComponents/styles.ts index 394500255..7fe14156c 100644 --- a/frontend/src/components/AdminsComponents/styles.ts +++ b/frontend/src/components/AdminsComponents/styles.ts @@ -5,7 +5,11 @@ export const Warning = styled.div` color: var(--osoc_red); `; -export const AdminsTable = styled(Table)``; +export const AdminsTable = styled(Table)` + min-width: fit-content; + width: 45em; + max-width: 100%; +`; export const ModalContentConfirm = styled.div` border: 3px solid var(--osoc_green); @@ -22,3 +26,7 @@ export const AddAdminButton = styled(Button).attrs({ })` float: right; `; + +export const EmailDiv = styled.div` + overflow: auto; +`; diff --git a/frontend/src/components/GeneralComponents/MenuItem.tsx b/frontend/src/components/GeneralComponents/MenuItem.tsx index 849fd4fea..5d38e028d 100644 --- a/frontend/src/components/GeneralComponents/MenuItem.tsx +++ b/frontend/src/components/GeneralComponents/MenuItem.tsx @@ -1,5 +1,5 @@ import { User } from "../../utils/api/users/users"; -import { EmailDiv, NameDiv } from "./styles"; +import { DropdownEmailDiv, NameDiv } from "./styles"; import EmailAndAuth from "./EmailAndAuth"; /** @@ -10,9 +10,9 @@ export default function UserMenuItem(props: { user: User }) { return (
    {props.user.name} - + - +
    ); } diff --git a/frontend/src/components/GeneralComponents/styles.ts b/frontend/src/components/GeneralComponents/styles.ts index 6c570862f..d548e5c39 100644 --- a/frontend/src/components/GeneralComponents/styles.ts +++ b/frontend/src/components/GeneralComponents/styles.ts @@ -2,6 +2,8 @@ import styled from "styled-components"; import { MenuItem } from "react-bootstrap-typeahead"; export const StyledMenuItem = styled(MenuItem)` + padding-top: 0; + padding-bottom: 0; color: white; transition: 200ms ease-out; @@ -12,12 +14,10 @@ export const StyledMenuItem = styled(MenuItem)` } `; -export const NameDiv = styled.div` - float: left; -`; +export const NameDiv = styled.div``; export const EmailDiv = styled.div` - float: right; + float: left; `; export const AuthTypeDiv = styled.div` @@ -26,5 +26,10 @@ export const AuthTypeDiv = styled.div` `; export const EmailAndAuthDiv = styled.div` - width: fit-content; + width: max-content; +`; + +export const DropdownEmailDiv = styled.div` + font-size: small; + margin-bottom: 5px; `; diff --git a/frontend/src/views/AdminsPage/styles.ts b/frontend/src/views/AdminsPage/styles.ts index be7039a25..df54262b8 100644 --- a/frontend/src/views/AdminsPage/styles.ts +++ b/frontend/src/views/AdminsPage/styles.ts @@ -1,7 +1,7 @@ import styled from "styled-components"; export const AdminsContainer = styled.div` - width: 50%; - min-width: 600px; + width: fit-content; + max-width: 90%; margin: 10px auto auto; `; From 0b02e4bd70963382bcbfd5eb5eaed803f9b616a2 Mon Sep 17 00:00:00 2001 From: beguille Date: Sun, 8 May 2022 12:05:39 +0200 Subject: [PATCH 109/649] project_student tests passing --- backend/src/app/logic/projects_students.py | 8 +- backend/src/database/crud/projects.py | 23 +- .../src/database/crud/projects_students.py | 12 +- backend/src/database/models.py | 12 +- .../test_projects/test_projects.py | 1 - .../test_students/test_students.py | 361 ++++++++++-------- 6 files changed, 224 insertions(+), 193 deletions(-) diff --git a/backend/src/app/logic/projects_students.py b/backend/src/app/logic/projects_students.py index e05bfe0e0..6048ab5cf 100644 --- a/backend/src/app/logic/projects_students.py +++ b/backend/src/app/logic/projects_students.py @@ -22,7 +22,7 @@ async def add_student_project(db: AsyncSession, project: Project, student_id: in if count > 0: raise FailedToAddProjectRoleException # check that the student has the skill - student = (await db.execute(select(Student).where(Student.student_id == student_id))).scalar_one() + student = (await db.execute(select(Student).where(Student.student_id == student_id))).unique().scalar_one() skill = (await db.execute(select(Skill).where(Skill.skill_id == skill_id))).scalar_one() if skill not in student.skills: raise FailedToAddProjectRoleException @@ -33,7 +33,7 @@ async def add_student_project(db: AsyncSession, project: Project, student_id: in if count_proj_definitive > 0: raise FailedToAddProjectRoleException # check that the project requires the skill - project = (await db.execute(select(Project).where(Project.project_id == project.project_id))).scalar_one() + project = (await db.execute(select(Project).where(Project.project_id == project.project_id))).unique().scalar_one() if skill not in project.skills: raise FailedToAddProjectRoleException @@ -49,7 +49,7 @@ async def change_project_role(db: AsyncSession, project: Project, student_id: in if count > 0: raise FailedToAddProjectRoleException # check that the student has the skill - student = (await db.execute(select(Student).where(Student.student_id == student_id))).scalar_one() + student = (await db.execute(select(Student).where(Student.student_id == student_id))).unique().scalar_one() skill = (await db.execute(select(Skill).where(Skill.skill_id == skill_id))).scalar_one() if skill not in student.skills: raise FailedToAddProjectRoleException @@ -60,7 +60,7 @@ async def change_project_role(db: AsyncSession, project: Project, student_id: in if count_proj_definitive > 0: raise FailedToAddProjectRoleException # check that the project requires the skill - project = (await db.execute(select(Project).where(Project.project_id == project.project_id))).scalar_one() + project = (await db.execute(select(Project).where(Project.project_id == project.project_id))).unique().scalar_one() if skill not in project.skills: raise FailedToAddProjectRoleException diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index 07c4d1559..09776746d 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -15,7 +15,11 @@ def _get_projects_for_edition_query(edition: Edition) -> Select: async def get_projects_for_edition(db: AsyncSession, edition: Edition) -> list[Project]: """Returns a list of all projects from a certain edition from the database""" result = await db.execute(_get_projects_for_edition_query(edition)) - return result.scalars().all() + projects: list[Project] = result.scalars().all() + for project in projects: + await db.refresh(project, attribute_names=["project_roles"]) + + return projects async def get_projects_for_edition_page(db: AsyncSession, edition: Edition, @@ -24,11 +28,12 @@ async def get_projects_for_edition_page(db: AsyncSession, edition: Edition, query = _get_projects_for_edition_query(edition).where( Project.name.contains(search_params.name)) if search_params.coach: - print("called") query = query.where(Project.project_id.in_([user_project.project_id for user_project in user.projects])) - print("after") result = await db.execute(paginate(query, search_params.page)) projects: list[Project] = result.unique().scalars().all() + # projects need refreshing + for project in projects: + await db.refresh(project, attribute_names=["project_roles"]) return projects @@ -79,7 +84,10 @@ async def get_project(db: AsyncSession, project_id: int) -> Project: """Query a specific project from the database through its ID""" query = select(Project).where(Project.project_id == project_id) result = await db.execute(query) - return result.unique().scalars().one() + project = result.unique().scalars().one() + # refresh to see updated relations + await db.refresh(project) + return project async def delete_project(db: AsyncSession, project_id: int): @@ -127,7 +135,7 @@ async def get_conflict_students(db: AsyncSession, edition: Edition) -> list[tupl """ query = select(Student).where(Student.edition == edition) result = await db.execute(query) - students = result.scalars().all() + students = result.unique().scalars().all() conflict_students = [] projs = [] @@ -137,9 +145,10 @@ async def get_conflict_students(db: AsyncSession, edition: Edition) -> list[tupl .where(ProjectRole.student_id == student.student_id)) proj_ids = result_proj_ids.scalars().all() for proj_id in proj_ids: - proj_id = proj_id[0] + print(proj_id) + #proj_id = proj_id[0] result_proj = await db.execute(select(Project).where(Project.project_id == proj_id)) - proj = result_proj.scalars().one() + proj = result_proj.unique().scalars().one() projs.append(proj) conflict_student = (student, projs) conflict_students.append(conflict_student) diff --git a/backend/src/database/crud/projects_students.py b/backend/src/database/crud/projects_students.py index 3e550a898..639f8bad9 100644 --- a/backend/src/database/crud/projects_students.py +++ b/backend/src/database/crud/projects_students.py @@ -18,8 +18,8 @@ async def add_student_project(db: AsyncSession, project: Project, student_id: in # check if all parameters exist in the database (await db.execute(select(Skill).where(Skill.skill_id == skill_id))).scalars().one() - (await db.execute(select(User).where(User.user_id == drafter_id))).one() - (await db.execute(select(Student).where(Student.student_id == student_id))).one() + (await db.execute(select(User).where(User.user_id == drafter_id))).unique().one() + (await db.execute(select(Student).where(Student.student_id == student_id))).unique().one() proj_role = ProjectRole(student_id=student_id, project_id=project.project_id, skill_id=skill_id, drafter_id=drafter_id) @@ -32,11 +32,11 @@ async def change_project_role(db: AsyncSession, project: Project, student_id: in # check if all parameters exist in the database (await db.execute(select(Skill).where(Skill.skill_id == skill_id))).scalars().one() - (await db.execute(select(User).where(User.user_id == drafter_id))).one() - (await db.execute(select(Student).where(Student.student_id == student_id))).one() + (await db.execute(select(User).where(User.user_id == drafter_id))).unique().one() + (await db.execute(select(Student).where(Student.student_id == student_id))).unique().one() - proj_role = db.query(ProjectRole).where( - ProjectRole.student_id == student_id).where(ProjectRole.project == project).one() + proj_role = (await db.execute(select(ProjectRole).where( + ProjectRole.student_id == student_id).where(ProjectRole.project == project))).scalar_one() proj_role.drafter_id = drafter_id proj_role.skill_id = skill_id await db.commit() diff --git a/backend/src/database/models.py b/backend/src/database/models.py index bfdd720eb..42f4caea8 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -220,12 +220,12 @@ class Student(Base): wants_to_be_student_coach = Column(Boolean, nullable=False, default=False) edition_id = Column(Integer, ForeignKey("editions.edition_id")) - emails: list[DecisionEmail] = relationship("DecisionEmail", back_populates="student", cascade="all, delete-orphan") - project_roles: list[ProjectRole] = relationship("ProjectRole", back_populates="student") - skills: list[Skill] = relationship("Skill", secondary="student_skills", back_populates="students") - suggestions: list[Suggestion] = relationship("Suggestion", back_populates="student") - questions: list[Question] = relationship("Question", back_populates="student") - edition: Edition = relationship("Edition", back_populates="students", uselist=False) + emails: list[DecisionEmail] = relationship("DecisionEmail", back_populates="student", cascade="all, delete-orphan", lazy="joined") + project_roles: list[ProjectRole] = relationship("ProjectRole", back_populates="student", lazy="joined") + skills: list[Skill] = relationship("Skill", secondary="student_skills", back_populates="students", lazy="joined") + suggestions: list[Suggestion] = relationship("Suggestion", back_populates="student", lazy="joined") + questions: list[Question] = relationship("Question", back_populates="student", lazy="joined") + edition: Edition = relationship("Edition", back_populates="students", uselist=False, lazy="joined") class Question(Base): diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index 40fad1730..86f84e6f7 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -132,7 +132,6 @@ async def test_create_project(database_with_data: AsyncSession, auth_client: Aut json={"name": "test", "number_of_students": 5, "skills": [1, 1, 1, 1, 1], "partners": ["ugent"], "coaches": [1]}) - print(response.json()) assert response.status_code == status.HTTP_201_CREATED assert response.json()['name'] == 'test' assert response.json()["partners"][0]["name"] == "ugent" diff --git a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py index 3570235fe..02b9802d7 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py @@ -1,5 +1,6 @@ import pytest from fastapi.testclient import TestClient +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status @@ -8,7 +9,7 @@ @pytest.fixture -def database_with_data(database_session: AsyncSession) -> Session: +async def database_with_data(database_session: AsyncSession) -> AsyncSession: """fixture for adding data to the database""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -58,86 +59,90 @@ def database_with_data(database_session: AsyncSession) -> Session: database_session.add(project_role2) database_session.add(project_role3) database_session.add(project_role4) - database_session.commit() + await database_session.commit() return database_session @pytest.fixture -def current_edition(database_with_data: Session) -> Edition: +async def current_edition(database_with_data: AsyncSession) -> Edition: """fixture to get the latest edition""" - return database_with_data.query(Edition).all()[-1] + return (await database_with_data.execute(select(Edition))).scalars().all()[-1] -def test_add_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_add_student_project(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """tests add a student to a project""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - resp = auth_client.post( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 3}) + async with auth_client: + resp = await auth_client.post( + "/editions/ed2022/projects/1/students/3", json={"skill_id": 3}) - assert resp.status_code == status.HTTP_201_CREATED + assert resp.status_code == status.HTTP_201_CREATED - response2 = auth_client.get('/editions/ed2022/projects') - json = response2.json() + response2 = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) + json = response2.json() + assert len(json['projects'][0]['projectRoles']) == 4 + assert json['projects'][0]['projectRoles'][3]['skillId'] == 3 - assert len(json['projects'][0]['projectRoles']) == 4 - assert json['projects'][0]['projectRoles'][3]['skillId'] == 3 - -def test_add_ghost_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_add_ghost_student_project(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests adding a non-existing student to a project""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - student10: list[Student] = database_with_data.query( - Student).where(Student.student_id == 10).all() + student10: list[Student] = (await database_with_data.execute(select(Student).where(Student.student_id == 10)))\ + .scalars().all() assert len(student10) == 0 - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 - resp = auth_client.post( - "/editions/ed2022/projects/1/students/10", json={"skill_id": 3}) - assert resp.status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 + + resp = await auth_client.post( + "/editions/ed2022/projects/1/students/10", json={"skill_id": 3}) + assert resp.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 -def test_add_student_project_non_existing_skill(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_add_student_project_non_existing_skill(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests adding a non-existing student to a project""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - skill10: list[Skill] = database_with_data.query( - Skill).where(Skill.skill_id == 10).all() + skill10: list[Skill] = (await database_with_data.execute(select( + Skill).where(Skill.skill_id == 10))).scalars().all() assert len(skill10) == 0 - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 - resp = auth_client.post( + resp = await auth_client.post( "/editions/ed2022/projects/1/students/3", json={"skill_id": 10}) - assert resp.status_code == status.HTTP_404_NOT_FOUND + assert resp.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 -def test_add_student_to_ghost_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_add_student_to_ghost_project(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests adding a student to a project that doesn't exist""" - auth_client.coach(current_edition) - project10: list[Project] = database_with_data.query( - Project).where(Project.project_id == 10).all() + await auth_client.coach(current_edition) + project10: list[Project] = (await database_with_data.execute(select( + Project).where(Project.project_id == 10))).scalars().all() assert len(project10) == 0 - resp = auth_client.post( - "/editions/ed2022/projects/10/students/1", json={"skill_id": 1}) - assert resp.status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + resp = await auth_client.post( + "/editions/ed2022/projects/10/students/1", json={"skill_id": 1}) + assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_add_incomplete_data_student_project(database_session: AsyncSession, auth_client: AuthClient): +async def test_add_incomplete_data_student_project(database_session: AsyncSession, auth_client: AuthClient): """Tests adding a student with incomplete data""" edition = Edition(year=2022, name="ed2022") @@ -145,139 +150,147 @@ def test_add_incomplete_data_student_project(database_session: AsyncSession, aut project = Project(name="project", edition_id=1, project_id=1, number_of_students=2) database_session.add(project) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) - resp = auth_client.post( - "/editions/ed2022/projects/1/students/1", json={}) + await auth_client.coach(edition) + async with auth_client: + resp = await auth_client.post( + "/editions/ed2022/projects/1/students/1", json={}) - assert resp.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + assert resp.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - response2 = auth_client.get('/editions/ed2022/projects') - json = response2.json() + response2 = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) + json = response2.json() - assert len(json['projects'][0]['projectRoles']) == 0 + assert len(json['projects'][0]['projectRoles']) == 0 -def test_change_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_change_student_project(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests changing a student's project""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - resp1 = auth_client.patch( - "/editions/ed2022/projects/1/students/1", json={"skill_id": 4}) + async with auth_client: + resp1 = await auth_client.patch( + "/editions/ed2022/projects/1/students/1", json={"skill_id": 4}) - assert resp1.status_code == status.HTTP_204_NO_CONTENT + assert resp1.status_code == status.HTTP_204_NO_CONTENT - response2 = auth_client.get('/editions/ed2022/projects') - json = response2.json() + response2 = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) + json = response2.json() - assert len(json['projects'][0]['projectRoles']) == 3 - assert json['projects'][0]['projectRoles'][0]['skillId'] == 4 + assert len(json['projects'][0]['projectRoles']) == 3 + assert json['projects'][0]['projectRoles'][0]['skillId'] == 4 -def test_change_incomplete_data_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_change_incomplete_data_student_project(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests changing a student's project with incomplete data""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - resp1 = auth_client.patch( - "/editions/ed2022/projects/1/students/1", json={}) + async with auth_client: + resp1 = await auth_client.patch( + "/editions/ed2022/projects/1/students/1", json={}) - assert resp1.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + assert resp1.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - response2 = auth_client.get('/editions/ed2022/projects') - json = response2.json() + response2 = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) + json = response2.json() - assert len(json['projects'][0]['projectRoles']) == 3 - assert json['projects'][0]['projectRoles'][0]['skillId'] == 1 + assert len(json['projects'][0]['projectRoles']) == 3 + assert json['projects'][0]['projectRoles'][0]['skillId'] == 1 -def test_change_ghost_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_change_ghost_student_project(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests changing a non-existing student of a project""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - student10: list[Student] = database_with_data.query( - Student).where(Student.student_id == 10).all() + student10: list[Student] = (await database_with_data.execute(select( + Student).where(Student.student_id == 10))).scalars().all() assert len(student10) == 0 - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 - resp = auth_client.patch( - "/editions/ed2022/projects/1/students/10", json={"skill_id": 4}) - assert resp.status_code == status.HTTP_404_NOT_FOUND + resp = await auth_client.patch( + "/editions/ed2022/projects/1/students/10", json={"skill_id": 4}) + assert resp.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 -def test_change_student_project_non_existing_skill(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_change_student_project_non_existing_skill(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests deleting a student from a project that isn't assigned""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - skill10: list[Skill] = database_with_data.query( - Skill).where(Skill.skill_id == 10).all() + skill10: list[Skill] = (await database_with_data.execute(select( + Skill).where(Skill.skill_id == 10))).scalars().all() assert len(skill10) == 0 - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 - resp = auth_client.patch( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 10}) - assert resp.status_code == status.HTTP_404_NOT_FOUND + resp = await auth_client.patch( + "/editions/ed2022/projects/1/students/3", json={"skill_id": 10}) + assert resp.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 -def test_change_student_project_ghost_drafter(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_change_student_project_ghost_drafter(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests changing a drafter of a ProjectRole to a non-existing one""" - auth_client.coach(current_edition) - user10: list[User] = database_with_data.query( - User).where(User.user_id == 10).all() + await auth_client.coach(current_edition) + user10: list[User] = (await database_with_data.execute(select( + User).where(User.user_id == 10))).scalars().all() assert len(user10) == 0 - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + async with auth_client: + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 - resp = auth_client.patch( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 4}) - assert resp.status_code == status.HTTP_404_NOT_FOUND + resp = await auth_client.patch( + "/editions/ed2022/projects/1/students/3", json={"skill_id": 4}) + assert resp.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get('/editions/ed2022/projects/1') - json = response.json() - assert len(json['projectRoles']) == 3 + response = await auth_client.get('/editions/ed2022/projects/1') + json = response.json() + assert len(json['projectRoles']) == 3 -def test_change_student_to_ghost_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_change_student_to_ghost_project(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests changing a student of a project that doesn't exist""" - auth_client.coach(current_edition) - project10: list[Project] = database_with_data.query( - Project).where(Project.project_id == 10).all() + await auth_client.coach(current_edition) + project10: list[Project] = (await database_with_data.execute(select( + Project).where(Project.project_id == 10))).scalars().all() assert len(project10) == 0 - resp = auth_client.patch( - "/editions/ed2022/projects/10/students/1", json={"skill_id": 1}) - assert resp.status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + resp = await auth_client.patch( + "/editions/ed2022/projects/10/students/1", json={"skill_id": 1}) + assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_delete_student_project(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_delete_student_project(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Tests deleting a student from a project""" - auth_client.coach(current_edition) - resp = auth_client.delete("/editions/ed2022/projects/1/students/1") + await auth_client.coach(current_edition) + async with auth_client: + resp = await auth_client.delete("/editions/ed2022/projects/1/students/1") - assert resp.status_code == status.HTTP_204_NO_CONTENT + assert resp.status_code == status.HTTP_204_NO_CONTENT - response2 = auth_client.get('/editions/ed2022/projects') - json = response2.json() + response2 = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) + json = response2.json() - assert len(json['projects'][0]['projectRoles']) == 2 + assert len(json['projects'][0]['projectRoles']) == 2 -def test_delete_student_project_empty(database_session: AsyncSession, auth_client: AuthClient): +async def test_delete_student_project_empty(database_session: AsyncSession, auth_client: AuthClient): """Tests deleting a student from a project that isn't assigned""" edition = Edition(year=2022, name="ed2022") @@ -285,96 +298,106 @@ def test_delete_student_project_empty(database_session: AsyncSession, auth_clien project = Project(name="project", edition_id=1, project_id=1, number_of_students=2) database_session.add(project) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) - resp = auth_client.delete("/editions/ed2022/projects/1/students/1") + await auth_client.coach(edition) + async with auth_client: + resp = await auth_client.delete("/editions/ed2022/projects/1/students/1") - assert resp.status_code == status.HTTP_404_NOT_FOUND + assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_get_conflicts(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_get_conflicts(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Test getting the conflicts""" - auth_client.coach(current_edition) - response = auth_client.get("/editions/ed2022/projects/conflicts") - json = response.json() + await auth_client.coach(current_edition) + async with auth_client: + response = await auth_client.get("/editions/ed2022/projects/conflicts") + json = response.json() assert len(json['conflictStudents']) == 1 assert json['conflictStudents'][0]['student']['studentId'] == 1 assert len(json['conflictStudents'][0]['projects']) == 2 -def test_add_student_project_old_edition(database_with_data: Session, auth_client: AuthClient): +async def test_add_student_project_old_edition(database_with_data: AsyncSession, auth_client: AuthClient): """tests add a student to a project from an old edition""" - auth_client.admin() + await auth_client.admin() database_with_data.add(Edition(year=2023, name="ed2023")) - database_with_data.commit() + await database_with_data.commit() - resp = auth_client.post( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 1, "drafter_id": 1}) + async with auth_client: + resp = await auth_client.post( + "/editions/ed2022/projects/1/students/3", json={"skill_id": 1, "drafter_id": 1}) assert resp.status_code == status.HTTP_405_METHOD_NOT_ALLOWED -def test_add_student_same_project_role(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_add_student_same_project_role(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """Two different students can't have the same project_role""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - resp = auth_client.post( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 2}) + async with auth_client: + resp = await auth_client.post( + "/editions/ed2022/projects/1/students/3", json={"skill_id": 2}) assert resp.status_code == status.HTTP_400_BAD_REQUEST -def test_add_student_project_wrong_project_skill(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_add_student_project_wrong_project_skill(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """A project_role can't be created if the project doesn't require the skill""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - resp = auth_client.post( - "/editions/ed2022/projects/3/students/3", json={"skill_id": 4}) + async with auth_client: + resp = await auth_client.post( + "/editions/ed2022/projects/3/students/3", json={"skill_id": 4}) assert resp.status_code == status.HTTP_400_BAD_REQUEST -def test_add_student_project_wrong_student_skill(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_add_student_project_wrong_student_skill(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """A project_role can't be created if the student doesn't have the skill""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - resp = auth_client.post( - "/editions/ed2022/projects/1/students/2", json={"skill_id": 1}) + async with auth_client: + resp = await auth_client.post( + "/editions/ed2022/projects/1/students/2", json={"skill_id": 1}) assert resp.status_code == status.HTTP_400_BAD_REQUEST -def test_add_student_project_already_confirmed(database_with_data: Session, current_edition: Edition, auth_client: AuthClient): +async def test_add_student_project_already_confirmed(database_with_data: AsyncSession, current_edition: Edition, auth_client: AuthClient): """A project_role can't be cre created if the student involved has already been confirmed elsewhere""" - auth_client.coach(current_edition) + await auth_client.coach(current_edition) - resp = auth_client.post("/editions/ed2022/projects/1/students/4", json={"skill_id": 3}) + async with auth_client: + resp = await auth_client.post("/editions/ed2022/projects/1/students/4", json={"skill_id": 3}) assert resp.status_code == status.HTTP_400_BAD_REQUEST -def test_confirm_project_role(database_with_data: Session, auth_client: AuthClient): +async def test_confirm_project_role(database_with_data: AsyncSession, auth_client: AuthClient): """Confirm a project role for a student without conflicts""" - auth_client.admin() - resp = auth_client.post( - "/editions/ed2022/projects/1/students/3", json={"skill_id": 3}) + await auth_client.admin() + + async with auth_client: + resp = await auth_client.post( + "/editions/ed2022/projects/1/students/3", json={"skill_id": 3}) - assert resp.status_code == status.HTTP_201_CREATED + assert resp.status_code == status.HTTP_201_CREATED - response2 = auth_client.post( - "/editions/ed2022/projects/1/students/3/confirm") + response2 = await auth_client.post( + "/editions/ed2022/projects/1/students/3/confirm") - assert response2.status_code == status.HTTP_204_NO_CONTENT - pr = database_with_data.query(ProjectRole).where(ProjectRole.student_id == 3) \ - .where(ProjectRole.project_id == 1).one() + assert response2.status_code == status.HTTP_204_NO_CONTENT + pr = (await database_with_data.execute(select(ProjectRole).where(ProjectRole.student_id == 3) + .where(ProjectRole.project_id == 1))).scalar_one() assert pr.definitive is True -def test_confirm_project_role_conflict(database_with_data: Session, auth_client: AuthClient): +async def test_confirm_project_role_conflict(database_with_data: AsyncSession, auth_client: AuthClient): """A student who is part of a conflict can't have their project_role confirmed""" - auth_client.admin() - response2 = auth_client.post( - "/editions/ed2022/projects/1/students/1/confirm") + await auth_client.admin() + async with auth_client: + response2 = await auth_client.post( + "/editions/ed2022/projects/1/students/1/confirm") assert response2.status_code == status.HTTP_409_CONFLICT From 9e31a26677561d840c08c4c487325f042617395d Mon Sep 17 00:00:00 2001 From: Francis <44001949+FKD13@users.noreply.github.com> Date: Sun, 8 May 2022 14:12:21 +0200 Subject: [PATCH 110/649] Create codecov.yaml --- codecov.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 codecov.yaml diff --git a/codecov.yaml b/codecov.yaml new file mode 100644 index 000000000..6fd5027ca --- /dev/null +++ b/codecov.yaml @@ -0,0 +1,13 @@ +comment: + layout: "reach, diff, flags, files" + behavior: default + require_changes: false # if true: only post the comment if coverage changes + require_base: no # [yes :: must have a base report to post] + require_head: yes # [yes :: must have a head report to post] + +coverage: + round: down + precision: 5 + +ignore: + - "./tests/*" From 510af7cd1b39dbbfc460630bac769f51069011a1 Mon Sep 17 00:00:00 2001 From: Francis <44001949+FKD13@users.noreply.github.com> Date: Sun, 8 May 2022 14:15:45 +0200 Subject: [PATCH 111/649] Update backend.yml --- .github/workflows/backend.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 4cc9a0cb9..96c073dad 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -50,6 +50,10 @@ jobs: key: venv-${{ runner.os }}-bullseye-3.10.2-v2-${{ hashFiles('**/poetry.lock') }} - run: python -m pytest --cov=src --cov-report=xml + - name: Code Coverage + uses: codecov/codecov-action@v2 + with: + token: ${{ secrets.CODECOV }} Lint: needs: [Test] From 6aad60bf66ea49656374f35d7e583ff79b1db779 Mon Sep 17 00:00:00 2001 From: Francis <44001949+FKD13@users.noreply.github.com> Date: Sun, 8 May 2022 14:20:37 +0200 Subject: [PATCH 112/649] install git when pushing coverage --- .github/workflows/backend.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 96c073dad..c99adbfad 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -50,6 +50,7 @@ jobs: key: venv-${{ runner.os }}-bullseye-3.10.2-v2-${{ hashFiles('**/poetry.lock') }} - run: python -m pytest --cov=src --cov-report=xml + - run: apt update && apt install -y git - name: Code Coverage uses: codecov/codecov-action@v2 with: From 285188db31ff6134bd4846d7540a4c8ff2afc76e Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Sun, 8 May 2022 17:15:59 +0200 Subject: [PATCH 113/649] function to convert project to an editable project --- .../TitleAndEdit/TitleAndEdit.tsx | 11 +++++----- frontend/src/data/interfaces/index.ts | 2 +- frontend/src/utils/logic/project.ts | 22 +++++++++++++++++++ .../ProjectDetailPage/ProjectDetailPage.tsx | 17 ++++++++++---- 4 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 frontend/src/utils/logic/project.ts diff --git a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx index c819c99ac..083059dab 100644 --- a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx +++ b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx @@ -4,7 +4,8 @@ import { Title, TitleContainer, Save, Cancel, Delete, TitleInput, Edit } from ". import { MdOutlineEditNote } from "react-icons/md"; import { HiOutlineTrash } from "react-icons/hi"; import { Role } from "../../../data/enums/role"; -import { Project } from "../../../data/interfaces/projects"; +import { Project, CreateProject as EditProject } from "../../../data/interfaces/projects"; +import projectToEditProject from "../../../utils/logic/project"; export default function TitleAndEdit({ editing, @@ -18,8 +19,8 @@ export default function TitleAndEdit({ }: { editing: boolean; project: Project; - editedProject: Project; - setEditedProject: (project: Project) => void; + editedProject: EditProject; + setEditedProject: (project: EditProject) => void; setEditing: (editing: boolean) => void; editProject: () => void; role: Role; @@ -34,7 +35,7 @@ export default function TitleAndEdit({ value={editedProject.name} onChange={e => { const newProject: Project = { ...project, name: e.target.value }; - setEditedProject(newProject); + setEditedProject(projectToEditProject(newProject)); }} /> )} @@ -55,7 +56,7 @@ export default function TitleAndEdit({ { setEditing(false); - setEditedProject(project); + setEditedProject(projectToEditProject(project)); }} > Cancel diff --git a/frontend/src/data/interfaces/index.ts b/frontend/src/data/interfaces/index.ts index 61fd40869..975235e5e 100644 --- a/frontend/src/data/interfaces/index.ts +++ b/frontend/src/data/interfaces/index.ts @@ -1,3 +1,3 @@ export type { Edition } from "./editions"; export type { User } from "./users"; -export type { Partner, Coach, Project } from "./projects"; +export type { Partner, Coach, Project, CreateProject } from "./projects"; diff --git a/frontend/src/utils/logic/project.ts b/frontend/src/utils/logic/project.ts new file mode 100644 index 000000000..2975e4edd --- /dev/null +++ b/frontend/src/utils/logic/project.ts @@ -0,0 +1,22 @@ +import { Project, CreateProject as EditProject } from "../../data/interfaces"; + +export default function projectToEditProject(project: Project): EditProject { + const coachesIds: number[] = []; + project.coaches.forEach(coach => { + coachesIds.push(coach.userId); + }); + + const partners: string[] = []; + project.partners.forEach(partner => { + partners.push(partner.name); + }); + + const editProject: EditProject = { + name: project.name, + number_of_students: project.numberOfStudents, + skills: [], + partners: partners, + coaches: coachesIds, + }; + return editProject; +} diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 6d14cb7c4..51e596936 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from "react"; import { useNavigate, useParams } from "react-router-dom"; -import { Project } from "../../../data/interfaces"; +import { Project, CreateProject as EditProject } from "../../../data/interfaces"; import { deleteProject, getProject, patchProject } from "../../../utils/api/projects"; import { @@ -28,6 +28,7 @@ import { useAuth } from "../../../contexts"; import ConfirmDelete from "../../../components/ProjectsComponents/ConfirmDelete"; import { RemoveButton } from "../CreateProjectPage/styles"; import { TitleAndEdit } from "../../../components/ProjectDetailComponents"; +import projectToEditProject from "../../../utils/logic/project"; /** * @returns the detailed page of a project. Here you can add or remove students from the project. @@ -38,7 +39,7 @@ export default function ProjectDetailPage() { const editionId = params.editionId!; const [project, setProject] = useState(); - const [editedProject, setEditedProject] = useState(); + const [editedProject, setEditedProject] = useState(); const [gotProject, setGotProject] = useState(false); const navigate = useNavigate(); @@ -68,7 +69,7 @@ export default function ProjectDetailPage() { const response = await getProject(editionId, projectId); if (response) { setProject(response); - setEditedProject(response); + setEditedProject(projectToEditProject(response)); // TODO // Generate student data @@ -91,7 +92,15 @@ export default function ProjectDetailPage() { }, [editionId, gotProject, navigate, projectId]); async function editProject() { - await patchProject(editionId, projectId, editedProject!.name, 10, [], [], []); + await patchProject( + editionId, + projectId, + editedProject!.name, + editedProject!.number_of_students, + [], // TODO Skills + editedProject!.partners, + editedProject!.coaches + ); setGotProject(false); } From 067602faa7373da0c78b041c8ae5bac726ede957 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Sun, 8 May 2022 17:34:57 +0200 Subject: [PATCH 114/649] Delete partner and coach form project --- .../TitleAndEdit/TitleAndEdit.tsx | 11 +++-- .../ProjectDetailPage/ProjectDetailPage.tsx | 41 ++++++++++++++----- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx index 083059dab..c819c99ac 100644 --- a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx +++ b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx @@ -4,8 +4,7 @@ import { Title, TitleContainer, Save, Cancel, Delete, TitleInput, Edit } from ". import { MdOutlineEditNote } from "react-icons/md"; import { HiOutlineTrash } from "react-icons/hi"; import { Role } from "../../../data/enums/role"; -import { Project, CreateProject as EditProject } from "../../../data/interfaces/projects"; -import projectToEditProject from "../../../utils/logic/project"; +import { Project } from "../../../data/interfaces/projects"; export default function TitleAndEdit({ editing, @@ -19,8 +18,8 @@ export default function TitleAndEdit({ }: { editing: boolean; project: Project; - editedProject: EditProject; - setEditedProject: (project: EditProject) => void; + editedProject: Project; + setEditedProject: (project: Project) => void; setEditing: (editing: boolean) => void; editProject: () => void; role: Role; @@ -35,7 +34,7 @@ export default function TitleAndEdit({ value={editedProject.name} onChange={e => { const newProject: Project = { ...project, name: e.target.value }; - setEditedProject(projectToEditProject(newProject)); + setEditedProject(newProject); }} /> )} @@ -56,7 +55,7 @@ export default function TitleAndEdit({ { setEditing(false); - setEditedProject(projectToEditProject(project)); + setEditedProject(project); }} > Cancel diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 51e596936..955984537 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -39,7 +39,7 @@ export default function ProjectDetailPage() { const editionId = params.editionId!; const [project, setProject] = useState(); - const [editedProject, setEditedProject] = useState(); + const [editedProject, setEditedProject] = useState(); const [gotProject, setGotProject] = useState(false); const navigate = useNavigate(); @@ -69,7 +69,7 @@ export default function ProjectDetailPage() { const response = await getProject(editionId, projectId); if (response) { setProject(response); - setEditedProject(projectToEditProject(response)); + setEditedProject(response); // TODO // Generate student data @@ -92,14 +92,15 @@ export default function ProjectDetailPage() { }, [editionId, gotProject, navigate, projectId]); async function editProject() { + const newProject: EditProject = projectToEditProject(editedProject!); await patchProject( editionId, projectId, - editedProject!.name, - editedProject!.number_of_students, + newProject!.name, + newProject!.number_of_students, [], // TODO Skills - editedProject!.partners, - editedProject!.coaches + newProject!.partners, + newProject!.coaches ); setGotProject(false); } @@ -133,11 +134,21 @@ export default function ProjectDetailPage() { > - {project.partners.map((element, _index) => ( + {editedProject.partners.map((element, _index) => ( {element.name} {editing && ( - {}}> + { + const newPartners = [...project.partners]; + newPartners.splice(_index, 1); + const newProject: Project = { + ...project, + partners: newPartners, + }; + setEditedProject(newProject); + }} + > )} @@ -151,11 +162,21 @@ export default function ProjectDetailPage() { - {project.coaches.map((element, _index) => ( + {editedProject.coaches.map((element, _index) => ( {element.name} {editing && ( - {}}> + { + const newCoaches = [...project.coaches]; + newCoaches.splice(_index, 1); + const newProject: Project = { + ...project, + coaches: newCoaches, + }; + setEditedProject(newProject); + }} + > )} From bf16a549c077d5153cdfb2e25527ef47f21e6c72 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Sun, 8 May 2022 22:25:49 +0200 Subject: [PATCH 115/649] part of the students tests works --- backend/src/database/crud/students.py | 2 +- .../test_students/test_students.py | 273 ++++++++++-------- .../test_suggestions/test_suggestions.py | 34 +-- 3 files changed, 168 insertions(+), 141 deletions(-) diff --git a/backend/src/database/crud/students.py b/backend/src/database/crud/students.py index ae2fe55ea..aa560e5d6 100644 --- a/backend/src/database/crud/students.py +++ b/backend/src/database/crud/students.py @@ -14,7 +14,7 @@ async def get_student_by_id(db: AsyncSession, student_id: int) -> Student: """Get a student by id""" query = select(Student).where(Student.student_id == student_id) result = await db.execute(query) - return result.scalar_one() + return result.unique().scalars().one() async def set_definitive_decision_on_student(db: AsyncSession, student: Student, decision: DecisionEnum) -> None: diff --git a/backend/tests/test_routers/test_editions/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_students/test_students.py index 7ec635966..702e2d0ba 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_students/test_students.py @@ -1,7 +1,8 @@ -import datetime import pytest +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status + from settings import DB_PAGE_SIZE from src.database.enums import DecisionEnum, EmailStatusEnum from src.database.models import Student, Edition, Skill, DecisionEmail @@ -10,13 +11,12 @@ @pytest.fixture -def database_with_data(database_session: AsyncSession) -> Session: +async def database_with_data(database_session: AsyncSession) -> AsyncSession: """A fixture to fill the database with fake data that can easly be used when testing""" # Editions edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() # Skill skill1: Skill = Skill(name="skill1", description="something about skill1") @@ -31,7 +31,6 @@ def database_with_data(database_session: AsyncSession) -> Session: database_session.add(skill4) database_session.add(skill5) database_session.add(skill6) - database_session.commit() # Student student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", @@ -43,146 +42,174 @@ def database_with_data(database_session: AsyncSession) -> Session: database_session.add(student01) database_session.add(student30) - database_session.commit() + await database_session.commit() return database_session -def test_set_definitive_decision_no_authorization(database_with_data: Session, auth_client: AuthClient): +@pytest.fixture +async def current_edition(database_with_data: AsyncSession) -> Edition: + """fixture to get the latest edition""" + return (await database_with_data.execute(select(Edition))).scalars().all()[-1] + + +async def test_set_definitive_decision_no_authorization(database_with_data: AsyncSession, auth_client: AuthClient): """tests that you have to be logged in""" - assert auth_client.put( - "/editions/ed2022/students/2/decision").status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + response = await auth_client.put("/editions/ed2022/students/2/decision") + assert response.status_code == status.HTTP_401_UNAUTHORIZED -def test_set_definitive_decision_coach(database_with_data: Session, auth_client: AuthClient): +async def test_set_definitive_decision_coach(database_with_data: AsyncSession, + auth_client: AuthClient, current_edition: Edition): """tests that a coach can't set a definitive decision""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.put( - "/editions/ed2022/students/2/decision").status_code == status.HTTP_403_FORBIDDEN + await auth_client.coach(current_edition) + async with auth_client: + response = await auth_client.put("/editions/ed2022/students/2/decision") + assert response.status_code == status.HTTP_403_FORBIDDEN -def test_set_definitive_decision_on_ghost(database_with_data: Session, auth_client: AuthClient): +async def test_set_definitive_decision_on_ghost(database_with_data: AsyncSession, auth_client: AuthClient): """tests that you get a 404 if a student don't exicist""" - auth_client.admin() - assert auth_client.put( - "/editions/ed2022/students/100/decision").status_code == status.HTTP_404_NOT_FOUND + await auth_client.admin() + async with auth_client: + response = await auth_client.put("/editions/ed2022/students/100/decision") + assert response.status_code == status.HTTP_404_NOT_FOUND -def test_set_definitive_decision_wrong_body(database_with_data: Session, auth_client: AuthClient): +async def test_set_definitive_decision_wrong_body(database_with_data: AsyncSession, auth_client: AuthClient): """tests you got a 422 if you give a wrong body""" - auth_client.admin() - assert auth_client.put( - "/editions/ed2022/students/1/decision").status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + await auth_client.admin() + async with auth_client: + response = await auth_client.put("/editions/ed2022/students/1/decision") + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_set_definitive_decision_yes(database_with_data: Session, auth_client: AuthClient): +async def test_set_definitive_decision_yes(database_with_data: AsyncSession, auth_client: AuthClient): """tests that an admin can set a yes""" - auth_client.admin() - assert auth_client.put("/editions/ed2022/students/1/decision", - json={"decision": 1}).status_code == status.HTTP_204_NO_CONTENT - student: Student = database_with_data.query( - Student).where(Student.student_id == 1).one() - assert student.decision == DecisionEnum.YES + await auth_client.admin() + async with auth_client: + response = await auth_client.put("/editions/ed2022/students/1/decision", json={"decision": 1}) + assert response.status_code == status.HTTP_204_NO_CONTENT + query = select(Student).where(Student.student_id == 1) + result = await database_with_data.execute(query) + student: Student = result.unique().scalars().one() + assert student.decision == DecisionEnum.YES -def test_set_definitive_decision_no(database_with_data: Session, auth_client: AuthClient): +async def test_set_definitive_decision_no(database_with_data: AsyncSession, auth_client: AuthClient): """tests that an admin can set a no""" - auth_client.admin() - assert auth_client.put("/editions/ed2022/students/1/decision", - json={"decision": 3}).status_code == status.HTTP_204_NO_CONTENT - student: Student = database_with_data.query( - Student).where(Student.student_id == 1).one() - assert student.decision == DecisionEnum.NO + await auth_client.admin() + async with auth_client: + response = await auth_client.put("/editions/ed2022/students/1/decision", json={"decision": 3}) + assert response.status_code == status.HTTP_204_NO_CONTENT + query = select(Student).where(Student.student_id == 1) + result = await database_with_data.execute(query) + student: Student = result.unique().scalars().one() + assert student.decision == DecisionEnum.NO -def test_set_definitive_decision_maybe(database_with_data: Session, auth_client: AuthClient): +async def test_set_definitive_decision_maybe(database_with_data: AsyncSession, auth_client: AuthClient): """tests that an admin can set a maybe""" - auth_client.admin() - assert auth_client.put("/editions/ed2022/students/1/decision", - json={"decision": 2}).status_code == status.HTTP_204_NO_CONTENT - student: Student = database_with_data.query( - Student).where(Student.student_id == 1).one() - assert student.decision == DecisionEnum.MAYBE + await auth_client.admin() + async with auth_client: + response = await auth_client.put("/editions/ed2022/students/1/decision", json={"decision": 2}) + assert response.status_code == status.HTTP_204_NO_CONTENT + query = select(Student).where(Student.student_id == 1) + result = await database_with_data.execute(query) + student: Student = result.unique().scalars().one() + assert student.decision == DecisionEnum.MAYBE -def test_delete_student_no_authorization(database_with_data: Session, auth_client: AuthClient): +async def test_delete_student_no_authorization(database_with_data: AsyncSession, auth_client: AuthClient): """tests that you have to be logged in""" - assert auth_client.delete( - "/editions/ed2022/students/2").status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + response = await auth_client.delete("/editions/ed2022/students/2") + assert response.status_code == status.HTTP_401_UNAUTHORIZED -def test_delete_student_coach(database_with_data: Session, auth_client: AuthClient): +async def test_delete_student_coach(database_with_data: AsyncSession, auth_client: AuthClient, + current_edition: Edition): """tests that a coach can't delete a student""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.delete( - "/editions/ed2022/students/2").status_code == status.HTTP_403_FORBIDDEN - students: Student = database_with_data.query( - Student).where(Student.student_id == 1).all() - assert len(students) == 1 + await auth_client.coach(current_edition) + async with auth_client: + response = await auth_client.delete("/editions/ed2022/students/2") + assert response.status_code == status.HTTP_403_FORBIDDEN + query = select(Student).where(Student.student_id == 1) + result = await database_with_data.execute(query) + students: list[Student] = result.unique().scalars().all() + assert len(students) == 1 -def test_delete_ghost(database_with_data: Session, auth_client: AuthClient): +async def test_delete_ghost(database_with_data: AsyncSession, auth_client: AuthClient): """tests that you can't delete a student that don't excist""" - auth_client.admin() - assert auth_client.delete( - "/editions/ed2022/students/100").status_code == status.HTTP_404_NOT_FOUND - students: Student = database_with_data.query( - Student).where(Student.student_id == 1).all() - assert len(students) == 1 + await auth_client.admin() + async with auth_client: + response = await auth_client.delete("/editions/ed2022/students/100") + assert response.status_code == status.HTTP_404_NOT_FOUND + query = select(Student).where(Student.student_id == 1) + result = await database_with_data.execute(query) + students: list[Student] = result.unique().scalars().all() + assert len(students) == 1 -def test_delete(database_with_data: Session, auth_client: AuthClient): +async def test_delete(database_with_data: AsyncSession, auth_client: AuthClient): """tests an admin can delete a student""" - auth_client.admin() - assert auth_client.delete( - "/editions/ed2022/students/1").status_code == status.HTTP_204_NO_CONTENT - students: Student = database_with_data.query( - Student).where(Student.student_id == 1).all() - assert len(students) == 0 + await auth_client.admin() + async with auth_client: + response = await auth_client.delete("/editions/ed2022/students/1") + assert response.status_code == status.HTTP_204_NO_CONTENT + query = select(Student).where(Student.student_id == 1) + result = await database_with_data.execute(query) + students: list[Student] = result.unique().scalars().all() + assert len(students) == 0 -def test_get_student_by_id_no_autorization(database_with_data: Session, auth_client: AuthClient): +async def test_get_student_by_id_no_autorization(database_with_data: AsyncSession, auth_client: AuthClient): """tests you have to be logged in to get a student by id""" - assert auth_client.get( - "/editions/ed2022/students/1").status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/1") + assert response.status_code == status.HTTP_401_UNAUTHORIZED -def test_get_student_by_id(database_with_data: Session, auth_client: AuthClient): +async def test_get_student_by_id(database_with_data: AsyncSession, auth_client: AuthClient, + current_edition: Edition): """tests you can get a student by id""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.get( - "/editions/ed2022/students/1").status_code == status.HTTP_200_OK + await auth_client.coach(current_edition) + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/1") + assert response.status_code == status.HTTP_200_OK -def test_get_student_by_id_wrong_edition(database_with_data: Session, auth_client: AuthClient): +async def test_get_student_by_id_wrong_edition(database_with_data: AsyncSession, auth_client: AuthClient, + current_edition: Edition): """tests you can get a student by id""" edition: Edition = Edition(year=2023, name="ed2023") database_with_data.add(edition) - database_with_data.commit() - auth_client.coach(edition) - assert auth_client.get( - "/editions/ed2023/students/1").status_code == status.HTTP_404_NOT_FOUND + await database_with_data.commit() + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get("/editions/ed2023/students/1") + assert response.status_code == status.HTTP_404_NOT_FOUND -def test_get_students_no_autorization(database_with_data: Session, auth_client: AuthClient): +async def test_get_students_no_autorization(database_with_data: AsyncSession, auth_client: AuthClient): """tests you have to be logged in to get all students""" assert auth_client.get( "/editions/ed2022/students/").status_code == status.HTTP_401_UNAUTHORIZED -def test_get_all_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_all_students(database_with_data: AsyncSession, auth_client: AuthClient, + current_edition: Edition): """tests get all students""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get("/editions/ed2022/students/") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()["students"]) == 2 + await auth_client.coach(current_edition) + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()["students"]) == 2 -def test_get_all_students_pagination(database_with_data: Session, auth_client: AuthClient): +async def test_get_all_students_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get all students with pagination""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -201,7 +228,7 @@ def test_get_all_students_pagination(database_with_data: Session, auth_client: A round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 2, 0) # +2 because there were already 2 students in the database -def test_get_first_name_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_first_name_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer first name""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -210,7 +237,7 @@ def test_get_first_name_students(database_with_data: Session, auth_client: AuthC assert len(response.json()["students"]) == 1 -def test_get_first_name_student_pagination(database_with_data: Session, auth_client: AuthClient): +async def test_get_first_name_student_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer first name with pagination""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -231,7 +258,7 @@ def test_get_first_name_student_pagination(database_with_data: Session, auth_cli round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) -def test_get_last_name_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_last_name_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer last name""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -241,7 +268,7 @@ def test_get_last_name_students(database_with_data: Session, auth_client: AuthCl assert len(response.json()["students"]) == 1 -def test_get_last_name_students_pagination(database_with_data: Session, auth_client: AuthClient): +async def test_get_last_name_students_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer last name with pagination""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -262,7 +289,7 @@ def test_get_last_name_students_pagination(database_with_data: Session, auth_cli round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) -def test_get_between_first_and_last_name_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_between_first_and_last_name_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer first- and last name""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -272,7 +299,7 @@ def test_get_between_first_and_last_name_students(database_with_data: Session, a assert len(response.json()["students"]) == 1 -def test_get_alumni_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_alumni_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer alumni""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -281,7 +308,7 @@ def test_get_alumni_students(database_with_data: Session, auth_client: AuthClien assert len(response.json()["students"]) == 1 -def test_get_alumni_students_pagination(database_with_data: Session, auth_client: AuthClient): +async def test_get_alumni_students_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer alumni with pagination""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -302,7 +329,7 @@ def test_get_alumni_students_pagination(database_with_data: Session, auth_client round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1, 0) # +1 because there is already is one -def test_get_student_coach_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_student_coach_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer student coach""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -311,7 +338,7 @@ def test_get_student_coach_students(database_with_data: Session, auth_client: Au assert len(response.json()["students"]) == 1 -def test_get_student_coach_students_pagination(database_with_data: Session, auth_client: AuthClient): +async def test_get_student_coach_students_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer student coach with pagination""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -332,7 +359,7 @@ def test_get_student_coach_students_pagination(database_with_data: Session, auth round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1, 0) # +1 because there is already is one -def test_get_one_skill_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_one_skill_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer one skill""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -342,7 +369,7 @@ def test_get_one_skill_students(database_with_data: Session, auth_client: AuthCl assert response.json()["students"][0]["firstName"] == "Jos" -def test_get_multiple_skill_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_multiple_skill_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer multiple skills""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -353,7 +380,7 @@ def test_get_multiple_skill_students(database_with_data: Session, auth_client: A assert response.json()["students"][0]["firstName"] == "Marta" -def test_get_multiple_skill_students_no_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_multiple_skill_students_no_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer multiple skills, but that student don't excist""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -363,7 +390,7 @@ def test_get_multiple_skill_students_no_students(database_with_data: Session, au assert len(response.json()["students"]) == 0 -def test_get_ghost_skill_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_ghost_skill_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer one skill that don't excist""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -372,7 +399,7 @@ def test_get_ghost_skill_students(database_with_data: Session, auth_client: Auth assert len(response.json()["students"]) == 0 -def test_get_one_real_one_ghost_skill_students(database_with_data: Session, auth_client: AuthClient): +async def test_get_one_real_one_ghost_skill_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer one skill that excist and one that don't excist""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -382,13 +409,13 @@ def test_get_one_real_one_ghost_skill_students(database_with_data: Session, auth assert len(response.json()["students"]) == 0 -def test_get_emails_student_no_authorization(database_with_data: Session, auth_client: AuthClient): +async def test_get_emails_student_no_authorization(database_with_data: AsyncSession, auth_client: AuthClient): """tests that you can't get the mails of a student when you aren't logged in""" response = auth_client.get("/editions/ed2022/students/1/emails") assert response.status_code == status.HTTP_401_UNAUTHORIZED -def test_get_emails_student_coach(database_with_data: Session, auth_client: AuthClient): +async def test_get_emails_student_coach(database_with_data: AsyncSession, auth_client: AuthClient): """tests that a coach can't get the mails of a student""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -396,7 +423,7 @@ def test_get_emails_student_coach(database_with_data: Session, auth_client: Auth assert response.status_code == status.HTTP_403_FORBIDDEN -def test_get_emails_student_admin(database_with_data: Session, auth_client: AuthClient): +async def test_get_emails_student_admin(database_with_data: AsyncSession, auth_client: AuthClient): """tests that an admin can get the mails of a student""" auth_client.admin() auth_client.post("/editions/ed2022/students/emails", @@ -411,13 +438,13 @@ def test_get_emails_student_admin(database_with_data: Session, auth_client: Auth assert response.json()["student"]["studentId"] == 2 -def test_post_email_no_authorization(database_with_data: Session, auth_client: AuthClient): +async def test_post_email_no_authorization(database_with_data: AsyncSession, auth_client: AuthClient): """tests user need to be loged in""" response = auth_client.post("/editions/ed2022/students/emails") assert response.status_code == status.HTTP_401_UNAUTHORIZED -def test_post_email_coach(database_with_data: Session, auth_client: AuthClient): +async def test_post_email_coach(database_with_data: AsyncSession, auth_client: AuthClient): """tests user can't be a coach""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -425,7 +452,7 @@ def test_post_email_coach(database_with_data: Session, auth_client: AuthClient): assert response.status_code == status.HTTP_403_FORBIDDEN -def test_post_email_applied(database_with_data: Session, auth_client: AuthClient): +async def test_post_email_applied(database_with_data: AsyncSession, auth_client: AuthClient): """test create email applied""" auth_client.admin() response = auth_client.post("/editions/ed2022/students/emails", @@ -435,7 +462,7 @@ def test_post_email_applied(database_with_data: Session, auth_client: AuthClient response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.APPLIED -def test_post_email_awaiting_project(database_with_data: Session, auth_client: AuthClient): +async def test_post_email_awaiting_project(database_with_data: AsyncSession, auth_client: AuthClient): """test create email awaiting project""" auth_client.admin() response = auth_client.post("/editions/ed2022/students/emails", @@ -445,7 +472,7 @@ def test_post_email_awaiting_project(database_with_data: Session, auth_client: A response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.AWAITING_PROJECT -def test_post_email_approved(database_with_data: Session, auth_client: AuthClient): +async def test_post_email_approved(database_with_data: AsyncSession, auth_client: AuthClient): """test create email applied""" auth_client.admin() response = auth_client.post("/editions/ed2022/students/emails", @@ -455,7 +482,7 @@ def test_post_email_approved(database_with_data: Session, auth_client: AuthClien response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.APPROVED -def test_post_email_contract_confirmed(database_with_data: Session, auth_client: AuthClient): +async def test_post_email_contract_confirmed(database_with_data: AsyncSession, auth_client: AuthClient): """test create email contract confirmed""" auth_client.admin() response = auth_client.post("/editions/ed2022/students/emails", @@ -465,7 +492,7 @@ def test_post_email_contract_confirmed(database_with_data: Session, auth_client: response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.CONTRACT_CONFIRMED -def test_post_email_contract_declined(database_with_data: Session, auth_client: AuthClient): +async def test_post_email_contract_declined(database_with_data: AsyncSession, auth_client: AuthClient): """test create email contract declined""" auth_client.admin() response = auth_client.post("/editions/ed2022/students/emails", @@ -475,7 +502,7 @@ def test_post_email_contract_declined(database_with_data: Session, auth_client: response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.CONTRACT_DECLINED -def test_post_email_rejected(database_with_data: Session, auth_client: AuthClient): +async def test_post_email_rejected(database_with_data: AsyncSession, auth_client: AuthClient): """test create email rejected""" auth_client.admin() response = auth_client.post("/editions/ed2022/students/emails", @@ -486,7 +513,7 @@ def test_post_email_rejected(database_with_data: Session, auth_client: AuthClien response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.REJECTED -def test_creat_email_for_ghost(database_with_data: Session, auth_client: AuthClient): +async def test_creat_email_for_ghost(database_with_data: AsyncSession, auth_client: AuthClient): """test create email for student that don't exist""" auth_client.admin() response = auth_client.post("/editions/ed2022/students/emails", @@ -494,7 +521,7 @@ def test_creat_email_for_ghost(database_with_data: Session, auth_client: AuthCli assert response.status_code == status.HTTP_404_NOT_FOUND -def test_creat_email_student_in_other_edition(database_with_data: Session, auth_client: AuthClient): +async def test_creat_email_student_in_other_edition(database_with_data: AsyncSession, auth_client: AuthClient): """test creat an email for a student not in this edition""" edition: Edition = Edition(year=2023, name="ed2023") database_with_data.add(edition) @@ -511,13 +538,13 @@ def test_creat_email_student_in_other_edition(database_with_data: Session, auth_ assert len(response.json()["studentEmails"]) == 0 -def test_get_emails_no_authorization(database_with_data: Session, auth_client: AuthClient): +async def test_get_emails_no_authorization(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails not loged in""" response = auth_client.get("/editions/ed2022/students/emails") assert response.status_code == status.HTTP_401_UNAUTHORIZED -def test_get_emails_coach(database_with_data: Session, auth_client: AuthClient): +async def test_get_emails_coach(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails logged in as coach""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -525,7 +552,7 @@ def test_get_emails_coach(database_with_data: Session, auth_client: AuthClient): assert response.status_code == status.HTTP_403_FORBIDDEN -def test_get_emails(database_with_data: Session, auth_client: AuthClient): +async def test_get_emails(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails""" auth_client.admin() response = auth_client.post("/editions/ed2022/students/emails", @@ -541,7 +568,7 @@ def test_get_emails(database_with_data: Session, auth_client: AuthClient): assert response.json()["studentEmails"][1]["emails"][0]["decision"] == 5 -def test_emails_filter_first_name(database_with_data: Session, auth_client: AuthClient): +async def test_emails_filter_first_name(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails with filter first name""" auth_client.admin() auth_client.post("/editions/ed2022/students/emails", @@ -554,7 +581,7 @@ def test_emails_filter_first_name(database_with_data: Session, auth_client: Auth assert response.json()["studentEmails"][0]["student"]["firstName"] == "Jos" -def test_emails_filter_last_name(database_with_data: Session, auth_client: AuthClient): +async def test_emails_filter_last_name(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails with filter last name""" auth_client.admin() auth_client.post("/editions/ed2022/students/emails", @@ -568,7 +595,7 @@ def test_emails_filter_last_name(database_with_data: Session, auth_client: AuthC "studentEmails"][0]["student"]["lastName"] == "Vermeulen" -def test_emails_filter_between_first_and_last_name(database_with_data: Session, auth_client: AuthClient): +async def test_emails_filter_between_first_and_last_name(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails with filter last name""" auth_client.admin() auth_client.post("/editions/ed2022/students/emails", @@ -584,7 +611,7 @@ def test_emails_filter_between_first_and_last_name(database_with_data: Session, "studentEmails"][0]["student"]["lastName"] == "Vermeulen" -def test_emails_filter_emailstatus(database_with_data: Session, auth_client: AuthClient): +async def test_emails_filter_emailstatus(database_with_data: AsyncSession, auth_client: AuthClient): """test to get all email status, and you only filter on the email send""" auth_client.admin() for i in range(0, 6): @@ -600,7 +627,7 @@ def test_emails_filter_emailstatus(database_with_data: Session, auth_client: Aut assert len(response.json()["studentEmails"]) == 0 -def test_emails_filter_emailstatus_multiple_status(database_with_data: Session, auth_client: AuthClient): +async def test_emails_filter_emailstatus_multiple_status(database_with_data: AsyncSession, auth_client: AuthClient): """test to get all email status with multiple status""" auth_client.admin() auth_client.post("/editions/ed2022/students/emails", diff --git a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py index 600d50f5e..fff3d8b49 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py +++ b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py @@ -8,7 +8,7 @@ @pytest.fixture -def database_with_data(database_session: AsyncSession) -> Session: +def database_with_data(database_session: AsyncSession) -> AsyncSession: """A fixture to fill the database with fake data that can easly be used when testing""" # Editions @@ -56,7 +56,7 @@ def database_with_data(database_session: AsyncSession) -> Session: return database_session -def test_new_suggestion(database_with_data: Session, auth_client: AuthClient): +def test_new_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests creating a new suggestion""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -72,7 +72,7 @@ def test_new_suggestion(database_with_data: Session, auth_client: AuthClient): "suggestion"]["argumentation"] == suggestions[0].argumentation -def test_overwrite_suggestion(database_with_data: Session, auth_client: AuthClient): +def test_overwrite_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that when you've already made a suggestion earlier, the existing one is replaced""" # Create initial suggestion edition: Edition = database_with_data.query(Edition).all()[0] @@ -95,7 +95,7 @@ def test_overwrite_suggestion(database_with_data: Session, auth_client: AuthClie assert suggestions[0].argumentation == arg -def test_new_suggestion_not_authorized(database_with_data: Session, auth_client: AuthClient): +def test_new_suggestion_not_authorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests when not authorized you can't add a new suggestion""" assert auth_client.post("/editions/ed2022/students/2/suggestions/", json={ @@ -105,14 +105,14 @@ def test_new_suggestion_not_authorized(database_with_data: Session, auth_client: assert len(suggestions) == 0 -def test_get_suggestions_of_student_not_authorized(database_with_data: Session, auth_client: AuthClient): +def test_get_suggestions_of_student_not_authorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests if you don't have the right access, you get the right HTTP code""" assert auth_client.get("/editions/ed2022/students/29/suggestions/", headers={"Authorization": "auth"}, json={ "suggestion": 1, "argumentation": "Ja"}).status_code == status.HTTP_401_UNAUTHORIZED -def test_get_suggestions_of_ghost(database_with_data: Session, auth_client: AuthClient): +def test_get_suggestions_of_ghost(database_with_data: AsyncSession, auth_client: AuthClient): """Tests if the student don't exist, you get a 404""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -121,7 +121,7 @@ def test_get_suggestions_of_ghost(database_with_data: Session, auth_client: Auth assert res.status_code == status.HTTP_404_NOT_FOUND -def test_get_suggestions_of_student(database_with_data: Session, auth_client: AuthClient): +def test_get_suggestions_of_student(database_with_data: AsyncSession, auth_client: AuthClient): """Tests to get the suggestions of a student""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -141,7 +141,7 @@ def test_get_suggestions_of_student(database_with_data: Session, auth_client: Au assert res_json["suggestions"][1]["argumentation"] == "Neen" -def test_delete_ghost_suggestion(database_with_data: Session, auth_client: AuthClient): +def test_delete_ghost_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that you get the correct status code when you delete a not existing suggestion""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -149,13 +149,13 @@ def test_delete_ghost_suggestion(database_with_data: Session, auth_client: AuthC "/editions/ed2022/students/1/suggestions/8000").status_code == status.HTTP_404_NOT_FOUND -def test_delete_not_autorized(database_with_data: Session, auth_client: AuthClient): +def test_delete_not_autorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that you have to be loged in for deleating a suggestion""" assert auth_client.delete( "/editions/ed2022/students/1/suggestions/8000").status_code == status.HTTP_401_UNAUTHORIZED -def test_delete_suggestion_admin(database_with_data: Session, auth_client: AuthClient): +def test_delete_suggestion_admin(database_with_data: AsyncSession, auth_client: AuthClient): """Test that an admin can update suggestions""" auth_client.admin() assert auth_client.delete( @@ -165,7 +165,7 @@ def test_delete_suggestion_admin(database_with_data: Session, auth_client: AuthC assert len(suggestions) == 0 -def test_delete_suggestion_coach_their_review(database_with_data: Session, auth_client: AuthClient): +def test_delete_suggestion_coach_their_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can delete their own suggestion""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -180,7 +180,7 @@ def test_delete_suggestion_coach_their_review(database_with_data: Session, auth_ assert len(suggestions) == 0 -def test_delete_suggestion_coach_other_review(database_with_data: Session, auth_client: AuthClient): +def test_delete_suggestion_coach_other_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can't delete other coaches their suggestions""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -191,20 +191,20 @@ def test_delete_suggestion_coach_other_review(database_with_data: Session, auth_ assert len(suggestions) == 1 -def test_update_ghost_suggestion(database_with_data: Session, auth_client: AuthClient): +def test_update_ghost_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests a suggestion that don't exist """ auth_client.admin() assert auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ "suggestion": 1, "argumentation": "test"}).status_code == status.HTTP_404_NOT_FOUND -def test_update_not_autorized(database_with_data: Session, auth_client: AuthClient): +def test_update_not_autorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests update when not autorized""" assert auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ "suggestion": 1, "argumentation": "test"}).status_code == status.HTTP_401_UNAUTHORIZED -def test_update_suggestion_admin(database_with_data: Session, auth_client: AuthClient): +def test_update_suggestion_admin(database_with_data: AsyncSession, auth_client: AuthClient): """Test that an admin can update suggestions""" auth_client.admin() assert auth_client.put("/editions/ed2022/students/1/suggestions/1", json={ @@ -215,7 +215,7 @@ def test_update_suggestion_admin(database_with_data: Session, auth_client: AuthC assert suggestion.argumentation == "test" -def test_update_suggestion_coach_their_review(database_with_data: Session, auth_client: AuthClient): +def test_update_suggestion_coach_their_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can update their own suggestion""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) @@ -231,7 +231,7 @@ def test_update_suggestion_coach_their_review(database_with_data: Session, auth_ assert suggestion.argumentation == "test" -def test_update_suggestion_coach_other_review(database_with_data: Session, auth_client: AuthClient): +def test_update_suggestion_coach_other_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can't update other coaches their suggestions""" edition: Edition = database_with_data.query(Edition).all()[0] auth_client.coach(edition) From d9e053bb1084bb833e42701940ac93fba41dd914 Mon Sep 17 00:00:00 2001 From: cledloof Date: Mon, 9 May 2022 06:26:55 +0200 Subject: [PATCH 116/649] hopefully last push --- frontend/src/data/interfaces/students.ts | 25 +++++++ frontend/src/utils/api/students.ts | 86 ++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 frontend/src/data/interfaces/students.ts create mode 100644 frontend/src/utils/api/students.ts diff --git a/frontend/src/data/interfaces/students.ts b/frontend/src/data/interfaces/students.ts new file mode 100644 index 000000000..b6d08eaaa --- /dev/null +++ b/frontend/src/data/interfaces/students.ts @@ -0,0 +1,25 @@ +export interface Student { + alumni: boolean; + editionId: number; + emailAddress: string; + finalDecision: number; + firstName: string; + lastName: string; + nrOfSuggestions: NrSuggestions; + phoneNumber: string; + preferredName: string; + skills: string[]; + studentId: number; + wantsToBeStudentCoach: boolean; +} + +export interface Students { + /** A list of projects */ + students: Student[]; +} + +export interface NrSuggestions { + yes: number; + maybe: number; + no: number; +} diff --git a/frontend/src/utils/api/students.ts b/frontend/src/utils/api/students.ts new file mode 100644 index 000000000..fcdcad57c --- /dev/null +++ b/frontend/src/utils/api/students.ts @@ -0,0 +1,86 @@ +import axios from "axios"; +import { Student, Students } from "../../data/interfaces/students"; +import { axiosInstance } from "./api"; + +export async function getStudents( + edition: string, + nameFilter: string, + rolesFilter: number[], + alumniFilter: boolean, + studentCoachVolunteerFilter: boolean +): Promise { + try { + const response = await axiosInstance.get( + "/editions/" + + edition + + "/students/?first_name=" + + nameFilter + + "&alumni=" + + alumniFilter + + "&student_coach=" + + studentCoachVolunteerFilter + ); + const students = response.data as Students; + return students; + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} + +export async function getStudent(edition: string, studentId: string): Promise { + try { + const request = "/editions/" + edition + "/students/" + studentId.toString(); + const response = await axiosInstance.get(request); + const student = response.data.student as Student; + console.log("get student"); + console.log(student); + return student; + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} + +export async function removeStudent(edition: string, studentId: string): Promise { + try { + const request = "/editions/" + edition + "/students/" + studentId.toString(); + await axiosInstance.delete(request); + return 201; + } catch (error) { + if (axios.isAxiosError(error)) { + return 422; + } else { + throw error; + } + } +} + +export async function makeSuggestion( + edition: string, + studentId: string, + suggestionArg: number, + argumentationArg: string +): Promise { + try { + const request = + "/editions/" + edition + "/students/" + studentId.toString() + "/suggestions"; + await axiosInstance.post(request, { + suggestion: suggestionArg, + argumentation: argumentationArg, + }); + return 201; + } catch (error) { + if (axios.isAxiosError(error)) { + return 422; + } else { + throw error; + } + } +} From 705688395a6697aeaa40f27b0e2fc2fdc1d72636 Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 07:58:58 +0200 Subject: [PATCH 117/649] students tests passing --- backend/src/app/logic/students.py | 9 +- backend/src/database/crud/students.py | 6 +- backend/src/database/models.py | 2 +- .../test_students/test_students.py | 423 ++++++++++-------- 4 files changed, 238 insertions(+), 202 deletions(-) diff --git a/backend/src/app/logic/students.py b/backend/src/app/logic/students.py index 369bcc0e3..60fa945bf 100644 --- a/backend/src/app/logic/students.py +++ b/backend/src/app/logic/students.py @@ -30,8 +30,7 @@ async def remove_student(db: AsyncSession, student: Student) -> None: async def get_students_search(db: AsyncSession, edition: Edition, commons: CommonQueryParams) -> ReturnStudentList: """return all students""" if commons.skill_ids: - # TODO: make skills async - skills: list[Skill] = get_skills_by_ids(db, commons.skill_ids) + skills: list[Skill] = await get_skills_by_ids(db, commons.skill_ids) if len(skills) != len(commons.skill_ids): return ReturnStudentList(students=[]) else: @@ -52,11 +51,11 @@ async def get_students_search(db: AsyncSession, edition: Edition, commons: Commo wants_to_be_student_coach=student.wants_to_be_student_coach, edition_id=student.edition_id, skills=student.skills)) - nr_of_yes_suggestions = len(get_suggestions_of_student_by_type( + nr_of_yes_suggestions = len(await get_suggestions_of_student_by_type( db, student.student_id, DecisionEnum.YES)) - nr_of_no_suggestions = len(get_suggestions_of_student_by_type( + nr_of_no_suggestions = len(await get_suggestions_of_student_by_type( db, student.student_id, DecisionEnum.NO)) - nr_of_maybe_suggestions = len(get_suggestions_of_student_by_type( + nr_of_maybe_suggestions = len(await get_suggestions_of_student_by_type( db, student.student_id, DecisionEnum.MAYBE)) students[-1].nr_of_suggestions = SuggestionsModel( yes=nr_of_yes_suggestions, no=nr_of_no_suggestions, maybe=nr_of_maybe_suggestions) diff --git a/backend/src/database/crud/students.py b/backend/src/database/crud/students.py index aa560e5d6..48744c66f 100644 --- a/backend/src/database/crud/students.py +++ b/backend/src/database/crud/students.py @@ -49,14 +49,14 @@ async def get_students(db: AsyncSession, edition: Edition, for skill in skills: query = query.where(Student.skills.contains(skill)) - return (await db.execute(paginate(query, commons.page))).scalars().all() + return (await db.execute(paginate(query, commons.page))).unique().scalars().all() async def get_emails(db: AsyncSession, student: Student) -> list[DecisionEmail]: """Get all emails send to a student""" query = select(DecisionEmail).where(DecisionEmail.student_id == student.student_id) result = await db.execute(query) - return result.scalars().all() + return result.unique().scalars().all() async def create_email(db: AsyncSession, student: Student, email_status: EmailStatusEnum) -> DecisionEmail: @@ -85,4 +85,4 @@ async def get_last_emails_of_students(db: AsyncSession, edition: Edition, common emails = emails.where(DecisionEmail.decision.in_(commons.email_status)) emails = emails.order_by(DecisionEmail.student_id) - return (await db.execute(paginate(emails, commons.page))).scalars().all() + return (await db.execute(paginate(emails, commons.page))).unique().scalars().all() diff --git a/backend/src/database/models.py b/backend/src/database/models.py index 42f4caea8..6f4aac267 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -80,7 +80,7 @@ class DecisionEmail(Base): decision = Column(Enum(EmailStatusEnum), nullable=False) date = Column(DateTime, nullable=False) - student: Student = relationship("Student", back_populates="emails", uselist=False) + student: Student = relationship("Student", back_populates="emails", uselist=False, lazy="joined") class Edition(Base): diff --git a/backend/tests/test_routers/test_editions/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_students/test_students.py index 702e2d0ba..45baa21fe 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_students/test_students.py @@ -195,8 +195,9 @@ async def test_get_student_by_id_wrong_edition(database_with_data: AsyncSession, async def test_get_students_no_autorization(database_with_data: AsyncSession, auth_client: AuthClient): """tests you have to be logged in to get all students""" - assert auth_client.get( - "/editions/ed2022/students/").status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + assert (await auth_client.get( + "/editions/ed2022/students/")).status_code == status.HTTP_401_UNAUTHORIZED async def test_get_all_students(database_with_data: AsyncSession, auth_client: AuthClient, @@ -211,159 +212,170 @@ async def test_get_all_students(database_with_data: AsyncSession, auth_client: A async def test_get_all_students_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get all students with pagination""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): student: Student = Student(first_name=f"Student {i}", last_name="Vermeulen", preferred_name=f"{i}", email_address=f"student{i}@mail.com", phone_number=f"0487/0{i}.24.45", alumni=True, wants_to_be_student_coach=True, edition=edition, skills=[]) database_with_data.add(student) - database_with_data.commit() - response = auth_client.get("/editions/ed2022/students/?page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['students']) == DB_PAGE_SIZE - response = auth_client.get("/editions/ed2022/students/?page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['students']) == max( - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 2, 0) # +2 because there were already 2 students in the database + await database_with_data.commit() + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/?page=0") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['students']) == DB_PAGE_SIZE + response = await auth_client.get("/editions/ed2022/students/?page=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['students']) == max( + round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 2, 0) # +2 because there were already 2 students in the database async def test_get_first_name_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer first name""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get("/editions/ed2022/students/?name=Jos") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/?name=Jos") assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 async def test_get_first_name_student_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer first name with pagination""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): student: Student = Student(first_name=f"Student {i}", last_name="Vermeulen", preferred_name=f"{i}", email_address=f"student{i}@mail.com", phone_number=f"0487/0{i}.24.45", alumni=True, wants_to_be_student_coach=True, edition=edition, skills=[]) database_with_data.add(student) - database_with_data.commit() - response = auth_client.get( - "/editions/ed2022/students/?name=Student&page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()["students"]) == DB_PAGE_SIZE - response = auth_client.get( - "/editions/ed2022/students/?name=Student&page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['students']) == max( - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) + await database_with_data.commit() + async with auth_client: + response = await auth_client.get( + "/editions/ed2022/students/?name=Student&page=0") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()["students"]) == DB_PAGE_SIZE + response = await auth_client.get( + "/editions/ed2022/students/?name=Student&page=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['students']) == max( + round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) async def test_get_last_name_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer last name""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get( - "/editions/ed2022/students/?name=Vermeulen") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get( + "/editions/ed2022/students/?name=Vermeulen") assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 async def test_get_last_name_students_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer last name with pagination""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): student: Student = Student(first_name="Jos", last_name=f"Student {i}", preferred_name=f"{i}", email_address=f"student{i}@mail.com", phone_number=f"0487/0{i}.24.45", alumni=True, wants_to_be_student_coach=True, edition=edition, skills=[]) database_with_data.add(student) - database_with_data.commit() - response = auth_client.get( - "/editions/ed2022/students/?name=Student&page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()["students"]) == DB_PAGE_SIZE - response = auth_client.get( - "/editions/ed2022/students/?name=Student&page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['students']) == max( - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) + await database_with_data.commit() + async with auth_client: + response = await auth_client.get( + "/editions/ed2022/students/?name=Student&page=0") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()["students"]) == DB_PAGE_SIZE + response = await auth_client.get( + "/editions/ed2022/students/?name=Student&page=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['students']) == max( + round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) async def test_get_between_first_and_last_name_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer first- and last name""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get( - "/editions/ed2022/students/?name=os V") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()["students"]) == 1 + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get( + "/editions/ed2022/students/?name=os V") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()["students"]) == 1 async def test_get_alumni_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer alumni""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get("/editions/ed2022/students/?alumni=true") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()["students"]) == 1 + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/?alumni=true") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()["students"]) == 1 async def test_get_alumni_students_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer alumni with pagination""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): student: Student = Student(first_name="Jos", last_name=f"Student {i}", preferred_name=f"{i}", email_address=f"student{i}@mail.com", phone_number=f"0487/0{i}.24.45", alumni=True, wants_to_be_student_coach=True, edition=edition, skills=[]) database_with_data.add(student) - database_with_data.commit() - response = auth_client.get( - "/editions/ed2022/students/?alumni=true&page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()["students"]) == DB_PAGE_SIZE - response = auth_client.get( - "/editions/ed2022/students/?alumni=true&page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['students']) == max( - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1, 0) # +1 because there is already is one + await database_with_data.commit() + async with auth_client: + response = await auth_client.get( + "/editions/ed2022/students/?alumni=true&page=0") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()["students"]) == DB_PAGE_SIZE + response = await auth_client.get( + "/editions/ed2022/students/?alumni=true&page=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['students']) == max( + round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1, 0) # +1 because there is already is one async def test_get_student_coach_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer student coach""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get("/editions/ed2022/students/?student_coach=true") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/?student_coach=true") assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 async def test_get_student_coach_students_pagination(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer student coach with pagination""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): student: Student = Student(first_name="Jos", last_name=f"Student {i}", preferred_name=f"{i}", email_address=f"student{i}@mail.com", phone_number=f"0487/0{i}.24.45", alumni=True, wants_to_be_student_coach=True, edition=edition, skills=[]) database_with_data.add(student) - database_with_data.commit() - response = auth_client.get( - "/editions/ed2022/students/?student_coach=true&page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()["students"]) == DB_PAGE_SIZE - response = auth_client.get( - "/editions/ed2022/students/?student_coach=true&page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['students']) == max( - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1, 0) # +1 because there is already is one + await database_with_data.commit() + async with auth_client: + response = await auth_client.get( + "/editions/ed2022/students/?student_coach=true&page=0") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()["students"]) == DB_PAGE_SIZE + response = await auth_client.get( + "/editions/ed2022/students/?student_coach=true&page=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['students']) == max( + round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1, 0) # +1 because there is already is one async def test_get_one_skill_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer one skill""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get("/editions/ed2022/students/?skill_ids=1") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/?skill_ids=1") assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 assert response.json()["students"][0]["firstName"] == "Jos" @@ -371,10 +383,11 @@ async def test_get_one_skill_students(database_with_data: AsyncSession, auth_cli async def test_get_multiple_skill_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer multiple skills""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get( - "/editions/ed2022/students/?skill_ids=4&skill_ids=5") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get( + "/editions/ed2022/students/?skill_ids=4&skill_ids=5") assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 assert response.json()["students"][0]["firstName"] == "Marta" @@ -382,80 +395,89 @@ async def test_get_multiple_skill_students(database_with_data: AsyncSession, aut async def test_get_multiple_skill_students_no_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer multiple skills, but that student don't excist""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get( - "/editions/ed2022/students/?skill_ids=4&skill_ids=6") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get( + "/editions/ed2022/students/?skill_ids=4&skill_ids=6") assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 0 async def test_get_ghost_skill_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer one skill that don't excist""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get("/editions/ed2022/students/?skill_ids=100") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/?skill_ids=100") assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 0 async def test_get_one_real_one_ghost_skill_students(database_with_data: AsyncSession, auth_client: AuthClient): """tests get students based on query paramer one skill that excist and one that don't excist""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get( - "/editions/ed2022/students/?skill_ids=4&skill_ids=100") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get( + "/editions/ed2022/students/?skill_ids=4&skill_ids=100") assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 0 async def test_get_emails_student_no_authorization(database_with_data: AsyncSession, auth_client: AuthClient): """tests that you can't get the mails of a student when you aren't logged in""" - response = auth_client.get("/editions/ed2022/students/1/emails") + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/1/emails") assert response.status_code == status.HTTP_401_UNAUTHORIZED async def test_get_emails_student_coach(database_with_data: AsyncSession, auth_client: AuthClient): """tests that a coach can't get the mails of a student""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.get("/editions/ed2022/students/1/emails") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/1/emails") assert response.status_code == status.HTTP_403_FORBIDDEN async def test_get_emails_student_admin(database_with_data: AsyncSession, auth_client: AuthClient): """tests that an admin can get the mails of a student""" - auth_client.admin() - auth_client.post("/editions/ed2022/students/emails", + await auth_client.admin() + async with auth_client: + await auth_client.post("/editions/ed2022/students/emails", json={"students_id": [1], "email_status": 1}) - response = auth_client.get("/editions/ed2022/students/1/emails") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()["emails"]) == 1 - assert response.json()["student"]["studentId"] == 1 - response = auth_client.get("/editions/ed2022/students/2/emails") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()["emails"]) == 0 - assert response.json()["student"]["studentId"] == 2 + response = await auth_client.get("/editions/ed2022/students/1/emails") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()["emails"]) == 1 + assert response.json()["student"]["studentId"] == 1 + response = await auth_client.get("/editions/ed2022/students/2/emails") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()["emails"]) == 0 + assert response.json()["student"]["studentId"] == 2 async def test_post_email_no_authorization(database_with_data: AsyncSession, auth_client: AuthClient): """tests user need to be loged in""" - response = auth_client.post("/editions/ed2022/students/emails") + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails") assert response.status_code == status.HTTP_401_UNAUTHORIZED async def test_post_email_coach(database_with_data: AsyncSession, auth_client: AuthClient): """tests user can't be a coach""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.post("/editions/ed2022/students/emails") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails") assert response.status_code == status.HTTP_403_FORBIDDEN async def test_post_email_applied(database_with_data: AsyncSession, auth_client: AuthClient): """test create email applied""" - auth_client.admin() - response = auth_client.post("/editions/ed2022/students/emails", + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails", json={"students_id": [2], "email_status": 0}) assert response.status_code == status.HTTP_201_CREATED assert EmailStatusEnum( @@ -464,8 +486,9 @@ async def test_post_email_applied(database_with_data: AsyncSession, auth_client: async def test_post_email_awaiting_project(database_with_data: AsyncSession, auth_client: AuthClient): """test create email awaiting project""" - auth_client.admin() - response = auth_client.post("/editions/ed2022/students/emails", + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails", json={"students_id": [2], "email_status": 1}) assert response.status_code == status.HTTP_201_CREATED assert EmailStatusEnum( @@ -474,9 +497,10 @@ async def test_post_email_awaiting_project(database_with_data: AsyncSession, aut async def test_post_email_approved(database_with_data: AsyncSession, auth_client: AuthClient): """test create email applied""" - auth_client.admin() - response = auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": 2}) + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": 2}) assert response.status_code == status.HTTP_201_CREATED assert EmailStatusEnum( response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.APPROVED @@ -484,9 +508,10 @@ async def test_post_email_approved(database_with_data: AsyncSession, auth_client async def test_post_email_contract_confirmed(database_with_data: AsyncSession, auth_client: AuthClient): """test create email contract confirmed""" - auth_client.admin() - response = auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": 3}) + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": 3}) assert response.status_code == status.HTTP_201_CREATED assert EmailStatusEnum( response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.CONTRACT_CONFIRMED @@ -494,9 +519,10 @@ async def test_post_email_contract_confirmed(database_with_data: AsyncSession, a async def test_post_email_contract_declined(database_with_data: AsyncSession, auth_client: AuthClient): """test create email contract declined""" - auth_client.admin() - response = auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": 4}) + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": 4}) assert response.status_code == status.HTTP_201_CREATED assert EmailStatusEnum( response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.CONTRACT_DECLINED @@ -504,9 +530,10 @@ async def test_post_email_contract_declined(database_with_data: AsyncSession, au async def test_post_email_rejected(database_with_data: AsyncSession, auth_client: AuthClient): """test create email rejected""" - auth_client.admin() - response = auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": 5}) + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": 5}) assert response.status_code == status.HTTP_201_CREATED print(response.json()) assert EmailStatusEnum( @@ -515,9 +542,10 @@ async def test_post_email_rejected(database_with_data: AsyncSession, auth_client async def test_creat_email_for_ghost(database_with_data: AsyncSession, auth_client: AuthClient): """test create email for student that don't exist""" - auth_client.admin() - response = auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [100], "email_status": 5}) + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [100], "email_status": 5}) assert response.status_code == status.HTTP_404_NOT_FOUND @@ -529,10 +557,11 @@ async def test_creat_email_student_in_other_edition(database_with_data: AsyncSes email_address="mehmet.dizdar@example.com", phone_number="(787)-938-6216", alumni=True, wants_to_be_student_coach=False, edition=edition, skills=[]) database_with_data.add(student) - database_with_data.commit() - auth_client.admin() - response = auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [3], "email_status": 5}) + await database_with_data.commit() + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [3], "email_status": 5}) print(response.json()) assert response.status_code == status.HTTP_201_CREATED assert len(response.json()["studentEmails"]) == 0 @@ -540,26 +569,29 @@ async def test_creat_email_student_in_other_edition(database_with_data: AsyncSes async def test_get_emails_no_authorization(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails not loged in""" - response = auth_client.get("/editions/ed2022/students/emails") + async with auth_client: + response = await auth_client.get("/editions/ed2022/students/emails") assert response.status_code == status.HTTP_401_UNAUTHORIZED async def test_get_emails_coach(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails logged in as coach""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - response = auth_client.post("/editions/ed2022/students/emails") + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.post("/editions/ed2022/students/emails") assert response.status_code == status.HTTP_403_FORBIDDEN async def test_get_emails(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails""" - auth_client.admin() - response = auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [1], "email_status": 3}) - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": 5}) - response = auth_client.get("/editions/ed2022/students/emails") + await auth_client.admin() + async with auth_client: + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [1], "email_status": 3}) + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": 5}) + response = await auth_client.get("/editions/ed2022/students/emails") assert response.status_code == status.HTTP_200_OK assert len(response.json()["studentEmails"]) == 2 assert response.json()["studentEmails"][0]["student"]["studentId"] == 1 @@ -570,72 +602,77 @@ async def test_get_emails(database_with_data: AsyncSession, auth_client: AuthCli async def test_emails_filter_first_name(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails with filter first name""" - auth_client.admin() - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [1], "email_status": 1}) - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": 1}) - response = auth_client.get( - "/editions/ed2022/students/emails/?name=Jos") + await auth_client.admin() + async with auth_client: + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [1], "email_status": 1}) + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": 1}) + response = await auth_client.get( + "/editions/ed2022/students/emails/?name=Jos", follow_redirects=True) assert len(response.json()["studentEmails"]) == 1 assert response.json()["studentEmails"][0]["student"]["firstName"] == "Jos" async def test_emails_filter_last_name(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails with filter last name""" - auth_client.admin() - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [1], "email_status": 1}) - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": 1}) - response = auth_client.get( - "/editions/ed2022/students/emails/?name=Vermeulen") + await auth_client.admin() + async with auth_client: + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [1], "email_status": 1}) + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": 1}) + response = await auth_client.get( + "/editions/ed2022/students/emails/?name=Vermeulen", follow_redirects=True) assert len(response.json()["studentEmails"]) == 1 assert response.json()[ - "studentEmails"][0]["student"]["lastName"] == "Vermeulen" + "studentEmails"][0]["student"]["lastName"] == "Vermeulen" async def test_emails_filter_between_first_and_last_name(database_with_data: AsyncSession, auth_client: AuthClient): """test get emails with filter last name""" - auth_client.admin() - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [1], "email_status": 1}) - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": 1}) - response = auth_client.get( - "/editions/ed2022/students/emails/?name=os V") + await auth_client.admin() + async with auth_client: + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [1], "email_status": 1}) + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": 1}) + response = await auth_client.get( + "/editions/ed2022/students/emails/?name=os V", follow_redirects=True) assert len(response.json()["studentEmails"]) == 1 assert response.json()[ - "studentEmails"][0]["student"]["firstName"] == "Jos" + "studentEmails"][0]["student"]["firstName"] == "Jos" assert response.json()[ - "studentEmails"][0]["student"]["lastName"] == "Vermeulen" + "studentEmails"][0]["student"]["lastName"] == "Vermeulen" async def test_emails_filter_emailstatus(database_with_data: AsyncSession, auth_client: AuthClient): """test to get all email status, and you only filter on the email send""" - auth_client.admin() - for i in range(0, 6): - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": i}) - response = auth_client.get( - f"/editions/ed2022/students/emails/?email_status={i}") - print(response.json()) - assert len(response.json()["studentEmails"]) == 1 - if i > 0: - response = auth_client.get( - f"/editions/ed2022/students/emails/?email_status={i-1}") - assert len(response.json()["studentEmails"]) == 0 + await auth_client.admin() + async with auth_client: + for i in range(0, 6): + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": i}) + response = await auth_client.get( + f"/editions/ed2022/students/emails/?email_status={i}", follow_redirects=True) + print(response.json()) + assert len(response.json()["studentEmails"]) == 1 + if i > 0: + response = await auth_client.get( + f"/editions/ed2022/students/emails/?email_status={i - 1}", follow_redirects=True) + assert len(response.json()["studentEmails"]) == 0 async def test_emails_filter_emailstatus_multiple_status(database_with_data: AsyncSession, auth_client: AuthClient): """test to get all email status with multiple status""" - auth_client.admin() - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [2], "email_status": 1}) - auth_client.post("/editions/ed2022/students/emails", - json={"students_id": [1], "email_status": 3}) - response = auth_client.get( - "/editions/ed2022/students/emails/?email_status=3&email_status=1") + await auth_client.admin() + async with auth_client: + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [2], "email_status": 1}) + await auth_client.post("/editions/ed2022/students/emails", + json={"students_id": [1], "email_status": 3}) + response = await auth_client.get( + "/editions/ed2022/students/emails/?email_status=3&email_status=1", follow_redirects=True) assert len(response.json()["studentEmails"]) == 2 assert response.json()["studentEmails"][0]["student"]["studentId"] == 1 assert response.json()["studentEmails"][1]["student"]["studentId"] == 2 From 0cfc76fc3e892bbd3fde528d1340e5ea35ea82cc Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 08:15:37 +0200 Subject: [PATCH 118/649] suggestions tests passing --- backend/src/database/crud/suggestions.py | 8 +- backend/src/database/models.py | 4 +- .../test_suggestions/test_suggestions.py | 322 +++++++++--------- 3 files changed, 174 insertions(+), 160 deletions(-) diff --git a/backend/src/database/crud/suggestions.py b/backend/src/database/crud/suggestions.py index 5aba3ccae..633433bec 100644 --- a/backend/src/database/crud/suggestions.py +++ b/backend/src/database/crud/suggestions.py @@ -21,7 +21,7 @@ async def get_suggestions_of_student(db: AsyncSession, student_id: int | None) - """Give all suggestions of a student""" query = select(Suggestion).where(Suggestion.student_id == student_id) result = await db.execute(query) - return result.scalars().all() + return result.unique().scalars().all() async def get_own_suggestion(db: AsyncSession, student_id: int | None, user_id: int | None) -> Suggestion | None: @@ -33,13 +33,13 @@ async def get_own_suggestion(db: AsyncSession, student_id: int | None, user_id: query = select(Suggestion).where(Suggestion.student_id == student_id).where( Suggestion.coach_id == user_id) result = await db.execute(query) - return result.scalar_one_or_none() + return result.unique().scalar_one_or_none() async def get_suggestion_by_id(db: AsyncSession, suggestion_id: int) -> Suggestion: """Give a suggestion based on the ID""" result = await db.execute(select(Suggestion).where(Suggestion.suggestion_id == suggestion_id)) - return result.scalar_one() + return result.unique().scalar_one() async def delete_suggestion(db: AsyncSession, suggestion: Suggestion) -> None: @@ -62,4 +62,4 @@ async def get_suggestions_of_student_by_type(db: AsyncSession, student_id: int | query = select(Suggestion).where(Suggestion.student_id == student_id)\ .where(Suggestion.suggestion == type_suggestion) result = await db.execute(query) - return result.scalars().all() + return result.unique().scalars().all() diff --git a/backend/src/database/models.py b/backend/src/database/models.py index 6f4aac267..e14d4b83c 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -287,8 +287,8 @@ class Suggestion(Base): suggestion = Column(Enum(DecisionEnum), nullable=False, default=DecisionEnum.UNDECIDED) argumentation = Column(Text, nullable=True) - student: Student = relationship("Student", back_populates="suggestions", uselist=False) - coach: User = relationship("User", back_populates="suggestions", uselist=False) + student: Student = relationship("Student", back_populates="suggestions", uselist=False, lazy="joined") + coach: User = relationship("User", back_populates="suggestions", uselist=False, lazy="joined") class User(Base): diff --git a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py index fff3d8b49..c21a028e5 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py +++ b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py @@ -1,4 +1,5 @@ import pytest +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.enums import DecisionEnum @@ -8,18 +9,18 @@ @pytest.fixture -def database_with_data(database_session: AsyncSession) -> AsyncSession: +async def database_with_data(database_session: AsyncSession) -> AsyncSession: """A fixture to fill the database with fake data that can easly be used when testing""" # Editions edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() # Users coach1: User = User(name="coach1", editions=[edition]) database_session.add(coach1) - database_session.commit() + await database_session.commit() # Skill skill1: Skill = Skill(name="skill1", description="something about skill1") @@ -34,7 +35,7 @@ def database_with_data(database_session: AsyncSession) -> AsyncSession: database_session.add(skill4) database_session.add(skill5) database_session.add(skill6) - database_session.commit() + await database_session.commit() # Student student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", @@ -46,198 +47,211 @@ def database_with_data(database_session: AsyncSession) -> AsyncSession: database_session.add(student01) database_session.add(student30) - database_session.commit() + await database_session.commit() # Suggestion suggestion1: Suggestion = Suggestion( student=student01, coach=coach1, argumentation="Good student", suggestion=DecisionEnum.YES) database_session.add(suggestion1) - database_session.commit() + await database_session.commit() return database_session -def test_new_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_new_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests creating a new suggestion""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - resp = auth_client.post("/editions/ed2022/students/2/suggestions/", - json={"suggestion": 1, "argumentation": "test"}) - assert resp.status_code == status.HTTP_201_CREATED - suggestions: list[Suggestion] = database_with_data.query( - Suggestion).where(Suggestion.student_id == 2).all() - assert len(suggestions) == 1 - assert DecisionEnum(resp.json()["suggestion"] - ["suggestion"]) == suggestions[0].suggestion - assert resp.json()[ - "suggestion"]["argumentation"] == suggestions[0].argumentation - - -def test_overwrite_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + resp = await auth_client.post("/editions/ed2022/students/2/suggestions/", + json={"suggestion": 1, "argumentation": "test"}) + assert resp.status_code == status.HTTP_201_CREATED + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.student_id == 2))).unique().scalars().all() + assert len(suggestions) == 1 + assert DecisionEnum(resp.json()["suggestion"] + ["suggestion"]) == suggestions[0].suggestion + assert resp.json()[ + "suggestion"]["argumentation"] == suggestions[0].argumentation + + +async def test_overwrite_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that when you've already made a suggestion earlier, the existing one is replaced""" # Create initial suggestion - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - auth_client.post("/editions/ed2022/students/2/suggestions/", - json={"suggestion": 1, "argumentation": "test"}) - - suggestions: list[Suggestion] = database_with_data.query( - Suggestion).where(Suggestion.student_id == 2).all() - assert len(suggestions) == 1 - - # Send a new request - arg = "overwritten" - resp = auth_client.post("/editions/ed2022/students/2/suggestions/", - json={"suggestion": 2, "argumentation": arg}) - assert resp.status_code == status.HTTP_201_CREATED - suggestions: list[Suggestion] = database_with_data.query( - Suggestion).where(Suggestion.student_id == 2).all() - assert len(suggestions) == 1 - assert suggestions[0].argumentation == arg - - -def test_new_suggestion_not_authorized(database_with_data: AsyncSession, auth_client: AuthClient): + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + await auth_client.post("/editions/ed2022/students/2/suggestions/", + json={"suggestion": 1, "argumentation": "test"}) + + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.student_id == 2))).unique().scalars().all() + assert len(suggestions) == 1 + + # Send a new request + arg = "overwritten" + resp = await auth_client.post("/editions/ed2022/students/2/suggestions/", + json={"suggestion": 2, "argumentation": arg}) + assert resp.status_code == status.HTTP_201_CREATED + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.student_id == 2))).unique().scalars().all() + assert len(suggestions) == 1 + assert suggestions[0].argumentation == arg + + +async def test_new_suggestion_not_authorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests when not authorized you can't add a new suggestion""" + async with auth_client: + assert (await auth_client.post("/editions/ed2022/students/2/suggestions/", json={ + "suggestion": 1, "argumentation": "test"})).status_code == status.HTTP_401_UNAUTHORIZED + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.student_id == 2))).unique().scalars().all() + assert len(suggestions) == 0 - assert auth_client.post("/editions/ed2022/students/2/suggestions/", json={ - "suggestion": 1, "argumentation": "test"}).status_code == status.HTTP_401_UNAUTHORIZED - suggestions: list[Suggestion] = database_with_data.query( - Suggestion).where(Suggestion.student_id == 2).all() - assert len(suggestions) == 0 - -def test_get_suggestions_of_student_not_authorized(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_get_suggestions_of_student_not_authorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests if you don't have the right access, you get the right HTTP code""" - - assert auth_client.get("/editions/ed2022/students/29/suggestions/", headers={"Authorization": "auth"}, json={ - "suggestion": 1, "argumentation": "Ja"}).status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + assert (await auth_client.get("/editions/ed2022/students/29/suggestions/", headers={"Authorization": "auth"})).status_code == status.HTTP_401_UNAUTHORIZED -def test_get_suggestions_of_ghost(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_get_suggestions_of_ghost(database_with_data: AsyncSession, auth_client: AuthClient): """Tests if the student don't exist, you get a 404""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - res = auth_client.get( - "/editions/ed2022/students/9000/suggestions/") - assert res.status_code == status.HTTP_404_NOT_FOUND + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + res = await auth_client.get( + "/editions/ed2022/students/9000/suggestions/") + assert res.status_code == status.HTTP_404_NOT_FOUND -def test_get_suggestions_of_student(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_get_suggestions_of_student(database_with_data: AsyncSession, auth_client: AuthClient): """Tests to get the suggestions of a student""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.post("/editions/ed2022/students/2/suggestions/", json={ - "suggestion": 1, "argumentation": "Ja"}).status_code == status.HTTP_201_CREATED - auth_client.admin() - assert auth_client.post("/editions/ed2022/students/2/suggestions/", json={ - "suggestion": 3, "argumentation": "Neen"}).status_code == status.HTTP_201_CREATED - res = auth_client.get( - "/editions/1/students/2/suggestions/") - assert res.status_code == status.HTTP_200_OK - res_json = res.json() - assert len(res_json["suggestions"]) == 2 - assert res_json["suggestions"][0]["suggestion"] == 1 - assert res_json["suggestions"][0]["argumentation"] == "Ja" - assert res_json["suggestions"][1]["suggestion"] == 3 - assert res_json["suggestions"][1]["argumentation"] == "Neen" - - -def test_delete_ghost_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + assert (await auth_client.post("/editions/ed2022/students/2/suggestions/", json={ + "suggestion": 1, "argumentation": "Ja"})).status_code == status.HTTP_201_CREATED + await auth_client.admin() + assert (await auth_client.post("/editions/ed2022/students/2/suggestions/", json={ + "suggestion": 3, "argumentation": "Neen"})).status_code == status.HTTP_201_CREATED + res = await auth_client.get( + "/editions/1/students/2/suggestions/") + assert res.status_code == status.HTTP_200_OK + res_json = res.json() + assert len(res_json["suggestions"]) == 2 + assert res_json["suggestions"][0]["suggestion"] == 1 + assert res_json["suggestions"][0]["argumentation"] == "Ja" + assert res_json["suggestions"][1]["suggestion"] == 3 + assert res_json["suggestions"][1]["argumentation"] == "Neen" + + +async def test_delete_ghost_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that you get the correct status code when you delete a not existing suggestion""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.delete( - "/editions/ed2022/students/1/suggestions/8000").status_code == status.HTTP_404_NOT_FOUND + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + assert (await auth_client.delete( + "/editions/ed2022/students/1/suggestions/8000")).status_code == status.HTTP_404_NOT_FOUND -def test_delete_not_autorized(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_delete_not_autorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that you have to be loged in for deleating a suggestion""" - assert auth_client.delete( - "/editions/ed2022/students/1/suggestions/8000").status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + assert (await auth_client.delete( + "/editions/ed2022/students/1/suggestions/8000")).status_code == status.HTTP_401_UNAUTHORIZED -def test_delete_suggestion_admin(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_delete_suggestion_admin(database_with_data: AsyncSession, auth_client: AuthClient): """Test that an admin can update suggestions""" - auth_client.admin() - assert auth_client.delete( - "/editions/ed2022/students/1/suggestions/1").status_code == status.HTTP_204_NO_CONTENT - suggestions: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == 1).all() - assert len(suggestions) == 0 + await auth_client.admin() + async with auth_client: + assert (await auth_client.delete( + "/editions/ed2022/students/1/suggestions/1")).status_code == status.HTTP_204_NO_CONTENT + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == 1))).unique().scalars().all() + assert len(suggestions) == 0 -def test_delete_suggestion_coach_their_review(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_delete_suggestion_coach_their_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can delete their own suggestion""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - new_suggestion = auth_client.post("/editions/ed2022/students/2/suggestions/", - json={"suggestion": 1, "argumentation": "test"}) - assert new_suggestion.status_code == status.HTTP_201_CREATED - suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] - assert auth_client.delete( - f"/editions/ed2022/students/1/suggestions/{suggestion_id}").status_code == status.HTTP_204_NO_CONTENT - suggestions: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == suggestion_id).all() - assert len(suggestions) == 0 - - -def test_delete_suggestion_coach_other_review(database_with_data: AsyncSession, auth_client: AuthClient): + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + new_suggestion = await auth_client.post("/editions/ed2022/students/2/suggestions/", + json={"suggestion": 1, "argumentation": "test"}) + assert new_suggestion.status_code == status.HTTP_201_CREATED + suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] + assert (await auth_client.delete( + f"/editions/ed2022/students/1/suggestions/{suggestion_id}")).status_code == status.HTTP_204_NO_CONTENT + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == suggestion_id))).unique().scalars().all() + assert len(suggestions) == 0 + + +async def test_delete_suggestion_coach_other_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can't delete other coaches their suggestions""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.delete( - "/editions/ed2022/students/1/suggestions/1").status_code == status.HTTP_403_FORBIDDEN - suggestions: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == 1).all() - assert len(suggestions) == 1 + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + assert (await auth_client.delete( + "/editions/ed2022/students/1/suggestions/1")).status_code == status.HTTP_403_FORBIDDEN + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == 1))).unique().scalars().all() + assert len(suggestions) == 1 -def test_update_ghost_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_update_ghost_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests a suggestion that don't exist """ - auth_client.admin() - assert auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ - "suggestion": 1, "argumentation": "test"}).status_code == status.HTTP_404_NOT_FOUND + await auth_client.admin() + async with auth_client: + assert (await auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ + "suggestion": 1, "argumentation": "test"})).status_code == status.HTTP_404_NOT_FOUND -def test_update_not_autorized(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_update_not_autorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests update when not autorized""" - assert auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ - "suggestion": 1, "argumentation": "test"}).status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + assert (await auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ + "suggestion": 1, "argumentation": "test"})).status_code == status.HTTP_401_UNAUTHORIZED -def test_update_suggestion_admin(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_update_suggestion_admin(database_with_data: AsyncSession, auth_client: AuthClient): """Test that an admin can update suggestions""" - auth_client.admin() - assert auth_client.put("/editions/ed2022/students/1/suggestions/1", json={ - "suggestion": 3, "argumentation": "test"}).status_code == status.HTTP_204_NO_CONTENT - suggestion: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == 1).one() - assert suggestion.suggestion == DecisionEnum.NO - assert suggestion.argumentation == "test" + await auth_client.admin() + async with auth_client: + assert (await auth_client.put("/editions/ed2022/students/1/suggestions/1", json={ + "suggestion": 3, "argumentation": "test"})).status_code == status.HTTP_204_NO_CONTENT + suggestion: Suggestion = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == 1))).unique().scalar_one() + assert suggestion.suggestion == DecisionEnum.NO + assert suggestion.argumentation == "test" -def test_update_suggestion_coach_their_review(database_with_data: AsyncSession, auth_client: AuthClient): +async def test_update_suggestion_coach_their_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can update their own suggestion""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - new_suggestion = auth_client.post("/editions/ed2022/students/2/suggestions/", - json={"suggestion": 1, "argumentation": "test"}) - assert new_suggestion.status_code == status.HTTP_201_CREATED - suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] - assert auth_client.put(f"/editions/ed2022/students/1/suggestions/{suggestion_id}", json={ - "suggestion": 3, "argumentation": "test"}).status_code == status.HTTP_204_NO_CONTENT - suggestion: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == suggestion_id).one() - assert suggestion.suggestion == DecisionEnum.NO - assert suggestion.argumentation == "test" - - -def test_update_suggestion_coach_other_review(database_with_data: AsyncSession, auth_client: AuthClient): + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + new_suggestion = await auth_client.post("/editions/ed2022/students/2/suggestions/", + json={"suggestion": 1, "argumentation": "test"}) + assert new_suggestion.status_code == status.HTTP_201_CREATED + suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] + assert (await auth_client.put(f"/editions/ed2022/students/1/suggestions/{suggestion_id}", json={ + "suggestion": 3, "argumentation": "test"})).status_code == status.HTTP_204_NO_CONTENT + suggestion: Suggestion = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == suggestion_id))).unique().scalar_one() + assert suggestion.suggestion == DecisionEnum.NO + assert suggestion.argumentation == "test" + + +async def test_update_suggestion_coach_other_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can't update other coaches their suggestions""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.put("/editions/ed2022/students/1/suggestions/1", json={ - "suggestion": 3, "argumentation": "test"}).status_code == status.HTTP_403_FORBIDDEN - suggestion: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == 1).one() - assert suggestion.suggestion != DecisionEnum.NO - assert suggestion.argumentation != "test" + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + assert (await auth_client.put("/editions/ed2022/students/1/suggestions/1", json={ + "suggestion": 3, "argumentation": "test"})).status_code == status.HTTP_403_FORBIDDEN + suggestion: Suggestion = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == 1))).unique().scalar_one() + assert suggestion.suggestion != DecisionEnum.NO + assert suggestion.argumentation != "test" From 921404487f7b81566e43ac05b34a8f0981f76b64 Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 08:23:29 +0200 Subject: [PATCH 119/649] register tests passing --- backend/tests/conftest.py | 5 +- .../test_register/test_register.py | 125 ++++++++++-------- 2 files changed, 70 insertions(+), 60 deletions(-) diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index e066d41ff..28583595b 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -4,6 +4,7 @@ import pytest from alembic import command from alembic import config +from httpx import AsyncClient from sqlalchemy.ext.asyncio import AsyncSession from starlette.testclient import TestClient @@ -52,7 +53,7 @@ async def database_session(tables: None) -> Generator[AsyncSession, None, None]: @pytest.fixture -def test_client(database_session: AsyncSession) -> TestClient: +def test_client(database_session: AsyncSession) -> AsyncClient: """Fixture to create a testing version of our main application""" def override_get_session() -> Generator[AsyncSession, None, None]: @@ -63,7 +64,7 @@ def override_get_session() -> Generator[AsyncSession, None, None]: # Replace get_session with a call to this method instead app.dependency_overrides[get_session] = override_get_session - return TestClient(app) + return AsyncClient(app=app, base_url="http://test") @pytest.fixture diff --git a/backend/tests/test_routers/test_editions/test_register/test_register.py b/backend/tests/test_routers/test_editions/test_register/test_register.py index 500cb660a..af888ae98 100644 --- a/backend/tests/test_routers/test_editions/test_register/test_register.py +++ b/backend/tests/test_routers/test_editions/test_register/test_register.py @@ -1,3 +1,5 @@ +from httpx import AsyncClient +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from starlette.testclient import TestClient @@ -6,72 +8,77 @@ from src.database.models import Edition, InviteLink, User, AuthEmail -def test_ok(database_session: AsyncSession, test_client: TestClient): +async def test_ok(database_session: AsyncSession, test_client: AsyncClient): """Tests a registeration is made""" edition: Edition = Edition(year=2022, name="ed2022") invite_link: InviteLink = InviteLink( edition=edition, target_email="jw@gmail.com") database_session.add(edition) database_session.add(invite_link) - database_session.commit() - response = test_client.post("/editions/ed2022/register/email", json={ - "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", - "uuid": str(invite_link.uuid)}) - assert response.status_code == status.HTTP_201_CREATED - user: User = database_session.query(User).where( - User.name == "Joskes vermeulen").one() - user_auth: AuthEmail = database_session.query(AuthEmail).where(AuthEmail.email == "jw@gmail.com").one() - assert user.user_id == user_auth.user_id - - -def test_use_uuid_multiple_times(database_session: AsyncSession, test_client: TestClient): + await database_session.commit() + async with test_client: + response = await test_client.post("/editions/ed2022/register/email", json={ + "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", + "uuid": str(invite_link.uuid)}) + assert response.status_code == status.HTTP_201_CREATED + user: User = (await database_session.execute(select(User).where( + User.name == "Joskes vermeulen"))).unique().scalar_one() + user_auth: AuthEmail = (await database_session.execute(select(AuthEmail).where(AuthEmail.email == "jw@gmail.com"))).scalar_one() + assert user.user_id == user_auth.user_id + + +async def test_use_uuid_multiple_times(database_session: AsyncSession, test_client: AsyncClient): """Tests that you can't use the same UUID multiple times""" edition: Edition = Edition(year=2022, name="ed2022") invite_link: InviteLink = InviteLink( edition=edition, target_email="jw@gmail.com") database_session.add(edition) database_session.add(invite_link) - database_session.commit() - test_client.post("/editions/ed2022/register/email", json={ - "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", - "uuid": str(invite_link.uuid)}) - response = test_client.post("/editions/ed2022/register/email", json={ - "name": "Joske Vermeulen", "email": "jw2@gmail.com", "pw": "test", - "uuid": str(invite_link.uuid)}) - assert response.status_code == status.HTTP_404_NOT_FOUND - - -def test_no_valid_uuid(database_session: AsyncSession, test_client: TestClient): + await database_session.commit() + async with test_client: + await test_client.post("/editions/ed2022/register/email", json={ + "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", + "uuid": str(invite_link.uuid)}) + response = await test_client.post("/editions/ed2022/register/email", json={ + "name": "Joske Vermeulen", "email": "jw2@gmail.com", "pw": "test", + "uuid": str(invite_link.uuid)}) + assert response.status_code == status.HTTP_404_NOT_FOUND + + +async def test_no_valid_uuid(database_session: AsyncSession, test_client: AsyncClient): """Tests that no valid uuid, can't make a account""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() - response = test_client.post("/editions/ed2022/register/email", json={ - "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", - "uuid": "550e8400-e29b-41d4-a716-446655440000"}) - assert response.status_code == status.HTTP_404_NOT_FOUND - users: list[User] = database_session.query( - User).where(User.name == "Joskes vermeulen").all() - assert len(users) == 0 - - -def test_no_edition(database_session: AsyncSession, test_client: TestClient): + await database_session.commit() + async with test_client: + response = await test_client.post("/editions/ed2022/register/email", json={ + "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", + "uuid": "550e8400-e29b-41d4-a716-446655440000"}) + assert response.status_code == status.HTTP_404_NOT_FOUND + users: list[User] = (await database_session.execute(select( + User).where(User.name == "Joskes vermeulen"))).scalars().all() + assert len(users) == 0 + + +async def test_no_edition(database_session: AsyncSession, test_client: AsyncClient): """Tests if there is no edition it gets the right error code""" - response = test_client.post("/editions/ed2022/register/email", json={ - "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test"}) + async with test_client: + response = await test_client.post("/editions/ed2022/register/email", json={ + "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test"}) assert response.status_code == status.HTTP_404_NOT_FOUND -def test_not_a_correct_email(database_session: AsyncSession, test_client: TestClient): +async def test_not_a_correct_email(database_session: AsyncSession, test_client: AsyncClient): """Tests when the email isn't correct, it gets the right error code""" database_session.add(Edition(year=2022, name="ed2022")) - database_session.commit() - response = test_client.post("/editions/ed2022/register/email", - json={"name": "Joskes vermeulen", "email": "jw", "pw": "test"}) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + await database_session.commit() + async with test_client: + response = await test_client.post("/editions/ed2022/register/email", + json={"name": "Joskes vermeulen", "email": "jw", "pw": "test"}) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_duplicate_user(database_session: AsyncSession, test_client: TestClient): +async def test_duplicate_user(database_session: AsyncSession, test_client: AsyncClient): """Tests when there is a duplicate, it gets the right error code""" edition: Edition = Edition(year=2022, name="ed2022") invite_link1: InviteLink = InviteLink( @@ -81,17 +88,18 @@ def test_duplicate_user(database_session: AsyncSession, test_client: TestClient) database_session.add(edition) database_session.add(invite_link1) database_session.add(invite_link2) - database_session.commit() - test_client.post("/editions/ed2022/register/email", - json={"name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", - "uuid": str(invite_link1.uuid)}) - response = test_client.post("/editions/ed2022/register/email", json={ - "name": "Joske vermeulen", "email": "jw@gmail.com", "pw": "test1", - "uuid": str(invite_link2.uuid)}) - assert response.status_code == status.HTTP_400_BAD_REQUEST - - -def test_old_edition(database_session: AsyncSession, test_client: TestClient): + await database_session.commit() + async with test_client: + await test_client.post("/editions/ed2022/register/email", + json={"name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", + "uuid": str(invite_link1.uuid)}) + response = await test_client.post("/editions/ed2022/register/email", json={ + "name": "Joske vermeulen", "email": "jw@gmail.com", "pw": "test1", + "uuid": str(invite_link2.uuid)}) + assert response.status_code == status.HTTP_400_BAD_REQUEST + + +async def test_old_edition(database_session: AsyncSession, test_client: AsyncClient): """Tests trying to make a registration for a read-only edition""" edition: Edition = Edition(year=2022, name="ed2022") edition3: Edition = Edition(year=2023, name="ed2023") @@ -100,8 +108,9 @@ def test_old_edition(database_session: AsyncSession, test_client: TestClient): database_session.add(edition) database_session.add(edition3) database_session.add(invite_link) - database_session.commit() - response = test_client.post("/editions/ed2022/register/email", json={ - "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", - "uuid": str(invite_link.uuid)}) + await database_session.commit() + async with test_client: + response = await test_client.post("/editions/ed2022/register/email", json={ + "name": "Joskes vermeulen", "email": "jw@gmail.com", "pw": "test", + "uuid": str(invite_link.uuid)}) assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED From 615e796b3054e722375e1f7f171c72fbe81a4be1 Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 08:26:49 +0200 Subject: [PATCH 120/649] login tests passing --- backend/src/database/crud/users.py | 2 +- .../test_routers/test_login/test_login.py | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/backend/src/database/crud/users.py b/backend/src/database/crud/users.py index 48415f310..e6fd2b9b9 100644 --- a/backend/src/database/crud/users.py +++ b/backend/src/database/crud/users.py @@ -191,7 +191,7 @@ async def remove_request_if_exists(db: AsyncSession, user_id: int, edition_name: async def get_user_by_email(db: AsyncSession, email: str) -> User: """Find a user by their email address""" auth_email = (await db.execute(select(AuthEmail).where(AuthEmail.email == email))).scalar_one() - return (await db.execute(select(User).where(User.user_id == auth_email.user_id))).scalar_one() + return (await db.execute(select(User).where(User.user_id == auth_email.user_id))).unique().scalar_one() async def get_user_by_id(db: AsyncSession, user_id: int) -> User: diff --git a/backend/tests/test_routers/test_login/test_login.py b/backend/tests/test_routers/test_login/test_login.py index 8ca8f4ecb..166ab913b 100644 --- a/backend/tests/test_routers/test_login/test_login.py +++ b/backend/tests/test_routers/test_login/test_login.py @@ -1,3 +1,4 @@ +from httpx import AsyncClient from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from starlette.testclient import TestClient @@ -6,17 +7,17 @@ from src.database.models import AuthEmail, User -def test_login_non_existing(test_client: TestClient): +async def test_login_non_existing(test_client: AsyncClient): """Test logging in without an existing account""" form = { "username": "this user", "password": "does not exist" } + async with test_client: + assert (await test_client.post("/login/token", data=form)).status_code == status.HTTP_401_UNAUTHORIZED - assert test_client.post("/login/token", data=form).status_code == status.HTTP_401_UNAUTHORIZED - -def test_login_existing(database_session: AsyncSession, test_client: TestClient): +async def test_login_existing(database_session: AsyncSession, test_client: AsyncClient): """Test logging in with an existing account""" email = "test@ema.il" password = "password" @@ -25,23 +26,23 @@ def test_login_existing(database_session: AsyncSession, test_client: TestClient) user = User(name="test") database_session.add(user) - database_session.commit() + await database_session.commit() auth = AuthEmail(pw_hash=security.get_password_hash(password), email=email) auth.user = user database_session.add(auth) - database_session.commit() + await database_session.commit() # Try to get a token using the credentials for the new user form = { "username": email, "password": password } - - assert test_client.post("/login/token", data=form).status_code == status.HTTP_200_OK + async with test_client: + assert (await test_client.post("/login/token", data=form)).status_code == status.HTTP_200_OK -def test_login_existing_wrong_credentials(database_session: AsyncSession, test_client: TestClient): +async def test_login_existing_wrong_credentials(database_session: AsyncSession, test_client: AsyncClient): """Test logging in with existing, but wrong credentials""" email = "test@ema.il" password = "password" @@ -50,17 +51,17 @@ def test_login_existing_wrong_credentials(database_session: AsyncSession, test_c user = User(name="test") database_session.add(user) - database_session.commit() + await database_session.commit() auth = AuthEmail(pw_hash=security.get_password_hash(password), email=email) auth.user = user database_session.add(auth) - database_session.commit() + await database_session.commit() # Try to get a token using the credentials for the new user form = { "username": email, "password": "another password" } - - assert test_client.post("/login/token", data=form).status_code == status.HTTP_401_UNAUTHORIZED + async with test_client: + assert (await test_client.post("/login/token", data=form)).status_code == status.HTTP_401_UNAUTHORIZED From ce1ec3f7f62c258177b465117890c4cc8f520290 Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 08:57:57 +0200 Subject: [PATCH 121/649] users tests passing --- backend/src/database/crud/users.py | 18 +- backend/src/database/models.py | 4 +- .../test_routers/test_users/test_users.py | 637 +++++++++--------- 3 files changed, 343 insertions(+), 316 deletions(-) diff --git a/backend/src/database/crud/users.py b/backend/src/database/crud/users.py index e6fd2b9b9..07d8bb16c 100644 --- a/backend/src/database/crud/users.py +++ b/backend/src/database/crud/users.py @@ -46,7 +46,7 @@ async def get_users_filtered_page(db: AsyncSession, params: FilterParameters): if params.admin is not None: query = query.filter(User.admin.is_(params.admin)) # If admin parameter is set, edition & exclude_edition is ignored - return (await db.execute(paginate(query, params.page))).scalars().all() + return (await db.execute(paginate(query, params.page))).unique().scalars().all() if params.edition is not None: edition = await get_edition_by_name(db, params.edition) @@ -62,7 +62,7 @@ async def get_users_filtered_page(db: AsyncSession, params: FilterParameters): query = query.filter(User.user_id.not_in(exclude_user_id)) - return (await db.execute(paginate(query, params.page))).scalars().all() + return (await db.execute(paginate(query, params.page))).unique().scalars().all() async def edit_admin_status(db: AsyncSession, user_id: int, admin: bool): @@ -70,7 +70,7 @@ async def edit_admin_status(db: AsyncSession, user_id: int, admin: bool): Edit the admin-status of a user """ result = await db.execute(select(User).where(User.user_id == user_id)) - user = result.scalar_one() + user = result.unique().scalar_one() user.admin = admin db.add(user) await db.commit() @@ -81,7 +81,7 @@ async def add_coach(db: AsyncSession, user_id: int, edition_name: str): Add user as coach for the given edition """ user_result = await db.execute(select(User).where(User.user_id == user_id)) - user = user_result.scalar_one() + user = user_result.unique().scalar_one() edition_result = await db.execute(select(Edition).where(Edition.name == edition_name)) edition = edition_result.scalar_one() user.editions.append(edition) @@ -119,14 +119,14 @@ async def get_requests(db: AsyncSession) -> list[CoachRequest]: """ Get all userrequests """ - return (await db.execute(_get_requests_query())).scalars().all() + return (await db.execute(_get_requests_query())).unique().scalars().all() async def get_requests_page(db: AsyncSession, page: int, user_name: str = "") -> list[CoachRequest]: """ Get all userrequests """ - return (await db.execute(paginate(_get_requests_query(user_name), page))).scalars().all() + return (await db.execute(paginate(_get_requests_query(user_name), page))).unique().scalars().all() def _get_requests_for_edition_query(edition: Edition, user_name: str = "") -> Select: @@ -144,7 +144,7 @@ async def get_requests_for_edition(db: AsyncSession, edition_name: str = "") -> Get all userrequests from a given edition """ edition = await get_edition_by_name(db, edition_name) - return (await db.execute(_get_requests_for_edition_query(edition))).scalars().all() + return (await db.execute(_get_requests_for_edition_query(edition))).unique().scalars().all() async def get_requests_for_edition_page( @@ -157,14 +157,14 @@ async def get_requests_for_edition_page( Get all userrequests from a given edition """ edition = await get_edition_by_name(db, edition_name) - return (await db.execute(paginate(_get_requests_for_edition_query(edition, user_name), page))).scalars().all() + return (await db.execute(paginate(_get_requests_for_edition_query(edition, user_name), page))).unique().scalars().all() async def accept_request(db: AsyncSession, request_id: int): """ Remove request and add user as coach """ - request = (await db.execute(select(CoachRequest).where(CoachRequest.request_id == request_id))).scalar_one() + request = (await db.execute(select(CoachRequest).where(CoachRequest.request_id == request_id))).unique().scalar_one() edition = (await db.execute(select(Edition).where(Edition.edition_id == request.edition_id))).scalar_one() await add_coach(db, request.user_id, edition.name) await db.execute(delete(CoachRequest).where(CoachRequest.request_id == request_id)) diff --git a/backend/src/database/models.py b/backend/src/database/models.py index e14d4b83c..8add39c04 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -67,8 +67,8 @@ class CoachRequest(Base): user_id = Column(Integer, ForeignKey("users.user_id"), nullable=False) edition_id = Column(Integer, ForeignKey("editions.edition_id"), nullable=False) - edition: Edition = relationship("Edition", back_populates="coach_requests", uselist=False) - user: User = relationship("User", back_populates="coach_request", uselist=False) + edition: Edition = relationship("Edition", back_populates="coach_requests", uselist=False, lazy="joined") + user: User = relationship("User", back_populates="coach_request", uselist=False, lazy="joined") class DecisionEmail(Base): diff --git a/backend/tests/test_routers/test_users/test_users.py b/backend/tests/test_routers/test_users/test_users.py index bf850f709..ce0ae304f 100644 --- a/backend/tests/test_routers/test_users/test_users.py +++ b/backend/tests/test_routers/test_users/test_users.py @@ -1,6 +1,5 @@ -from json import dumps - import pytest +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status @@ -12,7 +11,7 @@ @pytest.fixture -def data(database_session: AsyncSession) -> dict[str, str | int]: +async def data(database_session: AsyncSession) -> dict[str, str | int]: """Fill database with dummy data""" # Create users user1 = models.User(name="user1", admin=True) @@ -27,16 +26,16 @@ def data(database_session: AsyncSession) -> dict[str, str | int]: edition2 = models.Edition(year=2, name="ed2") database_session.add(edition2) - database_session.commit() + await database_session.commit() email_auth1 = models.AuthEmail(user_id=user1.user_id, email="user1@mail.com", pw_hash="HASH1") github_auth1 = models.AuthGitHub(user_id=user2.user_id, gh_auth_id=123, email="user2@mail.com") database_session.add(email_auth1) database_session.add(github_auth1) - database_session.commit() + await database_session.commit() # Create coach roles - database_session.execute(models.user_editions.insert(), [ + await database_session.execute(models.user_editions.insert(), [ {"user_id": user1.user_id, "edition_id": edition1.edition_id}, {"user_id": user2.user_id, "edition_id": edition1.edition_id}, {"user_id": user2.user_id, "edition_id": edition2.edition_id} @@ -53,191 +52,202 @@ def data(database_session: AsyncSession) -> dict[str, str | int]: } -def test_get_all_users(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): +async def test_get_all_users(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for getting a list of users""" - auth_client.admin() + await auth_client.admin() # All users - response = auth_client.get("/users") - assert response.status_code == status.HTTP_200_OK - user_ids = [user["userId"] for user in response.json()['users']] - user_ids.remove(auth_client.user.user_id) - assert len(user_ids) == 2 - assert data["user1"] in user_ids - assert data["user2"] in user_ids + async with auth_client: + response = await auth_client.get("/users", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + user_ids = [user["userId"] for user in response.json()['users']] + user_ids.remove(auth_client.user.user_id) + assert len(user_ids) == 2 + assert data["user1"] in user_ids + assert data["user2"] in user_ids -def test_get_all_users_paginated(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_users_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of users""" for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=False)) - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users?page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == DB_PAGE_SIZE - response = auth_client.get("/users?page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 - # +1 because Authclient.admin() also creates one user. + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users?page=0", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == DB_PAGE_SIZE + response = await auth_client.get("/users?page=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 + # +1 because Authclient.admin() also creates one user. -def test_get_all_users_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_users_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of users with filter for name""" count = 0 for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=False)) if "1" in str(i): count += 1 - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users?page=0&name=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == min(DB_PAGE_SIZE, count) - response = auth_client.get("/users?page=1&name=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == max(count - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users?page=0&name=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == min(DB_PAGE_SIZE, count) + response = await auth_client.get("/users?page=1&name=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == max(count - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) -def test_get_users_response(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str]): +async def test_get_users_response(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str]): """Test the response model of a user""" - auth_client.admin() - response = auth_client.get("/users") - users = response.json()["users"] - user1 = [user for user in users if user["userId"] == data["user1"]][0] - assert user1["auth"]["email"] == data["email1"] - assert user1["auth"]["authType"] == data["auth_type1"] - user2 = [user for user in users if user["userId"] == data["user2"]][0] - assert user2["auth"]["email"] == data["email2"] - assert user2["auth"]["authType"] == data["auth_type2"] - - -def test_get_all_admins(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users", follow_redirects=True) + users = response.json()["users"] + user1 = [user for user in users if user["userId"] == data["user1"]][0] + assert user1["auth"]["email"] == data["email1"] + assert user1["auth"]["authType"] == data["auth_type1"] + user2 = [user for user in users if user["userId"] == data["user2"]][0] + assert user2["auth"]["email"] == data["email2"] + assert user2["auth"]["authType"] == data["auth_type2"] + + +async def test_get_all_admins(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for getting a list of admins""" - auth_client.admin() + await auth_client.admin() # All admins - response = auth_client.get("/users?admin=true") - assert response.status_code == status.HTTP_200_OK - user_ids = [user["userId"] for user in response.json()['users']] - user_ids.remove(auth_client.user.user_id) - assert [data["user1"]] == user_ids + async with auth_client: + response = await auth_client.get("/users?admin=true", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + user_ids = [user["userId"] for user in response.json()['users']] + user_ids.remove(auth_client.user.user_id) + assert [data["user1"]] == user_ids -def test_get_all_admins_paginated(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_admins_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of paginated admins""" count = 0 for i in range(round(DB_PAGE_SIZE * 3)): database_session.add(models.User(name=f"User {i}", admin=i % 2 == 0)) if i % 2 == 0: count += 1 - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users?admin=true&page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == min(count + 1, DB_PAGE_SIZE) - response = auth_client.get("/users?admin=true&page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == min(count - DB_PAGE_SIZE + 1, DB_PAGE_SIZE + 1) - # +1 because Authclient.admin() also creates one user. + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users?admin=true&page=0", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == min(count + 1, DB_PAGE_SIZE) + response = await auth_client.get("/users?admin=true&page=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == min(count - DB_PAGE_SIZE + 1, DB_PAGE_SIZE + 1) + # +1 because Authclient.admin() also creates one user. -def test_get_all_non_admins_paginated(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_non_admins_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of paginated admins""" non_admins = [] for i in range(round(DB_PAGE_SIZE * 3)): user = models.User(name=f"User {i}", admin=i % 2 == 0) database_session.add(user) - database_session.commit() + await database_session.commit() if i % 2 != 0: non_admins.append(user.user_id) - database_session.commit() + await database_session.commit() - auth_client.admin() + await auth_client.admin() count = len(non_admins) - response = auth_client.get("/users?admin=false&page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == min(count, DB_PAGE_SIZE) - for user in response.json()["users"]: - assert user["userId"] in non_admins - - response = auth_client.get("/users?admin=false&page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == max(count - DB_PAGE_SIZE, 0) - - -def test_get_all_admins_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): + async with auth_client: + response = await auth_client.get("/users?admin=false&page=0", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == min(count, DB_PAGE_SIZE) + for user in response.json()["users"]: + assert user["userId"] in non_admins + + response = await auth_client.get("/users?admin=false&page=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == max(count - DB_PAGE_SIZE, 0) + + +async def test_get_all_admins_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of paginated admins with filter for name""" for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=True)) - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users?admin=true&page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == DB_PAGE_SIZE - response = auth_client.get("/users?admin=true&page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users?admin=true&page=0", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == DB_PAGE_SIZE + response = await auth_client.get("/users?admin=true&page=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 -def test_get_all_non_admins_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_non_admins_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of paginated admins""" non_admins = [] for i in range(round(DB_PAGE_SIZE * 3)): user = models.User(name=f"User {i}", admin=i % 2 == 0) database_session.add(user) - database_session.commit() + await database_session.commit() if i % 2 != 0 and "1" in str(i): non_admins.append(user.user_id) - database_session.commit() + await database_session.commit() - auth_client.admin() + await auth_client.admin() count = len(non_admins) - response = auth_client.get("/users?admin=false&page=0&name=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == min(count, DB_PAGE_SIZE) - for user in response.json()["users"]: - assert user["userId"] in non_admins + async with auth_client: + response = await auth_client.get("/users?admin=false&page=0&name=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == min(count, DB_PAGE_SIZE) + for user in response.json()["users"]: + assert user["userId"] in non_admins - response = auth_client.get("/users?admin=false&page=1&name=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == max(count - DB_PAGE_SIZE, 0) + response = await auth_client.get("/users?admin=false&page=1&name=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == max(count - DB_PAGE_SIZE, 0) -def test_get_users_from_edition(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): +async def test_get_users_from_edition(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for getting a list of users from a given edition""" - auth_client.admin() + await auth_client.admin() # All users from edition - response = auth_client.get(f"/users?edition={data['edition2']}") - assert response.status_code == status.HTTP_200_OK - user_ids = [user["userId"] for user in response.json()['users']] - assert [data["user2"]] == user_ids + async with auth_client: + response = await auth_client.get(f"/users?edition={data['edition2']}", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + user_ids = [user["userId"] for user in response.json()['users']] + assert [data["user2"]] == user_ids -def test_get_all_users_for_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_users_for_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of users""" edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=False, editions=[edition])) - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users?page=0&edition_name=ed2022") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == DB_PAGE_SIZE - response = auth_client.get("/users?page=1&edition_name=ed2022") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 - # +1 because Authclient.admin() also creates one user. + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users?page=0&edition_name=ed2022", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == DB_PAGE_SIZE + response = await auth_client.get("/users?page=1&edition_name=ed2022", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 + # +1 because Authclient.admin() also creates one user. -def test_get_all_users_for_edition_paginated_filter_user(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_users_for_edition_paginated_filter_user(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a list of users and filter on name""" edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -247,72 +257,75 @@ def test_get_all_users_for_edition_paginated_filter_user(database_session: Async database_session.add(models.User(name=f"User {i}", admin=False, editions=[edition])) if "1" in str(i): count += 1 - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users?page=0&edition_name=ed2022&name=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == min(count , DB_PAGE_SIZE) - response = auth_client.get("/users?page=1&edition_name=ed2022&name=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == max(count - DB_PAGE_SIZE, 0) + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users?page=0&edition_name=ed2022&name=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == min(count , DB_PAGE_SIZE) + response = await auth_client.get("/users?page=1&edition_name=ed2022&name=1", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == max(count - DB_PAGE_SIZE, 0) -def test_get_admins_from_edition(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): +async def test_get_admins_from_edition(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for getting a list of admins, edition should be ignored""" - auth_client.admin() + await auth_client.admin() # All admins from edition - response = auth_client.get(f"/users?admin=true&edition={data['edition1']}") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == 2 + async with auth_client: + response = await auth_client.get(f"/users?admin=true&edition={data['edition1']}", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == 2 - response = auth_client.get(f"/users?admin=true&edition={data['edition2']}") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['users']) == 2 + response = await auth_client.get(f"/users?admin=true&edition={data['edition2']}", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['users']) == 2 -def test_get_all_users_excluded_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): - auth_client.admin() +async def test_get_all_users_excluded_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): + await auth_client.admin() edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") database_session.add(edition_a) database_session.add(edition_b) - database_session.commit() + await database_session.commit() for i in range(round(DB_PAGE_SIZE * 1.5)): user_1 = models.User(name=f"User {i} - a", admin=False) user_2 = models.User(name=f"User {i} - b", admin=False) database_session.add(user_1) database_session.add(user_2) - database_session.commit() - database_session.execute(models.user_editions.insert(), [ + await database_session.commit() + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_a.edition_id}, {"user_id": user_2.user_id, "edition_id": edition_b.edition_id}, ]) - database_session.commit() - - a_users = auth_client.get(f"/users?page=0&exclude_edition=edB").json()["users"] - assert len(a_users) == DB_PAGE_SIZE - for user in a_users: - assert "b" not in user["name"] - assert len(auth_client.get(f"/users?page=1&exclude_edition=edB").json()["users"]) == \ - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 # auth_client is not a coach - - b_users = auth_client.get(f"/users?page=0&exclude_edition=edA").json()["users"] - assert len(b_users) == DB_PAGE_SIZE - for user in b_users: - assert "a" not in user["name"] - assert len(auth_client.get(f"/users?page=1&exclude_edition=edA").json()["users"]) == \ - round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 # auth_client is not a coach - - -def test_get_all_users_excluded_edition_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): - auth_client.admin() + await database_session.commit() + + async with auth_client: + a_users = (await auth_client.get(f"/users?page=0&exclude_edition=edB", follow_redirects=True)).json()["users"] + assert len(a_users) == DB_PAGE_SIZE + for user in a_users: + assert "b" not in user["name"] + assert len((await auth_client.get(f"/users?page=1&exclude_edition=edB", follow_redirects=True)).json()["users"]) == \ + round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 # auth_client is not a coach + + b_users = (await auth_client.get(f"/users?page=0&exclude_edition=edA", follow_redirects=True)).json()["users"] + assert len(b_users) == DB_PAGE_SIZE + for user in b_users: + assert "a" not in user["name"] + assert len((await auth_client.get(f"/users?page=1&exclude_edition=edA", follow_redirects=True)).json()["users"]) == \ + round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1 # auth_client is not a coach + + +async def test_get_all_users_excluded_edition_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): + await auth_client.admin() edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") database_session.add(edition_a) database_session.add(edition_b) - database_session.commit() + await database_session.commit() count = 0 for i in range(round(DB_PAGE_SIZE * 1.5)): @@ -320,37 +333,38 @@ def test_get_all_users_excluded_edition_paginated_filter_name(database_session: user_2 = models.User(name=f"User {i} - b", admin=False) database_session.add(user_1) database_session.add(user_2) - database_session.commit() - database_session.execute(models.user_editions.insert(), [ + await database_session.commit() + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_a.edition_id}, {"user_id": user_2.user_id, "edition_id": edition_b.edition_id}, ]) if "1" in str(i): count += 1 - database_session.commit() - - a_users = auth_client.get(f"/users?page=0&exclude_edition=edB&name=1").json()["users"] - assert len(a_users) == min(count, DB_PAGE_SIZE) - for user in a_users: - assert "b" not in user["name"] - assert len(auth_client.get(f"/users?page=1&exclude_edition=edB&name=1").json()["users"]) == \ - max(count - DB_PAGE_SIZE, 0) - - b_users = auth_client.get(f"/users?page=0&exclude_edition=edA&name=1").json()["users"] - assert len(b_users) == min(count, DB_PAGE_SIZE) - for user in b_users: - assert "a" not in user["name"] - assert len(auth_client.get(f"/users?page=1&exclude_edition=edA&name=1").json()["users"]) == \ - max(count - DB_PAGE_SIZE, 0) - - -def test_get_all_users_for_edition_excluded_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): - auth_client.admin() + await database_session.commit() + + async with auth_client: + a_users = (await auth_client.get(f"/users?page=0&exclude_edition=edB&name=1", follow_redirects=True)).json()["users"] + assert len(a_users) == min(count, DB_PAGE_SIZE) + for user in a_users: + assert "b" not in user["name"] + assert len((await auth_client.get(f"/users?page=1&exclude_edition=edB&name=1", follow_redirects=True)).json()["users"]) == \ + max(count - DB_PAGE_SIZE, 0) + + b_users = (await auth_client.get(f"/users?page=0&exclude_edition=edA&name=1", follow_redirects=True)).json()["users"] + assert len(b_users) == min(count, DB_PAGE_SIZE) + for user in b_users: + assert "a" not in user["name"] + assert len((await auth_client.get(f"/users?page=1&exclude_edition=edA&name=1", follow_redirects=True)).json()["users"]) == \ + max(count - DB_PAGE_SIZE, 0) + + +async def test_get_all_users_for_edition_excluded_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): + await auth_client.admin() edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") database_session.add(edition_a) database_session.add(edition_b) - database_session.commit() + await database_session.commit() correct_users_id = [] for i in range(round(DB_PAGE_SIZE * 1.5)): @@ -358,56 +372,58 @@ def test_get_all_users_for_edition_excluded_edition_paginated(database_session: user_2 = models.User(name=f"User {i} - b", admin=False) database_session.add(user_1) database_session.add(user_2) - database_session.commit() - database_session.execute(models.user_editions.insert(), [ + await database_session.commit() + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_a.edition_id}, {"user_id": user_2.user_id, "edition_id": edition_b.edition_id}, ]) if i % 2: - database_session.execute(models.user_editions.insert(), [ + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_b.edition_id}, ]) else: correct_users_id.append(user_1.user_id) - database_session.commit() - - users = auth_client.get(f"/users?page=0&exclude_edition=edB&edition=edA").json()["users"] - assert len(users) == len(correct_users_id) - for user in users: - assert user["userId"] in correct_users_id + await database_session.commit() + async with auth_client: + users = (await auth_client.get(f"/users?page=0&exclude_edition=edB&edition=edA", follow_redirects=True)).json()["users"] + assert len(users) == len(correct_users_id) + for user in users: + assert user["userId"] in correct_users_id -def test_get_users_invalid(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): +async def test_get_users_invalid(database_session: AsyncSession, auth_client: AuthClient, data: dict[str, str | int]): """Test endpoint for unvalid input""" - auth_client.admin() + await auth_client.admin() # Invalid input - response = auth_client.get("/users?admin=INVALID") - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + async with auth_client: + response = await auth_client.get("/users?admin=INVALID", follow_redirects=True) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_edit_admin_status(database_session: AsyncSession, auth_client: AuthClient): +async def test_edit_admin_status(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for editing the admin status of a user""" - auth_client.admin() + await auth_client.admin() # Create user user = models.User(name="user1", admin=False) database_session.add(user) - database_session.commit() + await database_session.commit() - response = auth_client.patch(f"/users/{user.user_id}", - data=dumps({"admin": True})) - assert response.status_code == status.HTTP_204_NO_CONTENT - assert user.admin + async with auth_client: + response = await auth_client.patch(f"/users/{user.user_id}", + json={"admin": True}) + assert response.status_code == status.HTTP_204_NO_CONTENT + assert user.admin - response = auth_client.patch(f"/users/{user.user_id}", - data=dumps({"admin": False})) - assert response.status_code == status.HTTP_204_NO_CONTENT - assert not user.admin + response = await auth_client.patch(f"/users/{user.user_id}", + json={"admin": False}) + assert response.status_code == status.HTTP_204_NO_CONTENT + assert not user.admin -def test_add_coach(database_session: AsyncSession, auth_client: AuthClient): +async def test_add_coach(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for adding coaches""" - auth_client.admin() + await auth_client.admin() # Create user user = models.User(name="user1", admin=False) database_session.add(user) @@ -416,19 +432,20 @@ def test_add_coach(database_session: AsyncSession, auth_client: AuthClient): edition = models.Edition(year=1, name="ed1") database_session.add(edition) - database_session.commit() + await database_session.commit() # Add coach - response = auth_client.post(f"/users/{user.user_id}/editions/{edition.name}") - assert response.status_code == status.HTTP_204_NO_CONTENT - coach = database_session.query(user_editions).one() - assert coach.user_id == user.user_id - assert coach.edition_id == edition.edition_id + async with auth_client: + response = await auth_client.post(f"/users/{user.user_id}/editions/{edition.name}") + assert response.status_code == status.HTTP_204_NO_CONTENT + coach = (await database_session.execute(select(user_editions))).one() + assert coach.user_id == user.user_id + assert coach.edition_id == edition.edition_id -def test_remove_coach(database_session: AsyncSession, auth_client: AuthClient): +async def test_remove_coach(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for removing coaches""" - auth_client.admin() + await auth_client.admin() # Create user user = models.User(name="user1") database_session.add(user) @@ -437,24 +454,25 @@ def test_remove_coach(database_session: AsyncSession, auth_client: AuthClient): edition = models.Edition(year=1, name="ed1") database_session.add(edition) - database_session.commit() + await database_session.commit() # Create request request = models.CoachRequest(user_id=user.user_id, edition_id=edition.edition_id) database_session.add(request) - database_session.commit() + await database_session.commit() # Remove coach - response = auth_client.delete(f"/users/{user.user_id}/editions/{edition.name}") - assert response.status_code == status.HTTP_204_NO_CONTENT - coach = database_session.query(user_editions).all() - assert len(coach) == 0 + async with auth_client: + response = await auth_client.delete(f"/users/{user.user_id}/editions/{edition.name}") + assert response.status_code == status.HTTP_204_NO_CONTENT + coach = (await database_session.execute(select(user_editions))).scalars().all() + assert len(coach) == 0 -def test_remove_coach_all_editions(database_session: AsyncSession, auth_client: AuthClient): +async def test_remove_coach_all_editions(database_session: AsyncSession, auth_client: AuthClient): """Test removing a user as coach from all editions""" - auth_client.admin() + await auth_client.admin() # Create user user1 = models.User(name="user1", admin=False) @@ -470,25 +488,26 @@ def test_remove_coach_all_editions(database_session: AsyncSession, auth_client: database_session.add(edition2) database_session.add(edition3) - database_session.commit() + await database_session.commit() # Create coach role - database_session.execute(models.user_editions.insert(), [ + await database_session.execute(models.user_editions.insert(), [ {"user_id": user1.user_id, "edition_id": edition1.edition_id}, {"user_id": user1.user_id, "edition_id": edition2.edition_id}, {"user_id": user1.user_id, "edition_id": edition3.edition_id}, {"user_id": user2.user_id, "edition_id": edition2.edition_id}, ]) - response = auth_client.delete(f"/users/{user1.user_id}/editions") - assert response.status_code == status.HTTP_204_NO_CONTENT - coach = database_session.query(user_editions).all() - assert len(coach) == 1 + async with auth_client: + response = await auth_client.delete(f"/users/{user1.user_id}/editions") + assert response.status_code == status.HTTP_204_NO_CONTENT + coach = (await database_session.execute(select(user_editions))).all() + assert len(coach) == 1 -def test_get_all_requests(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_requests(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting all userrequests""" - auth_client.admin() + await auth_client.admin() # Create user user1 = models.User(name="user1") @@ -502,7 +521,7 @@ def test_get_all_requests(database_session: AsyncSession, auth_client: AuthClien database_session.add(edition1) database_session.add(edition2) - database_session.commit() + await database_session.commit() # Create request request1 = models.CoachRequest(user_id=user1.user_id, edition_id=edition1.edition_id) @@ -510,17 +529,18 @@ def test_get_all_requests(database_session: AsyncSession, auth_client: AuthClien database_session.add(request1) database_session.add(request2) - database_session.commit() + await database_session.commit() - response = auth_client.get("/users/requests") - assert response.status_code == status.HTTP_200_OK - user_ids = [request["user"]["userId"] for request in response.json()['requests']] - assert len(user_ids) == 2 - assert user1.user_id in user_ids - assert user2.user_id in user_ids + async with auth_client: + response = await auth_client.get("/users/requests") + assert response.status_code == status.HTTP_200_OK + user_ids = [request["user"]["userId"] for request in response.json()['requests']] + assert len(user_ids) == 2 + assert user1.user_id in user_ids + assert user2.user_id in user_ids -def test_get_all_requests_paginated(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_requests_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a paginated list of requests""" edition = models.Edition(year=2022, name="ed2022") @@ -528,18 +548,19 @@ def test_get_all_requests_paginated(database_session: AsyncSession, auth_client: user = models.User(name=f"User {i}", admin=False) database_session.add(user) database_session.add(models.CoachRequest(user=user, edition=edition)) - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users/requests?page=0") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['requests']) == DB_PAGE_SIZE - response = auth_client.get("/users/requests?page=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['requests']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users/requests?page=0") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['requests']) == DB_PAGE_SIZE + response = await auth_client.get("/users/requests?page=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['requests']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE -def test_get_all_requests_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_requests_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a paginated list of requests""" edition = models.Edition(year=2022, name="ed2022") @@ -550,20 +571,21 @@ def test_get_all_requests_paginated_filter_name(database_session: AsyncSession, database_session.add(models.CoachRequest(user=user, edition=edition)) if "1" in str(i): count += 1 - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users/requests?page=0&user=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['requests']) == min(DB_PAGE_SIZE, count) - response = auth_client.get("/users/requests?page=1&user=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['requests']) == max(count-DB_PAGE_SIZE, 0) + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users/requests?page=0&user=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['requests']) == min(DB_PAGE_SIZE, count) + response = await auth_client.get("/users/requests?page=1&user=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['requests']) == max(count-DB_PAGE_SIZE, 0) -def test_get_all_requests_from_edition(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_requests_from_edition(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting all userrequests of a given edition""" - auth_client.admin() + await auth_client.admin() # Create user user1 = models.User(name="user1") @@ -577,7 +599,7 @@ def test_get_all_requests_from_edition(database_session: AsyncSession, auth_clie database_session.add(edition1) database_session.add(edition2) - database_session.commit() + await database_session.commit() # Create request request1 = models.CoachRequest(user_id=user1.user_id, edition_id=edition1.edition_id) @@ -585,22 +607,23 @@ def test_get_all_requests_from_edition(database_session: AsyncSession, auth_clie database_session.add(request1) database_session.add(request2) - database_session.commit() + await database_session.commit() - response = auth_client.get(f"/users/requests?edition={edition1.name}") - assert response.status_code == status.HTTP_200_OK - requests = response.json()['requests'] - assert len(requests) == 1 - assert user1.user_id == requests[0]["user"]["userId"] + async with auth_client: + response = await auth_client.get(f"/users/requests?edition={edition1.name}") + assert response.status_code == status.HTTP_200_OK + requests = response.json()['requests'] + assert len(requests) == 1 + assert user1.user_id == requests[0]["user"]["userId"] - response = auth_client.get(f"/users/requests?edition={edition2.name}") - assert response.status_code == status.HTTP_200_OK - requests = response.json()['requests'] - assert len(requests) == 1 - assert user2.user_id == requests[0]["user"]["userId"] + response = await auth_client.get(f"/users/requests?edition={edition2.name}") + assert response.status_code == status.HTTP_200_OK + requests = response.json()['requests'] + assert len(requests) == 1 + assert user2.user_id == requests[0]["user"]["userId"] -def test_get_all_requests_for_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_requests_for_edition_paginated(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a paginated list of requests""" edition = models.Edition(year=2022, name="ed2022") @@ -608,18 +631,19 @@ def test_get_all_requests_for_edition_paginated(database_session: AsyncSession, user = models.User(name=f"User {i}", admin=False) database_session.add(user) database_session.add(models.CoachRequest(user=user, edition=edition)) - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users/requests?page=0&edition_name=ed2022") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['requests']) == DB_PAGE_SIZE - response = auth_client.get("/users/requests?page=1&edition_name=ed2022") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['requests']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users/requests?page=0&edition_name=ed2022") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['requests']) == DB_PAGE_SIZE + response = await auth_client.get("/users/requests?page=1&edition_name=ed2022") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['requests']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE -def test_get_all_requests_for_edition_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): +async def test_get_all_requests_for_edition_paginated_filter_name(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for getting a paginated list of requests""" edition = models.Edition(year=2022, name="ed2022") @@ -630,20 +654,21 @@ def test_get_all_requests_for_edition_paginated_filter_name(database_session: As database_session.add(models.CoachRequest(user=user, edition=edition)) if "1" in str(i): count += 1 - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.get("/users/requests?page=0&edition_name=ed2022&user=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['requests']) == min(DB_PAGE_SIZE, count) - response = auth_client.get("/users/requests?page=1&edition_name=ed2022&user=1") - assert response.status_code == status.HTTP_200_OK - assert len(response.json()['requests']) == max(count-DB_PAGE_SIZE, 0) + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/users/requests?page=0&edition_name=ed2022&user=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['requests']) == min(DB_PAGE_SIZE, count) + response = await auth_client.get("/users/requests?page=1&edition_name=ed2022&user=1") + assert response.status_code == status.HTTP_200_OK + assert len(response.json()['requests']) == max(count-DB_PAGE_SIZE, 0) -def test_accept_request(database_session, auth_client: AuthClient): +async def test_accept_request(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for accepting a coach request""" - auth_client.admin() + await auth_client.admin() # Create user user1 = models.User(name="user1") database_session.add(user1) @@ -652,24 +677,25 @@ def test_accept_request(database_session, auth_client: AuthClient): edition1 = models.Edition(year=1, name="ed1") database_session.add(edition1) - database_session.commit() + await database_session.commit() # Create request request1 = models.CoachRequest(user_id=user1.user_id, edition_id=edition1.edition_id) database_session.add(request1) - database_session.commit() + await database_session.commit() - response = auth_client.post(f"users/requests/{request1.request_id}/accept") - assert response.status_code == status.HTTP_204_NO_CONTENT + async with auth_client: + response = await auth_client.post(f"users/requests/{request1.request_id}/accept") + assert response.status_code == status.HTTP_204_NO_CONTENT - assert len(user1.editions) == 1 - assert user1.editions[0].edition_id == edition1.edition_id + assert len(user1.editions) == 1 + assert user1.editions[0].edition_id == edition1.edition_id -def test_reject_request(database_session, auth_client: AuthClient): +async def test_reject_request(database_session: AsyncSession, auth_client: AuthClient): """Test endpoint for rejecting a coach request""" - auth_client.admin() + await auth_client.admin() # Create user user1 = models.User(name="user1") database_session.add(user1) @@ -678,19 +704,20 @@ def test_reject_request(database_session, auth_client: AuthClient): edition1 = models.Edition(year=1, name="ed1") database_session.add(edition1) - database_session.commit() + await database_session.commit() # Create request request1 = models.CoachRequest(user_id=user1.user_id, edition_id=edition1.edition_id) database_session.add(request1) - database_session.commit() + await database_session.commit() - response = auth_client.post(f"users/requests/{request1.request_id}/reject") - assert response.status_code == status.HTTP_204_NO_CONTENT + async with auth_client: + response = await auth_client.post(f"users/requests/{request1.request_id}/reject") + assert response.status_code == status.HTTP_204_NO_CONTENT - requests = database_session.query(CoachRequest).all() - assert len(requests) == 0 + requests = (await database_session.execute(select(CoachRequest))).scalars().all() + assert len(requests) == 0 - response = auth_client.post("users/requests/INVALID/reject") - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + response = await auth_client.post("users/requests/INVALID/reject") + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY From c61ec5060a1a28576188a3b0b7bcd8524b821250 Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 09:02:03 +0200 Subject: [PATCH 122/649] webhook tests passing --- .../test_webhooks/test_webhooks.py | 124 ++++++++++-------- 1 file changed, 67 insertions(+), 57 deletions(-) diff --git a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py index cfb22069d..9cb533e20 100644 --- a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py +++ b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py @@ -3,6 +3,8 @@ import pytest from fastapi.testclient import TestClient +from httpx import AsyncClient +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status @@ -12,36 +14,38 @@ @pytest.fixture -def edition(database_session: AsyncSession) -> Edition: +async def edition(database_session: AsyncSession) -> Edition: edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() return edition @pytest.fixture -def webhook(edition: Edition, database_session: AsyncSession) -> WebhookURL: +async def webhook(edition: Edition, database_session: AsyncSession) -> WebhookURL: webhook = WebhookURL(edition=edition) database_session.add(webhook) - database_session.commit() + await database_session.commit() return webhook -def test_new_webhook(auth_client: AuthClient, edition: Edition): - auth_client.admin() - response = auth_client.post(f"/editions/{edition.name}/webhooks/") - assert response.status_code == status.HTTP_201_CREATED - assert 'uuid' in response.json() - assert UUID(response.json()['uuid']) +async def test_new_webhook(auth_client: AuthClient, edition: Edition): + await auth_client.admin() + async with auth_client: + response = await auth_client.post(f"/editions/{edition.name}/webhooks/") + assert response.status_code == status.HTTP_201_CREATED + assert 'uuid' in response.json() + assert UUID(response.json()['uuid']) -def test_new_webhook_invalid_edition(auth_client: AuthClient, edition: Edition): - auth_client.admin() - response = auth_client.post("/editions/invalid/webhooks/") - assert response.status_code == status.HTTP_404_NOT_FOUND +async def test_new_webhook_invalid_edition(auth_client: AuthClient, edition: Edition): + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/invalid/webhooks/") + assert response.status_code == status.HTTP_404_NOT_FOUND -def test_webhook(test_client: TestClient, webhook: WebhookURL, database_session: AsyncSession): +async def test_webhook(test_client: AsyncClient, webhook: WebhookURL, database_session: AsyncSession): event: dict = create_webhook_event( email_address="test@gmail.com", first_name="Bob", @@ -50,74 +54,80 @@ def test_webhook(test_client: TestClient, webhook: WebhookURL, database_session: wants_to_be_student_coach=False, phone_number="0477002266", ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_201_CREATED + async with test_client: + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_201_CREATED - student: Student = database_session.query(Student).first() - assert student.edition == webhook.edition - assert student.email_address == "test@gmail.com" - assert student.first_name == "Bob" - assert student.last_name == "Klonck" - assert student.preferred_name == "Jhon" - assert student.wants_to_be_student_coach is False - assert student.phone_number == "0477002266" + student: Student = (await database_session.execute(select(Student))).unique().scalars().first() + assert student.edition == webhook.edition + assert student.email_address == "test@gmail.com" + assert student.first_name == "Bob" + assert student.last_name == "Klonck" + assert student.preferred_name == "Jhon" + assert student.wants_to_be_student_coach is False + assert student.phone_number == "0477002266" -def test_webhook_bad_format(test_client: TestClient, webhook: WebhookURL): +async def test_webhook_bad_format(test_client: AsyncClient, webhook: WebhookURL): """Test a badly formatted webhook input""" - response = test_client.post( - f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", - json=WEBHOOK_EVENT_BAD_FORMAT - ) + async with test_client: + response = await test_client.post( + f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", + json=WEBHOOK_EVENT_BAD_FORMAT + ) assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_webhook_duplicate_email(test_client: TestClient, webhook: WebhookURL, mocker): +async def test_webhook_duplicate_email(test_client: AsyncClient, webhook: WebhookURL, mocker): """Test entering a duplicate email address""" mocker.patch('builtins.open', new_callable=mock_open()) event: dict = create_webhook_event( email_address="test@gmail.com", ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_201_CREATED + async with test_client: + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_201_CREATED - event: dict = create_webhook_event( - email_address="test@gmail.com", - ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + event: dict = create_webhook_event( + email_address="test@gmail.com", + ) + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_webhook_duplicate_phone(test_client: TestClient, webhook: WebhookURL, mocker): +async def test_webhook_duplicate_phone(test_client: AsyncClient, webhook: WebhookURL, mocker): """Test entering a duplicate phone number""" mocker.patch('builtins.open', new_callable=mock_open()) event: dict = create_webhook_event( phone_number="0477002266", ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_201_CREATED + async with test_client: + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_201_CREATED - event: dict = create_webhook_event( - phone_number="0477002266", - ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + event: dict = create_webhook_event( + phone_number="0477002266", + ) + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_webhook_missing_question(test_client: TestClient, webhook: WebhookURL, mocker): +async def test_webhook_missing_question(test_client: AsyncClient, webhook: WebhookURL, mocker): """Test submitting a form with a question missing""" mocker.patch('builtins.open', new_callable=mock_open()) - response = test_client.post( - f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", - json=WEBHOOK_MISSING_QUESTION - ) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + async with test_client: + response = await test_client.post( + f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", + json=WEBHOOK_MISSING_QUESTION + ) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_new_webhook_old_edition(database_session: AsyncSession, auth_client: AuthClient, edition: Edition): +async def test_new_webhook_old_edition(database_session: AsyncSession, auth_client: AuthClient, edition: Edition): database_session.add(Edition(year=2023, name="ed2023")) - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.post(f"/editions/{edition.name}/webhooks/") - assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + await auth_client.admin() + async with auth_client: + response = await auth_client.post(f"/editions/{edition.name}/webhooks/") + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED From eb81700254bf8e21e09e1f242d0cd423d92318c6 Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 09:23:15 +0200 Subject: [PATCH 123/649] removed unnecessary typing --- backend/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index 28583595b..15193b5b4 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -28,7 +28,7 @@ def tables(): @pytest.fixture -async def database_session(tables: None) -> Generator[AsyncSession, None, None]: +async def database_session(tables) -> Generator[AsyncSession, None, None]: """ Fixture to create a session for every test, and rollback all the transactions so that each tests starts with a clean db From 69237fd8eb83ab0086451f669b6bdd12b42dd009 Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 09:46:59 +0200 Subject: [PATCH 124/649] fix typing and linting --- backend/src/app/logic/users.py | 3 ++- .../app/routers/editions/webhooks/webhooks.py | 3 ++- backend/src/app/routers/login/login.py | 6 ++++-- backend/src/app/utils/dependencies.py | 6 ++++-- backend/src/database/crud/invites.py | 3 ++- backend/src/database/crud/skills.py | 6 +++--- backend/src/database/crud/users.py | 6 ++++-- backend/src/database/database.py | 4 ++-- backend/src/database/models.py | 16 +++++++++++----- backend/tests/conftest.py | 9 ++++----- 10 files changed, 38 insertions(+), 24 deletions(-) diff --git a/backend/src/app/logic/users.py b/backend/src/app/logic/users.py index 5f31d027d..805f8c705 100644 --- a/backend/src/app/logic/users.py +++ b/backend/src/app/logic/users.py @@ -54,7 +54,8 @@ async def remove_coach_all_editions(db: AsyncSession, user_id: int): await users_crud.remove_coach_all_editions(db, user_id) -async def get_request_list(db: AsyncSession, edition_name: str | None, user_name: str | None, page: int) -> UserRequestsResponse: +async def get_request_list(db: AsyncSession, edition_name: str | None, user_name: str | None, page: int) \ + -> UserRequestsResponse: """ Query the database for a list of all user requests and wrap the result in a pydantic model diff --git a/backend/src/app/routers/editions/webhooks/webhooks.py b/backend/src/app/routers/editions/webhooks/webhooks.py index 8414517ce..ce49f45bf 100644 --- a/backend/src/app/routers/editions/webhooks/webhooks.py +++ b/backend/src/app/routers/editions/webhooks/webhooks.py @@ -26,7 +26,8 @@ async def new(edition: Edition = Depends(get_latest_edition), database: AsyncSes @webhooks_router.post("/{uuid}", dependencies=[Depends(valid_uuid)], status_code=status.HTTP_201_CREATED) -async def webhook(data: WebhookEvent, edition: Edition = Depends(get_edition), database: AsyncSession = Depends(get_session)): +async def webhook(data: WebhookEvent, edition: Edition = Depends(get_edition), + database: AsyncSession = Depends(get_session)): """Receive a webhook event, This is triggered by Tally""" try: await process_webhook(edition, data, database) diff --git a/backend/src/app/routers/login/login.py b/backend/src/app/routers/login/login.py index 72ee813d7..54a5504f2 100644 --- a/backend/src/app/routers/login/login.py +++ b/backend/src/app/routers/login/login.py @@ -18,7 +18,8 @@ @login_router.post("/token", response_model=Token) -async def login_for_access_token(db: AsyncSession = Depends(get_session), form_data: OAuth2PasswordRequestForm = Depends()): +async def login_for_access_token(db: AsyncSession = Depends(get_session), + form_data: OAuth2PasswordRequestForm = Depends()): """Called when logging in, generates an access token to use in other functions""" try: user = await authenticate_user(db, form_data.username, form_data.password) @@ -31,7 +32,8 @@ async def login_for_access_token(db: AsyncSession = Depends(get_session), form_d @login_router.post("/refresh", response_model=Token) -async def refresh_access_token(db: AsyncSession = Depends(get_session), user: User = Depends(get_user_from_refresh_token)): +async def refresh_access_token(db: AsyncSession = Depends(get_session), + user: User = Depends(get_user_from_refresh_token)): """ Return a new access & refresh token using on the old refresh token diff --git a/backend/src/app/utils/dependencies.py b/backend/src/app/utils/dependencies.py index 003b44655..4b30e226b 100644 --- a/backend/src/app/utils/dependencies.py +++ b/backend/src/app/utils/dependencies.py @@ -35,7 +35,8 @@ async def get_suggestion(suggestion_id: int, database: AsyncSession = Depends(ge return await get_suggestion_by_id(database, suggestion_id) -async def get_latest_edition(edition: Edition = Depends(get_edition), database: AsyncSession = Depends(get_session)) -> Edition: +async def get_latest_edition(edition: Edition = Depends(get_edition), database: AsyncSession = Depends(get_session)) \ + -> Edition: """Checks if the given edition is the latest one (others are read-only) and returns it if it is""" latest = await latest_edition(database) if edition != latest: @@ -79,7 +80,8 @@ async def get_user_from_access_token(db: AsyncSession = Depends(get_session), return await _get_user_from_token(TokenType.ACCESS, db, token) -async def get_user_from_refresh_token(db: AsyncSession = Depends(get_session), token: str = Depends(oauth2_scheme)) -> User: +async def get_user_from_refresh_token(db: AsyncSession = Depends(get_session), token: str = Depends(oauth2_scheme)) \ + -> User: """Check which user is making a request by decoding its refresh token This function is used as a dependency for other functions """ diff --git a/backend/src/database/crud/invites.py b/backend/src/database/crud/invites.py index 14b1965b0..fa36e8ab4 100644 --- a/backend/src/database/crud/invites.py +++ b/backend/src/database/crud/invites.py @@ -41,7 +41,8 @@ async def get_pending_invites_for_edition_page(db: AsyncSession, edition: Editio return result.scalars().all() -async def get_optional_invite_link_by_edition_and_email(db: AsyncSession, edition: Edition, email: str) -> InviteLink | None: +async def get_optional_invite_link_by_edition_and_email(db: AsyncSession, edition: Edition, email: str) \ + -> InviteLink | None: """Return an optional invite link by edition and target_email""" query = select(InviteLink)\ .where(InviteLink.edition == edition)\ diff --git a/backend/src/database/crud/skills.py b/backend/src/database/crud/skills.py index 8d66dd402..6a322b303 100644 --- a/backend/src/database/crud/skills.py +++ b/backend/src/database/crud/skills.py @@ -1,4 +1,4 @@ -from sqlalchemy import select +from sqlalchemy import select, delete from sqlalchemy.ext.asyncio import AsyncSession from src.app.schemas.skills import SkillBase @@ -46,6 +46,6 @@ async def delete_skill(db: AsyncSession, skill_id: int): db (Session): connection with the database. skill_id (int): the id of the skill """ - skill_to_delete = db.query(Skill).where(Skill.skill_id == skill_id).one() - await db.delete(skill_to_delete) + skill_to_delete = delete(Skill).where(Skill.skill_id == skill_id) + await db.execute(skill_to_delete) await db.commit() diff --git a/backend/src/database/crud/users.py b/backend/src/database/crud/users.py index 07d8bb16c..e1417ec07 100644 --- a/backend/src/database/crud/users.py +++ b/backend/src/database/crud/users.py @@ -157,14 +157,16 @@ async def get_requests_for_edition_page( Get all userrequests from a given edition """ edition = await get_edition_by_name(db, edition_name) - return (await db.execute(paginate(_get_requests_for_edition_query(edition, user_name), page))).unique().scalars().all() + return \ + (await db.execute(paginate(_get_requests_for_edition_query(edition, user_name), page))).unique().scalars().all() async def accept_request(db: AsyncSession, request_id: int): """ Remove request and add user as coach """ - request = (await db.execute(select(CoachRequest).where(CoachRequest.request_id == request_id))).unique().scalar_one() + request = \ + (await db.execute(select(CoachRequest).where(CoachRequest.request_id == request_id))).unique().scalar_one() edition = (await db.execute(select(Edition).where(Edition.edition_id == request.edition_id))).scalar_one() await add_coach(db, request.user_id, edition.name) await db.execute(delete(CoachRequest).where(CoachRequest.request_id == request_id)) diff --git a/backend/src/database/database.py b/backend/src/database/database.py index b23ad4c7d..6b4dd9968 100644 --- a/backend/src/database/database.py +++ b/backend/src/database/database.py @@ -1,9 +1,9 @@ -from typing import Generator +from typing import AsyncGenerator from sqlalchemy.ext.asyncio import AsyncSession -async def get_session() -> Generator[AsyncSession, None, None]: +async def get_session() -> AsyncGenerator[AsyncSession, None]: """FastAPI dependency to inject a database session into a route instead of using an import Allows the tests to replace it with another database session (not hard coding the session) """ diff --git a/backend/src/database/models.py b/backend/src/database/models.py index 8add39c04..6cab3d268 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -133,8 +133,11 @@ class Project(Base): edition: Edition = relationship("Edition", back_populates="projects", uselist=False, lazy="joined") coaches: list[User] = relationship("User", secondary="project_coaches", back_populates="projects", lazy="joined") skills: list[Skill] = relationship("Skill", secondary="project_skills", back_populates="projects", lazy="joined") - partners: list[Partner] = relationship("Partner", secondary="project_partners", back_populates="projects", lazy="joined") - project_roles: list[ProjectRole] = relationship("ProjectRole", back_populates="project", lazy="joined", cascade="save-update, merge, delete, delete-orphan") + partners: list[Partner] = \ + relationship("Partner", secondary="project_partners", back_populates="projects", lazy="joined") + project_roles: list[ProjectRole] = \ + relationship("ProjectRole", back_populates="project", lazy="joined", + cascade="save-update, merge, delete, delete-orphan") project_coaches = Table( @@ -220,7 +223,8 @@ class Student(Base): wants_to_be_student_coach = Column(Boolean, nullable=False, default=False) edition_id = Column(Integer, ForeignKey("editions.edition_id")) - emails: list[DecisionEmail] = relationship("DecisionEmail", back_populates="student", cascade="all, delete-orphan", lazy="joined") + emails: list[DecisionEmail] = \ + relationship("DecisionEmail", back_populates="student", cascade="all, delete-orphan", lazy="joined") project_roles: list[ProjectRole] = relationship("ProjectRole", back_populates="student", lazy="joined") skills: list[Skill] = relationship("Skill", secondary="student_skills", back_populates="students", lazy="joined") suggestions: list[Suggestion] = relationship("Suggestion", back_populates="student", lazy="joined") @@ -301,8 +305,10 @@ class User(Base): coach_request: CoachRequest = relationship("CoachRequest", back_populates="user", uselist=False, lazy="joined") drafted_roles: list[ProjectRole] = relationship("ProjectRole", back_populates="drafter", lazy="joined") - editions: list[Edition] = relationship("Edition", secondary="user_editions", back_populates="coaches", lazy="joined") - projects: list[Project] = relationship("Project", secondary="project_coaches", back_populates="coaches", lazy="joined") + editions: list[Edition] = \ + relationship("Edition", secondary="user_editions", back_populates="coaches", lazy="joined") + projects: list[Project] = \ + relationship("Project", secondary="project_coaches", back_populates="coaches", lazy="joined") suggestions: list[Suggestion] = relationship("Suggestion", back_populates="coach", lazy="joined") # Authentication methods diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index 15193b5b4..230b8e18a 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -1,12 +1,11 @@ """Pytest configuration file with fixtures""" -from typing import Generator +from typing import AsyncGenerator import pytest from alembic import command from alembic import config from httpx import AsyncClient from sqlalchemy.ext.asyncio import AsyncSession -from starlette.testclient import TestClient from src.app import app from src.database.database import get_session @@ -28,7 +27,7 @@ def tables(): @pytest.fixture -async def database_session(tables) -> Generator[AsyncSession, None, None]: +async def database_session(tables) -> AsyncGenerator[AsyncSession, None]: """ Fixture to create a session for every test, and rollback all the transactions so that each tests starts with a clean db @@ -56,7 +55,7 @@ async def database_session(tables) -> Generator[AsyncSession, None, None]: def test_client(database_session: AsyncSession) -> AsyncClient: """Fixture to create a testing version of our main application""" - def override_get_session() -> Generator[AsyncSession, None, None]: + def override_get_session() -> AsyncGenerator[AsyncSession, None]: """Inner function to override the Session used in the app A session provided by a fixture will be used instead """ @@ -71,7 +70,7 @@ def override_get_session() -> Generator[AsyncSession, None, None]: def auth_client(database_session: AsyncSession) -> AuthClient: """Fixture to get a TestClient that handles authentication""" - def override_get_session() -> Generator[AsyncSession, None, None]: + def override_get_session() -> AsyncGenerator[AsyncSession, None]: """Inner function to override the Session used in the app A session provided by a fixture will be used instead """ From 250b0c43ea5218708ef62a7f0342d62c4d57aff3 Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 09:55:07 +0200 Subject: [PATCH 125/649] fix fill db --- backend/tests/fill_database.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/tests/fill_database.py b/backend/tests/fill_database.py index acf61fd5f..c974538d2 100644 --- a/backend/tests/fill_database.py +++ b/backend/tests/fill_database.py @@ -8,12 +8,12 @@ from src.app.logic.security import get_password_hash -def fill_database(db: Session): +async def fill_database(db: AsyncSession): """A function to fill the database with fake data that can easly be used when testing""" # Editions edition: Edition = Edition(year=2022, name="ed2022") db.add(edition) - db.commit() + await db.commit() # Users admin: User = User(name="admin", admin=True) @@ -24,7 +24,7 @@ def fill_database(db: Session): db.add(coach1) db.add(coach2) db.add(request) - db.commit() + await db.commit() # AuthEmail pw_hash = get_password_hash("wachtwoord") @@ -36,7 +36,7 @@ def fill_database(db: Session): db.add(auth_email_coach1) db.add(auth_email_coach2) db.add(auth_email_request) - db.commit() + await db.commit() # Skill skill1: Skill = Skill(name="skill1", description="something about skill1") @@ -51,7 +51,7 @@ def fill_database(db: Session): db.add(skill4) db.add(skill5) db.add(skill6) - db.commit() + await db.commit() # Student student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", @@ -179,12 +179,12 @@ def fill_database(db: Session): db.add(student29) db.add(student30) db.add(student31) - db.commit() + await db.commit() # CoachRequest coach_request: CoachRequest = CoachRequest(edition=edition, user=request) db.add(coach_request) - db.commit() + await db.commit() # DecisionEmail decision_email1: DecisionEmail = DecisionEmail( @@ -208,7 +208,7 @@ def fill_database(db: Session): db.add(decision_email5) db.add(decision_email6) db.add(decision_email7) - db.commit() + await db.commit() # InviteLink invite_link1: InviteLink = InviteLink( @@ -217,7 +217,7 @@ def fill_database(db: Session): target_email="newuser2@email.com", edition=edition) db.add(invite_link1) db.add(invite_link2) - db.commit() + await db.commit() # Partner partner1: Partner = Partner(name="Partner1") @@ -226,7 +226,7 @@ def fill_database(db: Session): db.add(partner1) db.add(partner2) db.add(partner3) - db.commit() + await db.commit() # Project project1: Project = Project( @@ -241,7 +241,7 @@ def fill_database(db: Session): db.add(project2) db.add(project3) db.add(project4) - db.commit() + await db.commit() # Suggestion suggestion1: Suggestion = Suggestion( @@ -268,7 +268,7 @@ def fill_database(db: Session): db.add(suggestion6) db.add(suggestion7) db.add(suggestion8) - db.commit() + await db.commit() # ProjectRole project_role1: ProjectRole = ProjectRole( @@ -294,4 +294,4 @@ def fill_database(db: Session): db.add(project_role5) db.add(project_role6) db.add(project_role7) - db.commit() + await db.commit() From 3fe4451630a6320112cda5f36f36c57a185ad649 Mon Sep 17 00:00:00 2001 From: beguille Date: Mon, 9 May 2022 10:25:41 +0200 Subject: [PATCH 126/649] tests working again after merge with develop --- backend/src/app/app.py | 13 +++---------- backend/tests/conftest.py | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/backend/src/app/app.py b/backend/src/app/app.py index 3f81a5a3a..cbdb60a08 100644 --- a/backend/src/app/app.py +++ b/backend/src/app/app.py @@ -38,13 +38,6 @@ async def startup(): """ Check if all migrations have been executed. If not refuse to start the app. """ - #alembic_config: config.Config = config.Config('alembic.ini') - #alembic_script: script.ScriptDirectory = script.ScriptDirectory.from_config(alembic_config) - #async with engine.begin() as conn: - # revision: str = await conn.run_sync( - # lambda sync_conn: migration.MigrationContext.configure(sync_conn).get_current_revision() - # ) - # alembic_head: str = alembic_script.get_current_head() - # if revision != alembic_head: - # raise PendingMigrationsException('Pending migrations') - Base.metadata.create_all(bind=engine) + + async with engine.begin() as conn: + await conn.run_sync(Base.metadata.create_all) diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index a6b0afde4..dc2f0eb1e 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -1,7 +1,9 @@ """Pytest configuration file with fixtures""" +import asyncio from typing import AsyncGenerator import pytest +import pytest_asyncio from alembic import command from alembic import config from httpx import AsyncClient @@ -25,15 +27,23 @@ # yield # command.downgrade(alembic_config, 'base') +@pytest.fixture(scope="session") +def event_loop(): + loop = asyncio.get_event_loop_policy().new_event_loop() + yield loop + loop.close() + @pytest.fixture(scope="session") -def tables(): +async def tables(): """ Fixture to initialize a database before the tests """ - Base.metadata.create_all(bind=engine) + async with engine.begin() as conn: + await conn.run_sync(Base.metadata.create_all) +@pytest.fixture async def database_session(tables) -> AsyncGenerator[AsyncSession, None]: """ Fixture to create a session for every test, and rollback From e50248bbc322b7b71b238e53070430c7c0687e60 Mon Sep 17 00:00:00 2001 From: Francis Date: Mon, 9 May 2022 15:36:47 +0200 Subject: [PATCH 127/649] delete migration --- ..._refactor_and_add_projectrolesuggestion.py | 135 ------------------ 1 file changed, 135 deletions(-) delete mode 100644 backend/migrations/versions/2403b70be336_refactor_and_add_projectrolesuggestion.py diff --git a/backend/migrations/versions/2403b70be336_refactor_and_add_projectrolesuggestion.py b/backend/migrations/versions/2403b70be336_refactor_and_add_projectrolesuggestion.py deleted file mode 100644 index fc48e0cad..000000000 --- a/backend/migrations/versions/2403b70be336_refactor_and_add_projectrolesuggestion.py +++ /dev/null @@ -1,135 +0,0 @@ -"""refactor and add ProjectRoleSuggestion - -Revision ID: 2403b70be336 -Revises: d4eaf2b564a4 -Create Date: 2022-04-24 22:40:57.961685 - -""" -from alembic import op -import sqlalchemy as sa -from sqlalchemy.dialects import mysql - -# revision identifiers, used by Alembic. -revision = '2403b70be336' -down_revision = 'd4eaf2b564a4' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.execute('set FOREIGN_KEY_CHECKS=0') - - with op.batch_alter_table('project_roles', schema=None) as batch_op: - batch_op.drop_constraint('PRIMARY', type_='primary') - #batch_op.add_column(sa.Column('project_role_id', sa.Integer(), nullable=False)) - batch_op.add_column(sa.Column('description', sa.Text(), nullable=True)) - batch_op.add_column(sa.Column('slots', sa.Integer(), nullable=False)) - #batch_op.drop_constraint('project_roles_students_fk', type_='foreignkey') - #batch_op.drop_constraint('project_roles_users_fk', type_='foreignkey') - batch_op.drop_column('definitive') - batch_op.drop_column('student_id') - batch_op.drop_column('argumentation') - batch_op.drop_column('drafter_id') - - #op.create_primary_key('PRIMARY', 'project_roles', ['project_role_id']) - op.execute("ALTER TABLE project_roles ADD project_role_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT;") - - op.create_table( - 'pr_suggestions', - sa.Column('project_role_suggestion_id', sa.Integer(), nullable=False), - sa.Column('argumentation', sa.Text(), nullable=True), - sa.Column('project_role_id', sa.Integer(), nullable=True), - sa.Column('student_id', sa.Integer(), nullable=True), - sa.Column('drafter_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['drafter_id'], ['users.user_id'], name='pr_suggestions_users_fk'), - sa.ForeignKeyConstraint(['project_role_id'], ['project_roles.project_role_id'], name='pr_suggestions_project_roles_fk'), - sa.ForeignKeyConstraint(['student_id'], ['students.student_id'], name='pr_suggestions_students_fk'), - sa.PrimaryKeyConstraint('project_role_suggestion_id') - ) - - op.drop_table('project_skills') - - with op.batch_alter_table('decision_emails', schema=None) as batch_op: - batch_op.alter_column( - 'decision', - existing_type=mysql.ENUM( - 'APPLIED', 'AWAITING_PROJECT', 'APPROVED', 'CONTRACT_CONFIRMED', - 'CONTRACT_DECLINED', 'REJECTED', collation='utf8mb4_unicode_ci' - ), - nullable=False - ) - - with op.batch_alter_table('projects', schema=None) as batch_op: - batch_op.drop_column('number_of_students') - - with op.batch_alter_table('skills', schema=None) as batch_op: - batch_op.drop_column('description') - - with op.batch_alter_table('suggestions', schema=None) as batch_op: - batch_op.alter_column( - 'coach_id', - existing_type=mysql.INTEGER(display_width=11), - nullable=True - ) - batch_op.drop_index('unique_coach_student_suggestion') - - op.execute('set FOREIGN_KEY_CHECKS=1') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.execute('set FOREIGN_KEY_CHECKS=0') - - with op.batch_alter_table('suggestions', schema=None) as batch_op: - batch_op.create_index('unique_coach_student_suggestion', ['coach_id', 'student_id'], unique=False) - batch_op.alter_column( - 'coach_id', - existing_type=mysql.INTEGER(display_width=11), - nullable=False - ) - - with op.batch_alter_table('skills', schema=None) as batch_op: - batch_op.add_column(sa.Column('description', mysql.TEXT(collation='utf8mb4_unicode_ci'), nullable=True)) - - with op.batch_alter_table('projects', schema=None) as batch_op: - batch_op.add_column( - sa.Column('number_of_students', mysql.INTEGER(display_width=11), autoincrement=False, nullable=False)) - - with op.batch_alter_table('project_roles', schema=None) as batch_op: - batch_op.add_column( - sa.Column('drafter_id', mysql.INTEGER(display_width=11), autoincrement=False, nullable=False) - ) - batch_op.add_column(sa.Column('argumentation', mysql.TEXT(collation='utf8mb4_unicode_ci'), nullable=True)) - batch_op.add_column( - sa.Column('student_id', mysql.INTEGER(display_width=11), autoincrement=False, nullable=False) - ) - batch_op.add_column( - sa.Column('definitive', mysql.TINYINT(display_width=1), autoincrement=False, nullable=False) - ) - batch_op.create_foreign_key('project_roles_students_fk', 'students', ['student_id'], ['student_id']) - batch_op.create_foreign_key('project_roles_users_fk', 'users', ['drafter_id'], ['user_id']) - batch_op.drop_column('slots') - batch_op.drop_column('description') - batch_op.drop_column('project_role_id') - - with op.batch_alter_table('decision_emails', schema=None) as batch_op: - batch_op.alter_column('decision', - existing_type=mysql.ENUM('APPLIED', 'AWAITING_PROJECT', 'APPROVED', 'CONTRACT_CONFIRMED', - 'CONTRACT_DECLINED', 'REJECTED', collation='utf8mb4_unicode_ci'), - nullable=True) - - op.create_table('project_skills', - sa.Column('project_id', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True), - sa.Column('skill_id', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True), - sa.ForeignKeyConstraint(['project_id'], ['projects.project_id'], name='project_skills_projects_fk'), - sa.ForeignKeyConstraint(['skill_id'], ['skills.skill_id'], name='project_skills_skills_fk'), - mariadb_collate='utf8mb4_unicode_ci', - mariadb_default_charset='utf8mb4', - mariadb_engine='InnoDB' - ) - op.drop_table('pr_suggestions') - - op.execute('set FOREIGN_KEY_CHECKS=1') - # ### end Alembic commands ### From 9682f9717305cf27ed609a106a66db238f0326da Mon Sep 17 00:00:00 2001 From: Francis Date: Mon, 9 May 2022 15:38:49 +0200 Subject: [PATCH 128/649] remove duplicate dependency --- .../app/routers/editions/projects/students/projects_students.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/routers/editions/projects/students/projects_students.py b/backend/src/app/routers/editions/projects/students/projects_students.py index bb2b665b0..e5cd2a74d 100644 --- a/backend/src/app/routers/editions/projects/students/projects_students.py +++ b/backend/src/app/routers/editions/projects/students/projects_students.py @@ -36,7 +36,7 @@ async def remove_student_from_project( "/{student_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response, - dependencies=[Depends(get_latest_edition), Depends(get_project_role)] + dependencies=[Depends(get_latest_edition)] ) async def change_project_role( argumentation: InputArgumentation, From 7272b5411830c838b4b57e08a739cf07e32ce24f Mon Sep 17 00:00:00 2001 From: Francis Date: Mon, 9 May 2022 15:39:40 +0200 Subject: [PATCH 129/649] remove comented property --- backend/src/app/schemas/projects.py | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/app/schemas/projects.py b/backend/src/app/schemas/projects.py index 0d87a71b4..8f044575c 100644 --- a/backend/src/app/schemas/projects.py +++ b/backend/src/app/schemas/projects.py @@ -67,7 +67,6 @@ class Project(CamelCaseModel): """Represents a Project from the database to return when a GET request happens""" project_id: int name: str - # number_of_students: int coaches: list[User] partners: list[Partner] From d3915103ac4e5d4a843bc3bc4e8cfd5894e6792c Mon Sep 17 00:00:00 2001 From: Francis Date: Mon, 9 May 2022 15:40:49 +0200 Subject: [PATCH 130/649] update comment --- backend/src/database/crud/partners.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/database/crud/partners.py b/backend/src/database/crud/partners.py index 0be2d3e99..c1891a092 100644 --- a/backend/src/database/crud/partners.py +++ b/backend/src/database/crud/partners.py @@ -15,5 +15,5 @@ def create_partner(db: Session, name: str, commit: bool = True) -> Partner: def get_optional_partner_by_name(db: Session, name: str) -> Partner | None: - """Returns a list of all projects from a certain edition from the database""" + """Returns an optional partner given a name""" return db.query(Partner).where(Partner.name == name).one_or_none() From a387a9bb5ce1013c6f38489827b895bca049a046 Mon Sep 17 00:00:00 2001 From: Francis Date: Mon, 9 May 2022 15:46:34 +0200 Subject: [PATCH 131/649] use response list --- backend/src/app/logic/projects.py | 7 ++++--- backend/src/app/routers/editions/projects/projects.py | 4 ++-- backend/src/app/schemas/projects.py | 8 ++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index e18c08f02..1873619b7 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -3,7 +3,8 @@ import src.app.logic.partners as partners_logic import src.database.crud.projects as crud from src.app.schemas.projects import ( - ProjectList, ConflictStudentList, InputProject, InputProjectRole, QueryParamsProjects + ProjectList, ConflictStudentList, InputProject, InputProjectRole, QueryParamsProjects, + ProjectRoleResponseList ) from src.database.models import Edition, Project, ProjectRole, User @@ -55,9 +56,9 @@ def delete_project(db: Session, project: Project): crud.delete_project(db, project) -def get_project_roles(db: Session, project: Project) -> list[ProjectRole]: +def get_project_roles(db: Session, project: Project) -> ProjectRoleResponseList: """Get project roles for a project""" - return crud.get_project_roles_for_project(db, project) + return ProjectRoleResponseList(project_roles=crud.get_project_roles_for_project(db, project)) def create_project_role(db: Session, project: Project, input_project_role: InputProjectRole) -> ProjectRole: diff --git a/backend/src/app/routers/editions/projects/projects.py b/backend/src/app/routers/editions/projects/projects.py index 558faf603..08e084e3b 100644 --- a/backend/src/app/routers/editions/projects/projects.py +++ b/backend/src/app/routers/editions/projects/projects.py @@ -7,7 +7,7 @@ from src.app.routers.tags import Tags from src.app.schemas.projects import ( InputProjectRole, - ProjectRole as ProjectRoleSchema) + ProjectRole as ProjectRoleSchema, ProjectRoleResponseList) from src.app.schemas.projects import ( ProjectList, Project, InputProject, ConflictStudentList, QueryParamsProjects ) @@ -93,7 +93,7 @@ async def patch_project( @projects_router.get( "/{project_id}/roles", - response_model=list[ProjectRoleSchema], + response_model=ProjectRoleResponseList, dependencies=[Depends(require_coach), Depends(get_latest_edition)] ) async def get_project_roles(project: ProjectModel = Depends(get_project), db: Session = Depends(get_session)): diff --git a/backend/src/app/schemas/projects.py b/backend/src/app/schemas/projects.py index 8f044575c..2d9daaf96 100644 --- a/backend/src/app/schemas/projects.py +++ b/backend/src/app/schemas/projects.py @@ -63,6 +63,14 @@ class Config: orm_mode = True +class ProjectRoleResponseList(CamelCaseModel): + project_roles: list[ProjectRole] + + class Config: + """Set to ORM mode""" + orm_mode = True + + class Project(CamelCaseModel): """Represents a Project from the database to return when a GET request happens""" project_id: int From 950e69535d81a13ec5a250bf26523841b1602ad4 Mon Sep 17 00:00:00 2001 From: Francis Date: Mon, 9 May 2022 15:52:33 +0200 Subject: [PATCH 132/649] fix linting --- backend/src/app/schemas/projects.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/app/schemas/projects.py b/backend/src/app/schemas/projects.py index 2d9daaf96..a5bccdecb 100644 --- a/backend/src/app/schemas/projects.py +++ b/backend/src/app/schemas/projects.py @@ -64,6 +64,7 @@ class Config: class ProjectRoleResponseList(CamelCaseModel): + """Response list containing project roles""" project_roles: list[ProjectRole] class Config: From 553ebb5a1456fc103f4585ca4f2b2792feb9a28d Mon Sep 17 00:00:00 2001 From: stijndcl Date: Tue, 10 May 2022 17:05:31 +0200 Subject: [PATCH 133/649] remove bad merge --- frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index 294c45536..6d0784cb1 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -130,7 +130,7 @@ export default function ProjectPage() { }} placeholder="project name" /> - Search + {role === Role.ADMIN && editionId === editions[0] && ( navigate("/editions/" + editionId + "/projects/new")} From 52c9fabd51e3ed9c77d05aaeb85a3e46ad8e9168 Mon Sep 17 00:00:00 2001 From: stijndcl Date: Tue, 10 May 2022 17:11:10 +0200 Subject: [PATCH 134/649] Run Prettier --- frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index 6d0784cb1..c5886da10 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -7,6 +7,7 @@ import { useNavigate, useParams } from "react-router-dom"; import { useAuth } from "../../../contexts"; import { Role } from "../../../data/enums"; + /** * @returns The projects overview page where you can see all the projects. * You can filter on your own projects or filter on project name. @@ -130,7 +131,7 @@ export default function ProjectPage() { }} placeholder="project name" /> - + {role === Role.ADMIN && editionId === editions[0] && ( navigate("/editions/" + editionId + "/projects/new")} From c849d4c0bf46c18f771acbd59337658da44ce5eb Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Tue, 10 May 2022 18:30:54 +0200 Subject: [PATCH 135/649] add and delete partners and coaches --- .../CoachInput/CoachInput.tsx | 72 +++++++++++++++++++ .../CoachInput/index.ts | 1 + .../PartnerInput/PartnerInput.tsx | 43 +++++++++++ .../PartnerInput/index.ts | 1 + .../PartnerInput/styles.ts | 20 ++++++ .../ProjectDetailComponents/index.ts | 2 + .../ProjectsComponents/ProjectCard/styles.ts | 3 +- .../ProjectDetailPage/ProjectDetailPage.tsx | 26 ++++--- .../projectViews/ProjectDetailPage/styles.ts | 9 --- 9 files changed, 159 insertions(+), 18 deletions(-) create mode 100644 frontend/src/components/ProjectDetailComponents/CoachInput/CoachInput.tsx create mode 100644 frontend/src/components/ProjectDetailComponents/CoachInput/index.ts create mode 100644 frontend/src/components/ProjectDetailComponents/PartnerInput/PartnerInput.tsx create mode 100644 frontend/src/components/ProjectDetailComponents/PartnerInput/index.ts create mode 100644 frontend/src/components/ProjectDetailComponents/PartnerInput/styles.ts diff --git a/frontend/src/components/ProjectDetailComponents/CoachInput/CoachInput.tsx b/frontend/src/components/ProjectDetailComponents/CoachInput/CoachInput.tsx new file mode 100644 index 000000000..f50e59f87 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/CoachInput/CoachInput.tsx @@ -0,0 +1,72 @@ +import { useEffect, useState } from "react"; +import { useParams } from "react-router-dom"; +import { Project } from "../../../data/interfaces"; +import { User } from "../../../utils/api/users/users"; + +import { getCoaches } from "../../../utils/api/users/coaches"; +import { Input, AddButton } from "../PartnerInput/styles"; + +export default function CoachInput({ + project, + setProject, +}: { + project: Project; + setProject: (project: Project) => void; +}) { + const [coach, setCoach] = useState(""); + const [availableCoaches, setAvailableCoaches] = useState([]); + + const params = useParams(); + const editionId = params.editionId!; + + useEffect(() => { + async function callCoaches() { + setAvailableCoaches((await getCoaches(editionId, coach, 0)).users); + } + callCoaches(); + }, [coach, editionId]); + + return ( + <> + { + setCoach(e.target.value); + }} + list="coaches" + placeholder="Coach" + /> + + + {availableCoaches.map((availableCoach, _index) => { + return + + { + addToCoaches(); + }} + > + Add Coach + + + ); + + function addToCoaches() { + let coachToAdd = null; + availableCoaches.forEach(availableCoach => { + if (availableCoach.name === coach) { + coachToAdd = availableCoach; + } + }); + if (coachToAdd) { + if (!project.coaches.some(presentCoach => presentCoach.name === coach)) { + const newCoaches = [...project.coaches]; + newCoaches.push(coachToAdd); + setProject({ ...project, coaches: newCoaches }); + } + } + setCoach(""); + } +} diff --git a/frontend/src/components/ProjectDetailComponents/CoachInput/index.ts b/frontend/src/components/ProjectDetailComponents/CoachInput/index.ts new file mode 100644 index 000000000..72a50c9a9 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/CoachInput/index.ts @@ -0,0 +1 @@ +export { default } from "./CoachInput"; diff --git a/frontend/src/components/ProjectDetailComponents/PartnerInput/PartnerInput.tsx b/frontend/src/components/ProjectDetailComponents/PartnerInput/PartnerInput.tsx new file mode 100644 index 000000000..ac833dfcd --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/PartnerInput/PartnerInput.tsx @@ -0,0 +1,43 @@ +import { useState } from "react"; +import { Project, Partner } from "../../../data/interfaces"; +import { Input, AddButton } from "./styles"; + +export default function PartnerInput({ + project, + setProject, +}: { + project: Project; + setProject: (project: Project) => void; +}) { + const [partner, setPartner] = useState(""); + + return ( + <> + { + setPartner(e.target.value); + }} + placeholder="Partner" + /> + { + addToPartners(); + }} + > + Add Partner + + + ); + + function addToPartners() { + if (!project.partners.some(presentPartner => presentPartner.name === partner)) { + const newPartner: Partner = { name: partner }; + const newPartners = [...project.partners]; + newPartners.push(newPartner); + const newProject: Project = { ...project, partners: newPartners }; + setProject(newProject); + } + setPartner(""); + } +} diff --git a/frontend/src/components/ProjectDetailComponents/PartnerInput/index.ts b/frontend/src/components/ProjectDetailComponents/PartnerInput/index.ts new file mode 100644 index 000000000..2a6beef4c --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/PartnerInput/index.ts @@ -0,0 +1 @@ +export { default } from "./PartnerInput"; diff --git a/frontend/src/components/ProjectDetailComponents/PartnerInput/styles.ts b/frontend/src/components/ProjectDetailComponents/PartnerInput/styles.ts new file mode 100644 index 000000000..a0bc69ae2 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/PartnerInput/styles.ts @@ -0,0 +1,20 @@ +import styled from "styled-components"; + +export const Input = styled.input` + margin-right: 5px; + padding: 5px 10px; + background-color: #131329; + color: white; + border: none; + border-radius: 5px; +`; + +export const AddButton = styled.button` + padding: 0 10px; + background-color: #00bfff; + color: white; + border: none; + margin-right: 10px; + border-radius: 5px; + min-height: 34px; +`; diff --git a/frontend/src/components/ProjectDetailComponents/index.ts b/frontend/src/components/ProjectDetailComponents/index.ts index 883cda3db..0a8d6da59 100644 --- a/frontend/src/components/ProjectDetailComponents/index.ts +++ b/frontend/src/components/ProjectDetailComponents/index.ts @@ -1 +1,3 @@ export { default as TitleAndEdit } from "./TitleAndEdit"; +export { default as PartnerInput } from "./PartnerInput"; +export { default as CoachInput } from "./CoachInput"; diff --git a/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts b/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts index 1b3ef2ba5..0d570edc6 100644 --- a/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts +++ b/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts @@ -35,7 +35,7 @@ export const OpenIcon = styled(BsArrowUpRightSquare)` export const ClientContainer = styled.div` display: flex; - align-items: top; + align-items: center; justify-content: space-between; color: lightgray; `; @@ -58,6 +58,7 @@ export const NumberOfStudents = styled.div` export const CoachesContainer = styled.div` display: flex; + align-items: center; margin-top: 20px; overflow-x: auto; `; diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 955984537..58d90d55e 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -9,7 +9,6 @@ import { Client, ClientsContainer, NumberOfStudents, - AddButton, ClientContainer, } from "./styles"; @@ -27,7 +26,11 @@ import { import { useAuth } from "../../../contexts"; import ConfirmDelete from "../../../components/ProjectsComponents/ConfirmDelete"; import { RemoveButton } from "../CreateProjectPage/styles"; -import { TitleAndEdit } from "../../../components/ProjectDetailComponents"; +import { + CoachInput, + PartnerInput, + TitleAndEdit, +} from "../../../components/ProjectDetailComponents"; import projectToEditProject from "../../../utils/logic/project"; /** @@ -135,12 +138,12 @@ export default function ProjectDetailPage() { {editedProject.partners.map((element, _index) => ( - - {element.name} + + {element.name} {editing && ( { - const newPartners = [...project.partners]; + const newPartners = [...editedProject.partners]; newPartners.splice(_index, 1); const newProject: Project = { ...project, @@ -154,7 +157,9 @@ export default function ProjectDetailPage() { )} ))} - {editing && Add Partner} + {editing && ( + + )} {project.numberOfStudents} @@ -165,10 +170,13 @@ export default function ProjectDetailPage() { {editedProject.coaches.map((element, _index) => ( {element.name} + {_index} {editing && ( { - const newCoaches = [...project.coaches]; + const newCoaches = [...editedProject.coaches]; + console.log(_index); + newCoaches.splice(_index, 1); const newProject: Project = { ...project, @@ -182,7 +190,9 @@ export default function ProjectDetailPage() { )} ))} - {editing && Add Coach} + {editing && ( + + )}
    diff --git a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts index cb5104466..d81b75ba8 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts +++ b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts @@ -37,12 +37,3 @@ export const NumberOfStudents = styled.div` display: flex; align-items: center; `; - -export const AddButton = styled.button` - padding: 0 10px; - background-color: #00bfff; - color: white; - border: none; - margin-right: 10px; - border-radius: 5px; -`; From ed75aa593082c6f62a1a2fe6a243718534045652 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 11 May 2022 00:39:07 +0200 Subject: [PATCH 136/649] drag and drop baby --- frontend/package.json | 2 + .../StudentList/StudentList.tsx | 54 + .../StudentList/index.ts | 1 + .../StudentList/styles.ts | 17 + .../ProjectDetailComponents/index.ts | 1 + .../ProjectsComponents/ProjectCard/styles.ts | 6 + .../ProjectDetailPage/ProjectDetailPage.tsx | 279 +- .../projectViews/ProjectDetailPage/styles.ts | 20 + frontend/yarn.lock | 2619 +++++++++-------- 9 files changed, 1637 insertions(+), 1362 deletions(-) create mode 100644 frontend/src/components/ProjectDetailComponents/StudentList/StudentList.tsx create mode 100644 frontend/src/components/ProjectDetailComponents/StudentList/index.ts create mode 100644 frontend/src/components/ProjectDetailComponents/StudentList/styles.ts diff --git a/frontend/package.json b/frontend/package.json index 99d334d97..3178348fc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -35,6 +35,7 @@ "@types/jest": "^27.0.1", "@types/node": "^16.7.13", "@types/react": "^17.0.20", + "@types/react-beautiful-dnd": "^13.1.2", "@types/react-dom": "^17.0.9", "@types/react-infinite-scroller": "^1.2.3", "@types/react-router-bootstrap": "^0.24.5", @@ -54,6 +55,7 @@ "eslint-plugin-standard": "^5.0.0", "jest": "^27.5.1", "prettier": "^2.5.1", + "react-beautiful-dnd": "^13.1.0", "typedoc": "^0.22.13" }, "scripts": { diff --git a/frontend/src/components/ProjectDetailComponents/StudentList/StudentList.tsx b/frontend/src/components/ProjectDetailComponents/StudentList/StudentList.tsx new file mode 100644 index 000000000..14b3c7ec4 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/StudentList/StudentList.tsx @@ -0,0 +1,54 @@ +import { useEffect, useState } from "react"; +import { useParams } from "react-router-dom"; +import { Student } from "../../../data/interfaces/students"; +import { getStudents } from "../../../utils/api/students"; +import { StudentContainer, StudentListContainer } from "./styles"; +import { Draggable, Droppable } from "react-beautiful-dnd"; + +export default function StudentList() { + const [students, setStudents] = useState([]); + const [gotStudents, setGotStudents] = useState(false); + + const params = useParams(); + const editionId = params.editionId!; + + useEffect(() => { + async function callStudents(newPage: number) { + const response = await getStudents(editionId, "", [], false, false); + + if (response) { + setGotStudents(true); + setStudents(response.students); + } + } + if (!gotStudents) callStudents(0); + }, [editionId, gotStudents, students]); + + return ( + + + {(provided, snapshot) => ( +
    + {students.map((student, index) => ( + + {(provided, snapshot) => ( + + {student.firstName} +

    + {student.lastName} +     + )} +     + ))} + {provided.placeholder} +
    + )} +     +     + ); +} diff --git a/frontend/src/components/ProjectDetailComponents/StudentList/index.ts b/frontend/src/components/ProjectDetailComponents/StudentList/index.ts new file mode 100644 index 000000000..2ed75dd38 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/StudentList/index.ts @@ -0,0 +1 @@ +export { default } from "./StudentList"; diff --git a/frontend/src/components/ProjectDetailComponents/StudentList/styles.ts b/frontend/src/components/ProjectDetailComponents/StudentList/styles.ts new file mode 100644 index 000000000..3b3ec2a6d --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/StudentList/styles.ts @@ -0,0 +1,17 @@ +import styled from "styled-components"; + +export const StudentListContainer = styled.div` + margin: 20px; + padding: 20px; + padding-left: 0; + min-width: 20%; + border-right: 5px solid #131329; + overflow: auto; +`; + +export const StudentContainer = styled.div` + padding: 5px; + margin: 5px; + border-radius: 5px; + background-color: #131329; +`; diff --git a/frontend/src/components/ProjectDetailComponents/index.ts b/frontend/src/components/ProjectDetailComponents/index.ts index 0a8d6da59..baefba9dc 100644 --- a/frontend/src/components/ProjectDetailComponents/index.ts +++ b/frontend/src/components/ProjectDetailComponents/index.ts @@ -1,3 +1,4 @@ export { default as TitleAndEdit } from "./TitleAndEdit"; export { default as PartnerInput } from "./PartnerInput"; export { default as CoachInput } from "./CoachInput"; +export { default as StudentList } from "./StudentList"; diff --git a/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts b/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts index 0d570edc6..45993431b 100644 --- a/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts +++ b/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts @@ -92,3 +92,9 @@ export const Delete = styled.button` `; export const PopUp = styled(Modal)``; + +export const ProjectRoleContainer = styled.div` + margin: 10px; + background-color: #1a1a36; + padding: 10px; +`; diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 58d90d55e..589e60513 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -10,6 +10,9 @@ import { ClientsContainer, NumberOfStudents, ClientContainer, + ProjectPageContainer, + SuggestionContainer, + Suggestions, } from "./styles"; import { BiArrowBack } from "react-icons/bi"; @@ -17,11 +20,11 @@ import { BsPersonFill } from "react-icons/bs"; import { TiDeleteOutline } from "react-icons/ti"; import { StudentPlace } from "../../../data/interfaces/projects"; -import { StudentPlaceholder } from "../../../components/ProjectsComponents"; import { CoachContainer, CoachesContainer, CoachText, + ProjectRoleContainer, } from "../../../components/ProjectsComponents/ProjectCard/styles"; import { useAuth } from "../../../contexts"; import ConfirmDelete from "../../../components/ProjectsComponents/ConfirmDelete"; @@ -30,9 +33,13 @@ import { CoachInput, PartnerInput, TitleAndEdit, + StudentList, } from "../../../components/ProjectDetailComponents"; import projectToEditProject from "../../../utils/logic/project"; +import { DragDropContext, Droppable, Draggable, DropResult } from "react-beautiful-dnd"; +import { getStudent } from "../../../utils/api/students"; + /** * @returns the detailed page of a project. Here you can add or remove students from the project. */ @@ -49,7 +56,7 @@ export default function ProjectDetailPage() { const { role } = useAuth(); - const [students, setStudents] = useState([]); + // const [students, setStudents] = useState([]); const [editing, setEditing] = useState(false); @@ -65,6 +72,11 @@ export default function ProjectDetailPage() { navigate("/editions/" + editionId + "/projects/"); }; + const [projectRoles, setProjectRoles] = useState([ + { skill: "Frontend", slots: 5, suggestions: [{ name: "Tom" }] }, + { skill: "Backend", slots: 5, suggestions: [] }, + ]); + useEffect(() => { async function callProjects(): Promise { if (projectId) { @@ -85,7 +97,7 @@ export default function ProjectDetailPage() { }; studentsTemplate.push(student); } - setStudents(studentsTemplate); + // setStudents(studentsTemplate); } else navigate("/404-not-found"); } } @@ -111,96 +123,175 @@ export default function ProjectDetailPage() { if (!project || !editedProject) return null; return ( -
    - - navigate("/editions/" + editionId + "/projects/")}> - - Overview - - - - - - - - {editedProject.partners.map((element, _index) => ( - - {element.name} - {editing && ( - { - const newPartners = [...editedProject.partners]; - newPartners.splice(_index, 1); - const newProject: Project = { - ...project, - partners: newPartners, - }; - setEditedProject(newProject); - }} - > - - - )} - - ))} - {editing && ( - - )} - - {project.numberOfStudents} - - - - - - {editedProject.coaches.map((element, _index) => ( - - {element.name} - {_index} - {editing && ( - { - const newCoaches = [...editedProject.coaches]; - console.log(_index); - - newCoaches.splice(_index, 1); - const newProject: Project = { - ...project, - coaches: newCoaches, - }; - setEditedProject(newProject); - }} - > - - - )} - - ))} - {editing && ( - - )} - - -
    - {students.map((element: StudentPlace, _index) => ( - - ))} -
    -     -
    + onDragDrop(result)}> + + + + + navigate("/editions/" + editionId + "/projects/")}> + + Overview + + + + + + + + {editedProject.partners.map((element, _index) => ( + + {element.name} + {editing && ( + { + const newPartners = [...editedProject.partners]; + newPartners.splice(_index, 1); + const newProject: Project = { + ...project, + partners: newPartners, + }; + setEditedProject(newProject); + }} + > + + + )} + + ))} + {editing && ( + + )} + + {project.numberOfStudents} + + + + + + {editedProject.coaches.map((element, _index) => ( + + {element.name} + {_index} + {editing && ( + { + const newCoaches = [...editedProject.coaches]; + console.log(_index); + + newCoaches.splice(_index, 1); + const newProject: Project = { + ...project, + coaches: newCoaches, + }; + setEditedProject(newProject); + }} + > + + + )} + + ))} + {editing && ( + + )} + + +
    + {projectRoles.map((projectRole, _index) => ( + + {projectRole.skill} +

    + {projectRole.suggestions.length.toString() + + " / " + + projectRole.slots.toString()} + + {(provided, snapshot) => ( + + {projectRole.suggestions.map((sug, _index2) => ( + + {(provided, snapshot) => ( + + {sug.name} + + )} + + ))} + {provided.placeholder} + + )} + +     + ))} +
    +     +     +     ); + + async function onDragDrop(result: DropResult) { + const { source, destination } = result; + if (!destination || destination.droppableId === "student") { + if (source.droppableId === "students") return; + else { + const newProjectRoles = projectRoles.map((projectRole, index) => { + if (projectRole.skill === source.droppableId) { + const newSuggestions = [...projectRole.suggestions]; + newSuggestions.splice(source.index, 1); + return { ...projectRole, suggestions: newSuggestions }; + } else return projectRole; + }); + setProjectRoles(newProjectRoles); + } + } + if (destination?.droppableId === source.droppableId) return; + if (source.droppableId === "students") { + const student = await getStudent(editionId, result.draggableId); + const newProjectRoles = projectRoles.map((projectRole, index) => { + if (projectRole.skill === destination?.droppableId) { + const newSuggestions = [...projectRole.suggestions]; + newSuggestions.push({ name: student.lastName }); + return { ...projectRole, suggestions: newSuggestions }; + } else return projectRole; + }); + setProjectRoles(newProjectRoles); + } else { + const newProjectRoles = projectRoles.map((projectRole, index) => { + if (projectRole.skill === destination?.droppableId) { + const newSuggestions = [...projectRole.suggestions]; + newSuggestions.push({ name: result.draggableId }); + return { ...projectRole, suggestions: newSuggestions }; + } else if (projectRole.skill === source.droppableId) { + const newSuggestions = [...projectRole.suggestions]; + newSuggestions.splice(source.index, 1); + return { ...projectRole, suggestions: newSuggestions }; + } else return projectRole; + }); + setProjectRoles(newProjectRoles); + } + } } diff --git a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts index d81b75ba8..5210d8143 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts +++ b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts @@ -1,7 +1,15 @@ import styled from "styled-components"; +export const ProjectPageContainer = styled.div` + display: flex; + height: 90vh; +`; + export const ProjectContainer = styled.div` + width: 100%; margin: 20px; + border: 5px; + overflow: auto; `; export const GoBack = styled.div` @@ -37,3 +45,15 @@ export const NumberOfStudents = styled.div` display: flex; align-items: center; `; + +export const Suggestions = styled.div` + min-height: 10vh; +`; + +export const SuggestionContainer = styled.div` + margin: 10px; + background-color: #1a1a28; + padding: 10px; + max-width: 25%; + overflow: auto; +`; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index b3d4746e3..0a617fd2a 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4,14 +4,14 @@ "@ampproject/remapping@^2.1.0": version "2.1.2" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34" + resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz" integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg== dependencies: "@jridgewell/trace-mapping" "^0.3.0" "@apideck/better-ajv-errors@^0.3.1": version "0.3.3" - resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.3.tgz#ab0b1e981e1749bf59736cf7ebe25cfc9f949c15" + resolved "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.3.tgz" integrity sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg== dependencies: json-schema "^0.4.0" @@ -20,19 +20,19 @@ "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz" integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== dependencies: "@babel/highlight" "^7.16.7" "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz" integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== "@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0": version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz" integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== dependencies: "@ampproject/remapping" "^2.1.0" @@ -53,7 +53,7 @@ "@babel/eslint-parser@^7.16.3": version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6" + resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz" integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA== dependencies: eslint-scope "^5.1.1" @@ -62,7 +62,7 @@ "@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.7.2": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz" integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w== dependencies: "@babel/types" "^7.17.0" @@ -71,14 +71,14 @@ "@babel/helper-annotate-as-pure@^7.16.0", "@babel/helper-annotate-as-pure@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" + resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz" integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== dependencies: "@babel/types" "^7.16.7" "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" + resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz" integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA== dependencies: "@babel/helper-explode-assignable-expression" "^7.16.7" @@ -86,7 +86,7 @@ "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz" integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== dependencies: "@babel/compat-data" "^7.17.7" @@ -96,7 +96,7 @@ "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6": version "7.17.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9" + resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz" integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" @@ -109,7 +109,7 @@ "@babel/helper-create-regexp-features-plugin@^7.16.7": version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" + resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz" integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" @@ -117,7 +117,7 @@ "@babel/helper-define-polyfill-provider@^0.3.1": version "0.3.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665" + resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz" integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA== dependencies: "@babel/helper-compilation-targets" "^7.13.0" @@ -131,21 +131,21 @@ "@babel/helper-environment-visitor@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" + resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz" integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== dependencies: "@babel/types" "^7.16.7" "@babel/helper-explode-assignable-expression@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" + resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz" integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ== dependencies: "@babel/types" "^7.16.7" "@babel/helper-function-name@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" + resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz" integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== dependencies: "@babel/helper-get-function-arity" "^7.16.7" @@ -154,35 +154,35 @@ "@babel/helper-get-function-arity@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" + resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz" integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== dependencies: "@babel/types" "^7.16.7" "@babel/helper-hoist-variables@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" + resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz" integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== dependencies: "@babel/types" "^7.16.7" "@babel/helper-member-expression-to-functions@^7.16.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" + resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz" integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw== dependencies: "@babel/types" "^7.17.0" "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz" integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== dependencies: "@babel/types" "^7.16.7" "@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz" integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw== dependencies: "@babel/helper-environment-visitor" "^7.16.7" @@ -196,19 +196,19 @@ "@babel/helper-optimise-call-expression@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" + resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz" integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w== dependencies: "@babel/types" "^7.16.7" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" + resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz" integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== "@babel/helper-remap-async-to-generator@^7.16.8": version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" + resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz" integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" @@ -217,7 +217,7 @@ "@babel/helper-replace-supers@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" + resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz" integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw== dependencies: "@babel/helper-environment-visitor" "^7.16.7" @@ -228,38 +228,38 @@ "@babel/helper-simple-access@^7.17.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" + resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz" integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA== dependencies: "@babel/types" "^7.17.0" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" + resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz" integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw== dependencies: "@babel/types" "^7.16.0" "@babel/helper-split-export-declaration@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" + resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz" integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== dependencies: "@babel/types" "^7.16.7" "@babel/helper-validator-identifier@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz" integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== "@babel/helper-validator-option@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" + resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz" integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== "@babel/helper-wrap-function@^7.16.8": version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" + resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz" integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw== dependencies: "@babel/helper-function-name" "^7.16.7" @@ -269,7 +269,7 @@ "@babel/helpers@^7.17.8": version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz" integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw== dependencies: "@babel/template" "^7.16.7" @@ -278,7 +278,7 @@ "@babel/highlight@^7.16.7": version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" + resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz" integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== dependencies: "@babel/helper-validator-identifier" "^7.16.7" @@ -287,19 +287,19 @@ "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8": version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz" integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz" integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz" integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -308,7 +308,7 @@ "@babel/plugin-proposal-async-generator-functions@^7.16.8": version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz" integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -317,7 +317,7 @@ "@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz" integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== dependencies: "@babel/helper-create-class-features-plugin" "^7.16.7" @@ -325,7 +325,7 @@ "@babel/plugin-proposal-class-static-block@^7.16.7": version "7.17.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz" integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA== dependencies: "@babel/helper-create-class-features-plugin" "^7.17.6" @@ -334,7 +334,7 @@ "@babel/plugin-proposal-decorators@^7.16.4": version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.8.tgz#4f0444e896bee85d35cf714a006fc5418f87ff00" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.8.tgz" integrity sha512-U69odN4Umyyx1xO1rTII0IDkAEC+RNlcKXtqOblfpzqy1C+aOplb76BQNq0+XdpVkOaPlpEDwd++joY8FNFJKA== dependencies: "@babel/helper-create-class-features-plugin" "^7.17.6" @@ -345,7 +345,7 @@ "@babel/plugin-proposal-dynamic-import@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz" integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -353,7 +353,7 @@ "@babel/plugin-proposal-export-namespace-from@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz" integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -361,7 +361,7 @@ "@babel/plugin-proposal-json-strings@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz" integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -369,7 +369,7 @@ "@babel/plugin-proposal-logical-assignment-operators@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz" integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -377,7 +377,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz" integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -385,7 +385,7 @@ "@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz" integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -393,7 +393,7 @@ "@babel/plugin-proposal-object-rest-spread@^7.16.7": version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz" integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw== dependencies: "@babel/compat-data" "^7.17.0" @@ -404,7 +404,7 @@ "@babel/plugin-proposal-optional-catch-binding@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz" integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -412,7 +412,7 @@ "@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz" integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -421,7 +421,7 @@ "@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.16.11": version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz" integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw== dependencies: "@babel/helper-create-class-features-plugin" "^7.16.10" @@ -429,7 +429,7 @@ "@babel/plugin-proposal-private-property-in-object@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz" integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" @@ -439,7 +439,7 @@ "@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz" integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" @@ -447,154 +447,154 @@ "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz" integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-bigint@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz" integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3": version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz" integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-class-static-block@^7.14.5": version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz" integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-decorators@^7.17.0": version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz" integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz" integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-export-namespace-from@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz" integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-flow@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.7.tgz#202b147e5892b8452bbb0bb269c7ed2539ab8832" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.7.tgz" integrity sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz" integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz" integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-jsx@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz" integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz" integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3": version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz" integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz" integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz" integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz" integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-private-property-in-object@^7.14.5": version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz" integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3": version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz" integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.16.7", "@babel/plugin-syntax-typescript@^7.7.2": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz" integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-arrow-functions@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" + resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz" integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-async-to-generator@^7.16.8": version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz" integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg== dependencies: "@babel/helper-module-imports" "^7.16.7" @@ -603,21 +603,21 @@ "@babel/plugin-transform-block-scoped-functions@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz" integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-block-scoping@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz" integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-classes@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" + resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz" integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" @@ -631,21 +631,21 @@ "@babel/plugin-transform-computed-properties@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" + resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz" integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-destructuring@^7.16.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1" + resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz" integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" + resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz" integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" @@ -653,14 +653,14 @@ "@babel/plugin-transform-duplicate-keys@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" + resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz" integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-exponentiation-operator@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" + resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz" integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA== dependencies: "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" @@ -668,7 +668,7 @@ "@babel/plugin-transform-flow-strip-types@^7.16.0": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.7.tgz#291fb140c78dabbf87f2427e7c7c332b126964b8" + resolved "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.7.tgz" integrity sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -676,14 +676,14 @@ "@babel/plugin-transform-for-of@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" + resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz" integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-function-name@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" + resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz" integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA== dependencies: "@babel/helper-compilation-targets" "^7.16.7" @@ -692,21 +692,21 @@ "@babel/plugin-transform-literals@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" + resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz" integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-member-expression-literals@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" + resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz" integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-modules-amd@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz" integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g== dependencies: "@babel/helper-module-transforms" "^7.16.7" @@ -715,7 +715,7 @@ "@babel/plugin-transform-modules-commonjs@^7.16.8": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz" integrity sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA== dependencies: "@babel/helper-module-transforms" "^7.17.7" @@ -725,7 +725,7 @@ "@babel/plugin-transform-modules-systemjs@^7.16.7": version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz" integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw== dependencies: "@babel/helper-hoist-variables" "^7.16.7" @@ -736,7 +736,7 @@ "@babel/plugin-transform-modules-umd@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz" integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ== dependencies: "@babel/helper-module-transforms" "^7.16.7" @@ -744,21 +744,21 @@ "@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" + resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz" integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/plugin-transform-new-target@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" + resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz" integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-object-super@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" + resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz" integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -766,42 +766,42 @@ "@babel/plugin-transform-parameters@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" + resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz" integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-property-literals@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" + resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz" integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-constant-elements@^7.12.1": version "7.17.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.6.tgz#6cc273c2f612a6a50cb657e63ee1303e5e68d10a" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.6.tgz" integrity sha512-OBv9VkyyKtsHZiHLoSfCn+h6yU7YKX8nrs32xUmOa1SRSk+t03FosB6fBZ0Yz4BpD1WV7l73Nsad+2Tz7APpqw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz" integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-jsx-development@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz" integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A== dependencies: "@babel/plugin-transform-react-jsx" "^7.16.7" "@babel/plugin-transform-react-jsx@^7.16.7": version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz#eac1565da176ccb1a715dae0b4609858808008c1" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz" integrity sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" @@ -812,7 +812,7 @@ "@babel/plugin-transform-react-pure-annotations@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz" integrity sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" @@ -820,21 +820,21 @@ "@babel/plugin-transform-regenerator@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" + resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz" integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== dependencies: regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" + resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz" integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-runtime@^7.16.4": version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz#0a2e08b5e2b2d95c4b1d3b3371a2180617455b70" + resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz" integrity sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A== dependencies: "@babel/helper-module-imports" "^7.16.7" @@ -846,14 +846,14 @@ "@babel/plugin-transform-shorthand-properties@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" + resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz" integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-spread@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" + resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz" integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -861,28 +861,28 @@ "@babel/plugin-transform-sticky-regex@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" + resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz" integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-template-literals@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" + resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz" integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-typeof-symbol@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz" integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-typescript@^7.16.7": version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz" integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ== dependencies: "@babel/helper-create-class-features-plugin" "^7.16.7" @@ -891,14 +891,14 @@ "@babel/plugin-transform-unicode-escapes@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz" integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q== dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-unicode-regex@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz" integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" @@ -906,7 +906,7 @@ "@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.16.4": version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" + resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz" integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g== dependencies: "@babel/compat-data" "^7.16.8" @@ -986,7 +986,7 @@ "@babel/preset-modules@^0.1.5": version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" + resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz" integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -997,7 +997,7 @@ "@babel/preset-react@^7.12.5", "@babel/preset-react@^7.16.0": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" + resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz" integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -1009,7 +1009,7 @@ "@babel/preset-typescript@^7.16.0": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" + resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz" integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -1018,7 +1018,7 @@ "@babel/runtime-corejs3@^7.10.2": version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.8.tgz#d7dd49fb812f29c61c59126da3792d8740d4e284" + resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.8.tgz" integrity sha512-ZbYSUvoSF6dXZmMl/CYTMOvzIFnbGfv4W3SEHYgMvNsFTeLaF2gkGAF4K2ddmtSK4Emej+0aYcnSC6N5dPCXUQ== dependencies: core-js-pure "^3.20.2" @@ -1026,14 +1026,21 @@ "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.16", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.6", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz" integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.15.4": + version "7.17.9" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz" + integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.16.7", "@babel/template@^7.3.3": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz" integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== dependencies: "@babel/code-frame" "^7.16.7" @@ -1042,7 +1049,7 @@ "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2": version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz" integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== dependencies: "@babel/code-frame" "^7.16.7" @@ -1058,7 +1065,7 @@ "@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz" integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== dependencies: "@babel/helper-validator-identifier" "^7.16.7" @@ -1066,17 +1073,17 @@ "@bcoe/v8-coverage@^0.2.3": version "0.2.3" - resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@csstools/normalize.css@*": version "12.0.0" - resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-12.0.0.tgz#a9583a75c3f150667771f30b60d9f059473e62c4" + resolved "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz" integrity sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg== "@csstools/postcss-color-function@^1.0.3": version "1.0.3" - resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.0.3.tgz#251c961a852c99e9aabdbbdbefd50e9a96e8a9ff" + resolved "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.0.3.tgz" integrity sha512-J26I69pT2B3MYiLY/uzCGKVJyMYVg9TCpXkWsRlt+Yfq+nELUEm72QXIMYXs4xA9cJA4Oqs2EylrfokKl3mJEQ== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" @@ -1084,21 +1091,21 @@ "@csstools/postcss-font-format-keywords@^1.0.0": version "1.0.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.0.tgz#7e7df948a83a0dfb7eb150a96e2390ac642356a1" + resolved "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.0.tgz" integrity sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q== dependencies: postcss-value-parser "^4.2.0" "@csstools/postcss-hwb-function@^1.0.0": version "1.0.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.0.tgz#d6785c1c5ba8152d1d392c66f3a6a446c6034f6d" + resolved "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.0.tgz" integrity sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA== dependencies: postcss-value-parser "^4.2.0" "@csstools/postcss-ic-unit@^1.0.0": version "1.0.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.0.tgz#f484db59fc94f35a21b6d680d23b0ec69b286b7f" + resolved "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.0.tgz" integrity sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" @@ -1106,21 +1113,21 @@ "@csstools/postcss-is-pseudo-class@^2.0.1": version "2.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.1.tgz#472fff2cf434bdf832f7145b2a5491587e790c9e" + resolved "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.1.tgz" integrity sha512-Og5RrTzwFhrKoA79c3MLkfrIBYmwuf/X83s+JQtz/Dkk/MpsaKtqHV1OOzYkogQ+tj3oYp5Mq39XotBXNqVc3Q== dependencies: postcss-selector-parser "^6.0.9" "@csstools/postcss-normalize-display-values@^1.0.0": version "1.0.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.0.tgz#ce698f688c28517447aedf15a9037987e3d2dc97" + resolved "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.0.tgz" integrity sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ== dependencies: postcss-value-parser "^4.2.0" "@csstools/postcss-oklab-function@^1.0.2": version "1.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.0.2.tgz#87cd646e9450347a5721e405b4f7cc35157b7866" + resolved "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.0.2.tgz" integrity sha512-QwhWesEkMlp4narAwUi6pgc6kcooh8cC7zfxa9LSQNYXqzcdNUtNBzbGc5nuyAVreb7uf5Ox4qH1vYT3GA1wOg== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" @@ -1128,36 +1135,36 @@ "@csstools/postcss-progressive-custom-properties@^1.1.0", "@csstools/postcss-progressive-custom-properties@^1.3.0": version "1.3.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz#542292558384361776b45c85226b9a3a34f276fa" + resolved "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz" integrity sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA== dependencies: postcss-value-parser "^4.2.0" "@emotion/is-prop-valid@^0.8.8": version "0.8.8" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" + resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz" integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== dependencies: "@emotion/memoize" "0.7.4" "@emotion/memoize@0.7.4": version "0.7.4" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" + resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz" integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== "@emotion/stylis@^0.8.4": version "0.8.5" - resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" + resolved "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz" integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== "@emotion/unitless@^0.7.4": version "0.7.5" - resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" + resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== "@eslint/eslintrc@^1.2.1": version "1.2.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6" + resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz" integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ== dependencies: ajv "^6.12.4" @@ -1172,38 +1179,38 @@ "@fortawesome/fontawesome-common-types@6.1.0": version "6.1.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.0.tgz#5a9468da0e5c2a3ccc161882ef5ffafbd3d4882f" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.0.tgz" integrity sha512-lFIJ5opxOKG9q88xOsuJJAdRZ+2WRldsZwUR/7MJoOMUMhF/LkHUjwWACIEPTa5Wo6uTDHvGRIX+XutdN7zYxA== "@fortawesome/fontawesome-common-types@^0.3.0": version "0.3.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz#949995a05c0d8801be7e0a594f775f1dbaa0d893" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz" integrity sha512-CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w== "@fortawesome/fontawesome-svg-core@^1.3.0": version "1.3.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.3.0.tgz#343fac91fa87daa630d26420bfedfba560f85885" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.3.0.tgz" integrity sha512-UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg== dependencies: "@fortawesome/fontawesome-common-types" "^0.3.0" "@fortawesome/free-solid-svg-icons@^6.0.0": version "6.1.0" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.0.tgz#1bdc3ce6ddd2336348ba324ac4a72161725b0d95" + resolved "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.0.tgz" integrity sha512-OOr0jRHl5d41RzBS3sZh5Z3HmdPjMr43PxxKlYeLtQxFSixPf4sJFVM12/rTepB2m0rVShI0vtjHQmzOTlBaXg== dependencies: "@fortawesome/fontawesome-common-types" "6.1.0" "@fortawesome/react-fontawesome@^0.1.17": version "0.1.18" - resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.18.tgz#dae37f718a24e14d7a99a5496c873d69af3fbd73" + resolved "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.18.tgz" integrity sha512-RwLIB4TZw0M9gvy5u+TusAA0afbwM4JQIimNH/j3ygd6aIvYPQLqXMhC9ErY26J23rDPyDZldIfPq/HpTTJ/tQ== dependencies: prop-types "^15.8.1" "@humanwhocodes/config-array@^0.9.2": version "0.9.5" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7" + resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz" integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw== dependencies: "@humanwhocodes/object-schema" "^1.2.1" @@ -1212,12 +1219,12 @@ "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" - resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz" integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== dependencies: camelcase "^5.3.1" @@ -1228,12 +1235,12 @@ "@istanbuljs/schema@^0.1.2": version "0.1.3" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== "@jest/console@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba" + resolved "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz" integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg== dependencies: "@jest/types" "^27.5.1" @@ -1245,7 +1252,7 @@ "@jest/core@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626" + resolved "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz" integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ== dependencies: "@jest/console" "^27.5.1" @@ -1279,7 +1286,7 @@ "@jest/environment@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74" + resolved "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz" integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA== dependencies: "@jest/fake-timers" "^27.5.1" @@ -1289,7 +1296,7 @@ "@jest/fake-timers@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74" + resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz" integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ== dependencies: "@jest/types" "^27.5.1" @@ -1301,7 +1308,7 @@ "@jest/globals@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b" + resolved "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz" integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q== dependencies: "@jest/environment" "^27.5.1" @@ -1310,7 +1317,7 @@ "@jest/reporters@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04" + resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz" integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw== dependencies: "@bcoe/v8-coverage" "^0.2.3" @@ -1341,7 +1348,7 @@ "@jest/source-map@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf" + resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz" integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg== dependencies: callsites "^3.0.0" @@ -1350,7 +1357,7 @@ "@jest/test-result@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb" + resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz" integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag== dependencies: "@jest/console" "^27.5.1" @@ -1360,7 +1367,7 @@ "@jest/test-sequencer@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b" + resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz" integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ== dependencies: "@jest/test-result" "^27.5.1" @@ -1370,7 +1377,7 @@ "@jest/transform@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409" + resolved "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz" integrity sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw== dependencies: "@babel/core" "^7.1.0" @@ -1391,7 +1398,7 @@ "@jest/types@^27.5.1": version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80" + resolved "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz" integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" @@ -1402,17 +1409,17 @@ "@jridgewell/resolve-uri@^3.0.3": version "3.0.5" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c" + resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz" integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew== "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.11" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" + resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz" integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== "@jridgewell/trace-mapping@^0.3.0": version "0.3.4" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz" integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ== dependencies: "@jridgewell/resolve-uri" "^3.0.3" @@ -1420,7 +1427,7 @@ "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: "@nodelib/fs.stat" "2.0.5" @@ -1428,12 +1435,12 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: "@nodelib/fs.scandir" "2.1.5" @@ -1441,7 +1448,7 @@ "@pmmmwh/react-refresh-webpack-plugin@^0.5.3": version "0.5.4" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz#df0d0d855fc527db48aac93c218a0bf4ada41f99" + resolved "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz" integrity sha512-zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw== dependencies: ansi-html-community "^0.0.8" @@ -1456,33 +1463,33 @@ "@popperjs/core@^2.10.1", "@popperjs/core@^2.10.2", "@popperjs/core@^2.8.6": version "2.11.4" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" + resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz" integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg== "@react-aria/ssr@^3.0.1": version "3.1.2" - resolved "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.1.2.tgz#665a6fd56385068c7417922af2d0d71b0618e52d" + resolved "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.1.2.tgz" integrity sha512-amXY11ImpokvkTMeKRHjsSsG7v1yzzs6yeqArCyBIk60J3Yhgxwx9Cah+Uu/804ATFwqzN22AXIo7SdtIaMP+g== dependencies: "@babel/runtime" "^7.6.2" "@restart/hooks@^0.3.26": version "0.3.27" - resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.3.27.tgz#91f356d66d4699a8cd8b3d008402708b6a9dc505" + resolved "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.27.tgz" integrity sha512-s984xV/EapUIfkjlf8wz9weP2O9TNKR96C68FfMEy2bE69+H4cNv3RD4Mf97lW7Htt7PjZrYTjSC8f3SB9VCXw== dependencies: dequal "^2.0.2" "@restart/hooks@^0.4.0", "@restart/hooks@^0.4.5": version "0.4.5" - resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.4.5.tgz#e7acbea237bfc9e479970500cf87538b41a1ed02" + resolved "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.5.tgz" integrity sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A== dependencies: dequal "^2.0.2" "@restart/ui@^1.0.2": version "1.1.0" - resolved "https://registry.yarnpkg.com/@restart/ui/-/ui-1.1.0.tgz#46d436225162b47ecccdf191cfbcf9ec3d1d5f47" + resolved "https://registry.npmjs.org/@restart/ui/-/ui-1.1.0.tgz" integrity sha512-sYAO1LP78Suz5cT2VEkU4U/mvdjFXNg69QHanc5OAFTWyhCBG2lFJ9FITZ7hT8P8LPqcWXcwEGzHhuxPUDDDYQ== dependencies: "@babel/runtime" "^7.13.16" @@ -1498,7 +1505,7 @@ "@rollup/plugin-babel@^5.2.0": version "5.3.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283" + resolved "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz" integrity sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q== dependencies: "@babel/helper-module-imports" "^7.10.4" @@ -1506,7 +1513,7 @@ "@rollup/plugin-node-resolve@^11.2.1": version "11.2.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60" + resolved "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz" integrity sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg== dependencies: "@rollup/pluginutils" "^3.1.0" @@ -1518,7 +1525,7 @@ "@rollup/plugin-replace@^2.4.1": version "2.4.2" - resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a" + resolved "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz" integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg== dependencies: "@rollup/pluginutils" "^3.1.0" @@ -1526,7 +1533,7 @@ "@rollup/pluginutils@^3.1.0": version "3.1.0" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" + resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz" integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== dependencies: "@types/estree" "0.0.39" @@ -1535,26 +1542,26 @@ "@rushstack/eslint-patch@^1.1.0": version "1.1.1" - resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz#782fa5da44c4f38ae9fd38e9184b54e451936118" + resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz" integrity sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg== "@sinonjs/commons@^1.7.0": version "1.8.3" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz" integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== dependencies: type-detect "4.0.8" "@sinonjs/fake-timers@^8.0.1": version "8.1.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7" + resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz" integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg== dependencies: "@sinonjs/commons" "^1.7.0" "@surma/rollup-plugin-off-main-thread@^2.2.3": version "2.2.3" - resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053" + resolved "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz" integrity sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ== dependencies: ejs "^3.1.6" @@ -1564,47 +1571,47 @@ "@svgr/babel-plugin-add-jsx-attribute@^5.4.0": version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz#81ef61947bb268eb9d50523446f9c638fb355906" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz" integrity sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg== "@svgr/babel-plugin-remove-jsx-attribute@^5.4.0": version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz#6b2c770c95c874654fd5e1d5ef475b78a0a962ef" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz" integrity sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg== "@svgr/babel-plugin-remove-jsx-empty-expression@^5.0.1": version "5.0.1" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz#25621a8915ed7ad70da6cea3d0a6dbc2ea933efd" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz" integrity sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA== "@svgr/babel-plugin-replace-jsx-attribute-value@^5.0.1": version "5.0.1" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz#0b221fc57f9fcd10e91fe219e2cd0dd03145a897" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz" integrity sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ== "@svgr/babel-plugin-svg-dynamic-title@^5.4.0": version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz#139b546dd0c3186b6e5db4fefc26cb0baea729d7" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz" integrity sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg== "@svgr/babel-plugin-svg-em-dimensions@^5.4.0": version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz#6543f69526632a133ce5cabab965deeaea2234a0" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz" integrity sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw== "@svgr/babel-plugin-transform-react-native-svg@^5.4.0": version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz#00bf9a7a73f1cad3948cdab1f8dfb774750f8c80" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz" integrity sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q== "@svgr/babel-plugin-transform-svg-component@^5.5.0": version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz#583a5e2a193e214da2f3afeb0b9e8d3250126b4a" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz" integrity sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ== "@svgr/babel-preset@^5.5.0": version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-5.5.0.tgz#8af54f3e0a8add7b1e2b0fcd5a882c55393df327" + resolved "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz" integrity sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig== dependencies: "@svgr/babel-plugin-add-jsx-attribute" "^5.4.0" @@ -1618,7 +1625,7 @@ "@svgr/core@^5.5.0": version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/core/-/core-5.5.0.tgz#82e826b8715d71083120fe8f2492ec7d7874a579" + resolved "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz" integrity sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ== dependencies: "@svgr/plugin-jsx" "^5.5.0" @@ -1627,14 +1634,14 @@ "@svgr/hast-util-to-babel-ast@^5.5.0": version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz#5ee52a9c2533f73e63f8f22b779f93cd432a5461" + resolved "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz" integrity sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ== dependencies: "@babel/types" "^7.12.6" "@svgr/plugin-jsx@^5.5.0": version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz#1aa8cd798a1db7173ac043466d7b52236b369000" + resolved "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz" integrity sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA== dependencies: "@babel/core" "^7.12.3" @@ -1644,7 +1651,7 @@ "@svgr/plugin-svgo@^5.5.0": version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz#02da55d85320549324e201c7b2e53bf431fcc246" + resolved "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz" integrity sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ== dependencies: cosmiconfig "^7.0.0" @@ -1653,7 +1660,7 @@ "@svgr/webpack@^5.5.0": version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-5.5.0.tgz#aae858ee579f5fa8ce6c3166ef56c6a1b381b640" + resolved "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz" integrity sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g== dependencies: "@babel/core" "^7.12.3" @@ -1667,7 +1674,7 @@ "@testing-library/dom@^8.0.0": version "8.11.3" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.11.3.tgz#38fd63cbfe14557021e88982d931e33fb7c1a808" + resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-8.11.3.tgz" integrity sha512-9LId28I+lx70wUiZjLvi1DB/WT2zGOxUh46glrSNMaWVx849kKAluezVzZrXJfTKKoQTmEOutLes/bHg4Bj3aA== dependencies: "@babel/code-frame" "^7.10.4" @@ -1681,7 +1688,7 @@ "@testing-library/jest-dom@^5.14.1": version "5.16.2" - resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.2.tgz#f329b36b44aa6149cd6ced9adf567f8b6aa1c959" + resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.2.tgz" integrity sha512-6ewxs1MXWwsBFZXIk4nKKskWANelkdUehchEOokHsN8X7c2eKXGw+77aRV63UU8f/DTSVUPLaGxdrj4lN7D/ug== dependencies: "@babel/runtime" "^7.9.2" @@ -1696,7 +1703,7 @@ "@testing-library/react@^12.0.0": version "12.1.4" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.4.tgz#09674b117e550af713db3f4ec4c0942aa8bbf2c0" + resolved "https://registry.npmjs.org/@testing-library/react/-/react-12.1.4.tgz" integrity sha512-jiPKOm7vyUw311Hn/HlNQ9P8/lHNtArAx0PisXyFixDDvfl8DbD6EUdbshK5eqauvBSvzZd19itqQ9j3nferJA== dependencies: "@babel/runtime" "^7.12.5" @@ -1705,36 +1712,36 @@ "@testing-library/user-event@^13.2.1": version "13.5.0" - resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-13.5.0.tgz#69d77007f1e124d55314a2b73fd204b333b13295" + resolved "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz" integrity sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg== dependencies: "@babel/runtime" "^7.12.5" "@tootallnate/once@1": version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + resolved "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== "@trysound/sax@0.2.0": version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + resolved "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz" integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== "@types/aria-query@^4.2.0": version "4.2.2" - resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc" + resolved "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz" integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig== "@types/axios@^0.14.0": version "0.14.0" - resolved "https://registry.yarnpkg.com/@types/axios/-/axios-0.14.0.tgz#ec2300fbe7d7dddd7eb9d3abf87999964cafce46" + resolved "https://registry.npmjs.org/@types/axios/-/axios-0.14.0.tgz" integrity sha1-7CMA++fX3d1+udOr+HmZlkyvzkY= dependencies: axios "*" "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": version "7.1.19" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" + resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz" integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== dependencies: "@babel/parser" "^7.1.0" @@ -1745,14 +1752,14 @@ "@types/babel__generator@*": version "7.6.4" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7" + resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz" integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg== dependencies: "@babel/types" "^7.0.0" "@types/babel__template@*": version "7.4.1" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz" integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== dependencies: "@babel/parser" "^7.1.0" @@ -1760,14 +1767,14 @@ "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": version "7.14.2" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" + resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz" integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== dependencies: "@babel/types" "^7.3.0" "@types/body-parser@*": version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz" integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== dependencies: "@types/connect" "*" @@ -1775,21 +1782,21 @@ "@types/bonjour@^3.5.9": version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" + resolved "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz" integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== dependencies: "@types/node" "*" "@types/cheerio@*": version "0.22.31" - resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.31.tgz#b8538100653d6bb1b08a1e46dec75b4f2a5d5eb6" + resolved "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.31.tgz" integrity sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw== dependencies: "@types/node" "*" "@types/connect-history-api-fallback@^1.3.5": version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" + resolved "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz" integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== dependencies: "@types/express-serve-static-core" "*" @@ -1797,21 +1804,21 @@ "@types/connect@*": version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + resolved "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz" integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== dependencies: "@types/node" "*" "@types/enzyme-adapter-react-16@^1.0.6": version "1.0.6" - resolved "https://registry.yarnpkg.com/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.6.tgz#8aca7ae2fd6c7137d869b6616e696d21bb8b0cec" + resolved "https://registry.npmjs.org/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.6.tgz" integrity sha512-VonDkZ15jzqDWL8mPFIQnnLtjwebuL9YnDkqeCDYnB4IVgwUm0mwKkqhrxLL6mb05xm7qqa3IE95m8CZE9imCg== dependencies: "@types/enzyme" "*" "@types/enzyme@*", "@types/enzyme@^3.10.11": version "3.10.11" - resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.11.tgz#8924bd92cc63ac1843e215225dfa8f71555fe814" + resolved "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.10.11.tgz" integrity sha512-LEtC7zXsQlbGXWGcnnmOI7rTyP+i1QzQv4Va91RKXDEukLDaNyxu0rXlfMiGEhJwfgTPCTb0R+Pnlj//oM9e/w== dependencies: "@types/cheerio" "*" @@ -1819,7 +1826,7 @@ "@types/eslint-scope@^3.7.3": version "3.7.3" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" + resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz" integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== dependencies: "@types/eslint" "*" @@ -1827,7 +1834,7 @@ "@types/eslint@*": version "8.4.1" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304" + resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz" integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA== dependencies: "@types/estree" "*" @@ -1835,7 +1842,7 @@ "@types/eslint@^7.28.2": version "7.29.0" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78" + resolved "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz" integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng== dependencies: "@types/estree" "*" @@ -1843,17 +1850,17 @@ "@types/estree@*", "@types/estree@^0.0.51": version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" + resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== "@types/estree@0.0.39": version "0.0.39" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" + resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": version "4.17.28" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" + resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz" integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== dependencies: "@types/node" "*" @@ -1862,7 +1869,7 @@ "@types/express@*", "@types/express@^4.17.13": version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + resolved "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz" integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== dependencies: "@types/body-parser" "*" @@ -1872,19 +1879,19 @@ "@types/graceful-fs@^4.1.2": version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" + resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz" integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== dependencies: "@types/node" "*" "@types/history@^4.7.11": version "4.7.11" - resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64" + resolved "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz" integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA== -"@types/hoist-non-react-statics@*": +"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0": version "3.3.1" - resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" + resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz" integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== dependencies: "@types/react" "*" @@ -1892,43 +1899,43 @@ "@types/html-minifier-terser@^6.0.0": version "6.1.0" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" + resolved "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz" integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== "@types/http-proxy@^1.17.8": version "1.17.8" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55" + resolved "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz" integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA== dependencies: "@types/node" "*" "@types/invariant@^2.2.35": version "2.2.35" - resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.35.tgz#cd3ebf581a6557452735688d8daba6cf0bd5a3be" + resolved "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.35.tgz" integrity sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" + resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz" integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== "@types/istanbul-lib-report@*": version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz" integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== dependencies: "@types/istanbul-lib-coverage" "*" "@types/istanbul-reports@^3.0.0": version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz" integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== dependencies: "@types/istanbul-lib-report" "*" "@types/jest@*", "@types/jest@^27.0.1": version "27.4.1" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.1.tgz#185cbe2926eaaf9662d340cc02e548ce9e11ab6d" + resolved "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz" integrity sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw== dependencies: jest-matcher-utils "^27.0.0" @@ -1936,76 +1943,93 @@ "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.10" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23" + resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.10.tgz" integrity sha512-BLO9bBq59vW3fxCpD4o0N4U+DXsvwvIcl+jofw0frQo/GrBFC+/jRZj1E7kgp6dvTyNmA4y6JCV5Id/r3mNP5A== "@types/json5@^0.0.29": version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= "@types/mime@^1": version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + resolved "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/node@*": version "17.0.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" + resolved "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz" integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== "@types/node@^16.7.13": version "16.11.26" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.26.tgz#63d204d136c9916fb4dcd1b50f9740fe86884e47" + resolved "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz" integrity sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ== "@types/parse-json@^4.0.0": version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prettier@^2.1.5": version "2.4.4" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz#5d9b63132df54d8909fce1c3f8ca260fdd693e17" + resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.4.tgz" integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA== "@types/prop-types@*", "@types/prop-types@^15.7.4": version "15.7.4" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz" integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== "@types/q@^1.5.1": version "1.5.5" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + resolved "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz" integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== "@types/qs@*": version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz" integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== "@types/range-parser@*": version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== +"@types/react-beautiful-dnd@^13.1.2": + version "13.1.2" + resolved "https://registry.npmjs.org/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.1.2.tgz" + integrity sha512-+OvPkB8CdE/bGdXKyIhc/Lm2U7UAYCCJgsqmopFmh9gbAudmslkI8eOrPDjg4JhwSE6wytz4a3/wRjKtovHVJg== + dependencies: + "@types/react" "*" + "@types/react-dom@*", "@types/react-dom@^17.0.9": version "17.0.14" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" + resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.14.tgz" integrity sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ== dependencies: "@types/react" "*" "@types/react-infinite-scroller@^1.2.3": version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/react-infinite-scroller/-/react-infinite-scroller-1.2.3.tgz#b8dcb0e5762c3f79cc92e574d2c77402524cab71" + resolved "https://registry.npmjs.org/@types/react-infinite-scroller/-/react-infinite-scroller-1.2.3.tgz" integrity sha512-l60JckVoO+dxmKW2eEG7jbliEpITsTJvRPTe97GazjF5+ylagAuyYdXl8YY9DQsTP9QjhqGKZROknzgscGJy0A== dependencies: "@types/react" "*" +"@types/react-redux@^7.1.20": + version "7.1.24" + resolved "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz" + integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ== + dependencies: + "@types/hoist-non-react-statics" "^3.3.0" + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + redux "^4.0.0" + "@types/react-router-bootstrap@^0.24.5": version "0.24.5" - resolved "https://registry.yarnpkg.com/@types/react-router-bootstrap/-/react-router-bootstrap-0.24.5.tgz#9257ba3dfb01cda201aac9fa05cde3eb09ea5b27" + resolved "https://registry.npmjs.org/@types/react-router-bootstrap/-/react-router-bootstrap-0.24.5.tgz" integrity sha512-GRx/8xF/skw4/Pmm6d+xbExi8gobCLOe8Eoz9kXPQGbYo7p5Wbi61tjpOF5AbfJ5XMN+fIzweToTi56odj/LOQ== dependencies: "@types/react" "*" @@ -2013,7 +2037,7 @@ "@types/react-router-dom@*", "@types/react-router-dom@^5.3.3": version "5.3.3" - resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83" + resolved "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz" integrity sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw== dependencies: "@types/history" "^4.7.11" @@ -2022,7 +2046,7 @@ "@types/react-router@*": version "5.1.18" - resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3" + resolved "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz" integrity sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g== dependencies: "@types/history" "^4.7.11" @@ -2030,14 +2054,14 @@ "@types/react-transition-group@^4.4.4": version "4.4.4" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e" + resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz" integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug== dependencies: "@types/react" "*" "@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^17.0.20": version "17.0.41" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.41.tgz#6e179590d276394de1e357b3f89d05d7d3da8b85" + resolved "https://registry.npmjs.org/@types/react/-/react-17.0.41.tgz" integrity sha512-chYZ9ogWUodyC7VUTRBfblysKLjnohhFY9bGLwvnUFFy48+vB9DikmB3lW0qTFmBcKSzmdglcvkHK71IioOlDA== dependencies: "@types/prop-types" "*" @@ -2046,31 +2070,31 @@ "@types/resolve@1.17.1": version "1.17.1" - resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" + resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz" integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== dependencies: "@types/node" "*" "@types/retry@^0.12.0": version "0.12.1" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" + resolved "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz" integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g== "@types/scheduler@*": version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== "@types/serve-index@^1.9.1": version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" + resolved "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz" integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== dependencies: "@types/express" "*" "@types/serve-static@*": version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + resolved "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz" integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== dependencies: "@types/mime" "^1" @@ -2078,19 +2102,19 @@ "@types/sockjs@^0.3.33": version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" + resolved "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz" integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== dependencies: "@types/node" "*" "@types/stack-utils@^2.0.0": version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== "@types/styled-components@^5.1.24": version "5.1.24" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.24.tgz#b52ae677f03ea8a6018aa34c6c96b7018b7a3571" + resolved "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.24.tgz" integrity sha512-mz0fzq2nez+Lq5IuYammYwWgyLUE6OMAJTQL9D8hFLP4Pkh7gVYJii/VQWxq8/TK34g/OrkehXaFNdcEKcItug== dependencies: "@types/hoist-non-react-statics" "*" @@ -2099,43 +2123,43 @@ "@types/testing-library__jest-dom@^5.9.1": version "5.14.3" - resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.3.tgz#ee6c7ffe9f8595882ee7bda8af33ae7b8789ef17" + resolved "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.3.tgz" integrity sha512-oKZe+Mf4ioWlMuzVBaXQ9WDnEm1+umLx0InILg+yvZVBBDmzV5KfZyLrCvadtWcx8+916jLmHafcmqqffl+iIw== dependencies: "@types/jest" "*" "@types/trusted-types@^2.0.2": version "2.0.2" - resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756" + resolved "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz" integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg== "@types/warning@^3.0.0": version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" + resolved "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz" integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI= "@types/ws@^8.2.2": version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" + resolved "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz" integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== dependencies: "@types/node" "*" "@types/yargs-parser@*": version "21.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz" integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^16.0.0": version "16.0.4" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" + resolved "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz" integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== dependencies: "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^5.12.0", "@typescript-eslint/eslint-plugin@^5.5.0": version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.15.0.tgz#c28ef7f2e688066db0b6a9d95fb74185c114fb9a" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.15.0.tgz" integrity sha512-u6Db5JfF0Esn3tiAKELvoU5TpXVSkOpZ78cEGn/wXtT2RVqs2vkt4ge6N8cRCyw7YVKhmmLDbwI2pg92mlv7cA== dependencies: "@typescript-eslint/scope-manager" "5.15.0" @@ -2150,14 +2174,14 @@ "@typescript-eslint/experimental-utils@^5.0.0": version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.15.0.tgz#407bbbdf1d11d24de81cfdf556b3a9f4252ba4ae" + resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.15.0.tgz" integrity sha512-AJOOaBrVqKYWaYDBtgMi9XVDB3YHXlffto/3A4VQ39VVaNqosSOp/nW09G4N/ej8WlzHQB2jTnSfP5wWsXSQJA== dependencies: "@typescript-eslint/utils" "5.15.0" "@typescript-eslint/parser@^5.12.0", "@typescript-eslint/parser@^5.5.0": version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.15.0.tgz#95f603f8fe6eca7952a99bfeef9b85992972e728" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.15.0.tgz" integrity sha512-NGAYP/+RDM2sVfmKiKOCgJYPstAO40vPAgACoWPO/+yoYKSgAXIFaBKsV8P0Cc7fwKgvj27SjRNX4L7f4/jCKQ== dependencies: "@typescript-eslint/scope-manager" "5.15.0" @@ -2167,7 +2191,7 @@ "@typescript-eslint/scope-manager@5.15.0": version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz#d97afab5e0abf4018d1289bd711be21676cdd0ee" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz" integrity sha512-EFiZcSKrHh4kWk0pZaa+YNJosvKE50EnmN4IfgjkA3bTHElPtYcd2U37QQkNTqwMCS7LXeDeZzEqnsOH8chjSg== dependencies: "@typescript-eslint/types" "5.15.0" @@ -2175,7 +2199,7 @@ "@typescript-eslint/type-utils@5.15.0": version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.15.0.tgz#d2c02eb2bdf54d0a645ba3a173ceda78346cf248" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.15.0.tgz" integrity sha512-KGeDoEQ7gHieLydujGEFLyLofipe9PIzfvA/41urz4hv+xVxPEbmMQonKSynZ0Ks2xDhJQ4VYjB3DnRiywvKDA== dependencies: "@typescript-eslint/utils" "5.15.0" @@ -2184,12 +2208,12 @@ "@typescript-eslint/types@5.15.0": version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.15.0.tgz" integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA== "@typescript-eslint/typescript-estree@5.15.0": version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz#81513a742a9c657587ad1ddbca88e76c6efb0aac" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz" integrity sha512-Hb0e3dGc35b75xLzixM3cSbG1sSbrTBQDfIScqdyvrfJZVEi4XWAT+UL/HMxEdrJNB8Yk28SKxPLtAhfCbBInA== dependencies: "@typescript-eslint/types" "5.15.0" @@ -2202,7 +2226,7 @@ "@typescript-eslint/utils@5.15.0", "@typescript-eslint/utils@^5.13.0": version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.15.0.tgz#468510a0974d3ced8342f37e6c662778c277f136" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.15.0.tgz" integrity sha512-081rWu2IPKOgTOhHUk/QfxuFog8m4wxW43sXNOMSCdh578tGJ1PAaWPsj42LOa7pguh173tNlMigsbrHvh/mtA== dependencies: "@types/json-schema" "^7.0.9" @@ -2214,7 +2238,7 @@ "@typescript-eslint/visitor-keys@5.15.0": version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz#5669739fbf516df060f978be6a6dce75855a8027" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz" integrity sha512-+vX5FKtgvyHbmIJdxMJ2jKm9z2BIlXJiuewI8dsDYMp5LzPUcuTT78Ya5iwvQg3VqSVdmxyM8Anj1Jeq7733ZQ== dependencies: "@typescript-eslint/types" "5.15.0" @@ -2222,7 +2246,7 @@ "@webassemblyjs/ast@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz" integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== dependencies: "@webassemblyjs/helper-numbers" "1.11.1" @@ -2230,22 +2254,22 @@ "@webassemblyjs/floating-point-hex-parser@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz" integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== "@webassemblyjs/helper-api-error@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz" integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== "@webassemblyjs/helper-buffer@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz" integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== "@webassemblyjs/helper-numbers@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz" integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== dependencies: "@webassemblyjs/floating-point-hex-parser" "1.11.1" @@ -2254,12 +2278,12 @@ "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz" integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== "@webassemblyjs/helper-wasm-section@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz" integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2269,26 +2293,26 @@ "@webassemblyjs/ieee754@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz" integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== dependencies: "@xtuc/ieee754" "^1.2.0" "@webassemblyjs/leb128@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz" integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== dependencies: "@xtuc/long" "4.2.2" "@webassemblyjs/utf8@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz" integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== "@webassemblyjs/wasm-edit@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz" integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2302,7 +2326,7 @@ "@webassemblyjs/wasm-gen@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz" integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2313,7 +2337,7 @@ "@webassemblyjs/wasm-opt@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz" integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2323,7 +2347,7 @@ "@webassemblyjs/wasm-parser@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz" integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2335,7 +2359,7 @@ "@webassemblyjs/wast-printer@1.11.1": version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz" integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2343,22 +2367,22 @@ "@xtuc/ieee754@^1.2.0": version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz" integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== "@xtuc/long@4.2.2": version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== abab@^2.0.3, abab@^2.0.5: version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + resolved "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== dependencies: mime-types "~2.1.34" @@ -2366,7 +2390,7 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: acorn-globals@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" + resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz" integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== dependencies: acorn "^7.1.1" @@ -2374,17 +2398,17 @@ acorn-globals@^6.0.0: acorn-import-assertions@^1.7.6: version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz" integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== acorn-jsx@^5.3.1: version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-node@^1.6.1: version "1.8.2" - resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" + resolved "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz" integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== dependencies: acorn "^7.0.0" @@ -2393,27 +2417,27 @@ acorn-node@^1.6.1: acorn-walk@^7.0.0, acorn-walk@^7.1.1: version "7.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== acorn@^7.0.0, acorn@^7.1.1: version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0: version "8.7.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== address@^1.0.1, address@^1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" + resolved "https://registry.npmjs.org/address/-/address-1.1.2.tgz" integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA== adjust-sourcemap-loader@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99" + resolved "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz" integrity sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A== dependencies: loader-utils "^2.0.0" @@ -2421,14 +2445,14 @@ adjust-sourcemap-loader@^4.0.0: agent-base@6: version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== dependencies: debug "4" aggregate-error@^3.0.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz" integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== dependencies: clean-stack "^2.0.0" @@ -2436,7 +2460,7 @@ aggregate-error@^3.0.0: airbnb-prop-types@^2.16.0: version "2.16.0" - resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2" + resolved "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz" integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg== dependencies: array.prototype.find "^2.1.1" @@ -2451,26 +2475,26 @@ airbnb-prop-types@^2.16.0: ajv-formats@^2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + resolved "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz" integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== dependencies: ajv "^8.0.0" ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== ajv-keywords@^5.0.0: version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== dependencies: fast-deep-equal "^3.1.3" ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== dependencies: fast-deep-equal "^3.1.1" @@ -2480,7 +2504,7 @@ ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0: version "8.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" + resolved "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz" integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw== dependencies: fast-deep-equal "^3.1.1" @@ -2490,48 +2514,48 @@ ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0: ansi-escapes@^4.2.1, ansi-escapes@^4.3.1: version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz" integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: type-fest "^0.21.3" ansi-html-community@^0.0.8: version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + resolved "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz" integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== ansi-regex@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-regex@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz" integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== ansi-styles@^3.2.1: version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== dependencies: color-convert "^1.9.0" ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" ansi-styles@^5.0.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== anymatch@^3.0.3, anymatch@~3.1.2: version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" @@ -2539,24 +2563,24 @@ anymatch@^3.0.3, anymatch@~3.1.2: arg@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" + resolved "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz" integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA== argparse@^1.0.7: version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== dependencies: sprintf-js "~1.0.2" argparse@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== aria-query@^4.2.2: version "4.2.2" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" + resolved "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz" integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA== dependencies: "@babel/runtime" "^7.10.2" @@ -2564,22 +2588,22 @@ aria-query@^4.2.2: aria-query@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c" + resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz" integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg== array-flatten@1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= array-flatten@^2.1.0: version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" + resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== array-includes@^3.1.3, array-includes@^3.1.4: version "3.1.4" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" + resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz" integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== dependencies: call-bind "^1.0.2" @@ -2590,12 +2614,12 @@ array-includes@^3.1.3, array-includes@^3.1.4: array-union@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== array.prototype.filter@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.1.tgz#20688792acdb97a09488eaaee9eebbf3966aae21" + resolved "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.1.tgz" integrity sha512-Dk3Ty7N42Odk7PjU/Ci3zT4pLj20YvuVnneG/58ICM6bt4Ij5kZaJTVQ9TSaWaIECX2sFyz4KItkVZqHNnciqw== dependencies: call-bind "^1.0.2" @@ -2606,7 +2630,7 @@ array.prototype.filter@^1.0.0: array.prototype.find@^2.1.1: version "2.1.2" - resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.2.tgz#6abbd0c2573925d8094f7d23112306af8c16d534" + resolved "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.2.tgz" integrity sha512-00S1O4ewO95OmmJW7EesWfQlrCrLEL8kZ40w3+GkLX2yTt0m2ggcePPa2uHPJ9KUmJvwRq+lCV9bD8Yim23x/Q== dependencies: call-bind "^1.0.2" @@ -2615,7 +2639,7 @@ array.prototype.find@^2.1.1: array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.5: version "1.2.5" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13" + resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz" integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg== dependencies: call-bind "^1.0.2" @@ -2624,7 +2648,7 @@ array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.5: array.prototype.flatmap@^1.2.5: version "1.2.5" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" + resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz" integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA== dependencies: call-bind "^1.0.0" @@ -2633,44 +2657,44 @@ array.prototype.flatmap@^1.2.5: asap@~2.0.6: version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= ast-types-flow@^0.0.7: version "0.0.7" - resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" + resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz" integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= async@^2.6.2: version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + resolved "https://registry.npmjs.org/async/-/async-2.6.4.tgz" integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14" async@^3.2.3: version "3.2.3" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" + resolved "https://registry.npmjs.org/async/-/async-3.2.3.tgz" integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== asynckit@^0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= at-least-node@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== atob@^2.1.2: version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== autoprefixer@^10.4.4: version "10.4.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e" + resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.4.tgz" integrity sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA== dependencies: browserslist "^4.20.2" @@ -2682,24 +2706,24 @@ autoprefixer@^10.4.4: axe-core@^4.3.5: version "4.4.1" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.1.tgz#7dbdc25989298f9ad006645cd396782443757413" + resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.4.1.tgz" integrity sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw== axios@*, axios@^0.26.1: version "0.26.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" + resolved "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz" integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== dependencies: follow-redirects "^1.14.8" axobject-query@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" + resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz" integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== babel-jest@^27.4.2, babel-jest@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" + resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz" integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg== dependencies: "@jest/transform" "^27.5.1" @@ -2713,7 +2737,7 @@ babel-jest@^27.4.2, babel-jest@^27.5.1: babel-loader@^8.2.3: version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz" integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== dependencies: find-cache-dir "^3.3.1" @@ -2723,14 +2747,14 @@ babel-loader@^8.2.3: babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + resolved "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz" integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== dependencies: object.assign "^4.1.0" babel-plugin-istanbul@^6.1.1: version "6.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" + resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz" integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -2741,7 +2765,7 @@ babel-plugin-istanbul@^6.1.1: babel-plugin-jest-hoist@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz#9be98ecf28c331eb9f5df9c72d6f89deb8181c2e" + resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz" integrity sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ== dependencies: "@babel/template" "^7.3.3" @@ -2751,7 +2775,7 @@ babel-plugin-jest-hoist@^27.5.1: babel-plugin-macros@^3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" + resolved "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz" integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg== dependencies: "@babel/runtime" "^7.12.5" @@ -2760,12 +2784,12 @@ babel-plugin-macros@^3.1.0: babel-plugin-named-asset-import@^0.3.8: version "0.3.8" - resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz#6b7fa43c59229685368683c28bc9734f24524cc2" + resolved "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz" integrity sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q== babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz" integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w== dependencies: "@babel/compat-data" "^7.13.11" @@ -2774,7 +2798,7 @@ babel-plugin-polyfill-corejs2@^0.3.0: babel-plugin-polyfill-corejs3@^0.5.0: version "0.5.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz" integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.1" @@ -2782,14 +2806,14 @@ babel-plugin-polyfill-corejs3@^0.5.0: babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz" integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.1" "babel-plugin-styled-components@>= 1.12.0": version "2.0.6" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz#6f76c7f7224b7af7edc24a4910351948c691fc90" + resolved "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz" integrity sha512-Sk+7o/oa2HfHv3Eh8sxoz75/fFvEdHsXV4grdeHufX0nauCmymlnN0rGhIvfpMQSJMvGutJ85gvCGea4iqmDpg== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -2800,17 +2824,17 @@ babel-plugin-polyfill-regenerator@^0.3.0: babel-plugin-syntax-jsx@^6.18.0: version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" + resolved "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz" integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= babel-plugin-transform-react-remove-prop-types@^0.4.24: version "0.4.24" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a" + resolved "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz" integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA== babel-preset-current-node-syntax@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" + resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz" integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== dependencies: "@babel/plugin-syntax-async-generators" "^7.8.4" @@ -2828,7 +2852,7 @@ babel-preset-current-node-syntax@^1.0.0: babel-preset-jest@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz#91f10f58034cb7989cb4f962b69fa6eef6a6bc81" + resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz" integrity sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag== dependencies: babel-plugin-jest-hoist "^27.5.1" @@ -2836,7 +2860,7 @@ babel-preset-jest@^27.5.1: babel-preset-react-app@^10.0.1: version "10.0.1" - resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz#ed6005a20a24f2c88521809fa9aea99903751584" + resolved "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz" integrity sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg== dependencies: "@babel/core" "^7.16.0" @@ -2858,22 +2882,22 @@ babel-preset-react-app@^10.0.1: balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base64-js@^1.3.1: version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== batch@0.6.1: version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + resolved "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz" integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= bfj@^7.0.2: version "7.0.2" - resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2" + resolved "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz" integrity sha512-+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw== dependencies: bluebird "^3.5.5" @@ -2883,22 +2907,22 @@ bfj@^7.0.2: big.js@^5.2.2: version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + resolved "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== binary-extensions@^2.0.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== bluebird@^3.5.5: version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== body-parser@1.19.2: version "1.19.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" + resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz" integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== dependencies: bytes "3.1.2" @@ -2914,7 +2938,7 @@ body-parser@1.19.2: bonjour@^3.5.0: version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" + resolved "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz" integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= dependencies: array-flatten "^2.1.0" @@ -2926,17 +2950,17 @@ bonjour@^3.5.0: boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= bootstrap@5.1.3: version "5.1.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34" + resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz" integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q== brace-expansion@^1.1.7: version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== dependencies: balanced-match "^1.0.0" @@ -2944,26 +2968,26 @@ brace-expansion@^1.1.7: brace-expansion@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz" integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== dependencies: balanced-match "^1.0.0" braces@^3.0.1, braces@~3.0.2: version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: fill-range "^7.0.1" browser-process-hrtime@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1, browserslist@^4.20.2: version "4.20.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz" integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== dependencies: caniuse-lite "^1.0.30001317" @@ -2974,24 +2998,24 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4 bser@2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz" integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== dependencies: node-int64 "^0.4.0" buffer-from@^1.0.0: version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer-indexof@^1.0.0: version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" + resolved "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz" integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== buffer@^6.0.3: version "6.0.3" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + resolved "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz" integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== dependencies: base64-js "^1.3.1" @@ -2999,22 +3023,22 @@ buffer@^6.0.3: builtin-modules@^3.1.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" + resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz" integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA== bytes@3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= bytes@3.1.2: version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: function-bind "^1.1.1" @@ -3022,12 +3046,12 @@ call-bind@^1.0.0, call-bind@^1.0.2: callsites@^3.0.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== camel-case@^4.1.2: version "4.1.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" + resolved "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz" integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== dependencies: pascal-case "^3.1.2" @@ -3035,27 +3059,27 @@ camel-case@^4.1.2: camelcase-css@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" + resolved "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz" integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== camelcase@^5.3.1: version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== camelcase@^6.2.0, camelcase@^6.2.1: version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== camelize@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" + resolved "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz" integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= caniuse-api@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" + resolved "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz" integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== dependencies: browserslist "^4.0.0" @@ -3065,17 +3089,17 @@ caniuse-api@^3.0.0: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317: version "1.0.30001319" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz#eb4da4eb3ecdd409f7ba1907820061d56096e88f" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz" integrity sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw== case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" - resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" + resolved "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz" integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw== chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== dependencies: ansi-styles "^3.2.1" @@ -3084,7 +3108,7 @@ chalk@^2.0.0, chalk@^2.4.1: chalk@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + resolved "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz" integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== dependencies: ansi-styles "^4.1.0" @@ -3092,7 +3116,7 @@ chalk@^3.0.0: chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" @@ -3100,27 +3124,27 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: char-regex@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== char-regex@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-2.0.1.tgz#6dafdb25f9d3349914079f010ba8d0e6ff9cd01e" + resolved "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz" integrity sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw== charcodes@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4" + resolved "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz" integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ== check-types@^11.1.1: version "11.1.2" - resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f" + resolved "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz" integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ== cheerio-select@^1.5.0: version "1.5.0" - resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823" + resolved "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz" integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg== dependencies: css-select "^4.1.3" @@ -3131,7 +3155,7 @@ cheerio-select@^1.5.0: cheerio@^1.0.0-rc.3: version "1.0.0-rc.10" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e" + resolved "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz" integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw== dependencies: cheerio-select "^1.5.0" @@ -3144,7 +3168,7 @@ cheerio@^1.0.0-rc.3: chokidar@^3.4.2, chokidar@^3.5.3: version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== dependencies: anymatch "~3.1.2" @@ -3159,39 +3183,39 @@ chokidar@^3.4.2, chokidar@^3.5.3: chrome-trace-event@^1.0.2: version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^3.2.0: version "3.3.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" + resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz" integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== cjs-module-lexer@^1.0.0: version "1.2.2" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" + resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== classnames@^2.2.0, classnames@^2.3.1: version "2.3.1" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" + resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz" integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== clean-css@^5.2.2: version "5.2.4" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.4.tgz#982b058f8581adb2ae062520808fb2429bd487a4" + resolved "https://registry.npmjs.org/clean-css/-/clean-css-5.2.4.tgz" integrity sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg== dependencies: source-map "~0.6.0" clean-stack@^2.0.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== cliui@^7.0.2: version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz" integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== dependencies: string-width "^4.2.0" @@ -3200,12 +3224,12 @@ cliui@^7.0.2: co@^4.6.0: version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= coa@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" + resolved "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz" integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== dependencies: "@types/q" "^1.5.1" @@ -3214,90 +3238,90 @@ coa@^2.0.2: collect-v8-coverage@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" + resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz" integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== color-convert@^1.9.0: version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== dependencies: color-name "1.1.3" color-convert@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== dependencies: color-name "~1.1.4" color-name@1.1.3: version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= color-name@^1.1.4, color-name@~1.1.4: version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== colord@^2.9.1: version "2.9.2" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" + resolved "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz" integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ== colorette@^2.0.10: version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz" integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== combined-stream@^1.0.8: version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== dependencies: delayed-stream "~1.0.0" commander@^2.19.0, commander@^2.20.0: version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== commander@^7.2.0: version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== commander@^8.3.0: version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== common-path-prefix@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" + resolved "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz" integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w== common-tags@^1.8.0: version "1.8.2" - resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" + resolved "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz" integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA== commondir@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= compressible@~2.0.16: version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz" integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== dependencies: mime-db ">= 1.43.0 < 2" compression@^1.7.4: version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + resolved "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz" integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== dependencies: accepts "~1.3.5" @@ -3310,56 +3334,56 @@ compression@^1.7.4: compute-scroll-into-view@^1.0.17: version "1.0.17" - resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab" + resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz" integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg== concat-map@0.0.1: version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= confusing-browser-globals@^1.0.11: version "1.0.11" - resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" + resolved "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz" integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA== connect-history-api-fallback@^1.6.0: version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + resolved "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== content-disposition@0.5.4: version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz" integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== dependencies: safe-buffer "5.2.1" content-type@~1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz" integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== dependencies: safe-buffer "~5.1.1" cookie-signature@1.0.6: version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= cookie@0.4.2: version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" + resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz" integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== core-js-compat@^3.20.2, core-js-compat@^3.21.0: version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82" + resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz" integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g== dependencies: browserslist "^4.19.1" @@ -3367,22 +3391,22 @@ core-js-compat@^3.20.2, core-js-compat@^3.21.0: core-js-pure@^3.20.2, core-js-pure@^3.8.1: version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51" + resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz" integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ== core-js@^3.19.2: version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94" + resolved "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz" integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig== core-util-is@~1.0.0: version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== cosmiconfig@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz" integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== dependencies: "@types/parse-json" "^4.0.0" @@ -3393,7 +3417,7 @@ cosmiconfig@^6.0.0: cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz" integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== dependencies: "@types/parse-json" "^4.0.0" @@ -3404,7 +3428,7 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== dependencies: path-key "^3.1.0" @@ -3413,38 +3437,45 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3: crypto-random-string@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== css-blank-pseudo@^3.0.3: version "3.0.3" - resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz#36523b01c12a25d812df343a32c322d2a2324561" + resolved "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz" integrity sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ== dependencies: postcss-selector-parser "^6.0.9" +css-box-model@^1.2.0: + version "1.2.1" + resolved "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz" + integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw== + dependencies: + tiny-invariant "^1.0.6" + css-color-keywords@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" + resolved "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz" integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= css-declaration-sorter@^6.0.3: version "6.1.4" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4" + resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz" integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw== dependencies: timsort "^0.3.0" css-has-pseudo@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73" + resolved "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz" integrity sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw== dependencies: postcss-selector-parser "^6.0.9" css-loader@^6.5.1: version "6.7.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e" + resolved "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz" integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw== dependencies: icss-utils "^5.1.0" @@ -3458,7 +3489,7 @@ css-loader@^6.5.1: css-minimizer-webpack-plugin@^3.2.0: version "3.4.1" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" + resolved "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz" integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== dependencies: cssnano "^5.0.6" @@ -3470,17 +3501,17 @@ css-minimizer-webpack-plugin@^3.2.0: css-prefers-color-scheme@^6.0.3: version "6.0.3" - resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz#ca8a22e5992c10a5b9d315155e7caee625903349" + resolved "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz" integrity sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA== css-select-base-adapter@^0.1.1: version "0.1.1" - resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" + resolved "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz" integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== css-select@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" + resolved "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz" integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== dependencies: boolbase "^1.0.0" @@ -3490,7 +3521,7 @@ css-select@^2.0.0: css-select@^4.1.3: version "4.2.1" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" + resolved "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz" integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== dependencies: boolbase "^1.0.0" @@ -3501,7 +3532,7 @@ css-select@^4.1.3: css-to-react-native@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756" + resolved "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz" integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ== dependencies: camelize "^1.0.0" @@ -3510,7 +3541,7 @@ css-to-react-native@^3.0.0: css-tree@1.0.0-alpha.37: version "1.0.0-alpha.37" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" + resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz" integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== dependencies: mdn-data "2.0.4" @@ -3518,7 +3549,7 @@ css-tree@1.0.0-alpha.37: css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz" integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== dependencies: mdn-data "2.0.14" @@ -3526,22 +3557,22 @@ css-tree@^1.1.2, css-tree@^1.1.3: css-what@^3.2.1: version "3.4.2" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + resolved "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== css-what@^5.0.1, css-what@^5.1.0: version "5.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + resolved "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz" integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== css.escape@^1.5.1: version "1.5.1" - resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" + resolved "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz" integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s= css@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" + resolved "https://registry.npmjs.org/css/-/css-3.0.0.tgz" integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== dependencies: inherits "^2.0.4" @@ -3550,17 +3581,17 @@ css@^3.0.0: cssdb@^6.5.0: version "6.5.0" - resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-6.5.0.tgz#61264b71f29c834f09b59cb3e5b43c8226590122" + resolved "https://registry.npmjs.org/cssdb/-/cssdb-6.5.0.tgz" integrity sha512-Rh7AAopF2ckPXe/VBcoUS9JrCZNSyc60+KpgE6X25vpVxA32TmiqvExjkfhwP4wGSb6Xe8Z/JIyGqwgx/zZYFA== cssesc@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== cssnano-preset-default@^*: version "5.2.4" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.4.tgz#eced79bbc1ab7270337c4038a21891daac2329bc" + resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.4.tgz" integrity sha512-w1Gg8xsebln6/axZ6qDFQHuglrGfbIHOIx0g4y9+etRlRab8CGpSpe6UMsrgJe4zhCaJ0LwLmc+PhdLRTwnhIA== dependencies: css-declaration-sorter "^6.0.3" @@ -3595,12 +3626,12 @@ cssnano-preset-default@^*: cssnano-utils@^*, cssnano-utils@^3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" + resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== cssnano@^5.0.6: version "5.1.4" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.4.tgz#c648192e8e2f1aacb7d839e6aa3706b50cc7f8e4" + resolved "https://registry.npmjs.org/cssnano/-/cssnano-5.1.4.tgz" integrity sha512-hbfhVZreEPyzl+NbvRsjNo54JOX80b+j6nqG2biLVLaZHJEiqGyMh4xDGHtwhUKd5p59mj2GlDqlUBwJUuIu5A== dependencies: cssnano-preset-default "^*" @@ -3609,41 +3640,41 @@ cssnano@^5.0.6: csso@^4.0.2, csso@^4.2.0: version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + resolved "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz" integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== dependencies: css-tree "^1.1.2" cssom@^0.4.4: version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + resolved "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz" integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== cssom@~0.3.6: version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== cssstyle@^2.3.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz" integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== dependencies: cssom "~0.3.6" csstype@^3.0.2: version "3.0.11" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" + resolved "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz" integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw== damerau-levenshtein@^1.0.7: version "1.0.8" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" + resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz" integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== data-urls@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" + resolved "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz" integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== dependencies: abab "^2.0.3" @@ -3652,43 +3683,43 @@ data-urls@^2.0.0: debug@2.6.9, debug@^2.6.0, debug@^2.6.9: version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" debug@^3.1.1, debug@^3.2.7: version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" decimal.js@^10.2.1: version "10.3.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz" integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== decode-uri-component@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= dedent@^0.7.0: version "0.7.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" + resolved "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= deep-equal@^1.0.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + resolved "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz" integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== dependencies: is-arguments "^1.0.4" @@ -3700,41 +3731,41 @@ deep-equal@^1.0.1: deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== default-gateway@^6.0.3: version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" + resolved "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz" integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== dependencies: execa "^5.0.0" define-lazy-prop@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== define-properties@^1.1.3: version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== dependencies: object-keys "^1.0.12" defined@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" + resolved "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz" integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= del@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + resolved "https://registry.npmjs.org/del/-/del-6.0.0.tgz" integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== dependencies: globby "^11.0.1" @@ -3748,37 +3779,37 @@ del@^6.0.0: delayed-stream@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= depd@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= dequal@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d" + resolved "https://registry.npmjs.org/dequal/-/dequal-2.0.2.tgz" integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug== destroy@~1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= detect-newline@^3.0.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detect-node@^2.0.4: version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== detect-port-alt@^1.1.6: version "1.1.6" - resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" + resolved "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz" integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q== dependencies: address "^1.0.1" @@ -3786,7 +3817,7 @@ detect-port-alt@^1.1.6: detective@^5.2.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" + resolved "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz" integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg== dependencies: acorn-node "^1.6.1" @@ -3795,39 +3826,39 @@ detective@^5.2.0: didyoumean@^1.2.2: version "1.2.2" - resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + resolved "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz" integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== diff-sequences@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" + resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz" integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ== dir-glob@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz" integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== dependencies: path-type "^4.0.0" discontinuous-range@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" + resolved "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz" integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo= dlv@^1.1.3: version "1.1.3" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" + resolved "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz" integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== dns-equal@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + resolved "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: version "1.3.4" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + resolved "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz" integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== dependencies: ip "^1.1.0" @@ -3835,40 +3866,40 @@ dns-packet@^1.3.1: dns-txt@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + resolved "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz" integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= dependencies: buffer-indexof "^1.0.0" doctrine@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz" integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== dependencies: esutils "^2.0.2" doctrine@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz" integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== dependencies: esutils "^2.0.2" dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: version "0.5.13" - resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.13.tgz#102ee5f25eacce09bdf1cfa5a298f86da473be4b" + resolved "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.13.tgz" integrity sha512-R305kwb5CcMDIpSHUnLyIAp7SrSPBx6F0VfQFB3M75xVMHhXJJIdePYgbPPh1o57vCHNu5QztokWUPsLjWzFqw== dom-converter@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" + resolved "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz" integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== dependencies: utila "~0.4" dom-helpers@^5.0.1, dom-helpers@^5.2.0, dom-helpers@^5.2.1: version "5.2.1" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" + resolved "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz" integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== dependencies: "@babel/runtime" "^7.8.7" @@ -3876,7 +3907,7 @@ dom-helpers@^5.0.1, dom-helpers@^5.2.0, dom-helpers@^5.2.1: dom-serializer@0: version "0.2.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz" integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== dependencies: domelementtype "^2.0.1" @@ -3884,7 +3915,7 @@ dom-serializer@0: dom-serializer@^1.0.1, dom-serializer@^1.3.2: version "1.3.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz" integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== dependencies: domelementtype "^2.0.1" @@ -3893,31 +3924,31 @@ dom-serializer@^1.0.1, dom-serializer@^1.3.2: domelementtype@1: version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz" integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== domexception@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" + resolved "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz" integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== dependencies: webidl-conversions "^5.0.0" domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: version "4.3.1" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" + resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz" integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== dependencies: domelementtype "^2.2.0" domutils@^1.7.0: version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + resolved "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz" integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== dependencies: dom-serializer "0" @@ -3925,7 +3956,7 @@ domutils@^1.7.0: domutils@^2.5.2, domutils@^2.7.0, domutils@^2.8.0: version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== dependencies: dom-serializer "^1.0.1" @@ -3934,7 +3965,7 @@ domutils@^2.5.2, domutils@^2.7.0, domutils@^2.8.0: dot-case@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + resolved "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz" integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== dependencies: no-case "^3.0.4" @@ -3942,64 +3973,64 @@ dot-case@^3.0.4: dotenv-expand@^5.1.0: version "5.1.0" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + resolved "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== dotenv@^10.0.0: version "10.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" + resolved "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== duplexer@^0.1.2: version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== ee-first@1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= ejs@^3.1.6: version "3.1.7" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.7.tgz#c544d9c7f715783dd92f0bddcf73a59e6962d006" + resolved "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz" integrity sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw== dependencies: jake "^10.8.5" electron-to-chromium@^1.4.84: version "1.4.88" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.88.tgz#ebe6a2573b563680c7a7bf3a51b9e465c9c501db" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.88.tgz" integrity sha512-oA7mzccefkvTNi9u7DXmT0LqvhnOiN2BhSrKerta7HeUC1cLoIwtbf2wL+Ah2ozh5KQd3/1njrGrwDBXx6d14Q== emittery@^0.8.1: version "0.8.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" + resolved "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz" integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== emoji-regex@^8.0.0: version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== emoji-regex@^9.2.2: version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== emojis-list@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== encodeurl@~1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= enhanced-resolve@^5.9.2: version "5.9.2" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9" + resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz" integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA== dependencies: graceful-fs "^4.2.4" @@ -4007,12 +4038,12 @@ enhanced-resolve@^5.9.2: entities@^2.0.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== enzyme-adapter-react-16@^1.15.6: version "1.15.6" - resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz#fd677a658d62661ac5afd7f7f541f141f8085901" + resolved "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz" integrity sha512-yFlVJCXh8T+mcQo8M6my9sPgeGzj85HSHi6Apgf1Cvq/7EL/J9+1JoJmJsRxZgyTvPMAqOEpRSu/Ii/ZpyOk0g== dependencies: enzyme-adapter-utils "^1.14.0" @@ -4027,7 +4058,7 @@ enzyme-adapter-react-16@^1.15.6: enzyme-adapter-utils@^1.14.0: version "1.14.0" - resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz#afbb0485e8033aa50c744efb5f5711e64fbf1ad0" + resolved "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz" integrity sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg== dependencies: airbnb-prop-types "^2.16.0" @@ -4040,7 +4071,7 @@ enzyme-adapter-utils@^1.14.0: enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz#b9256cb25a5f430f9bfe073a84808c1d74fced2e" + resolved "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz" integrity sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q== dependencies: has "^1.0.3" @@ -4048,7 +4079,7 @@ enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.4: enzyme@^3.11.0: version "3.11.0" - resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28" + resolved "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz" integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw== dependencies: array.prototype.flat "^1.2.3" @@ -4076,21 +4107,21 @@ enzyme@^3.11.0: error-ex@^1.3.1: version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== dependencies: is-arrayish "^0.2.1" error-stack-parser@^2.0.6: version "2.0.7" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.7.tgz#b0c6e2ce27d0495cf78ad98715e0cad1219abb57" + resolved "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz" integrity sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA== dependencies: stackframe "^1.1.1" es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz" integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== dependencies: call-bind "^1.0.2" @@ -4116,17 +4147,17 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: es-array-method-boxes-properly@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" + resolved "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== es-module-lexer@^0.9.0: version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz" integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== es-to-primitive@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz" integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== dependencies: is-callable "^1.1.4" @@ -4135,32 +4166,32 @@ es-to-primitive@^1.2.1: escalade@^3.1.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== escape-html@~1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= escape-string-regexp@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= escape-string-regexp@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== escape-string-regexp@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== escodegen@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + resolved "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz" integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== dependencies: esprima "^4.0.1" @@ -4172,12 +4203,12 @@ escodegen@^2.0.0: eslint-config-prettier@^8.3.0: version "8.5.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" + resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz" integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== eslint-config-react-app@^7.0.0: version "7.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.0.tgz#0fa96d5ec1dfb99c029b1554362ab3fa1c3757df" + resolved "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.0.tgz" integrity sha512-xyymoxtIt1EOsSaGag+/jmcywRuieQoA2JbPCjnw9HukFj9/97aGPoZVFioaotzk1K5Qt9sHO5EutZbkrAXS0g== dependencies: "@babel/core" "^7.16.0" @@ -4197,12 +4228,12 @@ eslint-config-react-app@^7.0.0: eslint-config-standard@^16.0.3: version "16.0.3" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" + resolved "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz" integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== eslint-import-resolver-node@^0.3.6: version "0.3.6" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz" integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== dependencies: debug "^3.2.7" @@ -4210,7 +4241,7 @@ eslint-import-resolver-node@^0.3.6: eslint-module-utils@^2.7.2: version "2.7.3" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" + resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz" integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== dependencies: debug "^3.2.7" @@ -4218,7 +4249,7 @@ eslint-module-utils@^2.7.2: eslint-plugin-es@^3.0.0: version "3.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893" + resolved "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz" integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ== dependencies: eslint-utils "^2.0.0" @@ -4226,7 +4257,7 @@ eslint-plugin-es@^3.0.0: eslint-plugin-flowtype@^8.0.3: version "8.0.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz#e1557e37118f24734aa3122e7536a038d34a4912" + resolved "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz" integrity sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ== dependencies: lodash "^4.17.21" @@ -4234,7 +4265,7 @@ eslint-plugin-flowtype@^8.0.3: eslint-plugin-import@^2.25.3: version "2.25.4" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" + resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz" integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== dependencies: array-includes "^3.1.4" @@ -4253,14 +4284,14 @@ eslint-plugin-import@^2.25.3: eslint-plugin-jest@^25.3.0: version "25.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz#ff4ac97520b53a96187bad9c9814e7d00de09a6a" + resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz" integrity sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ== dependencies: "@typescript-eslint/experimental-utils" "^5.0.0" eslint-plugin-jsx-a11y@^6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8" + resolved "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz" integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g== dependencies: "@babel/runtime" "^7.16.3" @@ -4278,7 +4309,7 @@ eslint-plugin-jsx-a11y@^6.5.1: eslint-plugin-node@^11.1.0: version "11.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d" + resolved "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz" integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g== dependencies: eslint-plugin-es "^3.0.0" @@ -4290,24 +4321,24 @@ eslint-plugin-node@^11.1.0: eslint-plugin-prettier@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0" + resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz" integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ== dependencies: prettier-linter-helpers "^1.0.0" eslint-plugin-promise@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz#017652c07c9816413a41e11c30adc42c3d55ff18" + resolved "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz" integrity sha512-7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw== eslint-plugin-react-hooks@^4.3.0: version "4.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" + resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz" integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.28.0: version "7.29.4" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz#4717de5227f55f3801a5fd51a16a4fa22b5914d2" + resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz" integrity sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ== dependencies: array-includes "^3.1.4" @@ -4327,19 +4358,19 @@ eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.28.0: eslint-plugin-standard@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz#c43f6925d669f177db46f095ea30be95476b1ee4" + resolved "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz" integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg== eslint-plugin-testing-library@^5.0.1: version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.1.0.tgz#6ad539a53d4e897d3045902f8e534e07cebd4e8b" + resolved "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.1.0.tgz" integrity sha512-YSNzasJUbyhOTe14ZPygeOBvcPvcaNkwHwrj4vdf+uirr2D32JTDaKi6CP5Os2aWtOcvt4uBSPXp9h5xGoqvWQ== dependencies: "@typescript-eslint/utils" "^5.13.0" eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: esrecurse "^4.3.0" @@ -4347,7 +4378,7 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1: eslint-scope@^7.1.1: version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz" integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== dependencies: esrecurse "^4.3.0" @@ -4355,36 +4386,36 @@ eslint-scope@^7.1.1: eslint-utils@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz" integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: eslint-visitor-keys "^1.1.0" eslint-utils@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz" integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== dependencies: eslint-visitor-keys "^2.0.0" eslint-visitor-keys@^1.1.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0: version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== eslint-webpack-plugin@^3.1.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz#83dad2395e5f572d6f4d919eedaa9cf902890fcb" + resolved "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz" integrity sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg== dependencies: "@types/eslint" "^7.28.2" @@ -4395,7 +4426,7 @@ eslint-webpack-plugin@^3.1.1: eslint@^8.3.0, eslint@^8.9.0: version "8.11.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37" + resolved "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz" integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA== dependencies: "@eslint/eslintrc" "^1.2.1" @@ -4436,7 +4467,7 @@ eslint@^8.3.0, eslint@^8.9.0: espree@^9.3.1: version "9.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd" + resolved "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz" integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ== dependencies: acorn "^8.7.0" @@ -4445,61 +4476,61 @@ espree@^9.3.1: esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz" integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: estraverse "^5.1.0" esrecurse@^4.3.0: version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: estraverse "^5.2.0" estraverse@^4.1.1: version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== estree-walker@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" + resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz" integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== esutils@^2.0.2: version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== etag@~1.8.1: version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eventemitter3@^4.0.0: version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== events@^3.2.0: version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== execa@^5.0.0: version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== dependencies: cross-spawn "^7.0.3" @@ -4514,12 +4545,12 @@ execa@^5.0.0: exit@^0.1.2: version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= expect@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74" + resolved "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz" integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw== dependencies: "@jest/types" "^27.5.1" @@ -4529,7 +4560,7 @@ expect@^27.5.1: express@^4.17.1: version "4.17.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" + resolved "https://registry.npmjs.org/express/-/express-4.17.3.tgz" integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== dependencies: accepts "~1.3.8" @@ -4565,17 +4596,17 @@ express@^4.17.1: fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-diff@^1.1.2: version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-glob@^3.2.11, fast-glob@^3.2.9: version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== dependencies: "@nodelib/fs.stat" "^2.0.2" @@ -4586,45 +4617,45 @@ fast-glob@^3.2.11, fast-glob@^3.2.9: fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^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.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= fastq@^1.6.0: version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + resolved "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz" integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== dependencies: reusify "^1.0.4" faye-websocket@^0.11.3: version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" + resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz" integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== dependencies: websocket-driver ">=0.5.1" fb-watchman@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz" integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== dependencies: bser "2.1.1" file-entry-cache@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz" integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: flat-cache "^3.0.4" file-loader@^6.2.0: version "6.2.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" + resolved "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz" integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== dependencies: loader-utils "^2.0.0" @@ -4632,26 +4663,26 @@ file-loader@^6.2.0: filelist@^1.0.1: version "1.0.3" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.3.tgz#448607750376484932f67ef1b9ff07386b036c83" + resolved "https://registry.npmjs.org/filelist/-/filelist-1.0.3.tgz" integrity sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q== dependencies: minimatch "^5.0.1" filesize@^8.0.6: version "8.0.7" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8" + resolved "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz" integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ== fill-range@^7.0.1: version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== dependencies: to-regex-range "^5.0.1" finalhandler@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz" integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== dependencies: debug "2.6.9" @@ -4664,7 +4695,7 @@ finalhandler@~1.1.2: find-cache-dir@^3.3.1: version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz" integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== dependencies: commondir "^1.0.1" @@ -4673,21 +4704,21 @@ find-cache-dir@^3.3.1: find-up@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= dependencies: locate-path "^2.0.0" find-up@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz" integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== dependencies: locate-path "^3.0.0" find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz" integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== dependencies: locate-path "^5.0.0" @@ -4695,7 +4726,7 @@ find-up@^4.0.0, find-up@^4.1.0: find-up@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== dependencies: locate-path "^6.0.0" @@ -4703,7 +4734,7 @@ find-up@^5.0.0: flat-cache@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz" integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== dependencies: flatted "^3.1.0" @@ -4711,17 +4742,17 @@ flat-cache@^3.0.4: flatted@^3.1.0: version "3.2.5" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz" integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== follow-redirects@^1.0.0, follow-redirects@^1.14.8: version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz" integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== fork-ts-checker-webpack-plugin@^6.5.0: version "6.5.0" - resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz#0282b335fa495a97e167f69018f566ea7d2a2b5e" + resolved "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz" integrity sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw== dependencies: "@babel/code-frame" "^7.8.3" @@ -4740,7 +4771,7 @@ fork-ts-checker-webpack-plugin@^6.5.0: form-data@^3.0.0: version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + resolved "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz" integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== dependencies: asynckit "^0.4.0" @@ -4749,22 +4780,22 @@ form-data@^3.0.0: forwarded@0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== fraction.js@^4.2.0: version "4.2.0" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" + resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== fresh@0.5.2: version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= fs-extra@^10.0.0: version "10.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz" integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag== dependencies: graceful-fs "^4.2.0" @@ -4773,7 +4804,7 @@ fs-extra@^10.0.0: fs-extra@^9.0.0, fs-extra@^9.0.1: version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: at-least-node "^1.0.0" @@ -4783,27 +4814,27 @@ fs-extra@^9.0.0, fs-extra@^9.0.1: fs-monkey@1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" + resolved "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz" integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^2.3.2, fsevents@~2.3.2: version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== function.prototype.name@^1.1.2, function.prototype.name@^1.1.3: version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" + resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz" integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== dependencies: call-bind "^1.0.2" @@ -4813,27 +4844,27 @@ function.prototype.name@^1.1.2, function.prototype.name@^1.1.3: functional-red-black-tree@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= functions-have-names@^1.2.2: version "1.2.2" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21" + resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz" integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA== gensync@^1.0.0-beta.2: version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== get-caller-file@^2.0.5: version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== dependencies: function-bind "^1.1.1" @@ -4842,22 +4873,22 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" - resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + resolved "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz" integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== get-package-type@^0.1.0: version "0.1.0" - resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== get-stream@^6.0.0: version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== get-symbol-description@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz" integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== dependencies: call-bind "^1.0.2" @@ -4865,26 +4896,26 @@ get-symbol-description@^1.0.0: glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" glob-parent@^6.0.1, glob-parent@^6.0.2: version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== dependencies: is-glob "^4.0.3" glob-to-regexp@^0.4.1: version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" @@ -4896,14 +4927,14 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: global-modules@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + resolved "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz" integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== dependencies: global-prefix "^3.0.0" global-prefix@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz" integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== dependencies: ini "^1.3.5" @@ -4912,19 +4943,19 @@ global-prefix@^3.0.0: globals@^11.1.0: version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: version "13.13.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b" + resolved "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz" integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A== dependencies: type-fest "^0.20.2" globby@^11.0.1, globby@^11.0.4: version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== dependencies: array-union "^2.1.0" @@ -4936,87 +4967,87 @@ globby@^11.0.1, globby@^11.0.4: graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== gzip-size@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" + resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz" integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== dependencies: duplexer "^0.1.2" handle-thing@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + resolved "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz" integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== harmony-reflect@^1.4.6: version "1.6.2" - resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" + resolved "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz" integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g== has-bigints@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz" integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== has-flag@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-tostringtag@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz" integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== dependencies: has-symbols "^1.0.2" has@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" he@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== history@^5.2.0: version "5.3.0" - resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b" + resolved "https://registry.npmjs.org/history/-/history-5.3.0.tgz" integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== dependencies: "@babel/runtime" "^7.7.6" -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0: +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== dependencies: react-is "^16.7.0" hoopy@^0.1.4: version "0.1.4" - resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" + resolved "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz" integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== hpack.js@^2.1.6: version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + resolved "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz" integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= dependencies: inherits "^2.0.1" @@ -5026,7 +5057,7 @@ hpack.js@^2.1.6: html-element-map@^1.2.0: version "1.3.1" - resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.3.1.tgz#44b2cbcfa7be7aa4ff59779e47e51012e1c73c08" + resolved "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz" integrity sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg== dependencies: array.prototype.filter "^1.0.0" @@ -5034,24 +5065,24 @@ html-element-map@^1.2.0: html-encoding-sniffer@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" + resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz" integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== dependencies: whatwg-encoding "^1.0.5" html-entities@^2.1.0, html-entities@^2.3.2: version "2.3.2" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + resolved "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz" integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== html-escaper@^2.0.0: version "2.0.2" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== html-minifier-terser@^6.0.2: version "6.1.0" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" + resolved "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz" integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== dependencies: camel-case "^4.1.2" @@ -5064,7 +5095,7 @@ html-minifier-terser@^6.0.2: html-webpack-plugin@^5.5.0: version "5.5.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" + resolved "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz" integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw== dependencies: "@types/html-minifier-terser" "^6.0.0" @@ -5075,7 +5106,7 @@ html-webpack-plugin@^5.5.0: htmlparser2@^6.1.0: version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz" integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== dependencies: domelementtype "^2.0.1" @@ -5085,12 +5116,12 @@ htmlparser2@^6.1.0: http-deceiver@^1.2.7: version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + resolved "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz" integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= http-errors@1.8.1: version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz" integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== dependencies: depd "~1.1.2" @@ -5101,7 +5132,7 @@ http-errors@1.8.1: http-errors@~1.6.2: version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= dependencies: depd "~1.1.2" @@ -5111,12 +5142,12 @@ http-errors@~1.6.2: http-parser-js@>=0.5.1: version "0.5.6" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.6.tgz#2e02406ab2df8af8a7abfba62e0da01c62b95afd" + resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz" integrity sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA== http-proxy-agent@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz" integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== dependencies: "@tootallnate/once" "1" @@ -5125,7 +5156,7 @@ http-proxy-agent@^4.0.1: http-proxy-middleware@^2.0.0: version "2.0.4" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a" + resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz" integrity sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg== dependencies: "@types/http-proxy" "^1.17.8" @@ -5136,7 +5167,7 @@ http-proxy-middleware@^2.0.0: http-proxy@^1.18.1: version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz" integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== dependencies: eventemitter3 "^4.0.0" @@ -5145,7 +5176,7 @@ http-proxy@^1.18.1: https-proxy-agent@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz" integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== dependencies: agent-base "6" @@ -5153,58 +5184,58 @@ https-proxy-agent@^5.0.0: human-signals@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== iconv-lite@0.4.24: version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" iconv-lite@^0.6.3: version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== idb@^6.1.4: version "6.1.5" - resolved "https://registry.yarnpkg.com/idb/-/idb-6.1.5.tgz#dbc53e7adf1ac7c59f9b2bf56e00b4ea4fce8c7b" + resolved "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz" integrity sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw== identity-obj-proxy@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14" + resolved "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz" integrity sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ= dependencies: harmony-reflect "^1.4.6" ieee754@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.1.1, ignore@^5.1.8, ignore@^5.2.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== immer@^9.0.7: version "9.0.12" - resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.12.tgz#2d33ddf3ee1d247deab9d707ca472c8c942a0f20" + resolved "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz" integrity sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA== import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== dependencies: parent-module "^1.0.0" @@ -5212,7 +5243,7 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: import-local@^3.0.2: version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + resolved "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz" integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== dependencies: pkg-dir "^4.2.0" @@ -5220,17 +5251,17 @@ import-local@^3.0.2: imurmurhash@^0.1.4: version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= indent-string@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== inflight@^1.0.4: version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= dependencies: once "^1.3.0" @@ -5238,22 +5269,22 @@ inflight@^1.0.4: inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== inherits@2.0.3: version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@^1.3.5: version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== internal-slot@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz" integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== dependencies: get-intrinsic "^1.1.0" @@ -5262,29 +5293,29 @@ internal-slot@^1.0.3: invariant@^2.2.1, invariant@^2.2.4: version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== dependencies: loose-envify "^1.0.0" ip@^1.1.0: version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + resolved "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz" integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= ipaddr.js@1.9.1: version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== ipaddr.js@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" + resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz" integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== is-arguments@^1.0.4: version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz" integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== dependencies: call-bind "^1.0.2" @@ -5292,26 +5323,26 @@ is-arguments@^1.0.4: is-arrayish@^0.2.1: version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= is-bigint@^1.0.1: version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz" integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== dependencies: has-bigints "^1.0.1" is-binary-path@~2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz" integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== dependencies: binary-extensions "^2.0.0" is-boolean-object@^1.0.1, is-boolean-object@^1.1.0: version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz" integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: call-bind "^1.0.2" @@ -5319,100 +5350,100 @@ is-boolean-object@^1.0.1, is-boolean-object@^1.1.0: is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.4: version "1.2.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== is-core-module@^2.2.0, is-core-module@^2.8.0, is-core-module@^2.8.1: version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== dependencies: has "^1.0.3" is-date-object@^1.0.1: version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== dependencies: has-tostringtag "^1.0.0" is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== is-generator-fn@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" + resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" is-module@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz" integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= is-negative-zero@^2.0.1: version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-number-object@^1.0.4: version "1.0.6" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz" integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== dependencies: has-tostringtag "^1.0.0" is-number@^7.0.0: version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== is-obj@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= is-path-cwd@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" + resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz" integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== is-path-inside@^3.0.2: version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== is-plain-obj@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz" integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== is-potential-custom-element-name@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.4: version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" @@ -5420,80 +5451,80 @@ is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.4: is-regexp@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + resolved "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz" integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= is-root@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" + resolved "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz" integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== is-shared-array-buffer@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz" integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== is-stream@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz" integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== dependencies: has-tostringtag "^1.0.0" is-subset@^0.1.1: version "0.1.1" - resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" + resolved "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz" integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY= is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz" integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: has-symbols "^1.0.2" is-typedarray@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= is-weakref@^1.0.1: version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz" integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== dependencies: call-bind "^1.0.2" is-wsl@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== dependencies: is-docker "^2.0.0" isarray@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= isexe@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" + resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: version "5.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a" + resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz" integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q== dependencies: "@babel/core" "^7.12.3" @@ -5504,7 +5535,7 @@ istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: istanbul-lib-report@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz" integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== dependencies: istanbul-lib-coverage "^3.0.0" @@ -5513,7 +5544,7 @@ istanbul-lib-report@^3.0.0: istanbul-lib-source-maps@^4.0.0: version "4.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551" + resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz" integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== dependencies: debug "^4.1.1" @@ -5522,7 +5553,7 @@ istanbul-lib-source-maps@^4.0.0: istanbul-reports@^3.1.3: version "3.1.4" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c" + resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz" integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw== dependencies: html-escaper "^2.0.0" @@ -5530,7 +5561,7 @@ istanbul-reports@^3.1.3: jake@^10.8.5: version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" + resolved "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz" integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== dependencies: async "^3.2.3" @@ -5540,7 +5571,7 @@ jake@^10.8.5: jest-changed-files@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5" + resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz" integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw== dependencies: "@jest/types" "^27.5.1" @@ -5549,7 +5580,7 @@ jest-changed-files@^27.5.1: jest-circus@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc" + resolved "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz" integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw== dependencies: "@jest/environment" "^27.5.1" @@ -5574,7 +5605,7 @@ jest-circus@^27.5.1: jest-cli@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145" + resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz" integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw== dependencies: "@jest/core" "^27.5.1" @@ -5592,7 +5623,7 @@ jest-cli@^27.5.1: jest-config@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41" + resolved "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz" integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA== dependencies: "@babel/core" "^7.8.0" @@ -5622,7 +5653,7 @@ jest-config@^27.5.1: jest-diff@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def" + resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz" integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw== dependencies: chalk "^4.0.0" @@ -5632,14 +5663,14 @@ jest-diff@^27.5.1: jest-docblock@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0" + resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz" integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ== dependencies: detect-newline "^3.0.0" jest-each@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e" + resolved "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz" integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ== dependencies: "@jest/types" "^27.5.1" @@ -5650,7 +5681,7 @@ jest-each@^27.5.1: jest-environment-jsdom@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546" + resolved "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz" integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw== dependencies: "@jest/environment" "^27.5.1" @@ -5663,7 +5694,7 @@ jest-environment-jsdom@^27.5.1: jest-environment-node@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e" + resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz" integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw== dependencies: "@jest/environment" "^27.5.1" @@ -5675,12 +5706,12 @@ jest-environment-node@^27.5.1: jest-get-type@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" + resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz" integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw== jest-haste-map@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f" + resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz" integrity sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng== dependencies: "@jest/types" "^27.5.1" @@ -5700,7 +5731,7 @@ jest-haste-map@^27.5.1: jest-jasmine2@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4" + resolved "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz" integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ== dependencies: "@jest/environment" "^27.5.1" @@ -5723,7 +5754,7 @@ jest-jasmine2@^27.5.1: jest-leak-detector@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8" + resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz" integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ== dependencies: jest-get-type "^27.5.1" @@ -5731,7 +5762,7 @@ jest-leak-detector@^27.5.1: jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab" + resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz" integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw== dependencies: chalk "^4.0.0" @@ -5741,7 +5772,7 @@ jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1: jest-message-util@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf" + resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz" integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g== dependencies: "@babel/code-frame" "^7.12.13" @@ -5756,7 +5787,7 @@ jest-message-util@^27.5.1: jest-mock@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6" + resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz" integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og== dependencies: "@jest/types" "^27.5.1" @@ -5764,17 +5795,17 @@ jest-mock@^27.5.1: jest-pnp-resolver@^1.2.2: version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" + resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== jest-regex-util@^27.0.0, jest-regex-util@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95" + resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz" integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg== jest-resolve-dependencies@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8" + resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz" integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg== dependencies: "@jest/types" "^27.5.1" @@ -5783,7 +5814,7 @@ jest-resolve-dependencies@^27.5.1: jest-resolve@^27.4.2, jest-resolve@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384" + resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz" integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw== dependencies: "@jest/types" "^27.5.1" @@ -5799,7 +5830,7 @@ jest-resolve@^27.4.2, jest-resolve@^27.5.1: jest-runner@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5" + resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz" integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ== dependencies: "@jest/console" "^27.5.1" @@ -5826,7 +5857,7 @@ jest-runner@^27.5.1: jest-runtime@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af" + resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz" integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A== dependencies: "@jest/environment" "^27.5.1" @@ -5854,7 +5885,7 @@ jest-runtime@^27.5.1: jest-serializer@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64" + resolved "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz" integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w== dependencies: "@types/node" "*" @@ -5862,7 +5893,7 @@ jest-serializer@^27.5.1: jest-snapshot@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1" + resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz" integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA== dependencies: "@babel/core" "^7.7.2" @@ -5890,7 +5921,7 @@ jest-snapshot@^27.5.1: jest-util@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9" + resolved "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz" integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw== dependencies: "@jest/types" "^27.5.1" @@ -5902,7 +5933,7 @@ jest-util@^27.5.1: jest-validate@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067" + resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz" integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ== dependencies: "@jest/types" "^27.5.1" @@ -5914,7 +5945,7 @@ jest-validate@^27.5.1: jest-watch-typeahead@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-1.0.0.tgz#4de2ca1eb596acb1889752afbab84b74fcd99173" + resolved "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.0.0.tgz" integrity sha512-jxoszalAb394WElmiJTFBMzie/RDCF+W7Q29n5LzOPtcoQoHWfdUtHFkbhgf5NwWe8uMOxvKb/g7ea7CshfkTw== dependencies: ansi-escapes "^4.3.1" @@ -5927,7 +5958,7 @@ jest-watch-typeahead@^1.0.0: jest-watcher@^27.0.0, jest-watcher@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2" + resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz" integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw== dependencies: "@jest/test-result" "^27.5.1" @@ -5940,7 +5971,7 @@ jest-watcher@^27.0.0, jest-watcher@^27.5.1: jest-worker@^26.2.1: version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== dependencies: "@types/node" "*" @@ -5949,7 +5980,7 @@ jest-worker@^26.2.1: jest-worker@^27.0.2, jest-worker@^27.3.1, jest-worker@^27.4.5, jest-worker@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz" integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== dependencies: "@types/node" "*" @@ -5958,7 +5989,7 @@ jest-worker@^27.0.2, jest-worker@^27.3.1, jest-worker@^27.4.5, jest-worker@^27.5 jest@^27.4.3, jest@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc" + resolved "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz" integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== dependencies: "@jest/core" "^27.5.1" @@ -5967,12 +5998,12 @@ jest@^27.4.3, jest@^27.5.1: "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@^3.13.1: version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== dependencies: argparse "^1.0.7" @@ -5980,14 +6011,14 @@ js-yaml@^3.13.1: js-yaml@^4.1.0: version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== dependencies: argparse "^2.0.1" jsdom@^16.6.0: version "16.7.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + resolved "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz" integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== dependencies: abab "^2.0.5" @@ -6020,66 +6051,66 @@ jsdom@^16.6.0: jsesc@^2.5.1: version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== jsesc@~0.5.0: version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= json-parse-better-errors@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== json-parse-even-better-errors@^2.3.0: version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== json-schema-traverse@^0.4.1: version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== json-schema-traverse@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== json-schema@^0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" + resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz" integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= json5@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz" integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== dependencies: minimist "^1.2.0" json5@^2.1.2, json5@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + resolved "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" jsonc-parser@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" + resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz" integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== jsonfile@^6.0.1: version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz" integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== dependencies: universalify "^2.0.0" @@ -6088,12 +6119,12 @@ jsonfile@^6.0.1: jsonpointer@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072" + resolved "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz" integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg== "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1: version "3.2.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" + resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz" integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== dependencies: array-includes "^3.1.3" @@ -6101,39 +6132,39 @@ jsonpointer@^5.0.0: kind-of@^6.0.2: version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== kleur@^3.0.3: version "3.0.3" - resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== klona@^2.0.4, klona@^2.0.5: version "2.0.5" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" + resolved "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== language-subtag-registry@~0.3.2: version "0.3.21" - resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a" + resolved "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz" integrity sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg== language-tags@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a" + resolved "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz" integrity sha1-0yHbxNowuovzAk4ED6XBRmH5GTo= dependencies: language-subtag-registry "~0.3.2" leven@^3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz" integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== levn@^0.4.1: version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz" integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== dependencies: prelude-ls "^1.2.1" @@ -6141,7 +6172,7 @@ levn@^0.4.1: levn@~0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + resolved "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz" integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= dependencies: prelude-ls "~1.1.2" @@ -6149,22 +6180,22 @@ levn@~0.3.0: lilconfig@^2.0.3, lilconfig@^2.0.4: version "2.0.4" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz" integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== lines-and-columns@^1.1.6: version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== loader-runner@^4.2.0: version "4.2.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz" integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== loader-utils@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz" integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== dependencies: big.js "^5.2.2" @@ -6173,7 +6204,7 @@ loader-utils@^1.4.0: loader-utils@^2.0.0: version "2.0.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz" integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== dependencies: big.js "^5.2.2" @@ -6182,12 +6213,12 @@ loader-utils@^2.0.0: loader-utils@^3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f" + resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz" integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ== locate-path@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz" integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= dependencies: p-locate "^2.0.0" @@ -6195,7 +6226,7 @@ locate-path@^2.0.0: locate-path@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz" integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== dependencies: p-locate "^3.0.0" @@ -6203,165 +6234,170 @@ locate-path@^3.0.0: locate-path@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz" integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== dependencies: p-locate "^4.1.0" locate-path@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz" integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== dependencies: p-locate "^5.0.0" lodash.debounce@^4.0.8: version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= lodash.escape@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" + resolved "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz" integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg= lodash.flattendeep@^4.4.0: version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" + resolved "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz" integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= lodash.isequal@^4.5.0: version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + resolved "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= lodash.memoize@^4.1.2: version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= lodash.merge@^4.6.2: version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== lodash.sortby@^4.7.0: version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= lodash.uniq@^4.5.0: version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== dependencies: js-tokens "^3.0.0 || ^4.0.0" lower-case@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + resolved "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz" integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== dependencies: tslib "^2.0.3" lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== dependencies: yallist "^4.0.0" lunr@^2.3.9: version "2.3.9" - resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1" + resolved "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz" integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow== lz-string@^1.4.4: version "1.4.4" - resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" + resolved "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz" integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= magic-string@^0.25.0, magic-string@^0.25.7: version "0.25.9" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" + resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz" integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== dependencies: sourcemap-codec "^1.4.8" make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== dependencies: semver "^6.0.0" makeerror@1.0.12: version "1.0.12" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" + resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz" integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== dependencies: tmpl "1.0.5" marked@^4.0.12: version "4.0.12" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.12.tgz#2262a4e6fd1afd2f13557726238b69a48b982f7d" + resolved "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz" integrity sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ== mdn-data@2.0.14: version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz" integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== mdn-data@2.0.4: version "2.0.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" + resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz" integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== media-typer@0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= memfs@^3.1.2, memfs@^3.4.1: version "3.4.1" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305" + resolved "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz" integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw== dependencies: fs-monkey "1.0.3" +memoize-one@^5.1.1: + version "5.2.1" + resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz" + integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== + merge-descriptors@1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= merge-stream@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== methods@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz" integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" @@ -6369,104 +6405,104 @@ micromatch@^4.0.2, micromatch@^4.0.4: mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: mime-db "1.52.0" mime@1.6.0: version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mimic-fn@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" 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" + resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== mini-css-extract-plugin@^2.4.5: version "2.6.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz#578aebc7fc14d32c0ad304c2c34f08af44673f5e" + resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz" integrity sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w== dependencies: schema-utils "^4.0.0" minimalistic-assert@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== minimatch@3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" minimatch@^3.0.4, minimatch@^3.1.2: version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" minimatch@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== dependencies: brace-expansion "^2.0.1" minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: minimist "^1.2.5" moo@^0.5.0: version "0.5.1" - resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4" + resolved "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz" integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w== ms@2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= ms@2.1.2: version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== ms@2.1.3, ms@^2.1.1: version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== multicast-dns-service-types@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" + resolved "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz" integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= multicast-dns@^6.0.1: version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + resolved "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz" integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== dependencies: dns-packet "^1.3.1" @@ -6474,17 +6510,17 @@ multicast-dns@^6.0.1: nanoid@^3.3.1: version "3.3.1" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz" integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== natural-compare@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= nearley@^2.7.10: version "2.20.1" - resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474" + resolved "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz" integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ== dependencies: commander "^2.19.0" @@ -6494,17 +6530,17 @@ nearley@^2.7.10: negotiator@0.6.3: version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== neo-async@^2.6.2: version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== no-case@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + resolved "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz" integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== dependencies: lower-case "^2.0.2" @@ -6512,78 +6548,78 @@ no-case@^3.0.4: node-forge@^1.2.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2" + resolved "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz" integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA== node-int64@^0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz" integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= node-releases@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" + resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz" integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== normalize-range@^0.1.2: version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= normalize-url@^6.0.1: version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== npm-run-path@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== dependencies: path-key "^3.0.0" nth-check@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + resolved "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz" integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== dependencies: boolbase "~1.0.0" nth-check@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz" integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== dependencies: boolbase "^1.0.0" nwsapi@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz" integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= object-hash@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" + resolved "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz" integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== object-inspect@^1.11.0, object-inspect@^1.7.0, object-inspect@^1.9.0: version "1.12.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== object-is@^1.0.1, object-is@^1.0.2, object-is@^1.1.2: version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + resolved "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz" integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== dependencies: call-bind "^1.0.2" @@ -6591,12 +6627,12 @@ object-is@^1.0.1, object-is@^1.0.2, object-is@^1.1.2: object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== object.assign@^4.1.0, object.assign@^4.1.2: version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== dependencies: call-bind "^1.0.0" @@ -6606,7 +6642,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.5: version "1.1.5" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" + resolved "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz" integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== dependencies: call-bind "^1.0.2" @@ -6615,7 +6651,7 @@ object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.5: object.fromentries@^2.0.3, object.fromentries@^2.0.5: version "2.0.5" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" + resolved "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz" integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== dependencies: call-bind "^1.0.2" @@ -6624,7 +6660,7 @@ object.fromentries@^2.0.3, object.fromentries@^2.0.5: object.getownpropertydescriptors@^2.1.0: version "2.1.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" + resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz" integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw== dependencies: call-bind "^1.0.2" @@ -6633,7 +6669,7 @@ object.getownpropertydescriptors@^2.1.0: object.hasown@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" + resolved "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.0.tgz" integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== dependencies: define-properties "^1.1.3" @@ -6641,7 +6677,7 @@ object.hasown@^1.1.0: object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.2, object.values@^1.1.5: version "1.1.5" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz" integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== dependencies: call-bind "^1.0.2" @@ -6650,38 +6686,38 @@ object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.2, object.values@ obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + resolved "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== on-finished@~2.3.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= dependencies: ee-first "1.1.1" on-headers@~1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== once@^1.3.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= dependencies: wrappy "1" onetime@^5.1.2: version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" open@^8.0.9, open@^8.4.0: version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz" integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== dependencies: define-lazy-prop "^2.0.0" @@ -6690,7 +6726,7 @@ open@^8.0.9, open@^8.4.0: optionator@^0.8.1: version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== dependencies: deep-is "~0.1.3" @@ -6702,7 +6738,7 @@ optionator@^0.8.1: optionator@^0.9.1: version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz" integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== dependencies: deep-is "^0.1.3" @@ -6714,63 +6750,63 @@ optionator@^0.9.1: p-limit@^1.1.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz" integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== dependencies: p-try "^1.0.0" p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" p-limit@^3.0.2: version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== dependencies: yocto-queue "^0.1.0" p-locate@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz" integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= dependencies: p-limit "^1.1.0" p-locate@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz" integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== dependencies: p-limit "^2.0.0" p-locate@^4.1.0: version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz" integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== dependencies: p-limit "^2.2.0" p-locate@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz" integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== dependencies: p-limit "^3.0.2" p-map@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz" integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== dependencies: aggregate-error "^3.0.0" p-retry@^4.5.0: version "4.6.1" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" + resolved "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz" integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA== dependencies: "@types/retry" "^0.12.0" @@ -6778,17 +6814,17 @@ p-retry@^4.5.0: p-try@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz" integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= p-try@^2.0.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== param-case@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + resolved "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz" integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== dependencies: dot-case "^3.0.4" @@ -6796,14 +6832,14 @@ param-case@^3.0.4: parent-module@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz" integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== dependencies: callsites "^3.0.0" parse-json@^5.0.0, parse-json@^5.2.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz" integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" @@ -6813,24 +6849,24 @@ parse-json@^5.0.0, parse-json@^5.2.0: parse5-htmlparser2-tree-adapter@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + resolved "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz" integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== dependencies: parse5 "^6.0.1" parse5@6.0.1, parse5@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== pascal-case@^3.1.2: version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" + resolved "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz" integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== dependencies: no-case "^3.0.4" @@ -6838,81 +6874,81 @@ pascal-case@^3.1.2: path-exists@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= path-exists@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== path-is-absolute@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6, path-parse@^1.0.7: version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-to-regexp@0.1.7: version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-type@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== performance-now@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= picocolors@^0.2.1: version "0.2.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz" integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0: version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pirates@^4.0.4: version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" + resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz" integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== dependencies: find-up "^4.0.0" pkg-up@^3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + resolved "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz" integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== dependencies: find-up "^3.0.0" portfinder@^1.0.28: version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" + resolved "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz" integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== dependencies: async "^2.6.2" @@ -6921,19 +6957,19 @@ portfinder@^1.0.28: postcss-attribute-case-insensitive@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz#39cbf6babf3ded1e4abf37d09d6eda21c644105c" + resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz" integrity sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ== dependencies: postcss-selector-parser "^6.0.2" postcss-browser-comments@^4: version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz#bcfc86134df5807f5d3c0eefa191d42136b5e72a" + resolved "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz" integrity sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg== postcss-calc@^8.2.3: version "8.2.4" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" + resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz" integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== dependencies: postcss-selector-parser "^6.0.9" @@ -6941,35 +6977,35 @@ postcss-calc@^8.2.3: postcss-clamp@^4.1.0: version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz#7263e95abadd8c2ba1bd911b0b5a5c9c93e02363" + resolved "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz" integrity sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow== dependencies: postcss-value-parser "^4.2.0" postcss-color-functional-notation@^4.2.2: version "4.2.2" - resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz#f59ccaeb4ee78f1b32987d43df146109cc743073" + resolved "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz" integrity sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ== dependencies: postcss-value-parser "^4.2.0" postcss-color-hex-alpha@^8.0.3: version "8.0.3" - resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.3.tgz#61a0fd151d28b128aa6a8a21a2dad24eebb34d52" + resolved "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.3.tgz" integrity sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw== dependencies: postcss-value-parser "^4.2.0" postcss-color-rebeccapurple@^7.0.2: version "7.0.2" - resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.2.tgz#5d397039424a58a9ca628762eb0b88a61a66e079" + resolved "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.2.tgz" integrity sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw== dependencies: postcss-value-parser "^4.2.0" postcss-colormin@^*: version "5.3.0" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a" + resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz" integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg== dependencies: browserslist "^4.16.6" @@ -6979,60 +7015,60 @@ postcss-colormin@^*: postcss-convert-values@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10" + resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz" integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g== dependencies: postcss-value-parser "^4.2.0" postcss-custom-media@^8.0.0: version "8.0.0" - resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz#1be6aff8be7dc9bf1fe014bde3b71b92bb4552f1" + resolved "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz" integrity sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g== postcss-custom-properties@^12.1.5: version "12.1.5" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.5.tgz#e669cfff89b0ea6fc85c45864a32b450cb6b196f" + resolved "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.5.tgz" integrity sha512-FHbbB/hRo/7cxLGkc2NS7cDRIDN1oFqQnUKBiyh4b/gwk8DD8udvmRDpUhEK836kB8ggUCieHVOvZDnF9XhI3g== dependencies: postcss-value-parser "^4.2.0" postcss-custom-selectors@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz#022839e41fbf71c47ae6e316cb0e6213012df5ef" + resolved "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz" integrity sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q== dependencies: postcss-selector-parser "^6.0.4" postcss-dir-pseudo-class@^6.0.4: version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz#9afe49ea631f0cb36fa0076e7c2feb4e7e3f049c" + resolved "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz" integrity sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw== dependencies: postcss-selector-parser "^6.0.9" postcss-discard-comments@^*: version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369" + resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz" integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ== postcss-discard-duplicates@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" + resolved "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz" integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== postcss-discard-empty@^*: version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" + resolved "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz" integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== postcss-discard-overridden@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" + resolved "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz" integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw== postcss-double-position-gradients@^3.1.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz#a12cfdb7d11fa1a99ccecc747f0c19718fb37152" + resolved "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz" integrity sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" @@ -7040,62 +7076,62 @@ postcss-double-position-gradients@^3.1.1: postcss-env-function@^4.0.6: version "4.0.6" - resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.6.tgz#7b2d24c812f540ed6eda4c81f6090416722a8e7a" + resolved "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz" integrity sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA== dependencies: postcss-value-parser "^4.2.0" postcss-flexbugs-fixes@^5.0.2: version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz#2028e145313074fc9abe276cb7ca14e5401eb49d" + resolved "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz" integrity sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ== postcss-focus-visible@^6.0.4: version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz#50c9ea9afa0ee657fb75635fabad25e18d76bf9e" + resolved "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz" integrity sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw== dependencies: postcss-selector-parser "^6.0.9" postcss-focus-within@^5.0.4: version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz#5b1d2ec603195f3344b716c0b75f61e44e8d2e20" + resolved "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz" integrity sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ== dependencies: postcss-selector-parser "^6.0.9" postcss-font-variant@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66" + resolved "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz" integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA== postcss-gap-properties@^3.0.3: version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz#6401bb2f67d9cf255d677042928a70a915e6ba60" + resolved "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz" integrity sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ== postcss-image-set-function@^4.0.6: version "4.0.6" - resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz#bcff2794efae778c09441498f40e0c77374870a9" + resolved "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz" integrity sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A== dependencies: postcss-value-parser "^4.2.0" postcss-initial@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42" + resolved "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz" integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ== postcss-js@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00" + resolved "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz" integrity sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ== dependencies: camelcase-css "^2.0.1" postcss-lab-function@^4.1.2: version "4.1.2" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.1.2.tgz#b75afe43ba9c1f16bfe9bb12c8109cabd55b5fc2" + resolved "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.1.2.tgz" integrity sha512-isudf5ldhg4fk16M8viAwAbg6Gv14lVO35N3Z/49NhbwPQ2xbiEoHgrRgpgQojosF4vF7jY653ktB6dDrUOR8Q== dependencies: "@csstools/postcss-progressive-custom-properties" "^1.1.0" @@ -7103,7 +7139,7 @@ postcss-lab-function@^4.1.2: postcss-load-config@^3.1.0: version "3.1.3" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.3.tgz#21935b2c43b9a86e6581a576ca7ee1bde2bd1d23" + resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.3.tgz" integrity sha512-5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw== dependencies: lilconfig "^2.0.4" @@ -7111,7 +7147,7 @@ postcss-load-config@^3.1.0: postcss-loader@^6.2.1: version "6.2.1" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef" + resolved "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz" integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q== dependencies: cosmiconfig "^7.0.0" @@ -7120,17 +7156,17 @@ postcss-loader@^6.2.1: postcss-logical@^5.0.4: version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.4.tgz#ec75b1ee54421acc04d5921576b7d8db6b0e6f73" + resolved "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz" integrity sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g== postcss-media-minmax@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5" + resolved "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz" integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ== postcss-merge-longhand@^*: version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.2.tgz#fe3002f38ad5827c1d6f7d5bb3f71d2566a2a138" + resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.2.tgz" integrity sha512-18/bp9DZnY1ai9RlahOfLBbmIUKfKFPASxRCiZ1vlpZqWPCn8qWPFlEozqmWL+kBtcEQmG8W9YqGCstDImvp/Q== dependencies: postcss-value-parser "^4.2.0" @@ -7138,7 +7174,7 @@ postcss-merge-longhand@^*: postcss-merge-rules@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz#a2d5117eba09c8686a5471d97bd9afcf30d1b41f" + resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz" integrity sha512-NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ== dependencies: browserslist "^4.16.6" @@ -7148,14 +7184,14 @@ postcss-merge-rules@^*: postcss-minify-font-values@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" + resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz" integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== dependencies: postcss-value-parser "^4.2.0" postcss-minify-gradients@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz#de0260a67a13b7b321a8adc3150725f2c6612377" + resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz" integrity sha512-J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg== dependencies: colord "^2.9.1" @@ -7164,7 +7200,7 @@ postcss-minify-gradients@^*: postcss-minify-params@^*: version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.1.tgz#c5f8e7dac565e577dd99904787fbec576cbdbfb2" + resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.1.tgz" integrity sha512-WCpr+J9Uz8XzMpAfg3UL8z5rde6MifBbh5L8bn8S2F5hq/YDJJzASYCnCHvAB4Fqb94ys8v95ULQkW2EhCFvNg== dependencies: browserslist "^4.16.6" @@ -7173,19 +7209,19 @@ postcss-minify-params@^*: postcss-minify-selectors@^*: version "5.2.0" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c" + resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz" integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA== dependencies: postcss-selector-parser "^6.0.5" postcss-modules-extract-imports@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + resolved "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz" integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== postcss-modules-local-by-default@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz" integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== dependencies: icss-utils "^5.0.0" @@ -7194,75 +7230,75 @@ postcss-modules-local-by-default@^4.0.0: postcss-modules-scope@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz" integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== dependencies: postcss-selector-parser "^6.0.4" postcss-modules-values@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + resolved "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz" integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== dependencies: icss-utils "^5.0.0" postcss-nested@5.0.6: version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" + resolved "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz" integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA== dependencies: postcss-selector-parser "^6.0.6" postcss-nesting@^10.1.3: version "10.1.3" - resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.3.tgz#f0b1cd7ae675c697ab6a5a5ca1feea4784a2ef77" + resolved "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.3.tgz" integrity sha512-wUC+/YCik4wH3StsbC5fBG1s2Z3ZV74vjGqBFYtmYKlVxoio5TYGM06AiaKkQPPlkXWn72HKfS7Cw5PYxnoXSw== dependencies: postcss-selector-parser "^6.0.9" postcss-normalize-charset@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" + resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz" integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== postcss-normalize-display-values@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" + resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz" integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-positions@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458" + resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz" integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-repeat-style@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398" + resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz" integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-string@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" + resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz" integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-timing-functions@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" + resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz" integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-unicode@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75" + resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz" integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ== dependencies: browserslist "^4.16.6" @@ -7270,7 +7306,7 @@ postcss-normalize-unicode@^*: postcss-normalize-url@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" + resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz" integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== dependencies: normalize-url "^6.0.1" @@ -7278,14 +7314,14 @@ postcss-normalize-url@^*: postcss-normalize-whitespace@^*: version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" + resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz" integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== dependencies: postcss-value-parser "^4.2.0" postcss-normalize@^10.0.1: version "10.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-10.0.1.tgz#464692676b52792a06b06880a176279216540dd7" + resolved "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz" integrity sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA== dependencies: "@csstools/normalize.css" "*" @@ -7294,12 +7330,12 @@ postcss-normalize@^10.0.1: postcss-opacity-percentage@^1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz#bd698bb3670a0a27f6d657cc16744b3ebf3b1145" + resolved "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz" integrity sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w== postcss-ordered-values@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz#04ef429e0991b0292bc918b135cd4c038f7b889f" + resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz" integrity sha512-wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA== dependencies: cssnano-utils "^3.1.0" @@ -7307,24 +7343,24 @@ postcss-ordered-values@^*: postcss-overflow-shorthand@^3.0.3: version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz#ebcfc0483a15bbf1b27fdd9b3c10125372f4cbc2" + resolved "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz" integrity sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg== postcss-page-break@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f" + resolved "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz" integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ== postcss-place@^7.0.4: version "7.0.4" - resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.4.tgz#eb026650b7f769ae57ca4f938c1addd6be2f62c9" + resolved "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.4.tgz" integrity sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg== dependencies: postcss-value-parser "^4.2.0" postcss-preset-env@^7.0.1: version "7.4.3" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.4.3.tgz#fb1c8b4cb405da042da0ddb8c5eda7842c08a449" + resolved "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.4.3.tgz" integrity sha512-dlPA65g9KuGv7YsmGyCKtFkZKCPLkoVMUE3omOl6yM+qrynVHxFvf0tMuippIrXB/sB/MyhL1FgTIbrO+qMERg== dependencies: "@csstools/postcss-color-function" "^1.0.3" @@ -7373,14 +7409,14 @@ postcss-preset-env@^7.0.1: postcss-pseudo-class-any-link@^7.1.1: version "7.1.1" - resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.1.tgz#534eb1dadd9945eb07830dbcc06fb4d5d865b8e0" + resolved "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.1.tgz" integrity sha512-JRoLFvPEX/1YTPxRxp1JO4WxBVXJYrSY7NHeak5LImwJ+VobFMwYDQHvfTXEpcn+7fYIeGkC29zYFhFWIZD8fg== dependencies: postcss-selector-parser "^6.0.9" postcss-reduce-initial@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6" + resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz" integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw== dependencies: browserslist "^4.16.6" @@ -7388,26 +7424,26 @@ postcss-reduce-initial@^*: postcss-reduce-transforms@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" + resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz" integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== dependencies: postcss-value-parser "^4.2.0" postcss-replace-overflow-wrap@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319" + resolved "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz" integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw== postcss-selector-not@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz#ac5fc506f7565dd872f82f5314c0f81a05630dc7" + resolved "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz" integrity sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ== dependencies: balanced-match "^1.0.0" postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: version "6.0.9" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz" integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== dependencies: cssesc "^3.0.0" @@ -7415,7 +7451,7 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector postcss-svgo@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" + resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz" integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== dependencies: postcss-value-parser "^4.2.0" @@ -7423,19 +7459,19 @@ postcss-svgo@^*: postcss-unique-selectors@^*: version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" + resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz" integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== dependencies: postcss-selector-parser "^6.0.5" postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^7.0.35: version "7.0.39" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" + resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz" integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== dependencies: picocolors "^0.2.1" @@ -7443,7 +7479,7 @@ postcss@^7.0.35: postcss@^8.3.5, postcss@^8.4.4, postcss@^8.4.6, postcss@^8.4.7: version "8.4.12" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz" integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg== dependencies: nanoid "^3.3.1" @@ -7452,34 +7488,34 @@ postcss@^8.3.5, postcss@^8.4.4, postcss@^8.4.6, postcss@^8.4.7: prelude-ls@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== prelude-ls@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= prettier-linter-helpers@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + resolved "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz" integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== dependencies: fast-diff "^1.1.2" prettier@^2.5.1: version "2.6.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4" + resolved "https://registry.npmjs.org/prettier/-/prettier-2.6.0.tgz" integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" + resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz" integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== pretty-error@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" + resolved "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz" integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw== dependencies: lodash "^4.17.20" @@ -7487,7 +7523,7 @@ pretty-error@^4.0.0: pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1: version "27.5.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" + resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz" integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== dependencies: ansi-regex "^5.0.1" @@ -7496,19 +7532,19 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1: process-nextick-args@~2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== promise@^8.1.0: version "8.1.0" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" + resolved "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz" integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== dependencies: asap "~2.0.6" prompts@^2.0.1, prompts@^2.4.2: version "2.4.2" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz" integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== dependencies: kleur "^3.0.3" @@ -7516,7 +7552,7 @@ prompts@^2.0.1, prompts@^2.4.2: prop-types-exact@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869" + resolved "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz" integrity sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA== dependencies: has "^1.0.3" @@ -7525,7 +7561,7 @@ prop-types-exact@^1.2.0: prop-types-extra@^1.1.0: version "1.1.1" - resolved "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz#58c3b74cbfbb95d304625975aa2f0848329a010b" + resolved "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz" integrity sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew== dependencies: react-is "^16.3.2" @@ -7533,7 +7569,7 @@ prop-types-extra@^1.1.0: prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" @@ -7542,7 +7578,7 @@ prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: proxy-addr@~2.0.7: version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz" integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== dependencies: forwarded "0.2.0" @@ -7550,49 +7586,54 @@ proxy-addr@~2.0.7: psl@^1.1.33: version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + resolved "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== q@^1.1.2: version "1.5.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= qs@6.9.7: version "6.9.7" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" + resolved "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz" integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== queue-microtask@^1.2.2: version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== quick-lru@^5.1.1: version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz" integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== +raf-schd@^4.0.2: + version "4.0.3" + resolved "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz" + integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ== + raf@^3.4.1: version "3.4.1" - resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" + resolved "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz" integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== dependencies: performance-now "^2.1.0" railroad-diagrams@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" + resolved "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz" integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234= randexp@0.4.6: version "0.4.6" - resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" + resolved "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz" integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ== dependencies: discontinuous-range "1.0.0" @@ -7600,19 +7641,19 @@ randexp@0.4.6: randombytes@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz" integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== dependencies: safe-buffer "^5.1.0" range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== raw-body@2.4.3: version "2.4.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" + resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz" integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== dependencies: bytes "3.1.2" @@ -7622,7 +7663,7 @@ raw-body@2.4.3: react-app-polyfill@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz#95221e0a9bd259e5ca6b177c7bb1cb6768f68fd7" + resolved "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz" integrity sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w== dependencies: core-js "^3.19.2" @@ -7632,9 +7673,22 @@ react-app-polyfill@^3.0.0: regenerator-runtime "^0.13.9" whatwg-fetch "^3.6.2" +react-beautiful-dnd@^13.1.0: + version "13.1.0" + resolved "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.0.tgz" + integrity sha512-aGvblPZTJowOWUNiwd6tNfEpgkX5OxmpqxHKNW/4VmvZTNTbeiq7bA3bn5T+QSF2uibXB0D1DmJsb1aC/+3cUA== + dependencies: + "@babel/runtime" "^7.9.2" + css-box-model "^1.2.0" + memoize-one "^5.1.1" + raf-schd "^4.0.2" + react-redux "^7.2.0" + redux "^4.0.4" + use-memo-one "^1.1.1" + react-bootstrap-typeahead@^6.0.0-alpha.11: version "6.0.0-alpha.11" - resolved "https://registry.yarnpkg.com/react-bootstrap-typeahead/-/react-bootstrap-typeahead-6.0.0-alpha.11.tgz#6476df85256ad6dfe612913db753b52f3c70fef7" + resolved "https://registry.npmjs.org/react-bootstrap-typeahead/-/react-bootstrap-typeahead-6.0.0-alpha.11.tgz" integrity sha512-yHBPsdkAdvvLpkq6wWei55qt4REdbRnC+1wVxkBSBeTG4Z6lkKKSGx6w4kY9YmkyyVcbmmfwUSXhCWY/M+TzCg== dependencies: "@babel/runtime" "^7.14.6" @@ -7652,7 +7706,7 @@ react-bootstrap-typeahead@^6.0.0-alpha.11: react-bootstrap@^2.2.1: version "2.2.1" - resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-2.2.1.tgz#2a6ad0931e9367882ec3fc88a70ed0b8ace90b26" + resolved "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.2.1.tgz" integrity sha512-x8lpVQflsbevphuWbTnTNCatcbKyPJNrP2WyQ1MJYmFEcVjbTbai1yZhdlXr0QUxLQLxA8g5hQWb5TwJtaZoCA== dependencies: "@babel/runtime" "^7.17.2" @@ -7674,12 +7728,12 @@ react-bootstrap@^2.2.1: react-collapsible@^2.8.4: version "2.8.4" - resolved "https://registry.yarnpkg.com/react-collapsible/-/react-collapsible-2.8.4.tgz#319ff7471138c4381ce0afa3ac308ccde7f4e09f" + resolved "https://registry.npmjs.org/react-collapsible/-/react-collapsible-2.8.4.tgz" integrity sha512-oG4yOk6AGKswe0OD/8t3/nf4Rgj4UhlZUUvqL5jop0/ez02B3dBDmNvs3sQz0PcTpJvt0ai8zF7Atd1SzN/UNw== react-dev-utils@^12.0.0: version "12.0.0" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.0.tgz#4eab12cdb95692a077616770b5988f0adf806526" + resolved "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz" integrity sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ== dependencies: "@babel/code-frame" "^7.16.0" @@ -7709,7 +7763,7 @@ react-dev-utils@^12.0.0: react-dom@^17.0.2: version "17.0.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + resolved "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz" integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== dependencies: loose-envify "^1.1.0" @@ -7718,44 +7772,44 @@ react-dom@^17.0.2: react-error-overlay@^6.0.10: version "6.0.10" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6" + resolved "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.10.tgz" integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA== react-fast-compare@^3.0.1: version "3.2.0" - resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" + resolved "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== react-icons@^4.3.1: version "4.3.1" - resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.3.1.tgz#2fa92aebbbc71f43d2db2ed1aed07361124e91ca" + resolved "https://registry.npmjs.org/react-icons/-/react-icons-4.3.1.tgz" integrity sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ== react-infinite-scroller@^1.2.6: version "1.2.6" - resolved "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.2.6.tgz#8b80233226dc753a597a0eb52621247f49b15f18" + resolved "https://registry.npmjs.org/react-infinite-scroller/-/react-infinite-scroller-1.2.6.tgz" integrity sha512-mGdMyOD00YArJ1S1F3TVU9y4fGSfVVl6p5gh/Vt4u99CJOptfVu/q5V/Wlle72TMgYlBwIhbxK5wF0C/R33PXQ== dependencies: prop-types "^15.5.8" react-is@^16.13.1, react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.6: version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^17.0.1: +react-is@^17.0.1, react-is@^17.0.2: version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== react-lifecycles-compat@^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.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== react-overlays@^5.1.0: version "5.1.1" - resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-5.1.1.tgz#2e7cf49744b56537c7828ccb94cfc63dd778ae4f" + resolved "https://registry.npmjs.org/react-overlays/-/react-overlays-5.1.1.tgz" integrity sha512-eCN2s2/+GVZzpnId4XVWtvDPYYBD2EtOGP74hE+8yDskPzFy9+pV1H3ZZihxuRdEbQzzacySaaDkR7xE0ydl4Q== dependencies: "@babel/runtime" "^7.13.8" @@ -7769,27 +7823,39 @@ react-overlays@^5.1.0: react-popper@^2.2.5: version "2.2.5" - resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.5.tgz#1214ef3cec86330a171671a4fbcbeeb65ee58e96" + resolved "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz" integrity sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw== dependencies: react-fast-compare "^3.0.1" warning "^4.0.2" +react-redux@^7.2.0: + version "7.2.8" + resolved "https://registry.npmjs.org/react-redux/-/react-redux-7.2.8.tgz" + integrity sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw== + dependencies: + "@babel/runtime" "^7.15.4" + "@types/react-redux" "^7.1.20" + hoist-non-react-statics "^3.3.2" + loose-envify "^1.4.0" + prop-types "^15.7.2" + react-is "^17.0.2" + react-refresh@^0.11.0: version "0.11.0" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046" + resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz" integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A== react-router-bootstrap@^0.26.1: version "0.26.1" - resolved "https://registry.yarnpkg.com/react-router-bootstrap/-/react-router-bootstrap-0.26.1.tgz#395f8d134a58db4e5d4a7ccc37960077414e411f" + resolved "https://registry.npmjs.org/react-router-bootstrap/-/react-router-bootstrap-0.26.1.tgz" integrity sha512-qgFDfnN2U5RBARTf4L/Xrk0xjNid4wRtBQFrzI2Z2Gu74nlfKT5qZreUxDiYvv4sI+NrWcYacRZEqS5yeLYH0A== dependencies: prop-types "^15.7.2" react-router-dom@^6.2.1: version "6.2.2" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.2.tgz#f1a2c88365593c76b9612ae80154a13fcb72e442" + resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.2.2.tgz" integrity sha512-AtYEsAST7bDD4dLSQHDnk/qxWLJdad5t1HFa1qJyUrCeGgEuCSw0VB/27ARbF9Fi/W5598ujvJOm3ujUCVzuYQ== dependencies: history "^5.2.0" @@ -7797,14 +7863,14 @@ react-router-dom@^6.2.1: react-router@6.2.2: version "6.2.2" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.2.tgz#495e683a0c04461eeb3d705fe445d6cf42f0c249" + resolved "https://registry.npmjs.org/react-router/-/react-router-6.2.2.tgz" integrity sha512-/MbxyLzd7Q7amp4gDOGaYvXwhEojkJD5BtExkuKmj39VEE0m3l/zipf6h2WIB2jyAO0lI6NGETh4RDcktRm4AQ== dependencies: history "^5.2.0" react-scripts@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.0.tgz#6547a6d7f8b64364ef95273767466cc577cb4b60" + resolved "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.0.tgz" integrity sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg== dependencies: "@babel/core" "^7.16.0" @@ -7859,12 +7925,12 @@ react-scripts@^5.0.0: react-social-login-buttons@^3.6.0: version "3.6.0" - resolved "https://registry.yarnpkg.com/react-social-login-buttons/-/react-social-login-buttons-3.6.0.tgz#2be1cb114d8c0200581ba1c8ec5ea74e89cf7701" + resolved "https://registry.npmjs.org/react-social-login-buttons/-/react-social-login-buttons-3.6.0.tgz" integrity sha512-m5E72jHWgC4VBxRziZYQC5kQIzooGRF+dDE97K5JgSlcDPXkNxCjCzP+Qp9fNhNujG7APvPx2Qhzi1BO2xi17Q== react-test-renderer@^16.0.0-0: version "16.14.0" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz#e98360087348e260c56d4fe2315e970480c228ae" + resolved "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz" integrity sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg== dependencies: object-assign "^4.1.1" @@ -7874,7 +7940,7 @@ react-test-renderer@^16.0.0-0: react-transition-group@^4.4.2: version "4.4.2" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" + resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz" integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== dependencies: "@babel/runtime" "^7.5.5" @@ -7884,7 +7950,7 @@ react-transition-group@^4.4.2: react@^17.0.2: version "17.0.2" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + resolved "https://registry.npmjs.org/react/-/react-17.0.2.tgz" integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" @@ -7892,12 +7958,12 @@ react@^17.0.2: reactjs-popup@^2.0.5: version "2.0.5" - resolved "https://registry.yarnpkg.com/reactjs-popup/-/reactjs-popup-2.0.5.tgz#588a74966bb126699429d739948e3448d7771eac" + resolved "https://registry.npmjs.org/reactjs-popup/-/reactjs-popup-2.0.5.tgz" integrity sha512-b5hv9a6aGsHEHXFAgPO5s1Jw1eSkopueyUVxQewGdLgqk2eW0IVXZrPRpHR629YcgIpC2oxtX8OOZ8a7bQJbxA== readable-stream@^2.0.1: version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== dependencies: core-util-is "~1.0.0" @@ -7910,7 +7976,7 @@ readable-stream@^2.0.1: readable-stream@^3.0.6: version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== dependencies: inherits "^2.0.3" @@ -7919,63 +7985,70 @@ readable-stream@^3.0.6: readdirp@~3.6.0: version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" recursive-readdir@^2.2.2: version "2.2.2" - resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" + resolved "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz" integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg== dependencies: minimatch "3.0.4" redent@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + resolved "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz" integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== dependencies: indent-string "^4.0.0" strip-indent "^3.0.0" +redux@^4.0.0, redux@^4.0.4: + version "4.2.0" + resolved "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz" + integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA== + dependencies: + "@babel/runtime" "^7.9.2" + reflect.ownkeys@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" + resolved "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz" integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA= regenerate-unicode-properties@^10.0.1: version "10.0.1" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56" + resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz" integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw== dependencies: regenerate "^1.4.2" regenerate@^1.4.2: version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9: version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== regenerator-transform@^0.14.2: version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" + resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz" integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== dependencies: "@babel/runtime" "^7.8.4" regex-parser@^2.2.11: version "2.2.11" - resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58" + resolved "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz" integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.1: version "1.4.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" + resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz" integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== dependencies: call-bind "^1.0.2" @@ -7983,12 +8056,12 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.1: regexpp@^3.0.0, regexpp@^3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== regexpu-core@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" + resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz" integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw== dependencies: regenerate "^1.4.2" @@ -8000,24 +8073,24 @@ regexpu-core@^5.0.1: regjsgen@^0.6.0: version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" + resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz" integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== regjsparser@^0.8.2: version "0.8.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" + resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz" integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA== dependencies: jsesc "~0.5.0" relateurl@^0.2.7: version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + resolved "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= renderkid@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" + resolved "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz" integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg== dependencies: css-select "^4.1.3" @@ -8028,39 +8101,39 @@ renderkid@^3.0.0: require-directory@^2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= require-from-string@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== requires-port@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= resolve-cwd@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz" integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== dependencies: resolve-from "^5.0.0" resolve-from@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== resolve-from@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve-url-loader@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz#d50d4ddc746bb10468443167acf800dcd6c3ad57" + resolved "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz" integrity sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA== dependencies: adjust-sourcemap-loader "^4.0.0" @@ -8071,12 +8144,12 @@ resolve-url-loader@^4.0.0: resolve.exports@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" + resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== resolve@^1.10.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0: version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz" integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== dependencies: is-core-module "^2.8.1" @@ -8085,7 +8158,7 @@ resolve@^1.10.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.2 resolve@^2.0.0-next.3: version "2.0.0-next.3" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + resolved "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz" integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== dependencies: is-core-module "^2.2.0" @@ -8093,29 +8166,29 @@ resolve@^2.0.0-next.3: ret@~0.1.10: version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== retry@^0.13.1: version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" + resolved "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz" integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== reusify@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: glob "^7.1.3" rollup-plugin-terser@^7.0.0: version "7.0.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d" + resolved "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz" integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ== dependencies: "@babel/code-frame" "^7.10.4" @@ -8125,14 +8198,14 @@ rollup-plugin-terser@^7.0.0: rollup@^2.43.1: version "2.70.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.1.tgz#824b1f1f879ea396db30b0fc3ae8d2fead93523e" + resolved "https://registry.npmjs.org/rollup/-/rollup-2.70.1.tgz" integrity sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA== optionalDependencies: fsevents "~2.3.2" rst-selector-parser@^2.2.3: version "2.2.3" - resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" + resolved "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz" integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE= dependencies: lodash.flattendeep "^4.4.0" @@ -8140,34 +8213,34 @@ rst-selector-parser@^2.2.3: run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== dependencies: queue-microtask "^1.2.2" safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sanitize.css@*: version "13.0.0" - resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-13.0.0.tgz#2675553974b27964c75562ade3bd85d79879f173" + resolved "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz" integrity sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA== sass-loader@^12.3.0: version "12.6.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz#5148362c8e2cdd4b950f3c63ac5d16dbfed37bcb" + resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz" integrity sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA== dependencies: klona "^2.0.4" @@ -8175,19 +8248,19 @@ sass-loader@^12.3.0: sax@~1.2.4: version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== saxes@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" + resolved "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz" integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== dependencies: xmlchars "^2.2.0" scheduler@^0.19.1: version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" + resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz" integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== dependencies: loose-envify "^1.1.0" @@ -8195,7 +8268,7 @@ scheduler@^0.19.1: scheduler@^0.20.2: version "0.20.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz" integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== dependencies: loose-envify "^1.1.0" @@ -8203,7 +8276,7 @@ scheduler@^0.20.2: schema-utils@2.7.0: version "2.7.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz" integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== dependencies: "@types/json-schema" "^7.0.4" @@ -8212,7 +8285,7 @@ schema-utils@2.7.0: schema-utils@^2.6.5: version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== dependencies: "@types/json-schema" "^7.0.5" @@ -8221,7 +8294,7 @@ schema-utils@^2.6.5: schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz" integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== dependencies: "@types/json-schema" "^7.0.8" @@ -8230,7 +8303,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: schema-utils@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz" integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== dependencies: "@types/json-schema" "^7.0.9" @@ -8240,48 +8313,48 @@ schema-utils@^4.0.0: scroll-into-view-if-needed@^2.2.20: version "2.2.29" - resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz#551791a84b7e2287706511f8c68161e4990ab885" + resolved "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz" integrity sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg== dependencies: compute-scroll-into-view "^1.0.17" select-hose@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + resolved "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= selfsigned@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b" + resolved "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.0.tgz" integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ== dependencies: node-forge "^1.2.0" semver@7.0.0: version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== semver@^5.7.0, semver@^5.7.1: version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.3.2, semver@^7.3.5: version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" send@0.17.2: version "0.17.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" + resolved "https://registry.npmjs.org/send/-/send-0.17.2.tgz" integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== dependencies: debug "2.6.9" @@ -8300,21 +8373,21 @@ send@0.17.2: serialize-javascript@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" + resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz" integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== dependencies: randombytes "^2.1.0" serialize-javascript@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz" integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== dependencies: randombytes "^2.1.0" serve-index@^1.9.1: version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + resolved "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz" integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= dependencies: accepts "~1.3.4" @@ -8327,7 +8400,7 @@ serve-index@^1.9.1: serve-static@1.14.2: version "1.14.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" + resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz" integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== dependencies: encodeurl "~1.0.2" @@ -8337,39 +8410,39 @@ serve-static@1.14.2: setprototypeof@1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz" integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== setprototypeof@1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== shallowequal@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== dependencies: shebang-regex "^3.0.0" shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== shell-quote@^1.7.3: version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz" integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== shiki@^0.10.1: version "0.10.1" - resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.10.1.tgz#6f9a16205a823b56c072d0f1a0bcd0f2646bef14" + resolved "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz" integrity sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng== dependencies: jsonc-parser "^3.0.0" @@ -8378,7 +8451,7 @@ shiki@^0.10.1: side-channel@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== dependencies: call-bind "^1.0.0" @@ -8387,27 +8460,27 @@ side-channel@^1.0.4: signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== sisteransi@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== slash@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== slash@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" + resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz" integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== sockjs@^0.3.21: version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" + resolved "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz" integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== dependencies: faye-websocket "^0.11.3" @@ -8416,17 +8489,17 @@ sockjs@^0.3.21: source-list-map@^2.0.0, source-list-map@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== source-map-loader@^3.0.0: version "3.0.1" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.1.tgz#9ae5edc7c2d42570934be4c95d1ccc6352eba52d" + resolved "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz" integrity sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA== dependencies: abab "^2.0.5" @@ -8435,7 +8508,7 @@ source-map-loader@^3.0.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" + resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz" integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== dependencies: atob "^2.1.2" @@ -8443,7 +8516,7 @@ source-map-resolve@^0.6.0: source-map-support@^0.5.6, source-map-support@~0.5.20: version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" @@ -8451,34 +8524,34 @@ source-map-support@^0.5.6, source-map-support@~0.5.20: source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== source-map@^0.5.0: version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= source-map@^0.7.3, source-map@~0.7.2: version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== source-map@^0.8.0-beta.0: version "0.8.0-beta.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz" integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA== dependencies: whatwg-url "^7.0.0" sourcemap-codec@^1.4.8: version "1.4.8" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== spdy-transport@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + resolved "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz" integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== dependencies: debug "^4.1.0" @@ -8490,7 +8563,7 @@ spdy-transport@^3.0.0: spdy@^4.0.2: version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + resolved "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz" integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== dependencies: debug "^4.1.0" @@ -8501,34 +8574,34 @@ spdy@^4.0.2: sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= stable@^0.1.8: version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" + resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== stack-utils@^2.0.3: version "2.0.5" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" + resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz" integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== dependencies: escape-string-regexp "^2.0.0" stackframe@^1.1.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.1.tgz#1033a3473ee67f08e2f2fc8eba6aef4f845124e1" + resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.2.1.tgz" integrity sha512-h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg== "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= string-length@^4.0.1: version "4.0.2" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz" integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== dependencies: char-regex "^1.0.2" @@ -8536,7 +8609,7 @@ string-length@^4.0.1: string-length@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-5.0.1.tgz#3d647f497b6e8e8d41e422f7e0b23bc536c8381e" + resolved "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz" integrity sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow== dependencies: char-regex "^2.0.0" @@ -8544,12 +8617,12 @@ string-length@^5.0.1: string-natural-compare@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" + resolved "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== string-width@^4.1.0, string-width@^4.2.0: version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" @@ -8558,7 +8631,7 @@ string-width@^4.1.0, string-width@^4.2.0: string.prototype.matchall@^4.0.6: version "4.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d" + resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz" integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg== dependencies: call-bind "^1.0.2" @@ -8572,7 +8645,7 @@ string.prototype.matchall@^4.0.6: string.prototype.trim@^1.2.1: version "1.2.5" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.5.tgz#a587bcc8bfad8cb9829a577f5de30dd170c1682c" + resolved "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.5.tgz" integrity sha512-Lnh17webJVsD6ECeovpVN17RlAKjmz4rF9S+8Y45CkMc/ufVpTkU3vZIyIC7sllQ1FCvObZnnCdNs/HXTUOTlg== dependencies: call-bind "^1.0.2" @@ -8581,7 +8654,7 @@ string.prototype.trim@^1.2.1: string.prototype.trimend@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz" integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== dependencies: call-bind "^1.0.2" @@ -8589,7 +8662,7 @@ string.prototype.trimend@^1.0.4: string.prototype.trimstart@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz" integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== dependencies: call-bind "^1.0.2" @@ -8597,21 +8670,21 @@ string.prototype.trimstart@^1.0.4: string_decoder@^1.1.1: version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== dependencies: safe-buffer "~5.2.0" string_decoder@~1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== dependencies: safe-buffer "~5.1.0" stringify-object@^3.3.0: version "3.3.0" - resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + resolved "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz" integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== dependencies: get-own-enumerable-property-symbols "^3.0.0" @@ -8620,58 +8693,58 @@ stringify-object@^3.3.0: strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" strip-ansi@^7.0.0, strip-ansi@^7.0.1: version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz" integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== dependencies: ansi-regex "^6.0.1" strip-bom@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= strip-bom@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz" integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== strip-comments@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" + resolved "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz" integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== strip-final-newline@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== strip-indent@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" + resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz" integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== dependencies: min-indent "^1.0.0" strip-json-comments@^3.1.0, strip-json-comments@^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.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== style-loader@^3.3.1: version "3.3.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575" + resolved "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz" integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ== styled-components@^5.3.3: version "5.3.3" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.3.tgz#312a3d9a549f4708f0fb0edc829eb34bde032743" + resolved "https://registry.npmjs.org/styled-components/-/styled-components-5.3.3.tgz" integrity sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw== dependencies: "@babel/helper-module-imports" "^7.0.0" @@ -8687,7 +8760,7 @@ styled-components@^5.3.3: stylehacks@^*: version "5.1.0" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520" + resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz" integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q== dependencies: browserslist "^4.16.6" @@ -8695,28 +8768,28 @@ stylehacks@^*: supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" supports-color@^8.0.0: version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== dependencies: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz" integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== dependencies: has-flag "^4.0.0" @@ -8724,17 +8797,17 @@ supports-hyperlinks@^2.0.0: supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== svg-parser@^2.0.2: version "2.0.4" - resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" + resolved "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== svgo@^1.2.2: version "1.3.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" + resolved "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz" integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== dependencies: chalk "^2.4.1" @@ -8753,7 +8826,7 @@ svgo@^1.2.2: svgo@^2.7.0: version "2.8.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + resolved "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz" integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== dependencies: "@trysound/sax" "0.2.0" @@ -8766,12 +8839,12 @@ svgo@^2.7.0: symbol-tree@^3.2.4: version "3.2.4" - resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== tailwindcss@^3.0.2: version "3.0.23" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.23.tgz#c620521d53a289650872a66adfcb4129d2200d10" + resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.23.tgz" integrity sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA== dependencies: arg "^5.0.1" @@ -8798,22 +8871,22 @@ tailwindcss@^3.0.2: tapable@^1.0.0: version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" + resolved "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== temp-dir@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" + resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz" integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== tempy@^0.6.0: version "0.6.0" - resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.6.0.tgz#65e2c35abc06f1124a97f387b08303442bde59f3" + resolved "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz" integrity sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw== dependencies: is-stream "^2.0.0" @@ -8823,7 +8896,7 @@ tempy@^0.6.0: terminal-link@^2.0.0: version "2.1.1" - resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + resolved "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz" integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== dependencies: ansi-escapes "^4.2.1" @@ -8831,7 +8904,7 @@ terminal-link@^2.0.0: terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.5: version "5.3.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" + resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz" integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== dependencies: jest-worker "^27.4.5" @@ -8842,7 +8915,7 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.5: terser@^5.0.0, terser@^5.10.0, terser@^5.7.2: version "5.12.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c" + resolved "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz" integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ== dependencies: acorn "^8.5.0" @@ -8852,7 +8925,7 @@ terser@^5.0.0, terser@^5.10.0, terser@^5.7.2: test-exclude@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz" integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== dependencies: "@istanbuljs/schema" "^0.1.2" @@ -8861,49 +8934,54 @@ test-exclude@^6.0.0: text-table@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= throat@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" + resolved "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz" integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== thunky@^1.0.2: version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + resolved "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz" integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== timsort@^0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + resolved "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= +tiny-invariant@^1.0.6: + version "1.2.0" + resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz" + integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg== + tmpl@1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz" integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== to-fast-properties@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== dependencies: is-number "^7.0.0" toidentifier@1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== tough-cookie@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz" integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== dependencies: psl "^1.1.33" @@ -8912,26 +8990,26 @@ tough-cookie@^4.0.0: tr46@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" + resolved "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz" integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= dependencies: punycode "^2.1.0" tr46@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" + resolved "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz" integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== dependencies: punycode "^2.1.1" tryer@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" + resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== tsconfig-paths@^3.12.0: version "3.14.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz#4fcc48f9ccea8826c41b9ca093479de7f5018976" + resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz" integrity sha512-cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g== dependencies: "@types/json5" "^0.0.29" @@ -8941,58 +9019,58 @@ tsconfig-paths@^3.12.0: tslib@^1.8.1: version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.3, tslib@^2.2.0: version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== tsutils@^3.21.0: version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz" integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== dependencies: tslib "^1.8.1" type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz" integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== dependencies: prelude-ls "^1.2.1" type-check@~0.3.2: version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + resolved "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz" integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= dependencies: prelude-ls "~1.1.2" type-detect@4.0.8: version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== type-fest@^0.16.0: version "0.16.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz" integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg== type-fest@^0.20.2: version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== type-fest@^0.21.3: version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== type-is@~1.6.18: version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== dependencies: media-typer "0.3.0" @@ -9000,14 +9078,14 @@ type-is@~1.6.18: typedarray-to-buffer@^3.1.5: version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz" integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== dependencies: is-typedarray "^1.0.0" typedoc@^0.22.13: version "0.22.13" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.22.13.tgz#d061f8f0fb7c9d686e48814f245bddeea4564e66" + resolved "https://registry.npmjs.org/typedoc/-/typedoc-0.22.13.tgz" integrity sha512-NHNI7Dr6JHa/I3+c62gdRNXBIyX7P33O9TafGLd07ur3MqzcKgwTvpg18EtvCLHJyfeSthAtCLpM7WkStUmDuQ== dependencies: glob "^7.2.0" @@ -9018,12 +9096,12 @@ typedoc@^0.22.13: typescript@^4.4.2: version "4.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4" + resolved "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz" integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg== unbox-primitive@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz" integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== dependencies: function-bind "^1.1.1" @@ -9033,7 +9111,7 @@ unbox-primitive@^1.0.1: uncontrollable@^7.2.1: version "7.2.1" - resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.2.1.tgz#1fa70ba0c57a14d5f78905d533cf63916dc75738" + resolved "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz" integrity sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ== dependencies: "@babel/runtime" "^7.6.3" @@ -9043,12 +9121,12 @@ uncontrollable@^7.2.1: unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz" integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== unicode-match-property-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz" integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== dependencies: unicode-canonical-property-names-ecmascript "^2.0.0" @@ -9056,61 +9134,66 @@ unicode-match-property-ecmascript@^2.0.0: unicode-match-property-value-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz" integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" + resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz" integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== unique-string@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + resolved "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz" integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== dependencies: crypto-random-string "^2.0.0" universalify@^0.1.2: version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== universalify@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= unquote@~1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" + resolved "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz" integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= upath@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" + resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== uri-js@^4.2.2: version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz" integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" +use-memo-one@^1.1.1: + version "1.1.2" + resolved "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.2.tgz" + integrity sha512-u2qFKtxLsia/r8qG0ZKkbytbztzRb317XCkT7yP8wxL0tZ/CzK2G+WWie5vWvpyeP7+YoPIwbJoIHJ4Ba4k0oQ== + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= util.promisify@~1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" + resolved "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz" integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== dependencies: define-properties "^1.1.3" @@ -9120,27 +9203,27 @@ util.promisify@~1.0.0: utila@~0.4: version "0.4.0" - resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" + resolved "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz" integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= utils-merge@1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= uuid@^8.3.2: version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== v8-compile-cache@^2.0.3: version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== v8-to-istanbul@^8.1.0: version "8.1.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed" + resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz" integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" @@ -9149,50 +9232,50 @@ v8-to-istanbul@^8.1.0: vary@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= vscode-oniguruma@^1.6.1: version "1.6.2" - resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz#aeb9771a2f1dbfc9083c8a7fdd9cccaa3f386607" + resolved "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz" integrity sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA== vscode-textmate@5.2.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e" + resolved "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz" integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ== w3c-hr-time@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz" integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== dependencies: browser-process-hrtime "^1.0.0" w3c-xmlserializer@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" + resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz" integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== dependencies: xml-name-validator "^3.0.0" walker@^1.0.7: version "1.0.8" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" + resolved "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz" integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== dependencies: makeerror "1.0.12" warning@^4.0.0, warning@^4.0.1, warning@^4.0.2, warning@^4.0.3: version "4.0.3" - resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" + resolved "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz" integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== dependencies: loose-envify "^1.0.0" watchpack@^2.3.1: version "2.3.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" + resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz" integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== dependencies: glob-to-regexp "^0.4.1" @@ -9200,34 +9283,34 @@ watchpack@^2.3.1: wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + resolved "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz" integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== dependencies: minimalistic-assert "^1.0.0" web-vitals@^2.1.0: version "2.1.4" - resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-2.1.4.tgz#76563175a475a5e835264d373704f9dde718290c" + resolved "https://registry.npmjs.org/web-vitals/-/web-vitals-2.1.4.tgz" integrity sha512-sVWcwhU5mX6crfI5Vd2dC4qchyTqxV8URinzt25XqVh+bHEPGH4C3NPrNionCP7Obx59wrYEbNlw4Z8sjALzZg== webidl-conversions@^4.0.2: version "4.0.2" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" + resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== webidl-conversions@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" + resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz" integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== webidl-conversions@^6.1.0: version "6.1.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== webpack-dev-middleware@^5.3.1: version "5.3.1" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f" + resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz" integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg== dependencies: colorette "^2.0.10" @@ -9238,7 +9321,7 @@ webpack-dev-middleware@^5.3.1: webpack-dev-server@^4.6.0: version "4.7.4" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945" + resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz" integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A== dependencies: "@types/bonjour" "^3.5.9" @@ -9274,7 +9357,7 @@ webpack-dev-server@^4.6.0: webpack-manifest-plugin@^4.0.2: version "4.1.1" - resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz#10f8dbf4714ff93a215d5a45bcc416d80506f94f" + resolved "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz" integrity sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow== dependencies: tapable "^2.0.0" @@ -9282,7 +9365,7 @@ webpack-manifest-plugin@^4.0.2: webpack-sources@^1.4.3: version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== dependencies: source-list-map "^2.0.0" @@ -9290,7 +9373,7 @@ webpack-sources@^1.4.3: webpack-sources@^2.2.0: version "2.3.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd" + resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz" integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA== dependencies: source-list-map "^2.0.1" @@ -9298,12 +9381,12 @@ webpack-sources@^2.2.0: webpack-sources@^3.2.3: version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" + resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@^5.64.4: version "5.70.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d" + resolved "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz" integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw== dependencies: "@types/eslint-scope" "^3.7.3" @@ -9333,7 +9416,7 @@ webpack@^5.64.4: websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz" integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== dependencies: http-parser-js ">=0.5.1" @@ -9342,29 +9425,29 @@ websocket-driver@>=0.5.1, websocket-driver@^0.7.4: websocket-extensions@>=0.1.1: version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== whatwg-encoding@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz" integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== dependencies: iconv-lite "0.4.24" whatwg-fetch@^3.6.2: version "3.6.2" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" + resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== whatwg-mimetype@^2.3.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== whatwg-url@^7.0.0: version "7.1.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" + resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz" integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== dependencies: lodash.sortby "^4.7.0" @@ -9373,7 +9456,7 @@ whatwg-url@^7.0.0: whatwg-url@^8.0.0, whatwg-url@^8.5.0: version "8.7.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz" integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== dependencies: lodash "^4.7.0" @@ -9382,7 +9465,7 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0: which-boxed-primitive@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz" integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== dependencies: is-bigint "^1.0.1" @@ -9393,26 +9476,26 @@ which-boxed-primitive@^1.0.2: which@^1.3.1: version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== dependencies: isexe "^2.0.0" which@^2.0.1: version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== workbox-background-sync@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.1.tgz#df79c6a4a22945d8a44493a4947a6ed0f720ef86" + resolved "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.1.tgz" integrity sha512-T5a35fagLXQvV8Dr4+bDU+XYsP90jJ3eBLjZMKuCNELMQZNj+VekCODz1QK44jgoBeQk+vp94pkZV6G+e41pgg== dependencies: idb "^6.1.4" @@ -9420,14 +9503,14 @@ workbox-background-sync@6.5.1: workbox-broadcast-update@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.1.tgz#9aecb116979b0709480b84cfd1beca7a901d01d4" + resolved "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.1.tgz" integrity sha512-mb/oyblyEpDbw167cCTyHnC3RqCnCQHtFYuYZd+QTpuExxM60qZuBH1AuQCgvLtDcztBKdEYK2VFD9SZYgRbaQ== dependencies: workbox-core "6.5.1" workbox-build@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.1.tgz#6b5e8f090bb608267868540d3072b44b8531b3bc" + resolved "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.1.tgz" integrity sha512-coDUDzHvFZ1ADOl3wKCsCSyOBvkPKlPgcQDb6LMMShN1zgF31Mev/1HzN3+9T2cjjWAgFwZKkuRyExqc1v21Zw== dependencies: "@apideck/better-ajv-errors" "^0.3.1" @@ -9470,19 +9553,19 @@ workbox-build@6.5.1: workbox-cacheable-response@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.1.tgz#f71d0a75b3d6846e39594955e99ac42fd26f8693" + resolved "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.1.tgz" integrity sha512-3TdtH/luDiytmM+Cn72HCBLZXmbeRNJqZx2yaVOfUZhj0IVwZqQXhNarlGE9/k6U5Jelb+TtpH2mLVhnzfiSMg== dependencies: workbox-core "6.5.1" workbox-core@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.1.tgz#0dba3bccf883a46dfa61cc412eaa3cb09bb549e6" + resolved "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.1.tgz" integrity sha512-qObXZ39aFJ2N8X7IUbGrJHKWguliCuU1jOXM/I4MTT84u9BiKD2rHMkIzgeRP1Ixu9+cXU4/XHJq3Cy0Qqc5hw== workbox-expiration@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.1.tgz#9f105fcf3362852754884ad153888070ce98b692" + resolved "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.1.tgz" integrity sha512-iY/cTADAQATMmPkUBRmQdacqq0TJd2wMHimBQz+tRnPGHSMH+/BoLPABPnu7O7rT/g/s59CUYYRGxe3mEgoJCA== dependencies: idb "^6.1.4" @@ -9490,7 +9573,7 @@ workbox-expiration@6.5.1: workbox-google-analytics@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.1.tgz#685224d439c1e7a943f8241d65e2a34ee95a4ba0" + resolved "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.1.tgz" integrity sha512-qZU46/h4dbionYT6Yk6iBkUwpiEzAfnO1W7KkI+AMmY7G9/gA03dQQ7rpTw8F4vWrG7ahTUGWDFv6fERtaw1BQ== dependencies: workbox-background-sync "6.5.1" @@ -9500,14 +9583,14 @@ workbox-google-analytics@6.5.1: workbox-navigation-preload@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.1.tgz#a244e3bdf99ce86da7210315ca1ba5aef3710825" + resolved "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.1.tgz" integrity sha512-aKrgAbn2IMgzTowTi/ZyKdQUcES2m++9aGtpxqsX7Gn9ovCY8zcssaMEAMMwrIeveij5HiWNBrmj6MWDHi+0rg== dependencies: workbox-core "6.5.1" workbox-precaching@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.1.tgz#177b6424f1e71e601b9c3d6864decad2655f9ff9" + resolved "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.1.tgz" integrity sha512-EzlPBxvmjGfE56YZzsT/vpVkpLG1XJhoplgXa5RPyVWLUL1LbwEAxhkrENElSS/R9tgiTw80IFwysidfUqLihg== dependencies: workbox-core "6.5.1" @@ -9516,14 +9599,14 @@ workbox-precaching@6.5.1: workbox-range-requests@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.1.tgz#f40f84aa8765940543eba16131d02f12b38e2fdc" + resolved "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.1.tgz" integrity sha512-57Da/qRbd9v33YlHX0rlSUVFmE4THCjKqwkmfhY3tNLnSKN2L5YBS3qhWeDO0IrMNgUj+rGve2moKYXeUqQt4A== dependencies: workbox-core "6.5.1" workbox-recipes@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.1.tgz#d2fb21743677cc3ca9e1fc9e3b68f0d1587df205" + resolved "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.1.tgz" integrity sha512-DGsyKygHggcGPQpWafC/Nmbm1Ny3sB2vE9r//3UbeidXiQ+pLF14KEG1/0NNGRaY+lfOXOagq6d1H7SC8KA+rA== dependencies: workbox-cacheable-response "6.5.1" @@ -9535,21 +9618,21 @@ workbox-recipes@6.5.1: workbox-routing@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.1.tgz#5488795ae850fe3ae435241143b54ff25ab0db70" + resolved "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.1.tgz" integrity sha512-yAAncdTwanvlR8KPjubyvFKeAok8ZcIws6UKxvIAg0I+wsf7UYi93DXNuZr6RBSQrByrN6HkCyjuhmk8P63+PA== dependencies: workbox-core "6.5.1" workbox-strategies@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.1.tgz#51cabbddad5a1956eb9d51cf6ce01ab0a6372756" + resolved "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.1.tgz" integrity sha512-JNaTXPy8wXzKkr+6za7/eJX9opoZk7UgY261I2kPxl80XQD8lMjz0vo9EOcBwvD72v3ZhGJbW84ZaDwFEhFvWA== dependencies: workbox-core "6.5.1" workbox-streams@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.1.tgz#12036817385fa4449a86a3ef77fce1cb00ecad9f" + resolved "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.1.tgz" integrity sha512-7jaTWm6HRGJ/ewECnhb+UgjTT50R42E0/uNCC4eTKQwnLO/NzNGjoXTdQgFjo4zteR+L/K6AtFAiYKH3ZJbAYw== dependencies: workbox-core "6.5.1" @@ -9557,12 +9640,12 @@ workbox-streams@6.5.1: workbox-sw@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.1.tgz#f9256b40f0a7e94656ccd06f127ba19a92cd23c5" + resolved "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.1.tgz" integrity sha512-hVrQa19yo9wzN1fQQ/h2JlkzFpkuH2qzYT2/rk7CLaWt6tLnTJVFCNHlGRRPhytZSf++LoIy7zThT714sowT/Q== workbox-webpack-plugin@^6.4.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.1.tgz#da88b4b6d8eff855958f0e7ebb7aa3eea50a8282" + resolved "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.1.tgz" integrity sha512-SHtlQBpKruI16CAYhICDMkgjXE2fH5Yp+D+1UmBfRVhByZYzusVOykvnPm8ObJb9d/tXgn9yoppoxafFS7D4vQ== dependencies: fast-json-stable-stringify "^2.1.0" @@ -9573,7 +9656,7 @@ workbox-webpack-plugin@^6.4.1: workbox-window@6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.1.tgz#7b5ca29467b1da45dc9e2b5a1b89159d3eb9957a" + resolved "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.1.tgz" integrity sha512-oRlun9u7b7YEjo2fIDBqJkU2hXtrEljXcOytRhfeQRbqXxjUOpFgXSGRSAkmDx1MlKUNOSbr+zfi8h5n7In3yA== dependencies: "@types/trusted-types" "^2.0.2" @@ -9581,7 +9664,7 @@ workbox-window@6.5.1: wrap-ansi@^7.0.0: version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== dependencies: ansi-styles "^4.0.0" @@ -9590,12 +9673,12 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= write-file-atomic@^3.0.0: version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz" integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== dependencies: imurmurhash "^0.1.4" @@ -9605,52 +9688,52 @@ write-file-atomic@^3.0.0: ws@^7.4.6: version "7.5.7" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" + resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz" integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== ws@^8.4.2: version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + resolved "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz" integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== xml-name-validator@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== xmlchars@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== xtend@^4.0.2: version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^5.0.5: version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yallist@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== yargs-parser@^20.2.2: version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs@^16.2.0: version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== dependencies: cliui "^7.0.2" @@ -9663,5 +9746,5 @@ yargs@^16.2.0: yocto-queue@^0.1.0: version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From c6ac065abcf31e61b6a2381c290eedc135b90cce Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Wed, 11 May 2022 08:49:35 +0200 Subject: [PATCH 137/649] Style --- .../src/components/AdminsComponents/AdminList.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/AdminsComponents/AdminList.tsx b/frontend/src/components/AdminsComponents/AdminList.tsx index 43e81fd2f..690cce684 100644 --- a/frontend/src/components/AdminsComponents/AdminList.tsx +++ b/frontend/src/components/AdminsComponents/AdminList.tsx @@ -42,11 +42,15 @@ export default function AdminList(props: { Remove - - {props.admins.map(admin => ( - - ))} - + + {props.admins.map(admin => ( + + ))} + ); } From 1d746a4d2c674522a182a3dbfa73b007225d2732 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 11 May 2022 10:15:15 +0200 Subject: [PATCH 138/649] ProjectRoles dnd styling --- .../ProjectRoles/ProjectRoles.tsx | 47 ++++++++++++++ .../ProjectRoles/styles.ts | 26 ++++++++ .../ProjectsComponents/ProjectCard/styles.ts | 6 +- .../ProjectDetailPage/ProjectDetailPage.tsx | 65 ++----------------- .../projectViews/ProjectDetailPage/styles.ts | 12 ---- 5 files changed, 80 insertions(+), 76 deletions(-) create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectRoles/styles.ts diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx new file mode 100644 index 000000000..fa72cdc03 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx @@ -0,0 +1,47 @@ +import { Droppable, Draggable } from "react-beautiful-dnd"; +import { ProjectRoleContainer, SuggestionContainer, Suggestions } from "./styles"; +export function ProjectRoles({ + projectRoles, +}: { + projectRoles: { + skill: string; + slots: number; + suggestions: { + name: string; + }[]; + }[]; +}) { + return ( +
    + {projectRoles.map((projectRole, _index) => ( + + {projectRole.skill} +

    + {projectRole.suggestions.length.toString() + + " / " + + projectRole.slots.toString()} + + {(provided, snapshot) => ( + + {projectRole.suggestions.map((sug, _index2) => ( + + {(provided, snapshot) => ( + + {sug.name} + + )} + + ))} + {provided.placeholder} + + )} + +     + ))} +
    + ); +} diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/styles.ts b/frontend/src/components/ProjectDetailComponents/ProjectRoles/styles.ts new file mode 100644 index 000000000..5f424b9ce --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/styles.ts @@ -0,0 +1,26 @@ +import styled from "styled-components"; + +export const ProjectRoleContainer = styled.div` + border: 2px solid #1a1a36; + border-radius: 5px; + margin: 10px 20px; + margin-left: 0; + padding: 20px 20px 20px 20px; + background-color: #323252; + box-shadow: 5px 5px 15px #131329; +`; + +export const Suggestions = styled.div` + min-height: 10vh; +`; + +export const SuggestionContainer = styled.div` + background-color: #1a1a36; + border-radius: 5px; + margin-top: 10px; + margin-right: 10px; + text-align: center; + padding: 7.5px 15px; + max-width: 25vw; + display: flex; +`; diff --git a/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts b/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts index 45993431b..8c5a3008c 100644 --- a/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts +++ b/frontend/src/components/ProjectsComponents/ProjectCard/styles.ts @@ -93,8 +93,4 @@ export const Delete = styled.button` export const PopUp = styled(Modal)``; -export const ProjectRoleContainer = styled.div` - margin: 10px; - background-color: #1a1a36; - padding: 10px; -`; + diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 589e60513..be352d1cd 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -1,3 +1,4 @@ +import { ProjectRoles } from "./../../../components/ProjectDetailComponents/ProjectRoles/ProjectRoles"; import { useEffect, useState } from "react"; import { useNavigate, useParams } from "react-router-dom"; import { Project, CreateProject as EditProject } from "../../../data/interfaces"; @@ -11,20 +12,16 @@ import { NumberOfStudents, ClientContainer, ProjectPageContainer, - SuggestionContainer, - Suggestions, } from "./styles"; import { BiArrowBack } from "react-icons/bi"; import { BsPersonFill } from "react-icons/bs"; import { TiDeleteOutline } from "react-icons/ti"; -import { StudentPlace } from "../../../data/interfaces/projects"; import { CoachContainer, CoachesContainer, CoachText, - ProjectRoleContainer, } from "../../../components/ProjectsComponents/ProjectCard/styles"; import { useAuth } from "../../../contexts"; import ConfirmDelete from "../../../components/ProjectsComponents/ConfirmDelete"; @@ -37,7 +34,7 @@ import { } from "../../../components/ProjectDetailComponents"; import projectToEditProject from "../../../utils/logic/project"; -import { DragDropContext, Droppable, Draggable, DropResult } from "react-beautiful-dnd"; +import { DragDropContext, DropResult } from "react-beautiful-dnd"; import { getStudent } from "../../../utils/api/students"; /** @@ -73,7 +70,7 @@ export default function ProjectDetailPage() { }; const [projectRoles, setProjectRoles] = useState([ - { skill: "Frontend", slots: 5, suggestions: [{ name: "Tom" }] }, + { skill: "Frontend", slots: 5, suggestions: [{ name: "Jef" }] }, { skill: "Backend", slots: 5, suggestions: [] }, ]); @@ -85,19 +82,6 @@ export default function ProjectDetailPage() { if (response) { setProject(response); setEditedProject(response); - - // TODO - // Generate student data - const studentsTemplate: StudentPlace[] = []; - for (let i = 0; i < response.numberOfStudents; i++) { - const student: StudentPlace = { - available: i % 2 === 0, - name: i % 2 === 0 ? undefined : "Tom", - skill: "Frontend", - }; - studentsTemplate.push(student); - } - // setStudents(studentsTemplate); } else navigate("/404-not-found"); } } @@ -210,44 +194,7 @@ export default function ProjectDetailPage() { )} -
    - {projectRoles.map((projectRole, _index) => ( - - {projectRole.skill} -

    - {projectRole.suggestions.length.toString() + - " / " + - projectRole.slots.toString()} - - {(provided, snapshot) => ( - - {projectRole.suggestions.map((sug, _index2) => ( - - {(provided, snapshot) => ( - - {sug.name} - - )} - - ))} - {provided.placeholder} - - )} - -     - ))} -
    + @@ -274,7 +221,7 @@ export default function ProjectDetailPage() { const newProjectRoles = projectRoles.map((projectRole, index) => { if (projectRole.skill === destination?.droppableId) { const newSuggestions = [...projectRole.suggestions]; - newSuggestions.push({ name: student.lastName }); + newSuggestions.splice(destination.index, 0, { name: student.lastName }); return { ...projectRole, suggestions: newSuggestions }; } else return projectRole; }); @@ -283,7 +230,7 @@ export default function ProjectDetailPage() { const newProjectRoles = projectRoles.map((projectRole, index) => { if (projectRole.skill === destination?.droppableId) { const newSuggestions = [...projectRole.suggestions]; - newSuggestions.push({ name: result.draggableId }); + newSuggestions.splice(destination.index, 0, { name: result.draggableId }); return { ...projectRole, suggestions: newSuggestions }; } else if (projectRole.skill === source.droppableId) { const newSuggestions = [...projectRole.suggestions]; diff --git a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts index 5210d8143..1a3f38fee 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts +++ b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts @@ -45,15 +45,3 @@ export const NumberOfStudents = styled.div` display: flex; align-items: center; `; - -export const Suggestions = styled.div` - min-height: 10vh; -`; - -export const SuggestionContainer = styled.div` - margin: 10px; - background-color: #1a1a28; - padding: 10px; - max-width: 25%; - overflow: auto; -`; From 391f9be3a0658f6b44c7e30ed6a51ea5d26bb18c Mon Sep 17 00:00:00 2001 From: beguille Date: Wed, 11 May 2022 10:28:15 +0200 Subject: [PATCH 139/649] register database tests passing --- backend/src/database/crud/projects.py | 2 +- backend/src/database/models.py | 3 +- .../test_database/test_crud/test_register.py | 25 +++++---- backend/tests/test_database/test_models.py | 28 ++++++---- backend/tests/test_logic/test_register.py | 56 ++++++++++--------- .../test_projects/test_projects.py | 8 +-- 6 files changed, 68 insertions(+), 54 deletions(-) diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index 09776746d..cae57bdc0 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -66,7 +66,7 @@ async def add_project(db: AsyncSession, edition: Edition, input_project: InputPr try: query = select(Partner).where(Partner.name == partner) result = await db.execute(query) - partners_obj.append(result.scalars().one()) + partners_obj.append(result.unique().scalars().one()) except NoResultFound: partner_obj = Partner(name=partner) db.add(partner_obj) diff --git a/backend/src/database/models.py b/backend/src/database/models.py index 6cab3d268..0614b1d10 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -118,7 +118,8 @@ class Partner(Base): partner_id = Column(Integer, primary_key=True) name = Column(Text, unique=True, nullable=False) - projects: list[Project] = relationship("Project", secondary="project_partners", back_populates="partners") + projects: list[Project] = relationship("Project", secondary="project_partners", + back_populates="partners", lazy="joined") class Project(Base): diff --git a/backend/tests/test_database/test_crud/test_register.py b/backend/tests/test_database/test_crud/test_register.py index d0ca96f4a..1a2d6d3c3 100644 --- a/backend/tests/test_database/test_crud/test_register.py +++ b/backend/tests/test_database/test_crud/test_register.py @@ -1,38 +1,39 @@ +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from src.database.crud.register import create_user, create_coach_request, create_auth_email from src.database.models import AuthEmail, CoachRequest, User, Edition -def test_create_user(database_session: AsyncSession): +async def test_create_user(database_session: AsyncSession): """Tests for creating a user""" - create_user(database_session, "jos") + await create_user(database_session, "jos") - a = database_session.query(User).where(User.name == "jos").all() + a = (await database_session.execute(select(User).where(User.name == "jos"))).unique().scalars().all() assert len(a) == 1 assert a[0].name == "jos" -def test_react_coach_request(database_session: AsyncSession): +async def test_react_coach_request(database_session: AsyncSession): """Tests for creating a coach request""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() - u = create_user(database_session, "jos") - create_coach_request(database_session, u, edition) - a = database_session.query(CoachRequest).where(CoachRequest.user == u).all() + await database_session.commit() + u = await create_user(database_session, "jos") + await create_coach_request(database_session, u, edition) + a = (await database_session.execute(select(CoachRequest).where(CoachRequest.user == u))).unique().scalars().all() assert len(a) == 1 assert a[0].user_id == u.user_id assert u.coach_request == a[0] -def test_create_auth_email(database_session: AsyncSession): +async def test_create_auth_email(database_session: AsyncSession): """Tests for creating a auth email""" - u = create_user(database_session, "jos") - create_auth_email(database_session, u, "wachtwoord", "mail@email.com") + u = await create_user(database_session, "jos") + await create_auth_email(database_session, u, "wachtwoord", "mail@email.com") - a = database_session.query(AuthEmail).where(AuthEmail.user == u).all() + a = (await database_session.execute(select(AuthEmail).where(AuthEmail.user == u))).scalars().all() assert len(a) == 1 assert a[0].user_id == u.user_id diff --git a/backend/tests/test_database/test_models.py b/backend/tests/test_database/test_models.py index 506ba0560..09347556f 100644 --- a/backend/tests/test_database/test_models.py +++ b/backend/tests/test_database/test_models.py @@ -1,52 +1,58 @@ +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from src.database import models -def test_user_coach_request(database_session: AsyncSession): +async def test_user_coach_request(database_session: AsyncSession): """Test sending a coach request""" edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() # Passing as user_id user = models.User(name="name") database_session.add(user) - database_session.commit() + await database_session.commit() req = models.CoachRequest(user_id=user.user_id, edition=edition) database_session.add(req) - database_session.commit() + await database_session.commit() assert req.user == user # Check if passing as user instead of user_id works user = models.User(name="name") database_session.add(user) - database_session.commit() + await database_session.commit() req = models.CoachRequest(user=user, edition=edition) database_session.add(req) - database_session.commit() + await database_session.commit() assert req.user_id == user.user_id -def test_project_partners(database_session: AsyncSession): +async def test_project_partners(database_session: AsyncSession): """Test adding a partner to a project""" project = models.Project(name="project") database_session.add(project) - database_session.commit() + await database_session.commit() partner = models.Partner(name="partner") - database_session.add(project) - database_session.commit() + database_session.add(partner) + await database_session.commit() + + # query the partner and the project to create the association tables + (await database_session.execute(select(models.Partner).where(models.Partner.partner_id == partner.partner_id))).unique().scalars().one() + (await database_session.execute( + select(models.Project).where(models.Project.project_id == project.project_id))).unique().scalars().one() assert len(partner.projects) == 0 assert len(project.partners) == 0 partner.projects.append(project) - database_session.commit() + await database_session.commit() # Verify that appending to the list updates the association table # in both directions diff --git a/backend/tests/test_logic/test_register.py b/backend/tests/test_logic/test_register.py index df24e412d..20a312a93 100644 --- a/backend/tests/test_logic/test_register.py +++ b/backend/tests/test_logic/test_register.py @@ -1,4 +1,5 @@ import pytest +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.exc import NoResultFound @@ -9,29 +10,30 @@ from src.app.exceptions.register import FailedToAddNewUserException -def test_create_request(database_session: AsyncSession): +async def test_create_request(database_session: AsyncSession): """Tests if a normal request can be created""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) invite_link: InviteLink = InviteLink( edition=edition, target_email="jw@gmail.com") - database_session.commit() + database_session.add(invite_link) + await database_session.commit() new_user = NewUser(name="jos", email="email@email.com", pw="wachtwoord", uuid=invite_link.uuid) - create_request(database_session, new_user, edition) + await create_request(database_session, new_user, edition) - users = database_session.query(User).where(User.name == "jos").all() + users = (await database_session.execute(select(User).where(User.name == "jos"))).unique().scalars().all() assert len(users) == 1 - coach_requests = database_session.query( - CoachRequest).where(CoachRequest.user == users[0]).all() - auth_email = database_session.query(AuthEmail).where( - AuthEmail.user == users[0]).all() + coach_requests = (await database_session.execute(select( + CoachRequest).where(CoachRequest.user == users[0]))).unique().scalars().all() + auth_email = (await database_session.execute(select(AuthEmail).where( + AuthEmail.user == users[0]))).scalars().all() assert len(coach_requests) == 1 assert auth_email[0].pw_hash != new_user.pw assert len(auth_email) == 1 -def test_duplicate_user(database_session: AsyncSession): +async def test_duplicate_user(database_session: AsyncSession): """Tests if there is a duplicate, it's not created in the database""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -39,7 +41,9 @@ def test_duplicate_user(database_session: AsyncSession): edition=edition, target_email="jw@gmail.com") invite_link2: InviteLink = InviteLink( edition=edition, target_email="jw@gmail.com") - database_session.commit() + database_session.add(invite_link1) + database_session.add(invite_link2) + await database_session.commit() nu1 = NewUser(name="user1", email="email@email.com", pw="wachtwoord1", uuid=invite_link1.uuid) nu2 = NewUser(name="user2", email="email@email.com", @@ -48,52 +52,54 @@ def test_duplicate_user(database_session: AsyncSession): # These two have to be nested transactions because they share the same database_session, # and otherwise the second one rolls the first one back # Making them nested transactions creates a savepoint so only that part is rolled back - with database_session.begin_nested(): - create_request(database_session, nu1, edition) + async with database_session.begin_nested(): + await create_request(database_session, nu1, edition) - with pytest.raises(FailedToAddNewUserException), database_session.begin_nested(): - create_request(database_session, nu2, edition) + async with database_session.begin_nested(): + with pytest.raises(FailedToAddNewUserException): + await create_request(database_session, nu2, edition) # Verify that second user wasn't added # the first addition was successful, the second wasn't - users = database_session.query(User).all() + users = (await database_session.execute(select(User))).unique().scalars().all() assert len(users) == 1 assert users[0].name == nu1.name - emails = database_session.query(AuthEmail).all() + emails = (await database_session.execute(select(AuthEmail))).scalars().all() assert len(emails) == 1 assert emails[0].user == users[0] - requests = database_session.query(CoachRequest).all() + requests = (await database_session.execute(select(CoachRequest))).unique().scalars().all() assert len(requests) == 1 assert requests[0].user == users[0] # Verify that the link wasn't removed - links = database_session.query(InviteLink).all() + links = (await database_session.execute(select(InviteLink))).scalars().all() assert len(links) == 1 -def test_use_same_uuid_multiple_times(database_session: AsyncSession): +async def test_use_same_uuid_multiple_times(database_session: AsyncSession): """Tests that you can't use the same UUID multiple times""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) invite_link: InviteLink = InviteLink( edition=edition, target_email="jw@gmail.com") - database_session.commit() + database_session.add(invite_link) + await database_session.commit() new_user1 = NewUser(name="jos", email="email@email.com", pw="wachtwoord", uuid=invite_link.uuid) - create_request(database_session, new_user1, edition) + await create_request(database_session, new_user1, edition) with pytest.raises(NoResultFound): new_user2 = NewUser(name="jos", email="email2@email.com", pw="wachtwoord", uuid=invite_link.uuid) - create_request(database_session, new_user2, edition) + await create_request(database_session, new_user2, edition) -def test_not_a_correct_email(database_session: AsyncSession): +async def test_not_a_correct_email(database_session: AsyncSession): """Tests when the email is not a correct email adress, it's get the right error""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() with pytest.raises(ValueError): new_user = NewUser(name="jos", email="email", pw="wachtwoord") - create_request(database_session, new_user, edition) + await create_request(database_session, new_user, edition) diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index 86f84e6f7..433d5a347 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -125,7 +125,7 @@ async def test_create_project(database_with_data: AsyncSession, auth_client: Aut response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() assert len(json['projects']) == 3 - assert len((await database_with_data.execute(select(Partner))).scalars().all()) == 0 + assert len((await database_with_data.execute(select(Partner))).unique().scalars().all()) == 0 response = \ await auth_client.post("/editions/ed2022/projects/", @@ -136,7 +136,7 @@ async def test_create_project(database_with_data: AsyncSession, auth_client: Aut assert response.json()['name'] == 'test' assert response.json()["partners"][0]["name"] == "ugent" - assert len((await database_with_data.execute(select(Partner))).scalars().all()) == 1 + assert len((await database_with_data.execute(select(Partner))).unique().scalars().all()) == 1 response = await auth_client.get('/editions/ed2022/projects', follow_redirects=True) json = response.json() @@ -148,7 +148,7 @@ async def test_create_project(database_with_data: AsyncSession, auth_client: Aut async def test_create_project_same_partner(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that creating a project doesn't create a partner if the partner already exists""" await auth_client.admin() - assert len((await database_with_data.execute(select(Partner))).scalars().all()) == 0 + assert len((await database_with_data.execute(select(Partner))).unique().scalars().all()) == 0 async with auth_client: await auth_client.post("/editions/ed2022/projects/", @@ -159,7 +159,7 @@ async def test_create_project_same_partner(database_with_data: AsyncSession, aut json={"name": "test2", "number_of_students": 2, "skills": [1, 2], "partners": ["ugent"], "coaches": [1]}) - assert len((await database_with_data.execute(select(Partner))).scalars().all()) == 1 + assert len((await database_with_data.execute(select(Partner))).unique().scalars().all()) == 1 async def test_create_project_non_existing_skills(database_with_data: AsyncSession, auth_client: AuthClient): From 43d64d7c7021de2fea69c20b7326bd98ccc3c86a Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 11 May 2022 10:58:12 +0200 Subject: [PATCH 140/649] More seperate components --- .../PartnerInput/styles.ts | 2 + .../ProjectCoaches/ProjectCoaches.tsx | 44 +++++++++ .../ProjectCoaches/index.ts | 1 + .../ProjectCoaches/styles.ts | 36 +++++++ .../ProjectPartners/ProjectPartners.tsx | 43 ++++++++ .../ProjectPartners/index.ts | 1 + .../ProjectPartners/styles.ts | 24 +++++ .../ProjectRoles/ProjectRoles.tsx | 2 +- .../ProjectRoles/index.ts | 1 + .../ProjectDetailComponents/index.ts | 3 + .../ProjectDetailPage/ProjectDetailPage.tsx | 97 +++++-------------- .../projectViews/ProjectDetailPage/styles.ts | 10 -- 12 files changed, 182 insertions(+), 82 deletions(-) create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectCoaches/ProjectCoaches.tsx create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectCoaches/index.ts create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectCoaches/styles.ts create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectPartners/ProjectPartners.tsx create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectPartners/index.ts create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectPartners/styles.ts create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectRoles/index.ts diff --git a/frontend/src/components/ProjectDetailComponents/PartnerInput/styles.ts b/frontend/src/components/ProjectDetailComponents/PartnerInput/styles.ts index a0bc69ae2..d56966fa2 100644 --- a/frontend/src/components/ProjectDetailComponents/PartnerInput/styles.ts +++ b/frontend/src/components/ProjectDetailComponents/PartnerInput/styles.ts @@ -7,6 +7,8 @@ export const Input = styled.input` color: white; border: none; border-radius: 5px; + width: 15%; + min-width: 100px; `; export const AddButton = styled.button` diff --git a/frontend/src/components/ProjectDetailComponents/ProjectCoaches/ProjectCoaches.tsx b/frontend/src/components/ProjectDetailComponents/ProjectCoaches/ProjectCoaches.tsx new file mode 100644 index 000000000..f45ad4e6e --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectCoaches/ProjectCoaches.tsx @@ -0,0 +1,44 @@ +import { TiDeleteOutline } from "react-icons/ti"; +import { CoachContainer, CoachesContainer, CoachText, RemoveButton } from "./styles"; +import CoachInput from "../CoachInput"; +import { Project } from "../../../data/interfaces"; + +export default function ProjectCoaches({ + project, + editedProject, + setEditedProject, + editing, +}: { + project: Project; + editedProject: Project; + setEditedProject: (project: Project) => void; + editing: boolean; +}) { + return ( + + {editedProject.coaches.map((element, _index) => ( + + {element.name} + {editing && ( + { + const newCoaches = [...editedProject.coaches]; + console.log(_index); + + newCoaches.splice(_index, 1); + const newProject: Project = { + ...project, + coaches: newCoaches, + }; + setEditedProject(newProject); + }} + > + + + )} + + ))} + {editing && } + + ); +} diff --git a/frontend/src/components/ProjectDetailComponents/ProjectCoaches/index.ts b/frontend/src/components/ProjectDetailComponents/ProjectCoaches/index.ts new file mode 100644 index 000000000..c4d19a121 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectCoaches/index.ts @@ -0,0 +1 @@ +export { default } from "./ProjectCoaches" \ No newline at end of file diff --git a/frontend/src/components/ProjectDetailComponents/ProjectCoaches/styles.ts b/frontend/src/components/ProjectDetailComponents/ProjectCoaches/styles.ts new file mode 100644 index 000000000..cb3812122 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectCoaches/styles.ts @@ -0,0 +1,36 @@ +import styled from "styled-components"; + +export const CoachesContainer = styled.div` + display: flex; + align-items: center; + margin-top: 20px; + overflow-x: auto; +`; + +export const CoachContainer = styled.div` + background-color: #1a1a36; + border-radius: 5px; + margin-right: 10px; + text-align: center; + padding: 7.5px 15px; + width: fit-content; + max-width: 20vw; + display: flex; +`; + +export const CoachText = styled.div` + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +`; + +export const RemoveButton = styled.button` + padding: 0px 2.5px; + background-color: #f14a3b; + color: white; + border: none; + margin-left: 10px; + border-radius: 1px; + display: flex; + align-items: center; +`; diff --git a/frontend/src/components/ProjectDetailComponents/ProjectPartners/ProjectPartners.tsx b/frontend/src/components/ProjectDetailComponents/ProjectPartners/ProjectPartners.tsx new file mode 100644 index 000000000..b828b7dc5 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectPartners/ProjectPartners.tsx @@ -0,0 +1,43 @@ +import { TiDeleteOutline } from "react-icons/ti"; +import { Project } from "../../../data/interfaces"; +import PartnerInput from "../PartnerInput"; + +import { ClientContainer, Client, RemoveButton } from "./styles"; + +export default function ProjectPartners({ + project, + editedProject, + setEditedProject, + editing, +}: { + project: Project; + editedProject: Project; + setEditedProject: (project: Project) => void; + editing: boolean; +}) { + return ( + <> + {editedProject.partners.map((element, _index) => ( + + {element.name} + {editing && ( + { + const newPartners = [...editedProject.partners]; + newPartners.splice(_index, 1); + const newProject: Project = { + ...project, + partners: newPartners, + }; + setEditedProject(newProject); + }} + > + + + )} + + ))} + {editing && } + + ); +} diff --git a/frontend/src/components/ProjectDetailComponents/ProjectPartners/index.ts b/frontend/src/components/ProjectDetailComponents/ProjectPartners/index.ts new file mode 100644 index 000000000..a069a1af2 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectPartners/index.ts @@ -0,0 +1 @@ +export { default } from "./ProjectPartners"; diff --git a/frontend/src/components/ProjectDetailComponents/ProjectPartners/styles.ts b/frontend/src/components/ProjectDetailComponents/ProjectPartners/styles.ts new file mode 100644 index 000000000..01cb3b735 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectPartners/styles.ts @@ -0,0 +1,24 @@ +import styled from "styled-components"; + +export const ClientContainer = styled.div` + display: flex; + align-items: center; + margin-right: 2%; +`; + +export const Client = styled.h5` + width: max-content; + margin-bottom: 0; + margin-right: 0; +`; + +export const RemoveButton = styled.button` + padding: 0px 2.5px; + background-color: transparent; + color: lightgray; + border: none; + margin-left: 5px; + border-radius: 1px; + display: flex; + align-items: center; +`; \ No newline at end of file diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx index fa72cdc03..2a0093aa0 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx @@ -1,6 +1,6 @@ import { Droppable, Draggable } from "react-beautiful-dnd"; import { ProjectRoleContainer, SuggestionContainer, Suggestions } from "./styles"; -export function ProjectRoles({ +export default function ProjectRoles({ projectRoles, }: { projectRoles: { diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/index.ts b/frontend/src/components/ProjectDetailComponents/ProjectRoles/index.ts new file mode 100644 index 000000000..51d015fa8 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/index.ts @@ -0,0 +1 @@ +export { default } from "./ProjectRoles"; diff --git a/frontend/src/components/ProjectDetailComponents/index.ts b/frontend/src/components/ProjectDetailComponents/index.ts index baefba9dc..fd49cf536 100644 --- a/frontend/src/components/ProjectDetailComponents/index.ts +++ b/frontend/src/components/ProjectDetailComponents/index.ts @@ -2,3 +2,6 @@ export { default as TitleAndEdit } from "./TitleAndEdit"; export { default as PartnerInput } from "./PartnerInput"; export { default as CoachInput } from "./CoachInput"; export { default as StudentList } from "./StudentList"; +export { default as ProjectRoles } from "./ProjectRoles"; +export { default as ProjectCoaches } from "./ProjectCoaches"; +export { default as ProjectPartners } from "./ProjectPartners"; diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index be352d1cd..3cd857edc 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -1,41 +1,35 @@ -import { ProjectRoles } from "./../../../components/ProjectDetailComponents/ProjectRoles/ProjectRoles"; import { useEffect, useState } from "react"; import { useNavigate, useParams } from "react-router-dom"; +import { DragDropContext, DropResult } from "react-beautiful-dnd"; + import { Project, CreateProject as EditProject } from "../../../data/interfaces"; +import projectToEditProject from "../../../utils/logic/project"; + import { deleteProject, getProject, patchProject } from "../../../utils/api/projects"; +import { getStudent } from "../../../utils/api/students"; + +import { useAuth } from "../../../contexts"; + +import { BiArrowBack } from "react-icons/bi"; +import { BsPersonFill } from "react-icons/bs"; + import { GoBack, ProjectContainer, - Client, ClientsContainer, NumberOfStudents, - ClientContainer, ProjectPageContainer, } from "./styles"; -import { BiArrowBack } from "react-icons/bi"; -import { BsPersonFill } from "react-icons/bs"; -import { TiDeleteOutline } from "react-icons/ti"; - -import { - CoachContainer, - CoachesContainer, - CoachText, -} from "../../../components/ProjectsComponents/ProjectCard/styles"; -import { useAuth } from "../../../contexts"; import ConfirmDelete from "../../../components/ProjectsComponents/ConfirmDelete"; -import { RemoveButton } from "../CreateProjectPage/styles"; import { - CoachInput, - PartnerInput, TitleAndEdit, StudentList, + ProjectRoles, + ProjectCoaches, + ProjectPartners, } from "../../../components/ProjectDetailComponents"; -import projectToEditProject from "../../../utils/logic/project"; - -import { DragDropContext, DropResult } from "react-beautiful-dnd"; -import { getStudent } from "../../../utils/api/students"; /** * @returns the detailed page of a project. Here you can add or remove students from the project. @@ -136,63 +130,24 @@ export default function ProjectDetailPage() { > - {editedProject.partners.map((element, _index) => ( - - {element.name} - {editing && ( - { - const newPartners = [...editedProject.partners]; - newPartners.splice(_index, 1); - const newProject: Project = { - ...project, - partners: newPartners, - }; - setEditedProject(newProject); - }} - > - - - )} - - ))} - {editing && ( - - )} + {project.numberOfStudents} - - {editedProject.coaches.map((element, _index) => ( - - {element.name} - {_index} - {editing && ( - { - const newCoaches = [...editedProject.coaches]; - console.log(_index); - - newCoaches.splice(_index, 1); - const newProject: Project = { - ...project, - coaches: newCoaches, - }; - setEditedProject(newProject); - }} - > - - - )} - - ))} - {editing && ( - - )} - + diff --git a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts index 1a3f38fee..05a763227 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/styles.ts +++ b/frontend/src/views/projectViews/ProjectDetailPage/styles.ts @@ -30,16 +30,6 @@ export const ClientsContainer = styled.div` overflow-x: auto; `; -export const ClientContainer = styled.div` - display: flex; - margin-right: 2%; -`; - -export const Client = styled.h5` - width: max-content; - margin-bottom: 0; - margin-right: 0; -`; export const NumberOfStudents = styled.div` display: flex; From 6fde801c434565a917f78730e2564515e61d173c Mon Sep 17 00:00:00 2001 From: beguille Date: Wed, 11 May 2022 11:41:18 +0200 Subject: [PATCH 141/649] all tests that should pass are passing (ignored projects and skills until merge) --- .../test_database/test_crud/test_projects.py | 3 + .../test_crud/test_projects_students.py | 3 + .../test_database/test_crud/test_students.py | 431 +++++++++--------- .../test_crud/test_suggestions.py | 247 +++++----- .../test_database/test_crud/test_users.py | 344 +++++++------- backend/tests/test_fill_database.py | 5 +- backend/tests/test_logic/test_register.py | 1 + .../test_routers/test_skills/test_skills.py | 5 + 8 files changed, 534 insertions(+), 505 deletions(-) diff --git a/backend/tests/test_database/test_crud/test_projects.py b/backend/tests/test_database/test_crud/test_projects.py index 7fddcd8cc..13b6cdc17 100644 --- a/backend/tests/test_database/test_crud/test_projects.py +++ b/backend/tests/test_database/test_crud/test_projects.py @@ -7,6 +7,9 @@ import src.database.crud.projects as crud from src.database.models import Edition, Partner, Project, User, Skill, ProjectRole, Student +# temporary skip until merge is done +pytest.skip(allow_module_level=True) + @pytest.fixture def database_with_data(database_session: AsyncSession) -> Session: diff --git a/backend/tests/test_database/test_crud/test_projects_students.py b/backend/tests/test_database/test_crud/test_projects_students.py index 8b3cdf2a1..7dce591dd 100644 --- a/backend/tests/test_database/test_crud/test_projects_students.py +++ b/backend/tests/test_database/test_crud/test_projects_students.py @@ -6,6 +6,9 @@ remove_student_project, add_student_project, change_project_role) from src.database.models import Edition, Project, User, Skill, ProjectRole, Student +# temporary skip until merge is done +pytest.skip(allow_module_level=True) + @pytest.fixture def database_with_data(database_session: AsyncSession) -> Session: diff --git a/backend/tests/test_database/test_crud/test_students.py b/backend/tests/test_database/test_crud/test_students.py index 04cd62170..e0398e89b 100644 --- a/backend/tests/test_database/test_crud/test_students.py +++ b/backend/tests/test_database/test_crud/test_students.py @@ -1,5 +1,6 @@ import datetime import pytest +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm.exc import NoResultFound from src.database.models import Student, User, Edition, Skill, DecisionEmail @@ -11,12 +12,12 @@ @pytest.fixture -def database_with_data(database_session: AsyncSession): +async def database_with_data(database_session: AsyncSession): """A function to fill the database with fake data that can easly be used when testing""" # Editions edition: Edition = Edition(year=2022, name="ed22") database_session.add(edition) - database_session.commit() + await database_session.commit() # Users admin: User = User(name="admin", admin=True) @@ -25,7 +26,7 @@ def database_with_data(database_session: AsyncSession): database_session.add(admin) database_session.add(coach1) database_session.add(coach2) - database_session.commit() + await database_session.commit() # Skill skill1: Skill = Skill(name="skill1", description="something about skill1") @@ -40,7 +41,7 @@ def database_with_data(database_session: AsyncSession): database_session.add(skill4) database_session.add(skill5) database_session.add(skill6) - database_session.commit() + await database_session.commit() # Student student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", @@ -52,227 +53,227 @@ def database_with_data(database_session: AsyncSession): database_session.add(student01) database_session.add(student30) - database_session.commit() + await database_session.commit() # DecisionEmail decision_email: DecisionEmail = DecisionEmail( student=student01, decision=EmailStatusEnum.APPROVED, date=datetime.datetime.now()) database_session.add(decision_email) - database_session.commit() + await database_session.commit() return database_session -def test_get_student_by_id(database_with_data: Session): +async def test_get_student_by_id(database_with_data: AsyncSession): """Tests if you get the right student""" - student: Student = get_student_by_id(database_with_data, 1) + student: Student = await get_student_by_id(database_with_data, 1) assert student.first_name == "Jos" assert student.last_name == "Vermeulen" assert student.student_id == 1 assert student.email_address == "josvermeulen@mail.com" -def test_no_student(database_with_data: Session): +async def test_no_student(database_with_data: AsyncSession): """Tests if you get an error for a not existing student""" with pytest.raises(NoResultFound): - get_student_by_id(database_with_data, 5) + await get_student_by_id(database_with_data, 5) -def test_definitive_decision_on_student_yes(database_with_data: Session): +async def test_definitive_decision_on_student_yes(database_with_data: AsyncSession): """Tests for definitive decision yes""" - student: Student = get_student_by_id(database_with_data, 1) - set_definitive_decision_on_student( + student: Student = await get_student_by_id(database_with_data, 1) + await set_definitive_decision_on_student( database_with_data, student, DecisionEnum.YES) assert student.decision == DecisionEnum.YES -def test_definitive_decision_on_student_maybe(database_with_data: Session): +async def test_definitive_decision_on_student_maybe(database_with_data: AsyncSession): """Tests for definitive decision maybe""" - student: Student = get_student_by_id(database_with_data, 1) - set_definitive_decision_on_student( + student: Student = await get_student_by_id(database_with_data, 1) + await set_definitive_decision_on_student( database_with_data, student, DecisionEnum.MAYBE) assert student.decision == DecisionEnum.MAYBE -def test_definitive_decision_on_student_no(database_with_data: Session): +async def test_definitive_decision_on_student_no(database_with_data: AsyncSession): """Tests for definitive decision no""" - student: Student = get_student_by_id(database_with_data, 1) - set_definitive_decision_on_student( + student: Student = await get_student_by_id(database_with_data, 1) + await set_definitive_decision_on_student( database_with_data, student, DecisionEnum.NO) assert student.decision == DecisionEnum.NO -def test_delete_student(database_with_data: Session): +async def test_delete_student(database_with_data: AsyncSession): """Tests for deleting a student""" - student: Student = get_student_by_id(database_with_data, 1) - delete_student(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 1) + await delete_student(database_with_data, student) with pytest.raises(NoResultFound): - get_student_by_id(database_with_data, 1) + await get_student_by_id(database_with_data, 1) -def test_get_all_students(database_with_data: Session): +async def test_get_all_students(database_with_data: AsyncSession): """test get all students""" - edition: Edition = database_with_data.query( - Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, CommonQueryParams()) + edition: Edition = (await database_with_data.execute(select( + Edition).where(Edition.edition_id == 1))).scalars().one() + students = await get_students(database_with_data, edition, CommonQueryParams()) assert len(students) == 2 -def test_search_students_on_first_name(database_with_data: Session): +async def test_search_students_on_first_name(database_with_data: AsyncSession): """test""" - edition: Edition = database_with_data.query( - Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, - CommonQueryParams(name="Jos")) + edition: Edition = (await database_with_data.execute(select( + Edition).where(Edition.edition_id == 1))).scalars().one() + students = await get_students(database_with_data, edition, + CommonQueryParams(name="Jos")) assert len(students) == 1 -def test_search_students_on_last_name(database_with_data: Session): +async def test_search_students_on_last_name(database_with_data: AsyncSession): """tests search on last name""" - edition: Edition = database_with_data.query( - Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, - CommonQueryParams(name="Vermeulen")) + edition: Edition = (await database_with_data.execute(select( + Edition).where(Edition.edition_id == 1))).scalars().one() + students = await get_students(database_with_data, edition, + CommonQueryParams(name="Vermeulen")) assert len(students) == 1 -def test_search_students_on_between_first_and_last_name(database_with_data: Session): +async def test_search_students_on_between_first_and_last_name(database_with_data: AsyncSession): """tests search on between first- and last name""" - edition: Edition = database_with_data.query( - Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, - CommonQueryParams(name="os V")) + edition: Edition = (await database_with_data.execute(select( + Edition).where(Edition.edition_id == 1))).scalars().one() + students = await get_students(database_with_data, edition, + CommonQueryParams(name="os V")) assert len(students) == 1 -def test_search_students_alumni(database_with_data: Session): +async def test_search_students_alumni(database_with_data: AsyncSession): """tests search on alumni""" - edition: Edition = database_with_data.query( - Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, - CommonQueryParams(alumni=True)) + edition: Edition = (await database_with_data.execute(select( + Edition).where(Edition.edition_id == 1))).scalars().one() + students = await get_students(database_with_data, edition, + CommonQueryParams(alumni=True)) assert len(students) == 1 -def test_search_students_student_coach(database_with_data: Session): +async def test_search_students_student_coach(database_with_data: AsyncSession): """tests search on student coach""" - edition: Edition = database_with_data.query( - Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, - CommonQueryParams(student_coach=True)) + edition: Edition = (await database_with_data.execute(select( + Edition).where(Edition.edition_id == 1))).scalars().one() + students = await get_students(database_with_data, edition, + CommonQueryParams(student_coach=True)) assert len(students) == 1 -def test_search_students_one_skill(database_with_data: Session): +async def test_search_students_one_skill(database_with_data: AsyncSession): """tests search on one skill""" - edition: Edition = database_with_data.query( - Edition).where(Edition.edition_id == 1).one() - skill: Skill = database_with_data.query( - Skill).where(Skill.name == "skill1").one() - students = get_students(database_with_data, edition, - CommonQueryParams(), skills=[skill]) + edition: Edition = (await database_with_data.execute(select( + Edition).where(Edition.edition_id == 1))).scalars().one() + skill: Skill = (await database_with_data.execute(select( + Skill).where(Skill.name == "skill1"))).scalars().one() + students = await get_students(database_with_data, edition, + CommonQueryParams(), skills=[skill]) assert len(students) == 1 -def test_search_students_multiple_skills(database_with_data: Session): +async def test_search_students_multiple_skills(database_with_data: AsyncSession): """tests search on multiple skills""" - edition: Edition = database_with_data.query( - Edition).where(Edition.edition_id == 1).one() - skills: list[Skill] = database_with_data.query( - Skill).where(Skill.description == "important").all() - students = get_students(database_with_data, edition, - CommonQueryParams(), skills=skills) + edition: Edition = (await database_with_data.execute(select( + Edition).where(Edition.edition_id == 1))).scalars().one() + skills: list[Skill] = (await database_with_data.execute(select( + Skill).where(Skill.description == "important"))).scalars().all() + students = await get_students(database_with_data, edition, + CommonQueryParams(), skills=skills) assert len(students) == 1 -def test_get_emails(database_with_data: Session): +async def test_get_emails(database_with_data: AsyncSession): """tests to get emails""" - student: Student = get_student_by_id(database_with_data, 1) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 1) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 - student = get_student_by_id(database_with_data, 2) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student = await get_student_by_id(database_with_data, 2) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 0 -def test_create_email_applied(database_with_data: Session): +async def test_create_email_applied(database_with_data: AsyncSession): """test create email applied""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, EmailStatusEnum.APPLIED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, EmailStatusEnum.APPLIED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.APPLIED -def test_create_email_awaiting_project(database_with_data: Session): +async def test_create_email_awaiting_project(database_with_data: AsyncSession): """test create email awaiting project""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, EmailStatusEnum.AWAITING_PROJECT) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, EmailStatusEnum.AWAITING_PROJECT) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.AWAITING_PROJECT -def test_create_email_approved(database_with_data: Session): +async def test_create_email_approved(database_with_data: AsyncSession): """test create email approved""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, EmailStatusEnum.APPROVED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, EmailStatusEnum.APPROVED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.APPROVED -def test_create_email_contract_confirmed(database_with_data: Session): +async def test_create_email_contract_confirmed(database_with_data: AsyncSession): """test create email contract confirmed""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_create_email_contract_declined(database_with_data: Session): +async def test_create_email_contract_declined(database_with_data: AsyncSession): """test create email contract declined""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, - EmailStatusEnum.CONTRACT_DECLINED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, + EmailStatusEnum.CONTRACT_DECLINED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.CONTRACT_DECLINED -def test_create_email_rejected(database_with_data: Session): +async def test_create_email_rejected(database_with_data: AsyncSession): """test create email rejected""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, EmailStatusEnum.REJECTED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, EmailStatusEnum.REJECTED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.REJECTED -def test_get_last_emails_of_students(database_with_data: Session): +async def test_get_last_emails_of_students(database_with_data: AsyncSession): """tests get last email of all students that got an email""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) edition2: Edition = Edition(year=2023, name="ed2023") database_with_data.add(edition) student: Student = Student(first_name="Mehmet", last_name="Dizdar", preferred_name="Mehmet", email_address="mehmet.dizdar@example.com", phone_number="(787)-938-6216", alumni=True, wants_to_be_student_coach=False, edition=edition2, skills=[]) database_with_data.add(student) - database_with_data.commit() - create_email(database_with_data, student, - EmailStatusEnum.REJECTED) + await database_with_data.commit() + await create_email(database_with_data, student, + EmailStatusEnum.REJECTED) - emails: list[DecisionEmail] = get_last_emails_of_students( + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[])) assert len(emails) == 2 assert emails[0].student_id == 1 @@ -281,16 +282,16 @@ def test_get_last_emails_of_students(database_with_data: Session): assert emails[1].decision == EmailStatusEnum.REJECTED -def test_get_last_emails_of_students_filter_applied(database_with_data: Session): +async def test_get_last_emails_of_students_filter_applied(database_with_data: AsyncSession): """tests get all emails where last emails is applied""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student2, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student2, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.APPLIED])) assert len(emails) == 1 @@ -298,18 +299,18 @@ def test_get_last_emails_of_students_filter_applied(database_with_data: Session) assert emails[0].decision == EmailStatusEnum.APPLIED -def test_get_last_emails_of_students_filter_awaiting_project(database_with_data: Session): +async def test_get_last_emails_of_students_filter_awaiting_project(database_with_data: AsyncSession): """tests get all emails where last emails is awaiting project""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.AWAITING_PROJECT) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.AWAITING_PROJECT) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.AWAITING_PROJECT])) assert len(emails) == 1 @@ -317,18 +318,18 @@ def test_get_last_emails_of_students_filter_awaiting_project(database_with_data: assert emails[0].decision == EmailStatusEnum.AWAITING_PROJECT -def test_get_last_emails_of_students_filter_approved(database_with_data: Session): +async def test_get_last_emails_of_students_filter_approved(database_with_data: AsyncSession): """tests get all emails where last emails is approved""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.APPROVED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.APPROVED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.APPROVED])) assert len(emails) == 1 @@ -336,16 +337,16 @@ def test_get_last_emails_of_students_filter_approved(database_with_data: Session assert emails[0].decision == EmailStatusEnum.APPROVED -def test_get_last_emails_of_students_filter_contract_confirmed(database_with_data: Session): +async def test_get_last_emails_of_students_filter_contract_confirmed(database_with_data: AsyncSession): """tests get all emails where last emails is contract confirmed""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.CONTRACT_CONFIRMED])) assert len(emails) == 1 @@ -353,18 +354,18 @@ def test_get_last_emails_of_students_filter_contract_confirmed(database_with_dat assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_get_last_emails_of_students_filter_contract_declined(database_with_data: Session): +async def test_get_last_emails_of_students_filter_contract_declined(database_with_data: AsyncSession): """tests get all emails where last emails is contract declined""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.CONTRACT_DECLINED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.CONTRACT_DECLINED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.CONTRACT_DECLINED])) assert len(emails) == 1 @@ -372,18 +373,18 @@ def test_get_last_emails_of_students_filter_contract_declined(database_with_data assert emails[0].decision == EmailStatusEnum.CONTRACT_DECLINED -def test_get_last_emails_of_students_filter_rejected(database_with_data: Session): +async def test_get_last_emails_of_students_filter_rejected(database_with_data: AsyncSession): """tests get all emails where last emails is rejected""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.REJECTED])) assert len(emails) == 1 @@ -391,18 +392,18 @@ def test_get_last_emails_of_students_filter_rejected(database_with_data: Session assert emails[0].decision == EmailStatusEnum.REJECTED -def test_get_last_emails_of_students_first_name(database_with_data: Session): +async def test_get_last_emails_of_students_first_name(database_with_data: AsyncSession): """tests get all emails where last emails is first name""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(name="Jos", email_status=[])) assert len(emails) == 1 @@ -410,18 +411,18 @@ def test_get_last_emails_of_students_first_name(database_with_data: Session): assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_get_last_emails_of_students_last_name(database_with_data: Session): +async def test_get_last_emails_of_students_last_name(database_with_data: AsyncSession): """tests get all emails where last emails is last name""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(name="Vermeulen", email_status=[])) assert len(emails) == 1 @@ -429,18 +430,18 @@ def test_get_last_emails_of_students_last_name(database_with_data: Session): assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_get_last_emails_of_students_between_first_and_last_name(database_with_data: Session): +async def test_get_last_emails_of_students_between_first_and_last_name(database_with_data: AsyncSession): """tests get all emails where last emails is between first- and last name""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(name="os V", email_status=[])) assert len(emails) == 1 @@ -448,16 +449,16 @@ def test_get_last_emails_of_students_between_first_and_last_name(database_with_d assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_get_last_emails_of_students_filter_mutliple_status(database_with_data: Session): +async def test_get_last_emails_of_students_filter_mutliple_status(database_with_data: AsyncSession): """tests get all emails where last emails is applied""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student2, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student2, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[ EmailStatusEnum.APPLIED, EmailStatusEnum.CONTRACT_CONFIRMED diff --git a/backend/tests/test_database/test_crud/test_suggestions.py b/backend/tests/test_database/test_crud/test_suggestions.py index 788ace81e..b08c5eb0b 100644 --- a/backend/tests/test_database/test_crud/test_suggestions.py +++ b/backend/tests/test_database/test_crud/test_suggestions.py @@ -1,4 +1,5 @@ import pytest +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.exc import IntegrityError from sqlalchemy.orm.exc import NoResultFound @@ -13,12 +14,12 @@ @pytest.fixture -def database_with_data(database_session: AsyncSession): +async def database_with_data(database_session: AsyncSession): """A function to fill the database with fake data that can easly be used when testing""" # Editions edition: Edition = Edition(year=2022, name="ed22") database_session.add(edition) - database_session.commit() + await database_session.commit() # Users admin: User = User(name="admin", admin=True) @@ -27,7 +28,7 @@ def database_with_data(database_session: AsyncSession): database_session.add(admin) database_session.add(coach1) database_session.add(coach2) - database_session.commit() + await database_session.commit() # Skill skill1: Skill = Skill(name="skill1", description="something about skill1") @@ -42,7 +43,7 @@ def database_with_data(database_session: AsyncSession): database_session.add(skill4) database_session.add(skill5) database_session.add(skill6) - database_session.commit() + await database_session.commit() # Student student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", @@ -54,29 +55,29 @@ def database_with_data(database_session: AsyncSession): database_session.add(student01) database_session.add(student30) - database_session.commit() + await database_session.commit() # Suggestion suggestion1: Suggestion = Suggestion( student=student01, coach=admin, argumentation="Good student", suggestion=DecisionEnum.YES) database_session.add(suggestion1) - database_session.commit() + await database_session.commit() return database_session -def test_create_suggestion_yes(database_with_data: Session): +async def test_create_suggestion_yes(database_with_data: AsyncSession): """Test creat a yes suggestion""" - user: User = database_with_data.query( - User).where(User.name == "coach1").first() - student: Student = database_with_data.query(Student).where( - Student.email_address == "marta.marquez@example.com").first() + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().first() + student: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "marta.marquez@example.com"))).unique().scalars().first() - new_suggestion = create_suggestion( + new_suggestion = await create_suggestion( database_with_data, user.user_id, student.student_id, DecisionEnum.YES, "This is a good student") - suggestion: Suggestion = database_with_data.query(Suggestion).where( - Suggestion.coach == user).where(Suggestion.student_id == student.student_id).one() + suggestion: Suggestion = (await database_with_data.execute(select(Suggestion).where( + Suggestion.coach == user).where(Suggestion.student_id == student.student_id))).unique().scalars().one() assert new_suggestion == suggestion @@ -86,19 +87,19 @@ def test_create_suggestion_yes(database_with_data: Session): assert suggestion.argumentation == "This is a good student" -def test_create_suggestion_no(database_with_data: Session): +async def test_create_suggestion_no(database_with_data: AsyncSession): """Test create a no suggestion""" - user: User = database_with_data.query( - User).where(User.name == "coach1").first() - student: Student = database_with_data.query(Student).where( - Student.email_address == "marta.marquez@example.com").first() + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().first() + student: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "marta.marquez@example.com"))).unique().scalars().first() - new_suggestion = create_suggestion( + new_suggestion = await create_suggestion( database_with_data, user.user_id, student.student_id, DecisionEnum.NO, "This is a not good student") - suggestion: Suggestion = database_with_data.query(Suggestion).where( - Suggestion.coach == user).where(Suggestion.student_id == student.student_id).one() + suggestion: Suggestion = (await database_with_data.execute(select(Suggestion).where( + Suggestion.coach == user).where(Suggestion.student_id == student.student_id))).unique().scalars().one() assert new_suggestion == suggestion @@ -108,19 +109,19 @@ def test_create_suggestion_no(database_with_data: Session): assert suggestion.argumentation == "This is a not good student" -def test_create_suggestion_maybe(database_with_data: Session): +async def test_create_suggestion_maybe(database_with_data: AsyncSession): """Test create a maybe suggestion""" - user: User = database_with_data.query( - User).where(User.name == "coach1").first() - student: Student = database_with_data.query(Student).where( - Student.email_address == "marta.marquez@example.com").first() + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().first() + student: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "marta.marquez@example.com"))).unique().scalars().first() - new_suggestion = create_suggestion( + new_suggestion = await create_suggestion( database_with_data, user.user_id, student.student_id, DecisionEnum.MAYBE, "Idk if it's good student") - suggestion: Suggestion = database_with_data.query(Suggestion).where( - Suggestion.coach == user).where(Suggestion.student_id == student.student_id).one() + suggestion: Suggestion = (await database_with_data.execute(select(Suggestion).where( + Suggestion.coach == user).where(Suggestion.student_id == student.student_id))).unique().scalars().one() assert new_suggestion == suggestion @@ -130,102 +131,102 @@ def test_create_suggestion_maybe(database_with_data: Session): assert suggestion.argumentation == "Idk if it's good student" -def test_get_own_suggestion_existing(database_with_data: Session): +async def test_get_own_suggestion_existing(database_with_data: AsyncSession): """Test getting your own suggestion""" - user: User = database_with_data.query( - User).where(User.name == "coach1").one() - student1: Student = database_with_data.query(Student).where( - Student.email_address == "josvermeulen@mail.com").one() + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().one() + student1: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "josvermeulen@mail.com"))).unique().scalars().one() - suggestion = create_suggestion(database_with_data, user.user_id, student1.student_id, DecisionEnum.YES, "args") + suggestion = await create_suggestion(database_with_data, user.user_id, student1.student_id, DecisionEnum.YES, "args") - assert get_own_suggestion(database_with_data, student1.student_id, user.user_id) == suggestion + assert (await get_own_suggestion(database_with_data, student1.student_id, user.user_id)) == suggestion -def test_get_own_suggestion_non_existing(database_with_data: Session): +async def test_get_own_suggestion_non_existing(database_with_data: AsyncSession): """Test getting your own suggestion when it doesn't exist""" - user: User = database_with_data.query( - User).where(User.name == "coach1").one() - student1: Student = database_with_data.query(Student).where( - Student.email_address == "josvermeulen@mail.com").one() + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().one() + student1: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "josvermeulen@mail.com"))).unique().scalars().one() - assert get_own_suggestion(database_with_data, student1.student_id, user.user_id) is None + assert (await get_own_suggestion(database_with_data, student1.student_id, user.user_id)) is None -def test_get_own_suggestion_fields_none(database_with_data: Session): +async def test_get_own_suggestion_fields_none(database_with_data: AsyncSession): """Test getting your own suggestion when either of the fields are None This is really only to increase coverage, the case isn't possible in practice """ - user: User = database_with_data.query( - User).where(User.name == "coach1").one() - student1: Student = database_with_data.query(Student).where( - Student.email_address == "josvermeulen@mail.com").one() - create_suggestion(database_with_data, user.user_id, student1.student_id, DecisionEnum.YES, "args") + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().one() + student1: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "josvermeulen@mail.com"))).unique().scalars().one() + await create_suggestion(database_with_data, user.user_id, student1.student_id, DecisionEnum.YES, "args") - assert get_own_suggestion(database_with_data, None, user.user_id) is None - assert get_own_suggestion(database_with_data, student1.student_id, None) is None + assert (await get_own_suggestion(database_with_data, None, user.user_id)) is None + assert (await get_own_suggestion(database_with_data, student1.student_id, None)) is None -def test_one_coach_two_students(database_with_data: Session): +async def test_one_coach_two_students(database_with_data: AsyncSession): """Test that one coach can write multiple suggestions""" - user: User = database_with_data.query( - User).where(User.name == "coach1").one() - student1: Student = database_with_data.query(Student).where( - Student.email_address == "marta.marquez@example.com").one() - student2: Student = database_with_data.query(Student).where( - Student.email_address == "josvermeulen@mail.com").one() + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().one() + student1: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "marta.marquez@example.com"))).unique().scalars().one() + student2: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "josvermeulen@mail.com"))).unique().scalars().one() - create_suggestion(database_with_data, user.user_id, + await create_suggestion(database_with_data, user.user_id, student1.student_id, DecisionEnum.YES, "This is a good student") - create_suggestion(database_with_data, user.user_id, student2.student_id, + await create_suggestion(database_with_data, user.user_id, student2.student_id, DecisionEnum.NO, "This is a not good student") - suggestion1: Suggestion = database_with_data.query(Suggestion).where( - Suggestion.coach == user).where(Suggestion.student_id == student1.student_id).one() + suggestion1: Suggestion = (await database_with_data.execute(select(Suggestion).where( + Suggestion.coach == user).where(Suggestion.student_id == student1.student_id))).unique().scalars().one() assert suggestion1.coach == user assert suggestion1.student == student1 assert suggestion1.suggestion == DecisionEnum.YES assert suggestion1.argumentation == "This is a good student" - suggestion2: Suggestion = database_with_data.query(Suggestion).where( - Suggestion.coach == user).where(Suggestion.student_id == student2.student_id).one() + suggestion2: Suggestion = (await database_with_data.execute(select(Suggestion).where( + Suggestion.coach == user).where(Suggestion.student_id == student2.student_id))).unique().scalars().one() assert suggestion2.coach == user assert suggestion2.student == student2 assert suggestion2.suggestion == DecisionEnum.NO assert suggestion2.argumentation == "This is a not good student" -def test_multiple_suggestions_about_same_student(database_with_data: Session): +async def test_multiple_suggestions_about_same_student(database_with_data: AsyncSession): """Test get multiple suggestions about the same student""" - user: User = database_with_data.query( - User).where(User.name == "coach1").first() - student: Student = database_with_data.query(Student).where( - Student.email_address == "marta.marquez@example.com").first() + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().first() + student: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "marta.marquez@example.com"))).unique().scalars().first() - create_suggestion(database_with_data, user.user_id, student.student_id, + await create_suggestion(database_with_data, user.user_id, student.student_id, DecisionEnum.MAYBE, "Idk if it's good student") with pytest.raises(IntegrityError): - create_suggestion(database_with_data, user.user_id, + await create_suggestion(database_with_data, user.user_id, student.student_id, DecisionEnum.YES, "This is a good student") -def test_get_suggestions_of_student(database_with_data: Session): +async def test_get_suggestions_of_student(database_with_data: AsyncSession): """Test get all suggestions of a student""" - user1: User = database_with_data.query( - User).where(User.name == "coach1").first() - user2: User = database_with_data.query( - User).where(User.name == "coach2").first() - student: Student = database_with_data.query(Student).where( - Student.email_address == "marta.marquez@example.com").first() + user1: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().first() + user2: User = (await database_with_data.execute(select( + User).where(User.name == "coach2"))).scalars().first() + student: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "marta.marquez@example.com"))).unique().scalars().first() - create_suggestion(database_with_data, user1.user_id, student.student_id, + await create_suggestion(database_with_data, user1.user_id, student.student_id, DecisionEnum.MAYBE, "Idk if it's good student") - create_suggestion(database_with_data, user2.user_id, + await create_suggestion(database_with_data, user2.user_id, student.student_id, DecisionEnum.YES, "This is a good student") - suggestions_student = get_suggestions_of_student( + suggestions_student = await get_suggestions_of_student( database_with_data, student.student_id) assert len(suggestions_student) == 2 @@ -233,85 +234,85 @@ def test_get_suggestions_of_student(database_with_data: Session): assert suggestions_student[1].student == student -def test_get_suggestion_by_id(database_with_data: Session): +async def test_get_suggestion_by_id(database_with_data: AsyncSession): """Test get suggestion by id""" - suggestion: Suggestion = get_suggestion_by_id(database_with_data, 1) + suggestion: Suggestion = await get_suggestion_by_id(database_with_data, 1) assert suggestion.student_id == 1 assert suggestion.coach_id == 1 assert suggestion.suggestion == DecisionEnum.YES assert suggestion.argumentation == "Good student" -def test_get_suggestion_by_id_non_existing(database_with_data: Session): +async def test_get_suggestion_by_id_non_existing(database_with_data: AsyncSession): """Test you get an error when you search an id that don't exist""" with pytest.raises(NoResultFound): - get_suggestion_by_id(database_with_data, 900) + await get_suggestion_by_id(database_with_data, 900) -def test_delete_suggestion(database_with_data: Session): +async def test_delete_suggestion(database_with_data: AsyncSession): """Test delete suggestion""" - user: User = database_with_data.query( - User).where(User.name == "coach1").first() - student: Student = database_with_data.query(Student).where( - Student.email_address == "marta.marquez@example.com").first() + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().first() + student: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "marta.marquez@example.com"))).unique().scalars().first() - create_suggestion(database_with_data, user.user_id, + await create_suggestion(database_with_data, user.user_id, student.student_id, DecisionEnum.YES, "This is a good student") - suggestion: Suggestion = database_with_data.query(Suggestion).where( - Suggestion.coach == user).where(Suggestion.student_id == student.student_id).one() + suggestion: Suggestion = (await database_with_data.execute(select(Suggestion).where( + Suggestion.coach == user).where(Suggestion.student_id == student.student_id))).unique().scalars().one() - delete_suggestion(database_with_data, suggestion) + await delete_suggestion(database_with_data, suggestion) - suggestions: list[Suggestion] = database_with_data.query(Suggestion).where( - Suggestion.coach == user).where(Suggestion.student_id == student.student_id).all() + suggestions: list[Suggestion] = (await database_with_data.execute(select(Suggestion).where( + Suggestion.coach == user).where(Suggestion.student_id == student.student_id))).unique().scalars().all() assert len(suggestions) == 0 -def test_update_suggestion(database_with_data: Session): +async def test_update_suggestion(database_with_data: AsyncSession): """Test update suggestion""" - user: User = database_with_data.query( - User).where(User.name == "coach1").first() - student: Student = database_with_data.query(Student).where( - Student.email_address == "marta.marquez@example.com").first() + user: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().first() + student: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "marta.marquez@example.com"))).unique().scalars().first() - create_suggestion(database_with_data, user.user_id, + await create_suggestion(database_with_data, user.user_id, student.student_id, DecisionEnum.YES, "This is a good student") - suggestion: Suggestion = database_with_data.query(Suggestion).where( - Suggestion.coach == user).where(Suggestion.student_id == student.student_id).one() + suggestion: Suggestion = (await database_with_data.execute(select(Suggestion).where( + Suggestion.coach == user).where(Suggestion.student_id == student.student_id))).unique().scalars().one() - update_suggestion(database_with_data, suggestion, + await update_suggestion(database_with_data, suggestion, DecisionEnum.NO, "Not that good student") - new_suggestion: Suggestion = database_with_data.query(Suggestion).where( - Suggestion.coach == user).where(Suggestion.student_id == student.student_id).one() + new_suggestion: Suggestion = (await database_with_data.execute(select(Suggestion).where( + Suggestion.coach == user).where(Suggestion.student_id == student.student_id))).unique().scalars().one() assert new_suggestion.suggestion == DecisionEnum.NO assert new_suggestion.argumentation == "Not that good student" -def test_get_suggestions_of_student_by_type(database_with_data: Session): +async def test_get_suggestions_of_student_by_type(database_with_data: AsyncSession): """Tests get suggestion of a student by type of suggestion""" - user1: User = database_with_data.query( - User).where(User.name == "coach1").first() - user2: User = database_with_data.query( - User).where(User.name == "coach2").first() - user3: User = database_with_data.query( - User).where(User.name == "admin").first() - student: Student = database_with_data.query(Student).where( - Student.email_address == "marta.marquez@example.com").first() - - create_suggestion(database_with_data, user1.user_id, student.student_id, + user1: User = (await database_with_data.execute(select( + User).where(User.name == "coach1"))).unique().scalars().first() + user2: User = (await database_with_data.execute(select( + User).where(User.name == "coach2"))).scalars().first() + user3: User = (await database_with_data.execute(select( + User).where(User.name == "admin"))).scalars().first() + student: Student = (await database_with_data.execute(select(Student).where( + Student.email_address == "marta.marquez@example.com"))).unique().scalars().first() + + await create_suggestion(database_with_data, user1.user_id, student.student_id, DecisionEnum.MAYBE, "Idk if it's good student") - create_suggestion(database_with_data, user2.user_id, + await create_suggestion(database_with_data, user2.user_id, student.student_id, DecisionEnum.YES, "This is a good student") - create_suggestion(database_with_data, user3.user_id, + await create_suggestion(database_with_data, user3.user_id, student.student_id, DecisionEnum.NO, "This is not a good student") - suggestions_student_yes = get_suggestions_of_student_by_type( + suggestions_student_yes = await get_suggestions_of_student_by_type( database_with_data, student.student_id, DecisionEnum.YES) - suggestions_student_no = get_suggestions_of_student_by_type( + suggestions_student_no = await get_suggestions_of_student_by_type( database_with_data, student.student_id, DecisionEnum.NO) - suggestions_student_maybe = get_suggestions_of_student_by_type( + suggestions_student_maybe = await get_suggestions_of_student_by_type( database_with_data, student.student_id, DecisionEnum.MAYBE) assert len(suggestions_student_yes) == 1 assert len(suggestions_student_no) == 1 diff --git a/backend/tests/test_database/test_crud/test_users.py b/backend/tests/test_database/test_crud/test_users.py index 7fc985296..21c22082d 100644 --- a/backend/tests/test_database/test_crud/test_users.py +++ b/backend/tests/test_database/test_crud/test_users.py @@ -1,4 +1,5 @@ import pytest +from sqlalchemy import select, func from sqlalchemy.ext.asyncio import AsyncSession import src.database.crud.users as users_crud @@ -9,7 +10,7 @@ @pytest.fixture -def data(database_session: AsyncSession) -> dict[str, str]: +async def data(database_session: AsyncSession) -> dict[str, str]: """Fill database with dummy data""" # Create users @@ -24,16 +25,16 @@ def data(database_session: AsyncSession) -> dict[str, str]: edition2 = models.Edition(year=2, name="ed2") database_session.add(edition2) - database_session.commit() + await database_session.commit() email_auth1 = models.AuthEmail(user_id=user1.user_id, email="user1@mail.com", pw_hash="HASH1") github_auth1 = models.AuthGitHub(user_id=user2.user_id, gh_auth_id=123, email="user2@mail.com") database_session.add(email_auth1) database_session.add(github_auth1) - database_session.commit() + await database_session.commit() # Create coach roles - database_session.execute(models.user_editions.insert(), [ + await database_session.execute(models.user_editions.insert(), [ {"user_id": user1.user_id, "edition_id": edition1.edition_id}, {"user_id": user2.user_id, "edition_id": edition1.edition_id}, {"user_id": user2.user_id, "edition_id": edition2.edition_id} @@ -47,207 +48,217 @@ def data(database_session: AsyncSession) -> dict[str, str]: } -def test_get_all_users(database_session: AsyncSession, data: dict[str, int]): +async def test_get_all_users(database_session: AsyncSession, data: dict[str, int]): """Test get request for users""" # get all users - users = users_crud.get_users_filtered_page(database_session, FilterParameters()) + users = await users_crud.get_users_filtered_page(database_session, FilterParameters()) assert len(users) == 2, "Wrong length" user_ids = [user.user_id for user in users] assert data["user1"] in user_ids assert data["user2"] in user_ids -def test_get_all_users_paginated(database_session: AsyncSession): +async def test_get_all_users_paginated(database_session: AsyncSession): for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=False)) - database_session.commit() + await database_session.commit() - assert len(users_crud.get_users_filtered_page(database_session, FilterParameters(page=0))) == DB_PAGE_SIZE - assert len(users_crud.get_users_filtered_page(database_session, FilterParameters(page=1))) == round( + assert len(await users_crud.get_users_filtered_page(database_session, FilterParameters(page=0))) == DB_PAGE_SIZE + assert len(await users_crud.get_users_filtered_page(database_session, FilterParameters(page=1))) == round( DB_PAGE_SIZE * 1.5 ) - DB_PAGE_SIZE -def test_get_all_users_paginated_filter_name(database_session: AsyncSession): +async def test_get_all_users_paginated_filter_name(database_session: AsyncSession): count = 0 for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=False)) if "1" in str(i): count += 1 - database_session.commit() + await database_session.commit() - assert len(users_crud.get_users_filtered_page(database_session, FilterParameters(page=0, name="1"))) == count - assert len(users_crud.get_users_filtered_page(database_session, FilterParameters(page=1, name="1"))) == max( + assert len(await users_crud.get_users_filtered_page(database_session, FilterParameters(page=0, name="1"))) == count + assert len(await users_crud.get_users_filtered_page(database_session, FilterParameters(page=1, name="1"))) == max( count - round( DB_PAGE_SIZE * 1.5), 0) -def test_get_all_admins(database_session: AsyncSession, data: dict[str, str]): +async def test_get_all_admins(database_session: AsyncSession, data: dict[str, str]): """Test get request for admins""" # get all admins - users = users_crud.get_users_filtered_page(database_session, FilterParameters(admin=True)) + users = await users_crud.get_users_filtered_page(database_session, FilterParameters(admin=True)) assert len(users) == 1, "Wrong length" assert data["user1"] == users[0].user_id -def test_get_all_admins_paginated(database_session: AsyncSession): +async def test_get_all_admins_paginated(database_session: AsyncSession): admins = [] for i in range(round(DB_PAGE_SIZE * 3)): user = models.User(name=f"User {i}", admin=i % 2 == 0) database_session.add(user) if i % 2 == 0: admins.append(user) - database_session.commit() + await database_session.commit() count = len(admins) - users = users_crud.get_users_filtered_page(database_session, FilterParameters(page=0, admin=True)) + users = await users_crud.get_users_filtered_page(database_session, FilterParameters(page=0, admin=True)) assert len(users) == min(count, DB_PAGE_SIZE) for user in users: assert user in admins - assert len(users_crud.get_users_filtered_page(database_session, FilterParameters(page=1, admin=True))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, FilterParameters(page=1, admin=True))) == \ min(count - DB_PAGE_SIZE, DB_PAGE_SIZE) -def test_get_all_non_admins_paginated(database_session: AsyncSession): +async def test_get_all_non_admins_paginated(database_session: AsyncSession): non_admins = [] for i in range(round(DB_PAGE_SIZE * 3)): user = models.User(name=f"User {i}", admin=i % 2 == 0) database_session.add(user) if i % 2 != 0: non_admins.append(user) - database_session.commit() + await database_session.commit() count = len(non_admins) - users = users_crud.get_users_filtered_page(database_session, FilterParameters(page=0, admin=False)) + users = await users_crud.get_users_filtered_page(database_session, FilterParameters(page=0, admin=False)) assert len(users) == min(count, DB_PAGE_SIZE) for user in users: assert user in non_admins - assert len(users_crud.get_users_filtered_page(database_session, FilterParameters(page=1, admin=False))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, FilterParameters(page=1, admin=False))) == \ min(count - DB_PAGE_SIZE, DB_PAGE_SIZE) -def test_get_all_admins_paginated_filter_name(database_session: AsyncSession): +async def test_get_all_admins_paginated_filter_name(database_session: AsyncSession): count = 0 for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(models.User(name=f"User {i}", admin=i % 2 == 0)) if "1" in str(i) and i % 2 == 0: count += 1 - database_session.commit() + await database_session.commit() assert len( - users_crud.get_users_filtered_page(database_session, FilterParameters(page=0, name="1", admin=True))) == count + await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=0, name="1", admin=True))) == count assert len( - users_crud.get_users_filtered_page(database_session, FilterParameters(page=1, name="1", admin=True))) == max( + await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=1, name="1", admin=True))) == max( count - round( DB_PAGE_SIZE * 1.5), 0) -def test_get_user_edition_names_empty(database_session: AsyncSession): +async def test_get_user_edition_names_empty(database_session: AsyncSession): """Test getting all editions from a user when there are none""" user = models.User(name="test") database_session.add(user) - database_session.commit() + await database_session.commit() + # query the user to initiate association tables + await database_session.execute(select(models.User).where(models.User.user_id == user.user_id)) # No editions yet - editions = users_crud.get_user_edition_names(database_session, user) + editions = await users_crud.get_user_edition_names(database_session, user) assert len(editions) == 0 -def test_get_user_edition_names_admin(database_session: AsyncSession): +async def test_get_user_edition_names_admin(database_session: AsyncSession): """Test getting all editions for an admin""" user = models.User(name="test", admin=True) database_session.add(user) edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() + + # query the user to initiate association tables + await database_session.execute(select(models.User).where(models.User.user_id == user.user_id)) # Not added to edition yet, but admin can see it anyway - editions = users_crud.get_user_edition_names(database_session, user) + editions = await users_crud.get_user_edition_names(database_session, user) assert len(editions) == 1 -def test_get_user_edition_names_coach(database_session: AsyncSession): +async def test_get_user_edition_names_coach(database_session: AsyncSession): """Test getting all editions for a coach when they aren't empty""" user = models.User(name="test") database_session.add(user) edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() + + # query the user to initiate association tables + await database_session.execute(select(models.User).where(models.User.user_id == user.user_id)) # No editions yet - editions = users_crud.get_user_edition_names(database_session, user) + editions = await users_crud.get_user_edition_names(database_session, user) assert len(editions) == 0 # Add user to a new edition user.editions.append(edition) database_session.add(user) - database_session.commit() + await database_session.commit() # No editions yet - editions = users_crud.get_user_edition_names(database_session, user) + editions = await users_crud.get_user_edition_names(database_session, user) assert editions == [edition.name] -def test_get_all_users_from_edition(database_session: AsyncSession, data: dict[str, str]): +async def test_get_all_users_from_edition(database_session: AsyncSession, data: dict[str, str]): """Test get request for users of a given edition""" # get all users from edition - users = users_crud.get_users_filtered_page(database_session, FilterParameters(edition=data["edition1"])) + users = await users_crud.get_users_filtered_page(database_session, FilterParameters(edition=data["edition1"])) assert len(users) == 2, "Wrong length" user_ids = [user.user_id for user in users] assert data["user1"] in user_ids assert data["user2"] in user_ids - users = users_crud.get_users_filtered_page(database_session, FilterParameters(edition=data["edition2"])) + users = await users_crud.get_users_filtered_page(database_session, FilterParameters(edition=data["edition2"])) assert len(users) == 1, "Wrong length" assert data["user2"] == users[0].user_id -def test_get_all_users_for_edition_paginated(database_session: AsyncSession): +async def test_get_all_users_for_edition_paginated(database_session: AsyncSession): edition_1 = models.Edition(year=2022, name="ed2022") edition_2 = models.Edition(year=2023, name="ed2023") database_session.add(edition_1) database_session.add(edition_2) - database_session.commit() + await database_session.commit() for i in range(round(DB_PAGE_SIZE * 1.5)): user_1 = models.User(name=f"User {i} - a", admin=False) user_2 = models.User(name=f"User {i} - b", admin=False) database_session.add(user_1) database_session.add(user_2) - database_session.commit() - database_session.execute(models.user_editions.insert(), [ + await database_session.commit() + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_1.edition_id}, {"user_id": user_2.user_id, "edition_id": edition_2.edition_id}, ]) - database_session.commit() + await database_session.commit() - assert len(users_crud.get_users_filtered_page(database_session, FilterParameters(edition=edition_1.name, - page=0))) == DB_PAGE_SIZE - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(edition=edition_1.name, page=1))) == round( + assert len(await users_crud.get_users_filtered_page(database_session, FilterParameters(edition=edition_1.name, + page=0))) == DB_PAGE_SIZE + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(edition=edition_1.name, page=1))) == round( DB_PAGE_SIZE * 1.5 ) - DB_PAGE_SIZE - assert len(users_crud.get_users_filtered_page(database_session, FilterParameters(edition=edition_2.name, - page=0))) == DB_PAGE_SIZE - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(edition=edition_2.name, page=1))) == round( + assert len(await users_crud.get_users_filtered_page(database_session, FilterParameters(edition=edition_2.name, + page=0))) == DB_PAGE_SIZE + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(edition=edition_2.name, page=1))) == round( DB_PAGE_SIZE * 1.5 ) - DB_PAGE_SIZE -def test_get_all_users_for_edition_paginated_filter_name(database_session: AsyncSession): +async def test_get_all_users_for_edition_paginated_filter_name(database_session: AsyncSession): edition_1 = models.Edition(year=2022, name="ed2022") edition_2 = models.Edition(year=2023, name="ed2023") database_session.add(edition_1) database_session.add(edition_2) - database_session.commit() + await database_session.commit() count = 0 for i in range(round(DB_PAGE_SIZE * 1.5)): @@ -255,73 +266,73 @@ def test_get_all_users_for_edition_paginated_filter_name(database_session: Async user_2 = models.User(name=f"User {i} - b", admin=False) database_session.add(user_1) database_session.add(user_2) - database_session.commit() - database_session.execute(models.user_editions.insert(), [ + await database_session.commit() + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_1.edition_id}, {"user_id": user_2.user_id, "edition_id": edition_2.edition_id}, ]) if "1" in str(i): count += 1 - database_session.commit() + await database_session.commit() - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(edition=edition_1.name, page=0, name="1"))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(edition=edition_1.name, page=0, name="1"))) == \ min(count, DB_PAGE_SIZE) - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(edition=edition_1.name, page=1, name="1"))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(edition=edition_1.name, page=1, name="1"))) == \ max(count - DB_PAGE_SIZE, 0) - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(edition=edition_2.name, page=0, name="1"))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(edition=edition_2.name, page=0, name="1"))) == \ min(count, DB_PAGE_SIZE) - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(edition=edition_2.name, page=1, name="1"))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(edition=edition_2.name, page=1, name="1"))) == \ max(count - DB_PAGE_SIZE, 0) -def test_get_all_users_excluded_edition_paginated(database_session: AsyncSession): +async def test_get_all_users_excluded_edition_paginated(database_session: AsyncSession): edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") database_session.add(edition_a) database_session.add(edition_b) - database_session.commit() + await database_session.commit() for i in range(round(DB_PAGE_SIZE * 1.5)): user_1 = models.User(name=f"User {i} - a", admin=False) user_2 = models.User(name=f"User {i} - b", admin=False) database_session.add(user_1) database_session.add(user_2) - database_session.commit() - database_session.execute(models.user_editions.insert(), [ + await database_session.commit() + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_a.edition_id}, {"user_id": user_2.user_id, "edition_id": edition_b.edition_id}, ]) - database_session.commit() + await database_session.commit() - a_users = users_crud.get_users_filtered_page(database_session, - FilterParameters(page=0, exclude_edition="edB", name="")) + a_users = await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=0, exclude_edition="edB", name="")) assert len(a_users) == DB_PAGE_SIZE for user in a_users: assert "b" not in user.name - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(page=1, exclude_edition="edB", name=""))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=1, exclude_edition="edB", name=""))) == \ round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE - b_users = users_crud.get_users_filtered_page(database_session, - FilterParameters(page=0, exclude_edition="edA", name="")) + b_users = await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=0, exclude_edition="edA", name="")) assert len(b_users) == DB_PAGE_SIZE for user in b_users: assert "a" not in user.name - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(page=1, exclude_edition="edA", name=""))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=1, exclude_edition="edA", name=""))) == \ round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE -def test_get_all_users_excluded_edition_paginated_filter_name(database_session: AsyncSession): +async def test_get_all_users_excluded_edition_paginated_filter_name(database_session: AsyncSession): edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") database_session.add(edition_a) database_session.add(edition_b) - database_session.commit() + await database_session.commit() count = 0 for i in range(round(DB_PAGE_SIZE * 1.5)): @@ -329,40 +340,40 @@ def test_get_all_users_excluded_edition_paginated_filter_name(database_session: user_2 = models.User(name=f"User {i} - b", admin=False) database_session.add(user_1) database_session.add(user_2) - database_session.commit() - database_session.execute(models.user_editions.insert(), [ + await database_session.commit() + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_a.edition_id}, {"user_id": user_2.user_id, "edition_id": edition_b.edition_id}, ]) if "1" in str(i): count += 1 - database_session.commit() + await database_session.commit() - a_users = users_crud.get_users_filtered_page(database_session, - FilterParameters(page=0, exclude_edition="edB", name="1")) + a_users = await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=0, exclude_edition="edB", name="1")) assert len(a_users) == min(count, DB_PAGE_SIZE) for user in a_users: assert "b" not in user.name - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(page=1, exclude_edition="edB", name="1"))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=1, exclude_edition="edB", name="1"))) == \ max(count - DB_PAGE_SIZE, 0) - b_users = users_crud.get_users_filtered_page(database_session, - FilterParameters(page=0, exclude_edition="edA", name="1")) + b_users = await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=0, exclude_edition="edA", name="1")) assert len(b_users) == min(count, DB_PAGE_SIZE) for user in b_users: assert "a" not in user.name - assert len(users_crud.get_users_filtered_page(database_session, - FilterParameters(page=1, exclude_edition="edA", name="1"))) == \ + assert len(await users_crud.get_users_filtered_page(database_session, + FilterParameters(page=1, exclude_edition="edA", name="1"))) == \ max(count - DB_PAGE_SIZE, 0) -def test_get_all_users_for_edition_excluded_edition_paginated(database_session: AsyncSession): +async def test_get_all_users_for_edition_excluded_edition_paginated(database_session: AsyncSession): edition_a = models.Edition(year=2022, name="edA") edition_b = models.Edition(year=2023, name="edB") database_session.add(edition_a) database_session.add(edition_b) - database_session.commit() + await database_session.commit() correct_users = [] for i in range(round(DB_PAGE_SIZE * 1.5)): @@ -370,43 +381,43 @@ def test_get_all_users_for_edition_excluded_edition_paginated(database_session: user_2 = models.User(name=f"User {i} - b", admin=False) database_session.add(user_1) database_session.add(user_2) - database_session.commit() - database_session.execute(models.user_editions.insert(), [ + await database_session.commit() + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_a.edition_id}, {"user_id": user_2.user_id, "edition_id": edition_b.edition_id}, ]) if i % 2: - database_session.execute(models.user_editions.insert(), [ + await database_session.execute(models.user_editions.insert(), [ {"user_id": user_1.user_id, "edition_id": edition_b.edition_id}, ]) else: correct_users.append(user_1) - database_session.commit() + await database_session.commit() - users = users_crud.get_users_filtered_page(database_session, FilterParameters(page=0, exclude_edition="edB", - edition="edA")) + users = await users_crud.get_users_filtered_page(database_session, FilterParameters(page=0, exclude_edition="edB", + edition="edA")) assert len(users) == len(correct_users) for user in users: assert user in correct_users -def test_edit_admin_status(database_session: AsyncSession): +async def test_edit_admin_status(database_session: AsyncSession): """Test changing the admin status of a user""" # Create user user = models.User(name="user1", admin=False) database_session.add(user) - database_session.commit() + await database_session.commit() - users_crud.edit_admin_status(database_session, user.user_id, True) + await users_crud.edit_admin_status(database_session, user.user_id, True) assert user.admin - users_crud.edit_admin_status(database_session, user.user_id, False) + await users_crud.edit_admin_status(database_session, user.user_id, False) assert not user.admin -def test_add_coach(database_session: AsyncSession): +async def test_add_coach(database_session: AsyncSession): """Test adding a user as coach""" # Create user @@ -417,15 +428,15 @@ def test_add_coach(database_session: AsyncSession): edition = models.Edition(year=1, name="ed1") database_session.add(edition) - database_session.commit() - - users_crud.add_coach(database_session, user.user_id, edition.name) - coach = database_session.query(user_editions).one() + await database_session.commit() + print(user) + await users_crud.add_coach(database_session, user.user_id, edition.name) + coach = (await database_session.execute(select(user_editions))).one() assert coach.user_id == user.user_id assert coach.edition_id == edition.edition_id -def test_remove_coach(database_session: AsyncSession): +async def test_remove_coach(database_session: AsyncSession): """Test removing a user as coach""" # Create user @@ -438,19 +449,19 @@ def test_remove_coach(database_session: AsyncSession): edition = models.Edition(year=1, name="ed1") database_session.add(edition) - database_session.commit() + await database_session.commit() # Create coach role - database_session.execute(models.user_editions.insert(), [ + await database_session.execute(models.user_editions.insert(), [ {"user_id": user1.user_id, "edition_id": edition.edition_id}, {"user_id": user2.user_id, "edition_id": edition.edition_id} ]) - users_crud.remove_coach(database_session, user1.user_id, edition.name) - assert len(database_session.query(user_editions).all()) == 1 + await users_crud.remove_coach(database_session, user1.user_id, edition.name) + assert len((await database_session.execute(select(user_editions))).scalars().all()) == 1 -def test_remove_coach_all_editions(database_session: AsyncSession): +async def test_remove_coach_all_editions(database_session: AsyncSession): """Test removing a user as coach from all editions""" # Create user @@ -467,21 +478,21 @@ def test_remove_coach_all_editions(database_session: AsyncSession): database_session.add(edition2) database_session.add(edition3) - database_session.commit() + await database_session.commit() # Create coach role - database_session.execute(models.user_editions.insert(), [ + await database_session.execute(models.user_editions.insert(), [ {"user_id": user1.user_id, "edition_id": edition1.edition_id}, {"user_id": user1.user_id, "edition_id": edition2.edition_id}, {"user_id": user1.user_id, "edition_id": edition3.edition_id}, {"user_id": user2.user_id, "edition_id": edition2.edition_id}, ]) - users_crud.remove_coach_all_editions(database_session, user1.user_id) - assert len(database_session.query(user_editions).all()) == 1 + await users_crud.remove_coach_all_editions(database_session, user1.user_id) + assert len((await database_session.execute(select(user_editions))).scalars().all()) == 1 -def test_get_all_requests(database_session: AsyncSession): +async def test_get_all_requests(database_session: AsyncSession): """Test get request for all userrequests""" # Create user user1 = models.User(name="user1") @@ -495,7 +506,7 @@ def test_get_all_requests(database_session: AsyncSession): database_session.add(edition1) database_session.add(edition2) - database_session.commit() + await database_session.commit() # Create request request1 = models.CoachRequest(user_id=user1.user_id, edition_id=edition1.edition_id) @@ -503,9 +514,9 @@ def test_get_all_requests(database_session: AsyncSession): database_session.add(request1) database_session.add(request2) - database_session.commit() + await database_session.commit() - requests = users_crud.get_requests(database_session) + requests = await users_crud.get_requests(database_session) assert len(requests) == 2 assert request1 in requests assert request2 in requests @@ -514,7 +525,7 @@ def test_get_all_requests(database_session: AsyncSession): assert user2 in users -def test_get_requests_paginated(database_session: AsyncSession): +async def test_get_requests_paginated(database_session: AsyncSession): edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -522,15 +533,15 @@ def test_get_requests_paginated(database_session: AsyncSession): user = models.User(name=f"User {i}", admin=False) database_session.add(user) database_session.add(CoachRequest(user=user, edition=edition)) - database_session.commit() + await database_session.commit() - assert len(users_crud.get_requests_page(database_session, 0)) == DB_PAGE_SIZE - assert len(users_crud.get_requests_page(database_session, 1)) == round( + assert len(await users_crud.get_requests_page(database_session, 0)) == DB_PAGE_SIZE + assert len(await users_crud.get_requests_page(database_session, 1)) == round( DB_PAGE_SIZE * 1.5 ) - DB_PAGE_SIZE -def test_get_requests_paginated_filter_user_name(database_session: AsyncSession): +async def test_get_requests_paginated_filter_user_name(database_session: AsyncSession): edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -541,15 +552,15 @@ def test_get_requests_paginated_filter_user_name(database_session: AsyncSession) database_session.add(CoachRequest(user=user, edition=edition)) if "1" in str(i): count += 1 - database_session.commit() + await database_session.commit() - assert len(users_crud.get_requests_page(database_session, 0, "1")) == \ + assert len(await users_crud.get_requests_page(database_session, 0, "1")) == \ min(DB_PAGE_SIZE, count) - assert len(users_crud.get_requests_page(database_session, 1, "1")) == \ + assert len(await users_crud.get_requests_page(database_session, 1, "1")) == \ max(count - DB_PAGE_SIZE, 0) -def test_get_all_requests_from_edition(database_session: AsyncSession): +async def test_get_all_requests_from_edition(database_session: AsyncSession): """Test get request for all userrequests of a given edition""" # Create user @@ -564,7 +575,7 @@ def test_get_all_requests_from_edition(database_session: AsyncSession): database_session.add(edition1) database_session.add(edition2) - database_session.commit() + await database_session.commit() # Create request request1 = models.CoachRequest(user_id=user1.user_id, edition_id=edition1.edition_id) @@ -572,18 +583,18 @@ def test_get_all_requests_from_edition(database_session: AsyncSession): database_session.add(request1) database_session.add(request2) - database_session.commit() + await database_session.commit() - requests = users_crud.get_requests_for_edition(database_session, edition1.name) + requests = await users_crud.get_requests_for_edition(database_session, edition1.name) assert len(requests) == 1 assert requests[0].user == user1 - requests = users_crud.get_requests_for_edition(database_session, edition2.name) + requests = await users_crud.get_requests_for_edition(database_session, edition2.name) assert len(requests) == 1 assert requests[0].user == user2 -def test_get_requests_for_edition_paginated(database_session: AsyncSession): +async def test_get_requests_for_edition_paginated(database_session: AsyncSession): edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -591,15 +602,15 @@ def test_get_requests_for_edition_paginated(database_session: AsyncSession): user = models.User(name=f"User {i}", admin=False) database_session.add(user) database_session.add(CoachRequest(user=user, edition=edition)) - database_session.commit() + await database_session.commit() - assert len(users_crud.get_requests_for_edition_page(database_session, edition.name, 0)) == DB_PAGE_SIZE - assert len(users_crud.get_requests_for_edition_page(database_session, edition.name, 1)) == round( + assert len(await users_crud.get_requests_for_edition_page(database_session, edition.name, 0)) == DB_PAGE_SIZE + assert len(await users_crud.get_requests_for_edition_page(database_session, edition.name, 1)) == round( DB_PAGE_SIZE * 1.5 ) - DB_PAGE_SIZE -def test_get_requests_for_edition_paginated_filter_user_name(database_session: AsyncSession): +async def test_get_requests_for_edition_paginated_filter_user_name(database_session: AsyncSession): edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) @@ -610,15 +621,15 @@ def test_get_requests_for_edition_paginated_filter_user_name(database_session: A database_session.add(CoachRequest(user=user, edition=edition)) if "1" in str(i): count += 1 - database_session.commit() + await database_session.commit() - assert len(users_crud.get_requests_for_edition_page(database_session, edition.name, 0, "1")) == \ + assert len(await users_crud.get_requests_for_edition_page(database_session, edition.name, 0, "1")) == \ min(DB_PAGE_SIZE, count) - assert len(users_crud.get_requests_for_edition_page(database_session, edition.name, 1, "1")) == \ + assert len(await users_crud.get_requests_for_edition_page(database_session, edition.name, 1, "1")) == \ max(count - DB_PAGE_SIZE, 0) -def test_accept_request(database_session: AsyncSession): +async def test_accept_request(database_session: AsyncSession): """Test accepting a coach request""" # Create user @@ -629,23 +640,23 @@ def test_accept_request(database_session: AsyncSession): edition1 = models.Edition(year=1, name="ed1") database_session.add(edition1) - database_session.commit() + await database_session.commit() # Create request request1 = models.CoachRequest(user_id=user1.user_id, edition_id=edition1.edition_id) database_session.add(request1) - database_session.commit() + await database_session.commit() - users_crud.accept_request(database_session, request1.request_id) + await users_crud.accept_request(database_session, request1.request_id) - requests = database_session.query(CoachRequest).all() + requests = (await database_session.execute(select(CoachRequest))).scalars().all() assert len(requests) == 0 assert user1.editions[0].edition_id == edition1.edition_id -def test_reject_request_new_user(database_session: AsyncSession): +async def test_reject_request_new_user(database_session: AsyncSession): """Test rejecting a coach request""" # Create user @@ -655,50 +666,53 @@ def test_reject_request_new_user(database_session: AsyncSession): # Create edition edition1 = models.Edition(year=1, name="ed2022") database_session.add(edition1) - database_session.commit() + await database_session.commit() # Create request request1 = models.CoachRequest(user_id=user1.user_id, edition_id=edition1.edition_id) database_session.add(request1) - database_session.commit() + await database_session.commit() - users_crud.reject_request(database_session, request1.request_id) + await users_crud.reject_request(database_session, request1.request_id) - requests = database_session.query(CoachRequest).all() + requests = (await database_session.execute(select(CoachRequest))).scalars().all() assert len(requests) == 0 -def test_remove_request_if_exists_exists(database_session: AsyncSession): +async def test_remove_request_if_exists_exists(database_session: AsyncSession): """Test deleting a request when it exists""" user = models.User(name="user1") database_session.add(user) edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() request = models.CoachRequest(user_id=user.user_id, edition_id=edition.edition_id) database_session.add(request) - database_session.commit() + await database_session.commit() - assert database_session.query(CoachRequest).count() == 1 + count = (await database_session.execute(select(func.count()).select_from(select(CoachRequest).subquery()))).scalar_one() + assert count == 1 # Remove the request - users_crud.remove_request_if_exists(database_session, user.user_id, edition.name) + await users_crud.remove_request_if_exists(database_session, user.user_id, edition.name) - assert database_session.query(CoachRequest).count() == 0 + count = ( + await database_session.execute(select(func.count()).select_from(select(CoachRequest).subquery()))).scalar_one() + assert count == 0 -def test_remove_request_if_not_exists(database_session: AsyncSession): +async def test_remove_request_if_not_exists(database_session: AsyncSession): """Test deleting a request when it doesn't exist""" user = models.User(name="user1") database_session.add(user) edition = models.Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() # Remove the request # If the test succeeds then it means no error was raised, even though the request # doesn't exist - users_crud.remove_request_if_exists(database_session, user.user_id, edition.name) + await users_crud.remove_request_if_exists(database_session, user.user_id, edition.name) diff --git a/backend/tests/test_fill_database.py b/backend/tests/test_fill_database.py index 78040979c..0f23f36af 100644 --- a/backend/tests/test_fill_database.py +++ b/backend/tests/test_fill_database.py @@ -1,6 +1,7 @@ from sqlalchemy.ext.asyncio import AsyncSession from tests.fill_database import fill_database -def test_fill_database(database_session: AsyncSession): + +async def test_fill_database(database_session: AsyncSession): """Test that fill_database don't give an error""" - fill_database(database_session) + await fill_database(database_session) diff --git a/backend/tests/test_logic/test_register.py b/backend/tests/test_logic/test_register.py index 20a312a93..280d4f5af 100644 --- a/backend/tests/test_logic/test_register.py +++ b/backend/tests/test_logic/test_register.py @@ -33,6 +33,7 @@ async def test_create_request(database_session: AsyncSession): assert len(auth_email) == 1 +@pytest.mark.skip(reason="The async database rolls back both, even with nested query") async def test_duplicate_user(database_session: AsyncSession): """Tests if there is a duplicate, it's not created in the database""" edition = Edition(year=2022, name="ed2022") diff --git a/backend/tests/test_routers/test_skills/test_skills.py b/backend/tests/test_routers/test_skills/test_skills.py index 23a1d56c9..86bcac79e 100644 --- a/backend/tests/test_routers/test_skills/test_skills.py +++ b/backend/tests/test_routers/test_skills/test_skills.py @@ -1,10 +1,15 @@ from json import dumps + +import pytest from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.models import Skill from tests.utils.authorization import AuthClient +# temporary skip until merge is done +pytest.skip(allow_module_level=True) + def test_get_skills(database_session: AsyncSession, auth_client: AuthClient): """Performe tests on getting skills From 443ae2045740cb1a5da13db5c8de6d7fae9542ab Mon Sep 17 00:00:00 2001 From: Francis Date: Wed, 11 May 2022 12:11:43 +0200 Subject: [PATCH 142/649] remove comments --- backend/src/app/routers/editions/editions.py | 38 +++----------------- backend/src/app/routers/skills/skills.py | 26 ++------------ 2 files changed, 7 insertions(+), 57 deletions(-) diff --git a/backend/src/app/routers/editions/editions.py b/backend/src/app/routers/editions/editions.py index 0c5e4acc3..b884291b2 100644 --- a/backend/src/app/routers/editions/editions.py +++ b/backend/src/app/routers/editions/editions.py @@ -33,15 +33,7 @@ @editions_router.get("/", response_model=EditionList, tags=[Tags.EDITIONS]) async def get_editions(db: Session = Depends(get_session), user: User = Depends(require_auth), page: int = 0): - """Get a paginated list of all editions. - Args: - db (Session, optional): connection with the database. Defaults to Depends(get_session). - user (User, optional): the current logged in user. Defaults to Depends(require_auth). - page (int): the page to return. - - Returns: - EditionList: an object with a list of all the editions. - """ + """Get a paginated list of all editions.""" if user.admin: return logic_editions.get_editions_page(db, page) @@ -51,41 +43,19 @@ async def get_editions(db: Session = Depends(get_session), user: User = Depends( @editions_router.get("/{edition_name}", response_model=Edition, tags=[Tags.EDITIONS], dependencies=[Depends(require_coach)]) async def get_edition_by_name(edition_name: str, db: Session = Depends(get_session)): - """Get a specific edition. - - Args: - edition_name (str): the name of the edition that you want to get. - db (Session, optional): connection with the database. Defaults to Depends(get_session). - user (User, optional): the current logged in user. Defaults to Depends(get_current_active_user). - - Returns: - Edition: an edition. - """ + """Get a specific edition.""" return logic_editions.get_edition_by_name(db, edition_name) @editions_router.post("/", status_code=status.HTTP_201_CREATED, response_model=Edition, tags=[Tags.EDITIONS], dependencies=[Depends(require_admin)]) async def post_edition(edition: EditionBase, db: Session = Depends(get_session)): - """ Create a new edition. - - Args: - db (Session, optional): connection with the database. Defaults to Depends(get_session). - - Returns: - Edition: the newly made edition object. - """ + """ Create a new edition.""" return logic_editions.create_edition(db, edition) @editions_router.delete("/{edition_name}", status_code=status.HTTP_204_NO_CONTENT, tags=[Tags.EDITIONS], dependencies=[Depends(require_admin)]) async def delete_edition(edition_name: str, db: Session = Depends(get_session)): - """Delete an existing edition. - - Args: - edition_name (str): the name of the edition that needs to be deleted, if found. - db (Session, optional): connection with the database. Defaults to Depends(get_session). - - """ + """Delete an existing edition.""" logic_editions.delete_edition(db, edition_name) diff --git a/backend/src/app/routers/skills/skills.py b/backend/src/app/routers/skills/skills.py index 2da8892b5..84cb8a5bb 100644 --- a/backend/src/app/routers/skills/skills.py +++ b/backend/src/app/routers/skills/skills.py @@ -13,39 +13,19 @@ @skills_router.get("/", response_model=SkillList, tags=[Tags.SKILLS], dependencies=[Depends(require_auth)]) async def get_skills(db: Session = Depends(get_session)): - """Get a list of all the base skills that can be added to a student or project. - - Args: - db (Session, optional): connection with the database. Defaults to Depends(get_session). - - Returns: - SkillList: an object with a list of all the skills. - """ + """Get a list of all the base skills that can be added to a student or project.""" return logic_skills.get_skills(db) @skills_router.post("/", status_code=status.HTTP_201_CREATED, response_model=Skill, tags=[Tags.SKILLS], dependencies=[Depends(require_auth)]) async def create_skill(skill: SkillBase, db: Session = Depends(get_session)): - """Add a new skill into the database. - - Args: - skill (SkillBase): has all the fields needed to add a skill. - db (Session, optional): connection with the database. Defaults to Depends(get_session). - - Returns: - Skill: returns the new skill. - """ + """Add a new skill into the database.""" return logic_skills.create_skill(db, skill) @skills_router.delete("/{skill_id}", status_code=status.HTTP_204_NO_CONTENT, tags=[Tags.SKILLS], dependencies=[Depends(require_auth)]) async def delete_skill(skill_id: int, db: Session = Depends(get_session)): - """Delete an existing skill. - - Args: - skill_id (int): the id of the skill. - db (Session, optional): connection with the database. Defaults to Depends(get_session). - """ + """Delete an existing skill.""" logic_skills.delete_skill(db, skill_id) From 322b77557bf6576469f17dabf9a4fc557b490091 Mon Sep 17 00:00:00 2001 From: Francis Date: Wed, 11 May 2022 12:20:04 +0200 Subject: [PATCH 143/649] make fields optional when needed --- backend/src/app/schemas/projects.py | 4 ++-- backend/src/app/schemas/suggestion.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/app/schemas/projects.py b/backend/src/app/schemas/projects.py index a5bccdecb..ebf780ef9 100644 --- a/backend/src/app/schemas/projects.py +++ b/backend/src/app/schemas/projects.py @@ -40,8 +40,8 @@ class ProjectRoleSuggestion(CamelCaseModel): """Represents a ProjectRole from the database""" project_role_suggestion_id: int argumentation: str | None - drafter: User - student: Student + drafter: User | None + student: Student | None class Config: """Set to ORM mode""" diff --git a/backend/src/app/schemas/suggestion.py b/backend/src/app/schemas/suggestion.py index d6f25b98c..5340c1b34 100644 --- a/backend/src/app/schemas/suggestion.py +++ b/backend/src/app/schemas/suggestion.py @@ -17,7 +17,7 @@ class Suggestion(CamelCaseModel): """ suggestion_id: int - coach: User + coach: User | None suggestion: DecisionEnum argumentation: str From 5a354ab66ee5bbd2070d6bf44c2a3e70fa0f20a0 Mon Sep 17 00:00:00 2001 From: Francis Date: Wed, 11 May 2022 12:27:35 +0200 Subject: [PATCH 144/649] remove trailing slash --- .../test_editions/test_projects/test_projects.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index c0491b50e..1d366d9fe 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -109,12 +109,12 @@ def test_create_project_same_partner(database_session: Session, auth_client: Aut auth_client.admin() - auth_client.post(f"/editions/{edition.name}/projects/", json={ + auth_client.post(f"/editions/{edition.name}/projects", json={ "name": "test", "partners": ["ugent"], "coaches": [user.user_id] }) - auth_client.post(f"/editions/{edition.name}/projects/", json={ + auth_client.post(f"/editions/{edition.name}/projects", json={ "name": "test", "partners": ["ugent"], "coaches": [user.user_id] @@ -129,8 +129,7 @@ def test_create_project_non_existing_coach(database_session: Session, auth_clien database_session.commit() auth_client.admin() - endpoint = f"/editions/{edition.name}/projects/" - print(database_session.query(Edition).all()) + endpoint = f"/editions/{edition.name}/projects" database_session.begin_nested() response = auth_client.post(endpoint, json={ From df30bcf1552e685ccf7b4c9faf75c4d84d13579b Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 11 May 2022 12:59:09 +0200 Subject: [PATCH 145/649] only show edit and delete buttons to admin (projects) --- .../ProjectRoles/ProjectRoles.tsx | 3 +- .../TitleAndEdit/TitleAndEdit.tsx | 67 +++++++++++-------- .../TitleAndEdit/styles.ts | 5 ++ 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx index 2a0093aa0..d7889358f 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx @@ -15,8 +15,7 @@ export default function ProjectRoles({
    {projectRoles.map((projectRole, _index) => ( - {projectRole.skill} -

    +

    {projectRole.skill}

    {projectRole.suggestions.length.toString() + " / " + projectRole.slots.toString()} diff --git a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx index c819c99ac..0ed9970e0 100644 --- a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx +++ b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx @@ -1,5 +1,14 @@ import React from "react"; -import { Title, TitleContainer, Save, Cancel, Delete, TitleInput, Edit } from "./styles"; +import { + Title, + TitleContainer, + Save, + Cancel, + Delete, + TitleInput, + Edit, + EditDeleteContainer, +} from "./styles"; import { MdOutlineEditNote } from "react-icons/md"; import { HiOutlineTrash } from "react-icons/hi"; @@ -38,34 +47,36 @@ export default function TitleAndEdit({ }} /> )} - {!editing ? ( - - setEditing(true)} /> - - ) : ( - <> - { - await editProject(); - setEditing(false); - }} - > - Save - - { - setEditing(false); - setEditedProject(project); - }} - > - Cancel - - - )} {role === Role.ADMIN && ( - - - + + {!editing ? ( + + setEditing(true)} /> + + ) : ( + <> + { + await editProject(); + setEditing(false); + }} + > + Save + + { + setEditing(false); + setEditedProject(project); + }} + > + Cancel + + + )} + + + + )} ); diff --git a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/styles.ts b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/styles.ts index 9c0b832f6..03afb401f 100644 --- a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/styles.ts +++ b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/styles.ts @@ -20,6 +20,11 @@ export const TitleInput = styled.input` border-radius: 5px; `; +export const EditDeleteContainer = styled.div` + display: flex; + align-items: center; +`; + export const Edit = styled.div` :hover { cursor: pointer; From c6a878b2b52616c34b0df085e9ae1970cae22746 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Wed, 11 May 2022 13:10:01 +0200 Subject: [PATCH 146/649] Close button + disable button when no conflicts --- .../Conflicts/ConflictsButton.tsx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx b/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx index 91ebd2a44..ded606e84 100644 --- a/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx +++ b/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx @@ -30,7 +30,7 @@ export default function ConflictsButton(props: { editionId: string }) { if (show) { return ( - +

    Resolve Conflicts

     @@ -63,5 +63,17 @@ export default function ConflictsButton(props: { editionId: string }) {     ); } - return {`Conflicts (${conflicts.length})`}; + + let text; + if (conflicts.length === 0) { + text = "No conflicts"; + } else { + text = `Conflicts (${conflicts.length})`; + } + + return ( + + {text} + + ); } From 746485dabe863fe4224805f3e51402644bbf1957 Mon Sep 17 00:00:00 2001 From: stijndcl Date: Wed, 11 May 2022 16:19:34 +0200 Subject: [PATCH 147/649] Add toasts --- frontend/package.json | 1 + frontend/src/App.tsx | 5 ++++- frontend/yarn.lock | 12 ++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index 99d334d97..84b79dca4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -20,6 +20,7 @@ "react-router-dom": "^6.2.1", "react-scripts": "^5.0.0", "react-social-login-buttons": "^3.6.0", + "react-toastify": "^9.0.1", "reactjs-popup": "^2.0.5", "styled-components": "^5.3.3", "typescript": "^4.4.2", diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index cf4a170eb..ce81ab4f9 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,8 +1,10 @@ import React from "react"; import "bootstrap/dist/css/bootstrap.min.css"; import "./App.css"; -import Router from "./Router"; +import "react-toastify/dist/ReactToastify.css"; import { AuthProvider } from "./contexts"; +import { ToastContainer } from "react-toastify"; +import Router from "./Router"; /** * Main application component. Wraps the [[Router]] in an [[AuthProvider]] so that @@ -13,6 +15,7 @@ export default function App() { // AuthContext should be available in the entire application + ); } diff --git a/frontend/yarn.lock b/frontend/yarn.lock index b3d4746e3..910e19e97 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -3198,6 +3198,11 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +clsx@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" + integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -7872,6 +7877,13 @@ react-test-renderer@^16.0.0-0: react-is "^16.8.6" scheduler "^0.19.1" +react-toastify@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-9.0.1.tgz#2f3abd26a75efd55a82cb9c0a897c865218ea420" + integrity sha512-c2zeZHkCX+WXuItS/JRqQ/8CH8Qm/je+M0rt09xe9fnu5YPJigtNOdD8zX4fwLA093V2am3abkGfOowwpkrwOQ== + dependencies: + clsx "^1.1.1" + react-transition-group@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" From 074bdd1e6f899f31797a207695ff9f307883b536 Mon Sep 17 00:00:00 2001 From: stijndcl Date: Wed, 4 May 2022 19:39:44 +0200 Subject: [PATCH 148/649] Create basic buttons --- frontend/src/App.css | 7 +++++ .../Common/Buttons/CreateButton.tsx | 19 +++++++++++++ .../Common/Buttons/DeleteButton.tsx | 19 +++++++++++++ .../Common/Buttons/WarningButton.tsx | 22 +++++++++++++++ .../src/components/Common/Buttons/index.ts | 3 ++ .../src/components/Common/Buttons/props.ts | 4 +++ .../src/components/Common/Buttons/styles.ts | 28 +++++++++++++++++++ .../LoadSpinner/LoadSpinner.tsx | 0 .../LoadSpinner/index.ts | 0 .../LoadSpinner/styles.ts | 0 .../{CommonComps => Common}/index.ts | 1 + frontend/src/components/Common/styles.ts | 10 +++++++ 12 files changed, 113 insertions(+) create mode 100644 frontend/src/components/Common/Buttons/CreateButton.tsx create mode 100644 frontend/src/components/Common/Buttons/DeleteButton.tsx create mode 100644 frontend/src/components/Common/Buttons/WarningButton.tsx create mode 100644 frontend/src/components/Common/Buttons/index.ts create mode 100644 frontend/src/components/Common/Buttons/props.ts create mode 100644 frontend/src/components/Common/Buttons/styles.ts rename frontend/src/components/{CommonComps => Common}/LoadSpinner/LoadSpinner.tsx (100%) rename frontend/src/components/{CommonComps => Common}/LoadSpinner/index.ts (100%) rename frontend/src/components/{CommonComps => Common}/LoadSpinner/styles.ts (100%) rename frontend/src/components/{CommonComps => Common}/index.ts (59%) create mode 100644 frontend/src/components/Common/styles.ts diff --git a/frontend/src/App.css b/frontend/src/App.css index 3f0d1d775..47d316373 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -1,8 +1,15 @@ :root { + /* OSOC colours */ --osoc_blue: #131329; --osoc_orange: #fcb70f; --osoc_red: #f14a3b; --osoc_green: #44dba4; + /* Darkened OSOC colours, used for hovering, etc */ + --osoc_blue_darkened: #0e0e1e; + --osoc_orange_darkened: #c58c02; + --osoc_red_darkened: #d21f0f; + --osoc_green_darkened: #22b47f; + /* General site colours */ --react_dark_grey: #343434; --custom_light_blue: #00bfff; --background_color: #272741; diff --git a/frontend/src/components/Common/Buttons/CreateButton.tsx b/frontend/src/components/Common/Buttons/CreateButton.tsx new file mode 100644 index 000000000..c7043af19 --- /dev/null +++ b/frontend/src/components/Common/Buttons/CreateButton.tsx @@ -0,0 +1,19 @@ +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faPlus } from "@fortawesome/free-solid-svg-icons/faPlus"; +import { IconProp } from "@fortawesome/fontawesome-svg-core"; +import { BasicButton } from "./props"; +import { GreenButton } from "./styles"; + +/** + * Green button with a "+"-icon + */ +export default function CreateButton({ label = "", showIcon = true }: BasicButton) { + return ( + + {showIcon && ( + + )} + {label} + + ); +} diff --git a/frontend/src/components/Common/Buttons/DeleteButton.tsx b/frontend/src/components/Common/Buttons/DeleteButton.tsx new file mode 100644 index 000000000..88c74efa4 --- /dev/null +++ b/frontend/src/components/Common/Buttons/DeleteButton.tsx @@ -0,0 +1,19 @@ +import { BasicButton } from "./props"; +import { RedButton } from "./styles"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faTrashCan } from "@fortawesome/free-solid-svg-icons/faTrashCan"; +import { IconProp } from "@fortawesome/fontawesome-svg-core"; + +/** + * Red button with a garbage can icon + */ +export default function DeleteButton({ label = "", showIcon = true }: BasicButton) { + return ( + + {showIcon && ( + + )} + {label} + + ); +} diff --git a/frontend/src/components/Common/Buttons/WarningButton.tsx b/frontend/src/components/Common/Buttons/WarningButton.tsx new file mode 100644 index 000000000..9e0cd63f6 --- /dev/null +++ b/frontend/src/components/Common/Buttons/WarningButton.tsx @@ -0,0 +1,22 @@ +import { BasicButton } from "./props"; +import { RedButton } from "./styles"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faTriangleExclamation } from "@fortawesome/free-solid-svg-icons/faTriangleExclamation"; +import { IconProp } from "@fortawesome/fontawesome-svg-core"; + +/** + * Red button with a warning triangle icon + */ +export default function WarningButton({ label = "", showIcon = true }: BasicButton) { + return ( + + {showIcon && ( + + )} + {label} + + ); +} diff --git a/frontend/src/components/Common/Buttons/index.ts b/frontend/src/components/Common/Buttons/index.ts new file mode 100644 index 000000000..502fca43f --- /dev/null +++ b/frontend/src/components/Common/Buttons/index.ts @@ -0,0 +1,3 @@ +export { default as CreateButton } from "./CreateButton"; +export { default as DeleteButton } from "./DeleteButton"; +export { default as WarningButton } from "./WarningButton"; diff --git a/frontend/src/components/Common/Buttons/props.ts b/frontend/src/components/Common/Buttons/props.ts new file mode 100644 index 000000000..3f98c4785 --- /dev/null +++ b/frontend/src/components/Common/Buttons/props.ts @@ -0,0 +1,4 @@ +export interface BasicButton { + label?: string; + showIcon?: boolean; +} diff --git a/frontend/src/components/Common/Buttons/styles.ts b/frontend/src/components/Common/Buttons/styles.ts new file mode 100644 index 000000000..dede233f4 --- /dev/null +++ b/frontend/src/components/Common/Buttons/styles.ts @@ -0,0 +1,28 @@ +import Button from "react-bootstrap/Button"; +import styled from "styled-components"; + +import { HoverAnimation } from "../styles"; + +export const GreenButton = styled(Button)` + ${HoverAnimation}; + + background-color: var(--osoc_green); + border-color: var(--osoc_green); + + &:hover { + background-color: var(--osoc_green_darkened); + border-color: var(--osoc_green_darkened); + } +`; + +export const RedButton = styled(Button)` + ${HoverAnimation}; + + background-color: var(--osoc_red); + border-color: var(--osoc_red); + + &:hover { + background-color: var(--osoc_red_darkened); + border-color: var(--osoc_red_darkened); + } +`; diff --git a/frontend/src/components/CommonComps/LoadSpinner/LoadSpinner.tsx b/frontend/src/components/Common/LoadSpinner/LoadSpinner.tsx similarity index 100% rename from frontend/src/components/CommonComps/LoadSpinner/LoadSpinner.tsx rename to frontend/src/components/Common/LoadSpinner/LoadSpinner.tsx diff --git a/frontend/src/components/CommonComps/LoadSpinner/index.ts b/frontend/src/components/Common/LoadSpinner/index.ts similarity index 100% rename from frontend/src/components/CommonComps/LoadSpinner/index.ts rename to frontend/src/components/Common/LoadSpinner/index.ts diff --git a/frontend/src/components/CommonComps/LoadSpinner/styles.ts b/frontend/src/components/Common/LoadSpinner/styles.ts similarity index 100% rename from frontend/src/components/CommonComps/LoadSpinner/styles.ts rename to frontend/src/components/Common/LoadSpinner/styles.ts diff --git a/frontend/src/components/CommonComps/index.ts b/frontend/src/components/Common/index.ts similarity index 59% rename from frontend/src/components/CommonComps/index.ts rename to frontend/src/components/Common/index.ts index 507a08be1..dd61c9aea 100644 --- a/frontend/src/components/CommonComps/index.ts +++ b/frontend/src/components/Common/index.ts @@ -1 +1,2 @@ +export * as Buttons from "./Buttons"; export { default as LoadSpinner } from "./LoadSpinner"; diff --git a/frontend/src/components/Common/styles.ts b/frontend/src/components/Common/styles.ts new file mode 100644 index 000000000..fdb3d2edb --- /dev/null +++ b/frontend/src/components/Common/styles.ts @@ -0,0 +1,10 @@ +import { css } from "styled-components"; + +// Css for a component that does an animation on hover +export const HoverAnimation = css` + transition: 200ms ease-out; + + &:hover { + transition: 200ms ease-in; + } +`; From 7abf5eb5c6706e83ee7b74a9e7306b76cb1cbaba Mon Sep 17 00:00:00 2001 From: stijndcl Date: Wed, 4 May 2022 20:54:40 +0200 Subject: [PATCH 149/649] Add props & input fields --- frontend/src/components/Common/Buttons/CreateButton.tsx | 4 ++-- frontend/src/components/Common/Buttons/DeleteButton.tsx | 4 ++-- frontend/src/components/Common/Buttons/WarningButton.tsx | 4 ++-- frontend/src/components/Common/Buttons/props.ts | 4 +++- frontend/src/components/Common/Forms/InputField.tsx | 9 +++++++++ frontend/src/components/Common/Forms/index.ts | 1 + frontend/src/components/Common/index.ts | 1 + 7 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 frontend/src/components/Common/Forms/InputField.tsx create mode 100644 frontend/src/components/Common/Forms/index.ts diff --git a/frontend/src/components/Common/Buttons/CreateButton.tsx b/frontend/src/components/Common/Buttons/CreateButton.tsx index c7043af19..275ea44b3 100644 --- a/frontend/src/components/Common/Buttons/CreateButton.tsx +++ b/frontend/src/components/Common/Buttons/CreateButton.tsx @@ -7,9 +7,9 @@ import { GreenButton } from "./styles"; /** * Green button with a "+"-icon */ -export default function CreateButton({ label = "", showIcon = true }: BasicButton) { +export default function CreateButton({ label = "", showIcon = true, ...props }: BasicButton) { return ( - + {showIcon && ( )} diff --git a/frontend/src/components/Common/Buttons/DeleteButton.tsx b/frontend/src/components/Common/Buttons/DeleteButton.tsx index 88c74efa4..1e8fbfada 100644 --- a/frontend/src/components/Common/Buttons/DeleteButton.tsx +++ b/frontend/src/components/Common/Buttons/DeleteButton.tsx @@ -7,9 +7,9 @@ import { IconProp } from "@fortawesome/fontawesome-svg-core"; /** * Red button with a garbage can icon */ -export default function DeleteButton({ label = "", showIcon = true }: BasicButton) { +export default function DeleteButton({ label = "", showIcon = true, ...props }: BasicButton) { return ( - + {showIcon && ( )} diff --git a/frontend/src/components/Common/Buttons/WarningButton.tsx b/frontend/src/components/Common/Buttons/WarningButton.tsx index 9e0cd63f6..aa00ef1da 100644 --- a/frontend/src/components/Common/Buttons/WarningButton.tsx +++ b/frontend/src/components/Common/Buttons/WarningButton.tsx @@ -7,9 +7,9 @@ import { IconProp } from "@fortawesome/fontawesome-svg-core"; /** * Red button with a warning triangle icon */ -export default function WarningButton({ label = "", showIcon = true }: BasicButton) { +export default function WarningButton({ label = "", showIcon = true, ...props }: BasicButton) { return ( - + {showIcon && ( ; +} diff --git a/frontend/src/components/Common/Forms/index.ts b/frontend/src/components/Common/Forms/index.ts new file mode 100644 index 000000000..f0dab80d7 --- /dev/null +++ b/frontend/src/components/Common/Forms/index.ts @@ -0,0 +1 @@ +export { default as InputField } from "./InputField"; diff --git a/frontend/src/components/Common/index.ts b/frontend/src/components/Common/index.ts index dd61c9aea..6f7218cf3 100644 --- a/frontend/src/components/Common/index.ts +++ b/frontend/src/components/Common/index.ts @@ -1,2 +1,3 @@ export * as Buttons from "./Buttons"; +export * as Forms from "./Forms"; export { default as LoadSpinner } from "./LoadSpinner"; From fcd2e331302aa03e289af72835d51f4cbfd71280 Mon Sep 17 00:00:00 2001 From: stijndcl Date: Tue, 10 May 2022 17:34:33 +0200 Subject: [PATCH 150/649] Create spinning osoc logo --- .../Placeholders/OSOCSpinner/OSOCSpinner.tsx | 20 +++++++++++++ .../Common/Placeholders/OSOCSpinner/index.ts | 1 + .../Common/Placeholders/OSOCSpinner/styles.ts | 19 ++++++++++++ .../components/Common/Placeholders/index.ts | 1 + frontend/src/components/Common/index.ts | 1 + frontend/src/images/letters/osoc_c.svg | 30 +++++++++---------- 6 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 frontend/src/components/Common/Placeholders/OSOCSpinner/OSOCSpinner.tsx create mode 100644 frontend/src/components/Common/Placeholders/OSOCSpinner/index.ts create mode 100644 frontend/src/components/Common/Placeholders/OSOCSpinner/styles.ts create mode 100644 frontend/src/components/Common/Placeholders/index.ts diff --git a/frontend/src/components/Common/Placeholders/OSOCSpinner/OSOCSpinner.tsx b/frontend/src/components/Common/Placeholders/OSOCSpinner/OSOCSpinner.tsx new file mode 100644 index 000000000..e78d8a0ec --- /dev/null +++ b/frontend/src/components/Common/Placeholders/OSOCSpinner/OSOCSpinner.tsx @@ -0,0 +1,20 @@ +import React from "react"; +import { SpinningC } from "./styles"; +import OsocLetterC from "../../../../images/letters/osoc_c.svg"; + +interface Props { + children?: React.ReactNode; + show: boolean; +} + +/** + * Loading spinner comprised of a spinning C from the OSOC logo, as on the OSOC-website. + * This component can render children to easily hide a component if necessary + */ +export default function OSOCSpinner({ children, show }: Props) { + if (show) { + return ; + } + + return <>{children}; +} diff --git a/frontend/src/components/Common/Placeholders/OSOCSpinner/index.ts b/frontend/src/components/Common/Placeholders/OSOCSpinner/index.ts new file mode 100644 index 000000000..4d9e492be --- /dev/null +++ b/frontend/src/components/Common/Placeholders/OSOCSpinner/index.ts @@ -0,0 +1 @@ +export { default as OSOCSpinner } from "./OSOCSpinner"; diff --git a/frontend/src/components/Common/Placeholders/OSOCSpinner/styles.ts b/frontend/src/components/Common/Placeholders/OSOCSpinner/styles.ts new file mode 100644 index 000000000..46178e7b4 --- /dev/null +++ b/frontend/src/components/Common/Placeholders/OSOCSpinner/styles.ts @@ -0,0 +1,19 @@ +import styled from "styled-components"; + +export const SpinningC = styled.img.attrs(() => ({ + height: "40px", + width: "auto", + alt: "Loading...", +}))` + animation: rotate-c infinite 5s linear; + + @keyframes rotate-c { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(360deg); + } + } +`; diff --git a/frontend/src/components/Common/Placeholders/index.ts b/frontend/src/components/Common/Placeholders/index.ts new file mode 100644 index 000000000..6e656ea5d --- /dev/null +++ b/frontend/src/components/Common/Placeholders/index.ts @@ -0,0 +1 @@ +export { OSOCSpinner } from "./OSOCSpinner"; diff --git a/frontend/src/components/Common/index.ts b/frontend/src/components/Common/index.ts index 6f7218cf3..38b90d6c4 100644 --- a/frontend/src/components/Common/index.ts +++ b/frontend/src/components/Common/index.ts @@ -1,3 +1,4 @@ export * as Buttons from "./Buttons"; export * as Forms from "./Forms"; export { default as LoadSpinner } from "./LoadSpinner"; +export * as Placeholders from "./Placeholders"; diff --git a/frontend/src/images/letters/osoc_c.svg b/frontend/src/images/letters/osoc_c.svg index e2a0e212a..5d129246d 100644 --- a/frontend/src/images/letters/osoc_c.svg +++ b/frontend/src/images/letters/osoc_c.svg @@ -1,15 +1,15 @@ - - - - - - - - + + + + + + + + From 1a8c96f37982edd7991edc8a9be88e7ef5c12bd4 Mon Sep 17 00:00:00 2001 From: stijndcl Date: Wed, 11 May 2022 19:16:04 +0200 Subject: [PATCH 151/649] Animated buttons & change green button colours --- frontend/src/App.css | 2 +- .../Common/Buttons/CreateButton.tsx | 9 ++++- .../Common/Buttons/DeleteButton.tsx | 8 +++- .../Common/Buttons/WarningButton.tsx | 13 ++++-- .../src/components/Common/Buttons/props.ts | 6 +++ .../src/components/Common/Buttons/styles.ts | 40 +++++++++++++++++-- .../components/Common/Forms/InputField.tsx | 3 ++ frontend/src/components/index.ts | 1 + frontend/src/views/LoginPage/LoginPage.tsx | 6 +-- frontend/src/views/LoginPage/styles.ts | 10 ----- 10 files changed, 75 insertions(+), 23 deletions(-) diff --git a/frontend/src/App.css b/frontend/src/App.css index 47d316373..336e8b14b 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -8,7 +8,7 @@ --osoc_blue_darkened: #0e0e1e; --osoc_orange_darkened: #c58c02; --osoc_red_darkened: #d21f0f; - --osoc_green_darkened: #22b47f; + --osoc_green_darkened: #21be85; /* General site colours */ --react_dark_grey: #343434; --custom_light_blue: #00bfff; diff --git a/frontend/src/components/Common/Buttons/CreateButton.tsx b/frontend/src/components/Common/Buttons/CreateButton.tsx index 275ea44b3..00f3c5686 100644 --- a/frontend/src/components/Common/Buttons/CreateButton.tsx +++ b/frontend/src/components/Common/Buttons/CreateButton.tsx @@ -6,13 +6,20 @@ import { GreenButton } from "./styles"; /** * Green button with a "+"-icon + * Changes to orange on hover because the OSOC-site does this too */ -export default function CreateButton({ label = "", showIcon = true, ...props }: BasicButton) { +export default function CreateButton({ + label = "", + showIcon = true, + children, + ...props +}: BasicButton) { return ( {showIcon && ( )} + {children} {label} ); diff --git a/frontend/src/components/Common/Buttons/DeleteButton.tsx b/frontend/src/components/Common/Buttons/DeleteButton.tsx index 1e8fbfada..42acab75a 100644 --- a/frontend/src/components/Common/Buttons/DeleteButton.tsx +++ b/frontend/src/components/Common/Buttons/DeleteButton.tsx @@ -7,12 +7,18 @@ import { IconProp } from "@fortawesome/fontawesome-svg-core"; /** * Red button with a garbage can icon */ -export default function DeleteButton({ label = "", showIcon = true, ...props }: BasicButton) { +export default function DeleteButton({ + label = "", + showIcon = true, + children, + ...props +}: BasicButton) { return ( {showIcon && ( )} + {children} {label} ); diff --git a/frontend/src/components/Common/Buttons/WarningButton.tsx b/frontend/src/components/Common/Buttons/WarningButton.tsx index aa00ef1da..6a4939f27 100644 --- a/frontend/src/components/Common/Buttons/WarningButton.tsx +++ b/frontend/src/components/Common/Buttons/WarningButton.tsx @@ -1,4 +1,4 @@ -import { BasicButton } from "./props"; +import { AnimatedButton } from "./props"; import { RedButton } from "./styles"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faTriangleExclamation } from "@fortawesome/free-solid-svg-icons/faTriangleExclamation"; @@ -7,15 +7,22 @@ import { IconProp } from "@fortawesome/fontawesome-svg-core"; /** * Red button with a warning triangle icon */ -export default function WarningButton({ label = "", showIcon = true, ...props }: BasicButton) { +export default function WarningButton({ + label = "", + showIcon = true, + animated = false, + children, + ...props +}: AnimatedButton) { return ( - + {showIcon && ( )} + {children} {label} ); diff --git a/frontend/src/components/Common/Buttons/props.ts b/frontend/src/components/Common/Buttons/props.ts index b15022253..1c6d7f53a 100644 --- a/frontend/src/components/Common/Buttons/props.ts +++ b/frontend/src/components/Common/Buttons/props.ts @@ -1,6 +1,12 @@ import { ButtonProps } from "react-bootstrap/Button"; +import React from "react"; export interface BasicButton extends ButtonProps { label?: string; showIcon?: boolean; + children?: React.ReactNode; +} + +export interface AnimatedButton extends BasicButton { + animated?: boolean; } diff --git a/frontend/src/components/Common/Buttons/styles.ts b/frontend/src/components/Common/Buttons/styles.ts index dede233f4..7cd62caf4 100644 --- a/frontend/src/components/Common/Buttons/styles.ts +++ b/frontend/src/components/Common/Buttons/styles.ts @@ -1,23 +1,55 @@ import Button from "react-bootstrap/Button"; -import styled from "styled-components"; +import styled, { css } from "styled-components"; import { HoverAnimation } from "../styles"; +import { AnimatedButton } from "./props"; export const GreenButton = styled(Button)` ${HoverAnimation}; background-color: var(--osoc_green); border-color: var(--osoc_green); + color: var(--osoc_blue); &:hover { - background-color: var(--osoc_green_darkened); - border-color: var(--osoc_green_darkened); + background-color: var(--osoc_orange); + border-color: var(--osoc_orange); + color: var(--osoc_blue); } `; -export const RedButton = styled(Button)` +const WarningColourAnimation = css` + animation: button-change-colour infinite 3s ease-in-out; + + @keyframes button-change-colour { + 0% { + background-color: var(--osoc_red); + border-color: var(--osoc_red); + + box-shadow: none; + } + + 50% { + background-color: #ff9089ff; + border-color: #ff9089ff; + + box-shadow: 0 0 30px var(--osoc_red_darkened); + } + + 100% { + background-color: var(--osoc_red); + border-color: var(--osoc_red); + + box-shadow: none; + } + } +`; + +export const RedButton = styled(Button)` ${HoverAnimation}; + ${props => props.animated && WarningColourAnimation}; + background-color: var(--osoc_red); border-color: var(--osoc_red); diff --git a/frontend/src/components/Common/Forms/InputField.tsx b/frontend/src/components/Common/Forms/InputField.tsx index 1c92bcf54..0a45f317d 100644 --- a/frontend/src/components/Common/Forms/InputField.tsx +++ b/frontend/src/components/Common/Forms/InputField.tsx @@ -3,6 +3,9 @@ import { FormControlProps } from "react-bootstrap/FormControl"; /** * An input field that can be used in forms + * This is just the basic React-Bootstrap input field, but it does + * make sure that everyone uses the same one instead of their + * own implementation of it. */ export default function InputField(props: FormControlProps) { return ; diff --git a/frontend/src/components/index.ts b/frontend/src/components/index.ts index 9264eea45..b623c46e4 100644 --- a/frontend/src/components/index.ts +++ b/frontend/src/components/index.ts @@ -1,5 +1,6 @@ export { default as AdminRoute } from "./AdminRoute"; export { default as CurrentEditionRoute } from "./CurrentEditionRoute"; +export * as Common from "./Common"; export { default as Footer } from "./Footer"; export * as LoginComponents from "./LoginComponents"; export { default as Navbar } from "./Navbar"; diff --git a/frontend/src/views/LoginPage/LoginPage.tsx b/frontend/src/views/LoginPage/LoginPage.tsx index c3818c93f..390b9be25 100644 --- a/frontend/src/views/LoginPage/LoginPage.tsx +++ b/frontend/src/views/LoginPage/LoginPage.tsx @@ -3,17 +3,17 @@ import { useNavigate } from "react-router-dom"; import { logIn } from "../../utils/api/login"; +import CreateButton from "../../components/Common/Buttons/CreateButton"; import { Email, Password, SocialButtons, WelcomeText } from "../../components/LoginComponents"; import { EmailLoginContainer, - LoginButton, LoginContainer, LoginPageContainer, NoAccount, VerticalDivider, } from "./styles"; -import { useAuth } from "../../contexts/auth-context"; +import { useAuth } from "../../contexts"; /** * Page where users can log in to the application. @@ -60,7 +60,7 @@ export default function LoginPage() { Don't have an account? Ask an admin for an invite link
    - Log In +
    diff --git a/frontend/src/views/LoginPage/styles.ts b/frontend/src/views/LoginPage/styles.ts index fe3c9f764..ee0b9db8c 100644 --- a/frontend/src/views/LoginPage/styles.ts +++ b/frontend/src/views/LoginPage/styles.ts @@ -32,13 +32,3 @@ export const VerticalDivider = styled.div` export const NoAccount = styled.div` padding-bottom: 15px; `; - -export const LoginButton = styled.button` - width: 120px; - height: 35px; - cursor: pointer; - background: var(--osoc_green); - color: white; - border: none; - border-radius: 5px; -`; From 6e4f8e408ff0ee92277fe1aaaa16a148d0240dfa Mon Sep 17 00:00:00 2001 From: stijndcl Date: Wed, 11 May 2022 19:58:40 +0200 Subject: [PATCH 152/649] Fix navbar margin --- frontend/src/components/Navbar/NavbarBase.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Navbar/NavbarBase.tsx b/frontend/src/components/Navbar/NavbarBase.tsx index 5c0c16680..12ce4455b 100644 --- a/frontend/src/components/Navbar/NavbarBase.tsx +++ b/frontend/src/components/Navbar/NavbarBase.tsx @@ -10,7 +10,7 @@ import Brand from "./Brand"; export default function NavbarBase({ children }: { children?: React.ReactNode }) { return ( - + {children} From aab3798bd98c4c7bb6e8d8c06b94c09bd347bede Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 11 May 2022 21:43:46 +0200 Subject: [PATCH 153/649] Vertical and horizontal seps in navbar --- .../src/components/Navbar/LogoutButton.tsx | 13 ++++++++++-- frontend/src/components/Navbar/Navbar.tsx | 7 +++++-- frontend/src/components/Navbar/styles.ts | 20 +++++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/Navbar/LogoutButton.tsx b/frontend/src/components/Navbar/LogoutButton.tsx index b9945cfe1..5f2db1920 100644 --- a/frontend/src/components/Navbar/LogoutButton.tsx +++ b/frontend/src/components/Navbar/LogoutButton.tsx @@ -1,4 +1,4 @@ -import { LogOutText } from "./styles"; +import { LogOutText, LogOutTextHM } from "./styles"; import { logOut, useAuth } from "../../contexts"; import { useNavigate } from "react-router-dom"; @@ -20,5 +20,14 @@ export default function LogoutButton() { navigate("/login"); } - return Log Out; + return ( + <> + + Log Out + + + Log Out + + + ); } diff --git a/frontend/src/components/Navbar/Navbar.tsx b/frontend/src/components/Navbar/Navbar.tsx index 7d4a1dac9..790b027cc 100644 --- a/frontend/src/components/Navbar/Navbar.tsx +++ b/frontend/src/components/Navbar/Navbar.tsx @@ -1,4 +1,4 @@ -import { BSNavbar } from "./styles"; +import { BSNavbar, HorizontalSep, VerticalSep } from "./styles"; import { useAuth } from "../../contexts"; import Nav from "react-bootstrap/Nav"; import EditionDropdown from "./EditionDropdown"; @@ -11,7 +11,6 @@ import NavbarBase from "./NavbarBase"; import { LinkContainer } from "react-router-bootstrap"; import EditionNavLink from "./EditionNavLink"; import StudentsDropdown from "./StudentsDropdown"; - /** * Navbar component displayed at the top of the screen. * If the user is not signed in, this is hidden automatically. @@ -62,6 +61,8 @@ export default function Navbar() { diff --git a/frontend/src/components/Navbar/styles.ts b/frontend/src/components/Navbar/styles.ts index 304fc980b..e66d1bf78 100644 --- a/frontend/src/components/Navbar/styles.ts +++ b/frontend/src/components/Navbar/styles.ts @@ -28,6 +28,7 @@ export const StyledDropdownItem = styled(NavDropdown.Item)` `; export const LogOutText = styled(BSNavbar.Text)` + padding: 8px; transition: 150ms ease-out; &:hover { @@ -36,3 +37,22 @@ export const LogOutText = styled(BSNavbar.Text)` transition: 150ms ease-in; } `; + +export const LogOutTextHM = styled(BSNavbar.Text)` + padding: 8px 0; + transition: 150ms ease-out; + + &:hover { + cursor: pointer; + color: rgba(255, 255, 255, 75%); + transition: 150ms ease-in; + } +`; + +export const HorizontalSep = styled.hr` + margin: 5px 0; +`; + +export const VerticalSep = styled.div` + margin: 0 10px; +`; From 20735d82864e497fb59b66a193c4b7c98a167bdd Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 11 May 2022 23:17:20 +0200 Subject: [PATCH 154/649] Don't close add modals (input field not clearing) --- .../src/components/AdminsComponents/AddAdmin.tsx | 4 +++- .../Coaches/CoachesComponents/AddCoach.tsx | 13 ++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/AdminsComponents/AddAdmin.tsx b/frontend/src/components/AdminsComponents/AddAdmin.tsx index e73dbeb69..b039302b2 100644 --- a/frontend/src/components/AdminsComponents/AddAdmin.tsx +++ b/frontend/src/components/AdminsComponents/AddAdmin.tsx @@ -89,7 +89,9 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { setLoading(false); if (success) { props.adminAdded(user); - handleClose(); + setSearchTerm(""); + getData(0, ""); + setSelected(undefined); } } diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx index d3b0026e6..d953a1d68 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx @@ -1,10 +1,11 @@ import { getUsersExcludeEdition, User } from "../../../../utils/api/users/users"; -import React, { useState } from "react"; +import { useState, createRef } from "react"; import { addCoachToEdition } from "../../../../utils/api/users/coaches"; import { Button, Modal, Spinner } from "react-bootstrap"; import { Error } from "../../Requests/styles"; import { AddAdminButton, ModalContentConfirm } from "../../../AdminsComponents/styles"; import { AsyncTypeahead, Menu } from "react-bootstrap-typeahead"; +import Typeahead from "react-bootstrap-typeahead/types/core/Typeahead"; import UserMenuItem from "../../../GeneralComponents/MenuItem"; import { StyledMenuItem } from "../../../GeneralComponents/styles"; import { EmailAndAuth } from "../../../GeneralComponents"; @@ -24,6 +25,8 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => const [users, setUsers] = useState([]); // All users which are not a coach const [searchTerm, setSearchTerm] = useState(""); // The word set in filter + const ref = createRef(); + async function getData(page: number, filter: string | undefined = undefined) { if (filter === undefined) { filter = searchTerm; @@ -75,7 +78,10 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => setLoading(false); if (success) { props.refreshCoaches(); - handleClose(); + setSearchTerm(""); + getData(0, ""); + setSelected(undefined); + ref.current?.clear(); // Not clearing } } @@ -101,7 +107,7 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => return ( <> - Add coach + Add coach to current edition @@ -118,6 +124,7 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => minLength={1} onSearch={filterData} options={users} + ref={ref} placeholder={"user's name"} onChange={selected => { setSelected(selected[0] as User); From e2c86e916446fa01ee833c24ee1dc3ff19541a3e Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 4 May 2022 00:07:26 +0200 Subject: [PATCH 155/649] editionId + api call --- .../src/views/StudentsPage/StudentsPage.tsx | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/frontend/src/views/StudentsPage/StudentsPage.tsx b/frontend/src/views/StudentsPage/StudentsPage.tsx index 74ad961b9..f6b96d3ba 100644 --- a/frontend/src/views/StudentsPage/StudentsPage.tsx +++ b/frontend/src/views/StudentsPage/StudentsPage.tsx @@ -1,37 +1,37 @@ -import React, { useEffect, useState } from "react"; -import { StudentListFilters } from "../../components/StudentsComponents"; -import { getStudents } from "../../utils/api/students"; -import {Student} from "../../data/interfaces/students"; -import {useParams} from "react-router-dom"; - -function StudentsPage() { - const params = useParams(); - const [students, setStudents] = useState([]); - const [nameFilter, setNameFilter] = useState(""); - const [rolesFilter, setRolesFilter] = useState([]); - const [alumniFilter, setAlumniFilter] = useState(false); - const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); - - async function callGetStudents() { - try { - const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); - if (response) { - setStudents(response.students); - } - } catch (error) { - console.log(error); - } - } - - useEffect(() => { - callGetStudents(); - }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); - - return ( -
    - -
    - ); -} - -export default StudentsPage; +import React, { useEffect, useState } from "react"; +import { StudentListFilters } from "../../components/StudentsComponents"; +import { getStudents } from "../../utils/api/students"; +import {Student} from "../../data/interfaces/students"; +import {useParams} from "react-router-dom"; + +function StudentsPage() { + const params = useParams() + const [students, setStudents] = useState([]); + const [nameFilter, setNameFilter] = useState(""); + const [rolesFilter, setRolesFilter] = useState([]); + const [alumniFilter, setAlumniFilter] = useState(false); + const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); + + async function callGetStudents() { + try { + const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); + if (response) { + setStudents(response.students); + } + } catch (error) { + console.log(error); + } + } + + useEffect(() => { + callGetStudents(); + }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); + + return ( +
    + +
    + ); +} + +export default StudentsPage; From 1e2a81d84b6a089d07a0419c78495836de765cd5 Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 4 May 2022 05:31:10 +0200 Subject: [PATCH 156/649] all suggestion and confirm logic + popups --- .../StudentInfoComponents/StudentInfo.tsx | 2 - .../StudentInformation/styles.ts | 2 +- .../AdminDecisionContainer.tsx | 64 ++++++- .../AdminDecisionContainer/styles.ts | 15 ++ .../CoachSuggestionContainer.tsx | 160 +++++++++--------- .../StudentInfoComponents/styles.ts | 1 - .../StudentList/StudentCard/StudentCard.tsx | 24 +-- .../StudentList/StudentCard/styles.ts | 8 - .../SuggestionProgressBar.tsx | 34 ++++ .../SuggestionProgressBar/index.ts | 1 + .../SuggestionProgressBar/styles.ts | 7 + frontend/src/data/interfaces/suggestions.ts | 23 +++ frontend/src/utils/api/suggestions.ts | 29 ++++ 13 files changed, 248 insertions(+), 122 deletions(-) create mode 100644 frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts create mode 100644 frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts create mode 100644 frontend/src/data/interfaces/suggestions.ts create mode 100644 frontend/src/utils/api/suggestions.ts diff --git a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx index f9e601627..1099c7543 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx @@ -3,7 +3,6 @@ import { StudentListFilters } from "../StudentsComponents"; import StudentInformation from "./StudentInformation/StudentInformation"; import { StudentInfoPageContent } from "./styles"; import {Student} from "../../data/interfaces/students"; -import RemoveStudentButton from "./RemoveStudentButton/RemoveStudentButton"; interface Props { students: Student[]; @@ -22,7 +21,6 @@ export default function StudentInfo(props: Props) { return ( - ); diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index 6d816ef4b..994713758 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -25,7 +25,7 @@ export const StudentInfoTitle = styled.h4` color: var(--osoc_orange); `; -export const Suggestion = styled.p` +export const SuggestionField = styled.p` font-size: 20px; `; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx index e15249fa6..bad5b8c2f 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -1,19 +1,65 @@ -import React from "react"; -import { Button, Form } from "react-bootstrap"; +import React, {useState} from "react"; +import {Button, Modal} from "react-bootstrap"; import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; +import { SuggestionButtons, ConfirmButton } from "./styles"; export default function AdminDecisionContainer() { + const [show, setShow] = useState(false); + const [clickedButtonText, setClickedButtonText] = useState("") + function handleClose(){ + setShow(false) + setClickedButtonText("") + } + function handleShow(event: React.MouseEvent) { + event.preventDefault(); + setShow(true); + } + + function handleClick(event: React.MouseEvent) { + event.preventDefault(); + const button: HTMLButtonElement = event.currentTarget; + setClickedButtonText(button.innerText) + } + return (
    + + + Definitive decision on student + + Click on one of the buttons to mark your decision + + ) => handleClick(e)}> + Yes + + ) => handleClick(e)}> + Maybe + + ) => handleClick(e)}> + No + + + + + +
    + { clickedButtonText? ( + + ) : ( + + )} +
    +     +

    Definitive decision by admin

    - - - - - - - diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts new file mode 100644 index 000000000..414eba1ad --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts @@ -0,0 +1,15 @@ +import styled from "styled-components"; +import {Button} from "react-bootstrap"; + +export const SuggestionButtons = styled.div` + display: flex; + flex-direction: row; + width: 100%; + margin-top: 2%; +`; + +export const ConfirmButton = styled(Button)` + width: 29.33%; + margin-left: 2%; + margin-right: 2%; +`; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx index 8dc1ede08..c2e2e6843 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx @@ -1,80 +1,80 @@ -import {Button, ButtonGroup, Form, Modal} from "react-bootstrap"; -import React, { useState } from "react"; -import {Student} from "../../../../data/interfaces/students"; -import {makeSuggestion} from "../../../../utils/api/students"; -import {useParams} from "react-router-dom"; - -interface Props { - student: Student; -} - -export default function CoachSuggestionContainer(props: Props) { - const params = useParams() - const [show, setShow] = useState(false); - const [argumentation, setArgumentation] = useState(""); - const [clickedButtonText, setClickedButtonText] = useState("") - - const handleClose = () => setShow(false); - - function handleShow(event: React.MouseEvent) { - event.preventDefault(); - const button: HTMLButtonElement = event.currentTarget; - setClickedButtonText(button.innerText) - setShow(true); - } - - function doSuggestion() { - let suggestionNum: number = 0 - if (clickedButtonText === "Yes") { - suggestionNum = 1; - } else if (clickedButtonText === "Maybe") { - suggestionNum = 2; - } else { - suggestionNum = 3; - } - makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation) - setArgumentation("") - setShow(false) - } - - return ( -
    - - - Suggestion "{clickedButtonText}" for {props.student.firstName + " " + props.student.lastName} - - Why are you giving this decision for this student? - { - setArgumentation(e.target.value); - }} - placeholder="Place your argumentation here..."/> - * This field isn't required - - - - - - -

    Make a suggestion on this student

    - - - - - -
    - ); -} +import {Button, ButtonGroup, Form, Modal} from "react-bootstrap"; +import React, { useState } from "react"; +import {Student} from "../../../../data/interfaces/students"; +import {makeSuggestion} from "../../../../utils/api/students"; +import {useParams} from "react-router-dom"; + +interface Props { + student: Student; +} + +export default function CoachSuggestionContainer(props: Props) { + const params = useParams() + const [show, setShow] = useState(false); + const [argumentation, setArgumentation] = useState(""); + const [clickedButtonText, setClickedButtonText] = useState("") + + const handleClose = () => setShow(false); + + function handleShow(event: React.MouseEvent) { + event.preventDefault(); + const button: HTMLButtonElement = event.currentTarget; + setClickedButtonText(button.innerText) + setShow(true); + } + + function doSuggestion() { + let suggestionNum: number = 0 + if (clickedButtonText === "Yes") { + suggestionNum = 1; + } else if (clickedButtonText === "Maybe") { + suggestionNum = 2; + } else { + suggestionNum = 3; + } + makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation) + setArgumentation("") + setShow(false) + } + + return ( +
    + + + Suggestion "{clickedButtonText}" for {props.student.firstName + " " + props.student.lastName} + + Why are you giving this decision for this student? + { + setArgumentation(e.target.value); + }} + placeholder="Place your argumentation here..."/> + * This field isn't required + + + + + + +

    Make a suggestion on this student

    + + + + + +
    + ); +} \ No newline at end of file diff --git a/frontend/src/components/StudentInfoComponents/styles.ts b/frontend/src/components/StudentInfoComponents/styles.ts index b8c822ed1..ee8d68c10 100644 --- a/frontend/src/components/StudentInfoComponents/styles.ts +++ b/frontend/src/components/StudentInfoComponents/styles.ts @@ -1,7 +1,6 @@ import styled from "styled-components"; export const StudentRemoveButton = styled.button` - position: absolute; width: 150px; height: 35px; right: 5%; diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx index 1d6d5448d..5033c5e11 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx @@ -4,16 +4,11 @@ import { CardStudentInfo, CardVerticalContainer, CardHorizontalContainer, - CardSuggestionBar, CardStudentName, - CardAmountSuggestions, - AllSuggestions, - SuggestionSignYes, - SuggestionSignMaybe, - SuggestionSignNo } from "./styles"; import {useNavigate, useParams} from "react-router-dom"; import {NrSuggestions} from "../../../../data/interfaces/students"; +import SuggestionProgressBar from "../SuggestionProgressBar"; interface Props { firstName: string; @@ -22,6 +17,7 @@ interface Props { } export default function StudentCard(props: Props) { + const params = useParams() const navigate = useNavigate(); const params = useParams() @@ -33,22 +29,8 @@ export default function StudentCard(props: Props) { {props.firstName} - - V - - {props.nrOfSuggestions.yes} - - ? - - {props.nrOfSuggestions.maybe} - - X - - {props.nrOfSuggestions.no} - - - + diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts index b64a2feef..64d2dac34 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts @@ -21,14 +21,6 @@ export const CardConfirmColorBlock = styled.div` z-index: 1; `; -export const CardSuggestionBar = styled.div` - height: 2px; - width: 90%; - background: var(--osoc_green); - margin-left: 5%; - margin-bottom: 15px; -`; - export const CardStudentInfo = styled.div` display: flex; width: 100%; diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx new file mode 100644 index 000000000..4909b16af --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx @@ -0,0 +1,34 @@ +import React from "react"; +import {NrSuggestions} from "../../../../data/interfaces/students"; +import { + SuggestionBarContainer +} from "./styles"; +import { ProgressBar } from "react-bootstrap"; + + +interface Props { + nrOfSuggestions: NrSuggestions; +} + +function totalSuggestions(suggestions: NrSuggestions) { + let total: number = 0; + Object.entries(suggestions).forEach(([key, value]) => {total += value}) + return total +} + +export default function SuggestionProgressBar(props: Props) { + const amountSuggestions = totalSuggestions(props.nrOfSuggestions) + const frequencyYes = props.nrOfSuggestions.yes * 100/amountSuggestions + const frequencyMaybe = props.nrOfSuggestions.maybe * 100/amountSuggestions + const frequencyNo = props.nrOfSuggestions.no * 100/amountSuggestions + console.log(props.nrOfSuggestions) + return ( + + + + + + + + ); +} diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts new file mode 100644 index 000000000..ad83f01df --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts @@ -0,0 +1 @@ +export { default } from "./SuggestionProgressBar"; \ No newline at end of file diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts new file mode 100644 index 000000000..202a0f2a9 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/styles.ts @@ -0,0 +1,7 @@ +import styled from "styled-components"; + +export const SuggestionBarContainer = styled.div` + width: 90%; + background: transparent; + margin-left: 5%; +`; diff --git a/frontend/src/data/interfaces/suggestions.ts b/frontend/src/data/interfaces/suggestions.ts new file mode 100644 index 000000000..6db8d905e --- /dev/null +++ b/frontend/src/data/interfaces/suggestions.ts @@ -0,0 +1,23 @@ +export interface Suggestion { + suggestionId: number; + coach: OsocCoach; + suggestion: number; + argumentation: string; +} + +export interface OsocCoach { + userId: number; + name: string; + admin: boolean; + auth: Authentication; +} + +export interface Authentication { + authType: string; + email: string; +} + +export interface Suggestions { + /** A list of projects */ + suggestions: Suggestion[]; +} \ No newline at end of file diff --git a/frontend/src/utils/api/suggestions.ts b/frontend/src/utils/api/suggestions.ts new file mode 100644 index 000000000..c41baf491 --- /dev/null +++ b/frontend/src/utils/api/suggestions.ts @@ -0,0 +1,29 @@ +import axios from "axios"; +import {axiosInstance} from "./api"; +import {Suggestions} from "../../data/interfaces/suggestions"; + +export async function getSuggestions(edition: string, studentId: string){ + try { + const response = await axiosInstance.get("/editions/" + edition + "/students/" + studentId.toString() + "/suggestions"); + return response.data as Suggestions; + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} + +export async function confirmStudent(edition: string, studentId: string, confirmValue: number) { + try { + const response = await axiosInstance.put("/editions/" + edition + "/students/" + studentId.toString() + "/decision", { decision: confirmValue }); + return response.status === 204 + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} \ No newline at end of file From 182dc223540b68691811477aeb2fb064b643a118 Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 4 May 2022 05:31:26 +0200 Subject: [PATCH 157/649] forgot one file --- .../StudentInformation/StudentInformation.tsx | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index b04a570f3..a3d4a5931 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, {useEffect, useState} from "react"; import { FullName, FirstName, @@ -6,7 +6,7 @@ import { LineBreak, PreferedName, StudentInfoTitle, - Suggestion, + SuggestionField, StudentInformationContainer, PersonalInfoField, PersonalInfoFieldValue, @@ -17,18 +17,51 @@ import { } from "./styles"; import { AdminDecisionContainer, CoachSuggestionContainer } from "../SuggestionComponents"; import {Student} from "../../../data/interfaces/students"; +import {Suggestion} from "../../../data/interfaces/suggestions"; +import {getSuggestions} from "../../../utils/api/suggestions"; +import {useParams} from "react-router-dom"; +import RemoveStudentButton from "../RemoveStudentButton/RemoveStudentButton"; interface Props { currentStudent: Student; } export default function StudentInformation(props: Props) { + const [suggestions, setSuggestions] = useState([]); + const params = useParams() + + async function callGetSuggestions() { + try { + const response = await getSuggestions(params.editionId!, params.id!); + setSuggestions(response.suggestions); + } catch (error) { + console.log(error); + } + } + + function suggestionToText(suggestion: number) { + if (suggestion === 0) { + return "Undecided" + } else if (suggestion === 1) { + return "Yes" + } else if (suggestion === 2) { + return "Maybe" + } else if (suggestion === 3) { + return "No" + } + } + + useEffect(() => { + callGetSuggestions(); + console.log("fetched suggestion") + }, [params.editionId!, params.id!]); if (!props.currentStudent) { return

    loading

    } else { return ( + {props.currentStudent.firstName} {props.currentStudent.lastName} @@ -36,15 +69,9 @@ export default function StudentInformation(props: Props) { Prefered name: {props.currentStudent.preferredName} Suggestions - - Wow this student is really incredible! We should give her a project! - - - Wow this student is really incredible! We should give her a project! - - - Wow this student is really incredible! We should give her a project! - + {suggestions.map(suggestion => ( + {suggestionToText(suggestion.suggestion)}: {suggestion.argumentation} + ))} Personal information From 42d26b869936c8539a5a74a852f6cc8cdef5baff Mon Sep 17 00:00:00 2001 From: cledloof Date: Sat, 7 May 2022 15:20:07 +0200 Subject: [PATCH 158/649] rebased from develop --- .../StudentsComponents/StudentList/StudentCard/StudentCard.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx index 5033c5e11..fc4a61b41 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx @@ -17,7 +17,6 @@ interface Props { } export default function StudentCard(props: Props) { - const params = useParams() const navigate = useNavigate(); const params = useParams() From 0158892d9695c5bbab23088b95b873ef5fd35480 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 02:57:21 +0200 Subject: [PATCH 159/649] rebasing --- frontend/src/utils/api/students.ts | 172 +++++++++--------- .../src/views/StudentsPage/StudentsPage.tsx | 74 ++++---- 2 files changed, 123 insertions(+), 123 deletions(-) diff --git a/frontend/src/utils/api/students.ts b/frontend/src/utils/api/students.ts index 255b21489..fcdcad57c 100644 --- a/frontend/src/utils/api/students.ts +++ b/frontend/src/utils/api/students.ts @@ -1,86 +1,86 @@ -import axios from "axios"; -import { Student, Students } from "../../data/interfaces/students"; -import { axiosInstance } from "./api"; - -export async function getStudents( - edition: string, - nameFilter: string, - rolesFilter: number[], - alumniFilter: boolean, - studentCoachVolunteerFilter: boolean -): Promise { - try { - const response = await axiosInstance.get( - "/editions/" + - edition + - "/students/?first_name=" + - nameFilter + - "&alumni=" + - alumniFilter + - "&student_coach=" + - studentCoachVolunteerFilter - ); - const students = response.data as Students; - return students; - } catch (error) { - if (axios.isAxiosError(error)) { - throw error; - } else { - throw error; - } - } -} - -export async function getStudent(edition: string, studentId: string): Promise { - try { - const request = "/editions/" + edition + "/students/" + studentId.toString(); - const response = await axiosInstance.get(request); - const student = response.data.student as Student; - console.log("get student"); - console.log(student); - return student; - } catch (error) { - if (axios.isAxiosError(error)) { - throw error; - } else { - throw error; - } - } -} - -export async function removeStudent(edition: string, studentId: string): Promise { - try { - const request = "/editions/" + edition + "/students/" + studentId.toString(); - await axiosInstance.delete(request); - return 201; - } catch (error) { - if (axios.isAxiosError(error)) { - return 422; - } else { - throw error; - } - } -} - -export async function makeSuggestion( - edition: string, - studentId: string, - suggestionArg: number, - argumentationArg: string -): Promise { - try { - const request = - "/editions/" + edition + "/students/" + studentId.toString() + "/suggestions"; - await axiosInstance.post(request, { - suggestion: suggestionArg, - argumentation: argumentationArg, - }); - return 201; - } catch (error) { - if (axios.isAxiosError(error)) { - return 422; - } else { - throw error; - } - } -} +import axios from "axios"; +import { Student, Students } from "../../data/interfaces/students"; +import { axiosInstance } from "./api"; + +export async function getStudents( + edition: string, + nameFilter: string, + rolesFilter: number[], + alumniFilter: boolean, + studentCoachVolunteerFilter: boolean +): Promise { + try { + const response = await axiosInstance.get( + "/editions/" + + edition + + "/students/?first_name=" + + nameFilter + + "&alumni=" + + alumniFilter + + "&student_coach=" + + studentCoachVolunteerFilter + ); + const students = response.data as Students; + return students; + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} + +export async function getStudent(edition: string, studentId: string): Promise { + try { + const request = "/editions/" + edition + "/students/" + studentId.toString(); + const response = await axiosInstance.get(request); + const student = response.data.student as Student; + console.log("get student"); + console.log(student); + return student; + } catch (error) { + if (axios.isAxiosError(error)) { + throw error; + } else { + throw error; + } + } +} + +export async function removeStudent(edition: string, studentId: string): Promise { + try { + const request = "/editions/" + edition + "/students/" + studentId.toString(); + await axiosInstance.delete(request); + return 201; + } catch (error) { + if (axios.isAxiosError(error)) { + return 422; + } else { + throw error; + } + } +} + +export async function makeSuggestion( + edition: string, + studentId: string, + suggestionArg: number, + argumentationArg: string +): Promise { + try { + const request = + "/editions/" + edition + "/students/" + studentId.toString() + "/suggestions"; + await axiosInstance.post(request, { + suggestion: suggestionArg, + argumentation: argumentationArg, + }); + return 201; + } catch (error) { + if (axios.isAxiosError(error)) { + return 422; + } else { + throw error; + } + } +} diff --git a/frontend/src/views/StudentsPage/StudentsPage.tsx b/frontend/src/views/StudentsPage/StudentsPage.tsx index f6b96d3ba..afbf82b75 100644 --- a/frontend/src/views/StudentsPage/StudentsPage.tsx +++ b/frontend/src/views/StudentsPage/StudentsPage.tsx @@ -1,37 +1,37 @@ -import React, { useEffect, useState } from "react"; -import { StudentListFilters } from "../../components/StudentsComponents"; -import { getStudents } from "../../utils/api/students"; -import {Student} from "../../data/interfaces/students"; -import {useParams} from "react-router-dom"; - -function StudentsPage() { - const params = useParams() - const [students, setStudents] = useState([]); - const [nameFilter, setNameFilter] = useState(""); - const [rolesFilter, setRolesFilter] = useState([]); - const [alumniFilter, setAlumniFilter] = useState(false); - const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); - - async function callGetStudents() { - try { - const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); - if (response) { - setStudents(response.students); - } - } catch (error) { - console.log(error); - } - } - - useEffect(() => { - callGetStudents(); - }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); - - return ( -
    - -
    - ); -} - -export default StudentsPage; +import React, { useEffect, useState } from "react"; +import { StudentListFilters } from "../../components/StudentsComponents"; +import { getStudents } from "../../utils/api/students"; +import {Student} from "../../data/interfaces/students"; +import {useParams} from "react-router-dom"; + +function StudentsPage() { + const params = useParams() + const [students, setStudents] = useState([]); + const [nameFilter, setNameFilter] = useState(""); + const [rolesFilter, setRolesFilter] = useState([]); + const [alumniFilter, setAlumniFilter] = useState(false); + const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); + + async function callGetStudents() { + try { + const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); + if (response) { + setStudents(response.students); + } + } catch (error) { + console.log(error); + } + } + + useEffect(() => { + callGetStudents(); + }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); + + return ( +
    + +
    + ); +} + +export default StudentsPage; From b6922c1f5760e09fb2b0bcdae87c88b36a841e2d Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 4 May 2022 05:31:10 +0200 Subject: [PATCH 160/649] all suggestion and confirm logic + popups --- .../CoachSuggestionContainer.tsx | 165 +++++++++--------- .../StudentList/StudentCard/StudentCard.tsx | 1 + 2 files changed, 86 insertions(+), 80 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx index c2e2e6843..bb202fcd3 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx @@ -1,80 +1,85 @@ -import {Button, ButtonGroup, Form, Modal} from "react-bootstrap"; -import React, { useState } from "react"; -import {Student} from "../../../../data/interfaces/students"; -import {makeSuggestion} from "../../../../utils/api/students"; -import {useParams} from "react-router-dom"; - -interface Props { - student: Student; -} - -export default function CoachSuggestionContainer(props: Props) { - const params = useParams() - const [show, setShow] = useState(false); - const [argumentation, setArgumentation] = useState(""); - const [clickedButtonText, setClickedButtonText] = useState("") - - const handleClose = () => setShow(false); - - function handleShow(event: React.MouseEvent) { - event.preventDefault(); - const button: HTMLButtonElement = event.currentTarget; - setClickedButtonText(button.innerText) - setShow(true); - } - - function doSuggestion() { - let suggestionNum: number = 0 - if (clickedButtonText === "Yes") { - suggestionNum = 1; - } else if (clickedButtonText === "Maybe") { - suggestionNum = 2; - } else { - suggestionNum = 3; - } - makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation) - setArgumentation("") - setShow(false) - } - - return ( -
    - - - Suggestion "{clickedButtonText}" for {props.student.firstName + " " + props.student.lastName} - - Why are you giving this decision for this student? - { - setArgumentation(e.target.value); - }} - placeholder="Place your argumentation here..."/> - * This field isn't required - - - - - - -

    Make a suggestion on this student

    - - - - - -
    - ); -} \ No newline at end of file +import { Button, ButtonGroup, Form, Modal } from "react-bootstrap"; +import React, { useState } from "react"; +import { Student } from "../../../../data/interfaces/students"; +import { makeSuggestion } from "../../../../utils/api/students"; +import { useParams } from "react-router-dom"; + +interface Props { + student: Student; +} + +export default function CoachSuggestionContainer(props: Props) { + const params = useParams(); + const [show, setShow] = useState(false); + const [argumentation, setArgumentation] = useState(""); + const [clickedButtonText, setClickedButtonText] = useState(""); + + const handleClose = () => setShow(false); + + function handleShow(event: React.MouseEvent) { + event.preventDefault(); + const button: HTMLButtonElement = event.currentTarget; + setClickedButtonText(button.innerText); + setShow(true); + } + + function doSuggestion() { + let suggestionNum: number = 0; + if (clickedButtonText === "Yes") { + suggestionNum = 1; + } else if (clickedButtonText === "Maybe") { + suggestionNum = 2; + } else { + suggestionNum = 3; + } + makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation); + setArgumentation(""); + setShow(false); + } + + return ( +
    + + + + Suggestion "{clickedButtonText}" for{" "} + {props.student.firstName + " " + props.student.lastName} + + + + Why are you giving this decision for this student? + { + setArgumentation(e.target.value); + }} + placeholder="Place your argumentation here..." + /> + * This field isn't required + + + + + + +

    Make a suggestion on this student

    + + + + + +
    + ); +} diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx index fc4a61b41..5033c5e11 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx @@ -17,6 +17,7 @@ interface Props { } export default function StudentCard(props: Props) { + const params = useParams() const navigate = useNavigate(); const params = useParams() From 09d2fb55407030777c55966d6c3dd917d33e5ed3 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 02:50:51 +0200 Subject: [PATCH 161/649] layout change --- .../StudentInformation/StudentInformation.tsx | 73 ++++++++++++------- .../StudentInformation/styles.ts | 8 ++ 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index a3d4a5931..a12d87c72 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -1,4 +1,4 @@ -import React, {useEffect, useState} from "react"; +import React, { useEffect, useState } from "react"; import { FullName, FirstName, @@ -14,12 +14,13 @@ import { RolesField, RolesValues, Role, + NameAndRemoveButtonContainer, } from "./styles"; import { AdminDecisionContainer, CoachSuggestionContainer } from "../SuggestionComponents"; -import {Student} from "../../../data/interfaces/students"; -import {Suggestion} from "../../../data/interfaces/suggestions"; -import {getSuggestions} from "../../../utils/api/suggestions"; -import {useParams} from "react-router-dom"; +import { Student } from "../../../data/interfaces/students"; +import { Suggestion } from "../../../data/interfaces/suggestions"; +import { getSuggestions } from "../../../utils/api/suggestions"; +import { useParams } from "react-router-dom"; import RemoveStudentButton from "../RemoveStudentButton/RemoveStudentButton"; interface Props { @@ -28,7 +29,7 @@ interface Props { export default function StudentInformation(props: Props) { const [suggestions, setSuggestions] = useState([]); - const params = useParams() + const params = useParams(); async function callGetSuggestions() { try { @@ -41,56 +42,72 @@ export default function StudentInformation(props: Props) { function suggestionToText(suggestion: number) { if (suggestion === 0) { - return "Undecided" + return "Undecided"; } else if (suggestion === 1) { - return "Yes" + return "Yes"; } else if (suggestion === 2) { - return "Maybe" + return "Maybe"; } else if (suggestion === 3) { - return "No" + return "No"; } } useEffect(() => { callGetSuggestions(); - console.log("fetched suggestion") + console.log("fetched suggestion"); }, [params.editionId!, params.id!]); if (!props.currentStudent) { - return

    loading

    + return ( +
    +

    loading

    +
    + ); } else { return ( - - - {props.currentStudent.firstName} - {props.currentStudent.lastName} - + + + {props.currentStudent.firstName} + {props.currentStudent.lastName} + + + Prefered name: {props.currentStudent.preferredName} - + Suggestions {suggestions.map(suggestion => ( - {suggestionToText(suggestion.suggestion)}: {suggestion.argumentation} + + {suggestionToText(suggestion.suggestion)}: {suggestion.argumentation} + ))} - + Personal information Email: - {props.currentStudent.emailAddress} + + {props.currentStudent.emailAddress} + Phone number: - {props.currentStudent.phoneNumber} + + {props.currentStudent.phoneNumber} + Is an alumni?: - {props.currentStudent.alumni? "Yes": "No" } + + {props.currentStudent.alumni ? "Yes" : "No"} + Wants to be student coach?: - {props.currentStudent.wantsToBeStudentCoach? "Yes" : "No" } + + {props.currentStudent.wantsToBeStudentCoach ? "Yes" : "No"} + - + Skills Roles: @@ -100,10 +117,10 @@ export default function StudentInformation(props: Props) { Communication - +
    - - + +
    ); diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index 994713758..611be99cf 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -63,3 +63,11 @@ export const LineBreak = styled.div` export const DefinitiveDecisionContainer = styled.div` width: 40%; `; + +export const NameAndRemoveButtonContainer = styled.div` + background: orange; + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; +`; From eb9955bdeb24961081b823a128ee65fc7822778f Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 03:11:48 +0200 Subject: [PATCH 162/649] removed DOM error --- .../StudentInformation/styles.ts | 2 +- .../StudentList/StudentCard/StudentCard.tsx | 15 +- frontend/yarn.lock | 140 ++++++++++++++++-- 3 files changed, 141 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index 611be99cf..faa12e192 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -29,7 +29,7 @@ export const SuggestionField = styled.p` font-size: 20px; `; -export const PersonalInfoField = styled.p` +export const PersonalInfoField = styled.div` width: 100%; display: flex; `; diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx index 5033c5e11..e2294a190 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx @@ -6,8 +6,8 @@ import { CardHorizontalContainer, CardStudentName, } from "./styles"; -import {useNavigate, useParams} from "react-router-dom"; -import {NrSuggestions} from "../../../../data/interfaces/students"; +import { useNavigate, useParams } from "react-router-dom"; +import { NrSuggestions } from "../../../../data/interfaces/students"; import SuggestionProgressBar from "../SuggestionProgressBar"; interface Props { @@ -17,20 +17,23 @@ interface Props { } export default function StudentCard(props: Props) { - const params = useParams() + const params = useParams(); const navigate = useNavigate(); - const params = useParams() return ( <> - navigate(`/editions/${params.editionId}/students/${props.studentId}`)}> + + navigate(`/editions/${params.editionId}/students/${props.studentId}`) + } + > {/* */} {props.firstName} - + diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 7151b4a47..1f233d250 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -515,7 +515,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.16.7": +"@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665" integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q== @@ -1031,6 +1031,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.12.0", "@babel/runtime@^7.13.10", "@babel/runtime@^7.7.2": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" + integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.16.7", "@babel/template@^7.3.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" @@ -1133,6 +1140,40 @@ dependencies: postcss-value-parser "^4.2.0" +"@emotion/babel-plugin@^11.7.1": + version "11.9.2" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz#723b6d394c89fb2ef782229d92ba95a740576e95" + integrity sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw== + dependencies: + "@babel/helper-module-imports" "^7.12.13" + "@babel/plugin-syntax-jsx" "^7.12.13" + "@babel/runtime" "^7.13.10" + "@emotion/hash" "^0.8.0" + "@emotion/memoize" "^0.7.5" + "@emotion/serialize" "^1.0.2" + babel-plugin-macros "^2.6.1" + convert-source-map "^1.5.0" + escape-string-regexp "^4.0.0" + find-root "^1.1.0" + source-map "^0.5.7" + stylis "4.0.13" + +"@emotion/cache@^11.4.0", "@emotion/cache@^11.7.1": + version "11.7.1" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539" + integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/sheet" "^1.1.0" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + stylis "4.0.13" + +"@emotion/hash@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" + integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== + "@emotion/is-prop-valid@^0.8.8": version "0.8.8" resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" @@ -1145,16 +1186,60 @@ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== +"@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" + integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== + +"@emotion/react@^11.8.1": + version "11.9.0" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.9.0.tgz#b6d42b1db3bd7511e7a7c4151dc8bc82e14593b8" + integrity sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ== + dependencies: + "@babel/runtime" "^7.13.10" + "@emotion/babel-plugin" "^11.7.1" + "@emotion/cache" "^11.7.1" + "@emotion/serialize" "^1.0.3" + "@emotion/utils" "^1.1.0" + "@emotion/weak-memoize" "^0.2.5" + hoist-non-react-statics "^3.3.1" + +"@emotion/serialize@^1.0.2", "@emotion/serialize@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.3.tgz#99e2060c26c6292469fb30db41f4690e1c8fea63" + integrity sha512-2mSSvgLfyV3q+iVh3YWgNlUc2a9ZlDU7DjuP5MjK3AXRR0dYigCrP99aeFtaB2L/hjfEZdSThn5dsZ0ufqbvsA== + dependencies: + "@emotion/hash" "^0.8.0" + "@emotion/memoize" "^0.7.4" + "@emotion/unitless" "^0.7.5" + "@emotion/utils" "^1.0.0" + csstype "^3.0.2" + +"@emotion/sheet@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2" + integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g== + "@emotion/stylis@^0.8.4": version "0.8.5" resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== -"@emotion/unitless@^0.7.4": +"@emotion/unitless@^0.7.4", "@emotion/unitless@^0.7.5": version "0.7.5" resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== +"@emotion/utils@^1.0.0", "@emotion/utils@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf" + integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ== + +"@emotion/weak-memoize@^0.2.5": + version "0.2.5" + resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" + integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== + "@eslint/eslintrc@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6" @@ -2028,7 +2113,7 @@ "@types/history" "^4.7.11" "@types/react" "*" -"@types/react-transition-group@^4.4.4": +"@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.4": version "4.4.4" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e" integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug== @@ -2749,6 +2834,15 @@ babel-plugin-jest-hoist@^27.5.1: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" +babel-plugin-macros@^2.6.1: + version "2.8.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" + integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== + dependencies: + "@babel/runtime" "^7.7.2" + cosmiconfig "^6.0.0" + resolve "^1.12.0" + babel-plugin-macros@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" @@ -3345,7 +3439,7 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== @@ -4676,6 +4770,11 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" +find-root@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" + integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== + find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -5007,7 +5106,7 @@ history@^5.2.0: dependencies: "@babel/runtime" "^7.7.6" -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0: +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -6344,6 +6443,11 @@ memfs@^3.1.2, memfs@^3.4.1: dependencies: fs-monkey "1.0.3" +memoize-one@^5.0.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e" + integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== + merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" @@ -7536,7 +7640,7 @@ prop-types-extra@^1.1.0: react-is "^16.3.2" warning "^4.0.0" -prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -7862,6 +7966,19 @@ react-scripts@^5.0.0: optionalDependencies: fsevents "^2.3.2" +react-select@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.3.2.tgz#ecee0d5c59ed4acb7f567f7de3c75a488d93dacb" + integrity sha512-W6Irh7U6Ha7p5uQQ2ZnemoCQ8mcfgOtHfw3wuMzG6FAu0P+CYicgofSLOq97BhjMx8jS+h+wwWdCBeVVZ9VqlQ== + dependencies: + "@babel/runtime" "^7.12.0" + "@emotion/cache" "^11.4.0" + "@emotion/react" "^11.8.1" + "@types/react-transition-group" "^4.4.0" + memoize-one "^5.0.0" + prop-types "^15.6.0" + react-transition-group "^4.3.0" + react-social-login-buttons@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/react-social-login-buttons/-/react-social-login-buttons-3.6.0.tgz#2be1cb114d8c0200581ba1c8ec5ea74e89cf7701" @@ -7884,7 +8001,7 @@ react-toastify@^9.0.1: dependencies: clsx "^1.1.1" -react-transition-group@^4.4.2: +react-transition-group@^4.3.0, react-transition-group@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== @@ -8086,7 +8203,7 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@^1.10.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0: +resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== @@ -8466,7 +8583,7 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.5.0: +source-map@^0.5.0, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -8705,6 +8822,11 @@ stylehacks@^*: browserslist "^4.16.6" postcss-selector-parser "^6.0.4" +stylis@4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" + integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== + supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" From 515797a3acc7f90ee3988d2a5ed05600dcddf339 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 03:19:46 +0200 Subject: [PATCH 163/649] removed script because doesn't work for me --- backend/fill_database.py | 297 --------------------------------------- 1 file changed, 297 deletions(-) delete mode 100644 backend/fill_database.py diff --git a/backend/fill_database.py b/backend/fill_database.py deleted file mode 100644 index 930e2577a..000000000 --- a/backend/fill_database.py +++ /dev/null @@ -1,297 +0,0 @@ -from datetime import date -from sqlalchemy.orm import Session - -from src.database.models import (User, AuthEmail, Skill, Student, - Edition, CoachRequest, DecisionEmail, InviteLink, Partner, - Project, ProjectRole, Suggestion) -from src.database.enums import DecisionEnum, EmailStatusEnum -from src.app.logic.security import get_password_hash - - -def fill_database(db: Session): - """A function to fill the database with fake data that can easly be used when testing""" - # Editions - edition: Edition = Edition(year=2022, name="ed2022") - db.add(edition) - db.commit() - - # Users - admin: User = User(name="admin", admin=True) - coach1: User = User(name="coach1") - coach2: User = User(name="coach2") - request: User = User(name="request") - db.add(admin) - db.add(coach1) - db.add(coach2) - db.add(request) - db.commit() - - # AuthEmail - pw_hash = get_password_hash("wachtwoord") - auth_email_admin: AuthEmail = AuthEmail(user=admin, email="admin@ngmail.com", pw_hash=pw_hash) - auth_email_coach1: AuthEmail = AuthEmail(user=coach1, email="coach1@noutlook.be", pw_hash=pw_hash) - auth_email_coach2: AuthEmail = AuthEmail(user=coach2, email="coach2@noutlook.be", pw_hash=pw_hash) - auth_email_request: AuthEmail = AuthEmail(user=request, email="request@ngmail.com", pw_hash=pw_hash) - db.add(auth_email_admin) - db.add(auth_email_coach1) - db.add(auth_email_coach2) - db.add(auth_email_request) - db.commit() - - # Skill - skill1: Skill = Skill(name="skill1", description="something about skill1") - skill2: Skill = Skill(name="skill2", description="something about skill2") - skill3: Skill = Skill(name="skill3", description="something about skill3") - skill4: Skill = Skill(name="skill4", description="something about skill4") - skill5: Skill = Skill(name="skill5", description="something about skill5") - skill6: Skill = Skill(name="skill6", description="something about skill6") - db.add(skill1) - db.add(skill2) - db.add(skill3) - db.add(skill4) - db.add(skill5) - db.add(skill6) - db.commit() - - # Student - student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", - email_address="josvermeulen@mail.com", phone_number="0487/86.24.45", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill1, skill3, skill6]) - student02: Student = Student(first_name="Isabella", last_name="Christensen", preferred_name="Isabella", - email_address="isabella.christensen@example.com", phone_number="98389723", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) - student03: Student = Student(first_name="Lotte", last_name="Buss", preferred_name="Lotte", - email_address="lotte.buss@example.com", phone_number="0284-0749932", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student04: Student = Student(first_name="Délano", last_name="Van Lienden", preferred_name="Délano", - email_address="delano.vanlienden@mail.com", phone_number="128-049-9143", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student05: Student = Student(first_name="Einar", last_name="Rossebø", preferred_name="Einar", - email_address="einar.rossebo@example.com", phone_number="61491822", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) - student06: Student = Student(first_name="Dave", last_name="Johnston", preferred_name="Dave", - email_address="dave.johnston@example.com", phone_number="031-156-2869", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) - student07: Student = Student(first_name="Fernando", last_name="Stone", preferred_name="Fernando", - email_address="fernando.stone@mail.com", phone_number="(441)-156-4776", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student08: Student = Student(first_name="Isabelle", last_name="Singh", preferred_name="Isabelle", - email_address="isabelle.singh@example.com", phone_number="(338)-531-9957", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) - student09: Student = Student(first_name="Blake", last_name="Martin", preferred_name="Blake", - email_address="blake.martin@example.com", phone_number="404-060-5843", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student10: Student = Student(first_name="Mehmet", last_name="Dizdar", preferred_name="Mehmet", - email_address="mehmet.dizdar@example.com", phone_number="(787)-938-6216", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill2]) - student11: Student = Student(first_name="Mehmet", last_name="Balci", preferred_name="Mehmet", - email_address="mehmet.balci@example.com", phone_number="(496)-221-8222", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student12: Student = Student(first_name="Óscar", last_name="das Neves", preferred_name="Óscar", - email_address="oscar.dasneves@example.com", phone_number="(47) 6646-0730", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill4]) - student13: Student = Student(first_name="Melike", last_name="Süleymanoğlu", preferred_name="Melike", - email_address="melike.suleymanoglu@mail.com", phone_number="274-545-3055", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) - student14: Student = Student(first_name="Magnus", last_name="Schanke", preferred_name="Magnus", - email_address="magnus.schanke@example.com", phone_number="63507430", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) - student15: Student = Student(first_name="Tara", last_name="Howell", preferred_name="Tara", - email_address="tara.howell@example.com", phone_number="07-9111-0958", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student16: Student = Student(first_name="Hanni", last_name="Ewers", preferred_name="Hanni", - email_address="hanni.ewers@example.com", phone_number="0241-5176890", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill1, skill6, skill5]) - student17: Student = Student(first_name="آیناز", last_name="کریمی", preferred_name="آیناز", - email_address="aynz.khrymy@example.com", phone_number="009-26345191", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) - student18: Student = Student(first_name="Vicente", last_name="Garrido", preferred_name="Vicente", - email_address="vicente.garrido@example.com", phone_number="987-381-670", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student19: Student = Student(first_name="Elmer", last_name="Morris", preferred_name="Elmer", - email_address="elmer.morris@example.com", phone_number="(611)-832-8108", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student20: Student = Student(first_name="Alexis", last_name="Roy", preferred_name="Alexis", - email_address="alexis.roy@example.com", phone_number="566-546-7642", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student21: Student = Student(first_name="Lillie", last_name="Kelly", preferred_name="Lillie", - email_address="lillie.kelly@example.com", phone_number="(983)-560-1392", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student22: Student = Student(first_name="Karola", last_name="Andersen", preferred_name="Karola", - email_address="karola.andersen@example.com", phone_number="0393-3219328", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student23: Student = Student(first_name="Elvine", last_name="Andvik", preferred_name="Elvine", - email_address="elvine.andvik@example.com", phone_number="30454610", alumni=True, - wants_to_be_student_coach=True, edition=edition, skills=[skill2, skill4, skill5]) - student24: Student = Student(first_name="Chris", last_name="Kelly", preferred_name="Chris", - email_address="chris.kelly@example.com", phone_number="061-399-0053", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill4]) - student25: Student = Student(first_name="Aada", last_name="Pollari", preferred_name="Aada", - email_address="aada.pollari@example.com", phone_number="02-908-609", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student26: Student = Student(first_name="Sofia", last_name="Haataja", preferred_name="Sofia", - email_address="sofia.haataja@example.com", phone_number="06-373-889", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student27: Student = Student(first_name="Charlene", last_name="Gregory", preferred_name="Charlene", - email_address="charlene.gregory@mail.com", phone_number="(991)-378-7095", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student28: Student = Student(first_name="Danielle", last_name="Chavez", preferred_name="Danielle", - email_address="danielle.chavez@example.com", phone_number="01435 91142", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student29: Student = Student(first_name="Nikolaj", last_name="Poulsen", preferred_name="Nikolaj", - email_address="nikolaj.poulsen@example.com", phone_number="20525141", alumni=False, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student30: Student = Student(first_name="Marta", last_name="Marquez", preferred_name="Marta", - email_address="marta.marquez@example.com", phone_number="967-895-285", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - student31: Student = Student(first_name="Gül", last_name="Barbarosoğlu", preferred_name="Gül", - email_address="gul.barbarosoglu@mail.com", phone_number="(008)-316-3264", alumni=True, - wants_to_be_student_coach=False, edition=edition, skills=[skill2, skill4, skill5]) - - db.add(student01) - db.add(student02) - db.add(student03) - db.add(student04) - db.add(student05) - db.add(student06) - db.add(student07) - db.add(student08) - db.add(student09) - db.add(student10) - db.add(student11) - db.add(student12) - db.add(student13) - db.add(student14) - db.add(student15) - db.add(student16) - db.add(student17) - db.add(student18) - db.add(student19) - db.add(student20) - db.add(student21) - db.add(student22) - db.add(student23) - db.add(student24) - db.add(student25) - db.add(student26) - db.add(student27) - db.add(student28) - db.add(student29) - db.add(student30) - db.add(student31) - db.commit() - - # CoachRequest - coach_request: CoachRequest = CoachRequest(edition=edition, user=request) - db.add(coach_request) - db.commit() - - # DecisionEmail - decision_email1: DecisionEmail = DecisionEmail( - decision=EmailStatusEnum.REJECTED, student=student29, date=date.today()) - decision_email2: DecisionEmail = DecisionEmail( - decision=EmailStatusEnum.APPROVED, student=student09, date=date.today()) - decision_email3: DecisionEmail = DecisionEmail( - decision=EmailStatusEnum.APPROVED, student=student10, date=date.today()) - decision_email4: DecisionEmail = DecisionEmail( - decision=EmailStatusEnum.APPROVED, student=student11, date=date.today()) - decision_email5: DecisionEmail = DecisionEmail( - decision=EmailStatusEnum.APPROVED, student=student12, date=date.today()) - decision_email6: DecisionEmail = DecisionEmail( - decision=EmailStatusEnum.AWAITING_PROJECT, student=student06, date=date.today()) - decision_email7: DecisionEmail = DecisionEmail( - decision=EmailStatusEnum.AWAITING_PROJECT, student=student26, date=date.today()) - db.add(decision_email1) - db.add(decision_email2) - db.add(decision_email3) - db.add(decision_email4) - db.add(decision_email5) - db.add(decision_email6) - db.add(decision_email7) - db.commit() - - # InviteLink - invite_link1: InviteLink = InviteLink( - target_email="newuser1@email.com", edition=edition) - invite_link2: InviteLink = InviteLink( - target_email="newuser2@email.com", edition=edition) - db.add(invite_link1) - db.add(invite_link2) - db.commit() - - # Partner - partner1: Partner = Partner(name="Partner1") - partner2: Partner = Partner(name="Partner2") - partner3: Partner = Partner(name="Partner3") - db.add(partner1) - db.add(partner2) - db.add(partner3) - db.commit() - - # Project - project1: Project = Project( - name="project1", number_of_students=3, edition=edition, partners=[partner1]) - project2: Project = Project( - name="project2", number_of_students=6, edition=edition, partners=[partner2]) - project3: Project = Project( - name="project3", number_of_students=2, edition=edition, partners=[partner3]) - project4: Project = Project( - name="project4", number_of_students=9, edition=edition, partners=[partner1, partner3]) - db.add(project1) - db.add(project2) - db.add(project3) - db.add(project4) - db.commit() - - # Suggestion - suggestion1: Suggestion = Suggestion( - student=student01, coach=coach1, argumentation="Good student", suggestion=DecisionEnum.YES) - suggestion2: Suggestion = Suggestion( - student=student01, coach=coach2, argumentation="Good student", suggestion=DecisionEnum.YES) - suggestion3: Suggestion = Suggestion( - student=student12, coach=coach1, argumentation="Not a good student", suggestion=DecisionEnum.NO) - suggestion4: Suggestion = Suggestion( - student=student03, coach=coach2, argumentation="Maybe a student", suggestion=DecisionEnum.MAYBE) - suggestion5: Suggestion = Suggestion( - student=student04, coach=coach1, argumentation="Not a good student", suggestion=DecisionEnum.NO) - suggestion6: Suggestion = Suggestion( - student=student13, coach=coach1, argumentation="Good student", suggestion=DecisionEnum.YES) - suggestion7: Suggestion = Suggestion( - student=student01, coach=admin, argumentation="Not a good student", suggestion=DecisionEnum.NO) - suggestion8: Suggestion = Suggestion( - student=student12, coach=admin, argumentation="Good student", suggestion=DecisionEnum.YES) - db.add(suggestion1) - db.add(suggestion2) - db.add(suggestion3) - db.add(suggestion4) - db.add(suggestion5) - db.add(suggestion6) - db.add(suggestion7) - db.add(suggestion8) - db.commit() - - # ProjectRole - project_role1: ProjectRole = ProjectRole( - student=student01, project=project1, skill=skill1, drafter=coach1, argumentation="argmunet") - project_role2: ProjectRole = ProjectRole( # This brings a confict - student=student01, project=project2, skill=skill2, drafter=coach2, argumentation="argmunet") - project_role3: ProjectRole = ProjectRole( - student=student09, project=project2, skill=skill3, drafter=coach1, argumentation="argmunet") - project_role3: ProjectRole = ProjectRole( - student=student05, project=project1, skill=skill4, drafter=coach1, argumentation="argmunet") - project_role4: ProjectRole = ProjectRole( - student=student25, project=project3, skill=skill5, drafter=coach1, argumentation="argmunet") - project_role5: ProjectRole = ProjectRole( - student=student29, project=project3, skill=skill6, drafter=coach1, argumentation="argmunet") - project_role6: ProjectRole = ProjectRole( - student=student03, project=project4, skill=skill5, drafter=coach1, argumentation="argmunet") - project_role7: ProjectRole = ProjectRole( - student=student13, project=project4, skill=skill4, drafter=coach1, argumentation="argmunet") - db.add(project_role1) - db.add(project_role2) - db.add(project_role3) - db.add(project_role4) - db.add(project_role5) - db.add(project_role6) - db.add(project_role7) - db.commit() From cf88443563da2657b5ad4763559eef5480a09cc0 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 03:27:05 +0200 Subject: [PATCH 164/649] requested changes --- .../RemoveStudentButton.tsx | 23 ++++++++++--------- .../StudentInfoComponents/StudentInfo.tsx | 6 ++--- .../StudentInformation/StudentInformation.tsx | 3 ++- .../CoachSuggestionContainer.tsx | 6 ++--- frontend/src/views/StudentsPage/styles.ts | 1 - 5 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 frontend/src/views/StudentsPage/styles.ts diff --git a/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx b/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx index 750d6fc52..0257410f0 100644 --- a/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx +++ b/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx @@ -1,19 +1,20 @@ import React from "react"; -import {StudentRemoveButton} from "../styles" -import {removeStudent} from "../../../utils/api/students"; -import {useNavigate, useParams} from "react-router-dom"; +import { StudentRemoveButton } from "../styles"; +import { removeStudent } from "../../../utils/api/students"; +import { useNavigate, useParams } from "react-router-dom"; export default function RemoveStudentButton() { + const params = useParams(); + const navigate = useNavigate(); - const params = useParams() - const navigate = useNavigate() - - function handleRemoveStudent() { - removeStudent(params.editionId!, params.id!) - navigate(`/editions/${params.editionId}/students/`) + async function handleRemoveStudent() { + await removeStudent(params.editionId!, params.id!); + navigate(`/editions/${params.editionId}/students/`); } return ( - handleRemoveStudent()}>Remove Student + handleRemoveStudent()}> + Remove Student + ); -} \ No newline at end of file +} diff --git a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx index 1099c7543..c3e6b39e8 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx @@ -2,7 +2,7 @@ import React from "react"; import { StudentListFilters } from "../StudentsComponents"; import StudentInformation from "./StudentInformation/StudentInformation"; import { StudentInfoPageContent } from "./styles"; -import {Student} from "../../data/interfaces/students"; +import { Student } from "../../data/interfaces/students"; interface Props { students: Student[]; @@ -20,8 +20,8 @@ interface Props { export default function StudentInfo(props: Props) { return ( - - + + ); } diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index 711b7d017..16137a645 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -77,7 +77,8 @@ export default function StudentInformation(props: Props) { Suggestions {suggestions.map(suggestion => ( - {suggestionToText(suggestion.suggestion)}: {suggestion.argumentation} + {suggestion.coach.name}: "{suggestionToText(suggestion.suggestion)}"{" "} + {suggestion.argumentation} ))} diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx index bb202fcd3..0a9790712 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx @@ -23,8 +23,8 @@ export default function CoachSuggestionContainer(props: Props) { setShow(true); } - function doSuggestion() { - let suggestionNum: number = 0; + async function doSuggestion() { + let suggestionNum: number; if (clickedButtonText === "Yes") { suggestionNum = 1; } else if (clickedButtonText === "Maybe") { @@ -32,7 +32,7 @@ export default function CoachSuggestionContainer(props: Props) { } else { suggestionNum = 3; } - makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation); + await makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation); setArgumentation(""); setShow(false); } diff --git a/frontend/src/views/StudentsPage/styles.ts b/frontend/src/views/StudentsPage/styles.ts deleted file mode 100644 index cb0ff5c3b..000000000 --- a/frontend/src/views/StudentsPage/styles.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; From a7e8bd402df37fa3d3e3f459c3ad5f2b6c83efea Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 03:38:12 +0200 Subject: [PATCH 165/649] ran prettier on all files --- frontend/src/Router.tsx | 7 ++- .../StudentInformation/StudentInformation.tsx | 2 +- .../AdminDecisionContainer.tsx | 39 +++++++++----- .../AdminDecisionContainer/styles.ts | 2 +- .../StudentList/StudentCard/styles.ts | 4 +- .../StudentList/StudentList.tsx | 2 +- .../SuggestionProgressBar.tsx | 29 +++++------ .../StudentListFilters/StudentListFilters.tsx | 7 ++- frontend/src/data/interfaces/students.ts | 50 +++++++++--------- frontend/src/data/interfaces/suggestions.ts | 3 +- frontend/src/utils/api/suggestions.ts | 19 ++++--- .../views/StudentInfoPage/StudentInfoPage.tsx | 51 ++++++++++++------- .../src/views/StudentsPage/StudentsPage.tsx | 26 ++++++++-- frontend/src/views/index.ts | 2 +- 14 files changed, 147 insertions(+), 96 deletions(-) diff --git a/frontend/src/Router.tsx b/frontend/src/Router.tsx index 2d5880e95..b4e244a4c 100644 --- a/frontend/src/Router.tsx +++ b/frontend/src/Router.tsx @@ -17,7 +17,7 @@ import { UsersPage, AdminsPage, VerifyingTokenPage, - StudentInfoPage + StudentInfoPage, } from "./views"; import { ForbiddenPage, NotFoundPage } from "./views/errors"; import { Role } from "./data/enums"; @@ -83,7 +83,10 @@ export default function Router() { {/* Students routes */} } /> {/* TODO student page */} - } /> + } + /> {/* TODO student emails page */} } /> diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index 16137a645..eb23d6e84 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -72,7 +72,7 @@ export default function StudentInformation(props: Props) {     - Prefered name: {props.currentStudent.preferredName} + Preferred name: {props.currentStudent.preferredName} Suggestions {suggestions.map(suggestion => ( diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx index bad5b8c2f..0f880ecd4 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -1,14 +1,14 @@ -import React, {useState} from "react"; -import {Button, Modal} from "react-bootstrap"; +import React, { useState } from "react"; +import { Button, Modal } from "react-bootstrap"; import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; import { SuggestionButtons, ConfirmButton } from "./styles"; export default function AdminDecisionContainer() { const [show, setShow] = useState(false); - const [clickedButtonText, setClickedButtonText] = useState("") - function handleClose(){ - setShow(false) - setClickedButtonText("") + const [clickedButtonText, setClickedButtonText] = useState(""); + function handleClose() { + setShow(false); + setClickedButtonText(""); } function handleShow(event: React.MouseEvent) { event.preventDefault(); @@ -18,7 +18,7 @@ export default function AdminDecisionContainer() { function handleClick(event: React.MouseEvent) { event.preventDefault(); const button: HTMLButtonElement = event.currentTarget; - setClickedButtonText(button.innerText) + setClickedButtonText(button.innerText); } return ( @@ -27,15 +27,28 @@ export default function AdminDecisionContainer() { Definitive decision on student - Click on one of the buttons to mark your decision + + Click on one of the buttons to mark your decision - ) => handleClick(e)}> + ) => handleClick(e)} + > Yes - ) => handleClick(e)}> + ) => handleClick(e)} + > Maybe - ) => handleClick(e)}> + ) => handleClick(e)} + > No @@ -45,7 +58,7 @@ export default function AdminDecisionContainer() { Close
    - { clickedButtonText? ( + {clickedButtonText ? ( @@ -59,7 +72,7 @@ export default function AdminDecisionContainer() {

    Definitive decision by admin

    - diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts index 414eba1ad..b074ecf50 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/styles.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import {Button} from "react-bootstrap"; +import { Button } from "react-bootstrap"; export const SuggestionButtons = styled.div` display: flex; diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts index 64d2dac34..3d890c5d4 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/styles.ts @@ -55,13 +55,13 @@ export const CardAmountSuggestions = styled.p` export const SuggestionSignYes = styled.p` font-size: 20px; margin-right: 3px; - color: var(--osoc_green) + color: var(--osoc_green); `; export const SuggestionSignMaybe = styled.p` font-size: 20px; margin-right: 3px; - color: var(--osoc_orange) + color: var(--osoc_orange); `; export const SuggestionSignNo = styled.p` diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx index 19b43aa9f..b610f6f9f 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx @@ -1,7 +1,7 @@ import React from "react"; import { StudentCard } from "../index"; import { StudentCardsList } from "./styles"; -import {Student} from "../../../data/interfaces/students"; +import { Student } from "../../../data/interfaces/students"; interface Props { students: Student[]; diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx index 4909b16af..41065c7d2 100644 --- a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx @@ -1,33 +1,32 @@ import React from "react"; -import {NrSuggestions} from "../../../../data/interfaces/students"; -import { - SuggestionBarContainer -} from "./styles"; +import { NrSuggestions } from "../../../../data/interfaces/students"; +import { SuggestionBarContainer } from "./styles"; import { ProgressBar } from "react-bootstrap"; - interface Props { nrOfSuggestions: NrSuggestions; } function totalSuggestions(suggestions: NrSuggestions) { let total: number = 0; - Object.entries(suggestions).forEach(([key, value]) => {total += value}) - return total + Object.entries(suggestions).forEach(([key, value]) => { + total += value; + }); + return total; } export default function SuggestionProgressBar(props: Props) { - const amountSuggestions = totalSuggestions(props.nrOfSuggestions) - const frequencyYes = props.nrOfSuggestions.yes * 100/amountSuggestions - const frequencyMaybe = props.nrOfSuggestions.maybe * 100/amountSuggestions - const frequencyNo = props.nrOfSuggestions.no * 100/amountSuggestions - console.log(props.nrOfSuggestions) + const amountSuggestions = totalSuggestions(props.nrOfSuggestions); + const frequencyYes = (props.nrOfSuggestions.yes * 100) / amountSuggestions; + const frequencyMaybe = (props.nrOfSuggestions.maybe * 100) / amountSuggestions; + const frequencyNo = (props.nrOfSuggestions.no * 100) / amountSuggestions; + console.log(props.nrOfSuggestions); return ( - - - + + + ); diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx index d053751c4..d38f38dbb 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx @@ -14,7 +14,7 @@ import RolesFilter from "./RolesFilter/RolesFilter"; import "./StudentListFilters.css"; import ResetFiltersButton from "./ResetFiltersButton/ResetFiltersButton"; import ApplyFilterButton from "./ApplyFilterButton/ApplyFilterButton"; -import {Student} from "../../../data/interfaces/students"; +import { Student } from "../../../data/interfaces/students"; interface Props { students: Student[]; @@ -36,7 +36,10 @@ export default function StudentListFilters(props: Props) { - + ([]); const [nameFilter, setNameFilter] = useState(""); const [rolesFilter, setRolesFilter] = useState([]); @@ -14,7 +14,13 @@ function StudentInfoPage() { const [currentStudent, setCurrentStudent] = useState(); async function callGetStudents() { try { - const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); + const response = await getStudents( + params.editionId!, + nameFilter, + rolesFilter, + alumniFilter, + studentCoachVolunteerFilter + ); setStudents(response.students); } catch (error) { console.log(error); @@ -24,7 +30,7 @@ function StudentInfoPage() { async function callGetStudent() { try { const response = await getStudent(params.editionId!, params.id!); - setCurrentStudent(response) + setCurrentStudent(response); } catch (error) { console.log(error); } @@ -36,21 +42,28 @@ function StudentInfoPage() { }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter, params.id!]); if (!currentStudent) { - console.log("no current student") - return (
    -

    loading

    -
    ); - } - else { - console.log(currentStudent) + console.log("no current student"); + return ( +
    +

    loading

    +
    + ); + } else { + console.log(currentStudent); return (
    - +
    ); } diff --git a/frontend/src/views/StudentsPage/StudentsPage.tsx b/frontend/src/views/StudentsPage/StudentsPage.tsx index afbf82b75..fb2a12bd3 100644 --- a/frontend/src/views/StudentsPage/StudentsPage.tsx +++ b/frontend/src/views/StudentsPage/StudentsPage.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useState } from "react"; import { StudentListFilters } from "../../components/StudentsComponents"; import { getStudents } from "../../utils/api/students"; -import {Student} from "../../data/interfaces/students"; -import {useParams} from "react-router-dom"; +import { Student } from "../../data/interfaces/students"; +import { useParams } from "react-router-dom"; function StudentsPage() { - const params = useParams() + const params = useParams(); const [students, setStudents] = useState([]); const [nameFilter, setNameFilter] = useState(""); const [rolesFilter, setRolesFilter] = useState([]); @@ -14,7 +14,13 @@ function StudentsPage() { async function callGetStudents() { try { - const response = await getStudents(params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter); + const response = await getStudents( + params.editionId!, + nameFilter, + rolesFilter, + alumniFilter, + studentCoachVolunteerFilter + ); if (response) { setStudents(response.students); } @@ -29,7 +35,17 @@ function StudentsPage() { return (
    - +
    ); } diff --git a/frontend/src/views/index.ts b/frontend/src/views/index.ts index 93ca73742..3ac98f067 100644 --- a/frontend/src/views/index.ts +++ b/frontend/src/views/index.ts @@ -6,7 +6,7 @@ export { default as PendingPage } from "./PendingPage"; export { ProjectsPage, ProjectDetailPage, CreateProjectPage } from "./projectViews"; export { default as RegisterPage } from "./RegisterPage"; export { default as StudentsPage } from "./StudentsPage"; -export { default as StudentInfoPage } from "./StudentInfoPage" +export { default as StudentInfoPage } from "./StudentInfoPage"; export { default as UsersPage } from "./UsersPage"; export { default as AdminsPage } from "./AdminsPage"; export { default as VerifyingTokenPage } from "./VerifyingTokenPage"; From 75858a20f35d13ec60c2d4b12067bdde28f2eac6 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 03:45:14 +0200 Subject: [PATCH 166/649] prettier --- .../StudentList/SuggestionProgressBar/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts index ad83f01df..112160452 100644 --- a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/index.ts @@ -1 +1 @@ -export { default } from "./SuggestionProgressBar"; \ No newline at end of file +export { default } from "./SuggestionProgressBar"; From a058714d67ae2c71ad07e5f508fd92be6c1f022a Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 05:50:59 +0200 Subject: [PATCH 167/649] docs for all student files --- .../RemoveStudentButton.tsx | 6 ++++ .../StudentInfoComponents/StudentInfo.tsx | 4 +++ .../StudentInformation/StudentInformation.tsx | 14 ++++++++++ .../AdminDecisionContainer.tsx | 15 ++++++++++ .../CoachSuggestionContainer.tsx | 13 +++++++++ .../StudentList/StudentCard/StudentCard.tsx | 4 +++ .../StudentList/StudentList.tsx | 4 +++ .../SuggestionProgressBar.tsx | 9 +++++- .../AlumniFilter/AlumniFilter.tsx | 5 ++++ .../ApplyFilterButton/ApplyFilterButton.tsx | 6 ---- .../ApplyFilterButton/index.ts | 1 - .../NameFilter/NameFilter.tsx | 5 ++++ .../ResetFiltersButton/ResetFiltersButton.tsx | 7 +++++ .../RolesFilter/RolesFilter.tsx | 5 ++++ .../StudentCoachVolunteerFilter.tsx | 5 ++++ .../StudentListFilters/StudentListFilters.tsx | 6 ++-- .../StudentListFilters/index.ts | 1 - frontend/src/data/interfaces/projects.ts | 2 +- frontend/src/data/interfaces/students.ts | 15 +++++++++- frontend/src/utils/api/students.ts | 28 +++++++++++++++++-- frontend/src/utils/api/suggestions.ts | 11 ++++++++ .../views/StudentInfoPage/StudentInfoPage.tsx | 24 ++++++++++++++-- .../src/views/StudentsPage/StudentsPage.tsx | 9 ++++++ 23 files changed, 182 insertions(+), 17 deletions(-) delete mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/ApplyFilterButton.tsx delete mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/index.ts diff --git a/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx b/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx index 0257410f0..bf42c945b 100644 --- a/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx +++ b/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx @@ -3,10 +3,16 @@ import { StudentRemoveButton } from "../styles"; import { removeStudent } from "../../../utils/api/students"; import { useNavigate, useParams } from "react-router-dom"; +/** + * Component that removes the current student. + */ export default function RemoveStudentButton() { const params = useParams(); const navigate = useNavigate(); + /** + * Remove the current selected student and navigate back to the students page. + */ async function handleRemoveStudent() { await removeStudent(params.editionId!, params.id!); navigate(`/editions/${params.editionId}/students/`); diff --git a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx index c3e6b39e8..a58515fa8 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInfo.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInfo.tsx @@ -17,6 +17,10 @@ interface Props { setStudentCoachVolunteerFilter: (value: boolean) => void; } +/** + * Component that renders the students list and the information about the currently selected student. + * @param props all student, current student and all filters to handle the student information page. + */ export default function StudentInfo(props: Props) { return ( diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index eb23d6e84..26e765dc8 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -27,10 +27,17 @@ interface Props { currentStudent: Student; } +/** + * Component that renders all information of a student and all buttons to perform actions on this student. + * @param props current student whose information needs to be showed. + */ export default function StudentInformation(props: Props) { const [suggestions, setSuggestions] = useState([]); const params = useParams(); + /** + * Get all the suggestion that were made on this student. + */ async function callGetSuggestions() { try { const response = await getSuggestions(params.editionId!, params.id!); @@ -40,6 +47,10 @@ export default function StudentInformation(props: Props) { } } + /** + * Get the string representation for a suggestion value. + * @param suggestion + */ function suggestionToText(suggestion: number) { if (suggestion === 0) { return "Undecided"; @@ -52,6 +63,9 @@ export default function StudentInformation(props: Props) { } } + /** + * fetch suggestions whenever an edition id or student id changes. + */ useEffect(() => { callGetSuggestions(); }, [params.editionId!, params.id!]); diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx index 0f880ecd4..182cbeb66 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -3,18 +3,33 @@ import { Button, Modal } from "react-bootstrap"; import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; import { SuggestionButtons, ConfirmButton } from "./styles"; +/** + * Make definitive decision on the current student based on the selected decision value. + * Only admins can see this component. + */ export default function AdminDecisionContainer() { const [show, setShow] = useState(false); const [clickedButtonText, setClickedButtonText] = useState(""); + + /** + * Close the modal. + */ function handleClose() { setShow(false); setClickedButtonText(""); } + + /** + * Show the modal. + */ function handleShow(event: React.MouseEvent) { event.preventDefault(); setShow(true); } + /** + * Make definitive decision on the current student based on the selected decision value. + */ function handleClick(event: React.MouseEvent) { event.preventDefault(); const button: HTMLButtonElement = event.currentTarget; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx index 0a9790712..c76455150 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx @@ -8,14 +8,24 @@ interface Props { student: Student; } +/** + * Component for functionality of suggestions. + * @param props current student + */ export default function CoachSuggestionContainer(props: Props) { const params = useParams(); const [show, setShow] = useState(false); const [argumentation, setArgumentation] = useState(""); const [clickedButtonText, setClickedButtonText] = useState(""); + /** + * Close the modal. + */ const handleClose = () => setShow(false); + /** + * Show the modal. + */ function handleShow(event: React.MouseEvent) { event.preventDefault(); const button: HTMLButtonElement = event.currentTarget; @@ -23,6 +33,9 @@ export default function CoachSuggestionContainer(props: Props) { setShow(true); } + /** + * Make suggestion on the current student based on the selected suggestion value. + */ async function doSuggestion() { let suggestionNum: number; if (clickedButtonText === "Yes") { diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx index e2294a190..d646af925 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentCard/StudentCard.tsx @@ -16,6 +16,10 @@ interface Props { studentId: number; } +/** + * Card component that will be used to show a student in the students list. + * @param props all information about a student. + */ export default function StudentCard(props: Props) { const params = useParams(); const navigate = useNavigate(); diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx index b610f6f9f..ace7444db 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx @@ -7,6 +7,10 @@ interface Props { students: Student[]; } +/** + * Component that renders the list of students in the sidebar. + * @param props the students that need to be rendered. + */ export default function StudentList(props: Props) { return ( diff --git a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx index 41065c7d2..94337c927 100644 --- a/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/SuggestionProgressBar/SuggestionProgressBar.tsx @@ -7,6 +7,10 @@ interface Props { nrOfSuggestions: NrSuggestions; } +/** + * Count the total amount of suggestion (yes, maybe and no). + * @param suggestions + */ function totalSuggestions(suggestions: NrSuggestions) { let total: number = 0; Object.entries(suggestions).forEach(([key, value]) => { @@ -15,12 +19,15 @@ function totalSuggestions(suggestions: NrSuggestions) { return total; } +/** + * Component that shows a progressBar that weights all suggestions and shows how many of each there are. + * @param props all the suggestions. + */ export default function SuggestionProgressBar(props: Props) { const amountSuggestions = totalSuggestions(props.nrOfSuggestions); const frequencyYes = (props.nrOfSuggestions.yes * 100) / amountSuggestions; const frequencyMaybe = (props.nrOfSuggestions.maybe * 100) / amountSuggestions; const frequencyNo = (props.nrOfSuggestions.no * 100) / amountSuggestions; - console.log(props.nrOfSuggestions); return ( diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx index 58b7f96f7..cb4c543e4 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx @@ -1,6 +1,11 @@ import { Form } from "react-bootstrap"; import React from "react"; +/** + * Component that filters the students list based on the alumni field. + * @param alumniFilter + * @param setAlumniFilter + */ export default function AlumniFilter({ alumniFilter, setAlumniFilter, diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/ApplyFilterButton.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/ApplyFilterButton.tsx deleted file mode 100644 index ad40fb9d9..000000000 --- a/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/ApplyFilterButton.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import React from "react"; -import { FilterApplyButton } from "../styles"; - -export default function ApplyFilterButton() { - return Apply; -} diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/index.ts b/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/index.ts deleted file mode 100644 index 388f9c077..000000000 --- a/frontend/src/components/StudentsComponents/StudentListFilters/ApplyFilterButton/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./ApplyFilterButton"; diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx index 5b08625c7..a5123ce1d 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx @@ -7,6 +7,11 @@ import { } from "../styles"; import { Form } from "react-bootstrap"; +/** + * Component that filters the students list based on the name inserted in the input field. + * @param nameFilter + * @param setNameFilter + */ export default function NameFilter({ nameFilter, setNameFilter, diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx index dc8e923ad..b8956350b 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx @@ -7,7 +7,14 @@ interface Props { setStudentCoachVolunteerFilter: (studentCoachVolunteer: boolean) => void; } +/** + * Component that resets all filters. + * @param props + */ export default function ResetFiltersButton(props: Props) { + /** + * Reset all filters to their default value. + */ function resetFilters() { props.setNameFilter(""); props.setAlumniFilter(false); diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index af52bd601..0f9767ca2 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -7,6 +7,11 @@ import { } from "../styles"; import Select from "react-select"; +/** + * Component that filters the students list based on the current roles selected. + * @param rolesFilter + * @param setRolesFilter + */ export default function RolesFilter({ rolesFilter, setRolesFilter, diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx index b118dc443..b41f3528b 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx @@ -1,6 +1,11 @@ import { Form } from "react-bootstrap"; import React from "react"; +/** + * Component that filters the students list based on the student coach field. + * @param studentCoachVolunteerFilter + * @param setStudentCoachVolunteerFilter + */ export default function StudentCoachVolunteerFilter({ studentCoachVolunteerFilter, setStudentCoachVolunteerFilter, diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx index d38f38dbb..067337495 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx @@ -13,7 +13,6 @@ import NameFilter from "./NameFilter/NameFilter"; import RolesFilter from "./RolesFilter/RolesFilter"; import "./StudentListFilters.css"; import ResetFiltersButton from "./ResetFiltersButton/ResetFiltersButton"; -import ApplyFilterButton from "./ApplyFilterButton/ApplyFilterButton"; import { Student } from "../../../data/interfaces/students"; interface Props { @@ -28,6 +27,10 @@ interface Props { setStudentCoachVolunteerFilter: (value: boolean) => void; } +/** + * Component that shows the sidebar with all the filters and student list. + * @param props All students and filters currently selected. + */ export default function StudentListFilters(props: Props) { return ( @@ -48,7 +51,6 @@ export default function StudentListFilters(props: Props) {     - { try { const request = "/editions/" + edition + "/students/" + studentId.toString(); @@ -62,6 +79,13 @@ export async function removeStudent(edition: string, studentId: string): Promise } } +/** + * API call to make a suggestion on a student. + * @param edition The edition name. + * @param studentId The ID of the student on who a suggestion needs to be made. + * @param suggestionArg The Suggestion value. + * @param argumentationArg The argumentation for this suggestion. + */ export async function makeSuggestion( edition: string, studentId: string, diff --git a/frontend/src/utils/api/suggestions.ts b/frontend/src/utils/api/suggestions.ts index a5d9b6df5..dd06e4c24 100644 --- a/frontend/src/utils/api/suggestions.ts +++ b/frontend/src/utils/api/suggestions.ts @@ -2,6 +2,11 @@ import axios from "axios"; import { axiosInstance } from "./api"; import { Suggestions } from "../../data/interfaces/suggestions"; +/** + * API call to fetch all suggestion on a student. + * @param edition The edition name. + * @param studentId The ID of the student which suggestions need to be fetched. + */ export async function getSuggestions(edition: string, studentId: string) { try { const response = await axiosInstance.get( @@ -17,6 +22,12 @@ export async function getSuggestions(edition: string, studentId: string) { } } +/** + * API call for admins to make a definitive decision on a student. + * @param edition The edition name. + * @param studentId The ID of the student to make a decision on. + * @param confirmValue The decision to give this student. + */ export async function confirmStudent(edition: string, studentId: string, confirmValue: number) { try { const response = await axiosInstance.put( diff --git a/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx b/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx index 985e7f2b7..42e54b42f 100644 --- a/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx +++ b/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx @@ -4,6 +4,10 @@ import { getStudent, getStudents } from "../../utils/api/students"; import StudentInfo from "../../components/StudentInfoComponents/StudentInfo"; import { Student } from "../../data/interfaces/students"; +/** + * @returns the detailed page of a student. Here you can make a suggestion and admins + * can make definitive decisions on students. You can also remove the currently selected student. + */ function StudentInfoPage() { const params = useParams(); const [students, setStudents] = useState([]); @@ -12,6 +16,10 @@ function StudentInfoPage() { const [alumniFilter, setAlumniFilter] = useState(false); const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); const [currentStudent, setCurrentStudent] = useState(); + + /** + * Request all students with selected filters. + */ async function callGetStudents() { try { const response = await getStudents( @@ -27,6 +35,9 @@ function StudentInfoPage() { } } + /** + * Request the currently selected student. + */ async function callGetStudent() { try { const response = await getStudent(params.editionId!, params.id!); @@ -36,10 +47,19 @@ function StudentInfoPage() { } } + /** + * fetch students when a filter changes + */ useEffect(() => { - callGetStudent(); callGetStudents(); - }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter, params.id!]); + }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); + + /** + * fetch student when the student id changes + */ + useEffect(() => { + callGetStudent(); + }, [params.id!]); if (!currentStudent) { console.log("no current student"); diff --git a/frontend/src/views/StudentsPage/StudentsPage.tsx b/frontend/src/views/StudentsPage/StudentsPage.tsx index fb2a12bd3..93c4cc57f 100644 --- a/frontend/src/views/StudentsPage/StudentsPage.tsx +++ b/frontend/src/views/StudentsPage/StudentsPage.tsx @@ -4,6 +4,9 @@ import { getStudents } from "../../utils/api/students"; import { Student } from "../../data/interfaces/students"; import { useParams } from "react-router-dom"; +/** + * @returns Page where admins and coaches can filter on students. + */ function StudentsPage() { const params = useParams(); const [students, setStudents] = useState([]); @@ -12,6 +15,9 @@ function StudentsPage() { const [alumniFilter, setAlumniFilter] = useState(false); const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); + /** + * Request all students with selected filters + */ async function callGetStudents() { try { const response = await getStudents( @@ -29,6 +35,9 @@ function StudentsPage() { } } + /** + * fetch students again when a filter changes + */ useEffect(() => { callGetStudents(); }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); From 7d4020bdba9d3b40965f8e6d9a84849b3180c925 Mon Sep 17 00:00:00 2001 From: stijndcl Date: Thu, 12 May 2022 08:51:08 +0200 Subject: [PATCH 168/649] Fix prettier --- .../StudentListFilters/StudentListFilters.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css index 6110d34af..d4814782f 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css @@ -1,4 +1,4 @@ .form-check { margin-left: 5%; margin-bottom: 1vh; -} \ No newline at end of file +} From 8e0782c2be694b87c44f6dc98f97b814798544e8 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 12 May 2022 09:02:04 +0200 Subject: [PATCH 169/649] make partners async + removed unused imports from merge --- backend/src/app/logic/partners.py | 8 ++++---- backend/src/app/logic/projects.py | 3 ++- backend/src/app/logic/projects_students.py | 1 - backend/src/app/routers/editions/projects/projects.py | 3 --- backend/src/database/crud/partners.py | 11 ++++++----- backend/src/database/crud/projects.py | 1 - backend/src/database/crud/projects_students.py | 8 ++++---- 7 files changed, 16 insertions(+), 19 deletions(-) diff --git a/backend/src/app/logic/partners.py b/backend/src/app/logic/partners.py index da0eeb1fe..a10d4cd93 100644 --- a/backend/src/app/logic/partners.py +++ b/backend/src/app/logic/partners.py @@ -1,17 +1,17 @@ -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession import src.database.crud.partners as crud from src.database.models import Partner -def get_or_create_partners_by_name(db: Session, names: list[str], commit: bool = True) -> list[Partner]: +async def get_or_create_partners_by_name(db: AsyncSession, names: list[str], commit: bool = True) -> list[Partner]: """Return a list of partners, when a partner with the name does not exist, create it""" partners: list[Partner] = [] for partner_name in names: - partner = crud.get_optional_partner_by_name(db, partner_name) + partner = await crud.get_optional_partner_by_name(db, partner_name) if partner is None: - partners.append(crud.create_partner(db, partner_name, commit=commit)) + partners.append(await crud.create_partner(db, partner_name, commit=commit)) else: partners.append(partner) return partners diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index 795f28c2a..154ce6ae0 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -69,7 +69,8 @@ async def create_project_role(db: AsyncSession, project: Project, input_project_ return await crud.create_project_role(db, project, input_project_role) -async def patch_project_role(db: AsyncSession, project_role_id: int, input_project_role: InputProjectRole) -> ProjectRole: +async def patch_project_role(db: AsyncSession, project_role_id: int, input_project_role: InputProjectRole) \ + -> ProjectRole: """Update a project role""" return await crud.patch_project_role(db, project_role_id, input_project_role) diff --git a/backend/src/app/logic/projects_students.py b/backend/src/app/logic/projects_students.py index bb8e58451..671a21d7d 100644 --- a/backend/src/app/logic/projects_students.py +++ b/backend/src/app/logic/projects_students.py @@ -1,4 +1,3 @@ -from sqlalchemy import select, func from sqlalchemy.ext.asyncio import AsyncSession import src.database.crud.projects_students as crud diff --git a/backend/src/app/routers/editions/projects/projects.py b/backend/src/app/routers/editions/projects/projects.py index 96938a6b3..65b0f20a6 100644 --- a/backend/src/app/routers/editions/projects/projects.py +++ b/backend/src/app/routers/editions/projects/projects.py @@ -5,9 +5,6 @@ import src.app.logic.projects as logic from src.app.routers.tags import Tags -from src.app.schemas.projects import (ProjectList, Project, InputProject, - ConflictStudentList, QueryParamsProjects) -from src.app.utils.dependencies import get_edition, get_project, require_admin, require_coach, get_latest_edition from src.app.schemas.projects import ( InputProjectRole, ProjectRole as ProjectRoleSchema, ProjectRoleResponseList) diff --git a/backend/src/database/crud/partners.py b/backend/src/database/crud/partners.py index c1891a092..1b381e5fd 100644 --- a/backend/src/database/crud/partners.py +++ b/backend/src/database/crud/partners.py @@ -1,19 +1,20 @@ -from sqlalchemy.orm import Session +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from src.database.models import Partner -def create_partner(db: Session, name: str, commit: bool = True) -> Partner: +async def create_partner(db: AsyncSession, name: str, commit: bool = True) -> Partner: """Create a partner given a name""" partner = Partner(name=name) db.add(partner) if commit: - db.flush() + await db.flush() return partner -def get_optional_partner_by_name(db: Session, name: str) -> Partner | None: +async def get_optional_partner_by_name(db: AsyncSession, name: str) -> Partner | None: """Returns an optional partner given a name""" - return db.query(Partner).where(Partner.name == name).one_or_none() + return (await db.execute(select(Partner).where(Partner.name == name))).scalar_one_or_none() diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index efee3b2b9..21bb2bbdb 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -1,5 +1,4 @@ from sqlalchemy import select -from sqlalchemy.exc import NoResultFound from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.sql import Select diff --git a/backend/src/database/crud/projects_students.py b/backend/src/database/crud/projects_students.py index 4bab90f81..855ae9447 100644 --- a/backend/src/database/crud/projects_students.py +++ b/backend/src/database/crud/projects_students.py @@ -1,13 +1,11 @@ - -from sqlalchemy.orm import Session, Query from sqlalchemy import select from sqlalchemy.sql import Select from sqlalchemy.ext.asyncio import AsyncSession from src.app.schemas.projects import InputArgumentation -from src.database.models import ProjectRole, User, Student, ProjectRoleSuggestion +from src.database.models import ProjectRoleSuggestion -from src.database.models import Project, ProjectRole, Skill, User, Student +from src.database.models import ProjectRole, User, Student def _get_pr_suggestion_for_pr_by_student_query(project_role: ProjectRole, student: Student) -> Select: @@ -16,6 +14,7 @@ def _get_pr_suggestion_for_pr_by_student_query(project_role: ProjectRole, studen ProjectRoleSuggestion.student == student ) + async def get_pr_suggestion_for_pr_by_student( db: AsyncSession, project_role: ProjectRole, @@ -23,6 +22,7 @@ async def get_pr_suggestion_for_pr_by_student( """Get the project role suggestion for a student""" return (await db.execute(_get_pr_suggestion_for_pr_by_student_query(project_role, student))).scalar_one() + async def get_optional_pr_suggestion_for_pr_by_student( db: AsyncSession, project_role: ProjectRole, From b88827de94958530336f7965d6f0fc7a66c845ed Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 12 May 2022 09:39:15 +0200 Subject: [PATCH 170/649] update import --- frontend/src/components/AdminsComponents/AddAdmin.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/AdminsComponents/AddAdmin.tsx b/frontend/src/components/AdminsComponents/AddAdmin.tsx index b039302b2..1a2cc87a8 100644 --- a/frontend/src/components/AdminsComponents/AddAdmin.tsx +++ b/frontend/src/components/AdminsComponents/AddAdmin.tsx @@ -1,5 +1,5 @@ import { getUsersNonAdmin, User } from "../../utils/api/users/users"; -import React, { useState } from "react"; +import { useState } from "react"; import { addAdmin } from "../../utils/api/users/admins"; import { AddAdminButton, ModalContentConfirm, Warning } from "./styles"; import { Button, Modal, Spinner } from "react-bootstrap"; From bd16b3ee2e5685804452418aa640ace9b9ff96a3 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 12 May 2022 09:47:44 +0200 Subject: [PATCH 171/649] db tests passing --- backend/src/database/crud/projects.py | 4 +- .../test_database/test_crud/test_projects.py | 100 +++-- .../test_crud/test_projects_students.py | 87 ++-- .../test_database/test_crud/test_students.py | 401 +++++++++--------- .../test_projects/test_projects.py | 6 +- 5 files changed, 301 insertions(+), 297 deletions(-) diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index 21bb2bbdb..cbd9832ae 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -16,7 +16,7 @@ def _get_projects_for_edition_query(edition: Edition) -> Select: async def get_projects_for_edition(db: AsyncSession, edition: Edition) -> list[Project]: """Returns a list of all projects from a certain edition from the database""" result = await db.execute(_get_projects_for_edition_query(edition)) - projects: list[Project] = result.scalars().all() + projects: list[Project] = result.unique().scalars().all() for project in projects: await db.refresh(project, attribute_names=["project_roles"]) @@ -152,6 +152,6 @@ async def get_conflict_students(db: AsyncSession, edition: Edition) -> list[Stud Return an overview of the students that are assigned to multiple projects """ return [ - s for s in (await db.execute(select(Student).where(Student.edition == edition))).scalars().all() + s for s in (await db.execute(select(Student).where(Student.edition == edition))).unique().scalars().all() if len(s.pr_suggestions) > 1 ] diff --git a/backend/tests/test_database/test_crud/test_projects.py b/backend/tests/test_database/test_crud/test_projects.py index eb336c6d2..d2880b160 100644 --- a/backend/tests/test_database/test_crud/test_projects.py +++ b/backend/tests/test_database/test_crud/test_projects.py @@ -1,4 +1,5 @@ import pytest +from sqlalchemy import select from sqlalchemy.exc import NoResultFound from sqlalchemy.ext.asyncio import AsyncSession @@ -7,12 +8,9 @@ import src.database.crud.projects as crud from src.database.models import Edition, Partner, Project, User, Skill, ProjectRole, Student, ProjectRoleSuggestion -# temporary skip until merge is done -pytest.skip(allow_module_level=True) - @pytest.fixture -def database_with_data(database_session: AsyncSession) -> Session: +async def database_with_data(database_session: AsyncSession) -> AsyncSession: """fixture for adding data to the database""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) @@ -45,39 +43,39 @@ def database_with_data(database_session: AsyncSession) -> Session: database_session.add(project_role1) database_session.add(project_role2) database_session.add(project_role3) - database_session.commit() + await database_session.commit() return database_session @pytest.fixture -def current_edition(database_with_data: Session) -> Edition: +async def current_edition(database_with_data: AsyncSession) -> Edition: """fixture to get the latest edition""" - return database_with_data.query(Edition).all()[-1] + return (await database_with_data.execute(select(Edition))).scalars().all()[-1] -def test_get_all_projects_empty(database_session: AsyncSession): +async def test_get_all_projects_empty(database_session: AsyncSession): """test get all projects but there are none""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() - projects: list[Project] = crud.get_projects_for_edition( + await database_session.commit() + projects: list[Project] = await crud.get_projects_for_edition( database_session, edition) assert len(projects) == 0 -def test_get_all_projects(database_session: Session): +async def test_get_all_projects(database_session: AsyncSession): """test get all projects""" edition: Edition = Edition(year=2022, name="ed2022") for i in range(DB_PAGE_SIZE - 1): database_session.add(Project(name=f"Project {i}", edition=edition)) - database_session.commit() + await database_session.commit() - projects: list[Project] = crud.get_projects_for_edition(database_session, edition) + projects: list[Project] = await crud.get_projects_for_edition(database_session, edition) assert len(projects) == DB_PAGE_SIZE - 1 -def test_get_all_projects_pagination(database_session: AsyncSession): +async def test_get_all_projects_pagination(database_session: AsyncSession): """test get all projects paginated""" edition = Edition(year=2022, name="ed2022") user: User = User(name="coach") @@ -85,17 +83,17 @@ def test_get_all_projects_pagination(database_session: AsyncSession): for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(Project(name=f"Project {i}", edition=edition)) - database_session.commit() + await database_session.commit() assert len( - crud.get_projects_for_edition_page(database_session, edition, QueryParamsProjects(page=0), user=user) + await crud.get_projects_for_edition_page(database_session, edition, QueryParamsProjects(page=0), user=user) ) == DB_PAGE_SIZE assert len( - crud.get_projects_for_edition_page(database_session, edition, QueryParamsProjects(page=1), user=user) + await crud.get_projects_for_edition_page(database_session, edition, QueryParamsProjects(page=1), user=user) ) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE -def test_get_project_search_name(database_session: Session): +async def test_get_project_search_name(database_session: AsyncSession): """test get project with a specific name""" edition: Edition = Edition(year=2022, name="ed2022") user: User = User(name="coach") @@ -104,16 +102,16 @@ def test_get_project_search_name(database_session: Session): for i in range(DB_PAGE_SIZE - 2): database_session.add(Project(name=f"Project {i}", edition=edition)) database_session.add(Project(name=f"nice project", edition=edition)) - database_session.commit() + await database_session.commit() - projects: list[Project] = crud.get_projects_for_edition_page( + projects: list[Project] = await crud.get_projects_for_edition_page( database_session, edition, QueryParamsProjects(name="nice"), user=user ) assert len(projects) == 1 assert projects[0].name == "nice project" -def test_get_project_search_coach(database_session: Session): +async def test_get_project_search_coach(database_session: AsyncSession): """test get projects that you are a coach""" edition: Edition = Edition(year=2022, name="ed2022") user: User = User(name="coach") @@ -122,19 +120,19 @@ def test_get_project_search_coach(database_session: Session): for i in range(DB_PAGE_SIZE - 2): database_session.add(Project(name=f"Project {i}", edition=edition)) database_session.add(Project(name=f"nice project", edition=edition, coaches=[user])) - database_session.commit() + await database_session.commit() - projects: list[Project] = crud.get_projects_for_edition_page( + projects: list[Project] = await crud.get_projects_for_edition_page( database_session, edition, QueryParamsProjects(coach=True), user=user ) assert len(projects) == 1 -def test_add_project(database_session: Session): +async def test_add_project(database_session: AsyncSession): """tests add a project when the project don't exist yet""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() partners: list[Partner] = [Partner(name="partner1"), Partner(name="partner2")] @@ -144,43 +142,43 @@ def test_add_project(database_session: Session): coaches=[] ) - project: Project = crud.create_project(database_session, edition, input_project, partners=partners) + project: Project = await crud.create_project(database_session, edition, input_project, partners=partners) - assert len(database_session.query(Project).all()) == 1 + assert len((await database_session.execute(select(Project))).unique().scalars().all()) == 1 assert project.name == input_project.name assert len(project.partners) == len(partners) assert project.edition == edition -def test_get_project_not_found(database_session: Session): +async def test_get_project_not_found(database_session: AsyncSession): """test project that don't exist""" with pytest.raises(NoResultFound): - crud.get_project(database_session, 500) + await crud.get_project(database_session, 500) -def test_get_project(database_session: Session): +async def test_get_project(database_session: AsyncSession): """test get project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) database_session.add(project) - database_session.commit() + await database_session.commit() - assert project == crud.get_project(database_session, project.project_id) + assert project == await crud.get_project(database_session, project.project_id) -def test_delete_project_no_project_roles(database_session: Session): +async def test_delete_project_no_project_roles(database_session: AsyncSession): """test delete a project that don't have project roles""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) database_session.add(project) - database_session.commit() + await database_session.commit() - assert len(database_session.query(Project).all()) == 1 - crud.delete_project(database_session, project) - assert len(database_session.query(Project).all()) == 0 + assert len((await database_session.execute(select(Project))).unique().scalars().all()) == 1 + await crud.delete_project(database_session, project) + assert len((await database_session.execute(select(Project))).unique().scalars().all()) == 0 -def test_delete_project_with_project_roles(database_session: Session): +async def test_delete_project_with_project_roles(database_session: AsyncSession): """test delete a project that has project roles""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project( @@ -189,16 +187,16 @@ def test_delete_project_with_project_roles(database_session: Session): project_roles=[ProjectRole(slots=1, skill=Skill(name="skill"))] ) database_session.add(project) - database_session.commit() + await database_session.commit() - assert len(database_session.query(Project).all()) == 1 - assert len(database_session.query(ProjectRole).all()) == 1 - crud.delete_project(database_session, project) - assert len(database_session.query(Project).all()) == 0 - assert len(database_session.query(ProjectRole).all()) == 0 + assert len((await database_session.execute(select(Project))).unique().scalars().all()) == 1 + assert len((await database_session.execute(select(ProjectRole))).scalars().all()) == 1 + await crud.delete_project(database_session, project) + assert len((await database_session.execute(select(Project))).unique().scalars().all()) == 0 + assert len((await database_session.execute(select(ProjectRole))).scalars().all()) == 0 -def test_patch_project(database_session: Session): +async def test_patch_project(database_session: AsyncSession): """tests patch a project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project( @@ -208,13 +206,13 @@ def test_patch_project(database_session: Session): partners=[Partner(name="partner 1")] ) database_session.add(project) - database_session.commit() + await database_session.commit() new_user = User(name="coach 2") new_partner = Partner(name="partner 2") database_session.add(new_user) database_session.add(new_partner) - database_session.commit() + await database_session.commit() patch: InputProject = InputProject( name="project 1 - PATCHED", @@ -222,7 +220,7 @@ def test_patch_project(database_session: Session): coaches=[new_user.user_id] ) - crud.patch_project(database_session, project, patch, [new_partner]) + await crud.patch_project(database_session, project, patch, [new_partner]) assert project.name == "project 1 - PATCHED" assert len(project.partners) == 1 assert len(project.coaches) == 1 @@ -230,7 +228,7 @@ def test_patch_project(database_session: Session): assert project.coaches[0].user_id == new_user.user_id -def test_get_conflict_students(database_session: Session): +async def test_get_conflict_students(database_session: AsyncSession): """test if the right ConflictStudent is given""" edition: Edition = Edition(year=2022, name="ed2022") skill: Skill = Skill(name="skill 1") @@ -279,9 +277,9 @@ def test_get_conflict_students(database_session: Session): ) ) )) - database_session.commit() + await database_session.commit() - conflicts: list[Student] = crud.get_conflict_students(database_session, edition) + conflicts: list[Student] = await crud.get_conflict_students(database_session, edition) assert len(conflicts) == 1 assert conflicts[0].student_id == student.student_id assert len(conflicts[0].pr_suggestions) == 2 diff --git a/backend/tests/test_database/test_crud/test_projects_students.py b/backend/tests/test_database/test_crud/test_projects_students.py index 489913d44..4352685e2 100644 --- a/backend/tests/test_database/test_crud/test_projects_students.py +++ b/backend/tests/test_database/test_crud/test_projects_students.py @@ -1,6 +1,7 @@ import pytest +from sqlalchemy import select from sqlalchemy.exc import NoResultFound, IntegrityError -from sqlalchemy.orm import Session +from sqlalchemy.ext.asyncio import AsyncSession from src.app.schemas.projects import InputArgumentation from src.database.crud.projects_students import ( @@ -13,7 +14,7 @@ from src.database.models import Edition, Project, User, Skill, ProjectRole, Student, ProjectRoleSuggestion -def test_add_pr_suggestion(database_session: Session): +async def test_add_pr_suggestion(database_session: AsyncSession): """tests add student to a project""" db = database_session edition: Edition = Edition(year=2022, name="ed2022") @@ -34,18 +35,18 @@ def test_add_pr_suggestion(database_session: Session): db.add(edition) db.add(student) db.add(skill) - db.commit() + await db.commit() project_role: ProjectRole = ProjectRole(project=project, slots=1, skill=skill) db.add(project_role) - db.commit() + await db.commit() - assert len(db.query(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student).all()) == 0 - create_pr_suggestion(db, project_role, student, user, InputArgumentation()) - assert len(db.query(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student).all()) == 1 + assert len((await db.execute(select(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student))).scalars().all()) == 0 + await create_pr_suggestion(db, project_role, student, user, InputArgumentation()) + assert len((await db.execute(select(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student))).scalars().all()) == 1 -def test_add_pr_suggestion_duplicate(database_session: Session): +async def test_add_pr_suggestion_duplicate(database_session: AsyncSession): """tests add student to a project""" db = database_session edition: Edition = Edition(year=2022, name="ed2022") @@ -66,18 +67,18 @@ def test_add_pr_suggestion_duplicate(database_session: Session): db.add(edition) db.add(student) db.add(skill) - db.commit() + await db.commit() project_role: ProjectRole = ProjectRole(project=project, slots=1, skill=skill) db.add(project_role) - db.commit() + await db.commit() - create_pr_suggestion(db, project_role, student, user, InputArgumentation()) + await create_pr_suggestion(db, project_role, student, user, InputArgumentation()) with pytest.raises(IntegrityError): - create_pr_suggestion(db, project_role, student, user, InputArgumentation()) + await create_pr_suggestion(db, project_role, student, user, InputArgumentation()) -def test_get_pr_suggestion(database_session: Session): +async def test_get_pr_suggestion(database_session: AsyncSession): """tests add student to a project""" db = database_session edition: Edition = Edition(year=2022, name="ed2022") @@ -98,19 +99,19 @@ def test_get_pr_suggestion(database_session: Session): db.add(edition) db.add(student) db.add(skill) - db.commit() + await db.commit() project_role: ProjectRole = ProjectRole(project=project, slots=1, skill=skill) db.add(project_role) - db.commit() + await db.commit() with pytest.raises(NoResultFound): - get_pr_suggestion_for_pr_by_student(db, project_role, student) - create_pr_suggestion(db, project_role, student, user, InputArgumentation()) - assert get_pr_suggestion_for_pr_by_student(db, project_role, student) is not None + await get_pr_suggestion_for_pr_by_student(db, project_role, student) + await create_pr_suggestion(db, project_role, student, user, InputArgumentation()) + assert (await get_pr_suggestion_for_pr_by_student(db, project_role, student)) is not None -def test_get_optional_pr_suggestion(database_session: Session): +async def test_get_optional_pr_suggestion(database_session: AsyncSession): """tests add student to a project""" db = database_session edition: Edition = Edition(year=2022, name="ed2022") @@ -131,18 +132,18 @@ def test_get_optional_pr_suggestion(database_session: Session): db.add(edition) db.add(student) db.add(skill) - db.commit() + await db.commit() project_role: ProjectRole = ProjectRole(project=project, slots=1, skill=skill) db.add(project_role) - db.commit() + await db.commit() - assert get_optional_pr_suggestion_for_pr_by_student(db, project_role, student) is None - create_pr_suggestion(db, project_role, student, user, InputArgumentation()) - assert get_optional_pr_suggestion_for_pr_by_student(db, project_role, student) is not None + assert (await get_optional_pr_suggestion_for_pr_by_student(db, project_role, student)) is None + await create_pr_suggestion(db, project_role, student, user, InputArgumentation()) + assert (await get_optional_pr_suggestion_for_pr_by_student(db, project_role, student)) is not None -def test_remove_student_from_project(database_session: Session): +async def test_remove_student_from_project(database_session: AsyncSession): """test removing a student form a project""" db = database_session edition: Edition = Edition(year=2022, name="ed2022") @@ -163,19 +164,19 @@ def test_remove_student_from_project(database_session: Session): db.add(edition) db.add(student) db.add(skill) - db.commit() + await db.commit() project_role: ProjectRole = ProjectRole(project=project, slots=1, skill=skill) db.add(project_role) - db.commit() + await db.commit() - create_pr_suggestion(db, project_role, student, user, InputArgumentation()) - assert len(db.query(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student).all()) == 1 - remove_project_role_suggestion(db, project_role, student) - assert len(db.query(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student).all()) == 0 + await create_pr_suggestion(db, project_role, student, user, InputArgumentation()) + assert len((await db.execute(select(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student))).scalars().all()) == 1 + await remove_project_role_suggestion(db, project_role, student) + assert len((await db.execute(select(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student))).scalars().all()) == 0 -def test_remove_student_from_project_not_assigned_to(database_session: Session): +async def test_remove_student_from_project_not_assigned_to(database_session: AsyncSession): """test removing a student form a project that don't exist""" db = database_session edition: Edition = Edition(year=2022, name="ed2022") @@ -196,17 +197,17 @@ def test_remove_student_from_project_not_assigned_to(database_session: Session): db.add(edition) db.add(student) db.add(skill) - db.commit() + await db.commit() project_role: ProjectRole = ProjectRole(project=project, slots=1, skill=skill) db.add(project_role) - db.commit() + await db.commit() with pytest.raises(NoResultFound): - remove_project_role_suggestion(db, project_role, student) + await remove_project_role_suggestion(db, project_role, student) -def test_change_project_role(database_session: Session): +async def test_change_project_role(database_session: AsyncSession): """test change project role""" db = database_session edition: Edition = Edition(year=2022, name="ed2022") @@ -227,24 +228,24 @@ def test_change_project_role(database_session: Session): db.add(edition) db.add(student) db.add(skill) - db.commit() + await db.commit() project_role: ProjectRole = ProjectRole(project=project, slots=1, skill=skill) db.add(project_role) - db.commit() + await db.commit() - create_pr_suggestion(db, project_role, student, user, InputArgumentation()) - assert len(db.query(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student).all()) == 1 + await create_pr_suggestion(db, project_role, student, user, InputArgumentation()) + assert len((await db.execute(select(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student))).scalars().all()) == 1 updating_user: User = User(name="coach1") argumentation: InputArgumentation = InputArgumentation(argumentation="+") - pr_suggestion: ProjectRoleSuggestion = get_pr_suggestion_for_pr_by_student(db, project_role, student) - update_pr_suggestion(db, pr_suggestion, updating_user, argumentation) + pr_suggestion: ProjectRoleSuggestion = await get_pr_suggestion_for_pr_by_student(db, project_role, student) + await update_pr_suggestion(db, pr_suggestion, updating_user, argumentation) assert pr_suggestion.student == student assert pr_suggestion.drafter == updating_user assert pr_suggestion.argumentation == "+" assert pr_suggestion.project_role == project_role - assert len(db.query(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student).all()) == 1 + assert len((await db.execute(select(ProjectRoleSuggestion).where(ProjectRoleSuggestion.student == student))).scalars().all()) == 1 diff --git a/backend/tests/test_database/test_crud/test_students.py b/backend/tests/test_database/test_crud/test_students.py index 1ff4a5327..fe30b2d93 100644 --- a/backend/tests/test_database/test_crud/test_students.py +++ b/backend/tests/test_database/test_crud/test_students.py @@ -1,6 +1,7 @@ import datetime import pytest -from sqlalchemy.orm import Session +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm.exc import NoResultFound from src.database.models import Student, User, Edition, Skill, DecisionEmail from src.database.enums import DecisionEnum, EmailStatusEnum @@ -11,12 +12,12 @@ @pytest.fixture -def database_with_data(database_session: Session): +async def database_with_data(database_session: AsyncSession): """A function to fill the database with fake data that can easly be used when testing""" # Editions edition: Edition = Edition(year=2022, name="ed22") database_session.add(edition) - database_session.commit() + await database_session.commit() # Users admin: User = User(name="admin", admin=True) @@ -25,7 +26,7 @@ def database_with_data(database_session: Session): database_session.add(admin) database_session.add(coach1) database_session.add(coach2) - database_session.commit() + await database_session.commit() # Skill skill1: Skill = Skill(name="skill1") @@ -40,7 +41,7 @@ def database_with_data(database_session: Session): database_session.add(skill4) database_session.add(skill5) database_session.add(skill6) - database_session.commit() + await database_session.commit() # Student student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", @@ -52,213 +53,213 @@ def database_with_data(database_session: Session): database_session.add(student01) database_session.add(student30) - database_session.commit() + await database_session.commit() # DecisionEmail decision_email: DecisionEmail = DecisionEmail( student=student01, decision=EmailStatusEnum.APPROVED, date=datetime.datetime.now()) database_session.add(decision_email) - database_session.commit() + await database_session.commit() return database_session -def test_get_student_by_id(database_with_data: Session): +async def test_get_student_by_id(database_with_data: AsyncSession): """Tests if you get the right student""" - student: Student = get_student_by_id(database_with_data, 1) + student: Student = await get_student_by_id(database_with_data, 1) assert student.first_name == "Jos" assert student.last_name == "Vermeulen" assert student.student_id == 1 assert student.email_address == "josvermeulen@mail.com" -def test_no_student(database_with_data: Session): +async def test_no_student(database_with_data: AsyncSession): """Tests if you get an error for a not existing student""" with pytest.raises(NoResultFound): - get_student_by_id(database_with_data, 5) + await get_student_by_id(database_with_data, 5) -def test_definitive_decision_on_student_yes(database_with_data: Session): +async def test_definitive_decision_on_student_yes(database_with_data: AsyncSession): """Tests for definitive decision yes""" - student: Student = get_student_by_id(database_with_data, 1) - set_definitive_decision_on_student( + student: Student = await get_student_by_id(database_with_data, 1) + await set_definitive_decision_on_student( database_with_data, student, DecisionEnum.YES) assert student.decision == DecisionEnum.YES -def test_definitive_decision_on_student_maybe(database_with_data: Session): +async def test_definitive_decision_on_student_maybe(database_with_data: AsyncSession): """Tests for definitive decision maybe""" - student: Student = get_student_by_id(database_with_data, 1) - set_definitive_decision_on_student( + student: Student = await get_student_by_id(database_with_data, 1) + await set_definitive_decision_on_student( database_with_data, student, DecisionEnum.MAYBE) assert student.decision == DecisionEnum.MAYBE -def test_definitive_decision_on_student_no(database_with_data: Session): +async def test_definitive_decision_on_student_no(database_with_data: AsyncSession): """Tests for definitive decision no""" - student: Student = get_student_by_id(database_with_data, 1) - set_definitive_decision_on_student( + student: Student = await get_student_by_id(database_with_data, 1) + await set_definitive_decision_on_student( database_with_data, student, DecisionEnum.NO) assert student.decision == DecisionEnum.NO -def test_delete_student(database_with_data: Session): +async def test_delete_student(database_with_data: AsyncSession): """Tests for deleting a student""" - student: Student = get_student_by_id(database_with_data, 1) - delete_student(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 1) + await delete_student(database_with_data, student) with pytest.raises(NoResultFound): - get_student_by_id(database_with_data, 1) + await get_student_by_id(database_with_data, 1) -def test_get_all_students(database_with_data: Session): +async def test_get_all_students(database_with_data: AsyncSession): """test get all students""" - edition: Edition = database_with_data.query(Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, CommonQueryParams()) + edition: Edition = (await database_with_data.execute(select(Edition).where(Edition.edition_id == 1))).scalar_one() + students = await get_students(database_with_data, edition, CommonQueryParams()) assert len(students) == 2 -def test_search_students_on_first_name(database_with_data: Session): +async def test_search_students_on_first_name(database_with_data: AsyncSession): """test""" - edition: Edition = database_with_data.query(Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, CommonQueryParams(name="Jos")) + edition: Edition = (await database_with_data.execute(select(Edition).where(Edition.edition_id == 1))).scalar_one() + students = await get_students(database_with_data, edition, CommonQueryParams(name="Jos")) assert len(students) == 1 -def test_search_students_on_last_name(database_with_data: Session): +async def test_search_students_on_last_name(database_with_data: AsyncSession): """tests search on last name""" - edition: Edition = database_with_data.query(Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, CommonQueryParams(name="Vermeulen")) + edition: Edition = (await database_with_data.execute(select(Edition).where(Edition.edition_id == 1))).scalar_one() + students = await get_students(database_with_data, edition, CommonQueryParams(name="Vermeulen")) assert len(students) == 1 -def test_search_students_on_between_first_and_last_name(database_with_data: Session): +async def test_search_students_on_between_first_and_last_name(database_with_data: AsyncSession): """tests search on between first- and last name""" - edition: Edition = database_with_data.query(Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, CommonQueryParams(name="os V")) + edition: Edition = (await database_with_data.execute(select(Edition).where(Edition.edition_id == 1))).scalar_one() + students = await get_students(database_with_data, edition, CommonQueryParams(name="os V")) assert len(students) == 1 -def test_search_students_alumni(database_with_data: Session): +async def test_search_students_alumni(database_with_data: AsyncSession): """tests search on alumni""" - edition: Edition = database_with_data.query(Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, CommonQueryParams(alumni=True)) + edition: Edition = (await database_with_data.execute(select(Edition).where(Edition.edition_id == 1))).scalar_one() + students = await get_students(database_with_data, edition, CommonQueryParams(alumni=True)) assert len(students) == 1 -def test_search_students_student_coach(database_with_data: Session): +async def test_search_students_student_coach(database_with_data: AsyncSession): """tests search on student coach""" - edition: Edition = database_with_data.query(Edition).where(Edition.edition_id == 1).one() - students = get_students(database_with_data, edition, CommonQueryParams(student_coach=True)) + edition: Edition = (await database_with_data.execute(select(Edition).where(Edition.edition_id == 1))).scalar_one() + students = await get_students(database_with_data, edition, CommonQueryParams(student_coach=True)) assert len(students) == 1 -def test_search_students_one_skill(database_with_data: Session): +async def test_search_students_one_skill(database_with_data: AsyncSession): """tests search on one skill""" - edition: Edition = database_with_data.query(Edition).where(Edition.edition_id == 1).one() - skill: Skill = database_with_data.query(Skill).where(Skill.name == "skill1").one() - students = get_students(database_with_data, edition, CommonQueryParams(), skills=[skill]) + edition: Edition = (await database_with_data.execute(select(Edition).where(Edition.edition_id == 1))).scalar_one() + skill: Skill = (await database_with_data.execute(select(Skill).where(Skill.name == "skill1"))).scalar_one() + students = await get_students(database_with_data, edition, CommonQueryParams(), skills=[skill]) assert len(students) == 1 -def test_search_students_multiple_skills(database_with_data: Session): +async def test_search_students_multiple_skills(database_with_data: AsyncSession): """tests search on multiple skills""" - edition: Edition = database_with_data.query(Edition).where(Edition.edition_id == 1).one() + edition: Edition = (await database_with_data.execute(select(Edition).where(Edition.edition_id == 1))).scalar_one() skills: list[Skill] = [ - database_with_data.query(Skill).where(Skill.name == "skill4").one(), - database_with_data.query(Skill).where(Skill.name == "skill5").one(), + (await database_with_data.execute(select(Skill).where(Skill.name == "skill4"))).scalar_one(), + (await database_with_data.execute(select(Skill).where(Skill.name == "skill5"))).scalar_one(), ] - students = get_students(database_with_data, edition, CommonQueryParams(), skills=skills) + students = await get_students(database_with_data, edition, CommonQueryParams(), skills=skills) assert len(students) == 1 -def test_get_emails(database_with_data: Session): +async def test_get_emails(database_with_data: AsyncSession): """tests to get emails""" - student: Student = get_student_by_id(database_with_data, 1) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 1) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 - student = get_student_by_id(database_with_data, 2) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student = await get_student_by_id(database_with_data, 2) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 0 -def test_create_email_applied(database_with_data: Session): +async def test_create_email_applied(database_with_data: AsyncSession): """test create email applied""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, EmailStatusEnum.APPLIED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, EmailStatusEnum.APPLIED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.APPLIED -def test_create_email_awaiting_project(database_with_data: Session): +async def test_create_email_awaiting_project(database_with_data: AsyncSession): """test create email awaiting project""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, EmailStatusEnum.AWAITING_PROJECT) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, EmailStatusEnum.AWAITING_PROJECT) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.AWAITING_PROJECT -def test_create_email_approved(database_with_data: Session): +async def test_create_email_approved(database_with_data: AsyncSession): """test create email approved""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, EmailStatusEnum.APPROVED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, EmailStatusEnum.APPROVED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.APPROVED -def test_create_email_contract_confirmed(database_with_data: Session): +async def test_create_email_contract_confirmed(database_with_data: AsyncSession): """test create email contract confirmed""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_create_email_contract_declined(database_with_data: Session): +async def test_create_email_contract_declined(database_with_data: AsyncSession): """test create email contract declined""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, - EmailStatusEnum.CONTRACT_DECLINED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, + EmailStatusEnum.CONTRACT_DECLINED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.CONTRACT_DECLINED -def test_create_email_rejected(database_with_data: Session): +async def test_create_email_rejected(database_with_data: AsyncSession): """test create email rejected""" - student: Student = get_student_by_id(database_with_data, 2) - create_email(database_with_data, student, EmailStatusEnum.REJECTED) - emails: list[DecisionEmail] = get_emails(database_with_data, student) + student: Student = await get_student_by_id(database_with_data, 2) + await create_email(database_with_data, student, EmailStatusEnum.REJECTED) + emails: list[DecisionEmail] = await get_emails(database_with_data, student) assert len(emails) == 1 assert emails[0].decision == EmailStatusEnum.REJECTED -def test_get_last_emails_of_students(database_with_data: Session): +async def test_get_last_emails_of_students(database_with_data: AsyncSession): """tests get last email of all students that got an email""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) edition2: Edition = Edition(year=2023, name="ed2023") database_with_data.add(edition) student: Student = Student(first_name="Mehmet", last_name="Dizdar", preferred_name="Mehmet", email_address="mehmet.dizdar@example.com", phone_number="(787)-938-6216", alumni=True, wants_to_be_student_coach=False, edition=edition2, skills=[]) database_with_data.add(student) - database_with_data.commit() - create_email(database_with_data, student, - EmailStatusEnum.REJECTED) + await database_with_data.commit() + await create_email(database_with_data, student, + EmailStatusEnum.REJECTED) - emails: list[DecisionEmail] = get_last_emails_of_students( + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[])) assert len(emails) == 2 assert emails[0].student_id == 1 @@ -267,16 +268,16 @@ def test_get_last_emails_of_students(database_with_data: Session): assert emails[1].decision == EmailStatusEnum.REJECTED -def test_get_last_emails_of_students_filter_applied(database_with_data: Session): +async def test_get_last_emails_of_students_filter_applied(database_with_data: AsyncSession): """tests get all emails where last emails is applied""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student2, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student2, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.APPLIED])) assert len(emails) == 1 @@ -284,18 +285,18 @@ def test_get_last_emails_of_students_filter_applied(database_with_data: Session) assert emails[0].decision == EmailStatusEnum.APPLIED -def test_get_last_emails_of_students_filter_awaiting_project(database_with_data: Session): +async def test_get_last_emails_of_students_filter_awaiting_project(database_with_data: AsyncSession): """tests get all emails where last emails is awaiting project""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.AWAITING_PROJECT) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.AWAITING_PROJECT) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.AWAITING_PROJECT])) assert len(emails) == 1 @@ -303,18 +304,18 @@ def test_get_last_emails_of_students_filter_awaiting_project(database_with_data: assert emails[0].decision == EmailStatusEnum.AWAITING_PROJECT -def test_get_last_emails_of_students_filter_approved(database_with_data: Session): +async def test_get_last_emails_of_students_filter_approved(database_with_data: AsyncSession): """tests get all emails where last emails is approved""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.APPROVED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.APPROVED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.APPROVED])) assert len(emails) == 1 @@ -322,16 +323,16 @@ def test_get_last_emails_of_students_filter_approved(database_with_data: Session assert emails[0].decision == EmailStatusEnum.APPROVED -def test_get_last_emails_of_students_filter_contract_confirmed(database_with_data: Session): +async def test_get_last_emails_of_students_filter_contract_confirmed(database_with_data: AsyncSession): """tests get all emails where last emails is contract confirmed""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.CONTRACT_CONFIRMED])) assert len(emails) == 1 @@ -339,18 +340,18 @@ def test_get_last_emails_of_students_filter_contract_confirmed(database_with_dat assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_get_last_emails_of_students_filter_contract_declined(database_with_data: Session): +async def test_get_last_emails_of_students_filter_contract_declined(database_with_data: AsyncSession): """tests get all emails where last emails is contract declined""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.CONTRACT_DECLINED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.CONTRACT_DECLINED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.CONTRACT_DECLINED])) assert len(emails) == 1 @@ -358,18 +359,18 @@ def test_get_last_emails_of_students_filter_contract_declined(database_with_data assert emails[0].decision == EmailStatusEnum.CONTRACT_DECLINED -def test_get_last_emails_of_students_filter_rejected(database_with_data: Session): +async def test_get_last_emails_of_students_filter_rejected(database_with_data: AsyncSession): """tests get all emails where last emails is rejected""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[EmailStatusEnum.REJECTED])) assert len(emails) == 1 @@ -377,18 +378,18 @@ def test_get_last_emails_of_students_filter_rejected(database_with_data: Session assert emails[0].decision == EmailStatusEnum.REJECTED -def test_get_last_emails_of_students_first_name(database_with_data: Session): +async def test_get_last_emails_of_students_first_name(database_with_data: AsyncSession): """tests get all emails where last emails is first name""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(name="Jos", email_status=[])) assert len(emails) == 1 @@ -396,18 +397,18 @@ def test_get_last_emails_of_students_first_name(database_with_data: Session): assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_get_last_emails_of_students_last_name(database_with_data: Session): +async def test_get_last_emails_of_students_last_name(database_with_data: AsyncSession): """tests get all emails where last emails is last name""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(name="Vermeulen", email_status=[])) assert len(emails) == 1 @@ -415,18 +416,18 @@ def test_get_last_emails_of_students_last_name(database_with_data: Session): assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_get_last_emails_of_students_between_first_and_last_name(database_with_data: Session): +async def test_get_last_emails_of_students_between_first_and_last_name(database_with_data: AsyncSession): """tests get all emails where last emails is between first- and last name""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student1, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student2, - EmailStatusEnum.REJECTED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student1, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student2, + EmailStatusEnum.REJECTED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(name="os V", email_status=[])) assert len(emails) == 1 @@ -434,16 +435,16 @@ def test_get_last_emails_of_students_between_first_and_last_name(database_with_d assert emails[0].decision == EmailStatusEnum.CONTRACT_CONFIRMED -def test_get_last_emails_of_students_filter_mutliple_status(database_with_data: Session): +async def test_get_last_emails_of_students_filter_mutliple_status(database_with_data: AsyncSession): """tests get all emails where last emails is applied""" - student1: Student = get_student_by_id(database_with_data, 1) - student2: Student = get_student_by_id(database_with_data, 2) - edition: Edition = database_with_data.query(Edition).all()[0] - create_email(database_with_data, student2, - EmailStatusEnum.APPLIED) - create_email(database_with_data, student1, - EmailStatusEnum.CONTRACT_CONFIRMED) - emails: list[DecisionEmail] = get_last_emails_of_students( + student1: Student = await get_student_by_id(database_with_data, 1) + student2: Student = await get_student_by_id(database_with_data, 2) + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await create_email(database_with_data, student2, + EmailStatusEnum.APPLIED) + await create_email(database_with_data, student1, + EmailStatusEnum.CONTRACT_CONFIRMED) + emails: list[DecisionEmail] = await get_last_emails_of_students( database_with_data, edition, EmailsSearchQueryParams(email_status=[ EmailStatusEnum.APPLIED, EmailStatusEnum.CONTRACT_CONFIRMED diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index 7f9b78f3e..b274e5a14 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -1,3 +1,4 @@ +import pytest from sqlalchemy.orm import Session from starlette import status @@ -5,6 +6,9 @@ from src.database.models import Edition, Project, User, Partner from tests.utils.authorization import AuthClient +# temporary skip until merge is done +pytest.skip(allow_module_level=True) + def test_get_projects_paginated(database_session: Session, auth_client: AuthClient): """test get all projects paginated""" @@ -157,7 +161,7 @@ def test_create_project_no_name(database_session: Session, auth_client: AuthClie "coaches": [] }) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY response = auth_client.get(f"/editions/{edition.name}/projects/") assert len(response.json()['projects']) == 0 From b6328b94c66697d867ea07f3544dec49fe4c3221 Mon Sep 17 00:00:00 2001 From: Seppe <57944475+SeppeM8@users.noreply.github.com> Date: Thu, 12 May 2022 10:28:40 +0200 Subject: [PATCH 172/649] Typos Co-authored-by: Stijn De Clercq <60451863+stijndcl@users.noreply.github.com> --- .../ProjectsComponents/Conflicts/ConflictsButton.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx b/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx index ded606e84..abac1fbf9 100644 --- a/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx +++ b/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx @@ -36,13 +36,13 @@ export default function ConflictsButton(props: { editionId: string }) { - The student may be a better fot for a specific team, if they: + The student may be a better fit for a specific team, if they:
    • are an alumni and the team doesn't have any yet
    • are an alumni on a team with a half-time coach
    • are an alumni and provide skills the coach does not have
    • have pre-existing history with the project in question
      • -
    • enricht the team's diversity
      • +
    • enrich the team's diversity
    • have a skillset that is tough to find in other applicants,
      From eafe53677e51d65740ad0a11d9eab4e52667adb3 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 10:45:10 +0200 Subject: [PATCH 173/649] Style addButton, addModal & removeModal --- .../components/AdminsComponents/AddAdmin.tsx | 28 ++++++++----------- .../AdminsComponents/RemoveAdmin.tsx | 12 ++++---- .../src/components/AdminsComponents/styles.ts | 4 +++ 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/frontend/src/components/AdminsComponents/AddAdmin.tsx b/frontend/src/components/AdminsComponents/AddAdmin.tsx index ef60f0d92..d5da53361 100644 --- a/frontend/src/components/AdminsComponents/AddAdmin.tsx +++ b/frontend/src/components/AdminsComponents/AddAdmin.tsx @@ -9,21 +9,6 @@ import { StyledMenuItem } from "../GeneralComponents/styles"; import UserMenuItem from "../GeneralComponents/MenuItem"; import { EmailAndAuth } from "../GeneralComponents"; -/** - * Warning that the user will get all persmissions. - * @param props.name The name of the user. - */ -function AddWarning(props: { name: string | undefined }) { - if (props.name !== undefined) { - return ( - - Warning: {props.name} will be able to edit/delete all data and manage admin roles. - - ); - } - return null; -} - /** * Button and popup to add an existing user as admin. * @param props.users All users which can be added as admin. @@ -107,11 +92,20 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { }} disabled={selected === undefined} > - Add {selected?.name} as admin + Add admin ); } + let warning; + if (selected !== undefined) { + warning = ( + + Warning: This user will be able to edit/delete all data and manage admin roles. + + ); + } + return ( <> @@ -166,7 +160,7 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { - + {warning} {addButton} diff --git a/frontend/src/components/AdminsComponents/RemoveAdmin.tsx b/frontend/src/components/AdminsComponents/RemoveAdmin.tsx index 4e92f4883..2a34aa4f4 100644 --- a/frontend/src/components/AdminsComponents/RemoveAdmin.tsx +++ b/frontend/src/components/AdminsComponents/RemoveAdmin.tsx @@ -2,7 +2,7 @@ import { User } from "../../utils/api/users/users"; import React, { useState } from "react"; import { removeAdmin, removeAdminAndCoach } from "../../utils/api/users/admins"; import { Button, Modal } from "react-bootstrap"; -import { ModalContentWarning } from "./styles"; +import { ModalContentWarning, RemoveAdminBody } from "./styles"; import { Error } from "../UsersComponents/Requests/styles"; /** @@ -51,11 +51,11 @@ export default function RemoveAdmin(props: { admin: User; removeAdmin: (user: Us Remove Admin -

      {props.admin.name}

      -

      {props.admin.auth.email}

      -

      - Remove admin: {props.admin.name} will stay coach for assigned editions -

      + +

      {props.admin.name}

      +

      {props.admin.auth.email}

      +

      Remove admin: This admin will stay coach for assigned editions

      +       - ); + submitButton = ; } return ( @@ -130,7 +140,13 @@ export default function CreateEditionPage() { /> {yearError} - {submitButton} + + navigate("/editions")}> + + Cancel + + {submitButton} + {error} diff --git a/frontend/src/views/CreateEditionPage/styles.ts b/frontend/src/views/CreateEditionPage/styles.ts index 4cfef2415..4a0e8df75 100644 --- a/frontend/src/views/CreateEditionPage/styles.ts +++ b/frontend/src/views/CreateEditionPage/styles.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Form } from "react-bootstrap"; +import { Form, Button } from "react-bootstrap"; export const Error = styled.div` color: var(--osoc_red); @@ -15,10 +15,30 @@ export const CreateEditionDiv = styled.div` export const FormGroup = styled(Form.Group)` margin-top: 20px; + .form-control { + background-color: #131329; + color: white; + border: none; + } `; export const ButtonDiv = styled.div` - margin-top: 20px; - margin-bottom: 20px; - float: right; + margin: 15px auto; + display: flex; + width: fit-content; + align-items: center; + vertical-align: middle; +`; + +export const CancelButton = styled(Button)` + margin-right: 5px; + background-color: #131329; + color: white; + border-color: #131329; + + &:hover { + background-color: #131325; + color: white; + border-color: #131325; + } `; From 89ae52ea3f15c119afebfa4b195c21fc9cef62ca Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 12 May 2022 11:13:23 +0200 Subject: [PATCH 175/649] added toast ids --- .../CreateEditionPage/CreateEditionPage.tsx | 20 +++++++++++-------- .../src/views/CreateEditionPage/styles.ts | 2 ++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/frontend/src/views/CreateEditionPage/CreateEditionPage.tsx b/frontend/src/views/CreateEditionPage/CreateEditionPage.tsx index 6d3175e49..241941d40 100644 --- a/frontend/src/views/CreateEditionPage/CreateEditionPage.tsx +++ b/frontend/src/views/CreateEditionPage/CreateEditionPage.tsx @@ -26,25 +26,29 @@ export default function CreateEditionPage() { const [loading, setLoading] = useState(false); async function sendEdition(name: string, year: number): Promise { - const response = await toast.promise(createEdition(name, year), { - pending: "Creating new edition", - error: "Connection issue", - }); + const response = await toast.promise( + createEdition(name, year), + { + pending: "Creating new edition", + error: "Connection issue", + }, + { toastId: "createEdition" } + ); if (response.status === 201) { const allEditions = await getSortedEditions(); setEditions(allEditions); setCurrentEdition(response.data.name); - toast.success("Successfully made new edition"); + toast.success("Successfully made new edition", { toastId: "createEditionSuccess" }); return true; } else if (response.status === 409) { setNameError("Edition name already exists."); - toast.warning("Edition name already exists"); + toast.warning("Edition name already exists", { toastId: "createEditionNameExists" }); } else if (response.status === 422) { setNameError("Invalid edition name."); - toast.warning("Invalid edition name"); + toast.warning("Invalid edition name", { toastId: "createEditionBadName" }); } else { setError("Something went wrong."); - toast.error("Something went wrong"); + toast.error("Something went wrong", { toastId: "createEditionError" }); } return false; } diff --git a/frontend/src/views/CreateEditionPage/styles.ts b/frontend/src/views/CreateEditionPage/styles.ts index 4a0e8df75..7513b63c7 100644 --- a/frontend/src/views/CreateEditionPage/styles.ts +++ b/frontend/src/views/CreateEditionPage/styles.ts @@ -31,6 +31,8 @@ export const ButtonDiv = styled.div` `; export const CancelButton = styled(Button)` + display: flex; + align-items: center; margin-right: 5px; background-color: #131329; color: white; From 3ef3cbad7ba636779cebfe4160f0145574e8b3f2 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Sun, 8 May 2022 18:40:46 +0200 Subject: [PATCH 176/649] start webhooks route --- .../editions/students/answers/__init__.py | 1 + .../editions/students/answers/answers.py | 17 +++++ .../app/routers/editions/students/students.py | 3 + .../test_students/test_answers/__init__.py | 0 .../test_answers/test_answers.py | 76 +++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 backend/src/app/routers/editions/students/answers/__init__.py create mode 100644 backend/src/app/routers/editions/students/answers/answers.py create mode 100644 backend/tests/test_routers/test_editions/test_students/test_answers/__init__.py create mode 100644 backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py diff --git a/backend/src/app/routers/editions/students/answers/__init__.py b/backend/src/app/routers/editions/students/answers/__init__.py new file mode 100644 index 000000000..4549d9bc2 --- /dev/null +++ b/backend/src/app/routers/editions/students/answers/__init__.py @@ -0,0 +1 @@ +from .answers import students_answers_router diff --git a/backend/src/app/routers/editions/students/answers/answers.py b/backend/src/app/routers/editions/students/answers/answers.py new file mode 100644 index 000000000..748039c0a --- /dev/null +++ b/backend/src/app/routers/editions/students/answers/answers.py @@ -0,0 +1,17 @@ +from fastapi import APIRouter, Depends +from sqlalchemy.ext.asyncio import AsyncSession + +from starlette import status +from src.app.routers.tags import Tags +from src.app.utils.dependencies import require_auth, get_student, get_suggestion +from src.database.models import Student, User, Suggestion +from src.database.database import get_session + +students_answers_router = APIRouter( + prefix="/answers", tags=[Tags.STUDENTS]) + +@students_answers_router.get("/", status_code=status.HTTP_200_OK) +async def get_answers(student: Student=Depends(get_student), + db: AsyncSession=Depends(get_session)): + """give answers of a student""" + return "test" diff --git a/backend/src/app/routers/editions/students/students.py b/backend/src/app/routers/editions/students/students.py index 93deb4d45..ebe34d3ce 100644 --- a/backend/src/app/routers/editions/students/students.py +++ b/backend/src/app/routers/editions/students/students.py @@ -14,10 +14,13 @@ from src.database.database import get_session from src.database.models import Student, Edition from .suggestions import students_suggestions_router +from .answers import students_answers_router students_router = APIRouter(prefix="/students", tags=[Tags.STUDENTS]) students_router.include_router( students_suggestions_router, prefix="/{student_id}") +students_router.include_router( + students_answers_router, prefix="/{student_id}") @students_router.get("", dependencies=[Depends(require_auth)], response_model=ReturnStudentList) diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/__init__.py b/backend/tests/test_routers/test_editions/test_students/test_answers/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py new file mode 100644 index 000000000..9569fdd26 --- /dev/null +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -0,0 +1,76 @@ +import pytest +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession +#from starlette import status + +#from settings import DB_PAGE_SIZE +from src.database.models import Edition, Project, User, Skill, ProjectRole, Student +from tests.utils.authorization import AuthClient + + +@pytest.fixture +async def database_with_data(database_session: AsyncSession) -> AsyncSession: + """fixture for adding data to the database""" + edition: Edition = Edition(year=2022, name="ed2022") + database_session.add(edition) + project1 = Project(name="project1", edition=edition, number_of_students=2) + project2 = Project(name="project2", edition=edition, number_of_students=3) + project3 = Project(name="super nice project", edition=edition, number_of_students=3) + database_session.add(project1) + database_session.add(project2) + database_session.add(project3) + user: User = User(name="coach1") + database_session.add(user) + skill1: Skill = Skill(name="skill1", description="something about skill1") + skill2: Skill = Skill(name="skill2", description="something about skill2") + skill3: Skill = Skill(name="skill3", description="something about skill3") + database_session.add(skill1) + database_session.add(skill2) + database_session.add(skill3) + student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", + email_address="josvermeulen@mail.com", phone_number="0487/86.24.45", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill1, skill3]) + student02: Student = Student(first_name="Isabella", last_name="Christensen", preferred_name="Isabella", + email_address="isabella.christensen@example.com", phone_number="98389723", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2]) + database_session.add(student01) + database_session.add(student02) + project_role1: ProjectRole = ProjectRole( + student=student01, project=project1, skill=skill1, drafter=user, argumentation="argmunet") + project_role2: ProjectRole = ProjectRole( + student=student01, project=project2, skill=skill3, drafter=user, argumentation="argmunet") + project_role3: ProjectRole = ProjectRole( + student=student02, project=project1, skill=skill1, drafter=user, argumentation="argmunet") + database_session.add(project_role1) + database_session.add(project_role2) + database_session.add(project_role3) + await database_session.commit() + + return database_session + + +@pytest.fixture +async def current_edition(database_with_data: AsyncSession) -> Edition: + """fixture to get the latest edition""" + return (await database_with_data.execute(select(Edition))).scalars().all()[-1] + + +async def test_get_answers(database_with_data: AsyncSession, auth_client: AuthClient): + """test get answers""" + async with auth_client: + response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) + print(response) + assert False + +async def test_get_projects(database_with_data: AsyncSession, auth_client: AuthClient): + """Tests get all projects""" + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2022/projects", follow_redirects=True) + print(f"response: {response}") + json = response.json() + print(f"json: {json}") + assert len(json['projects']) == 3 + assert json['projects'][0]['name'] == "project1" + assert json['projects'][1]['name'] == "project2" + assert json['projects'][2]['name'] == "super nice project" From 375985f4b71b9fca359e21c5a779553f637f7cff Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Mon, 9 May 2022 11:15:16 +0200 Subject: [PATCH 177/649] some tests --- .../routers/editions/students/answers/answers.py | 11 ++++++----- .../test_students/test_answers/test_answers.py | 13 ------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/backend/src/app/routers/editions/students/answers/answers.py b/backend/src/app/routers/editions/students/answers/answers.py index 748039c0a..5066863d6 100644 --- a/backend/src/app/routers/editions/students/answers/answers.py +++ b/backend/src/app/routers/editions/students/answers/answers.py @@ -3,15 +3,16 @@ from starlette import status from src.app.routers.tags import Tags -from src.app.utils.dependencies import require_auth, get_student, get_suggestion -from src.database.models import Student, User, Suggestion +from src.app.utils.dependencies import get_student +from src.database.models import Student from src.database.database import get_session students_answers_router = APIRouter( prefix="/answers", tags=[Tags.STUDENTS]) + @students_answers_router.get("/", status_code=status.HTTP_200_OK) -async def get_answers(student: Student=Depends(get_student), - db: AsyncSession=Depends(get_session)): +async def get_answers(student: Student = Depends(get_student), + db: AsyncSession = Depends(get_session)): """give answers of a student""" - return "test" + return student.alumni diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py index 9569fdd26..cc8141502 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -61,16 +61,3 @@ async def test_get_answers(database_with_data: AsyncSession, auth_client: AuthCl response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) print(response) assert False - -async def test_get_projects(database_with_data: AsyncSession, auth_client: AuthClient): - """Tests get all projects""" - await auth_client.admin() - async with auth_client: - response = await auth_client.get("/editions/ed2022/projects", follow_redirects=True) - print(f"response: {response}") - json = response.json() - print(f"json: {json}") - assert len(json['projects']) == 3 - assert json['projects'][0]['name'] == "project1" - assert json['projects'][1]['name'] == "project2" - assert json['projects'][2]['name'] == "super nice project" From abc4b83e8ad7c14b093de02e0e71f792944be01e Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Thu, 12 May 2022 11:36:51 +0200 Subject: [PATCH 178/649] added answers --- backend/src/app/logic/answers.py | 21 ++++++ .../editions/students/answers/answers.py | 14 ++-- backend/src/app/schemas/answers.py | 44 ++++++++++++ .../test_answers/test_answers.py | 70 +++++++++++++------ 4 files changed, 119 insertions(+), 30 deletions(-) create mode 100644 backend/src/app/logic/answers.py create mode 100644 backend/src/app/schemas/answers.py diff --git a/backend/src/app/logic/answers.py b/backend/src/app/logic/answers.py new file mode 100644 index 000000000..c6cf5bf4a --- /dev/null +++ b/backend/src/app/logic/answers.py @@ -0,0 +1,21 @@ +from src.database.models import Student +from src.app.schemas.answers import Questions + + +async def gives_question_and_answers(student: Student) -> Questions: + """test""" + #student_question: question_model = + + + + #questions: list[Question] = [] + # for question in student_questions: + # questions.append(question) + + #return Question(type=student_question.type, + # question=student_question.question, + # answers=student_question.answers, + # files=student_question.files) + + # return "test" + return Questions(questions=student.questions) diff --git a/backend/src/app/routers/editions/students/answers/answers.py b/backend/src/app/routers/editions/students/answers/answers.py index 5066863d6..3cec9a9ec 100644 --- a/backend/src/app/routers/editions/students/answers/answers.py +++ b/backend/src/app/routers/editions/students/answers/answers.py @@ -1,18 +1,18 @@ from fastapi import APIRouter, Depends -from sqlalchemy.ext.asyncio import AsyncSession from starlette import status +from src.app.logic.answers import gives_question_and_answers from src.app.routers.tags import Tags -from src.app.utils.dependencies import get_student +from src.app.utils.dependencies import get_student, require_auth +from src.app.schemas.answers import Questions from src.database.models import Student -from src.database.database import get_session students_answers_router = APIRouter( prefix="/answers", tags=[Tags.STUDENTS]) -@students_answers_router.get("/", status_code=status.HTTP_200_OK) -async def get_answers(student: Student = Depends(get_student), - db: AsyncSession = Depends(get_session)): +@students_answers_router.get("/", status_code=status.HTTP_200_OK, response_model=Questions, + dependencies=[Depends(require_auth)]) +async def get_answers(student: Student = Depends(get_student)): """give answers of a student""" - return student.alumni + return await gives_question_and_answers(student=student) diff --git a/backend/src/app/schemas/answers.py b/backend/src/app/schemas/answers.py new file mode 100644 index 000000000..05cc04474 --- /dev/null +++ b/backend/src/app/schemas/answers.py @@ -0,0 +1,44 @@ +from src.app.schemas.utils import CamelCaseModel +from src.database.enums import QuestionEnum + + +class QuestionAnswer(CamelCaseModel): + """test""" + answer: str + + class Config: + """Set to ORM mode""" + orm_mode = True + + +class QuestionFileAnswer(CamelCaseModel): + """test""" + file_name: str + url: str + mime_type: str + size: str + + class Config: + """Set to ORM mode""" + orm_mode = True + + +class Question(CamelCaseModel): + """test""" + type: QuestionEnum + question: str + answers: list[QuestionAnswer] + files: list[QuestionFileAnswer] + + class Config: + """Set to ORM mode""" + orm_mode = True + + +class Questions(CamelCaseModel): + """test""" + questions: list[Question] + + class Config: + """Set to ORM mode""" + orm_mode = True diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py index cc8141502..c4825ea3c 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -1,10 +1,10 @@ import pytest from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession -#from starlette import status +from starlette import status -#from settings import DB_PAGE_SIZE -from src.database.models import Edition, Project, User, Skill, ProjectRole, Student +from src.database.models import Edition, User, Skill, Student, Question, QuestionAnswer +from src.database.enums import QuestionEnum from tests.utils.authorization import AuthClient @@ -13,12 +13,6 @@ async def database_with_data(database_session: AsyncSession) -> AsyncSession: """fixture for adding data to the database""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - project1 = Project(name="project1", edition=edition, number_of_students=2) - project2 = Project(name="project2", edition=edition, number_of_students=3) - project3 = Project(name="super nice project", edition=edition, number_of_students=3) - database_session.add(project1) - database_session.add(project2) - database_session.add(project3) user: User = User(name="coach1") database_session.add(user) skill1: Skill = Skill(name="skill1", description="something about skill1") @@ -35,17 +29,16 @@ async def database_with_data(database_session: AsyncSession) -> AsyncSession: wants_to_be_student_coach=True, edition=edition, skills=[skill2]) database_session.add(student01) database_session.add(student02) - project_role1: ProjectRole = ProjectRole( - student=student01, project=project1, skill=skill1, drafter=user, argumentation="argmunet") - project_role2: ProjectRole = ProjectRole( - student=student01, project=project2, skill=skill3, drafter=user, argumentation="argmunet") - project_role3: ProjectRole = ProjectRole( - student=student02, project=project1, skill=skill1, drafter=user, argumentation="argmunet") - database_session.add(project_role1) - database_session.add(project_role2) - database_session.add(project_role3) - await database_session.commit() + question1: Question = Question( + type=QuestionEnum.INPUT_EMAIL, question="Email", student=student01, answers=[], files=[]) + database_session.add(question1) + question_answer1: QuestionAnswer = QuestionAnswer( + answer="josvermeulen@mail.com", question=question1) + database_session.add(question_answer1) + #aswer1: QuestionAnswer = QuestionAnswer(answer="josvermeulen@mail.com", question=question1) + # database_session.add(aswer1) + await database_session.commit() return database_session @@ -55,9 +48,40 @@ async def current_edition(database_with_data: AsyncSession) -> Edition: return (await database_with_data.execute(select(Edition))).scalars().all()[-1] -async def test_get_answers(database_with_data: AsyncSession, auth_client: AuthClient): - """test get answers""" +async def test_get_answers_not_logged_in(database_with_data: AsyncSession, auth_client: AuthClient): + """test get answers when not logged in""" + async with auth_client: + response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) + assert response.status_code == status.HTTP_401_UNAUTHORIZED + + +async def test_get_answers_as_coach(database_with_data: AsyncSession, auth_client: AuthClient, current_edition: Edition): + """test get answers when logged in as coach""" + await auth_client.coach(current_edition) + async with auth_client: + response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + json = response.json() + assert len(json["questions"]) == 1 + assert QuestionEnum(json["questions"][0]["type"] + ) == QuestionEnum.INPUT_EMAIL + assert json["questions"][0]["question"] == "Email" + assert len(json["questions"][0]["answers"]) == 1 + assert json["questions"][0]["answers"][0]["answer"] == "josvermeulen@mail.com" + assert len(json["questions"][0]["files"]) == 0 + + +async def test_get_answers_as_admin(database_with_data: AsyncSession, auth_client: AuthClient): + """test get answers when logged in as admin""" + await auth_client.admin() async with auth_client: response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) - print(response) - assert False + assert response.status_code == status.HTTP_200_OK + json = response.json() + assert len(json["questions"]) == 1 + assert QuestionEnum(json["questions"][0]["type"] + ) == QuestionEnum.INPUT_EMAIL + assert json["questions"][0]["question"] == "Email" + assert len(json["questions"][0]["answers"]) == 1 + assert json["questions"][0]["answers"][0]["answer"] == "josvermeulen@mail.com" + assert len(json["questions"][0]["files"]) == 0 From 4438ebc11c55bb9808ba5b165e94f5548c756d51 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 12 May 2022 11:47:28 +0200 Subject: [PATCH 179/649] remove number of students input changed create project function --- .../NumberOfStudents/NumberOfStudents.tsx | 24 -------- .../InputFields/NumberOfStudents/index.ts | 1 - .../InputFields/index.ts | 1 - .../CreateProjectComponents/index.ts | 8 +-- frontend/src/data/interfaces/projects.ts | 6 -- frontend/src/utils/api/projects.ts | 6 -- .../CreateProjectPage/CreateProjectPage.tsx | 61 ++++++------------- 7 files changed, 20 insertions(+), 87 deletions(-) delete mode 100644 frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/NumberOfStudents.tsx delete mode 100644 frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/index.ts diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/NumberOfStudents.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/NumberOfStudents.tsx deleted file mode 100644 index 741d3148f..000000000 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/NumberOfStudents.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { Input } from "../../styles"; - -export default function NumberOfStudents({ - numberOfStudents, - setNumberOfStudents, -}: { - numberOfStudents: number; - setNumberOfStudents: (numberOfStudents: number) => void; -}) { - return ( -
      - { - if (e.target.valueAsNumber > 0 || isNaN(e.target.valueAsNumber)) - setNumberOfStudents(e.target.valueAsNumber); - }} - placeholder="Number of students" - /> -
      - ); -} diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/index.ts b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/index.ts deleted file mode 100644 index 7594e8ecf..000000000 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/NumberOfStudents/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./NumberOfStudents"; diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/index.ts b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/index.ts index b0235977d..a6cd81854 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/index.ts +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/index.ts @@ -1,5 +1,4 @@ export { default as NameInput } from "./Name"; -export { default as NumberOfStudentsInput } from "./NumberOfStudents"; export { default as CoachInput } from "./Coach"; export { default as SkillInput } from "./Skill"; export { default as PartnerInput } from "./Partner"; diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/index.ts b/frontend/src/components/ProjectsComponents/CreateProjectComponents/index.ts index 63f743cf3..ea14583f2 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/index.ts +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/index.ts @@ -1,10 +1,4 @@ -export { - NameInput, - NumberOfStudentsInput, - CoachInput, - SkillInput, - PartnerInput, -} from "./InputFields"; +export { NameInput, CoachInput, SkillInput, PartnerInput } from "./InputFields"; export { default as AddedPartners } from "./AddedPartners"; export { default as AddedCoaches } from "./AddedCoaches"; export { default as AddedSkills } from "./AddedSkills"; diff --git a/frontend/src/data/interfaces/projects.ts b/frontend/src/data/interfaces/projects.ts index 6609d8574..4eac335b2 100644 --- a/frontend/src/data/interfaces/projects.ts +++ b/frontend/src/data/interfaces/projects.ts @@ -74,12 +74,6 @@ export interface CreateProject { /** The name of the new project */ name: string; - /** Number of students the project needs */ - number_of_students: number; - - /** The required skills for the project */ - skills: string[]; - /** The partners that belong to this project */ partners: string[]; diff --git a/frontend/src/utils/api/projects.ts b/frontend/src/utils/api/projects.ts index 8550937a7..48f02e00a 100644 --- a/frontend/src/utils/api/projects.ts +++ b/frontend/src/utils/api/projects.ts @@ -62,8 +62,6 @@ export async function getProject(edition: string, projectId: number): Promise { const payload: CreateProject = { name: name, - number_of_students: numberOfStudents, - skills: skills, partners: partners, coaches: coaches, }; diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index 4aa5d304b..d3d8af2f4 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -13,7 +13,6 @@ import { useNavigate, useParams } from "react-router-dom"; import { BiArrowBack } from "react-icons/bi"; import { NameInput, - NumberOfStudentsInput, CoachInput, SkillInput, PartnerInput, @@ -23,6 +22,7 @@ import { } from "../../../components/ProjectsComponents/CreateProjectComponents"; import { SkillProject } from "../../../data/interfaces/projects"; import { User } from "../../../utils/api/users/users"; +import { toast } from "react-toastify"; /** * React component of the create project page. @@ -30,7 +30,6 @@ import { User } from "../../../utils/api/users/users"; */ export default function CreateProjectPage() { const [name, setName] = useState(""); - const [numberOfStudents, setNumberOfStudents] = useState(1); // States for coaches const [coach, setCoach] = useState(""); @@ -59,12 +58,6 @@ export default function CreateProjectPage() { - - - Cancel - { - if (name === "") { - alert("Project name must be filled in"); - return; - } - - if (isNaN(numberOfStudents)) { - alert("Number of students must be filled in"); - return; - } - - const coachIds: number[] = []; - coaches.forEach(coachToAdd => { - coachIds.push(coachToAdd.userId); - }); - - const response = await createProject( - editionId, - name, - numberOfStudents!, - [], // Empty skills for now TODO - partners, - coachIds - ); - if (response) { - navigate( - "/editions/" + editionId + "/projects/" + response.projectId - ); - } else alert("Something went wrong :("); - }} - > - Create Project - + Create Project ); + + async function makeProject() { + if (name === "") { + toast.warning("Project name must be filled in", { toastId: "createProjectNoName" }); + return; + } + + const coachIds: number[] = []; + coaches.forEach(coachToAdd => { + coachIds.push(coachToAdd.userId); + }); + + const response = await createProject(editionId, name, partners, coachIds); + if (response) { + navigate("/editions/" + editionId + "/projects/" + response.projectId); + } else alert("Something went wrong :("); + } } From 6b6175c1fca7b9c97ca13fb7ae5918fd81a6ec41 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 12 May 2022 12:05:15 +0200 Subject: [PATCH 180/649] updated interfaces to new skill format --- .../ProjectCard/ProjectCard.tsx | 17 ++++---- frontend/src/data/interfaces/projects.ts | 42 +++++++++++++------ 2 files changed, 39 insertions(+), 20 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/ProjectCard/ProjectCard.tsx b/frontend/src/components/ProjectsComponents/ProjectCard/ProjectCard.tsx index e4afd62bd..7101b46e9 100644 --- a/frontend/src/components/ProjectsComponents/ProjectCard/ProjectCard.tsx +++ b/frontend/src/components/ProjectsComponents/ProjectCard/ProjectCard.tsx @@ -25,6 +25,7 @@ import { useNavigate, useParams } from "react-router-dom"; import { Project } from "../../../data/interfaces"; import { useAuth } from "../../../contexts"; import { Role } from "../../../data/enums"; +import { toast } from "react-toastify"; /** * @@ -43,22 +44,22 @@ export default function ProjectCard({ const [show, setShow] = useState(false); const handleClose = () => setShow(false); const handleShow = () => setShow(true); + const navigate = useNavigate(); + const params = useParams(); + const editionId = params.editionId!; // What to do when deleting a project. async function handleDelete() { - const success = await deleteProject(project.editionName, project.projectId); + const success = await deleteProject(editionId, project.projectId); setShow(false); if (!success) { - alert("Failed to delete the project"); + toast.error("Could not delete project", { toastId: "deleteProject" }); } else { removeProject(project); + toast.success("Deleted project", { toastId: "deletedProject" }); } } - const navigate = useNavigate(); - const params = useParams(); - const editionId = params.editionId!; - const { role } = useAuth(); return ( @@ -94,7 +95,9 @@ export default function ProjectCard({ ))} - {project.numberOfStudents} + { + // project.numberOfStudents + } diff --git a/frontend/src/data/interfaces/projects.ts b/frontend/src/data/interfaces/projects.ts index 4eac335b2..cbe1232c2 100644 --- a/frontend/src/data/interfaces/projects.ts +++ b/frontend/src/data/interfaces/projects.ts @@ -2,6 +2,8 @@ * This file contains all interfaces used in projects pages. */ +import { Student } from "./students"; + /** * Data about a partner. */ @@ -14,11 +16,31 @@ export interface Partner { * Data about a coach. */ export interface Coach { + /** The user's ID */ + userId: number; /** The name of the coach */ name: string; +} - /** The user's ID */ - userId: number; +export interface Skill { + skillId: number; + name: string; +} + +export interface ProjectRoleSuggestion { + projectRoleSuggestionId: number; + argumentation: string; + drafter: Coach; + student: Student; +} + +export interface ProjectRole { + projectRoleId: number; + projectId: number; + description: string; + skill: Skill; + slots: number; + suggestions: ProjectRoleSuggestion[]; } /** @@ -26,23 +48,17 @@ export interface Coach { * Such as a list of the partners and the coaches */ export interface Project { + /** The project's ID */ + projectId: number; + /** The name of the project */ name: string; - /** How many students are needed for this project */ - numberOfStudents: number; - - /** The partners of this project */ - partners: Partner[]; - /** The coaches of this project */ coaches: Coach[]; - /** The name of the edition this project belongs to */ - editionName: string; - - /** The project's ID */ - projectId: number; + /** The partners of this project */ + partners: Partner[]; } /** From 4ea0544cc2567b174d4911acd85264756ec98e71 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 12 May 2022 12:05:31 +0200 Subject: [PATCH 181/649] tests should work now --- backend/src/app/logic/projects.py | 5 +- backend/src/database/crud/partners.py | 2 +- backend/src/database/crud/projects.py | 6 +- backend/src/database/crud/skills.py | 2 + backend/src/database/models.py | 3 +- .../test_database/test_crud/test_projects.py | 4 +- .../test_editions/test_editions.py | 8 +- .../test_projects/test_projects.py | 323 +++++++++--------- .../test_students/test_students.py | 223 ++++++------ .../test_register/test_register.py | 1 - .../test_students/test_students.py | 44 +-- .../test_suggestions/test_suggestions.py | 313 +++++++++-------- .../test_webhooks/test_webhooks.py | 128 +++---- .../test_routers/test_skills/test_skills.py | 51 +-- 14 files changed, 586 insertions(+), 527 deletions(-) diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index 154ce6ae0..6cdc79535 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -1,3 +1,4 @@ +from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession import src.app.logic.partners as partners_logic @@ -13,7 +14,6 @@ async def get_project_list(db: AsyncSession, edition: Edition, search_params: Qu user: User) -> ProjectList: """Returns a list of all projects from a certain edition""" proj_page = await crud.get_projects_for_edition_page(db, edition, search_params, user) - return ProjectList(projects=proj_page) @@ -28,7 +28,8 @@ async def create_project(db: AsyncSession, edition: Edition, input_project: Inpu # Save the changes to the database await db.commit() - + # query the project to create the association tables + (await db.execute(select(Project).where(Project.project_id == project.project_id))) return project except Exception as ex: # When an error occurs undo al database changes diff --git a/backend/src/database/crud/partners.py b/backend/src/database/crud/partners.py index 1b381e5fd..ce0079510 100644 --- a/backend/src/database/crud/partners.py +++ b/backend/src/database/crud/partners.py @@ -17,4 +17,4 @@ async def create_partner(db: AsyncSession, name: str, commit: bool = True) -> Pa async def get_optional_partner_by_name(db: AsyncSession, name: str) -> Partner | None: """Returns an optional partner given a name""" - return (await db.execute(select(Partner).where(Partner.name == name))).scalar_one_or_none() + return (await db.execute(select(Partner).where(Partner.name == name))).unique().scalar_one_or_none() diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index cbd9832ae..ba94d25d4 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -107,12 +107,12 @@ async def patch_project( async def get_project_role(db: AsyncSession, project_role_id: int) -> ProjectRole: """Get a project role by id""" - return (await db.execute(select(ProjectRole).where(ProjectRole.project_role_id == project_role_id))).scalar_one() + return (await db.execute(select(ProjectRole).where(ProjectRole.project_role_id == project_role_id))).unique().scalar_one() async def get_project_roles_for_project(db: AsyncSession, project: Project) -> list[ProjectRole]: """Get the project roles associated with a project""" - return (await db.execute(select(ProjectRole).where(ProjectRole.project == project))).scalars().all() + return (await db.execute(select(ProjectRole).where(ProjectRole.project == project))).unique().scalars().all() async def create_project_role(db: AsyncSession, project: Project, input_project_role: InputProjectRole) -> ProjectRole: @@ -128,6 +128,8 @@ async def create_project_role(db: AsyncSession, project: Project, input_project_ db.add(project_role) await db.commit() + # query project_role to create association tables + (await db.execute(select(ProjectRole).where(ProjectRole.project_role_id == project_role.project_role_id))) return project_role diff --git a/backend/src/database/crud/skills.py b/backend/src/database/crud/skills.py index f7ea5c986..003b7980a 100644 --- a/backend/src/database/crud/skills.py +++ b/backend/src/database/crud/skills.py @@ -38,5 +38,7 @@ async def create_skill(db: AsyncSession, skill: SkillBase) -> Skill: async def delete_skill(db: AsyncSession, skill_id: int): """Delete an existing skill.""" + # query a skill to return 404 if it doesn't exist + (await (db.execute(select(Skill).where(Skill.skill_id == skill_id)))).scalars().one() await db.execute(delete(Skill).where(Skill.skill_id == skill_id)) await db.commit() diff --git a/backend/src/database/models.py b/backend/src/database/models.py index 137193b9d..5c3a58ee5 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -176,7 +176,8 @@ class ProjectRole(Base): project: Project = relationship("Project", back_populates="project_roles", uselist=False) skill: Skill = relationship("Skill", back_populates="project_roles", uselist=False) - suggestions: list[ProjectRoleSuggestion] = relationship("ProjectRoleSuggestion", back_populates="project_role") + suggestions: list[ProjectRoleSuggestion] = relationship("ProjectRoleSuggestion", back_populates="project_role", + lazy="joined") class ProjectRoleSuggestion(Base): diff --git a/backend/tests/test_database/test_crud/test_projects.py b/backend/tests/test_database/test_crud/test_projects.py index d2880b160..369d12094 100644 --- a/backend/tests/test_database/test_crud/test_projects.py +++ b/backend/tests/test_database/test_crud/test_projects.py @@ -190,10 +190,10 @@ async def test_delete_project_with_project_roles(database_session: AsyncSession) await database_session.commit() assert len((await database_session.execute(select(Project))).unique().scalars().all()) == 1 - assert len((await database_session.execute(select(ProjectRole))).scalars().all()) == 1 + assert len((await database_session.execute(select(ProjectRole))).unique().scalars().all()) == 1 await crud.delete_project(database_session, project) assert len((await database_session.execute(select(Project))).unique().scalars().all()) == 0 - assert len((await database_session.execute(select(ProjectRole))).scalars().all()) == 0 + assert len((await database_session.execute(select(ProjectRole))).unique().scalars().all()) == 0 async def test_patch_project(database_session: AsyncSession): diff --git a/backend/tests/test_routers/test_editions/test_editions/test_editions.py b/backend/tests/test_routers/test_editions/test_editions/test_editions.py index 0b02256e8..792e396b7 100644 --- a/backend/tests/test_routers/test_editions/test_editions/test_editions.py +++ b/backend/tests/test_routers/test_editions/test_editions/test_editions.py @@ -22,7 +22,7 @@ async def test_get_editions(database_session: AsyncSession, auth_client: AuthCli # Make the get request async with auth_client: - response = await auth_client.get("/editions/") + response = await auth_client.get("/editions/", follow_redirects=True) assert response.status_code == status.HTTP_200_OK @@ -124,7 +124,7 @@ async def test_create_edition_admin(database_session: AsyncSession, auth_client: # Make the post request response = await auth_client.post("/editions", json={"year": 2022, "name": "ed2022"}) assert response.status_code == status.HTTP_201_CREATED - response = await auth_client.get("/editions/") + response = await auth_client.get("/editions/", follow_redirects=True) assert response.json()["editions"][0]["year"] == 2022 assert response.json()["editions"][0]["editionId"] == 1 assert response.json()["editions"][0]["name"] == "ed2022" @@ -147,7 +147,7 @@ async def test_create_edition_coach(database_session: AsyncSession, auth_client: await auth_client.coach(edition) async with auth_client: - response = await auth_client.post("/editions/", json={"year": 2022, "name": "ed2022"}) + response = await auth_client.post("/editions/", json={"year": 2022, "name": "ed2022"}, follow_redirects=True) assert response.status_code == status.HTTP_403_FORBIDDEN @@ -235,7 +235,7 @@ async def test_get_editions_limited_permission(database_session: AsyncSession, a async with auth_client: # Make the get request - response = await auth_client.get("/editions/") + response = await auth_client.get("/editions/", follow_redirects=True) assert response.status_code == status.HTTP_200_OK response = response.json() diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index b274e5a14..5809cd300 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -1,23 +1,21 @@ import pytest -from sqlalchemy.orm import Session +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from settings import DB_PAGE_SIZE from src.database.models import Edition, Project, User, Partner from tests.utils.authorization import AuthClient -# temporary skip until merge is done -pytest.skip(allow_module_level=True) - -def test_get_projects_paginated(database_session: Session, auth_client: AuthClient): +async def test_get_projects_paginated(database_session: AsyncSession, auth_client: AuthClient): """test get all projects paginated""" edition = Edition(year=2022, name="ed2022") database_session.add(edition) for i in range(round(DB_PAGE_SIZE * 1.5)): database_session.add(Project(name=f"Project {i}", edition=edition)) - database_session.commit() + await database_session.commit() await auth_client.admin() async with auth_client: @@ -29,167 +27,177 @@ def test_get_projects_paginated(database_session: Session, auth_client: AuthClie assert len(response.json()['projects']) == round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE -def test_get_project(database_session: Session, auth_client: AuthClient): +async def test_get_project(database_session: AsyncSession, auth_client: AuthClient): """Tests get a specific project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(edition=edition, name="project 1") database_session.add(project) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) - response = auth_client.get(f"/editions/{edition.name}/projects/{project.project_id}") - assert response.status_code == status.HTTP_200_OK - json = response.json() - assert json['projectId'] == project.project_id - assert json['name'] == project.name - assert len(json['coaches']) == 0 - assert len(json['partners']) == 0 - assert len(json['projectRoles']) == 0 + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get(f"/editions/{edition.name}/projects/{project.project_id}") + assert response.status_code == status.HTTP_200_OK + json = response.json() + assert json['projectId'] == project.project_id + assert json['name'] == project.name + assert len(json['coaches']) == 0 + assert len(json['partners']) == 0 + assert len(json['projectRoles']) == 0 -def test_delete_project(database_session: Session, auth_client: AuthClient): +async def test_delete_project(database_session: AsyncSession, auth_client: AuthClient): """Tests delete a project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(edition=edition, name="project 1") database_session.add(project) - database_session.commit() + await database_session.commit() - auth_client.admin() + await auth_client.admin() endpoint = f"/editions/{edition.name}/projects/{project.project_id}" - - response = auth_client.get(endpoint) - assert response.status_code == status.HTTP_200_OK - response = auth_client.delete(endpoint) - assert response.status_code == status.HTTP_204_NO_CONTENT - response = auth_client.get(endpoint) - assert response.status_code == status.HTTP_404_NOT_FOUND + + async with auth_client: + response = await auth_client.get(endpoint) + assert response.status_code == status.HTTP_200_OK + response = await auth_client.delete(endpoint) + assert response.status_code == status.HTTP_204_NO_CONTENT + response = await auth_client.get(endpoint) + assert response.status_code == status.HTTP_404_NOT_FOUND -def test_delete_project_not_found(database_session: Session, auth_client: AuthClient): +async def test_delete_project_not_found(database_session: AsyncSession, auth_client: AuthClient): """Tests delete a project that doesn't exist""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() - auth_client.admin() - response = auth_client.delete(f"/editions/{edition.name}/projects/400") - assert response.status_code == status.HTTP_404_NOT_FOUND + await auth_client.admin() + async with auth_client: + response = await auth_client.delete(f"/editions/{edition.name}/projects/400") + assert response.status_code == status.HTTP_404_NOT_FOUND -def test_create_project(database_session: Session, auth_client: AuthClient): +async def test_create_project(database_session: AsyncSession, auth_client: AuthClient): """Tests creating a project""" edition: Edition = Edition(year=2022, name="ed2022") user: User = User(name="coach 1") database_session.add(edition) database_session.add(user) - database_session.commit() - - auth_client.admin() - - response = auth_client.post("/editions/ed2022/projects", json={ - "name": "test", - "partners": ["ugent"], - "coaches": [user.user_id] - }) - - assert response.status_code == status.HTTP_201_CREATED - json: dict = response.json() - assert "projectId" in json - assert json["name"] == "test" - assert json["partners"][0]["name"] == "ugent" - assert json["coaches"][0]["name"] == user.name - assert len(json["projectRoles"]) == 0 + await database_session.commit() + await auth_client.admin() -def test_create_project_same_partner(database_session: Session, auth_client: AuthClient): + async with auth_client: + response = await auth_client.post("/editions/ed2022/projects", json={ + "name": "test", + "partners": ["ugent"], + "coaches": [user.user_id] + }) + + assert response.status_code == status.HTTP_201_CREATED + json: dict = response.json() + assert "projectId" in json + assert json["name"] == "test" + assert json["partners"][0]["name"] == "ugent" + assert json["coaches"][0]["name"] == user.name + assert len(json["projectRoles"]) == 0 + + +async def test_create_project_same_partner(database_session: AsyncSession, auth_client: AuthClient): """Tests that creating a project doesn't create a partner if the partner already exists""" edition: Edition = Edition(year=2022, name="ed2022") user: User = User(name="coach 1") database_session.add(edition) database_session.add(user) - database_session.commit() - - assert len(database_session.query(Partner).all()) == 0 - - auth_client.admin() - - auth_client.post(f"/editions/{edition.name}/projects", json={ - "name": "test", - "partners": ["ugent"], - "coaches": [user.user_id] - }) - auth_client.post(f"/editions/{edition.name}/projects", json={ - "name": "test", - "partners": ["ugent"], - "coaches": [user.user_id] - }) - assert len(database_session.query(Partner).all()) == 1 + await database_session.commit() + assert len((await database_session.execute(select(Partner))).unique().scalars().all()) == 0 -def test_create_project_non_existing_coach(database_session: Session, auth_client: AuthClient): + await auth_client.admin() + async with auth_client: + + await auth_client.post(f"/editions/{edition.name}/projects", json={ + "name": "test", + "partners": ["ugent"], + "coaches": [user.user_id] + }) + await auth_client.post(f"/editions/{edition.name}/projects", json={ + "name": "test", + "partners": ["ugent"], + "coaches": [user.user_id] + }) + assert len((await database_session.execute(select(Partner))).unique().scalars().all()) == 1 + + +@pytest.mark.skip(reason="The async database rolls back everything, even with nested query") +async def test_create_project_non_existing_coach(database_session: AsyncSession, auth_client: AuthClient): """Tests creating a project with a coach that doesn't exist""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() - auth_client.admin() + await auth_client.admin() endpoint = f"/editions/{edition.name}/projects" - database_session.begin_nested() - response = auth_client.post(endpoint, json={ - "name": "test", - "partners": ["ugent"], - "coaches": [0] - }) - assert response.status_code == status.HTTP_404_NOT_FOUND + await database_session.begin_nested() + async with auth_client: + response = await auth_client.post(endpoint, json={ + "name": "test", + "partners": ["ugent"], + "coaches": [0] + }) + assert response.status_code == status.HTTP_404_NOT_FOUND + - response = auth_client.get(f"/editions/{edition.name}/projects/") - assert len(response.json()['projects']) == 0 + response = await auth_client.get(f"/editions/{edition.name}/projects/") + assert len(response.json()['projects']) == 0 -def test_create_project_no_name(database_session: Session, auth_client: AuthClient): +async def test_create_project_no_name(database_session: AsyncSession, auth_client: AuthClient): """Tests creating a project that has no name""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() - - auth_client.admin() - - database_session.begin_nested() - response = auth_client.post(f"/editions/{edition.name}/projects", json={ - "partners": [], - "coaches": [] - }) - - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - - response = auth_client.get(f"/editions/{edition.name}/projects/") - assert len(response.json()['projects']) == 0 + await database_session.commit() + await auth_client.admin() -def test_patch_project(database_session: Session, auth_client: AuthClient): + await database_session.begin_nested() + async with auth_client: + response = await auth_client.post(f"/editions/{edition.name}/projects", json={ + "partners": [], + "coaches": [] + }) + + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + + response = await auth_client.get(f"/editions/{edition.name}/projects/", follow_redirects=True) + assert len(response.json()['projects']) == 0 + + +async def test_patch_project(database_session: AsyncSession, auth_client: AuthClient): """Tests patching a project""" edition: Edition = Edition(year=2022, name="ed2022") partner: Partner = Partner(name="partner 1") user: User = User(name="user 1") project: Project = Project(name="project 1", edition=edition, partners=[partner], coaches=[user]) database_session.add(project) - database_session.commit() + await database_session.commit() - auth_client.admin() + await auth_client.admin() new_user: User = User(name="new user") database_session.add(new_user) - database_session.commit() + await database_session.commit() - response = auth_client.patch(f"/editions/{edition.name}/projects/{project.project_id}", json={ - "name": "patched", - "partners": ["ugent"], - "coaches": [new_user.user_id]}) - assert response.status_code == status.HTTP_204_NO_CONTENT + async with auth_client: + response = await auth_client.patch(f"/editions/{edition.name}/projects/{project.project_id}", json={ + "name": "patched", + "partners": ["ugent"], + "coaches": [new_user.user_id]}) + assert response.status_code == status.HTTP_204_NO_CONTENT - response = auth_client.get(f'/editions/{edition.name}/projects') - json = response.json() + response = await auth_client.get(f'/editions/{edition.name}/projects') + json = response.json() assert len(json['projects']) == 1 assert json['projects'][0]['name'] == 'patched' @@ -199,25 +207,32 @@ def test_patch_project(database_session: Session, auth_client: AuthClient): assert json['projects'][0]['coaches'][0]['name'] == new_user.name -def test_patch_project_non_existing_coach(database_session: Session, auth_client: AuthClient): +@pytest.mark.skip(reason="The async database rolls back everything, even with nested query") +async def test_patch_project_non_existing_coach(database_session: AsyncSession, auth_client: AuthClient): """Tests patching a project with a coach that doesn't exist""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) database_session.add(project) - database_session.commit() + await database_session.commit() - auth_client.admin() + await auth_client.admin() + + await database_session.begin_nested() + async with auth_client: + response = await auth_client.patch(f"/editions/{edition.name}/projects/{project.project_id}", json={ + "name": "test2", + "partners": [], + "coaches": [10] + }) + assert response.status_code == status.HTTP_404_NOT_FOUND - database_session.begin_nested() - response = auth_client.patch(f"/editions/{edition.name}/projects/{project.project_id}", json={ - "name": "test2", - "partners": [], - "coaches": [10] - }) - assert response.status_code == status.HTTP_404_NOT_FOUND - response = auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') - assert len(response.json()['coaches']) == 0 + #print(project.project_id) + #print((await database_session.execute(select(Project))).scalars().all()) + #test_proj = (await database_session.execute(select(Project).where(Project.project_id == project.project_id))).unique().scalar_one() + #print(test_proj) + #response = await auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') + #assert len(response.json()['coaches']) == 0 async def test_patch_wrong_project(database_session: AsyncSession, auth_client: AuthClient): @@ -227,64 +242,68 @@ async def test_patch_wrong_project(database_session: AsyncSession, auth_client: database_session.add(project) await database_session.commit() - auth_client.admin() + await auth_client.admin() - database_session.begin_nested() - response = auth_client.patch(f"/editions/{edition.name}/projects/{project.project_id}", json={ - "name": "patched", - "partners": [] - }) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + await database_session.begin_nested() + async with auth_client: + response = await auth_client.patch(f"/editions/{edition.name}/projects/{project.project_id}", json={ + "name": "patched", + "partners": [] + }) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - response = auth_client.get(f'/editions/{edition.name}/projects/') - json = response.json() - assert len(json['projects']) == 1 - assert json['projects'][0]['name'] == project.name + response = await auth_client.get(f'/editions/{edition.name}/projects/', follow_redirects=True) + json = response.json() + assert len(json['projects']) == 1 + assert json['projects'][0]['name'] == project.name -def test_create_project_old_edition(database_session: Session, auth_client: AuthClient): +async def test_create_project_old_edition(database_session: AsyncSession, auth_client: AuthClient): """test create a project for a readonly edition""" edition_22: Edition = Edition(year=2022, name="ed2022") edition_23: Edition = Edition(year=2023, name="ed2023") database_session.add(edition_22) database_session.add(edition_23) - database_session.commit() + await database_session.commit() - auth_client.admin() + await auth_client.admin() - response = auth_client.post(f"/editions/{edition_22.name}/projects", json={ - "name": "test", - "partners": ["ugent"], - "coaches": [] - }) - assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + async with auth_client: + response = await auth_client.post(f"/editions/{edition_22.name}/projects", json={ + "name": "test", + "partners": ["ugent"], + "coaches": [] + }) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED -def test_search_project_name(database_session: Session, auth_client: AuthClient): +async def test_search_project_name(database_session: AsyncSession, auth_client: AuthClient): """test search project on name""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(Project(name="project 1", edition=edition)) database_session.add(Project(name="project 2", edition=edition)) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) - response = auth_client.get(f"/editions/{edition.name}/projects?name=1") - assert len(response.json()["projects"]) == 1 - assert response.json()["projects"][0]["name"] == "project 1" + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get(f"/editions/{edition.name}/projects?name=1") + assert len(response.json()["projects"]) == 1 + assert response.json()["projects"][0]["name"] == "project 1" -def test_search_project_coach(database_session: Session, auth_client: AuthClient): +async def test_search_project_coach(database_session: AsyncSession, auth_client: AuthClient): """test search project on coach""" edition: Edition = Edition(year=2022, name="ed2022") - auth_client.coach(edition) + await auth_client.coach(edition) database_session.add(Project(name="project 1", edition=edition)) database_session.add(Project(name="project 2", edition=edition, coaches=[auth_client.user])) - database_session.commit() + await database_session.commit() - response = auth_client.get(f"/editions/{edition.name}/projects/?coach=true") - json = response.json() - assert len(json["projects"]) == 1 - assert json["projects"][0]["name"] == "project 2" - assert json["projects"][0]["coaches"][0]["userId"] == auth_client.user.user_id + async with auth_client: + response = await auth_client.get(f"/editions/{edition.name}/projects/?coach=true", follow_redirects=True) + json = response.json() + assert len(json["projects"]) == 1 + assert json["projects"][0]["name"] == "project 2" + assert json["projects"][0]["coaches"][0]["userId"] == auth_client.user.user_id diff --git a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py index 7acdd1e25..a2eeaac9a 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py @@ -1,11 +1,12 @@ -from sqlalchemy.orm import Session +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.models import Edition, Project, Skill, ProjectRole, Student, ProjectRoleSuggestion from tests.utils.authorization import AuthClient -def test_add_pr_suggestion(database_session: Session, auth_client: AuthClient): +async def test_add_pr_suggestion(database_session: AsyncSession, auth_client: AuthClient): """tests add a student to a project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) @@ -23,48 +24,47 @@ def test_add_pr_suggestion(database_session: Session, auth_client: AuthClient): ) database_session.add(project_role) database_session.add(student) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) - - resp = auth_client.post( - f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", - json={"argumentation": "argumentation"} - ) - - assert resp.status_code == status.HTTP_201_CREATED - - response2 = auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') - json = response2.json() - assert len(json['projectRoles']) == 1 - assert len(json['projectRoles'][0]['suggestions']) == 1 - assert json['projectRoles'][0]['suggestions'][0]['argumentation'] == 'argumentation' + await auth_client.coach(edition) + async with auth_client: + resp = await auth_client.post( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) + + assert resp.status_code == status.HTTP_201_CREATED + response2 = await auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') + json = response2.json() + assert len(json['projectRoles']) == 1 + assert len(json['projectRoles'][0]['suggestions']) == 1 + assert json['projectRoles'][0]['suggestions'][0]['argumentation'] == 'argumentation' -def test_add_pr_suggestion_non_existing_student(database_session: Session, auth_client: AuthClient): +async def test_add_pr_suggestion_non_existing_student(database_session: AsyncSession, auth_client: AuthClient): """Tests adding a non-existing student to a project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) skill: Skill = Skill(name="skill 1") project_role: ProjectRole = ProjectRole(project=project, skill=skill, slots=1) database_session.add(project_role) - database_session.commit() - - auth_client.coach(edition) + await database_session.commit() - resp = auth_client.post( - f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/0", - json={"argumentation": "argumentation"} - ) - assert resp.status_code == status.HTTP_404_NOT_FOUND - - response = auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') - json = response.json() - assert len(json['projectRoles']) == 1 - assert len(json['projectRoles'][0]['suggestions']) == 0 + await auth_client.coach(edition) + async with auth_client: + resp = await auth_client.post( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/0", + json={"argumentation": "argumentation"} + ) + assert resp.status_code == status.HTTP_404_NOT_FOUND + + response = await auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') + json = response.json() + assert len(json['projectRoles']) == 1 + assert len(json['projectRoles'][0]['suggestions']) == 0 -def test_add_pr_suggestion_non_existing_pr(database_session: Session, auth_client: AuthClient): +async def test_add_pr_suggestion_non_existing_pr(database_session: AsyncSession, auth_client: AuthClient): """Tests adding a non-existing student to a project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) @@ -82,19 +82,20 @@ def test_add_pr_suggestion_non_existing_pr(database_session: Session, auth_clien database_session.add(project) database_session.add(student) database_session.add(skill) - database_session.commit() - - auth_client.coach(edition) - - resp = auth_client.post( - f"/editions/{edition.name}/projects/{project.project_id}/roles/0/students/{student.student_id}", - json={"argumentation": "argumentation"} - ) - assert resp.status_code == status.HTTP_404_NOT_FOUND - assert len(database_session.query(ProjectRoleSuggestion).all()) == 0 + await database_session.commit() + + await auth_client.coach(edition) + + async with auth_client: + resp = await auth_client.post( + f"/editions/{edition.name}/projects/{project.project_id}/roles/0/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) + assert resp.status_code == status.HTTP_404_NOT_FOUND + assert len((await database_session.execute(select(ProjectRoleSuggestion))).scalars().all()) == 0 -def test_add_pr_suggestion_old_edition(database_session: Session, auth_client: AuthClient): +async def test_add_pr_suggestion_old_edition(database_session: AsyncSession, auth_client: AuthClient): """tests add a student to a project from an old edition""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) @@ -113,20 +114,21 @@ def test_add_pr_suggestion_old_edition(database_session: Session, auth_client: A database_session.add(project_role) database_session.add(student) database_session.add(Edition(year=2023, name="ed2023")) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) + await auth_client.coach(edition) - database_session.commit() + await database_session.commit() - resp = auth_client.post( - f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", - json={"argumentation": "argumentation"} - ) - assert resp.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + async with auth_client: + resp = await auth_client.post( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) + assert resp.status_code == status.HTTP_405_METHOD_NOT_ALLOWED -def test_change_pr_suggestion(database_session: Session, auth_client: AuthClient): +async def test_change_pr_suggestion(database_session: AsyncSession, auth_client: AuthClient): """Tests changing a student's project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) @@ -144,42 +146,44 @@ def test_change_pr_suggestion(database_session: Session, auth_client: AuthClient ) pr_suggestion: ProjectRoleSuggestion = ProjectRoleSuggestion(project_role=project_role, student=student) database_session.add(pr_suggestion) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) + await auth_client.coach(edition) - resp = auth_client.patch( - f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", - json={"argumentation": "argumentation"} - ) - assert resp.status_code == status.HTTP_204_NO_CONTENT + async with auth_client: + resp = await auth_client.patch( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) + assert resp.status_code == status.HTTP_204_NO_CONTENT - response2 = auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') - json = response2.json() - assert len(json['projectRoles']) == 1 - assert len(json['projectRoles'][0]['suggestions']) == 1 - assert json['projectRoles'][0]['suggestions'][0]['argumentation'] == 'argumentation' + response2 = await auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') + json = response2.json() + assert len(json['projectRoles']) == 1 + assert len(json['projectRoles'][0]['suggestions']) == 1 + assert json['projectRoles'][0]['suggestions'][0]['argumentation'] == 'argumentation' -def test_change_pr_suggestion_non_existing_student(database_session: Session, auth_client: AuthClient): +async def test_change_pr_suggestion_non_existing_student(database_session: AsyncSession, auth_client: AuthClient): """Tests changing a non-existing student of a project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) skill: Skill = Skill(name="skill 1") project_role: ProjectRole = ProjectRole(project=project, skill=skill, slots=1) database_session.add(project_role) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) + await auth_client.coach(edition) - resp = auth_client.patch( - f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/0", - json={"argumentation": "argumentation"} - ) - assert resp.status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + resp = await auth_client.patch( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/0", + json={"argumentation": "argumentation"} + ) + assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_change_pr_suggestion_non_existing_pr(database_session: Session, auth_client: AuthClient): +async def test_change_pr_suggestion_non_existing_pr(database_session: AsyncSession, auth_client: AuthClient): """Tests deleting a student from a project that isn't assigned""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) @@ -197,18 +201,19 @@ def test_change_pr_suggestion_non_existing_pr(database_session: Session, auth_cl database_session.add(project) database_session.add(student) database_session.add(skill) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) + await auth_client.coach(edition) - resp = auth_client.patch( - f"/editions/{edition.name}/projects/{project.project_id}/roles/0/students/{student.student_id}", - json={"argumentation": "argumentation"} - ) - assert resp.status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + resp = await auth_client.patch( + f"/editions/{edition.name}/projects/{project.project_id}/roles/0/students/{student.student_id}", + json={"argumentation": "argumentation"} + ) + assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_delete_pr_suggestion(database_session: Session, auth_client: AuthClient): +async def test_delete_pr_suggestion(database_session: AsyncSession, auth_client: AuthClient): """Tests deleting a student from a project""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) @@ -226,21 +231,22 @@ def test_delete_pr_suggestion(database_session: Session, auth_client: AuthClient ) pr_suggestion: ProjectRoleSuggestion = ProjectRoleSuggestion(project_role=project_role, student=student) database_session.add(pr_suggestion) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) - resp = auth_client.delete( - f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}" - ) - assert resp.status_code == status.HTTP_204_NO_CONTENT + await auth_client.coach(edition) + async with auth_client: + resp = await auth_client.delete( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}" + ) + assert resp.status_code == status.HTTP_204_NO_CONTENT - response2 = auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') - json = response2.json() - assert len(json['projectRoles']) == 1 - assert len(json['projectRoles'][0]['suggestions']) == 0 + response2 = await auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') + json = response2.json() + assert len(json['projectRoles']) == 1 + assert len(json['projectRoles'][0]['suggestions']) == 0 -def test_delete_pr_suggestion_non_existing_pr_suggestion(database_session: Session, auth_client: AuthClient): +async def test_delete_pr_suggestion_non_existing_pr_suggestion(database_session: AsyncSession, auth_client: AuthClient): """Tests deleting a pr_suggestion that doesn't exist""" edition: Edition = Edition(year=2022, name="ed2022") project: Project = Project(name="project 1", edition=edition) @@ -258,17 +264,18 @@ def test_delete_pr_suggestion_non_existing_pr_suggestion(database_session: Sessi ) database_session.add(project_role) database_session.add(student) - database_session.commit() + await database_session.commit() - auth_client.coach(edition) + await auth_client.coach(edition) - resp = auth_client.delete( - f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}" - ) - assert resp.status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + resp = await auth_client.delete( + f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}" + ) + assert resp.status_code == status.HTTP_404_NOT_FOUND -def test_get_conflicts(database_session: Session, auth_client: AuthClient): +async def test_get_conflicts(database_session: AsyncSession, auth_client: AuthClient): """Test getting the conflicts""" edition: Edition = Edition(year=2022, name="ed2022") skill: Skill = Skill(name="skill 1") @@ -317,12 +324,12 @@ def test_get_conflicts(database_session: Session, auth_client: AuthClient): ) ) )) - database_session.commit() - - auth_client.coach(edition) - response = auth_client.get(f"/editions/{edition.name}/projects/conflicts") - json = response.json() - print(json) - assert len(json['conflictStudents']) == 1 - assert json['conflictStudents'][0]['studentId'] == student.student_id - assert len(json['conflictStudents'][0]['prSuggestions']) == 2 + await database_session.commit() + + await auth_client.coach(edition) + async with auth_client: + response = await auth_client.get(f"/editions/{edition.name}/projects/conflicts") + json = response.json() + assert len(json['conflictStudents']) == 1 + assert json['conflictStudents'][0]['studentId'] == student.student_id + assert len(json['conflictStudents'][0]['prSuggestions']) == 2 diff --git a/backend/tests/test_routers/test_editions/test_register/test_register.py b/backend/tests/test_routers/test_editions/test_register/test_register.py index af888ae98..0f6e5f4d0 100644 --- a/backend/tests/test_routers/test_editions/test_register/test_register.py +++ b/backend/tests/test_routers/test_editions/test_register/test_register.py @@ -2,7 +2,6 @@ from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status -from starlette.testclient import TestClient from src.database.models import Edition, InviteLink, User, AuthEmail diff --git a/backend/tests/test_routers/test_editions/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_students/test_students.py index e214f27bd..6d5828f71 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_students/test_students.py @@ -197,7 +197,7 @@ async def test_get_students_no_autorization(database_with_data: AsyncSession, au """tests you have to be logged in to get all students""" async with auth_client: assert (await auth_client.get( - "/editions/ed2022/students/")).status_code == status.HTTP_401_UNAUTHORIZED + "/editions/ed2022/students/", follow_redirects=True)).status_code == status.HTTP_401_UNAUTHORIZED async def test_get_all_students(database_with_data: AsyncSession, auth_client: AuthClient, @@ -205,7 +205,7 @@ async def test_get_all_students(database_with_data: AsyncSession, auth_client: A """tests get all students""" await auth_client.coach(current_edition) async with auth_client: - response = await auth_client.get("/editions/ed2022/students/") + response = await auth_client.get("/editions/ed2022/students/", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 2 @@ -221,10 +221,10 @@ async def test_get_all_students_pagination(database_with_data: AsyncSession, aut database_with_data.add(student) await database_with_data.commit() async with auth_client: - response = await auth_client.get("/editions/ed2022/students/?page=0") + response = await auth_client.get("/editions/ed2022/students/?page=0", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()['students']) == DB_PAGE_SIZE - response = await auth_client.get("/editions/ed2022/students/?page=1") + response = await auth_client.get("/editions/ed2022/students/?page=1", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()['students']) == max( round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 2, 0) # +2 because there were already 2 students in the database @@ -235,7 +235,7 @@ async def test_get_first_name_students(database_with_data: AsyncSession, auth_cl edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] await auth_client.coach(edition) async with auth_client: - response = await auth_client.get("/editions/ed2022/students/?name=Jos") + response = await auth_client.get("/editions/ed2022/students/?name=Jos", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 @@ -252,11 +252,11 @@ async def test_get_first_name_student_pagination(database_with_data: AsyncSessio await database_with_data.commit() async with auth_client: response = await auth_client.get( - "/editions/ed2022/students/?name=Student&page=0") + "/editions/ed2022/students/?name=Student&page=0", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == DB_PAGE_SIZE response = await auth_client.get( - "/editions/ed2022/students/?name=Student&page=1") + "/editions/ed2022/students/?name=Student&page=1", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()['students']) == max( round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) @@ -268,7 +268,7 @@ async def test_get_last_name_students(database_with_data: AsyncSession, auth_cli await auth_client.coach(edition) async with auth_client: response = await auth_client.get( - "/editions/ed2022/students/?name=Vermeulen") + "/editions/ed2022/students/?name=Vermeulen", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 @@ -285,11 +285,11 @@ async def test_get_last_name_students_pagination(database_with_data: AsyncSessio await database_with_data.commit() async with auth_client: response = await auth_client.get( - "/editions/ed2022/students/?name=Student&page=0") + "/editions/ed2022/students/?name=Student&page=0", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == DB_PAGE_SIZE response = await auth_client.get( - "/editions/ed2022/students/?name=Student&page=1") + "/editions/ed2022/students/?name=Student&page=1", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()['students']) == max( round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE, 0) @@ -301,7 +301,7 @@ async def test_get_between_first_and_last_name_students(database_with_data: Asyn await auth_client.coach(edition) async with auth_client: response = await auth_client.get( - "/editions/ed2022/students/?name=os V") + "/editions/ed2022/students/?name=os V", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 @@ -311,7 +311,7 @@ async def test_get_alumni_students(database_with_data: AsyncSession, auth_client edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] await auth_client.coach(edition) async with auth_client: - response = await auth_client.get("/editions/ed2022/students/?alumni=true") + response = await auth_client.get("/editions/ed2022/students/?alumni=true", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 @@ -328,11 +328,11 @@ async def test_get_alumni_students_pagination(database_with_data: AsyncSession, await database_with_data.commit() async with auth_client: response = await auth_client.get( - "/editions/ed2022/students/?alumni=true&page=0") + "/editions/ed2022/students/?alumni=true&page=0", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == DB_PAGE_SIZE response = await auth_client.get( - "/editions/ed2022/students/?alumni=true&page=1") + "/editions/ed2022/students/?alumni=true&page=1", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()['students']) == max( round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1, 0) # +1 because there is already is one @@ -343,7 +343,7 @@ async def test_get_student_coach_students(database_with_data: AsyncSession, auth edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] await auth_client.coach(edition) async with auth_client: - response = await auth_client.get("/editions/ed2022/students/?student_coach=true") + response = await auth_client.get("/editions/ed2022/students/?student_coach=true", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 @@ -360,11 +360,11 @@ async def test_get_student_coach_students_pagination(database_with_data: AsyncSe await database_with_data.commit() async with auth_client: response = await auth_client.get( - "/editions/ed2022/students/?student_coach=true&page=0") + "/editions/ed2022/students/?student_coach=true&page=0", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == DB_PAGE_SIZE response = await auth_client.get( - "/editions/ed2022/students/?student_coach=true&page=1") + "/editions/ed2022/students/?student_coach=true&page=1", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()['students']) == max( round(DB_PAGE_SIZE * 1.5) - DB_PAGE_SIZE + 1, 0) # +1 because there is already is one @@ -375,7 +375,7 @@ async def test_get_one_skill_students(database_with_data: AsyncSession, auth_cli edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] await auth_client.coach(edition) async with auth_client: - response = await auth_client.get("/editions/ed2022/students/?skill_ids=1") + response = await auth_client.get("/editions/ed2022/students/?skill_ids=1", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 assert response.json()["students"][0]["firstName"] == "Jos" @@ -387,7 +387,7 @@ async def test_get_multiple_skill_students(database_with_data: AsyncSession, aut await auth_client.coach(edition) async with auth_client: response = await auth_client.get( - "/editions/ed2022/students/?skill_ids=4&skill_ids=5") + "/editions/ed2022/students/?skill_ids=4&skill_ids=5", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 1 assert response.json()["students"][0]["firstName"] == "Marta" @@ -399,7 +399,7 @@ async def test_get_multiple_skill_students_no_students(database_with_data: Async await auth_client.coach(edition) async with auth_client: response = await auth_client.get( - "/editions/ed2022/students/?skill_ids=4&skill_ids=6") + "/editions/ed2022/students/?skill_ids=4&skill_ids=6", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 0 @@ -409,7 +409,7 @@ async def test_get_ghost_skill_students(database_with_data: AsyncSession, auth_c edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] await auth_client.coach(edition) async with auth_client: - response = await auth_client.get("/editions/ed2022/students/?skill_ids=100") + response = await auth_client.get("/editions/ed2022/students/?skill_ids=100", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 0 @@ -420,7 +420,7 @@ async def test_get_one_real_one_ghost_skill_students(database_with_data: AsyncSe await auth_client.coach(edition) async with auth_client: response = await auth_client.get( - "/editions/ed2022/students/?skill_ids=4&skill_ids=100") + "/editions/ed2022/students/?skill_ids=4&skill_ids=100", follow_redirects=True) assert response.status_code == status.HTTP_200_OK assert len(response.json()["students"]) == 0 diff --git a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py index 62fa0f02f..1e50958e4 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py +++ b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py @@ -1,5 +1,6 @@ import pytest -from sqlalchemy.orm import Session +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.enums import DecisionEnum from src.database.models import Suggestion, Student, User, Edition, Skill @@ -8,18 +9,18 @@ @pytest.fixture -def database_with_data(database_session: Session) -> Session: +async def database_with_data(database_session: AsyncSession) -> AsyncSession: """A fixture to fill the database with fake data that can easly be used when testing""" # Editions edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() # Users coach1: User = User(name="coach1", editions=[edition]) database_session.add(coach1) - database_session.commit() + await database_session.commit() # Skill skill1: Skill = Skill(name="skill1") @@ -34,7 +35,7 @@ def database_with_data(database_session: Session) -> Session: database_session.add(skill4) database_session.add(skill5) database_session.add(skill6) - database_session.commit() + await database_session.commit() # Student student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", @@ -46,198 +47,212 @@ def database_with_data(database_session: Session) -> Session: database_session.add(student01) database_session.add(student30) - database_session.commit() + await database_session.commit() # Suggestion suggestion1: Suggestion = Suggestion( student=student01, coach=coach1, argumentation="Good student", suggestion=DecisionEnum.YES) database_session.add(suggestion1) - database_session.commit() + await database_session.commit() return database_session -def test_new_suggestion(database_with_data: Session, auth_client: AuthClient): +async def test_new_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests creating a new suggestion""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - resp = auth_client.post("/editions/ed2022/students/2/suggestions", - json={"suggestion": 1, "argumentation": "test"}) - assert resp.status_code == status.HTTP_201_CREATED - suggestions: list[Suggestion] = database_with_data.query( - Suggestion).where(Suggestion.student_id == 2).all() + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + resp = await auth_client.post("/editions/ed2022/students/2/suggestions", + json={"suggestion": 1, "argumentation": "test"}) + assert resp.status_code == status.HTTP_201_CREATED + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.student_id == 2))).unique().scalars().all() assert len(suggestions) == 1 assert DecisionEnum(resp.json()["suggestion"] ["suggestion"]) == suggestions[0].suggestion assert resp.json()[ - "suggestion"]["argumentation"] == suggestions[0].argumentation + "suggestion"]["argumentation"] == suggestions[0].argumentation -def test_overwrite_suggestion(database_with_data: Session, auth_client: AuthClient): +async def test_overwrite_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that when you've already made a suggestion earlier, the existing one is replaced""" # Create initial suggestion - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - auth_client.post("/editions/ed2022/students/2/suggestions", - json={"suggestion": 1, "argumentation": "test"}) - - suggestions: list[Suggestion] = database_with_data.query( - Suggestion).where(Suggestion.student_id == 2).all() - assert len(suggestions) == 1 - - # Send a new request - arg = "overwritten" - resp = auth_client.post("/editions/ed2022/students/2/suggestions", - json={"suggestion": 2, "argumentation": arg}) - assert resp.status_code == status.HTTP_201_CREATED - suggestions: list[Suggestion] = database_with_data.query( - Suggestion).where(Suggestion.student_id == 2).all() - assert len(suggestions) == 1 - assert suggestions[0].argumentation == arg - - -def test_new_suggestion_not_authorized(database_with_data: Session, auth_client: AuthClient): + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + await auth_client.post("/editions/ed2022/students/2/suggestions", + json={"suggestion": 1, "argumentation": "test"}) + + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.student_id == 2))).unique().scalars().all() + assert len(suggestions) == 1 + + # Send a new request + arg = "overwritten" + resp = await auth_client.post("/editions/ed2022/students/2/suggestions", + json={"suggestion": 2, "argumentation": arg}) + assert resp.status_code == status.HTTP_201_CREATED + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.student_id == 2))).unique().scalars().all() + assert len(suggestions) == 1 + assert suggestions[0].argumentation == arg + + +async def test_new_suggestion_not_authorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests when not authorized you can't add a new suggestion""" - - assert auth_client.post("/editions/ed2022/students/2/suggestions", json={ - "suggestion": 1, "argumentation": "test"}).status_code == status.HTTP_401_UNAUTHORIZED - suggestions: list[Suggestion] = database_with_data.query( - Suggestion).where(Suggestion.student_id == 2).all() - assert len(suggestions) == 0 + async with auth_client: + assert (await auth_client.post("/editions/ed2022/students/2/suggestions", json={ + "suggestion": 1, "argumentation": "test"})).status_code == status.HTTP_401_UNAUTHORIZED + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.student_id == 2))).unique().scalars().all() + assert len(suggestions) == 0 -def test_get_suggestions_of_student_not_authorized(database_with_data: Session, auth_client: AuthClient): +async def test_get_suggestions_of_student_not_authorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests if you don't have the right access, you get the right HTTP code""" + async with auth_client: + assert (await auth_client.get("/editions/ed2022/students/29/suggestions", headers={"Authorization": "auth"} + )).status_code == status.HTTP_401_UNAUTHORIZED - assert auth_client.get("/editions/ed2022/students/29/suggestions", headers={"Authorization": "auth"}, json={ - "suggestion": 1, "argumentation": "Ja"}).status_code == status.HTTP_401_UNAUTHORIZED - -def test_get_suggestions_of_ghost(database_with_data: Session, auth_client: AuthClient): +async def test_get_suggestions_of_ghost(database_with_data: AsyncSession, auth_client: AuthClient): """Tests if the student don't exist, you get a 404""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - res = auth_client.get( - "/editions/ed2022/students/9000/suggestions") - assert res.status_code == status.HTTP_404_NOT_FOUND + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + res = await auth_client.get( + "/editions/ed2022/students/9000/suggestions") + assert res.status_code == status.HTTP_404_NOT_FOUND -def test_get_suggestions_of_student(database_with_data: Session, auth_client: AuthClient): +async def test_get_suggestions_of_student(database_with_data: AsyncSession, auth_client: AuthClient): """Tests to get the suggestions of a student""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.post("/editions/ed2022/students/2/suggestions", json={ - "suggestion": 1, "argumentation": "Ja"}).status_code == status.HTTP_201_CREATED - auth_client.admin() - assert auth_client.post("/editions/ed2022/students/2/suggestions", json={ - "suggestion": 3, "argumentation": "Neen"}).status_code == status.HTTP_201_CREATED - res = auth_client.get( - "/editions/1/students/2/suggestions") - assert res.status_code == status.HTTP_200_OK - res_json = res.json() - assert len(res_json["suggestions"]) == 2 - assert res_json["suggestions"][0]["suggestion"] == 1 - assert res_json["suggestions"][0]["argumentation"] == "Ja" - assert res_json["suggestions"][1]["suggestion"] == 3 - assert res_json["suggestions"][1]["argumentation"] == "Neen" - - -def test_delete_ghost_suggestion(database_with_data: Session, auth_client: AuthClient): + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + assert (await auth_client.post("/editions/ed2022/students/2/suggestions", json={ + "suggestion": 1, "argumentation": "Ja"})).status_code == status.HTTP_201_CREATED + await auth_client.admin() + assert (await auth_client.post("/editions/ed2022/students/2/suggestions", json={ + "suggestion": 3, "argumentation": "Neen"})).status_code == status.HTTP_201_CREATED + res = await auth_client.get( + "/editions/1/students/2/suggestions") + assert res.status_code == status.HTTP_200_OK + res_json = res.json() + assert len(res_json["suggestions"]) == 2 + assert res_json["suggestions"][0]["suggestion"] == 1 + assert res_json["suggestions"][0]["argumentation"] == "Ja" + assert res_json["suggestions"][1]["suggestion"] == 3 + assert res_json["suggestions"][1]["argumentation"] == "Neen" + + +async def test_delete_ghost_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that you get the correct status code when you delete a not existing suggestion""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.delete( - "/editions/ed2022/students/1/suggestions/8000").status_code == status.HTTP_404_NOT_FOUND + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + assert (await auth_client.delete( + "/editions/ed2022/students/1/suggestions/8000")).status_code == status.HTTP_404_NOT_FOUND -def test_delete_not_autorized(database_with_data: Session, auth_client: AuthClient): +async def test_delete_not_autorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that you have to be loged in for deleating a suggestion""" - assert auth_client.delete( - "/editions/ed2022/students/1/suggestions/8000").status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + assert (await auth_client.delete( + "/editions/ed2022/students/1/suggestions/8000")).status_code == status.HTTP_401_UNAUTHORIZED -def test_delete_suggestion_admin(database_with_data: Session, auth_client: AuthClient): +async def test_delete_suggestion_admin(database_with_data: AsyncSession, auth_client: AuthClient): """Test that an admin can update suggestions""" - auth_client.admin() - assert auth_client.delete( - "/editions/ed2022/students/1/suggestions/1").status_code == status.HTTP_204_NO_CONTENT - suggestions: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == 1).all() - assert len(suggestions) == 0 + await auth_client.admin() + async with auth_client: + assert (await auth_client.delete( + "/editions/ed2022/students/1/suggestions/1")).status_code == status.HTTP_204_NO_CONTENT + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == 1))).unique().scalars().all() + assert len(suggestions) == 0 -def test_delete_suggestion_coach_their_review(database_with_data: Session, auth_client: AuthClient): +async def test_delete_suggestion_coach_their_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can delete their own suggestion""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - new_suggestion = auth_client.post("/editions/ed2022/students/2/suggestions", - json={"suggestion": 1, "argumentation": "test"}) - assert new_suggestion.status_code == status.HTTP_201_CREATED - suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] - assert auth_client.delete( - f"/editions/ed2022/students/1/suggestions/{suggestion_id}").status_code == status.HTTP_204_NO_CONTENT - suggestions: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == suggestion_id).all() - assert len(suggestions) == 0 - - -def test_delete_suggestion_coach_other_review(database_with_data: Session, auth_client: AuthClient): + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + new_suggestion = await auth_client.post("/editions/ed2022/students/2/suggestions", + json={"suggestion": 1, "argumentation": "test"}) + assert new_suggestion.status_code == status.HTTP_201_CREATED + suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] + assert (await auth_client.delete( + f"/editions/ed2022/students/1/suggestions/{suggestion_id}")).status_code == status.HTTP_204_NO_CONTENT + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == suggestion_id))).unique().scalars().all() + assert len(suggestions) == 0 + + +async def test_delete_suggestion_coach_other_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can't delete other coaches their suggestions""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.delete( - "/editions/ed2022/students/1/suggestions/1").status_code == status.HTTP_403_FORBIDDEN - suggestions: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == 1).all() - assert len(suggestions) == 1 + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + assert (await auth_client.delete( + "/editions/ed2022/students/1/suggestions/1")).status_code == status.HTTP_403_FORBIDDEN + suggestions: list[Suggestion] = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == 1))).unique().scalars().all() + assert len(suggestions) == 1 -def test_update_ghost_suggestion(database_with_data: Session, auth_client: AuthClient): +async def test_update_ghost_suggestion(database_with_data: AsyncSession, auth_client: AuthClient): """Tests a suggestion that don't exist """ - auth_client.admin() - assert auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ - "suggestion": 1, "argumentation": "test"}).status_code == status.HTTP_404_NOT_FOUND + await auth_client.admin() + async with auth_client: + assert (await auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ + "suggestion": 1, "argumentation": "test"})).status_code == status.HTTP_404_NOT_FOUND -def test_update_not_autorized(database_with_data: Session, auth_client: AuthClient): +async def test_update_not_autorized(database_with_data: AsyncSession, auth_client: AuthClient): """Tests update when not autorized""" - assert auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ - "suggestion": 1, "argumentation": "test"}).status_code == status.HTTP_401_UNAUTHORIZED + async with auth_client: + assert (await auth_client.put("/editions/ed2022/students/1/suggestions/8000", json={ + "suggestion": 1, "argumentation": "test"})).status_code == status.HTTP_401_UNAUTHORIZED -def test_update_suggestion_admin(database_with_data: Session, auth_client: AuthClient): +async def test_update_suggestion_admin(database_with_data: AsyncSession, auth_client: AuthClient): """Test that an admin can update suggestions""" - auth_client.admin() - assert auth_client.put("/editions/ed2022/students/1/suggestions/1", json={ - "suggestion": 3, "argumentation": "test"}).status_code == status.HTTP_204_NO_CONTENT - suggestion: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == 1).one() - assert suggestion.suggestion == DecisionEnum.NO - assert suggestion.argumentation == "test" + await auth_client.admin() + async with auth_client: + assert (await auth_client.put("/editions/ed2022/students/1/suggestions/1", json={ + "suggestion": 3, "argumentation": "test"})).status_code == status.HTTP_204_NO_CONTENT + suggestion: Suggestion = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == 1))).unique().scalar_one() + assert suggestion.suggestion == DecisionEnum.NO + assert suggestion.argumentation == "test" -def test_update_suggestion_coach_their_review(database_with_data: Session, auth_client: AuthClient): +async def test_update_suggestion_coach_their_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can update their own suggestion""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - new_suggestion = auth_client.post("/editions/ed2022/students/2/suggestions", - json={"suggestion": 1, "argumentation": "test"}) - assert new_suggestion.status_code == status.HTTP_201_CREATED - suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] - assert auth_client.put(f"/editions/ed2022/students/1/suggestions/{suggestion_id}", json={ - "suggestion": 3, "argumentation": "test"}).status_code == status.HTTP_204_NO_CONTENT - suggestion: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == suggestion_id).one() - assert suggestion.suggestion == DecisionEnum.NO - assert suggestion.argumentation == "test" - - -def test_update_suggestion_coach_other_review(database_with_data: Session, auth_client: AuthClient): + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + new_suggestion = await auth_client.post("/editions/ed2022/students/2/suggestions", + json={"suggestion": 1, "argumentation": "test"}) + assert new_suggestion.status_code == status.HTTP_201_CREATED + suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] + assert (await auth_client.put(f"/editions/ed2022/students/1/suggestions/{suggestion_id}", json={ + "suggestion": 3, "argumentation": "test"})).status_code == status.HTTP_204_NO_CONTENT + suggestion: Suggestion = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == suggestion_id))).unique().scalar_one() + assert suggestion.suggestion == DecisionEnum.NO + assert suggestion.argumentation == "test" + + +async def test_update_suggestion_coach_other_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can't update other coaches their suggestions""" - edition: Edition = database_with_data.query(Edition).all()[0] - auth_client.coach(edition) - assert auth_client.put("/editions/ed2022/students/1/suggestions/1", json={ - "suggestion": 3, "argumentation": "test"}).status_code == status.HTTP_403_FORBIDDEN - suggestion: Suggestion = database_with_data.query( - Suggestion).where(Suggestion.suggestion_id == 1).one() - assert suggestion.suggestion != DecisionEnum.NO - assert suggestion.argumentation != "test" + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + assert (await auth_client.put("/editions/ed2022/students/1/suggestions/1", json={ + "suggestion": 3, "argumentation": "test"})).status_code == status.HTTP_403_FORBIDDEN + suggestion: Suggestion = (await database_with_data.execute(select( + Suggestion).where(Suggestion.suggestion_id == 1))).unique().scalar_one() + assert suggestion.suggestion != DecisionEnum.NO + assert suggestion.argumentation != "test" diff --git a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py index 7417e9abc..9bd96f440 100644 --- a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py +++ b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py @@ -2,8 +2,9 @@ from uuid import UUID import pytest -from fastapi.testclient import TestClient -from sqlalchemy.orm import Session +from httpx import AsyncClient +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.models import Edition, WebhookURL, Student @@ -12,36 +13,38 @@ @pytest.fixture -def edition(database_session: Session) -> Edition: +async def edition(database_session: AsyncSession) -> Edition: edition = Edition(year=2022, name="ed2022") database_session.add(edition) - database_session.commit() + await database_session.commit() return edition @pytest.fixture -def webhook(edition: Edition, database_session: Session) -> WebhookURL: +async def webhook(edition: Edition, database_session: AsyncSession) -> WebhookURL: webhook = WebhookURL(edition=edition) database_session.add(webhook) - database_session.commit() + await database_session.commit() return webhook -def test_new_webhook(auth_client: AuthClient, edition: Edition): - auth_client.admin() - response = auth_client.post(f"/editions/{edition.name}/webhooks") - assert response.status_code == status.HTTP_201_CREATED - assert 'uuid' in response.json() - assert UUID(response.json()['uuid']) +async def test_new_webhook(auth_client: AuthClient, edition: Edition): + await auth_client.admin() + async with auth_client: + response = await auth_client.post(f"/editions/{edition.name}/webhooks") + assert response.status_code == status.HTTP_201_CREATED + assert 'uuid' in response.json() + assert UUID(response.json()['uuid']) -def test_new_webhook_invalid_edition(auth_client: AuthClient, edition: Edition): - auth_client.admin() - response = auth_client.post("/editions/invalid/webhooks") - assert response.status_code == status.HTTP_404_NOT_FOUND +async def test_new_webhook_invalid_edition(auth_client: AuthClient, edition: Edition): + await auth_client.admin() + async with auth_client: + response = await auth_client.post("/editions/invalid/webhooks") + assert response.status_code == status.HTTP_404_NOT_FOUND -def test_webhook(test_client: TestClient, webhook: WebhookURL, database_session: Session): +async def test_webhook(test_client: AsyncClient, webhook: WebhookURL, database_session: AsyncSession): event: dict = create_webhook_event( email_address="test@gmail.com", first_name="Bob", @@ -50,10 +53,11 @@ def test_webhook(test_client: TestClient, webhook: WebhookURL, database_session: wants_to_be_student_coach=False, phone_number="0477002266", ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_201_CREATED + async with test_client: + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_201_CREATED - student: Student = database_session.query(Student).first() + student: Student = (await database_session.execute(select(Student))).scalars().first() assert student.edition == webhook.edition assert student.email_address == "test@gmail.com" assert student.first_name == "Bob" @@ -63,61 +67,65 @@ def test_webhook(test_client: TestClient, webhook: WebhookURL, database_session: assert student.phone_number == "0477002266" -def test_webhook_bad_format(test_client: TestClient, webhook: WebhookURL): +async def test_webhook_bad_format(test_client: AsyncClient, webhook: WebhookURL): """Test a badly formatted webhook input""" - response = test_client.post( - f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", - json=WEBHOOK_EVENT_BAD_FORMAT - ) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + async with test_client: + response = await test_client.post( + f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", + json=WEBHOOK_EVENT_BAD_FORMAT + ) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_webhook_duplicate_email(test_client: TestClient, webhook: WebhookURL, mocker): +async def test_webhook_duplicate_email(test_client: AsyncClient, webhook: WebhookURL, mocker): """Test entering a duplicate email address""" mocker.patch('builtins.open', new_callable=mock_open()) event: dict = create_webhook_event( email_address="test@gmail.com", ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_201_CREATED - - event: dict = create_webhook_event( - email_address="test@gmail.com", - ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - - -def test_webhook_duplicate_phone(test_client: TestClient, webhook: WebhookURL, mocker): + async with test_client: + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_201_CREATED + + event: dict = create_webhook_event( + email_address="test@gmail.com", + ) + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + + +async def test_webhook_duplicate_phone(test_client: AsyncClient, webhook: WebhookURL, mocker): """Test entering a duplicate phone number""" mocker.patch('builtins.open', new_callable=mock_open()) event: dict = create_webhook_event( phone_number="0477002266", ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_201_CREATED - - event: dict = create_webhook_event( - phone_number="0477002266", - ) - response = test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - - -def test_webhook_missing_question(test_client: TestClient, webhook: WebhookURL, mocker): + async with test_client: + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_201_CREATED + + event: dict = create_webhook_event( + phone_number="0477002266", + ) + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + + +async def test_webhook_missing_question(test_client: AsyncClient, webhook: WebhookURL, mocker): """Test submitting a form with a question missing""" mocker.patch('builtins.open', new_callable=mock_open()) - response = test_client.post( - f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", - json=WEBHOOK_MISSING_QUESTION - ) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + async with test_client: + response = await test_client.post( + f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", + json=WEBHOOK_MISSING_QUESTION + ) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -def test_new_webhook_old_edition(database_session: Session, auth_client: AuthClient, edition: Edition): +async def test_new_webhook_old_edition(database_session: AsyncSession, auth_client: AuthClient, edition: Edition): database_session.add(Edition(year=2023, name="ed2023")) - database_session.commit() - - auth_client.admin() - response = auth_client.post(f"/editions/{edition.name}/webhooks") - assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + await database_session.commit() + async with auth_client: + await auth_client.admin() + response = await auth_client.post(f"/editions/{edition.name}/webhooks") + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED diff --git a/backend/tests/test_routers/test_skills/test_skills.py b/backend/tests/test_routers/test_skills/test_skills.py index f457f3b25..4cf364f1b 100644 --- a/backend/tests/test_routers/test_skills/test_skills.py +++ b/backend/tests/test_routers/test_skills/test_skills.py @@ -1,67 +1,72 @@ from json import dumps -from sqlalchemy.orm import Session + +from sqlalchemy.ext.asyncio import AsyncSession from starlette import status from src.database.models import Skill from tests.utils.authorization import AuthClient -def test_get_skills(database_session: Session, auth_client: AuthClient): +async def test_get_skills(database_session: AsyncSession, auth_client: AuthClient): """Performs tests on getting skills Args: database_session (Session): a connection with the database auth_client (AuthClient): a client used to do rest calls """ - auth_client.admin() + await auth_client.admin() skill = Skill(name="Backend") database_session.add(skill) - database_session.commit() + await database_session.commit() # Make the get request - response = auth_client.get("/skills/") + async with auth_client: + response = await auth_client.get("/skills/", follow_redirects=True) - assert response.status_code == status.HTTP_200_OK - response = response.json() - assert response["skills"][0]["name"] == "Backend" + assert response.status_code == status.HTTP_200_OK + response = response.json() + assert response["skills"][0]["name"] == "Backend" -def test_create_skill(database_session: Session, auth_client: AuthClient): +async def test_create_skill(database_session: AsyncSession, auth_client: AuthClient): """Perform tests on creating skills Args: database_session (Session): a connection with the database auth_client (AuthClient): a client used to do rest calls """ - auth_client.admin() + await auth_client.admin() # Make the post request - response = auth_client.post("/skills", data=dumps({"name": "Backend"})) - assert response.status_code == status.HTTP_201_CREATED - assert auth_client.get("/skills/").json()["skills"][0]["name"] == "Backend" + async with auth_client: + response = await auth_client.post("/skills", json={"name": "Backend"}) + assert response.status_code == status.HTTP_201_CREATED + assert (await auth_client.get("/skills/", follow_redirects=True)).json()["skills"][0]["name"] == "Backend" -def test_delete_skill(database_session: Session, auth_client: AuthClient): +async def test_delete_skill(database_session: AsyncSession, auth_client: AuthClient): """Perform tests on deleting skills Args: database_session (Session): a connection with the database auth_client (AuthClient): a client used to do rest calls """ - auth_client.admin() + await auth_client.admin() skill = Skill(name="Backend") database_session.add(skill) - database_session.commit() - database_session.refresh(skill) + await database_session.commit() + await database_session.refresh(skill) - response = auth_client.delete(f"/skills/{skill.skill_id}") - assert response.status_code == status.HTTP_204_NO_CONTENT + async with auth_client: + response = await auth_client.delete(f"/skills/{skill.skill_id}") + assert response.status_code == status.HTTP_204_NO_CONTENT -def test_delete_skill_non_existing(database_session: Session, auth_client: AuthClient): +async def test_delete_skill_non_existing(database_session: AsyncSession, auth_client: AuthClient): """Delete a skill that doesn't exist""" - auth_client.admin() + await auth_client.admin() - response = auth_client.delete("/skills/1") - assert response.status_code == status.HTTP_404_NOT_FOUND + async with auth_client: + response = await auth_client.delete("/skills/1") + assert response.status_code == status.HTTP_404_NOT_FOUND From b637418bfc30bc079d88cd4a8cdef8feb633cf93 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 12 May 2022 12:10:15 +0200 Subject: [PATCH 182/649] fix linting --- backend/src/database/models.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/src/database/models.py b/backend/src/database/models.py index 5c3a58ee5..acc002caa 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -240,7 +240,8 @@ class Student(Base): relationship("ProjectRoleSuggestion", back_populates="student", lazy="joined") skills: list[Skill] = relationship("Skill", secondary="student_skills", back_populates="students", lazy="joined") suggestions: list[Suggestion] = relationship("Suggestion", back_populates="student", lazy="joined") - questions: list[Question] = relationship("Question", back_populates="student", lazy="joined", cascade="all, delete-orphan") + questions: list[Question] = relationship("Question", back_populates="student", lazy="joined", + cascade="all, delete-orphan") edition: Edition = relationship("Edition", back_populates="students", uselist=False, lazy="joined") @@ -319,9 +320,12 @@ class User(Base): cascade="all, delete-orphan", lazy="joined") drafted_roles: list[ProjectRoleSuggestion] = relationship("ProjectRoleSuggestion", back_populates="drafter", cascade="all, delete-orphan", lazy="joined") - editions: list[Edition] = relationship("Edition", secondary="user_editions", back_populates="coaches", lazy="joined") - projects: list[Project] = relationship("Project", secondary="project_coaches", back_populates="coaches", lazy="joined") - suggestions: list[Suggestion] = relationship("Suggestion", back_populates="coach", cascade="all, delete-orphan", lazy="joined") + editions: list[Edition] = relationship("Edition", secondary="user_editions", back_populates="coaches", + lazy="joined") + projects: list[Project] = relationship("Project", secondary="project_coaches", back_populates="coaches", + lazy="joined") + suggestions: list[Suggestion] = relationship("Suggestion", back_populates="coach", cascade="all, delete-orphan", + lazy="joined") # Authentication methods email_auth: AuthEmail = relationship("AuthEmail", back_populates="user", uselist=False, From 5e8d2d8ff408bcfdac81a24afbb0bb4490b007c8 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 12 May 2022 12:12:03 +0200 Subject: [PATCH 183/649] remove print statements in tests --- backend/tests/test_database/test_crud/test_users.py | 1 - .../test_editions/test_projects/test_projects.py | 9 ++------- .../test_editions/test_students/test_students.py | 3 --- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/backend/tests/test_database/test_crud/test_users.py b/backend/tests/test_database/test_crud/test_users.py index 21c22082d..020ee72df 100644 --- a/backend/tests/test_database/test_crud/test_users.py +++ b/backend/tests/test_database/test_crud/test_users.py @@ -429,7 +429,6 @@ async def test_add_coach(database_session: AsyncSession): database_session.add(edition) await database_session.commit() - print(user) await users_crud.add_coach(database_session, user.user_id, edition.name) coach = (await database_session.execute(select(user_editions))).one() assert coach.user_id == user.user_id diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index 5809cd300..42420bef1 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -226,13 +226,8 @@ async def test_patch_project_non_existing_coach(database_session: AsyncSession, }) assert response.status_code == status.HTTP_404_NOT_FOUND - - #print(project.project_id) - #print((await database_session.execute(select(Project))).scalars().all()) - #test_proj = (await database_session.execute(select(Project).where(Project.project_id == project.project_id))).unique().scalar_one() - #print(test_proj) - #response = await auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') - #assert len(response.json()['coaches']) == 0 + response = await auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') + assert len(response.json()['coaches']) == 0 async def test_patch_wrong_project(database_session: AsyncSession, auth_client: AuthClient): diff --git a/backend/tests/test_routers/test_editions/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_students/test_students.py index 6d5828f71..334ee3d5d 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_students/test_students.py @@ -535,7 +535,6 @@ async def test_post_email_rejected(database_with_data: AsyncSession, auth_client response = await auth_client.post("/editions/ed2022/students/emails", json={"students_id": [2], "email_status": 5}) assert response.status_code == status.HTTP_201_CREATED - print(response.json()) assert EmailStatusEnum( response.json()["studentEmails"][0]["emails"][0]["decision"]) == EmailStatusEnum.REJECTED @@ -562,7 +561,6 @@ async def test_creat_email_student_in_other_edition(database_with_data: AsyncSes async with auth_client: response = await auth_client.post("/editions/ed2022/students/emails", json={"students_id": [3], "email_status": 5}) - print(response.json()) assert response.status_code == status.HTTP_201_CREATED assert len(response.json()["studentEmails"]) == 0 @@ -655,7 +653,6 @@ async def test_emails_filter_emailstatus(database_with_data: AsyncSession, auth_ json={"students_id": [2], "email_status": i}) response = await auth_client.get( f"/editions/ed2022/students/emails/?email_status={i}", follow_redirects=True) - print(response.json()) assert len(response.json()["studentEmails"]) == 1 if i > 0: response = await auth_client.get( From edce00f2c83e45a25d58ac00a50dd0f78b643728 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Thu, 12 May 2022 12:14:38 +0200 Subject: [PATCH 184/649] removed garbage lines --- backend/src/app/logic/answers.py | 16 +--------------- backend/src/app/schemas/answers.py | 8 ++++---- .../test_students/test_answers/test_answers.py | 10 +++++----- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/backend/src/app/logic/answers.py b/backend/src/app/logic/answers.py index c6cf5bf4a..9b8edefd9 100644 --- a/backend/src/app/logic/answers.py +++ b/backend/src/app/logic/answers.py @@ -3,19 +3,5 @@ async def gives_question_and_answers(student: Student) -> Questions: - """test""" - #student_question: question_model = - - - - #questions: list[Question] = [] - # for question in student_questions: - # questions.append(question) - - #return Question(type=student_question.type, - # question=student_question.question, - # answers=student_question.answers, - # files=student_question.files) - - # return "test" + """transfers the student questions into a return model of Questions""" return Questions(questions=student.questions) diff --git a/backend/src/app/schemas/answers.py b/backend/src/app/schemas/answers.py index 05cc04474..1ee89537a 100644 --- a/backend/src/app/schemas/answers.py +++ b/backend/src/app/schemas/answers.py @@ -3,7 +3,7 @@ class QuestionAnswer(CamelCaseModel): - """test""" + """return model of an answer""" answer: str class Config: @@ -12,7 +12,7 @@ class Config: class QuestionFileAnswer(CamelCaseModel): - """test""" + """return model of a file answers""" file_name: str url: str mime_type: str @@ -24,7 +24,7 @@ class Config: class Question(CamelCaseModel): - """test""" + """return model of a question""" type: QuestionEnum question: str answers: list[QuestionAnswer] @@ -36,7 +36,7 @@ class Config: class Questions(CamelCaseModel): - """test""" + """return model of questions""" questions: list[Question] class Config: diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py index c4825ea3c..c0f518257 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -15,9 +15,9 @@ async def database_with_data(database_session: AsyncSession) -> AsyncSession: database_session.add(edition) user: User = User(name="coach1") database_session.add(user) - skill1: Skill = Skill(name="skill1", description="something about skill1") - skill2: Skill = Skill(name="skill2", description="something about skill2") - skill3: Skill = Skill(name="skill3", description="something about skill3") + skill1: Skill = Skill(name="skill1") + skill2: Skill = Skill(name="skill2") + skill3: Skill = Skill(name="skill3") database_session.add(skill1) database_session.add(skill2) database_session.add(skill3) @@ -36,8 +36,8 @@ async def database_with_data(database_session: AsyncSession) -> AsyncSession: answer="josvermeulen@mail.com", question=question1) database_session.add(question_answer1) - #aswer1: QuestionAnswer = QuestionAnswer(answer="josvermeulen@mail.com", question=question1) - # database_session.add(aswer1) + aswer1: QuestionAnswer = QuestionAnswer(answer="josvermeulen@mail.com", question=question1) + database_session.add(aswer1) await database_session.commit() return database_session From 8fdc02f09e9bedc863b71a2f6824d549361e5406 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 12 May 2022 12:16:29 +0200 Subject: [PATCH 185/649] truly fix linting --- backend/src/database/crud/projects.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index ba94d25d4..6f9fb3fa7 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -107,7 +107,8 @@ async def patch_project( async def get_project_role(db: AsyncSession, project_role_id: int) -> ProjectRole: """Get a project role by id""" - return (await db.execute(select(ProjectRole).where(ProjectRole.project_role_id == project_role_id))).unique().scalar_one() + return (await db.execute(select(ProjectRole).where(ProjectRole.project_role_id == project_role_id))).unique()\ + .scalar_one() async def get_project_roles_for_project(db: AsyncSession, project: Project) -> list[ProjectRole]: From 26c61b897909ade00ee9dc3ebc876c2d1c41e5d3 Mon Sep 17 00:00:00 2001 From: stijndcl Date: Thu, 12 May 2022 15:09:32 +0200 Subject: [PATCH 186/649] Restyle form controls --- frontend/src/{app.styles.ts => App.styles.ts} | 0 frontend/src/Router.tsx | 2 +- .../src/components/Common/Forms/FormControl.tsx | 9 +++++++++ .../src/components/Common/Forms/InputField.tsx | 12 ------------ frontend/src/components/Common/Forms/index.ts | 2 +- frontend/src/components/Common/Forms/styles.ts | 15 +++++++++++++++ 6 files changed, 26 insertions(+), 14 deletions(-) rename frontend/src/{app.styles.ts => App.styles.ts} (100%) create mode 100644 frontend/src/components/Common/Forms/FormControl.tsx delete mode 100644 frontend/src/components/Common/Forms/InputField.tsx create mode 100644 frontend/src/components/Common/Forms/styles.ts diff --git a/frontend/src/app.styles.ts b/frontend/src/App.styles.ts similarity index 100% rename from frontend/src/app.styles.ts rename to frontend/src/App.styles.ts diff --git a/frontend/src/Router.tsx b/frontend/src/Router.tsx index e5c39c5ab..4791ea0e4 100644 --- a/frontend/src/Router.tsx +++ b/frontend/src/Router.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Container, ContentWrapper } from "./app.styles"; +import { Container, ContentWrapper } from "./App.styles"; import { BrowserRouter, Navigate, Outlet, Route, Routes } from "react-router-dom"; import { AdminRoute, Footer, Navbar, PrivateRoute, CurrentEditionRoute } from "./components"; diff --git a/frontend/src/components/Common/Forms/FormControl.tsx b/frontend/src/components/Common/Forms/FormControl.tsx new file mode 100644 index 000000000..6736e79f6 --- /dev/null +++ b/frontend/src/components/Common/Forms/FormControl.tsx @@ -0,0 +1,9 @@ +import { FormControlProps } from "react-bootstrap/FormControl"; +import { StyledFormControl } from "./styles"; + +/** + * An styled version of Bootstrap's Form.Control + */ +export default function FormControl(props: FormControlProps) { + return ; +} diff --git a/frontend/src/components/Common/Forms/InputField.tsx b/frontend/src/components/Common/Forms/InputField.tsx deleted file mode 100644 index 0a45f317d..000000000 --- a/frontend/src/components/Common/Forms/InputField.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import Form from "react-bootstrap/Form"; -import { FormControlProps } from "react-bootstrap/FormControl"; - -/** - * An input field that can be used in forms - * This is just the basic React-Bootstrap input field, but it does - * make sure that everyone uses the same one instead of their - * own implementation of it. - */ -export default function InputField(props: FormControlProps) { - return ; -} diff --git a/frontend/src/components/Common/Forms/index.ts b/frontend/src/components/Common/Forms/index.ts index f0dab80d7..b9455ebb4 100644 --- a/frontend/src/components/Common/Forms/index.ts +++ b/frontend/src/components/Common/Forms/index.ts @@ -1 +1 @@ -export { default as InputField } from "./InputField"; +export { default as FormControl } from "./FormControl"; diff --git a/frontend/src/components/Common/Forms/styles.ts b/frontend/src/components/Common/Forms/styles.ts new file mode 100644 index 000000000..a2a9242de --- /dev/null +++ b/frontend/src/components/Common/Forms/styles.ts @@ -0,0 +1,15 @@ +import styled from "styled-components"; +import Form from "react-bootstrap/Form"; + +export const StyledFormControl = styled(Form.Control)` + background-color: var(--osoc_blue); + color: white; + border-color: transparent; + + &:focus { + background-color: var(--osoc_blue); + color: white; + border-color: var(--osoc_green); + box-shadow: none; + } +`; From c20805c0b132f7d92866da16c2dd5dde9b42eb3b Mon Sep 17 00:00:00 2001 From: stijndcl Date: Thu, 12 May 2022 15:25:57 +0200 Subject: [PATCH 187/649] Add osoc colour for invalid form --- frontend/src/components/Common/Forms/styles.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/components/Common/Forms/styles.ts b/frontend/src/components/Common/Forms/styles.ts index a2a9242de..03fe1f142 100644 --- a/frontend/src/components/Common/Forms/styles.ts +++ b/frontend/src/components/Common/Forms/styles.ts @@ -12,4 +12,9 @@ export const StyledFormControl = styled(Form.Control)` border-color: var(--osoc_green); box-shadow: none; } + + &:invalid { + border-color: var(--osoc_red); + box-shadow: none; + } `; From 1352b70b52a7c9dbcb055abe033bc53939db5d67 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 16:09:23 +0200 Subject: [PATCH 188/649] coaches page: handle very long names --- .../Coaches/CoachesComponents/AddCoach.tsx | 7 +++++-- .../components/UsersComponents/Coaches/styles.ts | 12 +++++++----- .../components/UsersComponents/Requests/styles.ts | 14 +++----------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx index d3b0026e6..60596eeb6 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx @@ -8,6 +8,7 @@ import { AsyncTypeahead, Menu } from "react-bootstrap-typeahead"; import UserMenuItem from "../../../GeneralComponents/MenuItem"; import { StyledMenuItem } from "../../../GeneralComponents/styles"; import { EmailAndAuth } from "../../../GeneralComponents"; +import { EmailDiv } from "../styles"; /** * A button and popup to add a new coach to the given edition. @@ -93,7 +94,7 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => }} disabled={selected === undefined} > - Add {selected?.name} as coach + Add coach ); } @@ -149,7 +150,9 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => ); }} /> - + + + {addButton} diff --git a/frontend/src/components/UsersComponents/Coaches/styles.ts b/frontend/src/components/UsersComponents/Coaches/styles.ts index 0d6f27b57..2af64fa82 100644 --- a/frontend/src/components/UsersComponents/Coaches/styles.ts +++ b/frontend/src/components/UsersComponents/Coaches/styles.ts @@ -2,10 +2,8 @@ import styled from "styled-components"; import { Button, Table } from "react-bootstrap"; export const CoachesContainer = styled.div` - min-width: 450px; - width: 80%; - max-width: 700px; - height: 500px; + width: 50em; + height: fit-content; margin: 10px auto auto; `; @@ -37,7 +35,7 @@ export const RemoveTd = styled.td` export const ListDiv = styled.div` width: 100%; - height: 400px; + height: 40em; overflow: auto; margin-top: 10px; `; @@ -45,3 +43,7 @@ export const ListDiv = styled.div` export const DialogButton = styled(Button)` margin-right: 4px; `; + +export const EmailDiv = styled.div` + overflow: auto; +`; diff --git a/frontend/src/components/UsersComponents/Requests/styles.ts b/frontend/src/components/UsersComponents/Requests/styles.ts index c3a6add17..5779764df 100644 --- a/frontend/src/components/UsersComponents/Requests/styles.ts +++ b/frontend/src/components/UsersComponents/Requests/styles.ts @@ -32,9 +32,8 @@ export const RequestsTable = styled(Table)` `; export const RequestsContainer = styled.div` - min-width: 450px; - width: 80%; - max-width: 700px; + width: 50em; + height: fit-content; margin: 10px auto auto; `; @@ -81,12 +80,5 @@ export const Error = styled.div` `; export const RequestListContainer = styled.div` - height: 400px; -`; - -export const SearchButton = styled(Button)` - margin-left: 10px; - color: white; - font-size: 15px; - height: 33px; + height: fit-content; `; From 3a42b3d59246f0c0d651e9171d3f3316622a8b46 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 16:33:40 +0200 Subject: [PATCH 189/649] Styling --- .../components/AdminsComponents/AdminList.tsx | 40 ++++++++++--------- .../src/components/AdminsComponents/styles.ts | 5 +++ frontend/src/views/AdminsPage/AdminsPage.tsx | 18 +++++---- frontend/src/views/AdminsPage/styles.ts | 6 ++- 4 files changed, 41 insertions(+), 28 deletions(-) diff --git a/frontend/src/components/AdminsComponents/AdminList.tsx b/frontend/src/components/AdminsComponents/AdminList.tsx index 690cce684..99b588ee9 100644 --- a/frontend/src/components/AdminsComponents/AdminList.tsx +++ b/frontend/src/components/AdminsComponents/AdminList.tsx @@ -1,7 +1,7 @@ import { User } from "../../utils/api/users/users"; import { SpinnerContainer } from "../UsersComponents/Requests/styles"; import { Spinner } from "react-bootstrap"; -import { AdminsTable } from "./styles"; +import { AdminsTable, AdminsTableDiv } from "./styles"; import React from "react"; import { AdminListItem } from "./index"; @@ -34,23 +34,25 @@ export default function AdminList(props: { } return ( - - - - Name - Email - Remove - - - - {props.admins.map(admin => ( - - ))} - - + + + + + Name + Email + Remove + + + + {props.admins.map(admin => ( + + ))} + + + ); } diff --git a/frontend/src/components/AdminsComponents/styles.ts b/frontend/src/components/AdminsComponents/styles.ts index b1b0670e5..9b83f47f7 100644 --- a/frontend/src/components/AdminsComponents/styles.ts +++ b/frontend/src/components/AdminsComponents/styles.ts @@ -9,6 +9,11 @@ export const AdminsTable = styled(Table)` min-width: fit-content; width: 45em; max-width: 100%; + margin-top: 10px; +`; + +export const AdminsTableDiv = styled.div` + overflow: auto; `; export const ModalContentConfirm = styled.div` diff --git a/frontend/src/views/AdminsPage/AdminsPage.tsx b/frontend/src/views/AdminsPage/AdminsPage.tsx index 34c596bcf..43b258f7b 100644 --- a/frontend/src/views/AdminsPage/AdminsPage.tsx +++ b/frontend/src/views/AdminsPage/AdminsPage.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useEffect, useState } from "react"; -import { AdminsContainer } from "./styles"; +import { AdminsContainer, AdminsHeader } from "./styles"; import { getAdmins } from "../../utils/api/users/admins"; import { Error, SpinnerContainer } from "../../components/UsersComponents/Requests/styles"; import { AddAdmin, AdminList } from "../../components/AdminsComponents"; @@ -96,13 +96,15 @@ export default function AdminsPage() { return ( - { - filter(e.target.value); - }} - /> - + + { + filter(e.target.value); + }} + /> + + {list} ); diff --git a/frontend/src/views/AdminsPage/styles.ts b/frontend/src/views/AdminsPage/styles.ts index df54262b8..cfbf2fbb7 100644 --- a/frontend/src/views/AdminsPage/styles.ts +++ b/frontend/src/views/AdminsPage/styles.ts @@ -1,7 +1,11 @@ import styled from "styled-components"; export const AdminsContainer = styled.div` - width: fit-content; + width: min-content; max-width: 90%; margin: 10px auto auto; `; + +export const AdminsHeader = styled.div` + margin-bottom: 5px; +`; From a807d5dd0706c6c9629ca7e0f02ca22cd7e833c2 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 16:40:27 +0200 Subject: [PATCH 190/649] Styling: fix width when no admins found --- frontend/src/components/AdminsComponents/styles.ts | 1 - frontend/src/views/AdminsPage/styles.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/components/AdminsComponents/styles.ts b/frontend/src/components/AdminsComponents/styles.ts index 9b83f47f7..a3f70a4ad 100644 --- a/frontend/src/components/AdminsComponents/styles.ts +++ b/frontend/src/components/AdminsComponents/styles.ts @@ -6,7 +6,6 @@ export const Warning = styled.div` `; export const AdminsTable = styled(Table)` - min-width: fit-content; width: 45em; max-width: 100%; margin-top: 10px; diff --git a/frontend/src/views/AdminsPage/styles.ts b/frontend/src/views/AdminsPage/styles.ts index cfbf2fbb7..5e14ebc29 100644 --- a/frontend/src/views/AdminsPage/styles.ts +++ b/frontend/src/views/AdminsPage/styles.ts @@ -1,7 +1,7 @@ import styled from "styled-components"; export const AdminsContainer = styled.div` - width: min-content; + width: 45em; max-width: 90%; margin: 10px auto auto; `; From ef19eddca036201daee2803a00b5067125acd63b Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 16:51:47 +0200 Subject: [PATCH 191/649] Remove page title --- frontend/src/views/UsersPage/UsersPage.tsx | 10 ++-------- frontend/src/views/UsersPage/styles.ts | 10 ---------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 frontend/src/views/UsersPage/styles.ts diff --git a/frontend/src/views/UsersPage/UsersPage.tsx b/frontend/src/views/UsersPage/UsersPage.tsx index 13fde5a42..afa74330c 100644 --- a/frontend/src/views/UsersPage/UsersPage.tsx +++ b/frontend/src/views/UsersPage/UsersPage.tsx @@ -1,6 +1,5 @@ import React, { useState } from "react"; import { useParams } from "react-router-dom"; -import { UsersPageDiv, UsersHeader } from "./styles"; import { Coaches } from "../../components/UsersComponents/Coaches"; import { InviteUser } from "../../components/UsersComponents/InviteUser"; import { PendingRequests } from "../../components/UsersComponents/Requests"; @@ -117,12 +116,7 @@ function UsersPage() { return
      Error
      ; } else { return ( - -
      - -

      Manage coaches from {params.editionId}

      -       -
      +
      - +
      ); } } diff --git a/frontend/src/views/UsersPage/styles.ts b/frontend/src/views/UsersPage/styles.ts deleted file mode 100644 index 02aaf4d40..000000000 --- a/frontend/src/views/UsersPage/styles.ts +++ /dev/null @@ -1,10 +0,0 @@ -import styled from "styled-components"; - -export const UsersPageDiv = styled.div``; - -export const UsersHeader = styled.div` - padding-left: 10px; - margin-top: 10px; - float: left; - display: inline-block; -`; From 20b0dd174a5ca36b9b185d4b032de9c9a16fc59e Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 16:54:04 +0200 Subject: [PATCH 192/649] Remove editionspage title --- frontend/src/views/EditionsPage/EditionsPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/views/EditionsPage/EditionsPage.tsx b/frontend/src/views/EditionsPage/EditionsPage.tsx index f2f7dc0a4..975beff56 100644 --- a/frontend/src/views/EditionsPage/EditionsPage.tsx +++ b/frontend/src/views/EditionsPage/EditionsPage.tsx @@ -11,7 +11,6 @@ export default function EditionsPage() { return ( -

      Editions

      navigate("/editions/new")} />       From d45b80a17c4af751bae230f53a67180d9ff91919 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 17:02:41 +0200 Subject: [PATCH 193/649] more prettier and confirm logic --- backend/.gitignore | 1 + .../StudentInformation/styles.ts | 1 - .../AdminDecisionContainer.tsx | 25 ++++++++++++++++--- .../RolesFilter/RolesFilter.tsx | 1 - .../StudentListFilters/StudentListFilters.css | 2 +- frontend/src/utils/api/students.ts | 5 +--- .../views/StudentInfoPage/StudentInfoPage.tsx | 2 -- 7 files changed, 25 insertions(+), 12 deletions(-) diff --git a/backend/.gitignore b/backend/.gitignore index 996e38fcc..eaaf3cd68 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -160,3 +160,4 @@ cython_debug/ # Testing SQLite database *test.db +/fill_my_database.py diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index faa12e192..822ff2d76 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -65,7 +65,6 @@ export const DefinitiveDecisionContainer = styled.div` `; export const NameAndRemoveButtonContainer = styled.div` - background: orange; display: flex; justify-content: space-between; align-items: center; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx index 182cbeb66..55081ad4c 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -2,12 +2,15 @@ import React, { useState } from "react"; import { Button, Modal } from "react-bootstrap"; import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; import { SuggestionButtons, ConfirmButton } from "./styles"; +import { confirmStudent } from "../../../../utils/api/suggestions"; +import { useParams } from "react-router-dom"; /** * Make definitive decision on the current student based on the selected decision value. * Only admins can see this component. */ export default function AdminDecisionContainer() { + const params = useParams(); const [show, setShow] = useState(false); const [clickedButtonText, setClickedButtonText] = useState(""); @@ -36,6 +39,22 @@ export default function AdminDecisionContainer() { setClickedButtonText(button.innerText); } + async function makeDecision() { + let decisionNum: number; + if (clickedButtonText === "Undecided") { + decisionNum = 0; + } else if (clickedButtonText === "Yes") { + decisionNum = 1; + } else if (clickedButtonText === "Maybe") { + decisionNum = 2; + } else { + decisionNum = 3; + } + await confirmStudent(params.editionId!, params.id!, decisionNum); + setClickedButtonText(""); + setShow(false); + } + return (
      @@ -74,11 +93,11 @@ export default function AdminDecisionContainer() {
      {clickedButtonText ? ( - ) : ( - )} @@ -87,7 +106,7 @@ export default function AdminDecisionContainer() {

      Definitive decision by admin

      - diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index 0f9767ca2..2f4732140 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -33,7 +33,6 @@ export default function RolesFilter({ newRoles.push(role.value); } setRolesFilter(newRoles); - console.log(rolesFilter); } return ( diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css index 6110d34af..d4814782f 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css @@ -1,4 +1,4 @@ .form-check { margin-left: 5%; margin-bottom: 1vh; -} \ No newline at end of file +} diff --git a/frontend/src/utils/api/students.ts b/frontend/src/utils/api/students.ts index 6b419ea63..9331b4fb9 100644 --- a/frontend/src/utils/api/students.ts +++ b/frontend/src/utils/api/students.ts @@ -47,10 +47,7 @@ export async function getStudent(edition: string, studentId: string): Promise

      loading

      ); } else { - console.log(currentStudent); return (
      Date: Thu, 12 May 2022 17:04:52 +0200 Subject: [PATCH 194/649] Make year of an edition not unqiue --- backend/src/database/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/database/models.py b/backend/src/database/models.py index e09fa58e5..9e25b692d 100644 --- a/backend/src/database/models.py +++ b/backend/src/database/models.py @@ -89,7 +89,7 @@ class Edition(Base): edition_id = Column(Integer, primary_key=True) name = Column(Text, unique=True, nullable=False) - year = Column(Integer, unique=True, nullable=False) + year = Column(Integer, nullable=False) invite_links: list[InviteLink] = relationship("InviteLink", back_populates="edition") projects: list[Project] = relationship("Project", back_populates="edition") From 61871fbeda2e20cccb5f7bc9f08fccb2245cffaa Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 12 May 2022 17:08:14 +0200 Subject: [PATCH 195/649] Add skills (projectRoles) to project --- .../AddedSkills/AddedSkills.tsx | 6 +- .../InputFields/Skill/Skill.tsx | 31 +++++++--- frontend/src/data/interfaces/projects.ts | 15 ++++- frontend/src/utils/api/projectRoles.ts | 60 +++++++++++++++++++ .../CreateProjectPage/CreateProjectPage.tsx | 40 ++++++++----- .../ProjectDetailPage/ProjectDetailPage.tsx | 4 +- 6 files changed, 125 insertions(+), 31 deletions(-) create mode 100644 frontend/src/utils/api/projectRoles.ts diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx index 798e525c0..fb17a209f 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx @@ -43,7 +43,7 @@ export default function AddedSkills({ if (event.target.valueAsNumber < 1) return item; return { ...item, - amount: event.target.valueAsNumber, + slots: event.target.valueAsNumber, }; } return { @@ -62,11 +62,11 @@ export default function AddedSkills({ - {skill.skill} + {skill.skill.name} { diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx index 809b70bfd..0a1a9a77a 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx @@ -1,7 +1,9 @@ -import { SkillProject } from "../../../../../data/interfaces/projects"; +import { useEffect, useState } from "react"; +import { SkillProject, Skill } from "../../../../../data/interfaces/projects"; +import { getSkills } from "../../../../../utils/api/projectRoles"; import { Input, AddButton } from "../../styles"; -export default function Skill({ +export default function SkillInput({ skill, setSkill, skills, @@ -12,7 +14,14 @@ export default function Skill({ skills: SkillProject[]; setSkills: (skills: SkillProject[]) => void; }) { - const availableSkills = ["Frontend", "Backend", "Database", "Design"]; + const [availableSkills, setAvailableSkills] = useState([]); + + useEffect(() => { + async function callCoaches() { + setAvailableSkills((await getSkills()) || []); + } + callCoaches(); + }, []); return (
      @@ -26,8 +35,8 @@ export default function Skill({ list="skills" /> - {availableSkills.map((availableCoach, _index) => { - return @@ -36,12 +45,18 @@ export default function Skill({ ); function addSkill() { - if (availableSkills.some(availableSkill => availableSkill === skill)) { + let skillToAdd: Skill | undefined; + availableSkills.forEach(availableSkill => { + if (availableSkill.name === skill) { + skillToAdd = availableSkill; + } + }); + if (skillToAdd) { const newSkills = [...skills]; const newSkill: SkillProject = { - skill: skill, + skill: skillToAdd, description: "", - amount: 1, + slots: 1, }; newSkills.push(newSkill); setSkills(newSkills); diff --git a/frontend/src/data/interfaces/projects.ts b/frontend/src/data/interfaces/projects.ts index cbe1232c2..3767ba11a 100644 --- a/frontend/src/data/interfaces/projects.ts +++ b/frontend/src/data/interfaces/projects.ts @@ -74,13 +74,13 @@ export interface Projects { */ export interface SkillProject { /** The name of the skill */ - skill: string; + skill: Skill; /** More info about this skill in a specific project */ description: string; /** Number of positions of this skill in a project */ - amount: number; + slots: number; } /** @@ -97,6 +97,17 @@ export interface CreateProject { coaches: number[]; } +export interface CreateProjectRole { + /** The id of the skill */ + skill_id: number; + + /** More info about this skill in a specific project */ + description: string; + + /** Number of positions of this skill in a project */ + slots: number; +} + /** * Data about a place in a project */ diff --git a/frontend/src/utils/api/projectRoles.ts b/frontend/src/utils/api/projectRoles.ts new file mode 100644 index 000000000..c05f37a2e --- /dev/null +++ b/frontend/src/utils/api/projectRoles.ts @@ -0,0 +1,60 @@ +import axios from "axios"; +import { axiosInstance } from "./api"; +import { CreateProjectRole, ProjectRole, Skill } from "../../data/interfaces/projects"; + +/** + * API call to create a ProjectRole. + * @param edition The edition name. + * @param projectId The projectId where to add the new project role. + * @param skillId The id of the skill. + * @param description Optional description for this skill. + * @param slots The number of places for this skill. + * @returns The newly created project role object. + */ +export async function createProjectRole( + edition: string, + projectId: string, + skillId: number, + description: string | undefined, + slots: number +): Promise { + const payload: CreateProjectRole = { + skill_id: skillId, + description: description || "", + slots: slots, + }; + + try { + const response = await axiosInstance.post( + "editions/" + edition + "/projects/" + projectId + "/roles", + payload + ); + const projectRole = response.data as ProjectRole; + + return projectRole; + } catch (error) { + if (axios.isAxiosError(error)) { + return null; + } else { + throw error; + } + } +} + +/** + * API call to get skills + * @returns + */ +export async function getSkills(): Promise { + try { + const response = await axiosInstance.get("skills"); + const projects = response.data.skills as Skill[]; + return projects; + } catch (error) { + if (axios.isAxiosError(error)) { + return null; + } else { + throw error; + } + } +} diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index d3d8af2f4..3f6616756 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -23,31 +23,26 @@ import { import { SkillProject } from "../../../data/interfaces/projects"; import { User } from "../../../utils/api/users/users"; import { toast } from "react-toastify"; - +import { createProjectRole } from "../../../utils/api/projectRoles"; /** * React component of the create project page. * @returns The create project page. */ + export default function CreateProjectPage() { - const [name, setName] = useState(""); + const [name, setName] = useState(""); // States for coaches - // States for coaches const [coach, setCoach] = useState(""); - const [coaches, setCoaches] = useState([]); + const [coaches, setCoaches] = useState([]); // States for skills - // States for skills const [skill, setSkill] = useState(""); - const [skills, setSkills] = useState([]); + const [projectSkills, setProjectSkills] = useState([]); // States for partners - // States for partners const [partner, setPartner] = useState(""); const [partners, setPartners] = useState([]); - const navigate = useNavigate(); - const params = useParams(); const editionId = params.editionId!; - return ( @@ -71,10 +66,10 @@ export default function CreateProjectPage() { - + { coachIds.push(coachToAdd.userId); }); - const response = await createProject(editionId, name, partners, coachIds); + if (response) { + projectSkills.forEach(async projectRole => { + const addedSkill = await createProjectRole( + editionId, + response.projectId.toString(), + projectRole.skill.skillId, + projectRole.description, + projectRole.slots + ); + if (!addedSkill) toast.error("Couldn't add skill" + projectRole.skill.name); + }); + toast.success("Successfully created project"); navigate("/editions/" + editionId + "/projects/" + response.projectId); - } else alert("Something went wrong :("); + } else toast.error("Something went wrong"); } } diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 9c0184eef..00c83896e 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -49,7 +49,7 @@ export default function ProjectDetailPage() { // TODO // Generate student data const studentsTemplate: StudentPlace[] = []; - for (let i = 0; i < response.numberOfStudents; i++) { + for (let i = 0; i < 10; i++) { const student: StudentPlace = { available: i % 2 === 0, name: i % 2 === 0 ? undefined : "Tom", @@ -83,7 +83,7 @@ export default function ProjectDetailPage() { {element.name} ))} - {project.numberOfStudents} + 10 From ce326f0be6d823914b32ad6ce11f6e9b47b6f2f6 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 17:43:11 +0200 Subject: [PATCH 196/649] Tables colors --- frontend/src/App.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/frontend/src/App.css b/frontend/src/App.css index 336e8b14b..b463fabc1 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -30,3 +30,18 @@ body { background-color: var(--background_color); color: white; } + + +/* All tables */ +.table-striped>tbody>tr:nth-of-type(odd)>* { + --bs-table-accent-bg: #1A1A38; +} + +.table-striped>tbody>tr:nth-of-type(odd)>*:hover { + --bs-table-accent-bg: #41415E; +} + +.table>:not(caption)>*>* { + --bs-table-accent-bg: #0F0F30; + --bs-table-hover-bg: #41415E; +} From 8b8e28879e628ea714e1a2c7d63a91b0e4a85c94 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 17:48:06 +0200 Subject: [PATCH 197/649] eslint suppress warnings --- .../StudentInformation/StudentInformation.tsx | 6 +++++- frontend/src/views/StudentInfoPage/StudentInfoPage.tsx | 5 ++++- frontend/src/views/StudentsPage/StudentsPage.tsx | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index 26e765dc8..5855ec370 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/exhaustive-deps */ import React, { useEffect, useState } from "react"; import { FullName, @@ -34,10 +35,13 @@ interface Props { export default function StudentInformation(props: Props) { const [suggestions, setSuggestions] = useState([]); const params = useParams(); + const editionId = params.editionId; + const studentId = params.id; /** * Get all the suggestion that were made on this student. */ + // eslint-disable-next-line react-hooks/exhaustive-deps async function callGetSuggestions() { try { const response = await getSuggestions(params.editionId!, params.id!); @@ -68,7 +72,7 @@ export default function StudentInformation(props: Props) { */ useEffect(() => { callGetSuggestions(); - }, [params.editionId!, params.id!]); + }, [editionId, studentId]); if (!props.currentStudent) { return ( diff --git a/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx b/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx index 8ca492101..5f8995e6b 100644 --- a/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx +++ b/frontend/src/views/StudentInfoPage/StudentInfoPage.tsx @@ -10,6 +10,7 @@ import { Student } from "../../data/interfaces/students"; */ function StudentInfoPage() { const params = useParams(); + const studentId = params.id; const [students, setStudents] = useState([]); const [nameFilter, setNameFilter] = useState(""); const [rolesFilter, setRolesFilter] = useState([]); @@ -52,6 +53,7 @@ function StudentInfoPage() { */ useEffect(() => { callGetStudents(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); /** @@ -59,7 +61,8 @@ function StudentInfoPage() { */ useEffect(() => { callGetStudent(); - }, [params.id!]); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [studentId]); if (!currentStudent) { return ( diff --git a/frontend/src/views/StudentsPage/StudentsPage.tsx b/frontend/src/views/StudentsPage/StudentsPage.tsx index 93c4cc57f..77d2f00f6 100644 --- a/frontend/src/views/StudentsPage/StudentsPage.tsx +++ b/frontend/src/views/StudentsPage/StudentsPage.tsx @@ -40,6 +40,7 @@ function StudentsPage() { */ useEffect(() => { callGetStudents(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); return ( From 8ccd9d295c31d4eae6cba1fb2fcef4ce9db74059 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 17:52:05 +0200 Subject: [PATCH 198/649] Style table --- frontend/src/components/AdminsComponents/AdminList.tsx | 2 +- frontend/src/components/AdminsComponents/styles.ts | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/AdminsComponents/AdminList.tsx b/frontend/src/components/AdminsComponents/AdminList.tsx index 99b588ee9..2e840a5da 100644 --- a/frontend/src/components/AdminsComponents/AdminList.tsx +++ b/frontend/src/components/AdminsComponents/AdminList.tsx @@ -35,7 +35,7 @@ export default function AdminList(props: { return ( - + Name diff --git a/frontend/src/components/AdminsComponents/styles.ts b/frontend/src/components/AdminsComponents/styles.ts index a3f70a4ad..6c424f479 100644 --- a/frontend/src/components/AdminsComponents/styles.ts +++ b/frontend/src/components/AdminsComponents/styles.ts @@ -5,7 +5,12 @@ export const Warning = styled.div` color: var(--osoc_red); `; -export const AdminsTable = styled(Table)` +export const AdminsTable = styled(Table).attrs({ + striped: true, + bordered: true, + variant: "dark", + hover: false, +})` width: 45em; max-width: 100%; margin-top: 10px; From f914192bd8de1dbb11c706a06f56c19208be9202 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 17:55:46 +0200 Subject: [PATCH 199/649] Style table --- .../Coaches/CoachesComponents/CoachList.tsx | 2 +- .../src/components/UsersComponents/Coaches/styles.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachList.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachList.tsx index c037bf237..5248098c1 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachList.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachList.tsx @@ -35,7 +35,7 @@ export default function CoachList(props: { useWindow={false} initialLoad={true} > - + Name diff --git a/frontend/src/components/UsersComponents/Coaches/styles.ts b/frontend/src/components/UsersComponents/Coaches/styles.ts index 2af64fa82..0c9b81503 100644 --- a/frontend/src/components/UsersComponents/Coaches/styles.ts +++ b/frontend/src/components/UsersComponents/Coaches/styles.ts @@ -14,9 +14,12 @@ export const CoachesTitle = styled.div` font-size: 25px; `; -export const CoachesTable = styled(Table)` - // TODO: make all tables in site uniform -`; +export const CoachesTable = styled(Table).attrs({ + striped: true, + bordered: true, + variant: "dark", + hover: false, +})``; export const ModalContent = styled.div` border: 3px solid var(--osoc_red); From 23d99813c7d4e9d4bbe1508eee2f43c53c379cb5 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 18:04:58 +0200 Subject: [PATCH 200/649] Style table v2 --- frontend/src/App.css | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/frontend/src/App.css b/frontend/src/App.css index b463fabc1..39ff6b6d8 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -33,15 +33,13 @@ body { /* All tables */ -.table-striped>tbody>tr:nth-of-type(odd)>* { - --bs-table-accent-bg: #1A1A38; -} - -.table-striped>tbody>tr:nth-of-type(odd)>*:hover { - --bs-table-accent-bg: #41415E; -} - -.table>:not(caption)>*>* { - --bs-table-accent-bg: #0F0F30; +.table-dark{ + --bs-table-bg: #0F0F30; + --bs-table-background: #0F0F30; + --bs-table-striped-bg: #1A1A38; + --bs-table-striped-color: #fff; + --bs-table-active-bg: #51516E; + --bs-table-active-color: #fff; --bs-table-hover-bg: #41415E; + --bs-table-hover-color: #fff; } From f8f8846539ded88481f5938342403e23a3921591 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 18:09:54 +0200 Subject: [PATCH 201/649] fix styling --- frontend/src/App.css | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/frontend/src/App.css b/frontend/src/App.css index 39ff6b6d8..9ecdb673c 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -31,15 +31,14 @@ body { color: white; } - /* All tables */ -.table-dark{ - --bs-table-bg: #0F0F30; - --bs-table-background: #0F0F30; - --bs-table-striped-bg: #1A1A38; +.table-dark { + --bs-table-bg: #0f0f30; + --bs-table-background: #0f0f30; + --bs-table-striped-bg: #1a1a38; --bs-table-striped-color: #fff; - --bs-table-active-bg: #51516E; + --bs-table-active-bg: #51516e; --bs-table-active-color: #fff; - --bs-table-hover-bg: #41415E; + --bs-table-hover-bg: #41415e; --bs-table-hover-color: #fff; } From 8bdd610abc11983a5b477b9e5e682163bff7ce08 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 12 May 2022 18:26:26 +0200 Subject: [PATCH 202/649] only render decision button for admins --- .../StudentInformation/StudentInformation.tsx | 13 ++++++++----- .../StudentInformation/styles.ts | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index 5855ec370..0f7ef0e10 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -14,7 +14,7 @@ import { PersonalInfoFieldSubject, RolesField, RolesValues, - Role, + RoleValue, NameAndRemoveButtonContainer, } from "./styles"; import { AdminDecisionContainer, CoachSuggestionContainer } from "../SuggestionComponents"; @@ -23,6 +23,8 @@ import { Suggestion } from "../../../data/interfaces/suggestions"; import { getSuggestions } from "../../../utils/api/suggestions"; import { useParams } from "react-router-dom"; import RemoveStudentButton from "../RemoveStudentButton/RemoveStudentButton"; +import { useAuth } from "../../../contexts"; +import { Role } from "../../../data/enums"; interface Props { currentStudent: Student; @@ -33,6 +35,7 @@ interface Props { * @param props current student whose information needs to be showed. */ export default function StudentInformation(props: Props) { + const { role } = useAuth(); const [suggestions, setSuggestions] = useState([]); const params = useParams(); const editionId = params.editionId; @@ -130,15 +133,15 @@ export default function StudentInformation(props: Props) { Roles: - Frontend - Design - Communication + Frontend + Design + Communication
      - + {role === Role.ADMIN ? : <>}
      ); diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index 822ff2d76..255005ddf 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -50,7 +50,7 @@ export const RolesValues = styled.ul` margin-left: 5%; `; -export const Role = styled.li``; +export const RoleValue = styled.li``; export const LineBreak = styled.div` background-color: #163542; From 678a18a720b1590ea40a1417163af8db2459312b Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 12 May 2022 19:38:39 +0200 Subject: [PATCH 203/649] adapt to new backend-response --- .../ProjectsComponents/Conflicts/Conflict.tsx | 14 ++++++-------- .../Conflicts/ConflictsButton.tsx | 2 +- frontend/src/data/interfaces/conflicts.ts | 18 +++++++----------- frontend/src/data/interfaces/index.ts | 2 +- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/Conflicts/Conflict.tsx b/frontend/src/components/ProjectsComponents/Conflicts/Conflict.tsx index 59bbdfecb..6e6b10455 100644 --- a/frontend/src/components/ProjectsComponents/Conflicts/Conflict.tsx +++ b/frontend/src/components/ProjectsComponents/Conflicts/Conflict.tsx @@ -7,18 +7,16 @@ import { ListLink } from "./styles"; export default function ConflictDiv(props: { editionId: string; conflict: Conflict }) { return (
    • - - {`${props.conflict.student.firstName} ${props.conflict.student.lastName}`} + + {`${props.conflict.firstName} ${props.conflict.lastName}`}
        - {props.conflict.projects.map(conflictProject => ( -
      • + {props.conflict.prSuggestions.map(prSuggestion => ( +
      • - {conflictProject.name} + {prSuggestion.projectRole.project.name}
        • ))} diff --git a/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx b/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx index abac1fbf9..2d8543f8e 100644 --- a/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx +++ b/frontend/src/components/ProjectsComponents/Conflicts/ConflictsButton.tsx @@ -53,7 +53,7 @@ export default function ConflictsButton(props: { editionId: string }) {
          {conflicts.map(conflict => ( diff --git a/frontend/src/data/interfaces/conflicts.ts b/frontend/src/data/interfaces/conflicts.ts index c90698c72..7a5f7f47b 100644 --- a/frontend/src/data/interfaces/conflicts.ts +++ b/frontend/src/data/interfaces/conflicts.ts @@ -1,20 +1,16 @@ -export interface ConflictProject { - projectId: number; - name: string; -} - -export interface Student { - firstName: string; - lastName: string; - studentId: number; +export interface PrSuggestion { + projectRole: { project: { name: string; projectId: number } }; + projectRoleSuggestionId: number; } /** * A conflict (student with multiple projects) */ export interface Conflict { - student: Student; - projects: ConflictProject[]; + firstName: string; + lastName: string; + prSuggestions: PrSuggestion[]; + studentId: number; } /** diff --git a/frontend/src/data/interfaces/index.ts b/frontend/src/data/interfaces/index.ts index e7970e8dd..5f1bdec2d 100644 --- a/frontend/src/data/interfaces/index.ts +++ b/frontend/src/data/interfaces/index.ts @@ -1,4 +1,4 @@ export type { Edition } from "./editions"; export type { User } from "./users"; export type { Partner, Coach, Project } from "./projects"; -export type { Conflicts, Conflict, ConflictProject, Student } from "./conflicts"; +export type { Conflicts, Conflict, PrSuggestion } from "./conflicts"; From 038b5d2430a8b0e24dd6bab9dee7a00b49fd7dcf Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 12 May 2022 20:33:08 +0200 Subject: [PATCH 204/649] API calls for skills in frontend and interfaces --- frontend/src/data/interfaces/skills.ts | 26 +++++++++++ frontend/src/utils/api/skills.ts | 62 ++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 frontend/src/data/interfaces/skills.ts create mode 100644 frontend/src/utils/api/skills.ts diff --git a/frontend/src/data/interfaces/skills.ts b/frontend/src/data/interfaces/skills.ts new file mode 100644 index 000000000..afbb6ff3f --- /dev/null +++ b/frontend/src/data/interfaces/skills.ts @@ -0,0 +1,26 @@ +/** + * Data about a skill + */ +export interface Skill { + /** The id of the skill */ + skillId: number; + + /** The name of the skill */ + name: string; +} + +/** + * To create a skill + */ +export interface CreateSkill { + /** The name of the skill */ + name: string; +} + +/** + * A list of skills + */ +export interface Skills { + /** The list of skills */ + skills: Skill[]; +} diff --git a/frontend/src/utils/api/skills.ts b/frontend/src/utils/api/skills.ts new file mode 100644 index 000000000..c2bc1dd63 --- /dev/null +++ b/frontend/src/utils/api/skills.ts @@ -0,0 +1,62 @@ +import axios from "axios"; +import { axiosInstance } from "./api"; +import { CreateSkill, Skill, Skills } from "../../data/interfaces/skills"; + +/** + * API call to get skills + * @returns a list of skills + */ +export async function getSkills(): Promise { + try { + const response = await axiosInstance.get("skills"); + const skills = response.data.skills as Skills; + return skills; + } catch (error) { + if (axios.isAxiosError(error)) { + return null; + } else { + throw error; + } + } +} + +/** + * API call to create a Skill. + * @param name The skill name. + * @returns The newly created project role object. + */ +export async function createSkill(name: string): Promise { + const payload: CreateSkill = { + name: name, + }; + + try { + const response = await axiosInstance.post("skills", payload); + const skill = response.data as Skill; + return skill; + } catch (error) { + if (axios.isAxiosError(error)) { + return null; + } else { + throw error; + } + } +} + +/** + * API call to delete a Skill. + * @param skillId The skill id. + * @returns True if the delete was successful, false if it failed. + */ +export async function deleteSkill(skillId: string): Promise { + try { + await axiosInstance.delete("skills/" + skillId); + return true; + } catch (error) { + if (axios.isAxiosError(error)) { + return false; + } else { + throw error; + } + } +} From 5fb4100d43a0f83efc9508a63cf2a7cef90c4aa3 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 12 May 2022 20:51:11 +0200 Subject: [PATCH 205/649] Used new skill api calls and interfaces --- .../InputFields/Skill/Skill.tsx | 7 ++++--- frontend/src/data/interfaces/projects.ts | 6 +----- frontend/src/utils/api/projectRoles.ts | 20 +------------------ 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx index 0a1a9a77a..371603e9a 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from "react"; -import { SkillProject, Skill } from "../../../../../data/interfaces/projects"; -import { getSkills } from "../../../../../utils/api/projectRoles"; +import { SkillProject } from "../../../../../data/interfaces/projects"; +import { Skill } from "../../../../../data/interfaces/skills"; +import { getSkills } from "../../../../../utils/api/skills"; import { Input, AddButton } from "../../styles"; export default function SkillInput({ @@ -18,7 +19,7 @@ export default function SkillInput({ useEffect(() => { async function callCoaches() { - setAvailableSkills((await getSkills()) || []); + setAvailableSkills((await getSkills())?.skills || []); } callCoaches(); }, []); diff --git a/frontend/src/data/interfaces/projects.ts b/frontend/src/data/interfaces/projects.ts index 3767ba11a..d57b23f0b 100644 --- a/frontend/src/data/interfaces/projects.ts +++ b/frontend/src/data/interfaces/projects.ts @@ -2,6 +2,7 @@ * This file contains all interfaces used in projects pages. */ +import { Skill } from "./skills"; import { Student } from "./students"; /** @@ -22,11 +23,6 @@ export interface Coach { name: string; } -export interface Skill { - skillId: number; - name: string; -} - export interface ProjectRoleSuggestion { projectRoleSuggestionId: number; argumentation: string; diff --git a/frontend/src/utils/api/projectRoles.ts b/frontend/src/utils/api/projectRoles.ts index c05f37a2e..7eaf44105 100644 --- a/frontend/src/utils/api/projectRoles.ts +++ b/frontend/src/utils/api/projectRoles.ts @@ -1,6 +1,6 @@ import axios from "axios"; import { axiosInstance } from "./api"; -import { CreateProjectRole, ProjectRole, Skill } from "../../data/interfaces/projects"; +import { CreateProjectRole, ProjectRole } from "../../data/interfaces/projects"; /** * API call to create a ProjectRole. @@ -40,21 +40,3 @@ export async function createProjectRole( } } } - -/** - * API call to get skills - * @returns - */ -export async function getSkills(): Promise { - try { - const response = await axiosInstance.get("skills"); - const projects = response.data.skills as Skill[]; - return projects; - } catch (error) { - if (axios.isAxiosError(error)) { - return null; - } else { - throw error; - } - } -} From f4494590000b02a6cf3c794b6c095dda31632175 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 12 May 2022 21:40:17 +0200 Subject: [PATCH 206/649] Fixes and toasts --- frontend/src/utils/api/skills.ts | 2 +- .../CreateProjectPage/CreateProjectPage.tsx | 30 ++++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/frontend/src/utils/api/skills.ts b/frontend/src/utils/api/skills.ts index c2bc1dd63..df5cc2c3e 100644 --- a/frontend/src/utils/api/skills.ts +++ b/frontend/src/utils/api/skills.ts @@ -9,7 +9,7 @@ import { CreateSkill, Skill, Skills } from "../../data/interfaces/skills"; export async function getSkills(): Promise { try { const response = await axiosInstance.get("skills"); - const skills = response.data.skills as Skills; + const skills = response.data as Skills; return skills; } catch (error) { if (axios.isAxiosError(error)) { diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index 3f6616756..d37c574a7 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -105,18 +105,26 @@ export default function CreateProjectPage() { const response = await createProject(editionId, name, partners, coachIds); if (response) { - projectSkills.forEach(async projectRole => { - const addedSkill = await createProjectRole( - editionId, - response.projectId.toString(), - projectRole.skill.skillId, - projectRole.description, - projectRole.slots - ); - if (!addedSkill) toast.error("Couldn't add skill" + projectRole.skill.name); - }); - toast.success("Successfully created project"); + await toast.promise(addProjectRolls(response.projectId), { + pending: "Creating project", + success: "Successfully created project", + error: "Something went wrong" + }) navigate("/editions/" + editionId + "/projects/" + response.projectId); } else toast.error("Something went wrong"); } + + async function addProjectRolls(projectId: number) { + // Use a for loop or else await won't work as intended + for (const projectSkill of projectSkills) { + const addedSkill = await createProjectRole( + editionId, + projectId.toString(), + projectSkill.skill.skillId, + projectSkill.description, + projectSkill.slots + ); + if (!addedSkill) toast.error("Couldn't add skill" + projectSkill.skill.name); + } + } } From fbdb898864131a0863f7fad306f91fc9d11cfb03 Mon Sep 17 00:00:00 2001 From: stijndcl Date: Thu, 12 May 2022 21:46:36 +0200 Subject: [PATCH 207/649] Rewrite login page --- .../src/components/Common/Buttons/styles.ts | 4 +- .../WelcomeText/WelcomeText.tsx | 12 +- frontend/src/utils/api/api.ts | 8 ++ frontend/src/utils/api/login.ts | 7 +- frontend/src/views/LoginPage/LoginPage.tsx | 111 ++++++++++++++---- 5 files changed, 111 insertions(+), 31 deletions(-) diff --git a/frontend/src/components/Common/Buttons/styles.ts b/frontend/src/components/Common/Buttons/styles.ts index 7cd62caf4..7eadbe6c4 100644 --- a/frontend/src/components/Common/Buttons/styles.ts +++ b/frontend/src/components/Common/Buttons/styles.ts @@ -11,7 +11,9 @@ export const GreenButton = styled(Button)` border-color: var(--osoc_green); color: var(--osoc_blue); - &:hover { + &:hover, + &:active, + &:focus { background-color: var(--osoc_orange); border-color: var(--osoc_orange); color: var(--osoc_blue); diff --git a/frontend/src/components/LoginComponents/WelcomeText/WelcomeText.tsx b/frontend/src/components/LoginComponents/WelcomeText/WelcomeText.tsx index d19300738..ba80514ec 100644 --- a/frontend/src/components/LoginComponents/WelcomeText/WelcomeText.tsx +++ b/frontend/src/components/LoginComponents/WelcomeText/WelcomeText.tsx @@ -6,12 +6,12 @@ import { WelcomeTextContainer } from "./styles"; export default function WelcomeText() { return ( -

          Hi!

          -

          - Welcome to the Open Summer of Code selections app. After you've logged in with your - account, we'll enable your account so you can get started. An admin will verify you - as soon as possible. -

          +

          Hi there!

          +

          Welcome to the Open Summer of Code selections app.

          +
          + After you've logged in with your account, we'll enable your account so you can get + started. An admin will verify you as soon as possible. +
          ); } diff --git a/frontend/src/utils/api/api.ts b/frontend/src/utils/api/api.ts index 8c48e6af0..f9d9426c9 100644 --- a/frontend/src/utils/api/api.ts +++ b/frontend/src/utils/api/api.ts @@ -33,6 +33,13 @@ axiosInstance.interceptors.response.use(undefined, async (error: AxiosError) => // If the token is already being refreshed, resend it (will be delayed until the token has been refreshed) return axiosInstance(error.config); } else { + // If the user is on the login page, don't try to refresh their token as + // they don't have one yet + // Instead just raise the error so we can show a message + if (window.location.pathname === "/") { + throw error; + } + setRefreshTokenLock(true); try { const tokens = await refreshTokens(); @@ -56,5 +63,6 @@ axiosInstance.interceptors.response.use(undefined, async (error: AxiosError) => setRefreshTokenLock(false); } } + throw error; }); diff --git a/frontend/src/utils/api/login.ts b/frontend/src/utils/api/login.ts index 9272775c5..529f331fb 100644 --- a/frontend/src/utils/api/login.ts +++ b/frontend/src/utils/api/login.ts @@ -21,7 +21,7 @@ export async function logIn( auth: AuthContextState, email: string, password: string -): Promise { +): Promise { const payload = new FormData(); payload.append("username", email); payload.append("password", password); @@ -34,12 +34,11 @@ export async function logIn( setRefreshToken(login.refresh_token); ctxLogIn(login.user, auth); - - return true; + return response.status; } catch (error) { if (axios.isAxiosError(error)) { auth.setIsLoggedIn(false); - return false; + return error.response?.status || 500; } else { auth.setIsLoggedIn(null); throw error; diff --git a/frontend/src/views/LoginPage/LoginPage.tsx b/frontend/src/views/LoginPage/LoginPage.tsx index 390b9be25..cb58a1492 100644 --- a/frontend/src/views/LoginPage/LoginPage.tsx +++ b/frontend/src/views/LoginPage/LoginPage.tsx @@ -1,10 +1,10 @@ -import { useEffect, useState } from "react"; +import { FormEvent, useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import { logIn } from "../../utils/api/login"; import CreateButton from "../../components/Common/Buttons/CreateButton"; -import { Email, Password, SocialButtons, WelcomeText } from "../../components/LoginComponents"; +import { SocialButtons, WelcomeText } from "../../components/LoginComponents"; import { EmailLoginContainer, @@ -14,13 +14,25 @@ import { VerticalDivider, } from "./styles"; import { useAuth } from "../../contexts"; +import { FormControl } from "../../components/Common/Forms"; +import FloatingLabel from "react-bootstrap/FloatingLabel"; +import Form from "react-bootstrap/Form"; +import { toast } from "react-toastify"; + +export enum ToastId { + EmptyEmail = "login-empty-email", + EmptyPassword = "login-empty-password", + PendingRequest = "login-pending-request", +} /** * Page where users can log in to the application. */ export default function LoginPage() { const [email, setEmail] = useState(""); + const [emailValid, setEmailValid] = useState(true); const [password, setPassword] = useState(""); + const [passwordValid, setPasswordValid] = useState(true); const authCtx = useAuth(); const navigate = useNavigate(); @@ -32,13 +44,44 @@ export default function LoginPage() { } }, [authCtx.isLoggedIn, navigate]); + async function handleSubmit(event: FormEvent) { + event.preventDefault(); + + // Show error messages & form validation when email or password are empty + if (!email) { + toast.error("Email address cannot be empty.", { toastId: ToastId.EmptyEmail }); + setEmailValid(false); + } + + if (!password) { + toast.error("Password cannot be empty.", { toastId: ToastId.EmptyPassword }); + setPasswordValid(false); + } + + if (email && password) { + toast.dismiss(); + await toast.promise( + callLogIn, + { + pending: "Logging in...", + }, + { toastId: ToastId.PendingRequest } + ); + } + } + async function callLogIn() { - try { - const response = await logIn(authCtx, email, password); - if (response) navigate("/editions"); - else alert("Something went wrong when login in"); - } catch (error) { - console.log(error); + const status = await logIn(authCtx, email, password); + toast.dismiss(); + + if (status === 200) { + navigate("/editions"); + } else if (status === 401) { + toast.error("Invalid email/password combination."); + setEmailValid(false); + setPasswordValid(false); + } else { + toast.warning("Something went wrong on our side."); } } @@ -50,18 +93,46 @@ export default function LoginPage() { - - - - Don't have an account? Ask an admin for an invite link - -
          - -
          +
          + + { + setEmailValid(true); + setEmail(e.target.value); + }} + onFocus={() => setEmailValid(true)} + isInvalid={!emailValid} + /> + + + { + setPasswordValid(true); + setPassword(e.target.value); + }} + onFocus={() => setPasswordValid(true)} + isInvalid={!passwordValid} + /> + + + Don't have an account? Ask an admin for an invite link + +
          + +
          +
          From 3db3f9a01a788e55b1fddc919f1a6a3dd8cd447d Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 12 May 2022 21:48:54 +0200 Subject: [PATCH 208/649] prettier --- .../projectViews/CreateProjectPage/CreateProjectPage.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index d37c574a7..53d38f993 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -49,7 +49,6 @@ export default function CreateProjectPage() {

          New Project

           - @@ -105,16 +104,16 @@ export default function CreateProjectPage() { const response = await createProject(editionId, name, partners, coachIds); if (response) { - await toast.promise(addProjectRolls(response.projectId), { + await toast.promise(addProjectRoles(response.projectId), { pending: "Creating project", success: "Successfully created project", - error: "Something went wrong" - }) + error: "Something went wrong", + }); navigate("/editions/" + editionId + "/projects/" + response.projectId); } else toast.error("Something went wrong"); } - async function addProjectRolls(projectId: number) { + async function addProjectRoles(projectId: number) { // Use a for loop or else await won't work as intended for (const projectSkill of projectSkills) { const addedSkill = await createProjectRole( From 5cb356f2c8fe916401d8bd23939321676442fee9 Mon Sep 17 00:00:00 2001 From: cledloof Date: Fri, 13 May 2022 03:06:37 +0200 Subject: [PATCH 209/649] added roles with call to api --- .../RolesFilter/RolesFilter.tsx | 33 ++++++++++++------- .../StudentListFilters/StudentListFilters.tsx | 2 +- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index 2f4732140..79ac1a83d 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import { FilterRoles, FilterRolesDropdownContainer, @@ -6,6 +6,12 @@ import { FilterRolesLabelContainer, } from "../styles"; import Select from "react-select"; +import { getSkills } from "../../../../utils/api/skills"; + +interface DropdownRole { + label: string; + value: number; +} /** * Component that filters the students list based on the current roles selected. @@ -13,21 +19,24 @@ import Select from "react-select"; * @param setRolesFilter */ export default function RolesFilter({ - rolesFilter, setRolesFilter, }: { - rolesFilter: number[]; setRolesFilter: (value: number[]) => void; }) { - const roles = [ - { value: 0, label: "Frontend" }, - { value: 1, label: "Backend" }, - { value: 2, label: "Communication" }, - ]; + const [roles, setRoles] = useState([]); + + async function fetchRoles() { + const allRoles = await getSkills(); + // @ts-ignore + const dropdownRoles = allRoles.map(role => ({ label: role.name, value: role.skillId })); + setRoles(dropdownRoles); + } + + useEffect(() => { + fetchRoles(); + }, []); - function handleRolesChange( - clickedRoles: () => IterableIterator<{ value: number; label: string }> - ): void { + function handleRolesChange(): void { const newRoles: number[] = []; for (const role of roles) { newRoles.push(role.value); @@ -46,7 +55,7 @@ export default function RolesFilter({ isMulti isSearchable placeholder="Choose roles..." - onChange={e => handleRolesChange(e.values)} + onChange={handleRolesChange} /> diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx index 067337495..11338c7ef 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx @@ -37,7 +37,7 @@ export default function StudentListFilters(props: Props) { Students - + Date: Fri, 13 May 2022 03:21:54 +0200 Subject: [PATCH 210/649] show skills from a student --- .../StudentInformation/StudentInformation.tsx | 7 ++++--- frontend/src/data/interfaces/students.ts | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index 0f7ef0e10..fcb545937 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -84,6 +84,7 @@ export default function StudentInformation(props: Props) {
    ); } else { + console.log(props.currentStudent.skills); return ( @@ -133,9 +134,9 @@ export default function StudentInformation(props: Props) { Roles: - Frontend - Design - Communication + {props.currentStudent.skills.map(skill => ( + {skill.name} + ))} diff --git a/frontend/src/data/interfaces/students.ts b/frontend/src/data/interfaces/students.ts index 85c179d37..c803bcfb2 100644 --- a/frontend/src/data/interfaces/students.ts +++ b/frontend/src/data/interfaces/students.ts @@ -2,6 +2,8 @@ * This file contains all interfaces used in students pages. */ +import { Skill } from "./skills"; + /** * Data about a student. */ @@ -15,7 +17,7 @@ export interface Student { nrOfSuggestions: NrSuggestions; phoneNumber: string; preferredName: string; - skills: string[]; + skills: Skill[]; studentId: number; wantsToBeStudentCoach: boolean; } From 2182f5673cf5516a58560459747d771f2807fc45 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Fri, 13 May 2022 12:58:23 +0200 Subject: [PATCH 211/649] More styling --- .../Coaches/CoachesComponents/RemoveCoach.tsx | 60 +++++++++++-------- .../UsersComponents/Coaches/styles.ts | 14 +++++ .../UsersComponents/InviteUser/styles.ts | 3 +- 3 files changed, 52 insertions(+), 25 deletions(-) diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx index c7660e857..cebe7fda1 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx @@ -5,7 +5,13 @@ import { removeCoachFromEdition, } from "../../../../utils/api/users/coaches"; import { Button, Modal, Spinner } from "react-bootstrap"; -import { DialogButton, ModalContent } from "../styles"; +import { + CancelButton, + CredsDiv, + DialogButton, + DialogButtonContainer, + ModalContent, +} from "../styles"; import { Error } from "../../Requests/styles"; /** @@ -63,27 +69,31 @@ export default function RemoveCoach(props: { buttons = ; } else { buttons = ( -
    - { - removeCoach(props.coach.userId, true); - }} - > - Remove from all editions - - { - removeCoach(props.coach.userId, false); - }} - > - Remove from {props.edition} - - -
    + +
    + { + removeCoach(props.coach.userId, true); + }} + > + Remove from all editions + +
    +
    + { + removeCoach(props.coach.userId, false); + }} + > + Remove from current edition + + + Cancel + +
    +     ); } @@ -99,8 +109,10 @@ export default function RemoveCoach(props: { Remove Coach -

    {props.coach.name}

    - {props.coach.auth.email} + +

    {props.coach.name}

    + {props.coach.auth.email} +     {buttons} diff --git a/frontend/src/components/UsersComponents/Coaches/styles.ts b/frontend/src/components/UsersComponents/Coaches/styles.ts index 0c9b81503..0f7e11bc6 100644 --- a/frontend/src/components/UsersComponents/Coaches/styles.ts +++ b/frontend/src/components/UsersComponents/Coaches/styles.ts @@ -45,8 +45,22 @@ export const ListDiv = styled.div` export const DialogButton = styled(Button)` margin-right: 4px; + margin-bottom: 4px; +`; + +export const DialogButtonContainer = styled.div` + width: 100%; +`; + +export const CancelButton = styled(Button)` + float: right; `; export const EmailDiv = styled.div` overflow: auto; `; + +export const CredsDiv = styled.div` + overflow: hidden; + text-overflow: ellipsis; +`; diff --git a/frontend/src/components/UsersComponents/InviteUser/styles.ts b/frontend/src/components/UsersComponents/InviteUser/styles.ts index d264261f6..9150e40f5 100644 --- a/frontend/src/components/UsersComponents/InviteUser/styles.ts +++ b/frontend/src/components/UsersComponents/InviteUser/styles.ts @@ -24,7 +24,8 @@ export const InviteInput = styled.input.attrs({ export const MessageDiv = styled.div` margin-left: 10px; margin-top: 5px; - height: 15px; + height: fit-content; + overflow: auto; `; export const Error = styled.div` From e7fd34e0a4c3d7329ef8931c9555c490d6622851 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Fri, 13 May 2022 13:19:18 +0200 Subject: [PATCH 212/649] Acceptable solution for very long project- & studentnames --- .../src/components/ProjectsComponents/Conflicts/styles.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/ProjectsComponents/Conflicts/styles.ts b/frontend/src/components/ProjectsComponents/Conflicts/styles.ts index 38b80d704..f5bcfc0ca 100644 --- a/frontend/src/components/ProjectsComponents/Conflicts/styles.ts +++ b/frontend/src/components/ProjectsComponents/Conflicts/styles.ts @@ -9,7 +9,8 @@ export const ConButton = styled(Button)` export const SidePanel = styled(Offcanvas)` background-color: #323252; - width: fit-content; + width: 33em; + max-width: fit-content; color: white; `; @@ -20,4 +21,6 @@ export const Loader = styled(Spinner)` export const ListLink = styled(Link)` color: white; + margin-right: 10px; + white-space: nowrap; `; From 64706eee23e9ab1193106988564d787e197792bc Mon Sep 17 00:00:00 2001 From: cledloof Date: Fri, 13 May 2022 13:21:44 +0200 Subject: [PATCH 213/649] replaced suppress with fix --- .../StudentListFilters/RolesFilter/RolesFilter.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index 79ac1a83d..e6bb8524f 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -27,8 +27,10 @@ export default function RolesFilter({ async function fetchRoles() { const allRoles = await getSkills(); - // @ts-ignore - const dropdownRoles = allRoles.map(role => ({ label: role.name, value: role.skillId })); + const dropdownRoles: DropdownRole[] = allRoles!.skills!.map(role => ({ + label: role.name, + value: role.skillId, + })); setRoles(dropdownRoles); } From 8678332584402bbc3596019e24b95ffad935af83 Mon Sep 17 00:00:00 2001 From: cledloof Date: Fri, 13 May 2022 13:34:00 +0200 Subject: [PATCH 214/649] fixed roles --- .../StudentListFilters/RolesFilter/RolesFilter.tsx | 2 +- frontend/src/utils/api/skills.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index e6bb8524f..7fc343541 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -27,7 +27,7 @@ export default function RolesFilter({ async function fetchRoles() { const allRoles = await getSkills(); - const dropdownRoles: DropdownRole[] = allRoles!.skills!.map(role => ({ + const dropdownRoles = allRoles!.skills.map(role => ({ label: role.name, value: role.skillId, })); diff --git a/frontend/src/utils/api/skills.ts b/frontend/src/utils/api/skills.ts index c2bc1dd63..df5cc2c3e 100644 --- a/frontend/src/utils/api/skills.ts +++ b/frontend/src/utils/api/skills.ts @@ -9,7 +9,7 @@ import { CreateSkill, Skill, Skills } from "../../data/interfaces/skills"; export async function getSkills(): Promise { try { const response = await axiosInstance.get("skills"); - const skills = response.data.skills as Skills; + const skills = response.data as Skills; return skills; } catch (error) { if (axios.isAxiosError(error)) { From b948815b17ec7bc61326f67d0ed0e19e8a4f9b1a Mon Sep 17 00:00:00 2001 From: cledloof Date: Fri, 13 May 2022 13:48:43 +0200 Subject: [PATCH 215/649] visible roles --- .../StudentListFilters/RolesFilter/RolesFilter.css | 4 ++++ .../StudentListFilters/RolesFilter/RolesFilter.tsx | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.css diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.css b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.css new file mode 100644 index 000000000..2a432d4ad --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.css @@ -0,0 +1,4 @@ +.RolesFilterDropdown { + color: black; + accent-color: green; +} diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index 7fc343541..f17d70ea6 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -7,6 +7,7 @@ import { } from "../styles"; import Select from "react-select"; import { getSkills } from "../../../../utils/api/skills"; +import "./RolesFilter.css"; interface DropdownRole { label: string; @@ -53,6 +54,7 @@ export default function RolesFilter({ setName(e.target.value)} placeholder="Project name" /> + setName(e.target.value)} + placeholder="Ex. UGent project" + /> ); } diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx index baec79905..c6b14b0ce 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Partner/Partner.tsx @@ -22,7 +22,7 @@ export default function Partner({ if (e.key === "Enter") addPartner(); }} list="partners" - placeholder="Partner" + placeholder="Ex. Open Knowledge Belgium" /> diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx index 371603e9a..cae63bfc8 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx @@ -32,7 +32,7 @@ export default function SkillInput({ onKeyDown={e => { if (e.key === "Enter") addSkill(); }} - placeholder="Skill" + placeholder="Ex. Front-end Developer" list="skills" /> diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index 319dfd25a..c4ba2f9f0 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -91,12 +91,23 @@ export default function CreateProjectPage() { async function makeProject() { if (name === "") { - toast.warning("Project name must be filled in", { + toast.error("Project name must be filled in", { toastId: "createProjectNoName", }); return; } + let badSkill = false; + projectSkills.forEach(projectSkill => { + if (isNaN(projectSkill.slots)) { + badSkill = true; + toast.error(projectSkill.skill.name + " is missing the amount of students", { + toastId: "invalidSkill" + projectSkill.skill.name, + }); + } + }); + if (badSkill) return; + const coachIds: number[] = []; coaches.forEach(coachToAdd => { coachIds.push(coachToAdd.userId); From 339a7cef21992e8da03e01bb7b75f348bd2c1e8b Mon Sep 17 00:00:00 2001 From: Francis Date: Tue, 17 May 2022 14:44:55 +0200 Subject: [PATCH 328/649] use path_ids --- backend/src/app/utils/websockets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/utils/websockets.py b/backend/src/app/utils/websockets.py index bb7911a7a..28900ddfb 100644 --- a/backend/src/app/utils/websockets.py +++ b/backend/src/app/utils/websockets.py @@ -120,7 +120,7 @@ async def live_middleware(request: Request, call_next) -> Response: del path_ids['edition_name'] live_event: LiveEventParameters = LiveEventParameters( request.method, - request.path_params + path_ids ) await publisher.broadcast(live_event) From e4a5cb3904a355593d8f6829e7dcdcd7ae806ad3 Mon Sep 17 00:00:00 2001 From: Francis Date: Tue, 17 May 2022 14:51:33 +0200 Subject: [PATCH 329/649] fix print & comments --- backend/src/app/routers/editions/projects/projects.py | 2 -- .../routers/editions/projects/students/projects_students.py | 3 --- backend/src/database/crud/projects.py | 1 - backend/src/database/crud/projects_students.py | 1 - 4 files changed, 7 deletions(-) diff --git a/backend/src/app/routers/editions/projects/projects.py b/backend/src/app/routers/editions/projects/projects.py index 5df7eefc5..2436e8b31 100644 --- a/backend/src/app/routers/editions/projects/projects.py +++ b/backend/src/app/routers/editions/projects/projects.py @@ -57,7 +57,6 @@ async def get_conflicts(db: AsyncSession = Depends(get_session), edition: Editio @projects_router.delete( "/{project_id}", status_code=status.HTTP_204_NO_CONTENT, - # response_class=Response, dependencies=[Depends(require_admin), Depends(live)] ) async def delete_project(project: ProjectModel = Depends(get_project), db: AsyncSession = Depends(get_session)): @@ -79,7 +78,6 @@ async def get_project_route(project: ProjectModel = Depends(get_project)): @projects_router.patch( "/{project_id}", status_code=status.HTTP_204_NO_CONTENT, - # response_class=Response, dependencies=[Depends(require_admin), Depends(get_latest_edition), Depends(live)] ) async def patch_project( diff --git a/backend/src/app/routers/editions/projects/students/projects_students.py b/backend/src/app/routers/editions/projects/students/projects_students.py index db574face..5025ab4f0 100644 --- a/backend/src/app/routers/editions/projects/students/projects_students.py +++ b/backend/src/app/routers/editions/projects/students/projects_students.py @@ -19,7 +19,6 @@ @project_students_router.delete( "/{student_id}", status_code=status.HTTP_204_NO_CONTENT, - # response_class=Response, dependencies=[Depends(require_coach), Depends(get_latest_edition), Depends(live)] ) async def remove_student_from_project( @@ -35,7 +34,6 @@ async def remove_student_from_project( @project_students_router.patch( "/{student_id}", status_code=status.HTTP_204_NO_CONTENT, - # response_class=Response, dependencies=[Depends(get_latest_edition), Depends(live)] ) async def change_project_role( @@ -53,7 +51,6 @@ async def change_project_role( @project_students_router.post( "/{student_id}", status_code=status.HTTP_201_CREATED, - # response_class=Response, dependencies=[Depends(get_latest_edition), Depends(live)] ) async def add_student_to_project( diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index 9be2adb8f..41a37e869 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -66,7 +66,6 @@ async def get_project(db: AsyncSession, project_id: int) -> Project: result = await db.execute(query) project = result.unique().scalars().one() # refresh to see updated relations - # await db.refresh(project) return project diff --git a/backend/src/database/crud/projects_students.py b/backend/src/database/crud/projects_students.py index f2720515b..04259eb54 100644 --- a/backend/src/database/crud/projects_students.py +++ b/backend/src/database/crud/projects_students.py @@ -67,7 +67,6 @@ async def remove_project_role_suggestion(db: AsyncSession, project_role: Project ProjectRoleSuggestion.student == student and ProjectRoleSuggestion.project_role == project_role ))).scalar_one() - print(project_role_suggestion) await db.delete(project_role_suggestion) await db.commit() await db.refresh(project_role) From 28512255a6e007be2f83b427a0a294c6b47b62b2 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Tue, 17 May 2022 15:16:33 +0200 Subject: [PATCH 330/649] deleted commented code --- backend/src/app/utils/dependencies.py | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/app/utils/dependencies.py b/backend/src/app/utils/dependencies.py index 38ec5169e..a0cdaf476 100644 --- a/backend/src/app/utils/dependencies.py +++ b/backend/src/app/utils/dependencies.py @@ -36,7 +36,6 @@ async def get_edition(edition_name: str, database: AsyncSession = Depends(get_se async def get_student(student_id: int, database: AsyncSession = Depends(get_session), edition: Edition = Depends(get_edition)) -> Student: """Get the student from the database, given the id in the path""" - # return await get_student_by_id(database, student_id) student: Student = await get_student_by_id(database, student_id) if student.edition != edition: raise NoResultFound From c28950c852e9f7ff3c60b49899569e2d539e6811 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Tue, 17 May 2022 15:40:05 +0200 Subject: [PATCH 331/649] Toasts instead of error-texts --- .../components/AdminsComponents/AddAdmin.tsx | 21 +++++++++--------- .../AdminsComponents/RemoveAdmin.tsx | 19 ++++++---------- .../src/components/Common/Users/styles.ts | 6 ----- .../ProjectsComponents/ProjectTable.tsx | 10 +-------- .../UsersComponents/Coaches/Coaches.tsx | 8 ++----- .../Coaches/CoachesComponents/AddCoach.tsx | 21 +++++++++--------- .../Coaches/CoachesComponents/RemoveCoach.tsx | 17 +++++++------- .../UsersComponents/InviteUser/InviteUser.tsx | 18 +++++++-------- .../UsersComponents/Requests/Requests.tsx | 15 ++++++------- .../RequestsComponents/AcceptReject.tsx | 22 +++++++++++-------- frontend/src/views/AdminsPage/AdminsPage.tsx | 19 ++++++++-------- .../MailOverviewPage/MailOverviewPage.tsx | 21 ++++++++---------- frontend/src/views/UsersPage/UsersPage.tsx | 17 +++++++------- .../ProjectsPage/ProjectsPage.tsx | 13 ++++++----- 14 files changed, 104 insertions(+), 123 deletions(-) diff --git a/frontend/src/components/AdminsComponents/AddAdmin.tsx b/frontend/src/components/AdminsComponents/AddAdmin.tsx index c371e71b5..b6a443b9a 100644 --- a/frontend/src/components/AdminsComponents/AddAdmin.tsx +++ b/frontend/src/components/AdminsComponents/AddAdmin.tsx @@ -4,12 +4,13 @@ import { addAdmin } from "../../utils/api/users/admins"; import { AddButtonDiv, EmailDiv, Warning } from "./styles"; import { Button, Modal, Spinner } from "react-bootstrap"; import { AsyncTypeahead, Menu } from "react-bootstrap-typeahead"; -import { Error, StyledMenuItem } from "../Common/Users/styles"; +import { StyledMenuItem } from "../Common/Users/styles"; import UserMenuItem from "../Common/Users/MenuItem"; import { EmailAndAuth } from "../Common/Users"; import CreateButton from "../Common/Buttons/CreateButton"; import { ModalContentConfirm } from "../Common/styles"; import Typeahead from "react-bootstrap-typeahead/types/core/Typeahead"; +import { toast } from "react-toastify"; /** * Button and popup to add an existing user as admin. @@ -19,7 +20,6 @@ import Typeahead from "react-bootstrap-typeahead/types/core/Typeahead"; export default function AddAdmin(props: { adminAdded: (user: User) => void }) { const [show, setShow] = useState(false); const [selected, setSelected] = useState(undefined); - const [error, setError] = useState(""); const [loading, setLoading] = useState(false); const [gettingData, setGettingData] = useState(false); // Waiting for data const [users, setUsers] = useState([]); // All users which are not a coach @@ -42,7 +42,6 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { filter = searchTerm; } setGettingData(true); - setError(""); try { const response = await getUsersNonAdmin(filter, page); if (page === 0) { @@ -53,7 +52,9 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { setGettingData(false); } catch (exception) { - setError("Oops, something went wrong..."); + toast.error("Failed to receive users", { + toastId: "add_admins_failed", + }); setGettingData(false); } } @@ -66,7 +67,6 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { const handleClose = () => { setSelected(undefined); - setError(""); setShow(false); }; const handleShow = () => { @@ -75,15 +75,18 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { async function addUserAsAdmin(user: User) { setLoading(true); - setError(""); let success = false; try { success = await addAdmin(user.userId); if (!success) { - setError("Something went wrong. Failed to add admin"); + toast.error("Failed to add admin", { + toastId: "add_admins_failed", + }); } } catch (error) { - setError("Something went wrong. Failed to add admin"); + toast.error("Failed to add admin", { + toastId: "add_admins_failed", + }); } setLoading(false); if (success) { @@ -149,7 +152,6 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { placeholder={"user's name"} onChange={selected => { setSelected(selected[0] as User); - setError(""); }} renderMenu={(results, menuProps) => { const { @@ -187,7 +189,6 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { - {error} diff --git a/frontend/src/components/AdminsComponents/RemoveAdmin.tsx b/frontend/src/components/AdminsComponents/RemoveAdmin.tsx index 0f45d8cfa..ff65baf93 100644 --- a/frontend/src/components/AdminsComponents/RemoveAdmin.tsx +++ b/frontend/src/components/AdminsComponents/RemoveAdmin.tsx @@ -3,8 +3,8 @@ import React, { useState } from "react"; import { removeAdmin, removeAdminAndCoach } from "../../utils/api/users/admins"; import { Button, Modal } from "react-bootstrap"; import { RemoveAdminBody } from "./styles"; -import { Error } from "../Common/Users/styles"; import { ModalContentWarning } from "../Common/styles"; +import { toast } from "react-toastify"; /** * Button and popup to remove a user as admin (and as coach). @@ -13,12 +13,10 @@ import { ModalContentWarning } from "../Common/styles"; */ export default function RemoveAdmin(props: { admin: User; removeAdmin: (user: User) => void }) { const [show, setShow] = useState(false); - const [error, setError] = useState(""); const handleClose = () => setShow(false); const handleShow = () => { setShow(true); - setError(""); }; async function removeUserAsAdmin(removeCoach: boolean) { @@ -33,10 +31,14 @@ export default function RemoveAdmin(props: { admin: User; removeAdmin: (user: Us if (removed) { props.removeAdmin(props.admin); } else { - setError("Something went wrong. Failed to remove admin"); + toast.error("Failed to remove admin", { + toastId: "remove_admin_failed", + }); } } catch (error) { - setError("Something went wrong. Failed to remove admin"); + toast.error("Failed to remove admin", { + toastId: "remove_admin_failed", + }); } } @@ -63,9 +65,6 @@ export default function RemoveAdmin(props: { admin: User; removeAdmin: (user: Us variant="primary" onClick={() => { removeUserAsAdmin(false); - if (!error) { - handleClose(); - } }} > Remove admin @@ -74,9 +73,6 @@ export default function RemoveAdmin(props: { admin: User; removeAdmin: (user: Us variant="primary" onClick={() => { removeUserAsAdmin(true); - if (!error) { - handleClose(); - } }} > Remove as admin and coach @@ -84,7 +80,6 @@ export default function RemoveAdmin(props: { admin: User; removeAdmin: (user: Us - {error} diff --git a/frontend/src/components/Common/Users/styles.ts b/frontend/src/components/Common/Users/styles.ts index 1613ecadc..fcfb5ed99 100644 --- a/frontend/src/components/Common/Users/styles.ts +++ b/frontend/src/components/Common/Users/styles.ts @@ -42,12 +42,6 @@ export const ListDiv = styled.div` margin-top: 10px; `; -export const Error = styled.div` - color: var(--osoc_red); - width: 100%; - margin: auto; -`; - export const SearchFieldDiv = styled.div` float: left; width: 15em; diff --git a/frontend/src/components/ProjectsComponents/ProjectTable.tsx b/frontend/src/components/ProjectsComponents/ProjectTable.tsx index cfae1d8be..0d6463fdd 100644 --- a/frontend/src/components/ProjectsComponents/ProjectTable.tsx +++ b/frontend/src/components/ProjectsComponents/ProjectTable.tsx @@ -5,7 +5,6 @@ import { Project } from "../../data/interfaces"; import React from "react"; import { MessageDiv } from "./styles"; import LoadSpinner from "../Common/LoadSpinner"; -import { Error } from "../Common/Users/styles"; /** * A table of [[ProjectCard]]s. @@ -23,15 +22,8 @@ export default function ProjectTable(props: { getMoreProjects: () => void; moreProjectsAvailable: boolean; removeProject: (project: Project) => void; - error: string | undefined; }) { - if (props.error) { - return ( - - {props.error} - - ); - } else if (props.gotData && props.projects.length === 0) { + if (props.gotData && props.projects.length === 0) { return (
    No projects found.
    diff --git a/frontend/src/components/UsersComponents/Coaches/Coaches.tsx b/frontend/src/components/UsersComponents/Coaches/Coaches.tsx index b3fe356c2..13b45ae44 100644 --- a/frontend/src/components/UsersComponents/Coaches/Coaches.tsx +++ b/frontend/src/components/UsersComponents/Coaches/Coaches.tsx @@ -3,7 +3,7 @@ import { CoachesTitle, CoachesContainer } from "./styles"; import { User } from "../../../utils/api/users/users"; import { CoachList, AddCoach } from "./CoachesComponents"; import { SearchBar } from "../../Common/Forms"; -import { Error, SearchFieldDiv, TableDiv } from "../../Common/Users/styles"; +import { SearchFieldDiv, TableDiv } from "../../Common/Users/styles"; /** * List of coaches of the given edition. @@ -13,7 +13,6 @@ import { Error, SearchFieldDiv, TableDiv } from "../../Common/Users/styles"; * @param props.getMoreCoaches A function to load more coaches. * @param props.searchCoaches A function to set the filter for coaches' username. * @param props.gotData All data is received. - * @param props.error An error message. * @param props.moreCoachesAvailable More unfetched coaches available. * @param props.searchTerm Current filter for coaches' names. * @param props.refreshCoaches A function which will be called when a coach is added. @@ -25,16 +24,13 @@ export default function Coaches(props: { getMoreCoaches: () => void; searchCoaches: (word: string) => void; gotData: boolean; - error: string; moreCoachesAvailable: boolean; searchTerm: string; refreshCoaches: () => void; removeCoach: (user: User) => void; }) { let table; - if (props.error) { - table = {props.error} ; - } else if (props.gotData && props.coaches.length === 0) { + if (props.gotData && props.coaches.length === 0) { table =
    No coaches found
    ; } else { table = ( diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx index b238f03fb..df0975990 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx @@ -6,11 +6,12 @@ import { AddButtonDiv } from "../../../AdminsComponents/styles"; import { AsyncTypeahead, Menu } from "react-bootstrap-typeahead"; import Typeahead from "react-bootstrap-typeahead/types/core/Typeahead"; import UserMenuItem from "../../../Common/Users/MenuItem"; -import { Error, StyledMenuItem } from "../../../Common/Users/styles"; +import { StyledMenuItem } from "../../../Common/Users/styles"; import { EmailAndAuth } from "../../../Common/Users"; import { EmailDiv } from "../styles"; import CreateButton from "../../../Common/Buttons/CreateButton"; import { ModalContentConfirm } from "../../../Common/styles"; +import { toast } from "react-toastify"; /** * A button and popup to add a new coach to the given edition. @@ -22,7 +23,6 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => const [show, setShow] = useState(false); const [selected, setSelected] = useState(undefined); const [loading, setLoading] = useState(false); - const [error, setError] = useState(""); const [gettingData, setGettingData] = useState(false); // Waiting for data const [users, setUsers] = useState([]); // All users which are not a coach const [searchTerm, setSearchTerm] = useState(""); // The word set in filter @@ -44,7 +44,6 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => filter = searchTerm; } setGettingData(true); - setError(""); try { const response = await getUsersExcludeEdition(props.edition, filter, page); if (page === 0) { @@ -55,7 +54,9 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => setGettingData(false); } catch (exception) { - setError("Oops, something went wrong..."); + toast.error("Failed to receive users", { + toastId: "fetch_users_failed", + }); setGettingData(false); } } @@ -68,7 +69,6 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => const handleClose = () => { setSelected(undefined); - setError(""); setShow(false); }; const handleShow = () => { @@ -77,15 +77,18 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => async function addCoach(user: User) { setLoading(true); - setError(""); let success = false; try { success = await addCoachToEdition(user.userId, props.edition); if (!success) { - setError("Something went wrong. Failed to add coach"); + toast.error("Failed to add coach", { + toastId: "add_coach_failed", + }); } } catch (error) { - setError("Something went wrong. Failed to add coach"); + toast.error("Failed to add coach", { + toastId: "add_coach_failed", + }); } setLoading(false); if (success) { @@ -142,7 +145,6 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => placeholder={"user's name"} onChange={selected => { setSelected(selected[0] as User); - setError(""); }} renderMenu={(results, menuProps) => { const { @@ -179,7 +181,6 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => - {error} diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx index 5ddfc9c22..dd7ea8448 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx @@ -14,7 +14,7 @@ import { } from "../styles"; import LoadSpinner from "../../../Common/LoadSpinner"; import DeleteButton from "../../../Common/Buttons/DeleteButton"; -import { Error } from "../../../Common/Users/styles"; +import { toast } from "react-toastify"; /** * A button (part of [[CoachListItem]]) and popup to remove a user as coach from the given edition or all editions. @@ -29,14 +29,12 @@ export default function RemoveCoach(props: { removeCoach: () => void; }) { const [show, setShow] = useState(false); - const [error, setError] = useState(""); const [loading, setLoading] = useState(false); const handleClose = () => setShow(false); const handleShow = () => { setShow(true); - setError(""); }; /** @@ -57,11 +55,15 @@ export default function RemoveCoach(props: { if (removed) { props.removeCoach(); } else { - setError("Something went wrong. Failed to remove coach"); + toast.error("Failed to remove coach", { + toastId: "remove_coach_failed", + }); setLoading(false); } } catch (error) { - setError("Something went wrong. Failed to remove coach"); + toast.error("Failed to remove coach", { + toastId: "remove_coach_failed", + }); setLoading(false); } } @@ -116,10 +118,7 @@ export default function RemoveCoach(props: { {props.coach.auth.email}     - - {buttons} - {error} - + {buttons} diff --git a/frontend/src/components/UsersComponents/InviteUser/InviteUser.tsx b/frontend/src/components/UsersComponents/InviteUser/InviteUser.tsx index 6aa5024af..1803d2570 100644 --- a/frontend/src/components/UsersComponents/InviteUser/InviteUser.tsx +++ b/frontend/src/components/UsersComponents/InviteUser/InviteUser.tsx @@ -1,8 +1,9 @@ import React, { useState } from "react"; import { getInviteLink } from "../../../utils/api/users/users"; -import { InviteContainer, Error, MessageDiv, InputContainer } from "./styles"; +import { InviteContainer, MessageDiv, InputContainer } from "./styles"; import { ButtonsDiv } from "./InviteUserComponents"; import { SearchBar } from "../../Common/Forms"; +import { toast } from "react-toastify"; /** * A component to invite a user as coach to a given edition. @@ -14,7 +15,6 @@ import { SearchBar } from "../../Common/Forms"; export default function InviteUser(props: { edition: string }) { const [email, setEmail] = useState(""); // The email address which is entered const [valid, setValid] = useState(true); // The given email address is valid (or still being typed) - const [errorMessage, setErrorMessage] = useState(""); // An error message const [loading, setLoading] = useState(false); // The invite link is being created const [message, setMessage] = useState(""); // A message to confirm link created @@ -26,7 +26,6 @@ export default function InviteUser(props: { edition: string }) { const changeEmail = function (email: string) { setEmail(email); setValid(true); - setErrorMessage(""); setMessage(""); }; @@ -53,12 +52,16 @@ export default function InviteUser(props: { edition: string }) { setEmail(""); } catch (error) { setLoading(false); - setErrorMessage("Something went wrong"); + toast.error("Failed to create invite", { + toastId: "send_invite_failed", + }); setMessage(""); } } else { setValid(false); - setErrorMessage("Invalid email"); + toast.error("Invalid email address", { + toastId: "invalid_email", + }); setMessage(""); } }; @@ -76,10 +79,7 @@ export default function InviteUser(props: { edition: string }) { - - {message} - {errorMessage} - + {message}
    ); } diff --git a/frontend/src/components/UsersComponents/Requests/Requests.tsx b/frontend/src/components/UsersComponents/Requests/Requests.tsx index e3e9c8089..ff5f0b88e 100644 --- a/frontend/src/components/UsersComponents/Requests/Requests.tsx +++ b/frontend/src/components/UsersComponents/Requests/Requests.tsx @@ -4,7 +4,8 @@ import { RequestsContainer, RequestListContainer } from "./styles"; import { getRequests, Request } from "../../../utils/api/users/requests"; import { RequestList, RequestsHeader } from "./RequestsComponents"; import SearchBar from "../../Common/Forms/SearchBar"; -import { Error, SearchFieldDiv } from "../../Common/Users/styles"; +import { SearchFieldDiv } from "../../Common/Users/styles"; +import { toast } from "react-toastify"; /** * A collapsible component which contains all coach requests for a given edition. @@ -19,7 +20,6 @@ export default function Requests(props: { edition: string; refreshCoaches: () => const [searchTerm, setSearchTerm] = useState(""); // The word set in the filter const [gotData, setGotData] = useState(false); // Received data const [open, setOpen] = useState(false); // Collapsible is open - const [error, setError] = useState(""); // Error message const [moreRequestsAvailable, setMoreRequestsAvailable] = useState(true); // Endpoint has more requests available const [allRequestsFetched, setAllRequestsFetched] = useState(false); const [page, setPage] = useState(0); // The next page which needs to be fetched @@ -67,7 +67,6 @@ export default function Requests(props: { edition: string; refreshCoaches: () => } setLoading(true); - setError(""); try { const response = await getRequests(props.edition, searchTerm, page); if (response.requests.length === 0) { @@ -91,10 +90,12 @@ export default function Requests(props: { edition: string; refreshCoaches: () => } setPage(page + 1); - setGotData(true); } catch (exception) { - setError("Oops, something went wrong..."); + toast.error("Failed to receive requests", { + toastId: "fetch_requests_failed", + }); } + setGotData(true); setLoading(false); } @@ -107,9 +108,7 @@ export default function Requests(props: { edition: string; refreshCoaches: () => } let list; - if (error) { - list = {error}; - } else if (gotData && requests.length === 0) { + if (gotData && requests.length === 0) { list =
    No requests found
    ; } else { list = ( diff --git a/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx b/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx index 8bbd93101..639fa1ef1 100644 --- a/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx +++ b/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx @@ -4,6 +4,7 @@ import LoadSpinner from "../../../Common/LoadSpinner"; import CreateButton from "../../../Common/Buttons/CreateButton"; import DeleteButton from "../../../Common/Buttons/DeleteButton"; import { Spacing } from "../styles"; +import { toast } from "react-toastify"; /** * Component consisting of two buttons to accept or reject a coach request. @@ -15,7 +16,6 @@ export default function AcceptReject(props: { removeRequest: (coachAdded: boolean, request: Request) => void; }) { const [loading, setLoading] = useState(false); - const [error, setError] = useState(""); async function accept() { setLoading(true); @@ -23,10 +23,14 @@ export default function AcceptReject(props: { try { success = await acceptRequest(props.request.requestId); if (!success) { - setError("Failed to accept"); + toast.error("Failed to accept request", { + toastId: "accept_request_failed", + }); } } catch (exception) { - setError("Failed to accept"); + toast.error("Failed to accept request", { + toastId: "accept_request_failed", + }); } setLoading(false); if (success) { @@ -40,10 +44,14 @@ export default function AcceptReject(props: { try { success = await rejectRequest(props.request.requestId); if (!success) { - setError("Failed to reject"); + toast.error("Failed to reject request", { + toastId: "reject_request_failed", + }); } } catch (exception) { - setError("Failed to reject"); + toast.error("Failed to reject request", { + toastId: "reject_request_failed", + }); } setLoading(false); if (success) { @@ -51,10 +59,6 @@ export default function AcceptReject(props: { } } - if (error) { - return
    {error}
    ; - } - if (loading) { return ; } diff --git a/frontend/src/views/AdminsPage/AdminsPage.tsx b/frontend/src/views/AdminsPage/AdminsPage.tsx index da9513584..69fceed66 100644 --- a/frontend/src/views/AdminsPage/AdminsPage.tsx +++ b/frontend/src/views/AdminsPage/AdminsPage.tsx @@ -4,8 +4,9 @@ import { getAdmins } from "../../utils/api/users/admins"; import { AddAdmin, AdminList } from "../../components/AdminsComponents"; import { User } from "../../utils/api/users/users"; import { SearchBar } from "../../components/Common/Forms"; -import { Error, SearchFieldDiv, TableDiv } from "../../components/Common/Users/styles"; +import { SearchFieldDiv, TableDiv } from "../../components/Common/Users/styles"; import LoadSpinner from "../../components/Common/LoadSpinner"; +import { toast } from "react-toastify"; export default function AdminsPage() { const [allAdmins, setAllAdmins] = useState([]); @@ -13,10 +14,8 @@ export default function AdminsPage() { const [loading, setLoading] = useState(false); const [searchTerm, setSearchTerm] = useState(""); const [gotData, setGotData] = useState(false); - const [error, setError] = useState(""); const getData = useCallback(async () => { - setError(""); try { let adminsAvailable = true; let page = 0; @@ -31,21 +30,23 @@ export default function AdminsPage() { adminsAvailable = response.users.length !== 0; page += 1; } - setGotData(true); setAdmins(newAdmins); setAllAdmins(newAdmins); } catch (exception) { - setError("Oops, something went wrong..."); + toast.error("Failed to receive admins", { + toastId: "fetch_admins_failed", + }); } + setGotData(true); setLoading(false); }, [searchTerm]); useEffect(() => { - if (!gotData && !loading && !error) { + if (!gotData && !loading) { setLoading(true); getData(); } - }, [gotData, loading, error, getData]); + }, [gotData, loading, getData]); function addAdmin(user: User) { setAllAdmins(allAdmins.concat([user])); @@ -74,10 +75,8 @@ export default function AdminsPage() { if (admins.length === 0) { if (loading) { list = ; - } else if (gotData) { - list =
    No admins found
    ; } else { - list = {error}; + list =
    No admins found
    ; } } else { list = ( diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index 346bf4538..2c41a2d18 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -21,7 +21,7 @@ import { EmailType } from "../../data/enums"; import { useParams } from "react-router-dom"; import { Student } from "../../data/interfaces"; import LoadSpinner from "../../components/Common/LoadSpinner"; -import { Error } from "../../components/Common/Users/styles"; +import { toast } from "react-toastify"; interface EmailRow { email: StudentEmail; @@ -36,7 +36,6 @@ export default function MailOverviewPage() { const [gotEmails, setGotEmails] = useState(false); const [loading, setLoading] = useState(false); const [moreEmailsAvailable, setMoreEmailsAvailable] = useState(true); // Endpoint has more emailRows available - const [error, setError] = useState(undefined); const [page, setPage] = useState(0); const [allSelected, setAllSelected] = useState(false); @@ -83,10 +82,12 @@ export default function MailOverviewPage() { ); } setPage(page + 1); - setGotEmails(true); } catch (exception) { - setError("Oops, something went wrong..."); + toast.error("Failed to receive states", { + toastId: "fetch_emails_failed", + }); } + setGotEmails(true); setLoading(false); } @@ -150,18 +151,14 @@ export default function MailOverviewPage() { alert("Successful changed"); refresh(); } catch { - alert("Failed to change state"); + toast.error("Failed to change state", { + toastId: "change_emails_failed", + }); } } let table; - if (error) { - table = ( - - {error} - - ); - } else if (gotEmails && emailRows.length === 0) { + if (gotEmails && emailRows.length === 0) { table = ( No students found. diff --git a/frontend/src/views/UsersPage/UsersPage.tsx b/frontend/src/views/UsersPage/UsersPage.tsx index afa74330c..aafa6ad68 100644 --- a/frontend/src/views/UsersPage/UsersPage.tsx +++ b/frontend/src/views/UsersPage/UsersPage.tsx @@ -1,10 +1,11 @@ import React, { useState } from "react"; -import { useParams } from "react-router-dom"; +import { useNavigate, useParams } from "react-router-dom"; import { Coaches } from "../../components/UsersComponents/Coaches"; import { InviteUser } from "../../components/UsersComponents/InviteUser"; import { PendingRequests } from "../../components/UsersComponents/Requests"; import { User } from "../../utils/api/users/users"; import { getCoaches } from "../../utils/api/users/coaches"; +import { toast } from "react-toastify"; /** * Page for admins to manage coach and admin settings. @@ -15,13 +16,13 @@ function UsersPage() { const [coaches, setCoaches] = useState([]); // All coaches from the selected edition const [loading, setLoading] = useState(false); // Waiting for data (used for spinner) const [gotData, setGotData] = useState(false); // Received data - const [error, setError] = useState(""); // Error message const [moreCoachesAvailable, setMoreCoachesAvailable] = useState(true); // Endpoint has more coaches available const [allCoachesFetched, setAllCoachesFetched] = useState(false); const [searchTerm, setSearchTerm] = useState(""); // The word set in filter for coachlist const [page, setPage] = useState(0); // The next page to request const params = useParams(); + const navigate = useNavigate(); /** * Request the next page from the list of coaches. @@ -43,7 +44,6 @@ function UsersPage() { } setLoading(true); - setError(""); try { const response = await getCoaches(params.editionId as string, searchTerm, page); if (response.users.length === 0) { @@ -67,10 +67,12 @@ function UsersPage() { } setPage(page + 1); - setGotData(true); } catch (exception) { - setError("Oops, something went wrong..."); + toast.error("Failed to receive coaches", { + toastId: "fetch_coaches_failed", + }); } + setGotData(true); setLoading(false); } @@ -112,8 +114,8 @@ function UsersPage() { } if (params.editionId === undefined) { - // If this happens, User should be redirected to error page - return
    Error
    ; + navigate("/404-not-found"); + return null; } else { return (
    @@ -123,7 +125,6 @@ function UsersPage() { edition={params.editionId} coaches={coaches} gotData={gotData} - error={error} getMoreCoaches={getCoachesData} searchCoaches={filterCoachesData} moreCoachesAvailable={moreCoachesAvailable} diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index d644eda40..86edd4aa1 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -8,6 +8,7 @@ import { useAuth } from "../../../contexts"; import { Role } from "../../../data/enums"; import ConflictsButton from "../../../components/ProjectsComponents/Conflicts/ConflictsButton"; +import { toast } from "react-toastify"; /** * @returns The projects overview page where you can see all the projects. * You can filter on your own projects or filter on project name. @@ -19,7 +20,6 @@ export default function ProjectPage() { const [loading, setLoading] = useState(false); const [moreProjectsAvailable, setMoreProjectsAvailable] = useState(true); // Endpoint has more coaches available const [allProjectsFetched, setAllProjectsFetched] = useState(false); - const [error, setError] = useState(undefined); // Keep track of the set filters const [searchString, setSearchString] = useState(""); @@ -76,13 +76,17 @@ export default function ProjectPage() { } setPage(page + 1); - setGotProjects(true); } else { - setError("Oops, something went wrong..."); + toast.error("Failed to receive projects", { + toastId: "fetch_projects_failed", + }); } } catch (exception) { - setError("Oops, something went wrong..."); + toast.error("Failed to receive projects", { + toastId: "fetch_projects_failed", + }); } + setGotProjects(true); setLoading(false); } @@ -158,7 +162,6 @@ export default function ProjectPage() { getMoreProjects={loadProjects} moreProjectsAvailable={moreProjectsAvailable} removeProject={removeProject} - error={error} />
    ); From a5693b7b8e4d0d832323b889af27037f1fb4c946 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Tue, 17 May 2022 15:57:45 +0200 Subject: [PATCH 332/649] just need to add the test --- backend/src/app/logic/projects.py | 5 +++++ .../src/app/routers/editions/projects/projects.py | 12 ++++++++++++ backend/src/database/crud/projects.py | 10 +++++++++- .../test_database/test_crud/test_projects.py | 15 +++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/backend/src/app/logic/projects.py b/backend/src/app/logic/projects.py index 6cdc79535..603c6fb20 100644 --- a/backend/src/app/logic/projects.py +++ b/backend/src/app/logic/projects.py @@ -79,3 +79,8 @@ async def patch_project_role(db: AsyncSession, project_role_id: int, input_proje async def get_conflicts(db: AsyncSession, edition: Edition) -> ConflictStudentList: """Returns a list of all students together with the projects they are causing a conflict for""" return ConflictStudentList(conflict_students=(await crud.get_conflict_students(db, edition))) + + +async def delete_project_role(db: AsyncSession, project_role_id: int) -> None: + """delete a project role""" + await crud.delete_project_role(db, project_role_id) diff --git a/backend/src/app/routers/editions/projects/projects.py b/backend/src/app/routers/editions/projects/projects.py index 2436e8b31..fb80a61ab 100644 --- a/backend/src/app/routers/editions/projects/projects.py +++ b/backend/src/app/routers/editions/projects/projects.py @@ -124,3 +124,15 @@ async def patch_project_role( db: AsyncSession = Depends(get_session)): """Create a new project role""" return await logic.patch_project_role(db, project_role_id, input_project_role) + + +@projects_router.delete( + "/{project_id}/roles/{project_role_id}", + status_code=status.HTTP_204_NO_CONTENT, + dependencies=[Depends(require_admin), Depends(get_project), Depends(live)] +) +async def delete_project_role( + project_role_id: int, + db: AsyncSession = Depends(get_session)): + """Delete a project role""" + return await logic.delete_project_role(db, project_role_id) diff --git a/backend/src/database/crud/projects.py b/backend/src/database/crud/projects.py index 41a37e869..003703664 100644 --- a/backend/src/database/crud/projects.py +++ b/backend/src/database/crud/projects.py @@ -28,7 +28,8 @@ async def get_projects_for_edition_page( query = _get_projects_for_edition_query(edition).where( Project.name.contains(search_params.name)) if search_params.coach: - query = query.where(Project.project_id.in_([user_project.project_id for user_project in user.projects])) + query = query.where(Project.project_id.in_( + [user_project.project_id for user_project in user.projects])) result = await db.execute(paginate(query.order_by(Project.name), search_params.page)) return result.unique().scalars().all() @@ -148,3 +149,10 @@ async def get_conflict_students(db: AsyncSession, edition: Edition) -> list[Stud s for s in (await db.execute(select(Student).where(Student.edition == edition))).unique().scalars().all() if len(s.pr_suggestions) > 1 ] + + +async def delete_project_role(db: AsyncSession, project_role_id: int) -> None: + """delete a project role""" + project_role: ProjectRole = await get_project_role(db, project_role_id) + await db.delete(project_role) + await db.commit() diff --git a/backend/tests/test_database/test_crud/test_projects.py b/backend/tests/test_database/test_crud/test_projects.py index 369d12094..d3742fd2b 100644 --- a/backend/tests/test_database/test_crud/test_projects.py +++ b/backend/tests/test_database/test_crud/test_projects.py @@ -196,6 +196,21 @@ async def test_delete_project_with_project_roles(database_session: AsyncSession) assert len((await database_session.execute(select(ProjectRole))).unique().scalars().all()) == 0 +async def test_delete_project_role(database_session: AsyncSession): + """test delete a project role""" + edition: Edition = Edition(year=2022, name="ed2022") + project: Project = Project( + name="project 1", + edition=edition, + project_roles=[ProjectRole(slots=1, skill=Skill(name="skill"))] + ) + database_session.add(project) + await database_session.commit() + assert len((await database_session.execute(select(ProjectRole))).unique().scalars().all()) == 1 + await crud.delete_project_role(database_session, 1) + assert len((await database_session.execute(select(ProjectRole))).unique().scalars().all()) == 0 + + async def test_patch_project(database_session: AsyncSession): """tests patch a project""" edition: Edition = Edition(year=2022, name="ed2022") From 96a0be2255756bdedfeb16c0d0542ca7ce92cdd3 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Tue, 17 May 2022 16:59:47 +0200 Subject: [PATCH 333/649] added test --- .../test_projects/test_projects.py | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/backend/tests/test_routers/test_editions/test_projects/test_projects.py b/backend/tests/test_routers/test_editions/test_projects/test_projects.py index 26a323ddd..9e96a8f3a 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_projects.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_projects.py @@ -4,7 +4,7 @@ from starlette import status from settings import DB_PAGE_SIZE -from src.database.models import Edition, Project, User, Partner +from src.database.models import Edition, Project, Skill, User, Partner from tests.utils.authorization import AuthClient @@ -302,3 +302,36 @@ async def test_search_project_coach(database_session: AsyncSession, auth_client: assert len(json["projects"]) == 1 assert json["projects"][0]["name"] == "project 2" assert json["projects"][0]["coaches"][0]["userId"] == auth_client.user.user_id + + +async def test_delete_project_role(database_session: AsyncSession, auth_client: AuthClient): + """test delete a project role""" + edition: Edition = Edition(year=2022, name="ed2022") + user: User = User(name="coach 1") + skill: Skill = Skill(name="Skill1") + database_session.add(edition) + database_session.add(user) + database_session.add(skill) + await database_session.commit() + + await auth_client.admin() + + async with auth_client: + response = await auth_client.post("/editions/ed2022/projects", json={ + "name": "test", + "partners": ["ugent"], + "coaches": [user.user_id] + }) + + assert response.status_code == status.HTTP_201_CREATED + assert response.json()["projectId"] == 1 + response = await auth_client.post("/editions/ed2022/projects/1/roles", json={ + "skill_id": 1, + "description": "description", + "slots": 1 + }) + response = await auth_client.get("/editions/ed2022/projects/1/roles") + assert len(response.json()["projectRoles"]) == 1 + await auth_client.delete("/editions/ed2022/projects/1/roles/1") + response = await auth_client.get("/editions/ed2022/projects/1/roles") + assert len(response.json()["projectRoles"]) == 0 From 69e3b6a6cf69358b6a3848038f6567813841ae10 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Tue, 17 May 2022 18:14:17 +0200 Subject: [PATCH 334/649] update add skills to make it more clear to the user --- .../CreateProjectComponents/AddedSkills/AddedSkills.tsx | 7 +++++-- .../CreateProjectComponents/AddedSkills/styles.ts | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx index bf34b5032..c7163ac15 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx @@ -11,7 +11,6 @@ import { } from "./styles"; import { TiDeleteOutline } from "react-icons/ti"; import React from "react"; -import { BsPersonFill } from "react-icons/bs"; /** * @@ -74,7 +73,11 @@ export default function AddedSkills({ updateSkills(event, index, true); }} /> - + { + (skill.slots === 1) + ?
    student
    + :
    students
    + } { diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts index 4ad171c4b..0119e731d 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts @@ -61,4 +61,5 @@ export const AmountInput = styled.input` border: none; border-radius: 5px; width: 100px; + direction:rtl; `; From 785d2a9c8980d941e0a9877bc69598a24fd16225 Mon Sep 17 00:00:00 2001 From: cledloof Date: Tue, 17 May 2022 18:28:06 +0200 Subject: [PATCH 335/649] roles and suggested filter --- .../RolesFilter/RolesFilter.tsx | 8 ++--- .../StudentListFilters/StudentListFilters.tsx | 14 ++++++--- .../SuggestedForFilter/SuggestedForFilter.tsx | 30 +++++++++++++++++++ frontend/src/utils/api/students.ts | 9 ++++++ 4 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index f17d70ea6..f527a08db 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -5,7 +5,7 @@ import { FilterRolesLabel, FilterRolesLabelContainer, } from "../styles"; -import Select from "react-select"; +import Select, { MultiValue } from "react-select"; import { getSkills } from "../../../../utils/api/skills"; import "./RolesFilter.css"; @@ -39,9 +39,9 @@ export default function RolesFilter({ fetchRoles(); }, []); - function handleRolesChange(): void { + function handleRolesChange(event: MultiValue): void { const newRoles: number[] = []; - for (const role of roles) { + for (const role of event) { newRoles.push(role.value); } setRolesFilter(newRoles); @@ -59,7 +59,7 @@ export default function RolesFilter({ isMulti isSearchable placeholder="Choose roles..." - onChange={handleRolesChange} + onChange={e => handleRolesChange(e)} /> diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx index 4216ed0c0..77d73b4dd 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx @@ -12,6 +12,7 @@ import { Student } from "../../../data/interfaces/students"; import { useParams } from "react-router-dom"; import { toast } from "react-toastify"; import { getStudents } from "../../../utils/api/students"; +import SuggestedForFilter from "./SuggestedForFilter/SuggestedForFilter"; /** * Component that shows the sidebar with all the filters and student list. @@ -29,6 +30,7 @@ export default function StudentListFilters() { const [rolesFilter, setRolesFilter] = useState([]); const [alumniFilter, setAlumniFilter] = useState(false); const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); + const [suggestedFilter, setSuggestedFilter] = useState(false); /** * Request all students with selected filters @@ -82,6 +84,7 @@ export default function StudentListFilters() { rolesFilter, alumniFilter, studentCoachVolunteerFilter, + suggestedFilter, requestedPage ); @@ -99,7 +102,8 @@ export default function StudentListFilters() { nameFilter === "" && rolesFilter.length === 0 && !alumniFilter && - !studentCoachVolunteerFilter + !studentCoachVolunteerFilter && + !suggestedFilter ) { if (response.students.length === 0) { setAllDataFetched(true); @@ -126,7 +130,7 @@ export default function StudentListFilters() { setMoreDataAvailable(true); getData(-1); // eslint-disable-next-line react-hooks/exhaustive-deps - }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter]); + }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter, suggestedFilter]); let list; if (students.length === 0) { @@ -147,12 +151,14 @@ export default function StudentListFilters() { - + - diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx new file mode 100644 index 000000000..e5dfe5e36 --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx @@ -0,0 +1,30 @@ +import { Form } from "react-bootstrap"; +import React from "react"; + +/** + * Component that filters the students list based on the suggested for field. + * @param suggestedFilter + * @param setSuggestedFilter + */ +export default function SuggestedForFilter({ + suggestedFilter, + setSuggestedFilter, +}: { + suggestedFilter: boolean; + setSuggestedFilter: (value: boolean) => void; +}) { + return ( +
    + { + setSuggestedFilter(e.target.checked); + e.target.checked = suggestedFilter; + }} + /> +
    + ); +} diff --git a/frontend/src/utils/api/students.ts b/frontend/src/utils/api/students.ts index 95f6bc142..5457d2ed1 100644 --- a/frontend/src/utils/api/students.ts +++ b/frontend/src/utils/api/students.ts @@ -17,8 +17,13 @@ export async function getStudents( rolesFilter: number[], alumniFilter: boolean, studentCoachVolunteerFilter: boolean, + suggestedFilter: boolean, page: number ): Promise { + let rolesRequestField: string = ""; + for (const role of rolesFilter) { + rolesRequestField += "skill_ids=" + role.toString() + "&"; + } const response = await axiosInstance.get( "/editions/" + edition + @@ -26,6 +31,10 @@ export async function getStudents( nameFilter + "&alumni=" + alumniFilter + + "&own_suggestions=" + + suggestedFilter + + "&" + + rolesRequestField + "&student_coach=" + studentCoachVolunteerFilter + "&page=" + From 15cb6a6486e9e907d456fb598322bb6fe297bd5b Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Tue, 17 May 2022 20:02:38 +0200 Subject: [PATCH 336/649] prettier --- .../CreateProjectComponents/AddedSkills/AddedSkills.tsx | 6 +----- .../CreateProjectComponents/AddedSkills/styles.ts | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx index c7163ac15..2c4627e4d 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/AddedSkills.tsx @@ -73,11 +73,7 @@ export default function AddedSkills({ updateSkills(event, index, true); }} /> - { - (skill.slots === 1) - ?
    student
    - :
    students
    - } + {skill.slots === 1 ?
    student
    :
    students
    } { diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts index 0119e731d..4266dea6d 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/AddedSkills/styles.ts @@ -61,5 +61,5 @@ export const AmountInput = styled.input` border: none; border-radius: 5px; width: 100px; - direction:rtl; + direction: rtl; `; From 7f6aa6c2f2d02d0ce9460110c9cd505410eaafa4 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Tue, 17 May 2022 20:09:29 +0200 Subject: [PATCH 337/649] closes #442 --- backend/src/app/logic/projects_students.py | 9 ++++++--- .../editions/projects/students/projects_students.py | 7 ++++--- backend/src/app/schemas/projects.py | 5 +++++ .../test_projects/test_students/test_students.py | 12 +++++++----- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/backend/src/app/logic/projects_students.py b/backend/src/app/logic/projects_students.py index 8ecdc6f64..ad89cda85 100644 --- a/backend/src/app/logic/projects_students.py +++ b/backend/src/app/logic/projects_students.py @@ -2,7 +2,8 @@ import src.database.crud.projects_students as crud from src.app.exceptions.crud import DuplicateInsertException -from src.app.schemas.projects import InputArgumentation +from src.app.schemas.projects import ( + InputArgumentation, ReturnProjectRoleSuggestion) from src.database.models import ProjectRole, Student, User, ProjectRoleSuggestion @@ -16,11 +17,13 @@ async def add_student_project( project_role: ProjectRole, student: Student, drafter: User, - argumentation: InputArgumentation) -> ProjectRoleSuggestion: + argumentation: InputArgumentation) -> ReturnProjectRoleSuggestion: """Add a student to a project""" pr_suggestion = await crud.get_optional_pr_suggestion_for_pr_by_student(db, project_role, student) if pr_suggestion is None: - return await crud.create_pr_suggestion(db, project_role, student, drafter, argumentation) + project_role_suggestion: ProjectRoleSuggestion = \ + await crud.create_pr_suggestion(db, project_role, student, drafter, argumentation) + return ReturnProjectRoleSuggestion(project_role_suggestion=project_role_suggestion) raise DuplicateInsertException() diff --git a/backend/src/app/routers/editions/projects/students/projects_students.py b/backend/src/app/routers/editions/projects/students/projects_students.py index 5025ab4f0..b8bce0e27 100644 --- a/backend/src/app/routers/editions/projects/students/projects_students.py +++ b/backend/src/app/routers/editions/projects/students/projects_students.py @@ -4,7 +4,7 @@ import src.app.logic.projects_students as logic from src.app.routers.tags import Tags -from src.app.schemas.projects import InputArgumentation +from src.app.schemas.projects import InputArgumentation, ReturnProjectRoleSuggestion from src.app.utils.dependencies import ( require_coach, get_latest_edition, get_student, get_project_role @@ -51,7 +51,8 @@ async def change_project_role( @project_students_router.post( "/{student_id}", status_code=status.HTTP_201_CREATED, - dependencies=[Depends(get_latest_edition), Depends(live)] + dependencies=[Depends(get_latest_edition), Depends(live)], + response_model=ReturnProjectRoleSuggestion ) async def add_student_to_project( argumentation: InputArgumentation, @@ -64,4 +65,4 @@ async def add_student_to_project( This is not a definitive decision, but represents a coach drafting the student. """ - await logic.add_student_project(db, project_role, student, user, argumentation) + return await logic.add_student_project(db, project_role, student, user, argumentation) diff --git a/backend/src/app/schemas/projects.py b/backend/src/app/schemas/projects.py index 0022bfada..8267067b6 100644 --- a/backend/src/app/schemas/projects.py +++ b/backend/src/app/schemas/projects.py @@ -49,6 +49,11 @@ class Config: orm_mode = True +class ReturnProjectRoleSuggestion(CamelCaseModel): + """return a project role suggestion""" + project_role_suggestion: ProjectRoleSuggestion + + class ProjectRole(CamelCaseModel): """Represents a ProjectRole from the database""" project_role_id: int diff --git a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py index e6e4113ac..ee557b520 100644 --- a/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py +++ b/backend/tests/test_routers/test_editions/test_projects/test_students/test_students.py @@ -32,13 +32,15 @@ async def test_add_pr_suggestion(database_session: AsyncSession, auth_client: Au f"/editions/{edition.name}/projects/{project.project_id}/roles/{project_role.project_role_id}/students/{student.student_id}", json={"argumentation": "argumentation"} ) - assert resp.status_code == status.HTTP_201_CREATED + json1 = resp.json() + assert json1["projectRoleSuggestion"]["projectRoleSuggestionId"] == 1 + assert json1["projectRoleSuggestion"]["argumentation"] == 'argumentation' response2 = await auth_client.get(f'/editions/{edition.name}/projects/{project.project_id}') - json = response2.json() - assert len(json['projectRoles']) == 1 - assert len(json['projectRoles'][0]['suggestions']) == 1 - assert json['projectRoles'][0]['suggestions'][0]['argumentation'] == 'argumentation' + json2 = response2.json() + assert len(json2['projectRoles']) == 1 + assert len(json2['projectRoles'][0]['suggestions']) == 1 + assert json2['projectRoles'][0]['suggestions'][0]['argumentation'] == 'argumentation' async def test_add_pr_suggestion_non_existing_student(database_session: AsyncSession, auth_client: AuthClient): From 5b6f22334d3811446ecc834fd8a11ce12ef30090 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Tue, 17 May 2022 20:18:06 +0200 Subject: [PATCH 338/649] fix merge and add delete project role api call --- backend/poetry.lock | 4 ---- frontend/src/utils/api/projectRoles.ts | 32 ++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/backend/poetry.lock b/backend/poetry.lock index ad7527566..980787f33 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -1036,11 +1036,7 @@ multidict = ">=4.0" [metadata] lock-version = "1.1" python-versions = "^3.10" -<<<<<<< HEAD -content-hash = "e7952db82764830e89e51ad0b5c433782baa4578cc82320fded134d3d52e3c04" -======= content-hash = "af57762cac23f6cbae8e7ff78c36a7395e3e85f4083303fe6eb8d713dc5ea941" ->>>>>>> develop [metadata.files] aiohttp = [ diff --git a/frontend/src/utils/api/projectRoles.ts b/frontend/src/utils/api/projectRoles.ts index caca948cd..3bfcdf514 100644 --- a/frontend/src/utils/api/projectRoles.ts +++ b/frontend/src/utils/api/projectRoles.ts @@ -10,10 +10,7 @@ import { CreateProjectRole, ProjectRole } from "../../data/interfaces/projects"; */ export async function getProjectRoles( edition: string, - projectId: string, - skillId: number, - description: string | undefined, - slots: number + projectId: string ): Promise { try { const response = await axiosInstance.get( @@ -110,3 +107,30 @@ export async function editProjectRole( } } } + +/** + * API call to delete a project role + * @param edition The edition name. + * @param projectId The projectId where to delete a project role. + * @param projectRoleId The Id of the project role to delete + * @returns whether the delete was successful or not. + */ +export async function deleteProjectRole( + edition: string, + projectId: string, + projectRoleId: string +): Promise { + try { + await axiosInstance.delete( + "editions/" + edition + "/projects/" + projectId + "/roles" + projectRoleId + ); + + return true; + } catch (error) { + if (axios.isAxiosError(error)) { + return false; + } else { + throw error; + } + } +} From 9d2cfc31854deaa293776b32d780af52e2e47a4d Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Tue, 17 May 2022 20:54:29 +0200 Subject: [PATCH 339/649] Toasts instead of try-catch --- .../components/AdminsComponents/AddAdmin.tsx | 76 +++++++---------- .../AdminsComponents/RemoveAdmin.tsx | 32 ++++---- .../StudentInformation/StudentInformation.tsx | 17 ++-- .../AdminDecisionContainer.tsx | 7 +- .../CoachSuggestionContainer.tsx | 10 ++- .../StudentListFilters/StudentListFilters.tsx | 57 +++++++------ .../Coaches/CoachesComponents/AddCoach.tsx | 39 ++++----- .../Coaches/CoachesComponents/RemoveCoach.tsx | 35 ++++---- .../UsersComponents/InviteUser/InviteUser.tsx | 33 +++----- .../InviteUserComponents/SendInviteButton.tsx | 11 +-- .../UsersComponents/Requests/Requests.tsx | 41 +++++----- .../RequestsComponents/AcceptReject.tsx | 43 +++------- frontend/src/utils/api/students.ts | 21 ++--- frontend/src/utils/api/suggestions.ts | 18 ++-- frontend/src/views/AdminsPage/AdminsPage.tsx | 35 ++++---- .../MailOverviewPage/MailOverviewPage.tsx | 82 +++++++++---------- frontend/src/views/MailOverviewPage/styles.ts | 5 -- frontend/src/views/UsersPage/UsersPage.tsx | 40 +++++---- .../ProjectsPage/ProjectsPage.tsx | 46 +++++------ 19 files changed, 285 insertions(+), 363 deletions(-) diff --git a/frontend/src/components/AdminsComponents/AddAdmin.tsx b/frontend/src/components/AdminsComponents/AddAdmin.tsx index b6a443b9a..14b59bfb5 100644 --- a/frontend/src/components/AdminsComponents/AddAdmin.tsx +++ b/frontend/src/components/AdminsComponents/AddAdmin.tsx @@ -2,7 +2,7 @@ import { getUsersNonAdmin, User } from "../../utils/api/users/users"; import { createRef, useEffect, useState } from "react"; import { addAdmin } from "../../utils/api/users/admins"; import { AddButtonDiv, EmailDiv, Warning } from "./styles"; -import { Button, Modal, Spinner } from "react-bootstrap"; +import { Button, Modal } from "react-bootstrap"; import { AsyncTypeahead, Menu } from "react-bootstrap-typeahead"; import { StyledMenuItem } from "../Common/Users/styles"; import UserMenuItem from "../Common/Users/MenuItem"; @@ -20,7 +20,6 @@ import { toast } from "react-toastify"; export default function AddAdmin(props: { adminAdded: (user: User) => void }) { const [show, setShow] = useState(false); const [selected, setSelected] = useState(undefined); - const [loading, setLoading] = useState(false); const [gettingData, setGettingData] = useState(false); // Waiting for data const [users, setUsers] = useState([]); // All users which are not a coach const [searchTerm, setSearchTerm] = useState(""); // The word set in filter @@ -42,21 +41,16 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { filter = searchTerm; } setGettingData(true); - try { - const response = await getUsersNonAdmin(filter, page); - if (page === 0) { - setUsers(response.users); - } else { - setUsers(users.concat(response.users)); - } - - setGettingData(false); - } catch (exception) { - toast.error("Failed to receive users", { - toastId: "add_admins_failed", - }); - setGettingData(false); + const response = await toast.promise(getUsersNonAdmin(filter, page), { + error: "Failed to receive users", + }); + if (page === 0) { + setUsers(response.users); + } else { + setUsers(users.concat(response.users)); } + + setGettingData(false); } function filterData(searchTerm: string) { @@ -74,49 +68,25 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { }; async function addUserAsAdmin(user: User) { - setLoading(true); - let success = false; - try { - success = await addAdmin(user.userId); - if (!success) { - toast.error("Failed to add admin", { - toastId: "add_admins_failed", - }); - } - } catch (error) { + const success = await toast.promise(addAdmin(user.userId), { + pending: "Adding admin", + success: "Admin successfully added", + error: "Failed to add admin", + }); + if (!success) { toast.error("Failed to add admin", { toastId: "add_admins_failed", }); } - setLoading(false); + if (success) { props.adminAdded(user); setSearchTerm(""); - getData(0, ""); setSelected(undefined); setClearRef(true); } } - let addButton; - if (loading) { - addButton = ; - } else { - addButton = ( - - ); - } - let warning; if (selected !== undefined) { warning = ( @@ -185,7 +155,17 @@ export default function AddAdmin(props: { adminAdded: (user: User) => void }) { {warning} - {addButton} + diff --git a/frontend/src/components/AdminsComponents/RemoveAdmin.tsx b/frontend/src/components/AdminsComponents/RemoveAdmin.tsx index ff65baf93..d9b5f2239 100644 --- a/frontend/src/components/AdminsComponents/RemoveAdmin.tsx +++ b/frontend/src/components/AdminsComponents/RemoveAdmin.tsx @@ -20,22 +20,24 @@ export default function RemoveAdmin(props: { admin: User; removeAdmin: (user: Us }; async function removeUserAsAdmin(removeCoach: boolean) { - try { - let removed; - if (removeCoach) { - removed = await removeAdminAndCoach(props.admin.userId); - } else { - removed = await removeAdmin(props.admin.userId); - } + let removed; + if (removeCoach) { + removed = await toast.promise(removeAdminAndCoach(props.admin.userId), { + pending: "Removing admin", + success: "Admin successfully removed", + error: "Failed to remove admin", + }); + } else { + removed = await toast.promise(removeAdmin(props.admin.userId), { + pending: "Removing admin", + success: "Admin successfully removed", + error: "Failed to remove admin", + }); + } - if (removed) { - props.removeAdmin(props.admin); - } else { - toast.error("Failed to remove admin", { - toastId: "remove_admin_failed", - }); - } - } catch (error) { + if (removed) { + props.removeAdmin(props.admin); + } else { toast.error("Failed to remove admin", { toastId: "remove_admin_failed", }); diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index f11826520..747913abc 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -42,14 +42,15 @@ export default function StudentInformation(props: { studentId: number; editionId * Get all the suggestion that were made on this student. */ async function getData() { - try { - const studentResponse = await getStudent(props.editionId, props.studentId); - const suggenstionsResponse = await getSuggestions(props.editionId, props.studentId); - setStudent(studentResponse); - setSuggestions(suggenstionsResponse.suggestions); - } catch (error) { - toast.error("Failed to get details", { toastId: "fetch_student_details_failed" }); - } + const studentResponse = await toast.promise(getStudent(props.editionId, props.studentId), { + error: "Failed to get details", + }); + const suggestionsResponse = await toast.promise( + getSuggestions(props.editionId, props.studentId), + { error: "Failed to get suggestions" } + ); + setStudent(studentResponse); + setSuggestions(suggestionsResponse.suggestions); } /** diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx index 55081ad4c..4dc910f6d 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -4,6 +4,7 @@ import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; import { SuggestionButtons, ConfirmButton } from "./styles"; import { confirmStudent } from "../../../../utils/api/suggestions"; import { useParams } from "react-router-dom"; +import { toast } from "react-toastify"; /** * Make definitive decision on the current student based on the selected decision value. @@ -50,7 +51,11 @@ export default function AdminDecisionContainer() { } else { decisionNum = 3; } - await confirmStudent(params.editionId!, params.id!, decisionNum); + await toast.promise(confirmStudent(params.editionId!, params.id!, decisionNum), { + error: "Failed to send decision", + pending: "Sending decision", + success: "Decision successfully sent", + }); setClickedButtonText(""); setShow(false); } diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx index c76455150..ec091b3cc 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx @@ -3,6 +3,7 @@ import React, { useState } from "react"; import { Student } from "../../../../data/interfaces/students"; import { makeSuggestion } from "../../../../utils/api/students"; import { useParams } from "react-router-dom"; +import { toast } from "react-toastify"; interface Props { student: Student; @@ -45,7 +46,14 @@ export default function CoachSuggestionContainer(props: Props) { } else { suggestionNum = 3; } - await makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation); + await toast.promise( + makeSuggestion(params.editionId!, params.id!, suggestionNum, argumentation), + { + error: "Failed to send suggestion", + pending: "Sending suggestion", + success: "Suggestion successfully sent", + } + ); setArgumentation(""); setShow(false); } diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx index 4216ed0c0..5193880ea 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx @@ -75,46 +75,45 @@ export default function StudentListFilters() { setLoading(true); - try { - const response = await getStudents( + const response = await toast.promise( + getStudents( params.editionId!, nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter, requestedPage - ); + ), + { error: "Failed to receive students" } + ); + + if (response.students.length === 0 && !filterChanged) { + setMoreDataAvailable(false); + } + if (page === 0 || filterChanged) { + setStudents(response.students); + } else { + setStudents(students.concat(response.students)); + } - if (response.students.length === 0 && !filterChanged) { - setMoreDataAvailable(false); + // If no filters are set, allStudents can be changed + if ( + nameFilter === "" && + rolesFilter.length === 0 && + !alumniFilter && + !studentCoachVolunteerFilter + ) { + if (response.students.length === 0) { + setAllDataFetched(true); } - if (page === 0 || filterChanged) { - setStudents(response.students); + if (page === 0) { + setAllStudents(response.students); } else { - setStudents(students.concat(response.students)); + setAllStudents(allStudents.concat(response.students)); } - - // If no filters are set, allStudents can be changed - if ( - nameFilter === "" && - rolesFilter.length === 0 && - !alumniFilter && - !studentCoachVolunteerFilter - ) { - if (response.students.length === 0) { - setAllDataFetched(true); - } - if (page === 0) { - setAllStudents(response.students); - } else { - setAllStudents(allStudents.concat(response.students)); - } - } - - setPage(page + 1); - } catch (error) { - toast.error("Failed to get students.", { toastId: "fetch_students_failed" }); } + + setPage(page + 1); setLoading(false); } diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx index df0975990..9dbf4750f 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx @@ -44,21 +44,16 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => filter = searchTerm; } setGettingData(true); - try { - const response = await getUsersExcludeEdition(props.edition, filter, page); - if (page === 0) { - setUsers(response.users); - } else { - setUsers(users.concat(response.users)); - } - - setGettingData(false); - } catch (exception) { - toast.error("Failed to receive users", { - toastId: "fetch_users_failed", - }); - setGettingData(false); + const response = await toast.promise(getUsersExcludeEdition(props.edition, filter, page), { + error: "Failed to receive users", + }); + if (page === 0) { + setUsers(response.users); + } else { + setUsers(users.concat(response.users)); } + + setGettingData(false); } function filterData(searchTerm: string) { @@ -77,19 +72,17 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => async function addCoach(user: User) { setLoading(true); - let success = false; - try { - success = await addCoachToEdition(user.userId, props.edition); - if (!success) { - toast.error("Failed to add coach", { - toastId: "add_coach_failed", - }); - } - } catch (error) { + const success = await toast.promise(addCoachToEdition(user.userId, props.edition), { + error: "Failed to add coach", + pending: "Adding coach", + success: "Coach successfully added", + }); + if (!success) { toast.error("Failed to add coach", { toastId: "add_coach_failed", }); } + setLoading(false); if (success) { props.refreshCoaches(); diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx index dd7ea8448..26506d207 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx @@ -44,28 +44,29 @@ export default function RemoveCoach(props: { */ async function removeCoach(userId: number, allEditions: boolean) { setLoading(true); - let removed = false; - try { - if (allEditions) { - removed = await removeCoachFromAllEditions(userId); - } else { - removed = await removeCoachFromEdition(userId, props.edition); - } + let removed; + if (allEditions) { + removed = await toast.promise(removeCoachFromAllEditions(userId), { + error: "Failed to remove coach", + pending: "Removing coach", + success: "Coach successfully removed", + }); + } else { + removed = await toast.promise(removeCoachFromEdition(userId, props.edition), { + error: "Failed to remove coach", + pending: "Removing coach", + success: "Coach successfully removed", + }); + } - if (removed) { - props.removeCoach(); - } else { - toast.error("Failed to remove coach", { - toastId: "remove_coach_failed", - }); - setLoading(false); - } - } catch (error) { + if (removed) { + props.removeCoach(); + } else { toast.error("Failed to remove coach", { toastId: "remove_coach_failed", }); - setLoading(false); } + setLoading(false); } let buttons; diff --git a/frontend/src/components/UsersComponents/InviteUser/InviteUser.tsx b/frontend/src/components/UsersComponents/InviteUser/InviteUser.tsx index 1803d2570..0ec1e6bd9 100644 --- a/frontend/src/components/UsersComponents/InviteUser/InviteUser.tsx +++ b/frontend/src/components/UsersComponents/InviteUser/InviteUser.tsx @@ -15,7 +15,6 @@ import { toast } from "react-toastify"; export default function InviteUser(props: { edition: string }) { const [email, setEmail] = useState(""); // The email address which is entered const [valid, setValid] = useState(true); // The given email address is valid (or still being typed) - const [loading, setLoading] = useState(false); // The invite link is being created const [message, setMessage] = useState(""); // A message to confirm link created /** @@ -38,25 +37,19 @@ export default function InviteUser(props: { edition: string }) { */ const sendInvite = async (copyInvite: boolean) => { if (/[^@\s]+@[^@\s]+\.[^@\s]+/.test(email)) { - setLoading(true); - try { - const response = await getInviteLink(props.edition, email); - if (copyInvite) { - await navigator.clipboard.writeText(response.inviteLink); - setMessage("Copied invite link for " + email); - } else { - window.open(response.mailTo); - setMessage("Created email for " + email); - } - setLoading(false); - setEmail(""); - } catch (error) { - setLoading(false); - toast.error("Failed to create invite", { - toastId: "send_invite_failed", - }); - setMessage(""); + const response = await toast.promise(getInviteLink(props.edition, email), { + error: "Failed to create invite", + pending: "Creating invite", + success: "Invite successfully created", + }); + if (copyInvite) { + await navigator.clipboard.writeText(response.inviteLink); + setMessage("Copied invite link for " + email); + } else { + window.open(response.mailTo); + setMessage("Created email for " + email); } + setEmail(""); } else { setValid(false); toast.error("Invalid email address", { @@ -77,7 +70,7 @@ export default function InviteUser(props: { edition: string }) { placeholder="Email address" /> - + {message}
    diff --git a/frontend/src/components/UsersComponents/InviteUser/InviteUserComponents/SendInviteButton.tsx b/frontend/src/components/UsersComponents/InviteUser/InviteUserComponents/SendInviteButton.tsx index fe675b6b3..aa65b5404 100644 --- a/frontend/src/components/UsersComponents/InviteUser/InviteUserComponents/SendInviteButton.tsx +++ b/frontend/src/components/UsersComponents/InviteUser/InviteUserComponents/SendInviteButton.tsx @@ -1,21 +1,14 @@ import { DropdownField, InviteButton } from "../styles"; import React from "react"; -import { ButtonGroup, Dropdown, Spinner } from "react-bootstrap"; +import { ButtonGroup, Dropdown } from "react-bootstrap"; import { CreateButton } from "../../../Common/Buttons"; import { DropdownToggle } from "../../../Common/Buttons/styles"; /** * A component to choice between sending an invite or copying it to clipboard. - * @param props.loading Invite is being created. Used to show a spinner. * @param props.sendInvite A function to send/copy the link. */ -export default function SendInviteButton(props: { - loading: boolean; - sendInvite: (copy: boolean) => void; -}) { - if (props.loading) { - return ; - } +export default function SendInviteButton(props: { sendInvite: (copy: boolean) => void }) { return ( diff --git a/frontend/src/components/UsersComponents/Requests/Requests.tsx b/frontend/src/components/UsersComponents/Requests/Requests.tsx index ff5f0b88e..31648245a 100644 --- a/frontend/src/components/UsersComponents/Requests/Requests.tsx +++ b/frontend/src/components/UsersComponents/Requests/Requests.tsx @@ -67,34 +67,33 @@ export default function Requests(props: { edition: string; refreshCoaches: () => } setLoading(true); - try { - const response = await getRequests(props.edition, searchTerm, page); + + const response = await toast.promise(getRequests(props.edition, searchTerm, page), { + error: "Failed to receive requests", + }); + + if (response.requests.length === 0) { + setMoreRequestsAvailable(false); + } + if (page === 0) { + setRequests(response.requests); + } else { + setRequests(requests.concat(response.requests)); + } + + if (searchTerm === "") { if (response.requests.length === 0) { - setMoreRequestsAvailable(false); + setAllRequestsFetched(true); } if (page === 0) { - setRequests(response.requests); + setAllRequests(response.requests); } else { - setRequests(requests.concat(response.requests)); + setAllRequests(allRequests.concat(response.requests)); } + } - if (searchTerm === "") { - if (response.requests.length === 0) { - setAllRequestsFetched(true); - } - if (page === 0) { - setAllRequests(response.requests); - } else { - setAllRequests(allRequests.concat(response.requests)); - } - } + setPage(page + 1); - setPage(page + 1); - } catch (exception) { - toast.error("Failed to receive requests", { - toastId: "fetch_requests_failed", - }); - } setGotData(true); setLoading(false); } diff --git a/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx b/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx index 639fa1ef1..6c4144ab7 100644 --- a/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx +++ b/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx @@ -1,6 +1,5 @@ import { Request, acceptRequest, rejectRequest } from "../../../../utils/api/users/requests"; -import React, { useState } from "react"; -import LoadSpinner from "../../../Common/LoadSpinner"; +import React from "react"; import CreateButton from "../../../Common/Buttons/CreateButton"; import DeleteButton from "../../../Common/Buttons/DeleteButton"; import { Spacing } from "../styles"; @@ -15,54 +14,38 @@ export default function AcceptReject(props: { request: Request; removeRequest: (coachAdded: boolean, request: Request) => void; }) { - const [loading, setLoading] = useState(false); - async function accept() { - setLoading(true); - let success = false; - try { - success = await acceptRequest(props.request.requestId); - if (!success) { - toast.error("Failed to accept request", { - toastId: "accept_request_failed", - }); - } - } catch (exception) { + const success = await toast.promise(acceptRequest(props.request.requestId), { + error: "Failed to accept request", + pending: "Accepting request", + }); + if (!success) { toast.error("Failed to accept request", { toastId: "accept_request_failed", }); } - setLoading(false); + if (success) { props.removeRequest(true, props.request); } } async function reject() { - setLoading(true); - let success = false; - try { - success = await rejectRequest(props.request.requestId); - if (!success) { - toast.error("Failed to reject request", { - toastId: "reject_request_failed", - }); - } - } catch (exception) { + const success = await toast.promise(rejectRequest(props.request.requestId), { + error: "Failed to reject request", + pending: "Rejecting request", + }); + if (!success) { toast.error("Failed to reject request", { toastId: "reject_request_failed", }); } - setLoading(false); + if (success) { props.removeRequest(false, props.request); } } - if (loading) { - return ; - } - return (
    diff --git a/frontend/src/utils/api/students.ts b/frontend/src/utils/api/students.ts index 95f6bc142..17877bb97 100644 --- a/frontend/src/utils/api/students.ts +++ b/frontend/src/utils/api/students.ts @@ -77,19 +77,10 @@ export async function makeSuggestion( suggestionArg: number, argumentationArg: string ): Promise { - try { - const request = - "/editions/" + edition + "/students/" + studentId.toString() + "/suggestions"; - await axiosInstance.post(request, { - suggestion: suggestionArg, - argumentation: argumentationArg, - }); - return 201; - } catch (error) { - if (axios.isAxiosError(error)) { - return 422; - } else { - throw error; - } - } + const request = "/editions/" + edition + "/students/" + studentId.toString() + "/suggestions"; + await axiosInstance.post(request, { + suggestion: suggestionArg, + argumentation: argumentationArg, + }); + return 201; } diff --git a/frontend/src/utils/api/suggestions.ts b/frontend/src/utils/api/suggestions.ts index 272b6de04..837f5adb2 100644 --- a/frontend/src/utils/api/suggestions.ts +++ b/frontend/src/utils/api/suggestions.ts @@ -29,17 +29,9 @@ export async function getSuggestions(edition: string, studentId: number) { * @param confirmValue The decision to give this student. */ export async function confirmStudent(edition: string, studentId: string, confirmValue: number) { - try { - const response = await axiosInstance.put( - "/editions/" + edition + "/students/" + studentId.toString() + "/decision", - { decision: confirmValue } - ); - return response.status === 204; - } catch (error) { - if (axios.isAxiosError(error)) { - throw error; - } else { - throw error; - } - } + const response = await axiosInstance.put( + "/editions/" + edition + "/students/" + studentId.toString() + "/decision", + { decision: confirmValue } + ); + return response.status === 204; } diff --git a/frontend/src/views/AdminsPage/AdminsPage.tsx b/frontend/src/views/AdminsPage/AdminsPage.tsx index 69fceed66..ee151d34d 100644 --- a/frontend/src/views/AdminsPage/AdminsPage.tsx +++ b/frontend/src/views/AdminsPage/AdminsPage.tsx @@ -16,27 +16,24 @@ export default function AdminsPage() { const [gotData, setGotData] = useState(false); const getData = useCallback(async () => { - try { - let adminsAvailable = true; - let page = 0; - let newAdmins: User[] = []; - while (adminsAvailable) { - const response = await getAdmins(page, searchTerm); - if (page === 0) { - newAdmins = response.users; - } else { - newAdmins = newAdmins.concat(response.users); - } - adminsAvailable = response.users.length !== 0; - page += 1; - } - setAdmins(newAdmins); - setAllAdmins(newAdmins); - } catch (exception) { - toast.error("Failed to receive admins", { - toastId: "fetch_admins_failed", + let adminsAvailable = true; + let page = 0; + let newAdmins: User[] = []; + while (adminsAvailable) { + const response = await toast.promise(getAdmins(page, searchTerm), { + error: "Failed to receive admins", }); + if (page === 0) { + newAdmins = response.users; + } else { + newAdmins = newAdmins.concat(response.users); + } + adminsAvailable = response.users.length !== 0; + page += 1; } + setAdmins(newAdmins); + setAllAdmins(newAdmins); + setGotData(true); setLoading(false); }, [searchTerm]); diff --git a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx index 2c41a2d18..e3d742333 100644 --- a/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx +++ b/frontend/src/views/MailOverviewPage/MailOverviewPage.tsx @@ -13,7 +13,6 @@ import { SearchDiv, FilterDiv, SearchAndFilterDiv, - EmailsTable, CenterDiv, MessageDiv, } from "./styles"; @@ -22,6 +21,7 @@ import { useParams } from "react-router-dom"; import { Student } from "../../data/interfaces"; import LoadSpinner from "../../components/Common/LoadSpinner"; import { toast } from "react-toastify"; +import { StyledTable } from "../../components/Common/Tables/styles"; interface EmailRow { email: StudentEmail; @@ -55,38 +55,36 @@ export default function MailOverviewPage() { setLoading(true); - try { - const response = await getMailOverview(editionId, page, searchTerm, filters); - if (response.studentEmails.length === 0) { - setMoreEmailsAvailable(false); - } - if (page === 0) { - setEmailRows( + const response = await toast.promise( + getMailOverview(editionId, page, searchTerm, filters), + { error: "Failed to receive states" } + ); + if (response.studentEmails.length === 0) { + setMoreEmailsAvailable(false); + } + if (page === 0) { + setEmailRows( + response.studentEmails.map(email => { + return { + email: email, + checked: false, + }; + }) + ); + } else { + setEmailRows( + emailRows.concat( response.studentEmails.map(email => { return { email: email, checked: false, }; }) - ); - } else { - setEmailRows( - emailRows.concat( - response.studentEmails.map(email => { - return { - email: email, - checked: false, - }; - }) - ) - ); - } - setPage(page + 1); - } catch (exception) { - toast.error("Failed to receive states", { - toastId: "fetch_emails_failed", - }); + ) + ); } + setPage(page + 1); + setGotEmails(true); setLoading(false); } @@ -139,22 +137,18 @@ export default function MailOverviewPage() { .filter(row => row.checked) .map(row => row.email.student.studentId); - try { - await setStateRequest(eventKey, editionId, selectedStudents); - setEmailRows( - emailRows.map(row => { - row.checked = false; - return row; - }) - ); - setAllSelected(false); - alert("Successful changed"); - refresh(); - } catch { - toast.error("Failed to change state", { - toastId: "change_emails_failed", - }); - } + await toast.promise(setStateRequest(eventKey, editionId, selectedStudents), { + error: "Failed to change state", + pending: "Changing state", + }); + setEmailRows( + emailRows.map(row => { + row.checked = false; + return row; + }) + ); + setAllSelected(false); + refresh(); } let table; @@ -175,7 +169,7 @@ export default function MailOverviewPage() { useWindow={false} getScrollParent={() => document.getElementById("root")} > - + @@ -219,7 +213,7 @@ export default function MailOverviewPage() { ))} - + ); diff --git a/frontend/src/views/MailOverviewPage/styles.ts b/frontend/src/views/MailOverviewPage/styles.ts index 1857f0111..90c2cb88b 100644 --- a/frontend/src/views/MailOverviewPage/styles.ts +++ b/frontend/src/views/MailOverviewPage/styles.ts @@ -1,4 +1,3 @@ -import { Table } from "react-bootstrap"; import styled from "styled-components"; export const TableDiv = styled.div` @@ -38,10 +37,6 @@ export const SearchAndFilterDiv = styled.div` width: fit-content; `; -export const EmailsTable = styled(Table)` - // TODO: Make all tables uniform -`; - export const CenterDiv = styled.div` width: 100%; margin: auto; diff --git a/frontend/src/views/UsersPage/UsersPage.tsx b/frontend/src/views/UsersPage/UsersPage.tsx index aafa6ad68..12ff53e21 100644 --- a/frontend/src/views/UsersPage/UsersPage.tsx +++ b/frontend/src/views/UsersPage/UsersPage.tsx @@ -44,34 +44,32 @@ function UsersPage() { } setLoading(true); - try { - const response = await getCoaches(params.editionId as string, searchTerm, page); + const response = await toast.promise( + getCoaches(params.editionId as string, searchTerm, page), + { error: "Failed to receive coaches" } + ); + if (response.users.length === 0) { + setMoreCoachesAvailable(false); + } + if (page === 0) { + setCoaches(response.users); + } else { + setCoaches(coaches.concat(response.users)); + } + + if (searchTerm === "") { if (response.users.length === 0) { - setMoreCoachesAvailable(false); + setAllCoachesFetched(true); } if (page === 0) { - setCoaches(response.users); + setAllCoaches(response.users); } else { - setCoaches(coaches.concat(response.users)); + setAllCoaches(allCoaches.concat(response.users)); } + } - if (searchTerm === "") { - if (response.users.length === 0) { - setAllCoachesFetched(true); - } - if (page === 0) { - setAllCoaches(response.users); - } else { - setAllCoaches(allCoaches.concat(response.users)); - } - } + setPage(page + 1); - setPage(page + 1); - } catch (exception) { - toast.error("Failed to receive coaches", { - toastId: "fetch_coaches_failed", - }); - } setGotData(true); setLoading(false); } diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index 86edd4aa1..2bd58b62f 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -52,40 +52,38 @@ export default function ProjectPage() { } setLoading(true); - try { - const response = await getProjects(editionId, searchString, ownProjects, page); - if (response) { + const response = await toast.promise( + getProjects(editionId, searchString, ownProjects, page), + { error: "Failed to receive projects" } + ); + if (response) { + if (response.projects.length === 0) { + setMoreProjectsAvailable(false); + } + if (page === 0) { + setProjects(response.projects); + } else { + setProjects(projects.concat(response.projects)); + } + + if (searchString === "") { if (response.projects.length === 0) { - setMoreProjectsAvailable(false); + setAllProjectsFetched(true); } if (page === 0) { - setProjects(response.projects); + setAllProjects(response.projects); } else { - setProjects(projects.concat(response.projects)); + setAllProjects(allProjects.concat(response.projects)); } - - if (searchString === "") { - if (response.projects.length === 0) { - setAllProjectsFetched(true); - } - if (page === 0) { - setAllProjects(response.projects); - } else { - setAllProjects(allProjects.concat(response.projects)); - } - } - - setPage(page + 1); - } else { - toast.error("Failed to receive projects", { - toastId: "fetch_projects_failed", - }); } - } catch (exception) { + + setPage(page + 1); + } else { toast.error("Failed to receive projects", { toastId: "fetch_projects_failed", }); } + setGotProjects(true); setLoading(false); } From d0412f794401a88d582a58a085f0f21acac441eb Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Tue, 17 May 2022 21:07:56 +0200 Subject: [PATCH 340/649] delete project role and other fixes --- .../ProjectRoles/ProjectRoles.tsx | 36 +++++++++++++++++-- .../SuggestedStudent/SuggestedStudent.tsx | 9 +++-- .../ProjectRoles/styles.ts | 6 ++++ .../TitleAndEdit/TitleAndEdit.tsx | 4 +-- frontend/src/data/interfaces/projects.ts | 2 +- frontend/src/utils/api/projectRoles.ts | 2 +- frontend/src/utils/api/projectStudents.ts | 9 +++-- .../ProjectDetailPage/ProjectDetailPage.tsx | 9 +++-- 8 files changed, 61 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx index e75a8cde9..135297fa5 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx @@ -1,14 +1,46 @@ import { Droppable } from "react-beautiful-dnd"; +import { useParams } from "react-router-dom"; +import { toast } from "react-toastify"; import { ProjectRole } from "../../../data/interfaces/projects"; -import { NoStudents, ProjectRoleContainer, Suggestions } from "./styles"; +import { deleteProjectRole } from "../../../utils/api/projectRoles"; +import { DeleteButton } from "../../Common/Buttons"; +import { NoStudents, ProjectRoleContainer, Suggestions, TitleDeleteContainer } from "./styles"; import SuggestedStudent from "./SuggestedStudent"; export default function ProjectRoles({ projectRoles }: { projectRoles: ProjectRole[] }) { + const params = useParams(); + const projectId = params.projectId!; + const editionId = params.editionId!; + return (
    {projectRoles.map((projectRole, _index) => ( -

    {projectRole.skill.name}

    + +

    {projectRole.skill.name}

    + { + await toast.promise( + deleteProjectRole( + editionId, + projectId, + projectRole.projectRoleId.toString() + ), + { + pending: "Deleting project role", + success: "Successfully deleted project role", + error: "Something went wrong", + }, + { + toastId: + "deleteProjectRole" + + projectRole.projectRoleId.toString(), + } + ); + }} + /> +     +
    {projectRole.description}
    {projectRole.suggestions.length.toString() + " / " + diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/SuggestedStudent.tsx b/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/SuggestedStudent.tsx index a75015536..dd992912c 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/SuggestedStudent.tsx +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/SuggestedStudent.tsx @@ -55,8 +55,13 @@ export default function SuggestedStudent({ /> - By Coach 1: - {" " + suggestion.argumentation} + {suggestion.argumentation !== "" ? ( + <> + By {suggestion.drafter.name}:{" " + suggestion.argumentation} + + ) : ( + <>By {suggestion.drafter.name} + )} {role === Role.ADMIN && ( diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/styles.ts b/frontend/src/components/ProjectDetailComponents/ProjectRoles/styles.ts index 30018bb65..2e842e627 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/styles.ts +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/styles.ts @@ -10,6 +10,12 @@ export const ProjectRoleContainer = styled.div` box-shadow: 5px 5px 15px #131329; `; +export const TitleDeleteContainer = styled.div` + display: flex; + align-items: center; + justify-content: space-between; +`; + export const Suggestions = styled.div` min-height: 10vh; `; diff --git a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx index bff94c415..ffea469c2 100644 --- a/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx +++ b/frontend/src/components/ProjectDetailComponents/TitleAndEdit/TitleAndEdit.tsx @@ -28,7 +28,7 @@ export default function TitleAndEdit({ editedProject: Project; setEditedProject: (project: Project) => void; setEditing: (editing: boolean) => void; - editProject: () => void; + editProject: () => Promise; role: Role; handleShow: () => void; }) { @@ -49,7 +49,7 @@ export default function TitleAndEdit({ {!editing ? ( - setEditing(true)} /> + setEditing(true)} /> ) : ( <> diff --git a/frontend/src/data/interfaces/projects.ts b/frontend/src/data/interfaces/projects.ts index 58ae9578c..74e0fd32a 100644 --- a/frontend/src/data/interfaces/projects.ts +++ b/frontend/src/data/interfaces/projects.ts @@ -34,7 +34,7 @@ export interface ProjectRoleSuggestion { argumentation: string; /** The user who suggested this student */ - // drafter: Coach; + drafter: Coach; /** The suggested student */ student: Student; diff --git a/frontend/src/utils/api/projectRoles.ts b/frontend/src/utils/api/projectRoles.ts index 3bfcdf514..786307933 100644 --- a/frontend/src/utils/api/projectRoles.ts +++ b/frontend/src/utils/api/projectRoles.ts @@ -122,7 +122,7 @@ export async function deleteProjectRole( ): Promise { try { await axiosInstance.delete( - "editions/" + edition + "/projects/" + projectId + "/roles" + projectRoleId + "editions/" + edition + "/projects/" + projectId + "/roles/" + projectRoleId ); return true; diff --git a/frontend/src/utils/api/projectStudents.ts b/frontend/src/utils/api/projectStudents.ts index ac62762ee..2df51baaf 100644 --- a/frontend/src/utils/api/projectStudents.ts +++ b/frontend/src/utils/api/projectStudents.ts @@ -1,6 +1,6 @@ import axios from "axios"; import { axiosInstance } from "./api"; -import { AddRoleSuggestion } from "../../data/interfaces/projects"; +import { AddRoleSuggestion, ProjectRoleSuggestion } from "../../data/interfaces/projects"; /** * API call to make a student role suggestion. @@ -17,7 +17,7 @@ export async function addStudentToProject( projectRoleId: string, studentId: string, argumentation: string | undefined -): Promise { +): Promise { const payload: AddRoleSuggestion = { argumentation: argumentation || "", }; @@ -34,11 +34,10 @@ export async function addStudentToProject( studentId, payload ); - if (response) return true; - else return false; + return response.data as ProjectRoleSuggestion; } catch (error) { if (axios.isAxiosError(error)) { - return false; + return null; } else { throw error; } diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index 496764d8e..db345cd09 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -30,7 +30,6 @@ import { } from "../../../components/ProjectDetailComponents"; import { addStudentToProject, deleteStudentFromProject } from "../../../utils/api/projectStudents"; import { toast } from "react-toastify"; -import { StudentListFilters } from "../../../components/StudentsComponents"; /** * @returns the detailed page of a project. Here you can add or remove students from the project. */ @@ -90,7 +89,7 @@ export default function ProjectDetailPage() { setShowAddModal(false); const student = await getStudent(editionId, parseInt(result.draggableId)); - await toast.promise( + const newProjectRole = await toast.promise( addStudentToProject( editionId, projectId.toString(), @@ -105,12 +104,15 @@ export default function ProjectDetailPage() { }, { toastId: "addStudentToProject" } ); + if (!newProjectRole) return + const newProjectRoles = projectRoles.map((projectRole, index) => { if (projectRole.projectRoleId.toString() === result.destination?.droppableId) { const newSuggestions = [...projectRole.suggestions]; newSuggestions.splice(result.destination.index, 0, { projectRoleSuggestionId: index, argumentation: motivation, + drafter: newProjectRole.drafter, student: student, }); return { ...projectRole, suggestions: newSuggestions }; @@ -136,7 +138,7 @@ export default function ProjectDetailPage() { onDragDrop(result)}> - + navigate("/editions/" + editionId + "/projects/")}> @@ -239,6 +241,7 @@ export default function ProjectDetailPage() { newSuggestions.splice(destination.index, 0, { projectRoleSuggestionId: index, argumentation: "arg", + drafter: {userId: 1, name: "Fix this"}, student: student, }); return { ...projectRole, suggestions: newSuggestions }; From 5499bb44e31d80a263429156f2c395a94fbc11fd Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Tue, 17 May 2022 21:11:07 +0200 Subject: [PATCH 341/649] closes #377 --- backend/src/app/logic/webhooks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/app/logic/webhooks.py b/backend/src/app/logic/webhooks.py index e58983b7f..7dd6e8d2f 100644 --- a/backend/src/app/logic/webhooks.py +++ b/backend/src/app/logic/webhooks.py @@ -6,7 +6,8 @@ from settings import FormMapping from src.app.exceptions.webhooks import WebhookProcessException from src.app.schemas.webhooks import WebhookEvent, Question, Form, QuestionUpload, QuestionOption -from src.database.enums import QuestionEnum as QE +from src.database.crud.students import create_email +from src.database.enums import QuestionEnum as QE, EmailStatusEnum from src.database.models import Question as QuestionModel, QuestionAnswer, QuestionFileAnswer, Student, Edition @@ -66,6 +67,7 @@ async def process_webhook(edition: Edition, data: WebhookEvent, database: AsyncS try: await database.commit() + await create_email(database, student, EmailStatusEnum.APPLIED) except sqlalchemy.exc.IntegrityError as error: raise WebhookProcessException('Unique Check Failed') from error From 337f3fd8270f16b38bcb6b8080d1f2a5c268b58c Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Tue, 17 May 2022 21:11:14 +0200 Subject: [PATCH 342/649] Remove blue glow on buttons --- frontend/src/components/Common/Buttons/styles.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Common/Buttons/styles.ts b/frontend/src/components/Common/Buttons/styles.ts index 4fdff1ae0..a04aeca7f 100644 --- a/frontend/src/components/Common/Buttons/styles.ts +++ b/frontend/src/components/Common/Buttons/styles.ts @@ -18,6 +18,7 @@ export const GreenButton = styled(Button)` background-color: var(--osoc_orange); border-color: var(--osoc_orange); color: var(--osoc_blue); + box-shadow: none; } `; @@ -31,9 +32,10 @@ export const DropdownToggle = styled(Dropdown.Toggle)` &:hover, &:active, &:focus { - background-color: var(--osoc_orange); + background-color: var(--osoc_orange) !important; border-color: var(--osoc_orange); color: var(--osoc_blue); + box-shadow: none !important; } `; From e6a8a8997d4bd515d50709e1f35d3bb1d4cc9c8d Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Tue, 17 May 2022 21:18:51 +0200 Subject: [PATCH 343/649] Buttons disabled color --- .../src/components/Common/Buttons/styles.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/frontend/src/components/Common/Buttons/styles.ts b/frontend/src/components/Common/Buttons/styles.ts index a04aeca7f..352f02272 100644 --- a/frontend/src/components/Common/Buttons/styles.ts +++ b/frontend/src/components/Common/Buttons/styles.ts @@ -12,6 +12,12 @@ export const GreenButton = styled(Button)` border-color: var(--osoc_green); color: var(--osoc_blue); + &:disabled { + background-color: var(--osoc_green); + border-color: var(--osoc_green); + color: var(--osoc_blue); + } + &:hover, &:active, &:focus { @@ -29,6 +35,12 @@ export const DropdownToggle = styled(Dropdown.Toggle)` border-color: var(--osoc_green); color: var(--osoc_blue); + &:disabled { + background-color: var(--osoc_green); + border-color: var(--osoc_green); + color: var(--osoc_blue); + } + &:hover, &:active, &:focus { @@ -74,6 +86,11 @@ export const RedButton = styled(Button)` background-color: var(--osoc_red); border-color: var(--osoc_red); + &:disabled { + background-color: var(--osoc_red); + border-color: var(--osoc_red); + } + &:hover { background-color: var(--osoc_red_darkened); border-color: var(--osoc_red_darkened); From 63b5a1cda46f2de852e11d4a6c52abdafdd1a0a1 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Tue, 17 May 2022 21:41:21 +0200 Subject: [PATCH 344/649] check suggestion for student --- backend/src/app/utils/dependencies.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/backend/src/app/utils/dependencies.py b/backend/src/app/utils/dependencies.py index 1136d3749..f8b835e28 100644 --- a/backend/src/app/utils/dependencies.py +++ b/backend/src/app/utils/dependencies.py @@ -42,9 +42,13 @@ async def get_student(student_id: int, database: AsyncSession = Depends(get_sess return student -async def get_suggestion(suggestion_id: int, database: AsyncSession = Depends(get_session)) -> Suggestion: +async def get_suggestion(suggestion_id: int, database: AsyncSession = Depends(get_session), + student: Student = Depends(get_student)) -> Suggestion: """Get the suggestion from the database, given the id in the path""" - return await get_suggestion_by_id(database, suggestion_id) + suggestion: Suggestion = await get_suggestion_by_id(database, suggestion_id) + if suggestion.student != student: + raise NoResultFound + return suggestion async def get_latest_edition(edition: Edition = Depends(get_edition), database: AsyncSession = Depends(get_session)) \ @@ -62,8 +66,7 @@ async def get_latest_edition(edition: Edition = Depends(get_edition), database: async def _get_user_from_token(token_type: TokenType, db: AsyncSession, token: str) -> User: """Check which user is making a request by decoding its token, and verifying the token type""" try: - payload = jwt.decode(token, settings.SECRET_KEY, - algorithms=[ALGORITHM]) + payload = jwt.decode(token, settings.SECRET_KEY, algorithms=[ALGORITHM]) user_id: int | None = payload.get("sub") type_in_token: int | None = payload.get("type") From 4d50dfaf68c2e67579fb646ac5c95f454587121a Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Tue, 17 May 2022 21:47:28 +0200 Subject: [PATCH 345/649] Buttons disabled color darker --- .../src/components/Common/Buttons/styles.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/Common/Buttons/styles.ts b/frontend/src/components/Common/Buttons/styles.ts index 352f02272..bdd179b02 100644 --- a/frontend/src/components/Common/Buttons/styles.ts +++ b/frontend/src/components/Common/Buttons/styles.ts @@ -13,9 +13,9 @@ export const GreenButton = styled(Button)` color: var(--osoc_blue); &:disabled { - background-color: var(--osoc_green); - border-color: var(--osoc_green); - color: var(--osoc_blue); + background-color: #3a6453; + border-color: #3a6453; + color: white; } &:hover, @@ -24,7 +24,7 @@ export const GreenButton = styled(Button)` background-color: var(--osoc_orange); border-color: var(--osoc_orange); color: var(--osoc_blue); - box-shadow: none; + box-shadow: none !important; } `; @@ -87,12 +87,15 @@ export const RedButton = styled(Button)` border-color: var(--osoc_red); &:disabled { - background-color: var(--osoc_red); - border-color: var(--osoc_red); + background-color: #8a4944; + border-color: #8a4944; } - &:hover { + &:hover, + &:active, + &:focus { background-color: var(--osoc_red_darkened); border-color: var(--osoc_red_darkened); + box-shadow: none !important; } `; From fe7f142bfd6db0344f85e77d24fa497c4aed8633 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Tue, 17 May 2022 21:53:27 +0200 Subject: [PATCH 346/649] fix test and wrote new test --- .../test_suggestions/test_suggestions.py | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py index 611edec76..793889951 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py +++ b/backend/tests/test_routers/test_editions/test_students/test_suggestions/test_suggestions.py @@ -183,12 +183,32 @@ async def test_delete_suggestion_coach_their_review(database_with_data: AsyncSes assert new_suggestion.status_code == status.HTTP_201_CREATED suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] assert (await auth_client.delete( - f"/editions/ed2022/students/1/suggestions/{suggestion_id}")).status_code == status.HTTP_204_NO_CONTENT + f"/editions/ed2022/students/2/suggestions/{suggestion_id}")).status_code == status.HTTP_204_NO_CONTENT suggestions: list[Suggestion] = (await database_with_data.execute(select( Suggestion).where(Suggestion.suggestion_id == suggestion_id))).unique().scalars().all() assert len(suggestions) == 0 +async def test_delete_suggestion_wrong_student(database_with_data: AsyncSession, auth_client: AuthClient): + """Test you can't delete an suggestion that's don't belong to that student""" + edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] + await auth_client.coach(edition) + async with auth_client: + new_suggestion = await auth_client.post("/editions/ed2022/students/2/suggestions", + json={"suggestion": 1, "argumentation": "test"}) + assert new_suggestion.status_code == status.HTTP_201_CREATED + suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] + assert (await auth_client.delete( + f"/editions/ed2022/students/1/suggestions/{suggestion_id}")).status_code == status.HTTP_404_NOT_FOUND + res = await auth_client.get( + "/editions/ed2022/students/2/suggestions") + assert res.status_code == status.HTTP_200_OK + res_json = res.json() + assert len(res_json["suggestions"]) == 1 + assert res_json["suggestions"][0]["suggestion"] == 1 + assert res_json["suggestions"][0]["argumentation"] == "test" + + async def test_delete_suggestion_coach_other_review(database_with_data: AsyncSession, auth_client: AuthClient): """Tests that a coach can't delete other coaches their suggestions""" edition: Edition = (await database_with_data.execute(select(Edition))).scalars().all()[0] @@ -237,7 +257,7 @@ async def test_update_suggestion_coach_their_review(database_with_data: AsyncSes json={"suggestion": 1, "argumentation": "test"}) assert new_suggestion.status_code == status.HTTP_201_CREATED suggestion_id = new_suggestion.json()["suggestion"]["suggestionId"] - assert (await auth_client.put(f"/editions/ed2022/students/1/suggestions/{suggestion_id}", json={ + assert (await auth_client.put(f"/editions/ed2022/students/2/suggestions/{suggestion_id}", json={ "suggestion": 3, "argumentation": "test"})).status_code == status.HTTP_204_NO_CONTENT suggestion: Suggestion = (await database_with_data.execute(select( Suggestion).where(Suggestion.suggestion_id == suggestion_id))).unique().scalar_one() From 6b25c8cbd7dbf0311198dfeb4bfa773f520bd6f4 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Tue, 17 May 2022 22:45:01 +0200 Subject: [PATCH 347/649] update on adding a skill --- .../ProjectRoles/AddNewSkill/AddNewSkill.tsx | 36 ++++++++++++++ .../ProjectRoles/AddNewSkill/index.ts | 1 + .../ProjectRoles/AddNewSkill/styles.ts | 48 +++++++++++++++++++ .../ProjectRoles/ProjectRoles.tsx | 2 + .../InputFields/Skill/Skill.tsx | 4 +- 5 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/AddNewSkill.tsx create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/index.ts create mode 100644 frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/styles.ts diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/AddNewSkill.tsx b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/AddNewSkill.tsx new file mode 100644 index 000000000..9b842fbbe --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/AddNewSkill.tsx @@ -0,0 +1,36 @@ +import { useEffect, useState } from "react"; +import { Skill } from "../../../../data/interfaces/skills"; +import { getSkills } from "../../../../utils/api/skills"; +import { CreateButton } from "../../../Common/Buttons"; +import { AddNewSkillContainer, NewSkill, StyledFormSelect } from "./styles"; + +export default function AddNewSkill() { + const [addingSkill, setAddingSkill] = useState(false); + + const [availableSkills, setAvailableSkills] = useState([]); + + useEffect(() => { + async function callSkills() { + setAvailableSkills((await getSkills())?.skills || []); + } + callSkills(); + }, []); + + return ( + <> + {!addingSkill ? ( + + setAddingSkill(true)} /> + + ) : ( + + + {availableSkills.map(skill => ( + + ))} + + + )} + + ); +} diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/index.ts b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/index.ts new file mode 100644 index 000000000..30ffb3e79 --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/index.ts @@ -0,0 +1 @@ +export { default } from "./AddNewSkill"; diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/styles.ts b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/styles.ts new file mode 100644 index 000000000..4e8e56aca --- /dev/null +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/styles.ts @@ -0,0 +1,48 @@ +import { Form } from "react-bootstrap"; +import styled from "styled-components"; + +export const AddNewSkillContainer = styled.div` + border: 2px solid #1a1a36; + border-radius: 5px; + margin: 10px 20px; + margin-top: 5vh; + margin-left: 0; + padding: 20px 20px 20px 20px; + background-color: #323252; + box-shadow: 5px 5px 15px #131329; + display: flex; + height: max-content; + justify-content: center; +`; + +export const NewSkill = styled.div` + border: 2px solid #1a1a36; + border-radius: 5px; + margin: 10px 20px; + margin-top: 5vh; + margin-left: 0; + padding: 20px 20px 20px 20px; + background-color: #323252; + box-shadow: 5px 5px 15px #131329; + display: flex; + height: max-content; +`; + +export const StyledFormSelect = styled(Form.Select)` + background-color: var(--osoc_blue); + color: white; + border-color: transparent; + max-width: 25%; + + &:focus { + background-color: var(--osoc_blue); + color: white; + border-color: var(--osoc_green); + box-shadow: none; + } + + &:invalid { + border-color: var(--osoc_red); + box-shadow: none; + } +`; diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx index 135297fa5..1cc4ff719 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/ProjectRoles.tsx @@ -6,6 +6,7 @@ import { deleteProjectRole } from "../../../utils/api/projectRoles"; import { DeleteButton } from "../../Common/Buttons"; import { NoStudents, ProjectRoleContainer, Suggestions, TitleDeleteContainer } from "./styles"; import SuggestedStudent from "./SuggestedStudent"; +import AddNewSkill from "./AddNewSkill"; export default function ProjectRoles({ projectRoles }: { projectRoles: ProjectRole[] }) { const params = useParams(); @@ -65,6 +66,7 @@ export default function ProjectRoles({ projectRoles }: { projectRoles: ProjectRo     ))} +
    ); } diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx index 371603e9a..96dafd480 100644 --- a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/Skill/Skill.tsx @@ -18,10 +18,10 @@ export default function SkillInput({ const [availableSkills, setAvailableSkills] = useState([]); useEffect(() => { - async function callCoaches() { + async function callSkills() { setAvailableSkills((await getSkills())?.skills || []); } - callCoaches(); + callSkills(); }, []); return ( From 88f90825e864678c7808425cbaf0b82530cde8d3 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Sun, 8 May 2022 18:40:46 +0200 Subject: [PATCH 348/649] start webhooks route --- .../editions/students/answers/__init__.py | 1 + .../editions/students/answers/answers.py | 17 +++++ .../app/routers/editions/students/students.py | 3 + .../test_students/test_answers/__init__.py | 0 .../test_answers/test_answers.py | 76 +++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 backend/src/app/routers/editions/students/answers/__init__.py create mode 100644 backend/src/app/routers/editions/students/answers/answers.py create mode 100644 backend/tests/test_routers/test_editions/test_students/test_answers/__init__.py create mode 100644 backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py diff --git a/backend/src/app/routers/editions/students/answers/__init__.py b/backend/src/app/routers/editions/students/answers/__init__.py new file mode 100644 index 000000000..4549d9bc2 --- /dev/null +++ b/backend/src/app/routers/editions/students/answers/__init__.py @@ -0,0 +1 @@ +from .answers import students_answers_router diff --git a/backend/src/app/routers/editions/students/answers/answers.py b/backend/src/app/routers/editions/students/answers/answers.py new file mode 100644 index 000000000..748039c0a --- /dev/null +++ b/backend/src/app/routers/editions/students/answers/answers.py @@ -0,0 +1,17 @@ +from fastapi import APIRouter, Depends +from sqlalchemy.ext.asyncio import AsyncSession + +from starlette import status +from src.app.routers.tags import Tags +from src.app.utils.dependencies import require_auth, get_student, get_suggestion +from src.database.models import Student, User, Suggestion +from src.database.database import get_session + +students_answers_router = APIRouter( + prefix="/answers", tags=[Tags.STUDENTS]) + +@students_answers_router.get("/", status_code=status.HTTP_200_OK) +async def get_answers(student: Student=Depends(get_student), + db: AsyncSession=Depends(get_session)): + """give answers of a student""" + return "test" diff --git a/backend/src/app/routers/editions/students/students.py b/backend/src/app/routers/editions/students/students.py index 8ea767f56..25a79032c 100644 --- a/backend/src/app/routers/editions/students/students.py +++ b/backend/src/app/routers/editions/students/students.py @@ -18,10 +18,13 @@ from src.database.database import get_session from src.database.models import Student, Edition from .suggestions import students_suggestions_router +from .answers import students_answers_router students_router = APIRouter(prefix="/students", tags=[Tags.STUDENTS]) students_router.include_router( students_suggestions_router, prefix="/{student_id}") +students_router.include_router( + students_answers_router, prefix="/{student_id}") @students_router.get("", dependencies=[Depends(require_auth)], response_model=ReturnStudentList) diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/__init__.py b/backend/tests/test_routers/test_editions/test_students/test_answers/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py new file mode 100644 index 000000000..9569fdd26 --- /dev/null +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -0,0 +1,76 @@ +import pytest +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession +#from starlette import status + +#from settings import DB_PAGE_SIZE +from src.database.models import Edition, Project, User, Skill, ProjectRole, Student +from tests.utils.authorization import AuthClient + + +@pytest.fixture +async def database_with_data(database_session: AsyncSession) -> AsyncSession: + """fixture for adding data to the database""" + edition: Edition = Edition(year=2022, name="ed2022") + database_session.add(edition) + project1 = Project(name="project1", edition=edition, number_of_students=2) + project2 = Project(name="project2", edition=edition, number_of_students=3) + project3 = Project(name="super nice project", edition=edition, number_of_students=3) + database_session.add(project1) + database_session.add(project2) + database_session.add(project3) + user: User = User(name="coach1") + database_session.add(user) + skill1: Skill = Skill(name="skill1", description="something about skill1") + skill2: Skill = Skill(name="skill2", description="something about skill2") + skill3: Skill = Skill(name="skill3", description="something about skill3") + database_session.add(skill1) + database_session.add(skill2) + database_session.add(skill3) + student01: Student = Student(first_name="Jos", last_name="Vermeulen", preferred_name="Joske", + email_address="josvermeulen@mail.com", phone_number="0487/86.24.45", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill1, skill3]) + student02: Student = Student(first_name="Isabella", last_name="Christensen", preferred_name="Isabella", + email_address="isabella.christensen@example.com", phone_number="98389723", alumni=True, + wants_to_be_student_coach=True, edition=edition, skills=[skill2]) + database_session.add(student01) + database_session.add(student02) + project_role1: ProjectRole = ProjectRole( + student=student01, project=project1, skill=skill1, drafter=user, argumentation="argmunet") + project_role2: ProjectRole = ProjectRole( + student=student01, project=project2, skill=skill3, drafter=user, argumentation="argmunet") + project_role3: ProjectRole = ProjectRole( + student=student02, project=project1, skill=skill1, drafter=user, argumentation="argmunet") + database_session.add(project_role1) + database_session.add(project_role2) + database_session.add(project_role3) + await database_session.commit() + + return database_session + + +@pytest.fixture +async def current_edition(database_with_data: AsyncSession) -> Edition: + """fixture to get the latest edition""" + return (await database_with_data.execute(select(Edition))).scalars().all()[-1] + + +async def test_get_answers(database_with_data: AsyncSession, auth_client: AuthClient): + """test get answers""" + async with auth_client: + response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) + print(response) + assert False + +async def test_get_projects(database_with_data: AsyncSession, auth_client: AuthClient): + """Tests get all projects""" + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2022/projects", follow_redirects=True) + print(f"response: {response}") + json = response.json() + print(f"json: {json}") + assert len(json['projects']) == 3 + assert json['projects'][0]['name'] == "project1" + assert json['projects'][1]['name'] == "project2" + assert json['projects'][2]['name'] == "super nice project" From aa356065abd5e1469c9cb50c322012afc975be96 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Mon, 9 May 2022 11:15:16 +0200 Subject: [PATCH 349/649] some tests --- .../routers/editions/students/answers/answers.py | 11 ++++++----- .../test_students/test_answers/test_answers.py | 13 ------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/backend/src/app/routers/editions/students/answers/answers.py b/backend/src/app/routers/editions/students/answers/answers.py index 748039c0a..5066863d6 100644 --- a/backend/src/app/routers/editions/students/answers/answers.py +++ b/backend/src/app/routers/editions/students/answers/answers.py @@ -3,15 +3,16 @@ from starlette import status from src.app.routers.tags import Tags -from src.app.utils.dependencies import require_auth, get_student, get_suggestion -from src.database.models import Student, User, Suggestion +from src.app.utils.dependencies import get_student +from src.database.models import Student from src.database.database import get_session students_answers_router = APIRouter( prefix="/answers", tags=[Tags.STUDENTS]) + @students_answers_router.get("/", status_code=status.HTTP_200_OK) -async def get_answers(student: Student=Depends(get_student), - db: AsyncSession=Depends(get_session)): +async def get_answers(student: Student = Depends(get_student), + db: AsyncSession = Depends(get_session)): """give answers of a student""" - return "test" + return student.alumni diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py index 9569fdd26..cc8141502 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -61,16 +61,3 @@ async def test_get_answers(database_with_data: AsyncSession, auth_client: AuthCl response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) print(response) assert False - -async def test_get_projects(database_with_data: AsyncSession, auth_client: AuthClient): - """Tests get all projects""" - await auth_client.admin() - async with auth_client: - response = await auth_client.get("/editions/ed2022/projects", follow_redirects=True) - print(f"response: {response}") - json = response.json() - print(f"json: {json}") - assert len(json['projects']) == 3 - assert json['projects'][0]['name'] == "project1" - assert json['projects'][1]['name'] == "project2" - assert json['projects'][2]['name'] == "super nice project" From 91bdcfd52c8897dfd4b7439cf1d403c3e3bc530e Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Thu, 12 May 2022 11:36:51 +0200 Subject: [PATCH 350/649] added answers --- backend/src/app/logic/answers.py | 21 ++++++ .../editions/students/answers/answers.py | 14 ++-- backend/src/app/schemas/answers.py | 44 ++++++++++++ .../test_answers/test_answers.py | 70 +++++++++++++------ 4 files changed, 119 insertions(+), 30 deletions(-) create mode 100644 backend/src/app/logic/answers.py create mode 100644 backend/src/app/schemas/answers.py diff --git a/backend/src/app/logic/answers.py b/backend/src/app/logic/answers.py new file mode 100644 index 000000000..c6cf5bf4a --- /dev/null +++ b/backend/src/app/logic/answers.py @@ -0,0 +1,21 @@ +from src.database.models import Student +from src.app.schemas.answers import Questions + + +async def gives_question_and_answers(student: Student) -> Questions: + """test""" + #student_question: question_model = + + + + #questions: list[Question] = [] + # for question in student_questions: + # questions.append(question) + + #return Question(type=student_question.type, + # question=student_question.question, + # answers=student_question.answers, + # files=student_question.files) + + # return "test" + return Questions(questions=student.questions) diff --git a/backend/src/app/routers/editions/students/answers/answers.py b/backend/src/app/routers/editions/students/answers/answers.py index 5066863d6..3cec9a9ec 100644 --- a/backend/src/app/routers/editions/students/answers/answers.py +++ b/backend/src/app/routers/editions/students/answers/answers.py @@ -1,18 +1,18 @@ from fastapi import APIRouter, Depends -from sqlalchemy.ext.asyncio import AsyncSession from starlette import status +from src.app.logic.answers import gives_question_and_answers from src.app.routers.tags import Tags -from src.app.utils.dependencies import get_student +from src.app.utils.dependencies import get_student, require_auth +from src.app.schemas.answers import Questions from src.database.models import Student -from src.database.database import get_session students_answers_router = APIRouter( prefix="/answers", tags=[Tags.STUDENTS]) -@students_answers_router.get("/", status_code=status.HTTP_200_OK) -async def get_answers(student: Student = Depends(get_student), - db: AsyncSession = Depends(get_session)): +@students_answers_router.get("/", status_code=status.HTTP_200_OK, response_model=Questions, + dependencies=[Depends(require_auth)]) +async def get_answers(student: Student = Depends(get_student)): """give answers of a student""" - return student.alumni + return await gives_question_and_answers(student=student) diff --git a/backend/src/app/schemas/answers.py b/backend/src/app/schemas/answers.py new file mode 100644 index 000000000..05cc04474 --- /dev/null +++ b/backend/src/app/schemas/answers.py @@ -0,0 +1,44 @@ +from src.app.schemas.utils import CamelCaseModel +from src.database.enums import QuestionEnum + + +class QuestionAnswer(CamelCaseModel): + """test""" + answer: str + + class Config: + """Set to ORM mode""" + orm_mode = True + + +class QuestionFileAnswer(CamelCaseModel): + """test""" + file_name: str + url: str + mime_type: str + size: str + + class Config: + """Set to ORM mode""" + orm_mode = True + + +class Question(CamelCaseModel): + """test""" + type: QuestionEnum + question: str + answers: list[QuestionAnswer] + files: list[QuestionFileAnswer] + + class Config: + """Set to ORM mode""" + orm_mode = True + + +class Questions(CamelCaseModel): + """test""" + questions: list[Question] + + class Config: + """Set to ORM mode""" + orm_mode = True diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py index cc8141502..c4825ea3c 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -1,10 +1,10 @@ import pytest from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession -#from starlette import status +from starlette import status -#from settings import DB_PAGE_SIZE -from src.database.models import Edition, Project, User, Skill, ProjectRole, Student +from src.database.models import Edition, User, Skill, Student, Question, QuestionAnswer +from src.database.enums import QuestionEnum from tests.utils.authorization import AuthClient @@ -13,12 +13,6 @@ async def database_with_data(database_session: AsyncSession) -> AsyncSession: """fixture for adding data to the database""" edition: Edition = Edition(year=2022, name="ed2022") database_session.add(edition) - project1 = Project(name="project1", edition=edition, number_of_students=2) - project2 = Project(name="project2", edition=edition, number_of_students=3) - project3 = Project(name="super nice project", edition=edition, number_of_students=3) - database_session.add(project1) - database_session.add(project2) - database_session.add(project3) user: User = User(name="coach1") database_session.add(user) skill1: Skill = Skill(name="skill1", description="something about skill1") @@ -35,17 +29,16 @@ async def database_with_data(database_session: AsyncSession) -> AsyncSession: wants_to_be_student_coach=True, edition=edition, skills=[skill2]) database_session.add(student01) database_session.add(student02) - project_role1: ProjectRole = ProjectRole( - student=student01, project=project1, skill=skill1, drafter=user, argumentation="argmunet") - project_role2: ProjectRole = ProjectRole( - student=student01, project=project2, skill=skill3, drafter=user, argumentation="argmunet") - project_role3: ProjectRole = ProjectRole( - student=student02, project=project1, skill=skill1, drafter=user, argumentation="argmunet") - database_session.add(project_role1) - database_session.add(project_role2) - database_session.add(project_role3) - await database_session.commit() + question1: Question = Question( + type=QuestionEnum.INPUT_EMAIL, question="Email", student=student01, answers=[], files=[]) + database_session.add(question1) + question_answer1: QuestionAnswer = QuestionAnswer( + answer="josvermeulen@mail.com", question=question1) + database_session.add(question_answer1) + #aswer1: QuestionAnswer = QuestionAnswer(answer="josvermeulen@mail.com", question=question1) + # database_session.add(aswer1) + await database_session.commit() return database_session @@ -55,9 +48,40 @@ async def current_edition(database_with_data: AsyncSession) -> Edition: return (await database_with_data.execute(select(Edition))).scalars().all()[-1] -async def test_get_answers(database_with_data: AsyncSession, auth_client: AuthClient): - """test get answers""" +async def test_get_answers_not_logged_in(database_with_data: AsyncSession, auth_client: AuthClient): + """test get answers when not logged in""" + async with auth_client: + response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) + assert response.status_code == status.HTTP_401_UNAUTHORIZED + + +async def test_get_answers_as_coach(database_with_data: AsyncSession, auth_client: AuthClient, current_edition: Edition): + """test get answers when logged in as coach""" + await auth_client.coach(current_edition) + async with auth_client: + response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + json = response.json() + assert len(json["questions"]) == 1 + assert QuestionEnum(json["questions"][0]["type"] + ) == QuestionEnum.INPUT_EMAIL + assert json["questions"][0]["question"] == "Email" + assert len(json["questions"][0]["answers"]) == 1 + assert json["questions"][0]["answers"][0]["answer"] == "josvermeulen@mail.com" + assert len(json["questions"][0]["files"]) == 0 + + +async def test_get_answers_as_admin(database_with_data: AsyncSession, auth_client: AuthClient): + """test get answers when logged in as admin""" + await auth_client.admin() async with auth_client: response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) - print(response) - assert False + assert response.status_code == status.HTTP_200_OK + json = response.json() + assert len(json["questions"]) == 1 + assert QuestionEnum(json["questions"][0]["type"] + ) == QuestionEnum.INPUT_EMAIL + assert json["questions"][0]["question"] == "Email" + assert len(json["questions"][0]["answers"]) == 1 + assert json["questions"][0]["answers"][0]["answer"] == "josvermeulen@mail.com" + assert len(json["questions"][0]["files"]) == 0 From 48addfe485b27b3fca8655926e7a3267116a0d49 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Thu, 12 May 2022 12:14:38 +0200 Subject: [PATCH 351/649] removed garbage lines --- backend/src/app/logic/answers.py | 16 +--------------- backend/src/app/schemas/answers.py | 8 ++++---- .../test_students/test_answers/test_answers.py | 10 +++++----- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/backend/src/app/logic/answers.py b/backend/src/app/logic/answers.py index c6cf5bf4a..9b8edefd9 100644 --- a/backend/src/app/logic/answers.py +++ b/backend/src/app/logic/answers.py @@ -3,19 +3,5 @@ async def gives_question_and_answers(student: Student) -> Questions: - """test""" - #student_question: question_model = - - - - #questions: list[Question] = [] - # for question in student_questions: - # questions.append(question) - - #return Question(type=student_question.type, - # question=student_question.question, - # answers=student_question.answers, - # files=student_question.files) - - # return "test" + """transfers the student questions into a return model of Questions""" return Questions(questions=student.questions) diff --git a/backend/src/app/schemas/answers.py b/backend/src/app/schemas/answers.py index 05cc04474..1ee89537a 100644 --- a/backend/src/app/schemas/answers.py +++ b/backend/src/app/schemas/answers.py @@ -3,7 +3,7 @@ class QuestionAnswer(CamelCaseModel): - """test""" + """return model of an answer""" answer: str class Config: @@ -12,7 +12,7 @@ class Config: class QuestionFileAnswer(CamelCaseModel): - """test""" + """return model of a file answers""" file_name: str url: str mime_type: str @@ -24,7 +24,7 @@ class Config: class Question(CamelCaseModel): - """test""" + """return model of a question""" type: QuestionEnum question: str answers: list[QuestionAnswer] @@ -36,7 +36,7 @@ class Config: class Questions(CamelCaseModel): - """test""" + """return model of questions""" questions: list[Question] class Config: diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py index c4825ea3c..c0f518257 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -15,9 +15,9 @@ async def database_with_data(database_session: AsyncSession) -> AsyncSession: database_session.add(edition) user: User = User(name="coach1") database_session.add(user) - skill1: Skill = Skill(name="skill1", description="something about skill1") - skill2: Skill = Skill(name="skill2", description="something about skill2") - skill3: Skill = Skill(name="skill3", description="something about skill3") + skill1: Skill = Skill(name="skill1") + skill2: Skill = Skill(name="skill2") + skill3: Skill = Skill(name="skill3") database_session.add(skill1) database_session.add(skill2) database_session.add(skill3) @@ -36,8 +36,8 @@ async def database_with_data(database_session: AsyncSession) -> AsyncSession: answer="josvermeulen@mail.com", question=question1) database_session.add(question_answer1) - #aswer1: QuestionAnswer = QuestionAnswer(answer="josvermeulen@mail.com", question=question1) - # database_session.add(aswer1) + aswer1: QuestionAnswer = QuestionAnswer(answer="josvermeulen@mail.com", question=question1) + database_session.add(aswer1) await database_session.commit() return database_session From 2b02ef137df04c289cc6888e8d87983b46dc6b99 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Sun, 15 May 2022 20:47:15 +0200 Subject: [PATCH 352/649] fix test --- .../test_editions/test_students/test_answers/test_answers.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py index c0f518257..4c02ca572 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -35,9 +35,6 @@ async def database_with_data(database_session: AsyncSession) -> AsyncSession: question_answer1: QuestionAnswer = QuestionAnswer( answer="josvermeulen@mail.com", question=question1) database_session.add(question_answer1) - - aswer1: QuestionAnswer = QuestionAnswer(answer="josvermeulen@mail.com", question=question1) - database_session.add(aswer1) await database_session.commit() return database_session From dc195594aaa44ad725fa4ae43637d95833952c3b Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Mon, 16 May 2022 12:36:14 +0200 Subject: [PATCH 353/649] small change --- .../test_answers/test_answers.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py index 4c02ca572..06acca36a 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -52,7 +52,8 @@ async def test_get_answers_not_logged_in(database_with_data: AsyncSession, auth_ assert response.status_code == status.HTTP_401_UNAUTHORIZED -async def test_get_answers_as_coach(database_with_data: AsyncSession, auth_client: AuthClient, current_edition: Edition): +async def test_get_answers_as_coach(database_with_data: AsyncSession, auth_client: AuthClient, + current_edition: Edition): """test get answers when logged in as coach""" await auth_client.coach(current_edition) async with auth_client: @@ -66,19 +67,3 @@ async def test_get_answers_as_coach(database_with_data: AsyncSession, auth_clien assert len(json["questions"][0]["answers"]) == 1 assert json["questions"][0]["answers"][0]["answer"] == "josvermeulen@mail.com" assert len(json["questions"][0]["files"]) == 0 - - -async def test_get_answers_as_admin(database_with_data: AsyncSession, auth_client: AuthClient): - """test get answers when logged in as admin""" - await auth_client.admin() - async with auth_client: - response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) - assert response.status_code == status.HTTP_200_OK - json = response.json() - assert len(json["questions"]) == 1 - assert QuestionEnum(json["questions"][0]["type"] - ) == QuestionEnum.INPUT_EMAIL - assert json["questions"][0]["question"] == "Email" - assert len(json["questions"][0]["answers"]) == 1 - assert json["questions"][0]["answers"][0]["answer"] == "josvermeulen@mail.com" - assert len(json["questions"][0]["files"]) == 0 From a8dac25b70c23622aac990b37fe1f83aff857be6 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Mon, 16 May 2022 12:55:52 +0200 Subject: [PATCH 354/649] added the admin test again --- .../test_students/test_answers/test_answers.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py index 06acca36a..9a0b0f850 100644 --- a/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py +++ b/backend/tests/test_routers/test_editions/test_students/test_answers/test_answers.py @@ -67,3 +67,19 @@ async def test_get_answers_as_coach(database_with_data: AsyncSession, auth_clien assert len(json["questions"][0]["answers"]) == 1 assert json["questions"][0]["answers"][0]["answer"] == "josvermeulen@mail.com" assert len(json["questions"][0]["files"]) == 0 + + +async def test_get_answers_as_admin(database_with_data: AsyncSession, auth_client: AuthClient): + """test get answers when logged in as coach""" + await auth_client.admin() + async with auth_client: + response = await auth_client.get("/editions/ed2023/students/1/answers", follow_redirects=True) + assert response.status_code == status.HTTP_200_OK + json = response.json() + assert len(json["questions"]) == 1 + assert QuestionEnum(json["questions"][0]["type"] + ) == QuestionEnum.INPUT_EMAIL + assert json["questions"][0]["question"] == "Email" + assert len(json["questions"][0]["answers"]) == 1 + assert json["questions"][0]["answers"][0]["answer"] == "josvermeulen@mail.com" + assert len(json["questions"][0]["files"]) == 0 From af2ba8400a37d6ed587e972945ddf8ed68e28ce6 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Tue, 17 May 2022 23:25:27 +0200 Subject: [PATCH 355/649] uses NotFound --- backend/src/app/utils/dependencies.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/app/utils/dependencies.py b/backend/src/app/utils/dependencies.py index f8b835e28..c42cfe49c 100644 --- a/backend/src/app/utils/dependencies.py +++ b/backend/src/app/utils/dependencies.py @@ -6,7 +6,6 @@ from fastapi.security import OAuth2PasswordBearer from jose import jwt, ExpiredSignatureError, JWTError from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm.exc import NoResultFound import settings import src.database.crud.projects as crud_projects @@ -38,7 +37,7 @@ async def get_student(student_id: int, database: AsyncSession = Depends(get_sess """Get the student from the database, given the id in the path""" student: Student = await get_student_by_id(database, student_id) if student.edition != edition: - raise NoResultFound + raise NotFound() return student @@ -47,7 +46,7 @@ async def get_suggestion(suggestion_id: int, database: AsyncSession = Depends(ge """Get the suggestion from the database, given the id in the path""" suggestion: Suggestion = await get_suggestion_by_id(database, suggestion_id) if suggestion.student != student: - raise NoResultFound + raise NotFound() return suggestion From bb0db6ee532f371ff4679a5ed8e5cbb036ec14aa Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Tue, 17 May 2022 23:40:03 +0200 Subject: [PATCH 356/649] skill select form --- .../ProjectRoles/AddNewSkill/AddNewSkill.tsx | 40 +++++++++++++++++-- .../ProjectRoles/AddNewSkill/styles.ts | 1 + .../ProjectCard/ProjectCard.tsx | 10 +++-- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/AddNewSkill.tsx b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/AddNewSkill.tsx index 9b842fbbe..55d175e5a 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/AddNewSkill.tsx +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/AddNewSkill.tsx @@ -1,14 +1,20 @@ import { useEffect, useState } from "react"; +import { CreateProjectRole } from "../../../../data/interfaces/projects"; import { Skill } from "../../../../data/interfaces/skills"; import { getSkills } from "../../../../utils/api/skills"; import { CreateButton } from "../../../Common/Buttons"; -import { AddNewSkillContainer, NewSkill, StyledFormSelect } from "./styles"; +import { StyledFormControl } from "../../../Common/Forms/styles"; +import { AmountInput } from "../../../ProjectsComponents/CreateProjectComponents/AddedSkills/styles"; +import { AddNewSkillContainer, NewSkill } from "./styles"; export default function AddNewSkill() { const [addingSkill, setAddingSkill] = useState(false); const [availableSkills, setAvailableSkills] = useState([]); + const [projectRole, setProjectRole] = useState(); + const [chosenSkill, setChosenSkill] = useState(); + useEffect(() => { async function callSkills() { setAvailableSkills((await getSkills())?.skills || []); @@ -24,11 +30,37 @@ export default function AddNewSkill() { ) : ( - + { + let skillToAdd: Skill | undefined; + availableSkills.forEach(availableSkill => { + if (availableSkill.name === e.target.value) { + skillToAdd = availableSkill; + } + }); + if (skillToAdd) setChosenSkill(skillToAdd); + }} + > {availableSkills.map(skill => ( - + ))} - + + { + setProjectRole(undefined); + }} + /> + {projectRole && projectRole.slots === 1 ? ( +
    student
    + ) : ( +
    students
    + )}     )} diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/styles.ts b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/styles.ts index 4e8e56aca..104fc5e7c 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/styles.ts +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/AddNewSkill/styles.ts @@ -25,6 +25,7 @@ export const NewSkill = styled.div` background-color: #323252; box-shadow: 5px 5px 15px #131329; display: flex; + align-items: center; height: max-content; `; diff --git a/frontend/src/components/ProjectsComponents/ProjectCard/ProjectCard.tsx b/frontend/src/components/ProjectsComponents/ProjectCard/ProjectCard.tsx index 854022ce2..e5c1676c8 100644 --- a/frontend/src/components/ProjectsComponents/ProjectCard/ProjectCard.tsx +++ b/frontend/src/components/ProjectsComponents/ProjectCard/ProjectCard.tsx @@ -30,7 +30,7 @@ import { toast } from "react-toastify"; /** * * @param project a Project object - * @param refreshProjects what to do when a project is deleted. + * @param removeProject what to do when a project is deleted. * @returns a project card which is a small overview of a project. */ export default function ProjectCard({ @@ -45,6 +45,12 @@ export default function ProjectCard({ const handleClose = () => setShow(false); const handleShow = () => setShow(true); + const params = useParams(); + const editionId = params.editionId!; + const { role } = useAuth(); + + const navigate = useNavigate(); + // What to do when deleting a project. async function handleDelete() { const success = await deleteProject(editionId, project.projectId); @@ -57,8 +63,6 @@ export default function ProjectCard({ } } - const { role } = useAuth(); - return ( From 46c3cdcbc165568cc35472f215e446351fd78f7e Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 18 May 2022 00:24:23 +0200 Subject: [PATCH 357/649] session storage + roles dropdown change --- .../AlumniFilter/AlumniFilter.tsx | 1 + .../NameFilter/NameFilter.tsx | 1 + .../ResetFiltersButton/ResetFiltersButton.tsx | 10 ++++ .../RolesFilter/RolesFilter.tsx | 16 +++--- .../StudentCoachVolunteerFilter.tsx | 1 + .../StudentListFilters/StudentListFilters.tsx | 53 +++++++++++++------ .../SuggestedForFilter/SuggestedForFilter.tsx | 1 + .../SuggestedForFilter/index.ts | 1 + frontend/src/utils/api/students.ts | 6 ++- 9 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/index.ts diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx index cb4c543e4..6dfb672d0 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx @@ -22,6 +22,7 @@ export default function AlumniFilter({ checked={alumniFilter} onChange={e => { setAlumniFilter(e.target.checked); + sessionStorage.setItem("alumniFilter", String(e.target.checked)); e.target.checked = alumniFilter; }} /> diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx index a5123ce1d..f1de980d5 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx @@ -32,6 +32,7 @@ export default function NameFilter({ value={nameFilter} onChange={e => { setNameFilter(e.target.value); + sessionStorage.setItem("nameFilter", e.target.value); }} /> diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx index b8956350b..7abcd2dba 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx @@ -1,9 +1,12 @@ import React from "react"; import { FilterResetButton } from "../styles"; +import { DropdownRole } from "../RolesFilter/RolesFilter"; interface Props { setNameFilter: (name: string) => void; + setRolesFilter: (roles: DropdownRole[]) => void; setAlumniFilter: (alumni: boolean) => void; + setSuggestedFilter: (suggested: boolean) => void; setStudentCoachVolunteerFilter: (studentCoachVolunteer: boolean) => void; } @@ -19,6 +22,13 @@ export default function ResetFiltersButton(props: Props) { props.setNameFilter(""); props.setAlumniFilter(false); props.setStudentCoachVolunteerFilter(false); + props.setSuggestedFilter(false); + props.setRolesFilter([]); + sessionStorage.removeItem("suggestedFilter"); + sessionStorage.removeItem("alumniFilter"); + sessionStorage.removeItem("nameFilter"); + sessionStorage.removeItem("studentCoachVolunteerFilter"); + sessionStorage.removeItem("rolesFilter"); } return resetFilters()}>Reset filters; diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index f527a08db..3661c2553 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -9,7 +9,7 @@ import Select, { MultiValue } from "react-select"; import { getSkills } from "../../../../utils/api/skills"; import "./RolesFilter.css"; -interface DropdownRole { +export interface DropdownRole { label: string; value: number; } @@ -20,9 +20,11 @@ interface DropdownRole { * @param setRolesFilter */ export default function RolesFilter({ + rolesFilter, setRolesFilter, }: { - setRolesFilter: (value: number[]) => void; + rolesFilter: DropdownRole[]; + setRolesFilter: (value: DropdownRole[]) => void; }) { const [roles, setRoles] = useState([]); @@ -40,11 +42,10 @@ export default function RolesFilter({ }, []); function handleRolesChange(event: MultiValue): void { - const newRoles: number[] = []; - for (const role of event) { - newRoles.push(role.value); - } - setRolesFilter(newRoles); + const allCheckedRoles: DropdownRole[] = []; + event.forEach(dropdownRole => allCheckedRoles.push(dropdownRole)); + setRolesFilter(allCheckedRoles); + sessionStorage.setItem("rolesFilter", JSON.stringify(allCheckedRoles)); } return ( @@ -59,6 +60,7 @@ export default function RolesFilter({ isMulti isSearchable placeholder="Choose roles..." + value={rolesFilter} onChange={e => handleRolesChange(e)} /> diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx index b41f3528b..4536eac4c 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx @@ -22,6 +22,7 @@ export default function StudentCoachVolunteerFilter({ checked={studentCoachVolunteerFilter} onChange={e => { setStudentCoachVolunteerFilter(e.target.checked); + sessionStorage.setItem("studentCoachVolunteerFilter", String(e.target.checked)); e.target.checked = studentCoachVolunteerFilter; }} /> diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx index 77d73b4dd..2dbeec9af 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx @@ -5,7 +5,7 @@ import { StudentListSideMenu, StudentListLinebreak, FilterControls, MessageDiv } import AlumniFilter from "./AlumniFilter/AlumniFilter"; import StudentCoachVolunteerFilter from "./StudentCoachVolunteerFilter/StudentCoachVolunteerFilter"; import NameFilter from "./NameFilter/NameFilter"; -import RolesFilter from "./RolesFilter/RolesFilter"; +import RolesFilter, { DropdownRole } from "./RolesFilter/RolesFilter"; import "./StudentListFilters.css"; import ResetFiltersButton from "./ResetFiltersButton/ResetFiltersButton"; import { Student } from "../../../data/interfaces/students"; @@ -26,11 +26,29 @@ export default function StudentListFilters() { const [allDataFetched, setAllDataFetched] = useState(false); const [page, setPage] = useState(0); - const [nameFilter, setNameFilter] = useState(""); - const [rolesFilter, setRolesFilter] = useState([]); - const [alumniFilter, setAlumniFilter] = useState(false); - const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState(false); - const [suggestedFilter, setSuggestedFilter] = useState(false); + const [nameFilter, setNameFilter] = useState( + sessionStorage.getItem("nameFilter") === null ? "" : sessionStorage.getItem("nameFilter") + ); + const [rolesFilter, setRolesFilter] = useState( + sessionStorage.getItem("rolesFilter") === null + ? [] + : JSON.parse(sessionStorage.getItem("rolesFilter")!) + ); + const [alumniFilter, setAlumniFilter] = useState( + sessionStorage.getItem("alumniFilter") === null + ? false + : sessionStorage.getItem("alumniFilter") === "true" + ); + const [studentCoachVolunteerFilter, setStudentCoachVolunteerFilter] = useState( + sessionStorage.getItem("studentCoachVolunteerFilter") === null + ? false + : sessionStorage.getItem("studentCoachVolunteerFilter") === "true" + ); + const [suggestedFilter, setSuggestedFilter] = useState( + sessionStorage.getItem("suggestedFilter") === null + ? false + : sessionStorage.getItem("suggestedFilter") === "true" + ); /** * Request all students with selected filters @@ -48,7 +66,7 @@ export default function StudentListFilters() { .filter(student => (student.firstName + " " + student.lastName) .toUpperCase() - .includes(nameFilter.toUpperCase()) + .includes(nameFilter!.toUpperCase()) ) .filter(student => !alumniFilter || student.alumni === alumniFilter) .filter( @@ -63,10 +81,11 @@ export default function StudentListFilters() { const newStudents: Student[] = []; for (const student of tempStudents) { for (const skill of student.skills) { - if (rolesFilter.includes(skill.skillId)) { - newStudents.push(student); - break; - } + rolesFilter.forEach(dropdownValue => { + if (dropdownValue.value === skill.skillId) { + newStudents.push(student); + } + }); } } setStudents(newStudents); @@ -80,11 +99,11 @@ export default function StudentListFilters() { try { const response = await getStudents( params.editionId!, - nameFilter, + nameFilter!, rolesFilter, alumniFilter, studentCoachVolunteerFilter, - suggestedFilter, + suggestedFilter!, requestedPage ); @@ -147,12 +166,12 @@ export default function StudentListFilters() { return ( - - + + diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx index e5dfe5e36..635bd6f38 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx @@ -22,6 +22,7 @@ export default function SuggestedForFilter({ checked={suggestedFilter} onChange={e => { setSuggestedFilter(e.target.checked); + sessionStorage.setItem("suggestedFilter", String(e.target.checked)); e.target.checked = suggestedFilter; }} /> diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/index.ts b/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/index.ts new file mode 100644 index 000000000..2c58462fc --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/index.ts @@ -0,0 +1 @@ +export { default } from "./SuggestedForFilter"; diff --git a/frontend/src/utils/api/students.ts b/frontend/src/utils/api/students.ts index 5457d2ed1..be1a7db02 100644 --- a/frontend/src/utils/api/students.ts +++ b/frontend/src/utils/api/students.ts @@ -1,6 +1,7 @@ import axios from "axios"; import { Student, Students } from "../../data/interfaces/students"; import { axiosInstance } from "./api"; +import { DropdownRole } from "../../components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter"; /** * API call to get students (and filter them). @@ -9,12 +10,13 @@ import { axiosInstance } from "./api"; * @param rolesFilter roles to filter on. * @param alumniFilter check to filter on. * @param studentCoachVolunteerFilter check to filter on. + * @param suggestedFilter check to filter on. * @param page The page to fetch. */ export async function getStudents( edition: string, nameFilter: string, - rolesFilter: number[], + rolesFilter: DropdownRole[], alumniFilter: boolean, studentCoachVolunteerFilter: boolean, suggestedFilter: boolean, @@ -22,7 +24,7 @@ export async function getStudents( ): Promise { let rolesRequestField: string = ""; for (const role of rolesFilter) { - rolesRequestField += "skill_ids=" + role.toString() + "&"; + rolesRequestField += "skill_ids=" + role.value.toString() + "&"; } const response = await axiosInstance.get( "/editions/" + From 3510f324a7a2f73f45138a7cb660d72b4b9632a5 Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 18 May 2022 00:49:28 +0200 Subject: [PATCH 358/649] copy student link to clipboard --- .../StudentCopyLink/StudentCopyLink.tsx | 12 ++++++++++++ .../StudentInformation/StudentInformation.tsx | 2 ++ .../StudentInformation/styles.ts | 9 +++++++++ 3 files changed, 23 insertions(+) create mode 100644 frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx diff --git a/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx b/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx new file mode 100644 index 000000000..5a541d6da --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx @@ -0,0 +1,12 @@ +import React from "react"; +import { StudentLink } from "../StudentInformation/styles"; + +/** + * Copy URL of current selected student. + */ +export default function StudentCopyLink() { + function copyStudentLink() { + navigator.clipboard.writeText(window.location.href); + } + return copy student link; +} diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index f11826520..a1150f7e4 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -28,6 +28,7 @@ import { Student } from "../../../data/interfaces/students"; import { getStudent } from "../../../utils/api/students"; import LoadSpinner from "../../Common/LoadSpinner"; import { toast } from "react-toastify"; +import StudentCopyLink from "../StudentCopyLink/StudentCopyLink"; /** * Component that renders all information of a student and all buttons to perform actions on this student. @@ -85,6 +86,7 @@ export default function StudentInformation(props: { studentId: number; editionId {student.firstName} {student.lastName} + diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index 9e2b38cb0..92d05efe8 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -15,9 +15,18 @@ export const FirstName = styled.h1` `; export const LastName = styled.h1` + padding-right: 5px; color: var(--osoc_orange); `; +export const StudentLink = styled.p` + font-size: 12px; + align-self: flex-end; + &:hover { + cursor: pointer; + } +`; + export const PreferedName = styled.p` font-size: 20px; `; From 1eb94f7d1a6dac6ebf21990a4d1f95f2d5e4e1cd Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 18 May 2022 04:35:23 +0200 Subject: [PATCH 359/649] students UI changes --- .../StudentInformation/StudentInformation.css | 14 ++ .../StudentInformation/StudentInformation.tsx | 130 ++++++++++-------- .../StudentInformation/styles.ts | 90 ++++++------ .../AdminDecisionContainer.tsx | 4 +- .../AdminDecisionContainer/styles.ts | 5 + .../CoachSuggestionContainer.tsx | 3 +- .../CoachSuggestionContainer/styles.ts | 5 + 7 files changed, 147 insertions(+), 104 deletions(-) create mode 100644 frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.css create mode 100644 frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/styles.ts diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.css b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.css new file mode 100644 index 000000000..d93f46c7b --- /dev/null +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.css @@ -0,0 +1,14 @@ +.CardContainer { + width: 100%; + border-color: var(--osoc_orange_darkened) !important; + margin-bottom: 2%; +} + +.CardHeader { + background-color: var(--card-color); + font-size: 30px; +} + +.CardBody { + background-color: var(--card-color); +} \ No newline at end of file diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx index a1150f7e4..036028fe8 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.tsx @@ -3,20 +3,19 @@ import { FullName, FirstName, LastName, - LineBreak, PreferedName, - StudentInfoTitle, SuggestionField, StudentInformationContainer, PersonalInfoFieldValue, PersonalInfoFieldSubject, - RolesField, - RolesValues, RoleValue, - NameAndRemoveButtonContainer, + NameContainer, SubjectFields, SubjectValues, PersonalInformation, + InfoHeadContainer, + PersonIcon, + AllName, } from "./styles"; import { AdminDecisionContainer, CoachSuggestionContainer } from "../SuggestionComponents"; import { Suggestion } from "../../../data/interfaces/suggestions"; @@ -29,6 +28,8 @@ import { getStudent } from "../../../utils/api/students"; import LoadSpinner from "../../Common/LoadSpinner"; import { toast } from "react-toastify"; import StudentCopyLink from "../StudentCopyLink/StudentCopyLink"; +import "./StudentInformation.css"; +import { Card } from "react-bootstrap"; /** * Component that renders all information of a student and all buttons to perform actions on this student. @@ -82,60 +83,77 @@ export default function StudentInformation(props: { studentId: number; editionId } else { return ( - - - {student.firstName} - {student.lastName} - - - - - Preferred name: {student.preferredName} - - Suggestions - {suggestions.map(suggestion => ( - - {suggestion.coach.name}: "{suggestionToText(suggestion.suggestion)}"{" "} - {suggestion.argumentation} - - ))} - - Personal information - - - Email: - Phone number: - Is an alumni?: - - Wants to be student coach?: - - - - {student.emailAddress} - {student.phoneNumber} - - {student.alumni ? "Yes" : "No"} - - - {student.wantsToBeStudentCoach ? "Yes" : "No"} - - - - - Skills - - Roles: - + + + + + + {student.firstName} + {student.lastName} + + +
    + {student.preferredName} +
    +     +     +     + + Suggestions + + {suggestions.map(suggestion => ( + + {suggestion.coach.name}: "{suggestionToText(suggestion.suggestion)}"{" "} + {suggestion.argumentation} + + ))} + + + + Personal information + + + + Email + Phone number + Is an alumni? + + Wants to be student coach? + + + + + {student.emailAddress} + + + {student.phoneNumber} + + + {student.alumni ? "Yes" : "No"} + + + {student.wantsToBeStudentCoach ? "Yes" : "No"} + + + + + + + Skills + {student.skills.map(skill => ( {skill.name} ))} -     -     - -
    - - {role === Role.ADMIN ? : <>} -
    + + + + Actions + + + {role === Role.ADMIN ? : <>} + + +     ); } diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index 92d05efe8..9f50d5288 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -1,51 +1,72 @@ import styled from "styled-components"; +import { BsPersonFill } from "react-icons/bs"; + +export const InfoHeadContainer = styled.div` + width: 100%; + margin-bottom: 1.5%; +`; export const StudentInformationContainer = styled.div` width: 100%; padding: 20px; `; +export const PersonIcon = styled(BsPersonFill)` + width: 15%; + height: 15%; + background: var(--osoc_red_darkened); +`; + +export const NameContainer = styled.div` + display: flex; + align-items: center; + margin-top: 1%; + margin-left: 1%; + width: 98%; +`; + +export const AllName = styled.div` + display: flex; + flex-direction: column; + margin-left: 2%; +`; + export const FullName = styled.div` display: flex; `; -export const FirstName = styled.h1` +export const FirstName = styled.span` + font-size: 250%; padding-right: 10px; - color: var(--osoc_orange); + color: white; `; -export const LastName = styled.h1` +export const LastName = styled.span` + font-size: 250%; padding-right: 5px; - color: var(--osoc_orange); + color: white; +`; + +export const PreferedName = styled.p` + margin-left: 1%; + font-size: 150%; `; export const StudentLink = styled.p` font-size: 12px; - align-self: flex-end; + align-self: center; &:hover { cursor: pointer; } `; -export const PreferedName = styled.p` - font-size: 20px; -`; - -export const StudentInfoTitle = styled.h4` - color: var(--osoc_orange); -`; - export const SuggestionField = styled.p` font-size: 20px; -`; - -export const PersonalInfoField = styled.div` - width: 50%; - display: flex; + margin-bottom: 1%; `; export const SubjectFields = styled.div` - width: 30vh; + width: 22vh; display: flex; flex-direction: column; `; @@ -65,35 +86,14 @@ export const PersonalInfoFieldSubject = styled.p` min-width: 30%; `; -export const PersonalInfoFieldValue = styled.p` - margin-left: 1vh; -`; - -export const RolesField = styled.div` - display: flex; -`; +export const PersonalInfoFieldValue = styled.p``; -export const RolesValues = styled.ul` - margin-left: 5%; -`; - -export const RoleValue = styled.li``; - -export const LineBreak = styled.div` - background-color: #163542; - height: 3px; - width: 100%; - margin-bottom: 30px; - margin-top: 30px; +export const RoleValue = styled.p` + margin-left: 2%; + font-size: 100%; + margin-bottom: 1%; `; export const DefinitiveDecisionContainer = styled.div` width: 40%; `; - -export const NameAndRemoveButtonContainer = styled.div` - display: flex; - justify-content: space-between; - align-items: center; - width: 100%; -`; diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx index 55081ad4c..2703a9f8e 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { Button, Modal } from "react-bootstrap"; import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; -import { SuggestionButtons, ConfirmButton } from "./styles"; +import { SuggestionButtons, ConfirmButton, ConfirmActionTitle } from "./styles"; import { confirmStudent } from "../../../../utils/api/suggestions"; import { useParams } from "react-router-dom"; @@ -104,7 +104,7 @@ export default function AdminDecisionContainer() {
    -

    Definitive decision by admin

    + Definitive decision by admin -

    Make a suggestion on this student

    + Make a suggestion on this student + diff --git a/frontend/src/components/AdminsComponents/RemoveAdmin.tsx b/frontend/src/components/AdminsComponents/RemoveAdmin.tsx index d9b5f2239..962815015 100644 --- a/frontend/src/components/AdminsComponents/RemoveAdmin.tsx +++ b/frontend/src/components/AdminsComponents/RemoveAdmin.tsx @@ -5,6 +5,7 @@ import { Button, Modal } from "react-bootstrap"; import { RemoveAdminBody } from "./styles"; import { ModalContentWarning } from "../Common/styles"; import { toast } from "react-toastify"; +import DeleteButton from "../Common/Buttons/DeleteButton"; /** * Button and popup to remove a user as admin (and as coach). @@ -20,35 +21,28 @@ export default function RemoveAdmin(props: { admin: User; removeAdmin: (user: Us }; async function removeUserAsAdmin(removeCoach: boolean) { - let removed; if (removeCoach) { - removed = await toast.promise(removeAdminAndCoach(props.admin.userId), { + await toast.promise(removeAdminAndCoach(props.admin.userId), { pending: "Removing admin", success: "Admin successfully removed", error: "Failed to remove admin", }); } else { - removed = await toast.promise(removeAdmin(props.admin.userId), { + await toast.promise(removeAdmin(props.admin.userId), { pending: "Removing admin", success: "Admin successfully removed", error: "Failed to remove admin", }); } - if (removed) { - props.removeAdmin(props.admin); - } else { - toast.error("Failed to remove admin", { - toastId: "remove_admin_failed", - }); - } + props.removeAdmin(props.admin); } return ( <> - + @@ -63,22 +57,22 @@ export default function RemoveAdmin(props: { admin: User; removeAdmin: (user: Us - - + diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx index 26506d207..9063fbcce 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx @@ -104,7 +104,7 @@ export default function RemoveCoach(props: { return ( <> - + Remove diff --git a/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx b/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx index 6c4144ab7..9e7e095dc 100644 --- a/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx +++ b/frontend/src/components/UsersComponents/Requests/RequestsComponents/AcceptReject.tsx @@ -15,44 +15,30 @@ export default function AcceptReject(props: { removeRequest: (coachAdded: boolean, request: Request) => void; }) { async function accept() { - const success = await toast.promise(acceptRequest(props.request.requestId), { + await toast.promise(acceptRequest(props.request.requestId), { error: "Failed to accept request", pending: "Accepting request", }); - if (!success) { - toast.error("Failed to accept request", { - toastId: "accept_request_failed", - }); - } - if (success) { - props.removeRequest(true, props.request); - } + props.removeRequest(true, props.request); } async function reject() { - const success = await toast.promise(rejectRequest(props.request.requestId), { + await toast.promise(rejectRequest(props.request.requestId), { error: "Failed to reject request", pending: "Rejecting request", }); - if (!success) { - toast.error("Failed to reject request", { - toastId: "reject_request_failed", - }); - } - if (success) { - props.removeRequest(false, props.request); - } + props.removeRequest(false, props.request); } return (
    - + Accept - + Reject
    diff --git a/frontend/src/utils/api/projects.ts b/frontend/src/utils/api/projects.ts index 8550937a7..43b884ed4 100644 --- a/frontend/src/utils/api/projects.ts +++ b/frontend/src/utils/api/projects.ts @@ -1,5 +1,5 @@ import axios from "axios"; -import { Projects, Project, CreateProject } from "../../data/interfaces/projects"; +import { CreateProject, Project, Projects } from "../../data/interfaces/projects"; import { axiosInstance } from "./api"; /** @@ -15,27 +15,18 @@ export async function getProjects( name: string, ownProjects: boolean, page: number -): Promise { - try { - const response = await axiosInstance.get( - "/editions/" + - edition + - "/projects?name=" + - name + - "&coach=" + - ownProjects.toString() + - "&page=" + - page.toString() - ); - const projects = response.data as Projects; - return projects; - } catch (error) { - if (axios.isAxiosError(error)) { - return null; - } else { - throw error; - } - } +): Promise { + const response = await axiosInstance.get( + "/editions/" + + edition + + "/projects?name=" + + name + + "&coach=" + + ownProjects.toString() + + "&page=" + + page.toString() + ); + return response.data as Projects; } /** @@ -47,8 +38,7 @@ export async function getProjects( export async function getProject(edition: string, projectId: number): Promise { try { const response = await axiosInstance.get("/editions/" + edition + "/projects/" + projectId); - const project = response.data as Project; - return project; + return response.data as Project; } catch (error) { if (axios.isAxiosError(error)) { return null; @@ -86,9 +76,7 @@ export async function createProject( try { const response = await axiosInstance.post("editions/" + edition + "/projects/", payload); - const project = response.data as Project; - - return project; + return response.data as Project; } catch (error) { if (axios.isAxiosError(error)) { return null; diff --git a/frontend/src/utils/api/users/admins.ts b/frontend/src/utils/api/users/admins.ts index cc6b8bf12..5bf0dbdb6 100644 --- a/frontend/src/utils/api/users/admins.ts +++ b/frontend/src/utils/api/users/admins.ts @@ -19,9 +19,8 @@ export async function getAdmins(page: number, name: string): Promise * Make the given user admin. * @param {number} userId The id of the user. */ -export async function addAdmin(userId: number): Promise { - const response = await axiosInstance.patch(`/users/${userId}`, { admin: true }); - return response.status === 204; +export async function addAdmin(userId: number) { + await axiosInstance.patch(`/users/${userId}`, { admin: true }); } /** @@ -29,8 +28,7 @@ export async function addAdmin(userId: number): Promise { * @param {number} userId The id of the user. */ export async function removeAdmin(userId: number) { - const response = await axiosInstance.patch(`/users/${userId}`, { admin: false }); - return response.status === 204; + await axiosInstance.patch(`/users/${userId}`, { admin: false }); } /** @@ -38,7 +36,6 @@ export async function removeAdmin(userId: number) { * @param {number} userId The id of the user. */ export async function removeAdminAndCoach(userId: number) { - const response2 = await axiosInstance.delete(`/users/${userId}/editions`); - const response1 = await axiosInstance.patch(`/users/${userId}`, { admin: false }); - return response1.status === 204 && response2.status === 204; + await axiosInstance.delete(`/users/${userId}/editions`); + await axiosInstance.patch(`/users/${userId}`, { admin: false }); } diff --git a/frontend/src/utils/api/users/requests.ts b/frontend/src/utils/api/users/requests.ts index b40888652..0b8fa1436 100644 --- a/frontend/src/utils/api/users/requests.ts +++ b/frontend/src/utils/api/users/requests.ts @@ -41,16 +41,14 @@ export async function getRequests( * Accept a coach request. * @param {number} requestId The id of the request. */ -export async function acceptRequest(requestId: number): Promise { - const response = await axiosInstance.post(`/users/requests/${requestId}/accept`); - return response.status === 204; +export async function acceptRequest(requestId: number) { + await axiosInstance.post(`/users/requests/${requestId}/accept`); } /** * Reject a coach request. * @param {number} requestId The id of the request.s */ -export async function rejectRequest(requestId: number): Promise { - const response = await axiosInstance.post(`/users/requests/${requestId}/reject`); - return response.status === 204; +export async function rejectRequest(requestId: number) { + await axiosInstance.post(`/users/requests/${requestId}/reject`); } diff --git a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx index 88c80d7c5..c67a8420c 100644 --- a/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx +++ b/frontend/src/views/projectViews/ProjectsPage/ProjectsPage.tsx @@ -56,34 +56,28 @@ export default function ProjectPage() { getProjects(editionId, searchString, ownProjects, page), { error: "Failed to retrieve projects" } ); - if (response) { + if (response.projects.length === 0) { + setMoreProjectsAvailable(false); + } + if (page === 0) { + setProjects(response.projects); + } else { + setProjects(projects.concat(response.projects)); + } + + if (searchString === "") { if (response.projects.length === 0) { - setMoreProjectsAvailable(false); + setAllProjectsFetched(true); } if (page === 0) { - setProjects(response.projects); + setAllProjects(response.projects); } else { - setProjects(projects.concat(response.projects)); + setAllProjects(allProjects.concat(response.projects)); } - - if (searchString === "") { - if (response.projects.length === 0) { - setAllProjectsFetched(true); - } - if (page === 0) { - setAllProjects(response.projects); - } else { - setAllProjects(allProjects.concat(response.projects)); - } - } - - setPage(page + 1); - } else { - toast.error("Failed to receive projects", { - toastId: "fetch_projects_failed", - }); } + setPage(page + 1); + setGotProjects(true); setLoading(false); } From 7da567293ecf9aae0ff6276100c670ebeafe2097 Mon Sep 17 00:00:00 2001 From: Francis Date: Wed, 18 May 2022 13:23:21 +0200 Subject: [PATCH 370/649] camelize path ids --- backend/src/app/utils/websockets.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/app/utils/websockets.py b/backend/src/app/utils/websockets.py index 28900ddfb..89b279eeb 100644 --- a/backend/src/app/utils/websockets.py +++ b/backend/src/app/utils/websockets.py @@ -4,6 +4,7 @@ from queue import Queue from fastapi import Depends, Request, Response, FastAPI +from humps import camelize from src.app.utils.dependencies import get_edition from src.database.models import Edition @@ -54,7 +55,7 @@ async def json(self) -> dict: """Generate json dict for live event""" return { 'method': self.method, - 'pathIds': self.path_ids, + 'pathIds': {camelize(k): v for k, v in self.path_ids}, 'eventType': self.event_type.value } From 6b2523b343bd791062de8cf3b5e8419aa3659df0 Mon Sep 17 00:00:00 2001 From: Francis Date: Wed, 18 May 2022 13:48:00 +0200 Subject: [PATCH 371/649] propper comprehension --- backend/src/app/utils/websockets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/utils/websockets.py b/backend/src/app/utils/websockets.py index 89b279eeb..bcccc7135 100644 --- a/backend/src/app/utils/websockets.py +++ b/backend/src/app/utils/websockets.py @@ -55,7 +55,7 @@ async def json(self) -> dict: """Generate json dict for live event""" return { 'method': self.method, - 'pathIds': {camelize(k): v for k, v in self.path_ids}, + 'pathIds': {camelize(k): v for k, v in self.path_ids.items()}, 'eventType': self.event_type.value } From ab9a3f2d9ebce7ffec992a95be58c57b6bda2af5 Mon Sep 17 00:00:00 2001 From: Francis <44001949+FKD13@users.noreply.github.com> Date: Wed, 18 May 2022 14:11:13 +0200 Subject: [PATCH 372/649] Create dependabot.yml --- dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 dependabot.yml diff --git a/dependabot.yml b/dependabot.yml new file mode 100644 index 000000000..f897ca9c7 --- /dev/null +++ b/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: pip + directory: "/backend" + schedule: + interval: weekly + - package-ecosystem: npm + directory: "/frontend" + schedule: + interval: weekly From 12a387fe3804eca91fbbd7ab706ba0de39cc0b5a Mon Sep 17 00:00:00 2001 From: Francis Date: Wed, 18 May 2022 14:21:57 +0200 Subject: [PATCH 373/649] move --- dependabot.yml => .github/dependabot.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dependabot.yml => .github/dependabot.yml (100%) diff --git a/dependabot.yml b/.github/dependabot.yml similarity index 100% rename from dependabot.yml rename to .github/dependabot.yml From b03e5af31da2fd4d59f1c56a5c591003504ceed8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 12:30:19 +0000 Subject: [PATCH 374/649] Bump @typescript-eslint/eslint-plugin from 5.15.0 to 5.25.0 in /frontend Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.15.0 to 5.25.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.25.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 96 ++++++++++++++++++++++++++++++++----------- 2 files changed, 72 insertions(+), 26 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index e3c964a17..d6ac432f7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -43,7 +43,7 @@ "@types/react-router-bootstrap": "^0.24.5", "@types/react-router-dom": "^5.3.3", "@types/styled-components": "^5.1.24", - "@typescript-eslint/eslint-plugin": "^5.12.0", + "@typescript-eslint/eslint-plugin": "^5.25.0", "@typescript-eslint/parser": "^5.12.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4e7153ec3..6f6d2446d 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2218,19 +2218,19 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.12.0", "@typescript-eslint/eslint-plugin@^5.5.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.15.0.tgz#c28ef7f2e688066db0b6a9d95fb74185c114fb9a" - integrity sha512-u6Db5JfF0Esn3tiAKELvoU5TpXVSkOpZ78cEGn/wXtT2RVqs2vkt4ge6N8cRCyw7YVKhmmLDbwI2pg92mlv7cA== - dependencies: - "@typescript-eslint/scope-manager" "5.15.0" - "@typescript-eslint/type-utils" "5.15.0" - "@typescript-eslint/utils" "5.15.0" - debug "^4.3.2" +"@typescript-eslint/eslint-plugin@^5.25.0", "@typescript-eslint/eslint-plugin@^5.5.0": + version "5.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.25.0.tgz#e8ce050990e4d36cc200f2de71ca0d3eb5e77a31" + integrity sha512-icYrFnUzvm+LhW0QeJNKkezBu6tJs9p/53dpPLFH8zoM9w1tfaKzVurkPotEpAqQ8Vf8uaFyL5jHd0Vs6Z0ZQg== + dependencies: + "@typescript-eslint/scope-manager" "5.25.0" + "@typescript-eslint/type-utils" "5.25.0" + "@typescript-eslint/utils" "5.25.0" + debug "^4.3.4" functional-red-black-tree "^1.0.1" - ignore "^5.1.8" + ignore "^5.2.0" regexpp "^3.2.0" - semver "^7.3.5" + semver "^7.3.7" tsutils "^3.21.0" "@typescript-eslint/experimental-utils@^5.0.0": @@ -2258,13 +2258,21 @@ "@typescript-eslint/types" "5.15.0" "@typescript-eslint/visitor-keys" "5.15.0" -"@typescript-eslint/type-utils@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.15.0.tgz#d2c02eb2bdf54d0a645ba3a173ceda78346cf248" - integrity sha512-KGeDoEQ7gHieLydujGEFLyLofipe9PIzfvA/41urz4hv+xVxPEbmMQonKSynZ0Ks2xDhJQ4VYjB3DnRiywvKDA== +"@typescript-eslint/scope-manager@5.25.0": + version "5.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.25.0.tgz#e78f1484bca7e484c48782075219c82c6b77a09f" + integrity sha512-p4SKTFWj+2VpreUZ5xMQsBMDdQ9XdRvODKXN4EksyBjFp2YvQdLkyHqOffakYZPuWJUDNu3jVXtHALDyTv3cww== dependencies: - "@typescript-eslint/utils" "5.15.0" - debug "^4.3.2" + "@typescript-eslint/types" "5.25.0" + "@typescript-eslint/visitor-keys" "5.25.0" + +"@typescript-eslint/type-utils@5.25.0": + version "5.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.25.0.tgz#5750d26a5db4c4d68d511611e0ada04e56f613bc" + integrity sha512-B6nb3GK3Gv1Rsb2pqalebe/RyQoyG/WDy9yhj8EE0Ikds4Xa8RR28nHz+wlt4tMZk5bnAr0f3oC8TuDAd5CPrw== + dependencies: + "@typescript-eslint/utils" "5.25.0" + debug "^4.3.4" tsutils "^3.21.0" "@typescript-eslint/types@5.15.0": @@ -2272,6 +2280,11 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501" integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA== +"@typescript-eslint/types@5.25.0": + version "5.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.25.0.tgz#dee51b1855788b24a2eceeae54e4adb89b088dd8" + integrity sha512-7fWqfxr0KNHj75PFqlGX24gWjdV/FDBABXL5dyvBOWHpACGyveok8Uj4ipPX/1fGU63fBkzSIycEje4XsOxUFA== + "@typescript-eslint/typescript-estree@5.15.0": version "5.15.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz#81513a742a9c657587ad1ddbca88e76c6efb0aac" @@ -2285,7 +2298,20 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/utils@5.15.0", "@typescript-eslint/utils@^5.13.0": +"@typescript-eslint/typescript-estree@5.25.0": + version "5.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.25.0.tgz#a7ab40d32eb944e3fb5b4e3646e81b1bcdd63e00" + integrity sha512-MrPODKDych/oWs/71LCnuO7NyR681HuBly2uLnX3r5i4ME7q/yBqC4hW33kmxtuauLTM0OuBOhhkFaxCCOjEEw== + dependencies: + "@typescript-eslint/types" "5.25.0" + "@typescript-eslint/visitor-keys" "5.25.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" + tsutils "^3.21.0" + +"@typescript-eslint/utils@5.15.0": version "5.15.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.15.0.tgz#468510a0974d3ced8342f37e6c662778c277f136" integrity sha512-081rWu2IPKOgTOhHUk/QfxuFog8m4wxW43sXNOMSCdh578tGJ1PAaWPsj42LOa7pguh173tNlMigsbrHvh/mtA== @@ -2297,6 +2323,18 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" +"@typescript-eslint/utils@5.25.0", "@typescript-eslint/utils@^5.13.0": + version "5.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.25.0.tgz#272751fd737733294b4ab95e16c7f2d4a75c2049" + integrity sha512-qNC9bhnz/n9Kba3yI6HQgQdBLuxDoMgdjzdhSInZh6NaDnFpTUlwNGxplUFWfY260Ya0TRPvkg9dd57qxrJI9g== + dependencies: + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.25.0" + "@typescript-eslint/types" "5.25.0" + "@typescript-eslint/typescript-estree" "5.25.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + "@typescript-eslint/visitor-keys@5.15.0": version "5.15.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz#5669739fbf516df060f978be6a6dce75855a8027" @@ -2305,6 +2343,14 @@ "@typescript-eslint/types" "5.15.0" eslint-visitor-keys "^3.0.0" +"@typescript-eslint/visitor-keys@5.25.0": + version "5.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.25.0.tgz#33aa5fdcc5cedb9f4c8828c6a019d58548d4474b" + integrity sha512-yd26vFgMsC4h2dgX4+LR+GeicSKIfUvZREFLf3DDjZPtqgLx5AJZr6TetMNwFP9hcKreTTeztQYBTNbNoOycwA== + dependencies: + "@typescript-eslint/types" "5.25.0" + eslint-visitor-keys "^3.3.0" + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -3756,7 +3802,7 @@ debug@2.6.9, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -5026,7 +5072,7 @@ globals@^13.6.0, globals@^13.9.0: dependencies: type-fest "^0.20.2" -globby@^11.0.1, globby@^11.0.4: +globby@^11.0.1, globby@^11.0.4, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -5296,7 +5342,7 @@ ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^5.1.1, ignore@^5.1.8, ignore@^5.2.0: +ignore@^5.1.1, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -8406,10 +8452,10 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== +semver@^7.3.2, semver@^7.3.5, semver@^7.3.7: + version "7.3.7" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== dependencies: lru-cache "^6.0.0" From 413e0f9b1e3d529e17b40068e6624cf1e9e52ca1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 12:30:47 +0000 Subject: [PATCH 375/649] Bump @testing-library/react from 12.1.4 to 12.1.5 in /frontend Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 12.1.4 to 12.1.5. - [Release notes](https://github.com/testing-library/react-testing-library/releases) - [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/react-testing-library/compare/v12.1.4...v12.1.5) --- updated-dependencies: - dependency-name: "@testing-library/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 38 ++++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index e3c964a17..b642cd063 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { "@testing-library/jest-dom": "^5.14.1", - "@testing-library/react": "^12.0.0", + "@testing-library/react": "^12.1.5", "@testing-library/user-event": "^13.2.1", "@types/axios": "^0.14.0", "@types/enzyme": "^3.10.11", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4e7153ec3..47f4c6e02 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1024,14 +1024,7 @@ core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.16", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.6", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" - integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.12.0", "@babel/runtime@^7.13.10", "@babel/runtime@^7.7.2": +"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.13.16", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.6", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== @@ -1779,14 +1772,14 @@ lodash "^4.17.15" redent "^3.0.0" -"@testing-library/react@^12.0.0": - version "12.1.4" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.4.tgz#09674b117e550af713db3f4ec4c0942aa8bbf2c0" - integrity sha512-jiPKOm7vyUw311Hn/HlNQ9P8/lHNtArAx0PisXyFixDDvfl8DbD6EUdbshK5eqauvBSvzZd19itqQ9j3nferJA== +"@testing-library/react@^12.1.5": + version "12.1.5" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.5.tgz#bb248f72f02a5ac9d949dea07279095fa577963b" + integrity sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg== dependencies: "@babel/runtime" "^7.12.5" "@testing-library/dom" "^8.0.0" - "@types/react-dom" "*" + "@types/react-dom" "<18.0.0" "@testing-library/user-event@^13.2.1": version "13.5.0" @@ -2074,12 +2067,12 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@*", "@types/react-dom@^17.0.9": - version "17.0.14" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" - integrity sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ== +"@types/react-dom@<18.0.0", "@types/react-dom@^17.0.9": + version "17.0.17" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1" + integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg== dependencies: - "@types/react" "*" + "@types/react" "^17" "@types/react-infinite-scroller@^1.2.3": version "1.2.3" @@ -2129,6 +2122,15 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/react@^17": + version "17.0.45" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.45.tgz#9b3d5b661fd26365fefef0e766a1c6c30ccf7b3f" + integrity sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + "@types/resolve@1.17.1": version "1.17.1" resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" From 807aa238c3a0486c4ab76b2ec09566d1fdb9d455 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 12:33:45 +0000 Subject: [PATCH 376/649] Bump sqlalchemy from 1.4.31 to 1.4.36 in /backend Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.4.31 to 1.4.36. - [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases) - [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/main/CHANGES.rst) - [Commits](https://github.com/sqlalchemy/sqlalchemy/commits) --- updated-dependencies: - dependency-name: sqlalchemy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- backend/poetry.lock | 78 +++++++++++++++++++++--------------------- backend/pyproject.toml | 2 +- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/backend/poetry.lock b/backend/poetry.lock index 980787f33..46626fc98 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -832,7 +832,7 @@ python-versions = ">=3.5" [[package]] name = "sqlalchemy" -version = "1.4.31" +version = "1.4.36" description = "Database Abstraction Library" category = "main" optional = false @@ -845,7 +845,7 @@ greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platfo aiomysql = ["greenlet (!=0.4.17)", "aiomysql"] aiosqlite = ["typing_extensions (!=3.10.0.1)", "greenlet (!=0.4.17)", "aiosqlite"] asyncio = ["greenlet (!=0.4.17)"] -asyncmy = ["greenlet (!=0.4.17)", "asyncmy (>=0.2.3)"] +asyncmy = ["greenlet (!=0.4.17)", "asyncmy (>=0.2.3,!=0.2.4)"] mariadb_connector = ["mariadb (>=1.0.1)"] mssql = ["pyodbc"] mssql_pymssql = ["pymssql"] @@ -1036,7 +1036,7 @@ multidict = ">=4.0" [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "af57762cac23f6cbae8e7ff78c36a7395e3e85f4083303fe6eb8d713dc5ea941" +content-hash = "f816647bc57fb678f2a4a6b44cbe13b93c1854c61c2eea4575b5fd4b2d636a7f" [metadata.files] aiohttp = [ @@ -1863,42 +1863,42 @@ sniffio = [ {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, ] sqlalchemy = [ - {file = "SQLAlchemy-1.4.31-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:c3abc34fed19fdeaead0ced8cf56dd121f08198008c033596aa6aae7cc58f59f"}, - {file = "SQLAlchemy-1.4.31-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:8d0949b11681380b4a50ac3cd075e4816afe9fa4a8c8ae006c1ca26f0fa40ad8"}, - {file = "SQLAlchemy-1.4.31-cp27-cp27m-win32.whl", hash = "sha256:f3b7ec97e68b68cb1f9ddb82eda17b418f19a034fa8380a0ac04e8fe01532875"}, - {file = "SQLAlchemy-1.4.31-cp27-cp27m-win_amd64.whl", hash = "sha256:81f2dd355b57770fdf292b54f3e0a9823ec27a543f947fa2eb4ec0df44f35f0d"}, - {file = "SQLAlchemy-1.4.31-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4ad31cec8b49fd718470328ad9711f4dc703507d434fd45461096da0a7135ee0"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:05fa14f279d43df68964ad066f653193187909950aa0163320b728edfc400167"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dccff41478050e823271642837b904d5f9bda3f5cf7d371ce163f00a694118d6"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57205844f246bab9b666a32f59b046add8995c665d9ecb2b7b837b087df90639"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ea8210090a816d48a4291a47462bac750e3bc5c2442e6d64f7b8137a7c3f9ac5"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-win32.whl", hash = "sha256:2e216c13ecc7fcdcbb86bb3225425b3ed338e43a8810c7089ddb472676124b9b"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-win_amd64.whl", hash = "sha256:e3a86b59b6227ef72ffc10d4b23f0fe994bef64d4667eab4fb8cd43de4223bec"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:2fd4d3ca64c41dae31228b80556ab55b6489275fb204827f6560b65f95692cf3"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6f22c040d196f841168b1456e77c30a18a3dc16b336ddbc5a24ce01ab4e95ae0"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c0c7171aa5a57e522a04a31b84798b6c926234cb559c0939840c3235cf068813"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d046a9aeba9bc53e88a41e58beb72b6205abb9a20f6c136161adf9128e589db5"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-win32.whl", hash = "sha256:d86132922531f0dc5a4f424c7580a472a924dd737602638e704841c9cb24aea2"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-win_amd64.whl", hash = "sha256:ca68c52e3cae491ace2bf39b35fef4ce26c192fd70b4cd90f040d419f70893b5"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:cf2cd387409b12d0a8b801610d6336ee7d24043b6dd965950eaec09b73e7262f"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb4b15fb1f0aafa65cbdc62d3c2078bea1ceecbfccc9a1f23a2113c9ac1191fa"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c317ddd7c586af350a6aef22b891e84b16bff1a27886ed5b30f15c1ed59caeaa"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c7ed6c69debaf6198fadb1c16ae1253a29a7670bbf0646f92582eb465a0b999"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-win32.whl", hash = "sha256:6a01ec49ca54ce03bc14e10de55dfc64187a2194b3b0e5ac0fdbe9b24767e79e"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-win_amd64.whl", hash = "sha256:330eb45395874cc7787214fdd4489e2afb931bc49e0a7a8f9cd56d6e9c5b1639"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:5e9c7b3567edbc2183607f7d9f3e7e89355b8f8984eec4d2cd1e1513c8f7b43f"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:de85c26a5a1c72e695ab0454e92f60213b4459b8d7c502e0be7a6369690eeb1a"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:975f5c0793892c634c4920057da0de3a48bbbbd0a5c86f5fcf2f2fedf41b76da"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5c20c8415173b119762b6110af64448adccd4d11f273fb9f718a9865b88a99c"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-win32.whl", hash = "sha256:b35dca159c1c9fa8a5f9005e42133eed82705bf8e243da371a5e5826440e65ca"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-win_amd64.whl", hash = "sha256:b7b20c88873675903d6438d8b33fba027997193e274b9367421e610d9da76c08"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:85e4c244e1de056d48dae466e9baf9437980c19fcde493e0db1a0a986e6d75b4"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e79e73d5ee24196d3057340e356e6254af4d10e1fc22d3207ea8342fc5ffb977"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:15a03261aa1e68f208e71ae3cd845b00063d242cbf8c87348a0c2c0fc6e1f2ac"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ddc5e5ccc0160e7ad190e5c61eb57560f38559e22586955f205e537cda26034"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-win32.whl", hash = "sha256:289465162b1fa1e7a982f8abe59d26a8331211cad4942e8031d2b7db1f75e649"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-win_amd64.whl", hash = "sha256:9e4fb2895b83993831ba2401b6404de953fdbfa9d7d4fa6a4756294a83bbc94f"}, - {file = "SQLAlchemy-1.4.31.tar.gz", hash = "sha256:582b59d1e5780a447aada22b461e50b404a9dc05768da1d87368ad8190468418"}, + {file = "SQLAlchemy-1.4.36-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:81e53bd383c2c33de9d578bfcc243f559bd3801a0e57f2bcc9a943c790662e0c"}, + {file = "SQLAlchemy-1.4.36-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6e1fe00ee85c768807f2a139b83469c1e52a9ffd58a6eb51aa7aeb524325ab18"}, + {file = "SQLAlchemy-1.4.36-cp27-cp27m-win32.whl", hash = "sha256:d57ac32f8dc731fddeb6f5d1358b4ca5456e72594e664769f0a9163f13df2a31"}, + {file = "SQLAlchemy-1.4.36-cp27-cp27m-win_amd64.whl", hash = "sha256:fca8322e04b2dde722fcb0558682740eebd3bd239bea7a0d0febbc190e99dc15"}, + {file = "SQLAlchemy-1.4.36-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:53d2d9ee93970c969bc4e3c78b1277d7129554642f6ffea039c282c7dc4577bc"}, + {file = "SQLAlchemy-1.4.36-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:f0394a3acfb8925db178f7728adb38c027ed7e303665b225906bfa8099dc1ce8"}, + {file = "SQLAlchemy-1.4.36-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09c606d8238feae2f360b8742ffbe67741937eb0a05b57f536948d198a3def96"}, + {file = "SQLAlchemy-1.4.36-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8d07fe2de0325d06e7e73281e9a9b5e259fbd7cbfbe398a0433cbb0082ad8fa7"}, + {file = "SQLAlchemy-1.4.36-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5041474dcab7973baa91ec1f3112049a9dd4652898d6a95a6a895ff5c58beb6b"}, + {file = "SQLAlchemy-1.4.36-cp310-cp310-win32.whl", hash = "sha256:be094460930087e50fd08297db9d7aadaed8408ad896baf758e9190c335632da"}, + {file = "SQLAlchemy-1.4.36-cp310-cp310-win_amd64.whl", hash = "sha256:64d796e9af522162f7f2bf7a3c5531a0a550764c426782797bbeed809d0646c5"}, + {file = "SQLAlchemy-1.4.36-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:a0ae3aa2e86a4613f2d4c49eb7da23da536e6ce80b2bfd60bbb2f55fc02b0b32"}, + {file = "SQLAlchemy-1.4.36-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d50cb71c1dbed70646d521a0975fb0f92b7c3f84c61fa59e07be23a1aaeecfc"}, + {file = "SQLAlchemy-1.4.36-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:16abf35af37a3d5af92725fc9ec507dd9e9183d261c2069b6606d60981ed1c6e"}, + {file = "SQLAlchemy-1.4.36-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5864a83bd345871ad9699ce466388f836db7572003d67d9392a71998092210e3"}, + {file = "SQLAlchemy-1.4.36-cp36-cp36m-win32.whl", hash = "sha256:fbf8c09fe9728168f8cc1b40c239eab10baf9c422c18be7f53213d70434dea43"}, + {file = "SQLAlchemy-1.4.36-cp36-cp36m-win_amd64.whl", hash = "sha256:6e859fa96605027bd50d8e966db1c4e1b03e7b3267abbc4b89ae658c99393c58"}, + {file = "SQLAlchemy-1.4.36-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:166a3887ec355f7d2f12738f7fa25dc8ac541867147a255f790f2f41f614cb44"}, + {file = "SQLAlchemy-1.4.36-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e885548da361aa3f8a9433db4cfb335b2107e533bf314359ae3952821d84b3e"}, + {file = "SQLAlchemy-1.4.36-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5c90ef955d429966d84326d772eb34333178737ebb669845f1d529eb00c75e72"}, + {file = "SQLAlchemy-1.4.36-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a052bd9f53004f8993c624c452dfad8ec600f572dd0ed0445fbe64b22f5570e"}, + {file = "SQLAlchemy-1.4.36-cp37-cp37m-win32.whl", hash = "sha256:dce3468bf1fc12374a1a732c9efd146ce034f91bb0482b602a9311cb6166a920"}, + {file = "SQLAlchemy-1.4.36-cp37-cp37m-win_amd64.whl", hash = "sha256:6cb4c4f57a20710cea277edf720d249d514e587f796b75785ad2c25e1c0fed26"}, + {file = "SQLAlchemy-1.4.36-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:e74ce103b81c375c3853b436297952ef8d7863d801dcffb6728d01544e5191b5"}, + {file = "SQLAlchemy-1.4.36-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b20c4178ead9bc398be479428568ff31b6c296eb22e75776273781a6551973f"}, + {file = "SQLAlchemy-1.4.36-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:af2587ae11400157753115612d6c6ad255143efba791406ad8a0cbcccf2edcb3"}, + {file = "SQLAlchemy-1.4.36-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:83cf3077712be9f65c9aaa0b5bc47bc1a44789fd45053e2e3ecd59ff17c63fe9"}, + {file = "SQLAlchemy-1.4.36-cp38-cp38-win32.whl", hash = "sha256:ce20f5da141f8af26c123ebaa1b7771835ca6c161225ce728962a79054f528c3"}, + {file = "SQLAlchemy-1.4.36-cp38-cp38-win_amd64.whl", hash = "sha256:316c7e5304dda3e3ad711569ac5d02698bbc71299b168ac56a7076b86259f7ea"}, + {file = "SQLAlchemy-1.4.36-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:f522214f6749bc073262529c056f7dfd660f3b5ec4180c5354d985eb7219801e"}, + {file = "SQLAlchemy-1.4.36-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2ecac4db8c1aa4a269f5829df7e706639a24b780d2ac46b3e485cbbd27ec0028"}, + {file = "SQLAlchemy-1.4.36-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b3db741beaa983d4cbf9087558620e7787106319f7e63a066990a70657dd6b35"}, + {file = "SQLAlchemy-1.4.36-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2ec89bf98cc6a0f5d1e28e3ad28e9be6f3b4bdbd521a4053c7ae8d5e1289a8a1"}, + {file = "SQLAlchemy-1.4.36-cp39-cp39-win32.whl", hash = "sha256:e12532c4d3f614678623da5d852f038ace1f01869b89f003ed6fe8c793f0c6a3"}, + {file = "SQLAlchemy-1.4.36-cp39-cp39-win_amd64.whl", hash = "sha256:cb441ca461bf97d00877b607f132772644b623518b39ced54da433215adce691"}, + {file = "SQLAlchemy-1.4.36.tar.gz", hash = "sha256:64678ac321d64a45901ef2e24725ec5e783f1f4a588305e196431447e7ace243"}, ] sqlalchemy-utils = [ {file = "SQLAlchemy-Utils-0.38.2.tar.gz", hash = "sha256:9e01d6d3fb52d3926fcd4ea4a13f3540701b751aced0316bff78264402c2ceb4"}, diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 770b316a5..eaa29cc75 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -36,7 +36,7 @@ python-multipart = "0.0.5" requests = "2.27.1" # SQLAlchemy: ORM and database toolkit -SQLAlchemy = "1.4.31" +SQLAlchemy = "1.4.36" # SQLAlchemy-Utils: Various utility functions and datatypes for SQLAlchemy sqlalchemy-utils = "0.38.2" From 706f3eb182c66edfc3c955ec4ec5ede982e3d8a1 Mon Sep 17 00:00:00 2001 From: Francis Date: Wed, 18 May 2022 14:41:08 +0200 Subject: [PATCH 377/649] add higher limit --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f897ca9c7..a847f962a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,9 +2,11 @@ version: 2 updates: - package-ecosystem: pip directory: "/backend" + open-pull-requests-limit: 100 schedule: interval: weekly - package-ecosystem: npm directory: "/frontend" + open-pull-requests-limit: 100 schedule: interval: weekly From 0dd218ad2932a745c411d94bffcc3b8b4c754149 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Wed, 18 May 2022 14:42:21 +0200 Subject: [PATCH 378/649] Center remove button adminspage --- frontend/src/components/AdminsComponents/AdminList.tsx | 3 ++- .../src/components/AdminsComponents/AdminListItem.tsx | 5 +++-- frontend/src/components/Common/Tables/styles.ts | 10 ++++++++++ .../Coaches/CoachesComponents/CoachList.tsx | 3 ++- .../Coaches/CoachesComponents/CoachListItem.tsx | 2 +- .../src/components/UsersComponents/Coaches/styles.ts | 10 ---------- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/AdminsComponents/AdminList.tsx b/frontend/src/components/AdminsComponents/AdminList.tsx index b0667c3fc..3c98cf078 100644 --- a/frontend/src/components/AdminsComponents/AdminList.tsx +++ b/frontend/src/components/AdminsComponents/AdminList.tsx @@ -5,6 +5,7 @@ import { AdminListItem } from "./index"; import LoadSpinner from "../Common/LoadSpinner"; import { ListDiv } from "../Common/Users/styles"; import { SpinnerContainer } from "../Common/LoadSpinner/styles"; +import { RemoveTh } from "../Common/Tables/styles"; /** * List of [[AdminListItem]]s which represents all admins. @@ -41,7 +42,7 @@ export default function AdminList(props: { Name Email - Remove + Remove diff --git a/frontend/src/components/AdminsComponents/AdminListItem.tsx b/frontend/src/components/AdminsComponents/AdminListItem.tsx index 2d3bb937f..2d7a5ea03 100644 --- a/frontend/src/components/AdminsComponents/AdminListItem.tsx +++ b/frontend/src/components/AdminsComponents/AdminListItem.tsx @@ -2,6 +2,7 @@ import { User } from "../../utils/api/users/users"; import React from "react"; import { RemoveAdmin } from "./index"; import { EmailAndAuth } from "../Common/Users"; +import { RemoveTd } from "../Common/Tables/styles"; /** * An item from [[AdminList]]. Contains the credentials of an admin and a button to remove the admin. @@ -15,9 +16,9 @@ export default function AdminItem(props: { admin: User; removeAdmin: (user: User - + - + ); } diff --git a/frontend/src/components/Common/Tables/styles.ts b/frontend/src/components/Common/Tables/styles.ts index 9cc14f420..95b6ded13 100644 --- a/frontend/src/components/Common/Tables/styles.ts +++ b/frontend/src/components/Common/Tables/styles.ts @@ -7,3 +7,13 @@ export const StyledTable = styled(Table).attrs({ variant: "dark", hover: false, })``; + +export const RemoveTh = styled.th` + width: 200px; + text-align: center; +`; + +export const RemoveTd = styled.td` + text-align: center; + vertical-align: middle; +`; diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachList.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachList.tsx index 2cce1db9e..e306197fd 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachList.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachList.tsx @@ -1,10 +1,11 @@ import { User } from "../../../../utils/api/users/users"; -import { CoachesTable, RemoveTh } from "../styles"; +import { CoachesTable } from "../styles"; import React from "react"; import InfiniteScroll from "react-infinite-scroller"; import { CoachListItem } from "./index"; import LoadSpinner from "../../../Common/LoadSpinner"; import { ListDiv } from "../../../Common/Users/styles"; +import { RemoveTh } from "../../../Common/Tables/styles"; /** * A list of [[CoachListItem]]s. diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachListItem.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachListItem.tsx index c38535bc5..c3a7ccfdc 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachListItem.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/CoachListItem.tsx @@ -1,8 +1,8 @@ import { User } from "../../../../utils/api/users/users"; import React from "react"; import RemoveCoach from "./RemoveCoach"; -import { RemoveTd } from "../styles"; import { EmailAndAuth } from "../../../Common/Users"; +import { RemoveTd } from "../../../Common/Tables/styles"; /** * An item from [[CoachList]] which represents one coach. diff --git a/frontend/src/components/UsersComponents/Coaches/styles.ts b/frontend/src/components/UsersComponents/Coaches/styles.ts index b261088f4..844fc7e6b 100644 --- a/frontend/src/components/UsersComponents/Coaches/styles.ts +++ b/frontend/src/components/UsersComponents/Coaches/styles.ts @@ -26,16 +26,6 @@ export const ModalContent = styled.div` background-color: var(--osoc_blue); `; -export const RemoveTh = styled.th` - width: 200px; - text-align: center; -`; - -export const RemoveTd = styled.td` - text-align: center; - vertical-align: middle; -`; - export const DialogButtonDiv = styled.div` margin-right: 4px; margin-bottom: 4px; From 5e0a4195d9407d29bfef85bfb2f9ba96087bd455 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 12:48:00 +0000 Subject: [PATCH 379/649] Bump prettier from 2.6.0 to 2.6.2 in /frontend Bumps [prettier](https://github.com/prettier/prettier) from 2.6.0 to 2.6.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.6.0...2.6.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index e3c964a17..8acd1f628 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -56,7 +56,7 @@ "eslint-plugin-react": "^7.28.0", "eslint-plugin-standard": "^5.0.0", "jest": "^27.5.1", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "typedoc": "^0.22.13" }, "scripts": { diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4e7153ec3..769cf03da 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -7581,10 +7581,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.5.1: - version "2.6.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4" - integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A== +prettier@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" + integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0" From 2c572a9e2f30d5ab7bace47ca4eb6e841a780d00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 12:53:00 +0000 Subject: [PATCH 380/649] Bump @types/node from 16.11.26 to 17.0.34 in /frontend Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.11.26 to 17.0.34. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index e3c964a17..de6c8b854 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -36,7 +36,7 @@ "@types/enzyme": "^3.10.11", "@types/enzyme-adapter-react-16": "^1.0.6", "@types/jest": "^27.0.1", - "@types/node": "^16.7.13", + "@types/node": "^17.0.34", "@types/react": "^17.0.20", "@types/react-dom": "^17.0.9", "@types/react-infinite-scroller": "^1.2.3", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4e7153ec3..0b09bf640 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2034,15 +2034,10 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== -"@types/node@*": - version "17.0.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" - integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== - -"@types/node@^16.7.13": - version "16.11.26" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.26.tgz#63d204d136c9916fb4dcd1b50f9740fe86884e47" - integrity sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ== +"@types/node@*", "@types/node@^17.0.34": + version "17.0.34" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.34.tgz#3b0b6a50ff797280b8d000c6281d229f9c538cef" + integrity sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA== "@types/parse-json@^4.0.0": version "4.0.0" From 25bb86cd371cf6962d11d1308e8f7f6ef816411b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:00:51 +0000 Subject: [PATCH 381/649] Bump react-router-dom from 6.2.2 to 6.3.0 in /frontend Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.2.2 to 6.3.0. - [Release notes](https://github.com/remix-run/react-router/releases) - [Commits](https://github.com/remix-run/react-router/commits/v6.3.0/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index d6ac432f7..258c000fc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,7 +18,7 @@ "react-icons": "^4.3.1", "react-infinite-scroller": "^1.2.6", "react-router-bootstrap": "^0.26.1", - "react-router-dom": "^6.2.1", + "react-router-dom": "^6.3.0", "react-scripts": "^5.0.0", "react-select": "^5.3.1", "react-social-login-buttons": "^3.6.0", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 6f6d2446d..ad172b244 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -7947,18 +7947,18 @@ react-router-bootstrap@^0.26.1: dependencies: prop-types "^15.7.2" -react-router-dom@^6.2.1: - version "6.2.2" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.2.tgz#f1a2c88365593c76b9612ae80154a13fcb72e442" - integrity sha512-AtYEsAST7bDD4dLSQHDnk/qxWLJdad5t1HFa1qJyUrCeGgEuCSw0VB/27ARbF9Fi/W5598ujvJOm3ujUCVzuYQ== +react-router-dom@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" + integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw== dependencies: history "^5.2.0" - react-router "6.2.2" + react-router "6.3.0" -react-router@6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.2.tgz#495e683a0c04461eeb3d705fe445d6cf42f0c249" - integrity sha512-/MbxyLzd7Q7amp4gDOGaYvXwhEojkJD5BtExkuKmj39VEE0m3l/zipf6h2WIB2jyAO0lI6NGETh4RDcktRm4AQ== +react-router@6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557" + integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ== dependencies: history "^5.2.0" From 20e9b02ebe9c29cd85ab9e2ff42617ee89bfeaa9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:00:51 +0000 Subject: [PATCH 382/649] Bump typescript from 4.6.2 to 4.6.4 in /frontend Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.6.2 to 4.6.4. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.2...v4.6.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index d6ac432f7..3f9e44824 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -25,7 +25,7 @@ "react-toastify": "^9.0.1", "reactjs-popup": "^2.0.5", "styled-components": "^5.3.3", - "typescript": "^4.4.2", + "typescript": "^4.6.4", "web-vitals": "^2.1.0" }, "devDependencies": { diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 6f6d2446d..74ea7a56d 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -9201,10 +9201,10 @@ typedoc@^0.22.13: minimatch "^5.0.1" shiki "^0.10.1" -typescript@^4.4.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4" - integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg== +typescript@^4.6.4: + version "4.6.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" + integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== unbox-primitive@^1.0.1: version "1.0.1" From 5779c054504f5f373b94283e67dd60ca6289298e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:11:47 +0000 Subject: [PATCH 383/649] Bump react-scripts from 5.0.0 to 5.0.1 in /frontend Bumps [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@5.0.1/packages/react-scripts) --- updated-dependencies: - dependency-name: react-scripts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 258c000fc..0673b70f3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,7 +19,7 @@ "react-infinite-scroller": "^1.2.6", "react-router-bootstrap": "^0.26.1", "react-router-dom": "^6.3.0", - "react-scripts": "^5.0.0", + "react-scripts": "^5.0.1", "react-select": "^5.3.1", "react-social-login-buttons": "^3.6.0", "react-toastify": "^9.0.1", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index ad172b244..5726ff97a 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4320,10 +4320,10 @@ eslint-config-prettier@^8.3.0: resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== -eslint-config-react-app@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.0.tgz#0fa96d5ec1dfb99c029b1554362ab3fa1c3757df" - integrity sha512-xyymoxtIt1EOsSaGag+/jmcywRuieQoA2JbPCjnw9HukFj9/97aGPoZVFioaotzk1K5Qt9sHO5EutZbkrAXS0g== +eslint-config-react-app@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz#73ba3929978001c5c86274c017ea57eb5fa644b4" + integrity sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA== dependencies: "@babel/core" "^7.16.0" "@babel/eslint-parser" "^7.16.3" @@ -7837,10 +7837,10 @@ react-collapsible@^2.8.4: resolved "https://registry.yarnpkg.com/react-collapsible/-/react-collapsible-2.8.4.tgz#319ff7471138c4381ce0afa3ac308ccde7f4e09f" integrity sha512-oG4yOk6AGKswe0OD/8t3/nf4Rgj4UhlZUUvqL5jop0/ez02B3dBDmNvs3sQz0PcTpJvt0ai8zF7Atd1SzN/UNw== -react-dev-utils@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.0.tgz#4eab12cdb95692a077616770b5988f0adf806526" - integrity sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ== +react-dev-utils@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73" + integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ== dependencies: "@babel/code-frame" "^7.16.0" address "^1.1.2" @@ -7861,7 +7861,7 @@ react-dev-utils@^12.0.0: open "^8.4.0" pkg-up "^3.1.0" prompts "^2.4.2" - react-error-overlay "^6.0.10" + react-error-overlay "^6.0.11" recursive-readdir "^2.2.2" shell-quote "^1.7.3" strip-ansi "^6.0.1" @@ -7876,10 +7876,10 @@ react-dom@^17.0.2: object-assign "^4.1.1" scheduler "^0.20.2" -react-error-overlay@^6.0.10: - version "6.0.10" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6" - integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA== +react-error-overlay@^6.0.11: + version "6.0.11" + resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb" + integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg== react-fast-compare@^3.0.1: version "3.2.0" @@ -7962,10 +7962,10 @@ react-router@6.3.0: dependencies: history "^5.2.0" -react-scripts@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.0.tgz#6547a6d7f8b64364ef95273767466cc577cb4b60" - integrity sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg== +react-scripts@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.1.tgz#6285dbd65a8ba6e49ca8d651ce30645a6d980003" + integrity sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ== dependencies: "@babel/core" "^7.16.0" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.3" @@ -7983,7 +7983,7 @@ react-scripts@^5.0.0: dotenv "^10.0.0" dotenv-expand "^5.1.0" eslint "^8.3.0" - eslint-config-react-app "^7.0.0" + eslint-config-react-app "^7.0.1" eslint-webpack-plugin "^3.1.1" file-loader "^6.2.0" fs-extra "^10.0.0" @@ -8000,7 +8000,7 @@ react-scripts@^5.0.0: postcss-preset-env "^7.0.1" prompts "^2.4.2" react-app-polyfill "^3.0.0" - react-dev-utils "^12.0.0" + react-dev-utils "^12.0.1" react-refresh "^0.11.0" resolve "^1.20.0" resolve-url-loader "^4.0.0" From 400200688add853c16293d29e8e87326d6883704 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:14:53 +0000 Subject: [PATCH 384/649] Bump axios from 0.26.1 to 0.27.2 in /frontend Bumps [axios](https://github.com/axios/axios) from 0.26.1 to 0.27.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.26.1...v0.27.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 55846b6f6..04a9159ff 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,7 +6,7 @@ "@fortawesome/fontawesome-svg-core": "^1.3.0", "@fortawesome/free-solid-svg-icons": "^6.0.0", "@fortawesome/react-fontawesome": "^0.1.17", - "axios": "^0.26.1", + "axios": "^0.27.2", "bootstrap": "5.1.3", "buffer": "^6.0.3", "multiselect-react-dropdown": "^2.0.21", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 78812df03..01bdeb782 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2818,12 +2818,13 @@ axe-core@^4.3.5: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.1.tgz#7dbdc25989298f9ad006645cd396782443757413" integrity sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw== -axios@*, axios@^0.26.1: - version "0.26.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" - integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== +axios@*, axios@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" + integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== dependencies: - follow-redirects "^1.14.8" + follow-redirects "^1.14.9" + form-data "^4.0.0" axobject-query@^2.2.0: version "2.2.0" @@ -4866,10 +4867,10 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== -follow-redirects@^1.0.0, follow-redirects@^1.14.8: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== +follow-redirects@^1.0.0, follow-redirects@^1.14.9: + version "1.15.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4" + integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ== fork-ts-checker-webpack-plugin@^6.5.0: version "6.5.0" @@ -4899,6 +4900,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" From 6420aca705daf9f80f5e21754e3b12f117e0afd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:15:46 +0000 Subject: [PATCH 385/649] Bump @testing-library/jest-dom from 5.16.2 to 5.16.4 in /frontend Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.16.2 to 5.16.4. - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/jest-dom/compare/v5.16.2...v5.16.4) --- updated-dependencies: - dependency-name: "@testing-library/jest-dom" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 55846b6f6..d4dd74b6c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -29,7 +29,7 @@ "web-vitals": "^2.1.0" }, "devDependencies": { - "@testing-library/jest-dom": "^5.14.1", + "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^12.1.5", "@testing-library/user-event": "^13.2.1", "@types/axios": "^0.14.0", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 78812df03..1a99517aa 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1757,10 +1757,10 @@ lz-string "^1.4.4" pretty-format "^27.0.2" -"@testing-library/jest-dom@^5.14.1": - version "5.16.2" - resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.2.tgz#f329b36b44aa6149cd6ced9adf567f8b6aa1c959" - integrity sha512-6ewxs1MXWwsBFZXIk4nKKskWANelkdUehchEOokHsN8X7c2eKXGw+77aRV63UU8f/DTSVUPLaGxdrj4lN7D/ug== +"@testing-library/jest-dom@^5.16.4": + version "5.16.4" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz#938302d7b8b483963a3ae821f1c0808f872245cd" + integrity sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA== dependencies: "@babel/runtime" "^7.9.2" "@types/testing-library__jest-dom" "^5.9.1" From a1adbb0c482b9a0f955adce0f8e57218c7de9802 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:22:26 +0000 Subject: [PATCH 386/649] Bump @fortawesome/free-solid-svg-icons from 6.1.0 to 6.1.1 in /frontend Bumps [@fortawesome/free-solid-svg-icons](https://github.com/FortAwesome/Font-Awesome) from 6.1.0 to 6.1.1. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.1.0...6.1.1) --- updated-dependencies: - dependency-name: "@fortawesome/free-solid-svg-icons" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index bbf6db773..75441606a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.3.0", - "@fortawesome/free-solid-svg-icons": "^6.0.0", + "@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/react-fontawesome": "^0.1.17", "axios": "^0.27.2", "bootstrap": "5.1.3", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 7780c0e79..c7977c0a7 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1248,10 +1248,10 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fortawesome/fontawesome-common-types@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.0.tgz#5a9468da0e5c2a3ccc161882ef5ffafbd3d4882f" - integrity sha512-lFIJ5opxOKG9q88xOsuJJAdRZ+2WRldsZwUR/7MJoOMUMhF/LkHUjwWACIEPTa5Wo6uTDHvGRIX+XutdN7zYxA== +"@fortawesome/fontawesome-common-types@6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz#7dc996042d21fc1ae850e3173b5c67b0549f9105" + integrity sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA== "@fortawesome/fontawesome-common-types@^0.3.0": version "0.3.0" @@ -1265,12 +1265,12 @@ dependencies: "@fortawesome/fontawesome-common-types" "^0.3.0" -"@fortawesome/free-solid-svg-icons@^6.0.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.0.tgz#1bdc3ce6ddd2336348ba324ac4a72161725b0d95" - integrity sha512-OOr0jRHl5d41RzBS3sZh5Z3HmdPjMr43PxxKlYeLtQxFSixPf4sJFVM12/rTepB2m0rVShI0vtjHQmzOTlBaXg== +"@fortawesome/free-solid-svg-icons@^6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.1.tgz#3369e673f8fe8be2fba30b1ec274d47490a830a6" + integrity sha512-0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg== dependencies: - "@fortawesome/fontawesome-common-types" "6.1.0" + "@fortawesome/fontawesome-common-types" "6.1.1" "@fortawesome/react-fontawesome@^0.1.17": version "0.1.18" From 9fa01d65ec05c1cb97fb04f9468bb0b3ac853458 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:23:36 +0000 Subject: [PATCH 387/649] Bump multiselect-react-dropdown from 2.0.21 to 2.0.22 in /frontend Bumps [multiselect-react-dropdown](https://github.com/srigar/multiselect-react-dropdown) from 2.0.21 to 2.0.22. - [Release notes](https://github.com/srigar/multiselect-react-dropdown/releases) - [Commits](https://github.com/srigar/multiselect-react-dropdown/compare/v2.0.21...v2.0.22) --- updated-dependencies: - dependency-name: multiselect-react-dropdown dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index bbf6db773..91d1c512a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,7 +9,7 @@ "axios": "^0.27.2", "bootstrap": "5.1.3", "buffer": "^6.0.3", - "multiselect-react-dropdown": "^2.0.21", + "multiselect-react-dropdown": "^2.0.22", "react": "^17.0.2", "react-bootstrap": "^2.2.1", "react-bootstrap-typeahead": "^6.0.0-alpha.11", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 7780c0e79..fb07c2feb 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -6639,10 +6639,10 @@ multicast-dns@^6.0.1: dns-packet "^1.3.1" thunky "^1.0.2" -multiselect-react-dropdown@^2.0.21: - version "2.0.21" - resolved "https://registry.yarnpkg.com/multiselect-react-dropdown/-/multiselect-react-dropdown-2.0.21.tgz#a025753aae27fa6441aa7d38344defd75ff29033" - integrity sha512-HvyM1rdpwlBylxORbxjY0XADYOyIfAebhOuLJOfjZFBnp8OA8kc07QbqVN5yVYue01aJF1svB55qAFngZavU5A== +multiselect-react-dropdown@^2.0.22: + version "2.0.22" + resolved "https://registry.yarnpkg.com/multiselect-react-dropdown/-/multiselect-react-dropdown-2.0.22.tgz#9eddcb75ff74e29ca0c4ae1a4b40c538b7b24c46" + integrity sha512-Oc6Y/Rl1U3XSyp2Hb5utTvqtHeFTMJf5+PHrmxvk06yT02KLivqXUhmqsmDnLfMZm3UC6Hnh4NnpoNxj/z+5gg== nanoid@^3.3.1: version "3.3.1" From 5f0627594541fda3674d6eec850a4776675f8c62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:25:35 +0000 Subject: [PATCH 388/649] Bump typedoc from 0.22.13 to 0.22.15 in /frontend Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.22.13 to 0.22.15. - [Release notes](https://github.com/TypeStrong/TypeDoc/releases) - [Changelog](https://github.com/TypeStrong/typedoc/blob/master/CHANGELOG.md) - [Commits](https://github.com/TypeStrong/TypeDoc/compare/v0.22.13...v0.22.15) --- updated-dependencies: - dependency-name: typedoc dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index bbf6db773..be1ccf9c2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -57,7 +57,7 @@ "eslint-plugin-standard": "^5.0.0", "jest": "^27.5.1", "prettier": "^2.6.2", - "typedoc": "^0.22.13" + "typedoc": "^0.22.15" }, "scripts": { "start": "react-scripts start", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 7780c0e79..83afd9fab 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -9202,10 +9202,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typedoc@^0.22.13: - version "0.22.13" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.22.13.tgz#d061f8f0fb7c9d686e48814f245bddeea4564e66" - integrity sha512-NHNI7Dr6JHa/I3+c62gdRNXBIyX7P33O9TafGLd07ur3MqzcKgwTvpg18EtvCLHJyfeSthAtCLpM7WkStUmDuQ== +typedoc@^0.22.15: + version "0.22.15" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.22.15.tgz#c6ad7ed9d017dc2c3a06c9189cb392bd8e2d8c3f" + integrity sha512-CMd1lrqQbFvbx6S9G6fL4HKp3GoIuhujJReWqlIvSb2T26vGai+8Os3Mde7Pn832pXYemd9BMuuYWhFpL5st0Q== dependencies: glob "^7.2.0" lunr "^2.3.9" From 1b875f91d244648ba827543e129fb455a1e266bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:26:26 +0000 Subject: [PATCH 389/649] Bump eslint from 8.11.0 to 8.15.0 in /frontend Bumps [eslint](https://github.com/eslint/eslint) from 8.11.0 to 8.15.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.11.0...v8.15.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 47 ++++++++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index bbf6db773..ce6f4d934 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -47,7 +47,7 @@ "@typescript-eslint/parser": "^5.12.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", - "eslint": "^8.9.0", + "eslint": "^8.15.0", "eslint-config-prettier": "^8.3.0", "eslint-config-standard": "^16.0.3", "eslint-plugin-node": "^11.1.0", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 7780c0e79..50df70a9a 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1233,19 +1233,19 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== -"@eslint/eslintrc@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6" - integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ== +"@eslint/eslintrc@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886" + integrity sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.3.1" + espree "^9.3.2" globals "^13.9.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" - minimatch "^3.0.4" + minimatch "^3.1.2" strip-json-comments "^3.1.1" "@fortawesome/fontawesome-common-types@6.1.0": @@ -2510,7 +2510,7 @@ acorn-import-assertions@^1.7.6: resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== -acorn-jsx@^5.3.1: +acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== @@ -2534,11 +2534,16 @@ acorn@^7.0.0, acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0: +acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0: version "8.7.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== +acorn@^8.7.1: + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== + address@^1.0.1, address@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" @@ -4541,12 +4546,12 @@ eslint-webpack-plugin@^3.1.1: normalize-path "^3.0.0" schema-utils "^3.1.1" -eslint@^8.3.0, eslint@^8.9.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37" - integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA== +eslint@^8.15.0, eslint@^8.3.0: + version "8.15.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.15.0.tgz#fea1d55a7062da48d82600d2e0974c55612a11e9" + integrity sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA== dependencies: - "@eslint/eslintrc" "^1.2.1" + "@eslint/eslintrc" "^1.2.3" "@humanwhocodes/config-array" "^0.9.2" ajv "^6.10.0" chalk "^4.0.0" @@ -4557,7 +4562,7 @@ eslint@^8.3.0, eslint@^8.9.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.1" + espree "^9.3.2" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -4573,7 +4578,7 @@ eslint@^8.3.0, eslint@^8.9.0: json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" - minimatch "^3.0.4" + minimatch "^3.1.2" natural-compare "^1.4.0" optionator "^0.9.1" regexpp "^3.2.0" @@ -4582,13 +4587,13 @@ eslint@^8.3.0, eslint@^8.9.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^9.3.1: - version "9.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd" - integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ== +espree@^9.3.2: + version "9.3.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596" + integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA== dependencies: - acorn "^8.7.0" - acorn-jsx "^5.3.1" + acorn "^8.7.1" + acorn-jsx "^5.3.2" eslint-visitor-keys "^3.3.0" esprima@^4.0.0, esprima@^4.0.1: From a4217139d9bbfca660984cc4a99232dbca7e5158 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:32:04 +0000 Subject: [PATCH 390/649] Bump pylint from 2.12.2 to 2.13.9 in /backend Bumps [pylint](https://github.com/PyCQA/pylint) from 2.12.2 to 2.13.9. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/main/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/v2.12.2...v2.13.9) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- backend/poetry.lock | 53 ++++++++++++++++++++++++------------------ backend/pyproject.toml | 2 +- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/backend/poetry.lock b/backend/poetry.lock index 46626fc98..6dbc786b3 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -85,7 +85,7 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "astroid" -version = "2.9.3" +version = "2.11.5" description = "An abstract syntax tree for Python with inference support." category = "dev" optional = false @@ -93,7 +93,7 @@ python-versions = ">=3.6.2" [package.dependencies] lazy-object-proxy = ">=1.4.0" -wrapt = ">=1.11,<1.14" +wrapt = ">=1.11,<2" [[package]] name = "async-timeout" @@ -230,6 +230,17 @@ sdist = ["setuptools_rust (>=0.11.4)"] ssh = ["bcrypt (>=3.1.5)"] test = ["pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] +[[package]] +name = "dill" +version = "0.3.4" +description = "serialize all of python" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*" + +[package.extras] +graph = ["objgraph (>=1.7.2)"] + [[package]] name = "ecdsa" version = "0.17.0" @@ -599,19 +610,23 @@ python-versions = "*" [[package]] name = "pylint" -version = "2.12.2" +version = "2.13.9" description = "python code static checker" category = "dev" optional = false python-versions = ">=3.6.2" [package.dependencies] -astroid = ">=2.9.0,<2.10" +astroid = ">=2.11.5,<=2.12.0-dev0" colorama = {version = "*", markers = "sys_platform == \"win32\""} +dill = ">=0.2" isort = ">=4.2.5,<6" -mccabe = ">=0.6,<0.7" +mccabe = ">=0.6,<0.8" platformdirs = ">=2.2.0" -toml = ">=0.9.2" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} + +[package.extras] +testutil = ["gitpython (>3)"] [[package]] name = "pylint-pytest" @@ -913,14 +928,6 @@ anyio = ">=3.0.0,<4" [package.extras] full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"] -[[package]] -name = "toml" -version = "0.10.2" -description = "Python Library for Tom's Obvious, Minimal Language" -category = "dev" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" - [[package]] name = "tomli" version = "2.0.1" @@ -1036,7 +1043,7 @@ multidict = ">=4.0" [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "f816647bc57fb678f2a4a6b44cbe13b93c1854c61c2eea4575b5fd4b2d636a7f" +content-hash = "f4906a3af80b882d70fab98c072dcbb61b4c93194c40b83ad07c745164c77a92" [metadata.files] aiohttp = [ @@ -1134,8 +1141,8 @@ asgiref = [ {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"}, ] astroid = [ - {file = "astroid-2.9.3-py3-none-any.whl", hash = "sha256:506daabe5edffb7e696ad82483ad0228245a9742ed7d2d8c9cdb31537decf9f6"}, - {file = "astroid-2.9.3.tar.gz", hash = "sha256:1efdf4e867d4d8ba4a9f6cf9ce07cd182c4c41de77f23814feb27ca93ca9d877"}, + {file = "astroid-2.11.5-py3-none-any.whl", hash = "sha256:14ffbb4f6aa2cf474a0834014005487f7ecd8924996083ab411e7fa0b508ce0b"}, + {file = "astroid-2.11.5.tar.gz", hash = "sha256:f4e4ec5294c4b07ac38bab9ca5ddd3914d4bf46f9006eb5c0ae755755061044e"}, ] async-timeout = [ {file = "async-timeout-4.0.2.tar.gz", hash = "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15"}, @@ -1312,6 +1319,10 @@ cryptography = [ {file = "cryptography-37.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452"}, {file = "cryptography-37.0.2.tar.gz", hash = "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e"}, ] +dill = [ + {file = "dill-0.3.4-py2.py3-none-any.whl", hash = "sha256:7e40e4a70304fd9ceab3535d36e58791d9c4a776b38ec7f7ec9afc8d3dca4d4f"}, + {file = "dill-0.3.4.zip", hash = "sha256:9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675"}, +] ecdsa = [ {file = "ecdsa-0.17.0-py2.py3-none-any.whl", hash = "sha256:5cf31d5b33743abe0dfc28999036c849a69d548f994b535e527ee3cb7f3ef676"}, {file = "ecdsa-0.17.0.tar.gz", hash = "sha256:b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa"}, @@ -1762,8 +1773,8 @@ pyhumps = [ {file = "pyhumps-3.5.3.tar.gz", hash = "sha256:0ecf7fee84503b45afdd3841ec769b529d32dfaed855e07046ff8babcc0ab831"}, ] pylint = [ - {file = "pylint-2.12.2-py3-none-any.whl", hash = "sha256:daabda3f7ed9d1c60f52d563b1b854632fd90035bcf01443e234d3dc794e3b74"}, - {file = "pylint-2.12.2.tar.gz", hash = "sha256:9d945a73640e1fec07ee34b42f5669b770c759acd536ec7b16d7e4b87a9c9ff9"}, + {file = "pylint-2.13.9-py3-none-any.whl", hash = "sha256:705c620d388035bdd9ff8b44c5bcdd235bfb49d276d488dd2c8ff1736aa42526"}, + {file = "pylint-2.13.9.tar.gz", hash = "sha256:095567c96e19e6f57b5b907e67d265ff535e588fe26b12b5ebe1fc5645b2c731"}, ] pylint-pytest = [ {file = "pylint_pytest-1.1.2-py2.py3-none-any.whl", hash = "sha256:fb20ef318081cee3d5febc631a7b9c40fa356b05e4f769d6e60a337e58c8879b"}, @@ -1912,10 +1923,6 @@ starlette = [ {file = "starlette-0.17.1-py3-none-any.whl", hash = "sha256:26a18cbda5e6b651c964c12c88b36d9898481cd428ed6e063f5f29c418f73050"}, {file = "starlette-0.17.1.tar.gz", hash = "sha256:57eab3cc975a28af62f6faec94d355a410634940f10b30d68d31cb5ec1b44ae8"}, ] -toml = [ - {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, - {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, -] tomli = [ {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, diff --git a/backend/pyproject.toml b/backend/pyproject.toml index eaa29cc75..e3565966a 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -65,7 +65,7 @@ faker = "13.3.1" mypy = "0.940" # Pylint: Python linter -pylint = "2.12.2" +pylint = "2.13.9" # Pylint-Pytest: A Pylint plugin to suppress pytest-related false positives. pylint-pytest = "1.1.2" From b0858879f11c564bfeb0a8cea495bdeaaef49335 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:39:24 +0000 Subject: [PATCH 391/649] Bump @typescript-eslint/parser from 5.15.0 to 5.25.0 in /frontend Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.15.0 to 5.25.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.25.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index f744c2713..ab544f04d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -44,7 +44,7 @@ "@types/react-router-dom": "^5.3.3", "@types/styled-components": "^5.1.24", "@typescript-eslint/eslint-plugin": "^5.25.0", - "@typescript-eslint/parser": "^5.12.0", + "@typescript-eslint/parser": "^5.25.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", "eslint": "^8.15.0", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 12c2a15f8..4eeaa2bed 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2242,15 +2242,15 @@ dependencies: "@typescript-eslint/utils" "5.15.0" -"@typescript-eslint/parser@^5.12.0", "@typescript-eslint/parser@^5.5.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.15.0.tgz#95f603f8fe6eca7952a99bfeef9b85992972e728" - integrity sha512-NGAYP/+RDM2sVfmKiKOCgJYPstAO40vPAgACoWPO/+yoYKSgAXIFaBKsV8P0Cc7fwKgvj27SjRNX4L7f4/jCKQ== +"@typescript-eslint/parser@^5.25.0", "@typescript-eslint/parser@^5.5.0": + version "5.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.25.0.tgz#fb533487147b4b9efd999a4d2da0b6c263b64f7f" + integrity sha512-r3hwrOWYbNKP1nTcIw/aZoH+8bBnh/Lh1iDHoFpyG4DnCpvEdctrSl6LOo19fZbzypjQMHdajolxs6VpYoChgA== dependencies: - "@typescript-eslint/scope-manager" "5.15.0" - "@typescript-eslint/types" "5.15.0" - "@typescript-eslint/typescript-estree" "5.15.0" - debug "^4.3.2" + "@typescript-eslint/scope-manager" "5.25.0" + "@typescript-eslint/types" "5.25.0" + "@typescript-eslint/typescript-estree" "5.25.0" + debug "^4.3.4" "@typescript-eslint/scope-manager@5.15.0": version "5.15.0" From cb7144bc7d219f2f6874031be7db688ad177ff82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:40:09 +0000 Subject: [PATCH 392/649] Bump @fortawesome/fontawesome-svg-core from 1.3.0 to 6.1.1 in /frontend Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome) from 1.3.0 to 6.1.1. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/commits/6.1.1) --- updated-dependencies: - dependency-name: "@fortawesome/fontawesome-svg-core" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index f744c2713..bb15f4e9c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@fortawesome/fontawesome-svg-core": "^1.3.0", + "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/react-fontawesome": "^0.1.17", "axios": "^0.27.2", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 12c2a15f8..209d0e281 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1253,17 +1253,12 @@ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz#7dc996042d21fc1ae850e3173b5c67b0549f9105" integrity sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA== -"@fortawesome/fontawesome-common-types@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz#949995a05c0d8801be7e0a594f775f1dbaa0d893" - integrity sha512-CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w== - -"@fortawesome/fontawesome-svg-core@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.3.0.tgz#343fac91fa87daa630d26420bfedfba560f85885" - integrity sha512-UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg== +"@fortawesome/fontawesome-svg-core@^6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.1.tgz#3424ec6182515951816be9b11665d67efdce5b5f" + integrity sha512-NCg0w2YIp81f4V6cMGD9iomfsIj7GWrqmsa0ZsPh59G7PKiGN1KymZNxmF00ssuAlo/VZmpK6xazsGOwzKYUMg== dependencies: - "@fortawesome/fontawesome-common-types" "^0.3.0" + "@fortawesome/fontawesome-common-types" "6.1.1" "@fortawesome/free-solid-svg-icons@^6.1.1": version "6.1.1" From 27af6bc42d6575696240716eb52a87b590215991 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:44:39 +0000 Subject: [PATCH 393/649] Bump @types/enzyme from 3.10.11 to 3.10.12 in /frontend Bumps [@types/enzyme](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/enzyme) from 3.10.11 to 3.10.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/enzyme) --- updated-dependencies: - dependency-name: "@types/enzyme" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index c6cb8b2be..7332d43da 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -33,7 +33,7 @@ "@testing-library/react": "^12.1.5", "@testing-library/user-event": "^13.2.1", "@types/axios": "^0.14.0", - "@types/enzyme": "^3.10.11", + "@types/enzyme": "^3.10.12", "@types/enzyme-adapter-react-16": "^1.0.6", "@types/jest": "^27.0.1", "@types/node": "^17.0.34", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 50e90a0ea..70577a9f5 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1887,10 +1887,10 @@ dependencies: "@types/enzyme" "*" -"@types/enzyme@*", "@types/enzyme@^3.10.11": - version "3.10.11" - resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.11.tgz#8924bd92cc63ac1843e215225dfa8f71555fe814" - integrity sha512-LEtC7zXsQlbGXWGcnnmOI7rTyP+i1QzQv4Va91RKXDEukLDaNyxu0rXlfMiGEhJwfgTPCTb0R+Pnlj//oM9e/w== +"@types/enzyme@*", "@types/enzyme@^3.10.12": + version "3.10.12" + resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.12.tgz#ac4494801b38188935580642f772ad18f72c132f" + integrity sha512-xryQlOEIe1TduDWAOphR0ihfebKFSWOXpIsk+70JskCfRfW+xALdnJ0r1ZOTo85F9Qsjk6vtlU7edTYHbls9tA== dependencies: "@types/cheerio" "*" "@types/react" "*" @@ -2108,16 +2108,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^17.0.20": - version "17.0.41" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.41.tgz#6e179590d276394de1e357b3f89d05d7d3da8b85" - integrity sha512-chYZ9ogWUodyC7VUTRBfblysKLjnohhFY9bGLwvnUFFy48+vB9DikmB3lW0qTFmBcKSzmdglcvkHK71IioOlDA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^17": +"@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^17", "@types/react@^17.0.20": version "17.0.45" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.45.tgz#9b3d5b661fd26365fefef0e766a1c6c30ccf7b3f" integrity sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg== From 1d7d0484cfeb8ef3a4bd76656b330180477805e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:48:14 +0000 Subject: [PATCH 394/649] Bump types-passlib from 1.7.0 to 1.7.5 in /backend Bumps [types-passlib](https://github.com/python/typeshed) from 1.7.0 to 1.7.5. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-passlib dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- backend/poetry.lock | 8 ++++---- backend/pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/poetry.lock b/backend/poetry.lock index 6dbc786b3..a2b455cac 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -938,7 +938,7 @@ python-versions = ">=3.7" [[package]] name = "types-passlib" -version = "1.7.0" +version = "1.7.5" description = "Typing stubs for passlib" category = "dev" optional = false @@ -1043,7 +1043,7 @@ multidict = ">=4.0" [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "f4906a3af80b882d70fab98c072dcbb61b4c93194c40b83ad07c745164c77a92" +content-hash = "fba5df22e0c558e8e73294cdbf5807289e46dcfc0c095b471136e1233a2219a6" [metadata.files] aiohttp = [ @@ -1928,8 +1928,8 @@ tomli = [ {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] types-passlib = [ - {file = "types-passlib-1.7.0.tar.gz", hash = "sha256:b069e428b601216e7220f5d3972c57706d85bdf2cd715be28c2a31ae4e5deaec"}, - {file = "types_passlib-1.7.0-py3-none-any.whl", hash = "sha256:e7d09757cd56343806cba44a1857809c0e594294badd83404c2138349b0ea8ec"}, + {file = "types-passlib-1.7.5.tar.gz", hash = "sha256:810ce820882a900429b2cbe6554851182370337c7246b0e0728ff4145db0edcf"}, + {file = "types_passlib-1.7.5-py3-none-any.whl", hash = "sha256:8366c5e31bbff65c0a6d1a0f10e84fba567797680c643b485b072691bc0908db"}, ] typing-extensions = [ {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"}, diff --git a/backend/pyproject.toml b/backend/pyproject.toml index e3565966a..8f1875980 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -90,7 +90,7 @@ pytest-mock = "3.7.0" sqlalchemy2-stubs="0.0.2a20" # Types for the passlib library -types-passlib="1.7.0" +types-passlib="1.7.5" [tool.mypy] plugins = ["sqlalchemy.ext.mypy.plugin"] From 231afdc7409c32c1c5a01d089053e7ac386769a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 13:51:08 +0000 Subject: [PATCH 395/649] Bump styled-components and @types/styled-components in /frontend Bumps [styled-components](https://github.com/styled-components/styled-components) and [@types/styled-components](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/styled-components). These dependencies needed to be updated together. Updates `styled-components` from 5.3.3 to 5.3.5 - [Release notes](https://github.com/styled-components/styled-components/releases) - [Changelog](https://github.com/styled-components/styled-components/blob/main/CHANGELOG.md) - [Commits](https://github.com/styled-components/styled-components/compare/v5.3.3...v5.3.5) Updates `@types/styled-components` from 5.1.24 to 5.1.25 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/styled-components) --- updated-dependencies: - dependency-name: styled-components dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: "@types/styled-components" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 4 ++-- frontend/yarn.lock | 44 +++++++++++++++---------------------------- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 8bb550984..3e3b6d353 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -24,7 +24,7 @@ "react-social-login-buttons": "^3.6.0", "react-toastify": "^9.0.1", "reactjs-popup": "^2.0.5", - "styled-components": "^5.3.3", + "styled-components": "^5.3.5", "typescript": "^4.6.4", "web-vitals": "^2.1.0" }, @@ -42,7 +42,7 @@ "@types/react-infinite-scroller": "^1.2.3", "@types/react-router-bootstrap": "^0.24.5", "@types/react-router-dom": "^5.3.3", - "@types/styled-components": "^5.1.24", + "@types/styled-components": "^5.1.25", "@typescript-eslint/eslint-plugin": "^5.25.0", "@typescript-eslint/parser": "^5.25.0", "enzyme": "^3.11.0", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 42954abd7..69fd415eb 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1167,17 +1167,12 @@ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== -"@emotion/is-prop-valid@^0.8.8": - version "0.8.8" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" - integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== +"@emotion/is-prop-valid@^1.1.0": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" + integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== dependencies: - "@emotion/memoize" "0.7.4" - -"@emotion/memoize@0.7.4": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" - integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== + "@emotion/memoize" "^0.7.4" "@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5": version "0.7.5" @@ -2108,16 +2103,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^17.0.20": - version "17.0.41" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.41.tgz#6e179590d276394de1e357b3f89d05d7d3da8b85" - integrity sha512-chYZ9ogWUodyC7VUTRBfblysKLjnohhFY9bGLwvnUFFy48+vB9DikmB3lW0qTFmBcKSzmdglcvkHK71IioOlDA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^17": +"@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^17", "@types/react@^17.0.20": version "17.0.45" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.45.tgz#9b3d5b661fd26365fefef0e766a1c6c30ccf7b3f" integrity sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg== @@ -2170,10 +2156,10 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/styled-components@^5.1.24": - version "5.1.24" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.24.tgz#b52ae677f03ea8a6018aa34c6c96b7018b7a3571" - integrity sha512-mz0fzq2nez+Lq5IuYammYwWgyLUE6OMAJTQL9D8hFLP4Pkh7gVYJii/VQWxq8/TK34g/OrkehXaFNdcEKcItug== +"@types/styled-components@^5.1.25": + version "5.1.25" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.25.tgz#0177c4ab5fa7c6ed0565d36f597393dae3f380ad" + integrity sha512-fgwl+0Pa8pdkwXRoVPP9JbqF0Ivo9llnmsm+7TCI330kbPIFd9qv1Lrhr37shf4tnxCOSu+/IgqM7uJXLWZZNQ== dependencies: "@types/hoist-non-react-statics" "*" "@types/react" "*" @@ -8861,14 +8847,14 @@ style-loader@^3.3.1: resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575" integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ== -styled-components@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.3.tgz#312a3d9a549f4708f0fb0edc829eb34bde032743" - integrity sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw== +styled-components@^5.3.5: + version "5.3.5" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.5.tgz#a750a398d01f1ca73af16a241dec3da6deae5ec4" + integrity sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/traverse" "^7.4.5" - "@emotion/is-prop-valid" "^0.8.8" + "@emotion/is-prop-valid" "^1.1.0" "@emotion/stylis" "^0.8.4" "@emotion/unitless" "^0.7.4" babel-plugin-styled-components ">= 1.12.0" From 2a19e243e911c6633513cc850bcf1519d96726bc Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Wed, 18 May 2022 16:16:58 +0200 Subject: [PATCH 396/649] only show delete sug button to admins and the coach who suggested --- .../SuggestedStudent/SuggestedStudent.tsx | 42 ++++++++----------- .../ProjectRoles/SuggestedStudent/styles.ts | 4 -- .../ProjectDetailPage/ProjectDetailPage.tsx | 17 ++++---- frontend/yarn.lock | 22 ++-------- 4 files changed, 29 insertions(+), 56 deletions(-) diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/SuggestedStudent.tsx b/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/SuggestedStudent.tsx index dd992912c..d96639d9c 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/SuggestedStudent.tsx +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/SuggestedStudent.tsx @@ -4,13 +4,8 @@ import { useAuth } from "../../../../contexts"; import { Role } from "../../../../data/enums"; import { ProjectRole, ProjectRoleSuggestion } from "../../../../data/interfaces/projects"; import { deleteStudentFromProject } from "../../../../utils/api/projectStudents"; -import { CreateButton, DeleteButton } from "../../../Common/Buttons"; -import { - ConfirmContainer, - DrafterContainer, - NameDeleteContainer, - SuggestionContainer, -} from "./styles"; +import { DeleteButton } from "../../../Common/Buttons"; +import { DrafterContainer, NameDeleteContainer, SuggestionContainer } from "./styles"; export default function SuggestedStudent({ suggestion, @@ -25,7 +20,7 @@ export default function SuggestedStudent({ const projectId = parseInt(params.projectId!); const editionId = params.editionId!; - const { role } = useAuth(); + const { role, userId } = useAuth(); return ( {suggestion.student.firstName + " " + suggestion.student.lastName} - { - deleteStudentFromProject( - editionId, - projectId.toString(), - projectRole.projectRoleId.toString(), - suggestion.student.studentId.toString() - ); - }} - /> + {(role === Role.ADMIN || userId === suggestion.drafter.userId) && ( + { + deleteStudentFromProject( + editionId, + projectId.toString(), + projectRole.projectRoleId.toString(), + suggestion.student.studentId.toString() + ); + }} + /> + )} - {suggestion.argumentation !== "" ? ( + {suggestion.drafter && suggestion.argumentation !== "" ? ( <> By {suggestion.drafter.name}:{" " + suggestion.argumentation} ) : ( - <>By {suggestion.drafter.name} + suggestion.drafter && <>By {suggestion.drafter.name} )} - {role === Role.ADMIN && ( - - - - )} )} diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/styles.ts b/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/styles.ts index 977c2f9a8..a7b920e07 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/styles.ts +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/styles.ts @@ -26,7 +26,3 @@ export const DrafterContainer = styled.div` display: flex; margin-bottom: 5px; `; - -export const ConfirmContainer = styled.div` - display: flex; -`; diff --git a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx index db345cd09..d5809f174 100644 --- a/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx +++ b/frontend/src/views/projectViews/ProjectDetailPage/ProjectDetailPage.tsx @@ -104,7 +104,8 @@ export default function ProjectDetailPage() { }, { toastId: "addStudentToProject" } ); - if (!newProjectRole) return + if (!newProjectRole) return; + setGotProject(false); const newProjectRoles = projectRoles.map((projectRole, index) => { if (projectRole.projectRoleId.toString() === result.destination?.droppableId) { @@ -137,8 +138,7 @@ export default function ProjectDetailPage() { return ( onDragDrop(result)}> - - + navigate("/editions/" + editionId + "/projects/")}> @@ -230,10 +230,11 @@ export default function ProjectDetailPage() { const student = await getStudent( editionId, parseInt( - result.draggableId.substring( - 0, - result.draggableId.length - source.droppableId.length - )) + result.draggableId.substring( + 0, + result.draggableId.length - source.droppableId.length + ) + ) ); const newProjectRoles = projectRoles.map((projectRole, index) => { if (projectRole.projectRoleId.toString() === destination?.droppableId) { @@ -241,7 +242,7 @@ export default function ProjectDetailPage() { newSuggestions.splice(destination.index, 0, { projectRoleSuggestionId: index, argumentation: "arg", - drafter: {userId: 1, name: "Fix this"}, + drafter: { userId: 1, name: "Fix this" }, student: student, }); return { ...projectRole, suggestions: newSuggestions }; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 68f33d0e7..56ac5177b 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1031,15 +1031,9 @@ dependencies: regenerator-runtime "^0.13.4" -<<<<<<< HEAD -"@babel/runtime@^7.15.4": - version "7.17.9" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz" -======= -"@babel/runtime@^7.12.0", "@babel/runtime@^7.13.10", "@babel/runtime@^7.7.2": +"@babel/runtime@^7.12.0", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.7.2": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" ->>>>>>> develop integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== dependencies: regenerator-runtime "^0.13.4" @@ -5136,11 +5130,7 @@ history@^5.2.0: dependencies: "@babel/runtime" "^7.7.6" -<<<<<<< HEAD -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: -======= -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1: ->>>>>>> develop +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -6477,15 +6467,9 @@ memfs@^3.1.2, memfs@^3.4.1: dependencies: fs-monkey "1.0.3" -<<<<<<< HEAD -memoize-one@^5.1.1: - version "5.2.1" - resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz" -======= -memoize-one@^5.0.0: +memoize-one@^5.0.0, memoize-one@^5.1.1: version "5.2.1" resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e" ->>>>>>> develop integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== merge-descriptors@1.0.1: From 637590554de08e931fc2b37bd5d2c92b357017ce Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 18 May 2022 16:27:27 +0200 Subject: [PATCH 397/649] styling on information cards --- .../StudentInformation/StudentInformation.css | 5 ++++- .../StudentInfoComponents/StudentInformation/styles.ts | 2 +- .../StudentsComponents/StudentListFilters/styles.ts | 7 +------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.css b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.css index 856496066..717d77b48 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.css +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/StudentInformation.css @@ -1,6 +1,9 @@ .CardContainer { width: 100%; - border-color: var(--osoc_orange_darkened) !important; + background-color: var(--card-color) !important; + box-shadow: 5px 5px 15px #131329 !important; + border-radius: 5px !important; + border: 2px solid #1a1a36 !important; margin-bottom: 2%; } diff --git a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts index 33fcb1a44..28f0a176e 100644 --- a/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts +++ b/frontend/src/components/StudentInfoComponents/StudentInformation/styles.ts @@ -14,7 +14,7 @@ export const StudentInformationContainer = styled.div` export const PersonIcon = styled(BsPersonFill)` width: 15%; height: 15%; - background: var(--osoc_red_darkened); + background: var(--background_color); `; export const NameContainer = styled.div` diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/styles.ts b/frontend/src/components/StudentsComponents/StudentListFilters/styles.ts index fdc4027ae..daf0a4e9e 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/styles.ts +++ b/frontend/src/components/StudentsComponents/StudentListFilters/styles.ts @@ -8,12 +8,7 @@ export const StudentListSideMenu = styled.div` min-width: 35vh; max-width: 50vh; height: 100vh; - border-right: 2px solid #163542; -`; - -export const StudentListTitle = styled.span` - align-self: center; - font-size: 5vh; + border-right: 2px solid var(--card-color); `; export const StudentListLinebreak = styled.div` From e5d5083975591b599fcf93bcbc38103088e3c5ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 14:45:48 +0000 Subject: [PATCH 398/649] Bump sqlalchemy2-stubs from 0.0.2a20 to 0.0.2a22 in /backend Bumps [sqlalchemy2-stubs](https://github.com/sqlalchemy/sqlalchemy2-stubs) from 0.0.2a20 to 0.0.2a22. - [Release notes](https://github.com/sqlalchemy/sqlalchemy2-stubs/releases) - [Commits](https://github.com/sqlalchemy/sqlalchemy2-stubs/compare/v0.0.2a20...v0.0.2a22) --- updated-dependencies: - dependency-name: sqlalchemy2-stubs dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- backend/poetry.lock | 8 ++++---- backend/pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/poetry.lock b/backend/poetry.lock index a2b455cac..d537c6078 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -905,7 +905,7 @@ url = ["furl (>=0.4.1)"] [[package]] name = "sqlalchemy2-stubs" -version = "0.0.2a20" +version = "0.0.2a22" description = "Typing Stubs for SQLAlchemy 1.4" category = "dev" optional = false @@ -1043,7 +1043,7 @@ multidict = ">=4.0" [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "fba5df22e0c558e8e73294cdbf5807289e46dcfc0c095b471136e1233a2219a6" +content-hash = "341c76ba5fcce3b45af92b027228d2b0204bb8b3be823bf4a485f5cc1f1914a6" [metadata.files] aiohttp = [ @@ -1916,8 +1916,8 @@ sqlalchemy-utils = [ {file = "SQLAlchemy_Utils-0.38.2-py3-none-any.whl", hash = "sha256:622235b1598f97300e4d08820ab024f5219c9a6309937a8b908093f487b4ba54"}, ] sqlalchemy2-stubs = [ - {file = "sqlalchemy2-stubs-0.0.2a20.tar.gz", hash = "sha256:3e96a5bb7d46a368c780ba57dcf2afbe2d3efdd75f7724ae7a859df0b0625f38"}, - {file = "sqlalchemy2_stubs-0.0.2a20-py3-none-any.whl", hash = "sha256:da31d0e30a2af2e5ad83dbce5738543a9f488089774f506de5ec7d28d425a202"}, + {file = "sqlalchemy2-stubs-0.0.2a22.tar.gz", hash = "sha256:31288db647bbdd411ad1e22da39a10ebe211bdcfe2efef24bcebea05abc28dd4"}, + {file = "sqlalchemy2_stubs-0.0.2a22-py3-none-any.whl", hash = "sha256:b9b907c3555d0b11bb8d738b788be478ce3871174839171d0d49aba5d0785016"}, ] starlette = [ {file = "starlette-0.17.1-py3-none-any.whl", hash = "sha256:26a18cbda5e6b651c964c12c88b36d9898481cd428ed6e063f5f29c418f73050"}, diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 8f1875980..e43758f42 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -87,7 +87,7 @@ pytest-env = "0.6.2" pytest-mock = "3.7.0" # Sqlalchemy-stubs: type hints for sqlalchemy -sqlalchemy2-stubs="0.0.2a20" +sqlalchemy2-stubs="0.0.2a22" # Types for the passlib library types-passlib="1.7.5" From cebbd31c7c4915899db502b63ae2eba2835afe6c Mon Sep 17 00:00:00 2001 From: cledloof Date: Wed, 18 May 2022 17:04:53 +0200 Subject: [PATCH 399/649] common components --- .../RemoveStudentButton.tsx | 8 +--- .../AdminDecisionContainer.tsx | 15 +++---- .../CoachSuggestionContainer.tsx | 39 ++++++++++++------- .../CoachSuggestionContainer/styles.ts | 27 +++++++++++++ .../NameFilter/NameFilter.tsx | 15 ++----- .../ResetFiltersButton/ResetFiltersButton.tsx | 8 +++- .../RolesFilter/RolesFilter.tsx | 10 +---- .../StudentListFilters/styles.ts | 2 - 8 files changed, 72 insertions(+), 52 deletions(-) diff --git a/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx b/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx index 6571d08ca..db8ee1022 100644 --- a/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx +++ b/frontend/src/components/StudentInfoComponents/RemoveStudentButton/RemoveStudentButton.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { StudentRemoveButton } from "../styles"; import { removeStudent } from "../../../utils/api/students"; import { useNavigate } from "react-router-dom"; +import { DeleteButton } from "../../Common/Buttons"; /** * Component that removes the current student. @@ -17,9 +17,5 @@ export default function RemoveStudentButton(props: { editionId: string; studentI navigate(`/editions/${props.editionId}/students/`); } - return ( - handleRemoveStudent()}> - Remove Student - - ); + return handleRemoveStudent()}>Remove Student; } diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx index 2703a9f8e..bb9fd26c1 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/AdminDecisionContainer/AdminDecisionContainer.tsx @@ -4,6 +4,7 @@ import { DefinitiveDecisionContainer } from "../../StudentInformation/styles"; import { SuggestionButtons, ConfirmButton, ConfirmActionTitle } from "./styles"; import { confirmStudent } from "../../../../utils/api/suggestions"; import { useParams } from "react-router-dom"; +import { CreateButton } from "../../../Common/Buttons"; /** * Make definitive decision on the current student based on the selected decision value. @@ -88,27 +89,27 @@ export default function AdminDecisionContainer() { -
    {clickedButtonText ? ( - + ) : ( - + )}
    Definitive decision by admin - +
    ); diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx index 50c906de7..1b11d2bc4 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/CoachSuggestionContainer.tsx @@ -1,9 +1,11 @@ -import { Button, ButtonGroup, Form, Modal } from "react-bootstrap"; +import { Button, ButtonGroup, Modal } from "react-bootstrap"; import React, { useState } from "react"; import { Student } from "../../../../data/interfaces/students"; import { makeSuggestion } from "../../../../utils/api/students"; import { useParams } from "react-router-dom"; -import { SuggestionActionTitle } from "./styles"; +import { SuggestionActionTitle, YesButton, MaybeButton, NoButton } from "./styles"; +import { CreateButton } from "../../../Common/Buttons"; +import { FormControl } from "../../../Common/Forms"; interface Props { student: Student; @@ -62,9 +64,8 @@ export default function CoachSuggestionContainer(props: Props) { Why are you giving this decision for this student? - { setArgumentation(e.target.value); @@ -74,25 +75,35 @@ export default function CoachSuggestionContainer(props: Props) { * This field isn't required - - + Save Suggestion Make a suggestion on this student - - - +
    ); diff --git a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/styles.ts b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/styles.ts index 6fece5964..580203d59 100644 --- a/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/styles.ts +++ b/frontend/src/components/StudentInfoComponents/SuggestionComponents/CoachSuggestionContainer/styles.ts @@ -1,5 +1,32 @@ import styled from "styled-components"; +import { Button } from "react-bootstrap"; export const SuggestionActionTitle = styled.p` font-size: 20px; `; + +export const YesButton = styled(Button)` + background-color: var(--osoc_green); + color: black; + height: 5vh; + width: 18vh; + margin-right: 2%; +`; + +export const MaybeButton = styled(Button)` + background-color: var(--osoc_orange); + color: black; + height: 5vh; + width: 18vh; + margin-left: 2%; + margin-right: 2%; +`; + +export const NoButton = styled(Button)` + background-color: var(--osoc_red); + color: black; + height: 5vh; + width: 18vh; + margin-left: 2%; + margin-right: 2%; +`; diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx index f1de980d5..15cf56cc3 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx @@ -1,11 +1,6 @@ import React from "react"; -import { - FilterStudentName, - FilterStudentNameInputContainer, - FilterStudentNameLabel, - FilterStudentNameLabelContainer, -} from "../styles"; -import { Form } from "react-bootstrap"; +import { FilterStudentName, FilterStudentNameInputContainer } from "../styles"; +import { FormControl } from "../../../Common/Forms"; /** * Component that filters the students list based on the name inserted in the input field. @@ -21,13 +16,9 @@ export default function NameFilter({ }) { return ( - - Search: - - { diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx index 7abcd2dba..1b2c19826 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { FilterResetButton } from "../styles"; import { DropdownRole } from "../RolesFilter/RolesFilter"; +import { DeleteButton } from "../../../Common/Buttons"; interface Props { setNameFilter: (name: string) => void; @@ -31,5 +31,9 @@ export default function ResetFiltersButton(props: Props) { sessionStorage.removeItem("rolesFilter"); } - return resetFilters()}>Reset filters; + return ( + <> + resetFilters()}>Reset filters + + ); } diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index 3661c2553..a8ee26c62 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -1,10 +1,5 @@ import React, { useEffect, useState } from "react"; -import { - FilterRoles, - FilterRolesDropdownContainer, - FilterRolesLabel, - FilterRolesLabelContainer, -} from "../styles"; +import { FilterRoles, FilterRolesDropdownContainer } from "../styles"; import Select, { MultiValue } from "react-select"; import { getSkills } from "../../../../utils/api/skills"; import "./RolesFilter.css"; @@ -50,9 +45,6 @@ export default function RolesFilter({ return ( - - Roles: - setInfoUrl(e.target.value)} + placeholder="Ex. https://osoc.be/" + /> + ); +} diff --git a/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/InfoUrl/index.ts b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/InfoUrl/index.ts new file mode 100644 index 000000000..071478423 --- /dev/null +++ b/frontend/src/components/ProjectsComponents/CreateProjectComponents/InputFields/InfoUrl/index.ts @@ -0,0 +1 @@ +export { default } from "./InfoUrl"; diff --git a/frontend/src/data/interfaces/projects.ts b/frontend/src/data/interfaces/projects.ts index 8d47ab810..d2272cfbf 100644 --- a/frontend/src/data/interfaces/projects.ts +++ b/frontend/src/data/interfaces/projects.ts @@ -50,6 +50,9 @@ export interface Project { /** The name of the project */ name: string; + /** An url with more info */ + infoUrl: string; + /** The coaches of this project */ coaches: Coach[]; @@ -86,6 +89,9 @@ export interface CreateProject { /** The name of the new project */ name: string; + /** An url with more info */ + infoUrl: string; + /** The partners that belong to this project */ partners: string[]; diff --git a/frontend/src/utils/api/projects.ts b/frontend/src/utils/api/projects.ts index 48f02e00a..d5095c780 100644 --- a/frontend/src/utils/api/projects.ts +++ b/frontend/src/utils/api/projects.ts @@ -69,17 +69,19 @@ export async function getProject(edition: string, projectId: number): Promise { const payload: CreateProject = { name: name, + infoUrl: infoUrl, partners: partners, coaches: coaches, }; try { - const response = await axiosInstance.post("editions/" + edition + "/projects/", payload); + const response = await axiosInstance.post("editions/" + edition + "/projects", payload); const project = response.data as Project; return project; diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index c4ba2f9f0..89d05ef4c 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -24,25 +24,30 @@ import { User } from "../../../utils/api/users/users"; import { toast } from "react-toastify"; import { createProjectRole } from "../../../utils/api/projectRoles"; import { CreateButton } from "../../../components/Common/Buttons"; +import InfoUrl from "../../../components/ProjectsComponents/CreateProjectComponents/InputFields/InfoUrl"; /** * React component of the create project page. * @returns The create project page. */ export default function CreateProjectPage() { - const [name, setName] = useState(""); // States for coaches + const [name, setName] = useState(""); // State for project name + + const [infoUrl, setInfoUrl] = useState(""); // State for info link const [coach, setCoach] = useState(""); - const [coaches, setCoaches] = useState([]); // States for skills + const [coaches, setCoaches] = useState([]); // States for coaches const [skill, setSkill] = useState(""); - const [projectSkills, setProjectSkills] = useState([]); // States for partners + const [projectSkills, setProjectSkills] = useState([]); // States for skills const [partner, setPartner] = useState(""); - const [partners, setPartners] = useState([]); + const [partners, setPartners] = useState([]); // States for partners + const navigate = useNavigate(); const params = useParams(); const editionId = params.editionId!; + return ( @@ -52,7 +57,10 @@ export default function CreateProjectPage() { - + + + + - + - + { coachIds.push(coachToAdd.userId); }); - const response = await createProject(editionId, name, partners, coachIds); + const response = await createProject(editionId, name, infoUrl, partners, coachIds); if (response) { await toast.promise(addProjectRoles(response.projectId), { From 8c2921621341a4c02f8a488b9c401e8b1c1d89ae Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 19 May 2022 18:11:54 +0200 Subject: [PATCH 456/649] Bugfix: use info_url instead of infoUrl in payload --- frontend/src/data/interfaces/projects.ts | 2 +- frontend/src/utils/api/projects.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/data/interfaces/projects.ts b/frontend/src/data/interfaces/projects.ts index d2272cfbf..dbb09c6cf 100644 --- a/frontend/src/data/interfaces/projects.ts +++ b/frontend/src/data/interfaces/projects.ts @@ -90,7 +90,7 @@ export interface CreateProject { name: string; /** An url with more info */ - infoUrl: string; + info_url: string; /** The partners that belong to this project */ partners: string[]; diff --git a/frontend/src/utils/api/projects.ts b/frontend/src/utils/api/projects.ts index d5095c780..80d7f3418 100644 --- a/frontend/src/utils/api/projects.ts +++ b/frontend/src/utils/api/projects.ts @@ -75,7 +75,7 @@ export async function createProject( ): Promise { const payload: CreateProject = { name: name, - infoUrl: infoUrl, + info_url: infoUrl, partners: partners, coaches: coaches, }; From 3fc0cb5ae8f43950a05e03cb665c5d9be769208b Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 19 May 2022 18:18:07 +0200 Subject: [PATCH 457/649] url validator frontend --- .../projectViews/CreateProjectPage/CreateProjectPage.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index 89d05ef4c..5966122c6 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -105,6 +105,13 @@ export default function CreateProjectPage() { return; } + if (infoUrl !== "" && (!infoUrl.startsWith("https://") && !infoUrl.startsWith("http://"))) { + toast.error("InfoUrl should start with https:// or http://", { + toastId: "createProjectBadUrl", + }); + return; + } + let badSkill = false; projectSkills.forEach(projectSkill => { if (isNaN(projectSkill.slots)) { From f721bb359da54b42dc8852c444719706831c7aa5 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 19 May 2022 18:21:33 +0200 Subject: [PATCH 458/649] prettier --- .../views/projectViews/CreateProjectPage/CreateProjectPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx index 5966122c6..1857065dd 100644 --- a/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx +++ b/frontend/src/views/projectViews/CreateProjectPage/CreateProjectPage.tsx @@ -105,7 +105,7 @@ export default function CreateProjectPage() { return; } - if (infoUrl !== "" && (!infoUrl.startsWith("https://") && !infoUrl.startsWith("http://"))) { + if (infoUrl !== "" && !infoUrl.startsWith("https://") && !infoUrl.startsWith("http://")) { toast.error("InfoUrl should start with https:// or http://", { toastId: "createProjectBadUrl", }); From 707c02852bb3ff12058a5fb40437fcc61b999d28 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 19 May 2022 19:32:34 +0200 Subject: [PATCH 459/649] removed timer --- .../StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx b/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx index b4697a6d9..956e64f6d 100644 --- a/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx @@ -10,7 +10,7 @@ import { toast } from "react-toastify"; export default function StudentCopyLink() { function copyStudentLink() { navigator.clipboard.writeText(window.location.href); - toast.info("Student URL copied to clipboard!", { autoClose: 1500 }); + toast.info("Student URL copied to clipboard!"); } return ( From eaf5fe76d94d68cb6a973fbe9b553058edbdc959 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 19 May 2022 19:51:30 +0200 Subject: [PATCH 460/649] Fix key error --- .../components/StudentsComponents/StudentList/StudentList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx b/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx index f2cf76050..b843d9511 100644 --- a/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx +++ b/frontend/src/components/StudentsComponents/StudentList/StudentList.tsx @@ -21,7 +21,7 @@ export default function StudentList(props: Props) { } + loader={} useWindow={false} initialLoad={true} > From a2b8d12dc53b80b8958f61871d3d8a2aeb46a94b Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 19 May 2022 20:24:53 +0200 Subject: [PATCH 461/649] Reset page after filter --- .../AlumniFilter/AlumniFilter.tsx | 4 ++++ .../NameFilter/NameFilter.tsx | 4 ++++ .../ResetFiltersButton/ResetFiltersButton.tsx | 2 ++ .../RolesFilter/RolesFilter.tsx | 8 +++++++- .../StudentCoachVolunteerFilter.tsx | 4 ++++ .../StudentListFilters/StudentListFilters.tsx | 17 ++++++++++++++--- .../SuggestedForFilter/SuggestedForFilter.tsx | 4 ++++ frontend/src/utils/api/students.ts | 10 ++++++++++ 8 files changed, 49 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx index eaaec9570..ae49bbd90 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/AlumniFilter/AlumniFilter.tsx @@ -6,13 +6,16 @@ import { setAlumniFilterStorage } from "../../../../utils/session-storage/studen * Component that filters the students list based on the alumni field. * @param alumniFilter * @param setAlumniFilter + * @param setPage Function to set the page to fetch next */ export default function AlumniFilter({ alumniFilter, setAlumniFilter, + setPage, }: { alumniFilter: boolean; setAlumniFilter: (value: boolean) => void; + setPage: (page: number) => void; }) { return (
    @@ -25,6 +28,7 @@ export default function AlumniFilter({ setAlumniFilter(e.target.checked); setAlumniFilterStorage(String(e.target.checked)); e.target.checked = alumniFilter; + setPage(0); }} />
    diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx index 60fe3ed12..3ed7a12c1 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/NameFilter/NameFilter.tsx @@ -6,13 +6,16 @@ import { setNameFilterStorage } from "../../../../utils/session-storage/student- * Component that filters the students list based on the name inserted in the input field. * @param nameFilter * @param setNameFilter + * @param setPage Function to set the page to fetch next */ export default function NameFilter({ nameFilter, setNameFilter, + setPage, }: { nameFilter: string; setNameFilter: (value: string) => void; + setPage: (page: number) => void; }) { return ( @@ -24,6 +27,7 @@ export default function NameFilter({ onChange={e => { setNameFilter(e.target.value); setNameFilterStorage(e.target.value); + setPage(0); }} />     diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx index 408503e71..afff10ab6 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/ResetFiltersButton/ResetFiltersButton.tsx @@ -15,6 +15,7 @@ interface Props { setAlumniFilter: (alumni: boolean) => void; setSuggestedFilter: (suggested: boolean) => void; setStudentCoachVolunteerFilter: (studentCoachVolunteer: boolean) => void; + setPage: (page: number) => void; } /** @@ -31,6 +32,7 @@ export default function ResetFiltersButton(props: Props) { props.setStudentCoachVolunteerFilter(false); props.setSuggestedFilter(false); props.setRolesFilter([]); + props.setPage(0); setNameFilterStorage(null); setAlumniFilterStorage(null); setStudentCoachVolunteerFilterStorage(null); diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx index 4b30fb695..b712a61c1 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/RolesFilter/RolesFilter.tsx @@ -14,13 +14,16 @@ export interface DropdownRole { * Component that filters the students list based on the current roles selected. * @param rolesFilter * @param setRolesFilter + * @param setPage Function to set the page to fetch next */ export default function RolesFilter({ rolesFilter, setRolesFilter, + setPage, }: { rolesFilter: DropdownRole[]; setRolesFilter: (value: DropdownRole[]) => void; + setPage: (page: number) => void; }) { const [roles, setRoles] = useState([]); @@ -55,7 +58,10 @@ export default function RolesFilter({ isSearchable placeholder="Choose roles..." value={rolesFilter} - onChange={e => handleRolesChange(e)} + onChange={e => { + handleRolesChange(e); + setPage(0); + }} /> diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx index 7f22b9446..3f7d7dbcd 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentCoachVolunteerFilter/StudentCoachVolunteerFilter.tsx @@ -6,13 +6,16 @@ import { setStudentCoachVolunteerFilterStorage } from "../../../../utils/session * Component that filters the students list based on the student coach field. * @param studentCoachVolunteerFilter * @param setStudentCoachVolunteerFilter + * @param setPage Function to set the page to fetch next */ export default function StudentCoachVolunteerFilter({ studentCoachVolunteerFilter, setStudentCoachVolunteerFilter, + setPage, }: { studentCoachVolunteerFilter: boolean; setStudentCoachVolunteerFilter: (value: boolean) => void; + setPage: (page: number) => void; }) { return (
    @@ -25,6 +28,7 @@ export default function StudentCoachVolunteerFilter({ setStudentCoachVolunteerFilter(e.target.checked); setStudentCoachVolunteerFilterStorage(String(e.target.checked)); e.target.checked = studentCoachVolunteerFilter; + setPage(0); }} />
    diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx index d54406aa3..6d61ae447 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx @@ -156,17 +156,27 @@ export default function StudentListFilters() { return ( - - + + - + @@ -177,6 +187,7 @@ export default function StudentListFilters() { setAlumniFilter={setAlumniFilter} setSuggestedFilter={setSuggestedFilter} setStudentCoachVolunteerFilter={setStudentCoachVolunteerFilter} + setPage={setPage} /> {list} diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx index 7e41a47c2..910abfcbe 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/SuggestedForFilter/SuggestedForFilter.tsx @@ -6,13 +6,16 @@ import { setSuggestedFilterStorage } from "../../../../utils/session-storage/stu * Component that filters the students list based on the suggested for field. * @param suggestedFilter * @param setSuggestedFilter + * @param setPage Function to set the page to fetch next */ export default function SuggestedForFilter({ suggestedFilter, setSuggestedFilter, + setPage, }: { suggestedFilter: boolean; setSuggestedFilter: (value: boolean) => void; + setPage: (page: number) => void; }) { return (
    @@ -25,6 +28,7 @@ export default function SuggestedForFilter({ setSuggestedFilter(e.target.checked); setSuggestedFilterStorage(String(e.target.checked)); e.target.checked = suggestedFilter; + setPage(0); }} />
    diff --git a/frontend/src/utils/api/students.ts b/frontend/src/utils/api/students.ts index 8461df70c..85b2c134d 100644 --- a/frontend/src/utils/api/students.ts +++ b/frontend/src/utils/api/students.ts @@ -23,6 +23,16 @@ export async function getStudents( page: number ): Promise { let rolesRequestField: string = ""; + + console.log([ + nameFilter, + rolesFilter, + alumniFilter, + studentCoachVolunteerFilter, + suggestedFilter, + page, + ]); + for (const role of rolesFilter) { rolesRequestField += "skill_ids=" + role.value.toString() + "&"; } From a6d3fe68da65568bb4f6d767566c515555691189 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 19 May 2022 20:29:25 +0200 Subject: [PATCH 462/649] Remove console.log --- frontend/src/utils/api/students.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/frontend/src/utils/api/students.ts b/frontend/src/utils/api/students.ts index 85b2c134d..ad3094fb6 100644 --- a/frontend/src/utils/api/students.ts +++ b/frontend/src/utils/api/students.ts @@ -24,15 +24,6 @@ export async function getStudents( ): Promise { let rolesRequestField: string = ""; - console.log([ - nameFilter, - rolesFilter, - alumniFilter, - studentCoachVolunteerFilter, - suggestedFilter, - page, - ]); - for (const role of rolesFilter) { rolesRequestField += "skill_ids=" + role.value.toString() + "&"; } From 4c196fac8365d13445520c3397ef0874451a2645 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 19 May 2022 20:33:38 +0200 Subject: [PATCH 463/649] Spinner when students are being fetched --- .../StudentListFilters/StudentListFilters.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx index 6d61ae447..6f9a4c783 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx @@ -20,6 +20,7 @@ import { getStudentCoachVolunteerFilter, getSuggestedFilter, } from "../../../utils/session-storage/student-filters"; +import LoadSpinner from "../../Common/LoadSpinner"; /** * Component that shows the sidebar with all the filters and student list. @@ -142,7 +143,9 @@ export default function StudentListFilters() { }, [nameFilter, rolesFilter, alumniFilter, studentCoachVolunteerFilter, suggestedFilter]); let list; - if (students.length === 0) { + if (loading) { + list = ; + } else if (students.length === 0) { list = No students found; } else { list = ( From ed234f1c9b2011a795fdcdf264668f493df12b63 Mon Sep 17 00:00:00 2001 From: cledloof Date: Thu, 19 May 2022 20:54:18 +0200 Subject: [PATCH 464/649] confirm filter --- .../StudentListFilters/StudentListFilters.css | 31 +++++++++++++ .../StudentListFilters/StudentListFilters.tsx | 43 ++++++++++++++++++- .../StudentListFilters/styles.ts | 8 ++++ 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css index d4814782f..0bdf431b8 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.css @@ -2,3 +2,34 @@ margin-left: 5%; margin-bottom: 1vh; } + +.ButtonGroupContainer { +} + +.YesToggle { + margin-right: 4%; + margin-bottom: 2.5%; + width: 10%; + color: var(--osoc_green); + border: 1px solid var(--osoc_green) !important; +} + +.MaybeToggle { + margin-bottom: 2.5%; + width: 10%; + color: var(--osoc_orange); + border: 1px solid var(--osoc_orange) !important; +} + +.NoToggle { + margin-right: 4%; + width: 10%; + color: var(--osoc_red); + border: 1px solid var(--osoc_red) !important; +} + +.UndecidedToggle { + width: 10%; + color: lightgrey; + border: 1px solid lightgrey !important; +} \ No newline at end of file diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx index 92c526d1b..4f3a10058 100644 --- a/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx +++ b/frontend/src/components/StudentsComponents/StudentListFilters/StudentListFilters.tsx @@ -1,7 +1,13 @@ import React, { useEffect, useState } from "react"; import StudentList from "../StudentList"; -import { Form } from "react-bootstrap"; -import { StudentListSideMenu, StudentListLinebreak, FilterControls, MessageDiv } from "./styles"; +import { ButtonGroup, Form, ToggleButton } from "react-bootstrap"; +import { + StudentListSideMenu, + StudentListLinebreak, + FilterControls, + MessageDiv, + ConfirmButtonsContainer, +} from "./styles"; import AlumniFilter from "./AlumniFilter/AlumniFilter"; import StudentCoachVolunteerFilter from "./StudentCoachVolunteerFilter/StudentCoachVolunteerFilter"; import NameFilter from "./NameFilter/NameFilter"; @@ -170,6 +176,39 @@ export default function StudentListFilters() { setStudentCoachVolunteerFilter={setStudentCoachVolunteerFilter} /> + + + + Yes + + + Maybe + + + + + No + + + Undecided + + + Date: Thu, 19 May 2022 21:16:54 +0200 Subject: [PATCH 465/649] fixes missing student suggestions when requesting a student by id --- backend/src/app/logic/students.py | 24 +++++++++++++++++-- .../app/routers/editions/students/students.py | 5 ++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/backend/src/app/logic/students.py b/backend/src/app/logic/students.py index a6c4a10fb..a02b78b5f 100644 --- a/backend/src/app/logic/students.py +++ b/backend/src/app/logic/students.py @@ -65,10 +65,30 @@ async def get_students_search(db: AsyncSession, edition: Edition, return ReturnStudentList(students=students) -def get_student_return(student: Student, edition: Edition) -> ReturnStudent: +async def get_student_return(db: AsyncSession, student: Student, edition: Edition) -> ReturnStudent: """return a student""" if student.edition == edition: - return ReturnStudent(student=student) + nr_of_yes_suggestions = len(await get_suggestions_of_student_by_type( + db, student.student_id, DecisionEnum.YES)) + nr_of_no_suggestions = len(await get_suggestions_of_student_by_type( + db, student.student_id, DecisionEnum.NO)) + nr_of_maybe_suggestions = len(await get_suggestions_of_student_by_type( + db, student.student_id, DecisionEnum.MAYBE)) + suggestions = SuggestionsModel( + yes=nr_of_yes_suggestions, no=nr_of_no_suggestions, maybe=nr_of_maybe_suggestions) + schema_student = StudentModel(student_id=student.student_id, + first_name=student.first_name, + last_name=student.last_name, + preferred_name=student.preferred_name, + email_address=student.email_address, + phone_number=student.phone_number, + alumni=student.alumni, + finalDecision=student.decision, + wants_to_be_student_coach=student.wants_to_be_student_coach, + edition_id=student.edition_id, + skills=student.skills, + nr_of_suggestions=suggestions) + return ReturnStudent(student=schema_student) raise NoResultFound diff --git a/backend/src/app/routers/editions/students/students.py b/backend/src/app/routers/editions/students/students.py index ecf83eb29..6b36fd7b2 100644 --- a/backend/src/app/routers/editions/students/students.py +++ b/backend/src/app/routers/editions/students/students.py @@ -79,11 +79,12 @@ async def delete_student(student: Student = Depends(get_student), db: AsyncSessi @students_router.get("/{student_id}", dependencies=[Depends(require_auth)], response_model=ReturnStudent) -async def get_student_by_id(edition: Edition = Depends(get_edition), student: Student = Depends(get_student)): +async def get_student_by_id(edition: Edition = Depends(get_edition), student: Student = Depends(get_student), + db: AsyncSession = Depends(get_session)): """ Get information about a specific student. """ - return get_student_return(student, edition) + return await get_student_return(db, student, edition) @students_router.put( From 45d7104fc42cb8f9345961a63d89448c2da85145 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 19 May 2022 21:29:29 +0200 Subject: [PATCH 466/649] make pretty --- backend/src/app/logic/students.py | 68 ++++++++++++------------------- 1 file changed, 27 insertions(+), 41 deletions(-) diff --git a/backend/src/app/logic/students.py b/backend/src/app/logic/students.py index a02b78b5f..08db3b3f0 100644 --- a/backend/src/app/logic/students.py +++ b/backend/src/app/logic/students.py @@ -29,6 +29,29 @@ async def remove_student(db: AsyncSession, student: Student) -> None: await delete_student(db, student) +async def _get_student_with_suggestions(db: AsyncSession, student: Student) -> StudentModel: + nr_of_yes_suggestions = len(await get_suggestions_of_student_by_type( + db, student.student_id, DecisionEnum.YES)) + nr_of_no_suggestions = len(await get_suggestions_of_student_by_type( + db, student.student_id, DecisionEnum.NO)) + nr_of_maybe_suggestions = len(await get_suggestions_of_student_by_type( + db, student.student_id, DecisionEnum.MAYBE)) + suggestions = SuggestionsModel( + yes=nr_of_yes_suggestions, no=nr_of_no_suggestions, maybe=nr_of_maybe_suggestions) + return StudentModel(student_id=student.student_id, + first_name=student.first_name, + last_name=student.last_name, + preferred_name=student.preferred_name, + email_address=student.email_address, + phone_number=student.phone_number, + alumni=student.alumni, + finalDecision=student.decision, + wants_to_be_student_coach=student.wants_to_be_student_coach, + edition_id=student.edition_id, + skills=student.skills, + nr_of_suggestions=suggestions) + + async def get_students_search(db: AsyncSession, edition: Edition, commons: CommonQueryParams, user: User) -> ReturnStudentList: """return all students""" @@ -42,53 +65,16 @@ async def get_students_search(db: AsyncSession, edition: Edition, students: list[StudentModel] = [] for student in students_orm: - students.append(StudentModel( - student_id=student.student_id, - first_name=student.first_name, - last_name=student.last_name, - preferred_name=student.preferred_name, - email_address=student.email_address, - phone_number=student.phone_number, - alumni=student.alumni, - finalDecision=student.decision, - wants_to_be_student_coach=student.wants_to_be_student_coach, - edition_id=student.edition_id, - skills=student.skills)) - nr_of_yes_suggestions = len(await get_suggestions_of_student_by_type( - db, student.student_id, DecisionEnum.YES)) - nr_of_no_suggestions = len(await get_suggestions_of_student_by_type( - db, student.student_id, DecisionEnum.NO)) - nr_of_maybe_suggestions = len(await get_suggestions_of_student_by_type( - db, student.student_id, DecisionEnum.MAYBE)) - students[-1].nr_of_suggestions = SuggestionsModel( - yes=nr_of_yes_suggestions, no=nr_of_no_suggestions, maybe=nr_of_maybe_suggestions) + student_model = await _get_student_with_suggestions(db, student) + students.append(student_model) return ReturnStudentList(students=students) async def get_student_return(db: AsyncSession, student: Student, edition: Edition) -> ReturnStudent: """return a student""" if student.edition == edition: - nr_of_yes_suggestions = len(await get_suggestions_of_student_by_type( - db, student.student_id, DecisionEnum.YES)) - nr_of_no_suggestions = len(await get_suggestions_of_student_by_type( - db, student.student_id, DecisionEnum.NO)) - nr_of_maybe_suggestions = len(await get_suggestions_of_student_by_type( - db, student.student_id, DecisionEnum.MAYBE)) - suggestions = SuggestionsModel( - yes=nr_of_yes_suggestions, no=nr_of_no_suggestions, maybe=nr_of_maybe_suggestions) - schema_student = StudentModel(student_id=student.student_id, - first_name=student.first_name, - last_name=student.last_name, - preferred_name=student.preferred_name, - email_address=student.email_address, - phone_number=student.phone_number, - alumni=student.alumni, - finalDecision=student.decision, - wants_to_be_student_coach=student.wants_to_be_student_coach, - edition_id=student.edition_id, - skills=student.skills, - nr_of_suggestions=suggestions) - return ReturnStudent(student=schema_student) + student_model = await _get_student_with_suggestions(db, student) + return ReturnStudent(student=student_model) raise NoResultFound From 74712900e6cfff876848a9a418aece38ea6ebf41 Mon Sep 17 00:00:00 2001 From: Tiebe Vercoutter Date: Thu, 19 May 2022 21:39:17 +0200 Subject: [PATCH 467/649] some style fixes --- .../ProjectRoles/SuggestedStudent/styles.ts | 6 +++++- .../ProjectDetailComponents/StudentList/styles.ts | 2 +- .../src/components/StudentsComponents/StudentList/styles.ts | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/styles.ts b/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/styles.ts index 740a29148..3d8a3cd9b 100644 --- a/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/styles.ts +++ b/frontend/src/components/ProjectDetailComponents/ProjectRoles/SuggestedStudent/styles.ts @@ -22,9 +22,13 @@ export const DrafterContainer = styled.div` border-radius: 5px; padding: 15px; margin-right: auto; - background-color: #1a1a2f; + background-color: #0f0f30; display: flex; margin-bottom: 5px; + width: 100%; + overflow: auto; + text-align: left; + text-overflow: ellipsis; `; export const StudentName = styled.div` diff --git a/frontend/src/components/ProjectDetailComponents/StudentList/styles.ts b/frontend/src/components/ProjectDetailComponents/StudentList/styles.ts index 2b4e705eb..3f7c07bdf 100644 --- a/frontend/src/components/ProjectDetailComponents/StudentList/styles.ts +++ b/frontend/src/components/ProjectDetailComponents/StudentList/styles.ts @@ -4,7 +4,7 @@ export const StudentListContainer = styled.div` margin: 20px; padding: 20px; padding-left: 0; - max-width: 20%; + width: 20%; border-right: 5px solid #131329; overflow: auto; `; diff --git a/frontend/src/components/StudentsComponents/StudentList/styles.ts b/frontend/src/components/StudentsComponents/StudentList/styles.ts index 3f240f5a8..77df200a1 100644 --- a/frontend/src/components/StudentsComponents/StudentList/styles.ts +++ b/frontend/src/components/StudentsComponents/StudentList/styles.ts @@ -2,6 +2,6 @@ import styled from "styled-components"; export const StudentCardsList = styled.div` height: 60%; - overflow-y: scroll; + overflow-y: auto; border-bottom: 1px solid white; `; From 67e7dfbe2af6e6008625566a7b262051eb12e801 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 19 May 2022 21:55:21 +0200 Subject: [PATCH 468/649] Fix toast closing too soon --- .../Coaches/CoachesComponents/AddCoach.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx index ae84c20c3..4854bae76 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx @@ -65,6 +65,7 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => const handleClose = () => { setSelected(undefined); + props.refreshCoaches(); setShow(false); }; const handleShow = () => { @@ -78,17 +79,9 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => pending: "Adding coach", success: "Coach successfully added", }); - if (!success) { - toast.error("Failed to add coach", { - toastId: "add_coach_failed", - }); - } setLoading(false); if (success) { - props.refreshCoaches(); - setSearchTerm(""); - getData(0, ""); setSelected(undefined); setClearRef(true); } From 3a1f8632a8b9b11b670b111e0dfeec3437dd5b81 Mon Sep 17 00:00:00 2001 From: SeppeM8 Date: Thu, 19 May 2022 21:58:50 +0200 Subject: [PATCH 469/649] Remove unnecessary check --- .../Coaches/CoachesComponents/AddCoach.tsx | 8 +++----- .../Coaches/CoachesComponents/RemoveCoach.tsx | 13 +++---------- frontend/src/utils/api/users/coaches.ts | 15 ++++++--------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx index 4854bae76..e20a90737 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/AddCoach.tsx @@ -74,17 +74,15 @@ export default function AddCoach(props: { edition: string; refreshCoaches: () => async function addCoach(user: User) { setLoading(true); - const success = await toast.promise(addCoachToEdition(user.userId, props.edition), { + await toast.promise(addCoachToEdition(user.userId, props.edition), { error: "Failed to add coach", pending: "Adding coach", success: "Coach successfully added", }); setLoading(false); - if (success) { - setSelected(undefined); - setClearRef(true); - } + setSelected(undefined); + setClearRef(true); } let addButton; diff --git a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx index e76be9f98..52adc63f6 100644 --- a/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx +++ b/frontend/src/components/UsersComponents/Coaches/CoachesComponents/RemoveCoach.tsx @@ -44,15 +44,14 @@ export default function RemoveCoach(props: { */ async function removeCoach(userId: number, allEditions: boolean) { setLoading(true); - let removed; if (allEditions) { - removed = await toast.promise(removeCoachFromAllEditions(userId), { + await toast.promise(removeCoachFromAllEditions(userId), { error: "Failed to remove coach", pending: "Removing coach", success: "Coach successfully removed", }); } else { - removed = await toast.promise(removeCoachFromEdition(userId, props.edition), { + await toast.promise(removeCoachFromEdition(userId, props.edition), { error: "Failed to remove coach", pending: "Removing coach", success: "Coach successfully removed", @@ -60,13 +59,7 @@ export default function RemoveCoach(props: { } setLoading(false); - if (removed) { - props.removeCoach(); - } else { - toast.error("Failed to remove coach", { - toastId: "remove_coach_failed", - }); - } + props.removeCoach(); } let buttons; diff --git a/frontend/src/utils/api/users/coaches.ts b/frontend/src/utils/api/users/coaches.ts index 40eba5719..e9539e021 100644 --- a/frontend/src/utils/api/users/coaches.ts +++ b/frontend/src/utils/api/users/coaches.ts @@ -33,18 +33,16 @@ export async function getCoaches( * @param {number} userId The user's id. * @param {string} edition The edition's name. */ -export async function removeCoachFromEdition(userId: number, edition: string): Promise { - const response = await axiosInstance.delete(`/users/${userId}/editions/${edition}`); - return response.status === 204; +export async function removeCoachFromEdition(userId: number, edition: string) { + await axiosInstance.delete(`/users/${userId}/editions/${edition}`); } /** * Remove a user as coach from all editions. * @param {number} userId The user's id. */ -export async function removeCoachFromAllEditions(userId: number): Promise { - const response = await axiosInstance.delete(`/users/${userId}/editions`); - return response.status === 204; +export async function removeCoachFromAllEditions(userId: number) { + await axiosInstance.delete(`/users/${userId}/editions`); } /** @@ -52,7 +50,6 @@ export async function removeCoachFromAllEditions(userId: number): Promise { - const response = await axiosInstance.post(`/users/${userId}/editions/${edition}`); - return response.status === 204; +export async function addCoachToEdition(userId: number, edition: string) { + await axiosInstance.post(`/users/${userId}/editions/${edition}`); } From f5ef06d5e93d18241b9a5091f401200c44db7b2d Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 19 May 2022 22:53:50 +0200 Subject: [PATCH 470/649] updated the user manual with all features --- files/user_manual.md | 132 ++++++++++++++++++++++++++++++++++-------- files/user_manual.pdf | Bin 121202 -> 135991 bytes 2 files changed, 107 insertions(+), 25 deletions(-) diff --git a/files/user_manual.md b/files/user_manual.md index 912f880e4..a0b300efb 100644 --- a/files/user_manual.md +++ b/files/user_manual.md @@ -2,6 +2,7 @@ In this file, we describe how the selection tool is meant to be used by the end users. This is divided in the different parts of the website. + ## Logging in After you have registered yourself and have been approved by one of the administrators of the selection tool, you can log in to the website. @@ -17,11 +18,17 @@ There are different ways to log in, depending on the way in which you have regis 1. Click the "Log in" button with the GitHub logo. -## Admins -This section is for admins. It contains all features to manage users. A user is someone who uses the tool (this does not include students). A user can be coach of one or more editions. He can only see data and work (making suggestions...) on these editions. A user can be admin of the tool. An admin can see/edit/delete all data from all editions and manage other users. This role is only for fully trusted people. An admin doesn't need to be coach from an edition to participate in the selection process. +## Logging out + +To log out, click on the **Log Out** button on the top right of the page. + -The management is split into two pages. The first one is to manage coaches of the currently selected edition. The other is to manage admins. Both pages can be found in the **Users** tab in the navigation bar. +## Managing Users (Admin-only) + +This section is for admins. It contains all features to manage users. A user is someone who uses the tool (this does not include students). A user can be coach of one or more editions. He can only see data and work (making suggestions...) on these editions. A user can be admin of the tool. An admin can see/edit/delete all data from all editions and manage other users. This role is only for fully trusted people. An admin doesn't need to be coach in an edition to participate in the selection process. + +The management is split into two pages. The first one is to manage coaches of the currently selected edition. The other is to manage admins (these are not linked to a specific edition). Both pages can be found in the **Users** tab in the navigation bar. ### Coaches @@ -38,18 +45,18 @@ At the top left, you can invite someone via an invite link. You can choose betwe At the top middle of the page, you find a dropdown labeled **Requests**. When you expand the dropdown, you can see a list of all pending user requests. These are all users who used an invite link to create an account, and haven't been accepted (or declined) yet. -Note: the list only contains requests from the current selected edition. Each edition has its own requests. +**Note:** the list only contains requests from the current selected edition. Each edition has its own requests. -The list can be filtered by name. Each row of the table contains the name and email address of a person. The email contains an icon indicating whether the person registered via email, GitHub. Next to each row there are two buttons to accept or reject the person. When a person is accepted, he will automatically be added as coach to the current edition. +The list can be filtered by name. Each row of the table contains the name and email address of a person. The email contains an icon indicating whether the person registered via email or GitHub. Next to each row there are two buttons to accept or reject the person. When a person is accepted, he will automatically be added as coach to the current edition. #### Coaches -A the centre of the page, you can find a list of all users who are coach in the current edition. As in the Requests list, each row contains the name and email address of a user. The list can be filtered by name. +At the centre of the page, you can find a list of all users who are coach in the current edition. As in the Requests list, each row contains the name and email address of a user. The list can be filtered by name. Next to the email address, there is a button to remove the user as coach from the currently selected edition. Once clicked, you get two choices: - **Remove from all editions**: The user will be removed as coach from all editions. If the user is not an admin, he won't be able to see any data from any edition anymore -- **Remove from {Edition name}**: The user will be removed as coach from the current selected edition. He will still be able to see data from any other edition wherefrom he is coach. +- **Remove from {Edition name}**: The user will be removed as coach from the current selected edition. He will still be able to see data from all other editions where he is coach. At the top right of the list, there is a button to add a user as coach to the selected edition. This can be used if a user of a previous edition needs to be a coach in the current edition. You can only add existing users via this button. Once clicked, you see a prompt to search for a user's name. After typing the name of the user, a list of users whose name contains the typed text will be shown. You can select the desired user, check if the email and register-method are correct and add him as coach to the current edition. A user who is added as coach will be able to see all data of the current edition and participate in the selection process. @@ -59,13 +66,14 @@ This page consists of a list of all users who are admin. An admin can see all ed Next to the email address, there is a button to remove a user as admin. Once clicked, you get two choices: -- **Remove admin**: Remove the given user as admin. He will stay coach for editions whereto he was assigned +- **Remove admin**: Remove the given user as admin. He will stay coach for editions where he was assigned to. - **Remove as admin and coach**: Remove the given user as admin and remove him as coach from every edition. The user won't be able to see any data from any edition. At the top right of the list, there is a button to add a user as admin. Once clicked, you see a prompt to search for a user's name. After typing the name of the user, a list of users whose names contain the typed text will be shown. You can select the desired user, check if the email and register-method are correct and add him as admin. **Warning**: A user who is added as admin will be able to edit and delete all data. He will be able to add and remove other admins. + ## Editions This section contains all actions related to managing your editions. @@ -84,7 +92,7 @@ This page lists all editions, and contains buttons for: In order to create new editions, head over to the Editions Page (see [Viewing a list of available editions](#viewing-a-list-of-available-editions)). In the top-right of the page, you should see a "+ Create Edition"-button. - Click the "+ Create Edition"-button -- Fill in the fields in the form presented to you +- Fill in the fields in the form presented to you (only alphanumerical characters, dashes and underscores are allowed as the name for an edition) - Click the "Submit"-button You've now created a new edition to which you can add coaches, projects, and students. @@ -112,6 +120,7 @@ _**Note**: This dropdown is hidden if you cannot see any editions, as it would b You have now set another edition as your "current edition". This means that navigating through the navbar will show results for that specific edition. + ## Projects This section contains all actions related to managing projects. @@ -122,41 +131,114 @@ You can navigate to the "Projects page" by clicking the **Projects** button. Her You can also filter on project name and on the projects where you are a coach of. To filter on name enter a name in the search field and press enter or click the **Search** button. To filter on your own projects toggle the **Only own projects** switch. -To get more search results click the **Load more projects** button located at the bottom of the search results +When there are a lot of projects, the **Load more projects** button located at the bottom of the search results will get you more projects. + +### Deleting a project (Admin-only) + +To delete a project click the **trash** button located on the top right of a project card or next to the project name in the detailed project page. A pop up will appear to confirm your decision. Press **Delete** again to delete the project or cancel the delete operation. + +### Conflicts + +As coaches can suggest a student for multiple project, but a student can only work on one, conflicts can happen. To definitively confirm a student for a project, all conflicts involving that student will first need to be resolved. -### Detailed view of a project +To see an overview of all current conflicts, click on the green button at the top right of the "Projects page". + + +## Detailed view of a project To get more in depth with a project click the title of the project. This will take you to the "Project page" of that specific project. -### Delete a project +### Editing a project (Admin-only) + +To edit a project, click on the pencil icon next to the project's name, now you can change all the attributes of the project. + +### Suggesting a student for a project + +To suggest a student for a project, drag the student from the list on the lefthand side to the skill you want to suggest the student for. A popup will appear asking for a motivation for the suggestion. + +### Confirming a student for a project (Admin-only) + +When it has been definitively decided that the student will work on this project, an admin can confirm the student for this project. This will not be possible if the student is currently also assigned to another project (=conflict). + +When a student is confirmed, they cannot be added to another project anymore. + +### Removing a student from a project (Admin-only) + +To remove a student from a project, click on the red trash icon on the top right of the student's card on the "Project page". + +### Adding a skill to a project (Admin-only) -To delete a project click the **trash** button located on the top right of a project card. A pop up will appear to confirm your decision. Press **Delete** again to delete the project or cancel the delete operation +A skill contains a number of slots where students can be placed in to fulfill that skill for that project. +To add a new skill requirement to a project, click on the **Add new skill** button on the botton of the "Project page". -## Email history of a student +### Removing a skill from a project (Admin-only) -To view a student's email history (i.e. all the emails that have ever been sent to that student), navigate to the page with the student's details, and click on the "See Email History" button. +To remove a skill from a project, click on the red trash icon on the top right of the card of the skill on the "Project page". -The email history will be shown in a table, with the most recent email at the top. -## Overview of email states +## State history of a student (Admin-only) -The overview of the email states is a table of all students of an edition, together with the most recent email type that has been sent to them. +A student can be at different stages throughout the selection process, at some stages, an email needs to be sent to the student to inform them of their state change (e.g. the student has been accepted/denied). -This table needs to be manually maintained (i.e. when an email is sent, someone has to update this list). +To view a student's state history (i.e. all states the student has ever been in), navigate to the page with the student's details, and click on the "See State History" button. + +The state history will be shown in a table, with the most recent state at the top. + + +## Overview of states (Admin-only) + +To see the overview of states, click on "Students" in the navbar on top of the page, and then click on "State Overview" + +The overview of the states is a table of all students of an edition, together with the most recent state that has been assigned to them. + +This table needs to be manually maintained (i.e. when a new decision has been made about a student, someone has to update this list). ### Searching and Filtering -The overview table allows you to search for a particular student or filter based on one or more email states. +The overview table allows you to search for a particular student or filter based on one or more states. -To search for a student: type (the beginning of) a student's name in the search bar and click on the "search" button. +To search for a student: type (the beginning of) a student's name in the search bar. -To filter based on email states: select one or more states from the list and click on the "search" button. +To filter based on email states: select one or more states from the list. These two things (searching and filtering) can also be combined. -### Updating the email overview +### Updating the state overview + +When a new state is assigned to one or more students, the list needs to be updated. + +This can be done by selecting these students in the table, clicking on the "Set state of selected students", and choosing the new state from the dropdown. + + +## Students + +### Viewing a student + +To view the details of a student, click on the student's name in the list on the lefthand side. + +### Making a suggestion for a student + +Every coach can make a suggestion for a student, where they express whether they find the student interesting to use in their project or not. +To do this, scroll down on the student's detail page and click on the appropriate suggestion you want to make for that student. A popup will appear where you can enter an argumentation for this decision. + +### Making a definitive decision for a student (Admin-only) + +An admin can make a definitive decision for a student, by taking into account the multiple suggestions from the coaches. This is where an admin decides if a student is accepted into the programme or not. +To make a definitive decision, scroll down on the student's detail page and click on the **Confirm** button. A popup will appear where you can select the decision you want to make. + +### Removing a student (Admin-only) + +To remove a student, click on the red trash icon on the bottom of the student's page. + +### Searching and filtering in the student's list + +The student's list on the lefthand side can be searched through (by typing the name of the student in the search bar) and can also be filtered by multiple attributes: + +- Roles: Only show students who have one of the selected roles +- Only alumni: Only show students who are alumni +- Students you've suggested for: Only show students for which you made a suggestion +- Only student coach volunteer: Only show students who indicated that they want to be a student coach -When a new email is sent to one or more students, the list needs to be updated. +These filters can also be reset by clicking the red **Reset filters** button at the top of the student's list. -This can be done by selecting these students in the table, clicking on the "Set state of selected students", and choosing the new email state from the dropdown. diff --git a/files/user_manual.pdf b/files/user_manual.pdf index daa8023630d294f5ecd3f5734f3c900032a43a4d..6cbdcb2898d40d2ce6d64868c1d687f2fbaafa53 100644 GIT binary patch delta 111018 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

    ~k;~JfmKkoh5YNG5khY!HT{J+2T%16X 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 O6BjH6g{Zt3?EeBsqhUJ$ delta 96354 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 Date: Thu, 19 May 2022 21:59:20 +0200 Subject: [PATCH 471/649] just so my changes don't get lost --- ...-5933d05a-b197-45ec-b95c-30c5be43fc80.json | 1 + backend/settings.py | 1 + backend/src/app/logic/webhooks.py | 20 ++- backend/src/database/crud/skills.py | 4 + .../test_database/test_crud/test_skills.py | 8 + .../test_webhooks/test_webhooks.py | 151 ++++++++++-------- 6 files changed, 116 insertions(+), 69 deletions(-) create mode 100644 backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json diff --git a/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json b/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json new file mode 100644 index 000000000..babb8904e --- /dev/null +++ b/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json @@ -0,0 +1 @@ +{"event_id": "5933d05a-b197-45ec-b95c-30c5be43fc80", "created_at": "2022-03-03T10:20:00.859Z", "data": {"response_id": "85e41402-b5b9-4a24-ac0e-344caa33f985", "submission_id": "wkv6d3", "form_id": "wkjyM3", "form_name": "#osoc22 student application form", "created_at": "2021-05-12T11:52:57.879Z", "fields": [{"key": "question_nGRzxz", "label": "Will you live in Belgium in July 2022?*", "type": "MULTIPLE_CHOICE", "value": "779e2fe0-64fe-4d87-b337-957c4a0517e3", "options": [{"id": "779e2fe0-64fe-4d87-b337-957c4a0517e3", "text": "Yes"}, {"id": "444fd1f8-756a-4a24-8189-a306c0fe94b0", "text": "No"}]}, {"key": "question_mO7zDA", "label": "Are you able to work 128 hours with a student employment agreement, or as a volunteer?*", "type": "MULTIPLE_CHOICE", "value": "398e4fe0-c307-4bce-9120-2079d35fe184", "options": [{"id": "0bcaf720-2040-4d31-a3e8-59c5644dab9a", "text": "Yes, I can work with a student employment agreement in Belgium"}, {"id": "5b519077-25c5-4d20-ab7f-2da844989ddb", "text": "Yes, I can work as a volunteer in Belgium"}, {"id": "f7fc01d2-a274-413b-8ea2-c0630d075e03", "text": "No \u2013 but I would like to join this experience for free"}, {"id": "398e4fe0-c307-4bce-9120-2079d35fe184", "text": "No, I won\u2019t be able to work as a student, as a volunteer or for free."}]}, {"key": "question_mVz0Ll", "label": "Can you work during the month of July, Monday through Thursday (~09:00 to 17:00)?*", "type": "MULTIPLE_CHOICE", "value": "6d7b21a6-5a78-4d56-89ee-e20fb01b4c25", "options": [{"id": "6d7b21a6-5a78-4d56-89ee-e20fb01b4c25", "text": "Yes"}, {"id": "748287a7-7b52-4746-8c5f-323caedcbbee", "text": "No, I wouldn't be able to work for the majority of days."}]}, {"key": "question_nPz6d0", "label": "Are there any responsibilities you might have which could hinder you during the day?", "type": "TEXTAREA", "value": "Strategy politics vote notice similar adult goal PM gas company follow thing sometimes break develop order away run six list organization single man free page far some tend interview chance positive activity market information could or simple site upon less candidate brother child community decision wall to course boy painting news hotel simply model idea fast worry kitchen admit along strategy actually business recent continue member.", "options": null}, {"key": "question_3ExXkL", "label": "Birth name", "type": "INPUT_TEXT", "value": "Bob", "options": null}, {"key": "question_nro6jL", "label": "Last name", "type": "INPUT_TEXT", "value": "Klonck", "options": null}, {"key": "question_w4K84o", "label": "Would you like to be called by a different name than your birth name?", "type": "MULTIPLE_CHOICE", "value": "4e8760d6-4960-404c-82fb-8b2e8dc6af61", "options": [{"id": "4e8760d6-4960-404c-82fb-8b2e8dc6af61", "text": "Yes"}, {"id": "10532c12-72fe-46c1-aca6-54e6185d385d", "text": "No"}]}, {"key": "question_3jlya9", "label": "How would you like to be called?", "type": "INPUT_TEXT", "value": "Jhon", "options": null}, {"key": "question_w2KeEb", "label": "What is your gender?", "type": "MULTIPLE_CHOICE", "value": "3b3e4851-354d-4135-92e0-7cab57041fc5", "options": [{"id": "dcb028c2-bdd3-4bc6-abe1-3937862a7c8f", "text": "Female"}, {"id": "3b3e4851-354d-4135-92e0-7cab57041fc5", "text": "Male"}, {"id": "ae4a4c95-4f22-48b9-892e-80d38bbe7ef1", "text": "Transgender"}, {"id": "20ba24a6-b52a-43ae-a517-556b139a8984", "text": "Rather not say"}]}, {"key": "question_3xJpX9", "label": "Would you like to add your pronouns?", "type": "MULTIPLE_CHOICE", "value": "980614af-52d8-45d9-acb6-9d76952a86f1", "options": [{"id": "980614af-52d8-45d9-acb6-9d76952a86f1", "text": "Yes"}, {"id": "ea012b47-896a-4264-b876-35c7e7392a06", "text": "No"}]}, {"key": "question_mZ2Njv", "label": "Which pronouns do you prefer?", "type": "MULTIPLE_CHOICE", "value": "2d74b670-9f74-481a-bd2f-b8b06668f0a4", "options": [{"id": "7719f945-47ca-4166-9aa3-a3a2e1387009", "text": "she/her/hers"}, {"id": "d9245c04-4abe-488e-a884-17f6c501c1eb", "text": "he/him/his"}, {"id": "b78cb089-3e57-484e-bb86-03f3cc753571", "text": "they/them/theirs"}, {"id": "2d74b670-9f74-481a-bd2f-b8b06668f0a4", "text": "ze/hir/hir "}, {"id": "a9145194-f930-436e-b0e0-340e7c3fac3e", "text": "by firstname"}, {"id": "e6d5eae6-9340-44ca-a268-934e53ebf707", "text": "by call name"}, {"id": "ac94baff-9650-4751-83fe-b8315ddedb80", "text": "other"}]}, {"key": "question_3N76pb", "label": "Enter your pronouns", "type": "INPUT_TEXT", "value": "I control sound.", "options": null}, {"key": "question_3qRd4k", "label": "What language are you most fluent in?", "type": "MULTIPLE_CHOICE", "value": "7f4d9b81-fb56-4a07-b878-9b2ac913348b", "options": [{"id": "7f4d9b81-fb56-4a07-b878-9b2ac913348b", "text": "Dutch"}, {"id": "aafb7b8e-e437-440c-a3c6-22a2b61da769", "text": "English"}, {"id": "06efe9b0-8187-4f8c-9f88-53da49177a28", "text": "French"}, {"id": "f4b3f9c9-525e-4bd2-949c-3b52e04477ca", "text": "German"}, {"id": "b6902bde-6134-442d-a8a8-18e882e3e09d", "text": "Other"}]}, {"key": "question_wQ7DKk", "label": "What language are you most fluent in?", "type": "INPUT_TEXT", "value": "Book affect local.", "options": null}, {"key": "question_n97Wq4", "label": "How would you rate your English?", "type": "MULTIPLE_CHOICE", "value": "10ccead0-4539-4695-978b-16a24c1a1fe1", "options": [{"id": "0288cfa1-a19a-40f4-a172-8b9335152d57", "text": "\u2605 I can understand your form, but it is hard for me to reply."}, {"id": "9de70dc1-c4b6-4734-84d1-3e3a2a29a70f", "text": "\u2605\u2605 I can have simple conversations."}, {"id": "a5464911-6714-490b-a370-eb3de514573a", "text": "\u2605\u2605\u2605 I can express myself, understand people and get a point across."}, {"id": "10ccead0-4539-4695-978b-16a24c1a1fe1", "text": "\u2605\u2605\u2605\u2605 I can have extensive and complicated conversations."}, {"id": "784e392f-9e56-4bba-8cdd-1a85e3194352", "text": "\u2605\u2605\u2605\u2605\u2605 I am fluent."}]}, {"key": "question_mea6qo", "label": "Phone number", "type": "INPUT_PHONE_NUMBER", "value": "0477002266", "options": null}, {"key": "question_nW8NOQ", "label": "Your email address\n", "type": "INPUT_EMAIL", "value": "test@gmail.com", "options": null}, {"key": "question_wa26Qy", "label": "Upload your CV \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "panel.png", "url": "https://rubye.net/images/panel.png", "mime_type": "image/png", "size": 4033}], "options": null}, {"key": "question_m6Z785", "label": "Or link to your CV", "type": "INPUT_LINK", "value": "http://craig-hall.com/", "options": null}, {"key": "question_w7NWRz", "label": "Upload your portfolio \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "Tuna.png", "url": "http://eliza.name/images/Tuna.png", "mime_type": "image/png", "size": 43843}], "options": null}, {"key": "question_wbW75E", "label": "Or link to your portfolio / GitHub", "type": "INPUT_LINK", "value": "https://johnson-wagner.com/", "options": null}, {"key": "question_wABd7N", "label": "Upload your motivation \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "Savings Account.png", "url": "http://orlando.com/images/Savings Account.png", "mime_type": "image/png", "size": 90759}], "options": null}, {"key": "question_mBxXzY", "label": "Or link to your motivation", "type": "INPUT_LINK", "value": "http://www.woods.com/", "options": null}, {"key": "question_wkNydj", "label": "Or write about your motivation", "type": "TEXTAREA", "value": "Eat accept rate decision focus us able significant learn scene pick soldier thank financial woman beautiful resource culture together some activity executive fear market throw change game two thousand foot mean half possible area not eat ground start less available become tell population realize reason future whether nation term after seem hair involve glass government deal future factor to learn agency may final nor maintain position with group sense where must tend clearly loss fish bad black soon stay director during head stuff rock hope the near character executive fill class property glass organization soldier common seat individual within hot laugh middle garden pass drug with free economy should against box seem move window.", "options": null}, {"key": "question_wvPAG8", "label": "Add a fun fact about yourself", "type": "TEXTAREA", "value": "Case prepare kind throughout at staff music rise your bit expert along knowledge seem choose former ability bill charge gun better factor more red consider theory feel tend whom early.", "options": null}, {"key": "question_mKV6YK", "label": "What do/did you study?", "type": "CHECKBOXES", "value": ["b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "874b62b3-1777-4bff-a51f-82711657ce3d", "f7faa5fd-f421-4038-bc65-cb705bead0e1", "29cdb508-55e0-4a7b-ac40-19d7395bab33"], "options": [{"id": "2882098f-9237-471c-9cca-fbb94336ec47", "text": "Backend development"}, {"id": "f7faa5fd-f421-4038-bc65-cb705bead0e1", "text": "Business management"}, {"id": "b7823b1e-eb73-4dcc-930a-85adadddd06f", "text": "Communication Sciences"}, {"id": "b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "text": "Computer Sciences"}, {"id": "874b62b3-1777-4bff-a51f-82711657ce3d", "text": "Design"}, {"id": "29cdb508-55e0-4a7b-ac40-19d7395bab33", "text": "Frontend development"}, {"id": "e9d3143b-97c7-4149-b39f-03e4fa118513", "text": "Marketing"}, {"id": "fe10f00d-2e69-4590-b128-12f170178586", "text": "Photography"}, {"id": "a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "text": "Videography"}, {"id": "9061ff92-8dfa-4e40-8492-c2905fe2ca49", "text": "Other"}]}, {"key": "question_mKV6YK_2882098f-9237-471c-9cca-fbb94336ec47", "label": "What do/did you study? (Backend development)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_mKV6YK_f7faa5fd-f421-4038-bc65-cb705bead0e1", "label": "What do/did you study? (Business management)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_b7823b1e-eb73-4dcc-930a-85adadddd06f", "label": "What do/did you study? (Communication Sciences)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "label": "What do/did you study? (Computer Sciences)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_874b62b3-1777-4bff-a51f-82711657ce3d", "label": "What do/did you study? (Design)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_29cdb508-55e0-4a7b-ac40-19d7395bab33", "label": "What do/did you study? (Frontend development)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_e9d3143b-97c7-4149-b39f-03e4fa118513", "label": "What do/did you study? (Marketing)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_fe10f00d-2e69-4590-b128-12f170178586", "label": "What do/did you study? (Photography)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "label": "What do/did you study? (Videography)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_9061ff92-8dfa-4e40-8492-c2905fe2ca49", "label": "What do/did you study? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_wLPbZ2", "label": "What do/did you study?", "type": "INPUT_TEXT", "value": "Window able treat every key.", "options": null}, {"key": "question_npDKbE", "label": "What kind of diploma are you currently going for?", "type": "CHECKBOXES", "value": ["2856db53-84de-4468-a70f-57eb7ba5ec40", "46570410-5581-4ada-9994-2a03f68f67a3", "1c39739b-29ce-4337-915b-bdf23b7a438d", "567f530f-d285-4e40-858f-df2f7a009e30", "ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca"], "options": [{"id": "2856db53-84de-4468-a70f-57eb7ba5ec40", "text": "A professional Bachelor"}, {"id": "46570410-5581-4ada-9994-2a03f68f67a3", "text": "An academic Bachelor"}, {"id": "567f530f-d285-4e40-858f-df2f7a009e30", "text": "An associate degree"}, {"id": "bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "text": "A master's degree"}, {"id": "ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "text": "Doctoral degree"}, {"id": "b6abbd71-7924-4655-a7b0-c51c5126ba52", "text": "No diploma, I am self taught"}, {"id": "1c39739b-29ce-4337-915b-bdf23b7a438d", "text": "Other"}]}, {"key": "question_npDKbE_2856db53-84de-4468-a70f-57eb7ba5ec40", "label": "What kind of diploma are you currently going for? (A professional Bachelor)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_npDKbE_46570410-5581-4ada-9994-2a03f68f67a3", "label": "What kind of diploma are you currently going for? (An academic Bachelor)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_567f530f-d285-4e40-858f-df2f7a009e30", "label": "What kind of diploma are you currently going for? (An associate degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "label": "What kind of diploma are you currently going for? (A master's degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "label": "What kind of diploma are you currently going for? (Doctoral degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_b6abbd71-7924-4655-a7b0-c51c5126ba52", "label": "What kind of diploma are you currently going for? (No diploma, I am self taught)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_1c39739b-29ce-4337-915b-bdf23b7a438d", "label": "What kind of diploma are you currently going for? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_319lAL", "label": "What kind of diploma are you currently going for?", "type": "INPUT_TEXT", "value": "Building learn month southern.", "options": null}, {"key": "question_wMEbe0", "label": "How many years does your degree take?", "type": "INPUT_NUMBER", "value": "4", "options": null}, {"key": "question_mJO697", "label": "Which year of your degree are you in?", "type": "INPUT_TEXT", "value": "4", "options": null}, {"key": "question_wg90DK", "label": "What is the name of your college or university?", "type": "INPUT_TEXT", "value": "Detail rather happy coach apply.", "options": null}, {"key": "question_3yJ6PW", "label": "Which role are you applying for?", "type": "CHECKBOXES", "value": ["8c1f1b4e-5004-43c8-8aa5-0241ed14d759"], "options": [{"id": "7ab99307-9377-4b16-bb7a-91172d69c417", "text": "Front-end developer"}, {"id": "c9a3aa50-7117-448f-9966-3f946731e79e", "text": "Back-end developer"}, {"id": "7f53e36f-4c84-4e00-baf9-0881e0e6ab51", "text": "UX / UI designer"}, {"id": "b8e4905a-fb22-4608-87db-f604ac9ad072", "text": "Graphic designer"}, {"id": "8421a8c4-01e1-43a6-9973-77af251ddcb2", "text": "Business Modeller"}, {"id": "8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "text": "Storyteller"}, {"id": "e5ede7d5-c874-4f93-b995-57bcd6928dad", "text": "Marketer"}, {"id": "c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "text": "Copywriter"}, {"id": "8c9800db-e9cc-42ce-a87b-f4c42755224f", "text": "Video editor"}, {"id": "8b54310e-70f2-410e-81b5-63ead19a2542", "text": "Photographer"}, {"id": "b96b05a6-5171-4318-8f5c-245b530695dd", "text": "Other"}]}, {"key": "question_3yJ6PW_7ab99307-9377-4b16-bb7a-91172d69c417", "label": "Which role are you applying for? (Front-end developer)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_3yJ6PW_c9a3aa50-7117-448f-9966-3f946731e79e", "label": "Which role are you applying for? (Back-end developer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_7f53e36f-4c84-4e00-baf9-0881e0e6ab51", "label": "Which role are you applying for? (UX / UI designer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_b8e4905a-fb22-4608-87db-f604ac9ad072", "label": "Which role are you applying for? (Graphic designer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8421a8c4-01e1-43a6-9973-77af251ddcb2", "label": "Which role are you applying for? (Business Modeller)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "label": "Which role are you applying for? (Storyteller)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_e5ede7d5-c874-4f93-b995-57bcd6928dad", "label": "Which role are you applying for? (Marketer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "label": "Which role are you applying for? (Copywriter)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8c9800db-e9cc-42ce-a87b-f4c42755224f", "label": "Which role are you applying for? (Video editor)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8b54310e-70f2-410e-81b5-63ead19a2542", "label": "Which role are you applying for? (Photographer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_b96b05a6-5171-4318-8f5c-245b530695dd", "label": "Which role are you applying for? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3X4DxV", "label": "Which role are you applying for that is not in the list above?", "type": "INPUT_TEXT", "value": "Catch year group.", "options": null}, {"key": "question_w8ZKNo", "label": "Which skill would you list as your best one?", "type": "INPUT_TEXT", "value": "Thank out like.", "options": null}, {"key": "question_n0exVQ", "label": "Have you participated in osoc before?", "type": "MULTIPLE_CHOICE", "value": "626e3879-1ffe-4544-a2a1-05a6b5154fc3", "options": [{"id": "89597a5d-bf59-41d0-88b1-cbce36cee12d", "text": "No, it's my first time participating in osoc"}, {"id": "626e3879-1ffe-4544-a2a1-05a6b5154fc3", "text": "Yes, I have been part of osoc before"}]}, {"key": "question_wz7qEE", "label": "Would you like to be a student coach this year?", "type": "MULTIPLE_CHOICE", "value": "4577f09c-0ec2-4887-b164-79bb536470c4", "options": [{"id": "4577f09c-0ec2-4887-b164-79bb536470c4", "text": "No, I don't want to be a student coach"}, {"id": "ca473ac4-eb45-486d-aacb-c3800b370e71", "text": "Yes, I'd like to be a student coach"}]}]}} \ No newline at end of file diff --git a/backend/settings.py b/backend/settings.py index 393b770ac..8774b215d 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -53,6 +53,7 @@ class FormMapping(enum.Enum): PHONE_NUMBER = "question_mea6qo" # CV = "question_wa26Qy" STUDENT_COACH = "question_wz7qEE" + ROLES = "question_3yJ6PW" UNKNOWN = None # Returned when no specific question can be matched diff --git a/backend/src/app/logic/webhooks.py b/backend/src/app/logic/webhooks.py index c3b1594e3..7710ceae8 100644 --- a/backend/src/app/logic/webhooks.py +++ b/backend/src/app/logic/webhooks.py @@ -7,9 +7,10 @@ from settings import FormMapping from src.app.exceptions.webhooks import WebhookProcessException from src.app.schemas.webhooks import WebhookEvent, Question, Form, QuestionUpload, QuestionOption +from src.database.crud.skills import get_skill_by_name from src.database.enums import QuestionEnum as QE, EmailStatusEnum from src.database.models import ( - Question as QuestionModel, QuestionAnswer, QuestionFileAnswer, Student, Edition, DecisionEmail) + Question as QuestionModel, QuestionAnswer, QuestionFileAnswer, Skill, Student, Edition, DecisionEmail) async def process_webhook(edition: Edition, data: WebhookEvent, database: AsyncSession): @@ -24,6 +25,8 @@ async def process_webhook(edition: Edition, data: WebhookEvent, database: AsyncS attributes: dict = {'edition': edition} + skills: list[Skill] = [] + for question in questions: match FormMapping(question.key): case FormMapping.FIRST_NAME: @@ -42,6 +45,15 @@ async def process_webhook(edition: Edition, data: WebhookEvent, database: AsyncS if option.id == question.value: attributes['wants_to_be_student_coach'] = "yes" in option.text.lower() break # Only 2 options, Yes and No. + case FormMapping.ROLES: + if question.options is not None: + answers = cast(list[str], question.value) + for value in answers: + options = cast(list[QuestionOption], question.options) + for option in options: + if option.id == value: + skill: Skill = await get_skill_by_name(database, option.text) + skills.append(skill) case _: extra_questions.append(question) @@ -58,11 +70,9 @@ async def process_webhook(edition: Edition, data: WebhookEvent, database: AsyncS diff = set(attributes.keys()).symmetric_difference(needed) if len(diff) != 0: - raise WebhookProcessException( - f'Missing questions for Attributes {diff}') - + raise WebhookProcessException(f'Missing questions for Attributes {diff}') + attributes["skills"] = skills student: Student = Student(**attributes) - database.add(student) email: DecisionEmail = DecisionEmail( student=student, decision=EmailStatusEnum.APPLIED, date=datetime.now()) diff --git a/backend/src/database/crud/skills.py b/backend/src/database/crud/skills.py index 439753e09..2d3c5bdef 100644 --- a/backend/src/database/crud/skills.py +++ b/backend/src/database/crud/skills.py @@ -27,6 +27,10 @@ async def get_skill_by_id(db: AsyncSession, skill_id: int) -> Skill: return (await db.execute(select(Skill).where(Skill.skill_id == skill_id))).scalar_one() +async def get_skill_by_name(db: AsyncSession, skill_name: str) -> Skill: + """Get a skill by name""" + return (await db.execute(select(Skill).where(Skill.name == skill_name))).one() + async def create_skill(db: AsyncSession, skill: SkillBase) -> Skill: """Add a new skill into the database.""" new_skill: Skill = Skill(name=skill.name) diff --git a/backend/tests/test_database/test_crud/test_skills.py b/backend/tests/test_database/test_crud/test_skills.py index 9b8781cdb..3a4de645b 100644 --- a/backend/tests/test_database/test_crud/test_skills.py +++ b/backend/tests/test_database/test_crud/test_skills.py @@ -60,3 +60,11 @@ async def test_create_skill_if_not_present_present(database_session: AsyncSessio assert not await crud.create_skill_if_not_present(database_session, "name") skills = (await database_session.execute(select(Skill).where(Skill.name == "name"))).scalars().all() assert len(skills) == 1 + + +async def test_get_skill_by_name(database_session: AsyncSession): + """Test to get skill by name""" + await crud.create_skill_if_not_present(database_session, "name") + skill1: Skill = await crud.get_skill_by_name(database_session, "name") + skill2: Skill = (await database_session.execute(select(Skill).where(Skill.name == "name"))).one() + assert skill1 == skill2 diff --git a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py index 9bd96f440..cb0945fd8 100644 --- a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py +++ b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py @@ -6,6 +6,7 @@ from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status +from src.app.schemas.skills import Skill from src.database.models import Edition, WebhookURL, Student from tests.utils.authorization import AuthClient @@ -45,6 +46,24 @@ async def test_new_webhook_invalid_edition(auth_client: AuthClient, edition: Edi async def test_webhook(test_client: AsyncClient, webhook: WebhookURL, database_session: AsyncSession): + """test webhook""" + database_session.add(Skill(name="Front-end developer")) + database_session.add(Skill(name="Back-end developer")) + database_session.add(Skill(name="UX / UI designer")) + database_session.add(Skill(name="Graphic designer")) + database_session.add(Skill(name="Business Modeller")) + database_session.add(Skill(name="Storyteller")) + database_session.add(Skill(name="Marketer")) + database_session.add(Skill(name="Copywriter")) + database_session.add(Skill(name="Video editor")) + database_session.add(Skill(name="Photographer")) + database_session.add(Skill(name="Other")) + await database_session.commit() + + + test = (await database_session.execute(select(Skill).where(Skill.name == "Video editior"))).one() + print(test) + event: dict = create_webhook_event( email_address="test@gmail.com", first_name="Bob", @@ -65,67 +84,71 @@ async def test_webhook(test_client: AsyncClient, webhook: WebhookURL, database_s assert student.preferred_name == "Jhon" assert student.wants_to_be_student_coach is False assert student.phone_number == "0477002266" - - -async def test_webhook_bad_format(test_client: AsyncClient, webhook: WebhookURL): - """Test a badly formatted webhook input""" - async with test_client: - response = await test_client.post( - f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", - json=WEBHOOK_EVENT_BAD_FORMAT - ) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - - -async def test_webhook_duplicate_email(test_client: AsyncClient, webhook: WebhookURL, mocker): - """Test entering a duplicate email address""" - mocker.patch('builtins.open', new_callable=mock_open()) - event: dict = create_webhook_event( - email_address="test@gmail.com", - ) - async with test_client: - response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_201_CREATED - - event: dict = create_webhook_event( - email_address="test@gmail.com", - ) - response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - - -async def test_webhook_duplicate_phone(test_client: AsyncClient, webhook: WebhookURL, mocker): - """Test entering a duplicate phone number""" - mocker.patch('builtins.open', new_callable=mock_open()) - event: dict = create_webhook_event( - phone_number="0477002266", - ) - async with test_client: - response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_201_CREATED - - event: dict = create_webhook_event( - phone_number="0477002266", - ) - response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - - -async def test_webhook_missing_question(test_client: AsyncClient, webhook: WebhookURL, mocker): - """Test submitting a form with a question missing""" - mocker.patch('builtins.open', new_callable=mock_open()) - async with test_client: - response = await test_client.post( - f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", - json=WEBHOOK_MISSING_QUESTION - ) - assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY - - -async def test_new_webhook_old_edition(database_session: AsyncSession, auth_client: AuthClient, edition: Edition): - database_session.add(Edition(year=2023, name="ed2023")) - await database_session.commit() - async with auth_client: - await auth_client.admin() - response = await auth_client.post(f"/editions/{edition.name}/webhooks") - assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + for skill in student.skills: + print(skill.name) + assert False + + + +#async def test_webhook_bad_format(test_client: AsyncClient, webhook: WebhookURL): +# """Test a badly formatted webhook input""" +# async with test_client: +# response = await test_client.post( +# f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", +# json=WEBHOOK_EVENT_BAD_FORMAT +# ) +# assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY +# +# +#async def test_webhook_duplicate_email(test_client: AsyncClient, webhook: WebhookURL, mocker): +# """Test entering a duplicate email address""" +# mocker.patch('builtins.open', new_callable=mock_open()) +# event: dict = create_webhook_event( +# email_address="test@gmail.com", +# ) +# async with test_client: +# response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) +# assert response.status_code == status.HTTP_201_CREATED +# +# event: dict = create_webhook_event( +# email_address="test@gmail.com", +# ) +# response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) +# assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY +# +# +#async def test_webhook_duplicate_phone(test_client: AsyncClient, webhook: WebhookURL, mocker): +# """Test entering a duplicate phone number""" +# mocker.patch('builtins.open', new_callable=mock_open()) +# event: dict = create_webhook_event( +# phone_number="0477002266", +# ) +# async with test_client: +# response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) +# assert response.status_code == status.HTTP_201_CREATED +# +# event: dict = create_webhook_event( +# phone_number="0477002266", +# ) +# response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) +# assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY +# +# +#async def test_webhook_missing_question(test_client: AsyncClient, webhook: WebhookURL, mocker): +# """Test submitting a form with a question missing""" +# mocker.patch('builtins.open', new_callable=mock_open()) +# async with test_client: +# response = await test_client.post( +# f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", +# json=WEBHOOK_MISSING_QUESTION +# ) +# assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY +# +# +#async def test_new_webhook_old_edition(database_session: AsyncSession, auth_client: AuthClient, edition: Edition): +# database_session.add(Edition(year=2023, name="ed2023")) +# await database_session.commit() +# async with auth_client: +# await auth_client.admin() +# response = await auth_client.post(f"/editions/{edition.name}/webhooks") +# assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED From b4118d66b59f784bcf004905c71c26660aa3a3a9 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Thu, 19 May 2022 23:00:27 +0200 Subject: [PATCH 472/649] skills are added to a student with the webhook --- ...-5933d05a-b197-45ec-b95c-30c5be43fc80.json | 2 +- backend/src/app/logic/webhooks.py | 2 +- backend/src/database/crud/skills.py | 2 +- .../test_database/test_crud/test_skills.py | 3 +- .../test_webhooks/test_webhooks.py | 176 +++++++++--------- 5 files changed, 91 insertions(+), 94 deletions(-) diff --git a/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json b/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json index babb8904e..8fe5be234 100644 --- a/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json +++ b/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json @@ -1 +1 @@ -{"event_id": "5933d05a-b197-45ec-b95c-30c5be43fc80", "created_at": "2022-03-03T10:20:00.859Z", "data": {"response_id": "85e41402-b5b9-4a24-ac0e-344caa33f985", "submission_id": "wkv6d3", "form_id": "wkjyM3", "form_name": "#osoc22 student application form", "created_at": "2021-05-12T11:52:57.879Z", "fields": [{"key": "question_nGRzxz", "label": "Will you live in Belgium in July 2022?*", "type": "MULTIPLE_CHOICE", "value": "779e2fe0-64fe-4d87-b337-957c4a0517e3", "options": [{"id": "779e2fe0-64fe-4d87-b337-957c4a0517e3", "text": "Yes"}, {"id": "444fd1f8-756a-4a24-8189-a306c0fe94b0", "text": "No"}]}, {"key": "question_mO7zDA", "label": "Are you able to work 128 hours with a student employment agreement, or as a volunteer?*", "type": "MULTIPLE_CHOICE", "value": "398e4fe0-c307-4bce-9120-2079d35fe184", "options": [{"id": "0bcaf720-2040-4d31-a3e8-59c5644dab9a", "text": "Yes, I can work with a student employment agreement in Belgium"}, {"id": "5b519077-25c5-4d20-ab7f-2da844989ddb", "text": "Yes, I can work as a volunteer in Belgium"}, {"id": "f7fc01d2-a274-413b-8ea2-c0630d075e03", "text": "No \u2013 but I would like to join this experience for free"}, {"id": "398e4fe0-c307-4bce-9120-2079d35fe184", "text": "No, I won\u2019t be able to work as a student, as a volunteer or for free."}]}, {"key": "question_mVz0Ll", "label": "Can you work during the month of July, Monday through Thursday (~09:00 to 17:00)?*", "type": "MULTIPLE_CHOICE", "value": "6d7b21a6-5a78-4d56-89ee-e20fb01b4c25", "options": [{"id": "6d7b21a6-5a78-4d56-89ee-e20fb01b4c25", "text": "Yes"}, {"id": "748287a7-7b52-4746-8c5f-323caedcbbee", "text": "No, I wouldn't be able to work for the majority of days."}]}, {"key": "question_nPz6d0", "label": "Are there any responsibilities you might have which could hinder you during the day?", "type": "TEXTAREA", "value": "Strategy politics vote notice similar adult goal PM gas company follow thing sometimes break develop order away run six list organization single man free page far some tend interview chance positive activity market information could or simple site upon less candidate brother child community decision wall to course boy painting news hotel simply model idea fast worry kitchen admit along strategy actually business recent continue member.", "options": null}, {"key": "question_3ExXkL", "label": "Birth name", "type": "INPUT_TEXT", "value": "Bob", "options": null}, {"key": "question_nro6jL", "label": "Last name", "type": "INPUT_TEXT", "value": "Klonck", "options": null}, {"key": "question_w4K84o", "label": "Would you like to be called by a different name than your birth name?", "type": "MULTIPLE_CHOICE", "value": "4e8760d6-4960-404c-82fb-8b2e8dc6af61", "options": [{"id": "4e8760d6-4960-404c-82fb-8b2e8dc6af61", "text": "Yes"}, {"id": "10532c12-72fe-46c1-aca6-54e6185d385d", "text": "No"}]}, {"key": "question_3jlya9", "label": "How would you like to be called?", "type": "INPUT_TEXT", "value": "Jhon", "options": null}, {"key": "question_w2KeEb", "label": "What is your gender?", "type": "MULTIPLE_CHOICE", "value": "3b3e4851-354d-4135-92e0-7cab57041fc5", "options": [{"id": "dcb028c2-bdd3-4bc6-abe1-3937862a7c8f", "text": "Female"}, {"id": "3b3e4851-354d-4135-92e0-7cab57041fc5", "text": "Male"}, {"id": "ae4a4c95-4f22-48b9-892e-80d38bbe7ef1", "text": "Transgender"}, {"id": "20ba24a6-b52a-43ae-a517-556b139a8984", "text": "Rather not say"}]}, {"key": "question_3xJpX9", "label": "Would you like to add your pronouns?", "type": "MULTIPLE_CHOICE", "value": "980614af-52d8-45d9-acb6-9d76952a86f1", "options": [{"id": "980614af-52d8-45d9-acb6-9d76952a86f1", "text": "Yes"}, {"id": "ea012b47-896a-4264-b876-35c7e7392a06", "text": "No"}]}, {"key": "question_mZ2Njv", "label": "Which pronouns do you prefer?", "type": "MULTIPLE_CHOICE", "value": "2d74b670-9f74-481a-bd2f-b8b06668f0a4", "options": [{"id": "7719f945-47ca-4166-9aa3-a3a2e1387009", "text": "she/her/hers"}, {"id": "d9245c04-4abe-488e-a884-17f6c501c1eb", "text": "he/him/his"}, {"id": "b78cb089-3e57-484e-bb86-03f3cc753571", "text": "they/them/theirs"}, {"id": "2d74b670-9f74-481a-bd2f-b8b06668f0a4", "text": "ze/hir/hir "}, {"id": "a9145194-f930-436e-b0e0-340e7c3fac3e", "text": "by firstname"}, {"id": "e6d5eae6-9340-44ca-a268-934e53ebf707", "text": "by call name"}, {"id": "ac94baff-9650-4751-83fe-b8315ddedb80", "text": "other"}]}, {"key": "question_3N76pb", "label": "Enter your pronouns", "type": "INPUT_TEXT", "value": "I control sound.", "options": null}, {"key": "question_3qRd4k", "label": "What language are you most fluent in?", "type": "MULTIPLE_CHOICE", "value": "7f4d9b81-fb56-4a07-b878-9b2ac913348b", "options": [{"id": "7f4d9b81-fb56-4a07-b878-9b2ac913348b", "text": "Dutch"}, {"id": "aafb7b8e-e437-440c-a3c6-22a2b61da769", "text": "English"}, {"id": "06efe9b0-8187-4f8c-9f88-53da49177a28", "text": "French"}, {"id": "f4b3f9c9-525e-4bd2-949c-3b52e04477ca", "text": "German"}, {"id": "b6902bde-6134-442d-a8a8-18e882e3e09d", "text": "Other"}]}, {"key": "question_wQ7DKk", "label": "What language are you most fluent in?", "type": "INPUT_TEXT", "value": "Book affect local.", "options": null}, {"key": "question_n97Wq4", "label": "How would you rate your English?", "type": "MULTIPLE_CHOICE", "value": "10ccead0-4539-4695-978b-16a24c1a1fe1", "options": [{"id": "0288cfa1-a19a-40f4-a172-8b9335152d57", "text": "\u2605 I can understand your form, but it is hard for me to reply."}, {"id": "9de70dc1-c4b6-4734-84d1-3e3a2a29a70f", "text": "\u2605\u2605 I can have simple conversations."}, {"id": "a5464911-6714-490b-a370-eb3de514573a", "text": "\u2605\u2605\u2605 I can express myself, understand people and get a point across."}, {"id": "10ccead0-4539-4695-978b-16a24c1a1fe1", "text": "\u2605\u2605\u2605\u2605 I can have extensive and complicated conversations."}, {"id": "784e392f-9e56-4bba-8cdd-1a85e3194352", "text": "\u2605\u2605\u2605\u2605\u2605 I am fluent."}]}, {"key": "question_mea6qo", "label": "Phone number", "type": "INPUT_PHONE_NUMBER", "value": "0477002266", "options": null}, {"key": "question_nW8NOQ", "label": "Your email address\n", "type": "INPUT_EMAIL", "value": "test@gmail.com", "options": null}, {"key": "question_wa26Qy", "label": "Upload your CV \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "panel.png", "url": "https://rubye.net/images/panel.png", "mime_type": "image/png", "size": 4033}], "options": null}, {"key": "question_m6Z785", "label": "Or link to your CV", "type": "INPUT_LINK", "value": "http://craig-hall.com/", "options": null}, {"key": "question_w7NWRz", "label": "Upload your portfolio \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "Tuna.png", "url": "http://eliza.name/images/Tuna.png", "mime_type": "image/png", "size": 43843}], "options": null}, {"key": "question_wbW75E", "label": "Or link to your portfolio / GitHub", "type": "INPUT_LINK", "value": "https://johnson-wagner.com/", "options": null}, {"key": "question_wABd7N", "label": "Upload your motivation \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "Savings Account.png", "url": "http://orlando.com/images/Savings Account.png", "mime_type": "image/png", "size": 90759}], "options": null}, {"key": "question_mBxXzY", "label": "Or link to your motivation", "type": "INPUT_LINK", "value": "http://www.woods.com/", "options": null}, {"key": "question_wkNydj", "label": "Or write about your motivation", "type": "TEXTAREA", "value": "Eat accept rate decision focus us able significant learn scene pick soldier thank financial woman beautiful resource culture together some activity executive fear market throw change game two thousand foot mean half possible area not eat ground start less available become tell population realize reason future whether nation term after seem hair involve glass government deal future factor to learn agency may final nor maintain position with group sense where must tend clearly loss fish bad black soon stay director during head stuff rock hope the near character executive fill class property glass organization soldier common seat individual within hot laugh middle garden pass drug with free economy should against box seem move window.", "options": null}, {"key": "question_wvPAG8", "label": "Add a fun fact about yourself", "type": "TEXTAREA", "value": "Case prepare kind throughout at staff music rise your bit expert along knowledge seem choose former ability bill charge gun better factor more red consider theory feel tend whom early.", "options": null}, {"key": "question_mKV6YK", "label": "What do/did you study?", "type": "CHECKBOXES", "value": ["b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "874b62b3-1777-4bff-a51f-82711657ce3d", "f7faa5fd-f421-4038-bc65-cb705bead0e1", "29cdb508-55e0-4a7b-ac40-19d7395bab33"], "options": [{"id": "2882098f-9237-471c-9cca-fbb94336ec47", "text": "Backend development"}, {"id": "f7faa5fd-f421-4038-bc65-cb705bead0e1", "text": "Business management"}, {"id": "b7823b1e-eb73-4dcc-930a-85adadddd06f", "text": "Communication Sciences"}, {"id": "b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "text": "Computer Sciences"}, {"id": "874b62b3-1777-4bff-a51f-82711657ce3d", "text": "Design"}, {"id": "29cdb508-55e0-4a7b-ac40-19d7395bab33", "text": "Frontend development"}, {"id": "e9d3143b-97c7-4149-b39f-03e4fa118513", "text": "Marketing"}, {"id": "fe10f00d-2e69-4590-b128-12f170178586", "text": "Photography"}, {"id": "a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "text": "Videography"}, {"id": "9061ff92-8dfa-4e40-8492-c2905fe2ca49", "text": "Other"}]}, {"key": "question_mKV6YK_2882098f-9237-471c-9cca-fbb94336ec47", "label": "What do/did you study? (Backend development)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_mKV6YK_f7faa5fd-f421-4038-bc65-cb705bead0e1", "label": "What do/did you study? (Business management)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_b7823b1e-eb73-4dcc-930a-85adadddd06f", "label": "What do/did you study? (Communication Sciences)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "label": "What do/did you study? (Computer Sciences)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_874b62b3-1777-4bff-a51f-82711657ce3d", "label": "What do/did you study? (Design)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_29cdb508-55e0-4a7b-ac40-19d7395bab33", "label": "What do/did you study? (Frontend development)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_e9d3143b-97c7-4149-b39f-03e4fa118513", "label": "What do/did you study? (Marketing)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_fe10f00d-2e69-4590-b128-12f170178586", "label": "What do/did you study? (Photography)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "label": "What do/did you study? (Videography)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_9061ff92-8dfa-4e40-8492-c2905fe2ca49", "label": "What do/did you study? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_wLPbZ2", "label": "What do/did you study?", "type": "INPUT_TEXT", "value": "Window able treat every key.", "options": null}, {"key": "question_npDKbE", "label": "What kind of diploma are you currently going for?", "type": "CHECKBOXES", "value": ["2856db53-84de-4468-a70f-57eb7ba5ec40", "46570410-5581-4ada-9994-2a03f68f67a3", "1c39739b-29ce-4337-915b-bdf23b7a438d", "567f530f-d285-4e40-858f-df2f7a009e30", "ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca"], "options": [{"id": "2856db53-84de-4468-a70f-57eb7ba5ec40", "text": "A professional Bachelor"}, {"id": "46570410-5581-4ada-9994-2a03f68f67a3", "text": "An academic Bachelor"}, {"id": "567f530f-d285-4e40-858f-df2f7a009e30", "text": "An associate degree"}, {"id": "bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "text": "A master's degree"}, {"id": "ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "text": "Doctoral degree"}, {"id": "b6abbd71-7924-4655-a7b0-c51c5126ba52", "text": "No diploma, I am self taught"}, {"id": "1c39739b-29ce-4337-915b-bdf23b7a438d", "text": "Other"}]}, {"key": "question_npDKbE_2856db53-84de-4468-a70f-57eb7ba5ec40", "label": "What kind of diploma are you currently going for? (A professional Bachelor)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_npDKbE_46570410-5581-4ada-9994-2a03f68f67a3", "label": "What kind of diploma are you currently going for? (An academic Bachelor)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_567f530f-d285-4e40-858f-df2f7a009e30", "label": "What kind of diploma are you currently going for? (An associate degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "label": "What kind of diploma are you currently going for? (A master's degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "label": "What kind of diploma are you currently going for? (Doctoral degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_b6abbd71-7924-4655-a7b0-c51c5126ba52", "label": "What kind of diploma are you currently going for? (No diploma, I am self taught)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_1c39739b-29ce-4337-915b-bdf23b7a438d", "label": "What kind of diploma are you currently going for? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_319lAL", "label": "What kind of diploma are you currently going for?", "type": "INPUT_TEXT", "value": "Building learn month southern.", "options": null}, {"key": "question_wMEbe0", "label": "How many years does your degree take?", "type": "INPUT_NUMBER", "value": "4", "options": null}, {"key": "question_mJO697", "label": "Which year of your degree are you in?", "type": "INPUT_TEXT", "value": "4", "options": null}, {"key": "question_wg90DK", "label": "What is the name of your college or university?", "type": "INPUT_TEXT", "value": "Detail rather happy coach apply.", "options": null}, {"key": "question_3yJ6PW", "label": "Which role are you applying for?", "type": "CHECKBOXES", "value": ["8c1f1b4e-5004-43c8-8aa5-0241ed14d759"], "options": [{"id": "7ab99307-9377-4b16-bb7a-91172d69c417", "text": "Front-end developer"}, {"id": "c9a3aa50-7117-448f-9966-3f946731e79e", "text": "Back-end developer"}, {"id": "7f53e36f-4c84-4e00-baf9-0881e0e6ab51", "text": "UX / UI designer"}, {"id": "b8e4905a-fb22-4608-87db-f604ac9ad072", "text": "Graphic designer"}, {"id": "8421a8c4-01e1-43a6-9973-77af251ddcb2", "text": "Business Modeller"}, {"id": "8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "text": "Storyteller"}, {"id": "e5ede7d5-c874-4f93-b995-57bcd6928dad", "text": "Marketer"}, {"id": "c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "text": "Copywriter"}, {"id": "8c9800db-e9cc-42ce-a87b-f4c42755224f", "text": "Video editor"}, {"id": "8b54310e-70f2-410e-81b5-63ead19a2542", "text": "Photographer"}, {"id": "b96b05a6-5171-4318-8f5c-245b530695dd", "text": "Other"}]}, {"key": "question_3yJ6PW_7ab99307-9377-4b16-bb7a-91172d69c417", "label": "Which role are you applying for? (Front-end developer)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_3yJ6PW_c9a3aa50-7117-448f-9966-3f946731e79e", "label": "Which role are you applying for? (Back-end developer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_7f53e36f-4c84-4e00-baf9-0881e0e6ab51", "label": "Which role are you applying for? (UX / UI designer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_b8e4905a-fb22-4608-87db-f604ac9ad072", "label": "Which role are you applying for? (Graphic designer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8421a8c4-01e1-43a6-9973-77af251ddcb2", "label": "Which role are you applying for? (Business Modeller)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "label": "Which role are you applying for? (Storyteller)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_e5ede7d5-c874-4f93-b995-57bcd6928dad", "label": "Which role are you applying for? (Marketer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "label": "Which role are you applying for? (Copywriter)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8c9800db-e9cc-42ce-a87b-f4c42755224f", "label": "Which role are you applying for? (Video editor)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8b54310e-70f2-410e-81b5-63ead19a2542", "label": "Which role are you applying for? (Photographer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_b96b05a6-5171-4318-8f5c-245b530695dd", "label": "Which role are you applying for? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3X4DxV", "label": "Which role are you applying for that is not in the list above?", "type": "INPUT_TEXT", "value": "Catch year group.", "options": null}, {"key": "question_w8ZKNo", "label": "Which skill would you list as your best one?", "type": "INPUT_TEXT", "value": "Thank out like.", "options": null}, {"key": "question_n0exVQ", "label": "Have you participated in osoc before?", "type": "MULTIPLE_CHOICE", "value": "626e3879-1ffe-4544-a2a1-05a6b5154fc3", "options": [{"id": "89597a5d-bf59-41d0-88b1-cbce36cee12d", "text": "No, it's my first time participating in osoc"}, {"id": "626e3879-1ffe-4544-a2a1-05a6b5154fc3", "text": "Yes, I have been part of osoc before"}]}, {"key": "question_wz7qEE", "label": "Would you like to be a student coach this year?", "type": "MULTIPLE_CHOICE", "value": "4577f09c-0ec2-4887-b164-79bb536470c4", "options": [{"id": "4577f09c-0ec2-4887-b164-79bb536470c4", "text": "No, I don't want to be a student coach"}, {"id": "ca473ac4-eb45-486d-aacb-c3800b370e71", "text": "Yes, I'd like to be a student coach"}]}]}} \ No newline at end of file +{"event_id": "5933d05a-b197-45ec-b95c-30c5be43fc80", "created_at": "2022-03-03T10:20:00.859Z", "data": {"response_id": "85e41402-b5b9-4a24-ac0e-344caa33f985", "submission_id": "wkv6d3", "form_id": "wkjyM3", "form_name": "#osoc22 student application form", "created_at": "2021-05-12T11:52:57.879Z", "fields": [{"key": "question_nGRzxz", "label": "Will you live in Belgium in July 2022?*", "type": "MULTIPLE_CHOICE", "value": "779e2fe0-64fe-4d87-b337-957c4a0517e3", "options": [{"id": "779e2fe0-64fe-4d87-b337-957c4a0517e3", "text": "Yes"}, {"id": "444fd1f8-756a-4a24-8189-a306c0fe94b0", "text": "No"}]}, {"key": "question_mO7zDA", "label": "Are you able to work 128 hours with a student employment agreement, or as a volunteer?*", "type": "MULTIPLE_CHOICE", "value": "0bcaf720-2040-4d31-a3e8-59c5644dab9a", "options": [{"id": "0bcaf720-2040-4d31-a3e8-59c5644dab9a", "text": "Yes, I can work with a student employment agreement in Belgium"}, {"id": "5b519077-25c5-4d20-ab7f-2da844989ddb", "text": "Yes, I can work as a volunteer in Belgium"}, {"id": "f7fc01d2-a274-413b-8ea2-c0630d075e03", "text": "No \u2013 but I would like to join this experience for free"}, {"id": "398e4fe0-c307-4bce-9120-2079d35fe184", "text": "No, I won\u2019t be able to work as a student, as a volunteer or for free."}]}, {"key": "question_mVz0Ll", "label": "Can you work during the month of July, Monday through Thursday (~09:00 to 17:00)?*", "type": "MULTIPLE_CHOICE", "value": "6d7b21a6-5a78-4d56-89ee-e20fb01b4c25", "options": [{"id": "6d7b21a6-5a78-4d56-89ee-e20fb01b4c25", "text": "Yes"}, {"id": "748287a7-7b52-4746-8c5f-323caedcbbee", "text": "No, I wouldn't be able to work for the majority of days."}]}, {"key": "question_nPz6d0", "label": "Are there any responsibilities you might have which could hinder you during the day?", "type": "TEXTAREA", "value": "Air carry ten girl surface organization life choice loss activity speech science major car campaign away wide treatment understand face again threat show important direction stop partner item purpose play.", "options": null}, {"key": "question_3ExXkL", "label": "Birth name", "type": "INPUT_TEXT", "value": "Bob", "options": null}, {"key": "question_nro6jL", "label": "Last name", "type": "INPUT_TEXT", "value": "Klonck", "options": null}, {"key": "question_w4K84o", "label": "Would you like to be called by a different name than your birth name?", "type": "MULTIPLE_CHOICE", "value": "4e8760d6-4960-404c-82fb-8b2e8dc6af61", "options": [{"id": "4e8760d6-4960-404c-82fb-8b2e8dc6af61", "text": "Yes"}, {"id": "10532c12-72fe-46c1-aca6-54e6185d385d", "text": "No"}]}, {"key": "question_3jlya9", "label": "How would you like to be called?", "type": "INPUT_TEXT", "value": "Jhon", "options": null}, {"key": "question_w2KeEb", "label": "What is your gender?", "type": "MULTIPLE_CHOICE", "value": "20ba24a6-b52a-43ae-a517-556b139a8984", "options": [{"id": "dcb028c2-bdd3-4bc6-abe1-3937862a7c8f", "text": "Female"}, {"id": "3b3e4851-354d-4135-92e0-7cab57041fc5", "text": "Male"}, {"id": "ae4a4c95-4f22-48b9-892e-80d38bbe7ef1", "text": "Transgender"}, {"id": "20ba24a6-b52a-43ae-a517-556b139a8984", "text": "Rather not say"}]}, {"key": "question_3xJpX9", "label": "Would you like to add your pronouns?", "type": "MULTIPLE_CHOICE", "value": "980614af-52d8-45d9-acb6-9d76952a86f1", "options": [{"id": "980614af-52d8-45d9-acb6-9d76952a86f1", "text": "Yes"}, {"id": "ea012b47-896a-4264-b876-35c7e7392a06", "text": "No"}]}, {"key": "question_mZ2Njv", "label": "Which pronouns do you prefer?", "type": "MULTIPLE_CHOICE", "value": "ac94baff-9650-4751-83fe-b8315ddedb80", "options": [{"id": "7719f945-47ca-4166-9aa3-a3a2e1387009", "text": "she/her/hers"}, {"id": "d9245c04-4abe-488e-a884-17f6c501c1eb", "text": "he/him/his"}, {"id": "b78cb089-3e57-484e-bb86-03f3cc753571", "text": "they/them/theirs"}, {"id": "2d74b670-9f74-481a-bd2f-b8b06668f0a4", "text": "ze/hir/hir "}, {"id": "a9145194-f930-436e-b0e0-340e7c3fac3e", "text": "by firstname"}, {"id": "e6d5eae6-9340-44ca-a268-934e53ebf707", "text": "by call name"}, {"id": "ac94baff-9650-4751-83fe-b8315ddedb80", "text": "other"}]}, {"key": "question_3N76pb", "label": "Enter your pronouns", "type": "INPUT_TEXT", "value": "Bar road work along.", "options": null}, {"key": "question_3qRd4k", "label": "What language are you most fluent in?", "type": "MULTIPLE_CHOICE", "value": "f4b3f9c9-525e-4bd2-949c-3b52e04477ca", "options": [{"id": "7f4d9b81-fb56-4a07-b878-9b2ac913348b", "text": "Dutch"}, {"id": "aafb7b8e-e437-440c-a3c6-22a2b61da769", "text": "English"}, {"id": "06efe9b0-8187-4f8c-9f88-53da49177a28", "text": "French"}, {"id": "f4b3f9c9-525e-4bd2-949c-3b52e04477ca", "text": "German"}, {"id": "b6902bde-6134-442d-a8a8-18e882e3e09d", "text": "Other"}]}, {"key": "question_wQ7DKk", "label": "What language are you most fluent in?", "type": "INPUT_TEXT", "value": "School mind citizen chance leg foreign.", "options": null}, {"key": "question_n97Wq4", "label": "How would you rate your English?", "type": "MULTIPLE_CHOICE", "value": "784e392f-9e56-4bba-8cdd-1a85e3194352", "options": [{"id": "0288cfa1-a19a-40f4-a172-8b9335152d57", "text": "\u2605 I can understand your form, but it is hard for me to reply."}, {"id": "9de70dc1-c4b6-4734-84d1-3e3a2a29a70f", "text": "\u2605\u2605 I can have simple conversations."}, {"id": "a5464911-6714-490b-a370-eb3de514573a", "text": "\u2605\u2605\u2605 I can express myself, understand people and get a point across."}, {"id": "10ccead0-4539-4695-978b-16a24c1a1fe1", "text": "\u2605\u2605\u2605\u2605 I can have extensive and complicated conversations."}, {"id": "784e392f-9e56-4bba-8cdd-1a85e3194352", "text": "\u2605\u2605\u2605\u2605\u2605 I am fluent."}]}, {"key": "question_mea6qo", "label": "Phone number", "type": "INPUT_PHONE_NUMBER", "value": "0477002266", "options": null}, {"key": "question_nW8NOQ", "label": "Your email address\n", "type": "INPUT_EMAIL", "value": "test@gmail.com", "options": null}, {"key": "question_wa26Qy", "label": "Upload your CV \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "panel.png", "url": "https://rubye.net/images/panel.png", "mime_type": "image/png", "size": 4033}], "options": null}, {"key": "question_m6Z785", "label": "Or link to your CV", "type": "INPUT_LINK", "value": "http://www.grant.com/", "options": null}, {"key": "question_w7NWRz", "label": "Upload your portfolio \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "Tuna.png", "url": "http://eliza.name/images/Tuna.png", "mime_type": "image/png", "size": 43843}], "options": null}, {"key": "question_wbW75E", "label": "Or link to your portfolio / GitHub", "type": "INPUT_LINK", "value": "https://shah-spencer.biz/", "options": null}, {"key": "question_wABd7N", "label": "Upload your motivation \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "Savings Account.png", "url": "http://orlando.com/images/Savings Account.png", "mime_type": "image/png", "size": 90759}], "options": null}, {"key": "question_mBxXzY", "label": "Or link to your motivation", "type": "INPUT_LINK", "value": "http://www.morrison-lopez.com/", "options": null}, {"key": "question_wkNydj", "label": "Or write about your motivation", "type": "TEXTAREA", "value": "Hotel part miss public customer arrive direction entire control recognize this modern several if single drug man physical recently wonder total when most agreement present rate own firm contain decide own face simple but simply from couple painting recently bank network compare any hot large need window key trouble use beautiful white technology head amount phone school source food stand computer computer indeed seek remember ahead deal light class fill street tell include fine only spend number fall style buy list just decide oil watch project group reach model politics be visit sit describe speech situation simple southern even along resource order political training worker trade run consumer radio firm very bring week bag individual door radio method ground after only.", "options": null}, {"key": "question_wvPAG8", "label": "Add a fun fact about yourself", "type": "TEXTAREA", "value": "Risk buy help important look blue just glass protect a wife tell authority mission support first across for create physical about could poor indicate arrive practice nor now worry add be.", "options": null}, {"key": "question_mKV6YK", "label": "What do/did you study?", "type": "CHECKBOXES", "value": ["29cdb508-55e0-4a7b-ac40-19d7395bab33", "874b62b3-1777-4bff-a51f-82711657ce3d", "b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "e9d3143b-97c7-4149-b39f-03e4fa118513", "2882098f-9237-471c-9cca-fbb94336ec47", "9061ff92-8dfa-4e40-8492-c2905fe2ca49", "fe10f00d-2e69-4590-b128-12f170178586"], "options": [{"id": "2882098f-9237-471c-9cca-fbb94336ec47", "text": "Backend development"}, {"id": "f7faa5fd-f421-4038-bc65-cb705bead0e1", "text": "Business management"}, {"id": "b7823b1e-eb73-4dcc-930a-85adadddd06f", "text": "Communication Sciences"}, {"id": "b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "text": "Computer Sciences"}, {"id": "874b62b3-1777-4bff-a51f-82711657ce3d", "text": "Design"}, {"id": "29cdb508-55e0-4a7b-ac40-19d7395bab33", "text": "Frontend development"}, {"id": "e9d3143b-97c7-4149-b39f-03e4fa118513", "text": "Marketing"}, {"id": "fe10f00d-2e69-4590-b128-12f170178586", "text": "Photography"}, {"id": "a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "text": "Videography"}, {"id": "9061ff92-8dfa-4e40-8492-c2905fe2ca49", "text": "Other"}]}, {"key": "question_mKV6YK_2882098f-9237-471c-9cca-fbb94336ec47", "label": "What do/did you study? (Backend development)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_mKV6YK_f7faa5fd-f421-4038-bc65-cb705bead0e1", "label": "What do/did you study? (Business management)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_b7823b1e-eb73-4dcc-930a-85adadddd06f", "label": "What do/did you study? (Communication Sciences)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "label": "What do/did you study? (Computer Sciences)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_874b62b3-1777-4bff-a51f-82711657ce3d", "label": "What do/did you study? (Design)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_29cdb508-55e0-4a7b-ac40-19d7395bab33", "label": "What do/did you study? (Frontend development)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_e9d3143b-97c7-4149-b39f-03e4fa118513", "label": "What do/did you study? (Marketing)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_fe10f00d-2e69-4590-b128-12f170178586", "label": "What do/did you study? (Photography)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "label": "What do/did you study? (Videography)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_9061ff92-8dfa-4e40-8492-c2905fe2ca49", "label": "What do/did you study? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_wLPbZ2", "label": "What do/did you study?", "type": "INPUT_TEXT", "value": "Information today building notice option.", "options": null}, {"key": "question_npDKbE", "label": "What kind of diploma are you currently going for?", "type": "CHECKBOXES", "value": ["bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "46570410-5581-4ada-9994-2a03f68f67a3", "2856db53-84de-4468-a70f-57eb7ba5ec40", "ea137e4d-c7c9-4f9e-b6a5-96e2239e5560"], "options": [{"id": "2856db53-84de-4468-a70f-57eb7ba5ec40", "text": "A professional Bachelor"}, {"id": "46570410-5581-4ada-9994-2a03f68f67a3", "text": "An academic Bachelor"}, {"id": "567f530f-d285-4e40-858f-df2f7a009e30", "text": "An associate degree"}, {"id": "bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "text": "A master's degree"}, {"id": "ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "text": "Doctoral degree"}, {"id": "b6abbd71-7924-4655-a7b0-c51c5126ba52", "text": "No diploma, I am self taught"}, {"id": "1c39739b-29ce-4337-915b-bdf23b7a438d", "text": "Other"}]}, {"key": "question_npDKbE_2856db53-84de-4468-a70f-57eb7ba5ec40", "label": "What kind of diploma are you currently going for? (A professional Bachelor)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_npDKbE_46570410-5581-4ada-9994-2a03f68f67a3", "label": "What kind of diploma are you currently going for? (An academic Bachelor)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_567f530f-d285-4e40-858f-df2f7a009e30", "label": "What kind of diploma are you currently going for? (An associate degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "label": "What kind of diploma are you currently going for? (A master's degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "label": "What kind of diploma are you currently going for? (Doctoral degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_b6abbd71-7924-4655-a7b0-c51c5126ba52", "label": "What kind of diploma are you currently going for? (No diploma, I am self taught)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_1c39739b-29ce-4337-915b-bdf23b7a438d", "label": "What kind of diploma are you currently going for? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_319lAL", "label": "What kind of diploma are you currently going for?", "type": "INPUT_TEXT", "value": "Source this team end common beat.", "options": null}, {"key": "question_wMEbe0", "label": "How many years does your degree take?", "type": "INPUT_NUMBER", "value": "6", "options": null}, {"key": "question_mJO697", "label": "Which year of your degree are you in?", "type": "INPUT_TEXT", "value": "2", "options": null}, {"key": "question_wg90DK", "label": "What is the name of your college or university?", "type": "INPUT_TEXT", "value": "Certain speak future democratic memory.", "options": null}, {"key": "question_3yJ6PW", "label": "Which role are you applying for?", "type": "CHECKBOXES", "value": ["7ab99307-9377-4b16-bb7a-91172d69c417", "c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "e5ede7d5-c874-4f93-b995-57bcd6928dad", "8c9800db-e9cc-42ce-a87b-f4c42755224f", "b96b05a6-5171-4318-8f5c-245b530695dd", "8b54310e-70f2-410e-81b5-63ead19a2542", "b8e4905a-fb22-4608-87db-f604ac9ad072", "8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "c9a3aa50-7117-448f-9966-3f946731e79e", "8421a8c4-01e1-43a6-9973-77af251ddcb2"], "options": [{"id": "7ab99307-9377-4b16-bb7a-91172d69c417", "text": "Front-end developer"}, {"id": "c9a3aa50-7117-448f-9966-3f946731e79e", "text": "Back-end developer"}, {"id": "7f53e36f-4c84-4e00-baf9-0881e0e6ab51", "text": "UX / UI designer"}, {"id": "b8e4905a-fb22-4608-87db-f604ac9ad072", "text": "Graphic designer"}, {"id": "8421a8c4-01e1-43a6-9973-77af251ddcb2", "text": "Business Modeller"}, {"id": "8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "text": "Storyteller"}, {"id": "e5ede7d5-c874-4f93-b995-57bcd6928dad", "text": "Marketer"}, {"id": "c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "text": "Copywriter"}, {"id": "8c9800db-e9cc-42ce-a87b-f4c42755224f", "text": "Video editor"}, {"id": "8b54310e-70f2-410e-81b5-63ead19a2542", "text": "Photographer"}, {"id": "b96b05a6-5171-4318-8f5c-245b530695dd", "text": "Other"}]}, {"key": "question_3yJ6PW_7ab99307-9377-4b16-bb7a-91172d69c417", "label": "Which role are you applying for? (Front-end developer)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_3yJ6PW_c9a3aa50-7117-448f-9966-3f946731e79e", "label": "Which role are you applying for? (Back-end developer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_7f53e36f-4c84-4e00-baf9-0881e0e6ab51", "label": "Which role are you applying for? (UX / UI designer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_b8e4905a-fb22-4608-87db-f604ac9ad072", "label": "Which role are you applying for? (Graphic designer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8421a8c4-01e1-43a6-9973-77af251ddcb2", "label": "Which role are you applying for? (Business Modeller)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "label": "Which role are you applying for? (Storyteller)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_e5ede7d5-c874-4f93-b995-57bcd6928dad", "label": "Which role are you applying for? (Marketer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "label": "Which role are you applying for? (Copywriter)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8c9800db-e9cc-42ce-a87b-f4c42755224f", "label": "Which role are you applying for? (Video editor)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8b54310e-70f2-410e-81b5-63ead19a2542", "label": "Which role are you applying for? (Photographer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_b96b05a6-5171-4318-8f5c-245b530695dd", "label": "Which role are you applying for? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3X4DxV", "label": "Which role are you applying for that is not in the list above?", "type": "INPUT_TEXT", "value": "World until point former thousand.", "options": null}, {"key": "question_w8ZKNo", "label": "Which skill would you list as your best one?", "type": "INPUT_TEXT", "value": "Performance able simply increase compare recently.", "options": null}, {"key": "question_n0exVQ", "label": "Have you participated in osoc before?", "type": "MULTIPLE_CHOICE", "value": "89597a5d-bf59-41d0-88b1-cbce36cee12d", "options": [{"id": "89597a5d-bf59-41d0-88b1-cbce36cee12d", "text": "No, it's my first time participating in osoc"}, {"id": "626e3879-1ffe-4544-a2a1-05a6b5154fc3", "text": "Yes, I have been part of osoc before"}]}, {"key": "question_wz7qEE", "label": "Would you like to be a student coach this year?", "type": "MULTIPLE_CHOICE", "value": "4577f09c-0ec2-4887-b164-79bb536470c4", "options": [{"id": "4577f09c-0ec2-4887-b164-79bb536470c4", "text": "No, I don't want to be a student coach"}, {"id": "ca473ac4-eb45-486d-aacb-c3800b370e71", "text": "Yes, I'd like to be a student coach"}]}]}} \ No newline at end of file diff --git a/backend/src/app/logic/webhooks.py b/backend/src/app/logic/webhooks.py index 7710ceae8..3934d5c0e 100644 --- a/backend/src/app/logic/webhooks.py +++ b/backend/src/app/logic/webhooks.py @@ -51,7 +51,7 @@ async def process_webhook(edition: Edition, data: WebhookEvent, database: AsyncS for value in answers: options = cast(list[QuestionOption], question.options) for option in options: - if option.id == value: + if option.id == value and option.text != "Other": skill: Skill = await get_skill_by_name(database, option.text) skills.append(skill) case _: diff --git a/backend/src/database/crud/skills.py b/backend/src/database/crud/skills.py index 2d3c5bdef..b51d9d6b1 100644 --- a/backend/src/database/crud/skills.py +++ b/backend/src/database/crud/skills.py @@ -29,7 +29,7 @@ async def get_skill_by_id(db: AsyncSession, skill_id: int) -> Skill: async def get_skill_by_name(db: AsyncSession, skill_name: str) -> Skill: """Get a skill by name""" - return (await db.execute(select(Skill).where(Skill.name == skill_name))).one() + return (await db.execute(select(Skill).where(Skill.name == skill_name))).scalar_one() async def create_skill(db: AsyncSession, skill: SkillBase) -> Skill: """Add a new skill into the database.""" diff --git a/backend/tests/test_database/test_crud/test_skills.py b/backend/tests/test_database/test_crud/test_skills.py index 3a4de645b..c042914dc 100644 --- a/backend/tests/test_database/test_crud/test_skills.py +++ b/backend/tests/test_database/test_crud/test_skills.py @@ -66,5 +66,4 @@ async def test_get_skill_by_name(database_session: AsyncSession): """Test to get skill by name""" await crud.create_skill_if_not_present(database_session, "name") skill1: Skill = await crud.get_skill_by_name(database_session, "name") - skill2: Skill = (await database_session.execute(select(Skill).where(Skill.name == "name"))).one() - assert skill1 == skill2 + assert skill1.name == "name" diff --git a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py index cb0945fd8..ec45a0207 100644 --- a/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py +++ b/backend/tests/test_routers/test_editions/test_webhooks/test_webhooks.py @@ -6,9 +6,8 @@ from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from starlette import status -from src.app.schemas.skills import Skill -from src.database.models import Edition, WebhookURL, Student +from src.database.models import Edition, WebhookURL, Student, Skill from tests.utils.authorization import AuthClient from .data import create_webhook_event, WEBHOOK_EVENT_BAD_FORMAT, WEBHOOK_MISSING_QUESTION @@ -29,6 +28,23 @@ async def webhook(edition: Edition, database_session: AsyncSession) -> WebhookUR return webhook +@pytest.fixture +async def database_session_skills(database_session: AsyncSession) -> AsyncSession: + """fixture to add skills""" + database_session.add(Skill(name="Front-end developer")) + database_session.add(Skill(name="Back-end developer")) + database_session.add(Skill(name="UX / UI designer")) + database_session.add(Skill(name="Graphic designer")) + database_session.add(Skill(name="Business Modeller")) + database_session.add(Skill(name="Storyteller")) + database_session.add(Skill(name="Marketer")) + database_session.add(Skill(name="Copywriter")) + database_session.add(Skill(name="Video editor")) + database_session.add(Skill(name="Photographer")) + await database_session.commit() + return database_session + + async def test_new_webhook(auth_client: AuthClient, edition: Edition): await auth_client.admin() async with auth_client: @@ -45,25 +61,9 @@ async def test_new_webhook_invalid_edition(auth_client: AuthClient, edition: Edi assert response.status_code == status.HTTP_404_NOT_FOUND -async def test_webhook(test_client: AsyncClient, webhook: WebhookURL, database_session: AsyncSession): +async def test_webhook(database_session_skills: AsyncSession, test_client: AsyncClient, webhook: WebhookURL): """test webhook""" - database_session.add(Skill(name="Front-end developer")) - database_session.add(Skill(name="Back-end developer")) - database_session.add(Skill(name="UX / UI designer")) - database_session.add(Skill(name="Graphic designer")) - database_session.add(Skill(name="Business Modeller")) - database_session.add(Skill(name="Storyteller")) - database_session.add(Skill(name="Marketer")) - database_session.add(Skill(name="Copywriter")) - database_session.add(Skill(name="Video editor")) - database_session.add(Skill(name="Photographer")) - database_session.add(Skill(name="Other")) - await database_session.commit() - - - test = (await database_session.execute(select(Skill).where(Skill.name == "Video editior"))).one() - print(test) - + event: dict = create_webhook_event( email_address="test@gmail.com", first_name="Bob", @@ -76,7 +76,7 @@ async def test_webhook(test_client: AsyncClient, webhook: WebhookURL, database_s response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) assert response.status_code == status.HTTP_201_CREATED - student: Student = (await database_session.execute(select(Student))).scalars().first() + student: Student = (await database_session_skills.execute(select(Student))).scalars().first() assert student.edition == webhook.edition assert student.email_address == "test@gmail.com" assert student.first_name == "Bob" @@ -84,71 +84,69 @@ async def test_webhook(test_client: AsyncClient, webhook: WebhookURL, database_s assert student.preferred_name == "Jhon" assert student.wants_to_be_student_coach is False assert student.phone_number == "0477002266" - for skill in student.skills: - print(skill.name) - assert False - - - -#async def test_webhook_bad_format(test_client: AsyncClient, webhook: WebhookURL): -# """Test a badly formatted webhook input""" -# async with test_client: -# response = await test_client.post( -# f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", -# json=WEBHOOK_EVENT_BAD_FORMAT -# ) -# assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -# -# -#async def test_webhook_duplicate_email(test_client: AsyncClient, webhook: WebhookURL, mocker): -# """Test entering a duplicate email address""" -# mocker.patch('builtins.open', new_callable=mock_open()) -# event: dict = create_webhook_event( -# email_address="test@gmail.com", -# ) -# async with test_client: -# response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) -# assert response.status_code == status.HTTP_201_CREATED -# -# event: dict = create_webhook_event( -# email_address="test@gmail.com", -# ) -# response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) -# assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -# -# -#async def test_webhook_duplicate_phone(test_client: AsyncClient, webhook: WebhookURL, mocker): -# """Test entering a duplicate phone number""" -# mocker.patch('builtins.open', new_callable=mock_open()) -# event: dict = create_webhook_event( -# phone_number="0477002266", -# ) -# async with test_client: -# response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) -# assert response.status_code == status.HTTP_201_CREATED -# -# event: dict = create_webhook_event( -# phone_number="0477002266", -# ) -# response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) -# assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -# -# -#async def test_webhook_missing_question(test_client: AsyncClient, webhook: WebhookURL, mocker): -# """Test submitting a form with a question missing""" -# mocker.patch('builtins.open', new_callable=mock_open()) -# async with test_client: -# response = await test_client.post( -# f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", -# json=WEBHOOK_MISSING_QUESTION -# ) -# assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY -# -# -#async def test_new_webhook_old_edition(database_session: AsyncSession, auth_client: AuthClient, edition: Edition): -# database_session.add(Edition(year=2023, name="ed2023")) -# await database_session.commit() -# async with auth_client: -# await auth_client.admin() -# response = await auth_client.post(f"/editions/{edition.name}/webhooks") -# assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + assert len(student.skills) > 0 + + +async def test_webhook_bad_format(test_client: AsyncClient, webhook: WebhookURL): + """Test a badly formatted webhook input""" + async with test_client: + response = await test_client.post( + f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", + json=WEBHOOK_EVENT_BAD_FORMAT + ) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + + +async def test_webhook_duplicate_email(database_session_skills: AsyncSession, test_client: AsyncClient, webhook: WebhookURL, mocker): + """Test entering a duplicate email address""" + mocker.patch('builtins.open', new_callable=mock_open()) + event: dict = create_webhook_event( + email_address="test@gmail.com", + ) + async with test_client: + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_201_CREATED + + event: dict = create_webhook_event( + email_address="test@gmail.com", + ) + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + + +async def test_webhook_duplicate_phone(database_session_skills: AsyncSession, test_client: AsyncClient, webhook: WebhookURL, mocker): + """Test entering a duplicate phone number""" + mocker.patch('builtins.open', new_callable=mock_open()) + event: dict = create_webhook_event( + phone_number="0477002266", + ) + async with test_client: + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_201_CREATED + + event: dict = create_webhook_event( + phone_number="0477002266", + ) + response = await test_client.post(f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", json=event) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + + +async def test_webhook_missing_question(database_session_skills: AsyncSession, test_client: AsyncClient, webhook: WebhookURL, mocker): + """Test submitting a form with a question missing""" + mocker.patch('builtins.open', new_callable=mock_open()) + async with test_client: + response = await test_client.post( + f"/editions/{webhook.edition.name}/webhooks/{webhook.uuid}", + json=WEBHOOK_MISSING_QUESTION + ) + assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY + + +async def test_new_webhook_old_edition(database_session_skills: AsyncSession, database_session: AsyncSession, auth_client: AuthClient, edition: Edition): + """Test new webhook to an old edition""" + database_session.add(Edition(year=2023, name="ed2023")) + await database_session.commit() + async with auth_client: + await auth_client.admin() + response = await auth_client.post(f"/editions/{edition.name}/webhooks") + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED From 6970569cdb05b29119b8d3f9c40f0b794b0a9e78 Mon Sep 17 00:00:00 2001 From: Ward Meersman Date: Thu, 19 May 2022 23:07:38 +0200 Subject: [PATCH 473/649] delete file --- backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json diff --git a/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json b/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json deleted file mode 100644 index 8fe5be234..000000000 --- a/backend/failed-webhook-5933d05a-b197-45ec-b95c-30c5be43fc80.json +++ /dev/null @@ -1 +0,0 @@ -{"event_id": "5933d05a-b197-45ec-b95c-30c5be43fc80", "created_at": "2022-03-03T10:20:00.859Z", "data": {"response_id": "85e41402-b5b9-4a24-ac0e-344caa33f985", "submission_id": "wkv6d3", "form_id": "wkjyM3", "form_name": "#osoc22 student application form", "created_at": "2021-05-12T11:52:57.879Z", "fields": [{"key": "question_nGRzxz", "label": "Will you live in Belgium in July 2022?*", "type": "MULTIPLE_CHOICE", "value": "779e2fe0-64fe-4d87-b337-957c4a0517e3", "options": [{"id": "779e2fe0-64fe-4d87-b337-957c4a0517e3", "text": "Yes"}, {"id": "444fd1f8-756a-4a24-8189-a306c0fe94b0", "text": "No"}]}, {"key": "question_mO7zDA", "label": "Are you able to work 128 hours with a student employment agreement, or as a volunteer?*", "type": "MULTIPLE_CHOICE", "value": "0bcaf720-2040-4d31-a3e8-59c5644dab9a", "options": [{"id": "0bcaf720-2040-4d31-a3e8-59c5644dab9a", "text": "Yes, I can work with a student employment agreement in Belgium"}, {"id": "5b519077-25c5-4d20-ab7f-2da844989ddb", "text": "Yes, I can work as a volunteer in Belgium"}, {"id": "f7fc01d2-a274-413b-8ea2-c0630d075e03", "text": "No \u2013 but I would like to join this experience for free"}, {"id": "398e4fe0-c307-4bce-9120-2079d35fe184", "text": "No, I won\u2019t be able to work as a student, as a volunteer or for free."}]}, {"key": "question_mVz0Ll", "label": "Can you work during the month of July, Monday through Thursday (~09:00 to 17:00)?*", "type": "MULTIPLE_CHOICE", "value": "6d7b21a6-5a78-4d56-89ee-e20fb01b4c25", "options": [{"id": "6d7b21a6-5a78-4d56-89ee-e20fb01b4c25", "text": "Yes"}, {"id": "748287a7-7b52-4746-8c5f-323caedcbbee", "text": "No, I wouldn't be able to work for the majority of days."}]}, {"key": "question_nPz6d0", "label": "Are there any responsibilities you might have which could hinder you during the day?", "type": "TEXTAREA", "value": "Air carry ten girl surface organization life choice loss activity speech science major car campaign away wide treatment understand face again threat show important direction stop partner item purpose play.", "options": null}, {"key": "question_3ExXkL", "label": "Birth name", "type": "INPUT_TEXT", "value": "Bob", "options": null}, {"key": "question_nro6jL", "label": "Last name", "type": "INPUT_TEXT", "value": "Klonck", "options": null}, {"key": "question_w4K84o", "label": "Would you like to be called by a different name than your birth name?", "type": "MULTIPLE_CHOICE", "value": "4e8760d6-4960-404c-82fb-8b2e8dc6af61", "options": [{"id": "4e8760d6-4960-404c-82fb-8b2e8dc6af61", "text": "Yes"}, {"id": "10532c12-72fe-46c1-aca6-54e6185d385d", "text": "No"}]}, {"key": "question_3jlya9", "label": "How would you like to be called?", "type": "INPUT_TEXT", "value": "Jhon", "options": null}, {"key": "question_w2KeEb", "label": "What is your gender?", "type": "MULTIPLE_CHOICE", "value": "20ba24a6-b52a-43ae-a517-556b139a8984", "options": [{"id": "dcb028c2-bdd3-4bc6-abe1-3937862a7c8f", "text": "Female"}, {"id": "3b3e4851-354d-4135-92e0-7cab57041fc5", "text": "Male"}, {"id": "ae4a4c95-4f22-48b9-892e-80d38bbe7ef1", "text": "Transgender"}, {"id": "20ba24a6-b52a-43ae-a517-556b139a8984", "text": "Rather not say"}]}, {"key": "question_3xJpX9", "label": "Would you like to add your pronouns?", "type": "MULTIPLE_CHOICE", "value": "980614af-52d8-45d9-acb6-9d76952a86f1", "options": [{"id": "980614af-52d8-45d9-acb6-9d76952a86f1", "text": "Yes"}, {"id": "ea012b47-896a-4264-b876-35c7e7392a06", "text": "No"}]}, {"key": "question_mZ2Njv", "label": "Which pronouns do you prefer?", "type": "MULTIPLE_CHOICE", "value": "ac94baff-9650-4751-83fe-b8315ddedb80", "options": [{"id": "7719f945-47ca-4166-9aa3-a3a2e1387009", "text": "she/her/hers"}, {"id": "d9245c04-4abe-488e-a884-17f6c501c1eb", "text": "he/him/his"}, {"id": "b78cb089-3e57-484e-bb86-03f3cc753571", "text": "they/them/theirs"}, {"id": "2d74b670-9f74-481a-bd2f-b8b06668f0a4", "text": "ze/hir/hir "}, {"id": "a9145194-f930-436e-b0e0-340e7c3fac3e", "text": "by firstname"}, {"id": "e6d5eae6-9340-44ca-a268-934e53ebf707", "text": "by call name"}, {"id": "ac94baff-9650-4751-83fe-b8315ddedb80", "text": "other"}]}, {"key": "question_3N76pb", "label": "Enter your pronouns", "type": "INPUT_TEXT", "value": "Bar road work along.", "options": null}, {"key": "question_3qRd4k", "label": "What language are you most fluent in?", "type": "MULTIPLE_CHOICE", "value": "f4b3f9c9-525e-4bd2-949c-3b52e04477ca", "options": [{"id": "7f4d9b81-fb56-4a07-b878-9b2ac913348b", "text": "Dutch"}, {"id": "aafb7b8e-e437-440c-a3c6-22a2b61da769", "text": "English"}, {"id": "06efe9b0-8187-4f8c-9f88-53da49177a28", "text": "French"}, {"id": "f4b3f9c9-525e-4bd2-949c-3b52e04477ca", "text": "German"}, {"id": "b6902bde-6134-442d-a8a8-18e882e3e09d", "text": "Other"}]}, {"key": "question_wQ7DKk", "label": "What language are you most fluent in?", "type": "INPUT_TEXT", "value": "School mind citizen chance leg foreign.", "options": null}, {"key": "question_n97Wq4", "label": "How would you rate your English?", "type": "MULTIPLE_CHOICE", "value": "784e392f-9e56-4bba-8cdd-1a85e3194352", "options": [{"id": "0288cfa1-a19a-40f4-a172-8b9335152d57", "text": "\u2605 I can understand your form, but it is hard for me to reply."}, {"id": "9de70dc1-c4b6-4734-84d1-3e3a2a29a70f", "text": "\u2605\u2605 I can have simple conversations."}, {"id": "a5464911-6714-490b-a370-eb3de514573a", "text": "\u2605\u2605\u2605 I can express myself, understand people and get a point across."}, {"id": "10ccead0-4539-4695-978b-16a24c1a1fe1", "text": "\u2605\u2605\u2605\u2605 I can have extensive and complicated conversations."}, {"id": "784e392f-9e56-4bba-8cdd-1a85e3194352", "text": "\u2605\u2605\u2605\u2605\u2605 I am fluent."}]}, {"key": "question_mea6qo", "label": "Phone number", "type": "INPUT_PHONE_NUMBER", "value": "0477002266", "options": null}, {"key": "question_nW8NOQ", "label": "Your email address\n", "type": "INPUT_EMAIL", "value": "test@gmail.com", "options": null}, {"key": "question_wa26Qy", "label": "Upload your CV \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "panel.png", "url": "https://rubye.net/images/panel.png", "mime_type": "image/png", "size": 4033}], "options": null}, {"key": "question_m6Z785", "label": "Or link to your CV", "type": "INPUT_LINK", "value": "http://www.grant.com/", "options": null}, {"key": "question_w7NWRz", "label": "Upload your portfolio \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "Tuna.png", "url": "http://eliza.name/images/Tuna.png", "mime_type": "image/png", "size": 43843}], "options": null}, {"key": "question_wbW75E", "label": "Or link to your portfolio / GitHub", "type": "INPUT_LINK", "value": "https://shah-spencer.biz/", "options": null}, {"key": "question_wABd7N", "label": "Upload your motivation \u2013 size limit 10MB", "type": "FILE_UPLOAD", "value": [{"name": "Savings Account.png", "url": "http://orlando.com/images/Savings Account.png", "mime_type": "image/png", "size": 90759}], "options": null}, {"key": "question_mBxXzY", "label": "Or link to your motivation", "type": "INPUT_LINK", "value": "http://www.morrison-lopez.com/", "options": null}, {"key": "question_wkNydj", "label": "Or write about your motivation", "type": "TEXTAREA", "value": "Hotel part miss public customer arrive direction entire control recognize this modern several if single drug man physical recently wonder total when most agreement present rate own firm contain decide own face simple but simply from couple painting recently bank network compare any hot large need window key trouble use beautiful white technology head amount phone school source food stand computer computer indeed seek remember ahead deal light class fill street tell include fine only spend number fall style buy list just decide oil watch project group reach model politics be visit sit describe speech situation simple southern even along resource order political training worker trade run consumer radio firm very bring week bag individual door radio method ground after only.", "options": null}, {"key": "question_wvPAG8", "label": "Add a fun fact about yourself", "type": "TEXTAREA", "value": "Risk buy help important look blue just glass protect a wife tell authority mission support first across for create physical about could poor indicate arrive practice nor now worry add be.", "options": null}, {"key": "question_mKV6YK", "label": "What do/did you study?", "type": "CHECKBOXES", "value": ["29cdb508-55e0-4a7b-ac40-19d7395bab33", "874b62b3-1777-4bff-a51f-82711657ce3d", "b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "e9d3143b-97c7-4149-b39f-03e4fa118513", "2882098f-9237-471c-9cca-fbb94336ec47", "9061ff92-8dfa-4e40-8492-c2905fe2ca49", "fe10f00d-2e69-4590-b128-12f170178586"], "options": [{"id": "2882098f-9237-471c-9cca-fbb94336ec47", "text": "Backend development"}, {"id": "f7faa5fd-f421-4038-bc65-cb705bead0e1", "text": "Business management"}, {"id": "b7823b1e-eb73-4dcc-930a-85adadddd06f", "text": "Communication Sciences"}, {"id": "b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "text": "Computer Sciences"}, {"id": "874b62b3-1777-4bff-a51f-82711657ce3d", "text": "Design"}, {"id": "29cdb508-55e0-4a7b-ac40-19d7395bab33", "text": "Frontend development"}, {"id": "e9d3143b-97c7-4149-b39f-03e4fa118513", "text": "Marketing"}, {"id": "fe10f00d-2e69-4590-b128-12f170178586", "text": "Photography"}, {"id": "a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "text": "Videography"}, {"id": "9061ff92-8dfa-4e40-8492-c2905fe2ca49", "text": "Other"}]}, {"key": "question_mKV6YK_2882098f-9237-471c-9cca-fbb94336ec47", "label": "What do/did you study? (Backend development)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_mKV6YK_f7faa5fd-f421-4038-bc65-cb705bead0e1", "label": "What do/did you study? (Business management)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_b7823b1e-eb73-4dcc-930a-85adadddd06f", "label": "What do/did you study? (Communication Sciences)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_b562c0a2-40af-4f51-8d37-50e1dc3f96eb", "label": "What do/did you study? (Computer Sciences)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_874b62b3-1777-4bff-a51f-82711657ce3d", "label": "What do/did you study? (Design)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_29cdb508-55e0-4a7b-ac40-19d7395bab33", "label": "What do/did you study? (Frontend development)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_e9d3143b-97c7-4149-b39f-03e4fa118513", "label": "What do/did you study? (Marketing)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_fe10f00d-2e69-4590-b128-12f170178586", "label": "What do/did you study? (Photography)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_a9e33c5a-a8e6-4c79-b262-37fa9107ac04", "label": "What do/did you study? (Videography)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_mKV6YK_9061ff92-8dfa-4e40-8492-c2905fe2ca49", "label": "What do/did you study? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_wLPbZ2", "label": "What do/did you study?", "type": "INPUT_TEXT", "value": "Information today building notice option.", "options": null}, {"key": "question_npDKbE", "label": "What kind of diploma are you currently going for?", "type": "CHECKBOXES", "value": ["bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "46570410-5581-4ada-9994-2a03f68f67a3", "2856db53-84de-4468-a70f-57eb7ba5ec40", "ea137e4d-c7c9-4f9e-b6a5-96e2239e5560"], "options": [{"id": "2856db53-84de-4468-a70f-57eb7ba5ec40", "text": "A professional Bachelor"}, {"id": "46570410-5581-4ada-9994-2a03f68f67a3", "text": "An academic Bachelor"}, {"id": "567f530f-d285-4e40-858f-df2f7a009e30", "text": "An associate degree"}, {"id": "bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "text": "A master's degree"}, {"id": "ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "text": "Doctoral degree"}, {"id": "b6abbd71-7924-4655-a7b0-c51c5126ba52", "text": "No diploma, I am self taught"}, {"id": "1c39739b-29ce-4337-915b-bdf23b7a438d", "text": "Other"}]}, {"key": "question_npDKbE_2856db53-84de-4468-a70f-57eb7ba5ec40", "label": "What kind of diploma are you currently going for? (A professional Bachelor)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_npDKbE_46570410-5581-4ada-9994-2a03f68f67a3", "label": "What kind of diploma are you currently going for? (An academic Bachelor)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_567f530f-d285-4e40-858f-df2f7a009e30", "label": "What kind of diploma are you currently going for? (An associate degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_bd722bf4-ed2f-4dd3-8aa4-b9f741c3d0ca", "label": "What kind of diploma are you currently going for? (A master's degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_ea137e4d-c7c9-4f9e-b6a5-96e2239e5560", "label": "What kind of diploma are you currently going for? (Doctoral degree)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_b6abbd71-7924-4655-a7b0-c51c5126ba52", "label": "What kind of diploma are you currently going for? (No diploma, I am self taught)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_npDKbE_1c39739b-29ce-4337-915b-bdf23b7a438d", "label": "What kind of diploma are you currently going for? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_319lAL", "label": "What kind of diploma are you currently going for?", "type": "INPUT_TEXT", "value": "Source this team end common beat.", "options": null}, {"key": "question_wMEbe0", "label": "How many years does your degree take?", "type": "INPUT_NUMBER", "value": "6", "options": null}, {"key": "question_mJO697", "label": "Which year of your degree are you in?", "type": "INPUT_TEXT", "value": "2", "options": null}, {"key": "question_wg90DK", "label": "What is the name of your college or university?", "type": "INPUT_TEXT", "value": "Certain speak future democratic memory.", "options": null}, {"key": "question_3yJ6PW", "label": "Which role are you applying for?", "type": "CHECKBOXES", "value": ["7ab99307-9377-4b16-bb7a-91172d69c417", "c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "e5ede7d5-c874-4f93-b995-57bcd6928dad", "8c9800db-e9cc-42ce-a87b-f4c42755224f", "b96b05a6-5171-4318-8f5c-245b530695dd", "8b54310e-70f2-410e-81b5-63ead19a2542", "b8e4905a-fb22-4608-87db-f604ac9ad072", "8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "c9a3aa50-7117-448f-9966-3f946731e79e", "8421a8c4-01e1-43a6-9973-77af251ddcb2"], "options": [{"id": "7ab99307-9377-4b16-bb7a-91172d69c417", "text": "Front-end developer"}, {"id": "c9a3aa50-7117-448f-9966-3f946731e79e", "text": "Back-end developer"}, {"id": "7f53e36f-4c84-4e00-baf9-0881e0e6ab51", "text": "UX / UI designer"}, {"id": "b8e4905a-fb22-4608-87db-f604ac9ad072", "text": "Graphic designer"}, {"id": "8421a8c4-01e1-43a6-9973-77af251ddcb2", "text": "Business Modeller"}, {"id": "8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "text": "Storyteller"}, {"id": "e5ede7d5-c874-4f93-b995-57bcd6928dad", "text": "Marketer"}, {"id": "c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "text": "Copywriter"}, {"id": "8c9800db-e9cc-42ce-a87b-f4c42755224f", "text": "Video editor"}, {"id": "8b54310e-70f2-410e-81b5-63ead19a2542", "text": "Photographer"}, {"id": "b96b05a6-5171-4318-8f5c-245b530695dd", "text": "Other"}]}, {"key": "question_3yJ6PW_7ab99307-9377-4b16-bb7a-91172d69c417", "label": "Which role are you applying for? (Front-end developer)", "type": "CHECKBOXES", "value": "True", "options": null}, {"key": "question_3yJ6PW_c9a3aa50-7117-448f-9966-3f946731e79e", "label": "Which role are you applying for? (Back-end developer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_7f53e36f-4c84-4e00-baf9-0881e0e6ab51", "label": "Which role are you applying for? (UX / UI designer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_b8e4905a-fb22-4608-87db-f604ac9ad072", "label": "Which role are you applying for? (Graphic designer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8421a8c4-01e1-43a6-9973-77af251ddcb2", "label": "Which role are you applying for? (Business Modeller)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8c1f1b4e-5004-43c8-8aa5-0241ed14d759", "label": "Which role are you applying for? (Storyteller)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_e5ede7d5-c874-4f93-b995-57bcd6928dad", "label": "Which role are you applying for? (Marketer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_c4ee7339-dff5-48c6-9d66-2a1d682dbfea", "label": "Which role are you applying for? (Copywriter)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8c9800db-e9cc-42ce-a87b-f4c42755224f", "label": "Which role are you applying for? (Video editor)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_8b54310e-70f2-410e-81b5-63ead19a2542", "label": "Which role are you applying for? (Photographer)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3yJ6PW_b96b05a6-5171-4318-8f5c-245b530695dd", "label": "Which role are you applying for? (Other)", "type": "CHECKBOXES", "value": "False", "options": null}, {"key": "question_3X4DxV", "label": "Which role are you applying for that is not in the list above?", "type": "INPUT_TEXT", "value": "World until point former thousand.", "options": null}, {"key": "question_w8ZKNo", "label": "Which skill would you list as your best one?", "type": "INPUT_TEXT", "value": "Performance able simply increase compare recently.", "options": null}, {"key": "question_n0exVQ", "label": "Have you participated in osoc before?", "type": "MULTIPLE_CHOICE", "value": "89597a5d-bf59-41d0-88b1-cbce36cee12d", "options": [{"id": "89597a5d-bf59-41d0-88b1-cbce36cee12d", "text": "No, it's my first time participating in osoc"}, {"id": "626e3879-1ffe-4544-a2a1-05a6b5154fc3", "text": "Yes, I have been part of osoc before"}]}, {"key": "question_wz7qEE", "label": "Would you like to be a student coach this year?", "type": "MULTIPLE_CHOICE", "value": "4577f09c-0ec2-4887-b164-79bb536470c4", "options": [{"id": "4577f09c-0ec2-4887-b164-79bb536470c4", "text": "No, I don't want to be a student coach"}, {"id": "ca473ac4-eb45-486d-aacb-c3800b370e71", "text": "Yes, I'd like to be a student coach"}]}]}} \ No newline at end of file From 4fcd448621b8eb13a8666b5d2f27555c19b7b092 Mon Sep 17 00:00:00 2001 From: beguille Date: Thu, 19 May 2022 23:30:48 +0200 Subject: [PATCH 474/649] created an invite template and used it to send the invite emails --- backend/src/app/logic/invites.py | 5 ++++- backend/templates/invites.txt | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 backend/templates/invites.txt diff --git a/backend/src/app/logic/invites.py b/backend/src/app/logic/invites.py index 408b0b374..7b7857f98 100644 --- a/backend/src/app/logic/invites.py +++ b/backend/src/app/logic/invites.py @@ -34,7 +34,10 @@ async def create_mailto_link(db: AsyncSession, edition: Edition, email_address: # Create endpoint for the user to click on link = f"{settings.FRONTEND_URL}/register/{encoded_link}" + with open('templates/invites.txt', 'r') as f: + message = f.read().format(invite_link=link) + return NewInviteLink(mail_to=generate_mailto_string( recipient=email_address.email, subject=f"Open Summer Of Code {edition.year} invitation", - body=link + body=message ), invite_link=link) diff --git a/backend/templates/invites.txt b/backend/templates/invites.txt new file mode 100644 index 000000000..01972f3cd --- /dev/null +++ b/backend/templates/invites.txt @@ -0,0 +1,11 @@ +Dear future OSOC-coach + +Thank you for your interest in being part of the OSOC-community! With your help and expertise, we can make the students of today become the grand innovators of tomorrow. + +By clicking on the link below you can create an account to access our selections tool: + +{invite_link} + +We hope to see you soon! + +The OSOC-team \ No newline at end of file From 36a488ed553cdf00e5287d90d3d47bdc3007b594 Mon Sep 17 00:00:00 2001 From: beguille Date: Fri, 20 May 2022 00:08:26 +0200 Subject: [PATCH 475/649] fix lint --- backend/src/app/logic/invites.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/app/logic/invites.py b/backend/src/app/logic/invites.py index 7b7857f98..a4e3f87cb 100644 --- a/backend/src/app/logic/invites.py +++ b/backend/src/app/logic/invites.py @@ -34,8 +34,8 @@ async def create_mailto_link(db: AsyncSession, edition: Edition, email_address: # Create endpoint for the user to click on link = f"{settings.FRONTEND_URL}/register/{encoded_link}" - with open('templates/invites.txt', 'r') as f: - message = f.read().format(invite_link=link) + with open('templates/invites.txt', 'r', encoding="utf-8") as file: + message = file.read().format(invite_link=link) return NewInviteLink(mail_to=generate_mailto_string( recipient=email_address.email, subject=f"Open Summer Of Code {edition.year} invitation", From 91865257f2c27700119a6299bfd0a03b8f63d739 Mon Sep 17 00:00:00 2001 From: cledloof Date: Fri, 20 May 2022 05:01:59 +0200 Subject: [PATCH 476/649] confirm filter + small quality of life changes --- .../StudentCopyLink/StudentCopyLink.tsx | 4 +- .../StudentsComponents/StudentList/styles.ts | 1 + .../ConfirmFilters/ConfirmFilters.tsx | 51 +++++++++++++++ .../ConfirmFilters/index.ts | 1 + .../RolesFilter.css => Dropdown.css} | 0 .../ResetFiltersButton/ResetFiltersButton.tsx | 4 ++ .../RolesFilter/RolesFilter.tsx | 2 +- .../StudentListFilters/StudentListFilters.css | 64 +++++++++++++++++-- .../StudentListFilters/StudentListFilters.tsx | 59 +++++------------ .../StudentListFilters/styles.ts | 19 ++++++ frontend/src/data/enums/session-storage.ts | 1 + frontend/src/utils/api/students.ts | 7 ++ .../utils/session-storage/student-filters.ts | 13 ++++ 13 files changed, 177 insertions(+), 49 deletions(-) create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/ConfirmFilters/ConfirmFilters.tsx create mode 100644 frontend/src/components/StudentsComponents/StudentListFilters/ConfirmFilters/index.ts rename frontend/src/components/StudentsComponents/StudentListFilters/{RolesFilter/RolesFilter.css => Dropdown.css} (100%) diff --git a/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx b/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx index 956e64f6d..5bf783740 100644 --- a/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx +++ b/frontend/src/components/StudentInfoComponents/StudentCopyLink/StudentCopyLink.tsx @@ -13,8 +13,8 @@ export default function StudentCopyLink() { toast.info("Student URL copied to clipboard!"); } return ( - - copy link + + copy link ); diff --git a/frontend/src/components/StudentsComponents/StudentList/styles.ts b/frontend/src/components/StudentsComponents/StudentList/styles.ts index 3f240f5a8..c6cb6f01b 100644 --- a/frontend/src/components/StudentsComponents/StudentList/styles.ts +++ b/frontend/src/components/StudentsComponents/StudentList/styles.ts @@ -4,4 +4,5 @@ export const StudentCardsList = styled.div` height: 60%; overflow-y: scroll; border-bottom: 1px solid white; + margin-top: 2%; `; diff --git a/frontend/src/components/StudentsComponents/StudentListFilters/ConfirmFilters/ConfirmFilters.tsx b/frontend/src/components/StudentsComponents/StudentListFilters/ConfirmFilters/ConfirmFilters.tsx new file mode 100644 index 000000000..8f1f31cee --- /dev/null +++ b/frontend/src/components/StudentsComponents/StudentListFilters/ConfirmFilters/ConfirmFilters.tsx @@ -0,0 +1,51 @@ +import React, { useEffect, useState } from "react"; +import { FilterConfirmsDropdownContainer, FilterConfirms, ConfirmsTitle } from "../styles"; +import { DropdownRole } from "../RolesFilter/RolesFilter"; +import Select, { MultiValue } from "react-select"; +import { setConfirmFilterStorage } from "../../../../utils/session-storage/student-filters"; + +/** + * Component that filters the students list based on confirmation. + */ +export default function ConfirmFilters({ + confirmFilter, + setConfirmFilter, +}: { + confirmFilter: DropdownRole[]; + setConfirmFilter: (value: DropdownRole[]) => void; +}) { + const [confirms, setConfirms] = useState([]); + + useEffect(() => { + setConfirms([ + { label: "Yes", value: 1 }, + { label: "Maybe", value: 2 }, + { label: "No", value: 3 }, + { label: "Undecided", value: 0 }, + ]); + }, []); + + function handleRolesChange(event: MultiValue): void { + const allCheckedRoles: DropdownRole[] = []; + event.forEach(dropdownRole => allCheckedRoles.push(dropdownRole)); + setConfirmFilter(allCheckedRoles); + setConfirmFilterStorage(JSON.stringify(allCheckedRoles)); + } + + return ( + + Confirmed + +