Add train details to train endpoint. Formatting and styling incomplete

src/lib/components/ui/Loading.svelte

@@ -1,7 +1,5 @@
 <script lang="ts">
-    let {
+	let { message = 'Loading...' } = $props();
-        message = "Loading..."
-    } = $props();
 </script>
 
 <div class="loading-state">
@@ -48,12 +46,21 @@
 	}
 
 	@keyframes data-travel {
-        0% { left: -50%; }
+		0% {
-        100% { left: 100%; }
+			left: -50%;
+		}
+		100% {
+			left: 100%;
+		}
 	}
 
 	@keyframes pulse {
-        0%, 100% {opacity: 1;}
+		0%,
-        50% {opacity: 0.4;}
+		100% {
+			opacity: 1;
+		}
+		50% {
+			opacity: 0.4;
+		}
 	}
 </style>

src/lib/components/ui/NoResults.svelte

@@ -1,17 +1,17 @@
 <script lang="ts">
 	import noResult from '$lib/assets/img/no-data.svg';
 	import Button from '$lib/components/ui/Button.svelte';
-    let { title = "No results", message = "Try checking your search term"} = $props();
+	let { title = 'No results', message = 'Try checking your search term' } = $props();
 </script>
 
 <div class="no-results-state">
-    <img src={noResult} class="image" height="200" width="200" alt="" role="presentation">
+	<img src={noResult} class="image" height="200" width="200" alt="" role="presentation" />
 	<h3>{title}</h3>
 	<p>{message}</p>
 	<div class="btn-container">
 		<Button
 			type="button"
-        onclick={() => history.length > 1 ? history.back() : window.location.href = '/'}
+			onclick={() => (history.length > 1 ? history.back() : (window.location.href = '/'))}
 			color="accent"
 		>
 			Go back

src/lib/components/ui/TocStyle.svelte

@@ -8,7 +8,6 @@
 	let code = $derived(toc.toUpperCase());
 </script>
 
-
 <!-- SPACE MONO for the font? -->
 <div class="toc-container {code}">
 	{code}
@@ -25,7 +24,7 @@
 		font-size: 1.1rem;
 		background-color: #333;
 		color: #fff;
-		font-family:'Courier New', Courier, monospace;
+		font-family: 'Courier New', Courier, monospace;
 	}
 
 	.AW {

src/lib/components/ui/TrainService.svelte

@@ -1,14 +1,16 @@
 <script lang="ts">
 	import type { ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
 	import { OwlClient, ApiError, ValidationError } from '$lib/owlClient';
-import { slide } from 'svelte/transition';
+	import { slide } from 'svelte/transition';
-import { quintOut} from 'svelte/easing';
+	import { quintOut } from 'svelte/easing';
-import { formatUkTime } from '$lib/utils/time';
+	import { formatUkTime } from '$lib/utils/time';
 	import TocStyle from '$lib/components/ui/TocStyle.svelte';
 
-    let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse} = $props();
+	let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse } = $props();
 	let isExpanded = $state(false);
-    let loadingDetails = $state(false)
+	let loadingDetails = $state(false);
+	let loadingDetailsError = $state(false);
+	let loadingDetailsErrorMsg = $state("");
 	let details = $state(null);
 
 	const toggleExpand = async (rid: string) => {
@@ -24,17 +26,17 @@ import { formatUkTime } from '$lib/utils/time';
 
 		loadingDetails = true;
 		try {
-            const result = await OwlClient.trains.getByRid(service.r)
+			const result = await OwlClient.trains.getByRid(service.r);
 			details = result.data;
 			isExpanded = true;
 		} catch (e) {
-            console.Error("Failde to load train details")
+			console.Error('Failed to load train details');
+			loadingDetailsError = true;
+			loadingDetailsErrorMsg = e.message;
 		} finally {
-            loading = false;
+			loadingDetails = false;
 		}
-
+	};
-    }
-
 
 	let OriginDepartureSummary = $derived(formatUkTime(service.od));
 
@@ -42,10 +44,12 @@ import { formatUkTime } from '$lib/utils/time';
 		if (details) return;
 		loadingDetails = true;
 
-        const result = await OwlClient.trains.getByRid(service.r)
+		const result = await OwlClient.trains.getByRid(service.r);
 		details = result.data;
 		loadingDetails = false;
 	}
+
+	const estClass = (act, est) => (!act && est) ? 'est' : 'act';
 </script>
 
 <div class="train-service">
@@ -60,9 +64,7 @@ import { formatUkTime } from '$lib/utils/time';
 			<div class="location-summary">
 				{service.ot}
 			</div>
-        <div class="location-summary to-summary">
+			<div class="location-summary to-summary">to</div>
-            to    
-        </div>
 			<div class="location-summary">
 				{service.dt}
 			</div>
@@ -71,9 +73,71 @@ import { formatUkTime } from '$lib/utils/time';
 		</div>
 	</button>
 	{#if isExpanded && details}
-            <div  transition:slide={{duration: 800, easing: quintOut}} class="detauls-content">
+		<div class="box-ext" transition:slide={{ duration: 800, easing: quintOut }}>
 			<!-- Here goes the data formatting! -->
-                {JSON.stringify(details)}
+			<div class="detail-head">
+				<!-- Cancellation Section -->
+				{#if details.header.cr}
+					<span class="cancel-reason">
+						{details.header.cr}
+						{#if details.header.cl}
+							{details.header.cn ? ' near ' : ' at '}
+							{details.header.cl}
+						{/if}
+					</span>
+				{/if}
+
+				<!-- Delay Section -->
+				{#if details.header.dr}
+					<span class="delay-reason">
+						{details.header.dr}
+						{#if details.header.dl}
+							{details.header.dn ? ' near ' : ' at '}
+							{details.header.dl}
+						{/if}
+					</span>
+				{/if}
+				<div class="pis-detail">
+					<!-- PIS Data Here -->
+				</div>
+			</div>
+			<div class="schedule-table-container">
+				<table class="schedule-table">
+					<thead>
+						<tr>
+							<th colspan="2"></th>
+							<th colspan="2">Arr</th>
+							<th colspan="2">Dep</th>
+						</tr>
+						<tr>
+							<th>Location</th>
+							<th>Plat</th>
+							<th>Sch</th>
+							<th>Act</th>
+							<th>Sch</th>
+							<th>Act</th>
+						</tr>
+					</thead>
+					<tbody>
+						{#each details.locations as loc}
+							<tr class:pass-loc={loc.r === "PASS"} class:can-loc={loc.can}>
+								<td class="tpl-cell">{loc.t}</td>
+								<td class="plat-cell">{loc.p}</td>
+								{#if loc.r == "PASS"}
+									<td class="time-cell" colspan="2">Pass</td>
+									<td class="time-cell">{formatUkTime(loc.wtp)}</td>
+									<td class="time-cell {estClass(loc.atp, loc.etp)}">{formatUkTime(loc.atp || loc.etp || "--")}</td>
+								{:else}
+								<td class="time-cell">{formatUkTime(loc.pta || loc.wta || "--")}</td>
+								<td class="time-cell {estClass(loc.ata, loc.eta)}">{formatUkTime(loc.ata || loc.eta || "--")}</td>
+								<td class="time-cell">{formatUkTime(loc.ptd || loc.wtd || "--")}</td>
+								<td class="time-cell {estClass(loc.atd, loc.etd)}">{formatUkTime(loc.atd || loc.etd || "--")}</td>
+								{/if}
+							</tr>
+						{/each}
+					</tbody>
+				</table>
+			</div>
 		</div>
 	{/if}
 </div>
@@ -90,8 +154,8 @@ import { formatUkTime } from '$lib/utils/time';
 		filter: brightness(1.1);
 	}
 
-    .train-service:hover {
+	.summary:hover {
-        filter:brightness(1.5);
+		filter:invert();
 	}
 
 	.summary {
@@ -137,4 +201,93 @@ import { formatUkTime } from '$lib/utils/time';
 		font-style: oblique;
 		text-transform: lowercase;
 	}
-    </style>
+
+	.box-ext {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+	}
+
+	.detail-head {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 0.5rem;
+		text-align: center;
+		width: 100%;
+	}
+
+	.cancel-reason, .delay-reason {
+		display: block;
+		padding: 4px 8px;
+		width: 95%;
+	}
+
+	.cancel-reason {
+		color:rgb(255, 0, 0);
+		font-weight: 500;
+		animation: cancel-pulse 2s ease-in-out infinite;
+	}
+
+	.delay-reason {
+		color:rgb(255, 119, 0);
+		font-weight: 500;
+		animation: cancel-pulse 2s ease-in-out infinite;
+	}
+
+	@keyframes cancel-pulse {
+		0% {
+			opacity: 1;
+			text-shadow: 0 0 0px rgb(255, 0, 0);
+		}
+		50% {
+			opacity: 0.8;
+			text-shadow: 0 0 5px rgba(255,0,0,0.2)
+		}
+		100% {
+			opacity: 1;
+			text-shadow: 0 0 0px rgb(255, 0, 0);
+		}
+	}
+
+	.schedule-table-container {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+	}
+
+	.schedule-table {
+		width: 95%;
+		max-width: 375px;
+		padding-bottom: 1rem;
+	}
+
+	th, td {
+		text-align: center;
+	}
+
+	.tpl-cell {
+		color: yellow;
+	}
+
+	.pass-loc {
+		color: var(--color-title);
+		opacity: 0.75;
+	}
+
+	.can-loc {
+		text-decoration: line-through;
+	}
+
+	.est {
+		font-style: oblique;
+		opacity: 0.5;
+	}
+
+	.act {
+		color: yellow;
+	}
+</style>

src/lib/components/ui/cards/HeadcodeSearchCard.svelte

@@ -13,23 +13,15 @@
 		const searchParams = new URLSearchParams();
 		searchParams.append('h', headcode.trim().toUpperCase());
 
-        goto(`/trains?${searchParams.toString()}`)
+		goto(`/trains?${searchParams.toString()}`);
 	}
 </script>
 
 <BaseCard header={'Search Train & PIS'}>
-
 	<form onsubmit={handleSearch} class="card-content">
-		<Textbox 
+		<Textbox placeholder="Enter Headcode" bind:value={headcode} maxLength={4} />
-            placeholder="Enter Headcode"
+		<Button type="submit" disabled={!headcode}>Search</Button>
-            bind:value={headcode}
+	</form>
-            maxLength={4}
-        />
-        <Button
-            type="submit"
-            disabled={!headcode}
-        >Search</Button>
-</form>
 </BaseCard>
 
 <style>

src/lib/geohash.svelte.ts

@@ -10,13 +10,13 @@ class NearestStationsState {
 	private initGeoConfig: PositionOptions = {
 		enableHighAccuracy: false,
 		timeout: 500,
-		maximumAge: Infinity,
+		maximumAge: Infinity
-	}
+	};
 
 	private geoConfig: PositionOptions = {
 		enableHighAccuracy: false,
 		timeout: 20000,
-		maximumAge: 30000,
+		maximumAge: 30000
 	};
 
 	constructor() {

src/lib/utils/time.ts

@@ -4,7 +4,7 @@
  */
 export function formatUkTime(dateStr: string | Date | undefined): string {
 	if (!dateStr) return '--:--';
-    const date = typeof dateStr === 'string' ? new Date(dateStr): dateStr;
+	const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;
 
 	if (isNaN(date.getTime())) return '--:--';
 
@@ -12,6 +12,6 @@ export function formatUkTime(dateStr: string | Date | undefined): string {
 		hour: '2-digit',
 		minute: '2-digit',
 		hour12: false,
-        timeZone: 'Europe/London',
+		timeZone: 'Europe/London'
 	});
 }

src/routes/+error.svelte

@@ -13,7 +13,7 @@
 	{:else}
 		<!-- STOP Error image -->
 		<img class="err-img" src={stopErr} alt="" role="presentation" width="150" height="210" />
-{/if}
+	{/if}
 	<h2 class="label">{page.status}</h2>
 
 	<p class="error-message">

src/routes/trains/+page.svelte

@@ -2,17 +2,12 @@
 	import NoResults from '$lib/components/ui/NoResults.svelte';
 	import TrainService from '$lib/components/ui/TrainService.svelte';
 	let { data } = $props();
-
 </script>
 
-
-
 {#if data.results.length === 0}
-    <NoResults 
+	<NoResults message={'No trains found on this date with this headcode.'} />
-        message={"No trains found on this date with this headcode."}
-    />
 {:else}
-<div class="result-boxes">
+	<div class="result-boxes">
 		{#each data.results as service (service.r)}
 			<TrainService {service} />
 		{/each}

src/routes/trains/+page.ts

@@ -6,11 +6,9 @@ import { error } from '@sveltejs/kit';
 export const load: PageLoad = async ({ url }) => {
 	const headcode = url.searchParams.get('h');
 	let dateParam = url.searchParams.get('d');
-    const toc = url.searchParams.get('t') || "";
+	const toc = url.searchParams.get('t') || '';
 
-    const date: string | Date = (dateParam === "" || dateParam === null)
+	const date: string | Date = dateParam === '' || dateParam === null ? new Date() : dateParam;
-        ? new Date()
-        : dateParam;
 
 	if (!headcode) {
 		throw error(400, {
@@ -20,45 +18,45 @@ export const load: PageLoad = async ({ url }) => {
 	}
 
 	// Declared outside of the try so that it can be used in both the try and catch blocks
-    let results: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse[]
+	let results: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse[];
 
 	try {
 		const response = await OwlClient.trains.getByHeadcode(headcode, date, toc);
 
-        results = (response.data);
+		results = response.data;
 		return {
 			title: headcode.toUpperCase(),
-            results: results,
+			results: results
-        }
+		};
 	} catch (e: unknown) {
 		if (e instanceof ValidationError) {
 			throw error(400, {
 				message: e.message,
-                owlCode: 'VALIDATION_ERROR',
+				owlCode: 'VALIDATION_ERROR'
 			});
 		} else if (e instanceof ApiError) {
 			// Check if NO_RESULTS error, and return empty array if that is the case
-            if (e.code === "NOT_FOUND") {
+			if (e.code === 'NOT_FOUND') {
 				return {
 					title: headcode.toUpperCase(),
 					results: []
-                }
+				};
 			} else {
 				throw error(e.status, {
 					message: e.message,
-                    owlCode: 'API_ERROR',
+					owlCode: 'API_ERROR'
 				});
 			}
 		} else if (e instanceof Error) {
 			throw error(500, {
 				message: e.message,
-                owlCode: 'GEN_ERROR',
+				owlCode: 'GEN_ERROR'
-            })
+			});
 		} else {
 			throw error(500, {
-                message: "Unexpected error",
+				message: 'Unexpected error',
-                owlCode: "UNKNOWN_ERR",
+				owlCode: 'UNKNOWN_ERR'
-            })
+			});
 		}
 	}
-}
+};