Add train details to train endpoint. Formatting and styling incomplete

Add rollover actions on train service
Add some additional toc styles

package.json

@@ -41,7 +41,7 @@
 		"vitest-browser-svelte": "^2.0.2"
 	},
 	"dependencies": {
-		"@owlboard/owlboard-ts": "^3.0.0-dev.20260428T2753",
+		"@owlboard/owlboard-ts": "^3.0.0-dev.20260503T0051",
 		"@tabler/icons-svelte": "^3.40.0"
 	}
 }

src/lib/components/ui/Loading.svelte

@@ -0,0 +1,66 @@
+<script lang="ts">
+	let { message = 'Loading...' } = $props();
+</script>
+
+<div class="loading-state">
+	<div class="track">
+		<div class="shuttle"></div>
+	</div>
+	<p>{message}</p>
+</div>
+
+<style>
+	.loading-state {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		padding: 4rem 2rem;
+		width: 75%;
+		margin: auto;
+	}
+
+	.track {
+		width: 160px;
+		height: 3px;
+		background-color: var(--color-title);
+		border-radius: 4px;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.shuttle {
+		position: absolute;
+		width: 50%;
+		height: 100%;
+		border-radius: 4px;
+		background: linear-gradient(90deg, #1abc9c 0%, #3498db 100%);
+		animation: data-travel 1.6s infinite ease-in-out;
+	}
+
+	p {
+		font-family: 'URW Gothic', sans-serif;
+		letter-spacing: 0.15em;
+		color: var(--color-title);
+		animation: pulse 2s infinite ease-in-out;
+	}
+
+	@keyframes data-travel {
+		0% {
+			left: -50%;
+		}
+		100% {
+			left: 100%;
+		}
+	}
+
+	@keyframes pulse {
+		0%,
+		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}
@@ -22,8 +21,22 @@
 		justify-content: center;
 		padding: 2px 8px;
 		font-weight: 800;
+		font-size: 1.1rem;
 		background-color: #333;
 		color: #fff;
+		font-family: 'Courier New', Courier, monospace;
+	}
+
+	.AW {
+		/* Transport for Wales */
+		background: red;
+		color: white;
+	}
+
+	.LM {
+		/* West Midlands Trains */
+		background: rgb(176, 115, 1);
+		color: white;
 	}
 
 	.GW {
@@ -44,6 +57,12 @@
 		color: #ffffff;
 	}
 
+	.GN {
+		/* Great Northern */
+		background-color: fuchsia;
+		color: rgb(229, 229, 229);
+	}
+
 	.SW {
 		/* South Western Railway */
 		background-color: #2a3389;

src/lib/components/ui/TrainService.svelte

@@ -1,15 +1,55 @@
 <script lang="ts">
 	import type { ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
+	import { OwlClient, ApiError, ValidationError } from '$lib/owlClient';
 	import { slide } from 'svelte/transition';
+	import { quintOut } from 'svelte/easing';
 	import { formatUkTime } from '$lib/utils/time';
 	import TocStyle from '$lib/components/ui/TocStyle.svelte';
 
 	let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse } = $props();
 	let isExpanded = $state(false);
+	let loadingDetails = $state(false);
+	let loadingDetailsError = $state(false);
+	let loadingDetailsErrorMsg = $state("");
+	let details = $state(null);
 
-    const toggleExpand = () => isExpanded = !isExpanded;
+	const toggleExpand = async (rid: string) => {
+		if (isExpanded) {
+			isExpanded = false;
+			return;
+		}
+
+		if (details) {
+			isExpanded = true;
+			return;
+		}
+
+		loadingDetails = true;
+		try {
+			const result = await OwlClient.trains.getByRid(service.r);
+			details = result.data;
+			isExpanded = true;
+		} catch (e) {
+			console.Error('Failed to load train details');
+			loadingDetailsError = true;
+			loadingDetailsErrorMsg = e.message;
+		} finally {
+			loadingDetails = false;
+		}
+	};
 
 	let OriginDepartureSummary = $derived(formatUkTime(service.od));
+
+	async function loadDetails(rid: string) {
+		if (details) return;
+		loadingDetails = true;
+
+		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">
@@ -24,14 +64,82 @@ 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>
+			<!-- Add arrow icon to signify drop-down -->
+			<!-- ADD LOADING STATE -->
 		</div>
 	</button>
+	{#if isExpanded && details}
+		<div class="box-ext" transition:slide={{ duration: 800, easing: quintOut }}>
+			<!-- Here goes the data formatting! -->
+			<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>
 
 <style>
@@ -42,6 +150,12 @@ import { formatUkTime } from '$lib/utils/time';
 		box-shadow: var(--shadow-std);
 		overflow: hidden;
 		font-family: 'URW Gothic', sans-serif;
+		transition: 0.2s all;
+		filter: brightness(1.1);
+	}
+
+	.summary:hover {
+		filter:invert();
 	}
 
 	.summary {
@@ -87,4 +201,93 @@ import { formatUkTime } from '$lib/utils/time';
 		font-style: oblique;
 		text-transform: lowercase;
 	}
+
+	.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,22 +13,14 @@
 		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}
-            maxLength={4}
-        />
-        <Button
-            type="submit"
-            disabled={!headcode}
-        >Search</Button>
 	</form>
 </BaseCard>
 

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

@@ -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/+layout.svelte

@@ -2,10 +2,11 @@
 	import { page } from '$app/state';
 	import { slide, fade } from 'svelte/transition';
 	import { onMount } from 'svelte';
-
+	import { navigating } from '$app/state';
 	import { LOCATIONS } from '$lib/locations-object.svelte';
 	import { nearestStationsState } from '$lib/geohash.svelte';
 
+	import Loading from '$lib/components/ui/Loading.svelte';
 	import TimezoneWarning from '$lib/components/ui/TimezoneWarning.svelte';
 
 	import '$lib/global.css';
@@ -81,7 +82,12 @@
 
 <main>
 	<TimezoneWarning />
+
+	{#if navigating && navigating.to}
+		<Loading />
+	{:else}
 		{@render children()}
+	{/if}
 </main>
 
 <nav bind:clientWidth={navWidth}>

src/routes/trains/+page.svelte

@@ -5,9 +5,7 @@
 </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">
 		{#each data.results as service (service.r)}
@@ -21,6 +19,7 @@
 		width: 95%;
 		margin: auto;
 		padding-top: 1rem;
+		padding-bottom: 1rem;
 		display: flex;
 		align-items: center;
 		justify-content: center;

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'
-            })
+			});
-        }
 		}
 	}
+};