+ {user.role &&
{user.role} }
+
{user.preferred_name}
+
+
{user.name}
{" "}
+ {user.pronouns && (
+ <>
+
·
+
{user.pronouns}
+
)}
- {currentUser?.id === user.id && (
-
- Edit Profile
-
+
+
+ {user.github && (
+
+
+
+ {user.github}
+
+ )}
+ {user.discord && (
+
+
+
+ {user.discord}
+
+ )}
+
+
+ {user.student_number && (
+
+
badge
+
{user.student_number}
+
+ )}
+ {user.university ? (
+
+
school
+
{universityLabel}
+
+ ) : (
+
+
school
+
The University of Western Australia
)}
-
+
+ {currentUser?.id === user.id && (
+
+ Edit Profile
+
+
+ )}
-
Projects
-
-
- {p1Loading ? (
-
Loading...
- ) : !pastProjects || pastProjects.length == 0 ? (
-
No past participated projects
- ) : (
-
- {pastProjects.map((project, index) => (
-
-
- ))}
+
+
+ {user?.role === null && (
+
+
+
Membership
+
+
+ You're not a member with us yet. Become a paying member of Coders for Causes for just $5
+ a year (ends on 31st Dec {new Date().getFullYear()}). There are many benefits to becoming a
+ member which include:
+
+
+ discounts to paid events such as industry nights
+ the ability to vote and run for committee positions
+ the ability to join our projects run during the winter and summer breaks.
+
+
- )}
-
-
-
View upcoming projects
-
+ {getIsMembershipOpen() ? (
+
+ ) : (
+
+ Memberships are temporarily closed for the new year. Please check back later.
+
+ )}
-
+ )}
diff --git a/src/app/profile/settings/@email/form.tsx b/src/app/profile/settings/@email/form.tsx
index 33c9568b5..27686164e 100644
--- a/src/app/profile/settings/@email/form.tsx
+++ b/src/app/profile/settings/@email/form.tsx
@@ -3,13 +3,12 @@
import { useReverification, useUser } from "@clerk/nextjs"
import { EmailAddressResource } from "@clerk/types"
import { zodResolver } from "@hookform/resolvers/zod"
-import Link from "next/link"
import { useEffect, useState } from "react"
import { FormProvider, useForm } from "react-hook-form"
import { z } from "zod"
import { Button } from "~/components/ui/button"
-import { FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from "~/components/ui/form"
+import { FormControl, FormField, FormItem, FormLabel, FormMessage } from "~/components/ui/form"
import { Input } from "~/components/ui/input"
import { toast } from "~/components/ui/use-toast"
@@ -59,8 +58,12 @@ const EmailForm = (props: { user_id: string; email?: Partial
}) => {
}
}, [countdown])
const updateEmail = api.users.updateEmail.useMutation({
- onSuccess: async () => {
- await utils.users.getCurrent.refetch()
+ onError: (error) => {
+ toast({
+ variant: "destructive",
+ title: "Failed to update email",
+ description: error.message,
+ })
},
})
@@ -111,11 +114,12 @@ const EmailForm = (props: { user_id: string; email?: Partial }) => {
oldEmail: (data.email ?? "").trim(),
newEmail: (data.new_email ?? "").trim(),
})
+ setStep("updated")
toast({
title: "Email updated",
description: "Your email has been updated successfully.",
})
- setStep("updated")
+ window.location.reload()
} else {
toast({
variant: "destructive",
@@ -150,7 +154,7 @@ const EmailForm = (props: { user_id: string; email?: Partial }) => {
*
-
}) => {
) : (
-
+
+
)
}
diff --git a/src/server/api/routers/admin/users/create-manual.ts b/src/server/api/routers/admin/users/create-manual.ts
index 87a71c937..93d9a3cbc 100644
--- a/src/server/api/routers/admin/users/create-manual.ts
+++ b/src/server/api/routers/admin/users/create-manual.ts
@@ -46,9 +46,10 @@ export const createManual = adminProcedure
)
.mutation(async ({ ctx, input }) => {
let clerkRes: ClerkUser | undefined
+ const clerk = await clerkClient()
// TODO: wrap in a transaction
try {
- clerkRes = await clerkClient().users.createUser({
+ clerkRes = await clerk.users.createUser({
emailAddress: [input.email],
firstName: input.name, // we treat clerk.firstName as the user's full name
unsafeMetadata: {
@@ -63,7 +64,7 @@ export const createManual = adminProcedure
})
} catch (err) {
// user might exist already
- clerkRes = (await clerkClient().users.getUserList({ emailAddress: [input.email] })).data[0]
+ clerkRes = (await clerk.users.getUserList({ emailAddress: [input.email] })).data[0]
}
if (!clerkRes)
From 00bd10628ac55210a8f5550d9d84dac381ae4c98 Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Wed, 17 Sep 2025 23:33:37 +0800
Subject: [PATCH 06/12] delete import
---
src/app/dashboard/(root)/page.tsx | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/app/dashboard/(root)/page.tsx b/src/app/dashboard/(root)/page.tsx
index ae44dbf55..358404c21 100644
--- a/src/app/dashboard/(root)/page.tsx
+++ b/src/app/dashboard/(root)/page.tsx
@@ -1,6 +1,3 @@
-import PaymentFormWrapper from "~/components/payment/online/wrapper"
-
-import { getIsMembershipOpen } from "~/lib/utils"
import { api } from "~/trpc/server"
import DashboardContent from "./content"
From 05f305a58ae54543c9254bb2d7a1c3e47c807f2c Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Wed, 17 Sep 2025 23:47:28 +0800
Subject: [PATCH 07/12] fix error
---
src/app/join/page.tsx | 12 ++++++++----
src/app/profile/settings/@email/form.tsx | 2 +-
src/middleware.ts | 4 ++--
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/app/join/page.tsx b/src/app/join/page.tsx
index 7fdd94216..361ecb2ec 100644
--- a/src/app/join/page.tsx
+++ b/src/app/join/page.tsx
@@ -65,10 +65,14 @@ export default function Join() {
try {
const attempt = await signIn.create({ identifier: email })
- const emailFactor = attempt.supportedFirstFactors.find((factor) => factor.strategy === "email_code")
-
+ const emailFactor = attempt.supportedFirstFactors?.find((factor) => factor.strategy === "email_code")
if (!emailFactor || emailFactor.strategy !== "email_code") {
- throw new Error("Email code factor not supported")
+ toast({
+ variant: "destructive",
+ title: "Error",
+ description: "Email code factor not supported",
+ })
+ return
}
const si = await attempt.prepareFirstFactor({
@@ -79,7 +83,7 @@ export default function Join() {
setStep("email")
window.scrollTo({
top: 0,
- behavior: "smooth", // smooth scrolling
+ behavior: "smooth",
})
} catch (error) {
const { errors = [] } = error as ClerkError
diff --git a/src/app/profile/settings/@email/form.tsx b/src/app/profile/settings/@email/form.tsx
index 27686164e..cf3220268 100644
--- a/src/app/profile/settings/@email/form.tsx
+++ b/src/app/profile/settings/@email/form.tsx
@@ -87,7 +87,7 @@ const EmailForm = (props: { user_id: string; email?: Partial
}) => {
const emailAddress = user.emailAddresses.find((a) => a.id === res?.id)
setEmailObj(emailAddress)
- emailAddress?.prepareVerification({ strategy: "email_code" })
+ await emailAddress?.prepareVerification({ strategy: "email_code" })
setCountdown(60)
setStep("enterCode")
window.scrollTo({
diff --git a/src/middleware.ts b/src/middleware.ts
index b5f7fa30e..d5b7acdfb 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -21,14 +21,14 @@ export default clerkMiddleware(async (auth, req) => {
if (!adminRoles.includes(user?.role ?? "")) {
// non-existent clerk role so we go to 404 page cleanly
- auth.protect({
+ await auth.protect({
role: "lmfaooo",
})
}
}
if (isProtectedPage(req)) {
- auth.protect()
+ await auth.protect()
}
if (isAuthPage(req) && clerkId) {
From 237f90fd4150f412c189f861d237671dfee20462 Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Thu, 18 Sep 2025 01:23:53 +0800
Subject: [PATCH 08/12] improve logic
---
src/app/profile/[id]/page.tsx | 2 +-
src/app/profile/[id]/profile.tsx | 79 +++++++++++++------
src/app/profile/settings/@email/form.tsx | 42 +++++++---
src/app/profile/settings/@personal/form.tsx | 2 +-
.../api/routers/projects/get-projects.ts | 14 +++-
src/server/api/routers/users/update-email.ts | 56 +++++++------
6 files changed, 132 insertions(+), 63 deletions(-)
diff --git a/src/app/profile/[id]/page.tsx b/src/app/profile/[id]/page.tsx
index 6c90f0f55..cd6a6d5c6 100644
--- a/src/app/profile/[id]/page.tsx
+++ b/src/app/profile/[id]/page.tsx
@@ -6,7 +6,7 @@ import ProfilePage from "./profile"
const Profile = async ({ params: { id } }: { params: { id: string } }) => {
const currentUser = await api.users.getCurrent.query()
- if (currentUser.id === id) {
+ if (currentUser) {
return ./profile
-
+
{user.role && {user.role} }
{user.preferred_name}
@@ -108,32 +113,58 @@ const ProfilePage = ({ id, currentUser }: ProfilePageProps) => {
)}
-
- {user?.role === null && (
-
-
-
Membership
-
-
- You're not a member with us yet. Become a paying member of Coders for Causes for just $5
- a year (ends on 31st Dec {new Date().getFullYear()}). There are many benefits to becoming a
- member which include:
+
+ {currentUser?.id === user.id ? (
+ user?.role === null && (
+
+
+
Membership
+
+
+ You're not a member with us yet. Become a paying member of Coders for Causes for just
+ $5 a year (ends on 31st Dec {new Date().getFullYear()}). There are many benefits to becoming
+ a member which include:
+
+
+ discounts to paid events such as industry nights
+ the ability to vote and run for committee positions
+ the ability to join our projects run during the winter and summer breaks.
+
+
+
+ {getIsMembershipOpen() ? (
+
+ ) : (
+
+ Memberships are temporarily closed for the new year. Please check back later.
-
- discounts to paid events such as industry nights
- the ability to vote and run for committee positions
- the ability to join our projects run during the winter and summer breaks.
-
+ )}
+
+ )
+ ) : (
+ <>
+ {" "}
+
Projects
+
+
+ {p1Loading ? (
+
Loading...
+ ) : !pastProjects || pastProjects.length == 0 ? (
+
+ This user has not participated in any projects
+
+ ) : (
+
+ {pastProjects.map((project, index) => (
+
+
+ ))}
+
+ )}
- {getIsMembershipOpen() ? (
-
- ) : (
-
- Memberships are temporarily closed for the new year. Please check back later.
-
- )}
-
+
)}
diff --git a/src/app/profile/settings/@email/form.tsx b/src/app/profile/settings/@email/form.tsx
index cf3220268..24f2ae4f8 100644
--- a/src/app/profile/settings/@email/form.tsx
+++ b/src/app/profile/settings/@email/form.tsx
@@ -3,6 +3,7 @@
import { useReverification, useUser } from "@clerk/nextjs"
import { EmailAddressResource } from "@clerk/types"
import { zodResolver } from "@hookform/resolvers/zod"
+import { se } from "date-fns/locale"
import { useEffect, useState } from "react"
import { FormProvider, useForm } from "react-hook-form"
import { z } from "zod"
@@ -43,9 +44,10 @@ const defaultValues: FormSchema = {
const EmailForm = (props: { user_id: string; email?: Partial
}) => {
const utils = api.useUtils()
const { isLoaded, isSignedIn, user } = useUser()
+ const [step, setStep] = useState<"submitForm" | "enterCode" | "verifying" | "updated">("submitForm")
const [countdown, setCountdown] = useState(0)
+ const [send, setSend] = useState(false)
const [code, setCode] = useState("")
- const [step, setStep] = useState<"submitForm" | "enterCode" | "verifying" | "updated">("submitForm")
const [emailObj, setEmailObj] = useState()
const createEmailAddress = useReverification((email: string) => user?.createEmailAddress({ email }))
useEffect(() => {
@@ -57,6 +59,19 @@ const EmailForm = (props: { user_id: string; email?: Partial }) => {
return () => clearInterval(timer)
}
}, [countdown])
+
+ useEffect(() => {
+ if (step === "enterCode" && emailObj && send) {
+ emailObj.prepareVerification({ strategy: "email_code" })
+ setSend(false)
+ setCountdown(60)
+ window.scrollTo({
+ top: 0,
+ behavior: "smooth",
+ })
+ }
+ }, [emailObj, step, send])
+
const updateEmail = api.users.updateEmail.useMutation({
onError: (error) => {
toast({
@@ -80,20 +95,25 @@ const EmailForm = (props: { user_id: string; email?: Partial }) => {
}
const sendOtp = async (values: FormSchema) => {
+ setSend(true)
try {
- const res = await createEmailAddress(values.new_email.trim())
- await user.reload()
+ if (values.new_email.trim() === user?.primaryEmailAddress?.emailAddress) {
+ toast({
+ variant: "destructive",
+ title: "Error",
+ description: "New email must be different from current email",
+ })
+ return
+ }
- const emailAddress = user.emailAddresses.find((a) => a.id === res?.id)
- setEmailObj(emailAddress)
+ if (!user.emailAddresses.some((e) => e.emailAddress === values.new_email.trim())) {
+ const res = await createEmailAddress(values.new_email.trim())
+ await user.reload()
+ const emailAddress = user.emailAddresses.find((a) => a.id === res?.id)
+ setEmailObj(emailAddress)
+ }
- await emailAddress?.prepareVerification({ strategy: "email_code" })
- setCountdown(60)
setStep("enterCode")
- window.scrollTo({
- top: 0,
- behavior: "smooth",
- })
} catch (error) {
console.error(JSON.stringify(error, null, 2))
toast({
diff --git a/src/app/profile/settings/@personal/form.tsx b/src/app/profile/settings/@personal/form.tsx
index 6b067ef70..430cd10d0 100644
--- a/src/app/profile/settings/@personal/form.tsx
+++ b/src/app/profile/settings/@personal/form.tsx
@@ -82,7 +82,7 @@ const PersonalForm = (props: { defaultValues?: Partial }) => {
const { getValues, setError } = form
const onSubmit = async (data: FormSchema) => {
- if (data.github !== "") {
+ if (data.github && data.github !== "") {
const { status: githubStatus } = await fetch(`https://api.github.com/users/${data.github}`)
if (githubStatus !== 200) {
diff --git a/src/server/api/routers/projects/get-projects.ts b/src/server/api/routers/projects/get-projects.ts
index 29db470fd..4687a6a22 100644
--- a/src/server/api/routers/projects/get-projects.ts
+++ b/src/server/api/routers/projects/get-projects.ts
@@ -39,8 +39,18 @@ export const getProjectByName = publicRatedProcedure(Ratelimit.fixedWindow(60, "
})
export const getProjectByUser = protectedRatedProcedure(Ratelimit.fixedWindow(60, "30s"))
- .input(z.object({ user: z.string() }))
+ .input(z.object({ user: z.string(), isPublic: z.boolean().optional() }))
.query(async ({ input, ctx }) => {
+ const conditions = []
+
+ if (input.user) {
+ conditions.push(arrayContains(Project.members, [input.user]))
+ }
+
+ if (typeof input.isPublic === "boolean") {
+ conditions.push(eq(Project.is_public, input.isPublic))
+ }
+
const projectData = await ctx.db.query.Project.findMany({
columns: {
logo_path: true,
@@ -60,7 +70,7 @@ export const getProjectByUser = protectedRatedProcedure(Ratelimit.fixedWindow(60
application_url: true,
is_public: true,
},
- where: input.user ? arrayContains(Project.members, [input.user]) : undefined,
+ where: conditions.length > 0 ? and(...conditions) : undefined,
})
return projectData
diff --git a/src/server/api/routers/users/update-email.ts b/src/server/api/routers/users/update-email.ts
index 4d4154fe6..18a7c84ef 100644
--- a/src/server/api/routers/users/update-email.ts
+++ b/src/server/api/routers/users/update-email.ts
@@ -1,11 +1,12 @@
import { clerkClient } from "@clerk/nextjs/server"
import { TRPCError } from "@trpc/server"
import { Ratelimit } from "@upstash/ratelimit"
-import { eq } from "drizzle-orm"
+import { eq, sql } from "drizzle-orm"
+import type { InferSelectModel } from "drizzle-orm"
import { z } from "zod"
import { protectedRatedProcedure } from "~/server/api/trpc"
-import { User } from "~/server/db/schema"
+import { Project, User } from "~/server/db/schema"
export const updateEmail = protectedRatedProcedure(Ratelimit.fixedWindow(4, "30s"))
.input(z.object({ userId: z.string(), oldEmail: z.string().email(), newEmail: z.string().email() }))
@@ -42,39 +43,46 @@ export const updateEmail = protectedRatedProcedure(Ratelimit.fixedWindow(4, "30s
message: `Clerk user with id: ${input.userId} does not have a primary email address???`,
})
- const updateClerkUserEmail = async (oldEmailAddressId: string, newEmailAddress: string) => {
- const clerk = await clerkClient()
- const nonPrimaryEmail = clerkUser.emailAddresses.find((e) => e.emailAddress == input.newEmail.toLowerCase())
- const externalAccount = clerkUser.externalAccounts.find(
- (account) => account.emailAddress === input.oldEmail.toLowerCase(),
- )
- // if (externalAccount) {
- // // TODO: correct this!!
- // const mess = await clerk.users.deleteUserExternalAccount({
- // userId: user.clerk_id,
- // externalAccountId: externalAccount.id,
- // })
- // if (!mess.deleted) throw new TRPCError({ code: "BAD_REQUEST", message: "Delete external account failed" })
- // }
- if (nonPrimaryEmail) {
- await clerk.users.updateUser(user.clerk_id, {
- primaryEmailAddressID: nonPrimaryEmail.id,
- })
- await clerk.emailAddresses.deleteEmailAddress(oldEmailAddressId)
- }
- }
// Clerk will always return the lowercased email from its API
if (clerkUser.primaryEmailAddress?.emailAddress !== input.oldEmail.toLowerCase())
throw new TRPCError({ code: "BAD_REQUEST", message: "Old email does not match" })
+
+ // use for sso accounts
+ // const externalAccount = clerkUser.externalAccounts.find(
+ // (account) => account.emailAddress === input.oldEmail.toLowerCase(),
+ // )
+
try {
- await updateClerkUserEmail(clerkUser.primaryEmailAddressId, input.newEmail)
+ await updateClerkUserEmail(user, clerkUser.primaryEmailAddressId)
} catch (err) {
throw new TRPCError({
code: "INTERNAL_SERVER_ERROR",
message: err instanceof Error ? err.message : "Failed to update email",
})
}
+
await ctx.db.update(User).set({ email: input.newEmail }).where(eq(User.id, input.userId))
+ await ctx.db
+ .update(Project)
+ .set({
+ members: sql`array_replace(${Project.members}, ${input.oldEmail}, ${input.newEmail})`,
+ })
+ .where(sql`${input.oldEmail} = ANY(${Project.members})`)
return user
})
+
+const updateClerkUserEmail = async (user: InferSelectModel, oldEmailAddressId: string) => {
+ const clerk = await clerkClient()
+
+ // if (externalAccount) {
+ // // TODO: correct this!! Use for sso
+ // const mess = await clerk.users.deleteUserExternalAccount({
+ // userId: user.clerk_id,
+ // externalAccountId: externalAccount.id,
+ // })
+ // if (!mess.deleted) throw new TRPCError({ code: "BAD_REQUEST", message: "Delete external account failed" })
+ // }
+
+ await clerk.emailAddresses.deleteEmailAddress(oldEmailAddressId)
+}
From e3e5dd52cc501e15b397fb07977815247e427e4c Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Thu, 18 Sep 2025 13:19:14 +0800
Subject: [PATCH 09/12] fix error and layout
---
src/app/profile/[id]/profile.tsx | 2 +-
src/app/profile/settings/@email/form.tsx | 17 +++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/app/profile/[id]/profile.tsx b/src/app/profile/[id]/profile.tsx
index 36cf407a6..c41d5856f 100644
--- a/src/app/profile/[id]/profile.tsx
+++ b/src/app/profile/[id]/profile.tsx
@@ -41,7 +41,7 @@ const ProfilePage = ({ id, currentUser }: ProfilePageProps) => {
./profile
-
+
{user.role &&
{user.role} }
{user.preferred_name}
diff --git a/src/app/profile/settings/@email/form.tsx b/src/app/profile/settings/@email/form.tsx
index 24f2ae4f8..5dbfdbaf4 100644
--- a/src/app/profile/settings/@email/form.tsx
+++ b/src/app/profile/settings/@email/form.tsx
@@ -61,15 +61,16 @@ const EmailForm = (props: { user_id: string; email?: Partial
}) => {
}, [countdown])
useEffect(() => {
- if (step === "enterCode" && emailObj && send) {
- emailObj.prepareVerification({ strategy: "email_code" })
- setSend(false)
- setCountdown(60)
- window.scrollTo({
- top: 0,
- behavior: "smooth",
- })
+ const run = async () => {
+ if (step === "enterCode" && emailObj && send) {
+ await emailObj.prepareVerification({ strategy: "email_code" })
+ setSend(false)
+ setCountdown(60)
+ window.scrollTo({ top: 0, behavior: "smooth" })
+ }
}
+
+ run()
}, [emailObj, step, send])
const updateEmail = api.users.updateEmail.useMutation({
From edc9bf7b5736d1252dc9d4aac0f5bd34da588dff Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Thu, 18 Sep 2025 14:03:56 +0800
Subject: [PATCH 10/12] add error handling
---
src/app/profile/settings/@email/form.tsx | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/app/profile/settings/@email/form.tsx b/src/app/profile/settings/@email/form.tsx
index 5dbfdbaf4..0f63628f5 100644
--- a/src/app/profile/settings/@email/form.tsx
+++ b/src/app/profile/settings/@email/form.tsx
@@ -63,7 +63,16 @@ const EmailForm = (props: { user_id: string; email?: Partial }) => {
useEffect(() => {
const run = async () => {
if (step === "enterCode" && emailObj && send) {
- await emailObj.prepareVerification({ strategy: "email_code" })
+ await emailObj.prepareVerification({ strategy: "email_code" }).catch((e) => {
+ console.error(e)
+ toast({
+ variant: "destructive",
+ title: "Error sending OTP",
+ description: `${(e as { message?: string })?.message ?? ""}`,
+ })
+ setSend(false)
+ return
+ })
setSend(false)
setCountdown(60)
window.scrollTo({ top: 0, behavior: "smooth" })
From 167d4942f960694eff27395ea98727bfa4109fe7 Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Thu, 18 Sep 2025 14:15:25 +0800
Subject: [PATCH 11/12] edit error handling
---
src/app/profile/settings/@email/form.tsx | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/app/profile/settings/@email/form.tsx b/src/app/profile/settings/@email/form.tsx
index 0f63628f5..b38958797 100644
--- a/src/app/profile/settings/@email/form.tsx
+++ b/src/app/profile/settings/@email/form.tsx
@@ -63,23 +63,26 @@ const EmailForm = (props: { user_id: string; email?: Partial }) => {
useEffect(() => {
const run = async () => {
if (step === "enterCode" && emailObj && send) {
- await emailObj.prepareVerification({ strategy: "email_code" }).catch((e) => {
+ try {
+ await emailObj.prepareVerification({ strategy: "email_code" })
+ } catch (e) {
console.error(e)
toast({
variant: "destructive",
title: "Error sending OTP",
- description: `${(e as { message?: string })?.message ?? ""}`,
+ description: e instanceof Error ? e.message : "Unknown error",
})
setSend(false)
return
- })
+ }
+
setSend(false)
setCountdown(60)
window.scrollTo({ top: 0, behavior: "smooth" })
}
}
- run()
+ void run()
}, [emailObj, step, send])
const updateEmail = api.users.updateEmail.useMutation({
@@ -133,6 +136,7 @@ const EmailForm = (props: { user_id: string; email?: Partial }) => {
})
}
}
+
const onSubmit = async (data: FormSchema) => {
setStep("verifying")
try {
From 5686b4e6e2658df6d163e0ea816215ef01651007 Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Fri, 19 Sep 2025 09:59:04 +0800
Subject: [PATCH 12/12] delete some unused code and comments. edit a bit
---
src/app/profile/settings/@email/form.tsx | 1 -
src/app/profile/settings/@email/page.tsx | 7 +++--
src/app/profile/settings/@personal/form.tsx | 31 ++++++++-------------
src/server/api/routers/users/update.ts | 12 +-------
4 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/src/app/profile/settings/@email/form.tsx b/src/app/profile/settings/@email/form.tsx
index b38958797..be9fa6599 100644
--- a/src/app/profile/settings/@email/form.tsx
+++ b/src/app/profile/settings/@email/form.tsx
@@ -3,7 +3,6 @@
import { useReverification, useUser } from "@clerk/nextjs"
import { EmailAddressResource } from "@clerk/types"
import { zodResolver } from "@hookform/resolvers/zod"
-import { se } from "date-fns/locale"
import { useEffect, useState } from "react"
import { FormProvider, useForm } from "react-hook-form"
import { z } from "zod"
diff --git a/src/app/profile/settings/@email/page.tsx b/src/app/profile/settings/@email/page.tsx
index 4b570919f..d2d77d1fd 100644
--- a/src/app/profile/settings/@email/page.tsx
+++ b/src/app/profile/settings/@email/page.tsx
@@ -15,9 +15,10 @@ export default async function Socials() {
Change your email
-
- You may change your email address associated with your account here. An email will be sent to your new email
- address.
+
+ You may change your email address associated with your account here. An email that contains verification code
+ will be sent to your new email address. It can take up to 10 minutes. Make sure to check your spam folder if
+ you can't find it. Resend the code if you need.
diff --git a/src/app/profile/settings/@personal/form.tsx b/src/app/profile/settings/@personal/form.tsx
index 430cd10d0..128d2f12a 100644
--- a/src/app/profile/settings/@personal/form.tsx
+++ b/src/app/profile/settings/@personal/form.tsx
@@ -65,12 +65,17 @@ const PersonalForm = (props: { defaultValues?: Partial
}) => {
const updateUser = api.users.update.useMutation({
onSuccess: async () => {
await utils.users.getCurrent.refetch()
+ toast({
+ title: "Update successful",
+ description: "Your personal details have been updated successfully.",
+ })
},
+
onError: () => {
toast({
variant: "destructive",
title: "Failed to update user details",
- description: "An error occurred while trying to update your personal details. Please try again later.",
+ description: "An error occurred while trying to update your personal details. Please try again.",
})
},
})
@@ -84,7 +89,6 @@ const PersonalForm = (props: { defaultValues?: Partial }) => {
const onSubmit = async (data: FormSchema) => {
if (data.github && data.github !== "") {
const { status: githubStatus } = await fetch(`https://api.github.com/users/${data.github}`)
-
if (githubStatus !== 200) {
toast({
variant: "destructive",
@@ -98,23 +102,12 @@ const PersonalForm = (props: { defaultValues?: Partial }) => {
return
}
}
- try {
- updateUser.mutate({
- ...data,
- student_number: !data.isUWA ? null : data.student_number,
- uni: data.isUWA ? "UWA" : data.uni,
- })
- toast({
- title: "Update successful",
- description: "Your personal details have been updated successfully.",
- })
- } catch (err) {
- toast({
- variant: "destructive",
- title: "Failed to update user details",
- description: "An error occurred while trying to update your personal details. Please try again later.",
- })
- }
+
+ updateUser.mutate({
+ ...data,
+ student_number: !data.isUWA ? null : data.student_number,
+ uni: data.isUWA ? "UWA" : data.uni,
+ })
}
return (
diff --git a/src/server/api/routers/users/update.ts b/src/server/api/routers/users/update.ts
index 9060504f6..a6308a636 100644
--- a/src/server/api/routers/users/update.ts
+++ b/src/server/api/routers/users/update.ts
@@ -21,15 +21,6 @@ export const update = protectedRatedProcedure(Ratelimit.fixedWindow(4, "30s"))
message: "Preferred name is required",
})
.optional(),
- // email: z
- // .string()
- // .email({
- // message: "Invalid email address",
- // })
- // .min(2, {
- // message: "Email is required",
- // })
- // .optional(),
pronouns: z
.string()
.min(2, {
@@ -65,7 +56,7 @@ export const update = protectedRatedProcedure(Ratelimit.fixedWindow(4, "30s"))
} catch (err: unknown) {
// Narrow the error type
if (err instanceof Error) {
- throw new Error(`Failed to update user metadata: ${err?.message}`)
+ throw new Error(`Failed to update user metadata: ${err.message}`)
} else {
throw new Error("Failed to update user metadata: unknown error")
}
@@ -76,7 +67,6 @@ export const update = protectedRatedProcedure(Ratelimit.fixedWindow(4, "30s"))
.set({
name: input.name?.trim(),
preferred_name: input.preferred_name?.trim(),
- // email: input.email?.trim(),
pronouns: input.pronouns?.trim(),
student_number: input.student_number?.trim() ?? null,
university: input.uni?.trim() ?? null,