a bug fixed + Cleaned Code

Kahdooie
yasaman 2024-01-28 15:20:09 +03:30
parent fa6c67d3f5
commit d1e7405780
16 changed files with 26 additions and 59 deletions

View File

@ -139,8 +139,6 @@ export default function AdminCategories() {
mutationKey: ["ChangeCat"], mutationKey: ["ChangeCat"],
mutationFn: UpdateCategory, mutationFn: UpdateCategory,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success ChangeCat");
setOpenEdit(false); setOpenEdit(false);
refetch1(); refetch1();
@ -161,8 +159,6 @@ export default function AdminCategories() {
mutationKey: ["DeleteCat"], mutationKey: ["DeleteCat"],
mutationFn: DeleteCategory, mutationFn: DeleteCategory,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success ChangeCat");
setOpenEdit(false); setOpenEdit(false);
refetch1(); refetch1();
toast("عملیات شما با موفقیت انجام شد. ", { toast("عملیات شما با موفقیت انجام شد. ", {
@ -182,8 +178,6 @@ export default function AdminCategories() {
mutationKey: ["AddCat"], mutationKey: ["AddCat"],
mutationFn: SubmitCategory, mutationFn: SubmitCategory,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success ChangeCat");
setOpenAdd(false); setOpenAdd(false);
refetch1(); refetch1();

View File

@ -108,9 +108,6 @@ export default function AdminKeysManagement() {
mutationKey: ["ChangeKey"], mutationKey: ["ChangeKey"],
mutationFn: ChangeKey, mutationFn: ChangeKey,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
// alert("Success");
console.log("Success ChangeKey");
setOpenEdit(false); setOpenEdit(false);
toast("عملیات شما با موفقیت انجام شد. ", { toast("عملیات شما با موفقیت انجام شد. ", {
@ -147,9 +144,6 @@ export default function AdminKeysManagement() {
mutationKey: ["AddKey"], mutationKey: ["AddKey"],
mutationFn: AddKey, mutationFn: AddKey,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success AddKey");
setOpenAdd(false); setOpenAdd(false);
refetch1(); refetch1();

View File

@ -168,7 +168,6 @@ export default function AdminNews() {
image: string image: string
) => { ) => {
// Set state variables // Set state variables
console.log(id);
setKeyId(id); setKeyId(id);
setTitleNews(title); setTitleNews(title);
setDescNews(description); setDescNews(description);
@ -230,8 +229,6 @@ export default function AdminNews() {
mutationKey: ["ChangeNews"], mutationKey: ["ChangeNews"],
mutationFn: UpdateNews, mutationFn: UpdateNews,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success Change News");
setOpenEdit(false); setOpenEdit(false);
refetch1(); refetch1();
@ -252,8 +249,6 @@ export default function AdminNews() {
mutationKey: ["DeleteNews"], mutationKey: ["DeleteNews"],
mutationFn: DeleteNews, mutationFn: DeleteNews,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success Change News");
setOpenEdit(false); setOpenEdit(false);
refetch1(); refetch1();
toast("عملیات شما با موفقیت انجام شد. ", { toast("عملیات شما با موفقیت انجام شد. ", {
@ -311,8 +306,6 @@ export default function AdminNews() {
resetField("Url"); resetField("Url");
resetField("Description"); resetField("Description");
resetField("Content"); resetField("Content");
console.log(data);
} }
const { resetField } = useForm(); const { resetField } = useForm();
@ -328,8 +321,6 @@ export default function AdminNews() {
} }
AddNewsMutation.mutate(formData); AddNewsMutation.mutate(formData);
console.log(data);
} }
useEffect(() => { useEffect(() => {

View File

@ -142,8 +142,6 @@ export default function AdminOrganizations() {
mutationKey: ["ChangeOrg"], mutationKey: ["ChangeOrg"],
mutationFn: UpdateOrganization, mutationFn: UpdateOrganization,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success ChangeCat");
setOpenEdit(false); setOpenEdit(false);
refetch1(); refetch1();
@ -164,8 +162,6 @@ export default function AdminOrganizations() {
mutationKey: ["DeleteOrg"], mutationKey: ["DeleteOrg"],
mutationFn: DeleteOrganization, mutationFn: DeleteOrganization,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success ChangeCat");
setOpenEdit(false); setOpenEdit(false);
refetch1(); refetch1();
toast("عملیات شما با موفقیت انجام شد. ", { toast("عملیات شما با موفقیت انجام شد. ", {
@ -185,8 +181,6 @@ export default function AdminOrganizations() {
mutationKey: ["AddOrg"], mutationKey: ["AddOrg"],
mutationFn: SubmitOrganization, mutationFn: SubmitOrganization,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success ChangeCat");
setOpenAdd(false); setOpenAdd(false);
refetch1(); refetch1();

View File

@ -139,7 +139,6 @@ export default function AdminSlider() {
queryFn: () => GetAllSliders(), queryFn: () => GetAllSliders(),
// refetchOnWindowFocus: false, // refetchOnWindowFocus: false,
}); });
console.log(data1);
// Edit // Edit
const handleClickEdit = ( const handleClickEdit = (
@ -202,8 +201,6 @@ const ChangeSliderMutation = useMutation({
mutationKey: ["ChangeSlider"], mutationKey: ["ChangeSlider"],
mutationFn: UpdateSlider, mutationFn: UpdateSlider,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success Change Slider");
setOpenEdit(false); setOpenEdit(false);
refetch1(); refetch1();
@ -224,8 +221,6 @@ const DeleteSliderMutation = useMutation({
mutationKey: ["DeleteSlider"], mutationKey: ["DeleteSlider"],
mutationFn: DeleteSlider, mutationFn: DeleteSlider,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success Change Slider");
setOpenEdit(false); setOpenEdit(false);
refetch1(); refetch1();
toast("عملیات شما با موفقیت انجام شد. ", { toast("عملیات شما با موفقیت انجام شد. ", {
@ -245,8 +240,6 @@ const AddSliderMutation = useMutation({
mutationKey: ["AddSlider"], mutationKey: ["AddSlider"],
mutationFn: SubmitSlider, mutationFn: SubmitSlider,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success Change Slider");
setOpenAdd(false); setOpenAdd(false);
refetch1(); refetch1();

View File

@ -116,9 +116,6 @@ export default function AdminWebContents() {
mutationKey: ["AddWebContents"], mutationKey: ["AddWebContents"],
mutationFn: SubmitWebContents, mutationFn: SubmitWebContents,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success ChangeCat");
setContentValueCall(""); setContentValueCall("");
setContentValueAbout(""); setContentValueAbout("");
setContentValueAfter(""); setContentValueAfter("");
@ -141,8 +138,6 @@ export default function AdminWebContents() {
mutationKey: ["EditWebContents"], mutationKey: ["EditWebContents"],
mutationFn: UpdateWebContents, mutationFn: UpdateWebContents,
onSuccess: (res) => { onSuccess: (res) => {
console.log(res);
console.log("Success Change UpdateWebContents");
toast("عملیات ویرایش شما با موفقیت انجام شد . ", { toast("عملیات ویرایش شما با موفقیت انجام شد . ", {
className: "!bg-green-500 !text-white", className: "!bg-green-500 !text-white",

View File

@ -136,6 +136,7 @@ export default function InspectorOperations({
placeholder="متن خود را وارد نمایید" placeholder="متن خود را وارد نمایید"
className="resize-none bg-white lg:min-h-[20em]" className="resize-none bg-white lg:min-h-[20em]"
{...field} {...field}
disabled={possibleOperations.length == 0}
/> />
</FormControl> </FormControl>
{/* <FormDescription> {/* <FormDescription>
@ -157,10 +158,10 @@ export default function InspectorOperations({
type="file" type="file"
onChange={(e) => { onChange={(e) => {
field.onChange(e.target.files ? e.target.files : null); field.onChange(e.target.files ? e.target.files : null);
console.log(e.target.files);
}} }}
multiple multiple
className="bg-white " className="bg-white "
disabled={possibleOperations.length == 0}
/> />
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
@ -181,13 +182,13 @@ export default function InspectorOperations({
> >
<FormItem className="flex items-center space-x-3 space-y-0"> <FormItem className="flex items-center space-x-3 space-y-0">
<FormControl> <FormControl>
<RadioGroupItem value="private" className="ml-2 " /> <RadioGroupItem value="private" className="ml-2 " disabled={possibleOperations.length == 0}/>
</FormControl> </FormControl>
<FormLabel className="font-normal">خصوصی</FormLabel> <FormLabel className="font-normal">خصوصی</FormLabel>
</FormItem> </FormItem>
<FormItem className="flex items-center space-x-3 space-y-0"> <FormItem className="flex items-center space-x-3 space-y-0">
<FormControl> <FormControl>
<RadioGroupItem value="public" className="ml-2 " /> <RadioGroupItem value="public" className="ml-2 " disabled={possibleOperations.length == 0}/>
</FormControl> </FormControl>
<FormLabel className="font-normal">عمومی</FormLabel> <FormLabel className="font-normal">عمومی</FormLabel>
</FormItem> </FormItem>
@ -215,6 +216,7 @@ export default function InspectorOperations({
<SelectTrigger <SelectTrigger
className=" bg-white h-10 !placeholder:text-xs text-xs" className=" bg-white h-10 !placeholder:text-xs text-xs"
dir="rtl" dir="rtl"
disabled={possibleOperations.length == 0}
> >
<SelectValue <SelectValue
className="text-xs " className="text-xs "

View File

@ -100,7 +100,6 @@ export default function LineChart({
anchor: "end", anchor: "end",
font: { size: 12 }, font: { size: 12 },
formatter: function (value, context) { formatter: function (value, context) {
console.log(context.dataset);
return value == 0 ? "" : value; return value == 0 ? "" : value;
}, },
}, },

View File

@ -18,7 +18,6 @@ export default function Pagination({
length?: any; length?: any;
}) { }) {
const handlePageClick = (event: any) => { const handlePageClick = (event: any) => {
console.log(event.selected);
Page(event.selected); Page(event.selected);
}; };
@ -35,7 +34,7 @@ export default function Pagination({
previousLabel={<MdKeyboardArrowRight className="w-5 h-5 " />} previousLabel={<MdKeyboardArrowRight className="w-5 h-5 " />}
pageClassName=" w-10 h-10 grid place-content-center rounded-lg !text-blue shadow-md" pageClassName=" w-10 h-10 grid place-content-center rounded-lg !text-blue shadow-md"
className={twMerge( 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" activeClassName=" bg-blue text-blue shadow-md shadow-main"
activeLinkClassName=" text-white w-full p-1 h-full" activeLinkClassName=" text-white w-full p-1 h-full"

View File

@ -29,6 +29,9 @@ export default function TabController() {
const [search, setSearch] = useState<any>(null); const [search, setSearch] = useState<any>(null);
const [page, setPage] = useState<any>(1); const [page, setPage] = useState<any>(1);
const [totalCount, setTotalCount] = useState<any>(0); const [totalCount, setTotalCount] = useState<any>(0);
const [currentPage, setCurrentPage] = useState<any>(0);
const [pageSize, setPageSize] = useState<any>(0);
const router = useRouter(); const router = useRouter();
const [psblState, setPsblState] = useState(0); const [psblState, setPsblState] = useState(0);
@ -63,6 +66,8 @@ export default function TabController() {
if (data) { if (data) {
const headersData = JSON.parse(data.headers["x-pagination"]); const headersData = JSON.parse(data.headers["x-pagination"]);
setTotalCount(headersData.TotalCount); setTotalCount(headersData.TotalCount);
setCurrentPage(headersData.CurrentPage);
setPageSize(headersData.PageSize);
} }
}, [data]); }, [data]);
useEffect(() => { useEffect(() => {
@ -131,6 +136,8 @@ export default function TabController() {
{data ? ( {data ? (
<TableController <TableController
data={data?.data} data={data?.data}
currentPage ={currentPage}
pageSize ={pageSize}
/> />
) : ( ) : (
<div className="flex flex-col gap-3"> <div className="flex flex-col gap-3">

View File

@ -51,8 +51,17 @@ interface Complaint {
lastActor: number; lastActor: number;
cipherKeyInspector: string; 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(); const router = useRouter();
return ( return (
<div> <div>
<Table className="border-[1px] border-solid border-muted rounded-md w-full min-w-[40rem] overflow-y-auto scrollbar-thumb-gray-600 scrollbar-track-gray-100 scrollbar-thin"> <Table className="border-[1px] border-solid border-muted rounded-md w-full min-w-[40rem] overflow-y-auto scrollbar-thumb-gray-600 scrollbar-track-gray-100 scrollbar-thin">
@ -81,7 +90,7 @@ export default function TableController({ data }: { data: Complaint[] }) {
key={item.id} key={item.id}
> >
<TableCell className="w-1/12 font-medium "> <TableCell className="w-1/12 font-medium ">
{index + 1} {pageSize * (currentPage - 1) + (index + 1)}
</TableCell> </TableCell>
<TableCell className="w-1/12">{item.trackingNumber}</TableCell> <TableCell className="w-1/12">{item.trackingNumber}</TableCell>
<TableCell className="w-2/12"> <TableCell className="w-2/12">

View File

@ -53,7 +53,6 @@ export default function Verify() {
otpToken: localStorage.getItem("verificationToken"), otpToken: localStorage.getItem("verificationToken"),
verificationCode: otp, verificationCode: otp,
}; };
console.log(userData);
verifyMutation.mutate(payload); verifyMutation.mutate(payload);
} }
}, [otp]); }, [otp]);

View File

@ -70,8 +70,7 @@ function BarChart({
// var value2 = chartData[1].values.map((item) => Number(item.value)); // var value2 = chartData[1].values.map((item) => Number(item.value));
// DataSets.push({ label: label1, data: value1 }); // DataSets.push({ label: label1, data: value1 });
// DataSets.push({ label: label2, data: value2 }); // DataSets.push({ label: label2, data: value2 });
// // console.log(labels);
// // console.log(value1);
// } else if ("گزارش تعداد درخواست ها بر اساس نوع بیمه") { // } else if ("گزارش تعداد درخواست ها بر اساس نوع بیمه") {
// var labels = chartData[0].values.map((item) => { // var labels = chartData[0].values.map((item) => {
// return item.title; // return item.title;
@ -79,9 +78,8 @@ function BarChart({
// var label1 = ""; // var label1 = "";
// var value1 = chartData[0].values.map((item) => Number(item.value)); // var value1 = chartData[0].values.map((item) => Number(item.value));
// DataSets.push({ label: label1, data: value1 }); // DataSets.push({ label: label1, data: value1 });
// console.log(value1);
// } // }
console.log(chartData);
const options: ChartOptions<"bar"> = { const options: ChartOptions<"bar"> = {
scales: { x: { ticks: { autoSkip: false } }, y: { stacked: false } }, scales: { x: { ticks: { autoSkip: false } }, y: { stacked: false } },
responsive: true, responsive: true,
@ -112,12 +110,10 @@ function BarChart({
// // suggestedMax: // // suggestedMax:
// // Math.max( // // Math.max(
// // ...chartData.map((l, j) => { // // ...chartData.map((l, j) => {
// // console.log(l);
// // const a = l.values.map((v) => { // // const a = l.values.map((v) => {
// // return Number(v.value); // // return Number(v.value);
// // }); // // });
// // const b = Math.max(...a); // // const b = Math.max(...a);
// // console.log(b);
// // return l.values.map((v) => Number(v.value)); // // return l.values.map((v) => Number(v.value));
// // }) // // })
// // ) * 1.2, // // ) * 1.2,
@ -140,7 +136,6 @@ function BarChart({
}; };
}), }),
}; };
// console.log(data);
return ( return (
<Bar dir="rtl" className="min-h-[20rem]" options={options} data={data} /> <Bar dir="rtl" className="min-h-[20rem]" options={options} data={data} />
); );

View File

@ -34,7 +34,6 @@ dEqG/38xFdYTFEekexcHnT/Vt1MW4/j76vBJHYWuAJU=
); );
setDecryptedData(decrypted); setDecryptedData(decrypted);
} catch (error) { } catch (error) {
console.log(error);
setError(error); setError(error);
} }
}, [encryptedData]); }, [encryptedData]);

View File

@ -15,7 +15,6 @@ axios.interceptors.response.use(
return response; return response;
}, },
async function (error) { async function (error) {
console.log(error);
const originalRequest = error.config; const originalRequest = error.config;
if (error.response.status === 401) { if (error.response.status === 401) {

View File

@ -10,13 +10,11 @@ export async function getCategory() {
// Get Captcha // Get Captcha
export async function getCaptcha() { export async function getCaptcha() {
const data = await axios.get("api/Common/Captcha", { responseType: "blob" }); const data = await axios.get("api/Common/Captcha", { responseType: "blob" });
console.log(data);
return data; return data;
} }
// Get Captcha // Get Captcha
export async function getContents() { export async function getContents() {
const data = await axios.get("api/Common/Contents"); const data = await axios.get("api/Common/Contents");
console.log(data);
return data.data; return data.data;
} }