Skip to content

Commit 6fe7141

Browse files
committed
Merge branch 'main' into bryphe/feat/initial-create-form
2 parents 5e4a44f + dfddaf1 commit 6fe7141

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.eslintrc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ rules:
3838
"@typescript-eslint/explicit-function-return-type": "off"
3939
"@typescript-eslint/explicit-module-boundary-types": "error"
4040
"@typescript-eslint/method-signature-style": ["error", "property"]
41+
"@typescript-eslint/no-floating-promises": error
4142
"@typescript-eslint/no-invalid-void-type": error
4243
# We're disabling the `no-namespace` rule to use a pattern of defining an interface,
4344
# and then defining functions that operate on that data via namespace. This is helpful for

site/components/SignIn/SignInForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ export const SignInForm: React.FC<SignInProps> = ({
8787
try {
8888
await loginHandler(email, password)
8989
// Tell SWR to invalidate the cache for the user endpoint
90-
mutate("/api/v2/user")
91-
router.push("/")
90+
await mutate("/api/v2/user")
91+
await router.push("/")
9292
} catch (err) {
9393
helpers.setFieldError("password", "The username or password is incorrect.")
9494
}

site/contexts/UserContext.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ export const useUser = (redirectOnError = false): UserContext => {
2323
const requestError = ctx.error
2424
useEffect(() => {
2525
if (redirectOnError && requestError) {
26-
router.push({
26+
// 'void' means we are ignoring handling the promise returned
27+
// from router.push (and lets the linter know we're OK with that!)
28+
void router.push({
2729
pathname: "/login",
2830
query: {
2931
redirect: router.asPath,

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4408,9 +4408,9 @@ nanoclone@^0.2.1:
44084408
integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
44094409

44104410
nanoid@^3.1.23:
4411-
version "3.1.30"
4412-
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"
4413-
integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
4411+
version "3.2.0"
4412+
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
4413+
integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
44144414

44154415
natural-compare@^1.4.0:
44164416
version "1.4.0"

0 commit comments

Comments
 (0)