From a7f7da0e0bdb762dbc2544ac1fcbf1d608bae5cc Mon Sep 17 00:00:00 2001 From: YasamanKahdooei Date: Sun, 19 May 2024 15:11:17 +0330 Subject: [PATCH] change part od RequestCqard , RequestList , Added part of RequestDetails page --- .../MyRequest/{[id] => [requestId]}/page.tsx | 5 +- app/User/MyRequest/page.tsx | 50 ++++- components/RecentRequest/RequestList.tsx | 55 ++++- components/Requests/RequestCard.tsx | 166 +++++++------- components/Requests/RequestDetails.tsx | 207 ++++++++++++------ 5 files changed, 326 insertions(+), 157 deletions(-) rename app/User/MyRequest/{[id] => [requestId]}/page.tsx (50%) diff --git a/app/User/MyRequest/[id]/page.tsx b/app/User/MyRequest/[requestId]/page.tsx similarity index 50% rename from app/User/MyRequest/[id]/page.tsx rename to app/User/MyRequest/[requestId]/page.tsx index 5c9252b..4bc6312 100644 --- a/app/User/MyRequest/[id]/page.tsx +++ b/app/User/MyRequest/[requestId]/page.tsx @@ -1,10 +1,11 @@ import RequestDetails from '@/components/Requests/RequestDetails' import React from 'react' -function page() { +function page({params}: {params : any}) { + const id = params.requestId; return (
- +
) } diff --git a/app/User/MyRequest/page.tsx b/app/User/MyRequest/page.tsx index d1a2e45..e3f8802 100644 --- a/app/User/MyRequest/page.tsx +++ b/app/User/MyRequest/page.tsx @@ -1,13 +1,55 @@ +"use client"; +import React, { useEffect, useState } from "react"; import RequestList from "@/components/RecentRequest/RequestList"; import RequestCard from "@/components/Requests/RequestCard"; -import React from "react"; +import { useQuery } from "@tanstack/react-query"; +import { ThreeDots } from "react-loader-spinner"; +import { getCitizenReportMine } from "@/utils/CitizenReport"; export default function page() { + const [reportData, setReportData] = useState(null); + const { data, isLoading, isError, isSuccess, refetch } = useQuery({ + queryKey: ["CitizenReportMine"], + queryFn: () => getCitizenReportMine({ PageNumber: 1, PageSize: 10 }), + // refetchOnWindowFocus: false, + }); + + useEffect(() => { + if (data) { + console.log(data); + console.log(data.data); + console.log(data.data[0]); + setReportData(data.data); + } + }, [data]); + + if (isLoading) { + return ( +
+ +
+ ); + } + + if (isError) { + return
Error loading data
; + } + return (
- - {/* */} + {isSuccess && + data?.data?.map((item: any) => ( + + ))}
- // ); } diff --git a/components/RecentRequest/RequestList.tsx b/components/RecentRequest/RequestList.tsx index 123c855..adf4657 100644 --- a/components/RecentRequest/RequestList.tsx +++ b/components/RecentRequest/RequestList.tsx @@ -1,11 +1,58 @@ -import React from "react"; +"use client"; +import React, { useEffect, useState } from "react"; import RequestCard from "../Requests/RequestCard"; +import { getCitizenReport } from "@/utils/CitizenReport"; +import { useQuery } from "@tanstack/react-query"; +import { ThreeDots } from "react-loader-spinner"; const RequestList = () => { + const [reportData, setReportData] = useState(null); + const { data, isLoading, isError, isSuccess, refetch } = useQuery({ + queryKey: ["CitizenReport"], + queryFn: () => + getCitizenReport({ PageNumber: 1, PageSize: 10, instanceId: 1 }), + // refetchOnWindowFocus: false, + }); + + useEffect(() => { + if (data) { + console.log(data); + console.log(data.data); + console.log(data.data[0]); + setReportData(data.data); + } + }, [data]); + + if (isLoading) { + return ( +
+ +
+ ); + } + + if (isError) { + return
Error loading data
; + } + return ( -
- {/*
*/} - +
+ {isSuccess && + data?.data?.map((item: any) => ( + + ))}
); }; diff --git a/components/Requests/RequestCard.tsx b/components/Requests/RequestCard.tsx index d453b38..24d8be4 100644 --- a/components/Requests/RequestCard.tsx +++ b/components/Requests/RequestCard.tsx @@ -12,98 +12,108 @@ import Link from "next/link"; import { useQuery } from "@tanstack/react-query"; import { getCitizenReport } from "@/utils/CitizenReport"; import { convertFullTime } from "@/lib/utils"; +import { useRouter } from "next/navigation"; + +// interface RequestCardProps { +// isSelfRequest?: boolean; +// } + +// Define the types for props +interface Media { + url3: string; +} + +interface RequestItem { + id: string; + categoryTitle: string; + lastStatus: string; + addressDetail: string; + trackingNumber: string; + sent: string; + medias: Media[]; + isLiked: boolean; + likes: number; +} interface RequestCardProps { + item: RequestItem; isSelfRequest?: boolean; } -const RequestCard: React.FC = ({ isSelfRequest = false }) => { - const [reportData, setReportData] = useState(null); - const [haveImage, sethaveImage] = useState(null); - const { data, isLoading, isError, isSuccess, refetch } = useQuery({ - queryKey: ["CitizenReport"], - queryFn: () => - getCitizenReport({ PageNumber: 1, PageSize: 10, instanceId: 1 }), - // refetchOnWindowFocus: false, - }); +const RequestCard: React.FC = ({ item, isSelfRequest }) => { + const router = useRouter(); - useEffect(() => { - if (data) { - console.log(data); - console.log(data.data); - console.log(data.data[0]); - setReportData(data.data); + const handleClick = () => { + if (isSelfRequest) { + router.push(`/User/MyRequest/${item.id}`); } - }, [data]); - + }; return ( //
<> - {reportData?.map((item: any) => { - return ( -
-
- 0 - ? `${process.env.NEXT_PUBLIC_BASE_URL_APP}${item.medias[0].url3}` - : img1 - } - alt="picture" - quality={100} - height={100} - width={100} - className="w-[80%] h-full rounded-md object-contain" - /> -
+
+
+ 0 + ? `${process.env.NEXT_PUBLIC_BASE_URL_APP}${item.medias[0].url3}` + : img1 + } + alt="picture" + quality={100} + height={100} + width={100} + className="w-[80%] h-full rounded-md object-contain" + /> +
-
- {/* 1 requestCardInfoRow */} -
-

- {item.categoryTitle} -

- -
+
+
+

+ {item.categoryTitle} +

+ +
- {/* 2 */} -
-
- -

{item.addressDetail}

-
-
- - {/* 3 */} -
-
- کد رهگیری: - {item.trackingNumber} -
-
- {convertFullTime(item.sent)} -
-
- - {/* 4 */} -
- -
- - - -
-
+
+
+ +

{item.addressDetail}

- ); - })} + +
+
+ کد رهگیری: + {item.trackingNumber} +
+
+ {convertFullTime(item.sent)} +
+
+ +
+ +
+ + + +
+
+
+
//
); diff --git a/components/Requests/RequestDetails.tsx b/components/Requests/RequestDetails.tsx index 61a5d6e..d753a0a 100644 --- a/components/Requests/RequestDetails.tsx +++ b/components/Requests/RequestDetails.tsx @@ -1,33 +1,83 @@ -import React from "react"; +"use client"; +import React, { useEffect, useState } from "react"; import Image from "next/image"; import img1 from "@/assets/images/no-image.jpeg"; import RequestStatus from "./RequestStatus"; import { MdLocationOn } from "react-icons/md"; +import { getSingleCitizenReportMine } from "@/utils/CitizenReport"; +import { useQuery } from "@tanstack/react-query"; +import { ThreeDots } from "react-loader-spinner"; +import { convertFullTime } from "@/lib/utils"; + +function RequestDetails({ id }: { id: any }) { + const [reportData, setReportData] = useState(null); + const { data, isLoading, isError, isSuccess, refetch } = useQuery({ + queryKey: ["ReportMineId", id], + queryFn: () => getSingleCitizenReportMine(id), + // refetchOnWindowFocus: false, + }); + + useEffect(() => { + if (data) { + console.log(data.data); + setReportData(data.data); + } + }, [data, isSuccess]); + console.log("🚀 ~ useEffect ~ setReportData:", reportData); + + if (isLoading) { + return ( +
+ +
+ ); + } + + if (isError) { + return
Error loading data
; + } -function RequestDetails() { return (
- {/* Loading */} - {/* SeuccesFull */} - {/* Card 1 DetailsCard*/} -
-
- imgDetails -
-
- -

- عنوان دسته بندی{" "} -

+ {isSuccess && ( + <> +
+
+ 0 + ? `${process.env.NEXT_PUBLIC_BASE_URL_APP}${reportData.medias[0].url3}` + : img1 + } + quality={100} + height={100} + width={100} + className="w-full h-full object-contain" + alt="imgDetails" + /> +
- {/* I dont Know */} - {/* {forms?.values ? ( +
+ +

+ {reportData?.categoryTitle} +

+ + {/* I dont Know */} + {/* {forms?.values ? ( <>
{forms?.values && ( @@ -94,61 +144,80 @@ function RequestDetails() {

{request.comments}

)} */} -
-

- کد رهگیری: - شماره رهگیری -

-

تاریخ درخواست

-
-
-
- - {/* Card 2 AddressCard*/} -
-

نشانی

- {/* */} - 11 -
-
- -

متن آدرس

-
-
-
- - {/*Card 3 OtherDetailsCard */} -
-
- -
-

زمان پاسخگویی :

-

نمایش زمان

+
+

+ کد رهگیری: + {reportData?.trackingNumber} +

+

+ {convertFullTime(reportData?.sent)} +

+
+
-
-

زمان اتمام :

-

نمایش زمان

+
+

نشانی

+ {/* */} + 11 +
+
+ +

+ {reportData?.address?.detail} +

+
+
-
-

تعداد نظرات :

-

نمایش تعداد

-
+
+
+
+

+ زمان پاسخگویی :{" "} +

+

+ {convertFullTime(reportData?.responseDeadline)} +

+
- -
-

تعداد پسندها :

-

نمایش تعداد

-
- -
-

هویت :

-

مخفی یا قابل رویت

-
+
+

+ زمان اتمام :{" "} +

+

+ {convertFullTime(reportData?.deadline)} +

+
-
-
+
+

+ تعداد نظرات :{" "} +

+

+ {reportData?.commentsCount} +

+
+ +
+

+ تعداد پسندها :{" "} +

+

{reportData?.likes}

+
+ +
+

+ هویت :{" "} +

+

+ {reportData?.isIdentityVisible ? "قابل رویت" : "مخفی"} +

+
+
+
+ + )}
); }