From fb6f58798148635dd556a98964e0da1f665675b5 Mon Sep 17 00:00:00 2001 From: Hossein Rahmani Date: Mon, 8 Jan 2024 22:45:02 +0330 Subject: [PATCH] Bugs fixed --- app/components/Landing.tsx | 7 ++++++- components/ProfileDropDown.tsx | 4 +++- components/RequestStep2.tsx | 14 ++++++++++---- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/app/components/Landing.tsx b/app/components/Landing.tsx index 4648d20..6faf06c 100644 --- a/app/components/Landing.tsx +++ b/app/components/Landing.tsx @@ -114,7 +114,12 @@ export default function Landing() { " key={index} href={item.link} - onClick={() => localStorage.removeItem("Sootzani_Login_State")} + onClick={() => { + localStorage.removeItem("Sootzani_Login_State"); + if (index == 0) { + localStorage.setItem("unknown", "true"); + } + }} >

{item.description} diff --git a/components/ProfileDropDown.tsx b/components/ProfileDropDown.tsx index 0f8c414..1cbbb70 100644 --- a/components/ProfileDropDown.tsx +++ b/components/ProfileDropDown.tsx @@ -54,7 +54,9 @@ export default function ProfileDropDown() { return ( - + diff --git a/components/RequestStep2.tsx b/components/RequestStep2.tsx index dea3812..f8ea290 100644 --- a/components/RequestStep2.tsx +++ b/components/RequestStep2.tsx @@ -45,6 +45,7 @@ import { ThreeDots } from "react-loader-spinner"; import useToken from "@/store/useToken"; import { toast } from "sonner"; import { RefreshCcw } from "lucide-react"; +import { getCookie } from "cookies-next"; const MAX_IMAGE_SIZE = 5242880; // 5 MB const ALLOWED_IMAGE_TYPES = [ @@ -117,9 +118,11 @@ export default function RequestStep2() { localStorage.setItem("password", res.password); router.push("/RequestResult"); }, - onError: (error) => { toast("مشکلی در ارسال درخواست به وجود آمد.", { - className: "!bg-red-500 !text-white", - });}, + onError: (error) => { + toast("مشکلی در ارسال درخواست به وجود آمد.", { + className: "!bg-red-500 !text-white", + }); + }, }); const authorizedComplaintSubmitMutation = useMutation({ @@ -190,7 +193,9 @@ export default function RequestStep2() { formData.append("Captcha.Key", CaptchaData?.headers["captcha-key"]); formData.append("Complaining", data.person ? data.person : ""); formData.append("OrganizationId", data.OrganizationId); - if (isAuth) { + const unknown = localStorage.getItem("unknown"); + const isAuth = getCookie("Sootzani_Token"); + if (isAuth && !unknown) { authorizedComplaintSubmitMutation.mutate({ Data: formData, }); @@ -199,6 +204,7 @@ export default function RequestStep2() { Data: formData, }); } + refetch(); resetField("Title"); resetField("Text"); diff --git a/package-lock.json b/package-lock.json index 8b986fa..2fc05aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sootzani", - "version": "0.1.4", + "version": "0.1.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "sootzani", - "version": "0.1.4", + "version": "0.1.5", "dependencies": { "@hookform/resolvers": "^3.3.2", "@radix-ui/react-alert-dialog": "^1.0.5", diff --git a/package.json b/package.json index 10fae8c..6a5d2b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sootzani", - "version": "0.1.4", + "version": "0.1.5", "private": true, "scripts": { "dev": "next dev",