Merge pull request '[1.0.4]' (#29) from dev into main

Reviewed-on: #29

.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
+```

Jenkinsfile

@@ -0,0 +1,221 @@
+// Single source of truth for env injection.
+// Adding/removing a variable means editing one `keys` list — nothing else.
+// `path` is the Vault KV path; `file` is the output path relative to ${WORKSPACE}.
+def ENV_LAYOUT = [
+    [path: 'ggh-dev/root', file: '.env', keys: [
+        'POSTGRES_DB', 'POSTGRES_PASSWORD', 'POSTGRES_USER',
+    ]],
+    [path: 'ggh-dev/backend', file: 'backend/.env', keys: [
+        'BYTESCALE_SECRET_API_KEY',
+        'CORS_ALLOWED_ORIGINS',
+        'DATABASE_URL',
+        'EMAIL_FROM',
+        'JWT_SECRET',
+        'PORT',
+        'POSTMARK_API_KEY',
+    ]],
+    [path: 'ggh-dev/dashboard-frontend', file: 'frontend/.env', keys: [
+        'VITE_API_URL',
+    ]],
+]
+
+pipeline {
+    agent { label 'jagent06' }
+
+    options {
+        disableConcurrentBuilds()
+    }
+
+    triggers {
+        GenericTrigger(
+            causeString: 'Triggered by Gitea webhook',
+            tokenCredentialId: 'ggh-dev',
+            printContributedVariables: true,
+            printPostContent: true
+        )
+    }
+
+    environment {
+        DOCKER_COMPOSE_FILE = "${WORKSPACE}/docker-compose.dev.yml"
+        DOCKER_BUILDKIT = '1'
+        COMPOSE_DOCKER_CLI_BUILD = '1'
+    }
+
+    stages {
+        stage('Checkout Code') {
+            steps {
+                checkout([
+                    $class: 'GitSCM',
+                    branches: [[name: '*/dev']],
+                    userRemoteConfigs: [[
+                        url: 'https://gt.mgsigma.net/GGH/gg-backend.git',
+                        credentialsId: 'SYS_BOT_PAT'
+                    ]]
+                ])
+            }
+        }
+
+        stage('Inject .env from Vault') {
+            steps {
+                script {
+                    def vaultSecrets = ENV_LAYOUT.collect { layer ->
+                        [
+                            path: layer.path,
+                            engineVersion: 2,
+                            secretValues: layer.keys.collect { k ->
+                                [vaultKey: k, envVar: k]
+                            }
+                        ]
+                    }
+
+                    def writtenFiles = ENV_LAYOUT.collect { it.file }.join(', ')
+
+                    withVault(
+                        configuration: [
+                            vaultUrl: 'https://vault.mgsigma.net',
+                            vaultCredentialId: 'vault-cicd-01'
+                        ],
+                        vaultSecrets: vaultSecrets
+                    ) {
+                        // Single-quoted sh + withEnv keeps secret names out of the
+                        // Groovy GString. Values are read at shell runtime via
+                        // `printenv`, so Jenkins's static analyzer has nothing to flag.
+                        ENV_LAYOUT.each { layer ->
+                            withEnv([
+                                "ENV_FILE=${layer.file}",
+                                "ENV_KEYS=${layer.keys.join(' ')}"
+                            ]) {
+                                sh '''
+                                    set +x
+                                    umask 077
+                                    mkdir -p "$(dirname "$WORKSPACE/$ENV_FILE")"
+                                    : > "$WORKSPACE/$ENV_FILE"
+                                    for k in $ENV_KEYS; do
+                                        printf '%s=%s\n' "$k" "$(printenv "$k")" >> "$WORKSPACE/$ENV_FILE"
+                                    done
+                                '''
+                            }
+                        }
+                        echo "[INFO] env files written: ${writtenFiles}"
+                    }
+                }
+            }
+        }
+
+        stage('Deploy') {
+            steps {
+                script {
+                    if (!fileExists(env.DOCKER_COMPOSE_FILE)) {
+                        error "docker-compose.dev.yml not found at ${env.DOCKER_COMPOSE_FILE}"
+                    }
+                }
+                sh '''
+                    set -e
+
+                    if [ -n "$(docker compose -f docker-compose.dev.yml ps -q 2>/dev/null)" ]; then
+                        echo "[INFO] Stopping existing containers..."
+                        docker compose -f docker-compose.dev.yml down --remove-orphans
+                    else
+                        echo "[INFO] No running containers — skipping stop."
+                    fi
+
+                    # Dangling-only prune — keeps tagged images and BuildKit cache so
+                    # subsequent builds reuse layers. Do NOT use `docker system prune -af`.
+                    docker image prune -f >/dev/null 2>&1 || true
+
+                    echo "[INFO] Building and starting services..."
+                    docker compose -f docker-compose.dev.yml up -d --build --remove-orphans
+                '''
+            }
+        }
+    }
+
+    post {
+        always {
+            script {
+                env.BUILD_INFO_HASH = sh(
+                    script: "git rev-parse --short HEAD 2>/dev/null || echo N/A",
+                    returnStdout: true
+                ).trim()
+                env.BUILD_INFO_AUTHOR = sh(
+                    script: "git log -1 --pretty=format:'%an' 2>/dev/null || echo N/A",
+                    returnStdout: true
+                ).trim()
+                env.BUILD_INFO_MESSAGE = sh(
+                    script: "git log -1 --pretty=format:'%s' 2>/dev/null || echo 'No commit message found'",
+                    returnStdout: true
+                ).trim()
+
+                def cause = currentBuild.getBuildCauses()?.getAt(0)?.shortDescription ?: 'Unknown'
+                env.BUILD_INFO_TRIGGER = cause.contains('Started by user') ? 'Manual trigger' : cause
+            }
+        }
+        success {
+            script {
+                emailext(
+                    subject: "[DEV] ${env.JOB_NAME} #${env.BUILD_NUMBER} succeeded",
+                    body: renderEmail('Build succeeded', '#16a34a', buildInfo()),
+                    mimeType: 'text/html',
+                    to: 'admin@msigmagokulam.com, ashir@mgsigma.net, kailasdevdas@msigmagokulam.com'
+                )
+            }
+        }
+        failure {
+            script {
+                emailext(
+                    subject: "[DEV] ${env.JOB_NAME} #${env.BUILD_NUMBER} failed",
+                    body: renderEmail('Build failed', '#dc2626', buildInfo()),
+                    mimeType: 'text/html',
+                    to: 'admin@msigmagokulam.com, ashir@mgsigma.net, kailasdevdas@msigmagokulam.com'
+                )
+            }
+        }
+    }
+}
+
+def buildInfo() {
+    return [
+        hash:     env.BUILD_INFO_HASH ?: 'N/A',
+        author:   env.BUILD_INFO_AUTHOR ?: 'N/A',
+        message:  env.BUILD_INFO_MESSAGE ?: 'N/A',
+        trigger:  env.BUILD_INFO_TRIGGER ?: 'Unknown',
+        duration: currentBuild.durationString.replace(' and counting', '')
+    ]
+}
+
+def renderEmail(String label, String accent, Map info) {
+    return """\
+<!DOCTYPE html>
+<html>
+<body style="margin:0; padding:0; background-color:#f6f7f9;">
+<table role="presentation" cellpadding="0" cellspacing="0" border="0" width="100%" style="background-color:#f6f7f9; padding:40px 16px;">
+  <tr><td align="center">
+    <table role="presentation" cellpadding="0" cellspacing="0" border="0" width="560" style="max-width:560px; background:#ffffff; border-radius:12px; overflow:hidden; box-shadow:0 1px 3px rgba(15,23,42,0.08); font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;">
+      <tr><td style="height:3px; background:${accent};"></td></tr>
+      <tr><td style="padding:32px 40px 0 40px;">
+        <div style="font-size:12px; font-weight:600; color:${accent}; letter-spacing:0.8px; text-transform:uppercase; margin-bottom:6px;">${label} · development</div>
+        <div style="font-size:20px; font-weight:600; color:#0f172a; line-height:1.35;">${env.JOB_NAME}<span style="color:#94a3b8; font-weight:400;"> &middot; #${env.BUILD_NUMBER}</span></div>
+      </td></tr>
+      <tr><td style="padding:20px 40px 8px 40px;">
+        <table role="presentation" cellpadding="0" cellspacing="0" border="0" width="100%" style="font-size:14px; color:#0f172a;">
+          <tr><td width="110" style="padding:7px 0; color:#64748b;">Commit</td><td style="padding:7px 0; font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace; font-size:13px;">${info.hash}</td></tr>
+          <tr><td style="padding:7px 0; color:#64748b;">Author</td><td style="padding:7px 0;">${info.author}</td></tr>
+          <tr><td style="padding:7px 0; color:#64748b; vertical-align:top;">Message</td><td style="padding:7px 0;">${info.message}</td></tr>
+          <tr><td style="padding:7px 0; color:#64748b;">Triggered by</td><td style="padding:7px 0;">${info.trigger}</td></tr>
+          <tr><td style="padding:7px 0; color:#64748b;">Duration</td><td style="padding:7px 0;">${info.duration}</td></tr>
+        </table>
+      </td></tr>
+      <tr><td style="padding:20px 40px 32px 40px;">
+        <a href="${env.BUILD_URL}" style="display:inline-block; padding:10px 18px; background:#0f172a; color:#ffffff; text-decoration:none; border-radius:8px; font-size:14px; font-weight:500;">View build</a>
+        <a href="${env.BUILD_URL}console" style="display:inline-block; padding:10px 14px; color:#475569; text-decoration:none; font-size:14px; font-weight:500;">Console output &rarr;</a>
+      </td></tr>
+      <tr><td style="padding:14px 40px; background:#f8fafc; border-top:1px solid #e2e8f0; font-size:12px; color:#94a3b8;">
+        Automated notification from Jenkins
+      </td></tr>
+    </table>
+  </td></tr>
+</table>
+</body>
+</html>
+"""
+}

Jenkinsfile.prod

@@ -0,0 +1,224 @@
+// Single source of truth for env injection.
+// Adding/removing a variable means editing one `keys` list — nothing else.
+// `path` is the Vault KV path; `file` is the output path relative to ${WORKSPACE}.
+def ENV_LAYOUT = [
+    [path: 'ggh-prod/root', file: '.env', keys: [
+        'POSTGRES_DB', 'POSTGRES_PASSWORD', 'POSTGRES_USER',
+    ]],
+    [path: 'ggh-prod/backend', file: 'backend/.env', keys: [
+        'BYTESCALE_SECRET_API_KEY',
+        'CORS_ALLOWED_ORIGINS',
+        'DATABASE_URL',
+        'EMAIL_FROM',
+        'JWT_SECRET',
+        'PORT',
+        'POSTMARK_API_KEY',
+    ]],
+    [path: 'ggh-prod/dashboard-frontend', file: 'frontend/.env', keys: [
+        'VITE_API_URL',
+    ]],
+]
+
+pipeline {
+    agent {
+        label 'jagent06'
+    }
+
+    options {
+        disableConcurrentBuilds()
+    }
+
+    environment {
+        REMOTE_HOST       = "root@170.187.237.83"
+        REMOTE_DEPLOY_DIR = "/root/gg-backend"
+        SSH_CREDENTIALS_ID = "ssh_id_ed25519"
+        COMPOSE_FILE      = "docker-compose.prod.yml"
+    }
+
+    stages {
+        stage('Checkout Code') {
+            steps {
+                git credentialsId: 'SYS_BOT_PAT', url: 'https://gt.mgsigma.net/GGH/gg-backend.git', branch: 'main'
+            }
+        }
+
+        stage('Inject .env from Vault') {
+            steps {
+                script {
+                    def vaultSecrets = ENV_LAYOUT.collect { layer ->
+                        [
+                            path: layer.path,
+                            engineVersion: 2,
+                            secretValues: layer.keys.collect { k ->
+                                [vaultKey: k, envVar: k]
+                            }
+                        ]
+                    }
+
+                    def writtenFiles = ENV_LAYOUT.collect { it.file }.join(', ')
+
+                    withVault(
+                        configuration: [
+                            vaultUrl: 'https://vault.mgsigma.net',
+                            vaultCredentialId: 'vault-cicd-01'
+                        ],
+                        vaultSecrets: vaultSecrets
+                    ) {
+                        // Single-quoted sh + withEnv keeps secret names out of the
+                        // Groovy GString. Values are read at shell runtime via
+                        // `printenv`, so Jenkins's static analyzer has nothing to flag.
+                        ENV_LAYOUT.each { layer ->
+                            withEnv([
+                                "ENV_FILE=${layer.file}",
+                                "ENV_KEYS=${layer.keys.join(' ')}"
+                            ]) {
+                                sh '''
+                                    set +x
+                                    umask 077
+                                    mkdir -p "$(dirname "$WORKSPACE/$ENV_FILE")"
+                                    : > "$WORKSPACE/$ENV_FILE"
+                                    for k in $ENV_KEYS; do
+                                        printf '%s=%s\n' "$k" "$(printenv "$k")" >> "$WORKSPACE/$ENV_FILE"
+                                    done
+                                '''
+                            }
+                        }
+                        echo "[INFO] env files written: ${writtenFiles}"
+                    }
+                }
+            }
+        }
+
+        stage('Sync sources to prod VPS') {
+            steps {
+                sshagent (credentials: ["${env.SSH_CREDENTIALS_ID}"]) {
+                    sh """
+                        ssh -o StrictHostKeyChecking=no $REMOTE_HOST 'mkdir -p $REMOTE_DEPLOY_DIR'
+                        rsync -az --delete \\
+                            --exclude='.git/' \\
+                            --exclude='node_modules/' \\
+                            --exclude='backend/node_modules/' \\
+                            --exclude='frontend/node_modules/' \\
+                            --exclude='frontend/dist/' \\
+                            -e "ssh -o StrictHostKeyChecking=no" \\
+                            ./ $REMOTE_HOST:$REMOTE_DEPLOY_DIR/
+                    """
+                }
+            }
+        }
+
+        stage('Deploy on prod VPS') {
+            steps {
+                sshagent (credentials: ["${env.SSH_CREDENTIALS_ID}"]) {
+                    sh """
+                        ssh -o StrictHostKeyChecking=no $REMOTE_HOST '
+                            set -e
+                            cd $REMOTE_DEPLOY_DIR
+
+                            if [ -n "\$(docker compose -f $COMPOSE_FILE ps -q 2>/dev/null)" ]; then
+                                echo "[INFO] Stopping existing containers..."
+                                docker compose -f $COMPOSE_FILE down --remove-orphans
+                            else
+                                echo "[INFO] No running containers — skipping stop."
+                            fi
+
+                            docker image prune -f >/dev/null 2>&1 || true
+
+                            echo "[INFO] Building and starting services..."
+                            docker compose -f $COMPOSE_FILE up -d --build --remove-orphans
+                        '
+                    """
+                }
+            }
+        }
+    }
+
+    post {
+        always {
+            script {
+                env.BUILD_INFO_HASH = sh(
+                    script: "git rev-parse --short HEAD 2>/dev/null || echo N/A",
+                    returnStdout: true
+                ).trim()
+                env.BUILD_INFO_AUTHOR = sh(
+                    script: "git log -1 --pretty=format:'%an' 2>/dev/null || echo N/A",
+                    returnStdout: true
+                ).trim()
+                env.BUILD_INFO_MESSAGE = sh(
+                    script: "git log -1 --pretty=format:'%s' 2>/dev/null || echo 'No commit message found'",
+                    returnStdout: true
+                ).trim()
+
+                def cause = currentBuild.getBuildCauses()?.getAt(0)?.shortDescription ?: 'Unknown'
+                env.BUILD_INFO_TRIGGER = cause.contains('Started by user') ? 'Manual trigger' : cause
+            }
+        }
+        success {
+            script {
+                emailext(
+                    subject: "[PROD] ${env.JOB_NAME} #${env.BUILD_NUMBER} succeeded",
+                    body: renderEmail('Build succeeded', '#16a34a', buildInfo()),
+                    mimeType: 'text/html',
+                    to: 'admin@msigmagokulam.com, ashir@mgsigma.net, kailasdevdas@msigmagokulam.com'
+                )
+            }
+        }
+        failure {
+            script {
+                emailext(
+                    subject: "[PROD] ${env.JOB_NAME} #${env.BUILD_NUMBER} failed",
+                    body: renderEmail('Build failed', '#dc2626', buildInfo()),
+                    mimeType: 'text/html',
+                    to: 'admin@msigmagokulam.com, ashir@mgsigma.net, kailasdevdas@msigmagokulam.com'
+                )
+            }
+        }
+    }
+}
+
+def buildInfo() {
+    return [
+        hash:     env.BUILD_INFO_HASH ?: 'N/A',
+        author:   env.BUILD_INFO_AUTHOR ?: 'N/A',
+        message:  env.BUILD_INFO_MESSAGE ?: 'N/A',
+        trigger:  env.BUILD_INFO_TRIGGER ?: 'Unknown',
+        duration: currentBuild.durationString.replace(' and counting', '')
+    ]
+}
+
+def renderEmail(String label, String accent, Map info) {
+    return """\
+<!DOCTYPE html>
+<html>
+<body style="margin:0; padding:0; background-color:#f6f7f9;">
+<table role="presentation" cellpadding="0" cellspacing="0" border="0" width="100%" style="background-color:#f6f7f9; padding:40px 16px;">
+  <tr><td align="center">
+    <table role="presentation" cellpadding="0" cellspacing="0" border="0" width="560" style="max-width:560px; background:#ffffff; border-radius:12px; overflow:hidden; box-shadow:0 1px 3px rgba(15,23,42,0.08); font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;">
+      <tr><td style="height:3px; background:${accent};"></td></tr>
+      <tr><td style="padding:32px 40px 0 40px;">
+        <div style="font-size:12px; font-weight:600; color:${accent}; letter-spacing:0.8px; text-transform:uppercase; margin-bottom:6px;">${label} · production</div>
+        <div style="font-size:20px; font-weight:600; color:#0f172a; line-height:1.35;">${env.JOB_NAME}<span style="color:#94a3b8; font-weight:400;"> &middot; #${env.BUILD_NUMBER}</span></div>
+      </td></tr>
+      <tr><td style="padding:20px 40px 8px 40px;">
+        <table role="presentation" cellpadding="0" cellspacing="0" border="0" width="100%" style="font-size:14px; color:#0f172a;">
+          <tr><td width="110" style="padding:7px 0; color:#64748b;">Commit</td><td style="padding:7px 0; font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace; font-size:13px;">${info.hash}</td></tr>
+          <tr><td style="padding:7px 0; color:#64748b;">Author</td><td style="padding:7px 0;">${info.author}</td></tr>
+          <tr><td style="padding:7px 0; color:#64748b; vertical-align:top;">Message</td><td style="padding:7px 0;">${info.message}</td></tr>
+          <tr><td style="padding:7px 0; color:#64748b;">Triggered by</td><td style="padding:7px 0;">${info.trigger}</td></tr>
+          <tr><td style="padding:7px 0; color:#64748b;">Duration</td><td style="padding:7px 0;">${info.duration}</td></tr>
+        </table>
+      </td></tr>
+      <tr><td style="padding:20px 40px 32px 40px;">
+        <a href="${env.BUILD_URL}" style="display:inline-block; padding:10px 18px; background:#0f172a; color:#ffffff; text-decoration:none; border-radius:8px; font-size:14px; font-weight:500;">View build</a>
+        <a href="${env.BUILD_URL}console" style="display:inline-block; padding:10px 14px; color:#475569; text-decoration:none; font-size:14px; font-weight:500;">Console output &rarr;</a>
+      </td></tr>
+      <tr><td style="padding:14px 40px; background:#f8fafc; border-top:1px solid #e2e8f0; font-size:12px; color:#94a3b8;">
+        Automated notification from Jenkins
+      </td></tr>
+    </table>
+  </td></tr>
+</table>
+</body>
+</html>
+"""
+}

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

@@ -0,0 +1,59 @@
+**GG-Node-Backend**
+
+## Tech Stack
+
+Runtime: Node.js (ES Modules)
+Framework: Express.js (v5.x)
+ORM: Prisma (PostgreSQL)
+Storage: Bytescale (Image uploads)
+Auth: JSON Web Tokens (JWT) & Bcrypt
+Email: Postmark
+
+## Project Structure
+
+backend/
+├── prisma/
+│ └── schema.prisma  
+├──── src/
+│ ├── app.js  
+│ ├── controllers/  
+│ ├── middlewares/  
+│ ├── routes/  
+│ ├── prisma/  
+│ └── utils/  
+├── .env  
+└── package.json
+
+## Installation & Setup
+
+**1. Prerequisites**
+Node.js (v18+)
+PostgreSQL Database
+
+**2. Environment Variables**
+DATABASE_URL=""
+PORT=5008
+JWT_SECRET=""
+CORS_ALLOWED_ORIGINS=http://localhost:3001 http://localhost:3003 http://localhost:5174 http://localhost:5173
+BYTESCALE_SECRET_API_KEY=""
+POSTMARK_API_KEY=""
+
+**3. Install Dependencies**
+npm install
+
+**4. Database Initialization**
+
+# Generate Prisma Client
+
+npm run generate
+
+# Run migrations to create database tables
+
+npm run migrate
+
+## Scripts
+
+1. npm start: Runs the server in production mode.
+2. npm run migrate: Syncs your local database with the current Prisma schema.
+3. npm run generate: Regenerates the Prisma Client (run this after schema changes).
+4. npx prisma studio: Opens a visual editor to view and manage your database data.

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/prisma/migrations/20260510161939_sort_inactive_fields/migration.sql

@@ -0,0 +1,14 @@
+-- AlterTable
+ALTER TABLE "Career" ADD COLUMN     "isActive" BOOLEAN NOT NULL DEFAULT true,
+ADD COLUMN     "sortOrder" INTEGER NOT NULL DEFAULT 0;
+
+-- AlterTable
+ALTER TABLE "Department" ADD COLUMN     "isActive" BOOLEAN NOT NULL DEFAULT true,
+ADD COLUMN     "sortOrder" INTEGER NOT NULL DEFAULT 0;
+
+-- AlterTable
+ALTER TABLE "Doctor" ADD COLUMN     "globalSortOrder" INTEGER NOT NULL DEFAULT 0,
+ADD COLUMN     "isActive" BOOLEAN NOT NULL DEFAULT true;
+
+-- AlterTable
+ALTER TABLE "DoctorDepartment" ADD COLUMN     "sortOrder" INTEGER NOT NULL DEFAULT 0;

backend/prisma/migrations/20260510171736_sort_order_default1000/migration.sql

@@ -0,0 +1,11 @@
+-- AlterTable
+ALTER TABLE "Career" ALTER COLUMN "sortOrder" SET DEFAULT 1000;
+
+-- AlterTable
+ALTER TABLE "Department" ALTER COLUMN "sortOrder" SET DEFAULT 1000;
+
+-- AlterTable
+ALTER TABLE "Doctor" ALTER COLUMN "globalSortOrder" SET DEFAULT 1000;
+
+-- AlterTable
+ALTER TABLE "DoctorDepartment" ALTER COLUMN "sortOrder" SET DEFAULT 1000;

backend/prisma/schema.prisma

@@ -25,6 +25,8 @@ model Doctor {
   designation   String?
   workingStatus String?
   qualification String?
+  isActive      Boolean  @default(true)
+  globalSortOrder Int    @default(1000)
 
   departments  DoctorDepartment[]
   appointments Appointment[]
@@ -46,6 +48,9 @@ model Department {
   facilities String?
   services   String?
 
+  isActive     Boolean  @default(true)
+  sortOrder    Int      @default(1000)
+
   doctors      DoctorDepartment[]
   appointments Appointment[]
 
@@ -61,7 +66,7 @@ model DoctorDepartment {
 
   doctor     Doctor     @relation(fields: [doctorId], references: [id])
   department Department @relation(fields: [departmentId], references: [id])
-
+  sortOrder  Int        @default(1000)
   timing DoctorTiming?
 
   createdAt DateTime @default(now())
@@ -111,7 +116,8 @@ model Career {
   email          String?
   number         String?
   status         String  @default("new")
-
+  isActive       Boolean @default(true)
+  sortOrder      Int     @default(1000)
   candidates Candidate[]
 
   createdAt DateTime @default(now())

backend/src/app.js

@@ -14,11 +14,15 @@ import inquiryRoutes from "./routes/inquiry.routes.js";
 import academicsResearchRoutes from "./routes/academicsResearch.routes.js";
 import emailConfigRoutes from "./routes/emailConfig.routes.js";
 import newsMediaRoutes from "./routes/newsMedia.routes.js";
+import importRoutes from "./routes/importRoutes.js";
 
 dotenv.config();
 
 const app = express();
 
+app.use(express.json({ limit: "50mb" }));
+app.use(express.urlencoded({ limit: "50mb", extended: true }));
+
 const allowedOrigins = process.env.CORS_ALLOWED_ORIGINS
 	? process.env.CORS_ALLOWED_ORIGINS.split(" ")
 	: ["http://localhost:3001"];
@@ -35,7 +39,6 @@ const corsOptions = {
 	allowedHeaders: "*",
 };
 
-app.use(express.json());
 app.use(cors(corsOptions));
 
 app.use("/api/departments", departmentRoutes);
@@ -51,8 +54,9 @@ app.use("/api/inquiry", inquiryRoutes);
 app.use("/api/academics", academicsResearchRoutes);
 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/academicsResearch.controller.js

@@ -35,18 +35,73 @@ export const createAcademicsResearch = async (req, res) => {
 					to: emailList,
 					subject: "New Academics & Research Inquiry",
 					html: `
-						<h2>New Academics & Research Inquiry</h2>
+		<div style="font-family: Arial, sans-serif; background-color: #f4f6f8; padding: 20px;">
+		  
+		  <div style="max-width: 600px; margin: auto; background: #ffffff; border-radius: 10px; overflow: hidden; box-shadow: 0 4px 10px rgba(0,0,0,0.05);">
+		    
+		    <!-- Header -->
+		    <div style="background-color: #0d6efd; color: #ffffff; padding: 20px;">
+		      <h2 style="margin: 0;">GG Hospital</h2>
+		      <p style="margin: 5px 0 0; font-size: 14px;">
+		        New Academics & Research Inquiry
+		      </p>
+		    </div>
 
-						<p><b>Name:</b> ${fullName}</p>
-						<p><b>Phone:</b> ${number}</p>
-						<p><b>Email:</b> ${emailId || "-"}</p>
+		    <!-- Body -->
+		    <div style="padding: 20px; color: #333;">
+		      
+		      <h3 style="margin-top: 0;">Contact Details</h3>
+		      
+		      <table style="width: 100%; border-collapse: collapse;">
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Name:</b></td>
+		          <td style="padding: 8px 0;">${fullName}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Phone:</b></td>
+		          <td style="padding: 8px 0;">${number}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Email:</b></td>
+		          <td style="padding: 8px 0;">${emailId || "-"}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Course:</b></td>
+		          <td style="padding: 8px 0;">${courseName || "-"}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Subject:</b></td>
+		          <td style="padding: 8px 0;">${subject || "-"}</td>
+		        </tr>
+		      </table>
 
-						<p><b>Course:</b> ${courseName || "-"}</p>
-						<p><b>Subject:</b> ${subject || "-"}</p>
+		      <!-- Message Box -->
+		     <div style="margin-top: 20px;">
+				<h3>Message</h3>
+				<div style="
+					background: #f8f9fa;
+					padding: 15px;
+					border-radius: 6px;
+					line-height: 1.6;
+					white-space: pre-wrap;
+					word-break: break-word;
+					overflow-wrap: anywhere;
+				">
+					${message ? message.replace(/\n/g, "<br/>") : "-"}
+				</div>
+				</div>
 
-						<p><b>Message:</b></p>
-						<p>${message || "-"}</p>
-					`,
+		    </div>
+
+		    <!-- Footer -->
+		    <div style="background: #f1f1f1; padding: 15px; text-align: center; font-size: 12px; color: #666;">
+		      This message was sent from the GG Hospital website (Academics & Research Inquiry).
+		    </div>
+
+		  </div>
+
+		</div>
+		`,
 				});
 			}
 		} catch (err) {

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) {
@@ -38,15 +38,88 @@ export const createAppointment = async (req, res) => {
 					to: emailList,
 					subject: "New Appointment Booked",
 					html: `
-						<h2>New Appointment Booked</h2>
-						<p><b>Name:</b> ${name}</p>
-						<p><b>Phone:</b> ${mobileNumber}</p>
-						<p><b>Email:</b> ${email || "-"}</p>
-						<p><b>Doctor:</b> ${appointment.doctor?.name}</p>
-						<p><b>Department:</b> ${appointment.department?.name}</p>
-						<p><b>Date:</b> ${new Date(date).toLocaleDateString()}</p>
-						<p><b>Message:</b> ${message || "-"}</p>
-					`,
+		<div style="font-family: Arial, sans-serif; background-color: #f4f6f8; padding: 20px;">
+		  
+		  <div style="max-width: 600px; margin: auto; background: #ffffff; border-radius: 10px; overflow: hidden; box-shadow: 0 4px 10px rgba(0,0,0,0.05);">
+		    
+		    <!-- Header -->
+		    <div style="background-color: #0d6efd; color: #ffffff; padding: 20px;">
+		      <h2 style="margin: 0;">GG Hospital</h2>
+		      <p style="margin: 5px 0 0; font-size: 14px;">
+		        New Appointment Booked
+		      </p>
+		    </div>
+
+		    <!-- Body -->
+		    <div style="padding: 20px; color: #333;">
+		      
+		      <h3 style="margin-top: 0;">Patient Details</h3>
+		      
+		      <table style="width: 100%; border-collapse: collapse;">
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Name:</b></td>
+		          <td style="padding: 8px 0;">${name}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Phone:</b></td>
+		          <td style="padding: 8px 0;">${mobileNumber}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Email:</b></td>
+		          <td style="padding: 8px 0;">${email || "-"}</td>
+		        </tr>
+		      </table>
+
+		      <h3 style="margin-top: 20px;">Appointment Details</h3>
+
+		      <table style="width: 100%; border-collapse: collapse;">
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Doctor:</b></td>
+		          <td style="padding: 8px 0;">${appointment.doctor?.name || "-"}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Department:</b></td>
+		          <td style="padding: 8px 0;">${appointment.department?.name || "-"}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Date:</b></td>
+		          <td style="padding: 8px 0;">
+					${new Date(date).toLocaleDateString("en-GB", {
+						day: "2-digit",
+						month: "long",
+						year: "numeric",
+					})}
+					</td>
+		        </tr>
+		      </table>
+
+		      <!-- Message Box -->
+		      <div style="margin-top: 20px;">
+		        <h3>Message</h3>
+		       <div style="
+					background: #f8f9fa;
+					padding: 15px;
+					border-radius: 6px;
+					line-height: 1.6;
+					white-space: pre-wrap;
+					word-break: break-word;
+					overflow-wrap: anywhere;
+				">
+					${message ? message.replace(/\n/g, "<br/>") : "-"}
+				</div>
+		      </div>
+
+		    </div>
+
+		    <!-- Footer -->
+		    <div style="background: #f1f1f1; padding: 15px; text-align: center; font-size: 12px; color: #666;">
+		      This appointment was booked via the GG Hospital website.
+		    </div>
+
+		  </div>
+
+		</div>
+		`,
 				});
 			}
 		} catch (err) {
@@ -71,22 +144,93 @@ 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, startDate, endDate, search } = req.query;
+
+		const where = {};
+
+		const hasSingleDate = date && date.trim() !== "";
+
+		const hasRange =
+			(startDate && startDate.trim() !== "") ||
+			(endDate && endDate.trim() !== "");
+
+		if (hasSingleDate) {
+			const start = new Date(date);
+			start.setHours(0, 0, 0, 0);
+
+			const end = new Date(date);
+			end.setHours(23, 59, 59, 999);
+
+			where.date = {
+				gte: start,
+				lte: end,
+			};
+		}
+
+		if (!hasSingleDate && hasRange) {
+			const dateFilter = {};
+
+			if (startDate && startDate.trim() !== "") {
+				const start = new Date(startDate);
+				start.setHours(0, 0, 0, 0);
+
+				dateFilter.gte = start;
+			}
+
+			if (endDate && endDate.trim() !== "") {
+				const end = new Date(endDate);
+				end.setHours(23, 59, 59, 999);
+
+				dateFilter.lte = end;
+			}
+
+			where.date = dateFilter;
+		}
+
+		if (search && search.trim() !== "") {
+			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",
@@ -98,7 +242,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 +278,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 +310,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 +339,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 +370,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/candidate.controller.js

@@ -39,19 +39,82 @@ export const createCandidate = async (req, res) => {
 					to: emailList,
 					subject: "New Job Application Received",
 					html: `
-						<h2>New Candidate Application</h2>
+		<div style="font-family: Arial, sans-serif; background-color: #f4f6f8; padding: 20px;">
+		  
+		  <div style="max-width: 600px; margin: auto; background: #ffffff; border-radius: 10px; overflow: hidden; box-shadow: 0 4px 10px rgba(0,0,0,0.05);">
+		    
+		    <!-- Header -->
+		    <div style="background-color: #0d6efd; color: #ffffff; padding: 20px;">
+		      <h2 style="margin: 0;">GG Hospital</h2>
+		      <p style="margin: 5px 0 0; font-size: 14px;">
+		        New Job Application Received
+		      </p>
+		    </div>
 
-						<p><b>Name:</b> ${fullName}</p>
-						<p><b>Phone:</b> ${mobile}</p>
-						<p><b>Email:</b> ${email}</p>
+		    <!-- Body -->
+		    <div style="padding: 20px; color: #333;">
+		      
+		      <h3 style="margin-top: 0;">Candidate Details</h3>
+		      
+		      <table style="width: 100%; border-collapse: collapse;">
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Name:</b></td>
+		          <td style="padding: 8px 0;">${fullName}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Phone:</b></td>
+		          <td style="padding: 8px 0;">${mobile}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Email:</b></td>
+		          <td style="padding: 8px 0;">${email}</td>
+		        </tr>
+		      </table>
 
-						<p><b>Applied For:</b> ${candidate.career?.post || "-"}</p>
-						<p><b>Designation:</b> ${candidate.career?.designation || "-"}</p>
+		      <h3 style="margin-top: 20px;">Application Details</h3>
 
-						<p><b>Subject:</b> ${subject || "-"}</p>
-						<p><b>Cover Letter:</b></p>
-						<p>${coverLetter || "-"}</p>
-					`,
+		      <table style="width: 100%; border-collapse: collapse;">
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Applied For:</b></td>
+		          <td style="padding: 8px 0;">${candidate.career?.post || "-"}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Designation:</b></td>
+		          <td style="padding: 8px 0;">${candidate.career?.designation || "-"}</td>
+		        </tr>
+		        <tr>
+		          <td style="padding: 8px 0;"><b>Subject:</b></td>
+		          <td style="padding: 8px 0;">${subject || "-"}</td>
+		        </tr>
+		      </table>
+
+		      <!-- Cover Letter -->
+		      <div style="margin-top: 20px;">
+		        <h3>Cover Letter</h3>
+				<div style="
+					background: #f8f9fa;
+					padding: 15px;
+					border-radius: 6px;
+					line-height: 1.6;
+					white-space: pre-wrap;
+					word-break: break-word;
+					overflow-wrap: anywhere;
+				">
+					${coverLetter ? coverLetter.replace(/\n/g, "<br/>") : "-"}
+				</div>
+		      </div>
+
+		    </div>
+
+		    <!-- Footer -->
+		    <div style="background: #f1f1f1; padding: 15px; text-align: center; font-size: 12px; color: #666;">
+		      This application was submitted via the GG Hospital careers page.
+		    </div>
+
+		  </div>
+
+		</div>
+		`,
 				});
 			}
 		} catch (err) {

backend/src/controllers/career.controller.js

@@ -4,8 +4,11 @@ import prisma from "../prisma/client.js";
 
 export const getAllCareers = async (req, res) => {
 	try {
+		const { admin } = req.query;
+
 		const careers = await prisma.career.findMany({
-			orderBy: {createdAt: "desc"},
+			where: admin === "true" ? {} : { isActive: true },
+			orderBy: [{ sortOrder: "asc" }, { createdAt: "desc" }],
 		});
 
 		const response = careers.map((c) => ({
@@ -17,6 +20,8 @@ export const getAllCareers = async (req, res) => {
 			email: c.email,
 			number: c.number,
 			status: c.status,
+			isActive: c.isActive,
+			sortOrder: c.sortOrder,
 		}));
 
 		return res.status(200).json({
@@ -44,6 +49,8 @@ export const createCareer = async (req, res) => {
 			email,
 			number,
 			status,
+			isActive,
+			sortOrder,
 		} = req.body;
 
 		if (!post || !designation) {
@@ -62,6 +69,8 @@ export const createCareer = async (req, res) => {
 				email,
 				number,
 				status,
+				isActive: isActive !== undefined ? isActive : true,
+				sortOrder: sortOrder !== undefined ? Number(sortOrder) : 0,
 			},
 		});
 
@@ -83,11 +92,16 @@ export const createCareer = async (req, res) => {
 
 export const updateCareer = async (req, res) => {
 	try {
-		const {id} = req.params;
+		const { id } = req.params;
+		const updateData = { ...req.body };
+
+		if (updateData.sortOrder !== undefined) {
+			updateData.sortOrder = Number(updateData.sortOrder);
+		}
 
 		const career = await prisma.career.update({
-			where: {id: Number(id)},
-			data: req.body,
+			where: { id: Number(id) },
+			data: updateData,
 		});
 
 		return res.status(200).json({
@@ -108,10 +122,10 @@ export const updateCareer = async (req, res) => {
 
 export const deleteCareer = async (req, res) => {
 	try {
-		const {id} = req.params;
+		const { id } = req.params;
 
 		await prisma.career.delete({
-			where: {id: Number(id)},
+			where: { id: Number(id) },
 		});
 
 		return res.status(200).json({

backend/src/controllers/department.controller.js

@@ -2,8 +2,11 @@ import prisma from "../prisma/client.js";
 
 export const getAllDepartments = async (req, res) => {
 	try {
+		const {admin} = req.query;
+
 		const departments = await prisma.department.findMany({
-			orderBy: {name: "asc"},
+			where: admin === "true" ? {} : {isActive: true},
+			orderBy: [{sortOrder: "asc"}, {name: "asc"}],
 		});
 
 		const response = departments.map((dep) => ({
@@ -15,6 +18,8 @@ export const getAllDepartments = async (req, res) => {
 			para3: dep.para3 ?? "",
 			facilities: dep.facilities ?? "",
 			services: dep.services ?? "",
+			isActive: dep.isActive,
+			sortOrder: dep.sortOrder,
 		}));
 
 		return res.status(200).json({
@@ -44,13 +49,14 @@ export const getDepartmentByName = async (req, res) => {
 		const department = await prisma.department.findFirst({
 			where: {
 				name: name,
+				isActive: true,
 			},
 		});
 
 		if (!department) {
 			return res.status(404).json({
 				success: false,
-				message: "Department not found",
+				message: "Department not found or inactive",
 			});
 		}
 
@@ -63,6 +69,8 @@ export const getDepartmentByName = async (req, res) => {
 			para3: department.para3 ?? "",
 			facilities: department.facilities ?? "",
 			services: department.services ?? "",
+			isActive: department.isActive,
+			sortOrder: department.sortOrder,
 		};
 
 		return res.status(200).json({
@@ -89,6 +97,8 @@ export async function createDepartment(req, res) {
 			para3,
 			facilities,
 			services,
+			isActive,
+			sortOrder,
 		} = req.body;
 
 		if (!departmentId || !name) {
@@ -107,6 +117,8 @@ export async function createDepartment(req, res) {
 				para3,
 				facilities,
 				services,
+				isActive: isActive !== undefined ? isActive : true,
+				sortOrder: sortOrder !== undefined ? Number(sortOrder) : 0,
 			},
 		});
 
@@ -118,7 +130,7 @@ export async function createDepartment(req, res) {
 		if (error.code === "P2002") {
 			return res.status(409).json({error: "Department already exists"});
 		}
-
+		console.error(error);
 		res.status(500).json({error: "Failed to create department"});
 	}
 }
@@ -126,20 +138,15 @@ export async function createDepartment(req, res) {
 export const updateDepartment = async (req, res) => {
 	try {
 		const {departmentId} = req.params;
+		const updateData = {...req.body};
 
-		const {name, image, para1, para2, para3, facilities, services} = req.body;
+		if (updateData.sortOrder !== undefined) {
+			updateData.sortOrder = Number(updateData.sortOrder);
+		}
 
 		const department = await prisma.department.update({
 			where: {departmentId},
-			data: {
-				name,
-				image,
-				para1,
-				para2,
-				para3,
-				facilities,
-				services,
-			},
+			data: updateData,
 		});
 
 		return res.status(200).json({

backend/src/controllers/doctor.controller.js

@@ -4,7 +4,10 @@ import prisma from "../prisma/client.js";
 
 export const getAllDoctors = async (req, res) => {
 	try {
+		const {admin} = req.query;
+
 		const doctors = await prisma.doctor.findMany({
+			where: admin === "true" ? {} : {isActive: true},
 			include: {
 				departments: {
 					include: {
@@ -13,7 +16,7 @@ export const getAllDoctors = async (req, res) => {
 					},
 				},
 			},
-			orderBy: {name: "asc"},
+			orderBy: [{globalSortOrder: "asc"}, {name: "asc"}],
 		});
 
 		const formatted = doctors.map((doc, index) => ({
@@ -24,10 +27,10 @@ export const getAllDoctors = async (req, res) => {
 			designation: doc.designation,
 			workingStatus: doc.workingStatus,
 			qualification: doc.qualification,
-
+			isActive: doc.isActive,
+			globalSortOrder: doc.globalSortOrder,
 			departments: doc.departments.map((d) => {
 				const t = d.timing || {};
-
 				const timingArray = [
 					t.monday && `Monday ${t.monday}`,
 					t.tuesday && `Tuesday ${t.tuesday}`,
@@ -43,6 +46,7 @@ export const getAllDoctors = async (req, res) => {
 					departmentId: d.department.departmentId,
 					departmentName: d.department.name,
 					timing: timingArray.join(" & "),
+					deptSortOrder: d.sortOrder,
 				};
 			}),
 		}));
@@ -135,17 +139,23 @@ export const getDoctorsByDepartmentId = async (req, res) => {
 			});
 		}
 
-		const doctors = await prisma.doctorDepartment.findMany({
-			where: {departmentId: department.id},
+		const doctorsInDept = await prisma.doctorDepartment.findMany({
+			where: {
+				departmentId: department.id,
+				doctor: {isActive: true},
+			},
 			include: {
 				doctor: true,
 			},
+			orderBy: {sortOrder: "asc"},
 		});
 
-		const result = doctors.map((d) => ({
+		const result = doctorsInDept.map((d) => ({
 			GG_ID: d.doctor.doctorId,
 			Name: d.doctor.name,
 			image: d.doctor.image ?? "",
+			designation: d.doctor.designation,
+			hierarchyOrder: d.sortOrder,
 		}));
 
 		res.status(200).json({
@@ -171,6 +181,8 @@ export const createDoctor = async (req, res) => {
 			designation,
 			workingStatus,
 			qualification,
+			isActive,
+			globalSortOrder,
 			departments,
 		} = req.body;
 
@@ -182,6 +194,9 @@ export const createDoctor = async (req, res) => {
 				designation,
 				workingStatus,
 				qualification,
+				isActive: isActive !== undefined ? isActive : true,
+				globalSortOrder:
+					globalSortOrder !== undefined ? Number(globalSortOrder) : 0,
 			},
 		});
 
@@ -196,6 +211,7 @@ export const createDoctor = async (req, res) => {
 				data: {
 					doctorId: doctor.id,
 					departmentId: department.id,
+					sortOrder: dep.sortOrder !== undefined ? Number(dep.sortOrder) : 0,
 				},
 			});
 
@@ -232,62 +248,71 @@ export const updateDoctor = async (req, res) => {
 			image,
 			workingStatus,
 			qualification,
+			isActive,
+			globalSortOrder,
 			departments,
 		} = req.body;
 
-		const doctor = await prisma.doctor.findUnique({
-			where: {doctorId},
-		});
-
-		if (!doctor) {
+		const doctor = await prisma.doctor.findUnique({where: {doctorId}});
+		if (!doctor)
 			return res
 				.status(404)
 				.json({success: false, message: "Doctor not found"});
-		}
 
 		await prisma.doctor.update({
 			where: {id: doctor.id},
-			data: {name, designation, image, workingStatus, qualification},
+			data: {
+				name,
+				designation,
+				image,
+				workingStatus,
+				qualification,
+				isActive,
+				globalSortOrder:
+					globalSortOrder !== undefined ? Number(globalSortOrder) : undefined,
+			},
 		});
 
-		const oldRelations = await prisma.doctorDepartment.findMany({
-			where: {doctorId: doctor.id},
-		});
+		const hasTimingData = departments?.some(
+			(dep) => dep.timing && Object.keys(dep.timing).length > 0,
+		);
 
-		for (const rel of oldRelations) {
-			await prisma.doctorTiming.deleteMany({
-				where: {doctorDepartmentId: rel.id},
-			});
-		}
-
-		await prisma.doctorDepartment.deleteMany({
-			where: {doctorId: doctor.id},
-		});
-
-		for (const dep of departments) {
-			const department = await prisma.department.findUnique({
-				where: {departmentId: dep.departmentId},
+		if (departments && Array.isArray(departments) && hasTimingData) {
+			const oldRelations = await prisma.doctorDepartment.findMany({
+				where: {doctorId: doctor.id},
 			});
 
-			if (!department) continue;
+			for (const rel of oldRelations) {
+				await prisma.doctorTiming.deleteMany({
+					where: {doctorDepartmentId: rel.id},
+				});
+			}
 
-			const doctorDepartment = await prisma.doctorDepartment.create({
-				data: {
-					doctorId: doctor.id,
-					departmentId: department.id,
-				},
+			await prisma.doctorDepartment.deleteMany({
+				where: {doctorId: doctor.id},
 			});
 
-			if (dep.timing) {
-				const {id, doctorDepartmentId, createdAt, updatedAt, ...cleanTiming} =
-					dep.timing;
+			for (const dep of departments) {
+				const targetDept = await prisma.department.findUnique({
+					where: {departmentId: dep.departmentId},
+				});
+				if (!targetDept) continue;
 
-				await prisma.doctorTiming.create({
+				const newDD = await prisma.doctorDepartment.create({
 					data: {
-						doctorDepartmentId: doctorDepartment.id,
-						...cleanTiming,
+						doctorId: doctor.id,
+						departmentId: targetDept.id,
+						sortOrder: dep.sortOrder !== undefined ? Number(dep.sortOrder) : 0,
 					},
 				});
+
+				if (dep.timing) {
+					const {id, doctorDepartmentId, createdAt, updatedAt, ...cleanTiming} =
+						dep.timing;
+					await prisma.doctorTiming.create({
+						data: {doctorDepartmentId: newDD.id, ...cleanTiming},
+					});
+				}
 			}
 		}
 
@@ -421,6 +446,7 @@ export const getDoctorTimingById = async (req, res) => {
 			departments: doctor.departments.map((d) => ({
 				departmentId: d.department.departmentId,
 				departmentName: d.department.name,
+				deptSortOrder: d.sortOrder,
 				timing: d.timing || {},
 			})),
 		};

backend/src/controllers/importController.js

@@ -0,0 +1,304 @@
+import { PrismaClient } from "@prisma/client";
+
+const prisma = new PrismaClient();
+
+export const bulkImportExcelData = async (req, res) => {
+	try {
+		const {
+			departments,
+			doctors,
+			timings,
+			careers,
+			inquiries,
+			academics,
+			appointments,
+			candidates,
+			news,
+		} = req.body;
+
+		console.log("🚀 Starting Robust Data Import...");
+
+		// 1. DEPARTMENTS
+		if (departments) {
+			for (const row of departments) {
+				if (!row.SL_NO) continue;
+				await prisma.department.upsert({
+					where: { departmentId: row.SL_NO.toString() },
+					update: {
+						name: row.Department?.toString(),
+						para1: row.para1?.toString() || null,
+						para2: row.para2?.toString() || null,
+						para3: row.para3?.toString() || null,
+						facilities: row.facilities?.toString() || null,
+						services: row.services?.toString() || null,
+					},
+					create: {
+						departmentId: row.SL_NO.toString(),
+						name: row.Department?.toString(),
+						para1: row.para1?.toString() || null,
+						para2: row.para2?.toString() || null,
+						para3: row.para3?.toString() || null,
+						facilities: row.facilities?.toString() || null,
+						services: row.services?.toString() || null,
+					},
+				});
+			}
+		}
+
+		// 2. DOCTORS
+		if (doctors) {
+			for (const row of doctors) {
+				if (!row.GG_ID) continue;
+				const doctor = await prisma.doctor.upsert({
+					where: { doctorId: row.GG_ID.toString() },
+					update: {
+						name: row.Name?.toString(),
+						designation: row.Designation?.toString() || null,
+						workingStatus: row["Working Status"]?.toString() || null,
+						qualification: row.Qualification?.toString() || null,
+					},
+					create: {
+						doctorId: row.GG_ID.toString(),
+						name: row.Name?.toString(),
+						designation: row.Designation?.toString() || null,
+						workingStatus: row["Working Status"]?.toString() || null,
+						qualification: row.Qualification?.toString() || null,
+					},
+				});
+
+				if (row.Department_ID) {
+					const dept = await prisma.department.findUnique({
+						where: { departmentId: row.Department_ID.toString() },
+					});
+					if (dept) {
+						await prisma.doctorDepartment.upsert({
+							where: {
+								doctorId_departmentId: {
+									doctorId: doctor.id,
+									departmentId: dept.id,
+								},
+							},
+							update: {},
+							create: {
+								doctorId: doctor.id,
+								departmentId: dept.id,
+							},
+						});
+					}
+				}
+			}
+		}
+
+		// 3. TIMINGS
+		if (timings) {
+			for (const row of timings) {
+				if (!row.GG_ID) continue;
+				const doctor = await prisma.doctor.findUnique({
+					where: { doctorId: row.GG_ID.toString() },
+					include: { departments: true },
+				});
+
+				if (doctor && doctor.departments.length > 0) {
+					const doctorDeptId = doctor.departments[0].id;
+					const rawAdd = row.Additional?.toString() || "";
+					const rawMon = row.Monday?.toString() || "";
+					const isAppt = (val) => /appointment|basis|on call/i.test(val);
+
+					let finalAdd = rawAdd;
+					if (!finalAdd && isAppt(rawMon)) finalAdd = rawMon;
+
+					await prisma.doctorTiming.upsert({
+						where: { doctorDepartmentId: doctorDeptId },
+						update: {
+							monday: isAppt(rawMon) ? null : row.Monday?.toString() || null,
+							tuesday: row.Tuesday?.toString() || null,
+							wednesday: row.Wednesday?.toString() || null,
+							thursday: row.Thursday?.toString() || null,
+							friday: row.Friday?.toString() || null,
+							saturday: row.Saturday?.toString() || null,
+							sunday: row.Sunday?.toString() || null,
+							additional: finalAdd || null,
+						},
+						create: {
+							doctorDepartmentId: doctorDeptId,
+							monday: isAppt(rawMon) ? null : row.Monday?.toString() || null,
+							tuesday: row.Tuesday?.toString() || null,
+							wednesday: row.Wednesday || null,
+							thursday: row.Thursday || null,
+							friday: row.Friday || null,
+							saturday: row.Saturday || null,
+							sunday: row.Sunday || null,
+							additional: finalAdd || null,
+						},
+					});
+				}
+			}
+		}
+
+		// 4. CAREERS
+		if (careers) {
+			for (const row of careers) {
+				if (!row.Post) continue;
+				const cId = row.Id ? parseInt(row.Id) : undefined;
+				const data = {
+					post: row.Post?.toString(),
+					designation: row.Designation?.toString() || null,
+					qualification: row.Qualification?.toString() || null,
+					experienceNeed: row.ExperienceNeed?.toString() || null,
+					email: row.HiringEmail?.toString() || null,
+					number: row.Number?.toString() || null,
+					status: row.Status?.toString() || "new",
+				};
+				if (cId) {
+					await prisma.career.upsert({
+						where: { id: cId },
+						update: data,
+						create: { ...data, id: cId },
+					});
+				} else {
+					await prisma.career.create({ data });
+				}
+			}
+		}
+
+		// 5. INQUIRIES
+		if (inquiries) {
+			for (const row of inquiries) {
+				if (!row.FullName) continue;
+				await prisma.inquiry.create({
+					data: {
+						fullName: row.FullName.toString(),
+						number: row.Number?.toString() || "",
+						emailId: row.EmailId?.toString() || null,
+						subject: row.Subject?.toString() || null,
+						message: row.Message?.toString() || null,
+						createdAt: row.Date ? new Date(row.Date) : new Date(),
+					},
+				});
+			}
+		}
+
+		// 6. ACADEMICS & RESEARCH (FIXED HERE)
+		if (academics) {
+			for (const row of academics) {
+				if (!row.FullName) continue;
+				await prisma.academicsResearch.create({
+					data: {
+						fullName: row.FullName.toString(),
+						number: row.Number?.toString() || "",
+						emailId: row.EmailId?.toString() || null,
+						subject: row.Subject?.toString() || null, // Force String
+						courseName: row["Course Name"]?.toString() || null,
+						message: row.Message?.toString() || null,
+						createdAt: row.Date ? new Date(row.Date) : new Date(),
+					},
+				});
+			}
+		}
+
+		// 7. APPOINTMENTS
+		if (appointments) {
+			for (const row of appointments) {
+				if (!row.FullName) continue;
+				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,
+						},
+					});
+				}
+			}
+		}
+
+		// 8. CANDIDATES
+		if (candidates) {
+			for (const row of candidates) {
+				if (!row.FullName || !row.CareerId) continue;
+				await prisma.candidate
+					.create({
+						data: {
+							fullName: row.FullName.toString(),
+							mobile: row.Number?.toString() || "",
+							email: row.EmailId?.toString() || "",
+							subject: row.Subject?.toString() || "",
+							coverLetter: row["Cover Letter"]?.toString() || "",
+							careerId: parseInt(row.CareerId),
+							createdAt: row.Date ? new Date(row.Date) : new Date(),
+						},
+					})
+					.catch(() => {});
+			}
+		}
+
+		// 9. NEWS & MEDIA
+		if (news) {
+			for (const row of news) {
+				if (!row.Headline) continue;
+				await prisma.newsMedia.create({
+					data: {
+						headline: row.Headline.toString(),
+						content: row.Content?.toString() || null,
+						firstPara: row.FirstPara?.toString() || null,
+						secondPara: row.SecondPara?.toString() || null,
+						author: row.Author?.toString() || null,
+						date: row.Date ? new Date(row.Date) : null,
+					},
+				});
+			}
+		}
+
+		res
+			.status(200)
+			.json({ success: true, message: "✅ Import completed successfully!" });
+	} catch (error) {
+		console.error("❌ Bulk Import Error:", error);
+		res.status(500).json({ success: false, error: error.message });
+	}
+};

backend/src/controllers/inquiry.controller.js

@@ -32,14 +32,66 @@ export const createInquiry = async (req, res) => {
 					to: emailList,
 					subject: "New Inquiry Received",
 					html: `
-						<h2>New Inquiry</h2>
+					<div style="font-family: Arial, sans-serif; background-color: #f4f6f8; padding: 20px;">
+					
+					<div style="max-width: 600px; margin: auto; background: #ffffff; border-radius: 10px; overflow: hidden; box-shadow: 0 4px 10px rgba(0,0,0,0.05);">
+						
+						<!-- Header -->
+						<div style="background-color: #0d6efd; color: #ffffff; padding: 20px;">
+						<h2 style="margin: 0;">GG Hospital</h2>
+						<p style="margin: 5px 0 0; font-size: 14px;">New Inquiry Received</p>
+						</div>
 
-						<p><b>Name:</b> ${fullName}</p>
-						<p><b>Phone:</b> ${number}</p>
-						<p><b>Email:</b> ${emailId}</p>
+						<!-- Body -->
+						<div style="padding: 20px; color: #333;">
+						
+						<h3 style="margin-top: 0;">Contact Details</h3>
+						
+						<table style="width: 100%; border-collapse: collapse;">
+							<tr>
+							<td style="padding: 8px 0;"><b>Name:</b></td>
+							<td style="padding: 8px 0;">${fullName}</td>
+							</tr>
+							<tr>
+							<td style="padding: 8px 0;"><b>Phone:</b></td>
+							<td style="padding: 8px 0;">${number}</td>
+							</tr>
+							<tr>
+							<td style="padding: 8px 0;"><b>Email:</b></td>
+							<td style="padding: 8px 0;">${emailId}</td>
+							</tr>
+							<tr>
+							<td style="padding: 8px 0;"><b>Subject:</b></td>
+							<td style="padding: 8px 0;">${subject}</td>
+							</tr>
+						</table>
 
-						<p><b>Subject:</b> ${subject}</p>
-					<p><b>Message:</b> ${message}</p>
+						<!-- Message Box -->
+						<div style="margin-top: 20px;">
+							<h3>Message</h3>
+							<div style="
+										background: #f8f9fa;
+										padding: 15px;
+										border-radius: 6px;
+										line-height: 1.6;
+										white-space: pre-wrap;
+										word-break: break-word;
+										overflow-wrap: anywhere;
+									">
+										${message ? message.replace(/\n/g, "<br/>") : "-"}
+							</div>
+						</div>
+
+						</div>
+
+						<!-- Footer -->
+						<div style="background: #f1f1f1; padding: 15px; text-align: center; font-size: 12px; color: #666;">
+						This message was sent from the GG Hospital website contact form.
+						</div>
+
+					</div>
+
+					</div>
 					`,
 				});
 			}

backend/src/controllers/newsMedia.controller.js

@@ -4,53 +4,41 @@ import prisma from "../prisma/client.js";
 
 export const getAllNews = async (req, res) => {
 	try {
-		const page = parseInt(req.query.page);
-		const limit = parseInt(req.query.limit);
+		const page = req.query.page ? parseInt(req.query.page) : null;
+		const limit = req.query.limit ? parseInt(req.query.limit) : null;
+		const search = req.query.search?.trim() || "";
 
 		const includeImages = {
 			images: true,
 		};
 
-		if (!page && !limit) {
-			const news = await prisma.newsMedia.findMany({
-				include: includeImages,
-				orderBy: { createdAt: "desc" },
-			});
+		const searchFilter = search
+			? {
+					headline: {
+						contains: search,
+						mode: "insensitive",
+					},
+				}
+			: {};
 
-			const response = news.map((n) => ({
-				Id: n.id.toString(),
-				Headline: n.headline,
-				Content: n.content,
-				FirstPara: n.firstPara,
-				SecondPara: n.secondPara,
-				Date: n.date,
-				Author: n.author,
-				Images: n.images.map((img) => ({
-					id: img.id,
-					image: img.url,
-				})),
-			}));
+		const whereCondition = {
+			...searchFilter,
+		};
 
-			return res.status(200).json({
-				success: true,
-				data: response,
-				meta: null,
-			});
-		}
-
-		const currentPage = page || 1;
-		const currentLimit = limit || 10;
-
-		const skip = (currentPage - 1) * currentLimit;
+		const skip = page && limit ? (page - 1) * limit : undefined;
+		const take = limit ? limit : undefined;
 
 		const [news, total] = await Promise.all([
 			prisma.newsMedia.findMany({
+				where: whereCondition,
 				include: includeImages,
 				orderBy: { createdAt: "desc" },
 				skip,
-				take: currentLimit,
+				take,
+			}),
+			prisma.newsMedia.count({
+				where: whereCondition,
 			}),
-			prisma.newsMedia.count(),
 		]);
 
 		const response = news.map((n) => ({
@@ -72,9 +60,9 @@ export const getAllNews = async (req, res) => {
 			data: response,
 			meta: {
 				total,
-				page: currentPage,
-				limit: currentLimit,
-				totalPages: Math.ceil(total / currentLimit),
+				page: page || 1,
+				limit: limit || total,
+				totalPages: limit ? Math.ceil(total / limit) : 1,
 			},
 		});
 	} catch (error) {
@@ -85,7 +73,6 @@ export const getAllNews = async (req, res) => {
 		});
 	}
 };
-
 // GET NEWS BY ID
 
 export const getNewsById = async (req, res) => {

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/routes/importRoutes.js

@@ -0,0 +1,9 @@
+import express from "express";
+import { bulkImportExcelData } from "../controllers/importController.js";
+import jwtAuthMiddleware from "../middleware/auth.js";
+
+const router = express.Router();
+
+router.post("/bulk", jwtAuthMiddleware, bulkImportExcelData);
+
+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,45 @@
+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
+  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:
+  external: true
+  name: gg-backend_postgres_data

docker-compose.prod.yml

@@ -0,0 +1,41 @@
+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: always
+
+ frontend:
+  build:
+   context: .
+   dockerfile: docker/dev/Dockerfile.frontend
+  ports:
+   - "127.0.0.1:3008:3000"
+  env_file:
+   - ./frontend/.env
+  restart: always
+
+ db:
+  image: postgres:16-alpine
+  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: always
+
+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

@@ -22,3 +22,8 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+#env files
+.env*
+.env.*.local
+

frontend/README.md

@@ -1,73 +1,47 @@
-# React + TypeScript + Vite
+**GG-Dashboard**
 
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+## Tech Stack
 
-Currently, two official plugins are available:
+Framework: React 19
+Build Tool: Vite + TypeScript
+Styling: Tailwind CSS 4 + shadcn/ui
+Rich Text: Editor.js
+State/Fetch: Axios + React Hooks
+Export: XLSX + File-saver
 
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+## Project Structure
 
-## React Compiler
+frontend/
+├── src/
+│ ├── api/  
+│ ├── assets/  
+│ ├── components/  
+│ ├── context/  
+│ ├── lib/  
+│ ├── layout/  
+│ ├── pages/  
+│ ├── services/  
+│ ├── utils/  
+│ └── App.tsx  
+├── .env  
+├── index.html
+└── package.json
 
-The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
+## Installation & Setup
 
-## Expanding the ESLint configuration
+**1. Prerequisites**
+Node.js (v20+)
 
-If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
+**2. Environment Variables**
+VITE_API_URL="http://localhost:5008/api"
 
-```js
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
+**3. Install Dependencies**
+npm install
 
-      // Remove tseslint.configs.recommended and replace with this
-      tseslint.configs.recommendedTypeChecked,
-      // Alternatively, use this for stricter rules
-      tseslint.configs.strictTypeChecked,
-      // Optionally, add this for stylistic rules
-      tseslint.configs.stylisticTypeChecked,
+**4. Development**
+npm run dev
 
-      // Other configs...
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
-```
+## Scripts
 
-You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
-
-```js
-// eslint.config.js
-import reactX from 'eslint-plugin-react-x'
-import reactDom from 'eslint-plugin-react-dom'
-
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-      // Enable lint rules for React
-      reactX.configs['recommended-typescript'],
-      // Enable lint rules for React DOM
-      reactDom.configs.recommended,
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
-```
+npm run dev: Starts the Vite development server with Hot Module Replacement.
+npm run build: Compiles TypeScript and builds the production-ready assets.

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",
@@ -29,6 +28,7 @@
         "radix-ui": "^1.4.3",
         "react": "^19.2.0",
         "react-dom": "^19.2.0",
+        "react-hot-toast": "^2.6.0",
         "react-router-dom": "^7.13.1",
         "shadcn": "^4.0.5",
         "tailwind-merge": "^3.5.0",
@@ -525,12 +525,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",
@@ -5194,7 +5188,6 @@
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
       "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
-      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/data-uri-to-buffer": {
@@ -6359,6 +6352,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/goober": {
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.18.tgz",
+      "integrity": "sha512-2vFqsaDVIT9Gz7N6kAL++pLpp41l3PfDuusHcjnGLfR6+huZkl6ziX+zgVC3ZxpqWhzH6pyDdGrCeDhMIvwaxw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "csstype": "^3.0.10"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -8143,6 +8145,23 @@
         "react": "^19.2.4"
       }
     },
+    "node_modules/react-hot-toast": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.6.0.tgz",
+      "integrity": "sha512-bH+2EBMZ4sdyou/DPrfgIouFpcRLCJ+HoCA32UoAYHn6T3Ur5yfcDCeSr5mwldl6pFOsiocmrXMuoCJ1vV8bWg==",
+      "license": "MIT",
+      "dependencies": {
+        "csstype": "^3.1.3",
+        "goober": "^2.1.16"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": ">=16",
+        "react-dom": ">=16"
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.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",
@@ -31,6 +30,7 @@
     "radix-ui": "^1.4.3",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
+    "react-hot-toast": "^2.6.0",
     "react-router-dom": "^7.13.1",
     "shadcn": "^4.0.5",
     "tailwind-merge": "^3.5.0",

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/App.tsx

@@ -1,4 +1,5 @@
-import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
+import {BrowserRouter, Routes, Route, Navigate} from "react-router-dom";
+import {Toaster} from "react-hot-toast";
 
 import Login from "@/pages/Login";
 
@@ -8,7 +9,7 @@ import DashboardLayout from "./layouts/DashboardLayout";
 
 import ProtectedRoute from "./auth/ProtectedRoute";
 import PublicRoute from "./auth/PublicRoute";
-import { AuthProvider } from "./context/AuthContext";
+import {AuthProvider} from "./context/AuthContext";
 import Department from "./pages/Department";
 import Doctor from "./pages/Doctor";
 import Blog from "./pages/Blog";
@@ -21,10 +22,13 @@ import InquiryPage from "./pages/inquiry";
 import AcademicsPage from "./pages/Academics";
 import NewsPage from "./pages/newsMedia";
 import BlogDetail from "./pages/BlogDetails";
+import ImportData from "./pages/ImportData";
 
 export default function App() {
 	return (
 		<BrowserRouter>
+			<Toaster position="top-right" />
+
 			<AuthProvider>
 				<Routes>
 					<Route element={<PublicRoute />}>
@@ -46,6 +50,7 @@ export default function App() {
 							<Route path="/inquiry" element={<InquiryPage />} />
 							<Route path="/academics" element={<AcademicsPage />} />
 							<Route path="/news" element={<NewsPage />} />
+							<Route path="/import" element={<ImportData />} />
 						</Route>
 					</Route>
 

frontend/src/api/appointment.ts

@@ -1,7 +1,22 @@
 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 = "",
+	startDate = "",
+	endDate = "",
+	search = "",
+) => {
+	const params = new URLSearchParams({
+		page: String(page),
+		limit: String(limit),
+		...(date && { date }),
+		...(startDate && { startDate }),
+		...(endDate && { endDate }),
+		...(search && { search }),
+	});
+	const res = await apiClient.get(`/appointments/getall?${params}`);
 	return res.data;
 };
 

frontend/src/api/career.ts

@@ -1,11 +1,49 @@
 import apiClient from "@/api/client";
+import toast from "react-hot-toast";
 
 export const getCareersApi = async () => {
-	const res = await apiClient.get("/careers/getAll");
+	const res = await apiClient.get("/careers/getAll?admin=true");
 	return res.data;
 };
 
+export const createCareerApi = async (data: any) => {
+	try {
+		const res = await apiClient.post("/careers", data);
+
+		toast.success("Career created successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to create career");
+
+		throw error;
+	}
+};
+
+export const updateCareerApi = async (id: number, data: any) => {
+	try {
+		const res = await apiClient.patch(`/careers/${id}`, data);
+
+		toast.success("Career updated successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to update career");
+
+		throw error;
+	}
+};
+
 export const deleteCareerApi = async (id: number) => {
-	const res = await apiClient.delete(`/careers/${id}`);
-	return res.data;
+	try {
+		const res = await apiClient.delete(`/careers/${id}`);
+
+		toast.success("Career deleted successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to delete career");
+
+		throw error;
+	}
 };

frontend/src/api/client.ts

@@ -1,10 +1,10 @@
 import axios from "axios";
 import type {InternalAxiosRequestConfig} from "axios";
 
-const BASE_URL: string = "http://localhost:3000/api";
+const baseURL: string = import.meta.env.VITE_API_URL;
 
 const apiClient = axios.create({
-	baseURL: BASE_URL,
+	baseURL: baseURL,
 	headers: {
 		"Content-Type": "application/json",
 	},

frontend/src/api/department.ts

@@ -1,4 +1,5 @@
 import apiClient from "@/api/client";
+import toast from "react-hot-toast";
 
 export interface Department {
 	departmentId: string;
@@ -9,10 +10,12 @@ export interface Department {
 	para3: string;
 	facilities: string;
 	services: string;
+	isActive?: boolean;
+	sortOrder?: number;
 }
 
 export const getDepartmentsApi = async () => {
-	const res = await apiClient.get("/departments/getAll");
+	const res = await apiClient.get("/departments/getAll?admin=true");
 	return res.data;
 };
 
@@ -25,8 +28,19 @@ export const createDepartmentApi = async (data: {
 	facilities?: string;
 	services?: string;
 }) => {
-	const res = await apiClient.post("/departments", data);
-	return res.data;
+	try {
+		const res = await apiClient.post("/departments", data);
+
+		toast.success("Department created successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(
+			error?.response?.data?.message || "Failed to create department",
+		);
+
+		throw error;
+	}
 };
 
 export const updateDepartmentApi = async (
@@ -40,11 +54,33 @@ export const updateDepartmentApi = async (
 		services?: string;
 	},
 ) => {
-	const res = await apiClient.put(`/departments/${departmentId}`, data);
-	return res.data;
+	try {
+		const res = await apiClient.put(`/departments/${departmentId}`, data);
+
+		toast.success("Department updated successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(
+			error?.response?.data?.message || "Failed to update department",
+		);
+
+		throw error;
+	}
 };
 
 export const deleteDepartmentApi = async (departmentId: string) => {
-	const res = await apiClient.delete(`/departments/${departmentId}`);
-	return res.data;
+	try {
+		const res = await apiClient.delete(`/departments/${departmentId}`);
+
+		toast.success("Department deleted successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(
+			error?.response?.data?.message || "Failed to delete department",
+		);
+
+		throw error;
+	}
 };

frontend/src/api/doctor.ts

@@ -1,4 +1,5 @@
 import apiClient from "@/api/client";
+import toast from "react-hot-toast";
 
 export interface Doctor {
 	doctorId: string;
@@ -7,8 +8,10 @@ export interface Doctor {
 	designation?: string;
 	workingStatus?: string;
 	qualification?: string;
+	isActive: boolean;
+	globalSortOrder: number;
 
-	departments: {
+	departments?: {
 		departmentId: string;
 		timing?: {
 			monday?: string;
@@ -24,7 +27,7 @@ export interface Doctor {
 }
 
 export const getDoctorsApi = async () => {
-	const res = await apiClient.get("/doctors/getAll");
+	const res = await apiClient.get("/doctors/getAll?admin=true");
 	return res.data;
 };
 
@@ -34,21 +37,48 @@ export const getDoctorByIdApi = async (doctorId: string) => {
 };
 
 export const createDoctorApi = async (data: Doctor) => {
-	const res = await apiClient.post("/doctors", data);
-	return res.data;
+	try {
+		const res = await apiClient.post("/doctors", data);
+
+		toast.success("Doctor created successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to create doctor");
+
+		throw error;
+	}
 };
 
 export const updateDoctorApi = async (
 	doctorId: string,
 	data: Partial<Doctor>,
 ) => {
-	const res = await apiClient.patch(`/doctors/${doctorId}`, data);
-	return res.data;
+	try {
+		const res = await apiClient.patch(`/doctors/${doctorId}`, data);
+
+		toast.success("Doctor updated successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to update doctor");
+
+		throw error;
+	}
 };
 
 export const deleteDoctorApi = async (doctorId: string) => {
-	const res = await apiClient.delete(`/doctors/${doctorId}`);
-	return res.data;
+	try {
+		const res = await apiClient.delete(`/doctors/${doctorId}`);
+
+		toast.success("Doctor deleted successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to delete doctor");
+
+		throw error;
+	}
 };
 
 export const getDoctorTimingApi = async (doctorId: string) => {

frontend/src/api/newsMedia.ts

@@ -1,8 +1,8 @@
 import apiClient from "@/api/client";
 
-export const getNewsApi = async (page = 1, limit = 10) => {
+export const getNewsApi = async (page = 1, limit = 10, search = "") => {
 	const res = await apiClient.get(
-		`/newsMedia/getAll?page=${page}&limit=${limit}`,
+		`/newsMedia/getAll?page=${page}&limit=${limit}&search=${search}`,
 	);
 	return res.data;
 };

frontend/src/components/BytescaleUploader/BytescaleUploader.tsx

@@ -6,7 +6,7 @@ import axios from "axios";
 interface BytescaleUploaderProps {
 	value: string;
 	onChange: (url: string) => void;
-	folderPath: "/doctors" | "/departments" | "/news";
+	folderPath: "/doctors" | "/departments" | "/news" | "/blog";
 }
 
 export function BytescaleUploader({
@@ -14,6 +14,7 @@ export function BytescaleUploader({
 	onChange,
 	folderPath,
 }: BytescaleUploaderProps) {
+	const baseURL = import.meta.env.VITE_API_URL;
 	const [isUploading, setIsUploading] = useState(false);
 	const fileInputRef = useRef<HTMLInputElement>(null);
 
@@ -33,15 +34,11 @@ export function BytescaleUploader({
 		formData.append("folderPath", folderPath);
 
 		try {
-			const response = await axios.post(
-				"http://localhost:3000/api/upload",
-				formData,
-				{
-					headers: {
-						"Content-Type": "multipart/form-data",
-					},
+			const response = await axios.post(`${baseURL}/upload`, formData, {
+				headers: {
+					"Content-Type": "multipart/form-data",
 				},
-			);
+			});
 
 			const {fileUrl} = response.data;
 			onChange(fileUrl);

frontend/src/pages/Appointment.tsx

@@ -40,57 +40,54 @@ export default function AppointmentPage() {
 	const [searchText, setSearchText] = useState("");
 	const [filterDoctor, setFilterDoctor] = useState("");
 	const [filterDate, setFilterDate] = useState("");
-
+	const [startDate, setStartDate] = useState("");
+	const [endDate, setEndDate] = useState("");
 	const [viewOpen, setViewOpen] = useState(false);
 	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,
+				startDate,
+				endDate,
+				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, startDate, endDate, 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);
@@ -122,20 +119,87 @@ export default function AppointmentPage() {
 			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
 				<h1 className="text-3xl font-bold">Appointments</h1>
 
-				<div className="flex flex-wrap gap-3">
-					<Input
-						placeholder="Search name / phone..."
-						value={searchText}
-						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[220px] text-base"
-					/>
+				<div className="flex flex-wrap gap-4 items-end">
+					<div className="flex flex-col gap-1">
+						<label className="text-xs font-medium text-muted-foreground">
+							Search
+						</label>
+						<Input
+							placeholder="Search name / phone..."
+							value={searchText}
+							onChange={(e) => {
+								setSearchText(e.target.value);
+								setCurrentPage(1);
+							}}
+							className="w-[220px] text-base"
+						/>
+					</div>
 
-					<Input
-						type="date"
-						value={filterDate}
-						onChange={(e) => setFilterDate(e.target.value)}
-						className="w-[160px] text-base"
-					/>
+					<div className="flex flex-col gap-1">
+						<label className="text-xs font-medium text-muted-foreground">
+							Date
+						</label>
+						<Input
+							type="date"
+							value={filterDate}
+							onChange={(e) => {
+								setFilterDate(e.target.value);
+								setCurrentPage(1);
+							}}
+							className="w-[160px] text-base"
+							disabled={!!startDate || !!endDate}
+						/>
+					</div>
+
+					<div className="flex flex-col gap-1">
+						<label className="text-xs font-medium text-muted-foreground">
+							From
+						</label>
+						<Input
+							type="date"
+							value={startDate}
+							onChange={(e) => {
+								setStartDate(e.target.value);
+								setCurrentPage(1);
+							}}
+							className="w-[160px] text-base"
+							disabled={!!filterDate}
+						/>
+					</div>
+
+					<div className="flex flex-col gap-1">
+						<label className="text-xs font-medium text-muted-foreground">
+							To
+						</label>
+						<Input
+							type="date"
+							value={endDate}
+							onChange={(e) => {
+								setEndDate(e.target.value);
+								setCurrentPage(1);
+							}}
+							className="w-[160px] text-base"
+							disabled={!!filterDate}
+						/>
+					</div>
+
+					<div className="flex flex-col gap-1">
+						<label className="text-xs font-medium text-muted-foreground">
+							Rows
+						</label>
+						<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>
+					</div>
 
 					<Button
 						variant="outline"
@@ -192,7 +256,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 +266,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 +324,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">

frontend/src/pages/BlogDetails.tsx

@@ -1,72 +1,202 @@
 import React, {useEffect, useState} from "react";
 import {useParams, useNavigate} from "react-router-dom";
-import axios from "axios";
 
 import {Button} from "@/components/ui/button";
-import {Card, CardContent} from "@/components/ui/card";
 import {getBlogByIdApi} from "@/api/blog";
 
+/* ---------------- LIST RENDERER ---------------- */
+const renderList = (items, style) => {
+	// ✅ Checklist
+	if (style === "checklist") {
+		return (
+			<div className="mb-4 space-y-2">
+				{items.map((item, i) => (
+					<div key={i} className="flex items-center gap-2">
+						<input
+							type="checkbox"
+							checked={item.meta?.checked || false}
+							readOnly
+						/>
+						<span
+							className={item.meta?.checked ? "line-through opacity-60" : ""}
+							dangerouslySetInnerHTML={{
+								__html: item.content || "",
+							}}
+						/>
+					</div>
+				))}
+			</div>
+		);
+	}
+
+	// ✅ Ordered / Unordered
+	const ListTag = style === "ordered" ? "ol" : "ul";
+
+	return (
+		<ListTag
+			className={`pl-6 mb-4 ${
+				style === "ordered" ? "list-decimal" : "list-disc"
+			}`}
+		>
+			{items
+				.filter((item) => item.content)
+				.map((item, i) => (
+					<li key={i}>
+						<span
+							dangerouslySetInnerHTML={{
+								__html: item.content,
+							}}
+						/>
+						{item.items?.length > 0 && renderList(item.items, style)}
+					</li>
+				))}
+		</ListTag>
+	);
+};
+
+/* ---------------- BLOCK RENDERER ---------------- */
+const renderBlock = (block, index) => {
+	switch (block.type) {
+		case "paragraph":
+			return (
+				<p
+					key={index}
+					className="mb-4 leading-7 text-gray-800"
+					dangerouslySetInnerHTML={{__html: block.data.text}}
+				/>
+			);
+
+		case "header":
+			return (
+				<h2
+					key={index}
+					className="text-2xl font-semibold mb-4"
+					dangerouslySetInnerHTML={{__html: block.data.text}}
+				/>
+			);
+
+		case "image":
+			return (
+				<img
+					key={index}
+					src={block.data.file?.url}
+					alt={block.data.caption || "blog-image"}
+					className="w-full rounded-lg mb-4"
+				/>
+			);
+
+		case "list":
+			return (
+				<div key={index}>{renderList(block.data.items, block.data.style)}</div>
+			);
+
+		case "quote":
+			return (
+				<blockquote
+					key={index}
+					className="border-l-4 border-gray-300 pl-4 italic my-4 text-gray-600"
+				>
+					{block.data.text}
+				</blockquote>
+			);
+
+		case "code":
+			return (
+				<pre
+					key={index}
+					className="bg-gray-100 p-4 rounded-md overflow-x-auto text-sm mb-4"
+				>
+					<code>{block.data.code}</code>
+				</pre>
+			);
+
+		case "table":
+			return (
+				<div key={index} className="overflow-x-auto mb-6">
+					<table className="w-full border border-gray-200">
+						<tbody>
+							{block.data.content.map((row, i) => (
+								<tr key={i}>
+									{row.map((cell, j) => (
+										<td
+											key={j}
+											className="border px-3 py-2"
+											dangerouslySetInnerHTML={{
+												__html: cell,
+											}}
+										/>
+									))}
+								</tr>
+							))}
+						</tbody>
+					</table>
+				</div>
+			);
+
+		case "delimiter":
+			return <hr key={index} className="my-6 border-gray-300" />;
+
+		default:
+			return null;
+	}
+};
+
+/* ---------------- MAIN COMPONENT ---------------- */
 const BlogDetail = () => {
 	const {id} = useParams();
 	const navigate = useNavigate();
-	const [blog, setBlog] = useState<any>(null);
+	const [blog, setBlog] = useState(null);
 
-	const fetchBlogById = async () => {
+	const fetchBlog = async () => {
 		try {
-			const response = await getBlogByIdApi(Number(id));
-
-			setBlog(response);
-		} catch (error) {
-			console.error("Error fetching blog", error);
+			const res = await getBlogByIdApi(Number(id));
+			console.log({res});
+			setBlog(res);
+		} catch (err) {
+			console.error("Error fetching blog", err);
 		}
 	};
 
 	useEffect(() => {
-		fetchBlogById();
-	}, [id]); // ✅ FIXED dependency
+		fetchBlog();
+	}, [id]);
 
 	if (!blog) {
-		return <div className="mt-40 text-center text-gray-500">Loading...</div>;
+		return <p className="mt-40 text-center">Loading...</p>;
 	}
 
 	return (
-		<div className=" mx-auto flex flex-col ">
-			<Card>
-				<CardContent className="p-6 space-y-4">
-					{/* Back */}
-					<Button
-						variant="ghost"
-						className="text-black-600 p-0"
-						onClick={() => navigate(-1)}
-					>
-						← Back
-					</Button>
+		<div className="mx-auto flex flex-col ">
+			{/* Back Button */}
+			<Button
+				variant="ghost"
+				className="mb-4 w-fit text-black px-0"
+				onClick={() => navigate(-1)}
+			>
+				← Back
+			</Button>
 
-					{/* Title */}
-					<h1 className="text-2xl md:text-4xl lg:text-5xl font-bold">
-						{blog.title}
-					</h1>
+			{/* Title */}
+			<h1 className="text-3xl md:text-5xl font-bold mb-2">{blog.title}</h1>
 
-					{/* Meta */}
-					<p className="text-gray-500 text-sm">
-						{blog.writer} • {new Date(blog.createdAt).toLocaleDateString()}
-					</p>
+			{/* Meta */}
+			<p className="text-gray-500 mb-4">
+				{blog.writer} • {new Date(blog.createdAt).toLocaleDateString()}
+			</p>
 
-					{/* Image */}
-					<img
-						src={blog.image}
-						alt={blog.title}
-						className="w-full h-[220px] md:h-[400px] object-cover rounded-md"
-					/>
+			{/* Image (only if exists) */}
+			{blog.image?.trim() && (
+				<img
+					src={blog.image}
+					alt="blog"
+					className="w-full h-[220px] md:h-[400px] object-cover rounded-lg mb-6"
+				/>
+			)}
 
-					{/* Content */}
-					<div className="space-y-3 text-gray-800 leading-relaxed">
-						{blog.content?.blocks?.map((block: any, index: number) => (
-							<p key={index}>{block.data?.text}</p>
-						))}
-					</div>
-				</CardContent>
-			</Card>
+			{/* Content */}
+			<div>
+				{blog.content?.blocks?.map((block, index) => renderBlock(block, index))}
+			</div>
 		</div>
 	);
 };

frontend/src/pages/BlogEditor.tsx

@@ -1,6 +1,6 @@
 import {useEffect, useRef, useState} from "react";
 import {useNavigate, useParams} from "react-router-dom";
-
+import {BytescaleUploader} from "@/components/BytescaleUploader/BytescaleUploader";
 import EditorJS, {OutputData} from "@editorjs/editorjs";
 import Header from "@editorjs/header";
 import List from "@editorjs/list";
@@ -10,6 +10,7 @@ import Table from "@editorjs/table";
 import CodeTool from "@editorjs/code";
 import Embed from "@editorjs/embed";
 import Delimiter from "@editorjs/delimiter";
+import axios from "axios";
 
 import {
 	createBlogApi,
@@ -23,6 +24,7 @@ import {Input} from "@/components/ui/input";
 import {Button} from "@/components/ui/button";
 
 export default function BlogEditorPage() {
+	const baseURL = import.meta.env.VITE_API_URL;
 	const {id} = useParams();
 	const navigate = useNavigate();
 
@@ -79,12 +81,41 @@ export default function BlogEditorPage() {
 						config: {
 							uploader: {
 								uploadByFile: async (file: File) => {
-									const res = await uploadImageApi(file);
+									if (file.size > 5 * 1024 * 1024) {
+										alert("File is too large (Max 5MB)");
+										return {success: 0, file: {url: ""}};
+									}
 
-									return {
-										success: 1,
-										file: {url: res.file.url},
-									};
+									const formData = new FormData();
+									formData.append("file", file);
+									formData.append("folderPath", "/blog");
+
+									try {
+										const response = await axios.post(
+											`${baseURL}/upload`,
+											formData,
+											{
+												headers: {
+													"Content-Type": "multipart/form-data",
+												},
+											},
+										);
+
+										return {
+											success: 1,
+											file: {url: response.data.fileUrl},
+										};
+									} catch (e: any) {
+										console.error("EditorJS Image Upload Error:", e);
+										const errorMessage =
+											e.response?.data?.error || e.message || "Upload failed";
+										alert(`Upload Error: ${errorMessage}`);
+
+										return {
+											success: 0,
+											file: {url: ""},
+										};
+									}
 								},
 							},
 						},
@@ -117,18 +148,6 @@ export default function BlogEditorPage() {
 		initEditor();
 	}, [id, isEdit]);
 
-	const handleCoverUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
-		const file = e.target.files?.[0];
-		if (!file) return;
-
-		try {
-			const res = await uploadImageApi(file);
-			setCoverImage(res.file.url);
-		} catch (err) {
-			console.error(err);
-		}
-	};
-
 	const handleSave = async () => {
 		if (!editorRef.current) return;
 
@@ -182,7 +201,11 @@ export default function BlogEditorPage() {
 					<div className="space-y-2">
 						<label className="text-sm font-medium">Cover Image</label>
 
-						<Input type="file" onChange={handleCoverUpload} />
+						<BytescaleUploader
+							value={coverImage}
+							folderPath="/blog"
+							onChange={(url) => setCoverImage(url)}
+						/>
 
 						{coverImage && (
 							<img

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 { getCareersApi, updateCareerApi, createCareerApi } from "@/api/career";
 
 import {
 	Table,
@@ -24,12 +23,13 @@ import {
 
 import { Input } from "@/components/ui/input";
 import { Badge } from "@/components/ui/badge";
+import { Switch } from "@/components/ui/switch";
+import { Label } from "@/components/ui/label";
 
 import {
 	Loader2,
 	Plus,
 	Pencil,
-	Trash,
 	RefreshCw,
 	ChevronLeft,
 	ChevronRight,
@@ -55,6 +55,8 @@ export default function CareerPage() {
 		email: "",
 		number: "",
 		status: "new",
+		isActive: true,
+		sortOrder: 0,
 	});
 
 	const fetchAll = useCallback(async () => {
@@ -92,6 +94,18 @@ export default function CareerPage() {
 		setForm({ ...form, [e.target.name]: e.target.value });
 	}
 
+	const handleToggleStatus = async (item: any) => {
+		try {
+			await updateCareerApi(item.id, {
+				...item,
+				isActive: !item.isActive,
+			} as any);
+			fetchAll();
+		} catch (error) {
+			console.error("Failed to toggle status", error);
+		}
+	};
+
 	function openAdd() {
 		setEditing(null);
 		setForm({
@@ -102,6 +116,8 @@ export default function CareerPage() {
 			email: "",
 			number: "",
 			status: "new",
+			isActive: true,
+			sortOrder: 0,
 		});
 		setOpenModal(true);
 	}
@@ -116,6 +132,8 @@ export default function CareerPage() {
 			email: item.email || "",
 			number: item.number || "",
 			status: item.status || "new",
+			isActive: item.isActive ?? true,
+			sortOrder: item.sortOrder ?? 0,
 		});
 		setOpenModal(true);
 	}
@@ -123,10 +141,11 @@ export default function CareerPage() {
 	async function handleSubmit() {
 		try {
 			if (editing) {
-				await apiClient.patch(`/careers/${editing.id}`, form);
+				await updateCareerApi(editing.id, form);
 			} else {
-				await apiClient.post("/careers", form);
+				await createCareerApi(form);
 			}
+
 			setOpenModal(false);
 			fetchAll();
 		} catch (err) {
@@ -134,12 +153,6 @@ export default function CareerPage() {
 		}
 	}
 
-	async function handleDelete(id: number) {
-		if (!confirm("Delete career?")) return;
-		await deleteCareerApi(id);
-		fetchAll();
-	}
-
 	return (
 		<div className="p-6 space-y-6">
 			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
@@ -177,13 +190,13 @@ export default function CareerPage() {
 
 				<CardContent className="p-0 sm:p-6 space-y-4">
 					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
-						<Table className="w-full min-w-[1000px] table-fixed border-separate border-spacing-0">
+						<Table className="w-full min-w-[800px] table-fixed border-separate border-spacing-0">
 							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
 								<TableRow>
-									<TableHead className="w-[60px] bg-background font-bold text-sm">
-										ID
+									<TableHead className="w-[80px] bg-background font-bold text-sm">
+										Priority
 									</TableHead>
-									<TableHead className="w-[200px] bg-background font-bold text-sm">
+									<TableHead className="w-[250px] bg-background font-bold text-sm">
 										Post & Designation
 									</TableHead>
 									<TableHead className="w-[200px] bg-background font-bold text-sm">
@@ -192,13 +205,10 @@ export default function CareerPage() {
 									<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 className="w-[80px] bg-background font-bold text-sm">
+										Status (Active)
 									</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">
+									<TableHead className="w-[80px] bg-background font-bold text-right text-sm">
 										Actions
 									</TableHead>
 								</TableRow>
@@ -207,14 +217,14 @@ export default function CareerPage() {
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={7} className="text-center py-10">
+										<TableCell colSpan={6} className="text-center py-10">
 											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
 								) : currentItems.length === 0 ? (
 									<TableRow>
 										<TableCell
-											colSpan={7}
+											colSpan={6}
 											className="text-center text-muted-foreground py-10 text-base"
 										>
 											No careers found
@@ -224,7 +234,7 @@ export default function CareerPage() {
 									currentItems.map((item) => (
 										<TableRow key={item.id} className="hover:bg-muted/50">
 											<TableCell className="font-mono text-xs">
-												{item.id}
+												{item.sortOrder}
 											</TableCell>
 											<TableCell>
 												<div className="font-semibold text-base truncate">
@@ -243,21 +253,19 @@ export default function CareerPage() {
 												{item.experienceNeed}
 											</TableCell>
 											<TableCell>
-												<div className="text-sm font-medium">{item.email}</div>
-												<div className="text-xs text-muted-foreground">
-													{item.number}
+												<div className="flex items-center gap-2">
+													<Switch
+														checked={item.isActive}
+														onCheckedChange={() => handleToggleStatus(item)}
+													/>
+													<Badge
+														variant={item.isActive ? "default" : "secondary"}
+														className="capitalize"
+													>
+														{item.isActive ? "Active" : "Hidden"}
+													</Badge>
 												</div>
 											</TableCell>
-											<TableCell>
-												<Badge
-													variant={
-														item.status === "active" ? "default" : "secondary"
-													}
-													className="capitalize"
-												>
-													{item.status}
-												</Badge>
-											</TableCell>
 
 											<TableCell className="text-right">
 												<div className="flex justify-end gap-2">
@@ -269,15 +277,6 @@ export default function CareerPage() {
 													>
 														<Pencil className="h-4 w-4" />
 													</Button>
-
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
-														onClick={() => handleDelete(item.id)}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
 												</div>
 											</TableCell>
 										</TableRow>
@@ -393,6 +392,30 @@ export default function CareerPage() {
 								onChange={handleChange}
 								className="text-base"
 							/>
+							<div className="flex items-center justify-between p-2 border rounded-md">
+								<Label htmlFor="isActive" className="text-base">
+									Active
+								</Label>
+								<Switch
+									id="isActive"
+									checked={form.isActive}
+									onCheckedChange={(val) => setForm({ ...form, isActive: val })}
+								/>
+							</div>
+							<div className="space-y-1">
+								<Label htmlFor="sortOrder" className="text-sm">
+									Sort Priority (Lower numbers show first)
+								</Label>
+								<Input
+									id="sortOrder"
+									name="sortOrder"
+									type="number"
+									placeholder="Sort Order"
+									value={form.sortOrder}
+									onChange={handleChange}
+									className="text-base"
+								/>
+							</div>
 						</div>
 					</div>
 

frontend/src/pages/Department.tsx

@@ -6,7 +6,6 @@ import {
 	getDepartmentsApi,
 	createDepartmentApi,
 	updateDepartmentApi,
-	deleteDepartmentApi,
 } from "@/api/department";
 
 import {
@@ -31,13 +30,15 @@ import {
 
 import {Input} from "@/components/ui/input";
 import {Textarea} from "@/components/ui/textarea";
+import {Switch} from "@/components/ui/switch";
+import {Label} from "@/components/ui/label";
+import {Badge} from "@/components/ui/badge";
 
 import {
 	Loader2,
 	RefreshCw,
 	Plus,
 	Pencil,
-	Trash,
 	Eye,
 	ChevronLeft,
 	ChevronRight,
@@ -52,6 +53,8 @@ interface Department {
 	para3: string;
 	facilities: string;
 	services: string;
+	isActive: boolean;
+	sortOrder: number;
 }
 
 export default function DepartmentPage() {
@@ -79,6 +82,8 @@ export default function DepartmentPage() {
 		para3: "",
 		facilities: "",
 		services: "",
+		isActive: true,
+		sortOrder: 0,
 	});
 
 	const fetchDepartments = useCallback(async () => {
@@ -122,13 +127,23 @@ export default function DepartmentPage() {
 	);
 
 	function handleChange(e: any) {
-		setForm({...form, [e.target.name]: e.target.value});
+		const value =
+			e.target.type === "number" ? Number(e.target.value) : e.target.value;
+		setForm({...form, [e.target.name]: value});
 	}
 
-	function truncate(text: string, limit = 60) {
-		if (!text) return "-";
-		return text.length > limit ? text.substring(0, limit) + "..." : text;
-	}
+	const handleToggleStatus = async (dep: Department) => {
+		try {
+			const {departmentId, ...updateData} = dep;
+			await updateDepartmentApi(departmentId, {
+				...updateData,
+				isActive: !dep.isActive,
+			} as any);
+			fetchDepartments();
+		} catch (error) {
+			console.error("Failed to toggle status", error);
+		}
+	};
 
 	function openAdd() {
 		setEditing(null);
@@ -141,13 +156,19 @@ export default function DepartmentPage() {
 			para3: "",
 			facilities: "",
 			services: "",
+			isActive: true,
+			sortOrder: 0,
 		});
 		setOpenModal(true);
 	}
 
 	function openEdit(dep: Department) {
 		setEditing(dep);
-		setForm(dep);
+		setForm({
+			...dep,
+			isActive: dep.isActive ?? true,
+			sortOrder: dep.sortOrder ?? 0,
+		});
 		setOpenModal(true);
 	}
 
@@ -160,7 +181,7 @@ export default function DepartmentPage() {
 		try {
 			if (editing) {
 				const {departmentId, ...updateData} = form;
-				await updateDepartmentApi(editing.departmentId, updateData);
+				await updateDepartmentApi(editing.departmentId, form as any);
 			} else {
 				await createDepartmentApi(form);
 			}
@@ -172,17 +193,6 @@ export default function DepartmentPage() {
 		}
 	}
 
-	async function handleDelete(id: string) {
-		if (!confirm("Delete this department?")) return;
-
-		try {
-			await deleteDepartmentApi(id);
-			fetchDepartments();
-		} catch (error) {
-			console.error(error);
-		}
-	}
-
 	return (
 		<div className="p-6 space-y-6">
 			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
@@ -226,25 +236,19 @@ export default function DepartmentPage() {
 
 				<CardContent className="p-0 sm:p-6 space-y-4">
 					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
-						<Table className="w-full min-w-[900px] table-fixed border-separate border-spacing-0">
+						<Table className="w-full min-w-[700px] table-fixed border-separate border-spacing-0">
 							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
 								<TableRow>
 									<TableHead className="w-[100px] bg-background text-sm font-bold">
-										ID
+										Priority
 									</TableHead>
-									<TableHead className="w-[200px] bg-background text-sm font-bold">
+									<TableHead className="w-[300px] bg-background text-sm font-bold">
 										Name
 									</TableHead>
-									<TableHead className="w-[250px] bg-background text-sm font-bold">
-										Para 1
+									<TableHead className="w-[80px] bg-background text-sm font-bold">
+										Status (Active)
 									</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">
+									<TableHead className="w-[80px] bg-background text-right text-sm font-bold">
 										Actions
 									</TableHead>
 								</TableRow>
@@ -253,14 +257,14 @@ export default function DepartmentPage() {
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={6} className="text-center py-10">
+										<TableCell colSpan={4} className="text-center py-10">
 											<Loader2 className="h-8 w-8 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
 								) : currentItems.length === 0 ? (
 									<TableRow>
 										<TableCell
-											colSpan={6}
+											colSpan={4}
 											className="text-center text-muted-foreground py-10 text-base"
 										>
 											No departments found
@@ -272,8 +276,8 @@ export default function DepartmentPage() {
 											key={dep.departmentId}
 											className="hover:bg-muted/50"
 										>
-											<TableCell className="font-mono text-xs">
-												{dep.departmentId}
+											<TableCell className="font-mono text-sm">
+												{dep.sortOrder}
 											</TableCell>
 
 											<TableCell>
@@ -283,23 +287,21 @@ export default function DepartmentPage() {
 												>
 													{dep.name}
 												</div>
-											</TableCell>
-
-											<TableCell>
-												<div className="text-sm break-words whitespace-normal">
-													{truncate(dep.para1)}
+												<div className="text-xs text-muted-foreground">
+													{dep.departmentId}
 												</div>
 											</TableCell>
-
 											<TableCell>
-												<div className="text-sm break-words whitespace-normal">
-													{truncate(dep.facilities)}
-												</div>
-											</TableCell>
-
-											<TableCell>
-												<div className="text-sm break-words whitespace-normal">
-													{truncate(dep.services)}
+												<div className="flex items-center gap-2">
+													<Switch
+														checked={dep.isActive}
+														onCheckedChange={() => handleToggleStatus(dep)}
+													/>
+													<Badge
+														variant={dep.isActive ? "default" : "secondary"}
+													>
+														{dep.isActive ? "Active" : "Hidden"}
+													</Badge>
 												</div>
 											</TableCell>
 
@@ -322,15 +324,6 @@ export default function DepartmentPage() {
 													>
 														<Pencil className="h-4 w-4" />
 													</Button>
-
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
-														onClick={() => handleDelete(dep.departmentId)}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
 												</div>
 											</TableCell>
 										</TableRow>
@@ -450,6 +443,32 @@ export default function DepartmentPage() {
 							onChange={handleChange}
 							placeholder="Services"
 						/>
+
+						<div className="grid grid-cols-1 md:grid-cols-2 gap-4 border-t pt-4">
+							<div className="flex items-center justify-between p-3 border rounded-md">
+								<Label htmlFor="isActive" className="text-base cursor-pointer">
+									Active Visibility
+								</Label>
+								<Switch
+									id="isActive"
+									checked={form.isActive}
+									onCheckedChange={(val) => setForm({...form, isActive: val})}
+								/>
+							</div>
+							<div className="space-y-1">
+								<Label htmlFor="sortOrder">
+									Sort Priority (Lower numbers show first)
+								</Label>
+								<Input
+									id="sortOrder"
+									name="sortOrder"
+									type="number"
+									value={form.sortOrder}
+									onChange={handleChange}
+									placeholder="0"
+								/>
+							</div>
+						</div>
 					</div>
 
 					<DialogFooter>
@@ -470,9 +489,17 @@ export default function DepartmentPage() {
 					</DialogHeader>
 					{viewData && (
 						<div className="space-y-4 text-sm">
-							<p>
-								<b>ID:</b> {viewData.departmentId}
-							</p>
+							<div className="flex gap-4 items-center border-b pb-4">
+								<Badge variant={viewData.isActive ? "default" : "secondary"}>
+									{viewData.isActive ? "ACTIVE" : "HIDDEN"}
+								</Badge>
+								<p>
+									<b>Sort Order:</b> {viewData.sortOrder}
+								</p>
+								<p>
+									<b>ID:</b> {viewData.departmentId}
+								</p>
+							</div>
 							<p>
 								<b>Name:</b> {viewData.name}
 							</p>

frontend/src/pages/Doctor.tsx

@@ -7,7 +7,6 @@ import {
 	getDoctorsApi,
 	createDoctorApi,
 	updateDoctorApi,
-	deleteDoctorApi,
 	getDoctorTimingApi,
 } from "@/api/doctor";
 import { getDepartmentsApi } from "@/api/department";
@@ -31,15 +30,16 @@ import {
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Badge } from "@/components/ui/badge";
+import { Switch } from "@/components/ui/switch";
+import { Label } from "@/components/ui/label";
+
 import {
 	Loader2,
 	RefreshCw,
 	Plus,
 	Pencil,
-	Trash,
 	ChevronLeft,
 	ChevronRight,
-	User,
 } from "lucide-react";
 
 interface Department {
@@ -80,6 +80,8 @@ export default function DoctorPage() {
 		designation: "",
 		workingStatus: "",
 		qualification: "",
+		isActive: true,
+		globalSortOrder: 0,
 		departments: [],
 	});
 
@@ -108,17 +110,36 @@ export default function DoctorPage() {
 		fetchAll();
 	}, [fetchAll]);
 
-	const filteredDoctors = doctors.filter((doc) => {
-		const matchesSearch =
-			doc.name.toLowerCase().includes(searchText.toLowerCase()) ||
-			doc.doctorId.toLowerCase().includes(searchText.toLowerCase());
+	const filteredDoctors = doctors
+		.filter((doc) => {
+			const matchesSearch =
+				doc.name.toLowerCase().includes(searchText.toLowerCase()) ||
+				doc.doctorId.toLowerCase().includes(searchText.toLowerCase());
 
-		const matchesDepartment = filterDepartment
-			? doc.departments?.some((d: any) => d.departmentId === filterDepartment)
-			: true;
+			const matchesDepartment = filterDepartment
+				? doc.departments?.some((d: any) => d.departmentId === filterDepartment)
+				: true;
 
-		return matchesSearch && matchesDepartment;
-	});
+			return matchesSearch && matchesDepartment;
+		})
+		.sort((a, b) => {
+			if (!filterDepartment) {
+				return a.globalSortOrder - b.globalSortOrder;
+			}
+
+			const aDept = a.departments.find(
+				(d: any) => d.departmentId === filterDepartment,
+			);
+
+			const bDept = b.departments.find(
+				(d: any) => d.departmentId === filterDepartment,
+			);
+
+			return (
+				(aDept?.deptSortOrder ?? Number.MAX_SAFE_INTEGER) -
+				(bDept?.deptSortOrder ?? Number.MAX_SAFE_INTEGER)
+			);
+		});
 
 	useEffect(() => {
 		setCurrentPage(1);
@@ -130,9 +151,27 @@ export default function DoctorPage() {
 	const currentItems = filteredDoctors.slice(indexOfFirstItem, indexOfLastItem);
 
 	function handleChange(e: any) {
-		setForm({ ...form, [e.target.name]: e.target.value });
+		const value =
+			e.target.type === "number" ? Number(e.target.value) : e.target.value;
+		setForm({ ...form, [e.target.name]: value });
 	}
 
+	const handleToggleStatus = async (doc: any) => {
+		try {
+			const newStatus = !doc.isActive;
+
+			const payload = {
+				isActive: newStatus,
+			};
+
+			await updateDoctorApi(doc.doctorId, payload);
+
+			fetchAll();
+		} catch (err) {
+			console.error("Failed to update status", err);
+		}
+	};
+
 	function handleDepartmentToggle(depId: string) {
 		const exists = form.departments.find((d: any) => d.departmentId === depId);
 		if (exists) {
@@ -145,11 +184,23 @@ export default function DoctorPage() {
 		} else {
 			setForm({
 				...form,
-				departments: [...form.departments, { departmentId: depId, timing: {} }],
+				departments: [
+					...form.departments,
+					{ departmentId: depId, sortOrder: 0, timing: {} },
+				],
 			});
 		}
 	}
 
+	function handleDeptSortChange(depId: string, value: string) {
+		setForm({
+			...form,
+			departments: form.departments.map((d: any) =>
+				d.departmentId === depId ? { ...d, sortOrder: Number(value) } : d,
+			),
+		});
+	}
+
 	function handleTimingChange(depId: string, day: string, value: string) {
 		setForm({
 			...form,
@@ -170,6 +221,8 @@ export default function DoctorPage() {
 			designation: "",
 			workingStatus: "",
 			qualification: "",
+			isActive: true,
+			globalSortOrder: 0,
 			departments: [],
 		});
 		setOpenModal(true);
@@ -180,6 +233,7 @@ export default function DoctorPage() {
 		try {
 			const timingRes = await getDoctorTimingApi(doc.doctorId);
 			const timingData = timingRes?.data?.departments || [];
+
 			setForm({
 				doctorId: doc.doctorId,
 				name: doc.name,
@@ -187,14 +241,17 @@ export default function DoctorPage() {
 				designation: doc.designation,
 				workingStatus: doc.workingStatus,
 				qualification: doc.qualification,
+				isActive: doc.isActive ?? true,
+				globalSortOrder: doc.globalSortOrder ?? 0,
 				departments: timingData.map((d: any) => ({
 					departmentId: d.departmentId,
+					sortOrder: d.deptSortOrder ?? 0,
 					timing: d.timing || {},
 				})),
 			});
 			setOpenModal(true);
 		} catch (err) {
-			console.error(err);
+			console.error("Error fetching doctor details:", err);
 		}
 	}
 
@@ -212,16 +269,6 @@ export default function DoctorPage() {
 		}
 	}
 
-	async function handleDelete(id: string) {
-		if (!confirm("Delete this doctor?")) return;
-		try {
-			await deleteDoctorApi(id);
-			fetchAll();
-		} catch (error) {
-			console.error(error);
-		}
-	}
-
 	return (
 		<div className="p-6 space-y-6">
 			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
@@ -278,25 +325,25 @@ export default function DoctorPage() {
 
 				<CardContent className="p-0 sm:p-6 space-y-4">
 					<div className="rounded-md border overflow-x-auto overflow-y-auto max-h-[650px] relative">
-						<Table className="w-full min-w-[900px] table-fixed border-separate border-spacing-0">
+						<Table className="w-full min-w-[1100px] table-fixed border-separate border-spacing-0">
 							<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
 								<TableRow>
-									<TableHead className="w-[100px] bg-background text-sm font-bold">
-										ID
-									</TableHead>
-									<TableHead className="w-[200px] bg-background text-sm font-bold">
-										Name
+									<TableHead className="w-[80px] bg-background text-sm font-bold">
+										Priority{" "}
 									</TableHead>
 									<TableHead className="w-[180px] bg-background text-sm font-bold">
+										Doctor Info
+									</TableHead>
+									<TableHead className="w-[150px] bg-background text-sm font-bold">
 										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
+										Departments (Hierarchy)
 									</TableHead>
-									<TableHead className="w-[120px] bg-background text-right text-sm font-bold">
+									<TableHead className="w-[80px] bg-background text-sm font-bold">
+										Status (Active)
+									</TableHead>
+									<TableHead className="w-[80px] bg-background text-right text-sm font-bold">
 										Actions
 									</TableHead>
 								</TableRow>
@@ -321,8 +368,8 @@ export default function DoctorPage() {
 								) : (
 									currentItems.map((doc) => (
 										<TableRow key={doc.doctorId} className="hover:bg-muted/50">
-											<TableCell className="truncate font-mono text-xs">
-												{doc.doctorId}
+											<TableCell className="font-mono text-sm">
+												{doc.globalSortOrder}
 											</TableCell>
 
 											<TableCell>
@@ -332,26 +379,20 @@ export default function DoctorPage() {
 												>
 													{doc.name}
 												</div>
-												<div className="text-xs text-muted-foreground truncate italic">
-													{doc.workingStatus}
+												<div className="text-xs text-muted-foreground truncate font-mono">
+													{doc.doctorId}
 												</div>
 											</TableCell>
 
 											<TableCell>
 												<div
-													className="truncate text-sm"
+													className="truncate text-sm font-medium"
 													title={doc.designation}
 												>
 													{doc.designation || "-"}
 												</div>
-											</TableCell>
-
-											<TableCell>
-												<div
-													className="truncate text-sm"
-													title={doc.qualification}
-												>
-													{doc.qualification || "-"}
+												<div className="text-xs italic text-muted-foreground truncate">
+													{doc.workingStatus}
 												</div>
 											</TableCell>
 
@@ -361,14 +402,28 @@ export default function DoctorPage() {
 														<Badge
 															key={d.departmentId}
 															variant="secondary"
-															className="text-xs px-2 h-5 leading-none"
+															className="text-xs px-2 h-6 leading-none flex items-center gap-1"
 														>
 															{d.departmentName}
+															<span className="bg-primary text-primary-foreground px-1 rounded-full text-[10px]">
+																{d.deptSortOrder}
+															</span>
 														</Badge>
 													))}
-													{doc.departments?.length === 0 && (
-														<span className="text-muted-foreground">-</span>
-													)}
+												</div>
+											</TableCell>
+
+											<TableCell>
+												<div className="flex items-center gap-2">
+													<Switch
+														checked={doc.isActive}
+														onCheckedChange={() => handleToggleStatus(doc)}
+													/>
+													<Badge
+														variant={doc.isActive ? "default" : "secondary"}
+													>
+														{doc.isActive ? "Active" : "Hidden"}
+													</Badge>
 												</div>
 											</TableCell>
 
@@ -382,14 +437,6 @@ export default function DoctorPage() {
 													>
 														<Pencil className="h-4 w-4" />
 													</Button>
-													<Button
-														size="icon"
-														variant="ghost"
-														className="h-9 w-9 text-destructive hover:text-destructive hover:bg-destructive/10"
-														onClick={() => handleDelete(doc.doctorId)}
-													>
-														<Trash className="h-4 w-4" />
-													</Button>
 												</div>
 											</TableCell>
 										</TableRow>
@@ -457,7 +504,7 @@ export default function DoctorPage() {
 						<div className="grid grid-cols-1 md:grid-cols-2 gap-8">
 							<div className="space-y-6">
 								<h3 className="font-bold text-base border-b pb-2">
-									Basic Information
+									Profile & Visibility
 								</h3>
 								<div className="space-y-4">
 									<div className="space-y-2">
@@ -471,6 +518,39 @@ export default function DoctorPage() {
 										/>
 									</div>
 
+									<div className="flex items-center justify-between p-3 border rounded-md bg-muted/30">
+										<Label
+											htmlFor="isActive"
+											className="text-base font-semibold cursor-pointer"
+										>
+											Active
+										</Label>
+										<Switch
+											id="isActive"
+											checked={form.isActive}
+											onCheckedChange={(val) =>
+												setForm({ ...form, isActive: val })
+											}
+										/>
+									</div>
+
+									<div className="space-y-1">
+										<Label
+											htmlFor="globalSortOrder"
+											className="text-sm font-semibold"
+										>
+											Sort Priority (Lower numbers show first)
+										</Label>
+										<Input
+											id="globalSortOrder"
+											name="globalSortOrder"
+											type="number"
+											value={form.globalSortOrder}
+											onChange={handleChange}
+											className="text-base"
+										/>
+									</div>
+
 									<div className="space-y-1">
 										<label className="text-sm font-semibold">Doctor ID</label>
 										<Input
@@ -556,11 +636,11 @@ export default function DoctorPage() {
 
 							<div className="space-y-6">
 								<h3 className="font-bold text-base border-b pb-2">
-									Working Hours / Timing
+									Department Hierarchy & 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
+										Select a department to configure hierarchy and timing
 									</div>
 								) : (
 									<div className="space-y-8">
@@ -571,15 +651,28 @@ export default function DoctorPage() {
 											return (
 												<div
 													key={dep.departmentId}
-													className="space-y-4 p-5 border rounded-lg bg-background shadow-sm"
+													className="space-y-4 p-5 border rounded-lg bg-background shadow-sm border-primary/20"
 												>
-													<div className="flex items-center justify-between">
+													<div className="flex items-center justify-between border-b pb-2">
 														<p className="font-bold text-base text-primary">
 															{depName}
 														</p>
-														<Badge variant="outline" className="text-xs">
-															Timing Slot
-														</Badge>
+														<div className="flex items-center gap-2">
+															<Label className="text-xs font-bold">
+																Hierarchy Order:
+															</Label>
+															<Input
+																type="number"
+																className="w-20 h-8 text-sm"
+																value={dep.sortOrder}
+																onChange={(e) =>
+																	handleDeptSortChange(
+																		dep.departmentId,
+																		e.target.value,
+																	)
+																}
+															/>
+														</div>
 													</div>
 													<div className="grid grid-cols-1 sm:grid-cols-2 gap-x-6 gap-y-3">
 														{DAYS.map((day) => (

frontend/src/pages/ImportData.tsx

@@ -0,0 +1,158 @@
+import React, { useState, ChangeEvent } from "react";
+import * as XLSX from "xlsx";
+import apiClient from "@/api/client";
+
+interface ImportPayload {
+	departments: any[];
+	doctors: any[];
+	timings: any[];
+	careers: any[];
+	inquiries: any[];
+	academics: any[];
+	appointments: any[];
+	candidates: any[];
+	news: any[];
+}
+
+const ImportData: React.FC = () => {
+	const [loading, setLoading] = useState<boolean>(false);
+	const [status, setStatus] = useState<string>("");
+
+	const handleFileUpload = (e: ChangeEvent<HTMLInputElement>) => {
+		const file = e.target.files?.[0];
+		if (!file) return;
+
+		setLoading(true);
+		setStatus("Reading Excel file...");
+
+		const reader = new FileReader();
+		reader.onload = async (evt: ProgressEvent<FileReader>) => {
+			try {
+				const bstr = evt.target?.result;
+				if (!bstr) throw new Error("Failed to read file content.");
+
+				const wb = XLSX.read(bstr, { type: "binary" });
+
+				const payload: ImportPayload = {
+					departments: XLSX.utils.sheet_to_json(wb.Sheets["Departments"]) || [],
+					doctors: XLSX.utils.sheet_to_json(wb.Sheets["Doctors"]) || [],
+					timings: XLSX.utils.sheet_to_json(wb.Sheets["Doctor Timings"]) || [],
+					careers: XLSX.utils.sheet_to_json(wb.Sheets["Careers"]) || [],
+					inquiries: XLSX.utils.sheet_to_json(wb.Sheets["Inquiry"]) || [],
+					academics:
+						XLSX.utils.sheet_to_json(wb.Sheets["Academics & Research"]) || [],
+					appointments:
+						XLSX.utils.sheet_to_json(wb.Sheets["Appointment"]) || [],
+					candidates: XLSX.utils.sheet_to_json(wb.Sheets["Candidate"]) || [],
+					news: XLSX.utils.sheet_to_json(wb.Sheets["News & Media"]) || [],
+				};
+
+				setStatus("Uploading data to server (this may take a moment)...");
+
+				const response = await apiClient.post("/import/bulk", payload);
+
+				if (response.status === 200) {
+					setStatus("✅ ALL DATA IMPORT COMPLETED SUCCESSFULLY!");
+				} else {
+					setStatus("❌ Server responded with an error.");
+				}
+			} catch (err: any) {
+				console.error("Import Error:", err);
+				const errorMsg = err.response?.data?.error || "Error processing file.";
+				setStatus(`❌ ${errorMsg}`);
+			} finally {
+				setLoading(false);
+				if (e.target) e.target.value = "";
+			}
+		};
+
+		reader.onerror = () => {
+			setStatus("❌ Failed to read the file.");
+			setLoading(false);
+		};
+
+		reader.readAsBinaryString(file);
+	};
+
+	return (
+		<div style={containerStyle}>
+			<div style={cardStyle}>
+				<h2 style={{ color: "#333", marginBottom: "10px" }}>
+					Database Bulk Import
+				</h2>
+				<p style={{ color: "#666", marginBottom: "30px" }}>
+					Select the <b>gg_hospital.xlsx</b> file. This will update all tables.
+				</p>
+
+				<div style={{ marginBottom: "20px" }}>
+					<input
+						type="file"
+						accept=".xlsx, .xls"
+						onChange={handleFileUpload}
+						id="excel-upload"
+						style={{ display: "none" }}
+						disabled={loading}
+					/>
+					<label
+						htmlFor="excel-upload"
+						style={{
+							...buttonStyle,
+							backgroundColor: loading ? "#a0aec0" : "#3182ce",
+							cursor: loading ? "not-allowed" : "pointer",
+						}}
+					>
+						{loading ? "⌛ Processing..." : "📂 Choose Excel File"}
+					</label>
+				</div>
+
+				{status && (
+					<div
+						style={{
+							marginTop: "25px",
+							padding: "15px",
+							borderRadius: "8px",
+							backgroundColor: status.includes("✅") ? "#f0fff4" : "#fff5f5",
+							color: status.includes("✅") ? "#2f855a" : "#c53030",
+							border: `1px solid ${status.includes("✅") ? "#c6f6d5" : "#fed7d7"}`,
+							fontWeight: "500",
+							whiteSpace: "pre-wrap",
+						}}
+					>
+						{status}
+					</div>
+				)}
+			</div>
+		</div>
+	);
+};
+
+const containerStyle: React.CSSProperties = {
+	display: "flex",
+	justifyContent: "center",
+	alignItems: "center",
+	minHeight: "80vh",
+	backgroundColor: "#f7fafc",
+	fontFamily: "'Segoe UI', Tahoma, Geneva, Verdana, sans-serif",
+};
+
+const cardStyle: React.CSSProperties = {
+	backgroundColor: "white",
+	padding: "40px",
+	borderRadius: "12px",
+	boxShadow: "0 4px 6px rgba(0,0,0,0.1)",
+	maxWidth: "500px",
+	width: "100%",
+	textAlign: "center",
+};
+
+const buttonStyle: React.CSSProperties = {
+	padding: "12px 24px",
+	color: "white",
+	borderRadius: "6px",
+	fontSize: "16px",
+	fontWeight: "bold",
+	transition: "all 0.2s ease",
+	display: "inline-block",
+};
+
+export default ImportData;

frontend/src/pages/newsMedia.tsx

@@ -73,7 +73,7 @@ export default function NewsPage() {
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
-			const res = await getNewsApi(currentPage, itemsPerPage);
+			const res = await getNewsApi(currentPage, itemsPerPage, searchText);
 
 			setNews(res?.data || []);
 			setTotalItems(res?.meta?.total || 0);
@@ -82,18 +82,12 @@ export default function NewsPage() {
 		} finally {
 			setLoading(false);
 		}
-	}, [currentPage, itemsPerPage]);
+	}, [currentPage, itemsPerPage, searchText]);
 
 	useEffect(() => {
 		fetchAll();
 	}, [fetchAll]);
 
-	const filteredNews = news.filter(
-		(item) =>
-			item.Headline?.toLowerCase().includes(searchText.toLowerCase()) ||
-			item.Author?.toLowerCase().includes(searchText.toLowerCase()),
-	);
-
 	const totalPages = Math.ceil(totalItems / itemsPerPage);
 
 	function handleChange(e: any) {
@@ -142,10 +136,19 @@ export default function NewsPage() {
 
 	async function handleSubmit() {
 		try {
+			const submissionData = {
+				...form,
+				firstPara: form.headline,
+				content:
+					form.secondPara.length > 100
+						? form.secondPara.substring(0, 100) + "..."
+						: form.secondPara,
+			};
+
 			if (editing) {
-				await updateNewsApi(editing.Id, form);
+				await updateNewsApi(editing.Id, submissionData);
 			} else {
-				await createNewsApi(form);
+				await createNewsApi(submissionData);
 			}
 			setOpenModal(false);
 			fetchAll();
@@ -171,8 +174,10 @@ export default function NewsPage() {
 					<Input
 						placeholder="Filter headline..."
 						value={searchText}
-						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[250px] text-base"
+						onChange={(e) => {
+							setSearchText(e.target.value);
+							setCurrentPage(1); // reset page
+						}}
 					/>
 
 					<select
@@ -246,7 +251,7 @@ export default function NewsPage() {
 											<Loader2 className="h-8 w-8 animate-spin mx-auto text-primary" />
 										</TableCell>
 									</TableRow>
-								) : filteredNews.length === 0 ? (
+								) : news.length === 0 ? (
 									<TableRow>
 										<TableCell
 											colSpan={7}
@@ -256,7 +261,7 @@ export default function NewsPage() {
 										</TableCell>
 									</TableRow>
 								) : (
-									filteredNews.map((item) => (
+									news.map((item) => (
 										<TableRow key={item.Id} className="hover:bg-muted/50">
 											<TableCell className="font-mono text-xs">
 												{item.Id}
@@ -415,21 +420,10 @@ export default function NewsPage() {
 								</div>
 							</div>
 							<div className="space-y-1">
-								<label className="text-sm font-semibold">Intro Paragraph</label>
+								<label className="text-sm font-semibold">Story Content</label>
 								<Textarea
-									name="firstPara"
-									value={form.firstPara}
-									onChange={handleChange}
-									className="min-h-[100px] text-base"
-								/>
-							</div>
-							<div className="space-y-1">
-								<label className="text-sm font-semibold">
-									Full Story Content
-								</label>
-								<Textarea
-									name="content"
-									value={form.content}
+									name="secondPara"
+									value={form.secondPara}
 									onChange={handleChange}
 									className="min-h-[200px] text-base"
 								/>

frontend/src/services/api.ts

@@ -1,7 +1,7 @@
 import axios from "axios";
 
 const api = axios.create({
-	baseURL: "http://localhost:3000/api",
+	baseURL: import.meta.env.VITE_API_URL,
 });
 
 api.interceptors.request.use((config) => {

frontend/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />