fix: maintain same ui across all the pages

backend/src/controllers/appointment.controller.js

@@ -1,10 +1,10 @@
 import prisma from "../prisma/client.js";
-import { sendEmail } from "../utils/sendEmail.js";
+import {sendEmail} from "../utils/sendEmail.js";
-import { getEmailsByType } from "../utils/getEmailByTypes.js";
+import {getEmailsByType} from "../utils/getEmailByTypes.js";
 
 export const createAppointment = async (req, res) => {
 	try {
-		const { name, mobileNumber, email, message, date, doctorId, departmentId } =
+		const {name, mobileNumber, email, message, date, doctorId, departmentId} =
 			req.body;
 
 		if (!name || !mobileNumber || !doctorId || !departmentId || !date) {
@@ -71,98 +71,19 @@ export const createAppointment = async (req, res) => {
 
 export const getAppointments = async (req, res) => {
 	try {
-		const page = parseInt(req.query.page);
-		const limit = parseInt(req.query.limit);
-
-		const search = req.query.search || "";
-		const doctor = req.query.doctor || "";
-		const department = req.query.department || "";
-		const date = req.query.date || "";
-
-		if (!page && !limit) {
 		const appointments = await prisma.appointment.findMany({
 			include: {
 				doctor: true,
 				department: true,
 			},
-				orderBy: { createdAt: "desc" },
+			orderBy: {
+				createdAt: "desc",
+			},
 		});
 
-			return res.status(200).json({
+		res.status(200).json({
 			success: true,
 			data: appointments,
-				meta: null,
-			});
-		}
-
-		const currentPage = page || 1;
-		const currentLimit = limit || 10;
-		const skip = (currentPage - 1) * currentLimit;
-
-		const where = {
-			AND: [
-				search
-					? {
-							OR: [
-								{ name: { contains: search, mode: "insensitive" } },
-								{ mobileNumber: { contains: search } },
-								{ email: { contains: search, mode: "insensitive" } },
-							],
-						}
-					: {},
-
-				doctor
-					? {
-							doctor: {
-								name: { contains: doctor, mode: "insensitive" },
-							},
-						}
-					: {},
-
-				department
-					? {
-							department: {
-								name: { contains: department, mode: "insensitive" },
-							},
-						}
-					: {},
-
-				date
-					? {
-							date: {
-								gte: new Date(date),
-								lt: new Date(
-									new Date(date).setDate(new Date(date).getDate() + 1),
-								),
-							},
-						}
-					: {},
-			],
-		};
-
-		const [appointments, total] = await Promise.all([
-			prisma.appointment.findMany({
-				where,
-				include: {
-					doctor: true,
-					department: true,
-				},
-				orderBy: { createdAt: "desc" },
-				skip,
-				take: currentLimit,
-			}),
-			prisma.appointment.count({ where }),
-		]);
-
-		return res.status(200).json({
-			success: true,
-			data: appointments,
-			meta: {
-				total,
-				page: currentPage,
-				limit: currentLimit,
-				totalPages: Math.ceil(total / currentLimit),
-			},
 		});
 	} catch (error) {
 		console.error(error);
@@ -177,7 +98,7 @@ export const getAppointments = async (req, res) => {
 
 export const getAppointment = async (req, res) => {
 	try {
-		const { id } = req.params;
+		const {id} = req.params;
 
 		const appointment = await prisma.appointment.findUnique({
 			where: {
@@ -213,7 +134,7 @@ export const getAppointment = async (req, res) => {
 
 export const getAppointmentsByDoctor = async (req, res) => {
 	try {
-		const { doctorId } = req.params;
+		const {doctorId} = req.params;
 
 		const appointments = await prisma.appointment.findMany({
 			where: {
@@ -245,7 +166,7 @@ export const getAppointmentsByDoctor = async (req, res) => {
 
 export const getAppointmentsByDepartment = async (req, res) => {
 	try {
-		const { departmentId } = req.params;
+		const {departmentId} = req.params;
 
 		const appointments = await prisma.appointment.findMany({
 			where: {
@@ -274,7 +195,7 @@ export const getAppointmentsByDepartment = async (req, res) => {
 
 export const updateAppointment = async (req, res) => {
 	try {
-		const { id } = req.params;
+		const {id} = req.params;
 
 		const appointment = await prisma.appointment.update({
 			where: {
@@ -305,7 +226,7 @@ export const updateAppointment = async (req, res) => {
 
 export const deleteAppointment = async (req, res) => {
 	try {
-		const { id } = req.params;
+		const {id} = req.params;
 
 		await prisma.appointment.delete({
 			where: {

frontend/src/api/appointment.ts

@@ -1,22 +1,7 @@
 import apiClient from "@/api/client";
 
-export const getAppointmentsApi = async (
+export const getAppointmentsApi = async () => {
-	page?: number,
+	const res = await apiClient.get("/appointments/getall");
-	limit?: number,
-	search?: string,
-	doctor?: string,
-	department?: string,
-	date?: string,
-) => {
-	let url = "/appointments/getAll";
-
-	if (page && limit) {
-		url += `?page=${page}&limit=${limit}&search=${search || ""}&doctor=${
-			doctor || ""
-		}&department=${department || ""}&date=${date || ""}`;
-	}
-
-	const res = await apiClient.get(url);
 	return res.data;
 };
 

frontend/src/components/ui/badge.tsx

@@ -0,0 +1,49 @@
+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,11 +13,26 @@ 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 { Loader2, Trash, RefreshCw, Download } from "lucide-react";
+import {
+	Loader2,
+	Trash,
+	RefreshCw,
+	Download,
+	ChevronLeft,
+	ChevronRight,
+	Eye,
+	BookOpen,
+} from "lucide-react";
 
 export default function AcademicsPage() {
 	const [records, setRecords] = useState<any[]>([]);
@@ -25,6 +40,12 @@ 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 {
@@ -51,6 +72,20 @@ 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);
@@ -74,24 +109,29 @@ export default function AcademicsPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex justify-between items-center gap-3 flex-wrap">
+			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
-				<h1 className="text-2xl font-bold">Academics & Research</h1>
+				<h1 className="text-3xl font-bold">Academics & Research</h1>
 
-				<div className="flex flex-wrap gap-2">
+				<div className="flex flex-wrap gap-3">
 					<Input
-						placeholder="Search name / phone / email / subject..."
+						placeholder="Search name / course / email..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[260px]"
+						className="w-[280px] text-base"
 					/>
 
-					<Button variant="outline" onClick={fetchAll} disabled={loading}>
+					<Button
-						<RefreshCw className="mr-2 h-4 w-4" />
+						variant="outline"
+						onClick={fetchAll}
+						disabled={loading}
+						className="text-base"
+					>
+						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button variant="outline" onClick={handleExport}>
+					<Button onClick={handleExport} className="text-base">
-						<Download className="mr-2 h-4 w-4" />
+						<Download className="mr-2 h-5 w-5" />
 						Export
 					</Button>
 				</div>
@@ -99,65 +139,108 @@ export default function AcademicsPage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle>Academics Records</CardTitle>
+					<CardTitle className="text-xl">Academic Records</CardTitle>
 				</CardHeader>
 
-				<CardContent>
+				<CardContent className="p-0 sm:p-6 space-y-4">
-					<div className="overflow-x-auto">
+					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
-						<Table className="min-w-[1000px]">
+						<Table className="w-full min-w-[1100px] table-fixed border-separate border-spacing-0">
-							<TableHeader>
+							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
 								<TableRow>
-									<TableHead>ID</TableHead>
+									<TableHead className="w-[60px] bg-background font-bold text-sm">
-									<TableHead>Name</TableHead>
+										ID
-									<TableHead>Phone</TableHead>
+									</TableHead>
-									<TableHead>Email</TableHead>
+									<TableHead className="w-[220px] bg-background font-bold text-sm">
-									<TableHead>Course</TableHead>
+										Full Name
-									<TableHead>Subject</TableHead>
+									</TableHead>
-									<TableHead>Message</TableHead>
+									<TableHead className="w-[180px] bg-background font-bold text-sm">
-									<TableHead>Date</TableHead>
+										Course
-									<TableHead>Actions</TableHead>
+									</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={9} className="text-center">
+										<TableCell colSpan={7} className="text-center py-10">
-											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
+											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : filteredRecords.length === 0 ? (
+								) : currentItems.length === 0 ? (
 									<TableRow>
-										<TableCell colSpan={9} className="text-center">
+										<TableCell
+											colSpan={7}
+											className="text-center text-muted-foreground py-10 text-base"
+										>
 											No records found
 										</TableCell>
 									</TableRow>
 								) : (
-									filteredRecords.map((item) => (
+									currentItems.map((item) => (
-										<TableRow key={item.id}>
+										<TableRow key={item.id} className="hover:bg-muted/50">
-											<TableCell>{item.id}</TableCell>
+											<TableCell className="font-mono text-xs">
-											<TableCell>{item.fullName}</TableCell>
+												{item.id}
-											<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">
+													{item.message || "-"}
+												</div>
+											</TableCell>
+											<TableCell className="text-right">
+												<div className="flex justify-end gap-2">
 													<Button
-													size="sm"
+														size="icon"
-													variant="destructive"
+														variant="ghost"
-													onClick={() => handleDelete(item.id)}>
+														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>
 									))
@@ -165,8 +248,117 @@ 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

@@ -15,6 +15,13 @@ import {
 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 {
 	Loader2,
@@ -23,6 +30,7 @@ import {
 	Download,
 	ChevronLeft,
 	ChevronRight,
+	Eye,
 } from "lucide-react";
 
 export default function AppointmentPage() {
@@ -31,86 +39,72 @@ export default function AppointmentPage() {
 
 	const [searchText, setSearchText] = useState("");
 	const [filterDoctor, setFilterDoctor] = useState("");
-	const [filterDepartment, setFilterDepartment] = useState("");
 	const [filterDate, setFilterDate] = useState("");
 
-	const [currentPage, setCurrentPage] = useState(1);
+	const [viewOpen, setViewOpen] = useState(false);
-	const [itemsPerPage, setItemsPerPage] = useState(10);
+	const [viewData, setViewData] = useState<any>(null);
 
-	const [meta, setMeta] = useState<any>({});
+	const [currentPage, setCurrentPage] = useState(1);
+	const itemsPerPage = 10;
 
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
-			const res = await getAppointmentsApi(
+			const res = await getAppointmentsApi();
-				currentPage,
-				itemsPerPage,
-				searchText,
-				filterDoctor,
-				filterDepartment,
-				filterDate,
-			);
-
 			setAppointments(res?.data || []);
-			setMeta(res?.meta || {});
 		} catch (err) {
 			console.error(err);
 		} finally {
 			setLoading(false);
 		}
-	}, [
+	}, []);
-		currentPage,
-		itemsPerPage,
-		searchText,
-		filterDoctor,
-		filterDepartment,
-		filterDate,
-	]);
 
 	useEffect(() => {
 		fetchAll();
 	}, [fetchAll]);
 
+	const filteredAppointments = appointments.filter((item) => {
+		const matchesSearch =
+			item.name?.toLowerCase().includes(searchText.toLowerCase()) ||
+			item.mobileNumber?.includes(searchText) ||
+			item.email?.toLowerCase().includes(searchText.toLowerCase());
+
+		const matchesDoctor = filterDoctor
+			? item.doctor?.name?.toLowerCase().includes(filterDoctor.toLowerCase())
+			: true;
+
+		const matchesDate = filterDate
+			? new Date(item.date).toISOString().split("T")[0] === filterDate
+			: true;
+
+		return matchesSearch && matchesDoctor && 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);
 		fetchAll();
 	}
 
-	const handleExport = async () => {
+	const handleExport = () => {
-		try {
+		const exportData = filteredAppointments.map((item) => ({
-			const res = await getAppointmentsApi();
-
-			let data = res?.data || [];
-
-			data = data.filter((item: any) => {
-				const matchesSearch =
-					item.name?.toLowerCase().includes(searchText.toLowerCase()) ||
-					item.mobileNumber?.includes(searchText) ||
-					item.email?.toLowerCase().includes(searchText.toLowerCase());
-
-				const matchesDoctor = filterDoctor
-					? 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 && matchesDepartment && matchesDate
-				);
-			});
-
-			const exportData = data.map((item: any) => ({
 			ID: item.id,
 			Name: item.name,
 			Phone: item.mobileNumber,
@@ -120,68 +114,41 @@ export default function AppointmentPage() {
 			Date: new Date(item.date).toLocaleDateString(),
 			Message: item.message,
 		}));
-
 		exportToExcel(exportData, "appointments");
-		} catch (err) {
-			console.error(err);
-		}
 	};
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex justify-between items-center flex-wrap gap-3">
+			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
-				<h1 className="text-2xl font-bold">Appointments</h1>
+				<h1 className="text-3xl font-bold">Appointments</h1>
 
-				<div className="flex flex-wrap gap-2 items-center">
+				<div className="flex flex-wrap gap-3">
 					<Input
-						placeholder="Search..."
+						placeholder="Search name / phone..."
 						value={searchText}
-						onChange={(e) => {
+						onChange={(e) => setSearchText(e.target.value)}
-							setSearchText(e.target.value);
+						className="w-[220px] text-base"
-							setCurrentPage(1);
-						}}
-						className="w-[200px]"
-					/>
-
-					<Input
-						placeholder="Doctor"
-						value={filterDoctor}
-						onChange={(e) => setFilterDoctor(e.target.value)}
-						className="w-[160px]"
-					/>
-
-					<Input
-						placeholder="Department"
-						value={filterDepartment}
-						onChange={(e) => setFilterDepartment(e.target.value)}
-						className="w-[160px]"
 					/>
 
 					<Input
 						type="date"
 						value={filterDate}
 						onChange={(e) => setFilterDate(e.target.value)}
-						className="w-[160px]"
+						className="w-[160px] text-base"
 					/>
 
-					<select
+					<Button
-						value={itemsPerPage}
+						variant="outline"
-						onChange={(e) => {
+						onClick={fetchAll}
-							setItemsPerPage(Number(e.target.value));
+						disabled={loading}
-							setCurrentPage(1);
+						className="text-base"
-						}}
+					>
-						className="border px-2 py-1 rounded">
+						<RefreshCw className="mr-2 h-5 w-5" />
-						<option value={5}>5</option>
+						Refresh
-						<option value={10}>10</option>
-						<option value={20}>20</option>
-					</select>
-
-					<Button onClick={fetchAll}>
-						<RefreshCw className="mr-2 h-4 w-4" />
 					</Button>
 
-					<Button onClick={handleExport}>
+					<Button onClick={handleExport} className="text-base">
-						<Download className="mr-2 h-4 w-4" />
+						<Download className="mr-2 h-5 w-5" />
 						Export
 					</Button>
 				</div>
@@ -189,84 +156,226 @@ export default function AppointmentPage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle>Appointment List</CardTitle>
+					<CardTitle className="text-xl">Appointment List</CardTitle>
 				</CardHeader>
 
-				<CardContent>
+				<CardContent className="p-0 sm:p-6 space-y-4">
-					<Table>
+					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
-						<TableHeader>
+						<Table className="w-full min-w-[1000px] table-fixed border-separate border-spacing-0">
+							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
 								<TableRow>
-								<TableHead>ID</TableHead>
+									<TableHead className="w-[60px] bg-background font-bold text-sm">
-								<TableHead>Name</TableHead>
+										ID
-								<TableHead>Phone</TableHead>
+									</TableHead>
-								<TableHead>Doctor</TableHead>
+									<TableHead className="w-[200px] bg-background font-bold text-sm">
-								<TableHead>Department</TableHead>
+										Patient
-								<TableHead>Date</TableHead>
+									</TableHead>
-								<TableHead>Actions</TableHead>
+									<TableHead className="w-[180px] bg-background font-bold text-sm">
+										Doctor
+									</TableHead>
+									<TableHead className="w-[150px] bg-background font-bold text-sm">
+										Date
+									</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={7} className="text-center">
+										<TableCell colSpan={6} className="text-center py-10">
-										<Loader2 className="animate-spin mx-auto" />
+											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-							) : appointments.length === 0 ? (
+								) : currentItems.length === 0 ? (
 									<TableRow>
 										<TableCell
-										colSpan={7}
+											colSpan={6}
-										className="text-center py-6 text-gray-500">
+											className="text-center text-muted-foreground py-10 text-base"
+										>
 											No appointments found
 										</TableCell>
 									</TableRow>
 								) : (
-								appointments.map((item) => (
+									currentItems.map((item) => (
-									<TableRow key={item.id}>
+										<TableRow key={item.id} className="hover:bg-muted/50">
-										<TableCell>{item.id}</TableCell>
+											<TableCell className="font-mono text-xs">
-										<TableCell>{item.name}</TableCell>
+												{item.id}
-										<TableCell>{item.mobileNumber}</TableCell>
-										<TableCell>{item.doctor?.name}</TableCell>
-										<TableCell>{item.department?.name}</TableCell>
-										<TableCell>
-											{new Date(item.date).toLocaleDateString()}
 											</TableCell>
 											<TableCell>
+												<div className="font-semibold text-base truncate">
+													{item.name}
+												</div>
+												<div className="text-xs text-muted-foreground">
+													{item.mobileNumber}
+												</div>
+											</TableCell>
+											<TableCell>
+												<div className="text-sm font-medium">
+													{item.doctor?.name || "-"}
+												</div>
+												<div className="text-[10px] text-muted-foreground truncate">
+													{item.department?.name}
+												</div>
+											</TableCell>
+											<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="sm"
+														size="icon"
-												variant="destructive"
+														variant="ghost"
-												onClick={() => handleDelete(item.id)}>
+														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>
 									))
 								)}
 							</TableBody>
 						</Table>
+					</div>
 
-					<div className="flex justify-between mt-4">
+					{!loading && filteredAppointments.length > 0 && (
-						<p>
+						<div className="flex items-center justify-between px-2 py-6 border-t">
-							Page {meta.page || 1} of {meta.totalPages || 1}
+							<div className="text-base text-muted-foreground">
-						</p>
+								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}
-								onClick={() => setCurrentPage((p) => p - 1)}>
+									>
-								<ChevronLeft />
+										<ChevronLeft className="h-5 w-5" />
 									</Button>
-
 									<Button
-								disabled={currentPage === meta.totalPages}
+										variant="outline"
-								onClick={() => setCurrentPage((p) => p + 1)}>
+										size="icon"
-								<ChevronRight />
+										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,7 +1,6 @@
 import { useState, useEffect, useCallback } from "react";
 
 import { getCareersApi, deleteCareerApi } from "@/api/career";
-
 import apiClient from "@/api/client";
 
 import {
@@ -15,7 +14,6 @@ import {
 
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
-
 import {
 	Dialog,
 	DialogContent,
@@ -25,8 +23,17 @@ import {
 } from "@/components/ui/dialog";
 
 import { Input } from "@/components/ui/input";
+import { Badge } from "@/components/ui/badge";
 
-import { Loader2, Plus, Pencil, Trash, RefreshCw } from "lucide-react";
+import {
+	Loader2,
+	Plus,
+	Pencil,
+	Trash,
+	RefreshCw,
+	ChevronLeft,
+	ChevronRight,
+} from "lucide-react";
 
 export default function CareerPage() {
 	const [careers, setCareers] = useState<any[]>([]);
@@ -37,6 +44,9 @@ export default function CareerPage() {
 
 	const [searchText, setSearchText] = useState("");
 
+	const [currentPage, setCurrentPage] = useState(1);
+	const itemsPerPage = 10;
+
 	const [form, setForm] = useState({
 		post: "",
 		designation: "",
@@ -63,10 +73,21 @@ export default function CareerPage() {
 		fetchAll();
 	}, [fetchAll]);
 
-	const filteredCareers = careers.filter((item) =>
+	const filteredCareers = careers.filter(
-		item.post?.toLowerCase().includes(searchText.toLowerCase()),
+		(item) =>
+			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 });
 	}
@@ -87,7 +108,6 @@ export default function CareerPage() {
 
 	function openEdit(item: any) {
 		setEditing(item);
-
 		setForm({
 			post: item.post || "",
 			designation: item.designation || "",
@@ -97,7 +117,6 @@ export default function CareerPage() {
 			number: item.number || "",
 			status: item.status || "new",
 		});
-
 		setOpenModal(true);
 	}
 
@@ -108,7 +127,6 @@ export default function CareerPage() {
 			} else {
 				await apiClient.post("/careers", form);
 			}
-
 			setOpenModal(false);
 			fetchAll();
 		} catch (err) {
@@ -124,24 +142,29 @@ export default function CareerPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex justify-between items-center gap-3 flex-wrap">
+			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
-				<h1 className="text-2xl font-bold">Careers</h1>
+				<h1 className="text-3xl font-bold">Careers</h1>
 
-				<div className="flex gap-2 flex-wrap">
+				<div className="flex flex-wrap gap-3">
 					<Input
-						placeholder="Search career..."
+						placeholder="Search post / designation..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[220px]"
+						className="w-[250px] text-base"
 					/>
 
-					<Button variant="outline" onClick={fetchAll} disabled={loading}>
+					<Button
-						<RefreshCw className="mr-2 h-4 w-4" />
+						variant="outline"
+						onClick={fetchAll}
+						disabled={loading}
+						className="text-base"
+					>
+						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={openAdd}>
+					<Button onClick={openAdd} className="text-base">
-						<Plus className="mr-2 h-4 w-4" />
+						<Plus className="mr-2 h-5 w-5" />
 						Add Career
 					</Button>
 				</div>
@@ -149,67 +172,113 @@ export default function CareerPage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle>Career List</CardTitle>
+					<CardTitle className="text-xl">Career Opportunities</CardTitle>
 				</CardHeader>
 
-				<CardContent>
+				<CardContent className="p-0 sm:p-6 space-y-4">
-					<div className="overflow-x-auto">
+					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
-						<Table className="min-w-[900px]">
+						<Table className="w-full min-w-[1000px] table-fixed border-separate border-spacing-0">
-							<TableHeader>
+							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
 								<TableRow>
-									<TableHead>ID</TableHead>
+									<TableHead className="w-[60px] bg-background font-bold text-sm">
-									<TableHead>Post</TableHead>
+										ID
-									<TableHead>Designation</TableHead>
+									</TableHead>
-									<TableHead>Qualification</TableHead>
+									<TableHead className="w-[200px] bg-background font-bold text-sm">
-									<TableHead>Experience</TableHead>
+										Post & Designation
-									<TableHead>Email</TableHead>
+									</TableHead>
-									<TableHead>Phone</TableHead>
+									<TableHead className="w-[200px] bg-background font-bold text-sm">
-									<TableHead>Status</TableHead>
+										Qualification
-									<TableHead>Actions</TableHead>
+									</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={9} className="text-center">
+										<TableCell colSpan={7} className="text-center py-10">
-											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
+											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : filteredCareers.length === 0 ? (
+								) : currentItems.length === 0 ? (
 									<TableRow>
-										<TableCell colSpan={9} className="text-center">
+										<TableCell
+											colSpan={7}
+											className="text-center text-muted-foreground py-10 text-base"
+										>
 											No careers found
 										</TableCell>
 									</TableRow>
 								) : (
-									filteredCareers.map((item) => (
+									currentItems.map((item) => (
-										<TableRow key={item.id}>
+										<TableRow key={item.id} className="hover:bg-muted/50">
-											<TableCell>{item.id}</TableCell>
+											<TableCell className="font-mono text-xs">
-											<TableCell>{item.post}</TableCell>
+												{item.id}
-											<TableCell>{item.designation}</TableCell>
+											</TableCell>
-											<TableCell>{item.qualification}</TableCell>
+											<TableCell>
-											<TableCell>{item.experienceNeed}</TableCell>
+												<div className="font-semibold text-base truncate">
-											<TableCell>{item.email}</TableCell>
+													{item.post}
-											<TableCell>{item.number}</TableCell>
+												</div>
-											<TableCell>{item.status}</TableCell>
+												<div className="text-xs text-muted-foreground truncate">
+													{item.designation}
+												</div>
+											</TableCell>
+											<TableCell>
+												<div className="text-sm line-clamp-2">
+													{item.qualification}
+												</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}
+												</Badge>
+											</TableCell>
 
-											<TableCell className="flex gap-2">
+											<TableCell className="text-right">
+												<div className="flex justify-end gap-2">
 													<Button
-													size="sm"
+														size="icon"
-													variant="outline"
+														variant="ghost"
+														className="h-9 w-9"
 														onClick={() => openEdit(item)}
 													>
 														<Pencil className="h-4 w-4" />
 													</Button>
 
 													<Button
-													size="sm"
+														size="icon"
-													variant="destructive"
+														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>
 									))
@@ -217,67 +286,126 @@ 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>
+				<DialogContent className="w-full max-w-lg">
 					<DialogHeader>
-						<DialogTitle>{editing ? "Edit Career" : "Add Career"}</DialogTitle>
+						<DialogTitle className="text-2xl">
+							{editing ? "Edit Career" : "Add New Career"}
+						</DialogTitle>
 					</DialogHeader>
 
-					<div className="space-y-3">
+					<div className="space-y-4 py-4">
+						<div className="grid grid-cols-1 gap-4">
 							<Input
 								name="post"
-							placeholder="Post"
+								placeholder="Post (e.g. Staff Nurse)"
 								value={form.post}
 								onChange={handleChange}
+								className="text-base"
 							/>
 							<Input
 								name="designation"
 								placeholder="Designation"
 								value={form.designation}
 								onChange={handleChange}
+								className="text-base"
 							/>
 							<Input
 								name="qualification"
 								placeholder="Qualification"
 								value={form.qualification}
 								onChange={handleChange}
+								className="text-base"
 							/>
 							<Input
 								name="experienceNeed"
 								placeholder="Experience Needed"
 								value={form.experienceNeed}
 								onChange={handleChange}
+								className="text-base"
 							/>
 							<Input
 								name="email"
-							placeholder="Email"
+								type="email"
+								placeholder="HR Email Address"
 								value={form.email}
 								onChange={handleChange}
+								className="text-base"
 							/>
 							<Input
 								name="number"
-							placeholder="Phone Number"
+								placeholder="Contact Number"
 								value={form.number}
 								onChange={handleChange}
+								className="text-base"
 							/>
 							<Input
 								name="status"
-							placeholder="Status"
+								placeholder="Status (e.g. active / closed)"
 								value={form.status}
 								onChange={handleChange}
+								className="text-base"
 							/>
 						</div>
+					</div>
 
-					<DialogFooter>
+					<DialogFooter className="pt-4 border-t">
-						<Button variant="outline" onClick={() => setOpenModal(false)}>
+						<Button
+							variant="ghost"
+							onClick={() => setOpenModal(false)}
+							className="text-base"
+						>
 							Cancel
 						</Button>
-						<Button onClick={handleSubmit}>
+						<Button onClick={handleSubmit} className="px-8 text-base">
-							{editing ? "Update" : "Create"}
+							{editing ? "Save Changes" : "Create Career"}
 						</Button>
 					</DialogFooter>
 				</DialogContent>

frontend/src/pages/Department.tsx

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

frontend/src/pages/candidates.tsx

@@ -13,11 +13,26 @@ 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 { Loader2, Trash, RefreshCw, Download } from "lucide-react";
+import {
+	Loader2,
+	Trash,
+	RefreshCw,
+	Download,
+	ChevronLeft,
+	ChevronRight,
+	Eye,
+	User,
+} from "lucide-react";
 
 export default function CandidatePage() {
 	const [candidates, setCandidates] = useState<any[]>([]);
@@ -26,6 +41,12 @@ 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 {
@@ -55,6 +76,23 @@ 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);
@@ -71,7 +109,7 @@ export default function CandidatePage() {
 			Designation: item.career?.designation,
 			Subject: item.subject,
 			CoverLetter: item.coverLetter,
-			Date: new Date(item.createdAt).toLocaleDateString(),
+			AppliedDate: new Date(item.createdAt).toLocaleDateString(),
 		}));
 
 		exportToExcel(exportData, "candidates");
@@ -79,31 +117,36 @@ export default function CandidatePage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex justify-between items-center gap-3 flex-wrap">
+			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
-				<h1 className="text-2xl font-bold">Candidates</h1>
+				<h1 className="text-3xl font-bold">Candidates</h1>
 
-				<div className="flex flex-wrap gap-2">
+				<div className="flex flex-wrap gap-3">
 					<Input
-						placeholder="Search name / phone / email..."
+						placeholder="Search candidate..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[220px]"
+						className="w-[250px] text-base"
 					/>
 
 					<Input
-						placeholder="Filter Career"
+						placeholder="Filter by Career"
 						value={filterCareer}
 						onChange={(e) => setFilterCareer(e.target.value)}
-						className="w-[200px]"
+						className="w-[200px] text-base"
 					/>
 
-					<Button variant="outline" onClick={fetchAll} disabled={loading}>
+					<Button
-						<RefreshCw className="mr-2 h-4 w-4" />
+						variant="outline"
+						onClick={fetchAll}
+						disabled={loading}
+						className="text-base"
+					>
+						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button variant="outline" onClick={handleExport}>
+					<Button onClick={handleExport} className="text-base">
-						<Download className="mr-2 h-4 w-4" />
+						<Download className="mr-2 h-5 w-5" />
 						Export
 					</Button>
 				</div>
@@ -111,68 +154,104 @@ export default function CandidatePage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle>Candidate List</CardTitle>
+					<CardTitle className="text-xl">Application List</CardTitle>
 				</CardHeader>
 
-				<CardContent>
+				<CardContent className="p-0 sm:p-6 space-y-4">
-					<div className="overflow-x-auto">
+					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
-						<Table className="min-w-[900px]">
+						<Table className="w-full min-w-[1100px] table-fixed border-separate border-spacing-0">
-							<TableHeader>
+							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
 								<TableRow>
-									<TableHead>ID</TableHead>
+									<TableHead className="w-[60px] bg-background font-bold text-sm">
-									<TableHead>Name</TableHead>
+										ID
-									<TableHead>Phone</TableHead>
+									</TableHead>
-									<TableHead>Email</TableHead>
+									<TableHead className="w-[220px] bg-background font-bold text-sm">
-									<TableHead>Career</TableHead>
+										Full Name
-									<TableHead>Designation</TableHead>
+									</TableHead>
-									<TableHead>Subject</TableHead>
+									<TableHead className="w-[180px] bg-background font-bold text-sm">
-									<TableHead>Cover Letter</TableHead>
+										Career & Post
-									<TableHead>Applied On</TableHead>
+									</TableHead>
-									<TableHead>Actions</TableHead>
+									<TableHead className="w-[150px] bg-background font-bold text-sm">
+										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={10} className="text-center">
+										<TableCell colSpan={7} className="text-center py-10">
-											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
+											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : filteredCandidates.length === 0 ? (
+								) : currentItems.length === 0 ? (
 									<TableRow>
-										<TableCell colSpan={10} className="text-center">
+										<TableCell
+											colSpan={7}
+											className="text-center text-muted-foreground py-10 text-base"
+										>
 											No candidates found
 										</TableCell>
 									</TableRow>
 								) : (
-									filteredCandidates.map((item) => (
+									currentItems.map((item) => (
-										<TableRow key={item.id}>
+										<TableRow key={item.id} className="hover:bg-muted/50">
-											<TableCell>{item.id}</TableCell>
+											<TableCell className="font-mono text-xs">
-											<TableCell>{item.fullName}</TableCell>
+												{item.id}
-											<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">
+													{item.coverLetter || "No cover letter provided."}
+												</div>
+											</TableCell>
+											<TableCell className="text-right">
+												<div className="flex justify-end gap-2">
 													<Button
-													size="sm"
+														size="icon"
-													variant="destructive"
+														variant="ghost"
-													onClick={() => handleDelete(item.id)}>
+														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>
 									))
@@ -180,8 +259,126 @@ 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,11 +13,26 @@ 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 { Loader2, Trash, RefreshCw, Download } from "lucide-react";
+import {
+	Loader2,
+	Trash,
+	RefreshCw,
+	Download,
+	ChevronLeft,
+	ChevronRight,
+	Eye,
+	Mail,
+} from "lucide-react";
 
 export default function InquiryPage() {
 	const [inquiries, setInquiries] = useState<any[]>([]);
@@ -25,6 +40,12 @@ 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 {
@@ -50,6 +71,23 @@ 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);
@@ -72,24 +110,29 @@ export default function InquiryPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex justify-between items-center gap-3 flex-wrap">
+			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
-				<h1 className="text-2xl font-bold">Inquiries</h1>
+				<h1 className="text-3xl font-bold">Inquiries</h1>
 
-				<div className="flex flex-wrap gap-2">
+				<div className="flex flex-wrap gap-3">
 					<Input
-						placeholder="Search name / phone / email / subject..."
+						placeholder="Search name / phone / subject..."
 						value={searchText}
 						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[260px]"
+						className="w-[280px] text-base"
 					/>
 
-					<Button variant="outline" onClick={fetchAll} disabled={loading}>
+					<Button
-						<RefreshCw className="mr-2 h-4 w-4" />
+						variant="outline"
+						onClick={fetchAll}
+						disabled={loading}
+						className="text-base"
+					>
+						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button variant="outline" onClick={handleExport}>
+					<Button onClick={handleExport} className="text-base">
-						<Download className="mr-2 h-4 w-4" />
+						<Download className="mr-2 h-5 w-5" />
 						Export
 					</Button>
 				</div>
@@ -97,62 +140,100 @@ export default function InquiryPage() {
 
 			<Card>
 				<CardHeader>
-					<CardTitle>Inquiry List</CardTitle>
+					<CardTitle className="text-xl">Customer Inquiries</CardTitle>
 				</CardHeader>
 
-				<CardContent>
+				<CardContent className="p-0 sm:p-6 space-y-4">
-					<div className="overflow-x-auto">
+					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
-						<Table className="min-w-[900px]">
+						<Table className="w-full min-w-[1000px] table-fixed border-separate border-spacing-0">
-							<TableHeader>
+							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
 								<TableRow>
-									<TableHead>ID</TableHead>
+									<TableHead className="w-[60px] bg-background font-bold text-sm">
-									<TableHead>Name</TableHead>
+										ID
-									<TableHead>Phone</TableHead>
+									</TableHead>
-									<TableHead>Email</TableHead>
+									<TableHead className="w-[220px] bg-background font-bold text-sm">
-									<TableHead>Subject</TableHead>
+										Customer Details
-									<TableHead>Message</TableHead>
+									</TableHead>
-									<TableHead>Date</TableHead>
+									<TableHead className="w-[200px] bg-background font-bold text-sm">
-									<TableHead>Actions</TableHead>
+										Subject
+									</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={8} className="text-center">
+										<TableCell colSpan={6} className="text-center py-10">
-											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
+											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : filteredInquiries.length === 0 ? (
+								) : currentItems.length === 0 ? (
 									<TableRow>
-										<TableCell colSpan={8} className="text-center">
+										<TableCell
+											colSpan={6}
+											className="text-center text-muted-foreground py-10 text-base"
+										>
 											No inquiries found
 										</TableCell>
 									</TableRow>
 								) : (
-									filteredInquiries.map((item) => (
+									currentItems.map((item) => (
-										<TableRow key={item.id}>
+										<TableRow key={item.id} className="hover:bg-muted/50">
-											<TableCell>{item.id}</TableCell>
+											<TableCell className="font-mono text-xs">
-											<TableCell>{item.fullName}</TableCell>
+												{item.id}
-											<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">
+													{item.message || "-"}
+												</div>
+											</TableCell>
+											<TableCell className="text-right">
+												<div className="flex justify-end gap-2">
 													<Button
-													size="sm"
+														size="icon"
-													variant="destructive"
+														variant="ghost"
-													onClick={() => handleDelete(item.id)}>
+														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>
 									))
@@ -160,8 +241,115 @@ 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,6 +19,7 @@ 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,
@@ -37,11 +38,13 @@ 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("");
 
@@ -66,29 +69,28 @@ export default function NewsPage() {
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
-			const res = await getNewsApi();
+			const res = await getNewsApi(currentPage, itemsPerPage);
+
 			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((item) =>
+	const filteredNews = news.filter(
-		item.Headline?.toLowerCase().includes(searchText.toLowerCase()),
+		(item) =>
+			item.Headline?.toLowerCase().includes(searchText.toLowerCase()) ||
+			item.Author?.toLowerCase().includes(searchText.toLowerCase()),
 	);
 
-	const totalPages = Math.ceil(filteredNews.length / itemsPerPage);
+	const totalPages = Math.ceil(totalItems / 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 });
@@ -109,7 +111,6 @@ export default function NewsPage() {
 
 	function openEdit(item: any) {
 		setEditing(item);
-
 		setForm({
 			headline: item.Headline || "",
 			content: item.Content || "",
@@ -118,7 +119,6 @@ export default function NewsPage() {
 			date: item.Date ? item.Date.split("T")[0] : "",
 			author: item.Author || "",
 		});
-
 		setOpenModal(true);
 	}
 
@@ -149,18 +149,17 @@ export default function NewsPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex justify-between items-center flex-wrap gap-3">
+			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
-				<h1 className="text-2xl font-bold">News Media</h1>
+				<h1 className="text-3xl font-bold font-sans tracking-tight">
+					News Media
+				</h1>
 
-				<div className="flex gap-2 flex-wrap items-center">
+				<div className="flex flex-wrap gap-3 items-center">
 					<Input
-						placeholder="Search headline..."
+						placeholder="Filter headline..."
 						value={searchText}
-						onChange={(e) => {
+						onChange={(e) => setSearchText(e.target.value)}
-							setSearchText(e.target.value);
+						className="w-[250px] text-base"
-							setCurrentPage(1);
-						}}
-						className="w-[250px]"
 					/>
 
 					<select
@@ -169,98 +168,131 @@ export default function NewsPage() {
 							setItemsPerPage(Number(e.target.value));
 							setCurrentPage(1);
 						}}
-						className="border px-2 py-1 rounded">
+						className="flex h-10 rounded-md border border-input bg-background px-3 py-2 text-sm focus:ring-2 focus:ring-primary"
+					>
 						<option value={5}>5 / page</option>
 						<option value={10}>10 / page</option>
 						<option value={20}>20 / page</option>
 					</select>
 
-					<Button variant="outline" onClick={fetchAll} disabled={loading}>
+					<Button
-						<RefreshCw className="mr-2 h-4 w-4" />
+						variant="outline"
+						onClick={fetchAll}
+						disabled={loading}
+						className="text-base"
+					>
+						<RefreshCw className="mr-2 h-5 w-5" />
 						Refresh
 					</Button>
 
-					<Button onClick={openAdd}>
+					<Button onClick={openAdd} className="text-base">
-						<Plus className="mr-2 h-4 w-4" />
+						<Plus className="mr-2 h-5 w-5" />
 						Add News
 					</Button>
 				</div>
 			</div>
 
-			<Card>
+			<Card className="shadow-sm">
 				<CardHeader>
-					<CardTitle>News List</CardTitle>
+					<CardTitle className="text-xl">News Archives</CardTitle>
 				</CardHeader>
 
-				<CardContent>
+				<CardContent className="p-0 sm:p-6 space-y-4">
-					<div className="overflow-x-auto">
+					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
-						<Table className="min-w-[900px] table-fixed">
+						<Table className="w-full min-w-[1000px] table-fixed border-separate border-spacing-0">
-							<TableHeader>
+							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
 								<TableRow>
-									<TableHead className="w-[60px]">ID</TableHead>
+									<TableHead className="w-[80px] bg-background font-bold">
-									<TableHead className="w-[220px]">Headline</TableHead>
+										ID
-									<TableHead className="w-[120px]">Author</TableHead>
+									</TableHead>
-									<TableHead className="w-[120px]">Date</TableHead>
+									<TableHead className="w-[280px] bg-background font-bold">
-									<TableHead className="w-[260px]">Content</TableHead>
+										Headline
-									<TableHead className="w-[150px]">Actions</TableHead>
+									</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">
+										<TableCell colSpan={6} className="text-center py-10">
-											<Loader2 className="animate-spin mx-auto" />
+											<Loader2 className="h-8 w-8 animate-spin mx-auto text-primary" />
 										</TableCell>
 									</TableRow>
-								) : paginatedData.length === 0 ? (
+								) : filteredNews.length === 0 ? (
 									<TableRow>
-										<TableCell colSpan={6} className="text-center">
+										<TableCell
-											No news found
+											colSpan={6}
+											className="text-center text-muted-foreground py-10 text-base"
+										>
+											No news articles found
 										</TableCell>
 									</TableRow>
 								) : (
-									paginatedData.map((item) => (
+									filteredNews.map((item) => (
-										<TableRow key={item.Id}>
+										<TableRow key={item.Id} className="hover:bg-muted/50">
-											<TableCell>{item.Id}</TableCell>
+											<TableCell className="font-mono text-xs">
-
+												{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>
-											<TableCell className="break-words whitespace-normal">
+												<div className="text-sm line-clamp-2 text-muted-foreground">
 													{item.Content}
+												</div>
 											</TableCell>
-
+											<TableCell className="text-right">
-											<TableCell className="flex gap-2">
+												<div className="flex justify-end gap-2">
 													<Button
-													size="sm"
+														size="icon"
-													variant="outline"
+														variant="ghost"
-													onClick={() => openView(item)}>
+														className="h-9 w-9"
+														onClick={() => openView(item)}
+													>
 														<Eye className="h-4 w-4" />
 													</Button>
-
 													<Button
-													size="sm"
+														size="icon"
-													variant="outline"
+														variant="ghost"
-													onClick={() => openEdit(item)}>
+														className="h-9 w-9"
+														onClick={() => openEdit(item)}
+													>
 														<Pencil className="h-4 w-4" />
 													</Button>
-
 													<Button
-													size="sm"
+														size="icon"
-													variant="destructive"
+														variant="ghost"
-													onClick={() => handleDelete(Number(item.Id))}>
+														className="h-9 w-9 text-destructive hover:bg-destructive/10"
+														onClick={() => handleDelete(Number(item.Id))}
+													>
 														<Trash className="h-4 w-4" />
 													</Button>
+												</div>
 											</TableCell>
 										</TableRow>
 									))
@@ -269,129 +301,197 @@ export default function NewsPage() {
 						</Table>
 					</div>
 
-					{/* PAGINATION */}
+					{!loading && totalItems > 0 && (
-					<div className="flex justify-between items-center mt-4">
+						<div className="flex items-center justify-between px-2 py-4 border-t">
-						<p className="text-sm">
+							<div className="text-sm text-muted-foreground">
+								Total <span className="font-bold">{totalItems}</span> articles
+								(Page <span className="font-bold">{currentPage}</span> of{" "}
+								{totalPages})
+							</div>
+							<div className="flex items-center gap-6">
+								<div className="text-base font-semibold">
 									Page {currentPage} of {totalPages}
-						</p>
+								</div>
-
 								<div className="flex gap-2">
 									<Button
 										variant="outline"
-								size="sm"
+										size="icon"
+										className="h-10 w-10"
+										onClick={() =>
+											setCurrentPage((prev) => Math.max(prev - 1, 1))
+										}
 										disabled={currentPage === 1}
-								onClick={() => setCurrentPage((p) => p - 1)}>
+									>
-								<ChevronLeft className="h-4 w-4" />
+										<ChevronLeft className="h-5 w-5" />
 									</Button>
-
 									<Button
 										variant="outline"
-								size="sm"
+										size="icon"
-								disabled={currentPage === totalPages}
+										className="h-10 w-10"
-								onClick={() => setCurrentPage((p) => p + 1)}>
+										onClick={() =>
-								<ChevronRight className="h-4 w-4" />
+											setCurrentPage((prev) => Math.min(prev + 1, totalPages))
+										}
+										disabled={currentPage === totalPages || totalPages === 0}
+									>
+										<ChevronRight className="h-5 w-5" />
 									</Button>
 								</div>
 							</div>
+						</div>
+					)}
 				</CardContent>
 			</Card>
 
-			{/* CREATE / EDIT MODAL */}
 			<Dialog open={openModal} onOpenChange={setOpenModal}>
-				<DialogContent className="w-[95vw] max-w-none max-h-[90vh] overflow-y-auto">
+				<DialogContent className="w-full !max-w-5xl max-h-[90vh] overflow-y-auto">
 					<DialogHeader>
-						<DialogTitle>{editing ? "Edit News" : "Add News"}</DialogTitle>
+						<DialogTitle className="text-2xl font-bold">
+							{editing ? "Edit News Article" : "Add New News Article"}
+						</DialogTitle>
 					</DialogHeader>
 
-					<div className="space-y-3">
+					<div className="grid grid-cols-1 md:grid-cols-2 gap-8 mt-6">
+						<div className="space-y-6">
+							<h3 className="font-bold text-base border-b pb-2 text-primary">
+								Article Information
+							</h3>
+							<div className="space-y-4">
+								<div className="space-y-1">
+									<label className="text-sm font-semibold">Headline</label>
 									<Input
 										name="headline"
-							placeholder="Headline"
 										value={form.headline}
 										onChange={handleChange}
+										className="text-base"
 									/>
+								</div>
+								<div className="space-y-1">
+									<label className="text-sm font-semibold">Author</label>
 									<Input
 										name="author"
-							placeholder="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"
-
-						<textarea
-							name="firstPara"
-							placeholder="First Paragraph"
-							value={form.firstPara}
-							onChange={handleChange}
-							className="border rounded p-2 w-full min-h-[100px]"
-						/>
-						<textarea
-							name="secondPara"
-							placeholder="Second Paragraph"
-							value={form.secondPara}
-							onChange={handleChange}
-							className="border rounded p-2 w-full min-h-[100px]"
-						/>
-						<textarea
-							name="content"
-							placeholder="Content"
-							value={form.content}
-							onChange={handleChange}
-							className="border rounded p-2 w-full min-h-[150px]"
 									/>
 								</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>
 
-					<DialogFooter>
+						<div className="space-y-6">
-						<Button variant="outline" onClick={() => setOpenModal(false)}>
+							<h3 className="font-bold text-base border-b pb-2 text-primary">
+								Story Details
+							</h3>
+							<div className="space-y-4">
+								<div className="space-y-1">
+									<label className="text-sm font-semibold">
+										Second Paragraph
+									</label>
+									<Textarea
+										name="secondPara"
+										value={form.secondPara}
+										onChange={handleChange}
+										className="min-h-[140px] text-base"
+									/>
+								</div>
+								<div className="space-y-1">
+									<label className="text-sm font-semibold">Content</label>
+									<Textarea
+										name="content"
+										value={form.content}
+										onChange={handleChange}
+										className="min-h-[200px] text-base"
+									/>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<DialogFooter className="mt-10 pt-6 border-t">
+						<Button
+							variant="ghost"
+							onClick={() => setOpenModal(false)}
+							className="text-base"
+						>
 							Cancel
 						</Button>
-						<Button onClick={handleSubmit}>
+						<Button
-							{editing ? "Update" : "Create"}
+							onClick={handleSubmit}
+							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-[95vw] max-w-none max-h-[90vh] overflow-y-auto p-6">
+				<DialogContent className="w-full !max-w-4xl max-h-[85vh] overflow-y-auto p-6">
 					<DialogHeader>
-						<DialogTitle>News Details</DialogTitle>
+						<DialogTitle className="text-2xl border-b pb-2 flex items-center gap-2">
+							<Newspaper className="h-6 w-6 text-primary" /> News Preview
+						</DialogTitle>
 					</DialogHeader>
 
 					{viewData && (
-						<div className="space-y-4 text-sm">
+						<div className="space-y-6 py-4">
-							<b>Headline:</b>
+							<div className="space-y-2">
-							<p>{viewData.Headline}</p>
+								<h2 className="text-2xl font-bold leading-tight">
-
+									{viewData.Headline}
-							<b>Author:</b>
+								</h2>
-							<p>{viewData.Author}</p>
+								<div className="flex gap-4 text-sm text-muted-foreground font-medium italic">
-
+									<span>By: {viewData.Author || "Anonymous"}</span>
-							<b>Date:</b>
+									<span>•</span>
-							<p>
+									<span>
 										{viewData.Date
-									? new Date(viewData.Date).toLocaleDateString()
+											? new Date(viewData.Date).toLocaleDateString("en-IN", {
-									: "-"}
+													dateStyle: "long",
-							</p>
+												})
+											: "No Date"}
+									</span>
+								</div>
+							</div>
 
-							<b>First Para:</b>
+							<div className="space-y-5 leading-relaxed text-base">
+								<div className="bg-muted/30 p-4 rounded-lg border-l-4 border-primary">
 									<p className="whitespace-pre-line">{viewData.FirstPara}</p>
-
+								</div>
-							<b>Second Para:</b>
+								<div className="space-y-4 px-1">
 									<p className="whitespace-pre-line">{viewData.SecondPara}</p>
-
+									<hr />
-							<b>Content:</b>
+									<p className="whitespace-pre-line text-muted-foreground">
-							<p className="whitespace-pre-line">{viewData.Content}</p>
+										{viewData.Content}
+									</p>
+								</div>
+							</div>
 						</div>
 					)}
 
 					<DialogFooter>
-						<Button onClick={() => setViewOpen(false)}>Close</Button>
+						<Button
+							onClick={() => setViewOpen(false)}
+							className="w-full md:w-auto"
+						>
+							Close Preview
+						</Button>
 					</DialogFooter>
 				</DialogContent>
 			</Dialog>