Redesign auth pages and enhance analytics UI with motion
All checks were successful
Build Frontend / build (push) Successful in 1m17s
All checks were successful
Build Frontend / build (push) Successful in 1m17s
Refactored login and registration pages for a modern, consistent look with animated backgrounds and improved form feedback. Enhanced analytics dashboard and metrics cards with framer-motion animations and visual polish. Updated MotionWrapper for flexible motion props and improved transitions. Minor UI/UX improvements and code cleanup throughout auth and analytics components.
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
|
||||
"use client"
|
||||
|
||||
import { useState, useEffect, useRef } from "react";
|
||||
@@ -7,7 +8,8 @@ import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { toast } from "sonner";
|
||||
import { Loader2 } from "lucide-react";
|
||||
import { Loader2, ArrowRight } from "lucide-react";
|
||||
import { motion } from "framer-motion";
|
||||
|
||||
export default function LoginForm() {
|
||||
const [username, setUsername] = useState("");
|
||||
@@ -25,7 +27,7 @@ export default function LoginForm() {
|
||||
.split("; ")
|
||||
.find((row) => row.startsWith("Authorization="))
|
||||
?.split("=")[1];
|
||||
|
||||
|
||||
if (authToken) {
|
||||
router.push("/dashboard");
|
||||
}
|
||||
@@ -45,13 +47,12 @@ export default function LoginForm() {
|
||||
setIsLoading(true);
|
||||
|
||||
try {
|
||||
// Using fetch directly with the proxy path
|
||||
const response = await fetch("/api/auth/login", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ username, password }),
|
||||
});
|
||||
|
||||
|
||||
let data;
|
||||
try {
|
||||
data = await response.json();
|
||||
@@ -63,95 +64,106 @@ export default function LoginForm() {
|
||||
setIsLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (response.ok && data.token) {
|
||||
// Store the token in both cookie and localStorage for redundancy
|
||||
document.cookie = `Authorization=${data.token}; path=/; Secure; SameSite=Strict; max-age=10800`;
|
||||
localStorage.setItem("Authorization", data.token);
|
||||
|
||||
// Show success notification
|
||||
toast.success("Login successful");
|
||||
|
||||
// Set success state for animation
|
||||
|
||||
toast.success("Welcome back!", { duration: 2000 });
|
||||
setLoginSuccess(true);
|
||||
|
||||
// Try Next.js router navigation
|
||||
|
||||
router.push(redirectUrl);
|
||||
|
||||
// Set up a fallback manual redirect if Next.js navigation doesn't work
|
||||
redirectTimeoutRef.current = setTimeout(() => {
|
||||
window.location.href = redirectUrl;
|
||||
}, 1500); // Wait 1.5 seconds before trying manual redirect
|
||||
}, 1500);
|
||||
} else {
|
||||
// Handle HTTP error responses
|
||||
const errorMessage = data.error || data.message || data.details || "Invalid credentials";
|
||||
toast.error("Login Failed", {
|
||||
toast.error("Access Denied", {
|
||||
description: errorMessage,
|
||||
});
|
||||
console.error("Login error response:", { status: response.status, data });
|
||||
setIsLoading(false);
|
||||
}
|
||||
} catch (error) {
|
||||
toast.error("Connection Error", {
|
||||
description: "Unable to connect to the server. Please check your internet connection and try again.",
|
||||
description: "Unable to connect to server.",
|
||||
});
|
||||
console.error("Login network error:", error);
|
||||
setIsLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={`flex items-center justify-center min-h-screen bg-gray-100 dark:bg-[#0F0F12] transition-opacity duration-300 ${loginSuccess ? 'opacity-0' : 'opacity-100'}`}>
|
||||
<div className={`w-full max-w-md p-8 space-y-8 bg-white dark:bg-[#1F1F23] rounded-xl shadow-lg transition-all duration-300 ${loginSuccess ? 'scale-95 opacity-0' : 'scale-100 opacity-100'} ${isLoading && !loginSuccess ? 'animate-pulse' : ''}`}>
|
||||
<div className="text-center">
|
||||
<h2 className="mt-6 text-3xl font-bold text-gray-900 dark:text-white">Welcome back</h2>
|
||||
<p className="mt-2 text-sm text-gray-600 dark:text-gray-400">Please sign in to your account</p>
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 20 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.5 }}
|
||||
className="w-full max-w-md relative z-10"
|
||||
>
|
||||
<div className={`
|
||||
overflow-hidden rounded-2xl border border-white/10 shadow-2xl transition-all duration-300
|
||||
bg-black/40 backdrop-blur-xl
|
||||
p-8
|
||||
${loginSuccess ? 'scale-[0.98] opacity-80' : 'scale-100 opacity-100'}
|
||||
`}>
|
||||
<div className="text-center mb-8">
|
||||
<h2 className="text-2xl font-bold text-white tracking-tight">Welcome back</h2>
|
||||
<p className="mt-2 text-sm text-zinc-400">Enter your credentials to access the dashboard</p>
|
||||
</div>
|
||||
|
||||
<form className="mt-8 space-y-6" onSubmit={handleLogin}>
|
||||
<form className="space-y-6" onSubmit={handleLogin}>
|
||||
<div className="space-y-4">
|
||||
<div className="animate-in fade-in duration-500">
|
||||
<Label htmlFor="username">Username</Label>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="username" className="text-zinc-300">Username</Label>
|
||||
<Input
|
||||
id="username"
|
||||
name="username"
|
||||
type="text"
|
||||
autoComplete="username"
|
||||
required
|
||||
value={username}
|
||||
onChange={(e) => setUsername(e.target.value)}
|
||||
className="mt-1"
|
||||
className="bg-white/5 border-white/10 text-white placeholder:text-zinc-500 focus:border-indigo-500/50 focus:ring-indigo-500/20 transition-all duration-300"
|
||||
placeholder="Enter your username"
|
||||
disabled={isLoading || loginSuccess}
|
||||
/>
|
||||
</div>
|
||||
<div className="animate-in fade-in duration-500 delay-150">
|
||||
<Label htmlFor="password">Password</Label>
|
||||
<div className="space-y-2">
|
||||
<div className="flex items-center justify-between">
|
||||
<Label htmlFor="password" className="text-zinc-300">Password</Label>
|
||||
<Link href="/auth/reset-password" className="text-xs text-indigo-400 hover:text-indigo-300 transition-colors">
|
||||
Forgot password?
|
||||
</Link>
|
||||
</div>
|
||||
<Input
|
||||
id="password"
|
||||
name="password"
|
||||
type="password"
|
||||
autoComplete="current-password"
|
||||
required
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
className="mt-1"
|
||||
className="bg-white/5 border-white/10 text-white placeholder:text-zinc-500 focus:border-indigo-500/50 focus:ring-indigo-500/20 transition-all duration-300"
|
||||
placeholder="Enter your password"
|
||||
disabled={isLoading || loginSuccess}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Button
|
||||
type="submit"
|
||||
className={`w-full animate-in fade-in-50 duration-500 delay-300 ${loginSuccess ? 'bg-green-600 hover:bg-green-700' : ''}`}
|
||||
<Button
|
||||
type="submit"
|
||||
className={`
|
||||
w-full h-11 font-medium text-sm transition-all duration-300
|
||||
${loginSuccess
|
||||
? 'bg-green-500/90 hover:bg-green-500 text-white'
|
||||
: 'bg-gradient-to-r from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500 text-white shadow-lg shadow-indigo-500/25'}
|
||||
`}
|
||||
disabled={isLoading || loginSuccess}
|
||||
>
|
||||
{isLoading ? (
|
||||
<span className="flex items-center justify-center">
|
||||
<Loader2 className="h-4 w-4 mr-2 animate-spin" />
|
||||
<span className="flex items-center justify-center gap-2">
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
Signing in...
|
||||
</span>
|
||||
) : loginSuccess ? (
|
||||
<span className="flex items-center justify-center">
|
||||
<span className="flex items-center justify-center gap-2">
|
||||
<ArrowRight className="h-4 w-4" />
|
||||
Redirecting...
|
||||
</span>
|
||||
) : (
|
||||
@@ -160,13 +172,18 @@ export default function LoginForm() {
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
<p className="mt-10 text-sm text-center text-gray-600 dark:text-gray-400 animate-in fade-in duration-500 delay-500">
|
||||
Don't have an account?{" "}
|
||||
<Link href="/auth/register" className="text-blue-600 hover:underline dark:text-blue-400">
|
||||
Sign up
|
||||
</Link>
|
||||
</p>
|
||||
<div className="mt-8 pt-6 border-t border-white/10 text-center">
|
||||
<p className="text-sm text-zinc-400">
|
||||
Don't have an account?{" "}
|
||||
<Link
|
||||
href="/auth/register"
|
||||
className="text-indigo-400 hover:text-indigo-300 font-medium transition-colors inline-flex items-center gap-1"
|
||||
>
|
||||
Sign up <ArrowRight className="w-3 h-3" />
|
||||
</Link>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
);
|
||||
}
|
||||
@@ -2,28 +2,42 @@
|
||||
|
||||
import React, { Suspense, lazy } from "react";
|
||||
|
||||
|
||||
// Use lazy loading for the form component
|
||||
const LoginForm = lazy(() => import('./components/LoginForm'));
|
||||
|
||||
// Simple loading state for the Suspense boundary
|
||||
// Background Component
|
||||
const AuthBackground = () => (
|
||||
<div className="absolute inset-0 overflow-hidden pointer-events-none">
|
||||
<div className="absolute inset-0 bg-black" />
|
||||
<div className="absolute top-0 left-0 w-full h-full bg-gradient-to-br from-indigo-500/20 via-purple-500/10 to-transparent" />
|
||||
<div className="absolute top-1/4 left-1/4 w-96 h-96 bg-blue-500/20 rounded-full blur-3xl opacity-50 animate-pulse" />
|
||||
<div className="absolute bottom-1/4 right-1/4 w-96 h-96 bg-purple-500/20 rounded-full blur-3xl opacity-50 animate-pulse delay-1000" />
|
||||
</div>
|
||||
);
|
||||
|
||||
// Loading State
|
||||
function LoginLoading() {
|
||||
return (
|
||||
<div className="flex items-center justify-center min-h-screen bg-gray-100 dark:bg-[#0F0F12]">
|
||||
<div className="w-full max-w-md p-8 space-y-8 bg-white dark:bg-[#1F1F23] rounded-xl shadow-lg text-center">
|
||||
<div className="mt-6 flex flex-col items-center justify-center">
|
||||
<div className="w-12 h-12 border-4 border-t-blue-500 border-b-transparent border-l-transparent border-r-transparent rounded-full animate-spin"></div>
|
||||
<p className="mt-4 text-gray-600 dark:text-gray-400">Loading login form...</p>
|
||||
</div>
|
||||
<div className="w-full max-w-md p-8 space-y-8 bg-black/40 backdrop-blur-xl border border-white/10 rounded-2xl shadow-2xl text-center relative z-10">
|
||||
<div className="mt-6 flex flex-col items-center justify-center">
|
||||
<div className="w-12 h-12 border-4 border-t-indigo-500 border-b-transparent border-l-transparent border-r-transparent rounded-full animate-spin"></div>
|
||||
<p className="mt-4 text-zinc-400">Loading secure login...</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// Main page component that uses Suspense
|
||||
// Main page component
|
||||
export default function LoginPage() {
|
||||
return (
|
||||
<Suspense fallback={<LoginLoading />}>
|
||||
<LoginForm />
|
||||
</Suspense>
|
||||
<div className="relative flex items-center justify-center min-h-screen overflow-hidden">
|
||||
<AuthBackground />
|
||||
<div className="flex flex-col items-center w-full px-4">
|
||||
<Suspense fallback={<LoginLoading />}>
|
||||
<LoginForm />
|
||||
</Suspense>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
"use client";
|
||||
import { fetchData } from "@/lib/api";
|
||||
|
||||
import { useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import Image from "next/image";
|
||||
@@ -7,111 +7,159 @@ import Link from "next/link";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Loader2, ArrowRight } from "lucide-react";
|
||||
import { motion } from "framer-motion";
|
||||
import { toast } from "@/hooks/use-toast";
|
||||
|
||||
// Matches LoginPage background
|
||||
const AuthBackground = () => (
|
||||
<div className="absolute inset-0 overflow-hidden pointer-events-none">
|
||||
<div className="absolute inset-0 bg-black" />
|
||||
<div className="absolute top-0 left-0 w-full h-full bg-gradient-to-br from-indigo-500/20 via-purple-500/10 to-transparent" />
|
||||
<div className="absolute top-1/4 left-1/4 w-96 h-96 bg-blue-500/20 rounded-full blur-3xl opacity-50 animate-pulse" />
|
||||
<div className="absolute bottom-1/4 right-1/4 w-96 h-96 bg-purple-500/20 rounded-full blur-3xl opacity-50 animate-pulse delay-1000" />
|
||||
</div>
|
||||
);
|
||||
|
||||
export default function RegisterPage() {
|
||||
const [username, setUsername] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [invitationCode, setInvitationCode] = useState("");
|
||||
const [error, setError] = useState("");
|
||||
const [loading, setLoading] = useState(false);
|
||||
const router = useRouter();
|
||||
|
||||
async function handleRegister(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
setError("");
|
||||
setLoading(true);
|
||||
|
||||
const res = await fetchData(
|
||||
`/api/auth/register`,
|
||||
{
|
||||
try {
|
||||
const res = await fetch(`/api/auth/register`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ username, password, invitationCode }),
|
||||
});
|
||||
|
||||
const data = await res.json();
|
||||
|
||||
if (res.ok) {
|
||||
toast({
|
||||
title: "Account Created! 🎉",
|
||||
description: "Welcome to Ember Market. Redirecting to login...",
|
||||
variant: "default",
|
||||
});
|
||||
setTimeout(() => router.push("/auth/login"), 1500);
|
||||
} else {
|
||||
toast({
|
||||
title: "Registration Failed",
|
||||
description: data.error || "Please check your details.",
|
||||
variant: "destructive",
|
||||
});
|
||||
setLoading(false);
|
||||
}
|
||||
);
|
||||
|
||||
const data = await res;
|
||||
|
||||
if (res) {
|
||||
console.log("Registered successfully:", data);
|
||||
router.push("/auth/login");
|
||||
} else {
|
||||
setError(data.error || "Registration failed");
|
||||
} catch (error) {
|
||||
toast({
|
||||
title: "Error",
|
||||
description: "Something went wrong. Please try again.",
|
||||
variant: "destructive",
|
||||
});
|
||||
setLoading(false);
|
||||
}
|
||||
|
||||
setLoading(false);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex items-center justify-center min-h-screen bg-gray-100 dark:bg-[#0F0F12]">
|
||||
<div className="w-full max-w-md p-8 space-y-8 bg-white dark:bg-[#1F1F23] rounded-xl shadow-lg">
|
||||
<div className="text-center">
|
||||
<h2 className="mt-6 text-3xl font-bold text-gray-900 dark:text-white">
|
||||
Create an Account
|
||||
</h2>
|
||||
<p className="mt-2 text-sm text-gray-600 dark:text-gray-400">
|
||||
Sign up to start selling
|
||||
</p>
|
||||
</div>
|
||||
<div className="relative flex items-center justify-center min-h-screen overflow-hidden">
|
||||
<AuthBackground />
|
||||
|
||||
{error && <p className="text-red-500 text-sm text-center">{error}</p>}
|
||||
<div className="flex flex-col items-center w-full px-4 text-center z-10">
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 20 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.5 }}
|
||||
className="w-full max-w-md"
|
||||
>
|
||||
<div className="overflow-hidden rounded-2xl border border-white/10 shadow-2xl bg-black/40 backdrop-blur-xl p-8">
|
||||
<div className="text-center mb-8">
|
||||
<h2 className="text-xl font-semibold text-white">Create your account</h2>
|
||||
<p className="mt-2 text-sm text-zinc-400">Start managing your store today</p>
|
||||
</div>
|
||||
|
||||
<form className="mt-8 space-y-6" onSubmit={handleRegister}>
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<Label htmlFor="username">Username</Label>
|
||||
<Input
|
||||
id="username"
|
||||
name="username"
|
||||
type="text"
|
||||
autoComplete="username"
|
||||
required
|
||||
value={username}
|
||||
onChange={(e) => setUsername(e.target.value)}
|
||||
className="mt-1"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<Label htmlFor="password">Password</Label>
|
||||
<Input
|
||||
id="password"
|
||||
name="password"
|
||||
type="password"
|
||||
autoComplete="new-password"
|
||||
required
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
className="mt-1"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<Label htmlFor="invitationCode">Invitation Code</Label>
|
||||
<Input
|
||||
id="invitationCode"
|
||||
name="invitationCode"
|
||||
type="text"
|
||||
required
|
||||
value={invitationCode}
|
||||
onChange={(e) => setInvitationCode(e.target.value)}
|
||||
className="mt-1"
|
||||
/>
|
||||
<form className="space-y-5" onSubmit={handleRegister}>
|
||||
<div className="space-y-4 text-left">
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="username" className="text-zinc-300">Username</Label>
|
||||
<Input
|
||||
id="username"
|
||||
name="username"
|
||||
type="text"
|
||||
autoComplete="username"
|
||||
required
|
||||
value={username}
|
||||
onChange={(e) => setUsername(e.target.value)}
|
||||
className="bg-white/5 border-white/10 text-white placeholder:text-zinc-500 focus:border-indigo-500/50 focus:ring-indigo-500/20 transition-all duration-300"
|
||||
placeholder="Choose a username"
|
||||
disabled={loading}
|
||||
/>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="password" className="text-zinc-300">Password</Label>
|
||||
<Input
|
||||
id="password"
|
||||
name="password"
|
||||
type="password"
|
||||
autoComplete="new-password"
|
||||
required
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
className="bg-white/5 border-white/10 text-white placeholder:text-zinc-500 focus:border-indigo-500/50 focus:ring-indigo-500/20 transition-all duration-300"
|
||||
placeholder="Create a strong password"
|
||||
disabled={loading}
|
||||
/>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="invitationCode" className="text-zinc-300">Invitation Code</Label>
|
||||
<Input
|
||||
id="invitationCode"
|
||||
name="invitationCode"
|
||||
type="text"
|
||||
required
|
||||
value={invitationCode}
|
||||
onChange={(e) => setInvitationCode(e.target.value)}
|
||||
className="bg-white/5 border-white/10 text-white placeholder:text-zinc-500 focus:border-indigo-500/50 focus:ring-indigo-500/20 transition-all duration-300"
|
||||
placeholder="Enter your invite code"
|
||||
disabled={loading}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Button
|
||||
type="submit"
|
||||
className="w-full h-11 font-medium bg-gradient-to-r from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500 text-white shadow-lg shadow-indigo-500/25 transition-all duration-300"
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? (
|
||||
<span className="flex items-center justify-center gap-2">
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
Creating account...
|
||||
</span>
|
||||
) : (
|
||||
"Create Account"
|
||||
)}
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
<div className="mt-8 pt-6 border-t border-white/10 text-center">
|
||||
<p className="text-sm text-zinc-400">
|
||||
Already have an account?{" "}
|
||||
<Link
|
||||
href="/auth/login"
|
||||
className="text-indigo-400 hover:text-indigo-300 font-medium transition-colors inline-flex items-center gap-1"
|
||||
>
|
||||
Sign in <ArrowRight className="w-3 h-3" />
|
||||
</Link>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Button type="submit" className="w-full" disabled={loading}>
|
||||
{loading ? "Registering..." : "Sign Up"}
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
<p className="mt-6 text-sm text-center text-gray-600 dark:text-gray-400">
|
||||
Already have an account?{" "}
|
||||
<Link
|
||||
href="/auth/login"
|
||||
className="text-blue-600 hover:underline dark:text-blue-400"
|
||||
>
|
||||
Sign in
|
||||
</Link>
|
||||
</p>
|
||||
</motion.div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user