Merge branch 'feat/bytescale-integration' into dev

backend/prisma/migrations/20260414074145_doctor_image_field/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Doctor" ADD COLUMN     "image" TEXT;

backend/prisma/migrations/20260414102430_department_image/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Department" ADD COLUMN     "image" TEXT;

backend/prisma/migrations/20260414105925_news_media/migration.sql

@@ -0,0 +1,12 @@
+-- CreateTable
+CREATE TABLE "NewsImage" (
+    "id" SERIAL NOT NULL,
+    "url" TEXT NOT NULL,
+    "newsMediaId" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "NewsImage_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "NewsImage" ADD CONSTRAINT "NewsImage_newsMediaId_fkey" FOREIGN KEY ("newsMediaId") REFERENCES "NewsMedia"("id") ON DELETE CASCADE ON UPDATE CASCADE;

backend/prisma/schema.prisma

@@ -21,6 +21,7 @@ model Doctor {
   id            Int     @id @default(autoincrement())
   doctorId      String  @unique
   name          String
+  image         String?
   designation   String?
   workingStatus String?
   qualification String?
@@ -36,6 +37,8 @@ model Department {
   id           Int    @id @default(autoincrement())
   departmentId String @unique
   name         String
+  image        String?
+
 
   para1      String?
   para2      String?
@@ -196,9 +199,18 @@ model NewsMedia {
   secondPara String?
   author     String?
   date       DateTime?
+  images     NewsImage[] 
 
   isActive   Boolean  @default(true)
-
   createdAt  DateTime    @default(now())
   updatedAt  DateTime    @updatedAt
 }
+
+model NewsImage {
+  id          Int       @id @default(autoincrement())
+  url         String    
+  newsMediaId Int
+  newsMedia   NewsMedia @relation(fields: [newsMediaId], references: [id], onDelete: Cascade)
+
+  createdAt   DateTime  @default(now())
+}

backend/src/controllers/department.controller.js

@@ -9,6 +9,7 @@ export const getAllDepartments = async (req, res) => {
 		const response = departments.map((dep) => ({
 			departmentId: dep.departmentId,
 			name: dep.name,
+			image: dep.image ?? "",
 			para1: dep.para1 ?? "",
 			para2: dep.para2 ?? "",
 			para3: dep.para3 ?? "",
@@ -56,6 +57,7 @@ export const getDepartmentByName = async (req, res) => {
 		const response = {
 			departmentId: department.departmentId,
 			name: department.name,
+			image: department.image ?? "",
 			para1: department.para1 ?? "",
 			para2: department.para2 ?? "",
 			para3: department.para3 ?? "",
@@ -78,8 +80,16 @@ export const getDepartmentByName = async (req, res) => {
 
 export async function createDepartment(req, res) {
 	try {
-		const {departmentId, name, para1, para2, para3, facilities, services} =
+		const {
-			req.body;
+			departmentId,
+			name,
+			image,
+			para1,
+			para2,
+			para3,
+			facilities,
+			services,
+		} = req.body;
 
 		if (!departmentId || !name) {
 			return res
@@ -91,6 +101,7 @@ export async function createDepartment(req, res) {
 			data: {
 				departmentId,
 				name,
+				image,
 				para1,
 				para2,
 				para3,
@@ -116,12 +127,13 @@ export const updateDepartment = async (req, res) => {
 	try {
 		const {departmentId} = req.params;
 
-		const {name, para1, para2, para3, facilities, services} = req.body;
+		const {name, image, para1, para2, para3, facilities, services} = req.body;
 
 		const department = await prisma.department.update({
 			where: {departmentId},
 			data: {
 				name,
+				image,
 				para1,
 				para2,
 				para3,

backend/src/controllers/doctor.controller.js

@@ -20,6 +20,7 @@ export const getAllDoctors = async (req, res) => {
 			SL_NO: String(index + 1),
 			doctorId: doc.doctorId,
 			name: doc.name,
+			image: doc.image ?? "",
 			designation: doc.designation,
 			workingStatus: doc.workingStatus,
 			qualification: doc.qualification,
@@ -87,6 +88,7 @@ export const getDoctorByDoctorId = async (req, res) => {
 		const response = {
 			doctorId: doctor.doctorId,
 			name: doctor.name,
+			image: doctor.image ?? "",
 			designation: doctor.designation,
 			workingStatus: doctor.workingStatus,
 			qualification: doctor.qualification,
@@ -143,6 +145,7 @@ export const getDoctorsByDepartmentId = async (req, res) => {
 		const result = doctors.map((d) => ({
 			GG_ID: d.doctor.doctorId,
 			Name: d.doctor.name,
+			image: d.doctor.image ?? "",
 		}));
 
 		res.status(200).json({
@@ -164,6 +167,7 @@ export const createDoctor = async (req, res) => {
 		const {
 			doctorId,
 			name,
+			image,
 			designation,
 			workingStatus,
 			qualification,
@@ -174,6 +178,7 @@ export const createDoctor = async (req, res) => {
 			data: {
 				doctorId,
 				name,
+				image,
 				designation,
 				workingStatus,
 				qualification,
@@ -221,8 +226,14 @@ export const createDoctor = async (req, res) => {
 export const updateDoctor = async (req, res) => {
 	try {
 		const {doctorId} = req.params;
-		const {name, designation, workingStatus, qualification, departments} =
+		const {
-			req.body;
+			name,
+			designation,
+			image,
+			workingStatus,
+			qualification,
+			departments,
+		} = req.body;
 
 		const doctor = await prisma.doctor.findUnique({
 			where: {doctorId},
@@ -236,7 +247,7 @@ export const updateDoctor = async (req, res) => {
 
 		await prisma.doctor.update({
 			where: {id: doctor.id},
-			data: {name, designation, workingStatus, qualification},
+			data: {name, designation, image, workingStatus, qualification},
 		});
 
 		const oldRelations = await prisma.doctorDepartment.findMany({

backend/src/controllers/inquiry.controller.js

@@ -1,5 +1,8 @@
 import prisma from "../prisma/client.js";
 
+import {sendEmail} from "../utils/sendEmail.js";
+import {getEmailsByType} from "../utils/getEmailByTypes.js";
+
 /* CREATE INQUIRY */
 export const createInquiry = async (req, res) => {
 	try {
@@ -21,6 +24,28 @@ export const createInquiry = async (req, res) => {
 				message,
 			},
 		});
+		try {
+			const emailList = await getEmailsByType("INQUIRY");
+
+			if (emailList && emailList.length > 0) {
+				await sendEmail({
+					to: emailList,
+					subject: "New Inquiry Received",
+					html: `
+						<h2>New Inquiry</h2>
+
+						<p><b>Name:</b> ${fullName}</p>
+						<p><b>Phone:</b> ${number}</p>
+						<p><b>Email:</b> ${emailId}</p>
+
+						<p><b>Subject:</b> ${subject}</p>
+					<p><b>Message:</b> ${message}</p>
+					`,
+				});
+			}
+		} catch (err) {
+			console.error("Inquiry email failed:", err);
+		}
 
 		res.status(200).json({
 			success: true,

backend/src/controllers/newsMedia.controller.js

@@ -7,8 +7,13 @@ export const getAllNews = async (req, res) => {
 		const page = parseInt(req.query.page);
 		const limit = parseInt(req.query.limit);
 
+		const includeImages = {
+			images: true,
+		};
+
 		if (!page && !limit) {
 			const news = await prisma.newsMedia.findMany({
+				include: includeImages,
 				orderBy: { createdAt: "desc" },
 			});
 
@@ -20,6 +25,10 @@ export const getAllNews = async (req, res) => {
 				SecondPara: n.secondPara,
 				Date: n.date,
 				Author: n.author,
+				Images: n.images.map((img) => ({
+					id: img.id,
+					image: img.url,
+				})),
 			}));
 
 			return res.status(200).json({
@@ -36,6 +45,7 @@ export const getAllNews = async (req, res) => {
 
 		const [news, total] = await Promise.all([
 			prisma.newsMedia.findMany({
+				include: includeImages,
 				orderBy: { createdAt: "desc" },
 				skip,
 				take: currentLimit,
@@ -51,6 +61,10 @@ export const getAllNews = async (req, res) => {
 			SecondPara: n.secondPara,
 			Date: n.date,
 			Author: n.author,
+			Images: n.images.map((img) => ({
+				id: img.id,
+				image: img.url,
+			})),
 		}));
 
 		return res.status(200).json({
@@ -80,6 +94,7 @@ export const getNewsById = async (req, res) => {
 
 		const n = await prisma.newsMedia.findUnique({
 			where: { id: Number(id) },
+			include: { images: true },
 		});
 
 		if (!n) {
@@ -97,6 +112,10 @@ export const getNewsById = async (req, res) => {
 			SecondPara: n.secondPara,
 			Date: n.date,
 			Author: n.author,
+			Images: n.images.map((img) => ({
+				id: img.id,
+				image: img.url,
+			})),
 		};
 
 		return res.status(200).json({
@@ -116,7 +135,15 @@ export const getNewsById = async (req, res) => {
 
 export const createNews = async (req, res) => {
 	try {
-		const { headline, content, firstPara, secondPara, date, author } = req.body;
+		const {
+			headline,
+			content,
+			firstPara,
+			secondPara,
+			date,
+			author,
+			imageUrls,
+		} = req.body;
 
 		if (!headline) {
 			return res.status(400).json({
@@ -133,7 +160,13 @@ export const createNews = async (req, res) => {
 				secondPara,
 				date: date ? new Date(date) : null,
 				author,
+				images: imageUrls
+					? {
+							create: imageUrls.map((url) => ({ url })),
+						}
+					: undefined,
 			},
+			include: { images: true },
 		});
 
 		return res.status(201).json({
@@ -155,13 +188,21 @@ export const createNews = async (req, res) => {
 export const updateNews = async (req, res) => {
 	try {
 		const { id } = req.params;
+		const { imageUrls, ...otherData } = req.body;
 
 		const news = await prisma.newsMedia.update({
 			where: { id: Number(id) },
 			data: {
-				...req.body,
+				...otherData,
 				date: req.body.date ? new Date(req.body.date) : undefined,
+				images: imageUrls
+					? {
+							deleteMany: {},
+							create: imageUrls.map((url) => ({ url })),
+						}
+					: undefined,
 			},
+			include: { images: true },
 		});
 
 		return res.status(200).json({

frontend/package-lock.json

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

frontend/package.json

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

frontend/src/api/department.ts

@@ -3,6 +3,7 @@ import apiClient from "@/api/client";
 export interface Department {
 	departmentId: string;
 	name: string;
+	image?: string;
 	para1: string;
 	para2: string;
 	para3: string;

frontend/src/api/doctor.ts

@@ -3,6 +3,7 @@ import apiClient from "@/api/client";
 export interface Doctor {
 	doctorId: string;
 	name: string;
+	image?: string;
 	designation?: string;
 	workingStatus?: string;
 	qualification?: string;

frontend/src/components/BytescaleUploader/BytescaleUploader.tsx

@@ -0,0 +1,109 @@
+import { useState, useRef } from "react";
+import * as Bytescale from "@bytescale/sdk";
+import { Button } from "@/components/ui/button";
+import { User, X, Loader2 } from "lucide-react";
+
+interface BytescaleUploaderProps {
+	value: string;
+	onChange: (url: string) => void;
+	folderPath: "/doctors" | "/departments" | "/news";
+}
+
+const uploadManager = new Bytescale.UploadManager({
+	apiKey: "public_223k2cv3MyaAxBeyALCfJa8EMLek",
+});
+
+export function BytescaleUploader({ value, onChange }: BytescaleUploaderProps) {
+	const [isUploading, setIsUploading] = useState(false);
+	const fileInputRef = useRef<HTMLInputElement>(null);
+
+	const onFileSelected = async (event: React.ChangeEvent<HTMLInputElement>) => {
+		const file = event.target.files?.[0];
+		if (!file) return;
+
+		setIsUploading(true);
+		try {
+			const { fileUrl } = await uploadManager.upload({
+				data: file,
+				path: {
+					folderPath: "/doctors",
+				},
+			});
+
+			onChange(fileUrl);
+		} catch (e: any) {
+			console.error("Upload Error:", e);
+			alert(`Error:\n${e.message}`);
+		} finally {
+			setIsUploading(false);
+			if (fileInputRef.current) fileInputRef.current.value = "";
+		}
+	};
+
+	return (
+		<div className="flex flex-col gap-2 p-3 border rounded-md bg-muted/5">
+			<div className="flex items-center gap-4">
+				<div className="relative">
+					{value ? (
+						<>
+							<img
+								src={value}
+								className="w-16 h-16 rounded-full object-cover border-2 border-primary/20"
+								alt="Doctor Profile"
+							/>
+							<button
+								type="button"
+								onClick={() => onChange("")}
+								className="absolute -top-1 -right-1 bg-destructive text-white rounded-full p-0.5 shadow-sm hover:scale-110 transition-transform"
+							>
+								<X className="w-3 h-3" />
+							</button>
+						</>
+					) : (
+						<div className="w-16 h-16 rounded-full bg-muted flex items-center justify-center">
+							{isUploading ? (
+								<Loader2 className="w-8 h-8 animate-spin text-primary" />
+							) : (
+								<User className="w-8 h-8 text-muted-foreground" />
+							)}
+						</div>
+					)}
+				</div>
+
+				<input
+					type="file"
+					ref={fileInputRef}
+					onChange={onFileSelected}
+					accept="image/jpeg,image/png,image/webp"
+					className="hidden"
+				/>
+
+				<Button
+					type="button"
+					variant="outline"
+					size="sm"
+					disabled={isUploading}
+					onClick={() => fileInputRef.current?.click()}
+				>
+					{isUploading ? (
+						<>
+							<Loader2 className="mr-2 h-4 w-4 animate-spin" />
+							Uploading...
+						</>
+					) : value ? (
+						"Change Photo"
+					) : (
+						"Upload Photo"
+					)}
+				</Button>
+			</div>
+
+			{value && (
+				<p className="text-xs text-amber-600 pl-[72px]">
+					⚠️ Make sure to save the changes by clicking the "Save Changes" button
+					at the bottom.
+				</p>
+			)}
+		</div>
+	);
+}

frontend/src/pages/Department.tsx

@@ -1,5 +1,6 @@
 import { useState, useEffect, useCallback } from "react";
 import { AxiosError } from "axios";
+import { BytescaleUploader } from "@/components/BytescaleUploader/BytescaleUploader";
 
 import {
 	getDepartmentsApi,
@@ -45,6 +46,7 @@ import {
 interface Department {
 	departmentId: string;
 	name: string;
+	image?: string;
 	para1: string;
 	para2: string;
 	para3: string;
@@ -71,6 +73,7 @@ export default function DepartmentPage() {
 	const [form, setForm] = useState<Department>({
 		departmentId: "",
 		name: "",
+		image: "",
 		para1: "",
 		para2: "",
 		para3: "",
@@ -132,6 +135,7 @@ export default function DepartmentPage() {
 		setForm({
 			departmentId: "",
 			name: "",
+			image: "",
 			para1: "",
 			para2: "",
 			para3: "",
@@ -393,6 +397,14 @@ export default function DepartmentPage() {
 					</DialogHeader>
 
 					<div className="space-y-4">
+						<div className="space-y-2">
+							<label className="text-sm font-semibold">Department Image</label>
+							<BytescaleUploader
+								value={form.image}
+								folderPath="/departments"
+								onChange={(url) => setForm({ ...form, image: url })}
+							/>
+						</div>
 						<Input
 							name="departmentId"
 							value={form.departmentId}

frontend/src/pages/Doctor.tsx

@@ -1,5 +1,8 @@
 import { useState, useEffect, useCallback } from "react";
 import { AxiosError } from "axios";
+
+import { BytescaleUploader } from "@/components/BytescaleUploader/BytescaleUploader";
+
 import {
 	getDoctorsApi,
 	createDoctorApi,
@@ -36,6 +39,7 @@ import {
 	Trash,
 	ChevronLeft,
 	ChevronRight,
+	User,
 } from "lucide-react";
 
 interface Department {
@@ -72,6 +76,7 @@ export default function DoctorPage() {
 	const [form, setForm] = useState<any>({
 		doctorId: "",
 		name: "",
+		image: "",
 		designation: "",
 		workingStatus: "",
 		qualification: "",
@@ -161,6 +166,7 @@ export default function DoctorPage() {
 		setForm({
 			doctorId: "",
 			name: "",
+			image: "",
 			designation: "",
 			workingStatus: "",
 			qualification: "",
@@ -177,6 +183,7 @@ export default function DoctorPage() {
 			setForm({
 				doctorId: doc.doctorId,
 				name: doc.name,
+				image: doc.image || "",
 				designation: doc.designation,
 				workingStatus: doc.workingStatus,
 				qualification: doc.qualification,
@@ -439,19 +446,31 @@ export default function DoctorPage() {
 			</Card>
 
 			<Dialog open={openModal} onOpenChange={setOpenModal}>
-				<DialogContent className="w-full !max-w-5xl max-h-[90vh] overflow-y-auto">
+				<DialogContent className="w-full !max-w-5xl h-[90vh] flex flex-col p-0 overflow-hidden">
-					<DialogHeader>
+					<DialogHeader className="p-6 border-b bg-background z-10">
 						<DialogTitle className="text-2xl">
 							{editing ? "Edit Doctor" : "Add Doctor"}
 						</DialogTitle>
 					</DialogHeader>
 
-					<div className="grid grid-cols-1 md:grid-cols-2 gap-8 mt-6">
+					<div className="flex-1 overflow-y-auto p-6">
+						<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
 								</h3>
 								<div className="space-y-4">
+									<div className="space-y-2">
+										<label className="text-sm font-semibold">
+											Doctor Photo
+										</label>
+										<BytescaleUploader
+											value={form.image}
+											folderPath="/doctors"
+											onChange={(url) => setForm({ ...form, image: url })}
+										/>
+									</div>
+
 									<div className="space-y-1">
 										<label className="text-sm font-semibold">Doctor ID</label>
 										<Input
@@ -496,7 +515,9 @@ export default function DoctorPage() {
 										/>
 									</div>
 									<div className="space-y-1">
-									<label className="text-sm font-semibold">Qualification</label>
+										<label className="text-sm font-semibold">
+											Qualification
+										</label>
 										<Input
 											name="qualification"
 											placeholder="MBBS, MD"
@@ -520,8 +541,10 @@ export default function DoctorPage() {
 													type="button"
 													variant={isSelected ? "default" : "outline"}
 													size="sm"
-												className="justify-start text-sm h-9"
+													className="justify-start text-sm min-h-11 whitespace-normal break-words text-left py-2"
-												onClick={() => handleDepartmentToggle(dep.departmentId)}
+													onClick={() =>
+														handleDepartmentToggle(dep.departmentId)
+													}
 												>
 													{dep.name}
 												</Button>
@@ -586,8 +609,9 @@ export default function DoctorPage() {
 								)}
 							</div>
 						</div>
+					</div>
 
-					<DialogFooter className="mt-10 pt-6 border-t">
+					<DialogFooter className="p-6 border-t bg-background z-10 mt-0">
 						<Button
 							variant="ghost"
 							onClick={() => setOpenModal(false)}

frontend/src/pages/email.tsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from "react";
+import {useState, useEffect, useCallback} from "react";
 
 import {
 	getEmailConfigsApi,
@@ -16,9 +16,9 @@ import {
 	TableRow,
 } from "@/components/ui/table";
 
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
+import {Button} from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
+import {Input} from "@/components/ui/input";
 
 import {
 	Dialog,
@@ -28,7 +28,7 @@ import {
 	DialogFooter,
 } from "@/components/ui/dialog";
 
-import { Loader2, Plus, Pencil, Trash, RefreshCw } from "lucide-react";
+import {Loader2, Plus, Pencil, Trash, RefreshCw} from "lucide-react";
 
 export default function EmailPage() {
 	const [emails, setEmails] = useState<any[]>([]);
@@ -69,7 +69,7 @@ export default function EmailPage() {
 	);
 
 	function handleChange(e: any) {
-		setForm({ ...form, [e.target.name]: e.target.value });
+		setForm({...form, [e.target.name]: e.target.value});
 	}
 
 	function openAdd() {
@@ -181,14 +181,16 @@ export default function EmailPage() {
 											<Button
 												size="sm"
 												variant="outline"
-												onClick={() => openEdit(item)}>
+												onClick={() => openEdit(item)}
+											>
 												<Pencil className="h-4 w-4" />
 											</Button>
 
 											<Button
 												size="sm"
 												variant="destructive"
-												onClick={() => handleDelete(item.id)}>
+												onClick={() => handleDelete(item.id)}
+											>
 												<Trash className="h-4 w-4" />
 											</Button>
 										</TableCell>
@@ -225,10 +227,12 @@ export default function EmailPage() {
 							name="type"
 							value={form.type}
 							onChange={handleChange}
-							className="border rounded px-2 py-2 w-full">
+							className="border rounded px-2 py-2 w-full"
+						>
 							<option value="APPOINTMENT">APPOINTMENT</option>
 							<option value="CANDIDATE">CANDIDATE</option>
 							<option value="ACADEMICS">ACADEMICS</option>
+							<option value="INQUIRY">INQUIRY</option>
 						</select>
 
 						<select
@@ -240,7 +244,8 @@ export default function EmailPage() {
 									isActive: e.target.value === "true",
 								})
 							}
-							className="border rounded px-2 py-2 w-full">
+							className="border rounded px-2 py-2 w-full"
+						>
 							<option value="true">Active</option>
 							<option value="false">Inactive</option>
 						</select>

frontend/src/pages/newsMedia.tsx

@@ -1,4 +1,5 @@
 import { useState, useEffect, useCallback } from "react";
+import { BytescaleUploader } from "@/components/BytescaleUploader/BytescaleUploader";
 
 import {
 	getNewsApi,
@@ -39,6 +40,8 @@ import {
 	ChevronLeft,
 	ChevronRight,
 	Newspaper,
+	ImageIcon,
+	X,
 } from "lucide-react";
 
 export default function NewsPage() {
@@ -60,6 +63,7 @@ export default function NewsPage() {
 	const [form, setForm] = useState({
 		headline: "",
 		content: "",
+		imageUrls: [] as string[],
 		firstPara: "",
 		secondPara: "",
 		date: "",
@@ -96,11 +100,19 @@ export default function NewsPage() {
 		setForm({ ...form, [e.target.name]: e.target.value });
 	}
 
+	function removeImageUrl(index: number) {
+		setForm((prev) => ({
+			...prev,
+			imageUrls: prev.imageUrls.filter((_, i) => i !== index),
+		}));
+	}
+
 	function openAdd() {
 		setEditing(null);
 		setForm({
 			headline: "",
 			content: "",
+			imageUrls: [],
 			firstPara: "",
 			secondPara: "",
 			date: "",
@@ -114,6 +126,7 @@ export default function NewsPage() {
 		setForm({
 			headline: item.Headline || "",
 			content: item.Content || "",
+			imageUrls: item.Images ? item.Images.map((img: any) => img.image) : [],
 			firstPara: item.FirstPara || "",
 			secondPara: item.SecondPara || "",
 			date: item.Date ? item.Date.split("T")[0] : "",
@@ -205,6 +218,9 @@ export default function NewsPage() {
 									<TableHead className="w-[80px] bg-background font-bold">
 										ID
 									</TableHead>
+									<TableHead className="w-[100px] bg-background font-bold">
+										Cover
+									</TableHead>
 									<TableHead className="w-[280px] bg-background font-bold">
 										Headline
 									</TableHead>
@@ -226,14 +242,14 @@ export default function NewsPage() {
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={6} className="text-center py-10">
+										<TableCell colSpan={7} className="text-center py-10">
 											<Loader2 className="h-8 w-8 animate-spin mx-auto text-primary" />
 										</TableCell>
 									</TableRow>
 								) : filteredNews.length === 0 ? (
 									<TableRow>
 										<TableCell
-											colSpan={6}
+											colSpan={7}
 											className="text-center text-muted-foreground py-10 text-base"
 										>
 											No news articles found
@@ -245,6 +261,19 @@ export default function NewsPage() {
 											<TableCell className="font-mono text-xs">
 												{item.Id}
 											</TableCell>
+											<TableCell>
+												{item.Images?.[0] ? (
+													<img
+														src={item.Images[0].image}
+														className="w-10 h-10 object-cover rounded border"
+														alt="cover"
+													/>
+												) : (
+													<div className="w-10 h-10 bg-muted flex items-center justify-center rounded">
+														<ImageIcon className="w-4 h-4 text-muted-foreground" />
+													</div>
+												)}
+											</TableCell>
 											<TableCell>
 												<div
 													className="font-semibold text-base line-clamp-2"
@@ -343,20 +372,20 @@ export default function NewsPage() {
 			</Card>
 
 			<Dialog open={openModal} onOpenChange={setOpenModal}>
-				<DialogContent className="w-full !max-w-5xl max-h-[90vh] overflow-y-auto">
+				<DialogContent className="w-full !max-w-6xl max-h-[90vh] overflow-y-auto">
 					<DialogHeader>
 						<DialogTitle className="text-2xl font-bold">
 							{editing ? "Edit News Article" : "Add New News Article"}
 						</DialogTitle>
 					</DialogHeader>
 
-					<div className="grid grid-cols-1 md:grid-cols-2 gap-8 mt-6">
+					<div className="grid grid-cols-1 lg:grid-cols-3 gap-8 mt-6">
-						<div className="space-y-6">
+						<div className="lg:col-span-2 space-y-6">
 							<h3 className="font-bold text-base border-b pb-2 text-primary">
 								Article Information
 							</h3>
-							<div className="space-y-4">
+							<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-								<div className="space-y-1">
+								<div className="space-y-1 col-span-2">
 									<label className="text-sm font-semibold">Headline</label>
 									<Input
 										name="headline"
@@ -385,35 +414,19 @@ export default function NewsPage() {
 									/>
 								</div>
 							</div>
-							<div className="space-y-1 pt-2">
+							<div className="space-y-1">
 								<label className="text-sm font-semibold">Intro Paragraph</label>
 								<Textarea
 									name="firstPara"
 									value={form.firstPara}
 									onChange={handleChange}
-									className="min-h-[140px] text-base"
+									className="min-h-[100px] text-base"
 								/>
 							</div>
-						</div>
-
-						<div className="space-y-6">
-							<h3 className="font-bold text-base border-b pb-2 text-primary">
-								Story Details
-							</h3>
-							<div className="space-y-4">
 							<div className="space-y-1">
 								<label className="text-sm font-semibold">
-										Second Paragraph
+									Full Story Content
 								</label>
-									<Textarea
-										name="secondPara"
-										value={form.secondPara}
-										onChange={handleChange}
-										className="min-h-[140px] text-base"
-									/>
-								</div>
-								<div className="space-y-1">
-									<label className="text-sm font-semibold">Content</label>
 								<Textarea
 									name="content"
 									value={form.content}
@@ -422,6 +435,55 @@ export default function NewsPage() {
 								/>
 							</div>
 						</div>
+
+						{/* Image Management Sidebar */}
+						<div className="space-y-6 border-l pl-6">
+							<h3 className="font-bold text-base border-b pb-2 text-primary flex items-center gap-2">
+								<ImageIcon className="w-4 h-4" /> Gallery Management
+							</h3>
+
+							<div className="space-y-4">
+								<label className="text-sm font-semibold">Upload Images</label>
+								<BytescaleUploader
+									value=""
+									folderPath="/news"
+									onChange={(url) => {
+										if (url) {
+											setForm((prev) => ({
+												...prev,
+												imageUrls: [...prev.imageUrls, url],
+											}));
+										}
+									}}
+								/>
+
+								<div className="grid grid-cols-2 gap-2 max-h-[400px] overflow-y-auto pr-2 mt-4">
+									{form.imageUrls.map((url, index) => (
+										<div
+											key={index}
+											className="relative group border rounded-lg overflow-hidden h-24 bg-muted"
+										>
+											<img
+												src={url}
+												alt="upload"
+												className="w-full h-full object-cover"
+											/>
+											<button
+												type="button"
+												onClick={() => removeImageUrl(index)}
+												className="absolute top-1 right-1 bg-destructive text-white rounded-full p-1 opacity-0 group-hover:opacity-100 transition-opacity shadow-sm"
+											>
+												<X className="w-3 h-3" />
+											</button>
+										</div>
+									))}
+								</div>
+								{form.imageUrls.length === 0 && (
+									<p className="text-xs text-muted-foreground text-center py-10 border-2 border-dashed rounded-lg">
+										No images uploaded yet.
+									</p>
+								)}
+							</div>
 						</div>
 					</div>
 
@@ -470,6 +532,17 @@ export default function NewsPage() {
 								</div>
 							</div>
 
+							<div className="grid grid-cols-3 md:grid-cols-4 gap-2">
+								{viewData.Images?.map((img: any, i: number) => (
+									<img
+										key={i}
+										src={img.image}
+										className="w-full h-24 object-cover rounded-md border"
+										alt="gallery"
+									/>
+								))}
+							</div>
+
 							<div className="space-y-5 leading-relaxed text-base">
 								<div className="bg-muted/30 p-4 rounded-lg border-l-4 border-primary">
 									<p className="whitespace-pre-line">{viewData.FirstPara}</p>