diff --git a/components/AdminCategories.tsx b/components/AdminCategories.tsx index 3b5f4b7..fabe0de 100644 --- a/components/AdminCategories.tsx +++ b/components/AdminCategories.tsx @@ -328,7 +328,7 @@ export default function AdminCategories() {

- تغییر دسته بندی + ویرایش دسته بندی

@@ -384,7 +384,7 @@ export default function AdminCategories() { type="submit" className="p-2 text-center text-white bg-blue min-w-max rounded-xl hover:bg-white hover:text-slate-800" > - تغییر دسته بندی + ویرایش دسته بندی diff --git a/components/AdminKeysManagement.tsx b/components/AdminKeysManagement.tsx index a250da6..81cbe3c 100644 --- a/components/AdminKeysManagement.tsx +++ b/components/AdminKeysManagement.tsx @@ -455,7 +455,7 @@ export default function AdminKeysManagement() { type="submit" className="p-2 text-center text-white bg-blue min-w-max rounded-xl hover:bg-white hover:text-slate-800" > - تغییر کلید + ویرایش کلید {/* (1); + const [totalCount, setTotalCount] = useState(0); const [keyIdDel, setKeyIdDel] = useState(""); const [openAdd, setOpenAdd] = React.useState(false); @@ -138,8 +140,11 @@ export default function AdminNews() { isLoading: isListLoading, refetch: refetch1, } = useQuery({ - queryKey: ["NewsList"], - queryFn: () => GetAllNews(), + queryKey: ["NewsList", page], + queryFn: () => + GetAllNews({ + PageNumber: page, + }), // queryFn: () => GetAllOrganizations(), // refetchOnWindowFocus: false, }); @@ -253,8 +258,6 @@ export default function AdminNews() { mutationKey: ["AddNews"], mutationFn: SubmitNews, onSuccess: (res) => { - console.log(res); - console.log("Success Change News"); setOpenAdd(false); refetch1(); @@ -314,8 +317,16 @@ export default function AdminNews() { console.log(data); } + useEffect(() => { + if (data1) { + const headersData = JSON.parse(data1.headers["x-pagination"]); + setTotalCount(headersData.TotalCount); + setPage(headersData.CurrentPage); + } + }, [data1]); + return ( -
+
{/* 1 */} @@ -516,7 +527,7 @@ export default function AdminNews() {

- تغییر خبر + ویرایش خبر

@@ -667,7 +678,7 @@ export default function AdminNews() { type="submit" className="p-2 text-center text-white bg-blue min-w-max rounded-xl hover:bg-white hover:text-slate-800" > - تغییر خبر + ویرایش خبر @@ -681,71 +692,85 @@ export default function AdminNews() { - {data1?.map((item: any) => { + {data1?.data?.map((item: any) => { return (
-

- عنوان : - {item.title} -

-

- توضیحات: - - {item.description} - -

-

- محتوا: - - {item.content} - -

- img + picture - -
- { - DeleteNewsMutation.mutate({id: item.id}); - }} - id={item.id} - /> - - - {/* */} -
+
+
+

+ عنوان : + {item.title} +

+

+ توضیحات: + + {item.description} + +

+

+ محتوا: + + {item.content} + +

+
+
+ { + DeleteNewsMutation.mutate({ id: item.id }); + }} + id={item.id} /> - + + + {/* */} + +
); })} + {!isListLoading && ( + setPage(num + 1)} + /> + )}
diff --git a/components/AdminSlider.tsx b/components/AdminSlider.tsx index 8bbece9..62d751f 100644 --- a/components/AdminSlider.tsx +++ b/components/AdminSlider.tsx @@ -456,7 +456,6 @@ function onSubmitAdd(data: AddSliderFormValues) { )} /> -
@@ -487,7 +486,7 @@ function onSubmitAdd(data: AddSliderFormValues) {

- تغییر اسلایدر + ویرایش اسلایدر

@@ -614,7 +613,6 @@ function onSubmitAdd(data: AddSliderFormValues) { )} /> -
@@ -622,7 +620,7 @@ function onSubmitAdd(data: AddSliderFormValues) { type="submit" className="p-2 text-center text-white bg-blue min-w-max rounded-xl hover:bg-white hover:text-slate-800" > - تغییر اسلایدر + ویرایش اسلایدر @@ -644,23 +642,22 @@ function onSubmitAdd(data: AddSliderFormValues) { `} >

- عنوان : - {item.title} + عنوان :{item.title}

توضیحات: {item.description} -

+

img + alt="img" + src={`${process.env.NEXT_PUBLIC_BASE_URL_APP}${item?.image?.url}`} + width={100} + height={100} + quality={100} + className="object-contain object-right w-full h-20 " + /> {/*

محتوا: @@ -675,8 +672,8 @@ function onSubmitAdd(data: AddSliderFormValues) { checked={!item.isDeleted} onCheckedChange={() => { DeleteSliderMutation.mutate({ - id: item.id - }) + id: item.id, + }); }} id={item.id} /> diff --git a/components/ComplainsDetails.tsx b/components/ComplainsDetails.tsx index 43f8ec9..28d7c41 100644 --- a/components/ComplainsDetails.tsx +++ b/components/ComplainsDetails.tsx @@ -286,7 +286,7 @@ export default function ComplainsDetails({ />

-{/* 2 */} + {/* 2 */}
{data.user == null ? ( @@ -315,6 +315,12 @@ export default function ComplainsDetails({ {data.complaining ? data.complaining : "-"}

+

+ کد پیگیری:{" "} + + {data.trackingNumber ? data.trackingNumber : "-"} + +

زمان ثبت:{" "} @@ -325,7 +331,7 @@ export default function ComplainsDetails({ ) : ( <> -

+

اطلاعات کلی

@@ -349,6 +355,12 @@ export default function ComplainsDetails({ {data.complaining ? data.complaining : "-"}

+

+ کد پیگیری:{" "} + + {data.trackingNumber ? data.trackingNumber : "-"} + +

زمان ثبت:{" "} @@ -356,7 +368,7 @@ export default function ComplainsDetails({

-
+

اطلاعات شاکی

@@ -386,14 +398,22 @@ export default function ComplainsDetails({ : "-"}

+

+ {/* کد پیگیری:{" "} + + {data.trackingNumber ? data.trackingNumber : "-"} + */} +

)}

روند شکایت

-
+
{data.contents?.map((item: any) => { return (
- {/* 3 */} + {/* 3 */}

انجام عملیات @@ -474,14 +494,12 @@ export default function ComplainsDetails({ key2={key} />

-
) : ( <> {getComplaintMutation.isPending && (
- { - const newOffset = (event.selected * itemsPerPage) % items.length; - console.log( - `User requested page number ${event.selected}, which is offset ${newOffset}` - ); - setItemOffset(newOffset); - // console.log(event.selected); - console.log(event); + console.log(event.selected); Page(event.selected); }; console.log(countPage); // console.log(pageCount, "1111"); return ( <> - {/* */} console.log(e)} nextLabel={} onPageChange={handlePageClick} pageRangeDisplayed={3} - pageCount={Math.ceil(countPage / 5)} + forcePage={currentPage} + pageCount={Math.ceil(countPage / (PageSize ? PageSize : 5))} previousLabel={} pageClassName=" w-10 h-10 grid place-content-center rounded-lg !text-blue shadow-md" className={twMerge( diff --git a/components/TabController.tsx b/components/TabController.tsx index 79ca894..c73eed9 100644 --- a/components/TabController.tsx +++ b/components/TabController.tsx @@ -61,7 +61,7 @@ export default function TabController() { }; const [psblState, setPsblState] = useState(0); - const [selectedTab, setSelectedTab] = useState("0"); + const [selectedTab, setSelectedTab] = useState("0"); const { data: dataState, @@ -97,11 +97,19 @@ export default function TabController() { setTotalCount(headersData.TotalCount); } }, [data]); + useEffect(() => { + const activeTab = localStorage.getItem("ActiveTab"); + if (activeTab) { + setSelectedTab(activeTab); + setPsblState(Number(activeTab)); + } + }, []); + const isZero = totalCount === 0; - console.log(totalCount); + return (
-

+

لیست شکایت ها

{/* Tab Title */} -

+ {/*

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

+

*/} {dataState?.map((item: any) => { // const isActive = item.value === selectedTab; @@ -133,6 +141,8 @@ export default function TabController() { onClick={() => { setPsblState(item.value); setSelectedTab(String(item.value)); + localStorage.setItem("ActiveTab", String(item.value)); + refetch(); setPage(0); }} diff --git a/utils/adminApi.ts b/utils/adminApi.ts index 9c49f59..3a001ce 100644 --- a/utils/adminApi.ts +++ b/utils/adminApi.ts @@ -160,9 +160,17 @@ export async function UpdateWebContents({ } // .....News................................................. -export async function GetAllNews() { - const data = await axios.get("api/News"); - return data.data; +export async function GetAllNews({ + PageNumber = 1, + PageSize = 5, +}: { + PageNumber?: number; + PageSize?: number; +}) { + const data = await axios.get("api/News", { + params: { PageNumber: PageNumber, PageSize: PageSize }, + }); + return data; } export async function GetSingleNews({ id }: { id: string }) { @@ -171,7 +179,7 @@ export async function GetSingleNews({ id }: { id: string }) { } export async function SubmitNews(payload: FormData) { - const data = await axios.post("api/News", payload , { + const data = await axios.post("api/News", payload, { headers: { "Content-Type": "multipart/form-data" }, }); return data.data; @@ -184,7 +192,7 @@ export async function UpdateNews({ id: string; payload: FormData; }) { - const data = await axios.put(`api/News/${id}`, payload , { + const data = await axios.put(`api/News/${id}`, payload, { headers: { "Content-Type": "multipart/form-data" }, }); return data.data; @@ -207,7 +215,7 @@ export async function GetSingleSlider({ id }: { id: string }) { } export async function SubmitSlider(payload: FormData) { - const data = await axios.post("api/Sliders", payload , { + const data = await axios.post("api/Sliders", payload, { headers: { "Content-Type": "multipart/form-data" }, }); return data.data; @@ -220,7 +228,7 @@ export async function UpdateSlider({ id: string; payload: FormData; }) { - const data = await axios.put(`api/Sliders/${id}`, payload , { + const data = await axios.put(`api/Sliders/${id}`, payload, { headers: { "Content-Type": "multipart/form-data" }, }); return data.data; diff --git a/utils/authenticateApi.ts b/utils/authenticateApi.ts index 5a963e3..2a94353 100644 --- a/utils/authenticateApi.ts +++ b/utils/authenticateApi.ts @@ -8,6 +8,8 @@ import { axios.defaults.baseURL = process.env.NEXT_PUBLIC_BASE_URL_APP; +let isRefreshing = false; + axios.interceptors.response.use( (response) => { return response; @@ -15,26 +17,37 @@ axios.interceptors.response.use( async function (error) { console.log(error); const originalRequest = error.config; - if ( - error.response.status === 401 && - originalRequest.url == "api/Authenticate/Profile" - ) { - originalRequest._retry = true; - const accessToken = getCookie("Sootzani_Token"); - const refreshToken = getCookie("Sootzani_Refresh_Token"); - if (accessToken) { - const data = await RefreshToken({ - token: accessToken, - refreshToken: refreshToken, - }); + + if (error.response.status === 401) { + if (!originalRequest._retry) { + originalRequest._retry = true; + const accessToken = getCookie("Sootzani_Token"); + const refreshToken = getCookie("Sootzani_Refresh_Token"); + + if (accessToken && refreshToken && !isRefreshing) { + isRefreshing = true; + + try { + // Perform token refresh + const data = await RefreshToken({ + token: accessToken, + refreshToken: refreshToken, + }); + + // Retry the original request + return axios(originalRequest); + } catch (refreshError) { + console.error("Token refresh failed", refreshError); + // Handle refresh error, e.g., redirect to login page + return Promise.reject(refreshError); + } finally { + isRefreshing = false; + } + } } } - // if (error.response.status === 403 && !originalRequest._retry) { - // originalRequest._retry = true; - // const access_token = await refreshAccessToken(); - // axios.defaults.headers.common["Authorization"] = "Bearer " + access_token; - // return axiosApiInstance(originalRequest); - // } + + // For other errors or if refresh token logic is not applicable return Promise.reject(error); } );