Add trainservice details (currently raw JSON)

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.20260427T2348",
+		"@owlboard/owlboard-ts": "^3.0.0-dev.20260503T0051",
 		"@tabler/icons-svelte": "^3.40.0"
 	}
 }

src/lib/assets/img/no-data.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120"><path fill="#fff" d="M0 0h120v120H0z"/><g fill="#00f"><path d="M60 0h60v60H60zM0 60h60v60H0z"/><path d="M12.72 32.97h1.08l1.22-4.9 1.2 4.9h1.08l2.16-7.4h-1.4l-1.3 5.17-1.25-5.16h-1l-1.26 5.16-1.3-5.16h-1.4zm12.6-5.54H24.1v.74a2 2 0 0 0-1.8-.87c-1.65 0-2.83 1.23-2.83 2.92 0 1.67 1.17 2.88 2.8 2.88a2.2 2.2 0 0 0 1.83-.85v.72h1.22zm-2.89 1.09c.95 0 1.63.7 1.63 1.72 0 .4-.16.86-.4 1.14-.27.33-.7.5-1.2.5-.98 0-1.65-.66-1.65-1.63 0-1.01.67-1.73 1.62-1.73m3.88 4.45h1.33v-3.08c-.03-.82.4-1.28 1.2-1.31V27.3h-.1c-.58 0-.86.16-1.2.67v-.54H26.3zm3.17 0h1.33v-2.61c0-.74.05-1.06.22-1.33q.33-.5.98-.51.53 0 .8.35c.18.24.26.65.26 1.39v2.7h1.33V30c0-1-.1-1.47-.4-1.9q-.56-.79-1.73-.8a2 2 0 0 0-1.56.66v-.53h-1.23zm6 0h1.33v-5.54h-1.33zm0-6.14h1.33v-1.25h-1.33zm2.4 6.14h1.33v-2.61c0-.74.05-1.06.22-1.33q.33-.5.98-.51.53 0 .8.35c.18.24.26.65.26 1.39v2.7h1.33V30c0-1-.1-1.47-.4-1.9q-.56-.79-1.73-.8a2 2 0 0 0-1.56.66v-.53h-1.23zm10.3-5.54v.7q-.62-.83-1.8-.83c-1.58 0-2.74 1.22-2.74 2.86 0 1.7 1.14 2.94 2.72 2.94.78 0 1.3-.25 1.82-.86q-.07 1.78-1.55 1.77c-.62 0-1-.16-1.39-.6h-1.5c.44 1.12 1.48 1.77 2.84 1.77 1 0 1.8-.35 2.31-1.01.4-.51.56-1.2.56-2.25v-4.5zm-1.66 1.09c.95 0 1.6.68 1.6 1.7 0 1-.62 1.66-1.58 1.66-.95 0-1.56-.65-1.56-1.66 0-1.02.61-1.7 1.54-1.7" aria-label="Warning" font-family="URW Gothic" font-size="10" font-weight="600" style="-inkscape-font-specification:&quot;URW Gothic Semi-Bold&quot;"/><g stroke-width="0" aria-label="No Data" font-family="URW Gothic" font-size="10" font-weight="600" style="-inkscape-font-specification:&quot;URW Gothic Oblique&quot;;text-align:center" text-anchor="middle"><path d="M83.98 87.39h1.37v-5.37l3.1 5.37h1.52V80H88.6v5.38L85.54 80h-1.56zm9.95-5.67a2.93 2.93 0 0 0-2.93 2.9c0 1.6 1.32 2.9 2.94 2.9s2.95-1.3 2.95-2.86a2.9 2.9 0 0 0-2.96-2.94m.01 1.22c.9 0 1.61.75 1.61 1.68s-.72 1.68-1.6 1.68c-.9 0-1.6-.75-1.6-1.7 0-.91.71-1.66 1.6-1.66M79.24 99.89h1.72c1.12 0 1.79-.11 2.39-.41 1.14-.56 1.8-1.78 1.8-3.27 0-1.41-.57-2.56-1.6-3.18a5 5 0 0 0-2.62-.53h-1.7zm1.37-1.31v-4.77h.27c.88 0 1.34.08 1.77.3.7.36 1.13 1.15 1.13 2.1 0 .89-.41 1.68-1.07 2.04-.41.22-.98.33-1.8.33zm11.1-4.23h-1.22v.74a2 2 0 0 0-1.81-.87c-1.64 0-2.82 1.23-2.82 2.92 0 1.67 1.17 2.88 2.79 2.88a2.2 2.2 0 0 0 1.84-.85v.72h1.22zm-2.9 1.09c.96 0 1.64.71 1.64 1.72 0 .4-.16.86-.4 1.14-.27.33-.7.5-1.21.5-.97 0-1.64-.66-1.64-1.63 0-1.01.67-1.73 1.62-1.73m4.26 4.45h1.33v-4.33h.8v-1.21h-.8V92.5h-1.33v1.85h-.65v1.21h.65zm8.33-5.54h-1.22v.74a2 2 0 0 0-1.81-.87c-1.64 0-2.82 1.23-2.82 2.92 0 1.67 1.17 2.88 2.79 2.88a2.2 2.2 0 0 0 1.84-.85v.72h1.22zm-2.9 1.09c.96 0 1.64.71 1.64 1.72 0 .4-.16.86-.4 1.14q-.42.5-1.21.5c-.97 0-1.64-.66-1.64-1.63 0-1.01.67-1.73 1.62-1.73" style="-inkscape-font-specification:&quot;URW Gothic Semi-Bold&quot;"/></g></g></svg>

src/lib/components/ui/Button.svelte

@@ -39,7 +39,7 @@
 		align-items: center;
 		justify-content: center;
 		min-height: 48px;
-		min-width: 48px;
+		min-width: 98px;
 		appearance: none;
 		background: transparent;
 		border: none;

src/lib/components/ui/Loading.svelte

@@ -0,0 +1,59 @@
+<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

@@ -0,0 +1,55 @@
+<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();
+</script>
+
+<div class="no-results-state">
+    <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 = '/'}
+        color="accent"
+    >
+        Go back
+    </Button>
+    </div>
+</div>
+
+<style>
+    .no-results-state {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        min-height: 400px;
+        padding: 5rem;
+        text-align: center;
+        box-sizing: border-box;
+        font-family: 'URW-Gothic', sans-serif;
+    }
+
+    .image {
+        margin-bottom: 1.95rem;
+        max-width: 90%;
+        height: auto;
+    }
+
+    h3 {
+        margin: 0 0 0.5rem 0;
+    }
+
+    p {
+        margin: 0;
+        opacity: 0.8;
+    }
+
+    .btn-container {
+        margin-top: 20px;
+    }
+</style>

src/lib/components/ui/TocStyle.svelte

@@ -8,6 +8,8 @@
 	let code = $derived(toc.toUpperCase());
 </script>
 
+
+<!-- SPACE MONO for the font? -->
 <div class="toc-container {code}">
 	{code}
 </div>
@@ -20,8 +22,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 {
@@ -42,6 +58,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

@@ -0,0 +1,140 @@
+<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 details = $state(null);
+
+    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("Failde to load train details")
+        } finally {
+            loading = 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;
+    }
+</script>
+
+<div class="train-service">
+    <button class="summary" onclick={toggleExpand} type="button" aria-expanded={isExpanded}>
+        <div class="operator-summary">
+            <TocStyle toc={service.o} />
+        </div>
+        <div class="main-text-summary">
+        <div class="time-summary">
+            {OriginDepartureSummary}
+        </div>
+        <div class="location-summary">
+            {service.ot}    
+        </div>
+        <div class="location-summary to-summary">
+            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  transition:slide={{duration: 800, easing: quintOut}} class="detauls-content">
+                <!-- Here goes the data formatting! -->
+                {JSON.stringify(details)}
+            </div>
+        {/if}
+</div>
+
+<style>
+    .train-service {
+        background-color: var(--color-accent);
+        width: 100%;
+        border-radius: 4px;
+        box-shadow: var(--shadow-std);
+        overflow: hidden;
+        font-family: 'URW Gothic', sans-serif;
+        transition: 0.2s all;
+        filter: brightness(1.1);
+    }
+
+    .train-service:hover {
+        filter:brightness(1.5);
+    }
+
+    .summary {
+        display: flex;
+        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 {
+        flex-shrink: 0;
+    }
+
+    .main-text-summary {
+        display: flex;
+        flex-grow: 1;
+        align-items: center;
+        gap: 0.5rem;
+    }
+
+    .time-summary {
+        font-size: 1.1rem;
+        font-weight: 700;
+        color: var(--color-brand);
+    }
+
+    .location-summary {
+        text-transform: uppercase;
+        font-weight: 500;
+        font-size: 1.1rem;
+        letter-spacing: 0.02em;
+        color: var(--color-title);
+    }
+
+    .to-summary {
+        font-size: 0.8rem;
+        font-style: oblique;
+        text-transform: lowercase;
+    }
+    </style>

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

@@ -37,7 +37,7 @@
 		text-align: center;
 		width: 90%;
 		margin: auto;
-		padding: 10px 0 10px 0;
+		padding: 10px 0 0 0;
         display: flex;
         flex-direction: column;
         gap: 0.75rem;

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

@@ -44,7 +44,7 @@
 		width: 90%;
 		min-height: 98px;
 		margin: auto;
-		padding: 10px 0 10px 0;
+		padding: 10px 0 0 0;
 	}
 
 	.stations-flex {

src/lib/utils/time.ts

@@ -0,0 +1,17 @@
+/**
+ * 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;
+
+    if (isNaN(date.getTime())) return '--:--';
+
+    return date.toLocaleTimeString('en-GB', {
+        hour: '2-digit',
+        minute: '2-digit',
+        hour12: false,
+        timeZone: 'Europe/London',
+    });
+}

src/routes/+error.svelte

@@ -2,12 +2,18 @@
 	import { page } from '$app/state';
 
 	import stopErr from '$lib/assets/img/stop-error.svg';
+	import noResult from '$lib/assets/img/no-data.svg';
 	import Button from '$lib/components/ui/Button.svelte';
 </script>
 
 <div class="error-wrapper">
+	{#if page.status == 404}
+	<!-- Warning no data image -->
+	<img class="err-img" src={noResult} alt="" role="presentation" width="200" height="200" />
+	{:else}
+	<!-- STOP Error image -->
 	<img class="err-img" src={stopErr} alt="" role="presentation" width="150" height="210" />
-
+{/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 />
-	{@render children()}
+
+	{#if navigating && navigating.to}
+		<Loading />
+	{:else}
+		{@render children()}
+	{/if}
 </main>
 
 <nav bind:clientWidth={navWidth}>

src/routes/pis/+page.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+	import HeadcodeSearchCard from '$lib/components/ui/cards/HeadcodeSearchCard.svelte';
 	import PisStartEndCard from '$lib/components/ui/cards/pis/PisStartEndCard.svelte';
 	import PisCode from '$lib/components/ui/cards/pis/PisCode.svelte';
 	import Button from '$lib/components/ui/Button.svelte';
@@ -60,6 +61,7 @@
 
 {#if !resultsLoaded}
 	<div class="card-container">
+		<HeadcodeSearchCard />
 		<PisStartEndCard onsearch={handleStartEndSearch} />
 		<PisCode onsearch={handleCodeSearch} />
 	</div>

src/routes/trains/+page.svelte

@@ -1,12 +1,34 @@
 <script lang="ts">
-	let { data } = $props();
+    import NoResults from '$lib/components/ui/NoResults.svelte';
+	import TrainService from '$lib/components/ui/TrainService.svelte';
+    let { data } = $props();
+
 </script>
-<pre>{JSON.stringify(data.results, null, 1)}</pre>
+
+
+
+{#if data.results.length === 0}
+    <NoResults 
+        message={"No trains found on this date with this headcode."}
+    />
+{:else}
+<div class="result-boxes">
+    {#each data.results as service (service.r)}
+        <TrainService {service} />
+    {/each}
+    </div>
+{/if}
+
 <style>
-	pre {
+    .result-boxes {
-        background: #1e1e1e;
+        width: 95%;
-        color: #00ff00;
+        margin: auto;
-        padding: 1rem;
+        padding-top: 1rem;
-        overflow: auto;
+        padding-bottom: 1rem;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        gap: 1rem;
     }
 </style>

src/routes/trains/+page.ts

@@ -19,11 +19,13 @@ 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[]
+
     try {
         const response = await OwlClient.trains.getByHeadcode(headcode, date, toc);
 
-        // Shouldn't be needed to cast the type...
+        results = (response.data);
-        const results = (response.data || []);
         return {
             title: headcode.toUpperCase(),
             results: results,
@@ -35,13 +37,20 @@ export const load: PageLoad = async ({ url }) => {
                 owlCode: 'VALIDATION_ERROR',
             });
         } else if (e instanceof ApiError) {
-            console.log(e);
+            // Check if NO_RESULTS error, and return empty array if that is the case
-            throw error(20, {
+            if (e.code === "NOT_FOUND") {
-                message: e.message,
+                return {
-                owlCode: 'API_ERROR',
+                    title: headcode.toUpperCase(),
-            });
+                    results: []
+                }
+            } else {
+                throw error(e.status, {
+                    message: e.message,
+                    owlCode: 'API_ERROR',
+                });
+            }
         } else if (e instanceof Error) {
-            throw error(20, {
+            throw error(500, {
                 message: e.message,
                 owlCode: 'GEN_ERROR',
             })
@@ -52,4 +61,4 @@ export const load: PageLoad = async ({ url }) => {
             })
         }
     }
-}
+}