Update table display on board page, in preparation for offering different 'table' styles.

Adjust the hover and active styles of the 'TrainService' expandable cards.

package.json

@@ -41,7 +41,8 @@
 		"vitest-browser-svelte": "^2.0.2"
 	},
 	"dependencies": {
-		"@owlboard/owlboard-ts": "^3.0.0-dev.20260503T0051",
+		"@owlboard/api-schema-types": "^3.0.3-alpha18",
+		"@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101",
 		"@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

@@ -1,59 +1,87 @@
 <script lang="ts">
-    let {
+	import { onMount } from 'svelte';
-        message = "Loading..."
+	import { fade } from 'svelte/transition';
-    } = $props();
+	let { message = 'Loading...' } = $props();
+
+	let messageIndex = $state(0);
+
+	onMount(() => {
+		const interval = setInterval(() => {
+			if (messageIndex === 0) {
+				messageIndex = 1;
+			} else {
+				messageIndex = messageIndex === 1 ? 2 : 1;
+			}
+		}, 1500);
+
+		return () => clearInterval(interval);
+	});
 </script>
 
 <div class="loading-state">
-    <div class="track">
+	<div class="track">
-        <div class="shuttle"></div>
+		<div class="shuttle"></div>
-    </div>
+	</div>
-    <p>{message}</p>
+	<div class="message-container">
+		{#if messageIndex === 0}
+			<p in:fade={{ delay: 300, duration: 250 }} out:fade={{ duration: 250 }}>{message}</p>
+		{:else if messageIndex === 1}
+			<p in:fade={{ delay: 300, duration: 250 }} out:fade={{ duration: 250 }}>Slow connection...</p>
+		{:else}
+			<p in:fade={{ delay: 300, duration: 250 }} out:fade={{ duration: 250 }}>Still trying...</p>
+		{/if}
+	</div>
 </div>
 
 <style>
-    .loading-state {
+	.loading-state {
-        display: flex;
+		display: flex;
-        flex-direction: column;
+		flex-direction: column;
-        justify-content: center;
+		justify-content: center;
-        align-items: center;
+		align-items: center;
-        padding: 4rem 2rem;
+		padding: 4rem 2rem;
-        width: 75%;
+		width: 75%;
-        margin: auto;
+		margin: auto;
-    }
+	}
 
-    .track {
+	.track {
-        width: 160px;
+		width: 160px;
-        height: 3px;
+		height: 3px;
-        background-color: var(--color-title);
+		background-color: var(--color-title);
-        border-radius: 4px;
+		border-radius: 4px;
-        position: relative;
+		position: relative;
-        overflow: hidden;
+		overflow: hidden;
-    }
+	}
 
-    .shuttle {
+	.shuttle {
-        position: absolute;
+		position: absolute;
-        width: 50%;
+		width: 50%;
-        height: 100%;
+		height: 100%;
-        border-radius: 4px;
+		border-radius: 4px;
-        background: linear-gradient(90deg, #1abc9c 0%, #3498db 100%);
+		background: linear-gradient(90deg, #1abc9c 0%, #3498db 100%);
-        animation: data-travel 1.6s infinite ease-in-out;
+		animation: data-travel 1.6s infinite ease-in-out;
-    }
+	}
 
-    p {
+	.message-container {
-        font-family: 'URW Gothic', sans-serif;
+		display: grid;
-        letter-spacing: 0.15em;
+		place-items: center;
-        color: var(--color-title);
+		height: 2rem;
-        animation: pulse 2s infinite ease-in-out;
+		margin-top: 1rem;
-    }
+	}
 
-    @keyframes data-travel {
+	p {
-        0% { left: -50%; }
+		grid-area: 1 / 1;
-        100% { left: 100%; }
+		font-family: 'URW Gothic', sans-serif;
-    }
+		letter-spacing: 0.15em;
+		color: var(--color-title);
+	}
 
-    @keyframes pulse {
+	@keyframes data-travel {
-        0%, 100% {opacity: 1;}
+		0% {
-        50% {opacity: 0.4;}
+			left: -50%;
-    }
+		}
-</style>
+		100% {
+			left: 100%;
+		}
+	}
+</style>

src/lib/components/ui/NoResults.svelte

@@ -1,55 +1,55 @@
 <script lang="ts">
 	import noResult from '$lib/assets/img/no-data.svg';
-    import Button from '$lib/components/ui/Button.svelte';
+	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>
+	<h3>{title}</h3>
-    <p>{message}</p>
+	<p>{message}</p>
-    <div class="btn-container">
+	<div class="btn-container">
-    <Button
+		<Button
-        type="button"
+			type="button"
-        onclick={() => history.length > 1 ? history.back() : window.location.href = '/'}
+			onclick={() => (history.length > 1 ? history.back() : (window.location.href = '/'))}
-        color="accent"
+			color="accent"
-    >
+		>
-        Go back
+			Go back
-    </Button>
+		</Button>
-    </div>
+	</div>
 </div>
 
 <style>
-    .no-results-state {
+	.no-results-state {
-        display: flex;
+		display: flex;
-        flex-direction: column;
+		flex-direction: column;
-        align-items: center;
+		align-items: center;
-        justify-content: center;
+		justify-content: center;
-        width: 100%;
+		width: 100%;
-        height: 100%;
+		height: 100%;
-        min-height: 400px;
+		min-height: 400px;
-        padding: 5rem;
+		padding: 5rem;
-        text-align: center;
+		text-align: center;
-        box-sizing: border-box;
+		box-sizing: border-box;
-        font-family: 'URW-Gothic', sans-serif;
+		font-family: 'URW-Gothic', sans-serif;
-    }
+	}
 
-    .image {
+	.image {
-        margin-bottom: 1.95rem;
+		margin-bottom: 1.95rem;
-        max-width: 90%;
+		max-width: 90%;
-        height: auto;
+		height: auto;
-    }
+	}
 
-    h3 {
+	h3 {
-        margin: 0 0 0.5rem 0;
+		margin: 0 0 0.5rem 0;
-    }
+	}
 
-    p {
+	p {
-        margin: 0;
+		margin: 0;
-        opacity: 0.8;
+		opacity: 0.8;
-    }
+	}
 
-    .btn-container {
+	.btn-container {
-        margin-top: 20px;
+		margin-top: 20px;
-    }
+	}
-</style>
+</style>

src/lib/components/ui/Textbox.svelte

@@ -2,6 +2,8 @@
 	import { fade } from 'svelte/transition';
 	import type { HTMLInputAttributes } from 'svelte/elements';
 
+	import { IconChevronRightFilled } from '@tabler/icons-svelte';
+
 	interface Props extends HTMLInputAttributes {
 		value?: string;
 		label?: string;
@@ -9,6 +11,7 @@
 		type?: 'text' | 'password' | 'email' | 'number' | 'search' | 'tel' | 'url';
 		error?: string;
 		uppercase?: boolean;
+		onsubmit?: (val: string) => void | Promise<void>;
 		[key: string]: any;
 	}
 
@@ -19,10 +22,18 @@
 		type = 'text',
 		error = '',
 		uppercase = false,
+		onsubmit,
 		...rest
 	}: Props = $props();
 
 	let isFocussed = $state(false);
+
+	const handleSubmit = (e: Event) => {
+		e.preventDefault();
+		if (onsubmit && value) {
+			onsubmit(value);
+		}
+	};
 </script>
 
 <div class="input-wrapper" class:focussed={isFocussed} class:has-error={!!error}>
@@ -30,16 +41,30 @@
 		<label for="adaptive-input">{label}</label>
 	{/if}
 
-	<input
+	<form onsubmit={handleSubmit} class="input-container">
-		id="adaptive-input"
+		<input
-		class:all-caps={uppercase}
+			id="adaptive-input"
-		{type}
+			class:all-caps={uppercase}
-		{placeholder}
+			{type}
-		bind:value
+			{placeholder}
-		onfocus={() => (isFocussed = true)}
+			bind:value
-		onblur={() => (isFocussed = false)}
+			onfocus={() => (isFocussed = true)}
-		{...rest}
+			onblur={() => (isFocussed = false)}
-	/>
+			{...rest}
+		/>
+
+		{#if onsubmit}
+			<button
+				type="submit"
+				class="submit-icon"
+				transition:fade
+				disabled={!value}
+				aria-label="Submit"
+			>
+				<IconChevronRightFilled />
+			</button>
+		{/if}
+	</form>
 
 	{#if error}
 		<span class="error-message" transition:fade>{error}</span>
@@ -50,29 +75,80 @@
 	.input-wrapper {
 		display: flex;
 		flex-direction: column;
-		gap: 8px;
+		gap: 0.4rem;
 		width: 100%;
 		font-family: 'URW Gothic', sans-serif;
 	}
 
+	.input-container {
+		position: relative;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		background-color: var(--color-title);
+		border-radius: 5000px;
+		transition: all 0.2s;
+		overflow: hidden;
+	}
+
 	label {
 		font-size: 0.9rem;
 		font-weight: 400;
 		color: var(--color-title);
 	}
 
+	input[type='number']::-webkit-outer-spin-button,
+	input[type='number']::-webkit-inner-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
+	}
+
+	input[type='number'] {
+		-moz-appearance: textfield;
+		appearance: textfield;
+	}
+
 	input {
+		width: 100%;
+		background: transparent;
 		min-height: 40px;
-		padding: 0 16px;
+		height: 100%;
-		background-color: var(--color-title);
+		line-height: normal;
-		border: 2px solid transparent;
+		padding: 0 48px;
-		border-radius: 20px;
+		border: none;
 		color: var(--color-bg-dark);
 		font-size: 1.2rem;
 		transition: all 0.2s ease-in-out;
 		outline: none;
 		text-align: center;
-		box-shadow: var(--shadow-std);
+	}
+
+	.submit-icon {
+		position: absolute;
+		background: transparent;
+		right: 0;
+		border: none;
+		color: var(--color-bg-dark);
+		cursor: pointer;
+		width: 48px;
+		height: 48px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		opacity: 0.75;
+		transition:
+			opacity 0.2s,
+			transform 0.2s;
+	}
+
+	.submit-icon:hover:not(:disabled) {
+		opacity: 1;
+		transform: translateX(2px);
+	}
+
+	.submit-icon:disabled {
+		opacity: 0.5;
+		cursor: not-allowed;
 	}
 
 	.all-caps {

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}
@@ -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,140 +1,570 @@
 <script lang="ts">
-    import type { ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
+	import type { ApiPisObject, ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
-    	import { OwlClient, ApiError, ValidationError } from '$lib/owlClient';
+	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, calculateDelay } from '$lib/utils/time';
-    import TocStyle from '$lib/components/ui/TocStyle.svelte';
+	import TocStyle from '$lib/components/ui/TocStyle.svelte';
-    
+	import TiplocConverter from '$lib/components/ui/TiplocConverter.svelte';
-    let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse} = $props();
+	import { IconChevronDownFilled } from '@tabler/icons-svelte';
-    let isExpanded = $state(false);
+	import { estClass } from '$lib/utils/time';
-    let loadingDetails = $state(false)
+	let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse } = $props();
-    let details = $state(null);
+	let isExpanded = $state(false);
+	let loadingDetails = $state(false);
+	let loadingDetailsError = $state(false);
+	let loadingDetailsErrorMsg = $state('');
+	let details = $state(null);
 
-    const toggleExpand = async (rid: string) => {
+	const toggleExpand = async (rid: string) => {
-        if (isExpanded) {
+		if (isExpanded) {
-            isExpanded = false;
+			isExpanded = false;
-            return;
+			return;
-        }
+		}
 
-        if (details) {
+		loadingDetails = true;
-            isExpanded = true;
+		try {
-            return;
+			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;
+		}
+	};
 
-        loadingDetails = true;
+	let OriginDepartureSummary = $derived(formatUkTime(service.od));
-        try {
-            const result = await OwlClient.trains.getByRid(service.r)
-            details = result.data;
-            isExpanded = true;
-        } catch (e) {
-            console.Error("Failde to load train details")
-        } finally {
-            loading = false;
-        }
 
-    }
+	async function loadDetails(rid: string) {
+		if (details) return;
+		loadingDetails = true;
 
+		const result = await OwlClient.trains.getByRid(service.r);
+		details = result.data;
+		loadingDetails = false;
+	}
 
-    let OriginDepartureSummary = $derived(formatUkTime(service.od));
+	const activityMap: Record<string, string> = {
+		'-D': 'Vehicles detatched',
+		'-T': 'Vehicles attached & detached',
+		'-U': 'Vehicles attached',
+		AE: 'Assist locomotive attached',
+		C: 'Traincrew change only',
+		D: 'Set down only',
+		E: 'Stops for examination',
+		K: 'Passenger count point',
+		KC: 'Ticket collection point',
+		KE: 'Ticket examination point',
+		KF: 'First class ticket examination point',
+		KS: 'Selective ticket examination point',
+		L: 'Locomotive changed',
+		N: 'Unadvertised stop',
+		OP: 'Operational stop only',
+		OR: 'Locomotive attached on rear',
+		R: 'Request stop only',
+		RM: 'Train changes direction',
+		RR: 'Locomotive run round',
+		S: 'Staff only stop',
+		TW: 'Stops for token/staff/tablet only',
+		U: 'Pick up only',
+		W: 'Watering coaches',
+		X: 'Passes another train'
+	};
 
-    async function loadDetails(rid: string) {
+	const activityRegex = new RegExp(
-        if (details) return;
+		Object.keys(activityMap)
-        loadingDetails = true;
+			.sort((a, b) => b.length - a.length) // Longest codes first
+			.map((key) => key.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')) // Escape special chars
+			.join('|'),
+		'g'
+	);
 
-        const result = await OwlClient.trains.getByRid(service.r)
+	const getRelevantActivities = (act: string) => {
-        details = result.data;
+		if (!act) return [];
-        loadingDetails = false;
+
-    }
+		// Find all matches in the string
+		const matches = act.match(activityRegex) || [];
+
+		// Map to labels and remove duplicates
+		return [...new Set(matches)].map((code) => activityMap[code]);
+	};
 </script>
 
-<div class="train-service">
+<div class="train-service" class:isExpanded>
-    <button class="summary" onclick={toggleExpand} type="button" aria-expanded={isExpanded}>
+	<button class="summary" onclick={toggleExpand} type="button" aria-expanded={isExpanded}>
-        <div class="operator-summary">
+		{#if loadingDetails}
-            <TocStyle toc={service.o} />
+			<div class="loading-state"><div class="loading-spinner"></div></div>
-        </div>
+		{/if}
-        <div class="main-text-summary">
+		<div class="operator-summary">
-        <div class="time-summary">
+			<TocStyle toc={service.o} />
-            {OriginDepartureSummary}
+		</div>
-        </div>
+		<div class="main-text-summary">
-        <div class="location-summary">
+			<div class="time-summary">
-            {service.ot}    
+				{OriginDepartureSummary}
-        </div>
+			</div>
-        <div class="location-summary to-summary">
+			<div class="location-summary" class:can-all={service.ct}>
-            to    
+				{service.ot}
-        </div>
+			</div>
-        <div class="location-summary">
+			<div class="location-summary to-summary" class:can-all={service.ct}>to</div>
-            {service.dt}    
+			<div class="location-summary" class:can-all={service.ct}>
-        </div>
+				{service.dt}
-        <!-- Add arrow icon to signify drop-down -->
+			</div>
-         <!-- ADD LOADING STATE -->
+			<div class="arrow" class:expanded={isExpanded}>
-    </div>
+				<IconChevronDownFilled color={'var(--color-title)'} size={25} />
-    </button>
+			</div>
-            {#if isExpanded && details}
+		</div>
-            <div  transition:slide={{duration: 800, easing: quintOut}} class="detauls-content">
+	</button>
-                <!-- Here goes the data formatting! -->
+	{#if isExpanded && details}
-                {JSON.stringify(details)}
+		<div class="box-ext" transition:slide={{ duration: 800, easing: quintOut }}>
-            </div>
+			<!-- Here goes the data formatting! -->
-        {/if}
+			<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} />
+						{/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}
+				{#if details.pis}
+					<div class="pis-detail">
+						<span class="pis-code">PIS: {details.pis.code}</span>
+						{#if details.pis.skip?.skip > 0}
+							<span class="pis-skip">
+								(skip {details.pis.skip.position === 'head' ? 'first' : 'last'}
+								{details.pis.skip.skip}
+								{details.pis.skip.skip === 1 ? 'stop' : 'stops'}
+								)
+							</span>
+						{/if}
+					</div>
+				{/if}
+			</div>
+			<div class="color-key">
+				<p class="tpl-stop">Times in yellow are estimates</p>
+			</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>
+							<th></th>
+						</tr>
+					</thead>
+					{#each details.locations as loc}
+						<tbody class="location-group">
+							<tr class:pass-loc={loc.r === 'PASS'} class:can-loc={loc.can}>
+								<td class="tpl-cell" class:tpl-stop={loc.r != 'PASS'}>
+									{loc.t}
+								</td>
+								<td class="plat-cell cell-divider-right" class:plat-change={loc.pc}>{loc.p}</td>
+								{#if loc.r == 'PASS'}
+									<td class="time-cell cell-divider-right" 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 cell-divider-right {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 cell-divider-right {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>
+							{#if loc.act && getRelevantActivities(loc.act).length > 0}
+								<tr class="activity-row">
+									<td colspan="7">
+										<div class="activity-container">
+											{#each getRelevantActivities(loc.act) as note}
+												<span class="activity-tag">{note}</span>
+											{/each}
+										</div>
+									</td>
+								</tr>
+							{/if}
+						</tbody>{/each}
+				</table>
+			</div>
+		</div>
+	{/if}
 </div>
 
 <style>
-    .train-service {
+	/* 
-        background-color: var(--color-accent);
+		Main container
-        width: 100%;
+	*/
-        border-radius: 4px;
+	.train-service {
-        box-shadow: var(--shadow-std);
+		background-color: var(--color-accent);
-        overflow: hidden;
+		width: 100%;
-        font-family: 'URW Gothic', sans-serif;
+		max-width: 460px;
-        transition: 0.2s all;
+		border-radius: 12px;
-        filter: brightness(1.1);
+		box-shadow: var(--shadow-std);
-    }
+		overflow: visible;
+		font-family: 'URW Gothic', sans-serif;
+		transition: 0.2s all;
+		filter: brightness(1.1);
+		-webkit-tap-highlight-color: transparent;
+	}
 
-    .train-service:hover {
+	.train-service:active {
-        filter:brightness(1.5);
+		filter: brightness(1.2);
-    }
+	}
 
-    .summary {
+	.train-service:active .arrow {
-        display: flex;
+		filter: brightness(0.2);
-        align-items: center;
+	}
-        width: 100%;
-        padding: 0.75rem;
-        min-height: 48px;
-        border: none;
-        background: transparent;
-        cursor: pointer;
-        text-align: left;
-        gap: 0.5rem;
-    }
 
-    .operator-summary {
+	@media (hover: hover) {
-        flex-shrink: 0;
+		.train-service:not(.isExpanded):hover {
-    }
+			filter: brightness(1.2);
+		}
 
-    .main-text-summary {
+		.summary:hover .arrow {
-        display: flex;
+			filter: brightness(0.2);
-        flex-grow: 1;
+		}
-        align-items: center;
+	}
-        gap: 0.5rem;
-    }
 
-    .time-summary {
+	/* 
-        font-size: 1.1rem;
+		Summary Header
-        font-weight: 700;
+	*/
-        color: var(--color-brand);
+	.summary {
-    }
+		position: relative;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		padding: 0 1rem;
+		min-height: 48px;
+		border: none;
+		background: transparent;
+		cursor: pointer;
+		text-align: left;
+		gap: 0.5rem;
+	}
 
-    .location-summary {
+	.operator-summary {
-        text-transform: uppercase;
+		flex-shrink: 0;
-        font-weight: 500;
+	}
-        font-size: 1.1rem;
-        letter-spacing: 0.02em;
-        color: var(--color-title);
-    }
 
-    .to-summary {
+	.main-text-summary {
-        font-size: 0.8rem;
+		display: flex;
-        font-style: oblique;
+		flex-grow: 1;
-        text-transform: lowercase;
+		align-items: center;
-    }
+		gap: 0.5rem;
-    </style>
+	}
+
+	.time-summary {
+		font-size: 0.75rem;
+		font-weight: 700;
+		color: var(--color-brand);
+	}
+
+	.location-summary {
+		text-transform: uppercase;
+		font-weight: 500;
+		font-size: 0.75rem;
+		letter-spacing: 0.02em;
+		color: var(--color-title);
+	}
+
+	.to-summary {
+		font-size: 0.8rem;
+		font-style: oblique;
+		text-transform: lowercase;
+	}
+
+	.arrow {
+		padding: 0;
+		margin: 0 0 0 auto;
+		height: 25px;
+		transition: all 0.3s;
+	}
+
+	.expanded {
+		transform: rotateX(180deg);
+	}
+
+	.can-all {
+		color: red;
+	}
+
+	/*
+		PIS Data
+	*/
+	.pis-detail {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		gap: 0.2rem;
+		padding: 8px 0;
+		width: 100%;
+	}
+	.pis-code {
+		font-weight: 600;
+		font-size: 1.1rem;
+		letter-spacing: 0.05em;
+	}
+
+	.pis-skip {
+		font-size: 0.85rem;
+		opacity: 0.75;
+		font-style: oblique;
+	}
+
+	/*
+		Box Extention
+	*/
+	.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%;
+		font-size: 1rem;
+		font-weight: 500;
+		animation: cancel-pulse 2s ease-in-out infinite;
+	}
+
+	.cancel-reason {
+		color: var(--cancel-red);
+	}
+
+	.delay-reason {
+		color: rgb(255, 119, 0);
+	}
+
+	/*
+		Schedule Table
+	*/
+
+	.color-key,
+	.color-key p {
+		text-align: center;
+		width: 100%;
+		padding: 0 0 0.2rem 0;
+		margin: 0;
+	}
+
+	.schedule-table-container {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		padding-bottom: 0.1rem;
+	}
+
+	.schedule-table {
+		width: 95%;
+		border-collapse: collapse;
+		font-family: 'URW Gothic', 'Inter', sans-serif;
+		font-variant-numeric: tabular-nums;
+		font-size: 0.8rem;
+		letter-spacing: -0.02ch;
+		transition: all 0.5s;
+		font-weight: 500;
+	}
+
+	.location-group:nth-of-type(even) {
+		background-color: rgba(255, 255, 255, 0.04);
+	}
+	.cell-divider-right {
+		border-right: 1px solid rgba(255, 255, 255, 0.1);
+	}
+
+	th,
+	td {
+		text-align: center;
+		padding: 6px 4px;
+	}
+
+	.activity-row td {
+		padding: 0 0 10px 0;
+		text-align: left;
+		font-size: 0.75rem;
+		letter-spacing: 0.01em;
+	}
+
+	.activity-container {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 6px;
+		padding: 0 12px;
+	}
+
+	.activity-tag {
+		background: rgba(255, 255, 255, 0.1);
+		border: 1px solid rgba(255, 255, 255, 0.05);
+		padding: 2px 6px;
+		border-radius: 4px;
+	}
+
+	.tpl-cell {
+		color: var(--color-title);
+		text-align: left;
+	}
+
+	.tpl-stop {
+		color: var(--location-yellow);
+	}
+
+	.plat-change {
+		animation: fast-pulse 2s ease-out infinite;
+	}
+
+	.pass-loc td {
+		color: var(--color-title);
+		font-style: oblique;
+		opacity: 0.5;
+	}
+
+	.can-loc {
+		text-decoration: line-through;
+	}
+
+	.est {
+		color: var(--location-yellow);
+		font-style: oblique;
+	}
+
+	td.delay-late {
+		color: var(--delay-orange);
+		font-weight: 600;
+		animation: pulse 2s ease-out infinite;
+	}
+
+	td.delay-early {
+		color: var(--early-blue);
+		font-weight: 600;
+		animation: pulse 2s ease-out infinite;
+	}
+
+	/* 
+		Loading State
+	*/
+	.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;
+	}
+
+	/*
+		Responsivity
+	*/
+	@media (min-width: 330px) {
+		.time-summary,
+		.location-summary {
+			font-size: 0.9rem;
+		}
+		.activity-row td {
+			font-size: 0.8rem;
+		}
+	}
+
+	@media (min-width: 340px) {
+		.schedule-table {
+			font-size: 0.9rem;
+		}
+	}
+
+	@media (min-width: 360px) {
+		.time-summary {
+			font-size: 1.1rem;
+		}
+		.location-summary {
+			font-size: 1rem;
+		}
+		.schedule-table {
+			font-size: 0.99rem;
+		}
+		.activity-row td {
+			font-size: 0.9rem;
+		}
+	}
+
+	@media (min-width: 420px) {
+		.schedule-table {
+			font-size: 1.1rem;
+		}
+	}
+
+	/*
+		KEYFRAMES
+	*/
+	@keyframes load-spin {
+		to {
+			transform: rotate(360deg);
+		}
+	}
+</style>

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

@@ -52,7 +52,7 @@
 	.card {
 		background: var(--color-accent);
 		position: relative;
-		border-radius: 20px;
+		border-radius: 12px;
 		overflow: visible;
 		width: 95%;
 		max-width: 600px;

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

@@ -1,35 +1,30 @@
 <script lang="ts">
-    import { goto } from '$app/navigation';
+	import { goto } from '$app/navigation';
 	import BaseCard from '$lib/components/ui/cards/BaseCard.svelte';
 	import Textbox from '$lib/components/ui/Textbox.svelte';
 	import Button from '$lib/components/ui/Button.svelte';
 
 	let headcode = $state('');
 
-    function handleSearch(e: SubmitEvent) {
+	function handleSearch(headcode: string) {
-        e.preventDefault();
+		if (!headcode.trim()) return;
-        if (!headcode.trim()) return;
 
-        const searchParams = new URLSearchParams();
+		const searchParams = new URLSearchParams();
-        searchParams.append('h', headcode.trim().toUpperCase());
+		searchParams.append('h', headcode.trim().toUpperCase());
 
-        goto(`/trains?${searchParams.toString()}`)
+		goto(`/trains?${searchParams.toString()}`);
-    }
+	}
 </script>
 
 <BaseCard header={'Search Train & PIS'}>
-
+	<div class="card-content">
-        <form onsubmit={handleSearch} class="card-content">
+		<Textbox
-		<Textbox 
+			placeholder="Enter Headcode"
-            placeholder="Enter Headcode"
+			bind:value={headcode}
-            bind:value={headcode}
+			maxLength={4}
-            maxLength={4}
+			onsubmit={handleSearch}
-        />
+		/>
-        <Button
+	</div>
-            type="submit"
-            disabled={!headcode}
-        >Search</Button>
-</form>
 </BaseCard>
 
 <style>
@@ -37,9 +32,9 @@
 		text-align: center;
 		width: 90%;
 		margin: auto;
-		padding: 10px 0 0 0;
+		padding: 10px 0 0.5rem 0;
-        display: flex;
+		display: flex;
-        flex-direction: column;
+		flex-direction: column;
-        gap: 0.75rem;
+		gap: 0.75rem;
 	}
-</style>
+</style>

src/lib/components/ui/cards/pis/PisCode.svelte

@@ -4,12 +4,6 @@
 	import Button from '$lib/components/ui/Button.svelte';
 
 	let { onsearch }: { onsearch: (c: string) => void } = $props();
-
-	let codeValue = $state('');
-
-	function resetValues(): void {
-		codeValue = '';
-	}
 </script>
 
 <BaseCard header={'Find by Code'}>
@@ -19,16 +13,13 @@
 				<Textbox
 					placeholder={'Code'}
 					uppercase={true}
-					type={'number'}
+					type={'text'}
-					max={9999}
+					onsubmit={onsearch}
-					bind:value={codeValue}
+					maxLength={4}
+					inputmode={'numeric'}
 				/>
 			</div>
 		</div>
-		<div class="button-wrapper">
-			<Button onclick={() => onsearch(codeValue.toString())}>Search</Button>
-			<Button onclick={resetValues}>Reset</Button>
-		</div>
 	</div>
 </BaseCard>
 
@@ -48,7 +39,7 @@
 	}
 
 	.textbox-item-wrapper {
-		width: 30%;
+		width: 60%;
 	}
 
 	.button-wrapper {

src/lib/components/ui/cards/pis/PisStartEndCard.svelte

@@ -43,11 +43,11 @@
 		display: flex;
 		width: 100%;
 		justify-content: center;
-		gap: 4rem;
+		gap: 1.1rem;
 	}
 
 	.textbox-item-wrapper {
-		width: 30%;
+		width: 50%;
 	}
 
 	.button-wrapper {

src/lib/components/ui/station-board/StaffServicesTable.svelte

@@ -0,0 +1,148 @@
+<script lang="ts">
+	import type { ApiStationsBoard } from '@owlboard/owlboard-ts';
+    import { formatUkTime, estClass, delayClassFromTimePair } from '$lib/utils/time';
+
+	let { services }: { services: ApiStationsBoard.BoardService[] } = $props();
+
+	const getRowKey = (s: ApiStationsBoard.BoardService) =>
+		`${s.r}${s.sta ?? ''}${s.std ?? ''}${s.wtp ?? ''}`;
+</script>
+
+	<table class="departure-board">
+		<thead>
+            <tr>
+                <th colspan="4" aria-hidden="true"></th>
+                <th scope="colgroup" colspan="2" class="upper-head"><abbr title="Arrival">Arr</abbr></th>
+                <th scope="colgroup" colspan="2" class="upper-head"><abbr title="Departure">Dep</abbr></th>
+            </tr>
+			<tr>
+				<th scope="col"><abbr title="Headcode">ID</abbr></th>
+				<th scope="col"><abbr title="Origin">Orig</abbr></th>
+				<th scope="col"><abbr title="Destination">Dest</abbr></th>
+				<th scope="col"><abbr title="Platform">Plt</abbr></th>
+				<th scope="col"><abbr title="Scheduled">Sch</abbr></th>
+				<th scope="col"><abbr title="Actual/Expected">Act</abbr></th>
+                <th scope="col"><abbr title="Scheduled">Sch</abbr></th>
+				<th scope="col"><abbr title="Actual/Expected">Act</abbr></th>
+			</tr>
+		</thead>
+
+        {#each services as service (getRowKey(service))}
+            <tbody>
+                <tr class="service-row" class:serviceCancelled={service.c} class:servicePass={service.wtp}>
+                    <td class="id-cell">{service.h}</td>
+                    <td class="orig-cell">{service.og.t}</td>
+                    <td class="dest-cell">{service.dt.t}</td>
+                    <td class="plt-cell" class:platSup={service.ps} class:platChange={service.pc}>{service.p}</td>
+
+                    <!-- Handle different display for a passing train -->
+                    {#if service.wtp}
+                      <td class="pass-cell" colspan="2">Pass</td>
+                      <td class="time-cell">{formatUkTime(service.wtp)}</td>
+                      <td class="time-cell {estClass(service.atp, service.etp)} {delayClassFromTimePair(service.wtp, service.atp || service.etp)}">{formatUkTime(service.atp || service.etp)}</td>
+                    {:else}
+                      <td class="time-cell">{formatUkTime(service.sta)}</td>
+                      <td class="time-cell {estClass(service.ata, service.eta)} {delayClassFromTimePair(service.sta, service.ata || service.eta)}">{formatUkTime(service.ata || service.eta)}</td>
+                      <td class="time-cell">{formatUkTime(service.std)}</td>
+                      <td class="time-cell {estClass(service.atd, service.etd)} {delayClassFromTimePair(service.std, service.atd || service.etd)}">{formatUkTime(service.atd || service.etd)}</td>
+                    {/if}
+                </tr>
+
+                {#if service.c && service.cr?.r}
+                <tr>
+                    <td aria-hidden="true"></td>
+                    <td colspan="8">
+                        {service.cr.r}
+                        {#if service.cr.l}
+                            {service.cr.n ? "near" : "at"}
+                            {service.cr.l}
+                        {/if}
+                    </td>
+                </tr>
+                {/if}
+                {#if service.dr?.r}
+                <tr>
+                    <td aria-hidden="true"></td>
+                    <td colspan="8">
+                        {service.dr.r}
+                        {#if service.dr.l}
+                            {service.dr.n ? "near" : "at"}
+                            {service.dr.l}
+                        {/if}
+                    </td>
+                </tr>
+                {/if}
+            </tbody>
+        {/each}
+
+	</table>
+
+<style>
+    .departure-board {
+        width: 100%;
+        margin: 0 auto;
+        font-family: 'URW Gothic', sans-serif;
+        font-variant-numeric: tabular-nums;
+        border-collapse: collapse;
+    }
+    thead {
+        position: sticky;
+        top: 0;
+        z-index: 2;
+        background: var(--color-bg-dark);
+    }
+    .serviceCancelled {
+        text-decoration: line-through;
+    }
+    .servicePass {
+        font-style: italic;
+        opacity: 0.5;
+    }
+    .id-cell{
+        font-family:'Courier New', Courier, monospace;
+        text-align: center;
+    }
+    .orig-cell, .dest-cell {
+        color: var(--location-yellow);
+    }
+    .orig-cell {
+        text-align: left;
+    }
+    .dest-cell {
+        text-align: right;
+    }
+    .plt-cell {
+        text-align: center;
+    }
+    .platChange {
+        animation: 2s fast-pulse ease-in-out infinite;
+    }
+    .platSup {
+        filter: opacity(0.5);
+    }
+    .pass-cell {
+        text-align: center;
+    }
+    .time-cell {
+        text-align: center;
+    }
+    .est {
+        font-style: oblique;
+        opacity: 0.75;
+    }
+    .act {
+        font-weight: 600;
+        color: green;
+    }
+    .delay-cell {
+        text-align: center;
+    }
+    .delay-late {
+        color: var(--delay-orange);
+        animation: 2s fast-pulse ease-in-out infinite;
+    }
+    .delay-early {
+        color: var(--early-blue);
+        animation: 2s fast-pulse ease-in-out infinite;
+    }
+</style>

src/lib/components/ui/station-board/StationAlertCard.svelte

@@ -0,0 +1,138 @@
+<script lang="ts">
+	import { slide } from 'svelte/transition';
+	import type { ApiStationsBoard } from '@owlboard/owlboard-ts';
+	import { IconAlertOctagonFilled, IconChevronDownFilled } from '@tabler/icons-svelte';
+
+	let { messages = [] }: { messages: ApiStationsBoard.BoardMsgs[] } = $props();
+	let isOpen = $state(false);
+</script>
+
+{#if messages.length > 0}
+	<aside class="alert-card">
+		<button onclick={() => (isOpen = !isOpen)} class="trigger" class:active={isOpen}>
+			<span class="warning-icon">
+				<IconAlertOctagonFilled />
+			</span>
+			<span class="summary">
+				{messages.length}
+				{messages.length === 1 ? 'active alert' : 'active alerts'}
+			</span>
+			<span class="chevron" class:rotated={isOpen}><IconChevronDownFilled /></span>
+		</button>
+
+		{#if isOpen}
+			<div transition:slide={{ duration: 450 }} class="content">
+				{#each messages as msg}
+					<div class="message-item">
+						<p class="message-text">
+							{msg.t}
+							{#if msg.l && msg.lt}
+								<a href={msg.l} target="_blank" rel="noopener noreferrer" class="alert-link">
+									{msg.lt}
+								</a>
+							{/if}
+						</p>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	</aside>
+{/if}
+
+<style>
+	.alert-card {
+		margin: 0;
+		border-radius: 8px;
+		background: transparent;
+		position: relative;
+		z-index: 10;
+		margin-bottom: 0;
+		width: 95%;
+		max-width: 750px;
+	}
+
+	.trigger {
+		width: 100%;
+		display: flex;
+		border-radius: 8px;
+		align-items: center;
+		padding: 0.4rem 1rem;
+		background: var(--alert-orange);
+		color: white;
+		border: none;
+		cursor: pointer;
+		text-align: left;
+		position: relative;
+		z-index: 2;
+		height: 46px;
+		transition: all 0.65s 0.2s;
+	}
+
+	.trigger.active {
+		border-radius: 8px 8px 0 0;
+		transition: all 0.1s 0s;
+	}
+
+	.warning-icon {
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		margin-left: 0;
+		margin-top: 0;
+		margin-bottom: 0;
+		margin-right: 1rem;
+		padding: 0;
+	}
+
+	.summary {
+		flex: 1;
+		font-family: 'URW Gothic', sans-serif;
+		letter-spacing: 0.05em;
+		font-weight: 600;
+		font-size: 1rem;
+	}
+
+	.chevron {
+		transition: transform 0.5s ease;
+		display: inline-flex;
+		justify-content: center;
+	}
+
+	.chevron.rotated {
+		transform: rotateX(180deg);
+	}
+
+	.content {
+		padding: 1rem;
+		position: absolute;
+		top: 46px;
+		border-radius: 0 0 8px 8px;
+		left: 0;
+		right: 0;
+		background: var(--alert-orange);
+		filter: brightness(1.2);
+		color: var(--color-title);
+		font-family: 'URW Gothic', sans-serif;
+		font-size: 1rem;
+		font-weight: 600;
+		line-height: 1.2;
+		z-index: 1;
+	}
+
+	.message-item {
+		margin: 10px;
+		padding-bottom: 0.75rem;
+	}
+
+	.message-item p {
+		margin: 0;
+	}
+
+	.message-item a {
+		color: #f2ff00;
+	}
+
+	.message-item:last-child {
+		padding-bottom: 0;
+	}
+</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/global.css

@@ -44,7 +44,96 @@
 	font-display: swap;
 }
 
+/* 100: Thin */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Thin.woff2') format('woff2');
+	font-weight: 100;
+	font-style: normal;
+	font-display: swap;
+}
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-ThinItalic.woff2') format('woff2');
+	font-weight: 100;
+	font-style: italic;
+	font-display: swap;
+}
+
+/* 200: ExtraLight */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-ExtraLight.woff2') format('woff2');
+	font-weight: 200;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 300: Light */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Light.woff2') format('woff2');
+	font-weight: 300;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 400: Regular / Italic */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Regular.woff2') format('woff2');
+	font-weight: 400;
+	font-style: normal;
+	font-display: swap;
+}
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Italic.woff2') format('woff2');
+	font-weight: 400;
+	font-style: italic;
+	font-display: swap;
+}
+
+/* 500: Medium */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Medium.woff2') format('woff2');
+	font-weight: 500;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 600: SemiBold */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-SemiBold.woff2') format('woff2');
+	font-weight: 600;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 700: Bold */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Bold.woff2') format('woff2');
+	font-weight: 700;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 800: ExtraBold */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-ExtraBold.woff2') format('woff2');
+	font-weight: 800;
+	font-style: normal;
+	font-display: swap;
+}
 :root {
+	/* Fixed Heights */
+	--header-height: 80px;
+	--nav-height: 60px;
+
 	/* Brand Colours */
 	--color-brand: #4fd1d1;
 	--color-accent: #3c6f79;
@@ -58,6 +147,36 @@
 	--shadow-small: 0 4px 6px var(--color-shadow);
 	--shadow-up: 0 -4px 12px var(--color-shadow);
 	--shadow-right: 4px 0 12px var(--color-shadow);
+
+	/* Functional Colours */
+	--location-yellow: #edff22;
+	--delay-orange: #ff914d;
+	--alert-orange: #f87728;
+	--cancel-red: #c60000;
+	--early-blue: #5ec1ff;
+}
+
+/* Pulse Animations */
+@keyframes pulse {
+	0%,
+	100% {
+		opacity: 1;
+	}
+	50% {
+		opacity: 0.3;
+	}
+}
+
+@keyframes fast-pulse {
+	0%,
+	50%,
+	100% {
+		opacity: 1;
+	}
+	25%,
+	75% {
+		opacity: 0.25;
+	}
 }
 
 body {

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,17 +1,128 @@
+import type { ApiTrainsTrainDetails } from '@owlboard/owlboard-ts';
+
+export const estClass = (act: any, est: any) => (!act && est ? 'est' : 'act');
+
 /**
- * Converts ISO/JSON time to UK-formatted HH:MM string.
+ * Converts ISO/JSON time to UK-formatted HH:MM string, with optional (default off) seconds
  * Ensures Europe/London timezone irrespective of browser timezone.
  */
-export function formatUkTime(dateStr: string | Date | undefined): string {
+export function formatUkTime(
-    if (!dateStr) return '--:--';
+	dateStr: string | Date | undefined,
-    const date = typeof dateStr === 'string' ? new Date(dateStr): dateStr;
+	includeSeconds: boolean = false
+): string {
+	if (!dateStr) return '--:--';
+	const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;
 
-    if (isNaN(date.getTime())) return '--:--';
+	if (isNaN(date.getTime())) return '--:--';
 
-    return date.toLocaleTimeString('en-GB', {
+	return date.toLocaleTimeString('en-GB', {
-        hour: '2-digit',
+		hour: '2-digit',
-        minute: '2-digit',
+		minute: '2-digit',
-        hour12: false,
+		...(includeSeconds && { second: '2-digit' }),
-        timeZone: 'Europe/London',
+		hour12: false,
-    });
+		timeZone: 'Europe/London'
-}
+	});
+}
+
+/**
+ * Converts ISO/JSON time to UK-formatted DD/MM/YY HH:MM:SS string.
+ * Ensures Europe/London timezone irrespective of browser timezone.
+ */
+export function formatUkDateTime(
+	dateStr: string | Date | undefined,
+	includeSeconds: boolean = false
+): string {
+	if (!dateStr) return '--/--/-- --:--:--';
+
+	const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;
+
+	if (isNaN(date.getTime())) return '--/--/-- --:--:--';
+
+	return date
+		.toLocaleString('en-GB', {
+			day: '2-digit',
+			month: '2-digit',
+			year: '2-digit',
+			hour: '2-digit',
+			minute: '2-digit',
+			...(includeSeconds && { second: '2-digit' }),
+			hour12: false,
+			timeZone: 'Europe/London'
+		})
+		.replace(',', '');
+}
+
+/**
+ * Specific type that can handle the TrainDetails.ServiceLocation and the ApiStationsBoard.BoardService types for delay calculation
+ */
+interface DelayInput {
+    // Board types
+    sta?: string | null; std?: string | null; 
+    eta?: string | null; etd?: string | null;
+    ata?: string | null; atd?: string | null;
+    
+    // Journey types
+    pta?: string | null; ptd?: string | null; 
+    wta?: string | null; wtd?: string | null;
+    atp?: string | null; wtp?: string | null;
+	etp?: string | null;
+}
+
+/**
+ * Calculates a 'delay' value, in the formats:
+ * RT, 1E, 7L, etc.
+ * @param 'Schedule Location' or 'Board Service' object
+ * @returns Delay string for departure boards
+ */
+export function calculateDelay(loc: DelayInput): {
+	val: string;
+	type: string;
+} {
+	const pairs = [
+        // Departure check (Board: atd/etd vs std | Journey: atd vs ptd/wtd)
+        { actual: loc.atd || loc.etd, sched: loc.std || loc.ptd || loc.wtd },
+        // Arrival check (Board: ata/eta vs sta | Journey: ata vs pta/wta)
+        { actual: loc.ata || loc.eta, sched: loc.sta || loc.pta || loc.wta },
+        // Passing check
+        { actual: loc.atp || loc.etp, 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' };
+	}
+}
+
+/**
+ * Accepts a pair of times (string or Date) and outputs a delay class 'delay-early', 'delay-late' or 'delay-rt'
+ * @param sched Scheduled Time (string, Date)
+ * @param act Actual Time (string, Date)
+ */
+export function delayClassFromTimePair(sched: any, act: any): string {
+    if (!sched || !act) return '';
+
+    const s = new Date(sched).getTime();
+    const a = new Date(act).getTime();
+
+    if (isNaN(s) || isNaN(a)) return '';
+
+    const diff = a - s;
+    const oneMinute = 60000;
+
+    // on-time if within one minute
+    if (Math.abs(diff) < oneMinute) {
+        return 'delay-rt';
+    }
+
+    return diff > 0 ? 'delay-late' : 'delay-early';
+}

src/routes/+error.svelte

@@ -8,12 +8,15 @@
 
 <div class="error-wrapper">
 	{#if page.status == 404}
-	<!-- Warning no data image -->
+		<!-- Warning no data image -->
-	<img class="err-img" src={noResult} alt="" role="presentation" width="200" height="200" />
+		<img class="err-img" src={noResult} alt="" role="presentation" width="200" height="200" />
+	{:else if page.status == 499}
+		<!-- Change to a GSM-R X Sign?? -->
+		<img class="err-img" src={stopErr} alt="" role="presentation" width="150" height="210" />
 	{:else}
-	<!-- STOP Error image -->
+		<!-- STOP Error image -->
-	<img class="err-img" src={stopErr} alt="" role="presentation" width="150" height="210" />
+		<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">
@@ -26,7 +29,11 @@
 		</div>
 	{/if}
 
-	<Button href={'/'} color={'accent'}>Return to Home</Button>
+	{#if $page.error?.owlCode === 'NETWORK_DISCONNECTED'}
+		<Button onclick={() => window.location.reload()} color={'accent'}>Retry</Button>
+	{:else}
+		<Button href={'/'} color={'accent'}>Return to Home</Button>
+	{/if}
 </div>
 
 <style>

src/routes/+layout.svelte

@@ -154,7 +154,7 @@
 <style>
 	header {
 		top: 0;
-		height: 80px;
+		height: var(--header-height);
 		box-shadow: var(--shadow-std);
 	}
 	.logo-link {
@@ -201,13 +201,12 @@
 		min-height: 100dvh;
 		box-sizing: border-box;
 		background-color: var(--color-bg-dark);
-		background-image: radial-gradient(var(--color-bg-dark), var(--color-bg-light));
 	}
 
 	nav {
 		display: flex;
 		bottom: 0;
-		height: 60px;
+		height: var(--nav-height);
 		box-shadow: var(--shadow-up);
 	}
 

src/routes/board/+page.svelte

@@ -1,8 +1,20 @@
 <script lang="ts">
-	import { untrack } from 'svelte';
+	import { onMount, untrack } from 'svelte';
 	import { quickLinks } from '$lib/quick-links.svelte';
+	import StationAlertCard from '$lib/components/ui/station-board/StationAlertCard.svelte';
 
+	import { formatUkDateTime, formatUkTime } from '$lib/utils/time';
+	import StaffServicesTable from '$lib/components/ui/station-board/StaffServicesTable.svelte';
 	let { data } = $props();
+	let now = $state(new Date());
+
+	onMount(() => {
+		const interval = setInterval(() => {
+			now = new Date();
+		}, 1000);
+
+		return () => clearInterval(interval);
+	});
 
 	// Update 'QuickLinks'
 	$effect(() => {
@@ -17,18 +29,68 @@
 			}
 		}
 	});
+
+	// Wake Lock API Handling
+	// Load Data Invalidation Handling
+	// Refresh countdown logic
 </script>
 
-<section>Live board are not yet implemented on the server</section>
+<section class="board-wrapper">
+	<div class="time-data">
+		<span class="time-loaded">Updated: {formatUkDateTime(data.boardData.producedAt, true)}</span>
+		<span class="time-now">{formatUkTime(now, true)}</span>
+	</div>
+	{#if data.boardData.data.m?.length}
+		<StationAlertCard messages={data.boardData.data.m} />
+	{/if}
+	{#if data.boardData.data.s?.length}
+	<div class="service-list-wrapper">
+		<StaffServicesTable services={data.boardData.data.s} />
+	</div>
+	{/if}
+</section>
 
 <style>
-	section {
+	.board-wrapper {
-		font-family: 'URW Gothic', sans-serif;
+		display: flex;
-		text-align: center;
+		height: calc(100dvh - var(--nav-height) - var(--header-height));
-		font-size: 2rem;
+		flex-direction: column;
+		align-items: center;
+		width: 100%;
+		margin: 0 auto;
+		overflow: hidden;
+		gap: 0;
+	}
+
+	.time-data {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
 		width: 90%;
-		margin: auto;
+		max-width: 700px;
-		padding-top: 25px;
+		margin: 10px auto;
-		max-width: 500px;
+		font-family: 'URW Gothic', sans-serif;
+	}
+
+	.time-loaded,
+	.time-now {
+		font-variant-numeric: tabular-nums;
+	}
+
+	.time-loaded {
+		font-size: 0.9rem;
+	}
+
+	.time-now {
+		font-weight: 600;
+		font-size: 1rem;
+	}
+
+	.service-list-wrapper {
+		flex: 1;
+		overflow-y: auto;
+		height: calc(100dvh - 60px);
+		width: 100%;
+		margin-bottom: 5px;
 	}
 </style>

src/routes/board/+page.ts

@@ -1,16 +1,14 @@
 import { LOCATIONS } from '$lib/locations-object.svelte';
+import { ApiError, OwlClient, ValidationError } from '$lib/owlClient';
 import type { PageLoad } from './$types';
 import { error } from '@sveltejs/kit';
 
-export const load: PageLoad = async ({ url }) => {
+export const load: PageLoad = async ({ url, fetch }) => {
 	const locId = url.searchParams.get('loc');
 
 	if (!LOCATIONS.loaded) {
 		await LOCATIONS.init();
 	}
-
-	let title: string = '';
-
 	if (!locId) {
 		error(400, {
 			message: 'Location not provided',
@@ -18,22 +16,49 @@ export const load: PageLoad = async ({ url }) => {
 		});
 	}
 
-	let BoardLocation;
+	const BoardLocation = LOCATIONS.find(locId);
 
-	if (locId) {
+	if (!BoardLocation) {
-		BoardLocation = LOCATIONS.find(locId);
+		error(404, {
+			message: `Location (${locId.toUpperCase()}) not found`,
+			owlCode: 'INVALID_LOCATION_CODE'
+		});
+	}
+	const title = BoardLocation.n || BoardLocation.t || 'Live Arr/Dep';
 
-		if (BoardLocation) {
+	try {
-			title = BoardLocation.n || BoardLocation.t || 'Live Arr/Dep';
+		const boardData = await OwlClient.board.getByLocation(locId, fetch);
-		} else {
+
-			error(404, {
+		return {
-				message: `Location (${locId.toUpperCase()}) not found`,
+			title,
-				owlCode: 'INVALID_LOCATION_CODE'
+			BoardLocation,
+			boardData
+		};
+	} catch (e: unknown) {
+		if (
+			e instanceof TypeError &&
+			(e.message == 'Failed to fetch' || e.message.includes('network'))
+		) {
+			throw error(503, {
+				message: 'Network error: Please check your connection',
+				owlCode: 'NETWORK_DISCONNECTED'
 			});
 		}
+		if (e instanceof ValidationError) {
+			throw error(400, { message: e.message, owlCode: 'VALIDATION_ERROR' });
+		} else if (e instanceof ApiError) {
+			// If the API returns 404, it means the backend doesn't recognize this CRS/TIPLOC
+			if (e.code === 'NOT_FOUND') {
+				throw error(404, {
+					message: `Location (${locId.toUpperCase()}) is not recognized by the server.`,
+					owlCode: 'LOCATION_NOT_IN_BACKEND'
+				});
+			}
+			throw error(e.status, { message: e.message, owlCode: 'API_ERROR' });
+		} else if (e instanceof Error) {
+			throw error(500, { message: e.message, owlCode: 'GEN_ERROR' });
+		}
+
+		throw error(500, { message: 'Unexpected error', owlCode: 'UNKNOWN_ERR' });
 	}
-	return {
-		title,
-		BoardLocation
-	};
 };

src/routes/trains/+page.svelte

@@ -1,34 +1,32 @@
 <script lang="ts">
-    import NoResults from '$lib/components/ui/NoResults.svelte';
+	import NoResults from '$lib/components/ui/NoResults.svelte';
 	import TrainService from '$lib/components/ui/TrainService.svelte';
-    let { data } = $props();
+	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 
+	<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)}
+		{#each data.results as service (service.r)}
-        <TrainService {service} />
+			<TrainService {service} />
-    {/each}
+		{/each}
-    </div>
+	</div>
 {/if}
 
 <style>
-    .result-boxes {
+	.result-boxes {
-        width: 95%;
+		width: 95%;
-        margin: auto;
+		margin: auto;
-        padding-top: 1rem;
+		padding-top: 1rem;
-        padding-bottom: 1rem;
+		padding-bottom: 1rem;
-        display: flex;
+		display: flex;
-        align-items: center;
+		align-items: center;
-        justify-content: center;
+		justify-content: center;
-        flex-direction: column;
+		flex-direction: column;
-        gap: 1rem;
+		gap: 1rem;
-    }
+	}
 </style>

src/routes/trains/+page.ts

@@ -3,62 +3,60 @@ import type { ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
 import type { PageLoad } from './$types';
 import { error } from '@sveltejs/kit';
 
-export const load: PageLoad = async ({ url }) => {
+export const load: PageLoad = async ({ fetch, url }) => {
-    const headcode = url.searchParams.get('h');
+	const headcode = url.searchParams.get('h');
-    let dateParam = url.searchParams.get('d');
+	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) {
+	if (!headcode) {
-        throw error(400, {
+		throw error(400, {
-            message: 'Headcode not provided',
+			message: 'Headcode not provided',
-            owlCode: 'INVALID_DATA'
+			owlCode: 'INVALID_DATA'
-        });
+		});
-    }
+	}
 
-    // Declared outside of the try so that it can be used in both the try and catch blocks
+	// 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 {
+	try {
-        const response = await OwlClient.trains.getByHeadcode(headcode, date, toc);
+		const response = await OwlClient.trains.getByHeadcode(headcode, date, toc, fetch);
 
-        results = (response.data);
+		results = response.data;
-        return {
+		return {
-            title: headcode.toUpperCase(),
+			title: headcode.toUpperCase(),
-            results: results,
+			results: results
-        }
+		};
-    } catch (e: unknown) {
+	} catch (e: unknown) {
-        if (e instanceof ValidationError) {
+		if (e instanceof ValidationError) {
-            throw error(400, {
+			throw error(400, {
-                message: e.message,
+				message: e.message,
-                owlCode: 'VALIDATION_ERROR',
+				owlCode: 'VALIDATION_ERROR'
-            });
+			});
-        } else if (e instanceof ApiError) {
+		} else if (e instanceof ApiError) {
-            // Check if NO_RESULTS error, and return empty array if that is the case
+			// 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 {
+				return {
-                    title: headcode.toUpperCase(),
+					title: headcode.toUpperCase(),
-                    results: []
+					results: []
-                }
+				};
-            } else {
+			} else {
-                throw error(e.status, {
+				throw error(e.status, {
-                    message: e.message,
+					message: e.message,
-                    owlCode: 'API_ERROR',
+					owlCode: 'API_ERROR'
-                });
+				});
-            }
+			}
-        } else if (e instanceof Error) {
+		} else if (e instanceof Error) {
-            throw error(500, {
+			throw error(500, {
-                message: e.message,
+				message: e.message,
-                owlCode: 'GEN_ERROR',
+				owlCode: 'GEN_ERROR'
-            })
+			});
-        } else {
+		} else {
-            throw error(500, {
+			throw error(500, {
-                message: "Unexpected error",
+				message: 'Unexpected error',
-                owlCode: "UNKNOWN_ERR",
+				owlCode: 'UNKNOWN_ERR'
-            })
+			});
-        }
+		}
-    }
+	}
-}
+};