Skip to content

Commit

Permalink
feat: add auth "error handling"
Browse files Browse the repository at this point in the history
  • Loading branch information
chloeelim committed Sep 20, 2024
1 parent d9ccc31 commit 6ac1902
Show file tree
Hide file tree
Showing 8 changed files with 472 additions and 5 deletions.
2 changes: 2 additions & 0 deletions frontend/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { Metadata } from "next";
import { Inter as FontSans } from "next/font/google";

import Navbar from "@/components/navigation/navbar";
import { Toaster } from "@/components/ui/toaster";
import { cn } from "@/lib/utils";

import "./globals.css";
Expand Down Expand Up @@ -31,6 +32,7 @@ export default function RootLayout({
<div className="relative flex min-h-screen flex-col bg-background">
<Navbar />
<main className="w-full flex flex-1">{children}</main>
<Toaster />
</div>
</body>
</html>
Expand Down
26 changes: 24 additions & 2 deletions frontend/app/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
"use client";

import { useState } from "react";
import { SubmitHandler, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { CircleAlert } from "lucide-react";
import { z } from "zod";

import { logInAuthLoginPost } from "@/client";
import PasswordField from "@/components/form/fields/password-field";
import TextField from "@/components/form/fields/text-field";
import GoogleOAuthButton from "@/components/miscellaneous/google-oauth-button";
import Link from "@/components/navigation/link";
import { Alert, AlertDescription } from "@/components/ui/alert";
import { Box } from "@/components/ui/box";
import { Button } from "@/components/ui/button";
import {
Expand All @@ -33,20 +36,27 @@ const loginFormDefault = {
type LoginForm = z.infer<typeof loginFormSchema>;

function LoginPage() {
const [isError, seIstError] = useState<boolean>(false);
const form = useForm<LoginForm>({
resolver: zodResolver(loginFormSchema),
defaultValues: loginFormDefault,
});

const onSubmit: SubmitHandler<LoginForm> = async (data) => {
await logInAuthLoginPost({
const response = await logInAuthLoginPost({
body: { username: data.email, password: data.password },
});

if (response.error) {
seIstError(true);
} else {
seIstError(false);
}
};

return (
<Box className="flex flex-col m-auto w-full justify-center items-center gap-y-6">
<Card className="flex flex-col border-0 md:border px-6 sm:px-12 sm:py-6 md:max-w-lg">
<Card className="flex flex-col border-0 md:border px-6 sm:px-12 sm:py-3 md:max-w-lg">
<CardHeader className="space-y-3">
<CardTitle>Log in to {process.env.NEXT_PUBLIC_APP_NAME}</CardTitle>
<CardDescription>
Expand All @@ -72,6 +82,18 @@ function LoginPage() {

<CardContent>
<Box className="space-y-6">
{isError && (
<Alert variant="destructive">
<CircleAlert className="h-5 w-5" />
<AlertDescription>
Your email or password is incorrect. Please try again, or{" "}
<Link href="/user/password-reset" size="sm">
reset your password
</Link>
.
</AlertDescription>
</Alert>
)}
<Form {...form}>
<form
className="space-y-10"
Expand Down
31 changes: 28 additions & 3 deletions frontend/app/register/page.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
"use client";

import { useState } from "react";
import { SubmitHandler, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { CircleAlert } from "lucide-react";
import { z } from "zod";

import { signUpAuthSignupPost } from "@/client";
import PasswordField from "@/components/form/fields/password-field";
import TextField from "@/components/form/fields/text-field";
import GoogleOAuthButton from "@/components/miscellaneous/google-oauth-button";
import Link from "@/components/navigation/link";
import { Alert, AlertDescription } from "@/components/ui/alert";
import { Box } from "@/components/ui/box";
import { Button } from "@/components/ui/button";
import { Form } from "@/components/ui/form";

const registerFormSchema = z.object({
email: z.string().email("Invalid email address"),
password: z.string().min(1, "Password required"),
password: z.string().min(6, "Password should be at least 6 characters"),
});

const registerFormDefault = {
Expand All @@ -26,13 +29,23 @@ const registerFormDefault = {
type RegisterForm = z.infer<typeof registerFormSchema>;

function RegisterPage() {
const [isError, seIstError] = useState<boolean>(false);
const form = useForm<RegisterForm>({
resolver: zodResolver(registerFormSchema),
defaultValues: registerFormDefault,
});

const onSubmit: SubmitHandler<RegisterForm> = async (data) => {
await signUpAuthSignupPost({ body: { ...data } });
const response = await signUpAuthSignupPost({
body: { ...data },
withCredentials: true,
});

if (response.error) {
seIstError(true);
} else {
seIstError(false);
}
};

return (
Expand Down Expand Up @@ -67,6 +80,18 @@ function RegisterPage() {

{/* Body */}
<Box className="space-y-6 pt-0 flex-col w-full">
{isError && (
<Alert variant="destructive">
<CircleAlert className="h-5 w-5" />
<AlertDescription>
This email is already registered.{" "}
<Link href="/login" size="sm">
Sign in
</Link>{" "}
instead?
</AlertDescription>
</Alert>
)}
<Form {...form}>
<form
className="space-y-10"
Expand All @@ -81,7 +106,7 @@ function RegisterPage() {
<PasswordField
label="Password"
name="password"
placeholder="Minimum 8 characters"
placeholder="Minimum 6 characters"
/>
</div>

Expand Down
129 changes: 129 additions & 0 deletions frontend/components/ui/toast.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
"use client"

import * as React from "react"
import * as ToastPrimitives from "@radix-ui/react-toast"
import { cva, type VariantProps } from "class-variance-authority"
import { X } from "lucide-react"

import { cn } from "@/lib/utils"

const ToastProvider = ToastPrimitives.Provider

const ToastViewport = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Viewport>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Viewport
ref={ref}
className={cn(
"fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
className
)}
{...props}
/>
))
ToastViewport.displayName = ToastPrimitives.Viewport.displayName

const toastVariants = cva(
"group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
{
variants: {
variant: {
default: "border bg-background text-foreground",
destructive:
"destructive group border-destructive bg-destructive text-destructive-foreground",
},
},
defaultVariants: {
variant: "default",
},
}
)

const Toast = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Root>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> &
VariantProps<typeof toastVariants>
>(({ className, variant, ...props }, ref) => {
return (
<ToastPrimitives.Root
ref={ref}
className={cn(toastVariants({ variant }), className)}
{...props}
/>
)
})
Toast.displayName = ToastPrimitives.Root.displayName

const ToastAction = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Action>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Action
ref={ref}
className={cn(
"inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium ring-offset-background transition-colors hover:bg-secondary focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive",
className
)}
{...props}
/>
))
ToastAction.displayName = ToastPrimitives.Action.displayName

const ToastClose = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Close>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Close
ref={ref}
className={cn(
"absolute right-2 top-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600",
className
)}
toast-close=""
{...props}
>
<X className="h-4 w-4" />
</ToastPrimitives.Close>
))
ToastClose.displayName = ToastPrimitives.Close.displayName

const ToastTitle = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Title>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Title
ref={ref}
className={cn("text-sm font-semibold", className)}
{...props}
/>
))
ToastTitle.displayName = ToastPrimitives.Title.displayName

const ToastDescription = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Description>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Description
ref={ref}
className={cn("text-sm opacity-90", className)}
{...props}
/>
))
ToastDescription.displayName = ToastPrimitives.Description.displayName

type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>

type ToastActionElement = React.ReactElement<typeof ToastAction>

export {
type ToastProps,
type ToastActionElement,
ToastProvider,
ToastViewport,
Toast,
ToastTitle,
ToastDescription,
ToastClose,
ToastAction,
}
35 changes: 35 additions & 0 deletions frontend/components/ui/toaster.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"use client";

import {
Toast,
ToastClose,
ToastDescription,
ToastProvider,
ToastTitle,
ToastViewport,
} from "@/components/ui/toast";
import { useToast } from "@/hooks/use-toast";

export function Toaster() {
const { toasts } = useToast();

return (
<ToastProvider>
{toasts.map(function ({ id, title, description, action, ...props }) {
return (
<Toast key={id} {...props}>
<div className="grid gap-1">
{title && <ToastTitle>{title}</ToastTitle>}
{description && (
<ToastDescription>{description}</ToastDescription>
)}
</div>
{action}
<ToastClose />
</Toast>
);
})}
<ToastViewport />
</ToastProvider>
);
}
Loading

0 comments on commit 6ac1902

Please sign in to comment.