chore: add toast show validation errors

Merge pull request 'chore: show required image dimension' (#31 ) from feat/healthcheckup-crud into dev
Reviewed-on: #31
2026-05-18 16:41:38 +05:30 · 2026-05-18 07:47:06 +00:00 · 2026-05-18 13:15:00 +05:30 · 2026-05-18 06:26:27 +00:00 · 2026-05-18 11:55:55 +05:30 · 2026-05-18 10:58:24 +05:30
47 changed files with 4100 additions and 378 deletions
@@ -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>
+"""
+}
@@ -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>
+"""
+}
@@ -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;
@@ -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;
@@ -0,0 +1,63 @@
+-- CreateTable
+CREATE TABLE "HealthCheckCategory" (
+    "id" SERIAL NOT NULL,
+    "name" TEXT NOT NULL,
+    "slug" TEXT NOT NULL,
+    "description" TEXT,
+    "isActive" BOOLEAN NOT NULL DEFAULT true,
+    "sortOrder" INTEGER NOT NULL DEFAULT 1000,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "HealthCheckCategory_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "HealthPackage" (
+    "id" SERIAL NOT NULL,
+    "name" TEXT NOT NULL,
+    "slug" TEXT NOT NULL,
+    "description" TEXT,
+    "price" DECIMAL(10,2),
+    "discountedPrice" DECIMAL(10,2),
+    "inclusions" JSONB NOT NULL,
+    "isActive" BOOLEAN NOT NULL DEFAULT true,
+    "isFeatured" BOOLEAN NOT NULL DEFAULT false,
+    "sortOrder" INTEGER NOT NULL DEFAULT 1000,
+    "categoryId" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "HealthPackage_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "HealthPackageInquiry" (
+    "id" SERIAL NOT NULL,
+    "fullName" TEXT NOT NULL,
+    "mobileNumber" TEXT NOT NULL,
+    "email" TEXT,
+    "preferredDate" TIMESTAMP(3),
+    "message" TEXT,
+    "packageId" INTEGER NOT NULL,
+    "status" TEXT NOT NULL DEFAULT 'pending',
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "HealthPackageInquiry_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "HealthCheckCategory_name_key" ON "HealthCheckCategory"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "HealthCheckCategory_slug_key" ON "HealthCheckCategory"("slug");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "HealthPackage_slug_key" ON "HealthPackage"("slug");
+
+-- AddForeignKey
+ALTER TABLE "HealthPackage" ADD CONSTRAINT "HealthPackage_categoryId_fkey" FOREIGN KEY ("categoryId") REFERENCES "HealthCheckCategory"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "HealthPackageInquiry" ADD CONSTRAINT "HealthPackageInquiry_packageId_fkey" FOREIGN KEY ("packageId") REFERENCES "HealthPackage"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "HealthPackageInquiry" ADD COLUMN     "age" INTEGER,
+ADD COLUMN     "gender" TEXT;
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "HealthPackage" ALTER COLUMN "inclusions" SET DEFAULT '{}';
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "HealthCheckCategory" ALTER COLUMN "slug" DROP NOT NULL;
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "HealthPackage" ADD COLUMN     "image" TEXT;
@@ -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())
@@ -214,3 +220,59 @@ model NewsImage {

  createdAt   DateTime  @default(now())
 }
+
+model HealthCheckCategory {
+  id          Int             @id @default(autoincrement())
+  name        String          @unique 
+  slug        String?          @unique
+  description String?
+  isActive    Boolean         @default(true)
+  sortOrder   Int             @default(1000)
+  
+  packages    HealthPackage[]
+
+  createdAt   DateTime        @default(now())
+  updatedAt   DateTime        @updatedAt
+}
+
+model HealthPackage {
+  id           Int                 @id @default(autoincrement())
+  name         String
+  slug         String              @unique
+  description  String?
+  price        Decimal?            @db.Decimal(10, 2)
+  image        String?
+  discountedPrice Decimal?         @db.Decimal(10, 2)
+  
+  inclusions   Json                @default("{}") 
+  
+  isActive     Boolean             @default(true)
+  isFeatured   Boolean             @default(false)
+  sortOrder    Int                 @default(1000)
+
+  categoryId   Int
+  category     HealthCheckCategory @relation(fields: [categoryId], references: [id])
+  
+  inquiries    HealthPackageInquiry[]
+
+  createdAt    DateTime            @default(now())
+  updatedAt    DateTime            @updatedAt
+}
+
+model HealthPackageInquiry {
+  id              Int           @id @default(autoincrement())
+  fullName        String
+  mobileNumber    String
+  email           String?
+  age             Int?          
+  gender          String?       
+  preferredDate   DateTime?
+  message         String?
+  
+  packageId       Int
+  healthPackage   HealthPackage @relation(fields: [packageId], references: [id])
+
+  status          String        @default("pending") 
+  createdAt       DateTime      @default(now())
+  updatedAt       DateTime      @updatedAt
+}
@@ -15,6 +15,7 @@ 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";
+import healthCheckRoutes from "./routes/healthCheck.route.js";

 dotenv.config();

@@ -55,6 +56,7 @@ app.use("/api/academics", academicsResearchRoutes);
 app.use("/api/email", emailConfigRoutes);
 app.use("/api/newsMedia", newsMediaRoutes);
 app.use("/api/import", importRoutes);
+app.use("/api/health-check", healthCheckRoutes);

 const PORT = process.env.PORT || 5008;
 app.listen(PORT, () => {
@@ -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;">
 		  
-						<p><b>Name:</b> ${fullName}</p>
-						<p><b>Phone:</b> ${number}</p>
-						<p><b>Email:</b> ${emailId || "-"}</p>
+		  <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);">
 		    
-						<p><b>Course:</b> ${courseName || "-"}</p>
-						<p><b>Subject:</b> ${subject || "-"}</p>
+		    <!-- 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>Message:</b></p>
-						<p>${message || "-"}</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>
+
+		      <!-- 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 (Academics & Research Inquiry).
+		    </div>
+
+		  </div>
+
+		</div>
+		`,
 				});
 			}
 		} catch (err) {
@@ -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) {
@@ -74,18 +147,51 @@ export const getAppointments = async (req, res) => {
 		const page = parseInt(req.query.page) || 1;
 		const limit = parseInt(req.query.limit) || 10;
 		const skip = (page - 1) * limit;
-		const { date, search } = req.query;
+
+		const { date, startDate, endDate, search } = req.query;

 		const where = {};

-		if (date) {
+		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.setDate(end.getDate() + 1);
-			where.date = { gte: start, lt: end };
+			end.setHours(23, 59, 59, 999);
+
+			where.date = {
+				gte: start,
+				lte: end,
+			};
 		}

-		if (search) {
+		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 } },
@@ -96,24 +202,39 @@ export const getAppointments = async (req, res) => {
 		const [appointments, total] = await Promise.all([
 			prisma.appointment.findMany({
 				where,
-				include: { doctor: true, department: true },
-				orderBy: { createdAt: "desc" },
+				include: {
+					doctor: true,
+					department: true,
+				},
+				orderBy: {
+					createdAt: "desc",
+				},
 				skip,
 				take: limit,
 			}),
-			prisma.appointment.count({ where }),
+
+			prisma.appointment.count({
+				where,
+			}),
 		]);

 		res.status(200).json({
 			success: true,
 			data: appointments,
-			pagination: { total, page, limit, totalPages: Math.ceil(total / limit) },
+			pagination: {
+				total,
+				page,
+				limit,
+				totalPages: Math.ceil(total / limit),
+			},
 		});
 	} catch (error) {
 		console.error(error);
-		res
-			.status(500)
-			.json({ success: false, message: "Failed to fetch appointments" });
+
+		res.status(500).json({
+			success: false,
+			message: "Failed to fetch appointments",
+		});
 	}
 };

@@ -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;">
 		  
-						<p><b>Name:</b> ${fullName}</p>
-						<p><b>Phone:</b> ${mobile}</p>
-						<p><b>Email:</b> ${email}</p>
+		  <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);">
 		    
-						<p><b>Applied For:</b> ${candidate.career?.post || "-"}</p>
-						<p><b>Designation:</b> ${candidate.career?.designation || "-"}</p>
+		    <!-- 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>Subject:</b> ${subject || "-"}</p>
-						<p><b>Cover Letter:</b></p>
-						<p>${coverLetter || "-"}</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>
+
+		      <h3 style="margin-top: 20px;">Application Details</h3>
+
+		      <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) {
@@ -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({
@@ -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({
@@ -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 || {},
 			})),
 		};
@@ -0,0 +1,440 @@
+import prisma from "../prisma/client.js";
+import { sendEmail } from "../utils/sendEmail.js";
+import { getEmailsByType } from "../utils/getEmailByTypes.js";
+
+export const getAllCategories = async (req, res) => {
+	try {
+		const { admin } = req.query;
+
+		const categories = await prisma.healthCheckCategory.findMany({
+			where: admin === "true" ? {} : { isActive: true },
+			orderBy: { sortOrder: "asc" },
+			include: {
+				_count: { select: { packages: true } },
+			},
+		});
+		return res.status(200).json({ success: true, data: categories });
+	} catch (error) {
+		return res
+			.status(500)
+			.json({ success: false, message: "Failed to fetch categories" });
+	}
+};
+
+export const createCategory = async (req, res) => {
+	try {
+		const { name, slug, description, isActive, sortOrder } = req.body;
+
+		const category = await prisma.healthCheckCategory.create({
+			data: {
+				name,
+				slug: slug || null,
+				description,
+				isActive: isActive ?? true,
+				sortOrder: sortOrder ? Number(sortOrder) : 1000,
+			},
+		});
+
+		return res
+			.status(201)
+			.json({ success: true, message: "Category created", data: category });
+	} catch (error) {
+		console.error(error);
+		return res
+			.status(500)
+			.json({ success: false, message: "Failed to create category" });
+	}
+};
+
+export const updateCategory = async (req, res) => {
+	try {
+		const { id } = req.params;
+		const data = { ...req.body };
+
+		delete data.id;
+		delete data._count;
+		delete data.createdAt;
+		delete data.updatedAt;
+
+		if (data.sortOrder !== undefined) data.sortOrder = Number(data.sortOrder);
+
+		if (data.slug === "") data.slug = null;
+
+		const updatedCategory = await prisma.$transaction(async (tx) => {
+			const category = await tx.healthCheckCategory.update({
+				where: { id: Number(id) },
+				data,
+			});
+
+			if (data.isActive === false) {
+				await tx.healthPackage.updateMany({
+					where: { categoryId: Number(id) },
+					data: { isActive: false },
+				});
+			}
+
+			return category;
+		});
+
+		return res.status(200).json({
+			success: true,
+			message: "Category updated",
+			data: updatedCategory,
+		});
+	} catch (error) {
+		console.error(error);
+		return res
+			.status(500)
+			.json({ success: false, message: "Failed to update category" });
+	}
+};
+
+export const deleteCategory = async (req, res) => {
+	try {
+		const { id } = req.params;
+
+		await prisma.healthCheckCategory.delete({
+			where: { id: Number(id) },
+		});
+
+		return res
+			.status(200)
+			.json({ success: true, message: "Category deleted successfully" });
+	} catch (error) {
+		console.error(error);
+		return res.status(500).json({
+			success: false,
+			message:
+				"Failed to delete category. Ensure no packages are linked to it.",
+		});
+	}
+};
+
+export const getAllPackages = async (req, res) => {
+	try {
+		const { admin, categorySlug } = req.query;
+
+		const packages = await prisma.healthPackage.findMany({
+			where: {
+				AND: [
+					admin === "true" ? {} : { isActive: true },
+					categorySlug ? { category: { slug: categorySlug } } : {},
+				],
+			},
+			include: { category: true },
+			orderBy: [{ sortOrder: "asc" }, { createdAt: "desc" }],
+		});
+
+		return res.status(200).json({ success: true, data: packages });
+	} catch (error) {
+		console.error(error);
+		return res
+			.status(500)
+			.json({ success: false, message: "Failed to fetch packages" });
+	}
+};
+
+export const createPackage = async (req, res) => {
+	try {
+		const {
+			name,
+			slug,
+			description,
+			price,
+			image,
+			discountedPrice,
+			inclusions,
+			categoryId,
+			isActive,
+			isFeatured,
+			sortOrder,
+		} = req.body;
+
+		const healthPackage = await prisma.healthPackage.create({
+			data: {
+				name,
+				slug,
+				description,
+				price,
+				image,
+				discountedPrice,
+				inclusions,
+				categoryId: Number(categoryId),
+				isActive: isActive ?? true,
+				isFeatured: isFeatured ?? false,
+				sortOrder: sortOrder ? Number(sortOrder) : 1000,
+			},
+		});
+
+		return res
+			.status(201)
+			.json({ success: true, message: "Package created", data: healthPackage });
+	} catch (error) {
+		console.error(error);
+		return res
+			.status(500)
+			.json({ success: false, message: "Failed to create package" });
+	}
+};
+
+export const updatePackage = async (req, res) => {
+	try {
+		const { id } = req.params;
+		const data = { ...req.body };
+		delete data.id;
+		delete data.category;
+
+		if (data.categoryId) data.categoryId = Number(data.categoryId);
+		if (data.sortOrder) data.sortOrder = Number(data.sortOrder);
+
+		const updated = await prisma.healthPackage.update({
+			where: { id: Number(id) },
+			data,
+		});
+
+		return res
+			.status(200)
+			.json({ success: true, message: "Package updated", data: updated });
+	} catch (error) {
+		console.error(error);
+		return res.status(500).json({ success: false, message: "Update failed" });
+	}
+};
+
+export const deletePackage = async (req, res) => {
+	try {
+		const { id } = req.params;
+		await prisma.healthPackage.delete({ where: { id: Number(id) } });
+		return res.status(200).json({ success: true, message: "Package deleted" });
+	} catch (error) {
+		console.error(error);
+		return res.status(500).json({ success: false, message: "Delete failed" });
+	}
+};
+
+export const createPackageInquiry = async (req, res) => {
+	try {
+		const {
+			fullName,
+			mobileNumber,
+			email,
+			age,
+			gender,
+			preferredDate,
+			packageId,
+			message,
+		} = req.body;
+
+		const inquiry = await prisma.healthPackageInquiry.create({
+			data: {
+				fullName,
+				mobileNumber,
+				email,
+				age: age ? Number(age) : null,
+				gender,
+				preferredDate: preferredDate ? new Date(preferredDate) : null,
+				message,
+				packageId: Number(packageId),
+			},
+			include: {
+				healthPackage: true,
+			},
+		});
+
+		try {
+			const emailList = await getEmailsByType("HCINQUIRY");
+
+			if (emailList) {
+				await sendEmail({
+					to: emailList,
+					subject: "New Health Checkup Package Inquiry",
+					html: `
+        <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 Health Checkup Package Inquiry
+              </p>
+            </div>
+
+            <!-- Body -->
+            <div style="padding: 20px; color: #333;">
+              
+              <h3 style="margin-top: 0;">Inquirer Details</h3>
+              
+              <table style="width: 100%; border-collapse: collapse;">
+                <tr>
+                  <td style="padding: 8px 0; width: 35%;"><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;">${mobileNumber}</td>
+                </tr>
+                <tr>
+                  <td style="padding: 8px 0;"><b>Email:</b></td>
+                  <td style="padding: 8px 0;">${email || "-"}</td>
+                </tr>
+                <tr>
+                  <td style="padding: 8px 0;"><b>Age:</b></td>
+                  <td style="padding: 8px 0;">${age || "-"}</td>
+                </tr>
+                <tr>
+                  <td style="padding: 8px 0;"><b>Gender:</b></td>
+                  <td style="padding: 8px 0;">${gender || "-"}</td>
+                </tr>
+              </table>
+
+              <h3 style="margin-top: 20px;">Package Details</h3>
+
+              <table style="width: 100%; border-collapse: collapse;">
+                <tr>
+                  <td style="padding: 8px 0; width: 35%;"><b>Package Name:</b></td>
+                  <td style="padding: 8px 0;">${inquiry.healthPackage?.name || "Unknown Package"}</td>
+                </tr>
+                <tr>
+                  <td style="padding: 8px 0;"><b>Preferred Date:</b></td>
+                  <td style="padding: 8px 0;">
+                    ${
+											preferredDate
+												? new Date(preferredDate).toLocaleDateString("en-GB", {
+														day: "2-digit",
+														month: "long",
+														year: "numeric",
+													})
+												: "Not specified"
+										}
+                  </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 inquiry was submitted via the GG Hospital website.
+            </div>
+
+          </div>
+
+        </div>
+        `,
+				});
+			}
+		} catch (err) {
+			console.error("Email failed:", err);
+		}
+
+		return res.status(201).json({
+			success: true,
+			message: "Booking inquiry sent successfully",
+			data: inquiry,
+		});
+	} catch (error) {
+		console.error(error);
+		return res
+			.status(500)
+			.json({ success: false, message: "Failed to submit inquiry" });
+	}
+};
+
+export const getPackageBySlug = async (req, res) => {
+	try {
+		const { slug } = req.params;
+		const healthPackage = await prisma.healthPackage.findFirst({
+			where: { slug, isActive: true },
+			include: { category: true },
+		});
+
+		if (!healthPackage) {
+			return res
+				.status(404)
+				.json({ success: false, message: "Package not found" });
+		}
+
+		return res.status(200).json({ success: true, data: healthPackage });
+	} catch (error) {
+		console.error(error);
+		return res
+			.status(500)
+			.json({ success: false, message: "Failed to fetch package" });
+	}
+};
+
+export const getAllInquiries = async (req, res) => {
+	try {
+		const { page = 1, limit = 10, filterDate, startDate, endDate } = req.query;
+
+		const queryPage = parseInt(page);
+		const queryLimit = parseInt(limit);
+		const skip = (queryPage - 1) * queryLimit;
+
+		let where = {};
+
+		if (filterDate) {
+			where.preferredDate = {
+				gte: new Date(`${filterDate}T00:00:00.000Z`),
+				lte: new Date(`${filterDate}T23:59:59.999Z`),
+			};
+		} else if (startDate || endDate) {
+			where.preferredDate = {};
+			if (startDate) {
+				where.preferredDate.gte = new Date(`${startDate}T00:00:00.000Z`);
+			}
+			if (endDate) {
+				where.preferredDate.lte = new Date(`${endDate}T23:59:59.999Z`);
+			}
+		}
+
+		const [total, inquiries] = await prisma.$transaction([
+			prisma.healthPackageInquiry.count({ where }),
+			prisma.healthPackageInquiry.findMany({
+				where,
+				skip,
+				take: queryLimit,
+				include: {
+					healthPackage: {
+						include: { category: true },
+					},
+				},
+				orderBy: { createdAt: "desc" },
+			}),
+		]);
+
+		return res.status(200).json({
+			success: true,
+			data: inquiries,
+			pagination: {
+				total,
+				page: queryPage,
+				limit: queryLimit,
+				totalPages: Math.ceil(total / queryLimit),
+			},
+		});
+	} catch (error) {
+		console.error(error);
+		return res
+			.status(500)
+			.json({ success: false, message: "Failed to fetch inquiries" });
+	}
+};
@@ -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;">
 					
-						<p><b>Name:</b> ${fullName}</p>
-						<p><b>Phone:</b> ${number}</p>
-						<p><b>Email:</b> ${emailId}</p>
+					<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);">
 						
-						<p><b>Subject:</b> ${subject}</p>
-					<p><b>Message:</b> ${message}</p>
+						<!-- 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>
+
+						<!-- 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>
+
+						<!-- 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>
 					`,
 				});
 			}
@@ -4,8 +4,8 @@ import prisma from "../prisma/client.js";

 export const getAllNews = async (req, res) => {
 	try {
-		const page = parseInt(req.query.page) || 1;
-		const limit = parseInt(req.query.limit) || 10;
+		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 = {
@@ -25,7 +25,8 @@ export const getAllNews = async (req, res) => {
 			...searchFilter,
 		};

-		const skip = (page - 1) * limit;
+		const skip = page && limit ? (page - 1) * limit : undefined;
+		const take = limit ? limit : undefined;

 		const [news, total] = await Promise.all([
 			prisma.newsMedia.findMany({
@@ -33,7 +34,7 @@ export const getAllNews = async (req, res) => {
 				include: includeImages,
 				orderBy: { createdAt: "desc" },
 				skip,
-				take: limit,
+				take,
 			}),
 			prisma.newsMedia.count({
 				where: whereCondition,
@@ -59,9 +60,9 @@ export const getAllNews = async (req, res) => {
 			data: response,
 			meta: {
 				total,
-				page,
-				limit,
-				totalPages: Math.ceil(total / limit),
+				page: page || 1,
+				limit: limit || total,
+				totalPages: limit ? Math.ceil(total / limit) : 1,
 			},
 		});
 	} catch (error) {
@@ -0,0 +1,39 @@
+import express from "express";
+import {
+	// Categories
+	getAllCategories,
+	getPackageBySlug,
+	createCategory,
+	updateCategory,
+	deleteCategory,
+
+	// Packages
+	getAllPackages,
+	createPackage,
+	updatePackage,
+	deletePackage,
+
+	// Inquiries
+	createPackageInquiry,
+	getAllInquiries,
+} from "../controllers/healthCheck.controller.js";
+
+import jwtAuthMiddleware from "../middleware/auth.js";
+
+const router = express.Router();
+
+router.get("/packages", getAllPackages);
+router.get("/packages/:slug", getPackageBySlug);
+router.get("/categories", getAllCategories);
+router.post("/inquiry", createPackageInquiry);
+
+router.get("/inquiries", jwtAuthMiddleware, getAllInquiries);
+router.post("/", jwtAuthMiddleware, createPackage);
+router.patch("/:id", jwtAuthMiddleware, updatePackage);
+router.delete("/:id", jwtAuthMiddleware, deletePackage);
+
+router.post("/categories", jwtAuthMiddleware, createCategory);
+router.patch("/categories/:id", jwtAuthMiddleware, updateCategory);
+router.delete("/categories/:id", jwtAuthMiddleware, deleteCategory);
+
+export default router;
@@ -26,7 +26,6 @@ services:

 db:
  image: postgres:16-alpine
-  container_name: postgres_db
  environment:
   - POSTGRES_USER=${POSTGRES_USER}
   - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
@@ -42,3 +41,5 @@ services:

 volumes:
 postgres_data:
+  external: true
+  name: gg-backend_postgres_data
@@ -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:
@@ -28,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",
@@ -5187,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": {
@@ -6352,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",
@@ -8136,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",
@@ -30,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",
@@ -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";
@@ -22,10 +23,13 @@ import AcademicsPage from "./pages/Academics";
 import NewsPage from "./pages/newsMedia";
 import BlogDetail from "./pages/BlogDetails";
 import ImportData from "./pages/ImportData";
+import HealthPackagePage from "./pages/HealthPackagePage";

 export default function App() {
 	return (
 		<BrowserRouter>
+			<Toaster position="top-right" />
+
 			<AuthProvider>
 				<Routes>
 					<Route element={<PublicRoute />}>
@@ -48,6 +52,7 @@ export default function App() {
 							<Route path="/academics" element={<AcademicsPage />} />
 							<Route path="/news" element={<NewsPage />} />
 							<Route path="/import" element={<ImportData />} />
+							<Route path="/health-check" element={<HealthPackagePage />} />
 						</Route>
 					</Route>

@@ -4,12 +4,16 @@ 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}`);
@@ -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;
+	}
 };
@@ -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;
+	}
 };
@@ -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) => {
@@ -0,0 +1,160 @@
+import apiClient from "@/api/client";
+import toast from "react-hot-toast";
+
+export interface HealthPackage {
+	id?: number;
+	name: string;
+	slug: string;
+	description?: string;
+	price: number;
+	image?: string;
+	discountedPrice?: number;
+	inclusions: Record<string, string[]>;
+	categoryId: number;
+	isActive: boolean;
+	isFeatured: boolean;
+	sortOrder: number;
+	category?: {
+		name: string;
+	};
+}
+
+export interface HealthCategory {
+	id: number;
+	name: string;
+	slug: string;
+	sortOrder: number;
+	isActive: boolean;
+}
+
+export interface HealthInquiry {
+	id: number;
+	fullName: string;
+	mobileNumber: string;
+	email?: string;
+	age: string;
+	gender: string;
+	preferredDate: string;
+	message?: string;
+	createdAt: string;
+	healthPackage?: {
+		name: string;
+		category?: {
+			name: string;
+		};
+	};
+}
+
+export const getHealthCategoriesApi = async () => {
+	const res = await apiClient.get("/health-check/categories?admin=true");
+	return res.data;
+};
+
+export const getHealthPackagesApi = async () => {
+	const res = await apiClient.get("/health-check/packages?admin=true");
+	return res.data;
+};
+
+export const createHealthPackageApi = async (data: Partial<HealthPackage>) => {
+	try {
+		const res = await apiClient.post("/health-check", data);
+		toast.success("Package created successfully");
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to create package");
+		throw error;
+	}
+};
+
+export const updateHealthPackageApi = async (
+	id: number,
+	data: Partial<HealthPackage>,
+) => {
+	try {
+		const res = await apiClient.patch(`/health-check/${id}`, data);
+		toast.success("Package updated successfully");
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to update package");
+		throw error;
+	}
+};
+
+export const deleteHealthPackageApi = async (id: number) => {
+	try {
+		const res = await apiClient.delete(`/health-check/${id}`);
+		toast.success("Package deleted successfully");
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to delete package");
+		throw error;
+	}
+};
+
+export const createCategoryApi = async (data: {
+	name: string;
+	slug: string;
+	sortOrder: number;
+}) => {
+	try {
+		const res = await apiClient.post("/health-check/categories", data);
+
+		toast.success("Category created successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to create category");
+
+		throw error;
+	}
+};
+
+export const updateCategoryApi = async (id: number, data: any) => {
+	try {
+		const res = await apiClient.patch(`/health-check/categories/${id}`, data);
+
+		toast.success("Category updated successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to update category");
+
+		throw error;
+	}
+};
+
+export const deleteCategoryApi = async (id: number) => {
+	try {
+		const res = await apiClient.delete(`/health-check/categories/${id}`);
+
+		toast.success("Category deleted successfully");
+
+		return res.data;
+	} catch (error: any) {
+		toast.error(error?.response?.data?.message || "Failed to delete category");
+
+		throw error;
+	}
+};
+
+export const getAllInquiriesApi = async (
+	page = 1,
+	limit = 10,
+	filterDate = "",
+	startDate = "",
+	endDate = "",
+) => {
+	const params = new URLSearchParams({
+		page: page.toString(),
+		limit: limit.toString(),
+	});
+
+	if (filterDate) params.append("filterDate", filterDate);
+	if (startDate) params.append("startDate", startDate);
+	if (endDate) params.append("endDate", endDate);
+
+	const res = await apiClient.get(
+		`/health-check/inquiries?${params.toString()}`,
+	);
+	return res.data;
+};
@@ -1,12 +1,17 @@
-import {useState, useRef} from "react";
-import {Button} from "@/components/ui/button";
-import {User, X, Loader2} from "lucide-react";
+import { useState, useRef } from "react";
+import { Button } from "@/components/ui/button";
+import { User, X, Loader2 } from "lucide-react";
 import axios from "axios";

 interface BytescaleUploaderProps {
 	value: string;
 	onChange: (url: string) => void;
-	folderPath: "/doctors" | "/departments" | "/news" | "/blog";
+	folderPath:
+		| "/doctors"
+		| "/departments"
+		| "/news"
+		| "/blog"
+		| "/health-packages";
 }

 export function BytescaleUploader({
@@ -40,7 +45,7 @@ export function BytescaleUploader({
 				},
 			});

-			const {fileUrl} = response.data;
+			const { fileUrl } = response.data;
 			onChange(fileUrl);
 		} catch (e: any) {
 			console.error("Upload Error:", e);
@@ -0,0 +1,273 @@
+import { useState, useEffect, useCallback } from "react";
+import { getAllInquiriesApi, HealthInquiry } from "@/api/healthCheck";
+
+import {
+	Table,
+	TableBody,
+	TableCell,
+	TableHead,
+	TableHeader,
+	TableRow,
+} from "@/components/ui/table";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipProvider,
+	TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Badge } from "@/components/ui/badge";
+import { Loader2, RefreshCw, ChevronLeft, ChevronRight } from "lucide-react";
+
+export default function PackageInquiriesTab() {
+	const [inquiries, setInquiries] = useState<HealthInquiry[]>([]);
+	const [loading, setLoading] = useState(true);
+
+	const [filterDate, setFilterDate] = useState("");
+	const [startDate, setStartDate] = useState("");
+	const [endDate, setEndDate] = useState("");
+
+	const [currentPage, setCurrentPage] = useState(1);
+	const [itemsPerPage, setItemsPerPage] = useState(10);
+	const [totalItems, setTotalItems] = useState(0);
+	const [totalPages, setTotalPages] = useState(1);
+
+	const fetchInquiries = useCallback(async () => {
+		setLoading(true);
+		try {
+			const res = await getAllInquiriesApi(
+				currentPage,
+				itemsPerPage,
+				filterDate,
+				startDate,
+				endDate,
+			);
+			setInquiries(res.data || []);
+			setTotalItems(res.pagination?.total || 0);
+			setTotalPages(res.pagination?.totalPages || 1);
+		} catch (err) {
+			console.error("Failed to fetch inquiries", err);
+		} finally {
+			setLoading(false);
+		}
+	}, [currentPage, itemsPerPage, filterDate, startDate, endDate]);
+
+	useEffect(() => {
+		fetchInquiries();
+	}, [fetchInquiries]);
+
+	const handleFilterChange = (
+		setter: React.Dispatch<React.SetStateAction<string>>,
+		value: string,
+	) => {
+		setter(value);
+		setCurrentPage(1);
+	};
+
+	const indexOfFirstItem = (currentPage - 1) * itemsPerPage;
+	const indexOfLastItem = Math.min(currentPage * itemsPerPage, totalItems);
+
+	return (
+		<Card>
+			<CardHeader className="flex flex-col md:flex-row items-start md:items-center justify-between gap-4">
+				<CardTitle className="text-xl">Package Inquiries</CardTitle>
+
+				<div className="flex flex-wrap items-end gap-3">
+					<div className="flex flex-col gap-1">
+						<label className="text-xs font-medium text-muted-foreground">
+							Specific Date
+						</label>
+						<Input
+							type="date"
+							value={filterDate}
+							onChange={(e) =>
+								handleFilterChange(setFilterDate, e.target.value)
+							}
+							className="w-[140px] text-sm"
+							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) => handleFilterChange(setStartDate, e.target.value)}
+							className="w-[140px] text-sm"
+							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) => handleFilterChange(setEndDate, e.target.value)}
+							className="w-[140px] text-sm"
+							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>
+							<option value={50}>50 / page</option>
+						</select>
+					</div>
+
+					<Button variant="outline" onClick={fetchInquiries} disabled={loading}>
+						<RefreshCw
+							className={`mr-2 h-4 w-4 ${loading ? "animate-spin" : ""}`}
+						/>
+						Refresh
+					</Button>
+				</div>
+			</CardHeader>
+			<CardContent className="p-0 sm:p-6 sm:pt-0">
+				<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">
+						<TableHeader className="sticky top-0 z-20 bg-background shadow-sm">
+							<TableRow>
+								<TableHead className="w-[150px] font-bold bg-background">
+									Requested Date
+								</TableHead>
+								<TableHead className="w-[220px] font-bold bg-background">
+									Patient Details
+								</TableHead>
+								<TableHead className="w-[250px] font-bold bg-background">
+									Requested Package
+								</TableHead>
+								<TableHead className="w-[120px] font-bold bg-background">
+									Age/Gender
+								</TableHead>
+								<TableHead className="w-[250px] font-bold bg-background">
+									Message
+								</TableHead>
+							</TableRow>
+						</TableHeader>
+						<TableBody>
+							{loading ? (
+								<TableRow>
+									<TableCell colSpan={5} className="text-center py-10">
+										<Loader2 className="h-8 w-8 animate-spin mx-auto" />
+									</TableCell>
+								</TableRow>
+							) : inquiries.length === 0 ? (
+								<TableRow>
+									<TableCell
+										colSpan={5}
+										className="text-center text-muted-foreground py-10">
+										No inquiries found for the selected criteria
+									</TableCell>
+								</TableRow>
+							) : (
+								inquiries.map((inq) => (
+									<TableRow key={inq.id} className="hover:bg-muted/50">
+										<TableCell>
+											<div className="font-semibold text-primary">
+												{new Date(inq.preferredDate).toLocaleDateString()}
+											</div>
+											<div className="text-[11px] text-muted-foreground mt-1">
+												Submitted:{" "}
+												{new Date(inq.createdAt).toLocaleDateString()}
+											</div>
+										</TableCell>
+										<TableCell>
+											<div className="font-semibold text-base">
+												{inq.fullName}
+											</div>
+											<div className="text-sm">{inq.mobileNumber}</div>
+											<div className="text-xs text-muted-foreground">
+												{inq.email || "-"}
+											</div>
+										</TableCell>
+										<TableCell>
+											<div className="font-semibold text-sm truncate">
+												{inq.healthPackage?.name || "N/A"}
+											</div>
+										</TableCell>
+										<TableCell>
+											<div className="font-medium">
+												{inq.age} yrs / {inq.gender}
+											</div>
+										</TableCell>
+										<TooltipProvider>
+											<Tooltip>
+												<TooltipTrigger asChild>
+													<div className="text-sm italic line-clamp-3 text-muted-foreground whitespace-pre-wrap cursor-pointer">
+														{inq.message || "No message provided."}
+													</div>
+												</TooltipTrigger>
+
+												<TooltipContent className="max-w-md whitespace-pre-wrap">
+													{inq.message || "No message provided."}
+												</TooltipContent>
+											</Tooltip>
+										</TooltipProvider>
+									</TableRow>
+								))
+							)}
+						</TableBody>
+					</Table>
+				</div>
+
+				{!loading && totalItems > 0 && (
+					<div className="flex flex-col sm:flex-row items-center justify-between px-2 py-4 border-t gap-4 mt-2">
+						<div className="text-sm text-muted-foreground">
+							Showing{" "}
+							<span className="font-semibold">{indexOfFirstItem + 1}</span> to{" "}
+							<span className="font-semibold">{indexOfLastItem}</span> of{" "}
+							<span className="font-semibold">{totalItems}</span> inquiries
+						</div>
+						<div className="flex items-center gap-6">
+							<div className="text-sm font-semibold">
+								Page {currentPage} of {totalPages || 1}
+							</div>
+							<div className="flex gap-2">
+								<Button
+									variant="outline"
+									size="icon"
+									className="h-9 w-9"
+									onClick={() =>
+										setCurrentPage((prev) => Math.max(prev - 1, 1))
+									}
+									disabled={currentPage === 1}>
+									<ChevronLeft className="h-4 w-4" />
+								</Button>
+								<Button
+									variant="outline"
+									size="icon"
+									className="h-9 w-9"
+									onClick={() =>
+										setCurrentPage((prev) => Math.min(prev + 1, totalPages))
+									}
+									disabled={currentPage === totalPages || totalPages === 0}>
+									<ChevronRight className="h-4 w-4" />
+								</Button>
+							</div>
+						</div>
+					</div>
+				)}
+			</CardContent>
+		</Card>
+	);
+}
@@ -15,6 +15,10 @@ export default function Sidebar() {
 			name: "Doctor",
 			path: "/doctor",
 		},
+		{
+			name: "Health Check",
+			path: "/health-check",
+		},
 		{
 			name: "Appointments",
 			path: "/appointment",
@@ -65,7 +69,8 @@ export default function Sidebar() {
 						<Link key={item.path} to={item.path}>
 							<Button
 								variant={active ? "secondary" : "ghost"}
-								className="w-full justify-start">
+								className="w-full justify-start"
+							>
 								{item.name}
 							</Button>
 						</Link>
@@ -5,7 +5,7 @@ import { Slot } from "radix-ui"
 import { cn } from "@/lib/utils"

 const buttonVariants = cva(
-  "group/button inline-flex shrink-0 items-center justify-center rounded-lg border border-transparent bg-clip-padding text-sm font-medium whitespace-nowrap transition-all outline-none select-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 active:translate-y-px disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+  "group/button inline-flex shrink-0 items-center justify-center rounded-lg border border-transparent bg-clip-padding text-sm font-medium whitespace-nowrap transition-all outline-none select-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 active:not-aria-[haspopup]:translate-y-px disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
  {
    variants: {
      variant: {
@@ -25,7 +25,7 @@ const buttonVariants = cva(
          "h-8 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
        xs: "h-6 gap-1 rounded-[min(var(--radius-md),10px)] px-2 text-xs in-data-[slot=button-group]:rounded-lg has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3",
        sm: "h-7 gap-1 rounded-[min(var(--radius-md),12px)] px-2.5 text-[0.8rem] in-data-[slot=button-group]:rounded-lg has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5",
-        lg: "h-9 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-3 has-data-[icon=inline-start]:pl-3",
+        lg: "h-9 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
        icon: "size-8",
        "icon-xs":
          "size-6 rounded-[min(var(--radius-md),10px)] in-data-[slot=button-group]:rounded-lg [&_svg:not([class*='size-'])]:size-3",
@@ -59,7 +59,7 @@ function DialogContent({
      <DialogPrimitive.Content
        data-slot="dialog-content"
        className={cn(
-          "fixed top-1/2 left-1/2 z-50 grid w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 gap-4 rounded-xl bg-background p-4 text-sm ring-1 ring-foreground/10 duration-100 outline-none sm:max-w-sm data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
+          "fixed top-1/2 left-1/2 z-50 grid w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 gap-4 rounded-xl bg-popover p-4 text-sm text-popover-foreground ring-1 ring-foreground/10 duration-100 outline-none sm:max-w-sm data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
          className
        )}
        {...props}
@@ -127,7 +127,10 @@ function DialogTitle({
  return (
    <DialogPrimitive.Title
      data-slot="dialog-title"
-      className={cn("text-base leading-none font-medium", className)}
+      className={cn(
+        "text-base leading-none font-medium",
+        className
+      )}
      {...props}
    />
  )
@@ -0,0 +1,190 @@
+import * as React from "react"
+import { Select as SelectPrimitive } from "radix-ui"
+
+import { cn } from "@/lib/utils"
+import { ChevronDownIcon, CheckIcon, ChevronUpIcon } from "lucide-react"
+
+function Select({
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Root>) {
+  return <SelectPrimitive.Root data-slot="select" {...props} />
+}
+
+function SelectGroup({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Group>) {
+  return (
+    <SelectPrimitive.Group
+      data-slot="select-group"
+      className={cn("scroll-my-1 p-1", className)}
+      {...props}
+    />
+  )
+}
+
+function SelectValue({
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Value>) {
+  return <SelectPrimitive.Value data-slot="select-value" {...props} />
+}
+
+function SelectTrigger({
+  className,
+  size = "default",
+  children,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
+  size?: "sm" | "default"
+}) {
+  return (
+    <SelectPrimitive.Trigger
+      data-slot="select-trigger"
+      data-size={size}
+      className={cn(
+        "flex w-fit items-center justify-between gap-1.5 rounded-lg border border-input bg-transparent py-2 pr-2 pl-2.5 text-sm whitespace-nowrap transition-colors outline-none select-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-placeholder:text-muted-foreground data-[size=default]:h-8 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <SelectPrimitive.Icon asChild>
+        <ChevronDownIcon className="pointer-events-none size-4 text-muted-foreground" />
+      </SelectPrimitive.Icon>
+    </SelectPrimitive.Trigger>
+  )
+}
+
+function SelectContent({
+  className,
+  children,
+  position = "item-aligned",
+  align = "center",
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Content>) {
+  return (
+    <SelectPrimitive.Portal>
+      <SelectPrimitive.Content
+        data-slot="select-content"
+        data-align-trigger={position === "item-aligned"}
+        className={cn("relative z-50 max-h-(--radix-select-content-available-height) min-w-36 origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg bg-popover text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95", position ==="popper"&&"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1", className )}
+        position={position}
+        align={align}
+        {...props}
+      >
+        <SelectScrollUpButton />
+        <SelectPrimitive.Viewport
+          data-position={position}
+          className={cn(
+            "data-[position=popper]:h-(--radix-select-trigger-height) data-[position=popper]:w-full data-[position=popper]:min-w-(--radix-select-trigger-width)",
+            position === "popper" && ""
+          )}
+        >
+          {children}
+        </SelectPrimitive.Viewport>
+        <SelectScrollDownButton />
+      </SelectPrimitive.Content>
+    </SelectPrimitive.Portal>
+  )
+}
+
+function SelectLabel({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Label>) {
+  return (
+    <SelectPrimitive.Label
+      data-slot="select-label"
+      className={cn("px-1.5 py-1 text-xs text-muted-foreground", className)}
+      {...props}
+    />
+  )
+}
+
+function SelectItem({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Item>) {
+  return (
+    <SelectPrimitive.Item
+      data-slot="select-item"
+      className={cn(
+        "relative flex w-full cursor-default items-center gap-1.5 rounded-md py-1 pr-8 pl-1.5 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+        className
+      )}
+      {...props}
+    >
+      <span className="pointer-events-none absolute right-2 flex size-4 items-center justify-center">
+        <SelectPrimitive.ItemIndicator>
+          <CheckIcon className="pointer-events-none" />
+        </SelectPrimitive.ItemIndicator>
+      </span>
+      <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+    </SelectPrimitive.Item>
+  )
+}
+
+function SelectSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Separator>) {
+  return (
+    <SelectPrimitive.Separator
+      data-slot="select-separator"
+      className={cn("pointer-events-none -mx-1 my-1 h-px bg-border", className)}
+      {...props}
+    />
+  )
+}
+
+function SelectScrollUpButton({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {
+  return (
+    <SelectPrimitive.ScrollUpButton
+      data-slot="select-scroll-up-button"
+      className={cn(
+        "z-10 flex cursor-default items-center justify-center bg-popover py-1 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      <ChevronUpIcon
+      />
+    </SelectPrimitive.ScrollUpButton>
+  )
+}
+
+function SelectScrollDownButton({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {
+  return (
+    <SelectPrimitive.ScrollDownButton
+      data-slot="select-scroll-down-button"
+      className={cn(
+        "z-10 flex cursor-default items-center justify-center bg-popover py-1 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      <ChevronDownIcon
+      />
+    </SelectPrimitive.ScrollDownButton>
+  )
+}
+
+export {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectLabel,
+  SelectScrollDownButton,
+  SelectScrollUpButton,
+  SelectSeparator,
+  SelectTrigger,
+  SelectValue,
+}
@@ -0,0 +1,88 @@
+import * as React from "react"
+import { cva, type VariantProps } from "class-variance-authority"
+import { Tabs as TabsPrimitive } from "radix-ui"
+
+import { cn } from "@/lib/utils"
+
+function Tabs({
+  className,
+  orientation = "horizontal",
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.Root>) {
+  return (
+    <TabsPrimitive.Root
+      data-slot="tabs"
+      data-orientation={orientation}
+      className={cn(
+        "group/tabs flex gap-2 data-horizontal:flex-col",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+const tabsListVariants = cva(
+  "group/tabs-list inline-flex w-fit items-center justify-center rounded-lg p-[3px] text-muted-foreground group-data-horizontal/tabs:h-8 group-data-vertical/tabs:h-fit group-data-vertical/tabs:flex-col data-[variant=line]:rounded-none",
+  {
+    variants: {
+      variant: {
+        default: "bg-muted",
+        line: "gap-1 bg-transparent",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+    },
+  }
+)
+
+function TabsList({
+  className,
+  variant = "default",
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.List> &
+  VariantProps<typeof tabsListVariants>) {
+  return (
+    <TabsPrimitive.List
+      data-slot="tabs-list"
+      data-variant={variant}
+      className={cn(tabsListVariants({ variant }), className)}
+      {...props}
+    />
+  )
+}
+
+function TabsTrigger({
+  className,
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.Trigger>) {
+  return (
+    <TabsPrimitive.Trigger
+      data-slot="tabs-trigger"
+      className={cn(
+        "relative inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-1.5 py-0.5 text-sm font-medium whitespace-nowrap text-foreground/60 transition-all group-data-vertical/tabs:w-full group-data-vertical/tabs:justify-start hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-1 focus-visible:outline-ring disabled:pointer-events-none disabled:opacity-50 has-data-[icon=inline-end]:pr-1 has-data-[icon=inline-start]:pl-1 dark:text-muted-foreground dark:hover:text-foreground group-data-[variant=default]/tabs-list:data-active:shadow-sm group-data-[variant=line]/tabs-list:data-active:shadow-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "group-data-[variant=line]/tabs-list:bg-transparent group-data-[variant=line]/tabs-list:data-active:bg-transparent dark:group-data-[variant=line]/tabs-list:data-active:border-transparent dark:group-data-[variant=line]/tabs-list:data-active:bg-transparent",
+        "data-active:bg-background data-active:text-foreground dark:data-active:border-input dark:data-active:bg-input/30 dark:data-active:text-foreground",
+        "after:absolute after:bg-foreground after:opacity-0 after:transition-opacity group-data-horizontal/tabs:after:inset-x-0 group-data-horizontal/tabs:after:bottom-[-5px] group-data-horizontal/tabs:after:h-0.5 group-data-vertical/tabs:after:inset-y-0 group-data-vertical/tabs:after:-right-1 group-data-vertical/tabs:after:w-0.5 group-data-[variant=line]/tabs-list:data-active:after:opacity-100",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function TabsContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.Content>) {
+  return (
+    <TabsPrimitive.Content
+      data-slot="tabs-content"
+      className={cn("flex-1 text-sm outline-none", className)}
+      {...props}
+    />
+  )
+}
+
+export { Tabs, TabsList, TabsTrigger, TabsContent, tabsListVariants }
@@ -0,0 +1,55 @@
+import * as React from "react"
+import { Tooltip as TooltipPrimitive } from "radix-ui"
+
+import { cn } from "@/lib/utils"
+
+function TooltipProvider({
+  delayDuration = 0,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
+  return (
+    <TooltipPrimitive.Provider
+      data-slot="tooltip-provider"
+      delayDuration={delayDuration}
+      {...props}
+    />
+  )
+}
+
+function Tooltip({
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Root>) {
+  return <TooltipPrimitive.Root data-slot="tooltip" {...props} />
+}
+
+function TooltipTrigger({
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
+  return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />
+}
+
+function TooltipContent({
+  className,
+  sideOffset = 0,
+  children,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Content>) {
+  return (
+    <TooltipPrimitive.Portal>
+      <TooltipPrimitive.Content
+        data-slot="tooltip-content"
+        sideOffset={sideOffset}
+        className={cn(
+          "z-50 inline-flex w-fit max-w-xs origin-(--radix-tooltip-content-transform-origin) items-center gap-1.5 rounded-md bg-foreground px-3 py-1.5 text-xs text-background has-data-[slot=kbd]:pr-1.5 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot=kbd]:relative **:data-[slot=kbd]:isolate **:data-[slot=kbd]:z-50 **:data-[slot=kbd]:rounded-sm data-[state=delayed-open]:animate-in data-[state=delayed-open]:fade-in-0 data-[state=delayed-open]:zoom-in-95 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <TooltipPrimitive.Arrow className="z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px] bg-foreground fill-foreground" />
+      </TooltipPrimitive.Content>
+    </TooltipPrimitive.Portal>
+  )
+}
+
+export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger }
@@ -40,7 +40,8 @@ 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);

@@ -56,6 +57,8 @@ export default function AppointmentPage() {
 				currentPage,
 				itemsPerPage,
 				filterDate,
+				startDate,
+				endDate,
 				searchText,
 			);
 			setAppointments(res?.data || []);
@@ -66,7 +69,7 @@ export default function AppointmentPage() {
 		} finally {
 			setLoading(false);
 		}
-	}, [currentPage, itemsPerPage, filterDate, searchText]);
+	}, [currentPage, itemsPerPage, filterDate, startDate, endDate, searchText]);

 	useEffect(() => {
 		fetchAll();
@@ -116,39 +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);
-							setCurrentPage(1);
-						}}
-						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);
-							setCurrentPage(1);
-						}}
-						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>

-					<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 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"
@@ -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: ""},
+										};
+									}
 								},
 							},
 						},
@@ -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>

@@ -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>
@@ -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) => (
@@ -233,6 +233,7 @@ export default function EmailPage() {
 							<option value="CANDIDATE">CANDIDATE</option>
 							<option value="ACADEMICS">ACADEMICS</option>
 							<option value="INQUIRY">INQUIRY</option>
+							<option value="HCINQUIRY">HC-APPOINTMENT</option>
 						</select>

 						<select
@@ -136,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();
@@ -411,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"
 								/>
Author	SHA1	Message	Date
Kailasdevdas	98194283df	chore: add toast show validation errors	2026-05-18 16:41:38 +05:30
kailasdevdas	1320ce6fe6	Merge pull request 'chore: show required image dimension' (#31 ) from feat/healthcheckup-crud into dev Reviewed-on: #31	2026-05-18 07:47:06 +00:00
Kailasdevdas	3dbbb2e77e	chore: show required image dimension	2026-05-18 13:15:00 +05:30
kailasdevdas	5b1d626661	Merge pull request 'feat: health checkup CRUD apis' (#30 ) from feat/healthcheckup-crud into dev Reviewed-on: #30	2026-05-18 06:26:27 +00:00
Kailasdevdas	098fe12fd7	feat: add image upload for health package	2026-05-18 11:55:55 +05:30
Kailasdevdas	852a25269a	feat: add toast	2026-05-18 10:58:24 +05:30
Kailasdevdas	d92e0538bd	fix: make category slug optional	2026-05-18 10:58:14 +05:30
Kailasdevdas	8d60afdc49	feat: health checkup page	2026-05-15 17:58:25 +05:30
Kailasdevdas	9bc0bf406a	feat: health checkup CRUD apis	2026-05-15 17:46:52 +05:30
kailasdevdas	3140d72e28	Merge pull request 'fix:blog editor image upload' (#28 ) from fix/blog-text-editor-image-uploader into dev Reviewed-on: #28	2026-05-13 11:49:49 +00:00
rishalkv	6117805467	fix:blog editor image upload	2026-05-13 17:16:25 +05:30
kailasdevdas	b002c053ae	Merge pull request 'fix: doctor toggle logic' (#27 ) from feat/appointment-date-filter into dev Reviewed-on: #27	2026-05-13 09:12:35 +00:00
kailasdevdas	e6044518d2	Merge pull request 'feat: update date format in mail' (#26 ) from feat/email-date-format into dev Reviewed-on: #26	2026-05-13 09:03:56 +00:00
Kailasdevdas	6889137164	feat: add appointment date range filter	2026-05-13 14:20:51 +05:30
Kailasdevdas	988fbd28f1	fix: doctor toggle logic	2026-05-13 14:19:42 +05:30
Kailasdevdas	fa2b02ad23	feat: update date format in mail	2026-05-13 11:57:33 +05:30
kailasdevdas	199797fdf4	Merge pull request 'feat:sorting according to the prio of dept' (#24 ) from feat/department-internal-sort into dev Reviewed-on: #24	2026-05-11 11:37:53 +00:00
rishalkv	5efe049fbd	feat:sorting according to the prio of dept	2026-05-11 16:27:20 +05:30
kailasdevdas	a008f09923	Merge pull request 'feat: implement sorting and visibility changes' (#23 ) from feat/inactive-field into dev Reviewed-on: #23	2026-05-11 05:35:39 +00:00
Kailasdevdas	903a541e35	chore: correct lablel	2026-05-11 10:57:52 +05:30
Kailasdevdas	4808e99ae5	feat: remove delete action and add status toggle to tables	2026-05-11 10:52:30 +05:30
Kailasdevdas	2c6da93dfb	feat: add toast	2026-05-11 10:51:34 +05:30
Kailasdevdas	1717507555	feat: implement sorting and visibility changes	2026-05-11 00:04:22 +05:30
kailasdevdas	9aaf1879a8	Merge pull request 'fix: edit form fields and update form submission logic' (#21 ) from fix/news-media-UI into dev Reviewed-on: #21	2026-05-05 06:44:06 +00:00
Kailasdevdas	d847789564	fix: edit form fields and update form submission logic	2026-05-05 10:48:18 +05:30
Ashir Ali	eab661bb4a	refactor: email updates	2026-05-01 01:31:41 +05:30
Ashir Ali	60ace745f3	feat: disableConcurrentBuilds	2026-05-01 01:27:33 +05:30
Ashir Ali	5fec4dd37d	feat: email template added, jenkins file bug fix	2026-05-01 00:50:31 +05:30
Ashir Ali	bb42581c17	feat: added email recepient	2026-05-01 00:47:17 +05:30
Ashir Ali	621bc8efcd	feat: Prod docker compose and Jenkinsfile added	2026-05-01 00:06:27 +05:30
Ashir Ali	e32a005340	fix: update docker compose to reuse old data	2026-04-30 21:28:20 +05:30
Ashir Ali	1e98bb4115	fix: agent 6 for jenkins	2026-04-30 21:04:15 +05:30
Ashir Ali	c4ef2af9df	fix: PAT update	2026-04-30 20:51:24 +05:30
Ashir Ali	dda6b75dce	feat: Jenkinsfile added	2026-04-30 20:33:42 +05:30
kailasdevdas	2c37cd042f	Merge pull request 'feat: improve email template' (#18 ) from feat/ui-enhancements into dev Reviewed-on: #18	2026-04-29 04:28:58 +00:00
Kailasdevdas	082e227111	feat: improve email template	2026-04-27 17:29:33 +05:30
kailasdevdas	a0dbf32cf3	Merge pull request 'fix/news-media-pagination' (#17 ) from fix/news-media-pagination into dev Reviewed-on: #17	2026-04-27 05:39:47 +00:00