Skip to content

Commit

Permalink
use new js package
Browse files Browse the repository at this point in the history
  • Loading branch information
@SKairinos
SKairinos committed Jun 19, 2024
1 parent 62eaa3c commit c2e00b3
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 29 deletions.
7 changes: 3 additions & 4 deletions src/pages/login/teacherForms/Otp.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { type FC } from "react"

import * as form from "codeforlife/components/form"
import { LinkButton } from "codeforlife/components/router"
import { useNavigate, useSessionRequired } from "codeforlife/hooks"
import { useNavigate, useSession } from "codeforlife/hooks"
import { submitForm } from "codeforlife/utils/form"

import { useLoginWithOtpMutation } from "../../../api/sso"
Expand All @@ -16,8 +16,7 @@ const Otp: FC<OtpProps> = () => {
const [loginWithOtp] = useLoginWithOtpMutation()
const navigate = useNavigate()

Check warning on line 17 in src/pages/login/teacherForms/Otp.tsx

View check run for this annotation

Codecov / codecov/patch

src/pages/login/teacherForms/Otp.tsx#L15-L17 

Added lines #L15 - L17 were not covered by tests

return useSessionRequired(
paths.login.teacher._,
return useSession(
({ otp_bypass_token_exists }) => (
<BaseForm

Check warning on line 21 in src/pages/login/teacherForms/Otp.tsx

View check run for this annotation

Codecov / codecov/patch

src/pages/login/teacherForms/Otp.tsx#L19-L21 

Added lines #L19 - L21 were not covered by tests
themedBoxProps={{ userType: "teacher" }}
Expand Down Expand Up @@ -47,7 +46,7 @@ const Otp: FC<OtpProps> = () => {
</Stack>
</BaseForm>
),
{ next: false },
{ userType: "teacher", next: false },
)
}

Expand Down
7 changes: 3 additions & 4 deletions src/pages/login/teacherForms/OtpBypassToken.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as yup from "yup"

import * as form from "codeforlife/components/form"
import { LinkButton } from "codeforlife/components/router"
import { useNavigate, useSessionRequired } from "codeforlife/hooks"
import { useNavigate, useSession } from "codeforlife/hooks"
import { submitForm } from "codeforlife/utils/form"

import { useLoginWithOtpBypassTokenMutation } from "../../../api/sso"
Expand All @@ -18,8 +18,7 @@ const OtpBypassToken: FC<OtpBypassTokenProps> = () => {
const navigate = useNavigate()
const theme = useTheme()

Check warning on line 19 in src/pages/login/teacherForms/OtpBypassToken.tsx

View check run for this annotation

Codecov / codecov/patch

src/pages/login/teacherForms/OtpBypassToken.tsx#L16-L19 

Added lines #L16 - L19 were not covered by tests

return useSessionRequired(
paths.login.teacher._,
return useSession(

Check warning on line 21 in src/pages/login/teacherForms/OtpBypassToken.tsx

View check run for this annotation

Codecov / codecov/patch

src/pages/login/teacherForms/OtpBypassToken.tsx#L21 

Added line #L21 was not covered by tests
<BaseForm
themedBoxProps={{ userType: "teacher" }}
header="Login as a teacher"
Expand Down Expand Up @@ -55,7 +54,7 @@ const OtpBypassToken: FC<OtpBypassTokenProps> = () => {
<form.SubmitButton>Log in</form.SubmitButton>
</Stack>
</BaseForm>,
{ next: false },
{ userType: "teacher", next: false },
)
}

Expand Down
42 changes: 21 additions & 21 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1851,9 +1851,9 @@
integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==

"@types/node@^20.14.2":
version "20.14.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18"
integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==
version "20.14.5"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.5.tgz#fe35e3022ebe58b8f201580eb24e1fcfc0f2487d"
integrity sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==
dependencies:
undici-types "~5.26.4"

Expand Down Expand Up @@ -2289,7 +2289,7 @@ array.prototype.toreversed@^1.1.2:
es-abstract "^1.22.1"
es-shim-unscopables "^1.0.0"

array.prototype.tosorted@^1.1.3:
array.prototype.tosorted@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==
Expand Down Expand Up @@ -2491,9 +2491,9 @@ camelcase@^7.0.0:
integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==

caniuse-lite@^1.0.30001629:
version "1.0.30001634"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz#aa563c8e7aeaf552f7ead60371bc8d803425deaa"
integrity sha512-fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA==
version "1.0.30001636"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz#b15f52d2bdb95fad32c2f53c0b68032b85188a78"
integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==

chai@^4.3.10:
version "4.4.1"
Expand Down Expand Up @@ -2578,7 +2578,7 @@ clsx@^2.1.0:

"codeforlife@github:ocadotechnology/codeforlife-package-javascript#auth_flow":
version "2.0.0"
resolved "https://codeload.github.com/ocadotechnology/codeforlife-package-javascript/tar.gz/f4e0106e5083a34b843065d76c8ad7c61175e170"
resolved "https://codeload.github.com/ocadotechnology/codeforlife-package-javascript/tar.gz/d07d4b011f53b4497e9e85eb3d3820ddf3af1f99"
dependencies:
"@emotion/react" "^11.10.6"
"@emotion/styled" "^11.10.6"
Expand Down Expand Up @@ -2918,9 +2918,9 @@ eastasianwidth@^0.2.0:
integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==

electron-to-chromium@^1.4.796:
version "1.4.802"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz#49b397eadc95a49b1ac33eebee146b8e5a93773f"
integrity sha512-TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA==
version "1.4.806"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.806.tgz#2cb046631cbabceb26fc72be68d273fa183e36bc"
integrity sha512-nkoEX2QIB8kwCOtvtgwhXWy2IHVcOLQZu9Qo36uaGB835mdX/h8uLRlosL6QIhLVUnAiicXRW00PwaPZC74Nrg==

emoji-regex@^8.0.0:
version "8.0.0"
Expand Down Expand Up @@ -3234,15 +3234,15 @@ eslint-plugin-react-hooks@^4.3.0:
integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==

eslint-plugin-react@^7.27.1:
version "7.34.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.2.tgz#2780a1a35a51aca379d86d29b9a72adc6bfe6b66"
integrity sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw==
version "7.34.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz#9965f27bd1250a787b5d4cfcc765e5a5d58dcb7b"
integrity sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==
dependencies:
array-includes "^3.1.8"
array.prototype.findlast "^1.2.5"
array.prototype.flatmap "^1.3.2"
array.prototype.toreversed "^1.1.2"
array.prototype.tosorted "^1.1.3"
array.prototype.tosorted "^1.1.4"
doctrine "^2.1.0"
es-iterator-helpers "^1.0.19"
estraverse "^5.3.0"
Expand Down Expand Up @@ -5696,9 +5696,9 @@ [email protected]:
vite "^5.0.0"

vite@^5.0.0, vite@^5.0.11:
version "5.3.0"
resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.0.tgz#6c11eb5b41a667c64d38ff38fe6dec7ff68b65a9"
integrity sha512-hA6vAVK977NyW1Qw+fLvqSo7xDPej7von7C3DwwqPRmnnnK36XEBC/J3j1V5lP8fbt7y0TgTKJbpNGSwM+Bdeg==
version "5.3.1"
resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.1.tgz#bb2ca6b5fd7483249d3e86b25026e27ba8a663e6"
integrity sha512-XBmSKRLXLxiaPYamLv3/hnP/KXDai1NDexN0FpkTaZXTfycHvkRHoenpgl/fvuK/kPbB6xAgoyiryAhQNxYmAQ==
dependencies:
esbuild "^0.21.3"
postcss "^8.4.38"
Expand Down Expand Up @@ -5856,9 +5856,9 @@ wrappy@1:
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==

ws@^8.16.0:
version "8.17.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea"
integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==
version "8.17.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==

xml-name-validator@^5.0.0:
version "5.0.0"
Expand Down

0 comments on commit c2e00b3

Please sign in to comment.