mirror of
https://github.com/shumaiOne/shumai.git
synced 2026-11-22 07:37:42 +00:00
Merge pull request #76 from shumaiOne/fix/infinite-redirect-loop
fix(webui): prevent infinite redirect loop between /signup and /login
This commit is contained in:
+25
-25
@@ -26,13 +26,13 @@ describe('LruTtlCache', () => {
|
||||
const cache = new LruTtlCache<string, string>(2)
|
||||
cache.set('key1', 'value1', 1000)
|
||||
cache.set('key2', 'value2', 1000)
|
||||
|
||||
|
||||
// Access key1 to make it most recently used
|
||||
cache.get('key1')
|
||||
|
||||
|
||||
// Add key3, which should evict key2 (the least recently used)
|
||||
cache.set('key3', 'value3', 1000)
|
||||
|
||||
|
||||
expect(cache.get('key1')).toBe('value1')
|
||||
expect(cache.get('key2')).toBeUndefined()
|
||||
expect(cache.get('key3')).toBe('value3')
|
||||
@@ -41,9 +41,9 @@ describe('LruTtlCache', () => {
|
||||
it('should return undefined for expired items', () => {
|
||||
const cache = new LruTtlCache<string, string>(10)
|
||||
cache.set('key1', 'value1', 1000)
|
||||
|
||||
|
||||
vi.advanceTimersByTime(1001)
|
||||
|
||||
|
||||
expect(cache.get('key1')).toBeUndefined()
|
||||
expect(cache.size).toBe(0)
|
||||
})
|
||||
@@ -51,28 +51,28 @@ describe('LruTtlCache', () => {
|
||||
it('should proactively evict expired items on get', () => {
|
||||
const sampleSize = 5
|
||||
const cache = new LruTtlCache<string, string>(100, sampleSize)
|
||||
|
||||
|
||||
// Set 10 items, all will expire
|
||||
for (let i = 0; i < 10; i++) {
|
||||
cache.set(`key${i}`, `value${i}`, 1000)
|
||||
}
|
||||
|
||||
|
||||
// Add one item that stays valid
|
||||
cache.set('valid', 'validValue', 5000)
|
||||
|
||||
|
||||
// Advance time so the 10 items expire
|
||||
vi.advanceTimersByTime(1001)
|
||||
|
||||
|
||||
// Total size should still be 11 (lazy eviction)
|
||||
expect(cache.size).toBe(11)
|
||||
|
||||
|
||||
// Call get on the valid item once. It should trigger one evictSample call.
|
||||
// evictSample will check 5 items.
|
||||
cache.get('valid')
|
||||
|
||||
|
||||
// Size should now be 11 - 5 = 6
|
||||
expect(cache.size).toBe(6)
|
||||
|
||||
|
||||
// Call get again, it should evict the remaining 5 expired items
|
||||
cache.get('valid')
|
||||
expect(cache.size).toBe(1)
|
||||
@@ -82,23 +82,23 @@ describe('LruTtlCache', () => {
|
||||
it('should loop through the cache with proactive eviction', () => {
|
||||
// sampleSize = 3 to make sure we cover all items in one go or skip k3 correctly
|
||||
const cache = new LruTtlCache<string, string>(10, 3)
|
||||
|
||||
|
||||
cache.set('k1', 'v1', 1000)
|
||||
cache.set('k2', 'v2', 1000)
|
||||
cache.set('k3', 'v3', 5000)
|
||||
|
||||
|
||||
vi.advanceTimersByTime(1001)
|
||||
|
||||
|
||||
// First get: evicts k1, k2. Checks k3 (not expired).
|
||||
cache.get('k3')
|
||||
expect(cache.size).toBe(1)
|
||||
|
||||
|
||||
// Add more items
|
||||
cache.set('k4', 'v4', 1000)
|
||||
cache.set('k5', 'v5', 1000)
|
||||
|
||||
|
||||
vi.advanceTimersByTime(1001)
|
||||
|
||||
|
||||
// Second get: evicts k4, k5.
|
||||
cache.get('k3')
|
||||
expect(cache.size).toBe(1)
|
||||
@@ -127,25 +127,25 @@ describe('LruTtlCache', () => {
|
||||
// This test addresses the user's specific request:
|
||||
// "add 100 keys to cache, do a evictSample, and remove 99 keys manually, and do evictSample again, see what happen"
|
||||
const cache = new LruTtlCache<number, number>(200, 10)
|
||||
|
||||
|
||||
// Add 100 keys
|
||||
for (let i = 0; i < 100; i++) {
|
||||
cache.set(i, i, 10000)
|
||||
}
|
||||
|
||||
|
||||
// Initial get to trigger evictSample and initialize the iterator
|
||||
cache.get(999)
|
||||
|
||||
cache.get(999)
|
||||
|
||||
// Remove 99 keys manually (leaving key 99)
|
||||
for (let i = 0; i < 99; i++) {
|
||||
cache.delete(i)
|
||||
}
|
||||
expect(cache.size).toBe(1)
|
||||
|
||||
|
||||
// Advance time so the remaining key 99 would expire if it was checked
|
||||
vi.advanceTimersByTime(20000)
|
||||
|
||||
// Call get. evictSample should run.
|
||||
|
||||
// Call get. evictSample should run.
|
||||
// The iterator was pointing to something that was deleted.
|
||||
// It should proceed to the next available element (key 99) and evict it.
|
||||
cache.get(999)
|
||||
|
||||
@@ -11,6 +11,7 @@ const customFetch = async (input: RequestInfo | URL, init?: RequestInit) => {
|
||||
// Don't redirect if we are already on login page, it's an auth request, or we are on a public share page
|
||||
if (
|
||||
!window.location.pathname.includes('/login') &&
|
||||
!window.location.pathname.includes('/signup') &&
|
||||
!window.location.pathname.startsWith('/share/') &&
|
||||
!url.includes('/api/authn')
|
||||
) {
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
import { ShumaiLogo } from '@/ui/components/ui/icons'
|
||||
import { CheckCircle2 } from 'lucide-react'
|
||||
import { ReactNode } from 'react'
|
||||
|
||||
export function AuthLayout({ children }: { children: ReactNode }) {
|
||||
return (
|
||||
<div className="min-h-screen w-full flex items-center justify-center p-4 md:p-8 bg-zinc-100/80 dark:bg-black font-sans overflow-hidden relative">
|
||||
{/* Drifting Background Mesh Blobs */}
|
||||
<div className="bg-rose-500/10 dark:bg-rose-600/5 w-[600px] h-[600px] rounded-full blur-[140px] absolute top-[-10%] left-[-10%] animate-drift-slow" />
|
||||
<div className="bg-orange-500/10 dark:bg-orange-600/5 w-[600px] h-[600px] rounded-full blur-[140px] absolute bottom-[-10%] right-[-10%] animate-drift-medium" />
|
||||
|
||||
{/* Main Glassmorphic Split-Pane Card */}
|
||||
<div className="relative max-w-4xl w-full flex flex-col md:flex-row rounded-3xl border border-zinc-200 dark:border-zinc-800 shadow-2xl bg-white dark:bg-zinc-900 overflow-hidden min-h-[580px] z-10 transition-all duration-300 hover:shadow-rose-500/5">
|
||||
{/* Left Pane (Brand Showcase) */}
|
||||
<div className="hidden md:flex flex-col w-full md:w-1/2 bg-gradient-to-br from-rose-500/15 via-orange-500/10 to-amber-500/5 dark:from-rose-950/30 dark:via-orange-950/15 dark:to-zinc-900/40 p-8 md:p-12 justify-between border-r border-zinc-200 dark:border-zinc-800 relative overflow-hidden">
|
||||
{/* Subtle Grid Overlay */}
|
||||
<div className="absolute inset-0 bg-[linear-gradient(to_right,#8080800a_1px,transparent_1px),linear-gradient(to_bottom,#8080800a_1px,transparent_1px)] bg-[size:14px_24px] [mask-image:radial-gradient(ellipse_60%_50%_at_50%_0%,#000_70%,transparent_100%)] pointer-events-none" />
|
||||
|
||||
{/* Logo & Brand */}
|
||||
<div className="relative flex items-center gap-3">
|
||||
<ShumaiLogo className="h-12 w-12 shadow-lg shadow-rose-500/10 rounded-2xl transition-transform duration-500 hover:scale-105" />
|
||||
<span className="text-xl font-extrabold tracking-tight bg-gradient-to-r from-rose-500 via-orange-500 to-amber-500 bg-clip-text text-transparent">
|
||||
Shumai
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* Marketing Copy / Feature Points */}
|
||||
<div className="relative my-8 md:my-0 space-y-6">
|
||||
<h2 className="text-3xl font-extrabold tracking-tight leading-tight text-zinc-900 dark:text-zinc-50">
|
||||
One workspace
|
||||
<br />
|
||||
for all your
|
||||
<br />
|
||||
<span className="bg-gradient-to-r from-rose-500 to-orange-500 bg-clip-text text-transparent">
|
||||
creative assets.
|
||||
</span>
|
||||
</h2>
|
||||
<p className="text-zinc-600 dark:text-zinc-400 text-sm leading-relaxed max-w-sm">
|
||||
Upload and index your files, enrich them with custom metadata schemas, draw
|
||||
annotations directly on media, and gather instant feedback — all in one modern
|
||||
workspace built for creators.
|
||||
</p>
|
||||
|
||||
<ul className="space-y-3.5 pt-4">
|
||||
{[
|
||||
'Instant asset uploads & high-fidelity media players',
|
||||
'Custom metadata schemas & drawing canvas reviews',
|
||||
'Frictionless team workspaces & secure sharing',
|
||||
].map((text, i) => (
|
||||
<li
|
||||
key={i}
|
||||
className="flex items-center gap-3 text-sm text-zinc-700 dark:text-zinc-300 font-medium"
|
||||
>
|
||||
<CheckCircle2 className="w-5 h-5 text-rose-500 flex-shrink-0" />
|
||||
<span>{text}</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
{/* Footer Label */}
|
||||
<div className="relative pt-4 border-t border-zinc-200/30 dark:border-zinc-800/30">
|
||||
<p className="text-xs text-zinc-500 dark:text-zinc-400 font-medium">
|
||||
Join our community of developers and designers.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Right Pane (Form Container) */}
|
||||
<div className="w-full md:w-1/2 p-8 md:p-12 flex flex-col justify-center">{children}</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
+95
-159
@@ -10,8 +10,9 @@ import { useEffect, useState } from 'react'
|
||||
import { useForm } from 'react-hook-form'
|
||||
import { z } from 'zod'
|
||||
import { signIn } from '@/ui/lib/auth-client'
|
||||
import { Loader2, Mail, Lock, ArrowRight, LogIn, CheckCircle2 } from 'lucide-react'
|
||||
import { Loader2, Mail, Lock, ArrowRight, LogIn } from 'lucide-react'
|
||||
import { ShumaiLogo } from '@/ui/components/ui/icons'
|
||||
import { AuthLayout } from '@/ui/components/auth-layout'
|
||||
|
||||
const loginSchema = z.object({
|
||||
email: z.string().email('Invalid email address'),
|
||||
@@ -77,165 +78,100 @@ function LoginPage() {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen w-full flex items-center justify-center p-4 md:p-8 bg-zinc-100/80 dark:bg-black font-sans overflow-hidden relative font-sans">
|
||||
{/* Drifting Background Mesh Blobs */}
|
||||
<div className="bg-rose-500/10 dark:bg-rose-600/5 w-[600px] h-[600px] rounded-full blur-[140px] absolute top-[-10%] left-[-10%] animate-drift-slow" />
|
||||
<div className="bg-orange-500/10 dark:bg-orange-600/5 w-[600px] h-[600px] rounded-full blur-[140px] absolute bottom-[-10%] right-[-10%] animate-drift-medium" />
|
||||
|
||||
{/* Main Glassmorphic Split-Pane Card */}
|
||||
<div className="relative max-w-4xl w-full flex flex-col md:flex-row rounded-3xl border border-zinc-200 dark:border-zinc-800 shadow-2xl bg-white dark:bg-zinc-900 overflow-hidden min-h-[580px] z-10 transition-all duration-300 hover:shadow-rose-500/5">
|
||||
{/* Left Pane (Brand Showcase) */}
|
||||
<div className="w-full md:w-1/2 bg-gradient-to-br from-rose-500/15 via-orange-500/10 to-amber-500/5 dark:from-rose-950/30 dark:via-orange-950/15 dark:to-zinc-900/40 p-8 md:p-12 flex flex-col justify-between border-b md:border-b-0 md:border-r border-zinc-200 dark:border-zinc-800 relative overflow-hidden">
|
||||
{/* Subtle Grid Overlay */}
|
||||
<div className="absolute inset-0 bg-[linear-gradient(to_right,#8080800a_1px,transparent_1px),linear-gradient(to_bottom,#8080800a_1px,transparent_1px)] bg-[size:14px_24px] [mask-image:radial-gradient(ellipse_60%_50%_at_50%_0%,#000_70%,transparent_100%)] pointer-events-none" />
|
||||
|
||||
{/* Logo & Brand */}
|
||||
<div className="relative flex items-center gap-3">
|
||||
<ShumaiLogo className="h-12 w-12 shadow-lg shadow-rose-500/10 rounded-2xl transition-transform duration-500 hover:scale-105" />
|
||||
<span className="text-xl font-extrabold tracking-tight bg-gradient-to-r from-rose-500 via-orange-500 to-amber-500 bg-clip-text text-transparent">
|
||||
Shumai
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* Marketing Copy / Feature Points */}
|
||||
<div className="relative my-8 md:my-0 space-y-6">
|
||||
<h2 className="text-3xl font-extrabold tracking-tight leading-tight text-zinc-900 dark:text-zinc-50">
|
||||
One workspace
|
||||
<br />
|
||||
for all your
|
||||
<br />
|
||||
<span className="bg-gradient-to-r from-rose-500 to-orange-500 bg-clip-text text-transparent">
|
||||
creative assets.
|
||||
</span>
|
||||
</h2>
|
||||
<p className="text-zinc-600 dark:text-zinc-400 text-sm leading-relaxed max-w-sm">
|
||||
Upload and index your files, enrich them with custom metadata schemas, draw
|
||||
annotations directly on media, and gather instant feedback — all in one modern
|
||||
workspace built for creators.
|
||||
</p>
|
||||
|
||||
<ul className="space-y-3.5 pt-4">
|
||||
{[
|
||||
'Instant asset uploads & high-fidelity media players',
|
||||
'Custom metadata schemas & drawing canvas reviews',
|
||||
'Frictionless team workspaces & secure sharing',
|
||||
].map((text, i) => (
|
||||
<li
|
||||
key={i}
|
||||
className="flex items-center gap-3 text-sm text-zinc-700 dark:text-zinc-300 font-medium"
|
||||
>
|
||||
<CheckCircle2 className="w-5 h-5 text-rose-500 flex-shrink-0" />
|
||||
<span>{text}</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
{/* Footer Label */}
|
||||
<div className="relative pt-4 border-t border-zinc-200/30 dark:border-zinc-800/30">
|
||||
<p className="text-xs text-zinc-500 dark:text-zinc-400 font-medium">
|
||||
Join our community of developers and designers.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Right Pane (Form Container) */}
|
||||
<div className="w-full md:w-1/2 p-8 md:p-12 flex flex-col justify-center">
|
||||
<div className="mb-8">
|
||||
<h1 className="text-2xl font-bold tracking-tight text-zinc-900 dark:text-zinc-50">
|
||||
Welcome Back
|
||||
</h1>
|
||||
<p className="text-zinc-500 dark:text-zinc-400 text-sm mt-1">
|
||||
Enter your credentials to access your account.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="mb-6 p-3 bg-red-500/10 border border-red-500/20 text-red-600 dark:text-red-400 rounded-xl text-sm text-center font-medium">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-5">
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="email"
|
||||
className="text-xs font-semibold text-zinc-600 dark:text-zinc-400 tracking-wide uppercase"
|
||||
>
|
||||
Email Address
|
||||
</Label>
|
||||
<div className="relative group">
|
||||
<Mail className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-400 dark:text-zinc-600 transition-colors group-focus-within:text-rose-500" />
|
||||
<Input
|
||||
id="email"
|
||||
{...form.register('email')}
|
||||
placeholder="you@example.com"
|
||||
type="email"
|
||||
className="pl-10.5 h-11 border-zinc-200 dark:border-zinc-800 focus-visible:ring-rose-500/50 focus-visible:border-rose-500 rounded-xl transition-all shadow-sm"
|
||||
/>
|
||||
</div>
|
||||
{form.formState.errors.email && (
|
||||
<p className="text-red-500 text-xs font-medium">
|
||||
{form.formState.errors.email.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="password"
|
||||
className="text-xs font-semibold text-zinc-600 dark:text-zinc-400 tracking-wide uppercase"
|
||||
>
|
||||
Password
|
||||
</Label>
|
||||
<div className="relative group">
|
||||
<Lock className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-400 dark:text-zinc-600 transition-colors group-focus-within:text-rose-500" />
|
||||
<Input
|
||||
id="password"
|
||||
type="password"
|
||||
{...form.register('password')}
|
||||
placeholder="Your password"
|
||||
className="pl-10.5 h-11 border-zinc-200 dark:border-zinc-800 focus-visible:ring-rose-500/50 focus-visible:border-rose-500 rounded-xl transition-all shadow-sm"
|
||||
/>
|
||||
</div>
|
||||
{form.formState.errors.password && (
|
||||
<p className="text-red-500 text-xs font-medium">
|
||||
{form.formState.errors.password.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Button
|
||||
type="submit"
|
||||
className="w-full h-11 bg-gradient-to-r from-rose-500 to-orange-500 hover:from-rose-600 hover:to-orange-600 text-white font-semibold rounded-xl shadow-md shadow-rose-500/10 hover:shadow-rose-500/20 active:scale-[0.98] transition-all flex items-center justify-center gap-2 border-0"
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? (
|
||||
<>
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
Logging in...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<LogIn className="w-4 h-4" />
|
||||
Login
|
||||
</>
|
||||
)}
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
<div className="mt-8 pt-6 border-t border-zinc-200/30 dark:border-zinc-800/30 text-center text-sm">
|
||||
<span className="text-zinc-500 dark:text-zinc-400">Don't have an account? </span>
|
||||
<a
|
||||
href="/signup"
|
||||
className="font-semibold text-rose-500 hover:text-rose-600 dark:text-rose-400 dark:hover:text-rose-300 transition-colors hover:underline inline-flex items-center gap-0.5"
|
||||
>
|
||||
Sign up <ArrowRight className="w-3.5 h-3.5" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<AuthLayout>
|
||||
<div className="mb-8">
|
||||
<h1 className="text-2xl font-bold tracking-tight text-zinc-900 dark:text-zinc-50">
|
||||
Welcome Back
|
||||
</h1>
|
||||
<p className="text-zinc-500 dark:text-zinc-400 text-sm mt-1">
|
||||
Enter your credentials to access your account.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="mb-6 p-3 bg-red-500/10 border border-red-500/20 text-red-600 dark:text-red-400 rounded-xl text-sm text-center font-medium">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-5">
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="email"
|
||||
className="text-xs font-semibold text-zinc-600 dark:text-zinc-400 tracking-wide uppercase"
|
||||
>
|
||||
Email Address
|
||||
</Label>
|
||||
<div className="relative group">
|
||||
<Mail className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-400 dark:text-zinc-600 transition-colors group-focus-within:text-rose-500" />
|
||||
<Input
|
||||
id="email"
|
||||
{...form.register('email')}
|
||||
placeholder="you@example.com"
|
||||
type="email"
|
||||
className="pl-10.5 h-11 border-zinc-200 dark:border-zinc-800 focus-visible:ring-rose-500/50 focus-visible:border-rose-500 rounded-xl transition-all shadow-sm"
|
||||
/>
|
||||
</div>
|
||||
{form.formState.errors.email && (
|
||||
<p className="text-red-500 text-xs font-medium">
|
||||
{form.formState.errors.email.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="password"
|
||||
className="text-xs font-semibold text-zinc-600 dark:text-zinc-400 tracking-wide uppercase"
|
||||
>
|
||||
Password
|
||||
</Label>
|
||||
<div className="relative group">
|
||||
<Lock className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-400 dark:text-zinc-600 transition-colors group-focus-within:text-rose-500" />
|
||||
<Input
|
||||
id="password"
|
||||
type="password"
|
||||
{...form.register('password')}
|
||||
placeholder="Your password"
|
||||
className="pl-10.5 h-11 border-zinc-200 dark:border-zinc-800 focus-visible:ring-rose-500/50 focus-visible:border-rose-500 rounded-xl transition-all shadow-sm"
|
||||
/>
|
||||
</div>
|
||||
{form.formState.errors.password && (
|
||||
<p className="text-red-500 text-xs font-medium">
|
||||
{form.formState.errors.password.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Button
|
||||
type="submit"
|
||||
className="w-full h-11 bg-gradient-to-r from-rose-500 to-orange-500 hover:from-rose-600 hover:to-orange-600 text-white font-semibold rounded-xl shadow-md shadow-rose-500/10 hover:shadow-rose-500/20 active:scale-[0.98] transition-all flex items-center justify-center gap-2 border-0"
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? (
|
||||
<>
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
Logging in...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<LogIn className="w-4 h-4" />
|
||||
Login
|
||||
</>
|
||||
)}
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
<div className="mt-8 pt-6 border-t border-zinc-200/30 dark:border-zinc-800/30 text-center text-sm">
|
||||
<span className="text-zinc-500 dark:text-zinc-400">Don't have an account? </span>
|
||||
<a
|
||||
href="/signup"
|
||||
className="font-semibold text-rose-500 hover:text-rose-600 dark:text-rose-400 dark:hover:text-rose-300 transition-colors hover:underline inline-flex items-center gap-0.5"
|
||||
>
|
||||
Sign up <ArrowRight className="w-3.5 h-3.5" />
|
||||
</a>
|
||||
</div>
|
||||
</AuthLayout>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+110
-174
@@ -4,7 +4,7 @@ import { Button } from '@/ui/components/ui/button'
|
||||
import { Card, CardDescription, CardFooter, CardHeader, CardTitle } from '@/ui/components/ui/card'
|
||||
import { Input } from '@/ui/components/ui/input'
|
||||
import { Label } from '@/ui/components/ui/label'
|
||||
import { Loader2, Mail, Lock, CheckCircle2, ArrowRight, UserPlus } from 'lucide-react'
|
||||
import { Loader2, Mail, Lock, ArrowRight, UserPlus } from 'lucide-react'
|
||||
import { useAuthStore } from '@/ui/stores/auth'
|
||||
import { zodResolver } from '@hookform/resolvers/zod'
|
||||
import { createFileRoute, redirect, useNavigate } from '@tanstack/react-router'
|
||||
@@ -13,6 +13,7 @@ import { z } from 'zod'
|
||||
import { signUp } from '@/ui/lib/auth-client'
|
||||
import { useState } from 'react'
|
||||
import { ShumaiLogo } from '@/ui/components/ui/icons'
|
||||
import { AuthLayout } from '@/ui/components/auth-layout'
|
||||
|
||||
const signupSchema = z.object({
|
||||
email: z.string().email('Invalid email address'),
|
||||
@@ -135,183 +136,118 @@ function SignupPage() {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen w-full flex items-center justify-center p-4 md:p-8 bg-zinc-100/80 dark:bg-black font-sans overflow-hidden relative">
|
||||
{/* Drifting Background Mesh Blobs */}
|
||||
<div className="bg-rose-500/10 dark:bg-rose-600/5 w-[600px] h-[600px] rounded-full blur-[140px] absolute top-[-10%] left-[-10%] animate-drift-slow" />
|
||||
<div className="bg-orange-500/10 dark:bg-orange-600/5 w-[600px] h-[600px] rounded-full blur-[140px] absolute bottom-[-10%] right-[-10%] animate-drift-medium" />
|
||||
<AuthLayout>
|
||||
<div className="mb-8">
|
||||
<h1 className="text-2xl font-bold tracking-tight text-zinc-900 dark:text-zinc-50">
|
||||
Create Account
|
||||
</h1>
|
||||
<p className="text-zinc-500 dark:text-zinc-400 text-sm mt-1 mb-4">
|
||||
Start building and organizing your space.
|
||||
</p>
|
||||
|
||||
{/* Main Glassmorphic Split-Pane Card */}
|
||||
<div className="relative max-w-4xl w-full flex flex-col md:flex-row rounded-3xl border border-zinc-200 dark:border-zinc-800 shadow-2xl bg-white dark:bg-zinc-900 overflow-hidden min-h-[580px] z-10 transition-all duration-300 hover:shadow-rose-500/5">
|
||||
{/* Left Pane (Brand Showcase) */}
|
||||
<div className="w-full md:w-1/2 bg-gradient-to-br from-rose-500/15 via-orange-500/10 to-amber-500/5 dark:from-rose-950/30 dark:via-orange-950/15 dark:to-zinc-900/40 p-8 md:p-12 flex flex-col justify-between border-b md:border-b-0 md:border-r border-zinc-200 dark:border-zinc-800 relative overflow-hidden">
|
||||
{/* Subtle Grid Overlay */}
|
||||
<div className="absolute inset-0 bg-[linear-gradient(to_right,#8080800a_1px,transparent_1px),linear-gradient(to_bottom,#8080800a_1px,transparent_1px)] bg-[size:14px_24px] [mask-image:radial-gradient(ellipse_60%_50%_at_50%_0%,#000_70%,transparent_100%)] pointer-events-none" />
|
||||
|
||||
{/* Logo & Brand */}
|
||||
<div className="relative flex items-center gap-3">
|
||||
<ShumaiLogo className="h-12 w-12 shadow-lg shadow-rose-500/10 rounded-2xl transition-transform duration-500 hover:scale-105" />
|
||||
<span className="text-xl font-extrabold tracking-tight bg-gradient-to-r from-rose-500 via-orange-500 to-amber-500 bg-clip-text text-transparent">
|
||||
Shumai
|
||||
{/* Context Banners (First User / Invite Info) */}
|
||||
{isFirstUser && (
|
||||
<div className="flex items-start gap-3 p-3 bg-amber-500/10 border border-amber-500/20 text-amber-800 dark:text-amber-300 rounded-2xl text-xs leading-relaxed font-medium">
|
||||
<span>🎉</span>
|
||||
<span>You will be the owner of the default workspace as the first user!</span>
|
||||
</div>
|
||||
)}
|
||||
{inviteInfo && !('error' in inviteInfo) && (
|
||||
<div className="flex items-start gap-3 p-3 bg-rose-500/10 border border-rose-500/20 text-rose-800 dark:text-rose-300 rounded-2xl text-xs leading-relaxed font-medium mt-3">
|
||||
<span>👋</span>
|
||||
<span>
|
||||
<strong>{inviteInfo.inviterName}</strong> invited you to join{' '}
|
||||
<strong>{inviteInfo.teamName || inviteInfo.projectName}</strong> as a{' '}
|
||||
<strong>{inviteInfo.role}</strong>.
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* Marketing Copy / Feature Points */}
|
||||
<div className="relative my-8 md:my-0 space-y-6">
|
||||
<h2 className="text-3xl font-extrabold tracking-tight leading-tight text-zinc-900 dark:text-zinc-50">
|
||||
One workspace
|
||||
<br />
|
||||
for all your
|
||||
<br />
|
||||
<span className="bg-gradient-to-r from-rose-500 to-orange-500 bg-clip-text text-transparent">
|
||||
creative assets.
|
||||
</span>
|
||||
</h2>
|
||||
<p className="text-zinc-600 dark:text-zinc-400 text-sm leading-relaxed max-w-sm">
|
||||
Upload and index your files, enrich them with custom metadata schemas, draw
|
||||
annotations directly on media, and gather instant feedback — all in one modern
|
||||
workspace built for creators.
|
||||
</p>
|
||||
|
||||
<ul className="space-y-3.5 pt-4">
|
||||
{[
|
||||
'Instant asset uploads & high-fidelity media players',
|
||||
'Custom metadata schemas & drawing canvas reviews',
|
||||
'Frictionless team workspaces & secure sharing',
|
||||
].map((text, i) => (
|
||||
<li
|
||||
key={i}
|
||||
className="flex items-center gap-3 text-sm text-zinc-700 dark:text-zinc-300 font-medium"
|
||||
>
|
||||
<CheckCircle2 className="w-5 h-5 text-rose-500 flex-shrink-0" />
|
||||
<span>{text}</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
{/* Context Banners (First User / Invite Info) */}
|
||||
<div className="relative pt-4 border-t border-zinc-200/30 dark:border-zinc-800/30">
|
||||
{isFirstUser && (
|
||||
<div className="flex items-start gap-3 p-3 bg-amber-500/10 border border-amber-500/20 text-amber-800 dark:text-amber-300 rounded-2xl text-xs leading-relaxed font-medium">
|
||||
<span>🎉</span>
|
||||
<span>You will be the owner of the default workspace as the first user!</span>
|
||||
</div>
|
||||
)}
|
||||
{inviteInfo && !('error' in inviteInfo) && (
|
||||
<div className="flex items-start gap-3 p-3 bg-rose-500/10 border border-rose-500/20 text-rose-800 dark:text-rose-300 rounded-2xl text-xs leading-relaxed font-medium">
|
||||
<span>👋</span>
|
||||
<span>
|
||||
<strong>{inviteInfo.inviterName}</strong> invited you to join{' '}
|
||||
<strong>{inviteInfo.teamName || inviteInfo.projectName}</strong> as a{' '}
|
||||
<strong>{inviteInfo.role}</strong>.
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
{!isFirstUser && !inviteInfo && (
|
||||
<p className="text-xs text-zinc-500 dark:text-zinc-400 font-medium">
|
||||
Join our community of developers and designers.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Right Pane (Form Container) */}
|
||||
<div className="w-full md:w-1/2 p-8 md:p-12 flex flex-col justify-center">
|
||||
<div className="mb-8">
|
||||
<h1 className="text-2xl font-bold tracking-tight text-zinc-900 dark:text-zinc-50">
|
||||
Create Account
|
||||
</h1>
|
||||
<p className="text-zinc-500 dark:text-zinc-400 text-sm mt-1">
|
||||
Start building and organizing your space.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="mb-6 p-3 bg-red-500/10 border border-red-500/20 text-red-600 dark:text-red-400 rounded-xl text-sm text-center font-medium">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-5">
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="email"
|
||||
className="text-xs font-semibold text-zinc-600 dark:text-zinc-400 tracking-wide uppercase"
|
||||
>
|
||||
Email Address
|
||||
</Label>
|
||||
<div className="relative group">
|
||||
<Mail className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-400 dark:text-zinc-600 transition-colors group-focus-within:text-rose-500" />
|
||||
<Input
|
||||
id="email"
|
||||
{...form.register('email')}
|
||||
placeholder="you@example.com"
|
||||
type="email"
|
||||
className="pl-10.5 h-11 border-zinc-200 dark:border-zinc-800 focus-visible:ring-rose-500/50 focus-visible:border-rose-500 rounded-xl transition-all shadow-sm"
|
||||
/>
|
||||
</div>
|
||||
{form.formState.errors.email && (
|
||||
<p className="text-red-500 text-xs font-medium">
|
||||
{form.formState.errors.email.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="password"
|
||||
className="text-xs font-semibold text-zinc-600 dark:text-zinc-400 tracking-wide uppercase"
|
||||
>
|
||||
Password
|
||||
</Label>
|
||||
<div className="relative group">
|
||||
<Lock className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-400 dark:text-zinc-600 transition-colors group-focus-within:text-rose-500" />
|
||||
<Input
|
||||
id="password"
|
||||
type="password"
|
||||
{...form.register('password')}
|
||||
placeholder="At least 3 characters"
|
||||
className="pl-10.5 h-11 border-zinc-200 dark:border-zinc-800 focus-visible:ring-rose-500/50 focus-visible:border-rose-500 rounded-xl transition-all shadow-sm"
|
||||
/>
|
||||
</div>
|
||||
{form.formState.errors.password && (
|
||||
<p className="text-red-500 text-xs font-medium">
|
||||
{form.formState.errors.password.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Button
|
||||
type="submit"
|
||||
className="w-full h-11 bg-gradient-to-r from-rose-500 to-orange-500 hover:from-rose-600 hover:to-orange-600 text-white font-semibold rounded-xl shadow-md shadow-rose-500/10 hover:shadow-rose-500/20 active:scale-[0.98] transition-all flex items-center justify-center gap-2 border-0"
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? (
|
||||
<>
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
Creating account...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<UserPlus className="w-4 h-4" />
|
||||
Sign Up
|
||||
</>
|
||||
)}
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
<div className="mt-8 pt-6 border-t border-zinc-200/30 dark:border-zinc-800/30 text-center text-sm">
|
||||
<span className="text-zinc-500 dark:text-zinc-400">Already have an account? </span>
|
||||
<a
|
||||
href="/login"
|
||||
className="font-semibold text-rose-500 hover:text-rose-600 dark:text-rose-400 dark:hover:text-rose-300 transition-colors hover:underline inline-flex items-center gap-0.5"
|
||||
>
|
||||
Login <ArrowRight className="w-3.5 h-3.5" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="mb-6 p-3 bg-red-500/10 border border-red-500/20 text-red-600 dark:text-red-400 rounded-xl text-sm text-center font-medium">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-5">
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="email"
|
||||
className="text-xs font-semibold text-zinc-600 dark:text-zinc-400 tracking-wide uppercase"
|
||||
>
|
||||
Email Address
|
||||
</Label>
|
||||
<div className="relative group">
|
||||
<Mail className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-400 dark:text-zinc-600 transition-colors group-focus-within:text-rose-500" />
|
||||
<Input
|
||||
id="email"
|
||||
{...form.register('email')}
|
||||
placeholder="you@example.com"
|
||||
type="email"
|
||||
className="pl-10.5 h-11 border-zinc-200 dark:border-zinc-800 focus-visible:ring-rose-500/50 focus-visible:border-rose-500 rounded-xl transition-all shadow-sm"
|
||||
/>
|
||||
</div>
|
||||
{form.formState.errors.email && (
|
||||
<p className="text-red-500 text-xs font-medium">
|
||||
{form.formState.errors.email.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="password"
|
||||
className="text-xs font-semibold text-zinc-600 dark:text-zinc-400 tracking-wide uppercase"
|
||||
>
|
||||
Password
|
||||
</Label>
|
||||
<div className="relative group">
|
||||
<Lock className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-zinc-400 dark:text-zinc-600 transition-colors group-focus-within:text-rose-500" />
|
||||
<Input
|
||||
id="password"
|
||||
type="password"
|
||||
{...form.register('password')}
|
||||
placeholder="At least 3 characters"
|
||||
className="pl-10.5 h-11 border-zinc-200 dark:border-zinc-800 focus-visible:ring-rose-500/50 focus-visible:border-rose-500 rounded-xl transition-all shadow-sm"
|
||||
/>
|
||||
</div>
|
||||
{form.formState.errors.password && (
|
||||
<p className="text-red-500 text-xs font-medium">
|
||||
{form.formState.errors.password.message}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Button
|
||||
type="submit"
|
||||
className="w-full h-11 bg-gradient-to-r from-rose-500 to-orange-500 hover:from-rose-600 hover:to-orange-600 text-white font-semibold rounded-xl shadow-md shadow-rose-500/10 hover:shadow-rose-500/20 active:scale-[0.98] transition-all flex items-center justify-center gap-2 border-0"
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? (
|
||||
<>
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
Creating account...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<UserPlus className="w-4 h-4" />
|
||||
Sign Up
|
||||
</>
|
||||
)}
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
<div className="mt-8 pt-6 border-t border-zinc-200/30 dark:border-zinc-800/30 text-center text-sm">
|
||||
<span className="text-zinc-500 dark:text-zinc-400">Already have an account? </span>
|
||||
<a
|
||||
href="/login"
|
||||
className="font-semibold text-rose-500 hover:text-rose-600 dark:text-rose-400 dark:hover:text-rose-300 transition-colors hover:underline inline-flex items-center gap-0.5"
|
||||
>
|
||||
Login <ArrowRight className="w-3.5 h-3.5" />
|
||||
</a>
|
||||
</div>
|
||||
</AuthLayout>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user