Merge branch 'feature/admin'

ad956 · Aug 5, 2024 · e0fe4a5 · e0fe4a5
2 parents 4b921f7 + 18671f8
commit e0fe4a5
Show file tree

Hide file tree

Showing 4 changed files with 361 additions and 18 deletions.
diff --git a/app/(pages)/admin/billing/page.tsx b/app/(pages)/admin/billing/page.tsx
diff --git a/app/(pages)/admin/components/Sidebar/index.tsx b/app/(pages)/admin/components/Sidebar/index.tsx
@@ -19,7 +19,7 @@ import { TbCurrencyRupee } from "react-icons/tb";
 const SidebarConfig = [
   { title: "Dashboard", uri: "", icon: <FiHome /> },
   { title: "Add Admin", uri: "add-admin", icon: <FiUserPlus /> },
-  { title: "Billing", uri: "billing", icon: <TbCurrencyRupee /> },
+  { title: "Transactions", uri: "transactions", icon: <TbCurrencyRupee /> },
   { title: "Hospitals", uri: "hospitals", icon: <FiHeart /> },
   { title: "Users", uri: "users", icon: <FiUser /> },
   { title: "Reports", uri: "reports", icon: <FiBarChart2 /> },

diff --git a/app/(pages)/admin/page.tsx b/app/(pages)/admin/page.tsx
@@ -57,12 +57,10 @@ export default function Admin() {
   const [recentUsers, setRecentUsers] = useState<RecentUser[]>([]);
   const [page, setPage] = useState(1);
   const [hasMore, setHasMore] = useState(true);
-  const [isLoading, setIsLoading] = useState(false);
 
   const observer = useRef<IntersectionObserver | null>(null);
   const lastUserElementRef = useCallback(
     (node: HTMLDivElement | null) => {
-      if (isLoading) return;
       if (observer.current) observer.current.disconnect();
       observer.current = new IntersectionObserver((entries) => {
         if (entries[0].isIntersecting && hasMore) {
@@ -71,7 +69,7 @@ export default function Admin() {
       });
       if (node) observer.current.observe(node);
     },
-    [isLoading, hasMore]
+    [hasMore]
   );
 
   useEffect(() => {
@@ -87,8 +85,8 @@ export default function Admin() {
   }, [page]);
 
   const fetchRecentUsers = async () => {
-    if (isLoading || !hasMore) return;
-    setIsLoading(true);
+    if (!hasMore) return;
+
     try {
       const response = await fetch(
         `/api/admin/dashboard/recent-users?page=${page}&limit=10`
@@ -98,8 +96,6 @@ export default function Admin() {
       setHasMore(data.page < data.totalPages);
     } catch (error) {
       console.error("Error fetching recent users:", error);
-    } finally {
-      setIsLoading(false);
     }
   };
 
@@ -189,11 +185,6 @@ export default function Admin() {
                     <p className="text-sm text-gray-500">{user.timeSince}</p>
                   </div>
                 ))}
-                {isLoading && (
-                  <div className="text-center">
-                    <Spinner size="md" />
-                  </div>
-                )}
               </div>
             </CardBody>
           </Card>