fix: edit form fields and update form submission logic

Reviewed-on: #18

Jenkinsfile

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

Jenkinsfile.prod

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

backend/src/controllers/academicsResearch.controller.js

@@ -35,18 +35,73 @@ export const createAcademicsResearch = async (req, res) => {
 					to: emailList,
 					subject: "New Academics & Research Inquiry",
 					html: `
-						<h2>New Academics & Research Inquiry</h2>
+		<div style="font-family: Arial, sans-serif; background-color: #f4f6f8; padding: 20px;">
 		  
-						<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) {

backend/src/controllers/appointment.controller.js

@@ -38,15 +38,84 @@ 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()}
+		          </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) {

backend/src/controllers/candidate.controller.js

@@ -39,19 +39,82 @@ export const createCandidate = async (req, res) => {
 					to: emailList,
 					subject: "New Job Application Received",
 					html: `
-						<h2>New Candidate Application</h2>
+		<div style="font-family: Arial, sans-serif; background-color: #f4f6f8; padding: 20px;">
 		  
-						<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) {

backend/src/controllers/inquiry.controller.js

@@ -32,14 +32,66 @@ export const createInquiry = async (req, res) => {
 					to: emailList,
 					subject: "New Inquiry Received",
 					html: `
-						<h2>New Inquiry</h2>
+					<div style="font-family: Arial, sans-serif; background-color: #f4f6f8; padding: 20px;">
 					
-						<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>
 					`,
 				});
 			}

backend/src/controllers/newsMedia.controller.js

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

docker-compose.dev.yml

@@ -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

docker-compose.prod.yml

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

frontend/src/api/newsMedia.ts

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

frontend/src/pages/newsMedia.tsx

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