summaryrefslogtreecommitdiff
path: root/apps/web/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'apps/web/src/app')
-rw-r--r--apps/web/src/app/auth/login/page.tsx134
-rw-r--r--apps/web/src/app/auth/signup/page.tsx163
2 files changed, 217 insertions, 80 deletions
diff --git a/apps/web/src/app/auth/login/page.tsx b/apps/web/src/app/auth/login/page.tsx
index 5eadb85c..ebf2eb3f 100644
--- a/apps/web/src/app/auth/login/page.tsx
+++ b/apps/web/src/app/auth/login/page.tsx
@@ -1,7 +1,7 @@
"use client";
-import { useSearchParams, useRouter } from "next/navigation";
-import { authClient } from "@/lib/auth-client";
+import { useRouter } from "next/navigation";
+import { signIn } from "@/lib/auth-client";
import { Button } from "@/components/ui/button";
import {
Card,
@@ -13,81 +13,145 @@ import {
import { Suspense, useState } from "react";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
+import { Separator } from "@/components/ui/separator";
import Link from "next/link";
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { ArrowLeft, Loader2 } from "lucide-react";
+import { GoogleIcon } from "@/components/icons";
function LoginForm() {
- const searchParams = useSearchParams();
const router = useRouter();
- const redirectUrl = searchParams.get("redirect");
const [email, setEmail] = useState("");
const [password, setPassword] = useState("");
const [error, setError] = useState<string | null>(null);
+ const [isEmailLoading, setIsEmailLoading] = useState(false);
+ const [isGoogleLoading, setIsGoogleLoading] = useState(false);
const handleLogin = async () => {
setError(null);
- const { error } = await authClient.signIn.email({
+ setIsEmailLoading(true);
+
+ const { error } = await signIn.email({
email,
password,
});
if (error) {
setError(error.message || "An unexpected error occurred.");
+ setIsEmailLoading(false);
return;
}
- router.push(redirectUrl || "/");
+ router.push("/editor");
+ };
+
+ const handleGoogleLogin = async () => {
+ setError(null);
+ setIsGoogleLoading(true);
+
+ try {
+ await signIn.social({
+ provider: "google",
+ });
+ router.push("/editor");
+ } catch (error) {
+ setError("Failed to sign in with Google. Please try again.");
+ setIsGoogleLoading(false);
+ }
};
+ const isAnyLoading = isEmailLoading || isGoogleLoading;
+
return (
- <div className="flex flex-col space-y-4">
+ <div className="flex flex-col space-y-6">
{error && (
<Alert variant="destructive">
<AlertTitle>Error</AlertTitle>
<AlertDescription>{error}</AlertDescription>
</Alert>
)}
- <div className="space-y-2">
- <Label htmlFor="email">Email</Label>
- <Input
- id="email"
- type="email"
- placeholder="m@example.com"
- value={email}
- onChange={(e) => setEmail(e.target.value)}
- />
+
+ <Button
+ onClick={handleGoogleLogin}
+ variant="outline"
+ size="lg"
+ disabled={isAnyLoading}
+ >
+ {isGoogleLoading ? <Loader2 className="animate-spin" /> : (<GoogleIcon />)} Continue with Google
+ </Button>
+ <div className="relative">
+ <div className="absolute inset-0 flex items-center">
+ <Separator className="w-full" />
+ </div>
+ <div className="relative flex justify-center text-xs uppercase">
+ <span className="bg-background px-2 text-muted-foreground">Or continue with</span>
+ </div>
</div>
- <div className="space-y-2">
- <Label htmlFor="password">Password</Label>
- <Input
- id="password"
- type="password"
- value={password}
- onChange={(e) => setPassword(e.target.value)}
- />
+ <div className="space-y-4">
+ <div className="space-y-2">
+ <Label htmlFor="email">Email</Label>
+ <Input
+ id="email"
+ type="email"
+ placeholder="m@example.com"
+ value={email}
+ onChange={(e) => setEmail(e.target.value)}
+ disabled={isAnyLoading}
+ className="h-11"
+ />
+ </div>
+ <div className="space-y-2">
+ <Label htmlFor="password">Password</Label>
+ <Input
+ id="password"
+ type="password"
+ value={password}
+ onChange={(e) => setPassword(e.target.value)}
+ disabled={isAnyLoading}
+ className="h-11"
+ />
+ </div>
+ <Button
+ onClick={handleLogin}
+ disabled={isAnyLoading || !email || !password}
+ className="w-full h-11"
+ size="lg"
+ >
+ {isEmailLoading ? <Loader2 className="animate-spin" /> : "Sign in"}
+ </Button>
</div>
- <Button onClick={handleLogin}>Login</Button>
</div>
);
}
export default function LoginPage() {
+ const router = useRouter();
+
return (
- <div className="flex h-screen items-center justify-center">
- <Card className="w-[350px]">
- <CardHeader>
- <CardTitle>Login</CardTitle>
- <CardDescription>
- Enter your email and password to login.
+ <div className="flex h-screen items-center justify-center relative">
+ <Button
+ variant="ghost"
+ onClick={() => router.back()}
+ className="absolute top-6 left-6"
+ >
+ <ArrowLeft className="h-5 w-5" /> Back
+ </Button>
+ <Card className="w-[400px] shadow-lg border-0">
+ <CardHeader className="text-center pb-4">
+ <CardTitle className="text-2xl font-semibold">Welcome back</CardTitle>
+ <CardDescription className="text-base">
+ Sign in to your account to continue
</CardDescription>
</CardHeader>
- <CardContent>
- <Suspense fallback={<div>Loading...</div>}>
+ <CardContent className="pt-0">
+ <Suspense fallback={<div className="text-center">
+ <Loader2 className="animate-spin" />
+ </div>}>
<LoginForm />
</Suspense>
- <div className="mt-4 text-center text-sm">
+ <div className="mt-6 text-center text-sm">
Don't have an account?{" "}
- <Link href="/auth/signup" className="underline">
+ <Link href="/auth/signup" className="font-medium text-primary underline-offset-4 hover:underline">
Sign up
</Link>
</div>
diff --git a/apps/web/src/app/auth/signup/page.tsx b/apps/web/src/app/auth/signup/page.tsx
index f328851c..3d125a07 100644
--- a/apps/web/src/app/auth/signup/page.tsx
+++ b/apps/web/src/app/auth/signup/page.tsx
@@ -1,7 +1,7 @@
"use client";
-import { useSearchParams, useRouter } from "next/navigation";
-import { authClient } from "@/lib/auth-client";
+import { useRouter } from "next/navigation";
+import { signUp, signIn } from "@/lib/auth-client";
import { Button } from "@/components/ui/button";
import {
Card,
@@ -13,21 +13,26 @@ import {
import { Suspense, useState } from "react";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
+import { Separator } from "@/components/ui/separator";
import Link from "next/link";
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Loader2, ArrowLeft } from "lucide-react";
+import { GoogleIcon } from "@/components/icons";
function SignUpForm() {
- const searchParams = useSearchParams();
const router = useRouter();
- const redirectUrl = searchParams.get("redirect");
const [name, setName] = useState("");
const [email, setEmail] = useState("");
const [password, setPassword] = useState("");
const [error, setError] = useState<string | null>(null);
+ const [isEmailLoading, setIsEmailLoading] = useState(false);
+ const [isGoogleLoading, setIsGoogleLoading] = useState(false);
const handleSignUp = async () => {
setError(null);
- const { error } = await authClient.signUp.email({
+ setIsEmailLoading(true);
+
+ const { error } = await signUp.email({
name,
email,
password,
@@ -35,70 +40,138 @@ function SignUpForm() {
if (error) {
setError(error.message || "An unexpected error occurred.");
+ setIsEmailLoading(false);
return;
}
- router.push(redirectUrl || "/");
+ router.push("/auth/login");
+ };
+
+ const handleGoogleSignUp = async () => {
+ setError(null);
+ setIsGoogleLoading(true);
+
+ try {
+ await signIn.social({
+ provider: "google",
+ });
+
+ router.push("/editor");
+ } catch (error) {
+ setError("Failed to sign up with Google. Please try again.");
+ setIsGoogleLoading(false);
+ }
};
+ const isAnyLoading = isEmailLoading || isGoogleLoading;
+
return (
- <div className="flex flex-col space-y-4">
+ <div className="flex flex-col space-y-6">
{error && (
<Alert variant="destructive">
<AlertTitle>Error</AlertTitle>
<AlertDescription>{error}</AlertDescription>
</Alert>
)}
- <div className="space-y-2">
- <Label htmlFor="name">Name</Label>
- <Input
- id="name"
- type="text"
- placeholder="John Doe"
- value={name}
- onChange={(e) => setName(e.target.value)}
- />
- </div>
- <div className="space-y-2">
- <Label htmlFor="email">Email</Label>
- <Input
- id="email"
- type="email"
- placeholder="m@example.com"
- value={email}
- onChange={(e) => setEmail(e.target.value)}
- />
+
+ <Button
+ onClick={handleGoogleSignUp}
+ variant="outline"
+ size="lg"
+ disabled={isAnyLoading}
+ >
+ {isGoogleLoading ? <Loader2 className="animate-spin" /> : (<GoogleIcon />)} Continue with Google
+ </Button>
+
+ <div className="relative">
+ <div className="absolute inset-0 flex items-center">
+ <Separator className="w-full" />
+ </div>
+ <div className="relative flex justify-center text-xs uppercase">
+ <span className="bg-background px-2 text-muted-foreground">Or continue with</span>
+ </div>
</div>
- <div className="space-y-2">
- <Label htmlFor="password">Password</Label>
- <Input
- id="password"
- type="password"
- value={password}
- onChange={(e) => setPassword(e.target.value)}
- />
+
+ <div className="space-y-4">
+ <div className="space-y-2">
+ <Label htmlFor="name">Full Name</Label>
+ <Input
+ id="name"
+ type="text"
+ placeholder="John Doe"
+ value={name}
+ onChange={(e) => setName(e.target.value)}
+ disabled={isAnyLoading}
+ className="h-11"
+ />
+ </div>
+ <div className="space-y-2">
+ <Label htmlFor="email">Email</Label>
+ <Input
+ id="email"
+ type="email"
+ placeholder="m@example.com"
+ value={email}
+ onChange={(e) => setEmail(e.target.value)}
+ disabled={isAnyLoading}
+ className="h-11"
+ />
+ </div>
+ <div className="space-y-2">
+ <Label htmlFor="password">Password</Label>
+ <Input
+ id="password"
+ type="password"
+ placeholder="Create a strong password"
+ value={password}
+ onChange={(e) => setPassword(e.target.value)}
+ disabled={isAnyLoading}
+ className="h-11"
+ />
+ </div>
+ <Button
+ onClick={handleSignUp}
+ disabled={isAnyLoading || !name || !email || !password}
+ className="w-full h-11"
+ size="lg"
+ >
+ {isEmailLoading ? <Loader2 className="animate-spin" /> : "Create account"}
+ </Button>
</div>
- <Button onClick={handleSignUp}>Sign Up</Button>
</div>
);
}
export default function SignUpPage() {
+ const router = useRouter();
+
return (
- <div className="flex h-screen items-center justify-center">
- <Card className="w-[350px]">
- <CardHeader>
- <CardTitle>Sign Up</CardTitle>
- <CardDescription>Create an account to get started.</CardDescription>
+ <div className="flex h-screen items-center justify-center relative">
+ <Button
+ variant="ghost"
+ onClick={() => router.back()}
+ className="absolute top-6 left-6"
+ >
+ <ArrowLeft className="h-5 w-5" /> Back
+ </Button>
+
+ <Card className="w-[400px] shadow-lg border-0">
+ <CardHeader className="text-center pb-4">
+ <CardTitle className="text-2xl font-semibold">Create your account</CardTitle>
+ <CardDescription className="text-base">
+ Get started with your free account today
+ </CardDescription>
</CardHeader>
- <CardContent>
- <Suspense fallback={<div>Loading...</div>}>
+ <CardContent className="pt-0">
+ <Suspense fallback={<div className="text-center">
+ <Loader2 className="animate-spin" />
+ </div>}>
<SignUpForm />
</Suspense>
- <div className="mt-4 text-center text-sm">
+ <div className="mt-6 text-center text-sm">
Already have an account?{" "}
- <Link href="/auth/login" className="underline">
- Login
+ <Link href="/auth/login" className="font-medium text-primary underline-offset-4 hover:underline">
+ Sign in
</Link>
</div>
</CardContent>
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-17 13:56:15 +0000