parent
47c79aff83
commit
a7f7da0e0b
|
|
@ -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 (
|
||||
<div>
|
||||
<RequestDetails />
|
||||
<RequestDetails id={id}/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -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<any | null>(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 (
|
||||
<section className="no-scrollbar flex w-full md:grid md:grid-cols-2 md:gap-4 h-full items-start flex-col overflow-y-auto p-5 scrollbar-thin scrollbar-thumb-yellow scrollbar-track-white scrollbar-thumb-rounded-lg ">
|
||||
<RequestCard isSelfRequest={true} />
|
||||
{/* <RequestList /> */}
|
||||
</section>
|
||||
// <RequestList />
|
||||
<div className="flex justify-center items-center text-center w-full h-full ">
|
||||
<ThreeDots
|
||||
visible={true}
|
||||
height="50"
|
||||
width="50"
|
||||
color="#003778"
|
||||
radius="9"
|
||||
ariaLabel="three-dots-loading"
|
||||
wrapperStyle={{}}
|
||||
wrapperClass=""
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (isError) {
|
||||
return <div>Error loading data</div>;
|
||||
}
|
||||
|
||||
return (
|
||||
<section className="no-scrollbar flex w-full md:grid md:grid-cols-2 md:gap-4 h-full items-start flex-col overflow-y-auto p-5 scrollbar-thin scrollbar-thumb-yellow scrollbar-track-white scrollbar-thumb-rounded-lg ">
|
||||
{isSuccess &&
|
||||
data?.data?.map((item: any) => (
|
||||
<RequestCard key={item.id} item={item} isSelfRequest={true} />
|
||||
))}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<any | null>(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 (
|
||||
<section className="flex flex-1 w-full h-[28rem] items-center flex-col overflow-y-scroll pl-5 scrollbar-thin scrollbar-thumb-yellow scrollbar-track-white scrollbar-thumb-rounded-lg" style={{direction:'rtl'}}>
|
||||
{/* <section className="flex flex-1 w-full items-center flex-col overflow-y-scroll overflow-x-hidden pl-5 scrollbar-thin scrollbar-thumb-yellow scrollbar-track-white "> */}
|
||||
<RequestCard isSelfRequest={false} />
|
||||
<div className="flex justify-center items-center text-center w-full h-full ">
|
||||
<ThreeDots
|
||||
visible={true}
|
||||
height="50"
|
||||
width="50"
|
||||
color="#003778"
|
||||
radius="9"
|
||||
ariaLabel="three-dots-loading"
|
||||
wrapperStyle={{}}
|
||||
wrapperClass=""
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (isError) {
|
||||
return <div>Error loading data</div>;
|
||||
}
|
||||
|
||||
return (
|
||||
<section
|
||||
className="flex flex-1 w-full h-[28rem] items-center flex-col overflow-y-scroll pl-5 scrollbar-thin scrollbar-thumb-yellow scrollbar-track-white scrollbar-thumb-rounded-lg"
|
||||
style={{ direction: "rtl" }}
|
||||
>
|
||||
{isSuccess &&
|
||||
data?.data?.map((item: any) => (
|
||||
<RequestCard key={item.id} item={item} />
|
||||
))}
|
||||
</section>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,40 +12,52 @@ 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<RequestCardProps> = ({ isSelfRequest = false }) => {
|
||||
const [reportData, setReportData] = useState<any | null>(null);
|
||||
const [haveImage, sethaveImage] = useState<boolean | null>(null);
|
||||
const { data, isLoading, isError, isSuccess, refetch } = useQuery({
|
||||
queryKey: ["CitizenReport"],
|
||||
queryFn: () =>
|
||||
getCitizenReport({ PageNumber: 1, PageSize: 10, instanceId: 1 }),
|
||||
// refetchOnWindowFocus: false,
|
||||
});
|
||||
const RequestCard: React.FC<RequestCardProps> = ({ 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 (
|
||||
// <div className="overflow-x-hidden overflow-y-scroll pl-5 scrollbar-thin scrollbar-thumb-yellow scrollbar-track-white">
|
||||
<>
|
||||
{reportData?.map((item: any) => {
|
||||
return (
|
||||
<div
|
||||
// href={`MyRequest/${1}`}
|
||||
// href={'#'}
|
||||
onClick={handleClick}
|
||||
className="w-full bg-white flex items-stretch mb-3 min-h-[170px] md:p-3 md:rounded-md md:border-0 md:shadow-[0_2px_5px_rgba(0,0,0,0.05)]"
|
||||
style={{ direction: "rtl" }}
|
||||
style={{
|
||||
direction: "rtl",
|
||||
cursor: isSelfRequest ? "pointer" : "default",
|
||||
}}
|
||||
key={item.id}
|
||||
>
|
||||
<div className="w-full max-w-[100px] flex items-center justify-center">
|
||||
|
|
@ -64,7 +76,6 @@ const RequestCard: React.FC<RequestCardProps> = ({ isSelfRequest = false }) => {
|
|||
</div>
|
||||
|
||||
<div className="flex-1 pr-2">
|
||||
{/* 1 requestCardInfoRow */}
|
||||
<div className="w-full flex items-center justify-between mb-[10px]">
|
||||
<p className="text-xs font-bold text-ellipsis">
|
||||
{item.categoryTitle}
|
||||
|
|
@ -72,7 +83,6 @@ const RequestCard: React.FC<RequestCardProps> = ({ isSelfRequest = false }) => {
|
|||
<RequestStatus lastStatus={item.lastStatus} />
|
||||
</div>
|
||||
|
||||
{/* 2 */}
|
||||
<div className="w-full flex items-center justify-between mb-[10px]">
|
||||
<div className="flex items-center text-sm text-gray-500 text-ellipsis">
|
||||
<MdLocationOn className="text-blue ml-1 text-xl" />
|
||||
|
|
@ -80,7 +90,6 @@ const RequestCard: React.FC<RequestCardProps> = ({ isSelfRequest = false }) => {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
{/* 3 */}
|
||||
<div className="w-full flex items-center justify-between mb-[10px]">
|
||||
<div className="text-xs text-gray-500">
|
||||
<span>کد رهگیری: </span>
|
||||
|
|
@ -91,19 +100,20 @@ const RequestCard: React.FC<RequestCardProps> = ({ isSelfRequest = false }) => {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
{/* 4 */}
|
||||
<div className="w-full flex items-center justify-between mb-[10px]">
|
||||
<RequestProcessIcon />
|
||||
<div className="flex items-center justify-center">
|
||||
<RequestViolation />
|
||||
<RequestLike reportId={item.id} initialIsLiked={item.isLiked} initialLikes={item.likes}/>
|
||||
<RequestLike
|
||||
reportId={item.id}
|
||||
initialIsLiked={item.isLiked}
|
||||
initialLikes={item.likes}
|
||||
/>
|
||||
<RequestComments />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</>
|
||||
// </div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,29 +1,79 @@
|
|||
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<any | null>(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 (
|
||||
<div className="flex justify-center items-center text-center w-full h-full ">
|
||||
<ThreeDots
|
||||
visible={true}
|
||||
height="50"
|
||||
width="50"
|
||||
color="#003778"
|
||||
radius="9"
|
||||
ariaLabel="three-dots-loading"
|
||||
wrapperStyle={{}}
|
||||
wrapperClass=""
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (isError) {
|
||||
return <div>Error loading data</div>;
|
||||
}
|
||||
|
||||
function RequestDetails() {
|
||||
return (
|
||||
<div className="w-full max-w-[640px] m-auto flex items-center flex-col p-5">
|
||||
{/* Loading */}
|
||||
|
||||
{/* SeuccesFull */}
|
||||
{/* Card 1 DetailsCard*/}
|
||||
|
||||
{isSuccess && (
|
||||
<>
|
||||
<div className="w-full rounded-xl bg-white overflow-hidden mb-5 shadow-[0_0_2px_1px_rgba(0,0,0,0.1)]">
|
||||
<div className="w-full h-[200px] m-0 py-5 px-0">
|
||||
<Image
|
||||
src={img1}
|
||||
src={
|
||||
reportData &&
|
||||
reportData.medias &&
|
||||
reportData.medias.length > 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"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="w-full p-3">
|
||||
<RequestStatus />
|
||||
<RequestStatus lastStatus={reportData?.lastStatus} />
|
||||
<p className="text-xs font-bold text-black my-3 mx-0">
|
||||
عنوان دسته بندی{" "}
|
||||
{reportData?.categoryTitle}
|
||||
</p>
|
||||
|
||||
{/* I dont Know */}
|
||||
|
|
@ -97,14 +147,15 @@ function RequestDetails() {
|
|||
<div className="w-full flex items-center justify-between mb-2">
|
||||
<p className="text-xs text-gray-400 font-bold">
|
||||
<span>کد رهگیری: </span>
|
||||
<span>شماره رهگیری </span>
|
||||
<span>{reportData?.trackingNumber}</span>
|
||||
</p>
|
||||
<p className="text-xs text-gray-400 font-bold">
|
||||
{convertFullTime(reportData?.sent)}
|
||||
</p>
|
||||
<p className="text-xs text-gray-400 font-bold">تاریخ درخواست</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Card 2 AddressCard*/}
|
||||
<div className="w-full rounded-xl bg-white overflow-hidden mb-5 shadow-[0_0_2px_1px_rgba(0,0,0,0.1)]">
|
||||
<h2 className="p-3">نشانی</h2>
|
||||
{/* <Map /> */}
|
||||
|
|
@ -112,44 +163,62 @@ function RequestDetails() {
|
|||
<div className="w-full p-3">
|
||||
<div className="w-full flex items-center justify-start">
|
||||
<MdLocationOn className="text-blue ml-1 text-xl" />
|
||||
<p className="text-sm text-black font-bold">متن آدرس</p>
|
||||
<p className="text-sm text-black font-bold">
|
||||
{reportData?.address?.detail}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/*Card 3 OtherDetailsCard */}
|
||||
<div className="w-full rounded-xl bg-white overflow-hidden mb-5 shadow-[0_0_2px_1px_rgba(0,0,0,0.1)]">
|
||||
<div className="w-full p-3 leading-loose">
|
||||
|
||||
<div className="w-full flex items-center mb-4">
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">زمان پاسخگویی : </p>
|
||||
<p className="text-sm text-black">نمایش زمان</p>
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">
|
||||
زمان پاسخگویی :{" "}
|
||||
</p>
|
||||
<p className="text-sm text-black">
|
||||
{convertFullTime(reportData?.responseDeadline)}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="w-full flex items-center mb-4">
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">زمان اتمام : </p>
|
||||
<p className="text-sm text-black">نمایش زمان</p>
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">
|
||||
زمان اتمام :{" "}
|
||||
</p>
|
||||
<p className="text-sm text-black">
|
||||
{convertFullTime(reportData?.deadline)}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="w-full flex items-center mb-4">
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">تعداد نظرات : </p>
|
||||
<p className="text-sm text-black">نمایش تعداد</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="w-full flex items-center mb-4">
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">تعداد پسندها : </p>
|
||||
<p className="text-sm text-black">نمایش تعداد</p>
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">
|
||||
تعداد نظرات :{" "}
|
||||
</p>
|
||||
<p className="text-sm text-black">
|
||||
{reportData?.commentsCount}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="w-full flex items-center mb-4">
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">هویت : </p>
|
||||
<p className="text-sm text-black">مخفی یا قابل رویت</p>
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">
|
||||
تعداد پسندها :{" "}
|
||||
</p>
|
||||
<p className="text-sm text-black">{reportData?.likes}</p>
|
||||
</div>
|
||||
|
||||
<div className="w-full flex items-center mb-4">
|
||||
<p className="text-[15px] font-bold text-black ml-[5px]">
|
||||
هویت :{" "}
|
||||
</p>
|
||||
<p className="text-sm text-black">
|
||||
{reportData?.isIdentityVisible ? "قابل رویت" : "مخفی"}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue