Compare commits
4 Commits
v3.0.0-dev
...
v3.0.0-dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 909e36ebc2 | |||
| f3d633e719 | |||
| 05a04ec922 | |||
| 3b91fad590 |
1193
package-lock.json
generated
1193
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -41,7 +41,7 @@
|
||||
"vitest-browser-svelte": "^2.0.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@owlboard/owlboard-ts": "^3.0.0-dev.20260503t0947",
|
||||
"@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101",
|
||||
"@tabler/icons-svelte": "^3.40.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,36 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { fade } from 'svelte/transition';
|
||||
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="shuttle"></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>
|
||||
@@ -38,11 +62,18 @@
|
||||
animation: data-travel 1.6s infinite ease-in-out;
|
||||
}
|
||||
|
||||
.message-container {
|
||||
display: grid;
|
||||
place-items: center;
|
||||
height: 2rem;
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
p {
|
||||
grid-area: 1 / 1;
|
||||
font-family: 'URW Gothic', sans-serif;
|
||||
letter-spacing: 0.15em;
|
||||
color: var(--color-title);
|
||||
animation: pulse 2s infinite ease-in-out;
|
||||
}
|
||||
|
||||
@keyframes data-travel {
|
||||
@@ -53,14 +84,4 @@
|
||||
left: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes pulse {
|
||||
0%,
|
||||
100% {
|
||||
opacity: 1;
|
||||
}
|
||||
50% {
|
||||
opacity: 0.4;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -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,6 +41,7 @@
|
||||
<label for="adaptive-input">{label}</label>
|
||||
{/if}
|
||||
|
||||
<form onsubmit={handleSubmit} class="input-container">
|
||||
<input
|
||||
id="adaptive-input"
|
||||
class:all-caps={uppercase}
|
||||
@@ -41,6 +53,19 @@
|
||||
{...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>
|
||||
{/if}
|
||||
@@ -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;
|
||||
background-color: var(--color-title);
|
||||
border: 2px solid transparent;
|
||||
border-radius: 20px;
|
||||
height: 100%;
|
||||
line-height: normal;
|
||||
padding: 0 48px;
|
||||
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 {
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
details = result.data;
|
||||
isExpanded = true;
|
||||
} catch (e) {
|
||||
console.Error('Failed to load train details');
|
||||
console.error('Failed to load train details');
|
||||
loadingDetailsError = true;
|
||||
loadingDetailsErrorMsg = e.message;
|
||||
} finally {
|
||||
@@ -93,7 +93,7 @@
|
||||
};
|
||||
</script>
|
||||
|
||||
<div class="train-service">
|
||||
<div class="train-service" class:isExpanded>
|
||||
<button class="summary" onclick={toggleExpand} type="button" aria-expanded={isExpanded}>
|
||||
{#if loadingDetails}
|
||||
<div class="loading-state"><div class="loading-spinner"></div></div>
|
||||
@@ -147,7 +147,15 @@
|
||||
{/if}
|
||||
{#if details.pis}
|
||||
<div class="pis-detail">
|
||||
{details.pis.code}
|
||||
<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>
|
||||
@@ -174,7 +182,6 @@
|
||||
</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}
|
||||
@@ -212,7 +219,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
{/if}
|
||||
|
||||
</tbody>{/each}
|
||||
</table>
|
||||
</div>
|
||||
@@ -241,10 +247,18 @@
|
||||
filter: brightness(1.2);
|
||||
}
|
||||
|
||||
.train-service:active .arrow {
|
||||
filter: brightness(0.2);
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
.train-service:hover {
|
||||
.train-service:not(.isExpanded):hover {
|
||||
filter: brightness(1.2);
|
||||
}
|
||||
|
||||
.summary:hover .arrow {
|
||||
filter: brightness(0.2);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -299,7 +313,7 @@
|
||||
padding: 0;
|
||||
margin: 0 0 0 auto;
|
||||
height: 25px;
|
||||
transition: all 0.9s;
|
||||
transition: all 0.3s;
|
||||
}
|
||||
|
||||
.expanded {
|
||||
@@ -310,6 +324,29 @@
|
||||
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
|
||||
*/
|
||||
|
||||
@@ -6,8 +6,7 @@
|
||||
|
||||
let headcode = $state('');
|
||||
|
||||
function handleSearch(e: SubmitEvent) {
|
||||
e.preventDefault();
|
||||
function handleSearch(headcode: string) {
|
||||
if (!headcode.trim()) return;
|
||||
|
||||
const searchParams = new URLSearchParams();
|
||||
@@ -18,10 +17,14 @@
|
||||
</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>
|
||||
<div class="card-content">
|
||||
<Textbox
|
||||
placeholder="Enter Headcode"
|
||||
bind:value={headcode}
|
||||
maxLength={4}
|
||||
onsubmit={handleSearch}
|
||||
/>
|
||||
</div>
|
||||
</BaseCard>
|
||||
|
||||
<style>
|
||||
@@ -29,7 +32,7 @@
|
||||
text-align: center;
|
||||
width: 90%;
|
||||
margin: auto;
|
||||
padding: 10px 0 0 0;
|
||||
padding: 10px 0 0.5rem 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.75rem;
|
||||
|
||||
137
src/lib/components/ui/cards/StationAlertCard.svelte
Normal file
137
src/lib/components/ui/cards/StationAlertCard.svelte
Normal file
@@ -0,0 +1,137 @@
|
||||
<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: 1rem 0;
|
||||
border-radius: 8px;
|
||||
background: transparent;
|
||||
position: relative;
|
||||
z-index: 10;
|
||||
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: 1.0rem;
|
||||
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>
|
||||
@@ -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'}
|
||||
max={9999}
|
||||
bind:value={codeValue}
|
||||
type={'text'}
|
||||
onsubmit={onsearch}
|
||||
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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -147,6 +147,7 @@
|
||||
/* Functional Colours */
|
||||
--location-yellow: #edff22;
|
||||
--delay-orange: #ff914d;
|
||||
--alert-orange: #f87728;
|
||||
--cancel-red: #c60000;
|
||||
--early-blue: #5ec1ff;
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import type { ApiTrainsTrainDetails } from '@owlboard/owlboard-ts';
|
||||
/**
|
||||
* 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(dateStr: string | Date | undefined, includeSeconds: boolean = false): string {
|
||||
if (!dateStr) return '--:--';
|
||||
const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;
|
||||
|
||||
@@ -12,11 +12,35 @@ export function formatUkTime(dateStr: string | Date | undefined): string {
|
||||
return date.toLocaleTimeString('en-GB', {
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
...(includeSeconds && { second: '2-digit' }),
|
||||
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(',', '');
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculates a 'delay' value, in the formats:
|
||||
* RT, 1E, 7L, etc.
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
{#if page.status == 404}
|
||||
<!-- Warning no data image -->
|
||||
<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 -->
|
||||
<img class="err-img" src={stopErr} alt="" role="presentation" width="150" height="210" />
|
||||
@@ -26,7 +29,11 @@
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#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>
|
||||
|
||||
@@ -1,8 +1,19 @@
|
||||
<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/cards/StationAlertCard.svelte';
|
||||
|
||||
import { formatUkDateTime, formatUkTime } from '$lib/utils/time';
|
||||
let { data } = $props();
|
||||
let now = $state(new Date());
|
||||
|
||||
onMount(() => {
|
||||
const interval = setInterval(() => {
|
||||
now = new Date();
|
||||
}, 1000);
|
||||
|
||||
return () => clearInterval(interval);
|
||||
})
|
||||
|
||||
// Update 'QuickLinks'
|
||||
$effect(() => {
|
||||
@@ -17,12 +28,60 @@
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<section>Live board are not yet implemented on the server</section>
|
||||
// Wake Lock API Handling
|
||||
// Load Data Invalidation Handling
|
||||
// Refresh countdown logic
|
||||
</script>
|
||||
<section class="board-wrapper">
|
||||
{#if data.boardData.data.m?.length}
|
||||
|
||||
<StationAlertCard messages={data.boardData.data.m} />
|
||||
<div class="time-data">
|
||||
<span class="time-loaded">Fetched: {formatUkDateTime(data.boardData.producedAt, true)}</span>
|
||||
<span class="time-now">{formatUkTime(now, true)}</span>
|
||||
</div>
|
||||
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
<section class="section-t">Live boards are not yet fully implemented on the server</section>
|
||||
|
||||
<pre class="json-dump">{JSON.stringify(data.boardData.data.s, null, 2)}</pre>
|
||||
|
||||
<style>
|
||||
section {
|
||||
.board-wrapper {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
margin: 0 auto;
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
.time-data {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
width: 90%;
|
||||
max-width: 700px;
|
||||
margin: 0 auto;
|
||||
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;
|
||||
}
|
||||
.section-t {
|
||||
font-family: 'URW Gothic', sans-serif;
|
||||
text-align: center;
|
||||
font-size: 2rem;
|
||||
@@ -31,4 +90,13 @@
|
||||
padding-top: 25px;
|
||||
max-width: 500px;
|
||||
}
|
||||
|
||||
.json-dump {
|
||||
background: #222;
|
||||
color: #0f0;
|
||||
padding: 1rem;
|
||||
border-radius: 4px;
|
||||
font-size: 0.9rem;
|
||||
width: 95%;
|
||||
margin: 1rem auto; }
|
||||
</style>
|
||||
|
||||
@@ -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) {
|
||||
BoardLocation = LOCATIONS.find(locId);
|
||||
|
||||
if (BoardLocation) {
|
||||
title = BoardLocation.n || BoardLocation.t || 'Live Arr/Dep';
|
||||
} else {
|
||||
if (!BoardLocation) {
|
||||
error(404, {
|
||||
message: `Location (${locId.toUpperCase()}) not found`,
|
||||
owlCode: 'INVALID_LOCATION_CODE'
|
||||
});
|
||||
}
|
||||
}
|
||||
const title = BoardLocation.n || BoardLocation.t || 'Live Arr/Dep';
|
||||
|
||||
try {
|
||||
const boardData = await OwlClient.board.getByLocation(locId, fetch);
|
||||
|
||||
return {
|
||||
title,
|
||||
BoardLocation
|
||||
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' });
|
||||
}
|
||||
};
|
||||
|
||||
@@ -3,7 +3,7 @@ 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');
|
||||
let dateParam = url.searchParams.get('d');
|
||||
const toc = url.searchParams.get('t') || '';
|
||||
@@ -21,7 +21,7 @@ export const load: PageLoad = async ({ url }) => {
|
||||
let results: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse[];
|
||||
|
||||
try {
|
||||
const response = await OwlClient.trains.getByHeadcode(headcode, date, toc);
|
||||
const response = await OwlClient.trains.getByHeadcode(headcode, date, toc, fetch);
|
||||
|
||||
results = response.data;
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user