Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ipk 117 server actions error handling #25

Merged
merged 5 commits into from
Jan 22, 2024
Merged

Ipk 117 server actions error handling #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9348591
IPK-117 Initial error functionality given
Jan 19, 2024
ca29e7b
IPK-117 Implemented full error handling system from server actions; b…
Jan 19, 2024
a3555d9
IPK-117 refactor
Jan 19, 2024
a1d5e55
Merge branch 'dev' into IPK-117-Server-Actions-Error-Handling
bencodes07 Jan 22, 2024
5782074
style: format code with Prettier
deepsource-autofix[bot] Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bun.lockb
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-toast": "^1.1.5",
"@radix-ui/react-tooltip": "^1.0.7",
"@react-three/drei": "^9.93.0",
"@react-three/fiber": "^8.15.14",
Expand All @@ -23,6 +24,7 @@
"@splinetool/runtime": "^1.0.26",
"@tweenjs/tween.js": "^21.0.0",
"class-variance-authority": "^0.7.0",
"classnames": "^2.5.1",
"clsx": "^2.1.0",
"framer-motion": "^10.18.0",
"jsonwebtoken": "^9.0.2",
Expand Down
2 changes: 2 additions & 0 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import React from "react";

import { cn } from "@/lib/utils";
import TokenRefresh from "@/components/auth/TokenRefresh";
import { Toaster } from "@/components/ui/toaster";

const fontSans = FontSans({
subsets: ["latin"],
Expand All @@ -22,6 +23,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
<body className={cn("min-h-screen bg-background font-sans antialiased", fontSans.variable)}>
{/* <TokenRefresh /> */}
<ReduxProvider>{children}</ReduxProvider>
<Toaster />
</body>
</html>
);
Expand Down
162 changes: 74 additions & 88 deletions src/app/login/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
"use client";
import { login } from "@/services/authService";
import { useDispatch } from "react-redux";
import Link from "next/link";
import { Separator } from "@/components/ui/separator";
import { Input } from "@/components/ui/input";
Expand All @@ -9,44 +7,44 @@ import { Button } from "@/components/ui/button";
import { FaGithub, FaGoogle } from "react-icons/fa6";
import { IoLogInOutline } from "react-icons/io5";
import Image from "next/image";
import { zodResolver } from "@hookform/resolvers/zod";
import { useForm } from "react-hook-form";
import * as z from "zod";
import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form";
import { useState } from "react";
import { FetchEventResult } from "next/dist/server/web/types";
import { useFormStatus, useFormState } from "react-dom";
import { loginUser } from "@/lib/actions";
import cx from "classnames";
import { useEffect } from "react";
import { useToast } from "@/components/ui/use-toast";

const formSchema = z.object({
email: z.string().email({ message: "Invalid email" }).min(5),
password: z.string().min(8, { message: "Password must be at least 8 characters long" })
});
const SubmitButton = () => {
const { pending } = useFormStatus();

const LoginForm = () => {
const dispatch = useDispatch();
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string>("");
return (
<Button type="submit" className="w-full gap-2 text-foreground" disabled={pending}>
<IoLogInOutline className="font-bold text-lg" />
Log In
</Button>
);
};

const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
defaultValues: {
const LoginForm = () => {
const { toast } = useToast();
const [formState, formAction] = useFormState(loginUser, {
message: "",
errors: undefined,
fieldValues: {
email: "",
password: ""
}
});

async function onSubmit(values: z.infer<typeof formSchema>) {
setLoading(true);
try {
const result = (await login(dispatch, values)) as PromiseFulfilledResult<FetchEventResult>;
setError(result?.status === undefined ? "Invalid email or password" : "");
setLoading(false);
} catch (error) {
console.error(error);
setError("Invalid email or password");
setLoading(false);
throw error;
useEffect(() => {
if (formState.message === "success") {
toast({
title: "Logged In!",
description: "Welcome back! You will be redirected any moment",
variant: "default",
className: "border-emerald-300"
});
}
}
}, [formState, toast]);

return (
<div className="w-screen min-h-screen flex justify-center items-center flex-col authBg">
Expand Down Expand Up @@ -83,65 +81,53 @@ const LoginForm = () => {
<Separator className="w-[45%] bg-foreground" />
</div>

<Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)} className="w-full h-full flex justify-center flex-col gap-y-6">
<FormField
control={form.control}
name="email"
render={({ field }) => (
<FormItem>
<FormControl>
<Input
placeholder="Email"
className="border-primary text-foreground bg-background"
{...field}
disabled={loading}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="password"
render={({ field }) => (
<FormItem>
<FormControl>
<Input
placeholder="Password"
type="password"
className="border-primary text-foreground bg-background"
{...field}
disabled={loading}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
{error && <p className="text-red-800">{error}</p>}
<div className="w-full flex justify-between items-center">
<div className="flex justify-start items-center text-foreground gap-x-2">
<Checkbox defaultChecked id="remember" />
<div className="grid gap-1.5 leading-none">
<label
htmlFor="remember"
className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
Remember me
</label>
</div>
<form action={formAction} className="w-full h-full flex justify-center flex-col gap-y-6">
<Input
placeholder="Email"
required
name="email"
className={cx(
"text-foreground bg-background border-primary",
formState.errors?.email && "border-red-700"
)}
/>

<Input
placeholder="Password"
required
name="password"
type="password"
className={cx(
"text-foreground bg-background border-primary",
formState.errors?.password && "border-red-700"
)}
/>

{formState?.message === "error" ? (
<div className="flex justify-start items-start mt-[-10px] mb-[-10px] flex-col">
<p className="text-red-700 text-sm empty:hidden">{formState?.errors?.email}</p>
<p className="text-red-700 text-sm empty:hidden">{formState?.errors?.password}</p>
</div>
) : (
""
)}
<div className="w-full flex justify-between items-center">
<div className="flex justify-start items-center text-foreground gap-x-2">
<Checkbox defaultChecked id="remember" />
<div className="grid gap-1.5 leading-none">
<label
htmlFor="remember"
className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
Remember me
</label>
</div>
<Link className="text-primary hover:underline text-sm" href="/forgot-password">
Forgot password?
</Link>
</div>
<Button type="submit" className="w-full gap-2 text-foreground" disabled={loading}>
<IoLogInOutline className="font-bold text-lg" />
Log In
</Button>
</form>
</Form>
<Link className="text-primary hover:underline text-sm" href="/forgot-password">
Forgot password?
</Link>
</div>
<SubmitButton />
</form>
</div>
</div>
<div className="flex justify-center items-center flex-col my-8">
Expand Down
Loading
Loading