diff --git a/app/layout.tsx b/app/layout.tsx index c59d2c5..1d20b52 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -2,7 +2,7 @@ import type { Metadata } from "next"; import "./globals.css"; import { Toaster } from "@/components/ui/toaster"; import Navbar from "@/components/Navbar"; -import Provider from "../utils/Provider"; +import Provider from "../utils/ReactQuery/Provider"; import { Toaster as SonnerToaster } from "@/components/ui/sonner"; import ProgressBarProviders from "@/components/ProgressBar"; import { unstable_noStore as noStore } from "next/cache"; diff --git a/components/ComplainsDetails.tsx b/components/ComplainsDetails.tsx index 5450580..1a480a0 100644 --- a/components/ComplainsDetails.tsx +++ b/components/ComplainsDetails.tsx @@ -149,8 +149,8 @@ export default function ComplainsDetails({ data = getComplaintMutation?.data; const possibleOperations = data?.possibleOperationsWithDescription; if (possibleOperations?.length == 0) { - localStorage.removeItem("trackingNumber2"); - localStorage.removeItem("password2"); + localStorage.removeItem("trackingNumber2"); + localStorage.removeItem("password2"); } return ( @@ -205,7 +205,7 @@ export default function ComplainsDetails({ )} */} {/* Editt */} -
+
{/* 1 */}
{/* ***** */} @@ -253,6 +253,12 @@ export default function ComplainsDetails({ {data.complaining ? data.complaining : "-"}

+

+ کد پیگیری:{" "} + + {data.trackingNumber ? data.trackingNumber : "-"} + +

زمان ثبت:{" "} diff --git a/components/FollowUp.tsx b/components/FollowUp.tsx index 481d3bc..ca6e8aa 100644 --- a/components/FollowUp.tsx +++ b/components/FollowUp.tsx @@ -28,11 +28,11 @@ import { toast } from "sonner"; import { Oval } from "react-loader-spinner"; const FormSchema = z.object({ - trackingNumber: z.string().min(2, { - message: "trackingNumber must be at least 2 characters.", + trackingNumber: z.string().min(1, { + message: "لطفا کد پیگیری را وارد نمایید.", }), - password: z.string().min(4, { - message: "Password must be at least 4 characters.", + password: z.string().min(1, { + message: "لطفا رمز عبور خود را وارد نمایید.", }), }); @@ -45,7 +45,7 @@ export default function FollowUp() { onSuccess: (res) => { const result = res; - + // router.push("/FollowResult"); router.push("/FollowResult", { data: JSON.stringify(result) }); }, @@ -73,7 +73,7 @@ export default function FollowUp() { // // ), // }); - + localStorage.setItem("trackingNumber2", data.trackingNumber); localStorage.setItem("password2", data.password); diff --git a/components/RequestStep1.tsx b/components/RequestStep1.tsx index c202493..556dce3 100644 --- a/components/RequestStep1.tsx +++ b/components/RequestStep1.tsx @@ -30,21 +30,21 @@ const FormSchema = z.object({ lastName: z.string().min(1, { message: "لطفا نام خانوادگی خود را وارد نمایید.", }), - nationalId: z - .string() - .length(10, { message: "کد ملی معتبر نمی باشد." }) - .transform((value) => { - const parsedNumber = Number(value); - if (Number.isNaN(parsedNumber)) { - throw new Error("کد ملی معتبر نمی باشد."); - } else if ( - Number(parsedNumber) > 100000000 && - Number(parsedNumber) < 999999999 - ) { - throw new Error("کد ملی معتبر نمی باشد."); - } - return parsedNumber; - }), + // nationalId: z + // .string() + // .length(10, { message: "کد ملی معتبر نمی باشد." }) + // .transform((value) => { + // const parsedNumber = Number(value); + // if (Number.isNaN(parsedNumber)) { + // throw new Error("کد ملی معتبر نمی باشد."); + // } else if ( + // Number(parsedNumber) > 100000000 && + // Number(parsedNumber) < 999999999 + // ) { + // throw new Error("کد ملی معتبر نمی باشد."); + // } + // return parsedNumber; + // }), }); export default function RequestStep1() { @@ -82,21 +82,12 @@ export default function RequestStep1() { if (profileData) { form.setValue("firstName", profileData.firstName); form.setValue("lastName", profileData.lastName); - form.setValue("nationalId", profileData.nationalId); } }, [profileData]); function onSubmit(data: z.infer) { - // toast({ - // title: "You submitted the following values:", - // description: ( - //

-    //       {JSON.stringify(data, null, 2)}
-    //     
- // ), - // }); - const strNationalId = String(data.nationalId); - const payload = { ...data, nationalId: strNationalId }; + // const strNationalId = String(data.nationalId); + const payload = data; editProfileMutation.mutate(payload); } diff --git a/components/ui/button.tsx b/components/ui/button.tsx index 0ba4277..0e91656 100644 --- a/components/ui/button.tsx +++ b/components/ui/button.tsx @@ -9,7 +9,7 @@ const buttonVariants = cva( { variants: { variant: { - default: "bg-primary text-primary-foreground hover:bg-primary/90", + default: "bg-primary text-primary-foreground hover:bg-blue/90", destructive: "bg-destructive text-destructive-foreground hover:bg-destructive/90", outline: diff --git a/utils/Provider.jsx b/utils/ReactQuery/Provider.jsx similarity index 100% rename from utils/Provider.jsx rename to utils/ReactQuery/Provider.jsx diff --git a/utils/getQueryClient.jsx b/utils/ReactQuery/getQueryClient.jsx similarity index 100% rename from utils/getQueryClient.jsx rename to utils/ReactQuery/getQueryClient.jsx diff --git a/utils/hydrate.client.jsx b/utils/ReactQuery/hydrate.client.jsx similarity index 100% rename from utils/hydrate.client.jsx rename to utils/ReactQuery/hydrate.client.jsx diff --git a/utils/authenticateApi.ts b/utils/authenticateApi.ts index aa5cc8a..20411c9 100644 --- a/utils/authenticateApi.ts +++ b/utils/authenticateApi.ts @@ -111,7 +111,7 @@ export async function getProfile() { export async function editProfile(payload: { firstName: string; lastName: string; - nationalId: string; + nationalId?: string; title?: string; }) { const token = getCookie("Sootzani_Token");