Compare commits

..

5 Commits

10 changed files with 286 additions and 119 deletions

2
.env
View File

@ -1 +1 @@
NEXT_PUBLIC_BASE_URL_APP="https://oyoonapi.yazd.ir/"
NEXT_PUBLIC_BASE_URL_APP="https://sootzaniapi.shetabdahi.ir/"

View File

@ -275,11 +275,23 @@ export default function AdminNews() {
toast("عملیات شما با موفقیت انجام شد. ", {
className: "!bg-green-500 !text-white",
});
formAdd.reset({
titleNews: "",
urlNews: "",
content: "",
description: "",
});
},
onError: (err: any | string) => {
toast(<>{err.response.data.detail}</>, {
className: "!bg-red-500 !text-white",
});
formAdd.reset({
titleNews: "",
urlNews: "",
content: "",
description: "",
});
},
});
@ -299,13 +311,7 @@ export default function AdminNews() {
// }
// }
ChangeNewsMutation.mutate({ id: keyId, payload: formData });
refetch1();
resetField("Title");
resetField("Image");
resetField("Url");
resetField("Description");
resetField("Content");
}
const { resetField } = useForm();

View File

@ -241,26 +241,29 @@ const AddSliderMutation = useMutation({
mutationFn: SubmitSlider,
onSuccess: (res) => {
setOpenAdd(false);
refetch1();
resetField("Title");
resetField("Image");
resetField("Url");
resetField("Description");
toast("عملیات شما با موفقیت انجام شد. ", {
className: "!bg-green-500 !text-white",
});
formAdd.reset({
titleSlider: "",
uploadImg: null,
urlSlider: "",
description: "",
});
},
onError: (err: any | string) => {
resetField("Title");
resetField("Image");
resetField("Url");
resetField("Description");
toast(<>{err.response.data.detail}</>, {
className: "!bg-red-500 !text-white",
});
formAdd.reset({
titleSlider: "",
uploadImg: null,
urlSlider: "",
description: "",
});
},
});
@ -280,13 +283,8 @@ function onSubmitEdit(data: EditSliderFormValues) {
ChangeSliderMutation.mutate({id: keyId, payload: formData});
refetch1();
resetField("Title");
resetField("Image");
resetField("Url");
resetField("Description");
}
const { resetField } = useForm();
function onSubmitAdd(data: AddSliderFormValues) {
const formData = new FormData();
@ -299,10 +297,6 @@ function onSubmitAdd(data: AddSliderFormValues) {
}
AddSliderMutation.mutate(formData);
resetField("Title");
resetField("Image");
resetField("Url");
resetField("Description");
}
const resetFormAdd = () => {
@ -313,6 +307,7 @@ const resetFormAdd = () => {
description: "",
});
};
const { resetField } = useForm();
return (
<div className="w-full min-h-[85vh] flex justify-center">

View File

@ -107,7 +107,7 @@ export default function AdminWebContents() {
}
});
}
}, [isSuccess1]);
}, [isSuccess1 , refetch1]);
// Add
@ -130,6 +130,8 @@ export default function AdminWebContents() {
toast(<>{err.response.data.detail}</>, {
className: "!bg-red-500 !text-white",
});
refetch1();
},
});
@ -148,6 +150,7 @@ export default function AdminWebContents() {
toast(<>{err.response.data.detail}</>, {
className: "!bg-red-500 !text-white",
});
refetch1();
},
});

View File

@ -436,10 +436,10 @@ export default function ComplainsDetails({
>
<div className="flex items-center gap-4 justify-between">
<p className="">
<Badge>
{item.operationWithDescription.description} توسط
{" "}{item.sender == 0 ? "شهروند" : "بازرس"}
</Badge>
<Badge>
{item.operationWithDescription.description} توسط
{" "}{item.sender == 0 ? "شهروند" : "بازرس"}
</Badge>
</p>
<p className="">
<span className="text-[#7C838A] text-sm">

View File

@ -158,7 +158,7 @@ export default function InspectorOperations({
name="media"
render={({ field }) => (
<FormItem>
<FormLabel>پیوست</FormLabel>
<FormLabel>پیوست‌ها</FormLabel>
<FormControl>
<Input
accept=".jpg, .jpeg, .png, .svg, .gif, .mp4 , .pdf"

View File

@ -22,7 +22,6 @@ export default function Search({
const inputRef = useRef<HTMLInputElement>(null);
const [cancel, setCancel] = useState<boolean>(false);
const handleSubmit = (e: any) => {
console.log(222);
e.preventDefault();
setCancel(true);
};
@ -31,12 +30,11 @@ export default function Search({
e.preventDefault();
setCancel(false);
if (changeValue !== undefined) {
console.log(444);
changeValue("");
}
Cancel(true);
};
console.log(value);
return (
<form
onSubmit={handleSubmit}

View File

@ -24,8 +24,20 @@ import useData from "@/store/useData";
import { toast } from "sonner";
import Pagination from "./Pagination";
import { Skeleton } from "./ui/skeleton";
import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectLabel,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { useMediaQuery } from "react-responsive";
export default function TabController() {
const isMobile = useMediaQuery({ maxWidth: 768 }); // Adjust the max width for mobile
const [search, setSearch] = useState<any>(null);
const [page, setPage] = useState<any>(1);
const [totalCount, setTotalCount] = useState<any>(0);
@ -88,7 +100,7 @@ export default function TabController() {
setPsblState(Number(activeTab));
}
if (activePage) {
setCurrentPage(activePage)
setCurrentPage(activePage);
}
}, []);
console.log(currentPage);
@ -96,86 +108,239 @@ export default function TabController() {
return (
<div className="w-[95vw] lg:w-[82vw] xl:w-[70vw] 3xl:w-[65vw] mt-16 pt-9 mx-auto">
<Tabs value={String(selectedTab)} className="" dir="rtl">
<div className="flex flex-col-reverse items-center justify-between w-full gap-4 mb-5 lg:flex-row lg:gap-2">
{/* Tab Title */}
<TabsList className="flex w-full gap-1 h-a max-lg:flex-wrap max lg:w-4/5 md:gap-4 lg:gap-1 p-1">
{/* <p className="text-xs font-bold 3xl:ml-6 sm:text-sm max-xl:hidden">
لیست شکایت ها |
</p> */}
{dataState?.map((item: any) => {
return (
<TabsTrigger
key={item.value}
className="hover:border-b-2 border-b-blue flex-1 h-10"
value={String(item.value)}
// data-state={isActive ? 'active' : 'inactive'}
onClick={() => {
setPsblState(item.value);
setSelectedTab(String(item.value));
localStorage.setItem("ActiveTab", String(item.value));
localStorage.setItem("ActivePage", page);
refetch();
setSearch("");
setPage(1);
}}
>
<div className="relative w-full ">
{item.title} ({item.count})
</div>
</TabsTrigger>
);
})}
</TabsList>
{/* Search Box */}
<Search
value={search}
changeValue={(data: any) => setSearch(data)}
mode="controller"
action={handelSearch}
Cancel={() => setCancel(true)}
/>
</div>
{/* Tab Content */}
<TabsContent value={selectedTab} key={selectedTab}>
{data ? (
<TableController
data={data?.data}
currentPage={currentPage}
pageSize={pageSize}
/>
) : (
<div className="flex flex-col gap-3">
<Skeleton className="w-full h-12" />
<Skeleton className="w-full h-12" />
<Skeleton className="w-full h-12" />
<Skeleton className="w-full h-12" />
{isMobile ? (
// Render your shadcn Select for mobile
<div>
<Tabs value={String(selectedTab)} className="" dir="rtl">
<div className="flex flex-col-reverse items-center justify-between w-full gap-4 mb-5 lg:flex-row lg:gap-2">
<Select
value={selectedTab}
onValueChange={(value) => {
setPsblState(Number(value));
setSelectedTab(String(value));
localStorage.setItem("ActiveTab", String(value));
localStorage.setItem("ActivePage", page);
refetch();
setSearch("");
setPage(1);
}}
>
<SelectTrigger className="w-full h-12 bg-[#E9E9E9] " dir="rtl">
<SelectValue placeholder="انتخاب دسته بندی" />
</SelectTrigger>
<SelectContent dir="rtl">
{dataState?.map((item: any) => (
<SelectItem key={item.value} value={String(item.value)}>
{item.title} ({item.count})
</SelectItem>
))}
</SelectContent>
</Select>
{/* Search Box */}
<Search
value={search}
changeValue={(data: any) => setSearch(data)}
mode="controller"
action={handelSearch}
Cancel={() => setCancel(true)}
/>
</div>
)}
{!isZero ? (
<Pagination
TotalPages={totalPages}
currentPage={currentPage - 1}
countPage={totalCount}
Page={(num: number) => setPage(num + 1)}
/>
) : (
<>
{" "}
{data?.data.length == 0 && (
<p className="flex justify-center mx-auto mt-10 text-blue/50">
درخواستی وجود ندارد
</p>
{/* Tab Content */}
<TabsContent value={selectedTab} key={selectedTab}>
{data ? (
<TableController
data={data?.data}
currentPage={currentPage}
pageSize={pageSize}
/>
) : (
<div className="flex flex-col gap-3">
<Skeleton className="w-full h-12" />
<Skeleton className="w-full h-12" />
<Skeleton className="w-full h-12" />
<Skeleton className="w-full h-12" />
</div>
)}
</>
)}
</TabsContent>
</Tabs>
{!isZero ? (
<Pagination
TotalPages={totalPages}
currentPage={currentPage - 1}
countPage={totalCount}
Page={(num: number) => setPage(num + 1)}
/>
) : (
<>
{" "}
{data?.data.length == 0 && (
<p className="flex justify-center mx-auto mt-10 text-blue/50">
درخواستی وجود ندارد
</p>
)}
</>
)}
</TabsContent>
</Tabs>
</div>
) : (
// Render Tabs for larger screens
// <Tabs value={String(selectedTab)} className="" dir="rtl">
// <div className="flex flex-col-reverse items-center justify-between w-full gap-4 mb-5 lg:flex-row lg:gap-2">
// {/* Tab Title */}
// <TabsList className="flex w-full gap-1 h-a max-lg:flex-wrap max lg:w-4/5 md:gap-4 lg:gap-1 p-1">
// {/* <p className="text-xs font-bold 3xl:ml-6 sm:text-sm max-xl:hidden">
// لیست شکایت ها |
// </p> */}
// {dataState?.map((item: any) => {
// return (
// <TabsTrigger
// key={item.value}
// className="hover:border-b-2 border-b-blue flex-1 h-10"
// value={String(item.value)}
// // data-state={isActive ? 'active' : 'inactive'}
// onClick={() => {
// setPsblState(item.value);
// setSelectedTab(String(item.value));
// localStorage.setItem("ActiveTab", String(item.value));
// localStorage.setItem("ActivePage", page);
// refetch();
// setSearch("");
// setPage(1);
// }}
// >
// <div className="relative w-full ">
// {item.title} ({item.count})
// </div>
// </TabsTrigger>
// );
// })}
// </TabsList>
// {/* Search Box */}
// <Search
// value={search}
// changeValue={(data: any) => setSearch(data)}
// mode="controller"
// action={handelSearch}
// Cancel={() => setCancel(true)}
// />
// </div>
// {/* Tab Content */}
// <TabsContent value={selectedTab} key={selectedTab}>
// {data ? (
// <TableController
// data={data?.data}
// currentPage={currentPage}
// pageSize={pageSize}
// />
// ) : (
// <div className="flex flex-col gap-3">
// <Skeleton className="w-full h-12" />
// <Skeleton className="w-full h-12" />
// <Skeleton className="w-full h-12" />
// <Skeleton className="w-full h-12" />
// </div>
// )}
// {!isZero ? (
// <Pagination
// TotalPages={totalPages}
// currentPage={currentPage - 1}
// countPage={totalCount}
// Page={(num: number) => setPage(num + 1)}
// />
// ) : (
// <>
// {" "}
// {data?.data.length == 0 && (
// <p className="flex justify-center mx-auto mt-10 text-blue/50">
// درخواستی وجود ندارد
// </p>
// )}
// </>
// )}
// </TabsContent>
// </Tabs>
<div>
<Tabs value={String(selectedTab)} className="" dir="rtl">
<div className="flex flex-col-reverse items-center justify-between w-full gap-4 mb-5 lg:flex-row lg:gap-2">
{/* Tab Title */}
<TabsList className="flex w-full gap-1 h-a max-lg:flex-wrap max lg:w-4/5 md:gap-4 lg:gap-1 p-1">
{dataState?.map((item: any) => (
<TabsTrigger
key={item.value}
className="hover:border-b-2 border-b-blue flex-1 h-10"
value={String(item.value)}
onClick={() => {
setPsblState(item.value);
setSelectedTab(String(item.value));
localStorage.setItem("ActiveTab", String(item.value));
localStorage.setItem("ActivePage", String(currentPage));
refetch();
setSearch("");
setPage(1);
}}
>
<div className="relative w-full ">
{item.title} ({item.count})
</div>
</TabsTrigger>
))}
</TabsList>
{/* Search Box */}
<Search
value={search}
changeValue={(data: any) => setSearch(data)}
mode="controller"
action={handelSearch}
Cancel={() => setCancel(true)}
/>
</div>
{/* Tab Content */}
<TabsContent value={selectedTab} key={selectedTab}>
{data ? (
<TableController
data={data?.data}
currentPage={currentPage}
pageSize={pageSize}
/>
) : (
<div className="flex flex-col gap-3">
<Skeleton className="w-full h-12" />
<Skeleton className="w-full h-12" />
<Skeleton className="w-full h-12" />
<Skeleton className="w-full h-12" />
</div>
)}
{!isZero ? (
<Pagination
TotalPages={totalPages}
currentPage={currentPage - 1}
countPage={totalCount}
Page={(num: number) => setPage(num + 1)}
/>
) : (
<>
{" "}
{data?.data.length == 0 && (
<p className="flex justify-center mx-auto mt-10 text-blue/50">
درخواستی وجود ندارد
</p>
)}
</>
)}
</TabsContent>
</Tabs>
</div>
)}
</div>
);
}

View File

@ -102,7 +102,7 @@ export default function TableController({
<TableCell className="w-2/12">
{convertFullTime(item.lastChanged)}
</TableCell>
<TableCell className="w-3/12">
<TableCell className="w-3/12 truncate max-w-[1em]">
{item?.title ? item.title : "-"}
</TableCell>
<TableCell className="w-3/12">

View File

@ -162,7 +162,7 @@ export async function UpdateWebContents({
// .....News.................................................
export async function GetAllNews({
PageNumber = 1,
PageSize = 5,
PageSize = 6,
}: {
PageNumber?: number;
PageSize?: number;