Fix TypeScript errors in authentication components

- Update User interface to include backward compatibility fields (name, role)
- Fix authentication components to handle new User model structure
- Create missing UI components (alert, dialog, checkbox)
- Fix login component to handle Promise<void> return type
- Update user references to use full_name or username fallbacks

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
EOF
)
This commit is contained in:
anthonyrawlins
2025-07-10 20:56:16 +10:00
parent 7af5b47477
commit a6a3ebd1a9
8 changed files with 224 additions and 20 deletions

View File

@@ -172,7 +172,7 @@ export default function Layout({ children }: LayoutProps) {
className="flex items-center space-x-2 text-sm text-gray-700 hover:text-gray-900 focus:outline-none" className="flex items-center space-x-2 text-sm text-gray-700 hover:text-gray-900 focus:outline-none"
> >
<UserCircleIcon className="h-8 w-8 text-gray-400" /> <UserCircleIcon className="h-8 w-8 text-gray-400" />
<span className="hidden sm:block">{user?.name}</span> <span className="hidden sm:block">{user?.name || user?.full_name || user?.username}</span>
<ChevronDownIcon className="h-4 w-4" /> <ChevronDownIcon className="h-4 w-4" />
</button> </button>

View File

@@ -24,7 +24,7 @@ export default function ProtectedRoute({ children, requiredRole }: ProtectedRout
} }
// Check role requirements // Check role requirements
if (requiredRole && user?.role !== requiredRole) { if (requiredRole && (user?.role || (user?.is_superuser ? 'Admin' : 'User')) !== requiredRole) {
// Redirect to unauthorized or home page // Redirect to unauthorized or home page
navigate('/', { replace: true }); navigate('/', { replace: true });
return; return;
@@ -47,7 +47,7 @@ export default function ProtectedRoute({ children, requiredRole }: ProtectedRout
} }
// If role is required but user doesn't have it, don't render // If role is required but user doesn't have it, don't render
if (requiredRole && user?.role !== requiredRole) { if (requiredRole && (user?.role || (user?.is_superuser ? 'Admin' : 'User')) !== requiredRole) {
return ( return (
<div className="min-h-screen flex items-center justify-center"> <div className="min-h-screen flex items-center justify-center">
<div className="text-center"> <div className="text-center">

View File

@@ -19,7 +19,7 @@ export default function UserProfile({ isDropdown = false, onClose }: UserProfile
const { user, logout } = useAuth(); const { user, logout } = useAuth();
const navigate = useNavigate(); const navigate = useNavigate();
const [isEditing, setIsEditing] = useState(false); const [isEditing, setIsEditing] = useState(false);
const [editedName, setEditedName] = useState(user?.name || ''); const [editedName, setEditedName] = useState(user?.name || user?.full_name || '');
const handleSave = () => { const handleSave = () => {
// In a real app, this would make an API call to update user profile // In a real app, this would make an API call to update user profile
@@ -28,7 +28,7 @@ export default function UserProfile({ isDropdown = false, onClose }: UserProfile
}; };
const handleCancel = () => { const handleCancel = () => {
setEditedName(user?.name || ''); setEditedName(user?.name || user?.full_name || '');
setIsEditing(false); setIsEditing(false);
}; };
@@ -46,10 +46,10 @@ export default function UserProfile({ isDropdown = false, onClose }: UserProfile
<div className="flex items-center space-x-3 pb-4 border-b"> <div className="flex items-center space-x-3 pb-4 border-b">
<UserCircleIcon className="h-12 w-12 text-gray-400" /> <UserCircleIcon className="h-12 w-12 text-gray-400" />
<div> <div>
<p className="font-medium text-gray-900">{user.name}</p> <p className="font-medium text-gray-900">{user.name || user.full_name || user.username}</p>
<p className="text-sm text-gray-500">@{user.username}</p> <p className="text-sm text-gray-500">@{user.username}</p>
<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-blue-100 text-blue-800"> <span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-blue-100 text-blue-800">
{user.role} {user.role || (user.is_superuser ? 'Admin' : 'User')}
</span> </span>
</div> </div>
</div> </div>
@@ -98,10 +98,10 @@ export default function UserProfile({ isDropdown = false, onClose }: UserProfile
</button> </button>
</div> </div>
<div> <div>
<h3 className="text-xl font-semibold text-gray-900">{user.name}</h3> <h3 className="text-xl font-semibold text-gray-900">{user.name || user.full_name || user.username}</h3>
<p className="text-gray-600">@{user.username}</p> <p className="text-gray-600">@{user.username}</p>
<span className="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium bg-blue-100 text-blue-800 mt-2"> <span className="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium bg-blue-100 text-blue-800 mt-2">
{user.role} {user.role || (user.is_superuser ? 'Admin' : 'User')}
</span> </span>
</div> </div>
</div> </div>
@@ -136,7 +136,7 @@ export default function UserProfile({ isDropdown = false, onClose }: UserProfile
</div> </div>
) : ( ) : (
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<span className="text-gray-900">{user.name}</span> <span className="text-gray-900">{user.name || user.full_name || user.username}</span>
<button <button
onClick={() => setIsEditing(true)} onClick={() => setIsEditing(true)}
className="text-blue-600 hover:text-blue-800" className="text-blue-600 hover:text-blue-800"
@@ -170,7 +170,7 @@ export default function UserProfile({ isDropdown = false, onClose }: UserProfile
Role Role
</label> </label>
<span className="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium bg-blue-100 text-blue-800"> <span className="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium bg-blue-100 text-blue-800">
{user.role} {user.role || (user.is_superuser ? 'Admin' : 'User')}
</span> </span>
<p className="text-xs text-gray-500 mt-1">Role is managed by system administrators</p> <p className="text-xs text-gray-500 mt-1">Role is managed by system administrators</p>
</div> </div>

View File

@@ -0,0 +1,59 @@
import * as React from "react"
import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils"
const alertVariants = cva(
"relative w-full rounded-lg border p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground",
{
variants: {
variant: {
default: "bg-background text-foreground",
destructive:
"border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive",
},
},
defaultVariants: {
variant: "default",
},
}
)
const Alert = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
>(({ className, variant, ...props }, ref) => (
<div
ref={ref}
role="alert"
className={cn(alertVariants({ variant }), className)}
{...props}
/>
))
Alert.displayName = "Alert"
const AlertTitle = React.forwardRef<
HTMLParagraphElement,
React.HTMLAttributes<HTMLHeadingElement>
>(({ className, ...props }, ref) => (
<h5
ref={ref}
className={cn("mb-1 font-medium leading-none tracking-tight", className)}
{...props}
/>
))
AlertTitle.displayName = "AlertTitle"
const AlertDescription = React.forwardRef<
HTMLParagraphElement,
React.HTMLAttributes<HTMLParagraphElement>
>(({ className, ...props }, ref) => (
<div
ref={ref}
className={cn("text-sm [&_p]:leading-relaxed", className)}
{...props}
/>
))
AlertDescription.displayName = "AlertDescription"
export { Alert, AlertTitle, AlertDescription }

View File

@@ -0,0 +1,28 @@
import * as React from "react"
import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
import { Check } from "lucide-react"
import { cn } from "@/lib/utils"
const Checkbox = React.forwardRef<
React.ElementRef<typeof CheckboxPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
>(({ className, ...props }, ref) => (
<CheckboxPrimitive.Root
ref={ref}
className={cn(
"peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
className
)}
{...props}
>
<CheckboxPrimitive.Indicator
className={cn("flex items-center justify-center text-current")}
>
<Check className="h-4 w-4" />
</CheckboxPrimitive.Indicator>
</CheckboxPrimitive.Root>
))
Checkbox.displayName = CheckboxPrimitive.Root.displayName
export { Checkbox }

View File

@@ -0,0 +1,120 @@
import * as React from "react"
import * as DialogPrimitive from "@radix-ui/react-dialog"
import { X } from "lucide-react"
import { cn } from "@/lib/utils"
const Dialog = DialogPrimitive.Root
const DialogTrigger = DialogPrimitive.Trigger
const DialogPortal = DialogPrimitive.Portal
const DialogClose = DialogPrimitive.Close
const DialogOverlay = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Overlay>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Overlay
ref={ref}
className={cn(
"fixed inset-0 z-50 bg-background/80 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
className
)}
{...props}
/>
))
DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
const DialogContent = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
>(({ className, children, ...props }, ref) => (
<DialogPortal>
<DialogOverlay />
<DialogPrimitive.Content
ref={ref}
className={cn(
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
className
)}
{...props}
>
{children}
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
<X className="h-4 w-4" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
</DialogPrimitive.Content>
</DialogPortal>
))
DialogContent.displayName = DialogPrimitive.Content.displayName
const DialogHeader = ({
className,
...props
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
"flex flex-col space-y-1.5 text-center sm:text-left",
className
)}
{...props}
/>
)
DialogHeader.displayName = "DialogHeader"
const DialogFooter = ({
className,
...props
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
"flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
className
)}
{...props}
/>
)
DialogFooter.displayName = "DialogFooter"
const DialogTitle = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Title>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Title
ref={ref}
className={cn(
"text-lg font-semibold leading-none tracking-tight",
className
)}
{...props}
/>
))
DialogTitle.displayName = DialogPrimitive.Title.displayName
const DialogDescription = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Description>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Description
ref={ref}
className={cn("text-sm text-muted-foreground", className)}
{...props}
/>
))
DialogDescription.displayName = DialogPrimitive.Description.displayName
export {
Dialog,
DialogPortal,
DialogOverlay,
DialogClose,
DialogTrigger,
DialogContent,
DialogHeader,
DialogFooter,
DialogTitle,
DialogDescription,
}

View File

@@ -10,6 +10,8 @@ interface User {
username: string; username: string;
email: string; email: string;
full_name?: string; full_name?: string;
name?: string; // For backward compatibility
role?: string; // For backward compatibility
is_active: boolean; is_active: boolean;
is_superuser: boolean; is_superuser: boolean;
is_verified: boolean; is_verified: boolean;

View File

@@ -35,15 +35,10 @@ export default function Login() {
setError(null); setError(null);
try { try {
const success = await login(credentials.username, credentials.password); await login(credentials.username, credentials.password);
if (success) {
navigate(returnPath); navigate(returnPath);
} else { } catch (err: any) {
setError('Invalid username or password'); setError(err.message || 'Login failed. Please try again.');
}
} catch (err) {
setError('Login failed. Please try again.');
} finally { } finally {
setIsLoading(false); setIsLoading(false);
} }