From f550a7b518794c67b3c3c1c9c5bbf69c9222df53 Mon Sep 17 00:00:00 2001
From: Sikandar Ejaz <34721766+SikandarEjaz@users.noreply.github.com>
Date: Mon, 8 Jun 2026 19:02:16 -0400
Subject: [PATCH] addressed issue #236

---
 Middleware/README.md                          |  2 +-
 .../core/controllers/DatasetController.java   | 20 ++---
 .../{ => src/main/resources}/DATA_SOURCES.md  |  0
 .../src/main/resources/static/home.html       | 84 ++++++++++---------
 4 files changed, 49 insertions(+), 57 deletions(-)
 rename Middleware/{ => src/main/resources}/DATA_SOURCES.md (100%)

diff --git a/Middleware/README.md b/Middleware/README.md
index 8c8b3c4a..ff154842 100644
--- a/Middleware/README.md
+++ b/Middleware/README.md
@@ -191,7 +191,7 @@ Include your username and password in the request body as JSON, for example:
 
 ## Available Data Sources
 
-- [Dataset Catalog](DATA_SOURCES.md) - Complete list of all available datasets
+- [Dataset Catalog](src/main/resources/DATA_SOURCES.md) - Complete list of all available datasets
 
 ## Demo & Presentations
 
diff --git a/Middleware/src/main/java/ca/concordia/encs/citydata/core/controllers/DatasetController.java b/Middleware/src/main/java/ca/concordia/encs/citydata/core/controllers/DatasetController.java
index c32e73bc..b6b65caa 100644
--- a/Middleware/src/main/java/ca/concordia/encs/citydata/core/controllers/DatasetController.java
+++ b/Middleware/src/main/java/ca/concordia/encs/citydata/core/controllers/DatasetController.java
@@ -2,11 +2,9 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Map;
 
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -40,20 +38,12 @@ public DatasetController(DatasetAccessService datasetAccessService) {
 	@GetMapping("/list")
 	public ResponseEntity<String> listDatasets() {
 		try {
-			Path filePath = Paths.get("DATA_SOURCES.md");
-			String content = Files.readString(filePath, StandardCharsets.UTF_8);
+			var resource = new ClassPathResource("DATA_SOURCES.md");
+			String content = new String(resource.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
 			return ResponseEntity.ok().contentType(MediaType.TEXT_PLAIN).body(content);
 		} catch (IOException e) {
-			// Fallback: try relative to project root
-			try {
-				Path filePath = Paths.get("Middleware/DATA_SOURCES.md");
-				String content = Files.readString(filePath, StandardCharsets.UTF_8);
-				return ResponseEntity.ok().contentType(MediaType.TEXT_PLAIN).body(content);
-			} catch (IOException e2) {
-				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						.body("Could not load dataset list. Tried ./DATA_SOURCES.md and Middleware/DATA_SOURCES.md. "
-								+ "Working directory: " + Paths.get("").toAbsolutePath());
-			}
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body("Could not load DATA_SOURCES.md from classpath.");
 		}
 	}
 
diff --git a/Middleware/DATA_SOURCES.md b/Middleware/src/main/resources/DATA_SOURCES.md
similarity index 100%
rename from Middleware/DATA_SOURCES.md
rename to Middleware/src/main/resources/DATA_SOURCES.md
diff --git a/Middleware/src/main/resources/static/home.html b/Middleware/src/main/resources/static/home.html
index aba3d239..0e68d765 100644
--- a/Middleware/src/main/resources/static/home.html
+++ b/Middleware/src/main/resources/static/home.html
@@ -295,7 +295,7 @@
 	   <section class="hero">
 
 		<div class="logo-wrap">
-		  <img src="/assets/logo.png" alt="CITYdata" style="width:300px;height:56px;object-fit:contain;">
+			<img id="logo-img" src="" style="width:300px;height:56px;object-fit:contain;">
 		</div>
 
 	     <p>
@@ -411,46 +411,48 @@ <h3 id="modalTitle">API Response</h3>
 	 <script>
 		
 	// ── API call ──────────────────────────────────────────
-		async function callApi(route) {
-		  const modal = document.getElementById('apiModal');
-		  const box   = document.getElementById('responseBox');
-		  const badge = document.getElementById('statusBadge');
-		  const title = document.getElementById('modalTitle');
-
-		  title.textContent = route;
-		  box.innerHTML     = '<pre>Fetching…</pre>';
-		  badge.textContent = '…';
-		  badge.className   = '';
-		  modal.classList.add('open');
-
-		  try {
-		    const res  = await fetch(route);
-		    const text = await res.text();
-		    badge.textContent = res.status + ' ' + res.statusText;
-		    badge.className   = res.ok ? 'ok' : 'err';
-
-		    try {
-		      const json = JSON.parse(text);
-		      if ((route === '/operations/list' || route === '/producers/list') && Array.isArray(json)) {
-		        box.innerHTML = renderNameParamsTable(json);
-		      } else {
-		        box.innerHTML = '<pre>' + JSON.stringify(json, null, 2) + '</pre>';
-		      }
-		    } catch {
-		      if (route === '/api/datasets/list') {
-		        box.innerHTML = renderMarkdownTable(text);
-		      } else {
-		        box.innerHTML = '<pre>' + text + '</pre>';
-		      }
-		    }
-
-		  } catch (e) {
-		    badge.textContent = 'ERROR';
-		    badge.className   = 'err';
-		    box.innerHTML     = '<pre>Request failed.\n\n' + e.message + '</pre>';
-		  }
-		}
-
+	const BASE = window.location.pathname.split('/').slice(0, -1).join('/');
+	document.getElementById('logo-img').src = BASE + '/assets/logo.png';
+
+	async function callApi(route) {
+	  const modal = document.getElementById('apiModal');
+	  const box   = document.getElementById('responseBox');
+	  const badge = document.getElementById('statusBadge');
+	  const title = document.getElementById('modalTitle');
+
+	  title.textContent = route;
+	  box.innerHTML     = '<pre>Fetching…</pre>';
+	  badge.textContent = '…';
+	  badge.className   = '';
+	  modal.classList.add('open');
+
+	  try {
+	    const res  = await fetch(BASE + route);
+	    const text = await res.text();
+	    badge.textContent = res.status + ' ' + res.statusText;
+	    badge.className   = res.ok ? 'ok' : 'err';
+
+	    try {
+	      const json = JSON.parse(text);
+	      if ((route === '/operations/list' || route === '/producers/list') && Array.isArray(json)) {
+	        box.innerHTML = renderNameParamsTable(json);
+	      } else {
+	        box.innerHTML = '<pre>' + JSON.stringify(json, null, 2) + '</pre>';
+	      }
+	    } catch {
+	      if (route === '/api/datasets/list') {
+	        box.innerHTML = renderMarkdownTable(text);
+	      } else {
+	        box.innerHTML = '<pre>' + text + '</pre>';
+	      }
+	    }
+
+	  } catch (e) {
+	    badge.textContent = 'ERROR';
+	    badge.className   = 'err';
+	    box.innerHTML     = '<pre>Request failed.\n\n' + e.message + '</pre>';
+	  }
+	}
 		function renderNameParamsTable(data) {
 		  const rows = data.map(d => {
 		    const shortName = d.name.split('.').pop();