diff --git a/app/components/dashboard/project-management/green-innovation-page.tsx b/app/components/dashboard/project-management/green-innovation-page.tsx index 59541ce..620ff49 100644 --- a/app/components/dashboard/project-management/green-innovation-page.tsx +++ b/app/components/dashboard/project-management/green-innovation-page.tsx @@ -267,9 +267,8 @@ export function GreenInnovationPage() { try { fetchingRef.current = true; - if (reset) { - setLoading(true); + setCurrentPage(1); } else { setLoadingMore(true); @@ -396,6 +395,9 @@ export function GreenInnovationPage() { }; }, [loadMore, hasMore, loadingMore]); + useEffect(()=>{ + setLoading(true); + },[]) const handleSort = (field: string) => { fetchingRef.current = false; setSortConfig((prev) => ({ @@ -679,10 +681,10 @@ export function GreenInnovationPage() { return ( -
+
{/* Stats Cards */}
-
+
{loading || statsLoading ? // Loading skeleton for stats cards - matching new design Array.from({ length: 2 }).map((_, index) => ( @@ -690,7 +692,7 @@ export function GreenInnovationPage() { key={`skeleton-${index}`} className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] backdrop-blur-sm rounded-lg overflow-hidden" > - +
-
+
{[...Array(8)].map((_, barIndex) => (
بازیافت و بازیابی منابع
-
+
{Object.entries(recycleParams).map((el, index) => { return ( @@ -826,7 +828,7 @@ export function GreenInnovationPage() { })}
-
+
`${val}%`} + tickFormatter={(val) => `${formatNumber(val)}%`} /> `${value}%`, + formatter: (value: any) => `${formatNumber(value)}%`, }} />