fix: add JWT middleware to private API routes

backend/src/controllers/department.controller.js

@@ -29,6 +29,53 @@ export const getAllDepartments = async (req, res) => {
 	}
 };
 
+export const getDepartmentByName = async (req, res) => {
+	try {
+		const {name} = req.query;
+
+		if (!name) {
+			return res.status(400).json({
+				success: false,
+				message: "Department name is required",
+			});
+		}
+
+		const department = await prisma.department.findFirst({
+			where: {
+				name: name,
+			},
+		});
+
+		if (!department) {
+			return res.status(404).json({
+				success: false,
+				message: "Department not found",
+			});
+		}
+
+		const response = {
+			departmentId: department.departmentId,
+			name: department.name,
+			para1: department.para1 ?? "",
+			para2: department.para2 ?? "",
+			para3: department.para3 ?? "",
+			facilities: department.facilities ?? "",
+			services: department.services ?? "",
+		};
+
+		return res.status(200).json({
+			success: true,
+			data: [response],
+		});
+	} catch (error) {
+		console.error(error);
+		return res.status(500).json({
+			success: false,
+			message: "Failed to fetch department",
+		});
+	}
+};
+
 export async function createDepartment(req, res) {
 	try {
 		const {departmentId, name, para1, para2, para3, facilities, services} =

backend/src/controllers/doctor.controller.js

@@ -16,38 +16,35 @@ export const getAllDoctors = async (req, res) => {
 			orderBy: {name: "asc"},
 		});
 
-		const formatted = doctors.map((doc, index) => {
+		const formatted = doctors.map((doc, index) => ({
-			return {
+			SL_NO: String(index + 1),
-				SL_NO: String(index + 1),
+			doctorId: doc.doctorId,
-				doctorId: doc.doctorId,
+			name: doc.name,
-				name: doc.name,
+			designation: doc.designation,
-				designation: doc.designation,
+			workingStatus: doc.workingStatus,
-				workingStatus: doc.workingStatus,
+			qualification: doc.qualification,
-				qualification: doc.qualification,
 
-				departments: doc.departments.map((d) => {
+			departments: doc.departments.map((d) => {
-					const t = d.timing || {};
+				const t = d.timing || {};
 
-					const timingArray = [
+				const timingArray = [
-						t.monday && `Monday ${t.monday}`,
+					t.monday && `Monday ${t.monday}`,
-						t.tuesday && `Tuesday ${t.tuesday}`,
+					t.tuesday && `Tuesday ${t.tuesday}`,
-						t.wednesday && `Wednesday ${t.wednesday}`,
+					t.wednesday && `Wednesday ${t.wednesday}`,
-						t.thursday && `Thursday ${t.thursday}`,
+					t.thursday && `Thursday ${t.thursday}`,
-						t.friday && `Friday ${t.friday}`,
+					t.friday && `Friday ${t.friday}`,
-						t.saturday && `Saturday ${t.saturday}`,
+					t.saturday && `Saturday ${t.saturday}`,
-						t.sunday && `Sunday ${t.sunday}`,
+					t.sunday && `Sunday ${t.sunday}`,
-						t.additional && t.additional,
+					t.additional && t.additional,
-					].filter(Boolean);
+				].filter(Boolean);
 
-					return {
+				return {
-						departmentId: d.department.departmentId,
+					departmentId: d.department.departmentId,
-						departmentName: d.department.name,
+					departmentName: d.department.name,
-
+					timing: timingArray.join(" & "),
-						timing: timingArray.join(" & "),
+				};
-					};
+			}),
-				}),
+		}));
-			};
-		});
 
 		res.status(200).json({
 			success: true,
@@ -113,6 +110,54 @@ export const getDoctorByDoctorId = async (req, res) => {
 	}
 };
 
+// get doctors by department
+export const getDoctorsByDepartmentId = async (req, res) => {
+	try {
+		const {Department_ID} = req.query;
+
+		if (!Department_ID) {
+			return res.status(400).json({
+				success: false,
+				message: "Department_ID is required",
+			});
+		}
+
+		const department = await prisma.department.findUnique({
+			where: {departmentId: Department_ID},
+		});
+
+		if (!department) {
+			return res.status(404).json({
+				success: false,
+				message: "Department not found",
+			});
+		}
+
+		const doctors = await prisma.doctorDepartment.findMany({
+			where: {departmentId: department.id},
+			include: {
+				doctor: true,
+			},
+		});
+
+		const result = doctors.map((d) => ({
+			GG_ID: d.doctor.doctorId,
+			Name: d.doctor.name,
+		}));
+
+		res.status(200).json({
+			success: true,
+			data: result,
+		});
+	} catch (error) {
+		console.error(error);
+		res.status(500).json({
+			success: false,
+			message: "Failed to fetch doctors",
+		});
+	}
+};
+
 // add doctors
 export const createDoctor = async (req, res) => {
 	try {
@@ -184,20 +229,14 @@ export const updateDoctor = async (req, res) => {
 		});
 
 		if (!doctor) {
-			return res.status(404).json({
+			return res
-				success: false,
+				.status(404)
-				message: "Doctor not found",
+				.json({success: false, message: "Doctor not found"});
-			});
 		}
 
 		await prisma.doctor.update({
 			where: {id: doctor.id},
-			data: {
+			data: {name, designation, workingStatus, qualification},
-				name,
-				designation,
-				workingStatus,
-				qualification,
-			},
 		});
 
 		const oldRelations = await prisma.doctorDepartment.findMany({
@@ -229,25 +268,24 @@ export const updateDoctor = async (req, res) => {
 			});
 
 			if (dep.timing) {
+				const {id, doctorDepartmentId, createdAt, updatedAt, ...cleanTiming} =
+					dep.timing;
+
 				await prisma.doctorTiming.create({
 					data: {
 						doctorDepartmentId: doctorDepartment.id,
-						...dep.timing,
+						...cleanTiming,
 					},
 				});
 			}
 		}
 
-		res.status(200).json({
+		res
-			success: true,
+			.status(200)
-			message: "Doctor updated successfully",
+			.json({success: true, message: "Doctor updated successfully"});
-		});
 	} catch (error) {
-		console.error(error);
+		console.error("Update Error:", error);
-		res.status(500).json({
+		res.status(500).json({success: false, message: "Failed to update doctor"});
-			success: false,
-			message: "Failed to update doctor",
-		});
 	}
 };
 //delete doctor
@@ -256,13 +294,6 @@ export const deleteDoctor = async (req, res) => {
 	try {
 		const {doctorId} = req.params;
 
-		if (!doctorId) {
-			return res.status(400).json({
-				success: false,
-				message: "Doctor ID is required",
-			});
-		}
-
 		const doctor = await prisma.doctor.findUnique({
 			where: {doctorId},
 		});
@@ -270,7 +301,7 @@ export const deleteDoctor = async (req, res) => {
 		if (!doctor) {
 			return res.status(404).json({
 				success: false,
-				message: `Doctor with ID ${doctorId} not found`,
+				message: "Doctor not found",
 			});
 		}
 
@@ -294,7 +325,7 @@ export const deleteDoctor = async (req, res) => {
 
 		res.status(200).json({
 			success: true,
-			message: `Doctor ${doctorId} deleted successfully`,
+			message: "Doctor deleted successfully",
 		});
 	} catch (error) {
 		console.error(error);
@@ -320,23 +351,19 @@ export const getDoctorTimings = async (req, res) => {
 		});
 
 		const result = doctors.map((doc) => {
-			let timing = {};
+			const timing = doc.departments[0]?.timing || {};
-
-			if (doc.departments.length > 0) {
-				timing = doc.departments[0].timing ?? {};
-			}
 
 			return {
 				Doctor_ID: doc.doctorId,
 				Doctor: doc.name,
-				Monday: timing?.monday ?? "",
+				Monday: timing.monday || "",
-				Tuesday: timing?.tuesday ?? "",
+				Tuesday: timing.tuesday || "",
-				Wednesday: timing?.wednesday ?? "",
+				Wednesday: timing.wednesday || "",
-				Thursday: timing?.thursday ?? "",
+				Thursday: timing.thursday || "",
-				Friday: timing?.friday ?? "",
+				Friday: timing.friday || "",
-				Saturday: timing?.saturday ?? "",
+				Saturday: timing.saturday || "",
-				Sunday: timing?.sunday ?? "",
+				Sunday: timing.sunday || "",
-				Additional: timing?.additional ?? "",
+				Additional: timing.additional || "",
 			};
 		});
 
@@ -380,26 +407,11 @@ export const getDoctorTimingById = async (req, res) => {
 		const result = {
 			doctorId: doctor.doctorId,
 			doctorName: doctor.name,
-
+			departments: doctor.departments.map((d) => ({
-			departments: doctor.departments.map((d) => {
+				departmentId: d.department.departmentId,
-				const t = d.timing || {};
+				departmentName: d.department.name,
-
+				timing: d.timing || {},
-				return {
+			})),
-					departmentId: d.department.departmentId,
-					departmentName: d.department.name,
-
-					timing: {
-						monday: t.monday || "",
-						tuesday: t.tuesday || "",
-						wednesday: t.wednesday || "",
-						thursday: t.thursday || "",
-						friday: t.friday || "",
-						saturday: t.saturday || "",
-						sunday: t.sunday || "",
-						additional: t.additional || "",
-					},
-				};
-			}),
 		};
 
 		res.status(200).json({

backend/src/routes/academicsResearch.routes.js

@@ -11,8 +11,8 @@ import jwtAuthMiddleware from "../middleware/auth.js";
 const router = express.Router();
 
 router.post("/", createAcademicsResearch);
-router.get("/getAll", getAcademicsResearch);
+router.get("/getAll", jwtAuthMiddleware, getAcademicsResearch);
-router.get("/:id", getSingleAcademicsResearch);
+router.get("/:id", jwtAuthMiddleware, getSingleAcademicsResearch);
 router.delete("/:id", jwtAuthMiddleware, deleteAcademicsResearch);
 
 export default router;

backend/src/routes/appointment.routes.js

@@ -13,11 +13,11 @@ const router = express.Router();
 
 /* PUBLIC */
 
-router.get("/getall", getAppointments);
+router.get("/getall", jwtAuthMiddleware, getAppointments);
 router.post("/", createAppointment);
 
-router.get("/:id", getAppointment);
+router.get("/:id", jwtAuthMiddleware, getAppointment);
-router.patch("/:id", updateAppointment);
+router.patch("/:id", jwtAuthMiddleware, updateAppointment);
 router.delete("/:id", jwtAuthMiddleware, deleteAppointment);
 
 export default router;

backend/src/routes/candidate.routes.js

@@ -13,13 +13,13 @@ import jwtAuthMiddleware from "../middleware/auth.js";
 const router = express.Router();
 
 /* PUBLIC */
-
-router.get("/getAll", getCandidates);
-router.get("/:id", getCandidate);
-router.get("/career/:careerId", getCandidatesByCareer);
-
 router.post("/", createCandidate);
-router.patch("/:id", updateCandidate);
+
+router.get("/getAll", jwtAuthMiddleware, getCandidates);
+router.get("/:id", jwtAuthMiddleware, getCandidate);
+router.get("/career/:careerId", jwtAuthMiddleware, getCandidatesByCareer);
+
+router.patch("/:id", jwtAuthMiddleware, updateCandidate);
 router.delete("/:id", jwtAuthMiddleware, deleteCandidate);
 
 export default router;

backend/src/routes/career.routes.js

@@ -10,8 +10,8 @@ const router = express.Router();
 
 router.get("/getAll", getAllCareers);
 
-router.post("/", createCareer);
+router.post("/", jwtAuthMiddleware, createCareer);
-router.patch("/:id", updateCareer);
+router.patch("/:id", jwtAuthMiddleware, updateCareer);
-router.delete("/:id", deleteCareer);
+router.delete("/:id", jwtAuthMiddleware, deleteCareer);
 
 export default router;

backend/src/routes/department.routes.js

@@ -1,6 +1,7 @@
 import express from "express";
 import {
 	getAllDepartments,
+	getDepartmentByName,
 	createDepartment,
 	updateDepartment,
 	deleteDepartment,
@@ -11,6 +12,7 @@ const router = express.Router();
 
 // Public
 router.get("/getAll", getAllDepartments);
+router.get("/search", getDepartmentByName);
 
 // Protected
 router.post("/", jwtAuthMiddleware, createDepartment);

backend/src/routes/doctor.routes.js

@@ -7,6 +7,7 @@ import {
 	getDoctorTimings,
 	getDoctorTimingById,
 	getDoctorByDoctorId,
+	getDoctorsByDepartmentId,
 } from "../controllers/doctor.controller.js";
 
 import jwtAuthMiddleware from "../middleware/auth.js";
@@ -14,9 +15,10 @@ import jwtAuthMiddleware from "../middleware/auth.js";
 const router = express.Router();
 
 router.get("/getAll", getAllDoctors);
-router.get("/:doctorId", getDoctorByDoctorId);
+router.get("/search", getDoctorsByDepartmentId);
 router.get("/getTimings", getDoctorTimings);
 router.get("/getTimings/:doctorId", getDoctorTimingById);
+router.get("/:doctorId", getDoctorByDoctorId);
 
 router.post("/", jwtAuthMiddleware, createDoctor);
 router.patch("/:doctorId", jwtAuthMiddleware, updateDoctor);

backend/src/routes/inquiry.routes.js

@@ -12,8 +12,8 @@ const router = express.Router();
 
 router.post("/", createInquiry);
 
-router.get("/getAll", getInquiries);
+router.get("/getAll", jwtAuthMiddleware, getInquiries);
-router.get("/:id", getInquiry);
+router.get("/:id", jwtAuthMiddleware, getInquiry);
 router.delete("/:id", jwtAuthMiddleware, deleteInquiry);
 
 export default router;

frontend/src/components/ui/badge.tsx

@@ -1,49 +0,0 @@
-import * as React from "react"
-import { cva, type VariantProps } from "class-variance-authority"
-import { Slot } from "radix-ui"
-
-import { cn } from "@/lib/utils"
-
-const badgeVariants = cva(
-  "group/badge inline-flex h-5 w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-4xl border border-transparent px-2 py-0.5 text-xs font-medium whitespace-nowrap transition-all focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&>svg]:pointer-events-none [&>svg]:size-3!",
-  {
-    variants: {
-      variant: {
-        default: "bg-primary text-primary-foreground [a]:hover:bg-primary/80",
-        secondary:
-          "bg-secondary text-secondary-foreground [a]:hover:bg-secondary/80",
-        destructive:
-          "bg-destructive/10 text-destructive focus-visible:ring-destructive/20 dark:bg-destructive/20 dark:focus-visible:ring-destructive/40 [a]:hover:bg-destructive/20",
-        outline:
-          "border-border text-foreground [a]:hover:bg-muted [a]:hover:text-muted-foreground",
-        ghost:
-          "hover:bg-muted hover:text-muted-foreground dark:hover:bg-muted/50",
-        link: "text-primary underline-offset-4 hover:underline",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-    },
-  }
-)
-
-function Badge({
-  className,
-  variant = "default",
-  asChild = false,
-  ...props
-}: React.ComponentProps<"span"> &
-  VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
-  const Comp = asChild ? Slot.Root : "span"
-
-  return (
-    <Comp
-      data-slot="badge"
-      data-variant={variant}
-      className={cn(badgeVariants({ variant }), className)}
-      {...props}
-    />
-  )
-}
-
-export { Badge, badgeVariants }

frontend/src/pages/Academics.tsx

@@ -13,26 +13,11 @@ import {
 } from "@/components/ui/table";
 
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import {
-	Dialog,
-	DialogContent,
-	DialogHeader,
-	DialogTitle,
-	DialogFooter,
-} from "@/components/ui/dialog";
 
-import {
+import { Loader2, Trash, RefreshCw, Download } from "lucide-react";
-	Loader2,
-	Trash,
-	RefreshCw,
-	Download,
-	ChevronLeft,
-	ChevronRight,
-	Eye,
-	BookOpen,
-} from "lucide-react";
 
 export default function AcademicsPage() {
 	const [records, setRecords] = useState<any[]>([]);
@@ -40,12 +25,6 @@ export default function AcademicsPage() {
 
 	const [searchText, setSearchText] = useState("");
 
-	const [viewOpen, setViewOpen] = useState(false);
-	const [viewData, setViewData] = useState<any>(null);
-
-	const [currentPage, setCurrentPage] = useState(1);
-	const itemsPerPage = 10;
-
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
@@ -72,20 +51,6 @@ export default function AcademicsPage() {
 		);
 	});
 
-	useEffect(() => {
-		setCurrentPage(1);
-	}, [searchText]);
-
-	const totalPages = Math.ceil(filteredRecords.length / itemsPerPage);
-	const indexOfLastItem = currentPage * itemsPerPage;
-	const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-	const currentItems = filteredRecords.slice(indexOfFirstItem, indexOfLastItem);
-
-	function openView(item: any) {
-		setViewData(item);
-		setViewOpen(true);
-	}
-
 	async function handleDelete(id: number) {
 		if (!confirm("Delete record?")) return;
 		await deleteAcademicsApi(id);
@@ -109,29 +74,24 @@ export default function AcademicsPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
+			<div className="flex justify-between items-center gap-3 flex-wrap">
-				<h1 className="text-3xl font-bold">Academics & Research</h1>
+				<h1 className="text-2xl font-bold">Academics & Research</h1>
 
-				<div className="flex flex-wrap gap-3">
+				<div className="flex flex-wrap gap-2">
 					<Input
-						placeholder="Search name / course / email..."
+						placeholder="Search name / phone / email / subject..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[280px] text-base"
+						className="w-[260px]"
 					/>
 
-					<Button
+					<Button variant="outline" onClick={fetchAll} disabled={loading}>
-						variant="outline"
+						<RefreshCw className="mr-2 h-4 w-4" />
-						onClick={fetchAll}
-						disabled={loading}
-						className="text-base"
-					>
-						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={handleExport} className="text-base">
+					<Button variant="outline" onClick={handleExport}>
-						<Download className="mr-2 h-5 w-5" />
+						<Download className="mr-2 h-4 w-4" />
 						Export
 					</Button>
 				</div>
@@ -139,108 +99,65 @@ export default function AcademicsPage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle className="text-xl">Academic Records</CardTitle>
+					<CardTitle>Academics Records</CardTitle>
 				</CardHeader>
 
-				<CardContent className="p-0 sm:p-6 space-y-4">
+				<CardContent>
-					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
+					<div className="overflow-x-auto">
-						<Table className="w-full min-w-[1100px] table-fixed border-separate border-spacing-0">
+						<Table className="min-w-[1000px]">
-							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
+							<TableHeader>
 								<TableRow>
-									<TableHead className="w-[60px] bg-background font-bold text-sm">
+									<TableHead>ID</TableHead>
-										ID
+									<TableHead>Name</TableHead>
-									</TableHead>
+									<TableHead>Phone</TableHead>
-									<TableHead className="w-[220px] bg-background font-bold text-sm">
+									<TableHead>Email</TableHead>
-										Full Name
+									<TableHead>Course</TableHead>
-									</TableHead>
+									<TableHead>Subject</TableHead>
-									<TableHead className="w-[180px] bg-background font-bold text-sm">
+									<TableHead>Message</TableHead>
-										Course
+									<TableHead>Date</TableHead>
-									</TableHead>
+									<TableHead>Actions</TableHead>
-									<TableHead className="w-[180px] bg-background font-bold text-sm">
-										Subject
-									</TableHead>
-									<TableHead className="w-[140px] bg-background font-bold text-sm">
-										Applied Date
-									</TableHead>
-									<TableHead className="w-[220px] bg-background font-bold text-sm">
-										Message
-									</TableHead>
-									<TableHead className="w-[120px] bg-background font-bold text-right text-sm">
-										Actions
-									</TableHead>
 								</TableRow>
 							</TableHeader>
 
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={7} className="text-center py-10">
+										<TableCell colSpan={9} className="text-center">
-											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
+											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : currentItems.length === 0 ? (
+								) : filteredRecords.length === 0 ? (
 									<TableRow>
-										<TableCell
+										<TableCell colSpan={9} className="text-center">
-											colSpan={7}
-											className="text-center text-muted-foreground py-10 text-base"
-										>
 											No records found
 										</TableCell>
 									</TableRow>
 								) : (
-									currentItems.map((item) => (
+									filteredRecords.map((item) => (
-										<TableRow key={item.id} className="hover:bg-muted/50">
+										<TableRow key={item.id}>
-											<TableCell className="font-mono text-xs">
+											<TableCell>{item.id}</TableCell>
-												{item.id}
+											<TableCell>{item.fullName}</TableCell>
+											<TableCell>{item.number}</TableCell>
+											<TableCell>{item.emailId}</TableCell>
+
+											<TableCell>{item.courseName}</TableCell>
+											<TableCell>{item.subject}</TableCell>
+
+											<TableCell className="max-w-[250px] whitespace-normal">
+												{item.message}
 											</TableCell>
+
 											<TableCell>
-												<div className="font-semibold text-base truncate">
-													{item.fullName}
-												</div>
-												<div className="text-xs text-muted-foreground truncate">
-													{item.emailId}
-												</div>
-												<div className="text-[11px] font-medium">
-													{item.number}
-												</div>
-											</TableCell>
-											<TableCell>
-												<div className="text-sm font-medium line-clamp-2">
-													{item.courseName || "-"}
-												</div>
-											</TableCell>
-											<TableCell>
-												<div className="text-sm line-clamp-2">
-													{item.subject || "-"}
-												</div>
-											</TableCell>
-											<TableCell className="text-sm">
 												{new Date(item.createdAt).toLocaleDateString()}
 											</TableCell>
+
 											<TableCell>
-												<div className="text-sm line-clamp-2 text-muted-foreground italic">
+												<Button
-													{item.message || "-"}
+													size="sm"
-												</div>
+													variant="destructive"
-											</TableCell>
+													onClick={() => handleDelete(item.id)}>
-											<TableCell className="text-right">
+													<Trash className="h-4 w-4" />
-												<div className="flex justify-end gap-2">
+												</Button>
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9"
-														onClick={() => openView(item)}
-													>
-														<Eye className="h-4 w-4" />
-													</Button>
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
-														onClick={() => handleDelete(item.id)}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
-												</div>
 											</TableCell>
 										</TableRow>
 									))
@@ -248,117 +165,8 @@ export default function AcademicsPage() {
 							</TableBody>
 						</Table>
 					</div>
-
-					{!loading && filteredRecords.length > 0 && (
-						<div className="flex items-center justify-between px-2 py-6 border-t">
-							<div className="text-base text-muted-foreground">
-								Showing{" "}
-								<span className="font-semibold">{indexOfFirstItem + 1}</span> to{" "}
-								<span className="font-semibold">
-									{Math.min(indexOfLastItem, filteredRecords.length)}
-								</span>{" "}
-								of{" "}
-								<span className="font-semibold">{filteredRecords.length}</span>{" "}
-								records
-							</div>
-							<div className="flex items-center gap-6">
-								<div className="text-base font-semibold">
-									Page {currentPage} of {totalPages}
-								</div>
-								<div className="flex gap-2">
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.max(prev - 1, 1))
-										}
-										disabled={currentPage === 1}
-									>
-										<ChevronLeft className="h-5 w-5" />
-									</Button>
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.min(prev + 1, totalPages))
-										}
-										disabled={currentPage === totalPages || totalPages === 0}
-									>
-										<ChevronRight className="h-5 w-5" />
-									</Button>
-								</div>
-							</div>
-						</div>
-					)}
 				</CardContent>
 			</Card>
-
-			<Dialog open={viewOpen} onOpenChange={setViewOpen}>
-				<DialogContent className="w-full !max-w-3xl max-h-[85vh] overflow-y-auto">
-					<DialogHeader>
-						<DialogTitle className="text-2xl border-b pb-2 flex items-center gap-2">
-							<BookOpen className="h-6 w-6" /> Academic Detail View
-						</DialogTitle>
-					</DialogHeader>
-					{viewData && (
-						<div className="space-y-6 py-4">
-							<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-								<div className="space-y-4">
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Applicant Information
-										</p>
-										<p className="text-lg font-bold text-primary">
-											{viewData.fullName}
-										</p>
-										<p className="text-sm font-medium">{viewData.emailId}</p>
-										<p className="text-sm">{viewData.number}</p>
-									</div>
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Course & Subject
-										</p>
-										<p className="text-base font-semibold">
-											{viewData.courseName || "N/A"}
-										</p>
-										<p className="text-sm text-muted-foreground">
-											{viewData.subject}
-										</p>
-									</div>
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Submission Date
-										</p>
-										<p className="text-sm">
-											{new Date(viewData.createdAt).toLocaleString()}
-										</p>
-									</div>
-								</div>
-								<div className="space-y-4">
-									<div className="p-4 bg-muted/30 rounded-lg border">
-										<p className="text-xs uppercase font-bold text-muted-foreground mb-2">
-											Message / Research Inquiry
-										</p>
-										<p className="text-sm leading-relaxed whitespace-pre-wrap italic">
-											{viewData.message || "No message content provided."}
-										</p>
-									</div>
-								</div>
-							</div>
-						</div>
-					)}
-					<DialogFooter>
-						<Button
-							onClick={() => setViewOpen(false)}
-							className="w-full md:w-auto"
-						>
-							Close
-						</Button>
-					</DialogFooter>
-				</DialogContent>
-			</Dialog>
 		</div>
 	);
 }

frontend/src/pages/Appointment.tsx

@@ -1,7 +1,7 @@
-import { useState, useEffect, useCallback } from "react";
+import {useState, useEffect, useCallback} from "react";
 
-import { getAppointmentsApi, deleteAppointmentApi } from "@/api/appointment";
+import {getAppointmentsApi, deleteAppointmentApi} from "@/api/appointment";
-import { exportToExcel } from "@/utils/exportToExcel";
+import {exportToExcel} from "@/utils/exportToExcel";
 
 import {
 	Table,
@@ -12,26 +12,12 @@ import {
 	TableRow,
 } from "@/components/ui/table";
 
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import {
-	Dialog,
-	DialogContent,
-	DialogHeader,
-	DialogTitle,
-	DialogFooter,
-} from "@/components/ui/dialog";
 
-import {
+import {Button} from "@/components/ui/button";
-	Loader2,
+import {Input} from "@/components/ui/input";
-	Trash,
+
-	RefreshCw,
+import {Loader2, Trash, RefreshCw, Download} from "lucide-react";
-	Download,
-	ChevronLeft,
-	ChevronRight,
-	Eye,
-} from "lucide-react";
 
 export default function AppointmentPage() {
 	const [appointments, setAppointments] = useState<any[]>([]);
@@ -39,14 +25,9 @@ export default function AppointmentPage() {
 
 	const [searchText, setSearchText] = useState("");
 	const [filterDoctor, setFilterDoctor] = useState("");
+	const [filterDepartment, setFilterDepartment] = useState("");
 	const [filterDate, setFilterDate] = useState("");
 
-	const [viewOpen, setViewOpen] = useState(false);
-	const [viewData, setViewData] = useState<any>(null);
-
-	const [currentPage, setCurrentPage] = useState(1);
-	const itemsPerPage = 10;
-
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
@@ -73,30 +54,19 @@ export default function AppointmentPage() {
 			? item.doctor?.name?.toLowerCase().includes(filterDoctor.toLowerCase())
 			: true;
 
+		const matchesDepartment = filterDepartment
+			? item.department?.name
+					?.toLowerCase()
+					.includes(filterDepartment.toLowerCase())
+			: true;
+
 		const matchesDate = filterDate
 			? new Date(item.date).toISOString().split("T")[0] === filterDate
 			: true;
 
-		return matchesSearch && matchesDoctor && matchesDate;
+		return matchesSearch && matchesDoctor && matchesDepartment && matchesDate;
 	});
 
-	useEffect(() => {
-		setCurrentPage(1);
-	}, [searchText, filterDoctor, filterDate]);
-
-	const totalPages = Math.ceil(filteredAppointments.length / itemsPerPage);
-	const indexOfLastItem = currentPage * itemsPerPage;
-	const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-	const currentItems = filteredAppointments.slice(
-		indexOfFirstItem,
-		indexOfLastItem,
-	);
-
-	function openView(item: any) {
-		setViewData(item);
-		setViewOpen(true);
-	}
-
 	async function handleDelete(id: number) {
 		if (!confirm("Delete appointment?")) return;
 		await deleteAppointmentApi(id);
@@ -114,41 +84,51 @@ export default function AppointmentPage() {
 			Date: new Date(item.date).toLocaleDateString(),
 			Message: item.message,
 		}));
+
 		exportToExcel(exportData, "appointments");
 	};
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
+			<div className="flex justify-between items-center gap-3 flex-wrap">
-				<h1 className="text-3xl font-bold">Appointments</h1>
+				<h1 className="text-2xl font-bold">Appointments</h1>
 
-				<div className="flex flex-wrap gap-3">
+				<div className="flex flex-wrap gap-2">
 					<Input
-						placeholder="Search name / phone..."
+						placeholder="Search name / phone / email..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[220px] text-base"
+						className="w-[220px]"
+					/>
+
+					<Input
+						placeholder="Filter Doctor"
+						value={filterDoctor}
+						onChange={(e) => setFilterDoctor(e.target.value)}
+						className="w-[180px]"
+					/>
+
+					<Input
+						placeholder="Filter Department"
+						value={filterDepartment}
+						onChange={(e) => setFilterDepartment(e.target.value)}
+						className="w-[200px]"
 					/>
 
 					<Input
 						type="date"
 						value={filterDate}
 						onChange={(e) => setFilterDate(e.target.value)}
-						className="w-[160px] text-base"
+						className="w-[180px]"
 					/>
 
-					<Button
+					<Button variant="outline" onClick={fetchAll} disabled={loading}>
-						variant="outline"
+						<RefreshCw className="mr-2 h-4 w-4" />
-						onClick={fetchAll}
-						disabled={loading}
-						className="text-base"
-					>
-						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={handleExport} className="text-base">
+					<Button variant="outline" onClick={handleExport}>
-						<Download className="mr-2 h-5 w-5" />
+						<Download className="mr-2 h-4 w-4" />
 						Export
 					</Button>
 				</div>
@@ -156,102 +136,72 @@ export default function AppointmentPage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle className="text-xl">Appointment List</CardTitle>
+					<CardTitle>Appointment List</CardTitle>
 				</CardHeader>
 
-				<CardContent className="p-0 sm:p-6 space-y-4">
+				<CardContent>
-					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
+					<div className="overflow-x-auto">
-						<Table className="w-full min-w-[1000px] table-fixed border-separate border-spacing-0">
+						<Table className="min-w-[700px]">
-							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
+							<TableHeader>
 								<TableRow>
-									<TableHead className="w-[60px] bg-background font-bold text-sm">
+									<TableHead>ID</TableHead>
-										ID
+									<TableHead>Name</TableHead>
-									</TableHead>
+									<TableHead>Phone</TableHead>
-									<TableHead className="w-[200px] bg-background font-bold text-sm">
+									<TableHead>Email</TableHead>
-										Patient
+									<TableHead>Doctor</TableHead>
-									</TableHead>
+									<TableHead>Department</TableHead>
-									<TableHead className="w-[180px] bg-background font-bold text-sm">
+									<TableHead>Appointment Date</TableHead>
-										Doctor
+									<TableHead>Message</TableHead>
-									</TableHead>
+									<TableHead>Generated on</TableHead>
-									<TableHead className="w-[150px] bg-background font-bold text-sm">
+
-										Date
+									<TableHead>Actions</TableHead>
-									</TableHead>
-									<TableHead className="w-[250px] bg-background font-bold text-sm">
-										Message
-									</TableHead>
-									<TableHead className="w-[120px] bg-background font-bold text-right text-sm">
-										Actions
-									</TableHead>
 								</TableRow>
 							</TableHeader>
 
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={6} className="text-center py-10">
+										<TableCell colSpan={9} className="text-center">
-											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
+											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : currentItems.length === 0 ? (
+								) : filteredAppointments.length === 0 ? (
 									<TableRow>
-										<TableCell
+										<TableCell colSpan={9} className="text-center">
-											colSpan={6}
-											className="text-center text-muted-foreground py-10 text-base"
-										>
 											No appointments found
 										</TableCell>
 									</TableRow>
 								) : (
-									currentItems.map((item) => (
+									filteredAppointments.map((item) => (
-										<TableRow key={item.id} className="hover:bg-muted/50">
+										<TableRow key={item.id}>
-											<TableCell className="font-mono text-xs">
+											<TableCell>{item.id}</TableCell>
-												{item.id}
+											<TableCell>{item.name}</TableCell>
+											<TableCell>{item.mobileNumber}</TableCell>
+											<TableCell>{item.email}</TableCell>
+											<TableCell>{item.doctor?.name}</TableCell>
+											<TableCell>{item.department?.name}</TableCell>
+
+											{/* ✅ DATE ONLY */}
+											<TableCell>
+												{new Date(item.date).toLocaleDateString()}
+											</TableCell>
+
+											<TableCell className="max-w-[250px] whitespace-normal">
+												{item.message}
 											</TableCell>
 											<TableCell>
-												<div className="font-semibold text-base truncate">
+												{" "}
-													{item.name}
+												{new Date(item.createdAt).toLocaleDateString()}
-												</div>
-												<div className="text-xs text-muted-foreground">
-													{item.mobileNumber}
-												</div>
 											</TableCell>
+
 											<TableCell>
-												<div className="text-sm font-medium">
+												<Button
-													{item.doctor?.name || "-"}
+													size="sm"
-												</div>
+													variant="destructive"
-												<div className="text-[10px] text-muted-foreground truncate">
+													onClick={() => handleDelete(item.id)}
-													{item.department?.name}
+												>
-												</div>
+													<Trash className="h-4 w-4" />
-											</TableCell>
+												</Button>
-											<TableCell>
-												<div className="text-sm">
-													{new Date(item.date).toLocaleDateString()}
-												</div>
-											</TableCell>
-											<TableCell>
-												<div className="text-sm line-clamp-2 text-muted-foreground italic">
-													{item.message || "-"}
-												</div>
-											</TableCell>
-											<TableCell className="text-right">
-												<div className="flex justify-end gap-2">
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9"
-														onClick={() => openView(item)}
-													>
-														<Eye className="h-4 w-4" />
-													</Button>
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
-														onClick={() => handleDelete(item.id)}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
-												</div>
 											</TableCell>
 										</TableRow>
 									))
@@ -259,123 +209,8 @@ export default function AppointmentPage() {
 							</TableBody>
 						</Table>
 					</div>
-
-					{!loading && filteredAppointments.length > 0 && (
-						<div className="flex items-center justify-between px-2 py-6 border-t">
-							<div className="text-base text-muted-foreground">
-								Showing{" "}
-								<span className="font-semibold">{indexOfFirstItem + 1}</span> to{" "}
-								<span className="font-semibold">
-									{Math.min(indexOfLastItem, filteredAppointments.length)}
-								</span>{" "}
-								of{" "}
-								<span className="font-semibold">
-									{filteredAppointments.length}
-								</span>
-							</div>
-							<div className="flex items-center gap-6">
-								<div className="text-base font-semibold">
-									Page {currentPage} of {totalPages}
-								</div>
-								<div className="flex gap-2">
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.max(prev - 1, 1))
-										}
-										disabled={currentPage === 1}
-									>
-										<ChevronLeft className="h-5 w-5" />
-									</Button>
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.min(prev + 1, totalPages))
-										}
-										disabled={currentPage === totalPages || totalPages === 0}
-									>
-										<ChevronRight className="h-5 w-5" />
-									</Button>
-								</div>
-							</div>
-						</div>
-					)}
 				</CardContent>
 			</Card>
-
-			<Dialog open={viewOpen} onOpenChange={setViewOpen}>
-				<DialogContent className="w-full !max-w-3xl max-h-[85vh] overflow-y-auto">
-					<DialogHeader>
-						<DialogTitle className="text-2xl border-b pb-2">
-							Appointment Details
-						</DialogTitle>
-					</DialogHeader>
-					{viewData && (
-						<div className="space-y-6 py-4">
-							<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-								<div className="space-y-4">
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Patient Information
-										</p>
-										<p className="text-lg font-bold text-primary">
-											{viewData.name}
-										</p>
-										<p className="text-sm">{viewData.mobileNumber}</p>
-										<p className="text-sm">
-											{viewData.email || "No email provided"}
-										</p>
-									</div>
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Appointment Date
-										</p>
-										<p className="text-base font-semibold">
-											{new Date(viewData.date).toLocaleDateString()}
-										</p>
-										<p className="text-[10px] text-muted-foreground">
-											Booked on: {new Date(viewData.createdAt).toLocaleString()}
-										</p>
-									</div>
-								</div>
-								<div className="space-y-4">
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Doctor / Department
-										</p>
-										<p className="text-base font-bold">
-											{viewData.doctor?.name || "Not Assigned"}
-										</p>
-										<p className="text-sm text-muted-foreground">
-											{viewData.department?.name || "General"}
-										</p>
-									</div>
-									<div className="p-4 bg-muted/30 rounded-lg">
-										<p className="text-xs uppercase font-bold text-muted-foreground mb-2">
-											Message from Patient
-										</p>
-										<p className="text-sm italic leading-relaxed whitespace-pre-wrap">
-											{viewData.message || "No message provided."}
-										</p>
-									</div>
-								</div>
-							</div>
-						</div>
-					)}
-					<DialogFooter>
-						<Button
-							onClick={() => setViewOpen(false)}
-							className="w-full md:w-auto"
-						>
-							Close
-						</Button>
-					</DialogFooter>
-				</DialogContent>
-			</Dialog>
 		</div>
 	);
 }

frontend/src/pages/Career.tsx

@@ -1,6 +1,7 @@
 import { useState, useEffect, useCallback } from "react";
 
 import { getCareersApi, deleteCareerApi } from "@/api/career";
+
 import apiClient from "@/api/client";
 
 import {
@@ -14,6 +15,7 @@ import {
 
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
+
 import {
 	Dialog,
 	DialogContent,
@@ -23,17 +25,8 @@ import {
 } from "@/components/ui/dialog";
 
 import { Input } from "@/components/ui/input";
-import { Badge } from "@/components/ui/badge";
 
-import {
+import { Loader2, Plus, Pencil, Trash, RefreshCw } from "lucide-react";
-	Loader2,
-	Plus,
-	Pencil,
-	Trash,
-	RefreshCw,
-	ChevronLeft,
-	ChevronRight,
-} from "lucide-react";
 
 export default function CareerPage() {
 	const [careers, setCareers] = useState<any[]>([]);
@@ -44,9 +37,6 @@ export default function CareerPage() {
 
 	const [searchText, setSearchText] = useState("");
 
-	const [currentPage, setCurrentPage] = useState(1);
-	const itemsPerPage = 10;
-
 	const [form, setForm] = useState({
 		post: "",
 		designation: "",
@@ -73,21 +63,10 @@ export default function CareerPage() {
 		fetchAll();
 	}, [fetchAll]);
 
-	const filteredCareers = careers.filter(
+	const filteredCareers = careers.filter((item) =>
-		(item) =>
+		item.post?.toLowerCase().includes(searchText.toLowerCase()),
-			item.post?.toLowerCase().includes(searchText.toLowerCase()) ||
-			item.designation?.toLowerCase().includes(searchText.toLowerCase()),
 	);
 
-	useEffect(() => {
-		setCurrentPage(1);
-	}, [searchText]);
-
-	const totalPages = Math.ceil(filteredCareers.length / itemsPerPage);
-	const indexOfLastItem = currentPage * itemsPerPage;
-	const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-	const currentItems = filteredCareers.slice(indexOfFirstItem, indexOfLastItem);
-
 	function handleChange(e: any) {
 		setForm({ ...form, [e.target.name]: e.target.value });
 	}
@@ -108,6 +87,7 @@ export default function CareerPage() {
 
 	function openEdit(item: any) {
 		setEditing(item);
+
 		setForm({
 			post: item.post || "",
 			designation: item.designation || "",
@@ -117,6 +97,7 @@ export default function CareerPage() {
 			number: item.number || "",
 			status: item.status || "new",
 		});
+
 		setOpenModal(true);
 	}
 
@@ -127,6 +108,7 @@ export default function CareerPage() {
 			} else {
 				await apiClient.post("/careers", form);
 			}
+
 			setOpenModal(false);
 			fetchAll();
 		} catch (err) {
@@ -142,29 +124,24 @@ export default function CareerPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
+			<div className="flex justify-between items-center gap-3 flex-wrap">
-				<h1 className="text-3xl font-bold">Careers</h1>
+				<h1 className="text-2xl font-bold">Careers</h1>
 
-				<div className="flex flex-wrap gap-3">
+				<div className="flex gap-2 flex-wrap">
 					<Input
-						placeholder="Search post / designation..."
+						placeholder="Search career..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[250px] text-base"
+						className="w-[220px]"
 					/>
 
-					<Button
+					<Button variant="outline" onClick={fetchAll} disabled={loading}>
-						variant="outline"
+						<RefreshCw className="mr-2 h-4 w-4" />
-						onClick={fetchAll}
-						disabled={loading}
-						className="text-base"
-					>
-						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={openAdd} className="text-base">
+					<Button onClick={openAdd}>
-						<Plus className="mr-2 h-5 w-5" />
+						<Plus className="mr-2 h-4 w-4" />
 						Add Career
 					</Button>
 				</div>
@@ -172,113 +149,67 @@ export default function CareerPage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle className="text-xl">Career Opportunities</CardTitle>
+					<CardTitle>Career List</CardTitle>
 				</CardHeader>
 
-				<CardContent className="p-0 sm:p-6 space-y-4">
+				<CardContent>
-					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
+					<div className="overflow-x-auto">
-						<Table className="w-full min-w-[1000px] table-fixed border-separate border-spacing-0">
+						<Table className="min-w-[900px]">
-							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
+							<TableHeader>
 								<TableRow>
-									<TableHead className="w-[60px] bg-background font-bold text-sm">
+									<TableHead>ID</TableHead>
-										ID
+									<TableHead>Post</TableHead>
-									</TableHead>
+									<TableHead>Designation</TableHead>
-									<TableHead className="w-[200px] bg-background font-bold text-sm">
+									<TableHead>Qualification</TableHead>
-										Post & Designation
+									<TableHead>Experience</TableHead>
-									</TableHead>
+									<TableHead>Email</TableHead>
-									<TableHead className="w-[200px] bg-background font-bold text-sm">
+									<TableHead>Phone</TableHead>
-										Qualification
+									<TableHead>Status</TableHead>
-									</TableHead>
+									<TableHead>Actions</TableHead>
-									<TableHead className="w-[120px] bg-background font-bold text-sm">
-										Experience
-									</TableHead>
-									<TableHead className="w-[200px] bg-background font-bold text-sm">
-										Contact Info
-									</TableHead>
-									<TableHead className="w-[100px] bg-background font-bold text-sm">
-										Status
-									</TableHead>
-									<TableHead className="w-[120px] bg-background font-bold text-right text-sm">
-										Actions
-									</TableHead>
 								</TableRow>
 							</TableHeader>
 
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={7} className="text-center py-10">
+										<TableCell colSpan={9} className="text-center">
-											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
+											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : currentItems.length === 0 ? (
+								) : filteredCareers.length === 0 ? (
 									<TableRow>
-										<TableCell
+										<TableCell colSpan={9} className="text-center">
-											colSpan={7}
-											className="text-center text-muted-foreground py-10 text-base"
-										>
 											No careers found
 										</TableCell>
 									</TableRow>
 								) : (
-									currentItems.map((item) => (
+									filteredCareers.map((item) => (
-										<TableRow key={item.id} className="hover:bg-muted/50">
+										<TableRow key={item.id}>
-											<TableCell className="font-mono text-xs">
+											<TableCell>{item.id}</TableCell>
-												{item.id}
+											<TableCell>{item.post}</TableCell>
-											</TableCell>
+											<TableCell>{item.designation}</TableCell>
-											<TableCell>
+											<TableCell>{item.qualification}</TableCell>
-												<div className="font-semibold text-base truncate">
+											<TableCell>{item.experienceNeed}</TableCell>
-													{item.post}
+											<TableCell>{item.email}</TableCell>
-												</div>
+											<TableCell>{item.number}</TableCell>
-												<div className="text-xs text-muted-foreground truncate">
+											<TableCell>{item.status}</TableCell>
-													{item.designation}
+
-												</div>
+											<TableCell className="flex gap-2">
-											</TableCell>
+												<Button
-											<TableCell>
+													size="sm"
-												<div className="text-sm line-clamp-2">
+													variant="outline"
-													{item.qualification}
+													onClick={() => openEdit(item)}
-												</div>
-											</TableCell>
-											<TableCell className="text-sm">
-												{item.experienceNeed}
-											</TableCell>
-											<TableCell>
-												<div className="text-sm font-medium">{item.email}</div>
-												<div className="text-xs text-muted-foreground">
-													{item.number}
-												</div>
-											</TableCell>
-											<TableCell>
-												<Badge
-													variant={
-														item.status === "active" ? "default" : "secondary"
-													}
-													className="capitalize"
 												>
-													{item.status}
+													<Pencil className="h-4 w-4" />
-												</Badge>
+												</Button>
-											</TableCell>
 
-											<TableCell className="text-right">
+												<Button
-												<div className="flex justify-end gap-2">
+													size="sm"
-													<Button
+													variant="destructive"
-														size="icon"
+													onClick={() => handleDelete(item.id)}
-														variant="ghost"
+												>
-														className="h-9 w-9"
+													<Trash className="h-4 w-4" />
-														onClick={() => openEdit(item)}
+												</Button>
-													>
-														<Pencil className="h-4 w-4" />
-													</Button>
-
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
-														onClick={() => handleDelete(item.id)}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
-												</div>
 											</TableCell>
 										</TableRow>
 									))
@@ -286,126 +217,67 @@ export default function CareerPage() {
 							</TableBody>
 						</Table>
 					</div>
-
-					{!loading && filteredCareers.length > 0 && (
-						<div className="flex items-center justify-between px-2 py-6 border-t">
-							<div className="text-base text-muted-foreground">
-								Showing{" "}
-								<span className="font-semibold">{indexOfFirstItem + 1}</span> to{" "}
-								<span className="font-semibold">
-									{Math.min(indexOfLastItem, filteredCareers.length)}
-								</span>{" "}
-								of{" "}
-								<span className="font-semibold">{filteredCareers.length}</span>{" "}
-								careers
-							</div>
-							<div className="flex items-center gap-6">
-								<div className="text-base font-semibold">
-									Page {currentPage} of {totalPages}
-								</div>
-								<div className="flex gap-2">
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.max(prev - 1, 1))
-										}
-										disabled={currentPage === 1}
-									>
-										<ChevronLeft className="h-5 w-5" />
-									</Button>
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.min(prev + 1, totalPages))
-										}
-										disabled={currentPage === totalPages || totalPages === 0}
-									>
-										<ChevronRight className="h-5 w-5" />
-									</Button>
-								</div>
-							</div>
-						</div>
-					)}
 				</CardContent>
 			</Card>
 
+			{/* MODAL */}
 			<Dialog open={openModal} onOpenChange={setOpenModal}>
-				<DialogContent className="w-full max-w-lg">
+				<DialogContent>
 					<DialogHeader>
-						<DialogTitle className="text-2xl">
+						<DialogTitle>{editing ? "Edit Career" : "Add Career"}</DialogTitle>
-							{editing ? "Edit Career" : "Add New Career"}
-						</DialogTitle>
 					</DialogHeader>
 
-					<div className="space-y-4 py-4">
+					<div className="space-y-3">
-						<div className="grid grid-cols-1 gap-4">
+						<Input
-							<Input
+							name="post"
-								name="post"
+							placeholder="Post"
-								placeholder="Post (e.g. Staff Nurse)"
+							value={form.post}
-								value={form.post}
+							onChange={handleChange}
-								onChange={handleChange}
+						/>
-								className="text-base"
+						<Input
-							/>
+							name="designation"
-							<Input
+							placeholder="Designation"
-								name="designation"
+							value={form.designation}
-								placeholder="Designation"
+							onChange={handleChange}
-								value={form.designation}
+						/>
-								onChange={handleChange}
+						<Input
-								className="text-base"
+							name="qualification"
-							/>
+							placeholder="Qualification"
-							<Input
+							value={form.qualification}
-								name="qualification"
+							onChange={handleChange}
-								placeholder="Qualification"
+						/>
-								value={form.qualification}
+						<Input
-								onChange={handleChange}
+							name="experienceNeed"
-								className="text-base"
+							placeholder="Experience Needed"
-							/>
+							value={form.experienceNeed}
-							<Input
+							onChange={handleChange}
-								name="experienceNeed"
+						/>
-								placeholder="Experience Needed"
+						<Input
-								value={form.experienceNeed}
+							name="email"
-								onChange={handleChange}
+							placeholder="Email"
-								className="text-base"
+							value={form.email}
-							/>
+							onChange={handleChange}
-							<Input
+						/>
-								name="email"
+						<Input
-								type="email"
+							name="number"
-								placeholder="HR Email Address"
+							placeholder="Phone Number"
-								value={form.email}
+							value={form.number}
-								onChange={handleChange}
+							onChange={handleChange}
-								className="text-base"
+						/>
-							/>
+						<Input
-							<Input
+							name="status"
-								name="number"
+							placeholder="Status"
-								placeholder="Contact Number"
+							value={form.status}
-								value={form.number}
+							onChange={handleChange}
-								onChange={handleChange}
+						/>
-								className="text-base"
-							/>
-							<Input
-								name="status"
-								placeholder="Status (e.g. active / closed)"
-								value={form.status}
-								onChange={handleChange}
-								className="text-base"
-							/>
-						</div>
 					</div>
 
-					<DialogFooter className="pt-4 border-t">
+					<DialogFooter>
-						<Button
+						<Button variant="outline" onClick={() => setOpenModal(false)}>
-							variant="ghost"
-							onClick={() => setOpenModal(false)}
-							className="text-base"
-						>
 							Cancel
 						</Button>
-						<Button onClick={handleSubmit} className="px-8 text-base">
+						<Button onClick={handleSubmit}>
-							{editing ? "Save Changes" : "Create Career"}
+							{editing ? "Update" : "Create"}
 						</Button>
 					</DialogFooter>
 				</DialogContent>

frontend/src/pages/Department.tsx

@@ -31,16 +31,7 @@ import {
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 
-import {
+import { Loader2, RefreshCw, Plus, Pencil, Trash, Eye } from "lucide-react";
-	Loader2,
-	RefreshCw,
-	Plus,
-	Pencil,
-	Trash,
-	Eye,
-	ChevronLeft,
-	ChevronRight,
-} from "lucide-react";
 
 interface Department {
 	departmentId: string;
@@ -65,9 +56,6 @@ export default function DepartmentPage() {
 
 	const [searchText, setSearchText] = useState("");
 
-	const [currentPage, setCurrentPage] = useState(1);
-	const itemsPerPage = 10;
-
 	const [form, setForm] = useState<Department>({
 		departmentId: "",
 		name: "",
@@ -100,22 +88,8 @@ export default function DepartmentPage() {
 		fetchDepartments();
 	}, [fetchDepartments]);
 
-	const filteredDepartments = departments.filter(
+	const filteredDepartments = departments.filter((dep) =>
-		(dep) =>
+		dep.name.toLowerCase().includes(searchText.toLowerCase()),
-			dep.name.toLowerCase().includes(searchText.toLowerCase()) ||
-			dep.departmentId.toLowerCase().includes(searchText.toLowerCase()),
-	);
-
-	useEffect(() => {
-		setCurrentPage(1);
-	}, [searchText]);
-
-	const totalPages = Math.ceil(filteredDepartments.length / itemsPerPage);
-	const indexOfLastItem = currentPage * itemsPerPage;
-	const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-	const currentItems = filteredDepartments.slice(
-		indexOfFirstItem,
-		indexOfLastItem,
 	);
 
 	function handleChange(e: any) {
@@ -181,153 +155,118 @@ export default function DepartmentPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
+			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-3">
-				<h1 className="text-3xl font-bold">Departments</h1>
+				<h1 className="text-2xl font-bold">Departments</h1>
 
 				<div className="flex flex-wrap gap-3">
 					<Input
 						placeholder="Search department..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[250px] text-base"
+						className="w-[220px]"
 					/>
 
 					<Button
 						variant="outline"
 						onClick={fetchDepartments}
-						disabled={loading}
+						disabled={loading}>
-						className="text-base"
+						<RefreshCw className="mr-2 h-4 w-4" />
-					>
-						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={openAdd} className="text-base">
+					<Button onClick={openAdd}>
-						<Plus className="mr-2 h-5 w-5" />
+						<Plus className="mr-2 h-4 w-4" />
 						Add Department
 					</Button>
 				</div>
 			</div>
 
 			{error && (
-				<div className="p-4 text-red-600 bg-red-50 border rounded-md text-base">
+				<div className="p-4 text-red-600 bg-red-50 border rounded-md">
 					{error}
 				</div>
 			)}
 
 			<Card>
 				<CardHeader>
-					<CardTitle className="text-xl">Department List</CardTitle>
+					<CardTitle>Department List</CardTitle>
 				</CardHeader>
 
-				<CardContent className="p-0 sm:p-6 space-y-4">
+				<CardContent>
-					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
+					<div className="border rounded-md max-h-[500px] overflow-y-auto">
-						<Table className="w-full min-w-[900px] table-fixed border-separate border-spacing-0">
+						<Table className="w-full table-fixed">
-							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
+							<TableHeader>
 								<TableRow>
-									<TableHead className="w-[100px] bg-background text-sm font-bold">
+									<TableHead className="w-[80px]">ID</TableHead>
-										ID
+									<TableHead className="w-[180px]">Name</TableHead>
-									</TableHead>
+									<TableHead className="w-[250px]">Para1</TableHead>
-									<TableHead className="w-[200px] bg-background text-sm font-bold">
+									<TableHead className="w-[220px]">Facilities</TableHead>
-										Name
+									<TableHead className="w-[220px]">Services</TableHead>
-									</TableHead>
+									<TableHead className="w-[120px]">Actions</TableHead>
-									<TableHead className="w-[250px] bg-background text-sm font-bold">
-										Para 1
-									</TableHead>
-									<TableHead className="w-[220px] bg-background text-sm font-bold">
-										Facilities
-									</TableHead>
-									<TableHead className="w-[220px] bg-background text-sm font-bold">
-										Services
-									</TableHead>
-									<TableHead className="w-[140px] bg-background text-right text-sm font-bold">
-										Actions
-									</TableHead>
 								</TableRow>
 							</TableHeader>
 
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={6} className="text-center py-10">
+										<TableCell colSpan={6} className="text-center">
-											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
+											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : currentItems.length === 0 ? (
+								) : filteredDepartments.length === 0 ? (
 									<TableRow>
-										<TableCell
+										<TableCell colSpan={6} className="text-center">
-											colSpan={6}
-											className="text-center text-muted-foreground py-10 text-base"
-										>
 											No departments found
 										</TableCell>
 									</TableRow>
 								) : (
-									currentItems.map((dep) => (
+									filteredDepartments.map((dep) => (
-										<TableRow
+										<TableRow key={dep.departmentId}>
-											key={dep.departmentId}
+											<TableCell>{dep.departmentId}</TableCell>
-											className="hover:bg-muted/50"
+
-										>
+											<TableCell>
-											<TableCell className="font-mono text-xs">
+												<div className="break-words">{dep.name}</div>
-												{dep.departmentId}
 											</TableCell>
 
 											<TableCell>
-												<div
+												<div className="break-words whitespace-normal">
-													className="font-semibold text-base truncate"
-													title={dep.name}
-												>
-													{dep.name}
-												</div>
-											</TableCell>
-
-											<TableCell>
-												<div className="text-sm break-words whitespace-normal">
 													{truncate(dep.para1)}
 												</div>
 											</TableCell>
 
 											<TableCell>
-												<div className="text-sm break-words whitespace-normal">
+												<div className="break-words whitespace-normal">
 													{truncate(dep.facilities)}
 												</div>
 											</TableCell>
 
 											<TableCell>
-												<div className="text-sm break-words whitespace-normal">
+												<div className="break-words whitespace-normal">
 													{truncate(dep.services)}
 												</div>
 											</TableCell>
 
-											<TableCell className="text-right">
+											<TableCell className="flex gap-2 whitespace-nowrap">
-												<div className="flex justify-end gap-2">
+												<Button
-													<Button
+													size="sm"
-														size="icon"
+													variant="outline"
-														variant="ghost"
+													onClick={() => openView(dep)}>
-														className="h-9 w-9"
+													<Eye className="h-4 w-4" />
-														onClick={() => openView(dep)}
+												</Button>
-													>
-														<Eye className="h-4 w-4" />
-													</Button>
 
-													<Button
+												<Button
-														size="icon"
+													size="sm"
-														variant="ghost"
+													variant="outline"
-														className="h-9 w-9"
+													onClick={() => openEdit(dep)}>
-														onClick={() => openEdit(dep)}
+													<Pencil className="h-4 w-4" />
-													>
+												</Button>
-														<Pencil className="h-4 w-4" />
-													</Button>
 
-													<Button
+												<Button
-														size="icon"
+													size="sm"
-														variant="ghost"
+													variant="destructive"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
+													onClick={() => handleDelete(dep.departmentId)}>
-														onClick={() => handleDelete(dep.departmentId)}
+													<Trash className="h-4 w-4" />
-													>
+												</Button>
-														<Trash className="h-4 w-4" />
-													</Button>
-												</div>
 											</TableCell>
 										</TableRow>
 									))
@@ -335,52 +274,6 @@ export default function DepartmentPage() {
 							</TableBody>
 						</Table>
 					</div>
-
-					{!loading && filteredDepartments.length > 0 && (
-						<div className="flex items-center justify-between px-2 py-6 border-t">
-							<div className="text-base text-muted-foreground">
-								Showing{" "}
-								<span className="font-semibold">{indexOfFirstItem + 1}</span> to{" "}
-								<span className="font-semibold">
-									{Math.min(indexOfLastItem, filteredDepartments.length)}
-								</span>{" "}
-								of{" "}
-								<span className="font-semibold">
-									{filteredDepartments.length}
-								</span>{" "}
-								departments
-							</div>
-							<div className="flex items-center gap-6">
-								<div className="text-base font-semibold">
-									Page {currentPage} of {totalPages}
-								</div>
-								<div className="flex gap-2">
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.max(prev - 1, 1))
-										}
-										disabled={currentPage === 1}
-									>
-										<ChevronLeft className="h-5 w-5" />
-									</Button>
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.min(prev + 1, totalPages))
-										}
-										disabled={currentPage === totalPages || totalPages === 0}
-									>
-										<ChevronRight className="h-5 w-5" />
-									</Button>
-								</div>
-							</div>
-						</div>
-					)}
 				</CardContent>
 			</Card>
 
@@ -453,6 +346,7 @@ export default function DepartmentPage() {
 
 			<Dialog open={viewOpen} onOpenChange={setViewOpen}>
 				<DialogContent className="w-full !max-w-5xl max-h-[90vh] overflow-y-auto">
+					{" "}
 					<DialogHeader>
 						<DialogTitle>Department Details</DialogTitle>
 					</DialogHeader>
@@ -461,29 +355,35 @@ export default function DepartmentPage() {
 							<p>
 								<b>ID:</b> {viewData.departmentId}
 							</p>
+
 							<p>
 								<b>Name:</b> {viewData.name}
 							</p>
+
 							<p>
 								<b>Para1:</b>
 								<br />
 								{viewData.para1}
 							</p>
+
 							<p>
 								<b>Para2:</b>
 								<br />
 								{viewData.para2}
 							</p>
+
 							<p>
 								<b>Para3:</b>
 								<br />
 								{viewData.para3}
 							</p>
+
 							<p>
 								<b>Facilities:</b>
 								<br />
 								{viewData.facilities}
 							</p>
+
 							<p>
 								<b>Services:</b>
 								<br />

frontend/src/pages/Doctor.tsx

@@ -1,5 +1,4 @@
-import { useState, useEffect, useCallback } from "react";
+import {useState, useEffect, useCallback} from "react";
-import { AxiosError } from "axios";
 import {
 	getDoctorsApi,
 	createDoctorApi,
@@ -7,7 +6,8 @@ import {
 	deleteDoctorApi,
 	getDoctorTimingApi,
 } from "@/api/doctor";
-import { getDepartmentsApi } from "@/api/department";
+
+import {getDepartmentsApi} from "@/api/department";
 
 import {
 	Table,
@@ -17,8 +17,10 @@ import {
 	TableHeader,
 	TableRow,
 } from "@/components/ui/table";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+
-import { Button } from "@/components/ui/button";
+import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
+import {Button} from "@/components/ui/button";
+
 import {
 	Dialog,
 	DialogContent,
@@ -26,49 +28,33 @@ import {
 	DialogTitle,
 	DialogFooter,
 } from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
+
-import { Badge } from "@/components/ui/badge";
+import {Popover, PopoverContent, PopoverTrigger} from "@/components/ui/popover";
 import {
-	Loader2,
+	Command,
-	RefreshCw,
+	CommandGroup,
-	Plus,
+	CommandItem,
-	Pencil,
+	CommandInput,
-	Trash,
+} from "@/components/ui/command";
-	ChevronLeft,
+
-	ChevronRight,
+import {Input} from "@/components/ui/input";
-} from "lucide-react";
+import {Loader2, Plus, Pencil, Trash, RefreshCw} from "lucide-react";
 
 interface Department {
 	departmentId: string;
 	name: string;
 }
 
-const DAYS = [
-	"monday",
-	"tuesday",
-	"wednesday",
-	"thursday",
-	"friday",
-	"saturday",
-	"sunday",
-	"additional",
-];
-
 export default function DoctorPage() {
 	const [doctors, setDoctors] = useState<any[]>([]);
 	const [departments, setDepartments] = useState<Department[]>([]);
 	const [loading, setLoading] = useState(true);
-	const [error, setError] = useState("");
-
 	const [openModal, setOpenModal] = useState(false);
 	const [editing, setEditing] = useState<any>(null);
 
 	const [searchText, setSearchText] = useState("");
 	const [filterDepartment, setFilterDepartment] = useState("");
 
-	const [currentPage, setCurrentPage] = useState(1);
-	const itemsPerPage = 10;
-
 	const [form, setForm] = useState<any>({
 		doctorId: "",
 		name: "",
@@ -80,20 +66,16 @@ export default function DoctorPage() {
 
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
-		setError("");
 		try {
 			const [docRes, depRes] = await Promise.all([
 				getDoctorsApi(),
 				getDepartmentsApi(),
 			]);
+
 			setDoctors(docRes?.data || []);
 			setDepartments(depRes?.data || []);
 		} catch (err) {
-			if (err instanceof AxiosError) {
+			console.error(err);
-				setError(err.response?.data?.message || "Failed to load data");
-			} else {
-				setError("Something went wrong");
-			}
 		} finally {
 			setLoading(false);
 		}
@@ -115,21 +97,13 @@ export default function DoctorPage() {
 		return matchesSearch && matchesDepartment;
 	});
 
-	useEffect(() => {
-		setCurrentPage(1);
-	}, [searchText, filterDepartment]);
-
-	const totalPages = Math.ceil(filteredDoctors.length / itemsPerPage);
-	const indexOfLastItem = currentPage * itemsPerPage;
-	const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-	const currentItems = filteredDoctors.slice(indexOfFirstItem, indexOfLastItem);
-
 	function handleChange(e: any) {
-		setForm({ ...form, [e.target.name]: e.target.value });
+		setForm({...form, [e.target.name]: e.target.value});
 	}
 
-	function handleDepartmentToggle(depId: string) {
+	function handleDepartmentChange(depId: string) {
 		const exists = form.departments.find((d: any) => d.departmentId === depId);
+
 		if (exists) {
 			setForm({
 				...form,
@@ -140,7 +114,7 @@ export default function DoctorPage() {
 		} else {
 			setForm({
 				...form,
-				departments: [...form.departments, { departmentId: depId, timing: {} }],
+				departments: [...form.departments, {departmentId: depId, timing: {}}],
 			});
 		}
 	}
@@ -150,7 +124,10 @@ export default function DoctorPage() {
 			...form,
 			departments: form.departments.map((d: any) =>
 				d.departmentId === depId
-					? { ...d, timing: { ...d.timing, [day]: value } }
+					? {
+							...d,
+							timing: {...d.timing, [day]: value},
+						}
 					: d,
 			),
 		});
@@ -171,20 +148,25 @@ export default function DoctorPage() {
 
 	async function openEdit(doc: any) {
 		setEditing(doc);
+
 		try {
 			const timingRes = await getDoctorTimingApi(doc.doctorId);
 			const timingData = timingRes?.data?.departments || [];
+
+			const mappedDepartments = timingData.map((d: any) => ({
+				departmentId: d.departmentId,
+				timing: d.timing || {},
+			}));
+
 			setForm({
 				doctorId: doc.doctorId,
 				name: doc.name,
 				designation: doc.designation,
 				workingStatus: doc.workingStatus,
 				qualification: doc.qualification,
-				departments: timingData.map((d: any) => ({
+				departments: mappedDepartments,
-					departmentId: d.departmentId,
-					timing: d.timing || {},
-				})),
 			});
+
 			setOpenModal(true);
 		} catch (err) {
 			console.error(err);
@@ -198,40 +180,38 @@ export default function DoctorPage() {
 			} else {
 				await createDoctorApi(form);
 			}
+
 			setOpenModal(false);
 			fetchAll();
-		} catch (error) {
+		} catch (err) {
-			console.error(error);
+			console.error(err);
 		}
 	}
 
 	async function handleDelete(id: string) {
-		if (!confirm("Delete this doctor?")) return;
+		if (!confirm("Delete doctor?")) return;
-		try {
+		await deleteDoctorApi(id);
-			await deleteDoctorApi(id);
+		fetchAll();
-			fetchAll();
-		} catch (error) {
-			console.error(error);
-		}
 	}
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
+			{/* HEADER */}
-				<h1 className="text-3xl font-bold">Doctors</h1>
+			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-3">
+				<h1 className="text-2xl font-bold">Doctors</h1>
 
-				<div className="flex flex-wrap gap-3">
+				<div className="flex flex-wrap gap-2">
 					<Input
 						placeholder="Search doctor..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[250px] text-base"
+						className="w-[200px]"
 					/>
 
 					<select
 						value={filterDepartment}
 						onChange={(e) => setFilterDepartment(e.target.value)}
-						className="flex h-10 w-[220px] rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+						className="border rounded px-2 py-1"
 					>
 						<option value="">All Departments</option>
 						{departments.map((dep) => (
@@ -241,149 +221,93 @@ export default function DoctorPage() {
 						))}
 					</select>
 
-					<Button
+					<Button variant="outline" onClick={fetchAll} disabled={loading}>
-						variant="outline"
+						<RefreshCw className="mr-2 h-4 w-4" />
-						onClick={fetchAll}
-						disabled={loading}
-						className="text-base"
-					>
-						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={openAdd} className="text-base">
+					<Button onClick={openAdd}>
-						<Plus className="mr-2 h-5 w-5" />
+						<Plus className="mr-2 h-4 w-4" />
 						Add Doctor
 					</Button>
 				</div>
 			</div>
 
-			{error && (
+			{/* TABLE */}
-				<div className="p-4 text-red-600 bg-red-50 border rounded-md text-base">
-					{error}
-				</div>
-			)}
-
 			<Card>
 				<CardHeader>
-					<CardTitle className="text-xl">Doctor List</CardTitle>
+					<CardTitle>Doctor List</CardTitle>
 				</CardHeader>
 
-				<CardContent className="p-0 sm:p-6 space-y-4">
+				<CardContent>
-					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
+					<div className="overflow-x-auto">
-						<Table className="w-full min-w-[900px] table-fixed border-separate border-spacing-0">
+						<Table className="min-w-[1000px]">
-							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
+							<TableHeader>
 								<TableRow>
-									<TableHead className="w-[100px] bg-background text-sm font-bold">
+									<TableHead>ID</TableHead>
-										ID
+									<TableHead>Name</TableHead>
-									</TableHead>
+									<TableHead>Designation</TableHead>
-									<TableHead className="w-[200px] bg-background text-sm font-bold">
+									<TableHead>Status</TableHead>
-										Name
+									<TableHead>Qualification</TableHead>
-									</TableHead>
+									<TableHead>Departments</TableHead>
-									<TableHead className="w-[180px] bg-background text-sm font-bold">
+									<TableHead>Timing</TableHead>
-										Designation
+									<TableHead>Actions</TableHead>
-									</TableHead>
-									<TableHead className="w-[180px] bg-background text-sm font-bold">
-										Qualification
-									</TableHead>
-									<TableHead className="w-[220px] bg-background text-sm font-bold">
-										Departments
-									</TableHead>
-									<TableHead className="w-[120px] bg-background text-right text-sm font-bold">
-										Actions
-									</TableHead>
 								</TableRow>
 							</TableHeader>
 
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={6} className="text-center py-10">
+										<TableCell colSpan={8} className="text-center">
-											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
+											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : currentItems.length === 0 ? (
+								) : filteredDoctors.length === 0 ? (
 									<TableRow>
-										<TableCell
+										<TableCell colSpan={8} className="text-center">
-											colSpan={6}
-											className="text-center text-muted-foreground py-10 text-base"
-										>
 											No doctors found
 										</TableCell>
 									</TableRow>
 								) : (
-									currentItems.map((doc) => (
+									filteredDoctors.map((doc) => (
-										<TableRow key={doc.doctorId} className="hover:bg-muted/50">
+										<TableRow key={doc.doctorId}>
-											<TableCell className="truncate font-mono text-xs">
+											<TableCell>{doc.doctorId}</TableCell>
-												{doc.doctorId}
+											<TableCell>{doc.name}</TableCell>
-											</TableCell>
+											<TableCell>{doc.designation}</TableCell>
+											<TableCell>{doc.workingStatus}</TableCell>
+											<TableCell>{doc.qualification}</TableCell>
 
 											<TableCell>
-												<div
+												{doc.departments
-													className="font-semibold text-base truncate"
+													?.map((d: any) => d.departmentName)
-													title={doc.name}
+													.join(", ")}
+											</TableCell>
+
+											<TableCell className="max-w-[250px] whitespace-normal">
+												{doc.departments?.map((d: any) => (
+													<div key={d.departmentId}>
+														<b>{d.departmentName}:</b>{" "}
+														{JSON.stringify(d.timing)}
+													</div>
+												))}
+											</TableCell>
+
+											<TableCell className="flex gap-2">
+												<Button
+													size="sm"
+													variant="outline"
+													onClick={() => openEdit(doc)}
 												>
-													{doc.name}
+													<Pencil className="h-4 w-4" />
-												</div>
+												</Button>
-												<div className="text-xs text-muted-foreground truncate italic">
-													{doc.workingStatus}
-												</div>
-											</TableCell>
 
-											<TableCell>
+												<Button
-												<div
+													size="sm"
-													className="truncate text-sm"
+													variant="destructive"
-													title={doc.designation}
+													onClick={() => handleDelete(doc.doctorId)}
 												>
-													{doc.designation || "-"}
+													<Trash className="h-4 w-4" />
-												</div>
+												</Button>
-											</TableCell>
-
-											<TableCell>
-												<div
-													className="truncate text-sm"
-													title={doc.qualification}
-												>
-													{doc.qualification || "-"}
-												</div>
-											</TableCell>
-
-											<TableCell>
-												<div className="flex flex-wrap gap-1">
-													{doc.departments?.map((d: any) => (
-														<Badge
-															key={d.departmentId}
-															variant="secondary"
-															className="text-xs px-2 h-5 leading-none"
-														>
-															{d.departmentName}
-														</Badge>
-													))}
-													{doc.departments?.length === 0 && (
-														<span className="text-muted-foreground">-</span>
-													)}
-												</div>
-											</TableCell>
-
-											<TableCell className="text-right">
-												<div className="flex justify-end gap-2">
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9"
-														onClick={() => openEdit(doc)}
-													>
-														<Pencil className="h-4 w-4" />
-													</Button>
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
-														onClick={() => handleDelete(doc.doctorId)}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
-												</div>
 											</TableCell>
 										</TableRow>
 									))
@@ -391,212 +315,153 @@ export default function DoctorPage() {
 							</TableBody>
 						</Table>
 					</div>
-
-					{!loading && filteredDoctors.length > 0 && (
-						<div className="flex items-center justify-between px-2 py-6 border-t">
-							<div className="text-base text-muted-foreground">
-								Showing{" "}
-								<span className="font-semibold">{indexOfFirstItem + 1}</span> to{" "}
-								<span className="font-semibold">
-									{Math.min(indexOfLastItem, filteredDoctors.length)}
-								</span>{" "}
-								of{" "}
-								<span className="font-semibold">{filteredDoctors.length}</span>{" "}
-								doctors
-							</div>
-							<div className="flex items-center gap-6">
-								<div className="text-base font-semibold">
-									Page {currentPage} of {totalPages}
-								</div>
-								<div className="flex gap-2">
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.max(prev - 1, 1))
-										}
-										disabled={currentPage === 1}
-									>
-										<ChevronLeft className="h-5 w-5" />
-									</Button>
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.min(prev + 1, totalPages))
-										}
-										disabled={currentPage === totalPages || totalPages === 0}
-									>
-										<ChevronRight className="h-5 w-5" />
-									</Button>
-								</div>
-							</div>
-						</div>
-					)}
 				</CardContent>
 			</Card>
 
+			{/* MODAL */}
+			{/* MODAL */}
 			<Dialog open={openModal} onOpenChange={setOpenModal}>
-				<DialogContent className="w-full !max-w-5xl max-h-[90vh] overflow-y-auto">
+				<DialogContent className="overflow-y-auto max-h-[80vh] ">
 					<DialogHeader>
-						<DialogTitle className="text-2xl">
+						<DialogTitle>{editing ? "Edit Doctor" : "Add Doctor"}</DialogTitle>
-							{editing ? "Edit Doctor" : "Add Doctor"}
-						</DialogTitle>
 					</DialogHeader>
 
-					<div className="grid grid-cols-1 md:grid-cols-2 gap-8 mt-6">
+					<div className="space-y-4">
-						<div className="space-y-6">
+						<Input
-							<h3 className="font-bold text-base border-b pb-2">
+							name="doctorId"
-								Basic Information
+							placeholder="Doctor ID"
-							</h3>
+							value={form.doctorId}
-							<div className="space-y-4">
+							onChange={handleChange}
-								<div className="space-y-1">
+							disabled={!!editing}
-									<label className="text-sm font-semibold">Doctor ID</label>
+						/>
-									<Input
-										name="doctorId"
-										placeholder="GG-DOC-001"
-										value={form.doctorId}
-										onChange={handleChange}
-										disabled={!!editing}
-										className="text-base"
-									/>
-								</div>
-								<div className="space-y-1">
-									<label className="text-sm font-semibold">Full Name</label>
-									<Input
-										name="name"
-										placeholder="Dr. John Doe"
-										value={form.name}
-										onChange={handleChange}
-										className="text-base"
-									/>
-								</div>
-								<div className="space-y-1">
-									<label className="text-sm font-semibold">Designation</label>
-									<Input
-										name="designation"
-										placeholder="Senior Consultant"
-										value={form.designation}
-										onChange={handleChange}
-										className="text-base"
-									/>
-								</div>
-								<div className="space-y-1">
-									<label className="text-sm font-semibold">
-										Working Status
-									</label>
-									<Input
-										name="workingStatus"
-										placeholder="Active / On Call"
-										value={form.workingStatus}
-										onChange={handleChange}
-										className="text-base"
-									/>
-								</div>
-								<div className="space-y-1">
-									<label className="text-sm font-semibold">Qualification</label>
-									<Input
-										name="qualification"
-										placeholder="MBBS, MD"
-										value={form.qualification}
-										onChange={handleChange}
-										className="text-base"
-									/>
-								</div>
-							</div>
 
-							<div className="p-5 border rounded-md bg-muted/20">
+						<Input
-								<p className="text-base font-bold mb-4">Assign Departments</p>
+							name="name"
-								<div className="grid grid-cols-2 gap-3">
+							placeholder="Name"
-									{departments.map((dep) => {
+							value={form.name}
-										const isSelected = form.departments.some(
+							onChange={handleChange}
-											(d: any) => d.departmentId === dep.departmentId,
+						/>
-										);
+						<Input
-										return (
+							name="designation"
-											<Button
+							placeholder="Designation"
-												key={dep.departmentId}
+							value={form.designation}
-												type="button"
+							onChange={handleChange}
-												variant={isSelected ? "default" : "outline"}
+						/>
-												size="sm"
+						<Input
-												className="justify-start text-sm h-9"
+							name="workingStatus"
-												onClick={() => handleDepartmentToggle(dep.departmentId)}
+							placeholder="Working Status"
-											>
+							value={form.workingStatus}
-												{dep.name}
+							onChange={handleChange}
-											</Button>
+						/>
-										);
+						<Input
-									})}
+							name="qualification"
-								</div>
+							placeholder="Qualification"
-							</div>
+							value={form.qualification}
-						</div>
+							onChange={handleChange}
+						/>
 
-						<div className="space-y-6">
+						{/* Departments */}
-							<h3 className="font-bold text-base border-b pb-2">
+						<div>
-								Working Hours / Timing
+							<p className="font-medium mb-2">Departments</p>
-							</h3>
+
-							{form.departments.length === 0 ? (
+							<Popover>
-								<div className="text-base text-muted-foreground italic py-24 text-center border-2 border-dashed rounded-lg">
+								<PopoverTrigger asChild>
-									Select a department to configure timing slots
+									<Button className="w-full justify-between h-auto min-h-[40px]">
-								</div>
+										{form.departments.length > 0 ? (
-							) : (
+											<div className="flex flex-col items-start gap-1 text-left">
-								<div className="space-y-8">
+												{form.departments.map((d: any) => {
-									{form.departments.map((dep: any) => {
+													const name = departments.find(
-										const depName = departments.find(
+														(dep) => dep.departmentId === d.departmentId,
-											(d) => d.departmentId === dep.departmentId,
+													)?.name;
-										)?.name;
+
-										return (
+													return (
-											<div
+														<span key={d.departmentId} className="text-sm">
-												key={dep.departmentId}
+															{name}
-												className="space-y-4 p-5 border rounded-lg bg-background shadow-sm"
+														</span>
-											>
+													);
-												<div className="flex items-center justify-between">
+												})}
-													<p className="font-bold text-base text-primary">
-														{depName}
-													</p>
-													<Badge variant="outline" className="text-xs">
-														Timing Slot
-													</Badge>
-												</div>
-												<div className="grid grid-cols-1 sm:grid-cols-2 gap-x-6 gap-y-3">
-													{DAYS.map((day) => (
-														<div key={day} className="space-y-1">
-															<label className="text-xs uppercase font-bold text-muted-foreground">
-																{day}
-															</label>
-															<Input
-																className="h-9 text-sm"
-																placeholder="e.g. 09:00 AM - 01:00 PM"
-																value={dep.timing?.[day] || ""}
-																onChange={(e) =>
-																	handleTimingChange(
-																		dep.departmentId,
-																		day,
-																		e.target.value,
-																	)
-																}
-															/>
-														</div>
-													))}
-												</div>
 											</div>
-										);
+										) : (
-									})}
+											<span>Select Departments</span>
-								</div>
+										)}
-							)}
+									</Button>
+								</PopoverTrigger>
+
+								<PopoverContent className="w-[300px] p-0">
+									<Command>
+										<CommandInput placeholder="Search department..." />
+
+										<CommandGroup className="max-h-[250px] overflow-y-auto">
+											{departments.map((dep) => {
+												const selected = form.departments.some(
+													(d: any) => d.departmentId === dep.departmentId,
+												);
+
+												return (
+													<CommandItem
+														key={dep.departmentId}
+														className="flex justify-between"
+														onSelect={() =>
+															handleDepartmentChange(dep.departmentId)
+														}
+													>
+														<span>{dep.name}</span>
+														{selected && <span>✔</span>}
+													</CommandItem>
+												);
+											})}
+										</CommandGroup>
+									</Command>
+								</PopoverContent>
+							</Popover>
 						</div>
+
+						{form.departments.map((dep: any) => {
+							const depName = departments.find(
+								(d) => d.departmentId === dep.departmentId,
+							)?.name;
+
+							return (
+								<div
+									key={dep.departmentId}
+									className="tw-border tw-p-3 tw-rounded"
+								>
+									<p className="tw-font-semibold">{depName}</p>
+
+									{[
+										"monday",
+										"tuesday",
+										"wednesday",
+										"thursday",
+										"friday",
+										"saturday",
+										"sunday",
+										"additional",
+									].map((day) => (
+										<Input
+											key={day}
+											placeholder={day}
+											value={dep.timing?.[day] || ""}
+											onChange={(e) =>
+												handleTimingChange(
+													dep.departmentId,
+													day,
+													e.target.value,
+												)
+											}
+										/>
+									))}
+								</div>
+							);
+						})}
 					</div>
 
-					<DialogFooter className="mt-10 pt-6 border-t">
+					<DialogFooter>
-						<Button
+						<Button variant="outline" onClick={() => setOpenModal(false)}>
-							variant="ghost"
-							onClick={() => setOpenModal(false)}
-							className="text-base"
-						>
 							Cancel
 						</Button>
-						<Button onClick={handleSubmit} className="px-10 text-base">
+						<Button onClick={handleSubmit}>
-							{editing ? "Save Changes" : "Create Doctor Profile"}
+							{editing ? "Update" : "Create"}
 						</Button>
 					</DialogFooter>
 				</DialogContent>

frontend/src/pages/candidates.tsx

@@ -13,26 +13,11 @@ import {
 } from "@/components/ui/table";
 
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import {
-	Dialog,
-	DialogContent,
-	DialogHeader,
-	DialogTitle,
-	DialogFooter,
-} from "@/components/ui/dialog";
 
-import {
+import { Loader2, Trash, RefreshCw, Download } from "lucide-react";
-	Loader2,
-	Trash,
-	RefreshCw,
-	Download,
-	ChevronLeft,
-	ChevronRight,
-	Eye,
-	User,
-} from "lucide-react";
 
 export default function CandidatePage() {
 	const [candidates, setCandidates] = useState<any[]>([]);
@@ -41,12 +26,6 @@ export default function CandidatePage() {
 	const [searchText, setSearchText] = useState("");
 	const [filterCareer, setFilterCareer] = useState("");
 
-	const [viewOpen, setViewOpen] = useState(false);
-	const [viewData, setViewData] = useState<any>(null);
-
-	const [currentPage, setCurrentPage] = useState(1);
-	const itemsPerPage = 10;
-
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
@@ -76,23 +55,6 @@ export default function CandidatePage() {
 		return matchesSearch && matchesCareer;
 	});
 
-	useEffect(() => {
-		setCurrentPage(1);
-	}, [searchText, filterCareer]);
-
-	const totalPages = Math.ceil(filteredCandidates.length / itemsPerPage);
-	const indexOfLastItem = currentPage * itemsPerPage;
-	const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-	const currentItems = filteredCandidates.slice(
-		indexOfFirstItem,
-		indexOfLastItem,
-	);
-
-	function openView(item: any) {
-		setViewData(item);
-		setViewOpen(true);
-	}
-
 	async function handleDelete(id: number) {
 		if (!confirm("Delete candidate?")) return;
 		await deleteCandidateApi(id);
@@ -109,7 +71,7 @@ export default function CandidatePage() {
 			Designation: item.career?.designation,
 			Subject: item.subject,
 			CoverLetter: item.coverLetter,
-			AppliedDate: new Date(item.createdAt).toLocaleDateString(),
+			Date: new Date(item.createdAt).toLocaleDateString(),
 		}));
 
 		exportToExcel(exportData, "candidates");
@@ -117,36 +79,31 @@ export default function CandidatePage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
+			<div className="flex justify-between items-center gap-3 flex-wrap">
-				<h1 className="text-3xl font-bold">Candidates</h1>
+				<h1 className="text-2xl font-bold">Candidates</h1>
 
-				<div className="flex flex-wrap gap-3">
+				<div className="flex flex-wrap gap-2">
 					<Input
-						placeholder="Search candidate..."
+						placeholder="Search name / phone / email..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[250px] text-base"
+						className="w-[220px]"
 					/>
 
 					<Input
-						placeholder="Filter by Career"
+						placeholder="Filter Career"
 						value={filterCareer}
 						onChange={(e) => setFilterCareer(e.target.value)}
-						className="w-[200px] text-base"
+						className="w-[200px]"
 					/>
 
-					<Button
+					<Button variant="outline" onClick={fetchAll} disabled={loading}>
-						variant="outline"
+						<RefreshCw className="mr-2 h-4 w-4" />
-						onClick={fetchAll}
-						disabled={loading}
-						className="text-base"
-					>
-						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={handleExport} className="text-base">
+					<Button variant="outline" onClick={handleExport}>
-						<Download className="mr-2 h-5 w-5" />
+						<Download className="mr-2 h-4 w-4" />
 						Export
 					</Button>
 				</div>
@@ -154,104 +111,68 @@ export default function CandidatePage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle className="text-xl">Application List</CardTitle>
+					<CardTitle>Candidate List</CardTitle>
 				</CardHeader>
 
-				<CardContent className="p-0 sm:p-6 space-y-4">
+				<CardContent>
-					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
+					<div className="overflow-x-auto">
-						<Table className="w-full min-w-[1100px] table-fixed border-separate border-spacing-0">
+						<Table className="min-w-[900px]">
-							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
+							<TableHeader>
 								<TableRow>
-									<TableHead className="w-[60px] bg-background font-bold text-sm">
+									<TableHead>ID</TableHead>
-										ID
+									<TableHead>Name</TableHead>
-									</TableHead>
+									<TableHead>Phone</TableHead>
-									<TableHead className="w-[220px] bg-background font-bold text-sm">
+									<TableHead>Email</TableHead>
-										Full Name
+									<TableHead>Career</TableHead>
-									</TableHead>
+									<TableHead>Designation</TableHead>
-									<TableHead className="w-[180px] bg-background font-bold text-sm">
+									<TableHead>Subject</TableHead>
-										Career & Post
+									<TableHead>Cover Letter</TableHead>
-									</TableHead>
+									<TableHead>Applied On</TableHead>
-									<TableHead className="w-[150px] bg-background font-bold text-sm">
+									<TableHead>Actions</TableHead>
-										Contact
-									</TableHead>
-									<TableHead className="w-[140px] bg-background font-bold text-sm">
-										Applied On
-									</TableHead>
-									<TableHead className="w-[250px] bg-background font-bold text-sm">
-										Cover Letter
-									</TableHead>
-									<TableHead className="w-[120px] bg-background font-bold text-right text-sm">
-										Actions
-									</TableHead>
 								</TableRow>
 							</TableHeader>
 
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={7} className="text-center py-10">
+										<TableCell colSpan={10} className="text-center">
-											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
+											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : currentItems.length === 0 ? (
+								) : filteredCandidates.length === 0 ? (
 									<TableRow>
-										<TableCell
+										<TableCell colSpan={10} className="text-center">
-											colSpan={7}
-											className="text-center text-muted-foreground py-10 text-base"
-										>
 											No candidates found
 										</TableCell>
 									</TableRow>
 								) : (
-									currentItems.map((item) => (
+									filteredCandidates.map((item) => (
-										<TableRow key={item.id} className="hover:bg-muted/50">
+										<TableRow key={item.id}>
-											<TableCell className="font-mono text-xs">
+											<TableCell>{item.id}</TableCell>
-												{item.id}
+											<TableCell>{item.fullName}</TableCell>
+											<TableCell>{item.mobile}</TableCell>
+											<TableCell>{item.email}</TableCell>
+
+											<TableCell>{item.career?.post}</TableCell>
+											<TableCell>{item.career?.designation}</TableCell>
+
+											<TableCell>{item.subject}</TableCell>
+
+											<TableCell className="max-w-[250px] whitespace-normal">
+												{item.coverLetter}
 											</TableCell>
+
 											<TableCell>
-												<div className="font-semibold text-base truncate">
-													{item.fullName}
-												</div>
-												<div className="text-xs text-muted-foreground truncate">
-													{item.email}
-												</div>
-											</TableCell>
-											<TableCell>
-												<div className="text-sm font-medium">
-													{item.career?.post || "-"}
-												</div>
-												<div className="text-[10px] text-muted-foreground truncate">
-													{item.career?.designation}
-												</div>
-											</TableCell>
-											<TableCell className="text-sm">{item.mobile}</TableCell>
-											<TableCell className="text-sm">
 												{new Date(item.createdAt).toLocaleDateString()}
 											</TableCell>
+
 											<TableCell>
-												<div className="text-sm line-clamp-2 text-muted-foreground italic">
+												<Button
-													{item.coverLetter || "No cover letter provided."}
+													size="sm"
-												</div>
+													variant="destructive"
-											</TableCell>
+													onClick={() => handleDelete(item.id)}>
-											<TableCell className="text-right">
+													<Trash className="h-4 w-4" />
-												<div className="flex justify-end gap-2">
+												</Button>
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9"
-														onClick={() => openView(item)}
-													>
-														<Eye className="h-4 w-4" />
-													</Button>
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
-														onClick={() => handleDelete(item.id)}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
-												</div>
 											</TableCell>
 										</TableRow>
 									))
@@ -259,126 +180,8 @@ export default function CandidatePage() {
 							</TableBody>
 						</Table>
 					</div>
-
-					{!loading && filteredCandidates.length > 0 && (
-						<div className="flex items-center justify-between px-2 py-6 border-t">
-							<div className="text-base text-muted-foreground">
-								Showing{" "}
-								<span className="font-semibold">{indexOfFirstItem + 1}</span> to{" "}
-								<span className="font-semibold">
-									{Math.min(indexOfLastItem, filteredCandidates.length)}
-								</span>{" "}
-								of{" "}
-								<span className="font-semibold">
-									{filteredCandidates.length}
-								</span>
-							</div>
-							<div className="flex items-center gap-6">
-								<div className="text-base font-semibold">
-									Page {currentPage} of {totalPages}
-								</div>
-								<div className="flex gap-2">
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.max(prev - 1, 1))
-										}
-										disabled={currentPage === 1}
-									>
-										<ChevronLeft className="h-5 w-5" />
-									</Button>
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.min(prev + 1, totalPages))
-										}
-										disabled={currentPage === totalPages || totalPages === 0}
-									>
-										<ChevronRight className="h-5 w-5" />
-									</Button>
-								</div>
-							</div>
-						</div>
-					)}
 				</CardContent>
 			</Card>
-
-			<Dialog open={viewOpen} onOpenChange={setViewOpen}>
-				<DialogContent className="w-full !max-w-3xl max-h-[85vh] overflow-y-auto">
-					<DialogHeader>
-						<DialogTitle className="text-2xl border-b pb-2 flex items-center gap-2">
-							<User className="h-6 w-6" /> Candidate Details
-						</DialogTitle>
-					</DialogHeader>
-					{viewData && (
-						<div className="space-y-6 py-4">
-							<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-								<div className="space-y-4">
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Personal Information
-										</p>
-										<p className="text-lg font-bold text-primary">
-											{viewData.fullName}
-										</p>
-										<p className="text-sm font-medium">{viewData.email}</p>
-										<p className="text-sm">{viewData.mobile}</p>
-									</div>
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Applied For
-										</p>
-										<p className="text-base font-semibold">
-											{viewData.career?.post || "General Application"}
-										</p>
-										<p className="text-sm text-muted-foreground">
-											{viewData.career?.designation}
-										</p>
-									</div>
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Application Date
-										</p>
-										<p className="text-sm">
-											{new Date(viewData.createdAt).toLocaleString()}
-										</p>
-									</div>
-								</div>
-								<div className="space-y-4">
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Subject
-										</p>
-										<p className="text-sm font-semibold">
-											{viewData.subject || "N/A"}
-										</p>
-									</div>
-									<div className="p-4 bg-muted/30 rounded-lg">
-										<p className="text-xs uppercase font-bold text-muted-foreground mb-2">
-											Cover Letter / Message
-										</p>
-										<p className="text-sm leading-relaxed whitespace-pre-wrap italic">
-											{viewData.coverLetter || "No cover letter provided."}
-										</p>
-									</div>
-								</div>
-							</div>
-						</div>
-					)}
-					<DialogFooter>
-						<Button
-							onClick={() => setViewOpen(false)}
-							className="w-full md:w-auto"
-						>
-							Close
-						</Button>
-					</DialogFooter>
-				</DialogContent>
-			</Dialog>
 		</div>
 	);
 }

frontend/src/pages/inquiry.tsx

@@ -13,26 +13,11 @@ import {
 } from "@/components/ui/table";
 
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import {
-	Dialog,
-	DialogContent,
-	DialogHeader,
-	DialogTitle,
-	DialogFooter,
-} from "@/components/ui/dialog";
 
-import {
+import { Loader2, Trash, RefreshCw, Download } from "lucide-react";
-	Loader2,
-	Trash,
-	RefreshCw,
-	Download,
-	ChevronLeft,
-	ChevronRight,
-	Eye,
-	Mail,
-} from "lucide-react";
 
 export default function InquiryPage() {
 	const [inquiries, setInquiries] = useState<any[]>([]);
@@ -40,12 +25,6 @@ export default function InquiryPage() {
 
 	const [searchText, setSearchText] = useState("");
 
-	const [viewOpen, setViewOpen] = useState(false);
-	const [viewData, setViewData] = useState<any>(null);
-
-	const [currentPage, setCurrentPage] = useState(1);
-	const itemsPerPage = 10;
-
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
@@ -71,23 +50,6 @@ export default function InquiryPage() {
 		);
 	});
 
-	useEffect(() => {
-		setCurrentPage(1);
-	}, [searchText]);
-
-	const totalPages = Math.ceil(filteredInquiries.length / itemsPerPage);
-	const indexOfLastItem = currentPage * itemsPerPage;
-	const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-	const currentItems = filteredInquiries.slice(
-		indexOfFirstItem,
-		indexOfLastItem,
-	);
-
-	function openView(item: any) {
-		setViewData(item);
-		setViewOpen(true);
-	}
-
 	async function handleDelete(id: number) {
 		if (!confirm("Delete inquiry?")) return;
 		await deleteInquiryApi(id);
@@ -110,29 +72,24 @@ export default function InquiryPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
+			<div className="flex justify-between items-center gap-3 flex-wrap">
-				<h1 className="text-3xl font-bold">Inquiries</h1>
+				<h1 className="text-2xl font-bold">Inquiries</h1>
 
-				<div className="flex flex-wrap gap-3">
+				<div className="flex flex-wrap gap-2">
 					<Input
-						placeholder="Search name / phone / subject..."
+						placeholder="Search name / phone / email / subject..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[280px] text-base"
+						className="w-[260px]"
 					/>
 
-					<Button
+					<Button variant="outline" onClick={fetchAll} disabled={loading}>
-						variant="outline"
+						<RefreshCw className="mr-2 h-4 w-4" />
-						onClick={fetchAll}
-						disabled={loading}
-						className="text-base"
-					>
-						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={handleExport} className="text-base">
+					<Button variant="outline" onClick={handleExport}>
-						<Download className="mr-2 h-5 w-5" />
+						<Download className="mr-2 h-4 w-4" />
 						Export
 					</Button>
 				</div>
@@ -140,100 +97,62 @@ export default function InquiryPage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle className="text-xl">Customer Inquiries</CardTitle>
+					<CardTitle>Inquiry List</CardTitle>
 				</CardHeader>
 
-				<CardContent className="p-0 sm:p-6 space-y-4">
+				<CardContent>
-					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
+					<div className="overflow-x-auto">
-						<Table className="w-full min-w-[1000px] table-fixed border-separate border-spacing-0">
+						<Table className="min-w-[900px]">
-							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
+							<TableHeader>
 								<TableRow>
-									<TableHead className="w-[60px] bg-background font-bold text-sm">
+									<TableHead>ID</TableHead>
-										ID
+									<TableHead>Name</TableHead>
-									</TableHead>
+									<TableHead>Phone</TableHead>
-									<TableHead className="w-[220px] bg-background font-bold text-sm">
+									<TableHead>Email</TableHead>
-										Customer Details
+									<TableHead>Subject</TableHead>
-									</TableHead>
+									<TableHead>Message</TableHead>
-									<TableHead className="w-[200px] bg-background font-bold text-sm">
+									<TableHead>Date</TableHead>
-										Subject
+									<TableHead>Actions</TableHead>
-									</TableHead>
-									<TableHead className="w-[150px] bg-background font-bold text-sm">
-										Date
-									</TableHead>
-									<TableHead className="w-[280px] bg-background font-bold text-sm">
-										Message Snippet
-									</TableHead>
-									<TableHead className="w-[120px] bg-background font-bold text-right text-sm">
-										Actions
-									</TableHead>
 								</TableRow>
 							</TableHeader>
 
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={6} className="text-center py-10">
+										<TableCell colSpan={8} className="text-center">
-											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
+											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : currentItems.length === 0 ? (
+								) : filteredInquiries.length === 0 ? (
 									<TableRow>
-										<TableCell
+										<TableCell colSpan={8} className="text-center">
-											colSpan={6}
-											className="text-center text-muted-foreground py-10 text-base"
-										>
 											No inquiries found
 										</TableCell>
 									</TableRow>
 								) : (
-									currentItems.map((item) => (
+									filteredInquiries.map((item) => (
-										<TableRow key={item.id} className="hover:bg-muted/50">
+										<TableRow key={item.id}>
-											<TableCell className="font-mono text-xs">
+											<TableCell>{item.id}</TableCell>
-												{item.id}
+											<TableCell>{item.fullName}</TableCell>
+											<TableCell>{item.number}</TableCell>
+											<TableCell>{item.emailId}</TableCell>
+											<TableCell>{item.subject}</TableCell>
+
+											<TableCell className="max-w-[250px] whitespace-normal">
+												{item.message}
 											</TableCell>
+
 											<TableCell>
-												<div className="font-semibold text-base truncate">
-													{item.fullName}
-												</div>
-												<div className="text-xs text-muted-foreground truncate">
-													{item.emailId}
-												</div>
-												<div className="text-[11px] font-medium">
-													{item.number}
-												</div>
-											</TableCell>
-											<TableCell>
-												<div className="text-sm font-medium line-clamp-2">
-													{item.subject || "-"}
-												</div>
-											</TableCell>
-											<TableCell className="text-sm">
 												{new Date(item.createdAt).toLocaleDateString()}
 											</TableCell>
+
 											<TableCell>
-												<div className="text-sm line-clamp-2 text-muted-foreground italic">
+												<Button
-													{item.message || "-"}
+													size="sm"
-												</div>
+													variant="destructive"
-											</TableCell>
+													onClick={() => handleDelete(item.id)}>
-											<TableCell className="text-right">
+													<Trash className="h-4 w-4" />
-												<div className="flex justify-end gap-2">
+												</Button>
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9"
-														onClick={() => openView(item)}
-													>
-														<Eye className="h-4 w-4" />
-													</Button>
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
-														onClick={() => handleDelete(item.id)}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
-												</div>
 											</TableCell>
 										</TableRow>
 									))
@@ -241,115 +160,8 @@ export default function InquiryPage() {
 							</TableBody>
 						</Table>
 					</div>
-
-					{!loading && filteredInquiries.length > 0 && (
-						<div className="flex items-center justify-between px-2 py-6 border-t">
-							<div className="text-base text-muted-foreground">
-								Showing{" "}
-								<span className="font-semibold">{indexOfFirstItem + 1}</span> to{" "}
-								<span className="font-semibold">
-									{Math.min(indexOfLastItem, filteredInquiries.length)}
-								</span>{" "}
-								of{" "}
-								<span className="font-semibold">
-									{filteredInquiries.length}
-								</span>
-							</div>
-							<div className="flex items-center gap-6">
-								<div className="text-base font-semibold">
-									Page {currentPage} of {totalPages}
-								</div>
-								<div className="flex gap-2">
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.max(prev - 1, 1))
-										}
-										disabled={currentPage === 1}
-									>
-										<ChevronLeft className="h-5 w-5" />
-									</Button>
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.min(prev + 1, totalPages))
-										}
-										disabled={currentPage === totalPages || totalPages === 0}
-									>
-										<ChevronRight className="h-5 w-5" />
-									</Button>
-								</div>
-							</div>
-						</div>
-					)}
 				</CardContent>
 			</Card>
-
-			<Dialog open={viewOpen} onOpenChange={setViewOpen}>
-				<DialogContent className="w-full !max-w-3xl max-h-[85vh] overflow-y-auto">
-					<DialogHeader>
-						<DialogTitle className="text-2xl border-b pb-2 flex items-center gap-2">
-							<Mail className="h-6 w-6" /> Inquiry Details
-						</DialogTitle>
-					</DialogHeader>
-					{viewData && (
-						<div className="space-y-6 py-4">
-							<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-								<div className="space-y-4">
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Customer Information
-										</p>
-										<p className="text-lg font-bold text-primary">
-											{viewData.fullName}
-										</p>
-										<p className="text-sm font-medium">{viewData.emailId}</p>
-										<p className="text-sm">{viewData.number}</p>
-									</div>
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Received Date
-										</p>
-										<p className="text-sm">
-											{new Date(viewData.createdAt).toLocaleString()}
-										</p>
-									</div>
-								</div>
-								<div className="space-y-4">
-									<div>
-										<p className="text-xs uppercase font-bold text-muted-foreground">
-											Subject
-										</p>
-										<p className="text-base font-semibold">
-											{viewData.subject || "No Subject"}
-										</p>
-									</div>
-									<div className="p-4 bg-muted/30 rounded-lg border">
-										<p className="text-xs uppercase font-bold text-muted-foreground mb-2">
-											Message
-										</p>
-										<p className="text-sm leading-relaxed whitespace-pre-wrap">
-											{viewData.message || "No message content."}
-										</p>
-									</div>
-								</div>
-							</div>
-						</div>
-					)}
-					<DialogFooter>
-						<Button
-							onClick={() => setViewOpen(false)}
-							className="w-full md:w-auto"
-						>
-							Close
-						</Button>
-					</DialogFooter>
-				</DialogContent>
-			</Dialog>
 		</div>
 	);
 }

frontend/src/pages/newsMedia.tsx

@@ -19,7 +19,6 @@ import {
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import { Textarea } from "@/components/ui/textarea";
 
 import {
 	Dialog,
@@ -38,13 +37,11 @@ import {
 	Eye,
 	ChevronLeft,
 	ChevronRight,
-	Newspaper,
 } from "lucide-react";
 
 export default function NewsPage() {
 	const [news, setNews] = useState<any[]>([]);
 	const [loading, setLoading] = useState(true);
-	const [totalItems, setTotalItems] = useState(0);
 
 	const [searchText, setSearchText] = useState("");
 
@@ -69,28 +66,29 @@ export default function NewsPage() {
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
-			const res = await getNewsApi(currentPage, itemsPerPage);
+			const res = await getNewsApi();
-
 			setNews(res?.data || []);
-			setTotalItems(res?.meta?.total || 0);
 		} catch (err) {
 			console.error(err);
 		} finally {
 			setLoading(false);
 		}
-	}, [currentPage, itemsPerPage]);
+	}, []);
 
 	useEffect(() => {
 		fetchAll();
 	}, [fetchAll]);
 
-	const filteredNews = news.filter(
+	const filteredNews = news.filter((item) =>
-		(item) =>
+		item.Headline?.toLowerCase().includes(searchText.toLowerCase()),
-			item.Headline?.toLowerCase().includes(searchText.toLowerCase()) ||
-			item.Author?.toLowerCase().includes(searchText.toLowerCase()),
 	);
 
-	const totalPages = Math.ceil(totalItems / itemsPerPage);
+	const totalPages = Math.ceil(filteredNews.length / itemsPerPage);
+	const startIndex = (currentPage - 1) * itemsPerPage;
+	const paginatedData = filteredNews.slice(
+		startIndex,
+		startIndex + itemsPerPage,
+	);
 
 	function handleChange(e: any) {
 		setForm({ ...form, [e.target.name]: e.target.value });
@@ -111,6 +109,7 @@ export default function NewsPage() {
 
 	function openEdit(item: any) {
 		setEditing(item);
+
 		setForm({
 			headline: item.Headline || "",
 			content: item.Content || "",
@@ -119,6 +118,7 @@ export default function NewsPage() {
 			date: item.Date ? item.Date.split("T")[0] : "",
 			author: item.Author || "",
 		});
+
 		setOpenModal(true);
 	}
 
@@ -149,17 +149,18 @@ export default function NewsPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
+			<div className="flex justify-between items-center flex-wrap gap-3">
-				<h1 className="text-3xl font-bold font-sans tracking-tight">
+				<h1 className="text-2xl font-bold">News Media</h1>
-					News Media
-				</h1>
 
-				<div className="flex flex-wrap gap-3 items-center">
+				<div className="flex gap-2 flex-wrap items-center">
 					<Input
-						placeholder="Filter headline..."
+						placeholder="Search headline..."
 						value={searchText}
-						onChange={(e) => setSearchText(e.target.value)}
+						onChange={(e) => {
-						className="w-[250px] text-base"
+							setSearchText(e.target.value);
+							setCurrentPage(1);
+						}}
+						className="w-[250px]"
 					/>
 
 					<select
@@ -168,131 +169,98 @@ export default function NewsPage() {
 							setItemsPerPage(Number(e.target.value));
 							setCurrentPage(1);
 						}}
-						className="flex h-10 rounded-md border border-input bg-background px-3 py-2 text-sm focus:ring-2 focus:ring-primary"
+						className="border px-2 py-1 rounded">
-					>
 						<option value={5}>5 / page</option>
 						<option value={10}>10 / page</option>
 						<option value={20}>20 / page</option>
 					</select>
 
-					<Button
+					<Button variant="outline" onClick={fetchAll} disabled={loading}>
-						variant="outline"
+						<RefreshCw className="mr-2 h-4 w-4" />
-						onClick={fetchAll}
-						disabled={loading}
-						className="text-base"
-					>
-						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={openAdd} className="text-base">
+					<Button onClick={openAdd}>
-						<Plus className="mr-2 h-5 w-5" />
+						<Plus className="mr-2 h-4 w-4" />
 						Add News
 					</Button>
 				</div>
 			</div>
 
-			<Card className="shadow-sm">
+			<Card>
 				<CardHeader>
-					<CardTitle className="text-xl">News Archives</CardTitle>
+					<CardTitle>News List</CardTitle>
 				</CardHeader>
 
-				<CardContent className="p-0 sm:p-6 space-y-4">
+				<CardContent>
-					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
+					<div className="overflow-x-auto">
-						<Table className="w-full min-w-[1000px] table-fixed border-separate border-spacing-0">
+						<Table className="min-w-[900px] table-fixed">
-							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
+							<TableHeader>
 								<TableRow>
-									<TableHead className="w-[80px] bg-background font-bold">
+									<TableHead className="w-[60px]">ID</TableHead>
-										ID
+									<TableHead className="w-[220px]">Headline</TableHead>
-									</TableHead>
+									<TableHead className="w-[120px]">Author</TableHead>
-									<TableHead className="w-[280px] bg-background font-bold">
+									<TableHead className="w-[120px]">Date</TableHead>
-										Headline
+									<TableHead className="w-[260px]">Content</TableHead>
-									</TableHead>
+									<TableHead className="w-[150px]">Actions</TableHead>
-									<TableHead className="w-[150px] bg-background font-bold">
-										Author
-									</TableHead>
-									<TableHead className="w-[140px] bg-background font-bold">
-										Date
-									</TableHead>
-									<TableHead className="w-[250px] bg-background font-bold">
-										Content Preview
-									</TableHead>
-									<TableHead className="w-[150px] bg-background font-bold text-right">
-										Actions
-									</TableHead>
 								</TableRow>
 							</TableHeader>
 
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={6} className="text-center py-10">
+										<TableCell colSpan={6} className="text-center">
-											<Loader2 className="h-8 w-8 animate-spin mx-auto text-primary" />
+											<Loader2 className="animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : filteredNews.length === 0 ? (
+								) : paginatedData.length === 0 ? (
 									<TableRow>
-										<TableCell
+										<TableCell colSpan={6} className="text-center">
-											colSpan={6}
+											No news found
-											className="text-center text-muted-foreground py-10 text-base"
-										>
-											No news articles found
 										</TableCell>
 									</TableRow>
 								) : (
-									filteredNews.map((item) => (
+									paginatedData.map((item) => (
-										<TableRow key={item.Id} className="hover:bg-muted/50">
+										<TableRow key={item.Id}>
-											<TableCell className="font-mono text-xs">
+											<TableCell>{item.Id}</TableCell>
-												{item.Id}
+
+											<TableCell className="break-words whitespace-normal">
+												{item.Headline}
 											</TableCell>
+
+											<TableCell>{item.Author}</TableCell>
+
 											<TableCell>
-												<div
-													className="font-semibold text-base line-clamp-2"
-													title={item.Headline}
-												>
-													{item.Headline}
-												</div>
-											</TableCell>
-											<TableCell className="text-sm font-medium">
-												{item.Author || "-"}
-											</TableCell>
-											<TableCell className="text-sm">
 												{item.Date
 													? new Date(item.Date).toLocaleDateString()
 													: "-"}
 											</TableCell>
-											<TableCell>
+
-												<div className="text-sm line-clamp-2 text-muted-foreground">
+											<TableCell className="break-words whitespace-normal">
-													{item.Content}
+												{item.Content}
-												</div>
 											</TableCell>
-											<TableCell className="text-right">
+
-												<div className="flex justify-end gap-2">
+											<TableCell className="flex gap-2">
-													<Button
+												<Button
-														size="icon"
+													size="sm"
-														variant="ghost"
+													variant="outline"
-														className="h-9 w-9"
+													onClick={() => openView(item)}>
-														onClick={() => openView(item)}
+													<Eye className="h-4 w-4" />
-													>
+												</Button>
-														<Eye className="h-4 w-4" />
+
-													</Button>
+												<Button
-													<Button
+													size="sm"
-														size="icon"
+													variant="outline"
-														variant="ghost"
+													onClick={() => openEdit(item)}>
-														className="h-9 w-9"
+													<Pencil className="h-4 w-4" />
-														onClick={() => openEdit(item)}
+												</Button>
-													>
+
-														<Pencil className="h-4 w-4" />
+												<Button
-													</Button>
+													size="sm"
-													<Button
+													variant="destructive"
-														size="icon"
+													onClick={() => handleDelete(Number(item.Id))}>
-														variant="ghost"
+													<Trash className="h-4 w-4" />
-														className="h-9 w-9 text-destructive hover:bg-destructive/10"
+												</Button>
-														onClick={() => handleDelete(Number(item.Id))}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
-												</div>
 											</TableCell>
 										</TableRow>
 									))
@@ -301,197 +269,129 @@ export default function NewsPage() {
 						</Table>
 					</div>
 
-					{!loading && totalItems > 0 && (
+					{/* PAGINATION */}
-						<div className="flex items-center justify-between px-2 py-4 border-t">
+					<div className="flex justify-between items-center mt-4">
-							<div className="text-sm text-muted-foreground">
+						<p className="text-sm">
-								Total <span className="font-bold">{totalItems}</span> articles
+							Page {currentPage} of {totalPages}
-								(Page <span className="font-bold">{currentPage}</span> of{" "}
+						</p>
-								{totalPages})
+
-							</div>
+						<div className="flex gap-2">
-							<div className="flex items-center gap-6">
+							<Button
-								<div className="text-base font-semibold">
+								variant="outline"
-									Page {currentPage} of {totalPages}
+								size="sm"
-								</div>
+								disabled={currentPage === 1}
-								<div className="flex gap-2">
+								onClick={() => setCurrentPage((p) => p - 1)}>
-									<Button
+								<ChevronLeft className="h-4 w-4" />
-										variant="outline"
+							</Button>
-										size="icon"
+
-										className="h-10 w-10"
+							<Button
-										onClick={() =>
+								variant="outline"
-											setCurrentPage((prev) => Math.max(prev - 1, 1))
+								size="sm"
-										}
+								disabled={currentPage === totalPages}
-										disabled={currentPage === 1}
+								onClick={() => setCurrentPage((p) => p + 1)}>
-									>
+								<ChevronRight className="h-4 w-4" />
-										<ChevronLeft className="h-5 w-5" />
+							</Button>
-									</Button>
-									<Button
-										variant="outline"
-										size="icon"
-										className="h-10 w-10"
-										onClick={() =>
-											setCurrentPage((prev) => Math.min(prev + 1, totalPages))
-										}
-										disabled={currentPage === totalPages || totalPages === 0}
-									>
-										<ChevronRight className="h-5 w-5" />
-									</Button>
-								</div>
-							</div>
 						</div>
-					)}
+					</div>
 				</CardContent>
 			</Card>
 
+			{/* CREATE / EDIT MODAL */}
 			<Dialog open={openModal} onOpenChange={setOpenModal}>
-				<DialogContent className="w-full !max-w-5xl max-h-[90vh] overflow-y-auto">
+				<DialogContent className="w-[95vw] max-w-none max-h-[90vh] overflow-y-auto">
 					<DialogHeader>
-						<DialogTitle className="text-2xl font-bold">
+						<DialogTitle>{editing ? "Edit News" : "Add News"}</DialogTitle>
-							{editing ? "Edit News Article" : "Add New News Article"}
-						</DialogTitle>
 					</DialogHeader>
 
-					<div className="grid grid-cols-1 md:grid-cols-2 gap-8 mt-6">
+					<div className="space-y-3">
-						<div className="space-y-6">
+						<Input
-							<h3 className="font-bold text-base border-b pb-2 text-primary">
+							name="headline"
-								Article Information
+							placeholder="Headline"
-							</h3>
+							value={form.headline}
-							<div className="space-y-4">
+							onChange={handleChange}
-								<div className="space-y-1">
+						/>
-									<label className="text-sm font-semibold">Headline</label>
+						<Input
-									<Input
+							name="author"
-										name="headline"
+							placeholder="Author"
-										value={form.headline}
+							value={form.author}
-										onChange={handleChange}
+							onChange={handleChange}
-										className="text-base"
+						/>
-									/>
+						<Input
-								</div>
+							type="date"
-								<div className="space-y-1">
+							name="date"
-									<label className="text-sm font-semibold">Author</label>
+							value={form.date}
-									<Input
+							onChange={handleChange}
-										name="author"
+						/>
-										value={form.author}
-										onChange={handleChange}
-										className="text-base"
-									/>
-								</div>
-								<div className="space-y-1">
-									<label className="text-sm font-semibold">Publish Date</label>
-									<Input
-										type="date"
-										name="date"
-										value={form.date}
-										onChange={handleChange}
-										className="text-base"
-									/>
-								</div>
-							</div>
-							<div className="space-y-1 pt-2">
-								<label className="text-sm font-semibold">Intro Paragraph</label>
-								<Textarea
-									name="firstPara"
-									value={form.firstPara}
-									onChange={handleChange}
-									className="min-h-[140px] text-base"
-								/>
-							</div>
-						</div>
 
-						<div className="space-y-6">
+						<textarea
-							<h3 className="font-bold text-base border-b pb-2 text-primary">
+							name="firstPara"
-								Story Details
+							placeholder="First Paragraph"
-							</h3>
+							value={form.firstPara}
-							<div className="space-y-4">
+							onChange={handleChange}
-								<div className="space-y-1">
+							className="border rounded p-2 w-full min-h-[100px]"
-									<label className="text-sm font-semibold">
+						/>
-										Second Paragraph
+						<textarea
-									</label>
+							name="secondPara"
-									<Textarea
+							placeholder="Second Paragraph"
-										name="secondPara"
+							value={form.secondPara}
-										value={form.secondPara}
+							onChange={handleChange}
-										onChange={handleChange}
+							className="border rounded p-2 w-full min-h-[100px]"
-										className="min-h-[140px] text-base"
+						/>
-									/>
+						<textarea
-								</div>
+							name="content"
-								<div className="space-y-1">
+							placeholder="Content"
-									<label className="text-sm font-semibold">Content</label>
+							value={form.content}
-									<Textarea
+							onChange={handleChange}
-										name="content"
+							className="border rounded p-2 w-full min-h-[150px]"
-										value={form.content}
+						/>
-										onChange={handleChange}
-										className="min-h-[200px] text-base"
-									/>
-								</div>
-							</div>
-						</div>
 					</div>
 
-					<DialogFooter className="mt-10 pt-6 border-t">
+					<DialogFooter>
-						<Button
+						<Button variant="outline" onClick={() => setOpenModal(false)}>
-							variant="ghost"
-							onClick={() => setOpenModal(false)}
-							className="text-base"
-						>
 							Cancel
 						</Button>
-						<Button
+						<Button onClick={handleSubmit}>
-							onClick={handleSubmit}
+							{editing ? "Update" : "Create"}
-							className="px-10 text-base bg-primary text-white"
-						>
-							{editing ? "Save Changes" : "Publish Now"}
 						</Button>
 					</DialogFooter>
 				</DialogContent>
 			</Dialog>
 
+			{/* VIEW MODAL */}
 			<Dialog open={viewOpen} onOpenChange={setViewOpen}>
-				<DialogContent className="w-full !max-w-4xl max-h-[85vh] overflow-y-auto p-6">
+				<DialogContent className="w-[95vw] max-w-none max-h-[90vh] overflow-y-auto p-6">
 					<DialogHeader>
-						<DialogTitle className="text-2xl border-b pb-2 flex items-center gap-2">
+						<DialogTitle>News Details</DialogTitle>
-							<Newspaper className="h-6 w-6 text-primary" /> News Preview
-						</DialogTitle>
 					</DialogHeader>
 
 					{viewData && (
-						<div className="space-y-6 py-4">
+						<div className="space-y-4 text-sm">
-							<div className="space-y-2">
+							<b>Headline:</b>
-								<h2 className="text-2xl font-bold leading-tight">
+							<p>{viewData.Headline}</p>
-									{viewData.Headline}
-								</h2>
-								<div className="flex gap-4 text-sm text-muted-foreground font-medium italic">
-									<span>By: {viewData.Author || "Anonymous"}</span>
-									<span>•</span>
-									<span>
-										{viewData.Date
-											? new Date(viewData.Date).toLocaleDateString("en-IN", {
-													dateStyle: "long",
-												})
-											: "No Date"}
-									</span>
-								</div>
-							</div>
 
-							<div className="space-y-5 leading-relaxed text-base">
+							<b>Author:</b>
-								<div className="bg-muted/30 p-4 rounded-lg border-l-4 border-primary">
+							<p>{viewData.Author}</p>
-									<p className="whitespace-pre-line">{viewData.FirstPara}</p>
+
-								</div>
+							<b>Date:</b>
-								<div className="space-y-4 px-1">
+							<p>
-									<p className="whitespace-pre-line">{viewData.SecondPara}</p>
+								{viewData.Date
-									<hr />
+									? new Date(viewData.Date).toLocaleDateString()
-									<p className="whitespace-pre-line text-muted-foreground">
+									: "-"}
-										{viewData.Content}
+							</p>
-									</p>
+
-								</div>
+							<b>First Para:</b>
-							</div>
+							<p className="whitespace-pre-line">{viewData.FirstPara}</p>
+
+							<b>Second Para:</b>
+							<p className="whitespace-pre-line">{viewData.SecondPara}</p>
+
+							<b>Content:</b>
+							<p className="whitespace-pre-line">{viewData.Content}</p>
 						</div>
 					)}
 
 					<DialogFooter>
-						<Button
+						<Button onClick={() => setViewOpen(false)}>Close</Button>
-							onClick={() => setViewOpen(false)}
-							className="w-full md:w-auto"
-						>
-							Close Preview
-						</Button>
 					</DialogFooter>
 				</DialogContent>
 			</Dialog>