Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/hooks/use-form-action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ interface UseFormActionOptions<TFieldValues extends FieldValues, TData> {
}

interface UseFormActionReturn<TFieldValues extends FieldValues> {
form: UseFormReturn<TFieldValues, any>; // Add 'any' context parameter to align return types
form: UseFormReturn<TFieldValues, any>;
onSubmit: (data: TFieldValues) => void;
}

Expand Down
6 changes: 3 additions & 3 deletions src/hooks/use-log-in.ts → src/modules/auth/auth.hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useForm } from "react-hook-form";
import { actions } from "astro:actions";
import { navigate } from "astro:transitions/client";
import { type LoginInput, loginSchema } from "@/schema/login";
import { useAction } from "@/hooks/use-action";
import { LoginInput, loginSchema } from "./auth.schema";

export default function useLogIn() {
const form = useForm<LoginInput>({
Expand All @@ -15,7 +15,7 @@ export default function useLogIn() {
});

// Setup the action runner using your custom hook
const { execute } = useAction(
const { execute, isLoading } = useAction(
async (data: LoginInput) => {
const result = await actions.login(data);

Expand Down Expand Up @@ -45,5 +45,5 @@ export default function useLogIn() {
execute(data);
};

return { form, onSubmit };
return { form, onSubmit, isLoading };
}
14 changes: 7 additions & 7 deletions src/modules/auth/components/login.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { FormInput } from "@/components/ui/form-input";
import { logInFields } from "@/config/login-fields";
import { Spinner } from "@/components/ui/spinner";
import { Toaster } from "@/components/ui/sonner";
import { Button } from "@/components/ui/button";
import { Form } from "@/components/ui/form";
import { FormInput } from "@/components/ui/form-input";
import useLogIn from "@/hooks/use-log-in";
import { Spinner } from "@/components/ui/spinner";
import useLogIn from "../auth.hooks";

export function LogInForm() {
const { form, isPending, onSubmit } = useLogIn();
const { form, isLoading, onSubmit } = useLogIn();

return (
<Form {...form}>
Expand All @@ -22,11 +22,11 @@ export function LogInForm() {
label={field.label}
placeholder={field.placeholder}
type={field.type}
disabled={isPending}
disabled={isLoading}
/>
))}
<Button type="submit" className="w-full font-bold" disabled={isPending}>
{isPending ? <Spinner /> : "Log in"}
<Button type="submit" className="w-full font-bold" disabled={isLoading}>
{isLoading ? <Spinner /> : "Log in"}
</Button>
</form>
</Form>
Expand Down
30 changes: 0 additions & 30 deletions src/schema/login.ts

This file was deleted.

Loading