Admin report renu

package.json

@@ -74,7 +74,7 @@
     "mongodb": "^6.13.0",
     "mongoose": "^8.10.1",
     "natural": "^8.1.0",
-    "next": "^15.2.4",
+    "next": "^15.4.1",
     "next-auth": "^4.24.11",
     "next-connect": "^1.0.0",
     "next-themes": "^0.4.4",

src/app/api/admin/dashboard/route.ts

@@ -4,13 +4,14 @@ import Session from "@/lib/models/sessionSchema";
 import SkillList from "@/lib/models/skillListing";
 import SkillListing from "@/lib/models/skillListing";
 import SkillMatch from "@/lib/models/skillMatch";
+import SuspendedUser from "@/lib/models/suspendedUserSchema";
 import { NextResponse } from "next/server";
 
 export async function GET() {
   try {
     await connect(); // Connect to your MongoDB
 
-    const totalUsers = await User.countDocuments();
+    const totalUsers = await User.countDocuments({ isDeleted: false });
     const sessions = await Session.countDocuments();
     const skillsRequested = await SkillList.countDocuments();
     const skillsOffered = await SkillListing.countDocuments();
@@ -20,6 +21,8 @@ export async function GET() {
     const userIds = await Session.distinct("userId");
     const activeUsers = userIds.length;
 
+    const suspendedUsers = await SuspendedUser.countDocuments();
+
     const popularSkillDoc = await SkillList.aggregate([
       { $group: { _id: "$skillName", count: { $sum: 1 } } },
       { $sort: { count: -1 } },
@@ -88,6 +91,7 @@ export async function GET() {
       totalUsers,
       activeUsers,
       sessions,
+      suspendedUsers,
       popularSkill,
       skillsOffered,
       skillsRequested,

src/app/api/admin/reports/route.ts

@@ -20,7 +20,7 @@ export async function GET(req: Request) {
     }
 
     // Check if we can fetch without population first
-    const reportsBasic = await ReportInSession.find({}).limit(1);
+    const reportsBasic = await ReportInSession.find({}).limit(1).lean();
     console.log(
       "Basic report sample:",
       JSON.stringify(reportsBasic[0], null, 2)

src/app/badge/page.tsx

@@ -20,7 +20,6 @@ const CATEGORIES = [
   "All",
   "Achievement Milestone Badges",
   "Specific Badges",
-  "Engagement and Activity Badges",
   "Exclusive Recognition Badges",
 ];
 

src/components/Admin/AdminSidebar.tsx

@@ -17,6 +17,7 @@ import {
   Shield,
   Star,
   UserX,
+  NotebookTabs,
 } from "lucide-react";
 
 import clsx from "clsx"; // Utility for conditional class names
@@ -88,7 +89,7 @@ const navItems = [
   {
     id: "forum-reports",
     label: "Forum Reports",
-    icon: Flag,
+    icon: NotebookTabs,
     permission: "manage_forum_reports",
   },
 ];