Adjust button minimum sizing to improve presentation of quick-links, while ensuring adequate touch target. Number of displayed quicklinks reduced from 9 to six, for improved presentation.

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.20260503t0947",
 		"@tabler/icons-svelte": "^3.40.0"
 	}
 }

src/lib/components/ui/Button.svelte

@@ -39,7 +39,7 @@
 		align-items: center;
 		justify-content: center;
 		min-height: 48px;
-		min-width: 98px;
+		min-width: 48px;
 		appearance: none;
 		background: transparent;
 		border: none;
@@ -55,7 +55,7 @@
 		width: fit-content;
 		flex-shrink: 0;
 		padding: 0 1.2rem;
-		min-width: 90px;
+		min-width: 40px;
 		height: 36px;
 		border-radius: 20px;
 		border: none;

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/TiplocConverter.svelte

@@ -0,0 +1,10 @@
+<script lang="ts">
+	import { LOCATIONS } from '$lib/locations-object.svelte';
+
+	let { code } = $props<{ code: string | null | undefined }>();
+
+	const location = $derived(LOCATIONS.getName(code));
+	const displayName = $derived(location?.n ?? code ?? '');
+</script>
+
+{displayName}

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,19 +1,58 @@
 <script lang="ts">
 	import type { ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
+	import { OwlClient, ApiError, ValidationError } from '$lib/owlClient';
 	import { slide } from 'svelte/transition';
-import { formatUkTime } from '$lib/utils/time';
+	import { quintOut } from 'svelte/easing';
+	import { formatUkTime, calculateDelay } from '$lib/utils/time';
 	import TocStyle from '$lib/components/ui/TocStyle.svelte';
-    
-    let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse} = $props();
+	import TiplocConverter from '$lib/components/ui/TiplocConverter.svelte';
+	import { IconCircleArrowDownFilled } from '@tabler/icons-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;
+		}
+
+		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">
 	<button class="summary" onclick={toggleExpand} type="button" aria-expanded={isExpanded}>
+		{#if loadingDetails}
+			<div class="loading-state"><div class="loading-spinner"></div></div>
+		{/if}
 		<div class="operator-summary">
 			<TocStyle toc={service.o} />
 		</div>
@@ -21,17 +60,101 @@ import { formatUkTime } from '$lib/utils/time';
 			<div class="time-summary">
 				{OriginDepartureSummary}
 			</div>
-        <div class="location-summary">
+			<div class="location-summary" class:can-all={service.ct}>
 				{service.ot}
 			</div>
-        <div class="location-summary to-summary">
-            to    
-        </div>
-        <div class="location-summary">
+			<div class="location-summary to-summary" class:can-all={service.ct}>to</div>
+			<div class="location-summary" class:can-all={service.ct}>
 				{service.dt}
 			</div>
+			<div class="arrow" class:expanded={isExpanded}>
+				<IconCircleArrowDownFilled color={"var(--color-title)"} size={25} />
+			</div>
 		</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 service.ct}
+					<span class="cancel-reason"> Cancelled throughout </span>
+				{/if}
+				{#if details.header.cr}
+					<span class="cancel-reason">
+						{details.header.cr}
+						{#if details.header.cl}
+							{details.header.cn ? ' near ' : ' at '}
+							<TiplocConverter code={details.header.cl} />
+							<!-- CONSIDER WRAPPING IN A COMPONENT THAT CONVERTS TO THE LOCATION NAME RATHER THAN TIPLOC -->
+						{/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><span class="tpl-cell">Est</span>/Act</th>
+							<th>Sch</th>
+							<th><span class="tpl-cell">Est</span>/Act</th>
+							<th></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}
+								{#if loc}
+								{@const delay = calculateDelay(loc)}
+								<td class="delay-{delay.type}">{delay.val}</td>
+								{/if}
+							</tr>
+						{/each}
+					</tbody>
+				</table>
+			</div>
+		</div>
+	{/if}
 </div>
 
 <style>
@@ -42,9 +165,18 @@ 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);
+	}
+
+	@media (hover: hover) {
+		.train-service:hover {
+			filter: brightness(1.2);
+		}
 	}
 
 	.summary {
+		position: relative;
 		display: flex;
 		align-items: center;
 		width: 100%;
@@ -57,6 +189,39 @@ import { formatUkTime } from '$lib/utils/time';
 		gap: 0.5rem;
 	}
 
+	.loading-state {
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 2;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: rgba(0, 0, 0, 0.2);
+		backdrop-filter: blur(5px);
+		width: 100%;
+		height: 100%;
+		font-family: 'URW Gothic', sans-serif;
+		font-size: 1rem;
+		color: var(--color-title);
+	}
+
+	.loading-spinner {
+		width: 16px;
+		height: 16px;
+		border: 2px solid rgba(0, 0, 0, 0.1);
+		border-top-color: #fff;
+		border-radius: 50%;
+		animation: load-spin 0.8s linear infinite;
+		z-index: 3;
+	}
+
+	@keyframes load-spin {
+		to {
+			transform: rotate(360deg);
+		}
+	}
+
 	.operator-summary {
 		flex-shrink: 0;
 	}
@@ -87,4 +252,121 @@ import { formatUkTime } from '$lib/utils/time';
 		font-style: oblique;
 		text-transform: lowercase;
 	}
-    </style>
+
+	.can-all {
+		color: red;
+	}
+
+	.arrow {
+		padding: 0;
+		margin: 0;
+		margin-left: auto;
+		height: 25px;
+		transition: all 0.3s;
+	}
+
+	.expanded {
+		transform: rotateX(180deg);
+	}
+
+	.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;
+		text-align: left;
+	}
+
+	.pass-loc {
+		color: var(--color-title);
+		opacity: 0.75;
+		font-style: oblique;
+	}
+
+	.can-loc {
+		text-decoration: line-through;
+	}
+
+	.est {
+		color: yellow;
+		opacity: 0.5;
+	}
+
+	.act {
+		color: white;
+	}
+
+	.delay-late {
+		color: red;
+	}
+
+	.delay-early {
+		color: blue;
+	}
+</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 
-            placeholder="Enter Headcode"
-            bind:value={headcode}
-            maxLength={4}
-        />
-        <Button
-            type="submit"
-            disabled={!headcode}
-        >Search</Button>
-</form>
+		<Textbox placeholder="Enter Headcode" bind:value={headcode} 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/locations-object.svelte.ts

@@ -28,6 +28,20 @@ class LocationStore {
 			return loc.t === query || loc.c === query;
 		});
 	}
+
+	getName(code: string | number | null | undefined): ApiLocationFilter.LocationFilterObject | null {
+		try {
+			if (!code) return null;
+
+			const query = String(code).toUpperCase().trim();
+
+			const match = this.data.find((loc) => loc.t === query || loc.c === query);
+			return match ?? null;
+		} catch (e) {
+			console.error('Error finding location object: ', e);
+			return null;
+		}
+	}
 }
 
 export const LOCATIONS = new LocationStore();

src/lib/quick-links.svelte.ts

@@ -4,7 +4,7 @@ export interface QuickLink {
 	lastAccessed: number;
 }
 
-const RETURNED_LENGTH: number = 9;
+const RETURNED_LENGTH: number = 6;
 const MAX_SCORE: number = 50;
 const MAX_ENTRIES: number = RETURNED_LENGTH * 4;
 

src/lib/utils/time.ts

@@ -1,10 +1,11 @@
+import type { ApiTrainsTrainDetails } from '@owlboard/owlboard-ts';
 /**
  * Converts ISO/JSON time to UK-formatted HH:MM string.
  * Ensures Europe/London timezone irrespective of browser timezone.
  */
 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 +13,37 @@ export function formatUkTime(dateStr: string | Date | undefined): string {
 		hour: '2-digit',
 		minute: '2-digit',
 		hour12: false,
-        timeZone: 'Europe/London',
+		timeZone: 'Europe/London'
 	});
 }
+
+/**
+ * Calculates a 'delay' value, in the formats:
+ * RT, 1E, 7L, etc.
+ * @param 'Schedule Location' object
+ * @returns Delay string for departure boards
+ */
+export function calculateDelay(loc: ApiTrainsTrainDetails.ServiceLocation): {val: string, type: string} {
+const pairs = [
+        { actual: loc.atd, sched: loc.ptd ?? loc.wtd },
+        { actual: loc.ata, sched: loc.pta ?? loc.wta },
+        { actual: loc.atp, sched: loc.wtp }
+    ];
+
+    const match = pairs.find(p => p.actual && p.sched);
+
+    if (!match || !match.actual || !match.sched) return {val: '', type: 'none'};
+
+    const diffMinutes = Math.round(
+        (Date.parse(match.actual) - Date.parse(match.sched)) / 60000
+    );
+
+    if (diffMinutes === 0) return {val: 'RT', type: 'ontime'};
+
+    const absDiff = Math.abs(diffMinutes);
+    if (diffMinutes > 0) {
+        return { val: `${absDiff}L`, type: 'late' };
+    } else {
+        return { val: `${absDiff}E`, type: 'early' };
+    }
+}

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/+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

@@ -4,12 +4,13 @@
 	let { data } = $props();
 </script>
 
+<h6 style="text-align:center;width=100%;margin:auto;padding-top:1rem;font-size:1rem;">
+	DateSelector
+</h6>
 {#if data.results.length === 0}
-    <NoResults 
-        message={"No trains found on this date with this headcode."}
-    />
+	<NoResults 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}
@@ -21,6 +22,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)
-        ? new Date()
-        : dateParam;
+	const date: string | Date = dateParam === '' || dateParam === null ? 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",
-                owlCode: "UNKNOWN_ERR",
-            })
+				message: 'Unexpected error',
+				owlCode: 'UNKNOWN_ERR'
+			});
 		}
 	}
-}
+};