Adjust policy and error message language to be more friendly.

- Add telemetry consent modal
 - Conditionally load telemetry script
 - Add telemetry consent to settings
 - Update and clarify privacy policy
 - Bump version number

.dockerignore

@@ -0,0 +1,9 @@
+.DS_Store
+node_modules
+/build
+/package
+.env
+.env.*
+!.env.example
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*

.eslintrc.cjs

@@ -1,25 +1,25 @@
 module.exports = {
     root: true,
-  extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'plugin:svelte/recommended', 'prettier'],
+    extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:svelte/recommended", "prettier"],
-  parser: '@typescript-eslint/parser',
+    parser: "@typescript-eslint/parser",
-  plugins: ['@typescript-eslint'],
+    plugins: ["@typescript-eslint"],
     parserOptions: {
-    sourceType: 'module',
+        sourceType: "module",
         ecmaVersion: 2020,
-    extraFileExtensions: ['.svelte']
+        extraFileExtensions: [".svelte"],
     },
     env: {
         browser: true,
         es2017: true,
-    node: true
+        node: true,
     },
     overrides: [
         {
-      files: ['*.svelte'],
+            files: ["*.svelte"],
-      parser: 'svelte-eslint-parser',
+            parser: "svelte-eslint-parser",
             parserOptions: {
-        parser: '@typescript-eslint/parser'
+                parser: "@typescript-eslint/parser",
-      }
+            },
-    }
+        },
-  ]
+    ],
 };

.prettierrc

@@ -1,9 +1,5 @@
 {
-  "useTabs": false,
+    "tabWidth": 4,
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true,
-  "trailingComma": "none",
     "printWidth": 180,
     "plugins": ["prettier-plugin-svelte"],
     "pluginSearchDirs": ["."],

nginx.conf

@@ -1,4 +1,5 @@
 load_module modules/ngx_http_brotli_static_module.so;
+load_module modules/ngx_http_brotli_filter_module.so;
 
 user  nginx;
 worker_processes  auto;
@@ -20,7 +21,7 @@ http {
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
-    access_log  /var/log/nginx/access.log  main;
+    access_log  /dev/stdout  main;
 
     sendfile        on;
 
@@ -31,7 +32,14 @@ http {
     proxy_cache_path /var/cache/nginx keys_zone=owl_cache:20m inactive=24h;
 
     upstream backend {
-        server owlboard-backend:8460;
+        # Within Kubernetes:
+        #server owlboard-backend:8460;
+
+        # External to Kubernetes:
+        #server 172.30.129.19:8460;
+
+        # Within Docker:
+        server backend:8460;
     }
 
     server {
@@ -44,24 +52,33 @@ http {
 
         location / {
             root /usr/share/nginx/html;
-            index index.html;
+            index /index.html;
             gzip_static on;
             brotli_static on;
-            error_page 500 502 503 504 /50x.html;
+            error_page 500 502 503 504 /err/50x.html;
-            try_files $uri $uri.html $uri/ =404;
+            try_files $uri $uri/ $uri.html /index.html;
             add_header Cache-Control "public, no-transform, max-age=1209600";
         }
 
         location /misc/ {
             proxy_pass http://backend;
+            brotli on;
+            brotli_comp_level 6;
+            brotli_types *;
+            gzip on;
+            gzip_comp_level 6;
+            gzip_types *;
         }
 
         location /api/ {
             proxy_pass http://backend;
+            brotli on;
+            brotli_comp_level 6;
+            brotli_types *;
+            gzip on;
+            gzip_comp_level 6;
+            gzip_types *;
             proxy_cache_key $scheme://$host$uri$is_args$query_string;
-            proxy_ignore_headers Cache-Control;
-            proxy_cache_valid 200 2m;  # Evaluate whether 2m or 1m is more appropriate
-            add_header Cache-Control "private, no-transform, max-age=120";
         }
 
     }

package.json

@@ -1,10 +1,11 @@
 {
     "name": "owlboard-svelte",
-  "version": "0.0.1",
+    "version": "2024.11.4",
     "private": true,
     "scripts": {
         "dev": "vite dev",
         "build": "vite build",
+        "postbuild": "npx svelte-sitemap --domain https://owlboard.info --ignore '**/err/**' --ignore '**/reg/submit'",
         "preview": "vite preview",
         "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
         "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
@@ -12,7 +13,7 @@
         "format": "prettier --plugin-search-dir . --write ."
     },
     "devDependencies": {
-    "@owlboard/ts-types": "^0.0.8",
+        "@owlboard/ts-types": "^1.2.1",
         "@sveltejs/adapter-auto": "^2.0.0",
         "@sveltejs/adapter-static": "^2.0.2",
         "@sveltejs/kit": "^1.5.0",
@@ -23,8 +24,11 @@
         "prettier-plugin-svelte": "^2.8.1",
         "svelte": "^3.54.0",
         "svelte-check": "^3.0.1",
+        "svelte-french-toast": "^1.2.0",
+        "svelte-sitemap": "^2.6.0",
         "typescript": "^5.0.0",
-    "vite": "^4.3.0"
+        "vite": "^4.3.0",
+        "@tabler/icons-svelte": "^3.2.0"
     },
     "type": "module"
 }

src/app.css

@@ -1,76 +0,0 @@
-/* FONTS */
-@font-face {
-  font-family: 'firamono';
-  src: url('/font/firamono/firamono-regular.woff2') format('woff2'), url('/font/firamono/firamono-regular.woff') format('woff'),
-    url('/font/firamono/firamono-regular.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-@font-face {
-  font-family: 'firamono';
-  src: url('/font/firamono/firamono-500.woff2') format('woff2'), url('/font/firamono/firamono-500.woff') format('woff'), url('/font/firamono/firamono-500.ttf') format('truetype');
-  font-weight: 500;
-  font-style: normal;
-}
-@font-face {
-  font-family: 'urwgothic';
-  src: url('/font/urwgothic/urwgothic.woff2') format('woff2'), url('/font/urwgothic/urwgothic.woff') format('woff'), url('/font/urwgothic/urwgothic.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-@font-face {
-  font-family: 'urwgothic';
-  src: url('/font/urwgothic/urwgothicDemi.woff2') format('woff2'), url('/font/urwgothic/urwgothicDemi.woff') format('woff'),
-    url('/font/urwgothic/urwgothicDemi.ttf') format('truetype');
-  font-weight: 900;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'ubuntu';
-  src: url('/font/ubuntumono/ubuntumono-regular.woff2') format('woff2'), url('/font/ubuntumono/ubuntumono-regular.woff') format('woff'),
-    url('/font/ubuntumono/ubuntumono-regular.ttf') format('truetype');
-  font-weight: 400;
-  font-style: normal;
-}
-
-/* COLOR VARS */
-:root {
-  --main-bg-color: #404c55;
-  --second-bg-color: #2b343c; /* Use as first arg in radial gradient */
-  --accent-color: #007979;
-  --overlay-color: #3c6f79de;
-  --overlay-color-solid: #3c6f79;
-  --main-text-color: #00b7b7;
-  --second-text-color: #0afdfd;
-  --note-text-color: #9de7ff;
-  --link-color: azure;
-  --box-border-color: ;
-  --link-visited-color: azure;
-  --main-alert-color: #ed6d00;
-  --second-alert-color: #e77f00; /* Use as second arg in radial gradient */
-  --main-warning-color: orange;
-  --board-name-color: #fcfc09;
-}
-
-html {
-  width: 100%;
-  height: 100%;
-}
-
-body {
-  background-color: var(--main-bg-color);
-  background-image: radial-gradient(var(--second-bg-color), var(--main-bg-color));
-  color: var(--second-text-color);
-  font-family: urwgothic, sans-serif;
-  text-align: center;
-  margin: auto;
-  width: 100%;
-  padding-bottom: 65px;
-}
-a {
-  color: var(--link-color);
-}
-button:hover {
-  cursor: pointer;
-}

src/lib/DevBanner.svelte

@@ -3,8 +3,8 @@
 <style>
     #banner {
         width: 200px;
-    background: red;
+        background: rgba(255, 0, 0, 0.5);
-    color: #fff;
+        color: #ffffff7a;
         position: fixed;
         text-align: center;
         top: 25px;
@@ -15,5 +15,6 @@
         -webkit-transform: rotate(45deg);
         transform: rotate(45deg);
         z-index: 100;
+        box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.451);
     }
 </style>

src/lib/Tooltip.svelte

@@ -0,0 +1,59 @@
+<script lang="ts">
+    import { onDestroy } from "svelte";
+    export let text: string;
+
+    let isVisible: boolean = false;
+    let timer: number;
+
+    function showTooltip() {
+        isVisible = true;
+        timer = setTimeout(() => {
+            isVisible = false;
+        }, 2000);
+    }
+
+    function hideTooltip() {
+        isVisible = false;
+        clearTimeout(timer);
+    }
+
+    onDestroy(() => {
+        clearTimeout(timer);
+    });
+</script>
+
+<div class="tooltip" on:touchstart={showTooltip} on:touchend={hideTooltip} on:touchcancel={hideTooltip}>
+    <slot />
+    <span class="tooltiptext">{text}</span>
+</div>
+
+<style>
+    .tooltip {
+        position: relative;
+        display: inline-block;
+        cursor: pointer;
+    }
+
+    .tooltip .tooltiptext {
+        visibility: hidden;
+        width: 120px;
+        background-color: var(--island-button-color);
+        color: #fff;
+        text-align: center;
+        border-radius: 6px;
+        padding: 5px;
+        position: absolute;
+        z-index: 1;
+        top: 50%;
+        right: 125%;
+        transform: translateY(-50%);
+        margin-left: -60px;
+        opacity: 0;
+        transition: opacity 0.5s;
+    }
+
+    .tooltip:hover .tooltiptext {
+        visibility: visible;
+        opacity: 0.8;
+    }
+</style>

src/lib/buttons/LinkButton.svelte

@@ -0,0 +1,35 @@
+<script lang="ts">
+    export let link: string;
+    export let text: string;
+</script>
+
+<a class="link-button" href={link}>{text}</a>
+
+<style>
+    .link-button {
+        color: aliceblue;
+        border: none;
+        border-radius: 20px;
+        text-decoration: none;
+        margin: 5px;
+        background-color: var(--island-button-color);
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
+        padding: 5px 25px;
+        min-width: 40px;
+        width: fit-content;
+        height: 22px;
+        font-size: 16px;
+        font-weight: 400;
+        box-shadow: var(--box-shadow);
+        transition: all 0.3s ease;
+        cursor: pointer;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .link-button:hover {
+        box-shadow: var(--box-shadow-dark);
+        background-color: rgb(45, 45, 45);
+    }
+</style>

src/lib/buttons/ScriptButton.svelte

@@ -0,0 +1,34 @@
+<script lang="ts">
+    export let fn = () => {};
+    export let text: string;
+</script>
+
+<button class="script-button" on:click={fn} on:keypress={fn}>{text}</button>
+
+<style>
+    .script-button {
+        color: aliceblue;
+        border: none;
+        border-radius: 20px;
+        text-decoration: none;
+        margin: 5px;
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
+        background-color: var(--island-button-color);
+        padding: 20px;
+        min-width: 40px;
+        height: 25px;
+        font-size: 16px;
+        font-weight: 400;
+        box-shadow: var(--box-shadow);
+        transition: all 0.3s ease;
+        cursor: pointer;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .script-button:hover {
+        box-shadow: var(--box-shadow-dark);
+        background-color: rgb(45, 45, 45);
+    }
+</style>

src/lib/cards/Card.svelte

@@ -0,0 +1,108 @@
+<script lang="ts">
+    import { fade } from "svelte/transition";
+    import type { CardConfig } from "./Card.types";
+    import { IconHelpCircle, IconRefresh } from "@tabler/icons-svelte";
+    import Tooltip from "$lib/Tooltip.svelte";
+
+    export let config: CardConfig;
+</script>
+
+<div class="card" in:fade={{ duration: 250 }}>
+    <div class="header">
+        <h2 class="title">{config.title}</h2>
+        <div class="actions">
+            {#if config.showHelp}
+                <Tooltip text={config.helpText}>
+                    <button aria-label="Help">
+                        <IconHelpCircle />
+                    </button>
+                </Tooltip>
+            {/if}
+            {#if config.showRefresh}
+                <button class:refreshing={config.refreshing} on:click={config.onRefresh} aria-label="Refresh">
+                    <IconRefresh />
+                </button>
+            {/if}
+        </div>
+    </div>
+    <div class="content">
+        <slot />
+    </div>
+</div>
+
+<style>
+    .card {
+        width: 85%;
+        max-width: 400px;
+        margin: auto;
+        margin-top: 10px;
+        margin-bottom: 20px;
+        padding: 10px 5px 5px 5px;
+        background-color: var(--island-bg-color);
+        border-radius: 10px;
+        box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.29);
+        min-height: 75px;
+    }
+
+    .header {
+        color: var(--island-header-color);
+        font-size: 14px;
+        display: flex;
+        margin: 0;
+        width: 100%;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+        text-shadow: 2px 1px 10px rgba(0, 0, 0, 0.29);
+    }
+
+    .title {
+        flex-grow: 1;
+        text-align: center;
+        margin: 0;
+    }
+
+    .actions {
+        display: flex;
+        position: absolute;
+        top: 5px;
+        right: 0;
+        display: flex;
+        gap: 0px;
+    }
+
+    .refreshing {
+        animation: spin 1.5s linear infinite;
+        transform-origin: 50% 45%;
+    }
+
+    .content {
+        margin-top: 5px;
+    }
+
+    button {
+        cursor: pointer;
+        color: white;
+        background: none;
+        border: none;
+        transition: all 0.3s ease;
+    }
+
+    button:hover {
+        color: var(--island-header-color);
+    }
+
+    @keyframes spin {
+        0% {
+            transform: rotate(0deg);
+            color: white;
+        }
+        50% {
+            color: rgb(185, 185, 255);
+        }
+        100% {
+            transform: rotate(-360deg);
+            color: white;
+        }
+    }
+</style>

src/lib/cards/Card.types.ts

@@ -0,0 +1,19 @@
+interface CardConfig {
+    title: string;
+    showHelp: boolean;
+    showRefresh: boolean;
+    helpText: string;
+    onRefresh: () => void;
+    refreshing: boolean;
+}
+
+interface LookupCardConfig {
+    title: string;
+    formAction: string;
+    maxLen: number;
+    placeholder: string;
+    helpText: string;
+    fieldName: string;
+}
+
+export type {CardConfig, LookupCardConfig}

src/lib/cards/FindByHeadcodeCard.svelte

@@ -0,0 +1,14 @@
+<script lang="ts">
+    import LookupCard from "./LookupCard.svelte";
+
+    const LookupCardConfig = {
+            title: "Find By Headcode",
+            helpText: "",
+            formAction: "/train",
+            placeholder: "enter headcode",
+            maxLen: 4,
+            fieldName: "headcode",
+        }
+</script>
+
+<LookupCard config={LookupCardConfig} />

src/lib/cards/LookupCard.svelte

@@ -0,0 +1,64 @@
+<script lang="ts">
+    import Card from "./Card.svelte";
+    import type { CardConfig, LookupCardConfig } from "./Card.types";
+
+    export let config: LookupCardConfig;
+
+    let upstreamConfig: CardConfig = {
+        title: config.title,
+        showHelp: false, // If enabled without showRefresh, cards will be shifted to left!
+        showRefresh: false,
+        helpText: config.helpText,
+        onRefresh: () => {},
+        refreshing: false,
+    };
+</script>
+
+<Card config={upstreamConfig}>
+    <form action={config.formAction}>
+        <input type="text" name={config.fieldName} placeholder={config.placeholder} maxlength={config.maxLen} autocomplete="off" />
+        <br />
+        <button type="submit">Submit</button>
+    </form>
+</Card>
+
+<style>
+    input {
+        margin: 4px;
+        width: 75%;
+        max-width: 250px;
+        text-align: center;
+        text-transform: uppercase;
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
+        font-size: 15px;
+        height: 30px;
+        border: none;
+        border-radius: 20px;
+        box-shadow: var(--box-shadow);
+        transition: all 0.3s ease;
+    }
+
+    button {
+        margin: 5px;
+        background-color: var(--island-button-color);
+        color: white;
+        border: none;
+        border-radius: 20px;
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
+        font-size: 16px;
+        width: 40%;
+        max-width: 200px;
+        height: 30px;
+        box-shadow: var(--box-shadow);
+        transition: all 0.3s ease;
+    }
+
+    input:hover {
+        box-shadow: var(--box-shadow-dark);
+    }
+
+    button:hover {
+        background-color: rgb(45, 45, 45);
+        box-shadow: var(--box-shadow-dark);
+    }
+</style>

src/lib/cards/NearToMeCard.svelte

@@ -0,0 +1,107 @@
+<script lang="ts">
+    import { getCurrentLocation } from "$lib/scripts/getLocation";
+    import toast from "svelte-french-toast";
+    import Card from "./Card.svelte";
+    import type { CardConfig } from "./Card.types";
+    import type { NearestStationResponse } from "@owlboard/ts-types";
+    import { uuid } from "$lib/stores/uuid";
+    import { location } from "$lib/stores/location";
+    import InLineLoading from "$lib/navigation/InLineLoading.svelte";
+    import { apiGet } from "$lib/scripts/apiFetch";
+    import { onMount } from "svelte";
+    import { nearToMeCache } from "$lib/stores/nearToMeCache";
+    import LinkButton from "$lib/buttons/LinkButton.svelte";
+    import ScriptButton from "$lib/buttons/ScriptButton.svelte";
+
+    let errorMessage: string;
+    let stations: NearestStationResponse[] = [];
+    let blockLoading: boolean = true;
+
+    let config: CardConfig = {
+        title: "Near to Me",
+        showHelp: true,
+        showRefresh: true,
+        helpText: "Your location may not be accurate on desktop and laptop devices.",
+        onRefresh: getNearestStations,
+        refreshing: false,
+    };
+
+    function turnOnLocation() {
+        location.set(true);
+        getCurrentLocation();
+        toast.success("Done\nTo disable location, go to settings");
+    }
+
+    async function getNearestStations() {
+        // Get location, then fetch nearest stations and push to `stations` variable
+        config.refreshing = true;
+        const currentLocation = await getCurrentLocation();
+        const apiPath: string = `/api/v2/live/station/nearest/${currentLocation.latitude}/${currentLocation.longitude}`;
+        try {
+            const apiResponse = (await apiGet(apiPath)) as NearestStationResponse[];
+            stations = apiResponse;
+            nearToMeCache.set(apiResponse);
+        } catch (err) {
+            errorMessage = err as string;
+        } finally {
+            config.refreshing = false;
+        }
+    }
+
+    onMount(() => {
+        if ($location) {
+            if (!$uuid || $uuid === "null") {
+                errorMessage = "Register to use this feature";
+            } else {
+                if ($nearToMeCache.length) {
+                    stations = $nearToMeCache;
+                }
+                getNearestStations();
+            }
+        }
+        blockLoading = false;
+    });
+</script>
+
+<Card {config}>
+    {#if blockLoading}
+        <InLineLoading />
+    {:else}
+    <div id="buttons">
+    {#if !$uuid || $uuid === "null"}
+        <LinkButton text="Register to use this feature" link="/more/reg" />
+    {:else if $location}
+        {#if !stations.length}
+            {#if errorMessage}
+                <p>{errorMessage}</p>
+            {:else}
+                <InLineLoading />
+            {/if}
+        {:else}
+            {#each stations as station}
+                <LinkButton text={`${station.NLCDESC} - ${station.miles}mi`} link={`/ldb?station=${station["3ALPHA"]}`} />
+            {/each}
+        {/if}
+    {:else}
+        <ScriptButton text={"Turn on Location"} fn={turnOnLocation} />
+    {/if}
+    </div>
+    {/if}
+</Card>
+
+<style>
+    #buttons {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+        align-items: center;
+        width: 95%;
+        margin: auto;
+        padding-top: 5px;
+    }
+
+    p {
+        text-align: center;
+        margin: auto;
+    }
+</style>

src/lib/cards/QuickLinkCard.svelte

@@ -0,0 +1,45 @@
+<script lang="ts">
+    import Card from "./Card.svelte";
+    import type { CardConfig } from "./Card.types";
+    import { ql } from "$lib/stores/quick-links";
+    import LinkButton from "$lib/buttons/LinkButton.svelte";
+
+    let upstreamProps: CardConfig = {
+        title: "Quick Links",
+        showHelp: false,
+        showRefresh: false,
+        helpText: "",
+        onRefresh: () => {},
+        refreshing: false,
+    };
+</script>
+
+<Card config={upstreamProps}>
+    <div class="quick-links">
+    {#if !$ql.length}
+        <LinkButton text={"Add Quick Links"} link={"/more/settings"} />
+    {:else}
+        
+            {#each $ql as link}
+                {#if link.length === 3}
+                    <LinkButton text={link.toUpperCase()} link={`/ldb?station=${link.toLowerCase()}`} />
+                {:else if link.length === 4}
+                    <LinkButton text={link.toUpperCase()} link={`/train?headcode=${link.toLowerCase()}`} />
+                {/if}
+            {/each}
+        
+    {/if}
+    </div>
+</Card>
+
+<style>
+    .quick-links {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+        align-items: center;
+        width: 90%;
+        margin: auto;
+        padding-top: 5px;
+    }
+</style>

src/lib/islands/input-island-form.svelte

@@ -1,45 +0,0 @@
-<script lang="ts">
-  import Island from '$lib/islands/island.svelte';
-  export let variables = {
-    title: 'Uninitialised',
-    action: '/',
-    placeholder: 'Uninitialised',
-    queryName: 'uninitiailsed'
-  };
-</script>
-
-<Island {variables}>
-  <form action={variables.action}>
-    <input class="form-input" type="text" id="input-headcode" name={variables.queryName} placeholder={variables.placeholder} autocomplete="off" />
-    <br />
-    <button type="submit">Submit</button>
-  </form>
-</Island>
-
-<style>
-  .form-input {
-    width: 75%;
-    height: 32px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    border-radius: 50px;
-    border: none;
-    text-align: center;
-    font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
-    text-transform: uppercase;
-    font-size: 15px;
-  }
-  button {
-    width: 50%;
-    margin-bottom: 5px;
-    margin-top: 5px;
-    border: none;
-    border-radius: 20px;
-    padding: 5px;
-    font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
-    font-size: 16px;
-    font-weight: 400;
-    background-color: var(--main-bg-color);
-    color: var(--link-color);
-  }
-</style>

src/lib/islands/island.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { fade } from 'svelte/transition';
+    import { fade } from "svelte/transition";
 
-  export let variables = { title: '' };
+    export let variables = { title: "" };
 </script>
 
 <div in:fade={{ duration: 250 }}>
@@ -11,10 +11,10 @@
 
 <style>
     span {
-    font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
         font-weight: 600;
         font-size: 20px;
-    color: var(--main-text-color);
+        color: var(--island-header-color);
     }
     div {
         width: 85%;
@@ -22,7 +22,8 @@
         margin: auto;
         margin-top: 25px;
         padding: 10px;
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-color);
         border-radius: 10px;
+        box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.29);
     }
 </style>

src/lib/islands/overlay-island.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { fade } from 'svelte/transition';
+    import { fade } from "svelte/transition";
 
-  export let variables = { title: '' };
+    export let variables = { title: "" };
 </script>
 
 <div in:fade={{ duration: 150 }} out:fade={{ duration: 150 }}>
@@ -11,8 +11,8 @@
 
 <style>
     span {
-    font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
-    color: var(--main-text-color);
+        color: var(--island-header-color);
         font-weight: 600;
         font-size: 20px;
     }
@@ -23,13 +23,13 @@
         transform: translateY(-50%) translateX(-50%);
         width: 85%;
         height: auto;
-    max-height: 85vh;
+        max-height: 75vh;
         overflow-y: auto;
         max-width: 400px;
         margin: auto;
         margin-top: 25px;
         padding: 10px;
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-solid);
         border-radius: 10px;
         z-index: 1000;
     }

src/lib/islands/quick-link-island.svelte

@@ -1,53 +0,0 @@
-<script lang="ts">
-  import Island from '$lib/islands/island.svelte';
-  import { ql } from '$lib/stores/quick-links';
-  export let variables = {
-    title: 'Quick Links'
-  };
-</script>
-
-<Island {variables}>
-  {#if $ql.length === 0}
-    <p>Go to <a href="/more/settings">settings</a> to add your Quick Links</p>
-  {/if}
-  <div class="buttons">
-    {#each $ql as link}
-      {#if link.length === 3}
-        <a class="link" href="/ldb?station={link}">
-          {link.toUpperCase()}
-        </a>
-      {:else if link.length === 4}
-        <a class="link" href="/train?headcode={link}">
-          {link.toUpperCase()}
-        </a>
-      {/if}
-    {/each}
-  </div>
-</Island>
-
-<style>
-  .buttons {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    align-items: center;
-    width: 90%;
-    margin: auto;
-    padding-top: 5px;
-  }
-  .link {
-    flex: 1;
-    width: 20%;
-    min-width: 50px;
-    margin: 5px;
-    border: none;
-    border-radius: 20px;
-    padding: 5px;
-    font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
-    font-size: 16px;
-    font-weight: 400;
-    text-decoration: none;
-    background-color: var(--main-bg-color);
-    color: var(--link-color);
-  }
-</style>

src/lib/islands/quick-link-set-island.svelte

@@ -1,8 +1,9 @@
 <script lang="ts">
-  import Island from '$lib/islands/island.svelte';
+    import Island from "$lib/islands/island.svelte";
-  import { ql } from '$lib/stores/quick-links';
+    import { ql } from "$lib/stores/quick-links";
+    import toast from "svelte-french-toast";
     export let variables = {
-    title: 'Quick Links'
+        title: "Quick Links",
     };
 
     let qlData: string[] = [];
@@ -11,44 +12,52 @@
         console.log(qlData);
     }
 
-  let saveButton = 'Save';
+    let saveButton = "Save";
 
     async function timeout(ms: number): Promise<any> {
         return new Promise((resolve) => setTimeout(resolve, ms));
     }
 
+    function save() {
+        toast.promise(saveQl(), {
+            loading: "Saving...",
+            success: "Quick Links saved!",
+            error: "Failed to save.",
+        });
+    }
+
     async function saveQl() {
         // Fetch the content of all text entries within the island then run ql.set([ARRAY OF INPUT CONTENT])
-    const inputs = document.getElementsByClassName('qlInput');
+        const inputs = document.getElementsByClassName("qlInput");
         let inputLinks: string[] = [];
         for (let item of inputs) {
             let text = (<HTMLInputElement>item)?.value;
-      if (text !== '') {
+            if (text !== "") {
                 inputLinks.push(text);
             }
         }
         console.log(inputLinks);
         ql.set(inputLinks);
-    saveButton = '&#10004;';
+        await timeout(1000);
-    await timeout(3000);
+        saveButton = "Saved";
-    saveButton = 'Saved';
     }
 
     function clearQl() {
         ql.set([]);
-    saveButton = 'Saved';
+        saveButton = "Saved";
+        toast.success("Cleared Quick Links.");
     }
 
     function addQlBox() {
-    saveButton = 'Save';
+        saveButton = "Save";
-    const updatedQl = [...$ql, ''];
+        const updatedQl = [...$ql, ""];
         $ql = updatedQl;
         ql.set(updatedQl);
     }
 
     function handleClick(event: any) {
         // Handle the click event here
-    console.log('Island Clicked');
+        console.log("Island Clicked");
         // You can access the `variables` passed to the Island component here if needed
     }
 </script>
@@ -64,7 +73,7 @@
         {/each}
         <button on:click={addQlBox} id="qlAdd">+</button>
     </div>
-  <button on:click={saveQl}>{@html saveButton}</button>
+    <button on:click={save}>{@html saveButton}</button>
     <button on:click={clearQl}>Clear</button>
 </Island>
 
@@ -92,12 +101,13 @@
         border: none;
         border-radius: 20px;
         padding: 5px;
-    font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
         font-size: 16px;
         font-weight: 400;
         text-decoration: none;
         text-align: center;
         text-transform: uppercase;
+        box-shadow: var(--box-shadow);
     }
     button {
         width: 30%;
@@ -106,10 +116,11 @@
         border: none;
         border-radius: 20px;
         padding: 5px;
-    font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
         font-size: 16px;
         font-weight: 400;
-    background-color: var(--main-bg-color);
+        background-color: var(--island-button-color);
-    color: var(--link-color);
+        color: var(--island-link-color);
+        box-shadow: var(--box-shadow);
     }
 </style>

src/lib/islands/result-island.svelte

@@ -1,31 +0,0 @@
-<script lang="ts">
-  import Island from '$lib/islands/island.svelte';
-
-  interface resultObj {
-    results: boolean;
-    title: string;
-    resultLines: string[];
-  }
-
-  export let resultObject: resultObj = {
-    results: true,
-    title: '',
-    resultLines: []
-  };
-
-  let variables = {
-    title: resultObject.title
-  };
-</script>
-
-<Island {variables}>
-  {#each resultObject.resultLines as line}
-    <p>{line}</p>
-  {/each}
-</Island>
-
-<style>
-  p {
-    color: white;
-  }
-</style>

src/lib/ldb/common/nrcc/alert-bar.svelte

@@ -0,0 +1,106 @@
+<script>
+    import { IconAlertCircle } from "@tabler/icons-svelte";
+    import { fly } from "svelte/transition";
+
+    export let alerts = [];
+    $: uniqueAlerts = [...new Set(alerts)];
+
+    let displayAlerts = false;
+
+    async function alertsToggle() {
+        displayAlerts = !displayAlerts;
+    }
+
+    function numberAsWord(number = 0) {
+        const words = ["zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"];
+        let word = words[number];
+        if (word) {
+            return word;
+        }
+        return number;
+    }
+</script>
+
+<div id="bar" on:click={alertsToggle} on:keypress={alertsToggle}>
+    <span class="image"><IconAlertCircle /></span>
+    {#if uniqueAlerts.length == 1}
+        <p id="bartext">There is one active alert</p>
+    {:else}
+        <p id="bartext">
+            There are {numberAsWord(uniqueAlerts.length)} active alerts
+        </p>
+    {/if}
+    <p id="arrow" class:displayAlerts>V</p>
+</div>
+{#if displayAlerts}
+    <div id="alerts" in:fly={{ y: -200, duration: 500 }} out:fly={{ y: -200, duration: 800 }}>
+        {#each uniqueAlerts as msg}
+            <p class="alert">{@html msg}</p>
+        {/each}
+    </div>
+{/if}
+
+<style>
+    #bar {
+        position: relative;
+        margin-top: 0;
+        padding: 0;
+        width: 100%;
+        height: 40px;
+        background-color: var(--main-alert-color);
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        z-index: 2;
+    }
+    .image {
+        margin-left: 15px;
+        margin-top: 4px;
+    }
+    #bartext {
+        color: white;
+        margin: auto;
+        font-weight: 600;
+        margin: 0 0 0 0;
+        padding: 0;
+    }
+    #arrow {
+        color: white;
+        font-family: Arial, Helvetica, sans-serif;
+        font-weight: 900;
+        border: none;
+        margin-right: 15px;
+        background-color: transparent;
+        transition-duration: 500ms;
+        transition-delay: 00ms;
+    }
+    #arrow:focus {
+        background-color: transparent;
+    }
+    #alerts {
+        position: absolute;
+        background-color: var(--main-alert-color);
+        opacity: 0.9;
+        width: 100%;
+        max-height: 80vh;
+        overflow-y: auto;
+        overflow-x: clip;
+        left: 0;
+        top: 89px;
+        z-index: 1;
+    }
+    .alert {
+        color: white;
+        text-align: center;
+        width: 80%;
+        margin: auto;
+        margin-top: 10px;
+        margin-bottom: 10px;
+        font-weight: 600;
+    }
+    .displayAlerts {
+        transition-duration: 500ms;
+        transition-delay: 400ms;
+        transform: rotate(180deg);
+    }
+</style>

src/lib/ldb/nrcc/alert-bar.svelte

@@ -1,118 +0,0 @@
-<script>
-  import { fly } from 'svelte/transition';
-
-  export let alerts = [];
-  $: uniqueAlerts = [...new Set(alerts)];
-
-  let displayAlerts = false;
-
-  async function alertsToggle() {
-    displayAlerts = !displayAlerts;
-  }
-
-  function numberAsWord(number) {
-    const words = ['zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight'];
-    let word = words[number];
-    if (word) {
-      return word;
-    }
-    return number;
-  }
-</script>
-
-<div id="block"><!--Prevent content slipping underneath the bar--></div>
-<div id="bar" on:click={alertsToggle} on:keypress={alertsToggle}>
-  <img src="/images/navigation/alert.svg" alt="" />
-  {#if uniqueAlerts.length == 1}
-    <p id="bartext">There is one active alert</p>
-  {:else if uniqueAlerts.length > 1}
-    <p id="bartext">
-      There are {numberAsWord(uniqueAlerts.length)} active alerts
-    </p>
-  {:else}
-    <p id="bartext">There are no active alerts</p>
-  {/if}
-  <p id="arrow" class:displayAlerts>V</p>
-</div>
-{#if displayAlerts}
-  <div id="alerts" in:fly={{ y: -200, duration: 500 }} out:fly={{ y: -200, duration: 800 }}>
-    {#each uniqueAlerts as msg}
-      <p class="alert">{@html msg}</p>
-    {/each}
-  </div>
-{/if}
-
-<style>
-  #block {
-    height: 40px;
-  }
-  #bar {
-    width: 100%;
-    height: 40px;
-    background-color: var(--main-alert-color);
-    opacity: 1;
-    position: fixed;
-    width: 100%;
-    top: 50px;
-    left: 0px;
-    z-index: 10;
-  }
-  img {
-    height: 25px;
-    width: 25px;
-    position: absolute;
-    left: 8px;
-    top: 8px;
-    margin: 0;
-    padding: 0;
-  }
-  #bartext {
-    color: white;
-    margin: auto;
-    font-weight: 600;
-    margin-top: 8px;
-    margin-bottom: 0px;
-    padding: 0px;
-  }
-  #arrow {
-    color: white;
-    font-family: Arial, Helvetica, sans-serif;
-    font-weight: 900;
-    position: absolute;
-    margin-top: 0;
-    right: 15px;
-    top: 11px;
-    border: none;
-    background-color: transparent;
-    transition-duration: 500ms;
-    transition-delay: 00ms;
-  }
-  #arrow:focus {
-    background-color: transparent;
-  }
-  #alerts {
-    position: fixed;
-    background-color: var(--main-alert-color);
-    opacity: 0.9;
-    width: 100%;
-    max-height: 80vh;
-    overflow-y: auto;
-    overflow-x: clip;
-    left: 0;
-    top: 89px;
-  }
-  .alert {
-    color: white;
-    text-align: center;
-    width: 80%;
-    margin: auto;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    font-weight: 600;
-  }
-  .displayAlerts {
-    transition-duration: 500ms;
-    transition-delay: 400ms;
-    transform: rotate(180deg);
-  }
-</style>

src/lib/ldb/public-ldb.svelte

@@ -1,11 +1,15 @@
 <script>
-  export let station = '';
+    export let station = "";
-  export let title = 'Loading...';
+    export let title = "Loading...";
-  import { onMount } from 'svelte';
+    import { onMount } from "svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Loading from "$lib/navigation/loading.svelte";
-  import OverlayIsland from '$lib/islands/overlay-island.svelte';
+    import OverlayIsland from "$lib/islands/overlay-island.svelte";
-  import AlertBar from '$lib/ldb/nrcc/alert-bar.svelte';
+    import AlertBar from "$lib/ldb/common/nrcc/alert-bar.svelte";
-  import Island from '$lib/islands/island.svelte';
+    import Island from "$lib/islands/island.svelte";
+    import { getApiUrl } from "$lib/scripts/upstream";
+    import TimeBar from "$lib/navigation/TimeBar.svelte";
+    import { IconBus, IconSailboat } from "@tabler/icons-svelte";
+    import toast from "svelte-french-toast";
 
     let requestedStation;
     $: requestedStation = station;
@@ -55,12 +59,12 @@
         isLoading = true; // Set loading state
         try {
             console.log(`Requested Station: ${requestedStation}`);
-      const data = await fetch(`https://owlboard.info/api/v2/live/station/${requestedStation}/public`);
+            const data = await fetch(`${getApiUrl()}/api/v2/live/station/${requestedStation}/public`);
             jsonData = await data.json();
         } catch (error) {
-      console.error('Error fetching data:', error);
+            console.error("Error fetching data:", error);
             dataExists = false;
-      title = 'Not Found';
+            title = "Not Found";
         } finally {
             isLoading = false; // Clear loading state
         }
@@ -71,38 +75,38 @@
         let output;
         let change;
         switch (string) {
-      case 'Delayed':
+            case "Delayed":
-        output = 'LATE';
+                output = "LATE";
-        change = 'changed';
+                change = "changed";
                 break;
-      case 'Cancelled':
+            case "Cancelled":
-        output = 'CANC';
+                output = "CANC";
-        change = 'cancelled';
+                change = "cancelled";
                 break;
-      case 'On Time':
+            case "On Time":
-      case 'On time':
+            case "On time":
-        output = 'RT';
+                output = "RT";
-        change = '';
+                change = "";
                 break;
-      case '':
+            case "":
-        output = '-';
+                output = "-";
-        change = '';
+                change = "";
                 break;
             case undefined:
-        output = '-';
+                output = "-";
-        change = '';
+                change = "";
                 break;
-      case 'No report':
+            case "No report":
-        output = '-';
+                output = "-";
-        change = '';
+                change = "";
                 break;
-      case 'undefined':
+            case "undefined":
                 output = false;
-        change = '';
+                change = "";
                 break;
             default:
                 output = string;
-        change = 'changed';
+                change = "changed";
         }
         return { data: output, changed: change };
     }
@@ -140,6 +144,7 @@
     }
 
     onMount(() => {
+        toast("Register for more detailed departure boards")
         if (requestedStation && jsonData === null) {
             fetchData();
         }
@@ -150,10 +155,11 @@
     <AlertBar {alerts} />
 {/if}
 
+<TimeBar updatedTime={dataAge} />
+
 {#if isLoading}
     <Loading />
 {:else if dataAge}
-  <p id="timestamp">Updated: {dataAge.toLocaleTimeString()}</p>
     {#if services.length}
         <table class="ldbTable">
             <tr>
@@ -169,19 +175,19 @@
                 <tr>
                     <td class="origdest from" on:click={loadService(service.serviceID)} on:keypress={loadService(service.serviceID)}>
                         {#if Array.isArray(service.origin?.location)}
-              {service.origin.location[0]['locationName'] + ' & ' + service.origin.location[1]['locationName']}
+                            {service.origin.location[0]["locationName"] + " & " + service.origin.location[1]["locationName"]}
                         {:else}
-              {service.origin?.location?.locationName || ''}
+                            {service.origin?.location?.locationName || ""}
                         {/if}
                     </td>
                     <td class="origdest to" on:click={loadService(service.serviceID)} on:keypress={loadService(service.serviceID)}>
                         {#if Array.isArray(service.destination?.location)}
-              {service.destination.location[0]['locationName'] + ' & ' + service.destination.location[0]['locationName']}
+                            {service.destination.location[0]["locationName"] + " & " + service.destination.location[0]["locationName"]}
                         {:else}
-              {service.destination?.location?.locationName || ''}
+                            {service.destination?.location?.locationName || ""}
                         {/if}
                     </td>
-          <td class="plat">{service.platform || '-'}</td>
+                    <td class="plat">{service.platform || "-"}</td>
                     <td class="time">{parseTime(service.sta).data}</td>
                     <td class="time {parseTime(service.eta).changed}">{parseTime(service.eta).data}</td>
                     <td class="time">{parseTime(service.std).data}</td>
@@ -191,9 +197,9 @@
                 <tr
                     ><td colspan="7">
                         <p class="service-detail">
-              A {service.operator || 'Unknown'} service
+                            A {service.operator || "Unknown"} service
-              {#if service['length']}
+                            {#if service["length"]}
-                with {service['length'] || 'some'} coaches
+                                with {service["length"] || "some"} coaches
                             {/if}
                         </p>
                         {#if service.delayReason}
@@ -211,7 +217,7 @@
     {/if}
     {#if busServices.length}
         <br />
-    <img class="transport-mode" src="/images/transport-modes/bus.svg" alt="Bus services" /><br />
+        <IconBus /><br />
         <span class="table-head-text">Bus Services</span>
         <table class="ldbTable">
             <tr>
@@ -224,9 +230,11 @@
             </tr>
             {#each busServices as service}
                 <tr>
-          <td class="origdest from" on:click={loadBusService(service.serviceID)} on:keypress={loadBusService(service.serviceID)}>{service.origin?.location?.locationName || ''}</td>
+                    <td class="origdest from" on:click={loadBusService(service.serviceID)} on:keypress={loadBusService(service.serviceID)}
+                        >{service.origin?.location?.locationName || ""}</td
+                    >
                     <td class="origdest to" on:click={loadBusService(service.serviceID)} on:keypress={loadBusService(service.serviceID)}
-            >{service.destination?.location?.locationName || ''}</td
+                        >{service.destination?.location?.locationName || ""}</td
                     >
                     <td class="time">{parseTime(service.sta).data}</td>
                     <td class="time {parseTime(service.eta).changed}">{parseTime(service.eta).data}</td>
@@ -237,7 +245,7 @@
                 <tr
                     ><td colspan="7">
                         <p class="service-detail">
-              A {service.operator || 'Unknown'} service
+                            A {service.operator || "Unknown"} service
                         </p>
                         {#if service.delayReason}
                             <p class="service-detail">{service.delayReason}</p>
@@ -252,7 +260,7 @@
     {/if}
     {#if ferryServices.length}
         <br />
-    <img class="transport-mode" src="/images/transport-modes/ferry.svg" alt="Bus services" /><br />
+        <IconSailboat /><br />
         <span class="table-head-text">Ferry Services</span>
         <table class="ldbTable">
             <tr>
@@ -265,8 +273,8 @@
             </tr>
             {#each ferryServices as service}
                 <tr>
-          <td class="origdest from">{service.origin?.location?.locationName || ''}</td>
+                    <td class="origdest from">{service.origin?.location?.locationName || ""}</td>
-          <td class="origdest to">{service.destination?.location?.locationName || ''}</td>
+                    <td class="origdest to">{service.destination?.location?.locationName || ""}</td>
                     <td class="time">{parseTime(service.sta).data}</td>
                     <td class="time {parseTime(service.eta).changed}">{parseTime(service.eta).data}</td>
                     <td class="time">{parseTime(service.std).data}</td>
@@ -317,9 +325,12 @@
                             <td>{serviceDetail.previousCallingPoints.callingPointList.callingPoint.locationName}</td>
                             <td>{serviceDetail.previousCallingPoints.callingPointList.callingPoint.st}</td>
                             <td
-                class="time {parseTime(serviceDetail.previousCallingPoints.callingPointList.callingPoint.at || serviceDetail.previousCallingPoints.callingPointList.callingPoint.et)
+                                class="time {parseTime(
-                  .changed}"
+                                    serviceDetail.previousCallingPoints.callingPointList.callingPoint.at || serviceDetail.previousCallingPoints.callingPointList.callingPoint.et
-                >{parseTime(serviceDetail.previousCallingPoints.callingPointList.callingPoint.at || serviceDetail.previousCallingPoints.callingPointList.callingPoint.et).data}</td
+                                ).changed}"
+                                >{parseTime(
+                                    serviceDetail.previousCallingPoints.callingPointList.callingPoint.at || serviceDetail.previousCallingPoints.callingPointList.callingPoint.et
+                                ).data}</td
                             >
                         </tr>
                     {/if}
@@ -354,11 +365,6 @@
 {/if}
 
 <style>
-  #timestamp {
-    margin: auto;
-    text-align: left;
-    font-size: 14px;
-  }
     .ldbTable {
         width: 100%;
         min-width: 300px;
@@ -393,9 +399,6 @@
         .transport-mode {
             width: 50px;
         }
-    #timestamp {
-      font-size: 16px;
-    }
     }
     @media (min-width: 1000px) {
         table {

src/lib/ldb/staff/fetch.ts

@@ -0,0 +1,39 @@
+// Fetches StaffLDB Data, correctly formats DATE fields and returns the data
+
+import { getApiUrl } from "$lib/scripts/upstream";
+import { uuid } from "$lib/stores/uuid";
+import type { ApiResponse, StaffLdb } from "@owlboard/ts-types";
+
+// Fetch StaffLDB Data, and returns the data after hydration (convert date types etc.)
+export async function fetchStaffLdb(station: string): Promise<ApiResponse<StaffLdb>> {
+    const url = `${getApiUrl()}/api/v2/live/station/${station}/staff`;
+
+    let uuid_value: string = "";
+    const unsubscribe = uuid.subscribe((value) => {
+        uuid_value = value;
+    });
+
+    const fetchOpts = {
+        method: "GET",
+        headers: {
+            uuid: uuid_value,
+        },
+    };
+    const res = await fetch(url, fetchOpts);
+    unsubscribe();
+    const resJs = await res.json();
+    return parseFormat(JSON.stringify(resJs));
+}
+
+// Parse dates within the JSON response
+function parseFormat(jsonString: any): ApiResponse<StaffLdb> {
+    return JSON.parse(jsonString, (key, value) => {
+        if (typeof value === "string") {
+            const dateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/;
+            if (dateRegex.test(value)) {
+                return new Date(value);
+            }
+        }
+        return value;
+    });
+}

src/lib/ldb/staff/staff-ldb-dev.svelte

@@ -1,135 +0,0 @@
-<script lang="ts">
-  export let station = '';
-  export let title = 'Loading...';
-  import { onMount } from 'svelte';
-  import AlertBar from '$lib/ldb/nrcc/alert-bar.svelte';
-  import StaffTrainDetail from '$lib/ldb/staff/train-detail.svelte';
-  import Loading from '$lib/navigation/loading.svelte';
-  import { uuid } from '$lib/stores/uuid';
-  import Island from '$lib/islands/island.svelte';
-  import TableGeneratorDev from './table/table-generator_dev.svelte';
-
-  const TableGenerator = TableGeneratorDev;
-
-  import type { StaffLdb, NrccMessage, TrainServices, ApiResponse } from '@owlboard/ts-types';
-
-  let jsonData: ApiResponse<StaffLdb>;
-  let isLoading = true;
-  let isErr = false;
-  let errMsg: string;
-  let alerts: NrccMessage[];
-  let detail = { show: false, rid: '', uid: '', headcode: '' };
-
-  $: {
-    if (isLoading) {
-      title = 'Loading...';
-    } else {
-      title = station;
-    }
-  }
-
-  async function fetchData() {
-    isLoading = true; // Set loading state
-    try {
-      console.log(`Requested Station: ${requestedStation}`);
-      const url = `https://owlboard.info/api/v2/live/station/${requestedStation}/staff`;
-      const opt = {
-        method: 'GET',
-        headers: {
-          uuid: $uuid
-        }
-      };
-      const data = await fetch(url, opt);
-      const json = await data.json();
-      if (json.ERROR === 'NOT_FOUND') {
-        isErr = true;
-        errMsg = 'Unable to find this station';
-      } else {
-        jsonData = json;
-      }
-    } catch (error) {
-      console.error('Error fetching data:', error);
-      isLoading = false;
-      isErr = true;
-      errMsg = 'Connection error, try again later';
-    } finally {
-      isLoading = false; // Clear loading state
-    }
-  }
-
-  function showDetail(rid = '', uid = '', tid = '') {
-    detail = {
-      rid: rid,
-      uid: uid,
-      headcode: tid,
-      show: true
-    };
-  }
-
-  function hideDetails() {
-    detail = {
-      rid: '',
-      uid: '',
-      headcode: '',
-      show: false
-    };
-  }
-</script>
-
-{#key detail}
-  {#if detail.show}
-    <StaffTrainDetail {detail} close={hideDetails} />
-  {/if}
-{/key}
-
-{#if isLoading}
-  <Loading />
-{:else if isErr}
-  <Island>
-    <p><strong>{errMsg}</strong></p>
-  </Island>
-{:else}
-  {#if alerts.length}
-    <AlertBar {alerts} />
-  {/if}
-  <p class="dataTime">Data from: {dataAge.toLocaleString([])}</p>
-  {#if trainServices && trainServices.length}
-    <TableGenerator services={trainServices} click={showDetail} />
-  {:else}
-    <p id="noservices">There are no scheduled train services in the next two hours</p>
-  {/if}
-  {#if busServices && busServices.length}
-    <img class="transport-mode-image" src="/images/transport-modes/bus.svg" alt="" />
-    <br />
-    <span class="transport-mode-text">Bus Services</span>
-    <TableGenerator services={busServices} click={showDetail} />
-  {/if}
-  {#if ferryServices && ferryServices.length}
-    <img class="transport-mode-image" src="/images/transport-modes/ferry.svg" alt="" />
-    <br />
-    <span class="transport-mode-text">Ferry Services</span>
-    <TableGenerator services={ferryServices} click={showDetail} />
-  {/if}
-{/if}
-
-<style>
-  p.dataTime {
-    margin-top: 5px;
-    margin-bottom: 0px;
-    font-size: 12px;
-  }
-  #noservices {
-    margin: 20px;
-    padding-top: 20px;
-    color: white;
-  }
-
-  .transport-mode-image {
-    width: 30px;
-    margin: auto;
-    padding-top: 25px;
-  }
-  .transport-mode-text {
-    color: white;
-  }
-</style>

src/lib/ldb/staff/staff-ldb.svelte

@@ -1,220 +1,102 @@
-<script>
+<script lang="ts">
-  export let station = '';
+    import TableGenerator from "./table/table-generator.svelte";
-  export let title = 'Loading...';
+    import Loading from "$lib/navigation/loading.svelte";
-  import { onMount } from 'svelte';
+    import type { StaffLdb } from "@owlboard/ts-types";
-  import AlertBar from '$lib/ldb/nrcc/alert-bar.svelte';
+    import { detailInit, defineDetail } from "./train-detail";
-  import StaffTrainDetail from '$lib/ldb/staff/train-detail.svelte';
+    import TrainDetail from "./train-detail.svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import { fetchStaffLdb } from "./fetch";
-  import { uuid } from '$lib/stores/uuid';
+    import AlertBar from "../common/nrcc/alert-bar.svelte";
-  import Island from '$lib/islands/island.svelte';
+    import TimeBar from "$lib/navigation/TimeBar.svelte";
-  import TableGenerator from './table/table-generator.svelte';
+    import { onMount } from "svelte";
+    import { IconBus, IconSailboat } from "@tabler/icons-svelte";
 
-  let requestedStation = '';
+    export let station: string;
-  $: requestedStation = station;
+    export let title: string | undefined = "Loading...";
 
-  let jsonData = {};
+    let errorDetail = {
-  /**
+        code: "",
-   * @type {string | any[]}
+        message: "",
-   */
-  let trainServices = [];
-  /**
-   * @type {string | any[]}
-   */
-  let busServices = [];
-  /**
-   * @type {string | any[]}
-   */
-  let ferryServices = [];
-  let dataAge = new Date(0);
-  let isLoading = true;
-  let isErr = false;
-  let errMsg = '';
-  let alerts = [''];
-  let detail = { show: false, rid: '', uid: '', headcode: '' };
-
-  $: {
-    // @ts-ignore
-    if (jsonData?.GetBoardResult?.generatedAt) {
-      // @ts-ignore
-      dataAge = new Date(jsonData.GetBoardResult.generatedAt);
-    }
-
-    // @ts-ignore
-    if (jsonData?.GetBoardResult?.trainServices?.service) {
-      // @ts-ignore
-      trainServices = ensureArray((trainServices = jsonData.GetBoardResult.trainServices.service));
-    } else {
-      trainServices = [];
-    }
-
-    // @ts-ignore
-    if (jsonData?.GetBoardResult?.busServices?.service) {
-      // @ts-ignore
-      busServices = ensureArray((busServices = jsonData.GetBoardResult.busServices.service));
-    } else {
-      busServices = [];
-    }
-
-    // @ts-ignore
-    if (jsonData?.GetBoardResult?.ferryServices?.service) {
-      // @ts-ignore
-      ensureArray((ferryServices = jsonData.GetBoardResult.ferryServices.service));
-    } else {
-      ferryServices = [];
-    }
-
-    // @ts-ignore
-    if (jsonData?.GetBoardResult?.locationName) {
-      // @ts-ignore
-      title = jsonData.GetBoardResult.locationName;
-    } else {
-      title = 'Loading Board';
-    }
-
-    // @ts-ignore
-    if (jsonData?.GetBoardResult?.nrccMessages) {
-      // @ts-ignore
-      alerts = processNrcc(jsonData.GetBoardResult?.nrccMessages?.message);
-    } else {
-      alerts = [];
-    }
-  }
-
-  /**
-   * @param {any} item
-   */
-  function ensureArray(item) {
-    if (Array.isArray(item)) {
-      return item;
-    }
-    return [item];
-  }
-
-  async function fetchData() {
-    isLoading = true; // Set loading state
-    try {
-      console.log(`Requested Station: ${requestedStation}`);
-      const url = `https://owlboard.info/api/v2/live/station/${requestedStation}/staff`;
-      const opt = {
-        method: 'GET',
-        headers: {
-          uuid: $uuid
-        }
     };
-      const data = await fetch(url, opt);
+    let nrcc: string[] = [];
-      const json = await data.json();
+
-      if (json.ERROR === 'NOT_FOUND') {
+    let detail = detailInit();
-        isErr = true;
+    function hideDetail() {
-        errMsg = 'Unable to find this station';
+        detail = detailInit();
-      } else {
-        jsonData = json;
-      }
-    } catch (error) {
-      console.error('Error fetching data:', error);
-      isLoading = false;
-      isErr = true;
-      errMsg = 'Connection error, try again later';
-    } finally {
-      isLoading = false; // Clear loading state
     }
+    function showDetail(rid: string, uid: string, tid: string) {
+        detail = defineDetail(rid, uid, tid);
     }
 
-  /**
+    console.log(`Station: ${station}`);
-   * @param {any} messages
+
-   */
+    let updatedTime: Date;
-  function processNrcc(messages) {
+
-    // Remove newlines and then <p> tags from input and append to array
+    async function callFetch(station: string): Promise<StaffLdb> {
-    let arrMessages;
+        console.log("callFetch function called");
-    if (!Array.isArray(messages)) {
+        const data = await fetchStaffLdb(station);
-      arrMessages = [messages];
+        if (data.data) {
-    } else {
+            title = data.data.locationName;
-      arrMessages = messages;
+            if (data.data?.nrccMessages) {
+                for (const msg of data.data.nrccMessages) {
+                    nrcc.push(msg.xhtmlMessage);
                 }
-    let processedMessages = [];
+                nrcc = nrcc; // Reassign to ensure Svelte reloads
-    for (const message of arrMessages) {
-      const msgText = message.xhtmlMessage;
-      processedMessages.push(msgText.replace(/[\n\r]/g, '').replace(/<\/?p[^>]*>/g, ''));
             }
-    return processedMessages;
+            if (data.data.generatedAt) {
+                updatedTime = new Date(data.data.generatedAt);
+            }
+            return data.data;
+        }
+        errorDetail.code = data.obStatus.toString() || "UNKNOWN";
+        errorDetail.message = data.obMsg || "An unknown error occoured";
+        throw new Error("Unable to Fetch Data");
     }
 
-  function showDetail(rid = '', uid = '', tid = '') {
+    onMount(async () => {
-    detail = {
+        console.log("staff-ldb component mounted");
-      rid: rid,
-      uid: uid,
-      headcode: tid,
-      show: true
-    };
-  }
-
-  function hideDetails() {
-    detail = {
-      rid: '',
-      uid: '',
-      headcode: '',
-      show: false
-    };
-  }
-
-  onMount(() => {
-    fetchData();
     });
 </script>
 
+{#if nrcc.length}
+    <AlertBar alerts={nrcc} />
+{/if}
+
+<TimeBar bind:updatedTime />
+
 {#key detail}
     {#if detail.show}
-    <StaffTrainDetail {detail} close={hideDetails} />
+        <TrainDetail {detail} close={hideDetail} />
     {/if}
 {/key}
 
-{#if isLoading}
+{#await callFetch(station)}
     <Loading />
-{:else if isErr}
+{:then data}
-  <Island>
+    {#if data}
-    <p><strong>{errMsg}</strong></p>
+        {#if data.trainServices?.length}
-  </Island>
+            <TableGenerator services={data.trainServices} click={showDetail} />
-{:else}
-  {#if alerts.length}
-    <AlertBar {alerts} />
         {/if}
-  <p class="dataTime">Data from: {dataAge.toLocaleString([])}</p>
+        {#if data.busServices?.length}
-  {#if trainServices && trainServices.length}
+            <IconBus />
-    <TableGenerator services={trainServices} click={showDetail} />
-  {:else}
-    <p id="noservices">There are no scheduled train services in the next two hours</p>
-  {/if}
-  {#if busServices && busServices.length}
-    <img class="transport-mode-image" src="/images/transport-modes/bus.svg" alt="" />
             <br />
-    <span class="transport-mode-text">Bus Services</span>
+            <span class="table-head-text">Bus Services</span>
-    <TableGenerator services={busServices} click={showDetail} />
+            <TableGenerator services={data.busServices} click={showDetail} />
         {/if}
-  {#if ferryServices && ferryServices.length}
+        {#if data.ferryServices?.length}
-    <img class="transport-mode-image" src="/images/transport-modes/ferry.svg" alt="" />
+            <IconSailboat />
-    <br />
+            <br>
-    <span class="transport-mode-text">Ferry Services</span>
+            <span class="table-head-text">Ferry Services</span>
-    <TableGenerator services={ferryServices} click={showDetail} />
+            <TableGenerator services={data.ferryServices} click={showDetail} />
         {/if}
     {/if}
+{:catch}
+    <h2>Error</h2>
+    <p>ERR-CODE: {errorDetail.code}</p>
+    <p>Message:<br />{errorDetail.message}</p>
+{/await}
 
 <style>
-  p.dataTime {
+    .table-head-text {
-    margin-top: 5px;
-    margin-bottom: 0px;
-    font-size: 12px;
-  }
-  #noservices {
-    margin: 20px;
-    padding-top: 20px;
-    color: white;
-  }
-
-  .transport-mode-image {
-    width: 30px;
-    margin: auto;
-    padding-top: 25px;
-  }
-  .transport-mode-text {
         color: white;
     }
 </style>

src/lib/ldb/staff/table/table-generator.svelte

@@ -1,168 +1,90 @@
-<script>
+<script lang="ts">
-  import Reason from '$lib/raw-fetchers/reason.svelte';
+    import Reason from "$lib/raw-fetchers/reason.svelte";
-  import { tocs as tocMap } from '$lib/stores/tocMap';
+    import { tocs as tocMap } from "$lib/stores/tocMap";
 
-  export let services;
+    import type { TrainServices, ServiceLocation } from "@owlboard/ts-types";
-  export let click;
+    import { fade } from "svelte/transition";
 
-  async function generateServiceData(service) {
+    export let services: TrainServices[];
-    const timeDetails = parseTimes(service);
+    export let click: Function;
-    let serviceData = {
-      from: await parseLocation(service.origin),
-      to: await parseLocation(service.destination),
-      length: await getTrainLength(service),
-      platform: await parsePlatform(service?.platform || 'undefined'),
-      platformHidden: service?.platformIsHidden === 'true',
-      schArr: timeDetails.schArr,
-      expArr: timeDetails.expArr,
-      schDep: timeDetails.schDep,
-      expDep: timeDetails.expDep,
-      isEarlyArr: timeDetails.earArr,
-      isLateArr: timeDetails.delArr,
-      isEarlyDep: timeDetails.earDep,
-      isLateDep: timeDetails.delDep,
-      isCancelled: Boolean(service?.isCancelled),
-      canArr: timeDetails.canArr,
-      canDep: timeDetails.canDep,
-      isDelayed: service?.arrivalType === 'Delayed',
-      isArrDelayed: service?.arrivalType === 'Delayed',
-      isDepDelayed: service?.departureType === 'Delayed',
-      isNonPublic: service?.isPassengerService === 'false' ? true : false
-    };
-    return serviceData;
-  }
 
-  async function getTrainLength(service) {
+    function detail(event: any, rid: string, uid: string, tid: string) {
-    if (service?.length) {
-      return parseInt(service?.length);
-    } else if (service?.formation?.coaches) {
-      return service.formation.coaches.coach.length;
-    }
-    return null;
-  }
-
-  async function parseLocation(location) {
-    if (!Array.isArray(location.location)) {
-      return location.location?.tiploc;
-    }
-    let locations = [];
-    for (const singleLocation of location?.location) {
-      locations.push(singleLocation?.tiploc);
-    }
-    return locations.join(' & ');
-  }
-
-  function parseTimes(service) {
-    let schArr = new Date(service?.sta);
-    let expArr = new Date(service?.eta || service?.ata);
-    let schDep = new Date(service?.std);
-    let expDep = new Date(service?.etd || service?.atd);
-    let isEarlyArr = false,
-      isDelayedArr = false,
-      isArr = false,
-      canArr = false;
-    let isEarlyDep = false,
-      isDelayedDep = false,
-      isDep = false,
-      canDep = false;
-    const timeDifferenceThreshold = 60 * 1000; // 60 seconds in milliseconds
-    if (expArr - schArr < -timeDifferenceThreshold) {
-      isEarlyArr = true;
-      isArr = true;
-    } else if (expArr - schArr > timeDifferenceThreshold) {
-      isDelayedArr = true;
-      isArr = true;
-    }
-
-    if (expDep - schDep < -timeDifferenceThreshold) {
-      isEarlyDep = true;
-      isDep = true;
-    } else if (expDep - schDep > timeDifferenceThreshold) {
-      isDelayedDep = true;
-      isDep = true;
-    }
-    let parsedExpArr;
-    if (expArr instanceof Date && !isNaN(expArr)) {
-      if (!isEarlyArr && !isDelayedArr) {
-        parsedExpArr = 'RT';
-      } else {
-        parsedExpArr = parseIndividualTime(expArr);
-      }
-    } else if (service.isCancelled === 'true') {
-      parsedExpArr = 'CANC';
-      canArr = true;
-    } else {
-      parsedExpArr = '-';
-    }
-
-    let parsedExpDep;
-    if (expDep instanceof Date && !isNaN(expDep)) {
-      if (!isEarlyDep && !isDelayedDep) {
-        parsedExpDep = 'RT';
-      } else {
-        parsedExpDep = parseIndividualTime(expDep);
-      }
-    } else if (service.isCancelled === 'true') {
-      parsedExpDep = 'CANC';
-      canDep = true;
-    } else {
-      parsedExpDep = '-';
-    }
-    return {
-      schArr: parseIndividualTime(schArr),
-      expArr: parsedExpArr,
-      schDep: parseIndividualTime(schDep),
-      expDep: parsedExpDep,
-      earArr: isEarlyArr,
-      delArr: isDelayedArr,
-      earDep: isEarlyDep,
-      delDep: isDelayedDep,
-      canArr: canArr,
-      canDep: canDep
-    };
-  }
-
-  function parseIndividualTime(input) {
-    const dt = new Date(input);
-    const output = dt.toLocaleTimeString([], {
-      hour: '2-digit',
-      minute: '2-digit'
-    });
-    if (output !== 'Invalid Date') {
-      return output;
-    }
-    return '-';
-  }
-
-  async function parsePlatform(platform) {
-    if (!platform) {
-      return '-';
-    }
-    if (platform === 'TBC' || platform == 'undefined') {
-      return '-';
-    }
-    return {
-      number: platform
-    };
-  }
-
-  function detail(event, rid, uid, tid) {
         const target = event.target;
         click(rid, uid, tid);
     }
+
+    async function formatLocations(locations: ServiceLocation[]): Promise<string> {
+        let tiplocs: string[] = [];
+        for (const location of locations) {
+            tiplocs.push(location.tiploc);
+        }
+        return tiplocs.join(" & ");
+    }
+
+    async function classGenerator(service: TrainServices) {
+        // This function needs updating next
+        let otherArr: string[] = [];
+        let arrArr: string[] = [];
+        let depArr: string[] = [];
+        let platArr: string[] = [];
+
+        if (service.isCancelled) {
+            otherArr.push("canc");
+        }
+        if (service.serviceIsSupressed) {
+            otherArr.push("nonPass");
+        }
+        if (service.platformIsHidden) {
+            platArr.push("nonPass");
+        }
+
+        function checkLateEarly(originalTime: Date | undefined, comparedTime: Date | undefined, arr: string[]) {
+            if (originalTime !== undefined && comparedTime instanceof Date) {
+                if (originalTime < comparedTime) {
+                    arr.push("late");
+                } else if (originalTime > comparedTime) {
+                    arr.push("early");
+                }
+            }
+        }
+
+        checkLateEarly(service.sta, service.eta, arrArr);
+        checkLateEarly(service.sta, service.ata, arrArr);
+        checkLateEarly(service.std, service.etd, depArr);
+        checkLateEarly(service.std, service.atd, depArr);
+
+        return {
+            other: otherArr.join(" "),
+            arr: arrArr.join(" "),
+            dep: depArr.join(" "),
+            plat: platArr.join(" "),
+        };
+    }
+
+    function fmtTime(date: Date | string | undefined): string | false {
+        if (typeof date === "string") return date;
+        if (date instanceof Date) {
+            const hours = date.getHours().toString().padStart(2, "0");
+            const minutes = date.getMinutes().toString().padStart(2, "0");
+            return `${hours}:${minutes}`;
+        } else {
+            return false;
+        }
+    }
 </script>
 
 <p class="smallScreen">Your display is too small to view this data</p>
-<table>
+<p class="smallScreen">Try rotating your device</p>
+<table in:fade={{ duration: 500 }}>
     <tr>
         <th class="id">ID</th>
         <th class="from">From</th>
         <th class="to">To</th>
         <th class="plat">Plat</th>
-    <th class="time">Sch</th>
+        <th class="time arrsch">Sch</th>
-    <th class="time">Exp</th>
+        <th class="time arrexp">Exp</th>
-    <th class="time">Sch</th>
+        <th class="time depsch">Sch</th>
-    <th class="time">Exp</th>
+        <th class="time depexp">Exp</th>
     </tr>
     <tr>
         <th class="other" colspan="4" />
@@ -170,51 +92,50 @@
         <th class="timepair" colspan="2">Departure</th>
     </tr>
     {#each services as service}
-    {#await generateServiceData(service)}
-      <tr><td colspan="8">Loading Service Data...</td></tr>
-    {:then serviceData}
         <tr
             class="dataRow"
             on:click={(event) => detail(event, service.rid, service.uid, service.trainid)}
             on:keypress={(event) => detail(event, service.rid, service.uid, service.trainid)}
         >
+            {#await classGenerator(service) then classes}
+                <!-- HEADCODE -->
                 <td class="id">{service.trainid}</td>
-        <td class="from {serviceData.isNonPublic && 'nonPass'} {serviceData.isCancelled && 'cancTxt'}">{serviceData.from}</td>
+                <!-- ORIGIN -->
-        <td class="to {serviceData.isNonPublic && 'nonPass'} {serviceData.isCancelled && 'cancTxt'}">{serviceData.to}</td>
+                <td class="loc from {classes.other}">{#await formatLocations(service.origin) then origin}{origin}{/await}</td>
-        <td class="plat {serviceData.isNonPublic && 'nonPass'} {serviceData.isCancelled && 'cancTxt'} {serviceData.platformHidden && 'nonPass'}"
+                <!-- DESTINATION -->
-          >{serviceData.platform.number || '-'}</td
+                <td class="loc to {classes.other}">{#await formatLocations(service.destination) then dest}<span class="locName">{dest}</span>{/await}</td>
-        >
+                <!-- PLATFORM -->
-        <td class="time schTime {serviceData.isNonPublic && 'nonPass'} {serviceData.isCancelled && 'cancTxt'}">{serviceData.schArr}</td>
+                <td class="plat {classes.other} {classes.plat}">{service.platform || "-"}</td>
-        <td
+                <!-- SCHEDULED ARR -->
-          class="time {serviceData.isNonPublic && 'nonPass'} {serviceData.isLateArr && 'late'} {serviceData.isArrDelayed && 'late'} {serviceData.isCancelled &&
+                <td class="time schTime {classes.other}">{fmtTime(service?.sta) || "-"}</td>
-            'canc'} {serviceData.isEarlyArr && 'early'}">{serviceData.isArrDelayed ? 'LATE' : serviceData.expArr}</td
+                <!-- EXPECTED/ACTUAL ARR -->
-        >
+                <td class="time {classes.other} {classes.arr}">{fmtTime(service.eta) || fmtTime(service.ata) || "-"}</td>
-        <td class="time schTime {serviceData.isNonPublic && 'nonPass'} {serviceData.isCancelled && 'cancTxt'}">{serviceData.schDep}</td>
+                <!-- SCHEDULED DEP -->
-        <td
+                <td class="time schTime {classes.other}">{fmtTime(service.std) || "-"}</td>
-          class="time {serviceData.isNonPublic && 'nonPass'} {serviceData.isLateDep && 'late'} {serviceData.isDepDelayed && 'late'}
+                <!-- EXPECTED/ACTUAL DEP -->
-                 {serviceData.isCancelled && 'canc'} {serviceData.isEarlyDep && 'early'}">{serviceData.isDepDelayed ? 'LATE' : serviceData.expDep}</td
+                <td class="time {classes.other} {classes.dep}">{fmtTime(service.etd) || fmtTime(service.atd) || "-"}</td>
-        >
+            {/await}
         </tr>
         <tr>
-        <td class="tableTxt" colspan="8">
+            <td colspan="1" />
+            <td class="tableTxt" colspan="7">
+                {#if service.destination?.[0] && service.destination[0].via}<span class="via">{service.destination[0].via}</span><br />{/if}
                 {tocMap.get(service.operatorCode.toLowerCase()) || service.operatorCode}
-          {#if service.isCharter}charter{/if}
+                {#if service.length} | {service.length} carriages{/if}
-          {#if serviceData.length} | {serviceData.length} carriages{/if}
                 {#if service.delayReason}
                     <br />
-            <Reason type={'delay'} code={service.delayReason} />
+                    <span class="delayTxt">
+                        <Reason type={"delay"} code={service.delayReason} />
+                    </span>
                 {/if}
                 {#if service.cancelReason}
                     <br />
-            <Reason type={'cancel'} code={service.cancelReason} />
+                    <span class="cancTxt">
+                        <Reason type={"cancel"} code={service.cancelReason} />
+                    </span>
                 {/if}
             </td>
         </tr>
-    {:catch}
-      <tr>
-        <td colspan="8">Unable to display service</td>
-      </tr>
-    {/await}
     {/each}
 </table>
 
@@ -235,9 +156,12 @@
 
     .dataRow {
         font-family: ubuntu, monospace;
-    vertical-align: bottom;
+        vertical-align: top;
         cursor: pointer;
         font-size: 16px;
+        line-height: 1;
+        padding: 0;
+        margin: 0;
     }
 
     /* Table Columns */
@@ -267,8 +191,7 @@
         color: yellow;
     }
 
-  td.to,
+    td.to {
-  th.to {
         text-align: right;
     }
     td.from,
@@ -277,16 +200,26 @@
     }
     td.time {
         font-size: 15px;
-    vertical-align: middle;
+        vertical-align: top;
     }
     .tableTxt {
         text-align: left;
         padding-left: 2px;
-    color: var(--second-text-color);
+        color: var(--secondary-text-color);
         vertical-align: top;
         font-size: 12px;
+        padding-bottom: 10px;
+    }
+    .delayTxt {
+        color: var(--main-warning-color);
+    }
+    .cancTxt {
+        color: var(--main-alert-color);
+    }
+    .via {
+        color: yellow;
+        padding-left: 0px;
     }
-
     /* Handle small screens */
     .smallScreen {
         display: none;
@@ -338,26 +271,27 @@
         td.from,
         th.to,
         th.from {
-      text-align: center;
+            text-align: left;
         }
     }
 
     /* Conditional Classes */
-  .cancTxt {
+    .loc.canc,
-    color: grey !important;
+    .canc {
+        color: grey;
         text-decoration: line-through;
         opacity: 0.8;
     }
 
     .nonPass {
-    opacity: 0.6;
+        opacity: 0.4;
     }
 
     .late {
         animation: pulse-late 1.5s linear infinite;
     }
 
-  .canc {
+    .canc.time {
         animation: pulse-cancel 1.5s linear infinite;
     }
 
@@ -383,103 +317,4 @@
             color: rgb(136, 164, 255);
         }
     }
-
-  /* CARRIED OVER FROM OLD COMPONENT:
-  
-    #timestamp {
-    color: var(--second-text-color);
-  }
-
-  .transport-mode {
-    width: 30px;
-    margin: auto;
-  }
-
-  .dataTable {
-    color: white;
-    font-weight: normal;
-    width: 100%;
-    margin: 0px, 0px;
-    padding-left: 8px;
-    padding-right: 8px;
-  }
-
-  .id {
-    width: 12%;
-  }
-
-  .from {
-    width: 20%;
-  }
-
-  .to {
-    width: 20%;
-  }
-
-  .plat {
-    width: 8%;
-  }
-
-  .timePair {
-    width: 20%;
-  }
-
-  .time {
-    width: 10%;
-  }
-
-  .data {
-    font-weight: normal;
-  }
-
-  .id-data {
-    color: lightgray;
-    text-align: left;
-  }
-
-  .from-data,
-  .to-data {
-    color: yellow;
-    text-decoration: none;
-    text-align: left;
-  }
-
-  .text-row {
-    margin-top: 0px;
-    padding-bottom: 5px;
-    width: 100%;
-  }
-
-  .text-data {
-    text-align: left;
-    color: cyan;
-    font-size: smaller;
-  }
-
-  .can-dat {
-    color: grey;
-    text-decoration: line-through;
-  }
-
-  .hidden {
-    opacity: 0.5;
-  }
-
-  .ecs {
-    opacity: 0.75;
-  }
-
-  .can-time {
-    animation: pulse-cancel 1.5s linear infinite;
-  }
-
-  .early {
-    animation: pulse-early 1.5s linear infinite;
-  }
-
-  .late {
-    animation: pulse-late 1.5s linear infinite;
-  }
-
-  */
 </style>

src/lib/ldb/staff/table/table-generator_dev.svelte

@@ -1,313 +0,0 @@
-<script lang="ts">
-  import Reason from '$lib/raw-fetchers/reason.svelte';
-  import { tocs as tocMap } from '$lib/stores/tocMap';
-
-  import type { TrainServices, ServiceLocation } from '@owlboard/ts-types';
-
-  export let services: TrainServices[];
-  export let click: any; // Not sure of the type here!
-
-  function detail(event: any, rid: string, uid: string, tid: string) {
-    const target = event.target;
-    click(rid, uid, tid);
-  }
-
-  async function formatLocations(locations: ServiceLocation[]): Promise<string> {
-    let tiplocs: string[] = [];
-    for (const location of locations) {
-      tiplocs.push(location.tiploc);
-    }
-    return tiplocs.join(' & ');
-  }
-
-  async function classGenerator(service: TrainServices) {
-    let otherArr: string[] = [];
-    let arrArr: string[] = [];
-    let depArr: string[] = [];
-    let platArr: string[] = [];
-
-    if (service.isCancelled) {
-      otherArr.push('canc');
-    }
-    if (service.serviceIsSupressed) {
-      otherArr.push('nonPass');
-    }
-    if (service.platformIsHidden) {
-      platArr.push('nonPass');
-    }
-
-    if (service.sta !== undefined) {
-      if (service.eta !== undefined) {
-        if (service.sta < service.eta) {
-          arrArr.push('late');
-        }
-      } else if (service.ata !== undefined) {
-        if (service.sta < service.ata) {
-          arrArr.push('late');
-        }
-      }
-      if (service.eta !== undefined) {
-        if (service.sta > service.eta) {
-          arrArr.push('early');
-        }
-      } else if (service.ata !== undefined) {
-        if (service.sta > service.ata) {
-          arrArr.push('early');
-        }
-      }
-    }
-
-    if (service.std !== undefined) {
-      if (service.etd !== undefined) {
-        if (service.std < service.etd) {
-          depArr.push('late');
-        }
-      } else if (service.atd !== undefined) {
-        if (service.std < service.atd) {
-          depArr.push('late');
-        }
-      }
-      if (service.etd !== undefined) {
-        if (service.std > service.etd) {
-          depArr.push('early');
-        }
-      } else if (service.atd !== undefined) {
-        if (service.std > service.atd) {
-          depArr.push('early');
-        }
-      }
-    }
-
-    return {
-      other: otherArr.join(' '),
-      arr: arrArr.join(' '),
-      dep: depArr.join(' '),
-      plat: platArr.join(' ')
-    };
-  }
-</script>
-
-<p class="smallScreen">Your display is too small to view this data</p>
-<table>
-  <tr>
-    <th class="id">ID</th>
-    <th class="from">From</th>
-    <th class="to">To</th>
-    <th class="plat">Plat</th>
-    <th class="time">Sch</th>
-    <th class="time">Exp</th>
-    <th class="time">Sch</th>
-    <th class="time">Exp</th>
-  </tr>
-  <tr>
-    <th class="other" colspan="4" />
-    <th class="timepair" colspan="2">Arrival</th>
-    <th class="timepair" colspan="2">Departure</th>
-  </tr>
-  {#each services as service}
-    <tr
-      class="dataRow"
-      on:click={(event) => detail(event, service.rid, service.uid, service.trainid)}
-      on:keypress={(event) => detail(event, service.rid, service.uid, service.trainid)}
-    >
-      {#await classGenerator(service) then classes}
-        <td class="id {classes.other}">{service.trainid}</td>
-        <td class="from {classes.other}">{#await formatLocations(service.origin) then txt}{txt}{/await}</td>
-        <td class="to {classes.other}">{#await formatLocations(service.destination) then txt}{txt}{/await}</td>
-        <td class="plat">{service.platform || '-'}</td>
-        <td class="time schTime {classes.other}">{service.sta || '-'}</td>
-        <!-- All time need to be displayed appropriately -->
-        <td class="time {classes.other} {classes.arr}">{service.eta || service.ata || '-'}</td>
-        <!-- All time need to be displayed appropriately -->
-        <td class="time schTime {classes.other}">{service.std || '-'}</td>
-        <!-- All time need to be displayed appropriately -->
-        <td class="time {classes.other} {classes.dep}">{service.etd || service.atd || '-'}</td>
-        <!-- All time need to be displayed appropriately -->
-      {/await}
-    </tr>
-    <tr>
-      <td class="tableTxt" colspan="8">
-        {tocMap.get(service.operatorCode.toLowerCase()) || service.operatorCode}
-        {#if service.length} | {service.length} carriages{/if}
-        {#if service.delayReason}
-          <br />
-          <Reason type={'delay'} code={service.delayReason} />
-        {/if}
-        {#if service.cancelReason}
-          <br />
-          <Reason type={'cancel'} code={service.cancelReason} />
-        {/if}
-      </td>
-    </tr>
-    <tr>
-      <td colspan="8">Unable to display service</td>
-    </tr>
-  {/each}
-</table>
-
-<style>
-  table {
-    table-layout: fixed;
-    width: 100%;
-    max-width: 875px;
-    margin: auto;
-    padding: 0px;
-    color: white;
-  }
-
-  th {
-    font-size: 12px;
-    margin: 0px;
-  }
-
-  .dataRow {
-    font-family: ubuntu, monospace;
-    vertical-align: bottom;
-    cursor: pointer;
-    font-size: 16px;
-  }
-
-  /* Table Columns */
-  .id {
-    width: 8%;
-  }
-  .from {
-    width: 14%;
-  }
-  .to {
-    width: 14%;
-  }
-  .plat {
-    width: 6%;
-  }
-  .time {
-    width: 9%;
-  }
-
-  td.id {
-    color: lightblue;
-    text-align: left;
-    padding-left: 2px;
-  }
-  td.from,
-  td.to {
-    color: yellow;
-  }
-
-  td.to,
-  th.to {
-    text-align: right;
-  }
-  td.from,
-  th.from {
-    text-align: left;
-  }
-  td.time {
-    font-size: 15px;
-    vertical-align: middle;
-  }
-  .tableTxt {
-    text-align: left;
-    padding-left: 2px;
-    color: var(--second-text-color);
-    vertical-align: top;
-    font-size: 12px;
-  }
-
-  /* Handle small screens */
-  .smallScreen {
-    display: none;
-    margin: 20px;
-  }
-  @media screen and (max-width: 335px) {
-    th {
-      font-size: 10px;
-    }
-    .dataRow {
-      font-size: 12px;
-    }
-    td.time {
-      font-size: 12px;
-    }
-    .tableTxt {
-      font-size: 10px;
-    }
-  }
-  @media screen and (max-width: 279px) {
-    table {
-      display: none;
-    }
-    .smallScreen {
-      display: block;
-    }
-  }
-
-  /* Handle Large Screens */
-  @media screen and (min-width: 375px) {
-    .dataRow {
-      font-size: 18px;
-    }
-    td.time {
-      font-size: 16px;
-    }
-  }
-  @media screen and (min-width: 450px) {
-    .dataRow {
-      font-size: 20px;
-    }
-    td.time {
-      font-size: 19px;
-    }
-    .tableTxt {
-      font-size: 14px;
-    }
-    td.to,
-    td.from,
-    th.to,
-    th.from {
-      text-align: center;
-    }
-  }
-
-  /* Conditional Classes */
-  .cancTxt {
-    color: grey !important;
-    text-decoration: line-through;
-    opacity: 0.8;
-  }
-
-  .nonPass {
-    opacity: 0.6;
-  }
-
-  .late {
-    animation: pulse-late 1.5s linear infinite;
-  }
-
-  .canc {
-    animation: pulse-cancel 1.5s linear infinite;
-  }
-
-  .early {
-    animation: pulse-early 1.5s linear infinite;
-  }
-
-  /* Animation Definitions */
-  @keyframes pulse-late {
-    50% {
-      color: var(--main-warning-color);
-    }
-  }
-
-  @keyframes pulse-cancel {
-    50% {
-      color: var(--main-alert-color);
-    }
-  }
-
-  @keyframes pulse-early {
-    50% {
-      color: rgb(136, 164, 255);
-    }
-  }
-</style>

src/lib/ldb/staff/train-detail.svelte

@@ -1,14 +1,15 @@
 <script>
-  import OverlayIsland from '$lib/islands/overlay-island.svelte';
+    import OverlayIsland from "$lib/islands/overlay-island.svelte";
-  import { fade } from 'svelte/transition';
+    import { fade } from "svelte/transition";
-  import Reason from '$lib/raw-fetchers/reason.svelte';
+    import Reason from "$lib/raw-fetchers/reason.svelte";
-  import { uuid } from '$lib/stores/uuid';
+    import { uuid } from "$lib/stores/uuid";
-  import StylesToc from '$lib/train/styles-toc.svelte';
+    import StylesToc from "$lib/train/styles-toc.svelte";
+    import { getApiUrl } from "$lib/scripts/upstream";
     export let detail = {
-    uid: '',
+        uid: "",
-    rid: '',
+        rid: "",
-    headcode: '',
+        headcode: "",
-    show: true
+        show: true,
     };
     export let close;
 
@@ -19,17 +20,17 @@
     async function getTrain(rid) {
         try {
             console.log(`Requested Station: ${rid}`);
-      const url = `https://owlboard.info/api/v2/live/train/rid/${rid}`;
+            const url = `${getApiUrl()}/api/v2/live/train/rid/${rid}`;
             const opt = {
-        method: 'GET',
+                method: "GET",
                 headers: {
-          uuid: $uuid
+                    uuid: $uuid,
-        }
+                },
             };
             const data = await fetch(url, opt);
             return await data.json();
         } catch (error) {
-      console.error('Error fetching data:', error);
+            console.error("Error fetching data:", error);
         }
     }
 
@@ -39,29 +40,29 @@
             try {
                 const result = Math.floor(location.lateness / 60);
                 if (result === 0) {
-          (string = 'RT'), (state = '');
+                    (string = "RT"), (state = "");
                 } else if (result < 0) {
-          (string = -result + 'E'), (state = 'early');
+                    (string = -result + "E"), (state = "early");
                 } else if (result > 0) {
-          (string = result + 'L'), (state = 'late');
+                    (string = result + "L"), (state = "late");
                 }
             } catch {
-        (string = ''), (state = '');
+                (string = ""), (state = "");
             }
-    } else if (location.arrivalType === 'Delayed') {
+        } else if (location.arrivalType === "Delayed") {
-      (string = ''), (state = 'late');
+            (string = ""), (state = "late");
         } else {
-      (string = ''), (state = 'noreport');
+            (string = ""), (state = "noreport");
         }
         return {
             string: string,
-      state: state
+            state: state,
         };
     }
 
     function parseTime(date) {
-    const parsedTime = date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
+        const parsedTime = date.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
-    return parsedTime !== 'Invalid Date' ? parsedTime : null;
+        return parsedTime !== "Invalid Date" ? parsedTime : null;
     }
 
     function parseTimes(service) {
@@ -78,19 +79,19 @@
             parsedEtd = parseTime(etd),
             parsedAtd = parseTime(atd);
         if (service.isCancelled) {
-      (parsedEta = 'CANC'), (parsedEtd = 'CANC');
+            (parsedEta = "CANC"), (parsedEtd = "CANC");
         }
         let times = {
-      sta: parsedSta || '-',
+            sta: parsedSta || "-",
-      eata: parsedEta || parsedAta || '-',
+            eata: parsedEta || parsedAta || "-",
-      aEst: parsedEta ? 'estimate' : '',
+            aEst: parsedEta ? "estimate" : "",
-      std: parsedStd || '-',
+            std: parsedStd || "-",
-      eatd: parsedEtd || parsedAtd || '-',
+            eatd: parsedEtd || parsedAtd || "-",
-      dEst: parsedEtd ? 'estimate' : ''
+            dEst: parsedEtd ? "estimate" : "",
         };
         if (service.isCancelled) {
-      (parsedEta = 'CANC'), (parsedEtd = 'CANC');
+            (parsedEta = "CANC"), (parsedEtd = "CANC");
-      (times.aEst = 'canc'), (times.dEst = 'canc');
+            (times.aEst = "canc"), (times.dEst = "canc");
         }
         return times;
     }
@@ -138,16 +139,16 @@
                 {#each train.GetServiceDetailsResult.locations.location as location}
                     <tr>
                         <td class="location {location?.isPass === 'true' ? 'pass' : ''}">{location.tiploc}</td>
-            <td class={location?.isPass === 'true' ? 'pass' : ''}>{location.platform || ''}</td>
+                        <td class={location?.isPass === "true" ? "pass" : ""}>{location.platform || ""}</td>
                         {#await parseTimes(location)}
                             <td />
                             <td />
                             <td />
                             <td />
                         {:then times}
-              <td class={location?.isPass === 'true' ? 'pass' : ''}>{times.sta}</td>
+                            <td class={location?.isPass === "true" ? "pass" : ""}>{times.sta}</td>
                             <td class="{location?.isPass === 'true' ? 'pass' : ''} {times.aEst}">{times.eata}</td>
-              <td class={location?.isPass === 'true' ? 'pass' : ''}>{times.std}</td>
+                            <td class={location?.isPass === "true" ? "pass" : ""}>{times.std}</td>
                             <td class="{location?.isPass === 'true' ? 'pass' : ''} {times.dEst}">{times.eatd}</td>
                         {/await}
                         {#await parseDelay(location)}

src/lib/ldb/staff/train-detail.ts

@@ -0,0 +1,29 @@
+// Contains the details required to lookup train details
+export interface Detail {
+    show: boolean;
+    headcode: string;
+    rid: string;
+    uid: string;
+}
+
+// Initiates/Resets a `Detail` interface
+export function detailInit(): Detail {
+    const detail: Detail = {
+        show: false,
+        headcode: "",
+        rid: "",
+        uid: "",
+    };
+    return detail;
+}
+
+// Initiates/Updates a `Detail` interface using the given values
+export function defineDetail(rid: string, uid: string, tid: string) {
+    const detail: Detail = {
+        rid: rid,
+        uid: uid,
+        headcode: tid,
+        show: true,
+    };
+    return detail;
+}

src/lib/libauth.ts

@@ -1,4 +1,5 @@
-import { uuid } from './stores/uuid';
+import { getApiUrl } from "./scripts/upstream";
+import { uuid } from "./stores/uuid";
 
 export interface libauthResponse {
     uuidPresent?: boolean;
@@ -18,7 +19,7 @@ export async function checkAuth(): Promise<libauthResponse> {
     result.uuidPresent = uuidCheck?.uuidPresent;
     result.uuidValue = uuidCheck?.uuidValue;
 
-  const serverCheck = await checkServerAuth(result.uuidValue || '');
+    const serverCheck = await checkServerAuth(result.uuidValue || "");
     result.serverAuthCheck = serverCheck.authOk;
     result.serverAuthCheckResponseCode = serverCheck.status;
 
@@ -26,23 +27,23 @@ export async function checkAuth(): Promise<libauthResponse> {
 }
 
 async function checkUuid(): Promise<uuidCheckRes> {
-  let uuid_value: string = '';
+    let uuid_value: string = "";
     const unsubscribe = uuid.subscribe((value) => {
         uuid_value = value;
     });
     let res: uuidCheckRes = {
-    uuidValue: uuid_value
+        uuidValue: uuid_value,
     };
-  console.log('uuid-value is: ', uuid_value);
+    console.log("uuid-value is: ", uuid_value);
-  if (uuid_value && uuid_value != 'null') {
+    if (uuid_value && uuid_value != "null") {
         res = {
             uuidPresent: true,
-      uuidValue: uuid_value
+            uuidValue: uuid_value,
         };
     } else {
         res = {
             uuidPresent: false,
-      uuidValue: uuid_value
+            uuidValue: uuid_value,
         };
     }
     unsubscribe();
@@ -50,12 +51,12 @@ async function checkUuid(): Promise<uuidCheckRes> {
 }
 
 async function checkServerAuth(uuidString: string) {
-  const url = 'https://owlboard.info/api/v2/user/checkAuth';
+    const url = `${getApiUrl()}/api/v2/user/checkAuth`;
     const options = {
-    method: 'GET',
+        method: "GET",
         headers: {
-      uuid: uuidString
+            uuid: uuidString,
-    }
+        },
     };
     const res = await fetch(url, options);
     let ok: boolean;
@@ -66,7 +67,7 @@ async function checkServerAuth(uuidString: string) {
     }
     return {
         authOk: ok,
-    status: res.status
+        status: res.status,
     };
 }
 

src/lib/main.css

@@ -0,0 +1,64 @@
+/* FONTS */
+@font-face {
+    font-family: "firamono";
+    src: url("/font/firamono/firamono-regular.woff2") format("woff2"), url("/font/firamono/firamono-regular.woff") format("woff");
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: "firamono";
+    src: url("/font/firamono/firamono-500.woff2") format("woff2"), url("/font/firamono/firamono-500.woff") format("woff");
+    font-weight: 500;
+    font-style: normal;
+}
+@font-face {
+    font-family: "urwgothic";
+    src: url("/font/urwgothic/urwgothic.woff2") format("woff2"), url("/font/urwgothic/urwgothic.woff") format("woff");
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: "urwgothic";
+    src: url("/font/urwgothic/urwgothicDemi.woff2") format("woff2"), url("/font/urwgothic/urwgothicDemi.woff") format("woff");
+    font-weight: 900;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: "ubuntu";
+    src: url("/font/ubuntumono/ubuntumono-regular.woff2") format("woff2"), url("/font/ubuntumono/ubuntumono-regular.woff") format("woff");
+    font-weight: 400;
+    font-style: normal;
+}
+
+html {
+    width: 100%;
+    height: 100%;
+}
+
+body {
+    background-color: var(--main-bg-color);
+    background-image: radial-gradient(var(--second-bg-color), var(--main-bg-color));
+    color: var(--main-text-color);
+    font-family: urwgothic, sans-serif;
+    text-align: center;
+    margin: auto;
+    width: 100%;
+    padding-bottom: 65px;
+}
+a {
+    color: var(--main-link-color);
+}
+button:hover {
+    cursor: pointer;
+}
+
+button {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-tap-highlight-color: transparent;
+}

src/lib/navigation/InLineLoading.svelte

@@ -0,0 +1,28 @@
+<script lang="ts">
+    export let size: string = "1em";
+    export let color: string = "aliceblue";
+</script>
+
+<div class="spinner" style="--spinner-size: {size}; --spinner-color: {color};" />
+
+<style>
+    .spinner {
+        display: inline-block;
+        width: var(--spinner-size);
+        height: var(--spinner-size);
+        border: 2px solid transparent;
+        border-top-color: var(--spinner-color);
+        border-radius: 50%;
+        animation: spin 1s linear infinite;
+        margin: 10px;
+    }
+
+    @keyframes spin {
+        0% {
+            transform: rotate(0deg);
+        }
+        100% {
+            transform: rotate(360deg);
+        }
+    }
+</style>

src/lib/navigation/LogoutButton.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { logout } from '$lib/libauth';
+    import { logout } from "$lib/libauth";
 
     async function logoutAction() {
         await logout();
@@ -12,13 +12,14 @@
 <style>
     .logout {
         border: none;
-    background-color: var(--overlay-color);
+        background-color: var(--island-button-color);
-    color: white;
+        color: var(--island-link-color);
         width: 35%;
         border-radius: 50px;
         font-size: 20px;
         min-width: 90px;
         margin: 30px;
         height: 48px;
+        box-shadow: var(--box-shadow);
     }
 </style>

src/lib/navigation/TimeBar.svelte

@@ -0,0 +1,57 @@
+<script lang="ts">
+    import { onMount } from "svelte";
+    import { fade } from "svelte/transition";
+
+    export let updatedTime: Date | undefined;
+
+    let currentTime: string = "00:00:00";
+    let updateDisplay: string;
+    function updateTime() {
+        const now = new Date();
+        const hours = now.getHours().toString().padStart(2, "0");
+        const mins = now.getMinutes().toString().padStart(2, "0");
+        const secs = now.getSeconds().toString().padStart(2, "0");
+        currentTime = `${hours}:${mins}:${secs}`;
+    }
+
+    onMount(() => {
+        console.log("TimeBar component mounted");
+        updateTime();
+        const interval = setInterval(updateTime, 250);
+        return () => clearInterval(interval);
+    });
+</script>
+
+<div id="TimeBar">
+    {#if updatedTime}
+        <span in:fade class="updated-time">Updated: {updatedTime.toLocaleTimeString()}</span>
+    {:else}
+        <span />
+    {/if}
+    <span class="current-time">{currentTime}</span>
+</div>
+
+<style>
+    #TimeBar {
+        width: 100%;
+        background-color: transparent;
+        height: 30px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0;
+    }
+    .updated-time {
+        font-family: firamono, "Courier New", Courier, monospace;
+        margin-left: 10px;
+        font-size: 14px;
+    }
+    .current-time {
+        font-family: firamono, "Courier New", Courier, monospace;
+        font-weight: 900;
+        vertical-align: middle;
+        color: aliceblue;
+        margin-right: 10px;
+        font-size: 17px;
+    }
+</style>

src/lib/navigation/done.svelte

@@ -15,17 +15,18 @@
         left: 50%;
         transform: translate(-50%, -50%);
         margin: auto;
-    background-color: var(--overlay-color);
+        background-color: var(--overlay-island-bg-color);
         border-radius: 15px;
         padding: 20px;
         padding-bottom: 1px;
         min-width: 90px;
         max-width: 90px;
+        box-shadow: var(--box-shadow);
     }
     p {
         padding-top: 0px;
         font-weight: bolder;
         overflow-wrap: normal;
-    color: white;
+        color: var(--island-text-color);
     }
 </style>

src/lib/navigation/header.svelte

@@ -1,13 +1,10 @@
 <script>
-  export let title = 'title';
+    export let title = "title";
 </script>
 
 <div class="headerBar">
     <a href="/">
-    <picture>
+        <img src="/images/logo/wide_logo.svg" alt="OwlBoard Logo" />
-      <source srcset="/images/logo/wide_logo.svg" type="image/svg+xml" />
-      <img src="/images/logo/wide_logo_200.png" alt="OwlBoard Logo" />
-    </picture>
     </a>
     <header>{title}</header>
 </div>
@@ -17,8 +14,8 @@
 
 <style>
     .headerBar {
-    background: var(--overlay-color-solid);
+        background: var(--island-bg-solid);
-    color: var(--main-text-color);
+        color: var(--main-header-color);
         position: fixed;
         top: 0;
         left: 0;
@@ -27,6 +24,7 @@
         padding: 0;
         height: 50px;
         z-index: 20;
+        box-shadow: 0 3px 30px var(--box-shadow-color);
     }
 
     img {

src/lib/navigation/loading.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { fade } from 'svelte/transition';
+    import { fade } from "svelte/transition";
 </script>
 
 <div id="container" in:fade={{ delay: 150, duration: 250 }} out:fade={{ duration: 250 }}>
@@ -19,10 +19,10 @@
     .spinner::before {
         animation: 1.5s linear infinite spinner;
         animation-play-state: inherit;
-    border: solid 5px var(--overlay-color);
+        border: solid 5px var(--overlay-island-bg-color);
         border-bottom-color: white;
         border-radius: 50%;
-    content: '';
+        content: "";
         height: 40px;
         width: 40px;
         position: absolute;
@@ -37,17 +37,18 @@
         left: 50%;
         transform: translate(-50%, -50%);
         margin: auto;
-    background-color: var(--overlay-color);
+        background-color: var(--overlay-island-bg-color);
         border-radius: 15px;
         padding: 20px;
         padding-bottom: 1px;
         min-width: 90px;
         max-width: 90px;
+        box-shadow: var(--box-shadow);
     }
     p {
         padding-top: 50px;
         font-weight: bolder;
         overflow-wrap: normal;
-    color: white;
+        color: var(--island-text-color);
     }
 </style>

src/lib/navigation/nav-ldb.svelte

@@ -1,20 +1,21 @@
-<script>
+<script lang="ts">
     const links = [
         {
-      title: 'Home',
+            title: "Home",
-      path: '/',
+            path: "/",
-      svgPath: '/images/navigation/home.svg'
+            icon: IconHome,
-    }
+        },
     ];
-  import { page } from '$app/stores';
+    import { page } from "$app/stores";
+    import { IconHome } from "@tabler/icons-svelte";
 </script>
 
 <footer>
     {#each links as item}
         <a class="footerLink" href={item.path} class:active={$page.url.pathname == item.path}>
-      <img src={item.svgPath} alt={item.title} />
+            <svelte:component this={item.icon} />
             <br />
-      <span>{item.title}</span>
+            <span class="title">{item.title}</span>
         </a>
     {/each}
     <div class="data-source">
@@ -36,18 +37,19 @@
         left: 0;
         width: 100%;
         height: 50px;
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-solid);
     }
 
     .footerLink {
         width: 30%;
         height: 100%;
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-solid);
         border-style: solid;
         border-width: 1px;
         border-top: none;
         border-bottom: none;
-    border-color: rgba(0, 0, 0, 0.24);
+        border-color: var(--box-shadow-color);
+        color: var(--main-text-color);
         text-decoration: double;
         font-weight: 600;
     }
@@ -83,7 +85,7 @@
         margin-top: 3px;
         padding: 0;
     }
-  span {
+    .title {
         margin: 0;
         margin-bottom: 3px;
         padding: 0;

src/lib/navigation/nav.svelte

@@ -1,28 +1,29 @@
 <script>
     const links = [
         {
-      title: 'Home',
+            title: "Home",
-      path: '/',
+            path: "/",
-      svgPath: '/images/navigation/home.svg'
+            icon: IconHome,
         },
         {
-      title: 'PIS Finder',
+            title: "PIS Finder",
-      path: '/pis',
+            path: "/pis/",
-      svgPath: '/images/navigation/info.svg'
+            icon: IconDialpad,
         },
         {
-      title: 'Menu',
+            title: "Menu",
-      path: '/more',
+            path: "/more/",
-      svgPath: '/images/navigation/more.svg'
+            icon: IconMenu2,
-    }
+        },
     ];
-  import { page } from '$app/stores';
+    import { page } from "$app/stores";
+    import { IconHome, IconMenu2, IconDialpad } from "@tabler/icons-svelte";
 </script>
 
 <footer>
     {#each links as item}
-    <a href={item.path} class:active={$page.url.pathname == item.path}>
+        <a href={item.path} class:active={$page.url.pathname == item.path || $page.url.pathname == item.path + "/"}>
-      <img src={item.svgPath} alt={item.title} />
+            <svelte:component this={item.icon} />
             <br />
             <span>{item.title}</span>
         </a>
@@ -38,19 +39,21 @@
         width: 100%;
         height: 50px;
         background-color: rgb(54, 54, 54);
+        box-shadow: 0 -2px 30px rgba(0, 0, 0, 0.19);
     }
 
     footer a {
         flex: 12;
         width: 30%;
         height: 100%;
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-solid);
         border-style: solid;
         border-width: 1px;
         border-top: none;
         border-bottom: none;
-    border-color: rgba(0, 0, 0, 0.24);
+        border-color: var(--box-shadow-color);
         text-decoration: double;
+        color: var(--main-text-color);
         font-weight: 600;
     }
 
@@ -58,14 +61,6 @@
         background-color: transparent;
     }
 
-  img {
-    height: 20px;
-    width: 20px;
-    margin: 0;
-    margin-top: 3px;
-    padding: 0;
-  }
-
     span {
         margin: 0;
         margin-bottom: 3px;

src/lib/overlays/welcome.svelte

@@ -1,102 +0,0 @@
-<script lang="ts">
-  import { welcome } from '$lib/stores/welcome';
-  import { fade } from 'svelte/transition';
-  import { version } from '$lib/stores/version';
-
-  let pageNum: number = 0;
-
-  function pageUp() {
-    pageNum++;
-    console.log(`Welcome page: ${pageNum}`);
-  }
-
-  function pageDn() {
-    pageNum--;
-    console.log(`Welcome page: ${pageNum}`);
-  }
-
-  function close() {
-    welcome.set(version);
-  }
-
-  const pageText: string[] = [
-    '<h3>Sign-up Fixed</h3>' +
-      '<p>An issue present since 28/07/2023 has meant that new users or users with expired logins are unable to register.</p>' +
-      '<p>This issue has now been fixed and new users will be able to register for Rail Staff Access</p>',
-    '<h3>Always Improving</h3>' +
-      '<p>OwlBoard is always improving, the current focus is to improve performance when you have low mobile signal by reducing the amount of data being sent.</p>'
-  ];
-</script>
-
-<div id="popup" in:fade={{ delay: 500, duration: 300 }} out:fade={{ duration: 300 }}>
-  <h2>What's new in OwlBoard {version}</h2>
-  {#key pageNum}
-    <div in:fade={{ delay: 300 }} out:fade={{ duration: 200 }}>
-      {@html pageText[pageNum] || "You won't see this welcome message again"}
-    </div>
-  {/key}
-  {#if pageNum >= pageText.length - 1}
-    <button in:fade={{ delay: 350, duration: 250 }} out:fade={{ duration: 250 }} class="navButton" id="buttonCentre" type="button" on:click={close}>X</button>
-  {/if}
-  {#if pageNum > 0 && pageNum < pageText.length}
-    <button in:fade={{ delay: 350, duration: 250 }} out:fade={{ duration: 250 }} class="navButton" id="buttonLeft" type="button" on:click={pageDn}>&lt;</button>
-  {/if}
-  {#if pageNum < pageText.length - 1}
-    <button in:fade={{ delay: 350, duration: 250 }} out:fade={{ duration: 250 }} class="navButton" id="buttonRight" type="button" on:click={pageUp}>&gt;</button>
-  {/if}
-</div>
-
-<style>
-  #popup {
-    position: fixed;
-    top: 50px;
-    left: 50%;
-    transform: translateX(-50%);
-    width: 85%;
-    height: 75vh;
-    max-height: 600px;
-    overflow-y: auto;
-    max-width: 400px;
-    margin: auto;
-    margin-top: 25px;
-    padding: 10px;
-    background-color: grey;
-    border-radius: 10px;
-    z-index: 2500;
-  }
-
-  .navButton {
-    border-radius: 50px;
-    border: none;
-    color: white;
-    background-color: var(--overlay-color);
-    width: 50px;
-    height: 50px;
-    font-size: 20px;
-    font-weight: 600;
-    bottom: 50px;
-  }
-
-  #buttonLeft {
-    position: absolute;
-    margin: auto;
-    left: 50px;
-  }
-
-  #buttonCentre {
-    position: absolute;
-    margin: auto;
-    left: 50%;
-    transform: translateX(-50%);
-  }
-
-  #buttonRight {
-    position: absolute;
-    margin: auto;
-    right: 50px;
-  }
-
-  div {
-    color: white;
-  }
-</style>

src/lib/popover/analytics-consent.svelte

@@ -0,0 +1,113 @@
+<script lang="ts">
+    import { setTelemetryFalse, setTelemetryTrue } from "$lib/stores/SetTelemetryConsent";
+    import { telemetry } from "$lib/stores/telemetryConsent";
+    import { onMount } from "svelte";
+    import { browser } from "$app/environment";
+
+    onMount(() => {
+        if (!localStorage.getItem("telemetryRequested")) {
+            document.querySelector<HTMLDialogElement>("#analytics-consent")?.showModal();
+        }
+    })
+
+    // Setting Function Calls
+    function setAcceptAnalytics() {
+        setTelemetryTrue();
+        localStorage.setItem("telemetryRequested", "yes");
+        document.querySelector<HTMLDialogElement>("#analytics-consent")?.close();
+    }
+    function setDenyAnalytics() {
+        setTelemetryFalse();
+        localStorage.setItem("telemetryRequested", "yes");
+        document.querySelector<HTMLDialogElement>("#analytics-consent")?.close();
+    }
+
+    // Reactively call telemetry script functions
+    $: {
+        if (browser) {
+          if ($telemetry) {
+                loadTelemetryScript();
+          } else {
+                removeTelemetryScript();
+          }
+        }
+    }
+
+    function loadTelemetryScript() {
+        console.log("Activating telemetry script")
+        if (browser) {
+        if (document.querySelector("script[data-entity='owlboard-frontend']")) return; // Prevent duplicate loading
+
+        const script = document.createElement("script");
+        script.type = "module";
+        script.dataset.entity = "owlboard-frontend";
+        script.src = "https://liwan.fjla.uk/script.js";
+        document.body.appendChild(script);
+        }
+    }
+
+    function removeTelemetryScript() {
+        console.log("Deactivating telemetry script")
+        if (browser) {
+        document.querySelector("script[data-entity='owlboard-frontend']")?.remove();
+        }
+    }
+</script>
+
+<dialog id="analytics-consent">
+    <h1>Telemetry</h1>
+    <p>
+        OwlBoard collects <strong>anonymous</strong> usage data, such as the most visited pages. Any personal data is anonymized to ensure it cannot be linked to individuals.
+    </p>
+    <p>
+        This data is used to focus efforts, improving the most used features.
+    </p>
+    <p>
+        By selecting Accept, you are helping to steer OwlBoard's future - if
+        you change your mind, head over to Settings.
+    </p>
+    <p>
+        Nobody can be identified using any data stored, all data is available for
+        all to see <a href="https://liwan.fjla.uk" target="_blank">here</a>.
+    </p>
+    <p>
+        Further information can be found in the <a href="/more/privacy">Privacy Policy</a>.
+    </p>
+    <button class="modal-button" type="button" on:click={setAcceptAnalytics}>Accept</button>
+    <button class="modal-button" id="deny-button" type="button" on:click={setDenyAnalytics}>Deny</button>
+</dialog>
+
+<style>
+    ::backdrop {
+        background-color: var(--main-bg-color);
+        opacity: 75%;
+    }
+
+    #analytics-consent {
+        width: 75vw;
+        max-width: 700px;
+        border-radius: 25px;
+        background-color: var(--island-bg-color);
+        opacity: 100;
+        color: var(--island-text-color);
+        border: none;
+    }
+
+    .modal-button {
+        width: 25%;
+        min-width: 120px;
+        height: 40px;
+        font-size: larger;
+        margin: 5px;
+        border-radius: 30px;
+        background-color: var(--second-bg-color);
+        color: var(--island-text-color);
+        box-shadow: var(--box-shadow);
+        border: none;
+        font-family: urwgothic, sans-serif;
+    }
+
+    #deny-button {
+        background-color: var(--main-bg-color);
+    }
+</style>

src/lib/raw-fetchers/reason.svelte

@@ -1,35 +1,36 @@
-<script>
+<script lang="ts">
-  import { uuid } from '$lib/stores/uuid';
+    import { apiGet } from "$lib/scripts/apiFetch";
+    import type { ReasonCode } from "@owlboard/ts-types";
 
-  export let code = '';
+    export let code: string;
-  export let type = '';
+    export let type: string;
 
-  async function getDelay(code = '') {
+    async function getDelay(code: string): Promise<string | undefined> {
-    console.log(`Fetching delay reason ${code}`);
         const data = await getReason(code);
-    return data[0].lateReason || 'This train has been delayed';
+        if (data) {
+            return data[0].lateReason || "This train has been delayed";
+        }
     }
 
-  async function getCancel(code = '') {
+    async function getCancel(code: string): Promise<string | undefined> {
-    console.log(`Fetching cancel reason ${code}`);
         const data = await getReason(code);
-    return data[0].cancReason || 'This train has been cancelled';
+        if (data) {
+            return data[0].cancReason || "This train has been cancelled";
+        }
     }
 
-  async function getReason(code = '') {
+    async function getReason(code: string): Promise<ReasonCode[] | undefined> {
-    const url = `https://owlboard.info/api/v2/ref/reasonCode/${code}`;
+        const apiString = `/api/v2/ref/reasonCode/${code}`;
-    const options = {
+        try {
-      method: 'GET',
+            const apiRes = (await apiGet(apiString)) as ReasonCode[];
-      headers: {
+            return apiRes;
-        uuid: $uuid
+        } catch (err) {
+            console.error("Unable to define reason code");
         }
-    };
-    const res = await fetch(url, options);
-    return await res.json();
     }
 </script>
 
-{#if type === 'cancel'}
+{#if type === "cancel"}
     {#await getCancel(code)}
         This train has been cancelled
     {:then reason}
@@ -37,7 +38,7 @@
     {:catch}
         This train has been cancelled
     {/await}
-{:else if type === 'delay'}
+{:else if type === "delay"}
     {#await getDelay(code)}
         This train has been delayed
     {:then reason}

src/lib/scripts/apiFetch.ts

@@ -0,0 +1,55 @@
+import { dev } from "$app/environment";
+import { uuid } from "$lib/stores/uuid";
+import type { Unsubscriber } from "svelte/store";
+
+function getUrlString(): string {
+    if (dev) {
+        const testUrl: string = "http://localhost:8460";
+        console.info("DEVMODE active, using testing URL: ", testUrl);
+        return testUrl;
+    } else {
+        const currentUrl: string = `https://${window.location.host}`;
+        return currentUrl;
+    }
+}
+
+export async function apiGet(path: string): Promise<any> {
+    let uuidString: string = "";
+    let unsubscribe: Unsubscriber;
+    try {
+        unsubscribe = uuid.subscribe((value) => {
+            uuidString = value;
+        });
+    } catch (err) {
+        throw new Error("Unable to read UUID");
+    }
+
+    const options = {
+        method: "GET",
+        headers: {
+            uuid: uuidString,
+        },
+    };
+
+    try {
+        const res = await fetch(getUrlString() + path, options);
+
+        if (res.status === 401) {
+            throw new Error("Registration not accepted.  Register at `Menu > Registration`");
+        }
+
+        if (!res.ok) {
+            throw new Error(`Failed: ${res.status}: ${res.statusText}`);
+        }
+        const contentType = res.headers.get("content-type");
+        if (!contentType || !contentType.includes("application/json")) {
+            throw new Error("Invalid response.  Require JSON.");
+        }
+        return await res.json();
+    } catch (err) {
+        console.error("Error fetching data:", err);
+        throw err;
+    } finally {
+        unsubscribe();
+    }
+}

src/lib/scripts/featureDetect.ts

@@ -0,0 +1,49 @@
+export interface FeatureDetectionResult {
+    critical: boolean;
+    nice: boolean;
+    missing: string[];
+}
+
+export function featureDetect(): FeatureDetectionResult {
+    console.info("Running feature detection");
+    // Define critical features
+    const criticalFeatures = {
+        fetch: "fetch" in window,
+        localStorage: "localStorage" in window && window["localStorage"] !== null,
+        sessionStorage: "sessionStorage" in window && window["sessionStorage"] !== null,
+        promise: "Promise" in window,
+    };
+
+    // Define nice-to-have features
+    const niceToHaveFeatures = {
+        geolocation: "geolocation" in navigator,
+        serviceWorker: "serviceWorker" in navigator,
+        dialog: "HTMLDialogElement" in window,
+        popover: "showPopover" in HTMLElement.prototype, // Note: 'Popover' might need more specific checks based on implementation
+    };
+
+    // Initialize result object
+    const result = {
+        critical: true,
+        nice: true,
+        missing: [],
+    };
+
+    // Check critical features
+    for (const [feature, available] of Object.entries(criticalFeatures)) {
+        if (!available) {
+            result.critical = false;
+            result.missing.push(feature);
+        }
+    }
+
+    // Check nice-to-have features
+    for (const [feature, available] of Object.entries(niceToHaveFeatures)) {
+        if (!available) {
+            result.nice = false;
+            result.missing.push(feature);
+        }
+    }
+
+    return result;
+}

src/lib/scripts/getLocation.ts

@@ -0,0 +1,39 @@
+export async function getCurrentLocation(): Promise<locationObj> {
+    console.debug("Fetching location");
+
+    if (typeof window === "undefined") {
+        console.error("Location fetch has run serverside - invalid method");
+    }
+
+    if (!navigator.geolocation) {
+        console.error("Geolocation is not supported");
+        throw new Error("Geolocation is not supported");
+    }
+
+    return new Promise((resolve, reject) => {
+        const options = {
+            timeout: 10000,
+            maximumAge: 300,
+        };
+
+        navigator.geolocation.getCurrentPosition(
+            (position) => {
+                console.debug(`Position obtained: ${position.coords}`);
+                resolve({
+                    latitude: position.coords.latitude,
+                    longitude: position.coords.longitude,
+                });
+            },
+            (error) => {
+                console.error("Error fetching location: ", error);
+                reject(error);
+            }
+        );
+        options;
+    });
+}
+
+export interface locationObj {
+    latitude: number;
+    longitude: number;
+}

src/lib/scripts/upstream.ts

@@ -0,0 +1,12 @@
+import { dev } from "$app/environment";
+
+const testUrl: string = "http://localhost:8460";
+const prodUrl: string = "https://owlboard.info";
+
+export function getApiUrl() {
+    if (dev) {
+        console.info("DEVMODE active, using testing URL: ", testUrl);
+        return testUrl;
+    }
+    return prodUrl;
+}

src/lib/stores/SetTelemetryConsent.ts

@@ -0,0 +1,14 @@
+import { get } from "svelte/store";
+import { telemetry } from "./telemetryConsent";
+
+export function setTelemetryTrue() {
+    telemetry.set(true);
+}
+
+export function setTelemetryFalse() {
+    telemetry.set(false);
+}
+
+export function getTelemetry(): boolean {
+    return get(telemetry);
+}

src/lib/stores/location.ts

@@ -0,0 +1,25 @@
+// src/stores.js
+import { writable, type Writable } from "svelte/store";
+import { browser } from "$app/environment";
+
+// Initialize the store with a boolean value from local storage
+export const location: Writable<boolean> = writable(fromLocalStorage("location", false));
+toLocalStorage(location, "location");
+
+function fromLocalStorage(storageKey: string, fallback: boolean): boolean {
+    if (browser) {
+        const storedValue = localStorage.getItem(storageKey);
+        if (storedValue !== null && storedValue !== "undefined") {
+            return storedValue === "true";
+        }
+    }
+    return fallback;
+}
+
+function toLocalStorage(store: Writable<boolean>, storageKey: string) {
+    if (browser) {
+        store.subscribe((value: boolean) => {
+            localStorage.setItem(storageKey, String(value));
+        });
+    }
+}

src/lib/stores/nearToMeCache.ts

@@ -0,0 +1,26 @@
+import { writable, type Writable } from "svelte/store";
+import { browser } from "$app/environment";
+import type { NearestStationResponse } from "@owlboard/ts-types";
+
+export const nearToMeCache = writable(fromSessionStorage("nearToMeCache", []));
+toSessionStorage(nearToMeCache, "nearToMeCache");
+
+function fromSessionStorage(storageKey: string, fallback: NearestStationResponse[]): NearestStationResponse[] {
+    if (browser) {
+        const storedValue = sessionStorage.getItem(storageKey);
+        if (storedValue !== "undefined" && storedValue !== null) {
+            return typeof fallback === "object" ? JSON.parse(storedValue) : storedValue;
+        }
+    }
+    return fallback;
+}
+
+function toSessionStorage(store: Writable<NearestStationResponse[]>, storageKey: string) {
+    if (browser) {
+        store.subscribe((value) => {
+            let storageValue = typeof value === "object" ? JSON.stringify(value.sort()) : value;
+
+            sessionStorage.setItem(storageKey, storageValue);
+        });
+    }
+}

src/lib/stores/quick-links.ts

@@ -1,14 +1,14 @@
-import { writable, type Writable } from 'svelte/store';
+import { writable, type Writable } from "svelte/store";
-import { browser } from '$app/environment';
+import { browser } from "$app/environment";
 
-export const ql = writable(fromLocalStorage('ql', []));
+export const ql = writable(fromLocalStorage("ql", []));
-toLocalStorage(ql, 'ql');
+toLocalStorage(ql, "ql");
 
 function fromLocalStorage(storageKey: string, fallback: string[]): string[] {
     if (browser) {
         const storedValue = localStorage.getItem(storageKey);
-    if (storedValue !== 'undefined' && storedValue !== null) {
+        if (storedValue !== "undefined" && storedValue !== null) {
-      return typeof fallback === 'object' ? JSON.parse(storedValue) : storedValue;
+            return typeof fallback === "object" ? JSON.parse(storedValue) : storedValue;
         }
     }
     return fallback;
@@ -17,7 +17,7 @@ function fromLocalStorage(storageKey: string, fallback: string[]): string[] {
 function toLocalStorage(store: Writable<string[]>, storageKey: string) {
     if (browser) {
         store.subscribe((value) => {
-      let storageValue = typeof value === 'object' ? JSON.stringify(value.sort()) : value;
+            let storageValue = typeof value === "object" ? JSON.stringify(value.sort()) : value;
 
             localStorage.setItem(storageKey, storageValue);
         });

src/lib/stores/telemetryConsent.ts

@@ -0,0 +1,25 @@
+// src/stores.js
+import { writable, type Writable } from "svelte/store";
+import { browser } from "$app/environment";
+
+// Initialize the store with a boolean value from local storage
+export const telemetry: Writable<boolean> = writable(fromLocalStorage("telemetry", false));
+toLocalStorage(telemetry, "telemetry");
+
+function fromLocalStorage(storageKey: string, fallback: boolean): boolean {
+    if (browser) {
+        const storedValue = localStorage.getItem(storageKey);
+        if (storedValue !== null && storedValue !== "undefined") {
+            return storedValue === "true";
+        }
+    }
+    return fallback;
+}
+
+function toLocalStorage(store: Writable<boolean>, storageKey: string) {
+    if (browser) {
+        store.subscribe((value: boolean) => {
+            localStorage.setItem(storageKey, String(value));
+        });
+    }
+}

src/lib/stores/tocMap.ts

@@ -1,43 +1,44 @@
 export const tocs = new Map<string, string>([
-  ['gw', 'Great Western Railway'],
+    ["gw", "Great Western Railway"],
-  ['sw', 'South Western Railway'],
+    ["sw", "South Western Railway"],
-  ['id', 'Island Line'],
+    ["il", "Island Line"],
-  ['nt', 'Northern'],
+    ["nt", "Northern"],
-  ['aw', 'Transport for Wales'],
+    ["aw", "Trafnidiaeth Cymru"],
-  ['cc', 'c2c'],
+    ["cc", "c2c"],
-  ['cs', 'Caledonian Sleeper'],
+    ["cs", "Caledonian Sleeper"],
-  ['ch', 'Chiltern Railways'],
+    ["ch", "Chiltern Railways"],
-  ['xc', 'CrossCountry'],
+    ["xc", "CrossCountry"],
-  ['em', 'East Midlands Railway'],
+    ["em", "East Midlands Railway"],
-  ['es', 'Eurostar'],
+    ["es", "Eurostar"],
-  ['ht', 'Hull Trains'],
+    ["ht", "Hull Trains"],
-  ['tl', 'Thameslink'],
+    ["tl", "Thameslink"],
-  ['gc', 'Grand Central'],
+    ["gc", "Grand Central"],
-  ['gx', 'Gatwick Express'],
+    ["gx", "Gatwick Express"],
-  ['hx', 'Heathrow Express'],
+    ["hx", "Heathrow Express"],
-  ['ls', 'Locomotive Services Limited'],
+    ["ls", "Locomotive Services Limited"],
-  ['me', 'Merseyrail'],
+    ["me", "Merseyrail"],
-  ['lr', 'Network Rail OTM'],
+    ["lr", "Network Rail OTM"],
-  ['xr', 'TfL Elizabeth Line'],
+    ["xr", "TfL Elizabeth Line"],
-  ['se', 'Southeastern'],
+    ["se", "Southeastern"],
-  ['sn', 'Southern'],
+    ["sn", "Southern"],
-  ['le', 'Greater Anglia'],
+    ["le", "Greater Anglia"],
-  ['ga', 'Greater Anglia'],
+    ["ga", "Greater Anglia"],
-  ['lm', 'West Midlands Railway'],
+    ["lm", "West Midlands Railway (LM)"],
-  ['sr', 'ScotRail'],
+    ["sr", "ScotRail"],
-  ['gn', 'Great Northern'],
+    ["gn", "Great Northern"],
-  ['lt', 'TfL London Underground'],
+    ["lt", "TfL London Underground"],
-  ['lo', 'TfL London Overground'],
+    ["lo", "TfL London Overground"],
-  ['sj', 'Sheffield SuperTram'],
+    ["sj", "SuperTram (Sheffield)"],
-  ['tp', 'TransPennine Express'],
+    ["tp", "TransPennine Express"],
-  ['vt', 'Avanti West Coast'],
+    ["vt", "Avanti West Coast"],
-  ['gr', 'LNER'],
+    ["gr", "LNER"],
-  ['wr', 'West Coast Railway'],
+    ["wr", "West Coast Railway"],
-  ['ty', 'Vintage Trains'],
+    ["ty", "Vintage Trains"],
-  ['ld', 'Lumo'],
+    ["tw", "Nexus (Tyne & Wear Metro)"],
-  ['so', 'Rail Adventure'],
+    ["ld", "Lumo"],
-  ['ln', 'Grand Union Trains'],
+    ["so", "Rail Adventure"],
-  ['zz', 'Freight/Charter Company'],
+    ["ln", "Grand Union Trains"],
-  ['wm', 'West Midlands Railway (WMT)'],
+    ["zz", "Freight/Charter Company"],
-  ['uk', 'Unknown Operator']
+    ["wm", "West Midlands Railway (WM)"],
+    ["uk", "Unknown Operator"],
 ]);

src/lib/stores/uuid.js

@@ -1,13 +1,13 @@
-import { writable } from 'svelte/store';
+import { writable } from "svelte/store";
-import { browser } from '$app/environment';
+import { browser } from "$app/environment";
 
-export const uuid = writable(fromLocalStorage('uuid', null));
+export const uuid = writable(fromLocalStorage("uuid", null));
-toLocalStorage(uuid, 'uuid');
+toLocalStorage(uuid, "uuid");
 
 function fromLocalStorage(storageKey, fallback) {
     if (browser) {
         const storedValue = localStorage.getItem(storageKey);
-    if (storedValue !== 'undefined') {
+        if (storedValue !== "undefined") {
             return storedValue;
         }
     }

src/lib/stores/version.ts

@@ -1,3 +1,2 @@
-export const version: string = '2023.8.3';
+export const version: string = "2025.05.1";
-export const versionTag: string = '';
+export const versionTag: string = "";
-export const showWelcome: boolean = false;

src/lib/stores/welcome.ts

@@ -1,23 +0,0 @@
-import { writable, type Writable } from 'svelte/store';
-import { browser } from '$app/environment';
-
-export const welcome = writable(fromLocalStorage('welcome', '0'));
-toLocalStorage(welcome, 'welcome');
-
-function fromLocalStorage(storageKey: string, fallback: string) {
-  if (browser) {
-    const storedValue = localStorage.getItem(storageKey);
-    if (storedValue !== 'undefined') {
-      return storedValue;
-    }
-  }
-  return fallback;
-}
-
-function toLocalStorage(store: Writable<any>, storageKey: string) {
-  if (browser) {
-    store.subscribe((value: string) => {
-      localStorage.setItem(storageKey, value);
-    });
-  }
-}

src/lib/themes.css

@@ -0,0 +1,60 @@
+/* OLD THEME
+:root {
+    --main-bg-color: #404c55;
+    --second-bg-color: #2b343c;
+    --accent-color: #007979;
+    --overlay-color: #3c6f79de;
+    --overlay-color-solid: #3c6f79;
+    --main-text-color: #00b7b7;
+    --second-text-color: #0afdfd;
+    --note-text-color: #9de7ff;
+    --link-color: azure;
+    --box-border-color: rgba(0,0,0,0.19);
+    --link-visited-color: azure;
+    --main-alert-color: #ed6d00;
+    --second-alert-color: #e77f00;
+    --main-warning-color: orange;
+    --board-name-color: #fcfc09;
+}*/
+
+/* Main Theme */
+:root {
+    --main-bg-color: #404c55;
+    --second-bg-color: #2b343c;
+    --main-header-color: #dff3f3;
+    --main-text-color: #cce9e9;
+    --secondary-text-color: #02fcfc;
+    --main-link-color: #00b7b7;
+    --island-bg-color: #3c6f79de;
+    --island-bg-solid: #3c6f79;
+    --island-button-color: #404c55;
+    --island-link-color: #e1ebeb;
+    --island-header-color: #4fd1d1;
+    --island-text-color: #e1ebeb;
+    --overlay-island-bg-color: #3c6f79;
+    --box-shadow-color: rgba(0, 0, 0, 0.19);
+    --box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.19);
+    --box-shadow-dark: 2px 2px 4px rgba(0, 0, 0, 0.392);
+    --main-alert-color: #ed6d00;
+    --second-alert-color: #e77f00;
+    --main-warning-color: orange;
+}
+
+/* Christmas Theme 
+:root {
+    --main-bg-color: #404c55;
+    --second-bg-color: #2b343c;
+    --main-header-color: #00ff00;
+    --main-text-color: #ff0000;
+    --main-link-color: #2bc500;
+    --island-bg-color: #9900ffde;
+    --island-bg-solid: #3c6f79;
+    --island-button-color: #404c55;
+    --island-link-color: #cce9e9;
+    --island-header-color: #4fd1d1;
+    --island-text-color: #cce9e9;
+    --overlay-island-bg-color: #3c6f79;
+    --box-shadow-color: rgba(0,0,0,0.19);
+    --box-shadow: 2px 2px 4px rgba(0,0,0,0.19);
+}
+*/

src/lib/train/pis-handler.svelte

@@ -0,0 +1,33 @@
+<script lang="ts">
+    import type { OB_Pis_SimpleObject } from "@owlboard/ts-types";
+
+    export let pisObject: OB_Pis_SimpleObject;
+</script>
+
+{#if pisObject}
+    {#if typeof pisObject === "string" || typeof pisObject === "number"}
+        <span class="pis">PIS: {pisObject}</span>
+    {:else if pisObject["skipCount"] === 0}
+        <span class="pis">PIS: {pisObject.code}</span>
+    {:else if pisObject["skipCount"] > 0}
+        <span class="pis">PIS: {pisObject.code}</span>
+        <br />
+        <span class="pis-text"
+            >(skip {pisObject.skipType}{#if pisObject.skipCount > 1} {" " + pisObject.skipCount} stops{:else} stop{/if})</span
+        >
+    {/if}
+{/if}
+
+<style>
+    .pis-text {
+        font-size: 14px;
+        font-weight: 600;
+        color: var(--main-text-color);
+    }
+
+    .pis {
+        font-size: 18px;
+        font-weight: 600;
+        color: var(--main-text-color);
+    }
+</style>

src/lib/train/styles-toc.svelte

@@ -2,7 +2,7 @@
     export let toc: string;
     export let full: boolean = false;
 
-  import { tocs as map } from '$lib/stores/tocMap';
+    import { tocs as map } from "$lib/stores/tocMap";
 
     let text: string;
 

src/lib/train/train-detail.svelte

@@ -1,26 +1,32 @@
-<script>
+<script lang="ts">
-  import { fly } from 'svelte/transition';
+    import { fly } from "svelte/transition";
-  import { uuid } from '$lib/stores/uuid';
+    import { uuid } from "$lib/stores/uuid";
-  import LoadingText from '$lib/navigation/loading-text.svelte';
+    import LoadingText from "$lib/navigation/loading-text.svelte";
-  import StylesToc from './styles-toc.svelte';
+    import StylesToc from "./styles-toc.svelte";
+    import { getApiUrl } from "$lib/scripts/upstream";
+    import PisHandler from "$lib/train/pis-handler.svelte";
 
-  export let service = '';
+    import type { OB_TrainTT_service } from "@owlboard/ts-types";
+    import TrainIcons from "./trainIcons.svelte";
+
+    export let service: OB_TrainTT_service;
+    export let date: Date;
 
     let isExpanded = false;
 
-  async function getTrainByUID(tuid = '') {
+    async function getTrainByUID(tuid = "") {
-    const url = `https://owlboard.info/api/v2/timetable/train/now/byTrainUid/${tuid}`;
+        const url = `${getApiUrl()}/api/v2/timetable/train/${date.toISOString().split('T')[0]}/byTrainUid/${tuid}`;
         const options = {
-      method: 'GET',
+            method: "GET",
             headers: {
-        uuid: $uuid
+                uuid: $uuid,
-      }
+            },
         };
         const res = await fetch(url, options);
         if (res.status === 200) {
             return await res.json();
         } else {
-      throw new Error('Unable to Fetch');
+            throw new Error("Unable to Fetch");
         }
     }
 
@@ -29,14 +35,12 @@
     }
 </script>
 
-<!-- The next version of backend will only return a subset of information required to display the container-header
-      , the container will then be responsible for fetching more data using the trainUid. -->
 <div class="container">
     <div class="container-header" on:click={expand} on:keypress={expand}>
         <span class="header"
-      ><StylesToc toc={service?.operator || ''} />
+            ><StylesToc toc={service?.operator || ""} />
-      {service?.stops[0]['publicDeparture'] || service?.stops[0]['wttDeparture']}
+            {service?.stops[0]["publicDeparture"] || service?.stops[0]["wttDeparture"]}
-      {service?.stops[0]['tiploc']} to {service?.stops[service['stops'].length - 1]['tiploc']}</span
+            {service?.stops[0]["tiploc"]} to {service?.stops[service["stops"].length - 1]["tiploc"]}</span
         >
         <span id="container-arrow" class:isExpanded>V</span>
     </div>
@@ -45,49 +49,60 @@
             {#await getTrainByUID(service.trainUid)}
                 <LoadingText />
             {:then serviceDetail}
-        <div class="detailOperator"><StylesToc toc={service?.operator || ''} full={true} /></div>
+                {#if serviceDetail.stpIndicator === "C"}
+                    <p class="text-message">This has been removed from the timetable for today.</p>
+                    <p class="text-message">The service may have been retimed, re-routed or removed from todays timetable completely.</p>
+                    <p class="text-message">If it has been retimed or re-routed, there is likely to be another service with the same headcode booked to run.</p>
+                {:else}
+                    <div class="detailOperator"><StylesToc toc={service?.operator || ""} full={true} /></div>
+
+                    <TrainIcons serviceDetails={serviceDetail.serviceDetail} />
                     {#if serviceDetail.pis}
-          <p class="pis">PIS: {serviceDetail.pis}</p>
+                        <PisHandler pisObject={serviceDetail.pis} />
                     {/if}
                     <p class="svc-detail">
-          Planned Type: {parseInt(serviceDetail.planSpeed) || '--'}mph {serviceDetail.powerType || 'Non-Rail vehicle'}
+                        Planned Type: {parseInt(serviceDetail.planSpeed) || "--"}mph {serviceDetail.powerType || "Non-Rail vehicle"}
                     </p>
                     <p class="svc-detail">
-          Days Run: {serviceDetail?.daysRun.join(', ').toUpperCase() || 'Unknown'}
+                        Days Run: {serviceDetail?.daysRun.join(", ").toUpperCase() || "Unknown"}
                     </p>
                     <p class="svc-detail validity">
-          Valid From: {new Date(serviceDetail.scheduleStartDate).toLocaleDateString('en-GB', {
+                        Valid From: {new Date(serviceDetail.scheduleStart).toLocaleDateString("en-GB", {
-            timeZone: 'UTC'
+                            timeZone: "UTC",
-          })} - {new Date(serviceDetail.scheduleEndDate).toLocaleDateString('en-GB', {
+                        })} - {new Date(serviceDetail.scheduleEnd).toLocaleDateString("en-GB", {
-            timeZone: 'UTC'
+                            timeZone: "UTC",
                         })}
                     </p>
                     <table>
+                        <caption>Italics are 'pass' times, grey times are non-passenger stops</caption>
                         <tr>
                             <th>Location</th>
+                            <th>Plt.</th>
                             <th>Sch Arr.</th>
                             <th>Sch Dep.</th>
                         </tr>
-          {#if serviceDetail.stops[0]['publicDeparture']}
                         {#each serviceDetail.stops as stop}
+                            <tr>
                                 {#if stop.publicArrival || stop.publicDeparture}
-                <tr>
                                     <td>{stop.tiploc}</td>
-                  <td>{stop.publicArrival || '-'}</td>
+                                    <td>{stop.platform || "-"}</td>
-                  <td>{stop.publicDeparture || '-'}</td>
+                                    <td>{stop.publicArrival || "-"}</td>
-                </tr>
+                                    <td>{stop.publicDeparture || "-"}</td>
-              {/if}
+                                {:else if stop.wttArrival || stop.wttDeparture}
-            {/each}
+                                    <td class="wtt">{stop.tiploc}</td>
+                                    <td class="wtt">{stop.platform || stop.depLine || stop.arrLine || "-"}</td>
+                                    <td class="wtt">{stop.wttArrival || "-"}</td>
+                                    <td class="wtt">{stop.wttDeparture || "-"}</td>
                                 {:else}
-            {#each serviceDetail.stops as stop}
+                                    <td class="pass">{stop.tiploc}</td>
-              <tr>
+                                    <td class="pass">{stop.platform || stop.depLine || stop.arrLine || "-"}</td>
-                <td>{stop.tiploc}</td>
+                                    <td class="pass">-</td>
-                <td>{stop.wttArrival || '-'}</td>
+                                    <td class="pass">{stop.pass || "-"}</td>
-                <td>{stop.wttDeparture || '-'}</td>
+                                {/if}
                             </tr>
                         {/each}
-          {/if}
                     </table>
+                {/if}
             {:catch}
                 <p>Unable to fetch train data</p>
             {/await}
@@ -103,10 +118,11 @@
         width: 95%;
         max-width: 600px;
         height: auto;
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-solid);
         border-radius: 10px;
         overflow: hidden;
         transition: height 500ms ease-in-out;
+        box-shadow: 5px 5px 30px var(--box-shadow-color);
     }
     .container-header {
         text-align: left;
@@ -116,12 +132,12 @@
         padding-top: 12px;
         padding-bottom: 10px;
         font-family: ubuntu, monospace;
-    color: white;
+        color: var(--island-text-color);
     }
     #container-arrow {
         font-family: Arial, Helvetica, sans-serif;
         font-weight: 600;
-    color: white;
+        color: var(--island-text-color);
         margin: 0;
         padding: 0;
         position: absolute;
@@ -138,25 +154,35 @@
         margin-bottom: 15px;
         font-weight: 600;
     }
-  .pis {
-    font-size: 18px;
-    font-weight: 600;
-    color: azure;
-    margin-top: 10px;
-    margin-bottom: 5px;
-  }
     .svc-detail {
-    margin-top: 2px;
+        margin-top: 6px;
         margin-bottom: 2px;
-    color: white;
+        color: var(--island-text-color);
     }
     .validity {
         font-size: 14px;
     }
     table {
         margin: auto;
-    padding-top: 10px;
+        padding-top: 5px;
+        padding-bottom: 10px;
+        color: var(--island-text-color);
+    }
+    caption {
+        padding-top: 15px;
+        font-size: small;
+    }
+    .wtt {
+        opacity: 0.5;
+    }
+    .pass {
+        font-style: italic;
+        opacity: 0.5;
+    }
+    .text-message {
+        margin: 5px;
+        margin-left: 20px;
+        margin-right: 20px;
         padding-bottom: 10px;
-    color: white;
     }
 </style>

src/lib/train/trainIcons.svelte

@@ -0,0 +1,39 @@
+<script lang="ts">
+    import Tooltip from "$lib/Tooltip.svelte";
+    import type { ServiceDetail } from "@owlboard/ts-types";
+    import { IconBed, IconSquare1, IconSquareLetterV, IconToolsKitchen2 } from "@tabler/icons-svelte";
+
+    export let serviceDetails: ServiceDetail;
+</script>
+
+{#if serviceDetails.firstClass}
+    <Tooltip text="First Class is available">
+        <IconSquare1 />
+    </Tooltip>
+{/if}
+
+{#if serviceDetails.catering}
+    <Tooltip text="Catering is available">
+        <IconToolsKitchen2 />
+    </Tooltip>
+{/if}
+
+{#if serviceDetails.sleeper}
+    <Tooltip text="Sleeping Berths are available">
+        <IconBed />
+    </Tooltip>
+{/if}
+
+{#if serviceDetails.vstp}
+    <Tooltip text="This is a VSTP planned service">
+        <IconSquareLetterV />
+    </Tooltip>
+{/if}
+
+<!-- Render a newline if any of the icons is to appear -->
+{#if serviceDetails.firstClass || serviceDetails.catering || serviceDetails.sleeper || serviceDetails.vstp}
+    <br />
+{/if}
+
+<style>
+</style>

src/routes/+error.svelte

@@ -1,16 +1,20 @@
 <script>
-  import { page } from '$app/stores';
+    import { page } from "$app/stores";
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  const title = 'OwlBoard - Error';
+    const title = "OwlBoard - Error";
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
 
 <h1>{$page.status}: {$page?.error?.message}</h1>
 
 {#if $page.status === 404}
-  <p>This is not the page you're looking for.</p>
+    <p>There's no light at the end of this tunnel</p>
     <p>The page you are looking for doesn't exist, use the tabs below to find another page.</p>
 {:else if $page.status === 500}
     <p>

src/routes/+layout.svelte

@@ -1,24 +1,45 @@
 <script>
-  import '../app.css';
+    import "$lib/themes.css";
-  import { dev } from '$app/environment';
+    import "$lib/main.css";
-  import DevBanner from '$lib/DevBanner.svelte';
+    import { dev } from "$app/environment";
+    import DevBanner from "$lib/DevBanner.svelte";
+    import { page } from "$app/stores";
+    import { Toaster } from "svelte-french-toast";
+    import AnalyticsConsent from "$lib/popover/analytics-consent.svelte";
 </script>
 
 <svelte:head>
+    <!--
+  ___         _ ___                   _ 
+ / _ \__ __ _| | _ ) ___  __ _ _ _ __| |
+| (_) \ V  V / | _ \/ _ \/ _` | '_/ _` |
+ \___/ \_/\_/|_|___/\___/\__,_|_| \__,_|
+ Check out the source code on Gitea (https://git.fjla.net/OwlBoard)
+ It's easier to read there
+-->
+
     <meta name="application-name" content="OwlBoard" />
     <meta name="author" content="Frederick Boniface" />
     <meta
         name="description"
-    content="Get instant access to live train data, PIS codes, and location reference codes. Built by railway staff, for railway staff – your fastest route to accurate information."
+        content="Get instant access to live train data, PIS codes, and location reference codes. Built by railway staff, for railway staff - your fastest route to accurate information."
     />
     <meta name="viewport" content="width=device-width" />
     <meta name="theme-color" content="#00b7b7" />
+    <link rel="canonical" href="https://owlboard.info{$page.url.pathname}" />
     <link rel="icon" href="/images/icon.svg" type="image/svg+xml" />
     <link rel="apple-touch-icon" href="/images/app-icons/any/apple-192.png" />
     <link rel="manifest" href="/manifest.json" />
     <title>OwlBoard</title>
 </svelte:head>
+
+<Toaster />
+<AnalyticsConsent />
+
 {#if dev}
     <DevBanner />
 {/if}
 <slot />
+
+<style>
+</style>

src/routes/+page.svelte

@@ -1,38 +1,42 @@
-<script>
+<script lang="ts">
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import InputIsland from '$lib/islands/input-island-form.svelte';
+    import { featureDetect } from "$lib/scripts/featureDetect";
-  import QuickLinkIsland from '$lib/islands/quick-link-island.svelte';
+    import { onMount } from "svelte";
-  import Welcome from '$lib/overlays/welcome.svelte';
+    import toast from "svelte-french-toast";
-  import { welcome } from '$lib/stores/welcome';
+    import type { LookupCardConfig } from "$lib/cards/Card.types";
-  import { version, showWelcome } from '$lib/stores/version';
+    import LookupCard from "$lib/cards/LookupCard.svelte";
-
+    import NearToMeCard from "$lib/cards/NearToMeCard.svelte";
-  const title = 'OwlBoard';
+    import QuickLinkCard from "$lib/cards/QuickLinkCard.svelte";
-  const inputIslands = [
+    import FindByHeadcodeCard from "$lib/cards/FindByHeadcodeCard.svelte";
+    const title = "OwlBoard";
+    const lookupCards: LookupCardConfig[] = [
         {
-      title: 'Live Departure Boards',
+            title: "Live Arr/Dep Boards",
-      action: '/ldb',
+            helpText: "",
-      placeholder: 'Enter CRS/TIPLOC',
+            formAction: "/ldb",
-      queryName: 'station'
+            placeholder: "enter crs/tiploc",
-    },
+            maxLen: 7,
-    {
+            fieldName: "station",
-      title: 'Train Details & PIS',
-      action: '/train',
-      placeholder: 'Enter Headcode',
-      queryName: 'headcode'
         }
     ];
+
+    onMount(async () => {
+        const featureSupport = featureDetect();
+        if (!featureSupport.critical) {
+            toast.error("Use a newer browser or OwlBoard might not work properly.  See `Menu > Statistics` for more information.");
+        } else if (!featureSupport.nice) {
+            toast.error("Use a newer browser for the best experience, see `Menu > Statistics` for more information.");
+        }
+    });
 </script>
 
-{#if showWelcome && ($welcome === 'null' || !$welcome || parseInt($welcome.replace(/\./g, '')) < parseInt(version.replace(/\./g, '')))}
-  <Welcome />
-{/if}
 <Header {title} />
-
+{#each lookupCards as config}
-{#each inputIslands as variables}
+    <LookupCard {config} />
-  <InputIsland {variables} />
 {/each}
-
+<FindByHeadcodeCard />
-<QuickLinkIsland />
+<NearToMeCard />
+<QuickLinkCard />
 
 <Nav />

src/routes/err/404/+page.svelte

@@ -0,0 +1,27 @@
+<script lang="ts">
+    import Header from "$lib/navigation/header.svelte";
+    import Nav from "$lib/navigation/nav.svelte";
+
+    const title = "404 - Not Found";
+</script>
+
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
+<Header {title} />
+<h1 class="heading">There's no light at the end of this tunnel</h1>
+<p>The page you were looking for wasn't found</p>
+<p>Use the menu bar to try another destination</p>
+<br />
+<p class="err_code">Status: 404<br />Message: NOT_FOUND</p>
+<Nav />
+
+<style>
+    .heading {
+        color: var(--second-text-color);
+    }
+    .err_code {
+        color: white;
+    }
+</style>

src/routes/err/50x/+page.svelte

@@ -0,0 +1,27 @@
+<script lang="ts">
+    import Header from "$lib/navigation/header.svelte";
+    import Nav from "$lib/navigation/nav.svelte";
+
+    const title = "50x - Server Error";
+</script>
+
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
+<Header {title} />
+<h1 class="heading">This page has been delayed by more servers than usual needing repairs at the same time</h1>
+<p>There was an error with the server, please try again later</p>
+<p>Use the menu bar to try another destination, you can report an issue from the 'Menu'</p>
+<br />
+<p class="err_code">Status: 50x<br />Message: INTERNAL_SERVER_ERROR</p>
+<Nav />
+
+<style>
+    .heading {
+        color: var(--second-text-color);
+    }
+    .err_code {
+        color: white;
+    }
+</style>

src/routes/ldb/+page.svelte

@@ -1,42 +1,49 @@
-<script>
+<script lang="ts">
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav-ldb.svelte';
+    import Nav from "$lib/navigation/nav-ldb.svelte";
-  import PublicLdb from '$lib/ldb/public-ldb.svelte';
+    import PublicLdb from "$lib/ldb/public-ldb.svelte";
-  import StaffLdb from '$lib/ldb/staff/staff-ldb.svelte';
+    import StaffLdb from "$lib/ldb/staff/staff-ldb.svelte";
-  import { uuid } from '$lib/stores/uuid.js';
+    import { uuid } from "$lib/stores/uuid.js";
-  import { onMount } from 'svelte';
+    import { onMount } from "svelte";
 
-  let title = 'Loading';
+    let title = "Loading";
 
     async function getHeadcode() {
-    return new URLSearchParams(window.location.search).get('station');
+        return new URLSearchParams(window.location.search).get("station");
     }
 
-  let station = '';
+    let station: string;
-  let staff = false;
+    let staff: boolean;
-  let uuidValue = '';
+    let uuidValue: string;
+    let blockLoading: boolean = true;
 
     $: uuidValue = $uuid;
 
     onMount(async () => {
-    station = (await getHeadcode()) || '';
+        station = (await getHeadcode()) || "";
-    if (uuidValue !== null && uuidValue !== '' && uuidValue !== 'null') {
+        if (uuidValue !== null && uuidValue !== "" && uuidValue !== "null") {
             staff = true;
-      title = 'Staff Board';
+            title = "Staff Board";
         } else {
-      title = 'Public Board';
+            title = "Public Board";
         }
+
+        blockLoading = false;
     });
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
 
-<!-- If 'uuid' exists in store then load StaffLdb else load PublicLdb -->
+{#if !blockLoading}
     {#if !staff}
         <PublicLdb {station} bind:title />
     {:else}
         <StaffLdb {station} bind:title />
-  <!--<StaffLdb {station} bind:title={title} /> -- Temporary, Disable StaffLdb - it isn't implemented -->
+    {/if}
 {/if}
 
 <Nav />

src/routes/maintenance-mode/+page.svelte

@@ -0,0 +1,14 @@
+<script>
+    import LargeLogo from "$lib/images/large-logo.svelte";
+
+</script>
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+<LargeLogo />
+<h1>
+OwlBoard is down for maintenance
+</h1>
+<p>
+    Maintenance is expected to be complete by 23:59 on 22/11/2024
+</p>

src/routes/more/+page.svelte

@@ -1,27 +1,44 @@
 <script>
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  const title = 'More';
+    import {
+        IconHelp,
+        IconInfoCircle,
+        IconLocation,
+        IconMessageCode,
+        IconNumber,
+        IconSettings,
+        IconSpy,
+        IconUser,
+        IconUserPlus,
+        IconVersions,
+    } from "@tabler/icons-svelte";
+    const title = "More";
 
     const links = [
-    { title: 'Your Data', path: '/more/data' },
+        { title: "Help", path: "https://docs.owlboard.info", icon: IconHelp },
-    { title: 'Registration', path: '/more/reg' },
+        { title: "Settings", path: "/more/settings", icon: IconSettings },
-    { title: 'Settings', path: '/more/settings' },
+        { title: "Your Data", path: "/more/data", icon: IconUser },
-    { title: 'Report Issue', path: '/more/report' },
+        { title: "About", path: "/more/about", icon: IconInfoCircle },
-    { title: 'About', path: '/more/about' },
+        { title: "Registration", path: "/more/reg", icon: IconUserPlus },
-    { title: 'Location Reference Code Lookup', path: '/more/corpus' },
+        { title: "Location Reference Code Lookup", path: "/more/corpus", icon: IconLocation },
-    { title: 'Reason Code Lookup', path: '/more/reasons' },
+        { title: "Reason Code Lookup", path: "/more/reasons", icon: IconMessageCode },
-    { title: 'Privacy Policy', path: '/more/privacy' },
+        { title: "Privacy Policy", path: "/more/privacy", icon: IconSpy },
-    { title: 'Component Versions', path: '/more/versions' },
+        { title: "Component Versions", path: "/more/versions", icon: IconVersions },
-    { title: 'Statistics', path: '/more/statistics' }
+        { title: "Statistics", path: "/more/statistics", icon: IconNumber },
     ];
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
 
 {#each links as item}
     <a href={item.path}>
         <div>
+            <svelte:component this={item.icon} />
             <p>{item.title}</p>
         </div>
     </a>
@@ -37,13 +54,19 @@
         border-width: 1px;
         border-style: solid;
         border-left: none;
+        padding-left: 0.5rem;
+        overflow-x: hidden;
         border-right: none;
         height: 50px;
+        display: flex;
+        align-items: center;
+        margin-bottom: 0.5rem;
     }
     a {
         text-decoration: none;
         height: 100%;
         vertical-align: middle;
+        overflow-x: hidden;
     }
     p {
         color: white;
@@ -54,6 +77,7 @@
         vertical-align: middle;
         font-weight: 600;
         font-size: 20px;
+        overflow-x: hidden;
     }
     @media (min-width: 600px) {
         p {

src/routes/more/about/+page.svelte

@@ -1,14 +1,14 @@
 <script>
-  import LargeLogo from '$lib/images/large-logo.svelte';
+    import LargeLogo from "$lib/images/large-logo.svelte";
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
 
-  const title = 'About';
+    const title = "About";
 </script>
 
 <Header {title} />
 <LargeLogo />
-<p class="neg">&copy; 2022-2023 Frederick Boniface</p>
+<p class="neg">&copy; 2022-2025 Frederick Boniface</p>
 <p>OwlBoard was created by train crew for train crew.</p>
 <p>I developed OwlBoard in 2022 with the aim of providing fast and easy access to the information we need on a daily basis.</p>
 <p>Data is sourced from National Rail Enquiries, the OwlBoard Project, and Network Rail.</p>

src/routes/more/corpus/+page.svelte

@@ -1,22 +1,23 @@
 <script>
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Loading from "$lib/navigation/loading.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  const title = 'Location Codes';
+    import { getApiUrl } from "$lib/scripts/upstream";
+    const title = "Location Codes";
 
     let val = {
-    crs: '',
+        crs: "",
-    tiploc: '',
+        tiploc: "",
-    stanox: '',
+        stanox: "",
-    nlc: '',
+        nlc: "",
-    name: '',
+        name: "",
-    uic: ''
+        uic: "",
     };
 
     let isLoading = false;
 
-  async function getData(type = '', value = '') {
+    async function getData(type = "", value = "") {
-    const url = `https://owlboard.info/api/v2/ref/locationCode/${type}/${value}`;
+        const url = `${getApiUrl()}/api/v2/ref/locationCode/${type}/${value}`;
         const res = await fetch(url);
         const data = await res.json();
         isLoading = false;
@@ -25,16 +26,16 @@
 
     async function processData(data) {
         //console.log("data",JSON.stringify(data))
-    if (data.ERROR == 'Offline') {
+        if (data.ERROR == "Offline") {
             return;
         }
         val = {
-      crs: data[0]['3ALPHA'] || 'None',
+            crs: data[0]["3ALPHA"] || "None",
-      tiploc: data[0]['TIPLOC'] || 'None',
+            tiploc: data[0]["TIPLOC"] || "None",
-      stanox: data[0]['STANOX'] || 'None',
+            stanox: data[0]["STANOX"] || "None",
-      nlc: data[0]['NLC'] || 'None',
+            nlc: data[0]["NLC"] || "None",
-      name: data[0]['NLCDESC'] || 'None',
+            name: data[0]["NLCDESC"] || "None",
-      uic: data[0]['UIC'] || 'None'
+            uic: data[0]["UIC"] || "None",
         };
         //console.log("val",JSON.stringify(val));
     }
@@ -43,13 +44,13 @@
         isLoading = true;
         let data = [];
         if (val?.crs) {
-      data = await getData('crs', val.crs);
+            data = await getData("crs", val.crs);
         } else if (val?.tiploc) {
-      data = await getData('tiploc', val.tiploc);
+            data = await getData("tiploc", val.tiploc);
         } else if (val?.stanox) {
-      data = await getData('stanox', val.stanox);
+            data = await getData("stanox", val.stanox);
         } else if (val?.nlc) {
-      data = await getData('nlc', val.nlc);
+            data = await getData("nlc", val.nlc);
         } else {
             return;
         }
@@ -58,12 +59,12 @@
 
     async function reset() {
         val = {
-      crs: '',
+            crs: "",
-      tiploc: '',
+            tiploc: "",
-      stanox: '',
+            stanox: "",
-      nlc: '',
+            nlc: "",
-      name: '',
+            name: "",
-      uic: ''
+            uic: "",
         };
     }
 </script>
@@ -113,11 +114,12 @@
         height: 30px;
         margin-bottom: 10px;
         text-transform: uppercase;
+        box-shadow: var(--box-shadow);
     }
     button {
         border-radius: 50px;
         font-family: urwgothic, sans-serif;
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-color);
         border: none;
         color: white;
         height: 30px;
@@ -125,6 +127,7 @@
         max-width: 100px;
         min-width: 75px;
         font-size: 18px;
+        box-shadow: var(--box-shadow);
     }
     .desc {
         color: white;

src/routes/more/data/+page.svelte

@@ -1,24 +1,25 @@
 <script>
-  import LogoutButton from '$lib/navigation/LogoutButton.svelte';
+    import LogoutButton from "$lib/navigation/LogoutButton.svelte";
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Loading from "$lib/navigation/loading.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import { uuid } from '$lib/stores/uuid.js';
+    import { getApiUrl } from "$lib/scripts/upstream";
-  import { onMount } from 'svelte';
+    import { uuid } from "$lib/stores/uuid.js";
-  const title = 'Your Data';
+    import { onMount } from "svelte";
+    const title = "Your Data";
 
     let data = [
         {
-      domain: 'User not Found',
+            domain: "User not Found",
-      atime: 'User not Found'
+            atime: "User not Found",
-    }
+        },
     ];
 
     let isLoading = false;
 
     async function fetchData() {
-    if ($uuid != 'null') {
+        if ($uuid != "null") {
-      const url = `https://owlboard.info/api/v2/user/${$uuid}`;
+            const url = `${getApiUrl()}/api/v2/user/${$uuid}`;
             const res = await fetch(url);
             const json = await res.json();
             if (json.length) {
@@ -34,6 +35,10 @@
     });
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
 
 <p>OwlBoard stores as little data about you as possible to offer the service.</p>
@@ -43,13 +48,13 @@
 
 {#if isLoading}
     <Loading />
-{:else if data[0].domain != 'User not Found'}
+{:else if data[0].domain != "User not Found"}
-  <p class="api_response">Registration Domain: {data[0]['domain']}</p>
+    <p class="api_response">Registration Domain: {data[0]["domain"]}</p>
-  <p class="api_response">Access Time: {data[0]['atime']}</p>
+    <p class="api_response">Access Time: {data[0]["atime"]}</p>
     <LogoutButton />
     <p>
-    Clicking the logout button will delete your data from your browser. You will then be able to make a new account, your old account will remain inactive and be deleted after 90
+        Clicking the logout button will delete your data from your browser. You will then be able to make a new account, your old account will remain inactive and be deleted after
-    days.
+        90 days.
     </p>
 {:else}
     <p class="api_response">You are not registered, we don't have any data stored.</p>

src/routes/more/help/+page.svelte

@@ -0,0 +1,21 @@
+<script>
+    import Header from "$lib/navigation/header.svelte";
+    import Nav from "$lib/navigation/nav.svelte";
+</script>
+
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
+<Header title={"Help"} />
+<Nav />
+<br /><br />
+<p>
+    You can find extensive help and documentation at <a href="https://docs.owlboard.info">the documentation site</a>.
+</p>
+<p>
+    You can also use the <a href="https://www.facebook.com/owlboard.support">OwlBoard Support</a> page on Facebook.
+</p>
+<br /><br />
+
+<p>Alternatively, you can report an issue on the <a href="/more/report">Report an Issue</a> page.</p>

src/routes/more/privacy/+page.svelte

@@ -1,39 +1,74 @@
 <script>
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  const title = 'Privacy Policy';
+    const title = "Privacy Policy";
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
 <div>
+    <h2>Your Data</h2>
         <p>
-    OwlBoard stores the minimum amount of data necessary to provide its functions for your use. No personal data is stored unless you report an issue. To review the specific data
+            OwlBoard logs the IP addresses of its users, this is done on the basis of legitimate
-    that we store, please visit <a href="/more/data">My Data</a>.
+            interest to ensure the security of the platform and to protect all users from
-  </p>
+            malicious activity.  See <a href="#datasharing">Data Sharing</a> for details on how
-  <p>OwlBoard does not utilize any cookies. IP addresses and browser fingerprints are not logged.</p>
+            we may share this data.
-  <h2>If You Do Not Sign Up</h2>
-  <p>
-    If you choose not to sign up, no personal data will be processed or stored unless you report an issue. Any personal settings are stored locally in your browser and do not leave
-    your device.
-  </p>
-  <h2>If You Sign Up</h2>
-  <p>
-    If you sign up for the rail staff version of OwlBoard, we do require the storage of some data. However, none of this data can be used to personally identify you. Any personal
-    settings are stored locally in your browser and do not leave your device.
         </p>
         <p>
-    During the sign-up process, you will be asked to provide a work email address, which will be checked to confirm its origin from a railway company. Once confirmed, an email
+            With the exception of sending emails, all data is held - and always remains within -
-    containing a registration link will be sent to you. At this point, the username portion of your email address is discarded. For example, if your email address is
+            the United Kingdom.
-    'a-user@owlboard.info', only 'owlboard.info' will be stored. This host portion of your email address is stored to filter and display relevant results prominently.
         </p>
-  <p>The email server may store the address and message content as part of its regular operation, and your consent to this is implied when you sign up.</p>
+        <h3>Telemetry</h3>
-  <p>In addition to the host portion of your email address, a randomly generated UUID is stored for the purpose of authorizing access to the rail staff data.</p>
-  <h2>Reporting an Issue</h2>
-  <p>When you report an issue, certain data is collected, including your browser's User Agent string and the size of the window in which you are viewing the website.</p>
         <p>
-    Any data submitted when reporting an issue will be publicly viewable alongside the <a href="https://git.fjla.uk/owlboard/backend/issues" target="_blank"
+            If you opt-in to Telemetry, you will share your IP address and information about the
-      >OwlBoard/backend git repository</a
+            type of device and software you're using to access the service.  This data is
-    >.
+            anonymised and cannot be traced back to any individual.  You can opt-in or opt-out in
+            your <a href="/more/settings">Settings</a>.  All of the anonymised data can be viewed
+            at: <a target="_blank" href="https://liwan.fjla.uk">liwan.fjla.uk</a> at any time.
+        </p>
+        <p>
+            All of the data that is stored is held within the United Kingdom.
+        </p>
+        <p>
+            Telemetry data is used to identify which areas of the webapp are used most frequently
+            and where improvements need to be made.
+        </p>
+        <h3>Registering</h3>
+        <p>
+            If you register, your email address will be used to verify that you work for an
+            organisation that is permitted to access staff data on the service.  An activation
+            email will be sent before your email address is anonymised.  For example, if your
+            email address is hello@owlboard.info, it will be anonymized to @owlboard.info.
+        </p>
+        <p>
+            OwlBoard emails are sent using Proton Mail, a privacy-first email service based in
+            Switzerland.  To facilitate this, your email address will be securely sent to
+            Proton Mail securely.
+        </p>
+        <p>
+            You will be assigned a unique identifier which will be stored alongside your
+            anonymised email address as well as in your browser.  This is how the service
+            verifies that you are authorised to access staff data.
+        </p>
+    
+    <h2 id="datasharing">Data Sharing</h2>
+        <p>
+            OwlBoard utilises CrowdSec, a security service that helps to protect the platform from
+            malicious activity.  As part of its operation, CrowdSec analyzes IP addresses and may
+            share certain information with its community of users to identify and mitigate
+            security threats.  If your IP address is identified as part of a security incident or
+            threat, it may be shared with CrowdSec's network for further analysis and to prevent
+            malicious activity.  This sharing of IP addresses is done under the legitimate
+            interest basis for ensuring the security of the platform and protecting all users
+            from malicious activity.
+        </p>
+        <p>
+            CrowdSec anonymizes and processes data in accordance with its own privacy policy, which
+            is available for review here.  We recommend reviewing their policy to understand how
+            they handle any data collected.
         </p>
 </div>
 
@@ -46,12 +81,23 @@
 
     h2 {
         color: var(--second-text-color);
-    margin: 10px;
+        margin: auto;
+        width: 90vw;
         padding-top: 20px;
     }
 
+    h3 {
+        color: var(--second-text-color);
+        margin: auto;
+        width: 90vw;
+        padding-top: 10px;
+    }
     p {
         color: white;
-    margin: 10px;
+        margin: auto;
+        padding-top: 5px;
+        padding-bottom: 8px;
+        width: 90vw;
+        max-width: 550px;
     }
 </style>

src/routes/more/reasons/+page.svelte

@@ -1,17 +1,32 @@
-<script>
+<script lang="ts">
-  import { onMount } from 'svelte';
+    import { onMount } from "svelte";
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Loading from "$lib/navigation/loading.svelte";
-  import ResultIsland from '$lib/islands/result-island.svelte';
+    import Card from "$lib/cards/Card.svelte";
+    import type { CardConfig } from "$lib/cards/Card.types";
+    import { apiGet } from "$lib/scripts/apiFetch";
 
-  const title = 'Reason Codes';
+    interface ApiResponse {
+        results: boolean;
+        title: string;
+        resultLines: string[];
+    }
+    const title = "Reason Codes";
     let isLoading = false;
-  let inputValue = '';
+    let inputValue = "";
-  let resultObject = {
+    let resultObject: ApiResponse = {
         results: false,
-    title: '',
+        title: "",
-    resultLines: []
+        resultLines: [],
+    };
+    let config: CardConfig = {
+        title: "",
+        showHelp: false,
+        showRefresh: false,
+        helpText: "",
+        onRefresh: () => {},
+        refreshing: false,
     };
 
     function load() {
@@ -25,9 +40,9 @@
 
     async function getData() {
         if (inputValue) {
-      const url = `https://owlboard.info/api/v2/ref/reasonCode/${inputValue}`;
+            const apiPath = `/api/v2/ref/reasonCode/${inputValue}`;
-      const res = await fetch(url);
+            const res = await apiGet(apiPath);
-      return await res.json();
+            return res;
         } else {
             return [];
         }
@@ -36,16 +51,17 @@
     async function handleData(data) {
         let resultLines = [];
         if (data.length) {
-      resultObject.title = data[0]['code'];
+            resultObject.title = data[0]["code"];
-      resultLines = [data[0]['lateReason'], data[0]['cancReason']];
+            resultLines = [data[0]["lateReason"], data[0]["cancReason"]];
         } else {
             resultObject = {
                 results: false,
-        title: 'Not Found',
+                title: "Not Found",
-        resultLines: []
+                resultLines: [],
             };
         }
         resultObject.resultLines = resultLines;
+        config.title = resultObject.title;
         resultObject.results = true;
     }
 
@@ -78,7 +94,11 @@
 {/if}
 
 {#if resultObject.results}
-  <ResultIsland {resultObject} />
+    <Card {config}>
+        {#each resultObject.resultLines as line}
+            <p>{line}</p>
+        {/each}
+    </Card>
 {/if}
 
 <Nav />
@@ -97,9 +117,10 @@
         border-radius: 50px;
         border: none;
         text-align: center;
-    font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
         text-transform: uppercase;
         font-size: 15px;
+        box-shadow: var(--box-shadow);
     }
     button {
         width: 15%;
@@ -109,10 +130,11 @@
         border: none;
         border-radius: 20px;
         padding: 5px;
-    font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+        font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
         font-size: 16px;
         font-weight: 400;
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-color);
-    color: var(--link-color);
+        color: var(--main-text-color);
+        box-shadow: var(--box-shadow);
     }
 </style>

src/routes/more/reg/+page.svelte

@@ -1,50 +1,60 @@
-<script>
+<script lang="ts">
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Loading from "$lib/navigation/loading.svelte";
-  import { onMount } from 'svelte';
+    import { onMount } from "svelte";
-  import { checkAuth, logout } from '$lib/libauth';
+    import { checkAuth } from "$lib/libauth";
-  import LogoutButton from '$lib/navigation/LogoutButton.svelte';
+    import LogoutButton from "$lib/navigation/LogoutButton.svelte";
+    import { getApiUrl } from "$lib/scripts/upstream";
+    import toast from "svelte-french-toast";
 
-  const title = 'Register';
+    const title = "Register";
 
-  let state = 'unreg';
+    let state = "unreg";
     let isLoading = true;
-  let inputValue = '';
+    let inputValue = "";
 
-  function handleInput(event) {
+    function handleInput(event: KeyboardEvent) {
-    inputValue = event.target.value;
+        inputValue = event?.target?.value;
     }
 
     async function request() {
         isLoading = true;
-    const url = 'https://owlboard.info/api/v2/user/request';
+        const url = `${getApiUrl()}/api/v2/user/request`;
         const request = {
-      method: 'POST',
+            method: "POST",
             headers: {
-        'Content-Type': 'application/json'
+                "Content-Type": "application/json",
             },
             body: JSON.stringify({
-        email: inputValue
+                email: inputValue,
-      })
+            }),
         };
         const res = await fetch(url, request);
         if (res.status == 400 || res.status == 403) {
-      state = 'unauth';
+            state = "unauth";
         } else if (res.status == 201) {
-      state = 'sent';
+            state = "sent";
         } else {
-      state = 'error';
+            state = "error";
         }
         isLoading = false;
     }
 
+    function send() {
+        toast.promise(request(), {
+            loading: "Sending email...",
+            success: "Sent, check your inbox",
+            error: "Error sending email",
+        });
+    }
+
     onMount(async () => {
         const auth = await checkAuth();
         if (auth.uuidPresent === false) {
-      state = 'unreg';
+            state = "unreg";
         } else if (auth.uuidPresent === true) {
-      state = 'reg';
+            state = "reg";
         }
         isLoading = false;
     });
@@ -55,20 +65,10 @@
 <section class="content">
     {#if isLoading}
         <Loading />
-  {:else if state == 'unreg'}
+    {:else if state == "unreg"}
-    <p>The staff version of OwlBoard offers several extra features:</p>
-    <ul>
-      <li>Access the Train Finder</li>
-      <li>Access the PIS Finder</li>
-      <li>More detailed departure boards:</li>
-      <ul>
-        <li>Non-Passenger movements</li>
-        <li>Hidden platform numbers</li>
-        <li>Display up to 25 services</li>
-      </ul>
-    </ul>
         <p>To register, you will need to enter a work email address to receive a confirmation email</p>
-    <form on:submit={request}>
+        <p class="bold">Already have a registration code? <a href="/more/reg/submit">enter it here</a></p>
+        <form on:submit={send}>
             <input type="text" autocomplete="email" placeholder="Enter work email" bind:value={inputValue} on:input={handleInput} /><br />
             <label for="checkbox">
                 I have read and accept the terms of the <a href="/more/privacy">Privacy Policy</a><br />
@@ -76,21 +76,29 @@
             </label><br />
             <button type="submit">Submit</button>
         </form>
-  {:else if state == 'sent'}
+        <br />
-    <p>An email has been sent, click the link in the email to activate your profile.</p>
+        <p class="bold">What do you get?</p>
-    <p>When you click the link, your authorisation key will be automatically be stored in your browser.</p>
+        <li>Access to Train details</li>
+        <li>Access to PIS Codes</li>
+        <li>ECS Movements on departure boards</li>
+        <li>Non-Public trains on departure boards</li>
+        <li>Hidden platform numbers on departure boards</li>
+        <li>See up to the next 40 trains departing a station over the next two hours</li>
+    {:else if state == "sent"}
+        <p>An email has been sent, enter the code in the email to activate your profile.</p>
+        <p class="bold"><a href="/more/reg/submit">Ready to enter your code?</a></p>
         <p>If you use multiple browsers, you will only be logged in using the browser you open the link with.</p>
         <p>You will be able to register again using the same email address</p>
-  {:else if state == 'unauth'}
+    {:else if state == "unauth"}
         <p>The email address you entered does not belong to an authorised business.</p>
-    <p>If you think this is an error, you can report an issue by <a href="/more/report">reporting an issue</a>.</p>
+        <p>If you think this is an error, you can get help on <a href="/more/help">the help page</a>.</p>
-  {:else if state == 'error'}
+    {:else if state == "error"}
         <p>There was an error processing your request.</p>
         <p>Check that the email you entered was correct or try again later.</p>
-  {:else if state == 'reg'}
+    {:else if state == "reg"}
         <p>
-      You are already registered for OwlBoard. If you've recently logged out or updated, you may need to refresh this page to register as old data could still be stored in your
+            You are already registered for OwlBoard. If you've recently logged out or updated, you may need to refresh this page to register as old data could still be stored in
-      browser.
+            your browser.
         </p>
         <LogoutButton />
     {/if}
@@ -98,21 +106,31 @@
 <Nav />
 
 <style>
+    .bold {
+        font-weight: 800;
+    }
     .content {
         margin-top: 30px;
     }
     p {
         margin: 10px;
+        margin-left: 20px;
+        margin-right: 20px;
     }
-  ul {
+    li {
-    text-align: left;
+        text-align: center;
+        font-size: 14px;
         color: white;
+        margin-top: 5px;
+        margin-left: 15px;
+        margin-right: 15px;
+        list-style-type: none;
     }
     input {
         height: 40px;
         width: 80%;
         max-width: 375px;
-    font-family: urwgothic, 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
+        font-family: urwgothic, "Franklin Gothic Medium", "Arial Narrow", Arial, sans-serif;
         text-align: center;
         font-size: 20px;
         border-radius: 50px;
@@ -125,8 +143,8 @@
     }
     button {
         border: none;
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-color);
-    color: white;
+        color: var(--main-text-color);
         width: 35%;
         height: 30px;
         border-radius: 50px;

src/routes/more/reg/submit/+page.svelte

@@ -1,79 +1,104 @@
-<script>
+<script lang="ts">
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import { getApiUrl } from "$lib/scripts/upstream";
-  import { uuid } from '$lib/stores/uuid.js';
+    import { uuid } from "$lib/stores/uuid";
-  import { onMount } from 'svelte';
 
-  const title = 'Registration';
+    const title = "Submit Registration";
-  let state = '';
+    let state = false;
-  let isLoading = true;
+    let status: string;
+    let inputString: string;
 
-  async function getUUID() {
+    async function handleSubmit() {
-    return new URLSearchParams(window.location.search).get('key');
+        console.log(`Code: ${inputString}`);
+        const res = await submit(inputString);
+        console.log(`Registration Status: ${res}`);
+        if (res == 201) {
+            status = "okay";
+        } else if (res == 401) {
+            status = "fail";
+        } else {
+            console.error("Unable to register: ", status);
+        }
+        state = true;
     }
 
-  async function submit(id) {
+    async function submit(id: string): Promise<number> {
-    const url = 'https://owlboard.info/api/v2/user/register';
+        const url = `${getApiUrl()}/api/v2/user/register`;
         const request = {
-      method: 'POST',
+            method: "POST",
             headers: {
-        'Content-Type': 'application/json'
+                "Content-Type": "application/json",
             },
             body: JSON.stringify({
-        uuid: id
+                uuid: id,
-      })
+            }),
         };
         const res = await fetch(url, request);
         const body = await res.json();
         if (body.api_key) {
             uuid.set(body.api_key);
             return 201;
-    }
+        } else {
             return res.status;
         }
-
-  onMount(async () => {
-    const id = (await getUUID()) || '';
-    if (id == '' || !id) {
-      state = 'none';
-      isLoading = false;
-      return;
     }
-    const status = await submit(id);
-    if (status == 201) {
-      console.log('Registered Successfully');
-      state = 'done';
-    } else if (status == 401) {
-      console.log('Invalid Key');
-      state = 'unauth';
-    } else {
-      console.log('Error');
-      state = 'error';
-    }
-    isLoading = false;
-  });
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
-{#if isLoading}
+
-  <Loading />
+{#if state}
+    {#if status == "okay"}
+        <p class="title-ish">You are now registered</p>
+        <p>Your secret key will be stored in your browser.</p>
+        <p>If you change browsers, change device or clear your browsing data, you may have to register again.</p>
+    {:else if status == "fail"}
+        <p class="title-ish">Your code was not accepted</p>
+        <p>The code expires after 1 hour, you can check the code and enter it again or request a <a href="/more/reg">new code</a>.</p>
     {/if}
-{#if state == 'none'}
+{:else}
-  <p>Unable to read your access key.</p>
+    <p class="title-ish">Enter your registration code below</p>
-  <p>Please click the link in your email again.</p>
+    <form on:submit={handleSubmit} id="codeInputForm">
-{:else if state == 'unauth'}
+            <input class="code-in" bind:value={inputString} id={'input'} maxlength="6" autocomplete="off">
-  <p>Your link is not valid, links expire after 30 minutes.</p>
+        <br />
-  <p>You can try to register again.</p>
+        <button type="submit">Submit</button>
-{:else if state == 'error'}
+    </form>
-  <p>There was an error on our end, please try again later</p>
-{:else if state == 'done'}
-  <p>You are now logged in</p>
 {/if}
+
 <Nav />
 
 <style>
+    .title-ish {
+        font-size: 20px;
+    }
+    .code-in {
+        margin: 3px;
+        margin-bottom: 20px;
+        width: calc(29px * 6);
+        height: 39px;
+        font-size: 30px;
+        text-align: center;
+        text-transform: uppercase;
+        border-radius: 10px;
+        border: none;
+    }
+    button {
+        border: none;
+        background-color: var(--island-bg-color);
+        color: var(--main-text-color);
+        width: 35%;
+        min-width: 95px;
+        max-width: 231px;
+        height: 30px;
+        border-radius: 50px;
+        font-size: 18px;
+    }
     p {
-    margin: 14px;
+        margin-left: 40px;
+        margin-right: 40px;
     }
 </style>

src/routes/more/report/+page.svelte

@@ -1,19 +1,20 @@
 <script>
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Island from '$lib/islands/island.svelte';
+    import Island from "$lib/islands/island.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import { onMount } from 'svelte';
+    import { onMount } from "svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Loading from "$lib/navigation/loading.svelte";
-  import Done from '$lib/navigation/done.svelte';
+    import Done from "$lib/navigation/done.svelte";
+    import { getApiUrl } from "$lib/scripts/upstream";
 
-  const title = 'Report Issue';
+    const title = "Report Issue";
     let isLoading = false;
     let isDone = false;
     let isError = false;
 
-  let reportType = '',
+    let reportType = "",
-    reportSubject = '',
+        reportSubject = "",
-    reportMsg = '',
+        reportMsg = "",
         reportCollected;
     onMount(async () => {
         reportCollected = {
@@ -21,7 +22,7 @@
             browser: navigator.appName,
             version: navigator.appVersion,
             platform: navigator.platform,
-      viewport: `${window.innerWidth} x ${window.innerHeight}`
+            viewport: `${window.innerWidth} x ${window.innerHeight}`,
         };
     });
 
@@ -33,7 +34,7 @@
     }
 
     async function send() {
-    console.log('SEND DATA REQUESTED');
+        console.log("SEND DATA REQUESTED");
         isLoading = true;
         const formData = JSON.stringify({
             label: reportType,
@@ -45,22 +46,22 @@
                 `Platform: ${reportCollected.platform}\n` +
                 `Viewport: ${reportCollected.viewport}\n\n\n` +
                 `User Message:\n` +
-        `${reportMsg}`
+                `${reportMsg}`,
         });
-    const url = `https://owlboard.info/misc/issue`;
+        const url = `${getApiUrl()}/misc/issue`;
         const options = {
-      method: 'POST',
+            method: "POST",
             headers: {
-        'Content-Type': 'application/json'
+                "Content-Type": "application/json",
             },
-      body: formData
+            body: formData,
         };
         const res = await fetch(url, options);
         if (res.status == 200) {
             isLoading = false;
             isDone = true;
             await new Promise((r) => setTimeout(r, 2000));
-      window.location.href = '/';
+            window.location.href = "/";
         } else {
             isLoading = false;
             isError = true;
@@ -75,6 +76,10 @@
     }
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
 
 {#if isLoading}
@@ -86,9 +91,11 @@
 {/if}
 
 {#if !preFlight && !isDone}
+    <p>Get help on the <a href="https://www.facebook.com/owlboard.support">OwlBoard Support Facebook Page</a></p>
     <p>
-    Any data that you enter here will be visible publicly
+        Or submit an issue, you can check for existing reports
         <a href="https://git.fjla.uk/OwlBoard/backend/issues" target="_blank">here</a>
+        before submitting a new issue.
     </p>
     <p>You will be shown all of the collected data before the form is submitted.</p>
     <form on:submit={submit}>
@@ -162,8 +169,8 @@
         max-height: 400px;
     }
     button {
-    background-color: var(--overlay-color);
+        background-color: var(--island-bg-color);
-    color: white;
+        color: var(--main-text-color);
         font-family: urwgothic, sans-serif;
         font-size: 16px;
         border: none;
@@ -171,6 +178,7 @@
         width: 25%;
         height: 30px;
         max-width: 100px;
+        box-shadow: var(--box-shadow);
     }
     h2 {
         color: white;

src/routes/more/settings/+page.svelte

@@ -1,12 +1,65 @@
 <script>
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import QlSet from '$lib/islands/quick-link-set-island.svelte';
+    import QlSet from "$lib/islands/quick-link-set-island.svelte";
-  const title = 'Settings';
+    import Island from "$lib/islands/island.svelte";
+    import { location } from "$lib/stores/location";
+    import { telemetry } from "$lib/stores/telemetryConsent";
+    import { getCurrentLocation } from "$lib/scripts/getLocation";
+    import toast from "svelte-french-toast";
+    const title = "Settings";
+
+    $: if ($location) {
+        getCurrentLocation();
+    }
+
+    function confirmationToast() {
+        toast.success("Settings updated");
+    }
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
 
 <QlSet />
 
+<Island variables={{ title: "Location" }}>
+    <p>Use your location to quickly check departure boards near you</p>
+    <div class="checkbox-container">
+        <label for="location_enable">Enabled</label>
+        <input id="location_enable" type="checkbox" bind:checked={$location} on:click={confirmationToast} />
+    </div>
+</Island>
+
+<Island variables={{title:"Telemetry"}}>
+    <p>Telemetry helps shape the future of OwlBoard - all data is anonymised.  To find out more, see the
+        <a href="/more/privacy">privacy policy</a>.
+    </p>
+    <div class="checkbox-container">
+        <label for="telemetry_enable">Enabled</label>
+        <input id="telemetry_enable" type="checkbox" bind:checked={$telemetry} on:click={confirmationToast} />
+</Island>
+
 <Nav />
+
+<style>
+    .checkbox-container {
+        display: inline-flex;
+        align-items: center;
+        margin: auto;
+    }
+    .checkbox-container input[type="checkbox"] {
+        margin: 0;
+        height: 25px;
+        width: 25px;
+    }
+    .checkbox-container label {
+        margin-left: 0;
+        margin-right: 25px;
+        font-weight: 800;
+    }
+    
+</style>

src/routes/more/statistics/+page.svelte

@@ -1,27 +1,52 @@
-<script>
+<script lang="ts">
-  import Island from '$lib/islands/island.svelte';
+    import Island from "$lib/islands/island.svelte";
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Loading from "$lib/navigation/loading.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  const title = 'Statistics';
+    import { getApiUrl } from "$lib/scripts/upstream";
+    import { featureDetect, type FeatureDetectionResult } from "$lib/scripts/featureDetect";
+    import { getCurrentLocation } from "$lib/scripts/getLocation";
+    import { onMount } from "svelte";
+    const title = "Statistics";
+    let features: FeatureDetectionResult | null = null;
+    let error: Error | null = null;
 
     async function getData() {
-    const url = 'https://owlboard.info/misc/server/stats';
+        const url = `${getApiUrl()}/misc/server/stats`;
         const res = await fetch(url);
         return await res.json();
     }
 
-  function U2L(input) {
+    async function loadFeatures() {
+        try {
+            features = await featureDetect();
+        } catch (e) {
+            error = e;
+        }
+    }
+
+    onMount(() => {
+        loadFeatures();
+    });
+
+    function U2L(input: Date | number): string {
+        if (input instanceof Date) {
+            return input.toLocaleString();
+        }
         try {
             const datetime = new Date(input * 1000);
             return datetime.toLocaleString();
         } catch (err) {
             console.log(err);
-      return false;
+            return "Unknown";
         }
     }
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
 
 {#await getData()}
@@ -30,7 +55,7 @@
     <br />
     <p>API Server:<br /><span>{data?.hostname}</span></p>
     <p>Runtime Mode: <span>{data?.runtimeMode}</span></p>
-  <p>Stats Reset: <span>{U2L(data?.reset) || 'Unknown'}</span></p>
+    <p>Stats Reset: <span>{U2L(data?.reset) || "Unknown"}</span></p>
     <h2>Last Update</h2>
     <p>Timetable: <span>{U2L(data?.updateTimes?.timetable)}</span></p>
     <p>Location Ref: <span>{U2L(data?.updateTimes?.corpus)}</span></p>
@@ -60,6 +85,73 @@
     </Island>
 {/await}
 
+<h2>Browser Features</h2>
+{#if features === null && error === null}
+    Checking browser features...
+{:else if features !== null}
+    <h3>Critical Features</h3>
+    {#if !features.critical}
+        <p>
+            OwlBoard will not function properly without these browser features. If you see any crosses here you may need to update your browser or choose another browser. Chrome,
+            Edge, Firefox, Brave & Samsung Browser have been tested.
+        </p>
+    {/if}
+    <ul class="feature-list">
+        <li>
+            Fetch <span class="feature-status {features.missing.includes('fetch') ? 'cross' : 'tick'}">
+                {features.missing.includes("fetch") ? "✗" : "✓"}
+            </span>
+        </li>
+        <li>
+            Local Storage <span class="feature-status {features.missing.includes('localStorage') ? 'cross' : 'tick'}">
+                {features.missing.includes("localStorage") ? "✗" : "✓"}
+            </span>
+        </li>
+        <li>
+            Session Storage <span class="feature-status {features.missing.includes('sessionStorage') ? 'cross' : 'tick'}">
+                {features.missing.includes("sessionStorage") ? "✗" : "✓"}
+            </span>
+        </li>
+        <li>
+            Promises <span class="feature-status {features.missing.includes('promise') ? 'cross' : 'tick'}">
+                {features.missing.includes("promise") ? "✗" : "✓"}
+            </span>
+        </li>
+    </ul>
+
+    <h3>Nice-to-have Features</h3>
+    {#if !features.nice}
+        <p>
+            OwlBoard may run slowly or be missing some functions without these browser features. If you see any crosses here you may want to update your browser or choose another
+            browser for improved performance. Chrome, Edge, Firefox, Brave & Samsung Browser have been tested.
+        </p>
+    {/if}
+    <ul class="feature-list">
+        <li>
+            Geolocation <span class="feature-status {features.missing.includes('geolocation') ? 'cross' : 'tick'}">
+                {features.missing.includes("geolocation") ? "✗" : "✓"}
+            </span>
+        </li>
+        <li>
+            Service Worker <span class="feature-status {features.missing.includes('serviceWorker') ? 'cross' : 'tick'}">
+                {features.missing.includes("serviceWorker") ? "✗" : "✓"}
+            </span>
+        </li>
+        <li>
+            Dialog <span class="feature-status {features.missing.includes('dialog') ? 'cross' : 'tick'}">
+                {features.missing.includes("dialog") ? "✗" : "✓"}
+            </span>
+        </li>
+        <li>
+            Popover API <span class="feature-status {features.missing.includes('popover') ? 'cross' : 'tick'}">
+                {features.missing.includes("popover") ? "✗" : "✓"}
+            </span>
+        </li>
+    </ul>
+{:else if error !== null}
+    Failed to detect browser features: {error.message}
+{/if}
+
 <Nav />
 
 <style>
@@ -75,4 +167,35 @@
         margin-bottom: 2px;
         margin-top: 8px;
     }
+    .feature-list {
+        list-style-type: none; /* Remove bullet points */
+        padding: 0;
+        text-align: center; /* Center the list */
+    }
+
+    .feature-list li {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin: 8px 0;
+    }
+
+    .feature-status {
+        display: inline-block;
+        width: 20px;
+        height: 20px;
+        line-height: 20px;
+        text-align: center;
+        border-radius: 50%;
+        color: white;
+        margin-left: 8px;
+    }
+
+    .tick {
+        background-color: green;
+    }
+
+    .cross {
+        background-color: red;
+    }
 </style>

src/routes/more/versions/+page.svelte

@@ -1,19 +1,26 @@
 <script>
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Island from '$lib/islands/island.svelte';
+    import Island from "$lib/islands/island.svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Loading from "$lib/navigation/loading.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import LargeLogo from '$lib/images/large-logo.svelte';
+    import LargeLogo from "$lib/images/large-logo.svelte";
-  import { version, versionTag } from '$lib/stores/version';
+    import { version, versionTag } from "$lib/stores/version";
-  const title = 'Versions';
+    import { getApiUrl } from "$lib/scripts/upstream";
+    import { IconBrandGolang, IconBrandJavascript, IconBrandNodejs, IconBrandPython, IconBrandSvelte, IconBrandTypescript } from "@tabler/icons-svelte";
+    import Tooltip from "$lib/Tooltip.svelte";
+    const title = "Versions";
 
     async function getData() {
-    const url = 'https://owlboard.info/misc/server/versions';
+        const url = `${getApiUrl()}/misc/server/versions`;
         const res = await fetch(url);
         return await res.json();
     }
 </script>
 
+<svelte:head>
+    <meta name="robots" content="noindex">
+</svelte:head>
+
 <Header {title} />
 
 <LargeLogo />
@@ -23,24 +30,43 @@
 {:then data}
     <Island>
         <p>
-      <a class="data" href="https://git.fjla.uk/owlboard/owlboard-svelte" target="_blank">Web-app version<br /><span class="data">{version}-{versionTag}</span></a>
+            <Tooltip text="Svelte"><IconBrandSvelte /></Tooltip>
+            <Tooltip text="Javascript"><IconBrandJavascript /></Tooltip>
+            <Tooltip text="Typescript"><IconBrandTypescript /></Tooltip>
+            <br />
+            <a class="data" href="https://git.fjla.uk/owlboard/owlboard-svelte" target="_blank"
+                >Web-app version<br /><span class="data"
+                    >{version}{#if versionTag}-{versionTag}{/if}</span
+                ></a
+            >
         </p>
         <p>
-      <a class="data" href="https://git.fjla.uk/owlboard/backend" target="_blank">API Server version<br /><span class="data">{data?.backend || 'Unknown'}</span></a>
+            <Tooltip text="NodeJS"><IconBrandNodejs /></Tooltip>
+            <Tooltip text="Javascript"><IconBrandJavascript /></Tooltip>
+            <Tooltip text="Typescript"><IconBrandTypescript /></Tooltip>
+            <br />
+            <a class="data" href="https://git.fjla.uk/owlboard/backend" target="_blank">API Server version<br /><span class="data">{data?.backend || "Unknown"}</span></a>
         </p>
         <p>
-      <a class="data" href="https://git.fjla.uk/owlboard/db-manager" target="_blank">DB Manager version<br /><span class="data">{data?.['db-manager'] || 'Unknown'}</span></a>
+            <Tooltip text="Python"><IconBrandPython /></Tooltip>
+            <br />
+            <a class="data" href="https://git.fjla.uk/owlboard/db-manager" target="_blank">DB Manager version<br /><span class="data">{data?.["db-manager"] || "Unknown"}</span></a>
         </p>
         <p>
-      <a class="data" href="https://git.fjla.uk/owlboard/mq-client" target="_blank">MQ Client version<br /><span class="data">{data?.['mq-client'] || 'Not installed'}</span></a>
+            <Tooltip text="Go"><IconBrandGolang /></Tooltip>
+            <br />
+            <a class="data" href="https://git.fjla.uk/owlboard/mq-client" target="_blank">timetable-mgr<br /><span class="data">{data?.["mq-client"] || "Not installed"}</span></a>
         </p>
     </Island>
 {:catch}
     <Island>
         <p>
-      Web-app Version<br /><span class="data">{version}-{versionTag}</span>
+            <IconBrandSvelte /><IconBrandJavascript /><IconBrandTypescript /><br />
+            Web-app Version<br /><span class="data"
+                >{version}{#if versionTag}-{versionTag}{/if}</span
+            >
         </p>
-    <p>Unable to fetch server versions</p>
+        <p>Unable to fetch server application versions</p>
     </Island>
 {/await}
 <Nav />
@@ -48,6 +74,7 @@
 <style>
     p {
         text-decoration: none;
+        padding: 15px;
     }
     .data {
         color: white;

src/routes/pis/+page.svelte

@@ -1,82 +1,128 @@
-<script>
+<script lang="ts">
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import Island from '$lib/islands/island.svelte';
+    import { uuid } from "$lib/stores/uuid";
-  import Loading from '$lib/navigation/loading.svelte';
+    import StylesToc from "$lib/train/styles-toc.svelte";
-  import { uuid } from '$lib/stores/uuid';
+    import { getApiUrl } from "$lib/scripts/upstream";
-  import StylesToc from '$lib/train/styles-toc.svelte';
+    import toast from "svelte-french-toast";
+    import { onMount } from "svelte";
+    import type { OB_Pis_FullObject } from "@owlboard/ts-types";
+    import Card from "$lib/cards/Card.svelte";
+    import type { CardConfig } from "$lib/cards/Card.types";
+    import FindByHeadcodeCard from "$lib/cards/FindByHeadcodeCard.svelte";
 
-  const title = 'PIS Finder';
+    const title = "PIS Finder";
-  const variables = { title: 'Results' };
+    let entryPIS = "";
-  let entryPIS = '';
+    let entryStartCRS = "";
-  let entryStartCRS = '';
+    let entryEndCRS = "";
-  let entryEndCRS = '';
+    let data: OB_Pis_FullObject[] = [];
-  let data = [];
     let error = false;
-  let errMsg = 'Unknown Error';
+    let errMsg = "Unknown Error";
-  let isLoading = false;
 
     async function findByStartEnd() {
-    isLoading = true;
+        const url = `${getApiUrl()}/api/v2/pis/byStartEnd/${entryStartCRS}/${entryEndCRS}`;
-    const url = `https://owlboard.info/api/v2/pis/byStartEnd/${entryStartCRS}/${entryEndCRS}`;
         await fetchData(url);
-    isLoading = false;
     }
 
+
     async function findByPis() {
-    isLoading = true;
+        const url = `${getApiUrl()}/api/v2/pis/byCode/${entryPIS}`;
-    const url = `https://owlboard.info/api/v2/pis/byCode/${entryPIS}`;
         await fetchData(url);
-    isLoading = false;
     }
 
-  async function fetchData(url) {
+    async function fetchData(url: string) {
         const options = {
-      method: 'GET',
+            method: "GET",
             headers: {
-        uuid: $uuid
+                uuid: $uuid,
-      }
+            },
         };
         const res = await fetch(url, options); // Enable Auth
         if (res.status == 401) {
-      errMsg = 'You must be logged in to the staff version';
+            errMsg = "You must be logged in to the staff version";
+            toast.error("You must be registered");
             error = true;
             return false;
         } else if (res.status == 500) {
-      errMsg = 'Server Error, try again later';
+            errMsg = "Server Error, try again later";
+            toast.error("Server Error.", { duration: 7500 });
             error = true;
             return false;
         }
         const jsonData = await res.json();
-    if (jsonData.ERROR == 'offline') {
+        if (jsonData.ERROR == "offline") {
-      errMsg = 'Connection error, check your internet connection and try again';
+            errMsg = "Connection error, check your internet connection and try again";
+            toast.error("You are offline.");
             error = true;
             return false;
         }
         data = jsonData;
+        let count = data.length;
+        if (!count) {
+            toast.error("No PIS Codes found.");
+        } else {
+            toast.success(`${count} PIS Codes found`);
+        }
     }
 
     async function reset() {
         data = [];
         error = false;
-    entryPIS = '';
+        entryPIS = "";
-    entryStartCRS = '';
+        entryStartCRS = "";
-    entryEndCRS = '';
+        entryEndCRS = "";
+    }
+
+    onMount(() => {
+        if ($uuid == null || $uuid == "") {
+        toast("You must register to see results", {
+            duration: 3000,
+        });
+        }
+    });
+
+    const resultsCard: CardConfig = {
+        title: "Results",
+        showHelp: false,
+        helpText: "",
+        showRefresh: false,
+        onRefresh: ()=>{},
+        refreshing: false
+    }
+    const errorCard: CardConfig = {
+        title: "Error",
+        showHelp: true,
+        helpText: "There was an error searching for PIS Codes",
+        showRefresh: false,
+        onRefresh: () => {},
+        refreshing: false,
+    }
+    const findByStartEndCard: CardConfig = {
+        title: "Find by Start/End CRS",
+        showHelp: true,
+        helpText: "Enter a start and end CRS Code",
+        showRefresh: false,
+        onRefresh: () => {},
+        refreshing: false,
+    }
+    const findByPisCodeCard: CardConfig = {
+        title: "Find by PIS Code",
+        showHelp: true,
+        helpText: "Enter a PIS Code to see its details. (Four digits)",
+        showRefresh: false,
+        onRefresh: () => {},
+        refreshing: false,
     }
 </script>
 
 <Header {title} />
 
-{#if isLoading}
-  <Loading />
-{/if}
-
 {#if error}
-  <Island {variables}>
+    <Card config={errorCard}>
         <p class="error">{errMsg}</p>
-  </Island>
+    </Card>
 {:else if data.length}
-  <Island {variables}>
+    <Card config={resultsCard}>
         <table>
             <tr>
                 <th class="toc">TOC</th>
@@ -85,32 +131,34 @@
             </tr>
             {#each data as item}
                 <tr>
-          <td class="toc toc-data"><StylesToc toc={item.toc || '-'} /></td>
+                    <td class="toc toc-data"><StylesToc toc={item.toc || "-"} /></td>
                     <td class="code">{item.code}</td>
-          <td class="stops stops-data">{item.stops.join('  ')}</td>
+                    <td class="stops stops-data">{item.stops.join("  ")}</td>
                 </tr>
             {/each}
         </table>
-  </Island>
+    </Card>
-{:else}
-  <p>To search by headcode use the Train Finder on the homepage</p>
-  <p>This feature is only supported for GWR West & Sleeper services</p>
-  <p class="label">Find By Start/End CRS:</p>
-  <form on:submit={findByStartEnd}>
-    <input type="text" maxlength="3" autocomplete="off" placeholder="Start" bind:value={entryStartCRS} />
-    <input type="text" maxlength="3" autocomplete="off" placeholder="End" bind:value={entryEndCRS} />
-    <br />
-    <button type="submit">Search</button>
-  </form>
-
-  <p class="label">Find By PIS Code:</p>
-  <form on:submit={findByPis}>
-    <input type="number" max="9999" autocomplete="off" placeholder="PIS" bind:value={entryPIS} />
-    <br />
-    <button type="submit">Search</button>
-  </form>
-{/if}
     <button id="reset" type="reset" on:click={reset}>Reset</button>
+{:else}
+    <FindByHeadcodeCard />
+    <Card config={findByStartEndCard}>
+    <form on:submit={findByStartEnd}>
+        <input type="text" maxlength="3" pattern="^[A-Za-z]+$" autocomplete="off" placeholder="Start" required bind:value={entryStartCRS} />
+        <input type="text" maxlength="3" pattern="^[A-Za-z]+$" autocomplete="off" placeholder="End" required bind:value={entryEndCRS} />
+        <br />
+        <button type="submit">Search</button>
+        <button type="reset">Clear</button>
+    </form>
+    </Card>
+    <Card config={findByPisCodeCard}>
+      <form on:submit={findByPis}>
+        <input type="text" maxlength="4" pattern="^\d+$" autocomplete="off" placeholder="PIS" required bind:value={entryPIS} />
+        <br />
+        <button type="submit">Search</button>
+        <button type="reset" >Clear</button>
+      </form>
+    </Card>
+{/if}
 <Nav />
 
 <style>
@@ -118,21 +166,21 @@
         margin-left: 10px;
         margin-right: 10px;
     }
-  .label {
-    font-weight: 600;
-    color: var(--main-text-color);
-  }
     input {
         border: none;
         border-radius: 50px;
         font-family: urwgothic, sans-serif;
         text-align: center;
         text-transform: uppercase;
-    width: 30%;
+        width: 25%;
         max-width: 250px;
         height: 30px;
         font-size: 16px;
+        margin-top: 10px;
         margin-bottom: 15px;
+        margin-left: 10px;
+        margin-right: 10px;
+        box-shadow: var(--box-shadow);
     }
     button {
         border: none;
@@ -143,10 +191,12 @@
         margin: 0px;
         margin-left: 10px;
         margin-right: 10px;
+        margin-bottom: 15px;
         height: 30px;
-    background-color: var(--overlay-color);
+        background-color: var(--island-button-color);
         color: white;
         font-size: 16px;
+        box-shadow: var(--box-shadow);
     }
     table {
         width: 100%;

src/routes/train/+page.svelte

@@ -1,105 +1,163 @@
-<script>
+<script lang="ts">
-  import Header from '$lib/navigation/header.svelte';
+    import Header from "$lib/navigation/header.svelte";
-  import Loading from '$lib/navigation/loading.svelte';
+    import Island from "$lib/islands/island.svelte";
-  import Island from '$lib/islands/island.svelte';
+    import Nav from "$lib/navigation/nav.svelte";
-  import Nav from '$lib/navigation/nav.svelte';
+    import { uuid } from "$lib/stores/uuid";
-  import { uuid } from '$lib/stores/uuid';
 
-  import { onMount } from 'svelte';
+    import { onMount } from "svelte";
-  import TrainDetail from '$lib/train/train-detail.svelte';
+    import TrainDetail from "$lib/train/train-detail.svelte";
+    import { getApiUrl } from "$lib/scripts/upstream";
+    import toast from "svelte-french-toast";
+    import TimeBar from "$lib/navigation/TimeBar.svelte";
+    import { IconArrowLeft, IconArrowRight, IconCheck } from "@tabler/icons-svelte";
+    import Error from "../+error.svelte";
 
-  let title = 'Timetable Results';
+    let title = "Timetable Results";
-  let id = '';
+    let id = "";
     let data = [];
-  let isLoading = true;
     let error = false;
-  let errMsg = '';
+    let errMsg = "";
+
+    let formattedDate = new Date().toISOString().split('T')[0];
 
     $: {
         if (id) {
             title = id.toUpperCase();
         } else {
-      title = 'Querying Timetable';
+            title = "Querying Timetable";
         }
     }
 
     async function getHeadcode() {
-    return new URLSearchParams(window.location.search).get('headcode');
+        return new URLSearchParams(window.location.search).get("headcode");
+    }
+
+    function incrementDate() {
+        let dateInput = new Date(formattedDate)
+        dateInput.setDate(dateInput.getDate() + 1);
+        formattedDate = dateInput.toISOString().split('T')[0];
+    }
+
+    function decrementDate() {
+        let dateInput = new Date(formattedDate)
+        dateInput.setDate(dateInput.getDate() - 1);
+        formattedDate = dateInput.toISOString().split('T')[0];
     }
 
     onMount(async () => {
-    isLoading = true;
+        id = (await getHeadcode()) || "";
-    id = (await getHeadcode()) || '';
+        load();
-    const res = await fetchData(id);
+
-    if (res) {
+        if ($uuid == null || $uuid == "") {
-      data = res;
+        toast("Register to see PIS codes", {
-      if (!data.length) {
+            duration: 3000,
-        error = true;
+        });
-        errMsg = 'No services found';
     }
-    }
-    isLoading = false;
     });
 
-  async function fetchData(id = '') {
+    function load() {
-    const date = 'now';
+        error = false;
-    const searchType = 'headcode';
+        const selectedDate = new Date(formattedDate);
-    const options = {
+        const currentDate = new Date();
-      method: 'GET',
+        const difference: number = currentDate.getTime() - selectedDate.getTime();
-      headers: {
+        const differenceDays: number = difference / (1000 * 60 * 60 * 24)
-        uuid: $uuid
+        if (differenceDays > 7) {
+            toast.error("Timetable data is not available for dates older than a week")
+            return
         }
+
+        toast.promise(
+            fetchData(id),
+            {
+                loading: 'Searching Timetable',
+                success: 'Done',
+                error: 'No Services Found'
+            }
+        )
+    }
+
+    async function fetchData(id = "") {
+        data = [];
+        const searchType = "headcode";
+        const options = {
+            method: "GET",
+            headers: {
+                uuid: $uuid,
+            },
         };
-    const url = `https://owlboard.info/api/v2/timetable/train/${date}/${searchType}/${id}`;
+        const url = `${getApiUrl()}/api/v2/timetable/train/${formattedDate}/${searchType}/${id}`;
         try {
             const res = await fetch(url, options);
-      if (res.status == 200) {
+            if (res.status < 300) {
-        return await res.json();
+                let services = await res.json();
+                if (!services.length) {
+                    error = true;
+                    errMsg = "No services found";
+                    return Promise.reject(new Error(errMsg));
+                }
+                data = services
             } else if (res.status === 401) {
                 error = true;
-        errMsg = 'You must be logged into the staff version for this feature';
+                errMsg = "You must be logged into the staff version for this feature";
-        return false;
+                return Promise.reject(new Error(errMsg));
             } else {
                 error = true;
-        errMsg = 'Unable to connect, check your connection and try again';
+                errMsg = "Unable to connect, check your connection and try again";
-        return false;
+                return Promise.reject(new Error(errMsg));
             }
         } catch (err) {
             error = true;
-      errMsg = 'Connection error, try again later';
+            errMsg = "Connection error, try again later";
+            return Promise.reject(new Error(errMsg));
         }
-    isLoading = false;
     }
 </script>
 
-<Header {title} />
+<svelte:head>
-<div id="whitespace" />
+    <meta name="robots" content="noindex">
+</svelte:head>
 
+<Header {title} />
+<TimeBar updatedTime={undefined} />
+<div id="dateSelector">
+    <button on:click={decrementDate}><IconArrowLeft /></button>
+    <input 
+        type="date" 
+        id="dateInput" 
+        bind:value={formattedDate}
+    />
+    <button on:click={incrementDate}><IconArrowRight /></button>
+    <button on:click={load}><IconCheck /></button>
+</div>
 {#if error}
     <Island>
         <p style="font-weight:600">{errMsg}</p>
     </Island>
 {/if}
 
-{#if isLoading}
-  <Loading />
-{/if}
-
 {#each data as service}
     {#if service}
-    <TrainDetail {service} />
+        <TrainDetail {service} date={new Date(formattedDate)} />
     {/if}
 {/each}
 
 <Nav />
 
 <style>
-  #whitespace {
-    height: 15px;
-  }
     p {
         color: white;
         font-size: 18px;
         font-weight: 600;
     }
+
+    #dateInput {
+        height: 25px;
+        transform: translateY(-8px) translateX(20px);
+    }
+    button {
+        background: none;
+        border: none;
+        color: white;
+        transform: translateX(20px);
+    }
 </style>

src/service-worker.js

@@ -1,21 +1,31 @@
 /// <reference types="@sveltejs/kit" />
 
-import { build, files, version } from '$service-worker';
+import { build, files, version } from "$service-worker";
 
 const cacheName = `ob-${version}`;
 
-const assets = [...build, ...files, '/service-worker.js'];
+const assets = [...build, ...files, "/service-worker.js"];
 
-self.addEventListener('install', (event) => {
+const excludePatterns = [
+    "/static/images/screnshots",
+    "/images/screenshots",
+    "/static/images/shortcuts",
+    "/images/shortcuts",
+];
+
+self.addEventListener("install", (event) => {
     async function addToCache() {
         const cache = await caches.open(cacheName);
-    await cache.addAll(assets);
+        const assetsToCache = assets.filter(asset => {
+            return !excludePatterns.some(pattern => asset.startsWith(pattern));
+        });
+        await cache.addAll(assetsToCache);
     }
 
     event.waitUntil(addToCache());
 });
 
-self.addEventListener('activate', (event) => {
+self.addEventListener("activate", (event) => {
     async function deleteOldCache() {
         for (const key of await caches.keys()) {
             if (key !== cacheName) {
@@ -27,8 +37,8 @@ self.addEventListener('activate', (event) => {
     event.waitUntil(deleteOldCache());
 });
 
-self.addEventListener('fetch', (event) => {
+self.addEventListener("fetch", (event) => {
-  if (event.request.method !== 'GET') {
+    if (event.request.method !== "GET") {
         return;
     }
     async function respond() {
@@ -40,7 +50,7 @@ self.addEventListener('fetch', (event) => {
         try {
             return await fetch(event.request);
         } catch (err) {
-      return { error: 'OFFLINE', errorMsg: 'You are offline' };
+            return { error: "OFFLINE", errorMsg: "You are offline" };
         }
     }
 

static/images/nav/alert_icon.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 448 433" version="1.1" viewBox="0 0 448 433" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-		<radialGradient id="a" cx="216.7" cy="393.79" r="296.7" gradientUnits="userSpaceOnUse">
-			<stop stop-color="#F4D708" offset="0"/>
-			<stop stop-color="#FCB400" offset="1"/>
-		</radialGradient>
-		<path d="m8.551 390.5 184.85-368.8s26.409-31.504 52.815 0c26.41 31.501 180.19 370.65 180.19 370.65s3.105 18.534-27.961 18.534-361.94 0-361.94 0-23.299 0-27.959-20.38z" fill="url(#a)"/>
-		<path d="m8.551 390.5 184.85-368.8s26.409-31.504 52.815 0c26.41 31.501 180.19 370.65 180.19 370.65s3.105 18.534-27.961 18.534-361.94 0-361.94 0-23.299 0-27.959-20.38z" fill="none" stroke="#E2A713" stroke-width="5"/>
-<path d="m212.5 292.63c-13.168-79.969-19.75-123.12-19.75-129.45 0-7.703 2.551-13.926 7.66-18.676 5.105-4.746 10.871-7.121 17.293-7.121 6.949 0 12.82 2.535 17.609 7.598s7.188 11.023 7.188 17.883c0 6.543-6.668 49.801-20 129.77h-10zm27 38.17c0 6.098-2.156 11.301-6.469 15.613-4.313 4.309-9.461 6.465-15.453 6.465-6.098 0-11.301-2.156-15.613-6.465-4.313-4.313-6.465-9.516-6.465-15.613 0-5.992 2.152-11.141 6.465-15.453s9.516-6.469 15.613-6.469c5.992 0 11.141 2.156 15.453 6.469s6.48 9.45 6.48 15.44z"/>
-<metadata><rdf:RDF><cc:Work><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/><dc:publisher><cc:Agent rdf:about="http://openclipart.org/"><dc:title>Openclipart</dc:title></cc:Agent></dc:publisher><dc:title>Warning Notification</dc:title><dc:date>2007-02-08T17:08:47</dc:date><dc:description>Beveled yellow caution sign</dc:description><dc:source>http://openclipart.org/detail/3130/warning-notification-by-eastshores</dc:source><dc:creator><cc:Agent><dc:title>eastshores</dc:title></cc:Agent></dc:creator><dc:subject><rdf:Bag><rdf:li>alert</rdf:li><rdf:li>caution</rdf:li><rdf:li>clip art</rdf:li><rdf:li>clipart</rdf:li><rdf:li>icon</rdf:li><rdf:li>image</rdf:li><rdf:li>media</rdf:li><rdf:li>public domain</rdf:li><rdf:li>svg</rdf:li><rdf:li>warning</rdf:li></rdf:Bag></dc:subject></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/></cc:License></rdf:RDF></metadata></svg>

static/images/nav/back.svg

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="4.191mm" height="4.191mm" version="1.1" viewBox="0 0 4.191 4.191" xmlns="http://www.w3.org/2000/svg">
-<g transform="translate(-91.032 -156.47)">
-<path d="m95.223 158.3v0.52916h-3.175c0.48507 0.48507 0.97014 0.97014 1.4552 1.4552-0.12524 0.12524-0.25047 0.25047-0.37571 0.37571l-2.0955-2.0955 2.0955-2.0955c0.12524 0.12524 0.25047 0.25047 0.37571 0.37571-0.48507 0.48507-0.97014 0.97014-1.4552 1.4552h3.175z" fill="#f9f9f9" stroke-width=".26458"/>
-</g>
-</svg>