diff --git a/sigap-website/app/(pages)/(auth)/_components/sign-in-with-credential.tsx b/sigap-website/app/(pages)/(auth)/_components/sign-in-with-credential.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/sigap-website/app/(pages)/(auth)/_components/signin-form.tsx b/sigap-website/app/(pages)/(auth)/_components/signin-form.tsx
index 699755b..95b66d5 100644
--- a/sigap-website/app/(pages)/(auth)/_components/signin-form.tsx
+++ b/sigap-website/app/(pages)/(auth)/_components/signin-form.tsx
@@ -9,7 +9,7 @@ import Link from "next/link";
import { FormField } from "@/app/_components/form-field";
// import { useSignInController } from "@/src/interface-adapters/controllers/auth/sign-in.controller";
import { useState } from "react";
-import { signIn } from "../action";
+
import { useSignInHandler } from "../_handlers/use-sign-in";
export function SignInForm({
@@ -98,7 +98,7 @@ export function SignInForm({
{isPending ? (
<>
- Signing in...
+ Sign in
) : (
"Sign in"
diff --git a/sigap-website/app/(pages)/(auth)/_handlers/use-sign-in.ts b/sigap-website/app/(pages)/(auth)/_handlers/use-sign-in.ts
index b35b081..e55e021 100644
--- a/sigap-website/app/(pages)/(auth)/_handlers/use-sign-in.ts
+++ b/sigap-website/app/(pages)/(auth)/_handlers/use-sign-in.ts
@@ -1,5 +1,5 @@
import { useNavigations } from "@/app/_hooks/use-navigations";
-import { useSignInMutation } from "../_queries/mutations";
+import { useSignInPasswordlessMutation } from "../_queries/mutations";
import { toast } from "sonner";
import { useState } from "react";
import { useForm } from "react-hook-form";
@@ -7,7 +7,7 @@ import { ISignInPasswordlessSchema, SignInPasswordlessSchema } from "@/src/entit
import { zodResolver } from "@hookform/resolvers/zod";
export function useSignInHandler() {
- const { mutateAsync: signIn, isPending, error: errors } = useSignInMutation();
+ const { mutateAsync: signIn, isPending, error: errors } = useSignInPasswordlessMutation();
const { router } = useNavigations();
const [error, setError] = useState();
diff --git a/sigap-website/app/(pages)/(auth)/_queries/mutations.ts b/sigap-website/app/(pages)/(auth)/_queries/mutations.ts
index 9d4ee98..7eabde1 100644
--- a/sigap-website/app/(pages)/(auth)/_queries/mutations.ts
+++ b/sigap-website/app/(pages)/(auth)/_queries/mutations.ts
@@ -1,10 +1,17 @@
import { useMutation } from "@tanstack/react-query"
-import { sendMagicLink, sendPasswordRecovery, signIn, signOut, verifyOtp } from "../action"
+import { sendMagicLink, sendPasswordRecovery, signInPasswordless, signInWithPassword, signOut, verifyOtp } from "../action"
-export const useSignInMutation = () => {
+export const useSignInPasswordlessMutation = () => {
return useMutation({
mutationKey: ["signIn"],
- mutationFn: async (formData: FormData) => await signIn(formData),
+ mutationFn: async (formData: FormData) => await signInPasswordless(formData),
+ })
+}
+
+export const useSignInWithPasswordMutation = () => {
+ return useMutation({
+ mutationKey: ["signInWithCredentials"],
+ mutationFn: async (formData: FormData) => await signInWithPassword(formData),
})
}
diff --git a/sigap-website/app/(pages)/(auth)/action.ts b/sigap-website/app/(pages)/(auth)/action.ts
index 00dfc79..7077085 100644
--- a/sigap-website/app/(pages)/(auth)/action.ts
+++ b/sigap-website/app/(pages)/(auth)/action.ts
@@ -8,17 +8,18 @@ import { InputParseError, NotFoundError } from "@/src/entities/errors/common"
import { AuthenticationError, UnauthenticatedError } from "@/src/entities/errors/auth"
import { createClient } from "@/app/_utils/supabase/server"
-export async function signIn(formData: FormData) {
+export async function signInPasswordless(formData: FormData) {
const instrumentationService = getInjection("IInstrumentationService")
return await instrumentationService.instrumentServerAction("signIn", {
recordResponse: true
},
async () => {
- const email = formData.get("email")?.toString()
try {
- const signInController = getInjection("ISignInController")
- return await signInController({ email })
+ const email = formData.get("email")?.toString()
+
+ const signInPasswordlessController = getInjection("ISignInPasswordlessController")
+ return await signInPasswordlessController({ email })
// if (email) {
// redirect(`/verify-otp?email=${encodeURIComponent(email)}`)
@@ -51,6 +52,43 @@ export async function signIn(formData: FormData) {
})
}
+
+export async function signInWithPassword(formData: FormData) {
+ const instrumentationService = getInjection("IInstrumentationService")
+ return await instrumentationService.instrumentServerAction("signInWithPassword", {
+ recordResponse: true
+ }, async () => {
+ try {
+ const email = formData.get("email")?.toString()
+ const password = formData.get("password")?.toString()
+
+ const signInWithPasswordController = getInjection("ISignInWithPasswordController")
+ return await signInWithPasswordController({ email, password })
+ } catch (err) {
+ if (err instanceof InputParseError) {
+ return { error: err.message }
+ }
+
+ if (err instanceof AuthenticationError) {
+ return { error: "Invalid credential. Please try again." }
+ }
+
+ if (err instanceof UnauthenticatedError || err instanceof NotFoundError) {
+ return {
+ error: 'User not found. Please tell your admin to create an account for you.',
+ };
+ }
+
+ const crashReporterService = getInjection('ICrashReporterService');
+ crashReporterService.report(err);
+
+ return {
+ error:
+ 'An error happened. The developers have been notified. Please try again later.',
+ };
+ }
+ })
+}
// export async function signUp(formData: FormData) {
// const instrumentationService = getInjection("IInstrumentationService")
// return await instrumentationService.instrumentServerAction("signUp", { recordResponse: true }, async () => {
diff --git a/sigap-website/app/(pages)/(auth)/handler.tsx b/sigap-website/app/(pages)/(auth)/handler.tsx
new file mode 100644
index 0000000..7817f5a
--- /dev/null
+++ b/sigap-website/app/(pages)/(auth)/handler.tsx
@@ -0,0 +1,161 @@
+// import { AuthenticationError } from "@/src/entities/errors/auth";
+// import { useState } from "react";
+// import { useAuthActions } from './queries';
+// import { useForm } from 'react-hook-form';
+// import { zodResolver } from '@hookform/resolvers/zod';;
+// import { toast } from 'sonner';
+// import { useNavigations } from '@/app/_hooks/use-navigations';
+// import {
+// IVerifyOtpSchema,
+// verifyOtpSchema,
+// } from '@/src/entities/models/auth/verify-otp.model';
+
+// /**
+// * Hook untuk menangani proses sign in
+// *
+// * @returns {Object} Object berisi handler dan state untuk form sign in
+// * @example
+// * const { handleSubmit, isPending, error } = useSignInHandler();
+// *
+// */
+// export function useSignInHandler() {
+// const { signIn } = useAuthActions();
+// const { router } = useNavigations();
+
+// const [error, setError] = useState();
+
+// const handleSubmit = async (event: React.FormEvent) => {
+// event.preventDefault();
+// if (signIn.isPending) return;
+
+// setError(undefined);
+
+// const formData = new FormData(event.currentTarget);
+// const email = formData.get('email')?.toString();
+
+// const res = await signIn.mutateAsync(formData);
+
+// if (!res?.error) {
+// toast('An email has been sent to you. Please check your inbox.');
+// if (email) router.push(`/verify-otp?email=${encodeURIComponent(email)}`);
+// } else {
+// setError(res.error);
+// }
+
+
+// };
+
+// return {
+// // formData,
+// // handleChange,
+// handleSignIn: handleSubmit,
+// error,
+// isPending: signIn.isPending,
+// errors: !!error || signIn.error,
+// clearError: () => setError(undefined),
+// };
+// }
+
+// export function useVerifyOtpHandler(email: string) {
+// const { router } = useNavigations();
+// const { verifyOtp } = useAuthActions();
+// const [error, setError] = useState();
+
+// const {
+// register,
+// handleSubmit: hookFormSubmit,
+// control,
+// formState: { errors },
+// setValue,
+// } = useForm({
+// resolver: zodResolver(verifyOtpSchema),
+// defaultValues: {
+// email,
+// token: '',
+// },
+// });
+
+// const handleOtpChange = (
+// value: string,
+// onChange: (value: string) => void
+// ) => {
+// onChange(value);
+
+// if (value.length === 6) {
+// handleSubmit();
+// }
+
+// // Clear error when user starts typing
+// if (error) {
+// setError(undefined);
+// }
+// };
+
+// const handleSubmit = hookFormSubmit(async (data) => {
+// if (verifyOtp.isPending) return;
+
+// setError(undefined);
+
+// // Create FormData object
+// const formData = new FormData();
+// formData.append('email', data.email);
+// formData.append('token', data.token);
+
+// await verifyOtp.mutateAsync(formData, {
+// onSuccess: () => {
+// toast.success('OTP verified successfully');
+// // Navigate to dashboard on success
+// router.push('/dashboard');
+// },
+// onError: (error) => {
+// setError(error.message);
+// },
+// });
+// });
+
+// return {
+// register,
+// control,
+// handleVerifyOtp: handleSubmit,
+// handleOtpChange,
+// errors: {
+// ...errors,
+// token: error ? { message: error } : errors.token,
+// },
+// isPending: verifyOtp.isPending,
+// clearError: () => setError(undefined),
+// };
+// }
+
+// export function useSignOutHandler() {
+// const { signOut } = useAuthActions();
+// const { router } = useNavigations();
+// const [error, setError] = useState();
+
+// const handleSignOut = async () => {
+// if (signOut.isPending) return;
+
+// setError(undefined);
+
+// await signOut.mutateAsync(undefined, {
+// onSuccess: () => {
+// toast.success('You have been signed out successfully');
+// router.push('/sign-in');
+// },
+// onError: (error) => {
+// if (error instanceof AuthenticationError) {
+// setError(error.message);
+// toast.error(error.message);
+// }
+// },
+// });
+// };
+
+// return {
+// handleSignOut,
+// error,
+// isPending: signOut.isPending,
+// errors: !!error || signOut.error,
+// clearError: () => setError(undefined),
+// };
+// }
diff --git a/sigap-website/app/(pages)/(auth)/sign-in/_components/carousal-quote.tsx b/sigap-website/app/(pages)/(auth)/sign-in/_components/carousal-quote.tsx
new file mode 100644
index 0000000..c943ca2
--- /dev/null
+++ b/sigap-website/app/(pages)/(auth)/sign-in/_components/carousal-quote.tsx
@@ -0,0 +1,50 @@
+import { Carousel, CarouselContent, CarouselItem } from "@/app/_components/ui/carousal"
+import { QuoteIcon } from "lucide-react"
+
+export const CarousalQuotes = () => {
+
+ const items = [
+ {
+ quote: "Tried @supabase for the first time yesterday. Amazing tool! I was able to get my Posgres DB up in no time and their documentation on operating on the DB is super easy! 👏 Can't wait for Cloud functions to arrive! It's gonna be a great Firebase alternative!",
+ author: "@codewithbhargav",
+ image: "https://github.com/shadcn.png",
+ },
+ {
+ quote: "Check out this amazing product @supabase. A must give try #newidea #opportunity",
+ author: "@techenthusiast",
+ image: "https://github.com/shadcn.png",
+ },
+ {
+ quote: "Check out this amazing product @supabase. A must give try #newidea #opportunity",
+ author: "@dataguru",
+ image: "https://github.com/shadcn.png",
+ },
+ ];
+
+ return (
+ <>
+
+
+ {items.map((item, index) => (
+
+
+ {/*
*/}
+
{item.quote}
+
+
+
+
+
-
-
{item.quote}
-
-
-
-
-