Compare commits

..

2 Commits

8 changed files with 17 additions and 15 deletions

View File

@ -163,7 +163,7 @@ export default function ComplainsDetails({
dir="rtl" dir="rtl"
id="picture" id="picture"
onChange={(e) => setPassword(e.target.value)} onChange={(e) => setPassword(e.target.value)}
className="bg-white hover:bg-white focus:bg-white" className="bg-white hover:bg-white focus:bg-white"
/> />
</div> </div>
<AlertDialogFooter className=" gap-y-2 max-md:w-full max-md:flex max-md:flex-col"> <AlertDialogFooter className=" gap-y-2 max-md:w-full max-md:flex max-md:flex-col">
@ -188,7 +188,7 @@ export default function ComplainsDetails({
{state !== "FollowResult" && ( {state !== "FollowResult" && (
<button <button
onClick={() => router.push("/Account/Complaints")} onClick={() => router.push("/Account/Complaints")}
className="flex gap-1 my-2 cursor-pointer text-blue" className="flex gap-1 my-2 cursor-pointer text-blue"
> >
<span> <span>
<ArrowRight /> <ArrowRight />
@ -322,7 +322,7 @@ export default function ComplainsDetails({
<div className="bg-[#E9E9E9] rounded-md py-4 px-10 flex flex-col max-h-[50vh] lg:max-h-[39.5vh] 2xl:max-h-[43.5vh] 3xl:max-h-[41vh] min-[1920px]:max-h-[48.5vh] overflow-auto <div className="bg-[#E9E9E9] rounded-md py-4 px-10 flex flex-col max-h-[50vh] lg:max-h-[39.5vh] 2xl:max-h-[43.5vh] 3xl:max-h-[41vh] min-[1920px]:max-h-[48.5vh] overflow-auto
scrollbar-thin scrollbar-thumb-gray-500 scrollbar-track-gray-100"> scrollbar-thin scrollbar-thumb-gray-500 scrollbar-track-gray-100">
<p className="text-[#464646] text-base font-bold">روند شکایت</p> <p className="text-[#464646] text-base font-bold">روند شکایت</p>
<div className="flex flex-col mt-4 gap-y-4"> <div className="flex flex-col mt-4 gap-y-4">
{data.contents?.map((item: any) => { {data.contents?.map((item: any) => {
return ( return (
<div <div
@ -351,7 +351,7 @@ export default function ComplainsDetails({
<Separator className="mt-2 mb-1 " /> <Separator className="mt-2 mb-1 " />
)} */} )} */}
<div className=" text-[#464646] mt-2"> <div className=" text-[#464646] mt-2">
<div className="flex flex-wrap items-center w-full gap-2 mt-2 text-xs max-md:flex-col"> <div className="flex flex-wrap items-center w-full gap-2 mt-2 text-xs max-md:flex-col">
{item?.media.map((item: any, index: number) => { {item?.media.map((item: any, index: number) => {
return ( return (
<div <div

View File

@ -25,6 +25,7 @@ import { useReactToPrint } from "react-to-print";
import "../app/print-styles.css"; import "../app/print-styles.css";
import ComplainsDetails from "./ComplainsDetails"; import ComplainsDetails from "./ComplainsDetails";
import { toast } from "sonner";
export default function FollowResult() { export default function FollowResult() {
const router = useRouter(); const router = useRouter();

View File

@ -18,13 +18,13 @@ import {
FormMessage, FormMessage,
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { toast } from "@/components/ui/use-toast";
import { Textarea } from "@/components/ui/textarea"; import { Textarea } from "@/components/ui/textarea";
import Image from "next/image"; import Image from "next/image";
import Link from "next/link"; import Link from "next/link";
import FollowResult from "./FollowResult"; import FollowResult from "./FollowResult";
import { postComplaintTracking } from "@/utils/citizenApi"; import { postComplaintTracking } from "@/utils/citizenApi";
import { toast } from "sonner";
const FormSchema = z.object({ const FormSchema = z.object({
trackingNumber: z.string().min(2, { trackingNumber: z.string().min(2, {

View File

@ -60,10 +60,11 @@ export default function Login() {
const loginMutation = useMutation({ const loginMutation = useMutation({
mutationFn: loginStaff, mutationFn: loginStaff,
onSuccess: (res) => {}, onSuccess: (res) => {},
onError: (err: any | string) => { onError: (err: any) => {
toast(<>{err.response.data.detail}</>, { if (err.response.status == 428) {
className: "!bg-red-500 !text-white", console.log(useData);
}); router.push("/Verify");
}
}, },
}); });

View File

@ -16,12 +16,12 @@ import {
FormMessage, FormMessage,
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { toast } from "@/components/ui/use-toast";
import Link from "next/link"; import Link from "next/link";
import RequestStep2 from "./RequestStep2"; import RequestStep2 from "./RequestStep2";
import { useMutation, useQuery } from "@tanstack/react-query"; import { useMutation, useQuery } from "@tanstack/react-query";
import { editProfile, getProfile } from "@/utils/authenticateApi"; import { editProfile, getProfile } from "@/utils/authenticateApi";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";
import { toast } from "sonner";
const FormSchema = z.object({ const FormSchema = z.object({
firstName: z.string().min(1, { firstName: z.string().min(1, {

View File

@ -16,12 +16,12 @@ import {
FormMessage, FormMessage,
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { toast } from "@/components/ui/use-toast";
import Link from "next/link"; import Link from "next/link";
import RequestStep2 from "./RequestStep2"; import RequestStep2 from "./RequestStep2";
import { useMutation, useQuery } from "@tanstack/react-query"; import { useMutation, useQuery } from "@tanstack/react-query";
import { editProfile, getProfile } from "@/utils/authenticateApi"; import { editProfile, getProfile } from "@/utils/authenticateApi";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";
import { toast } from "sonner";
const FormSchema = z.object({ const FormSchema = z.object({
firstName: z.string().min(1, { firstName: z.string().min(1, {

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "sootzani", "name": "sootzani",
"version": "0.1.6", "version": "0.1.7",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "sootzani", "name": "sootzani",
"version": "0.1.6", "version": "0.1.7",
"dependencies": { "dependencies": {
"@hookform/resolvers": "^3.3.2", "@hookform/resolvers": "^3.3.2",
"@radix-ui/react-alert-dialog": "^1.0.5", "@radix-ui/react-alert-dialog": "^1.0.5",

View File

@ -1,6 +1,6 @@
{ {
"name": "sootzani", "name": "sootzani",
"version": "0.1.6", "version": "0.1.7",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",