diff --git a/.env b/.env
new file mode 100644
index 0000000..acdeed6
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+NEXT_PUBLIC_BASE_URL_APP="https://shahrbinapi.shetabdahi.ir/"
\ No newline at end of file
diff --git a/.eslintrc.json b/.eslintrc.json
index bffb357..fe73d21 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,3 +1,3 @@
{
- "extends": "next/core-web-vitals"
-}
+ "extends": ["next/babel","next/core-web-vitals"]
+}
\ No newline at end of file
diff --git a/app/Verify/page.tsx b/app/Verify/page.tsx
new file mode 100644
index 0000000..1f84f57
--- /dev/null
+++ b/app/Verify/page.tsx
@@ -0,0 +1,10 @@
+import Verify from '@/components/Verify/Verify'
+import React from 'react'
+
+function page() {
+ return (
+
+ )
+}
+
+export default page
\ No newline at end of file
diff --git a/app/layout.tsx b/app/layout.tsx
index 3314e47..14a8401 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,6 +1,9 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./globals.css";
+import { Toaster } from "@/components/ui/toaster";
+import Provider from "../utils/ReactQuery/Provider";
+import { Toaster as SonnerToaster } from "@/components/ui/sonner";
const inter = Inter({ subsets: ["latin"] });
@@ -16,7 +19,13 @@ export default function RootLayout({
}>) {
return (
-
{children}
+
+
+ {children}
+
+
+
+
);
}
diff --git a/components/SignIn/LoginForm.tsx b/components/SignIn/LoginForm.tsx
index 5220072..960744a 100644
--- a/components/SignIn/LoginForm.tsx
+++ b/components/SignIn/LoginForm.tsx
@@ -14,14 +14,20 @@ import {
FormMessage,
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
+import { toast } from "sonner";
import Image from "next/image";
import { RefreshCcw } from "lucide-react";
import { Oval, ThreeDots } from "react-loader-spinner";
import img1 from "@/assets/images/direct.png";
import Link from "next/link";
+import { getCaptcha } from "@/utils/commonApi";
+import { useRouter } from "next/navigation";
+import useData from "@/store/useData";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { logisterCitizen } from "@/utils/authenticateApi";
const formSchema = z.object({
- username: z.string({ required_error: "*فیلد اجباری*" }).max(11, {
+ phoneNumber: z.string({ required_error: "*فیلد اجباری*" }).max(11, {
message: "حداکثر تعداد کاراکتر 11 تا میباشد.",
}),
@@ -31,106 +37,157 @@ const formSchema = z.object({
});
function LoginForm() {
- // 1. Define your form.
- const form = useForm>({
- resolver: zodResolver(formSchema),
- // defaultValues: {
- // username: "",
+ const router = useRouter();
+ const saveData = useData((state) => state.saveData);
+
+ const {
+ data: CaptchaData,
+ isLoading,
+ refetch,
+ } = useQuery({
+ queryKey: ["Captcha"],
+ queryFn: () => getCaptcha(),
+ refetchOnWindowFocus: false,
+ });
+
+ const loginMutation = useMutation({
+ mutationFn: logisterCitizen,
+ onSuccess: (res: any | string) => {
+ localStorage.setItem("VerifyRole", "citizen");
+ localStorage.setItem("verificationToken", res);
+ },
+ onError: (err: any | string) => {
+ if (err.response.status == 428) {
+ router.push("/Verify");
+ }
+ },
+
+ // onSuccess: (res: any | string) => {
+ // router.push("/Verify");
+ // localStorage.setItem("VerifyRole", "citizen");
+ // localStorage.setItem("verificationToken", res);
+ // },
+ // onError: (err: any | string) => {
+ // refetch();
+ // toast(<>{err.response.data.detail}>, {
+ // className: "!bg-red-500 !text-white",
+ // });
// },
});
+ // 1. Define your form.
+ const form = useForm>({
+ resolver: zodResolver(formSchema),
+ });
+
// 2. Define a submit handler.
- function onSubmit(values: z.infer) {
- // Do something with the form values.
- // ✅ This will be type-safe and validated.
- console.log(values);
+ function onSubmit(data: z.infer) {
+ const payload = {
+ phoneNumber: data.phoneNumber,
+ captcha: {
+ key: CaptchaData?.headers["captcha-key"],
+ value: data.captcha,
+ },
+ };
+ loginMutation.mutateAsync(payload);
+ saveData({
+ phoneNumber: data.phoneNumber,
+ });
+
+ console.log(data);
}
+ const srcForImage = CaptchaData
+ ? URL.createObjectURL(CaptchaData.data)
+ : null;
+
return (
<>
-