Skip to content

Commit 30d1ac6

Browse files
iamhectorsosaiamhectorsosa
committed
chore: brushing up repo
1 parent 4195d64 commit 30d1ac6

23 files changed

+422
-160
lines changed

‎apps/next/app/login/new/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { redirect } from "next/navigation"
22

3-
import { RegisterForm } from "@/components/user/register-form"
3+
import { RegisterForm } from "@/components/user/login/new/register-form"
44

55
import { createClient } from "@/modules/utils/server"
66

‎apps/next/app/login/new/passwordless/page.tsx

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { redirect } from "next/navigation"
2+
3+
import { RegisterFormPasswordless } from "@/components/user/login/new/register-form-passwordless"
4+
5+
import { createClient } from "@/modules/utils/server"
6+
7+
export default async function Page() {
8+
const supabase = createClient()
9+
10+
const {
11+
data: { user },
12+
} = await supabase.auth.getUser()
13+
14+
if (user) {
15+
user.is_anonymous ? redirect("/guest") : redirect("/settings/accounts")
16+
}
17+
18+
return <RegisterFormPasswordless />
19+
}

‎apps/next/app/login/otp/confirm/page.tsx

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { redirect } from "next/navigation"
2+
import { z } from "zod"
3+
4+
import { OtpLoginConfirmForm } from "@/components/user/login/otp/otp-login-confirm-form"
5+
6+
import { createClient } from "@/modules/utils/server"
7+
8+
const emailSchema = z.object({
9+
email: z.string().email(),
10+
})
11+
12+
export default async function Page({
13+
searchParams,
14+
}: {
15+
searchParams: { email?: string }
16+
}) {
17+
const supabase = createClient()
18+
19+
const {
20+
data: { user },
21+
} = await supabase.auth.getUser()
22+
23+
if (user) {
24+
redirect("/settings/accounts")
25+
}
26+
27+
if (!searchParams.email) {
28+
redirect("/login")
29+
}
30+
31+
const res = emailSchema.safeParse({ email: searchParams.email })
32+
33+
if (!res.success) {
34+
redirect("/login")
35+
}
36+
37+
return <OtpLoginConfirmForm email={searchParams.email} />
38+
}

‎apps/next/app/login/otp/page.tsx

+3-22
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
import { redirect } from "next/navigation"
2-
import { z } from "zod"
32

4-
import { OtpLoginForm } from "@/components/user/otp-login-form"
3+
import { OtpLoginForm } from "@/components/user/login/otp/otp-login-form"
54

65
import { createClient } from "@/modules/utils/server"
76

8-
const emailSchema = z.object({
9-
email: z.string().email(),
10-
})
11-
12-
export default async function Page({
13-
searchParams,
14-
}: {
15-
searchParams: { email?: string }
16-
}) {
7+
export default async function Page() {
178
const supabase = createClient()
189

1910
const {
@@ -24,15 +15,5 @@ export default async function Page({
2415
redirect("/settings/accounts")
2516
}
2617

27-
if (!searchParams.email) {
28-
redirect("/login")
29-
}
30-
31-
const res = emailSchema.safeParse({ email: searchParams.email })
32-
33-
if (!res.success) {
34-
redirect("/login")
35-
}
36-
37-
return <OtpLoginForm email={searchParams.email} />
18+
return <OtpLoginForm />
3819
}

‎apps/next/app/login/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { redirect } from "next/navigation"
22
import { z } from "zod"
33

4-
import { LoginForm } from "@/components/user/login-form"
4+
import { LoginForm } from "@/components/user/login/login-form"
55

66
import { createClient } from "@/modules/utils/server"
77
import { isAnonymousUser } from "@/modules/user/helpers"

‎apps/next/app/login/reset-password/new/page.tsx ‎apps/next/app/login/reset/new/page.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { redirect } from "next/navigation"
22

3-
import { NewResetPasswordForm } from "@/components/user/new-reset-password-form"
3+
import { ResetPasswordConfirmForm } from "@/components/user/login/reset/reset-password-confirm-form"
44

55
import { createClient } from "@/modules/utils/server"
66

@@ -15,5 +15,5 @@ export default async function Page() {
1515
redirect("/login")
1616
}
1717

18-
return <NewResetPasswordForm />
18+
return <ResetPasswordConfirmForm />
1919
}

‎apps/next/app/login/reset-password/page.tsx ‎apps/next/app/login/reset/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { redirect } from "next/navigation"
22

3-
import { ResetPasswordForm } from "@/components/user/reset-password-form"
3+
import { ResetPasswordForm } from "@/components/user/login/reset/reset-password-form"
44

55
import { createClient } from "@/modules/utils/server"
66

‎apps/next/components/bookmarks/bookmarks-list.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const BookmarksList: React.FC<{ userId: string }> = ({ userId }) => {
3131
return (
3232
<div className="flex h-full flex-col items-center justify-center">
3333
<div className="animate-pulse">
34-
<CircleIcon className="size-8 animate-spin" />
34+
<CircleIcon className="size-8 animate-spin inline" />
3535
</div>
3636
</div>
3737
)
@@ -131,7 +131,7 @@ const BookmarkDelete: React.FC<{ bookmarkId: string; userId: string }> = ({
131131
size={"sm"}
132132
className="-ml-3 block"
133133
>
134-
{isPending && <Loader2 className="mr-1.5 size-4 animate-spin" />}
134+
{isPending && <Loader2 className="mr-1.5 size-4 animate-spin inline" />}
135135
Delete
136136
</Button>
137137
)

‎apps/next/components/bookmarks/create-bookmark.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const CreateBookmarkComponent: React.FC<{
8888
)}
8989
/>
9090
<Button type="submit" disabled={isPending}>
91-
{isPending && <CircleIcon className="mr-2 size-4 animate-spin" />}
91+
{isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
9292
Save
9393
</Button>
9494
</form>

‎apps/next/components/user/accounts.tsx

+6-22
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ export const Accounts: React.FC<{ userId: string }> = ({ userId }) => {
3939
queryFn: () => getProfile({ id: userId }),
4040
})
4141

42+
const logout = useMutation({
43+
mutationFn: signOut,
44+
})
45+
4246
if (profile.isLoading) {
4347
return (
4448
<div className="flex h-full flex-col items-center justify-center">
@@ -76,31 +80,11 @@ export const Accounts: React.FC<{ userId: string }> = ({ userId }) => {
7680
}
7781

7882
return (
79-
<AccountsContainer
83+
<AccountsComponent
8084
username={profile.data.username}
8185
email={profile.data.email}
8286
preferredName={profile.data.preferred_name}
8387
preferredHue={profile.data.preferred_hue}
84-
/>
85-
)
86-
}
87-
88-
export const AccountsContainer: React.FC<{
89-
username: string
90-
email: string
91-
preferredName: string | null
92-
preferredHue: string
93-
}> = ({ username, email, preferredName, preferredHue }) => {
94-
const logout = useMutation({
95-
mutationFn: signOut,
96-
})
97-
98-
return (
99-
<AccountsComponent
100-
username={username}
101-
email={email}
102-
preferredName={preferredName}
103-
preferredHue={preferredHue}
10488
signOut={() =>
10589
logout.mutate({
10690
redirect: {
@@ -161,7 +145,7 @@ const AccountsComponent: React.FC<{
161145
variant="secondary"
162146
className="hidden px-3 shadow-none sm:block"
163147
>
164-
{isPending && <CircleIcon className="mr-2 size-4 animate-spin" />}
148+
{isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
165149
Sign out
166150
</Button>
167151
<Separator

‎apps/next/components/user/credentials-form.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ const CredentialsFormComponent: React.FC<{
196196
</Alert>
197197
)}
198198
<Button type="submit" disabled={isPending}>
199-
{isPending && <CircleIcon className="mr-2 size-4 animate-spin" />}
199+
{isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
200200
Update Settings
201201
</Button>
202202
</form>

‎apps/next/components/user/guest-form.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const GuestFormNotRegistered: React.FC<{
126126
</Alert>
127127
)}
128128
<Button type="submit" disabled={isPending}>
129-
{isPending && <CircleIcon className="mr-2 size-4 animate-spin" />}
129+
{isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
130130
Create account
131131
</Button>
132132
</form>
@@ -197,7 +197,7 @@ const GuestFormNoPassword: React.FC<{
197197
</Alert>
198198
)}
199199
<Button type="submit" disabled={isPending}>
200-
{isPending && <CircleIcon className="mr-2 size-4 animate-spin" />}
200+
{isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
201201
Set password
202202
</Button>
203203
</form>

0 commit comments

Comments
 (0)