feat: server-side pagination, search, and date filter for appointments

Reviewed-on: #15

.dockerignore

@@ -0,0 +1,34 @@
+# Include any files or directories that you don't want to be copied to your
+# container here (e.g., local build artifacts, temporary files, etc.).
+#
+# For more help, visit the .dockerignore file reference guide at
+# https://docs.docker.com/go/build-context-dockerignore/
+
+**/.classpath
+**/.dockerignore
+# **/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.next
+**/.cache
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/charts
+**/docker-compose*
+**/compose.y*ml
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+**/build
+**/dist
+LICENSE
+README.md

.gitignore

@@ -0,0 +1 @@
+.env

CLAUDE.md

@@ -0,0 +1,102 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Repository layout
+
+Monorepo with two independent npm packages plus a shared Docker dev stack:
+
+- `backend/` — Node.js + Express 5 (ESM) API, Prisma ORM over PostgreSQL.
+- `frontend/` — React 19 + Vite + TypeScript admin dashboard, styled with Tailwind 4 + shadcn/ui.
+- `docker/` — Dev Dockerfiles + `entrypoint.sh` (used by `docker-compose.dev.yml` at repo root).
+
+There is no root-level package script — run npm commands inside `backend/` or `frontend/`.
+
+## Common commands
+
+### Docker (full stack)
+
+```bash
+docker compose -f docker-compose.dev.yml up --build   # backend :5008, frontend :3008, postgres :5432 (internal)
+docker compose -f docker-compose.dev.yml down
+```
+
+The backend container's `entrypoint.sh` runs `prisma generate` then `prisma db push` (NOT `migrate deploy`) on every start — schema changes propagate without a migration step in the Docker dev flow.
+
+### Backend (`cd backend`)
+
+```bash
+npm run dev          # nodemon src/app.js
+npm start            # node src/app.js
+npm run migrate      # npx prisma migrate dev (use this locally; Docker uses db push)
+npm run generate     # npx prisma generate
+npx prisma studio    # GUI for the DB
+npm run create-user <username> <password> [role]   # role defaults to "admin"
+```
+
+In Docker, create an admin via:
+```bash
+docker exec -it gg-backend-api-backend-1 node src/utils/createUser.js <name> <password> <role>
+```
+
+### Frontend (`cd frontend`)
+
+```bash
+npm run dev      # Vite dev server
+npm run build    # tsc -b && vite build
+npm run lint     # eslint .
+npm run preview
+```
+
+There is no test runner configured in either package.
+
+## Architecture
+
+### Backend
+
+Single Express app assembled in `backend/src/app.js`. Each domain follows the same triplet:
+
+- `src/routes/<domain>.routes.js` — declares the Express router, applies `jwtAuthMiddleware` per-route (mixed public/protected within the same router; see `blog.routes.js` for the pattern: list/detail public, admin endpoints + writes protected).
+- `src/controllers/<domain>.controller.js` — handler logic; uses Prisma directly.
+- Mounted at `/api/<domain>` in `app.js`.
+
+Domains: `departments`, `auth`, `blogs`, `upload`, `doctors`, `careers`, `candidates`, `appointments`, `inquiry`, `academics`, `email`, `newsMedia`, `import`. Static `uploads/` is served at `/uploads`.
+
+Cross-cutting pieces:
+
+- **Prisma client** — `src/prisma/client.js` exports a singleton. Always import from there rather than instantiating `new PrismaClient()` (the import controller currently instantiates its own — match the singleton pattern when adding new code).
+- **Auth** — `src/middleware/auth.js` expects `Authorization: Bearer <jwt>`, attaches the decoded payload to `req.user`. Tokens are issued by `src/utils/jwt.js` using `JWT_SECRET`. Passwords hashed via `src/utils/password.js` (bcrypt).
+- **Email** — `src/utils/sendEmail.js` wraps Postmark with `EMAIL_FROM` as sender. Recipient lists are looked up by category via `getEmailsByType(type)` against the `EmailConfig` table — controllers call this to fan out notifications (e.g. on new appointments/inquiries).
+- **CORS** — `CORS_ALLOWED_ORIGINS` is a **space-separated** list (not comma-separated). Requests with no `Origin` header are allowed.
+- **Body limits** — JSON/urlencoded bodies are capped at 50mb to support image-laden Editor.js payloads and bulk Excel imports.
+
+### Data model (Prisma — `backend/prisma/schema.prisma`)
+
+Note the natural-key relations: `Appointment.doctorId` references `Doctor.doctorId` (the string business ID), not `Doctor.id`. Same for `Department`. The `SL_NO` / `GG_ID` columns from imports become these business IDs. `Doctor` ↔ `Department` is many-to-many through `DoctorDepartment`, which has a 1:1 `DoctorTiming` for weekday schedules. `NewsMedia` has cascading `NewsImage` children.
+
+### Frontend
+
+- Routing in `src/App.tsx`: `PublicRoute` wraps `/` (Login); everything else is wrapped by `ProtectedRoute` → `DashboardLayout`. Unknown paths redirect to `/department`.
+- `src/context/AuthContext.tsx` is the auth source of truth; `src/services/api.ts` is the shared Axios instance that auto-injects `Authorization: Bearer <token>` from `localStorage.getItem("token")`.
+- `src/api/<domain>.ts` files are thin wrappers around that axios client, one per backend domain — keep this pattern when adding endpoints.
+- Path alias `@/*` → `src/*` (configured in both `vite.config.ts` and `tsconfig`).
+- File uploads go through Bytescale (`src/components/BytescaleUploader`) — server only stores the resulting URL.
+- The `/import` page parses Excel via `xlsx` and POSTs structured payloads to `/api/import`, where `importController.js` upserts across multiple tables. When changing import behavior, the frontend's column names (`SL_NO`, `GG_ID`, `Department`, `Working Status`, etc.) and the controller's destructured keys (`departments`, `doctors`, `timings`, …) must stay in sync.
+
+## Environment variables
+
+`backend/.env`:
+```
+DATABASE_URL=postgresql://user:password@db:5432/mydb
+PORT=5008
+JWT_SECRET=...
+CORS_ALLOWED_ORIGINS=http://localhost:5173      # space-separated for multiple
+BYTESCALE_SECRET_API_KEY=...
+POSTMARK_API_KEY=...
+EMAIL_FROM=admin@example.com
+```
+
+`frontend/.env`:
+```
+VITE_API_URL=http://localhost:5008/api
+```

README.md

@@ -0,0 +1,94 @@
+# Docker Setup (Backend + Frontend + PostgreSQL)
+
+This project provides a complete development environment using **Docker Compose** for:
+
+- Backend (Node.js / Express / Prisma)
+- Frontend (Vite / React)
+- PostgreSQL Database
+
+---
+
+## Project Structure
+
+```
+.
+├── backend/
+├── frontend/
+├── docker/
+│   └── dev/
+│       ├── Dockerfile.main
+│       └── Dockerfile.frontend
+├── docker-compose.dev.yml
+```
+
+---
+
+## Prerequisites
+
+Make sure you have installed:
+
+- Docker
+- Docker Compose
+
+---
+
+## Environment Variables
+
+### Backend (`backend/.env`)
+
+```env
+DATABASE_URL=postgresql://user:password@db:5432/mydb
+PORT=5008
+JWT_SECRET=your_secret_here
+
+CORS_ALLOWED_ORIGINS=http://localhost:5173
+
+BYTESCALE_SECRET_API_KEY=your_key
+POSTMARK_API_KEY=your_key
+EMAIL_FROM=admin@example.com
+```
+
+### Frontend (`frontend/.env`)
+
+```env
+VITE_API_URL=http://localhost:5008/api
+```
+
+---
+
+## Running the Project
+
+### Start containers
+
+```bash
+docker compose -f docker-compose.dev.yml up --build
+```
+
+## Create User
+
+```bash
+docker exec -it gg-backend-api-backend-1 node src/utils/createUser.js <name> <password> <role>
+
+```
+
+---
+
+### Stop containers
+
+```bash
+docker compose -f docker-compose.dev.yml down
+```
+
+---
+
+## Database (PostgreSQL)
+
+- User: `user`
+- Password: `password`
+- DB: `mydb`
+
+Data is persisted using Docker volume:
+
+```
+postgres_data
+```

backend/.gitignore

@@ -1,5 +1,5 @@
 node_modules
 # Keep environment variables out of version control
-.env
+.env*
 
 /src/generated/prisma

backend/README.md

@@ -32,7 +32,7 @@ PostgreSQL Database
 
 **2. Environment Variables**
 DATABASE_URL=""
-PORT=3000
+PORT=5008
 JWT_SECRET=""
 CORS_ALLOWED_ORIGINS=http://localhost:3001 http://localhost:3003 http://localhost:5174 http://localhost:5173
 BYTESCALE_SECRET_API_KEY=""

backend/package.json

@@ -8,7 +8,8 @@
 		"start": "node src/app.js",
 		"prisma": "prisma",
 		"migrate": "npx prisma migrate dev",
-		"generate": "npx prisma generate"
+		"generate": "npx prisma generate",
+		"create-user": "node src/utils/createUser.js"
 	},
 	"keywords": [],
 	"author": "",

backend/src/app.js

@@ -56,7 +56,7 @@ app.use("/api/email", emailConfigRoutes);
 app.use("/api/newsMedia", newsMediaRoutes);
 app.use("/api/import", importRoutes);
 
-const PORT = process.env.PORT || 3000;
+const PORT = process.env.PORT || 5008;
 app.listen(PORT, () => {
 	console.log(`Server running on port ${PORT}`);
 });

backend/src/controllers/appointment.controller.js

@@ -1,10 +1,10 @@
 import prisma from "../prisma/client.js";
-import {sendEmail} from "../utils/sendEmail.js";
-import {getEmailsByType} from "../utils/getEmailByTypes.js";
+import { sendEmail } from "../utils/sendEmail.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,26 +71,49 @@ export const createAppointment = async (req, res) => {
 
 export const getAppointments = async (req, res) => {
 	try {
-		const appointments = await prisma.appointment.findMany({
-			include: {
-				doctor: true,
-				department: true,
-			},
-			orderBy: {
-				createdAt: "desc",
-			},
-		});
+		const page = parseInt(req.query.page) || 1;
+		const limit = parseInt(req.query.limit) || 10;
+		const skip = (page - 1) * limit;
+		const { date, search } = req.query;
+
+		const where = {};
+
+		if (date) {
+			const start = new Date(date);
+			const end = new Date(date);
+			end.setDate(end.getDate() + 1);
+			where.date = { gte: start, lt: end };
+		}
+
+		if (search) {
+			where.OR = [
+				{ name: { contains: search, mode: "insensitive" } },
+				{ mobileNumber: { contains: search } },
+				{ email: { contains: search, mode: "insensitive" } },
+			];
+		}
+
+		const [appointments, total] = await Promise.all([
+			prisma.appointment.findMany({
+				where,
+				include: { doctor: true, department: true },
+				orderBy: { createdAt: "desc" },
+				skip,
+				take: limit,
+			}),
+			prisma.appointment.count({ where }),
+		]);
 
 		res.status(200).json({
 			success: true,
 			data: appointments,
+			pagination: { total, page, limit, totalPages: Math.ceil(total / limit) },
 		});
 	} catch (error) {
 		console.error(error);
-		res.status(500).json({
-			success: false,
-			message: "Failed to fetch appointments",
-		});
+		res
+			.status(500)
+			.json({ success: false, message: "Failed to fetch appointments" });
 	}
 };
 
@@ -98,7 +121,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: {
@@ -134,7 +157,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: {
@@ -166,7 +189,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: {
@@ -195,7 +218,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: {
@@ -226,7 +249,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: {

backend/src/controllers/importController.js

@@ -200,22 +200,59 @@ export const bulkImportExcelData = async (req, res) => {
 		if (appointments) {
 			for (const row of appointments) {
 				if (!row.FullName) continue;
-				const docId = row.Doctor?.toString();
-				const deptId = row["Department Id"]?.toString();
-				if (docId && deptId) {
-					await prisma.appointment
-						.create({
-							data: {
-								name: row.FullName.toString(),
-								mobileNumber: row.Number?.toString() || "",
-								email: row["Email Id"]?.toString() || null,
-								message: row.Message?.toString() || null,
-								date: row.Date ? new Date(row.Date) : new Date(),
-								doctorId: docId,
-								departmentId: deptId,
-							},
-						})
-						.catch(() => {});
+				const doctorName = row.Doctor?.toString();
+				const departmentName = row["Department Id"]?.toString();
+
+				const doctor = await prisma.doctor.findFirst({
+					where: { name: doctorName },
+				});
+
+				const department = await prisma.department.findFirst({
+					where: { name: departmentName },
+				});
+				const parseDate = (value) => {
+					if (!value) return new Date();
+
+					// Excel numeric date
+					if (typeof value === "number") {
+						return new Date((value - 25569) * 86400 * 1000);
+					}
+
+					if (typeof value === "string") {
+						const v = value.trim();
+
+						// Handle DD/MM/YYYY
+						const ddmmyyyy = /^(\d{2})\/(\d{2})\/(\d{4})$/;
+						const match = v.match(ddmmyyyy);
+
+						if (match) {
+							const [_, dd, mm, yyyy] = match;
+							return new Date(`${yyyy}-${mm}-${dd}`);
+						}
+
+						// Fallback (ISO or other valid formats)
+						const d = new Date(v);
+
+						if (!isNaN(d.getTime()) && d.getFullYear() < 2100) {
+							return d;
+						}
+					}
+
+					console.warn("⚠️ Invalid date, using current date:", value);
+					return new Date();
+				};
+				if (doctor && department) {
+					await prisma.appointment.create({
+						data: {
+							name: row.FullName.toString(),
+							mobileNumber: row.Number?.toString() || "",
+							email: row["Email Id"]?.toString() || null,
+							message: row.Message?.toString() || null,
+							date: parseDate(row.Date),
+							doctorId: doctor.doctorId,
+							departmentId: department.departmentId,
+						},
+					});
 				}
 			}
 		}

backend/src/routes/auth.routes.js

@@ -1,9 +1,8 @@
 import express from "express";
-import {register, login} from "../controllers/auth.controller.js";
+import { login } from "../controllers/auth.controller.js";
 
 const router = express.Router();
 
-router.post("/register", register);
 router.post("/login", login);
 
 export default router;

backend/src/utils/createUser.js

@@ -0,0 +1,47 @@
+import prisma from "../prisma/client.js";
+import { hashPassword } from "./password.js";
+async function main() {
+	const username = process.argv[2];
+	const password = process.argv[3];
+	const role = process.argv[4] || "admin";
+
+	if (!username || !password) {
+		console.log(
+			"Usage: node scripts/createUser.js <username> <password> [role]",
+		);
+		process.exit(1);
+	}
+
+	const existingUser = await prisma.user.findUnique({
+		where: { username },
+	});
+
+	if (existingUser) {
+		console.log("User already exists");
+		process.exit(1);
+	}
+
+	const hashedPassword = await hashPassword(password);
+
+	const user = await prisma.user.create({
+		data: {
+			username,
+			password: hashedPassword,
+			role,
+		},
+	});
+
+	console.log("User created:", {
+		id: user.id,
+		username: user.username,
+		role: user.role,
+	});
+}
+
+main()
+	.catch((e) => {
+		console.error(e);
+	})
+	.finally(async () => {
+		await prisma.$disconnect();
+	});

docker-compose.dev.yml

@@ -0,0 +1,44 @@
+version: "3.8"
+
+services:
+ backend:
+  build:
+   context: .
+   dockerfile: docker/dev/Dockerfile.main
+  ports:
+   - "127.0.0.1:5008:5008"
+  env_file:
+   - ./backend/.env
+  depends_on:
+   db:
+    condition: service_healthy
+  restart: unless-stopped
+
+ frontend:
+  build:
+   context: .
+   dockerfile: docker/dev/Dockerfile.frontend
+  ports:
+   - "127.0.0.1:3008:3000"
+  env_file:
+   - ./frontend/.env
+  restart: unless-stopped
+
+ db:
+  image: postgres:16-alpine
+  container_name: postgres_db
+  environment:
+   - POSTGRES_USER=${POSTGRES_USER}
+   - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+   - POSTGRES_DB=${POSTGRES_DB}
+  volumes:
+   - postgres_data:/var/lib/postgresql/data
+  healthcheck:
+   test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+   interval: 5s
+   timeout: 5s
+   retries: 5
+  restart: unless-stopped
+
+volumes:
+ postgres_data:

docker/dev/Dockerfile.frontend

@@ -0,0 +1,19 @@
+ARG NODE_VERSION=24.15.0
+FROM node:${NODE_VERSION}-alpine
+
+WORKDIR /usr/src/app
+
+COPY ./frontend/package*.json ./
+RUN npm ci
+
+COPY ./frontend .
+
+# Build the app
+RUN npm run build
+
+RUN npm install -g serve
+
+EXPOSE 3000
+
+# Serve built app
+CMD ["serve", "-s", "dist"]

docker/dev/Dockerfile.main

@@ -0,0 +1,24 @@
+ARG NODE_VERSION=24.15.0
+FROM node:${NODE_VERSION}-alpine
+
+WORKDIR /usr/src/app
+
+# Use cache mounts for faster installs
+RUN --mount=type=bind,source=backend/package.json,target=package.json \
+    --mount=type=bind,source=backend/package-lock.json,target=package-lock.json \
+    --mount=type=cache,target=/root/.npm \
+    npm ci
+
+# Copy the backend source
+COPY ./backend .
+
+# Copy and setup entrypoint
+COPY ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+EXPOSE 5008
+
+ENTRYPOINT [ "entrypoint.sh" ]
+
+# This '$@' will be replaced by the CMD
+CMD ["npm", "start"]

docker/entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e  # Exit immediately if a command exits with a non-zero status
+
+echo "Generating Prisma Client..."
+npx prisma generate
+
+# echo "Running migrate..."
+# npx prisma migrate deploy
+echo "Running PUSH..."
+npx prisma db push
+
+echo "Executing command: $@"
+exec "$@"
+

frontend/.gitignore

@@ -24,6 +24,6 @@ dist-ssr
 *.sw?
 
 #env files
-.env
+.env*
 .env.*.local
 

frontend/README.md

@@ -33,7 +33,7 @@ frontend/
 Node.js (v20+)
 
 **2. Environment Variables**
-VITE_API_URL="http://localhost:3000/api"
+VITE_API_URL="http://localhost:5008/api"
 
 **3. Install Dependencies**
 npm install

frontend/index.html

@@ -1,13 +1,13 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>frontend</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
+	<head>
+		<meta charset="UTF-8" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>GG Admin Dashboard</title>
+	</head>
+	<body>
+		<div id="root"></div>
+		<script type="module" src="/src/main.tsx"></script>
+	</body>
 </html>

frontend/package-lock.json

@@ -8,7 +8,6 @@
       "name": "frontend",
       "version": "0.0.0",
       "dependencies": {
-        "@bytescale/sdk": "^3.53.0",
         "@editorjs/code": "^2.9.4",
         "@editorjs/delimiter": "^1.4.2",
         "@editorjs/editorjs": "^2.31.5",
@@ -525,12 +524,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@bytescale/sdk": {
-      "version": "3.53.0",
-      "resolved": "https://registry.npmjs.org/@bytescale/sdk/-/sdk-3.53.0.tgz",
-      "integrity": "sha512-qCeNup3pSjaklXuBrO9JeKbozZEs/PjQEvuqCiOAWLBRl6lDjd0V9gRVYqyttPimXYFoV+J/7dmPWtK6RfOABQ==",
-      "license": "MIT"
-    },
     "node_modules/@codexteam/icons": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@codexteam/icons/-/icons-0.3.3.tgz",

frontend/package.json

@@ -10,7 +10,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@bytescale/sdk": "^3.53.0",
     "@editorjs/code": "^2.9.4",
     "@editorjs/delimiter": "^1.4.2",
     "@editorjs/editorjs": "^2.31.5",

frontend/public/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

frontend/src/api/appointment.ts

@@ -1,7 +1,18 @@
 import apiClient from "@/api/client";
 
-export const getAppointmentsApi = async () => {
-	const res = await apiClient.get("/appointments/getall");
+export const getAppointmentsApi = async (
+	page = 1,
+	limit = 10,
+	date = "",
+	search = "",
+) => {
+	const params = new URLSearchParams({
+		page: String(page),
+		limit: String(limit),
+		...(date && { date }),
+		...(search && { search }),
+	});
+	const res = await apiClient.get(`/appointments/getall?${params}`);
 	return res.data;
 };
 

frontend/src/pages/Appointment.tsx

@@ -45,52 +45,46 @@ export default function AppointmentPage() {
 	const [viewData, setViewData] = useState<any>(null);
 
 	const [currentPage, setCurrentPage] = useState(1);
-	const itemsPerPage = 10;
+	const [totalPages, setTotalPages] = useState(1);
+	const [totalItems, setTotalItems] = useState(0);
+	const [itemsPerPage, setItemsPerPage] = useState(10);
 
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
-			const res = await getAppointmentsApi();
+			const res = await getAppointmentsApi(
+				currentPage,
+				itemsPerPage,
+				filterDate,
+				searchText,
+			);
 			setAppointments(res?.data || []);
+			setTotalPages(res?.pagination?.totalPages || 1);
+			setTotalItems(res?.pagination?.total || 0);
 		} catch (err) {
 			console.error(err);
 		} finally {
 			setLoading(false);
 		}
-	}, []);
+	}, [currentPage, itemsPerPage, filterDate, searchText]);
 
 	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;
+		return matchesDoctor;
 	});
 
 	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,
-	);
+	const indexOfFirstItem = (currentPage - 1) * itemsPerPage;
 
 	function openView(item: any) {
 		setViewData(item);
@@ -126,17 +120,36 @@ export default function AppointmentPage() {
 					<Input
 						placeholder="Search name / phone..."
 						value={searchText}
-						onChange={(e) => setSearchText(e.target.value)}
+						onChange={(e) => {
+							setSearchText(e.target.value);
+							setCurrentPage(1);
+						}}
 						className="w-[220px] text-base"
 					/>
 
 					<Input
 						type="date"
 						value={filterDate}
-						onChange={(e) => setFilterDate(e.target.value)}
+						onChange={(e) => {
+							setFilterDate(e.target.value);
+							setCurrentPage(1);
+						}}
 						className="w-[160px] text-base"
 					/>
 
+					<select
+						value={itemsPerPage}
+						onChange={(e) => {
+							setItemsPerPage(Number(e.target.value));
+							setCurrentPage(1);
+						}}
+						className="flex h-10 rounded-md border border-input bg-background px-3 py-2 text-sm focus:ring-2 focus:ring-primary"
+					>
+						<option value={5}>5 / page</option>
+						<option value={10}>10 / page</option>
+						<option value={20}>20 / page</option>
+					</select>
+
 					<Button
 						variant="outline"
 						onClick={fetchAll}
@@ -192,7 +205,7 @@ export default function AppointmentPage() {
 											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
-								) : currentItems.length === 0 ? (
+								) : filteredAppointments.length === 0 ? (
 									<TableRow>
 										<TableCell
 											colSpan={6}
@@ -202,7 +215,7 @@ export default function AppointmentPage() {
 										</TableCell>
 									</TableRow>
 								) : (
-									currentItems.map((item) => (
+									filteredAppointments.map((item) => (
 										<TableRow key={item.id} className="hover:bg-muted/50">
 											<TableCell className="font-mono text-xs">
 												{item.id}
@@ -260,18 +273,15 @@ export default function AppointmentPage() {
 						</Table>
 					</div>
 
-					{!loading && filteredAppointments.length > 0 && (
+					{!loading && totalItems > 0 && (
 						<div className="flex items-center justify-between px-2 py-6 border-t">
 							<div className="text-base text-muted-foreground">
 								Showing{" "}
 								<span className="font-semibold">{indexOfFirstItem + 1}</span> to{" "}
 								<span className="font-semibold">
-									{Math.min(indexOfLastItem, filteredAppointments.length)}
+									{Math.min(currentPage * itemsPerPage, totalItems)}
 								</span>{" "}
-								of{" "}
-								<span className="font-semibold">
-									{filteredAppointments.length}
-								</span>
+								of <span className="font-semibold">{totalItems}</span>
 							</div>
 							<div className="flex items-center gap-6">
 								<div className="text-base font-semibold">