Compare commits
17 Commits
v3.0.0-dev
...
v3.0.0-dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 6a857c2d64 | |||
| 1c4c7ccabc | |||
| 9ca3662ada | |||
| c524fe3c2e | |||
| 5486795711 | |||
| 24960707e2 | |||
| 91cb119b7d | |||
| 26e40c5bf6 | |||
| a746a1eac2 | |||
| 68af07b9bd | |||
| 16d929fad1 | |||
| 5bbffcecb8 | |||
| 5ead4f8296 | |||
| abb8663766 | |||
| 3225b60140 | |||
| f7b1b7fe0d | |||
| 8c0d385772 |
1815
package-lock.json
generated
1815
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -19,7 +19,6 @@
|
||||
"devDependencies": {
|
||||
"@eslint/compat": "^2.0.2",
|
||||
"@eslint/js": "^9.39.2",
|
||||
"@owlboard/owlboard-ts": "^3.0.0-dev.202603302258",
|
||||
"@playwright/test": "^1.58.1",
|
||||
"@sveltejs/adapter-static": "^3.0.10",
|
||||
"@sveltejs/kit": "^2.50.2",
|
||||
@@ -42,6 +41,7 @@
|
||||
"vitest-browser-svelte": "^2.0.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@owlboard/owlboard-ts": "^3.0.0-dev.20260503t0947",
|
||||
"@tabler/icons-svelte": "^3.40.0"
|
||||
}
|
||||
}
|
||||
|
||||
5
src/app.d.ts
vendored
5
src/app.d.ts
vendored
@@ -2,7 +2,10 @@
|
||||
// for information about these interfaces
|
||||
declare global {
|
||||
namespace App {
|
||||
// interface Error {}
|
||||
interface Error {
|
||||
message: string;
|
||||
owlCode?: string;
|
||||
}
|
||||
// interface Locals {}
|
||||
// interface PageData {}
|
||||
// interface PageState {}
|
||||
|
||||
1
src/lib/assets/img/no-data.svg
Normal file
1
src/lib/assets/img/no-data.svg
Normal file
@@ -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:"URW Gothic Semi-Bold""/><g stroke-width="0" aria-label="No Data" font-family="URW Gothic" font-size="10" font-weight="600" style="-inkscape-font-specification:"URW Gothic Oblique";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:"URW Gothic Semi-Bold""/></g></g></svg>
|
||||
|
After Width: | Height: | Size: 2.8 KiB |
@@ -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;
|
||||
|
||||
66
src/lib/components/ui/Loading.svelte
Normal file
66
src/lib/components/ui/Loading.svelte
Normal file
@@ -0,0 +1,66 @@
|
||||
<script lang="ts">
|
||||
let { message = 'Loading...' } = $props();
|
||||
</script>
|
||||
|
||||
<div class="loading-state">
|
||||
<div class="track">
|
||||
<div class="shuttle"></div>
|
||||
</div>
|
||||
<p>{message}</p>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.loading-state {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding: 4rem 2rem;
|
||||
width: 75%;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.track {
|
||||
width: 160px;
|
||||
height: 3px;
|
||||
background-color: var(--color-title);
|
||||
border-radius: 4px;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.shuttle {
|
||||
position: absolute;
|
||||
width: 50%;
|
||||
height: 100%;
|
||||
border-radius: 4px;
|
||||
background: linear-gradient(90deg, #1abc9c 0%, #3498db 100%);
|
||||
animation: data-travel 1.6s infinite ease-in-out;
|
||||
}
|
||||
|
||||
p {
|
||||
font-family: 'URW Gothic', sans-serif;
|
||||
letter-spacing: 0.15em;
|
||||
color: var(--color-title);
|
||||
animation: pulse 2s infinite ease-in-out;
|
||||
}
|
||||
|
||||
@keyframes data-travel {
|
||||
0% {
|
||||
left: -50%;
|
||||
}
|
||||
100% {
|
||||
left: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes pulse {
|
||||
0%,
|
||||
100% {
|
||||
opacity: 1;
|
||||
}
|
||||
50% {
|
||||
opacity: 0.4;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
55
src/lib/components/ui/NoResults.svelte
Normal file
55
src/lib/components/ui/NoResults.svelte
Normal file
@@ -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>
|
||||
@@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { slide } from 'svelte/transition';
|
||||
import { slide } from 'svelte/transition';
|
||||
|
||||
let isNotLondon = $state(false);
|
||||
let londonZone = $state('Greenwich Mean Time');
|
||||
@@ -19,24 +19,26 @@
|
||||
</script>
|
||||
|
||||
{#if isNotLondon}
|
||||
<div transition:slide={{duration: 300}} class="tzWarn"><p class="tzText">
|
||||
All times are shown in <strong>{londonZone}</strong>
|
||||
</p></div>
|
||||
<div transition:slide={{ duration: 300 }} class="tzWarn">
|
||||
<p class="tzText">
|
||||
All times are shown in <strong>{londonZone}</strong>
|
||||
</p>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<style>
|
||||
.tzWarn {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
padding: 1rem 0 0 0;
|
||||
}
|
||||
.tzWarn {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
padding: 1rem 0 0 0;
|
||||
}
|
||||
|
||||
.tzText {
|
||||
width: 80%;
|
||||
text-align: center;
|
||||
margin: auto;
|
||||
font-family: 'URW Gothic', sans-serif;
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
.tzText {
|
||||
width: 80%;
|
||||
text-align: center;
|
||||
margin: auto;
|
||||
font-family: 'URW Gothic', sans-serif;
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
</style>
|
||||
10
src/lib/components/ui/TiplocConverter.svelte
Normal file
10
src/lib/components/ui/TiplocConverter.svelte
Normal file
@@ -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}
|
||||
@@ -8,6 +8,7 @@
|
||||
let code = $derived(toc.toUpperCase());
|
||||
</script>
|
||||
|
||||
<!-- SPACE MONO for the font? -->
|
||||
<div class="toc-container {code}">
|
||||
{code}
|
||||
</div>
|
||||
@@ -20,8 +21,22 @@
|
||||
justify-content: center;
|
||||
padding: 2px 8px;
|
||||
font-weight: 800;
|
||||
font-size: 1.1rem;
|
||||
background-color: #333;
|
||||
color: #fff;
|
||||
font-family: 'Courier New', Courier, monospace;
|
||||
}
|
||||
|
||||
.AW {
|
||||
/* Transport for Wales */
|
||||
background: red;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.LM {
|
||||
/* West Midlands Trains */
|
||||
background: rgb(176, 115, 1);
|
||||
color: white;
|
||||
}
|
||||
|
||||
.GW {
|
||||
@@ -42,6 +57,12 @@
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.GN {
|
||||
/* Great Northern */
|
||||
background-color: fuchsia;
|
||||
color: rgb(229, 229, 229);
|
||||
}
|
||||
|
||||
.SW {
|
||||
/* South Western Railway */
|
||||
background-color: #2a3389;
|
||||
|
||||
534
src/lib/components/ui/TrainService.svelte
Normal file
534
src/lib/components/ui/TrainService.svelte
Normal file
@@ -0,0 +1,534 @@
|
||||
<script lang="ts">
|
||||
import type { ApiPisObject, ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
|
||||
import { OwlClient, ApiError, ValidationError } from '$lib/owlClient';
|
||||
import { slide } from 'svelte/transition';
|
||||
import { quintOut } from 'svelte/easing';
|
||||
import { formatUkTime, calculateDelay } from '$lib/utils/time';
|
||||
import TocStyle from '$lib/components/ui/TocStyle.svelte';
|
||||
import TiplocConverter from '$lib/components/ui/TiplocConverter.svelte';
|
||||
import { IconChevronDownFilled } from '@tabler/icons-svelte';
|
||||
let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse } = $props();
|
||||
let isExpanded = $state(false);
|
||||
let loadingDetails = $state(false);
|
||||
let loadingDetailsError = $state(false);
|
||||
let loadingDetailsErrorMsg = $state('');
|
||||
let details = $state(null);
|
||||
|
||||
const toggleExpand = async (rid: string) => {
|
||||
if (isExpanded) {
|
||||
isExpanded = false;
|
||||
return;
|
||||
}
|
||||
|
||||
loadingDetails = true;
|
||||
try {
|
||||
const result = await OwlClient.trains.getByRid(service.r);
|
||||
details = result.data;
|
||||
isExpanded = true;
|
||||
} catch (e) {
|
||||
console.Error('Failed to load train details');
|
||||
loadingDetailsError = true;
|
||||
loadingDetailsErrorMsg = e.message;
|
||||
} finally {
|
||||
loadingDetails = false;
|
||||
}
|
||||
};
|
||||
|
||||
let OriginDepartureSummary = $derived(formatUkTime(service.od));
|
||||
|
||||
async function loadDetails(rid: string) {
|
||||
if (details) return;
|
||||
loadingDetails = true;
|
||||
|
||||
const result = await OwlClient.trains.getByRid(service.r);
|
||||
details = result.data;
|
||||
loadingDetails = false;
|
||||
}
|
||||
|
||||
const estClass = (act, est) => (!act && est ? 'est' : 'act');
|
||||
|
||||
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'
|
||||
};
|
||||
|
||||
const activityRegex = new RegExp(
|
||||
Object.keys(activityMap)
|
||||
.sort((a, b) => b.length - a.length) // Longest codes first
|
||||
.map((key) => key.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')) // Escape special chars
|
||||
.join('|'),
|
||||
'g'
|
||||
);
|
||||
|
||||
const getRelevantActivities = (act: string) => {
|
||||
if (!act) return [];
|
||||
|
||||
// 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">
|
||||
<button class="summary" onclick={toggleExpand} type="button" aria-expanded={isExpanded}>
|
||||
{#if loadingDetails}
|
||||
<div class="loading-state"><div class="loading-spinner"></div></div>
|
||||
{/if}
|
||||
<div class="operator-summary">
|
||||
<TocStyle toc={service.o} />
|
||||
</div>
|
||||
<div class="main-text-summary">
|
||||
<div class="time-summary">
|
||||
{OriginDepartureSummary}
|
||||
</div>
|
||||
<div class="location-summary" class:can-all={service.ct}>
|
||||
{service.ot}
|
||||
</div>
|
||||
<div class="location-summary to-summary" class:can-all={service.ct}>to</div>
|
||||
<div class="location-summary" class:can-all={service.ct}>
|
||||
{service.dt}
|
||||
</div>
|
||||
<div class="arrow" class:expanded={isExpanded}>
|
||||
<IconChevronDownFilled color={'var(--color-title)'} size={25} />
|
||||
</div>
|
||||
</div>
|
||||
</button>
|
||||
{#if isExpanded && details}
|
||||
<div class="box-ext" transition:slide={{ duration: 800, easing: quintOut }}>
|
||||
<!-- Here goes the data formatting! -->
|
||||
<div class="detail-head">
|
||||
<!-- Cancellation Section -->
|
||||
{#if service.ct}
|
||||
<span class="cancel-reason"> Cancelled throughout </span>
|
||||
{/if}
|
||||
{#if details.header.cr}
|
||||
<span class="cancel-reason">
|
||||
{details.header.cr}
|
||||
{#if details.header.cl}
|
||||
{details.header.cn ? ' near ' : ' at '}
|
||||
<TiplocConverter code={details.header.cl} />
|
||||
{/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">
|
||||
{details.pis.code}
|
||||
</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>
|
||||
/*
|
||||
Main container
|
||||
*/
|
||||
.train-service {
|
||||
background-color: var(--color-accent);
|
||||
width: 100%;
|
||||
max-width: 460px;
|
||||
border-radius: 12px;
|
||||
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:active {
|
||||
filter: brightness(1.2);
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
.train-service:hover {
|
||||
filter: brightness(1.2);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
Summary Header
|
||||
*/
|
||||
.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;
|
||||
}
|
||||
|
||||
.operator-summary {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.main-text-summary {
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.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.9s;
|
||||
}
|
||||
|
||||
.expanded {
|
||||
transform: rotateX(180deg);
|
||||
}
|
||||
|
||||
.can-all {
|
||||
color: red;
|
||||
}
|
||||
|
||||
/*
|
||||
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>
|
||||
@@ -52,7 +52,7 @@
|
||||
.card {
|
||||
background: var(--color-accent);
|
||||
position: relative;
|
||||
border-radius: 20px;
|
||||
border-radius: 12px;
|
||||
overflow: visible;
|
||||
width: 95%;
|
||||
max-width: 600px;
|
||||
|
||||
37
src/lib/components/ui/cards/HeadcodeSearchCard.svelte
Normal file
37
src/lib/components/ui/cards/HeadcodeSearchCard.svelte
Normal file
@@ -0,0 +1,37 @@
|
||||
<script lang="ts">
|
||||
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) {
|
||||
e.preventDefault();
|
||||
if (!headcode.trim()) return;
|
||||
|
||||
const searchParams = new URLSearchParams();
|
||||
searchParams.append('h', headcode.trim().toUpperCase());
|
||||
|
||||
goto(`/trains?${searchParams.toString()}`);
|
||||
}
|
||||
</script>
|
||||
|
||||
<BaseCard header={'Search Train & PIS'}>
|
||||
<form onsubmit={handleSearch} class="card-content">
|
||||
<Textbox placeholder="Enter Headcode" bind:value={headcode} maxLength={4} />
|
||||
<Button type="submit" disabled={!headcode}>Search</Button>
|
||||
</form>
|
||||
</BaseCard>
|
||||
|
||||
<style>
|
||||
.card-content {
|
||||
text-align: center;
|
||||
width: 90%;
|
||||
margin: auto;
|
||||
padding: 10px 0 0 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.75rem;
|
||||
}
|
||||
</style>
|
||||
@@ -44,7 +44,7 @@
|
||||
width: 90%;
|
||||
min-height: 98px;
|
||||
margin: auto;
|
||||
padding: 10px 0 10px 0;
|
||||
padding: 10px 0 0 0;
|
||||
}
|
||||
|
||||
.stations-flex {
|
||||
|
||||
71
src/lib/components/ui/cards/QuickLinksCard.svelte
Normal file
71
src/lib/components/ui/cards/QuickLinksCard.svelte
Normal file
@@ -0,0 +1,71 @@
|
||||
<script lang="ts">
|
||||
import BaseCard from '$lib/components/ui/cards/BaseCard.svelte';
|
||||
import Button from '$lib/components/ui/Button.svelte';
|
||||
|
||||
import { fade } from 'svelte/transition';
|
||||
import { flip } from 'svelte/animate';
|
||||
|
||||
import { quickLinks } from '$lib/quick-links.svelte';
|
||||
|
||||
const flipDuration = 300;
|
||||
</script>
|
||||
|
||||
<BaseCard header={'Quick Links'}>
|
||||
<div class="card-content">
|
||||
{#if quickLinks.list.length === 0}
|
||||
<p class="msg">Your most viewed stations will appear here</p>
|
||||
{:else}
|
||||
<div class="stations-flex">
|
||||
{#each quickLinks.list as station (station.id)}
|
||||
<div
|
||||
class="btn-container"
|
||||
animate:flip={{ duration: flipDuration }}
|
||||
in:fade|global={{ duration: 200 }}
|
||||
>
|
||||
<Button href={`/board?loc=${station.id}`}
|
||||
><span class="stn-name">{station.id}</span></Button
|
||||
>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</BaseCard>
|
||||
|
||||
<style>
|
||||
.card-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
width: 90%;
|
||||
min-height: 98px;
|
||||
margin: auto;
|
||||
padding: 10px 0 10px 0;
|
||||
}
|
||||
|
||||
.stations-flex {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.1rem 0.5rem;
|
||||
justify-content: center;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.btn-container {
|
||||
display: block;
|
||||
width: fit-content;
|
||||
will-change: transform;
|
||||
}
|
||||
|
||||
.msg {
|
||||
font-size: 1.1rem;
|
||||
font-weight: 600;
|
||||
color: var(--color-title);
|
||||
}
|
||||
|
||||
.stn-name {
|
||||
text-transform: capitalize;
|
||||
}
|
||||
</style>
|
||||
@@ -7,10 +7,16 @@ class NearestStationsState {
|
||||
loading = $state(true);
|
||||
error = $state<string | null>(null);
|
||||
|
||||
private initGeoConfig: PositionOptions = {
|
||||
enableHighAccuracy: false,
|
||||
timeout: 500,
|
||||
maximumAge: Infinity
|
||||
};
|
||||
|
||||
private geoConfig: PositionOptions = {
|
||||
enableHighAccuracy: false,
|
||||
timeout: 30000,
|
||||
maximumAge: 120000
|
||||
timeout: 20000,
|
||||
maximumAge: 30000
|
||||
};
|
||||
|
||||
constructor() {
|
||||
@@ -24,7 +30,7 @@ class NearestStationsState {
|
||||
navigator.geolocation.getCurrentPosition(
|
||||
(pos) => this.handleUpdate(pos.coords.latitude, pos.coords.longitude),
|
||||
(err) => this.handleError(err),
|
||||
this.geoConfig
|
||||
this.initGeoConfig
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -44,6 +44,91 @@
|
||||
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 {
|
||||
/* Brand Colours */
|
||||
--color-brand: #4fd1d1;
|
||||
@@ -58,6 +143,35 @@
|
||||
--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;
|
||||
--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;
|
||||
}
|
||||
}
|
||||
|
||||
body {
|
||||
|
||||
@@ -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();
|
||||
|
||||
60
src/lib/quick-links.svelte.ts
Normal file
60
src/lib/quick-links.svelte.ts
Normal file
@@ -0,0 +1,60 @@
|
||||
export interface QuickLink {
|
||||
id: string;
|
||||
score: number;
|
||||
lastAccessed: number;
|
||||
}
|
||||
|
||||
const RETURNED_LENGTH: number = 6;
|
||||
const MAX_SCORE: number = 50;
|
||||
const MAX_ENTRIES: number = RETURNED_LENGTH * 4;
|
||||
|
||||
class QuickLinksService {
|
||||
#links = $state<QuickLink[]>([]);
|
||||
|
||||
constructor() {
|
||||
if (typeof window !== 'undefined') {
|
||||
const saved = localStorage.getItem('ql');
|
||||
if (saved) {
|
||||
this.#links = JSON.parse(saved);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
get list(): QuickLink[] {
|
||||
return this.#links.slice(0, RETURNED_LENGTH);
|
||||
}
|
||||
|
||||
recordVisit(id: string) {
|
||||
if (id == '') return;
|
||||
const existing = this.#links.find((l) => l.id === id);
|
||||
|
||||
if (existing) {
|
||||
existing.score += 1;
|
||||
existing.lastAccessed = Date.now();
|
||||
} else {
|
||||
this.#links.push({
|
||||
id: id,
|
||||
score: 1,
|
||||
lastAccessed: Date.now()
|
||||
});
|
||||
}
|
||||
|
||||
// Score decay - if MAX_SCORE reached, divide all by two
|
||||
if (this.#links.some((l) => l.score > MAX_SCORE)) {
|
||||
this.#links.forEach((l) => {
|
||||
l.score = Math.max(1, Math.floor(l.score / 2));
|
||||
});
|
||||
}
|
||||
|
||||
// Sort & Prune
|
||||
const sorted = [...this.#links].sort(
|
||||
(a, b) => b.score - a.score || b.lastAccessed - a.lastAccessed
|
||||
);
|
||||
|
||||
this.#links = sorted.slice(0, MAX_ENTRIES);
|
||||
|
||||
localStorage.setItem('ql', JSON.stringify(this.#links));
|
||||
}
|
||||
}
|
||||
|
||||
export const quickLinks = new QuickLinksService();
|
||||
50
src/lib/utils/time.ts
Normal file
50
src/lib/utils/time.ts
Normal file
@@ -0,0 +1,50 @@
|
||||
import type { ApiTrainsTrainDetails } from '@owlboard/owlboard-ts';
|
||||
/**
|
||||
* Converts ISO/JSON time to UK-formatted HH:MM string.
|
||||
* Ensures Europe/London timezone irrespective of browser timezone.
|
||||
*/
|
||||
export function formatUkTime(dateStr: string | Date | undefined): string {
|
||||
if (!dateStr) return '--:--';
|
||||
const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;
|
||||
|
||||
if (isNaN(date.getTime())) return '--:--';
|
||||
|
||||
return date.toLocaleTimeString('en-GB', {
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hour12: false,
|
||||
timeZone: 'Europe/London'
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculates a 'delay' value, in the formats:
|
||||
* RT, 1E, 7L, etc.
|
||||
* @param 'Schedule Location' object
|
||||
* @returns Delay string for departure boards
|
||||
*/
|
||||
export function calculateDelay(loc: ApiTrainsTrainDetails.ServiceLocation): {
|
||||
val: string;
|
||||
type: string;
|
||||
} {
|
||||
const pairs = [
|
||||
{ actual: loc.atd, sched: loc.ptd ?? loc.wtd },
|
||||
{ actual: loc.ata, sched: loc.pta ?? loc.wta },
|
||||
{ actual: loc.atp, sched: loc.wtp }
|
||||
];
|
||||
|
||||
const match = pairs.find((p) => p.actual && p.sched);
|
||||
|
||||
if (!match || !match.actual || !match.sched) return { val: '', type: 'none' };
|
||||
|
||||
const diffMinutes = Math.round((Date.parse(match.actual) - Date.parse(match.sched)) / 60000);
|
||||
|
||||
if (diffMinutes === 0) return { val: 'RT', type: 'ontime' };
|
||||
|
||||
const absDiff = Math.abs(diffMinutes);
|
||||
if (diffMinutes > 0) {
|
||||
return { val: `${absDiff}L`, type: 'late' };
|
||||
} else {
|
||||
return { val: `${absDiff}E`, type: 'early' };
|
||||
}
|
||||
}
|
||||
@@ -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">
|
||||
<img class="err-img" src={stopErr} alt="" role="presentation" width="150" height="210" />
|
||||
|
||||
{#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">
|
||||
|
||||
@@ -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}>
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
<script lang="ts">
|
||||
import LocationBoardCard from '$lib/components/ui/cards/LocationBoardCard.svelte';
|
||||
import HeadcodeSearchCard from '$lib/components/ui/cards/HeadcodeSearchCard.svelte';
|
||||
import NearbyStationsCard from '$lib/components/ui/cards/NearbyStationsCard.svelte';
|
||||
import QuickLinksCard from '$lib/components/ui/cards/QuickLinksCard.svelte';
|
||||
</script>
|
||||
|
||||
<div class="card-container">
|
||||
<LocationBoardCard />
|
||||
<HeadcodeSearchCard />
|
||||
<NearbyStationsCard />
|
||||
<QuickLinksCard />
|
||||
</div>
|
||||
|
||||
<style>
|
||||
|
||||
@@ -1,3 +1,24 @@
|
||||
<script lang="ts">
|
||||
import { untrack } from 'svelte';
|
||||
import { quickLinks } from '$lib/quick-links.svelte';
|
||||
|
||||
let { data } = $props();
|
||||
|
||||
// Update 'QuickLinks'
|
||||
$effect(() => {
|
||||
if (data.BoardLocation) {
|
||||
const id = data.BoardLocation?.c ?? data.BoardLocation?.t;
|
||||
if (id) {
|
||||
// Untrack, as we do not need to handle changes to quickLinks - this is WRITE_ONLY
|
||||
untrack(() => {
|
||||
quickLinks.recordVisit(id);
|
||||
console.log(`QuickLink visit recorded: ${JSON.stringify(data.BoardLocation)}`);
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<section>Live board are not yet implemented on the server</section>
|
||||
|
||||
<style>
|
||||
|
||||
@@ -18,11 +18,13 @@ export const load: PageLoad = async ({ url }) => {
|
||||
});
|
||||
}
|
||||
|
||||
if (locId) {
|
||||
const location = LOCATIONS.find(locId);
|
||||
let BoardLocation;
|
||||
|
||||
if (location) {
|
||||
title = location.n || location.t;
|
||||
if (locId) {
|
||||
BoardLocation = LOCATIONS.find(locId);
|
||||
|
||||
if (BoardLocation) {
|
||||
title = BoardLocation.n || BoardLocation.t || 'Live Arr/Dep';
|
||||
} else {
|
||||
error(404, {
|
||||
message: `Location (${locId.toUpperCase()}) not found`,
|
||||
@@ -32,6 +34,6 @@ export const load: PageLoad = async ({ url }) => {
|
||||
}
|
||||
return {
|
||||
title,
|
||||
location
|
||||
BoardLocation
|
||||
};
|
||||
};
|
||||
|
||||
@@ -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>
|
||||
|
||||
32
src/routes/trains/+page.svelte
Normal file
32
src/routes/trains/+page.svelte
Normal file
@@ -0,0 +1,32 @@
|
||||
<script lang="ts">
|
||||
import NoResults from '$lib/components/ui/NoResults.svelte';
|
||||
import TrainService from '$lib/components/ui/TrainService.svelte';
|
||||
let { data } = $props();
|
||||
</script>
|
||||
|
||||
<h6 style="text-align:center;width=100%;margin:auto;padding-top:1rem;font-size:1rem;">
|
||||
DateSelector
|
||||
</h6>
|
||||
{#if data.results.length === 0}
|
||||
<NoResults message={'No trains found on this date with this headcode.'} />
|
||||
{:else}
|
||||
<div class="result-boxes">
|
||||
{#each data.results as service (service.r)}
|
||||
<TrainService {service} />
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<style>
|
||||
.result-boxes {
|
||||
width: 95%;
|
||||
margin: auto;
|
||||
padding-top: 1rem;
|
||||
padding-bottom: 1rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
gap: 1rem;
|
||||
}
|
||||
</style>
|
||||
62
src/routes/trains/+page.ts
Normal file
62
src/routes/trains/+page.ts
Normal file
@@ -0,0 +1,62 @@
|
||||
import { OwlClient, ApiError, ValidationError } from '$lib/owlClient';
|
||||
import type { ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
|
||||
import type { PageLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: PageLoad = async ({ url }) => {
|
||||
const headcode = url.searchParams.get('h');
|
||||
let dateParam = url.searchParams.get('d');
|
||||
const toc = url.searchParams.get('t') || '';
|
||||
|
||||
const date: string | Date = dateParam === '' || dateParam === null ? new Date() : dateParam;
|
||||
|
||||
if (!headcode) {
|
||||
throw error(400, {
|
||||
message: 'Headcode not provided',
|
||||
owlCode: 'INVALID_DATA'
|
||||
});
|
||||
}
|
||||
|
||||
// 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);
|
||||
|
||||
results = response.data;
|
||||
return {
|
||||
title: headcode.toUpperCase(),
|
||||
results: results
|
||||
};
|
||||
} catch (e: unknown) {
|
||||
if (e instanceof ValidationError) {
|
||||
throw error(400, {
|
||||
message: e.message,
|
||||
owlCode: 'VALIDATION_ERROR'
|
||||
});
|
||||
} else if (e instanceof ApiError) {
|
||||
// Check if NO_RESULTS error, and return empty array if that is the case
|
||||
if (e.code === 'NOT_FOUND') {
|
||||
return {
|
||||
title: headcode.toUpperCase(),
|
||||
results: []
|
||||
};
|
||||
} else {
|
||||
throw error(e.status, {
|
||||
message: e.message,
|
||||
owlCode: 'API_ERROR'
|
||||
});
|
||||
}
|
||||
} else if (e instanceof Error) {
|
||||
throw error(500, {
|
||||
message: e.message,
|
||||
owlCode: 'GEN_ERROR'
|
||||
});
|
||||
} else {
|
||||
throw error(500, {
|
||||
message: 'Unexpected error',
|
||||
owlCode: 'UNKNOWN_ERR'
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
BIN
static/type/jetbrains-mono/JetBrainsMono-Bold.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-Bold.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-BoldItalic.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-BoldItalic.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-ExtraBold.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-ExtraBold.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-ExtraBoldItalic.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-ExtraBoldItalic.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-ExtraLight.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-ExtraLight.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-ExtraLightItalic.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-ExtraLightItalic.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-Italic.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-Italic.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-Light.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-Light.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-LightItalic.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-LightItalic.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-Medium.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-Medium.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-MediumItalic.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-MediumItalic.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-Regular.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-Regular.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-SemiBold.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-SemiBold.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-SemiBoldItalic.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-SemiBoldItalic.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-Thin.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-Thin.woff2
Normal file
Binary file not shown.
BIN
static/type/jetbrains-mono/JetBrainsMono-ThinItalic.woff2
Normal file
BIN
static/type/jetbrains-mono/JetBrainsMono-ThinItalic.woff2
Normal file
Binary file not shown.
Reference in New Issue
Block a user