diff --git a/components/AdminCategories.tsx b/components/AdminCategories.tsx index 27d1137..b193abb 100644 --- a/components/AdminCategories.tsx +++ b/components/AdminCategories.tsx @@ -139,8 +139,6 @@ export default function AdminCategories() { mutationKey: ["ChangeCat"], mutationFn: UpdateCategory, onSuccess: (res) => { - console.log(res); - console.log("Success ChangeCat"); setOpenEdit(false); refetch1(); @@ -161,8 +159,6 @@ export default function AdminCategories() { mutationKey: ["DeleteCat"], mutationFn: DeleteCategory, onSuccess: (res) => { - console.log(res); - console.log("Success ChangeCat"); setOpenEdit(false); refetch1(); toast("عملیات شما با موفقیت انجام شد. ", { @@ -182,8 +178,6 @@ export default function AdminCategories() { mutationKey: ["AddCat"], mutationFn: SubmitCategory, onSuccess: (res) => { - console.log(res); - console.log("Success ChangeCat"); setOpenAdd(false); refetch1(); diff --git a/components/AdminKeysManagement.tsx b/components/AdminKeysManagement.tsx index 4e657cc..619a28a 100644 --- a/components/AdminKeysManagement.tsx +++ b/components/AdminKeysManagement.tsx @@ -108,9 +108,6 @@ export default function AdminKeysManagement() { mutationKey: ["ChangeKey"], mutationFn: ChangeKey, onSuccess: (res) => { - console.log(res); - // alert("Success"); - console.log("Success ChangeKey"); setOpenEdit(false); toast("عملیات شما با موفقیت انجام شد. ", { @@ -147,9 +144,6 @@ export default function AdminKeysManagement() { mutationKey: ["AddKey"], mutationFn: AddKey, onSuccess: (res) => { - console.log(res); - console.log("Success AddKey"); - setOpenAdd(false); refetch1(); diff --git a/components/AdminNews.tsx b/components/AdminNews.tsx index a1e04bd..8839869 100644 --- a/components/AdminNews.tsx +++ b/components/AdminNews.tsx @@ -168,7 +168,6 @@ export default function AdminNews() { image: string ) => { // Set state variables - console.log(id); setKeyId(id); setTitleNews(title); setDescNews(description); @@ -230,8 +229,6 @@ export default function AdminNews() { mutationKey: ["ChangeNews"], mutationFn: UpdateNews, onSuccess: (res) => { - console.log(res); - console.log("Success Change News"); setOpenEdit(false); refetch1(); @@ -252,8 +249,6 @@ export default function AdminNews() { mutationKey: ["DeleteNews"], mutationFn: DeleteNews, onSuccess: (res) => { - console.log(res); - console.log("Success Change News"); setOpenEdit(false); refetch1(); toast("عملیات شما با موفقیت انجام شد. ", { @@ -311,8 +306,6 @@ export default function AdminNews() { resetField("Url"); resetField("Description"); resetField("Content"); - - console.log(data); } const { resetField } = useForm(); @@ -328,8 +321,6 @@ export default function AdminNews() { } AddNewsMutation.mutate(formData); - - console.log(data); } useEffect(() => { diff --git a/components/AdminOrganizations.tsx b/components/AdminOrganizations.tsx index 9bfb10b..71ba0ad 100644 --- a/components/AdminOrganizations.tsx +++ b/components/AdminOrganizations.tsx @@ -142,8 +142,6 @@ export default function AdminOrganizations() { mutationKey: ["ChangeOrg"], mutationFn: UpdateOrganization, onSuccess: (res) => { - console.log(res); - console.log("Success ChangeCat"); setOpenEdit(false); refetch1(); @@ -164,8 +162,6 @@ export default function AdminOrganizations() { mutationKey: ["DeleteOrg"], mutationFn: DeleteOrganization, onSuccess: (res) => { - console.log(res); - console.log("Success ChangeCat"); setOpenEdit(false); refetch1(); toast("عملیات شما با موفقیت انجام شد. ", { @@ -185,8 +181,6 @@ export default function AdminOrganizations() { mutationKey: ["AddOrg"], mutationFn: SubmitOrganization, onSuccess: (res) => { - console.log(res); - console.log("Success ChangeCat"); setOpenAdd(false); refetch1(); diff --git a/components/AdminSlider.tsx b/components/AdminSlider.tsx index 1526c16..ac1d1e5 100644 --- a/components/AdminSlider.tsx +++ b/components/AdminSlider.tsx @@ -139,7 +139,6 @@ export default function AdminSlider() { queryFn: () => GetAllSliders(), // refetchOnWindowFocus: false, }); - console.log(data1); // Edit const handleClickEdit = ( @@ -202,8 +201,6 @@ const ChangeSliderMutation = useMutation({ mutationKey: ["ChangeSlider"], mutationFn: UpdateSlider, onSuccess: (res) => { - console.log(res); - console.log("Success Change Slider"); setOpenEdit(false); refetch1(); @@ -224,8 +221,6 @@ const DeleteSliderMutation = useMutation({ mutationKey: ["DeleteSlider"], mutationFn: DeleteSlider, onSuccess: (res) => { - console.log(res); - console.log("Success Change Slider"); setOpenEdit(false); refetch1(); toast("عملیات شما با موفقیت انجام شد. ", { @@ -245,8 +240,6 @@ const AddSliderMutation = useMutation({ mutationKey: ["AddSlider"], mutationFn: SubmitSlider, onSuccess: (res) => { - console.log(res); - console.log("Success Change Slider"); setOpenAdd(false); refetch1(); diff --git a/components/AdminWebContents.tsx b/components/AdminWebContents.tsx index a547eb7..4ef362a 100644 --- a/components/AdminWebContents.tsx +++ b/components/AdminWebContents.tsx @@ -116,9 +116,6 @@ export default function AdminWebContents() { mutationKey: ["AddWebContents"], mutationFn: SubmitWebContents, onSuccess: (res) => { - console.log(res); - console.log("Success ChangeCat"); - setContentValueCall(""); setContentValueAbout(""); setContentValueAfter(""); @@ -141,8 +138,6 @@ export default function AdminWebContents() { mutationKey: ["EditWebContents"], mutationFn: UpdateWebContents, onSuccess: (res) => { - console.log(res); - console.log("Success Change UpdateWebContents"); toast("عملیات ویرایش شما با موفقیت انجام شد . ", { className: "!bg-green-500 !text-white", diff --git a/components/InspectorOperations.tsx b/components/InspectorOperations.tsx index c65d476..e0eee2e 100644 --- a/components/InspectorOperations.tsx +++ b/components/InspectorOperations.tsx @@ -143,6 +143,7 @@ export default function InspectorOperations({ placeholder="متن خود را وارد نمایید" className="resize-none bg-white lg:min-h-[20em]" {...field} + disabled={possibleOperations.length == 0} /> {/* @@ -164,10 +165,10 @@ export default function InspectorOperations({ type="file" onChange={(e) => { field.onChange(e.target.files ? e.target.files : null); - console.log(e.target.files); }} multiple className="bg-white " + disabled={possibleOperations.length == 0} /> @@ -188,13 +189,13 @@ export default function InspectorOperations({ > - + خصوصی - + عمومی @@ -222,6 +223,7 @@ export default function InspectorOperations({ { - console.log(event.selected); Page(event.selected); }; @@ -35,7 +34,7 @@ export default function Pagination({ previousLabel={} pageClassName=" w-10 h-10 grid place-content-center rounded-lg !text-blue shadow-md" className={twMerge( - " flex flex-wrap gap-3 text-sm md:text-base w-full bottom-0 rounded-md p-1 bg-white/30 backdrop-blur-lg justify-center text-blue mt-5" + " flex flex-wrap gap-3 text-sm md:text-base w-full rounded-md p-1 bg-white/30 backdrop-blur-lg justify-center text-blue mt-5 absolute left-0 right-0 bottom-6" )} activeClassName=" bg-blue text-blue shadow-md shadow-main" activeLinkClassName=" text-white w-full p-1 h-full" diff --git a/components/TabController.tsx b/components/TabController.tsx index 6c760f9..b09d026 100644 --- a/components/TabController.tsx +++ b/components/TabController.tsx @@ -29,6 +29,9 @@ export default function TabController() { const [search, setSearch] = useState(null); const [page, setPage] = useState(1); const [totalCount, setTotalCount] = useState(0); + const [currentPage, setCurrentPage] = useState(0); + const [pageSize, setPageSize] = useState(0); + const router = useRouter(); const [psblState, setPsblState] = useState(0); @@ -63,6 +66,8 @@ export default function TabController() { if (data) { const headersData = JSON.parse(data.headers["x-pagination"]); setTotalCount(headersData.TotalCount); + setCurrentPage(headersData.CurrentPage); + setPageSize(headersData.PageSize); } }, [data]); useEffect(() => { @@ -131,6 +136,8 @@ export default function TabController() { {data ? ( ) : (
diff --git a/components/TableController.tsx b/components/TableController.tsx index d5c672f..df5a7a8 100644 --- a/components/TableController.tsx +++ b/components/TableController.tsx @@ -51,8 +51,17 @@ interface Complaint { lastActor: number; cipherKeyInspector: string; } -export default function TableController({ data }: { data: Complaint[] }) { +export default function TableController({ + data, + pageSize, + currentPage +}: { + data: Complaint[]; + pageSize: number; + currentPage: number; +}) { const router = useRouter(); + return (
@@ -81,7 +90,7 @@ export default function TableController({ data }: { data: Complaint[] }) { key={item.id} > - {index + 1} + {pageSize * (currentPage - 1) + (index + 1)} {item.trackingNumber} diff --git a/components/Verify.tsx b/components/Verify.tsx index 1eb6391..19df48e 100644 --- a/components/Verify.tsx +++ b/components/Verify.tsx @@ -53,7 +53,6 @@ export default function Verify() { otpToken: localStorage.getItem("verificationToken"), verificationCode: otp, }; - console.log(userData); verifyMutation.mutate(payload); } }, [otp]); diff --git a/components/VerticalChart.tsx b/components/VerticalChart.tsx index 7504687..f31b726 100644 --- a/components/VerticalChart.tsx +++ b/components/VerticalChart.tsx @@ -70,8 +70,7 @@ function BarChart({ // var value2 = chartData[1].values.map((item) => Number(item.value)); // DataSets.push({ label: label1, data: value1 }); // DataSets.push({ label: label2, data: value2 }); - // // console.log(labels); - // // console.log(value1); + // } else if ("گزارش تعداد درخواست ها بر اساس نوع بیمه") { // var labels = chartData[0].values.map((item) => { // return item.title; @@ -79,9 +78,8 @@ function BarChart({ // var label1 = ""; // var value1 = chartData[0].values.map((item) => Number(item.value)); // DataSets.push({ label: label1, data: value1 }); - // console.log(value1); + // } - console.log(chartData); const options: ChartOptions<"bar"> = { scales: { x: { ticks: { autoSkip: false } }, y: { stacked: false } }, responsive: true, @@ -112,12 +110,10 @@ function BarChart({ // // suggestedMax: // // Math.max( // // ...chartData.map((l, j) => { - // // console.log(l); // // const a = l.values.map((v) => { // // return Number(v.value); // // }); // // const b = Math.max(...a); - // // console.log(b); // // return l.values.map((v) => Number(v.value)); // // }) // // ) * 1.2, @@ -140,7 +136,6 @@ function BarChart({ }; }), }; - // console.log(data); return ( ); diff --git a/hooks/useDecrypt.tsx b/hooks/useDecrypt.tsx index a7c92ef..372e3f9 100644 --- a/hooks/useDecrypt.tsx +++ b/hooks/useDecrypt.tsx @@ -34,7 +34,6 @@ dEqG/38xFdYTFEekexcHnT/Vt1MW4/j76vBJHYWuAJU= ); setDecryptedData(decrypted); } catch (error) { - console.log(error); setError(error); } }, [encryptedData]); diff --git a/utils/authenticateApi.ts b/utils/authenticateApi.ts index 2eb6103..2aaafc4 100644 --- a/utils/authenticateApi.ts +++ b/utils/authenticateApi.ts @@ -15,7 +15,6 @@ axios.interceptors.response.use( return response; }, async function (error) { - console.log(error); const originalRequest = error.config; if (error.response.status === 401) { diff --git a/utils/commonApi.ts b/utils/commonApi.ts index 68c0389..4fc0b51 100644 --- a/utils/commonApi.ts +++ b/utils/commonApi.ts @@ -10,13 +10,11 @@ export async function getCategory() { // Get Captcha export async function getCaptcha() { const data = await axios.get("api/Common/Captcha", { responseType: "blob" }); - console.log(data); return data; } // Get Captcha export async function getContents() { const data = await axios.get("api/Common/Contents"); - console.log(data); return data.data; }