Skip to content

Commit 6d5d343

Browse files
committed
Merge branch 'Tsurgcom-skeletons-2' into staging
2 parents 388f437 + b4693c3 commit 6d5d343

File tree

10 files changed

+269
-198
lines changed

10 files changed

+269
-198
lines changed
Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
1+
import { SigninFormSkeleton } from "@/components/auth/skeletons/signin-form";
12
import { SignInForm } from "@/components/auth/signin-form";
2-
import { Loader2 } from "lucide-react";
33
import { Suspense } from "react";
44

5-
function SignInContent() {
5+
export default function SigninPage() {
66
return (
77
<div className="flex min-h-svh w-full justify-center sm:items-center">
88
<div className="size-full max-w-md px-2 py-10 sm:max-w-sm">
9-
<SignInForm />
9+
<Suspense fallback={<SigninFormSkeleton />}>
10+
<SignInForm />
11+
</Suspense>
1012
</div>
1113
</div>
1214
);
1315
}
14-
15-
export default function SignInPage() {
16-
return (
17-
<Suspense
18-
fallback={
19-
<div className="flex min-h-svh w-full items-center justify-center">
20-
<Loader2 className="h-8 w-8 animate-spin" />
21-
</div>
22-
}
23-
>
24-
<SignInContent />
25-
</Suspense>
26-
);
27-
}

apps/web/src/app/(public)/(auth)/signup/page.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
import { SignupFormSkeleton } from "@/components/auth/skeletons/signup-form";
12
import { SignupForm } from "@/components/auth/signup-form";
23
import { Suspense } from "react";
34

45
export default function SignupPage() {
56
return (
67
<div className="flex min-h-svh w-full justify-center sm:items-center">
78
<div className="size-full max-w-md px-2 py-10 sm:max-w-sm">
8-
<Suspense fallback={<div>Loading...</div>}>
9+
<Suspense fallback={<SignupFormSkeleton />}>
910
<SignupForm />
1011
</Suspense>
1112
</div>

apps/web/src/components/auth/shared/auth-card.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export function AuthCard({ title, description, navigationType, children, classNa
3535
</div>
3636
</CardHeader>
3737

38-
<CardContent className="px-6">{children}</CardContent>
38+
<CardContent className="px-5">{children}</CardContent>
3939

4040
<CardFooter className="px-6 py-4">
4141
<p className="w-full text-center text-sm text-neutral-600">

apps/web/src/components/auth/shared/social-auth-button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function SocialAuthButton({
3232
<Button
3333
variant="outline"
3434
type="button"
35-
className="w-full cursor-pointer justify-between shadow-lg shadow-blue-600/10 transition-all duration-300 hover:shadow-blue-600/20"
35+
className="w-full cursor-pointer justify-between truncate shadow-md shadow-blue-600/20 transition-all duration-300 hover:shadow-sm hover:shadow-blue-600/20 dark:shadow-lg"
3636
{...props}
3737
>
3838
<IconComponent />

apps/web/src/components/auth/signin-form.tsx

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,27 +62,27 @@ export function SignInForm({ className, ...props }: ComponentProps<"div">) {
6262
disabled={isLoading}
6363
/>
6464

65-
<div className="text-muted-foreground text-center text-sm">OR</div>
65+
<div className="text-muted-foreground text-center font-mono text-sm font-semibold tracking-wider">OR</div>
6666

6767
<form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-4">
68-
<div className="space-y-2">
69-
<Label htmlFor="email" className="text-muted-foreground text-sm font-semibold">
68+
<div className="space-y-1">
69+
<Label htmlFor="email" className="dark:text-muted-foreground text-sm font-semibold">
7070
Email
7171
</Label>
7272
<Input
7373
id="email"
7474
type="email"
7575
placeholder="[email protected]"
76-
className="shadow-md"
76+
className=""
7777
{...register("email")}
7878
aria-invalid={!!errors.email}
7979
autoComplete="email"
8080
/>
8181
<FieldError error={errors.email?.message} />
8282
</div>
8383

84-
<div className="space-y-2">
85-
<Label htmlFor="password" className="text-muted-foreground text-sm font-semibold">
84+
<div className="space-y-1">
85+
<Label htmlFor="password" className="dark:text-muted-foreground text-sm font-semibold">
8686
Password
8787
</Label>
8888
<PasswordInput
@@ -96,14 +96,18 @@ export function SignInForm({ className, ...props }: ComponentProps<"div">) {
9696
<FieldError error={errors.password?.message} />
9797
</div>
9898

99-
<div className="flex items-center justify-between">
100-
<div className="flex items-center space-x-2">
99+
<div className="mt-1 flex items-center justify-between">
100+
<div className="flex flex-1 items-center space-x-2">
101101
<Checkbox
102102
id="remember"
103103
{...register("remember")}
104104
onCheckedChange={checked => setValue("remember", !!checked)}
105+
defaultChecked={true}
105106
/>
106-
<Label htmlFor="remember" className="text-muted-foreground cursor-pointer text-sm">
107+
<Label
108+
htmlFor="remember"
109+
className="text-muted-foreground line-clamp-1 cursor-pointer overflow-hidden text-sm"
110+
>
107111
Remember me
108112
</Label>
109113
</div>

0 commit comments

Comments
 (0)