From 56184f2ebe76d480b91969531138fa9139bf687e Mon Sep 17 00:00:00 2001 From: yasaman Date: Wed, 31 Jan 2024 14:11:06 +0330 Subject: [PATCH 1/3] TabController , AdminNews , AdminSlider , WebContent Modified --- .env | 2 +- components/AdminNews.tsx | 22 ++- components/AdminSlider.tsx | 37 ++-- components/AdminWebContents.tsx | 5 +- components/TabController.tsx | 325 ++++++++++++++++++++++++-------- 5 files changed, 282 insertions(+), 109 deletions(-) diff --git a/.env b/.env index d82fc5d..2d0c1a9 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -NEXT_PUBLIC_BASE_URL_APP="https://oyoonapi.yazd.ir/" \ No newline at end of file +NEXT_PUBLIC_BASE_URL_APP="https://sootzaniapi.shetabdahi.ir/" \ No newline at end of file diff --git a/components/AdminNews.tsx b/components/AdminNews.tsx index 8839869..eec022e 100644 --- a/components/AdminNews.tsx +++ b/components/AdminNews.tsx @@ -270,16 +270,28 @@ export default function AdminNews() { onSuccess: (res) => { setOpenAdd(false); - refetch1(); + refetch1(); toast("عملیات شما با موفقیت انجام شد. ", { className: "!bg-green-500 !text-white", }); + formAdd.reset({ + titleNews: "", + urlNews: "", + content: "", + description: "", + }); }, - onError: (err: any | string) => { + 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(); diff --git a/components/AdminSlider.tsx b/components/AdminSlider.tsx index ac1d1e5..0cf138f 100644 --- a/components/AdminSlider.tsx +++ b/components/AdminSlider.tsx @@ -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(); @@ -298,11 +296,7 @@ function onSubmitAdd(data: AddSliderFormValues) { formData.append("Image", data.uploadImg); } - AddSliderMutation.mutate(formData); - resetField("Title"); - resetField("Image"); - resetField("Url"); - resetField("Description"); + AddSliderMutation.mutate(formData); } const resetFormAdd = () => { @@ -313,6 +307,7 @@ const resetFormAdd = () => { description: "", }); }; +const { resetField } = useForm(); return (
diff --git a/components/AdminWebContents.tsx b/components/AdminWebContents.tsx index 4ef362a..b70f2dd 100644 --- a/components/AdminWebContents.tsx +++ b/components/AdminWebContents.tsx @@ -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(); }, }); diff --git a/components/TabController.tsx b/components/TabController.tsx index ad9293a..b161aaa 100644 --- a/components/TabController.tsx +++ b/components/TabController.tsx @@ -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(null); const [page, setPage] = useState(1); const [totalCount, setTotalCount] = useState(0); @@ -88,7 +100,7 @@ export default function TabController() { setPsblState(Number(activeTab)); } if (activePage) { - setCurrentPage(activePage) + setCurrentPage(activePage); } }, []); console.log(currentPage); @@ -96,86 +108,243 @@ export default function TabController() { return (
- -
- {/* Tab Title */} - - {/*

- لیست شکایت ها | -

*/} - - {dataState?.map((item: any) => { - return ( - { - setPsblState(item.value); - setSelectedTab(String(item.value)); - localStorage.setItem("ActiveTab", String(item.value)); - localStorage.setItem("ActivePage", page); - refetch(); - setSearch(""); - setPage(1); - }} - > -
- {item.title} ({item.count}) -
-
- ); - })} -
- - {/* Search Box */} - setSearch(data)} - mode="controller" - action={handelSearch} - Cancel={() => setCancel(true)} - /> -
- - {/* Tab Content */} - - - {data ? ( - - ) : ( -
- - - - + {isMobile ? ( + // Render your shadcn Select for mobile +
+ +
+ + {/* Search Box */} + setSearch(data)} + mode="controller" + action={handelSearch} + Cancel={() => setCancel(true)} + />
- )} - {!isZero ? ( - setPage(num + 1)} - /> - ) : ( - <> - {" "} - {data?.data.length == 0 && ( -

- درخواستی وجود ندارد -

+ {/* Tab Content */} + + {data ? ( + + ) : ( +
+ + + + +
)} - - )} -
-
+ + {!isZero ? ( + setPage(num + 1)} + /> + ) : ( + <> + {" "} + {data?.data.length == 0 && ( +

+ درخواستی وجود ندارد +

+ )} + + )} + + +
+ ) : ( + // Render Tabs for larger screens + // + //
+ + // {/* Tab Title */} + // + // {/*

+ // لیست شکایت ها | + //

*/} + + // {dataState?.map((item: any) => { + // return ( + // { + // setPsblState(item.value); + // setSelectedTab(String(item.value)); + // localStorage.setItem("ActiveTab", String(item.value)); + // localStorage.setItem("ActivePage", page); + // refetch(); + // setSearch(""); + // setPage(1); + // }} + // > + //
+ // {item.title} ({item.count}) + //
+ //
+ // ); + // })} + //
+ + // {/* Search Box */} + // setSearch(data)} + // mode="controller" + // action={handelSearch} + // Cancel={() => setCancel(true)} + // /> + //
+ + // {/* Tab Content */} + + // + // {data ? ( + // + // ) : ( + //
+ // + // + // + // + //
+ // )} + + // {!isZero ? ( + // setPage(num + 1)} + // /> + // ) : ( + // <> + // {" "} + // {data?.data.length == 0 && ( + //

+ // درخواستی وجود ندارد + //

+ // )} + // + // )} + //
+ //
+
+ +
+ {/* Tab Title */} + + {dataState?.map((item: any) => ( + { + setPsblState(item.value); + setSelectedTab(String(item.value)); + localStorage.setItem("ActiveTab", String(item.value)); + localStorage.setItem("ActivePage", String(currentPage)); + refetch(); + setSearch(""); + setPage(1); + }} + > +
+ {item.title} ({item.count}) +
+
+ ))} +
+ + {/* Search Box */} + setSearch(data)} + mode="controller" + action={handelSearch} + Cancel={() => setCancel(true)} + /> +
+ + {/* Tab Content */} + + {data ? ( + + ) : ( +
+ + + + +
+ )} + + {!isZero ? ( + setPage(num + 1)} + /> + ) : ( + <> + {" "} + {data?.data.length == 0 && ( +

+ درخواستی وجود ندارد +

+ )} + + )} +
+
+
+ )}
); } From 2d10412137c11c30f7144e88b60c4de733ebad60 Mon Sep 17 00:00:00 2001 From: yasaman Date: Thu, 1 Feb 2024 14:24:21 +0330 Subject: [PATCH 2/3] a bug fixed --- components/Search.tsx | 4 +--- components/TableController.tsx | 2 +- utils/adminApi.ts | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/components/Search.tsx b/components/Search.tsx index 086da7c..ddeb8fc 100644 --- a/components/Search.tsx +++ b/components/Search.tsx @@ -22,7 +22,6 @@ export default function Search({ const inputRef = useRef(null); const [cancel, setCancel] = useState(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 (
{convertFullTime(item.lastChanged)} - + {item?.title ? item.title : "-"} diff --git a/utils/adminApi.ts b/utils/adminApi.ts index 277e17b..907f215 100644 --- a/utils/adminApi.ts +++ b/utils/adminApi.ts @@ -162,7 +162,7 @@ export async function UpdateWebContents({ // .....News................................................. export async function GetAllNews({ PageNumber = 1, - PageSize = 5, + PageSize = 6, }: { PageNumber?: number; PageSize?: number; From 6b7a4028ce4b6f6e66fee833d726a914dca3b9f8 Mon Sep 17 00:00:00 2001 From: yasaman Date: Thu, 1 Feb 2024 14:33:24 +0330 Subject: [PATCH 3/3] bug fixed --- components/TabController.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/components/TabController.tsx b/components/TabController.tsx index b161aaa..299bbc9 100644 --- a/components/TabController.tsx +++ b/components/TabController.tsx @@ -126,15 +126,11 @@ export default function TabController() { }} > - - {dataState?.find((item:any) => item.value === selectedTab) - ?.title || "انتخاب دسته بندی"} - - {/* */} + {dataState?.map((item: any) => ( - + {item.title} ({item.count}) ))}