Skip to content

Commit

Permalink
Merge branch 'main' of github.com:42Atomys/stud42 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
42atomys committed May 30, 2022
2 parents 5020d2e + eae2799 commit 27e4ef6
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 127 deletions.
10 changes: 5 additions & 5 deletions web/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@apollo/client": "^3.6.1",
"@apollo/react-hooks": "^4.0.0",
"@grpc/grpc-js": "^1.6.5",
"@headlessui/react": "^1.6.1",
"@headlessui/react": "^1.6.4",
"@sentry/nextjs": "^6.19.6",
"@sentry/tracing": "^6.19.6",
"axios": "^0.26.1",
Expand All @@ -45,7 +45,7 @@
"isomorphic-unfetch": "^3.1.0",
"js-cookie": "^3.0.1",
"jsonwebtoken": "^8.5.1",
"jwks-rsa": "^2.0.5",
"jwks-rsa": "^2.1.3",
"next": "^12.1.6",
"next-auth": "^4.3.2",
"protoc-gen-ts": "^0.8.2",
Expand Down Expand Up @@ -77,16 +77,16 @@
"babel-jest": "^28.1.0",
"babel-loader": "^8.2.3",
"babel-plugin-inline-react-svg": "^2.0.1",
"concurrently": "^7.1.0",
"cypress": "^9.5.4",
"concurrently": "^7.2.1",
"cypress": "^9.7.0",
"eslint": "^8.14.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-next": "12.1.5",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.26.0",
"husky": "^8.0.1",
"jest": "^28.0.3",
"jest-environment-jsdom": "^28.0.2",
"jest-environment-jsdom": "^28.1.0",
"postcss": "^8.4.13",
"prettier": "2.6.2",
"pretty-quick": "^3.1.3",
Expand Down
156 changes: 34 additions & 122 deletions web/ui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1516,10 +1516,10 @@
dependencies:
"@hapi/hoek" "^9.0.0"

"@headlessui/react@^1.6.1":
version "1.6.1"
resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.6.1.tgz#d822792e589aac005462491dd62f86095e0c3bef"
integrity sha512-gMd6uIs1U4Oz718Z5gFoV0o/vD43/4zvbyiJN9Dt7PK9Ubxn+TmJwTmYwyNJc5KxxU1t0CmgTNgwZX9+4NjCnQ==
"@headlessui/react@^1.6.4":
version "1.6.4"
resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.6.4.tgz#c73084e23386bef5fb86cd16da3352c3a844bb4c"
integrity sha512-0yqz1scwbFtwljmbbKjXsSGl5ABEYNICVHZnMCWo0UtOZodo2Tpu94uOVgCRjRZ77l2WcTi2S0uidINDvG7lsA==

"@humanwhocodes/config-array@^0.9.2":
version "0.9.5"
Expand Down Expand Up @@ -1603,16 +1603,6 @@
slash "^3.0.0"
strip-ansi "^6.0.0"

"@jest/environment@^28.0.2":
version "28.0.2"
resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.0.2.tgz#a865949d876b2d364b979bbc0a46338ffd23de26"
integrity sha512-IvI7dEfqVEffDYlw9FQfVBt6kXt/OI38V7QUIur0ulOQgzpKYJDVvLzj4B1TVmHWTGW5tcnJdlZ3hqzV6/I9Qg==
dependencies:
"@jest/fake-timers" "^28.0.2"
"@jest/types" "^28.0.2"
"@types/node" "*"
jest-mock "^28.0.2"

"@jest/environment@^28.1.0":
version "28.1.0"
resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.0.tgz#dedf7d59ec341b9292fcf459fd0ed819eb2e228a"
Expand All @@ -1638,18 +1628,6 @@
expect "^28.1.0"
jest-snapshot "^28.1.0"

"@jest/fake-timers@^28.0.2":
version "28.0.2"
resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.0.2.tgz#d36e62bc58f39d65ea6adac1ff7749e63aff05f3"
integrity sha512-R75yUv+WeybPa4ZVhX9C+8XN0TKjUoceUX+/QEaDVQGxZZOK50eD74cs7iMDTtpodh00d8iLlc9197vgF6oZjA==
dependencies:
"@jest/types" "^28.0.2"
"@sinonjs/fake-timers" "^9.1.1"
"@types/node" "*"
jest-message-util "^28.0.2"
jest-mock "^28.0.2"
jest-util "^28.0.2"

"@jest/fake-timers@^28.1.0":
version "28.1.0"
resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.0.tgz#ea77878aabd5c5d50e1fc53e76d3226101e33064"
Expand Down Expand Up @@ -1758,18 +1736,6 @@
slash "^3.0.0"
write-file-atomic "^4.0.1"

"@jest/types@^28.0.2":
version "28.0.2"
resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.0.2.tgz#70b9538c1863fb060b2f438ca008b5563d00c5b4"
integrity sha512-hi3jUdm9iht7I2yrV5C4s3ucCJHUP8Eh3W6rQ1s4n/Qw9rQgsda4eqCt+r3BKRi7klVmZfQlMx1nGlzNMP2d8A==
dependencies:
"@jest/schemas" "^28.0.2"
"@types/istanbul-lib-coverage" "^2.0.0"
"@types/istanbul-reports" "^3.0.0"
"@types/node" "*"
"@types/yargs" "^17.0.8"
chalk "^4.0.0"

"@jest/types@^28.1.0":
version "28.1.0"
resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.0.tgz#508327a89976cbf9bd3e1cc74641a29fd7dfd519"
Expand Down Expand Up @@ -2451,14 +2417,6 @@
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==

"@types/[email protected]":
version "0.0.42"
resolved "https://registry.yarnpkg.com/@types/express-jwt/-/express-jwt-0.0.42.tgz#4f04e1fadf9d18725950dc041808a4a4adf7f5ae"
integrity sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==
dependencies:
"@types/express" "*"
"@types/express-unless" "*"

"@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"
Expand All @@ -2468,14 +2426,7 @@
"@types/qs" "*"
"@types/range-parser" "*"

"@types/express-unless@*":
version "0.5.3"
resolved "https://registry.yarnpkg.com/@types/express-unless/-/express-unless-0.5.3.tgz#271f8603617445568ed0d6efe25a7d2f338544c1"
integrity sha512-TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw==
dependencies:
"@types/express" "*"

"@types/express@*":
"@types/express@^4.17.13":
version "4.17.13"
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
Expand Down Expand Up @@ -4088,19 +4039,20 @@ [email protected]:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=

concurrently@^7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.1.0.tgz#477b49b8cfc630bb491f9b02e9ed7fb7bff02942"
integrity sha512-Bz0tMlYKZRUDqJlNiF/OImojMB9ruKUz6GCfmhFnSapXgPe+3xzY4byqoKG9tUZ7L2PGEUjfLPOLfIX3labnmw==
concurrently@^7.2.1:
version "7.2.1"
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.2.1.tgz#88b144060443403060aad46f837dd17451f7e55e"
integrity sha512-7cab/QyqipqghrVr9qZmoWbidu0nHsmxrpNqQ7r/67vfl1DWJElexehQnTH1p+87tDkihaAjM79xTZyBQh7HLw==
dependencies:
chalk "^4.1.0"
date-fns "^2.16.1"
lodash "^4.17.21"
rxjs "^6.6.3"
shell-quote "^1.7.3"
spawn-command "^0.0.2-1"
supports-color "^8.1.0"
tree-kill "^1.2.2"
yargs "^16.2.0"
yargs "^17.3.1"

confusing-browser-globals@^1.0.10:
version "1.0.11"
Expand Down Expand Up @@ -4279,10 +4231,10 @@ csstype@^3.0.2:
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==

cypress@^9.5.4:
version "9.6.0"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.6.0.tgz#84473b3362255fa8f5e627a596e58575c9e5320f"
integrity sha512-nNwt9eBQmSENamwa8LxvggXksfyzpyYaQ7lNBLgks3XZ6dPE/6BCQFBzeAyAPt/bNXfH3tKPkAyhiAZPYkWoEg==
cypress@^9.7.0:
version "9.7.0"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.7.0.tgz#bf55b2afd481f7a113ef5604aa8b693564b5e744"
integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q==
dependencies:
"@cypress/request" "^2.88.10"
"@cypress/xvfb" "^1.2.4"
Expand Down Expand Up @@ -6450,18 +6402,18 @@ jest-each@^28.1.0:
jest-util "^28.1.0"
pretty-format "^28.1.0"

jest-environment-jsdom@^28.0.2:
version "28.0.2"
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-28.0.2.tgz#b923f861f4cd896d2ba1971255060e1f413e9a04"
integrity sha512-rQhgV9reB6Id7VPa5jEkKx80Ppa/I6C7vKTMnceBS+d/rt+aTfbxbK/P4HRLMLE8KKsETszPpzYtGgsa8xMg7g==
jest-environment-jsdom@^28.1.0:
version "28.1.0"
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-28.1.0.tgz#1042cffd0343615c5fac2d2c8da20d1d43b73ef8"
integrity sha512-8n6P4xiDjNVqTWv6W6vJPuQdLx+ZiA3dbYg7YJ+DPzR+9B61K6pMVJrSs2IxfGRG4J7pyAUA5shQ9G0KEun78w==
dependencies:
"@jest/environment" "^28.0.2"
"@jest/fake-timers" "^28.0.2"
"@jest/types" "^28.0.2"
"@jest/environment" "^28.1.0"
"@jest/fake-timers" "^28.1.0"
"@jest/types" "^28.1.0"
"@types/jsdom" "^16.2.4"
"@types/node" "*"
jest-mock "^28.0.2"
jest-util "^28.0.2"
jest-mock "^28.1.0"
jest-util "^28.1.0"
jsdom "^19.0.0"

jest-environment-node@^28.1.0:
Expand Down Expand Up @@ -6533,21 +6485,6 @@ jest-matcher-utils@^28.1.0:
jest-get-type "^28.0.2"
pretty-format "^28.1.0"

jest-message-util@^28.0.2:
version "28.0.2"
resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.0.2.tgz#f3cf36be72be4c4c4058cb34bd6673996d26dee3"
integrity sha512-knK7XyojvwYh1XiF2wmVdskgM/uN11KsjcEWWHfnMZNEdwXCrqB4sCBO94F4cfiAwCS8WFV6CDixDwPlMh/wdA==
dependencies:
"@babel/code-frame" "^7.12.13"
"@jest/types" "^28.0.2"
"@types/stack-utils" "^2.0.0"
chalk "^4.0.0"
graceful-fs "^4.2.9"
micromatch "^4.0.4"
pretty-format "^28.0.2"
slash "^3.0.0"
stack-utils "^2.0.3"

jest-message-util@^28.1.0:
version "28.1.0"
resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.0.tgz#7e8f0b9049e948e7b94c2a52731166774ba7d0af"
Expand All @@ -6563,14 +6500,6 @@ jest-message-util@^28.1.0:
slash "^3.0.0"
stack-utils "^2.0.3"

jest-mock@^28.0.2:
version "28.0.2"
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.0.2.tgz#059b500b34c1dd76474ebcdeccc249fe4dd0249f"
integrity sha512-vfnJ4zXRB0i24jOTGtQJyl26JKsgBKtqRlCnsrORZbG06FToSSn33h2x/bmE8XxqxkLWdZBRo+/65l8Vi3nD+g==
dependencies:
"@jest/types" "^28.0.2"
"@types/node" "*"

jest-mock@^28.1.0:
version "28.1.0"
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.0.tgz#ccc7cc12a9b330b3182db0c651edc90d163ff73e"
Expand Down Expand Up @@ -6696,18 +6625,6 @@ jest-snapshot@^28.1.0:
pretty-format "^28.1.0"
semver "^7.3.5"

jest-util@^28.0.2:
version "28.0.2"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.0.2.tgz#8e22cdd6e0549e0a393055f0e2da7eacc334b143"
integrity sha512-EVdpIRCC8lzqhp9A0u0aAKlsFIzufK6xKxNK7awsnebTdOP4hpyQW5o6Ox2qPl8gbeUKYF+POLyItaND53kpGA==
dependencies:
"@jest/types" "^28.0.2"
"@types/node" "*"
chalk "^4.0.0"
ci-info "^3.2.0"
graceful-fs "^4.2.9"
picomatch "^2.2.3"

jest-util@^28.1.0:
version "28.1.0"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.0.tgz#d54eb83ad77e1dd441408738c5a5043642823be5"
Expand Down Expand Up @@ -7004,12 +6921,12 @@ jwa@^1.4.1:
ecdsa-sig-formatter "1.0.11"
safe-buffer "^5.0.1"

jwks-rsa@^2.0.5:
version "2.1.0"
resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-2.1.0.tgz#00e4c5eecc40ba41de199b71ab7e489807a1727f"
integrity sha512-GKOSDBWWBCiQTzawei6mEdRQvji5gecj8F9JwMt0ZOPnBPSmTjo5CKFvvbhE7jGPkU159Cpi0+OTLuABFcNOQQ==
jwks-rsa@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-2.1.3.tgz#12ffbec22defa7e6c70f47574d992d2e7d71801d"
integrity sha512-+zSFnZYHckwxEIgjEu81AAWDyqx8z5/OVtmhuXPbchUA9Y4bipVDqvL/5Z5Qhe088e/uxPvp8QDpIDOmI2cEBg==
dependencies:
"@types/express-jwt" "0.0.42"
"@types/express" "^4.17.13"
debug "^4.3.4"
jose "^2.0.5"
limiter "^1.1.5"
Expand Down Expand Up @@ -8215,16 +8132,6 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
ansi-styles "^5.0.0"
react-is "^17.0.1"

pretty-format@^28.0.2:
version "28.0.2"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.0.2.tgz#6a24d71cbb61a5e5794ba7513fe22101675481bc"
integrity sha512-UmGZ1IERwS3yY35LDMTaBUYI1w4udZDdJGGT/DqQeKG9ZLDn7/K2Jf/JtYSRiHCCKMHvUA+zsEGSmHdpaVp1yw==
dependencies:
"@jest/schemas" "^28.0.2"
ansi-regex "^5.0.1"
ansi-styles "^5.0.0"
react-is "^18.0.0"

pretty-format@^28.1.0:
version "28.1.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.0.tgz#8f5836c6a0dfdb834730577ec18029052191af55"
Expand Down Expand Up @@ -8862,6 +8769,11 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
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"
integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==

side-channel@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
Expand Down

0 comments on commit 27e4ef6

Please sign in to comment.