OwlBoard
/
owlboard-svelte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update prettier settings

This commit is contained in:
Fred Boniface 2024-04-30 11:17:06 +01:00
parent 1484a9068e
commit af58e923de
71 changed files with 4133 additions and 4114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.eslintrc.cjs
View File

@ -1,25 +1,25 @@
module.exports = { module.exports = {
root: true, 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: { parserOptions: {
sourceType: 'module', sourceType: "module",
ecmaVersion: 2020, ecmaVersion: 2020,
extraFileExtensions: ['.svelte'] extraFileExtensions: [".svelte"]
}, },
env: { env: {
browser: true, browser: true,
es2017: true, es2017: true,
node: true node: true
}, },
overrides: [ overrides: [
{ {
files: ['*.svelte'], files: ["*.svelte"],
parser: 'svelte-eslint-parser', parser: "svelte-eslint-parser",
parserOptions: { parserOptions: {
parser: '@typescript-eslint/parser' parser: "@typescript-eslint/parser"
} }
} }
] ]
}; };

18
.prettierrc
View File

@ -1,11 +1,11 @@
{ {
"useTabs": false, "useTabs": false,
"tabWidth": 2, "tabWidth": 4,
"semi": true, "semi": true,
"singleQuote": true, "singleQuote": false,
"trailingComma": "none", "trailingComma": "none",
"printWidth": 180, "printWidth": 180,
"plugins": ["prettier-plugin-svelte"], "plugins": ["prettier-plugin-svelte"],
"pluginSearchDirs": ["."], "pluginSearchDirs": ["."],
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
} }

66
package.json
View File

@ -1,35 +1,35 @@
{ {
"name": "owlboard-svelte", "name": "owlboard-svelte",
"version": "2024.03.2", "version": "2024.03.2",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
"build": "vite build", "build": "vite build",
"postbuild": "npx svelte-sitemap --domain https://owlboard.info --ignore '**/err/**' --ignore '**/reg/submit'", "postbuild": "npx svelte-sitemap --domain https://owlboard.info --ignore '**/err/**' --ignore '**/reg/submit'",
"preview": "vite preview", "preview": "vite preview",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"lint": "prettier --plugin-search-dir . --check . && eslint .", "lint": "prettier --plugin-search-dir . --check . && eslint .",
"format": "prettier --plugin-search-dir . --write ." "format": "prettier --plugin-search-dir . --write ."
}, },
"devDependencies": { "devDependencies": {
"@owlboard/ts-types": "^1.1.0", "@owlboard/ts-types": "^1.1.0",
"@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/adapter-static": "^2.0.2", "@sveltejs/adapter-static": "^2.0.2",
"@sveltejs/kit": "^1.5.0", "@sveltejs/kit": "^1.5.0",
"eslint": "^8.28.0", "eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.5.0",
"eslint-plugin-svelte": "^2.26.0", "eslint-plugin-svelte": "^2.26.0",
"prettier": "^2.8.0", "prettier": "^2.8.0",
"prettier-plugin-svelte": "^2.8.1", "prettier-plugin-svelte": "^2.8.1",
"svelte": "^3.54.0", "svelte": "^3.54.0",
"svelte-check": "^3.0.1", "svelte-check": "^3.0.1",
"svelte-sitemap": "^2.6.0", "svelte-sitemap": "^2.6.0",
"typescript": "^5.0.0", "typescript": "^5.0.0",
"vite": "^4.3.0" "vite": "^4.3.0"
}, },
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@tabler/icons-svelte": "^3.2.0" "@tabler/icons-svelte": "^3.2.0"
} }
} }

12
src/app.d.ts vendored
View File

@ -1,12 +1,12 @@
// See https://kit.svelte.dev/docs/types#app // See https://kit.svelte.dev/docs/types#app
// for information about these interfaces // for information about these interfaces
declare global { declare global {
namespace App { namespace App {
// interface Error {} // interface Error {}
// interface Locals {} // interface Locals {}
// interface PageData {} // interface PageData {}
// interface Platform {} // interface Platform {}
} }
} }
export {}; export {};

14
src/app.html
View File

@ -1,10 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
%sveltekit.head% %sveltekit.head%
</head> </head>
<body data-sveltekit-preload-data="hover"> <body data-sveltekit-preload-data="hover">
<div style="display: contents">%sveltekit.body%</div> <div style="display: contents">%sveltekit.body%</div>
</body> </body>
</html> </html>

32
src/lib/DevBanner.svelte
View File

@ -1,20 +1,20 @@
<div id="banner">DEVMODE</div> <div id="banner">DEVMODE</div>
<style> <style>
#banner { #banner {
width: 200px; width: 200px;
background: red; background: red;
color: #fff; color: #fff;
position: fixed; position: fixed;
text-align: center; text-align: center;
top: 25px; top: 25px;
line-height: 40px; line-height: 40px;
right: -50px; right: -50px;
left: auto; left: auto;
-ms-transform: rotate(45deg); -ms-transform: rotate(45deg);
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
transform: rotate(45deg); transform: rotate(45deg);
z-index: 100; z-index: 100;
box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.451); box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.451);
} }
</style> </style>

88
src/lib/Tooltip.svelte
View File

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

12
src/lib/images/large-logo.svelte
View File

@ -1,10 +1,10 @@
<img src="/images/logo/wide_logo.svg" alt="Logo" /> <img src="/images/logo/wide_logo.svg" alt="Logo" />
<style> <style>
img { img {
width: 50%; width: 50%;
max-width: 250px; max-width: 250px;
margin-top: 55px; margin-top: 55px;
margin-bottom: 55px; margin-bottom: 55px;
} }
</style> </style>

78
src/lib/islands/input-island-form.svelte
View File

@ -1,47 +1,47 @@
<script lang="ts"> <script lang="ts">
import Island from '$lib/islands/island.svelte'; import Island from "$lib/islands/island.svelte";
export let variables = { export let variables = {
title: 'Uninitialised', title: "Uninitialised",
action: '/', action: "/",
placeholder: 'Uninitialised', placeholder: "Uninitialised",
queryName: 'uninitiailsed' queryName: "uninitiailsed"
}; };
</script> </script>
<Island {variables}> <Island {variables}>
<form action={variables.action}> <form action={variables.action}>
<input class="form-input" type="text" id="input-headcode" name={variables.queryName} placeholder={variables.placeholder} autocomplete="off" /> <input class="form-input" type="text" id="input-headcode" name={variables.queryName} placeholder={variables.placeholder} autocomplete="off" />
<br /> <br />
<button type="submit">Submit</button> <button type="submit">Submit</button>
</form> </form>
</Island> </Island>
<style> <style>
.form-input { .form-input {
width: 75%; width: 75%;
height: 32px; height: 32px;
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;
border-radius: 50px; border-radius: 50px;
border: none; border: none;
text-align: center; 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; text-transform: uppercase;
font-size: 15px; font-size: 15px;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
button { button {
width: 50%; width: 50%;
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 5px; margin-top: 5px;
border: none; border: none;
border-radius: 20px; border-radius: 20px;
padding: 5px; 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-size: 16px;
font-weight: 400; font-weight: 400;
background-color: var(--island-button-color); background-color: var(--island-button-color);
color: var(--island-link-color); color: var(--island-link-color);
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
</style> </style>

40
src/lib/islands/island.svelte
View File

@ -1,29 +1,29 @@
<script lang="ts"> <script lang="ts">
import { fade } from 'svelte/transition'; import { fade } from "svelte/transition";
export let variables = { title: '' }; export let variables = { title: "" };
</script> </script>
<div in:fade={{ duration: 250 }}> <div in:fade={{ duration: 250 }}>
<span>{variables.title}</span> <span>{variables.title}</span>
<slot /> <slot />
</div> </div>
<style> <style>
span { 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-weight: 600;
font-size: 20px; font-size: 20px;
color: var(--island-header-color); color: var(--island-header-color);
} }
div { div {
width: 85%; width: 85%;
max-width: 400px; max-width: 400px;
margin: auto; margin: auto;
margin-top: 25px; margin-top: 25px;
padding: 10px; padding: 10px;
background-color: var(--island-bg-color); background-color: var(--island-bg-color);
border-radius: 10px; border-radius: 10px;
box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.29); box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.29);
} }
</style> </style>

54
src/lib/islands/overlay-island.svelte
View File

@ -1,36 +1,36 @@
<script lang="ts"> <script lang="ts">
import { fade } from 'svelte/transition'; import { fade } from "svelte/transition";
export let variables = { title: '' }; export let variables = { title: "" };
</script> </script>
<div in:fade={{ duration: 150 }} out:fade={{ duration: 150 }}> <div in:fade={{ duration: 150 }} out:fade={{ duration: 150 }}>
<span>{variables.title}</span> <span>{variables.title}</span>
<slot /> <slot />
</div> </div>
<style> <style>
span { 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(--island-header-color); color: var(--island-header-color);
font-weight: 600; font-weight: 600;
font-size: 20px; font-size: 20px;
} }
div { div {
position: fixed; position: fixed;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translateY(-50%) translateX(-50%); transform: translateY(-50%) translateX(-50%);
width: 85%; width: 85%;
height: auto; height: auto;
max-height: 75vh; max-height: 75vh;
overflow-y: auto; overflow-y: auto;
max-width: 400px; max-width: 400px;
margin: auto; margin: auto;
margin-top: 25px; margin-top: 25px;
padding: 10px; padding: 10px;
background-color: var(--island-bg-solid); background-color: var(--island-bg-solid);
border-radius: 10px; border-radius: 10px;
z-index: 1000; z-index: 1000;
} }
</style> </style>

92
src/lib/islands/quick-link-island.svelte
View File

@ -1,54 +1,54 @@
<script lang="ts"> <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";
export let variables = { export let variables = {
title: 'Quick Links' title: "Quick Links"
}; };
</script> </script>
<Island {variables}> <Island {variables}>
{#if $ql.length === 0} {#if $ql.length === 0}
<p>Go to <a href="/more/settings">settings</a> to add your Quick Links</p> <p>Go to <a href="/more/settings">settings</a> to add your Quick Links</p>
{/if} {/if}
<div class="buttons"> <div class="buttons">
{#each $ql as link} {#each $ql as link}
{#if link.length === 3} {#if link.length === 3}
<a class="link" href="/ldb?station={link}"> <a class="link" href="/ldb?station={link}">
{link.toUpperCase()} {link.toUpperCase()}
</a> </a>
{:else if link.length === 4} {:else if link.length === 4}
<a class="link" href="/train?headcode={link}"> <a class="link" href="/train?headcode={link}">
{link.toUpperCase()} {link.toUpperCase()}
</a> </a>
{/if} {/if}
{/each} {/each}
</div> </div>
</Island> </Island>
<style> <style>
.buttons { .buttons {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 90%; width: 90%;
margin: auto; margin: auto;
padding-top: 5px; padding-top: 5px;
} }
.link { .link {
flex: 1; flex: 1;
width: 20%; width: 20%;
min-width: 50px; min-width: 50px;
margin: 5px; margin: 5px;
border: none; border: none;
border-radius: 20px; border-radius: 20px;
padding: 5px; 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-size: 16px;
font-weight: 400; font-weight: 400;
text-decoration: none; text-decoration: none;
background-color: var(--island-button-color); background-color: var(--island-button-color);
color: var(--island-link-color); color: var(--island-link-color);
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
</style> </style>

208
src/lib/islands/quick-link-set-island.svelte
View File

@ -1,117 +1,117 @@
<script lang="ts"> <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";
export let variables = { export let variables = {
title: 'Quick Links' title: "Quick Links"
}; };
let qlData: string[] = []; let qlData: string[] = [];
$: { $: {
qlData = $ql; qlData = $ql;
console.log(qlData); console.log(qlData);
}
let saveButton = 'Save';
async function timeout(ms: number): Promise<any> {
return new Promise((resolve) => setTimeout(resolve, ms));
}
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');
let inputLinks: string[] = [];
for (let item of inputs) {
let text = (<HTMLInputElement>item)?.value;
if (text !== '') {
inputLinks.push(text);
}
} }
console.log(inputLinks);
ql.set(inputLinks);
saveButton = '&#10004;';
await timeout(3000);
saveButton = 'Saved';
}
function clearQl() { let saveButton = "Save";
ql.set([]);
saveButton = 'Saved';
}
function addQlBox() { async function timeout(ms: number): Promise<any> {
saveButton = 'Save'; return new Promise((resolve) => setTimeout(resolve, ms));
const updatedQl = [...$ql, '']; }
$ql = updatedQl;
ql.set(updatedQl);
}
function handleClick(event: any) { async function saveQl() {
// Handle the click event here // Fetch the content of all text entries within the island then run ql.set([ARRAY OF INPUT CONTENT])
console.log('Island Clicked'); const inputs = document.getElementsByClassName("qlInput");
// You can access the `variables` passed to the Island component here if needed let inputLinks: string[] = [];
} for (let item of inputs) {
let text = (<HTMLInputElement>item)?.value;
if (text !== "") {
inputLinks.push(text);
}
}
console.log(inputLinks);
ql.set(inputLinks);
saveButton = "&#10004;";
await timeout(3000);
saveButton = "Saved";
}
function clearQl() {
ql.set([]);
saveButton = "Saved";
}
function addQlBox() {
saveButton = "Save";
const updatedQl = [...$ql, ""];
$ql = updatedQl;
ql.set(updatedQl);
}
function handleClick(event: any) {
// Handle the click event here
console.log("Island Clicked");
// You can access the `variables` passed to the Island component here if needed
}
</script> </script>
<Island on:click={handleClick} {variables}> <Island on:click={handleClick} {variables}>
{#if $ql.length === 0} {#if $ql.length === 0}
<p>Click the + button to add links</p> <p>Click the + button to add links</p>
{/if} {/if}
<div id="buttons" class="buttons"> <div id="buttons" class="buttons">
<p>Quick links can be CRS Codes or Headcodes</p> <p>Quick links can be CRS Codes or Headcodes</p>
{#each qlData as link} {#each qlData as link}
<input class="qlInput" type="text" value={link} /> <input class="qlInput" type="text" value={link} />
{/each} {/each}
<button on:click={addQlBox} id="qlAdd">+</button> <button on:click={addQlBox} id="qlAdd">+</button>
</div> </div>
<button on:click={saveQl}>{@html saveButton}</button> <button on:click={saveQl}>{@html saveButton}</button>
<button on:click={clearQl}>Clear</button> <button on:click={clearQl}>Clear</button>
</Island> </Island>
<style> <style>
p { p {
margin-bottom: 0; margin-bottom: 0;
} }
#qlAdd { #qlAdd {
width: 40px; width: 40px;
} }
.buttons { .buttons {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 90%; width: 90%;
margin: auto; margin: auto;
padding-top: 5px; padding-top: 5px;
} }
input { input {
flex: 1; flex: 1;
width: 20%; width: 20%;
min-width: 50px; min-width: 50px;
margin: 5px; margin: 5px;
border: none; border: none;
border-radius: 20px; border-radius: 20px;
padding: 5px; 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-size: 16px;
font-weight: 400; font-weight: 400;
text-decoration: none; text-decoration: none;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
button { button {
width: 30%; width: 30%;
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 10px; margin-top: 10px;
border: none; border: none;
border-radius: 20px; border-radius: 20px;
padding: 5px; 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-size: 16px;
font-weight: 400; font-weight: 400;
background-color: var(--island-button-color); background-color: var(--island-button-color);
color: var(--island-link-color); color: var(--island-link-color);
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
</style> </style>

40
src/lib/islands/result-island.svelte
View File

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

206
src/lib/ldb/nrcc/alert-bar.svelte
View File

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

879
src/lib/ldb/public-ldb.svelte
View File

@ -1,486 +1,491 @@
<script> <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/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 { getApiUrl } from "$lib/scripts/upstream";
let requestedStation; let requestedStation;
$: requestedStation = station; $: requestedStation = station;
let jsonData = null; let jsonData = null;
let services = []; let services = [];
let busServices = []; let busServices = [];
let ferryServices = []; let ferryServices = [];
let dataAge = null; let dataAge = null;
let isLoading = true; let isLoading = true;
let dataExists = false; let dataExists = false;
let alerts = []; let alerts = [];
let serviceDetail; let serviceDetail;
$: { $: {
if (jsonData === null && requestedStation) { if (jsonData === null && requestedStation) {
fetchData(); fetchData();
}
if (jsonData?.GetStationBoardResult?.generatedAt) {
dataAge = new Date(jsonData.GetStationBoardResult.generatedAt);
}
if (jsonData?.GetStationBoardResult?.trainServices?.service) {
services = jsonData.GetStationBoardResult.trainServices.service;
} else {
services = [];
}
if (jsonData?.GetStationBoardResult?.busServices?.service) {
busServices = jsonData.GetStationBoardResult.busServices.service;
}
if (jsonData?.GetStationBoardResult?.ferryServices?.service) {
ferryServices = jsonData.GetStationBoardResult.ferryServices.service;
}
if (jsonData?.GetStationBoardResult?.locationName) {
title = jsonData.GetStationBoardResult.locationName;
} else {
title = requestedStation.toUpperCase();
}
} }
if (jsonData?.GetStationBoardResult?.generatedAt) { async function fetchData() {
dataAge = new Date(jsonData.GetStationBoardResult.generatedAt); dataExists = true;
isLoading = true; // Set loading state
try {
console.log(`Requested Station: ${requestedStation}`);
const data = await fetch(`${getApiUrl()}/api/v2/live/station/${requestedStation}/public`);
jsonData = await data.json();
} catch (error) {
console.error("Error fetching data:", error);
dataExists = false;
title = "Not Found";
} finally {
isLoading = false; // Clear loading state
}
prepareNrcc();
} }
if (jsonData?.GetStationBoardResult?.trainServices?.service) { function parseTime(string) {
services = jsonData.GetStationBoardResult.trainServices.service; let output;
} else { let change;
services = []; switch (string) {
case "Delayed":
output = "LATE";
change = "changed";
break;
case "Cancelled":
output = "CANC";
change = "cancelled";
break;
case "On Time":
case "On time":
output = "RT";
change = "";
break;
case "":
output = "-";
change = "";
break;
case undefined:
output = "-";
change = "";
break;
case "No report":
output = "-";
change = "";
break;
case "undefined":
output = false;
change = "";
break;
default:
output = string;
change = "changed";
}
return { data: output, changed: change };
} }
if (jsonData?.GetStationBoardResult?.busServices?.service) { async function loadService(sid) {
busServices = jsonData.GetStationBoardResult.busServices.service; for (const service of services) {
if (service.serviceID == sid) {
serviceDetail = service;
}
}
} }
if (jsonData?.GetStationBoardResult?.ferryServices?.service) { async function loadBusService(sid) {
ferryServices = jsonData.GetStationBoardResult.ferryServices.service; for (const service of busServices) {
if (service.serviceID == sid) {
serviceDetail = service;
}
}
} }
if (jsonData?.GetStationBoardResult?.locationName) { async function closeService() {
title = jsonData.GetStationBoardResult.locationName; serviceDetail = null;
} else {
title = requestedStation.toUpperCase();
} }
}
async function fetchData() { async function prepareNrcc() {
dataExists = true; if (jsonData?.GetStationBoardResult?.nrccMessages?.message) {
isLoading = true; // Set loading state const nrcc = jsonData.GetStationBoardResult.nrccMessages.message;
try { if (Array.isArray(nrcc)) {
console.log(`Requested Station: ${requestedStation}`); alerts = nrcc;
const data = await fetch(`${getApiUrl()}/api/v2/live/station/${requestedStation}/public`); return;
jsonData = await data.json(); }
} catch (error) { alerts.push(nrcc);
console.error('Error fetching data:', error); return;
dataExists = false; }
title = 'Not Found';
} finally {
isLoading = false; // Clear loading state
} }
prepareNrcc();
}
function parseTime(string) { onMount(() => {
let output; if (requestedStation && jsonData === null) {
let change; fetchData();
switch (string) { }
case 'Delayed': });
output = 'LATE';
change = 'changed';
break;
case 'Cancelled':
output = 'CANC';
change = 'cancelled';
break;
case 'On Time':
case 'On time':
output = 'RT';
change = '';
break;
case '':
output = '-';
change = '';
break;
case undefined:
output = '-';
change = '';
break;
case 'No report':
output = '-';
change = '';
break;
case 'undefined':
output = false;
change = '';
break;
default:
output = string;
change = 'changed';
}
return { data: output, changed: change };
}
async function loadService(sid) {
for (const service of services) {
if (service.serviceID == sid) {
serviceDetail = service;
}
}
}
async function loadBusService(sid) {
for (const service of busServices) {
if (service.serviceID == sid) {
serviceDetail = service;
}
}
}
async function closeService() {
serviceDetail = null;
}
async function prepareNrcc() {
if (jsonData?.GetStationBoardResult?.nrccMessages?.message) {
const nrcc = jsonData.GetStationBoardResult.nrccMessages.message;
if (Array.isArray(nrcc)) {
alerts = nrcc;
return;
}
alerts.push(nrcc);
return;
}
}
onMount(() => {
if (requestedStation && jsonData === null) {
fetchData();
}
});
</script> </script>
{#if alerts.length} {#if alerts.length}
<AlertBar {alerts} /> <AlertBar {alerts} />
{/if} {/if}
{#if isLoading} {#if isLoading}
<Loading /> <Loading />
{:else if dataAge} {:else if dataAge}
<p id="timestamp">Updated: {dataAge.toLocaleTimeString()}</p> <p id="timestamp">Updated: {dataAge.toLocaleTimeString()}</p>
{#if services.length} {#if services.length}
<table class="ldbTable"> <table class="ldbTable">
<tr> <tr>
<th class="from">From</th> <th class="from">From</th>
<th class="to">To</th> <th class="to">To</th>
<th class="plat">Plat.</th> <th class="plat">Plat.</th>
<th class="time">Sch Arr.</th> <th class="time">Sch Arr.</th>
<th class="time">Exp Arr.</th> <th class="time">Exp Arr.</th>
<th class="time">Sch Dep.</th> <th class="time">Sch Dep.</th>
<th class="time">Exp Dep.</th> <th class="time">Exp Dep.</th>
</tr> </tr>
{#each services as service} {#each services as service}
<tr> <tr>
<td class="origdest from" on:click={loadService(service.serviceID)} on:keypress={loadService(service.serviceID)}> <td class="origdest from" on:click={loadService(service.serviceID)} on:keypress={loadService(service.serviceID)}>
{#if Array.isArray(service.origin?.location)} {#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} {:else}
{service.origin?.location?.locationName || ''} {service.origin?.location?.locationName || ""}
{/if} {/if}
</td> </td>
<td class="origdest to" on:click={loadService(service.serviceID)} on:keypress={loadService(service.serviceID)}> <td class="origdest to" on:click={loadService(service.serviceID)} on:keypress={loadService(service.serviceID)}>
{#if Array.isArray(service.destination?.location)} {#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} {:else}
{service.destination?.location?.locationName || ''} {service.destination?.location?.locationName || ""}
{/if} {/if}
</td> </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.sta).data}</td>
<td class="time {parseTime(service.eta).changed}">{parseTime(service.eta).data}</td> <td class="time {parseTime(service.eta).changed}">{parseTime(service.eta).data}</td>
<td class="time">{parseTime(service.std).data}</td> <td class="time">{parseTime(service.std).data}</td>
<td class="time {parseTime(service.etd).changed}">{parseTime(service.etd).data}</td> <td class="time {parseTime(service.etd).changed}">{parseTime(service.etd).data}</td>
</tr> </tr>
<tr <tr
><td colspan="7"> ><td colspan="7">
<p class="service-detail"> <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} {/if}
</p> </p>
{#if service.delayReason} {#if service.delayReason}
<p class="service-detail">{service.delayReason}</p> <p class="service-detail">{service.delayReason}</p>
{/if} {/if}
{#if service.cancelReason} {#if service.cancelReason}
<p class="service-detail">{service.cancelReason}</p> <p class="service-detail">{service.cancelReason}</p>
{/if} {/if}
</td></tr </td></tr
> >
{/each} {/each}
</table> </table>
{:else} {:else}
<p class="table-head-text">No Scheduled Train Services</p> <p class="table-head-text">No Scheduled Train Services</p>
{/if} {/if}
{#if busServices.length} {#if busServices.length}
<br /> <br />
<img class="transport-mode" src="/images/transport-modes/bus.svg" alt="Bus services" /><br /> <img class="transport-mode" src="/images/transport-modes/bus.svg" alt="Bus services" /><br />
<span class="table-head-text">Bus Services</span> <span class="table-head-text">Bus Services</span>
<table class="ldbTable"> <table class="ldbTable">
<tr> <tr>
<th class="from">From</th> <th class="from">From</th>
<th class="to">To</th> <th class="to">To</th>
<th class="time">Sch Arr.</th> <th class="time">Sch Arr.</th>
<th class="time">Exp Arr.</th> <th class="time">Exp Arr.</th>
<th class="time">Sch Dep.</th> <th class="time">Sch Dep.</th>
<th class="time">Exp Dep.</th> <th class="time">Exp Dep.</th>
</tr> </tr>
{#each busServices as service} {#each busServices as service}
<tr> <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)}
<td class="origdest to" on:click={loadBusService(service.serviceID)} on:keypress={loadBusService(service.serviceID)} >{service.origin?.location?.locationName || ""}</td
>{service.destination?.location?.locationName || ''}</td >
> <td class="origdest to" on:click={loadBusService(service.serviceID)} on:keypress={loadBusService(service.serviceID)}
<td class="time">{parseTime(service.sta).data}</td> >{service.destination?.location?.locationName || ""}</td
<td class="time {parseTime(service.eta).changed}">{parseTime(service.eta).data}</td> >
<td class="time">{parseTime(service.std).data}</td> <td class="time">{parseTime(service.sta).data}</td>
<td class="time {parseTime(service.etd).changed}">{parseTime(service.etd).data}</td> <td class="time {parseTime(service.eta).changed}">{parseTime(service.eta).data}</td>
</tr> <td class="time">{parseTime(service.std).data}</td>
<td class="time {parseTime(service.etd).changed}">{parseTime(service.etd).data}</td>
</tr>
<tr <tr
><td colspan="7"> ><td colspan="7">
<p class="service-detail"> <p class="service-detail">
A {service.operator || 'Unknown'} service A {service.operator || "Unknown"} service
</p> </p>
{#if service.delayReason} {#if service.delayReason}
<p class="service-detail">{service.delayReason}</p> <p class="service-detail">{service.delayReason}</p>
{/if} {/if}
{#if service.cancelReason} {#if service.cancelReason}
<p class="service-detail">{service.cancelReason}</p> <p class="service-detail">{service.cancelReason}</p>
{/if} {/if}
</td></tr </td></tr
> >
{/each} {/each}
</table> </table>
{/if} {/if}
{#if ferryServices.length} {#if ferryServices.length}
<br /> <br />
<img class="transport-mode" src="/images/transport-modes/ferry.svg" alt="Bus services" /><br /> <img class="transport-mode" src="/images/transport-modes/ferry.svg" alt="Bus services" /><br />
<span class="table-head-text">Ferry Services</span> <span class="table-head-text">Ferry Services</span>
<table class="ldbTable"> <table class="ldbTable">
<tr> <tr>
<th class="from">From</th> <th class="from">From</th>
<th class="to">To</th> <th class="to">To</th>
<th class="time">Sch Arr.</th> <th class="time">Sch Arr.</th>
<th class="time">Exp Arr.</th> <th class="time">Exp Arr.</th>
<th class="time">Sch Dep.</th> <th class="time">Sch Dep.</th>
<th class="time">Exp Dep.</th> <th class="time">Exp Dep.</th>
</tr> </tr>
{#each ferryServices as service} {#each ferryServices as service}
<tr> <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.sta).data}</td>
<td class="time {parseTime(service.eta).changed}">{parseTime(service.eta).data}</td> <td class="time {parseTime(service.eta).changed}">{parseTime(service.eta).data}</td>
<td class="time">{parseTime(service.std).data}</td> <td class="time">{parseTime(service.std).data}</td>
<td class="time {parseTime(service.etd).changed}">{parseTime(service.etd).data}</td> <td class="time {parseTime(service.etd).changed}">{parseTime(service.etd).data}</td>
</tr> </tr>
<tr <tr
><td colspan="7"> ><td colspan="7">
{#if service.delayReason} {#if service.delayReason}
<p class="service-detail">{service.delayReason}</p> <p class="service-detail">{service.delayReason}</p>
{/if} {/if}
{#if service.cancelReason} {#if service.cancelReason}
<p class="service-detail">{service.cancelReason}</p> <p class="service-detail">{service.cancelReason}</p>
{/if} {/if}
</td></tr </td></tr
> >
{/each} {/each}
</table> </table>
{/if} {/if}
{:else} {:else}
<Island> <Island>
<p style="font-weight:600">Unable to load data</p> <p style="font-weight:600">Unable to load data</p>
</Island> </Island>
{/if} {/if}
{#if serviceDetail} {#if serviceDetail}
<OverlayIsland> <OverlayIsland>
<div id="detailBox"> <div id="detailBox">
<h6>Service Detail</h6> <h6>Service Detail</h6>
<button type="button" id="closeService" on:click={closeService}>X</button> <button type="button" id="closeService" on:click={closeService}>X</button>
<table id="detailTable"> <table id="detailTable">
<tr> <tr>
<th>Location</th> <th>Location</th>
<th>Sch</th> <th>Sch</th>
<th>Exp</th> <th>Exp</th>
</tr> </tr>
{#if serviceDetail?.previousCallingPoints?.callingPointList?.callingPoint} {#if serviceDetail?.previousCallingPoints?.callingPointList?.callingPoint}
{#if Array.isArray(serviceDetail?.previousCallingPoints?.callingPointList?.callingPoint)} {#if Array.isArray(serviceDetail?.previousCallingPoints?.callingPointList?.callingPoint)}
{#each serviceDetail.previousCallingPoints.callingPointList.callingPoint as prevPoint} {#each serviceDetail.previousCallingPoints.callingPointList.callingPoint as prevPoint}
<tr> <tr>
<td>{prevPoint.locationName}</td> <td>{prevPoint.locationName}</td>
<td>{prevPoint.st}</td> <td>{prevPoint.st}</td>
<td class="time {parseTime(prevPoint.at || prevPoint.et).changed}">{parseTime(prevPoint.at || prevPoint.et).data}</td> <td class="time {parseTime(prevPoint.at || prevPoint.et).changed}">{parseTime(prevPoint.at || prevPoint.et).data}</td>
</tr> </tr>
{/each} {/each}
{:else} {:else}
<tr> <tr>
<td>{serviceDetail.previousCallingPoints.callingPointList.callingPoint.locationName}</td> <td>{serviceDetail.previousCallingPoints.callingPointList.callingPoint.locationName}</td>
<td>{serviceDetail.previousCallingPoints.callingPointList.callingPoint.st}</td> <td>{serviceDetail.previousCallingPoints.callingPointList.callingPoint.st}</td>
<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(
</tr> serviceDetail.previousCallingPoints.callingPointList.callingPoint.at || serviceDetail.previousCallingPoints.callingPointList.callingPoint.et
{/if} ).data}</td
{/if} >
<tr class="thisStop"> </tr>
<td>{title}</td> {/if}
<td>{serviceDetail.std || serviceDetail.sta}</td> {/if}
<td class="time {parseTime(serviceDetail.etd || serviceDetail.eta).changed}">{parseTime(serviceDetail.etd || serviceDetail.eta).data}</td> <tr class="thisStop">
</tr> <td>{title}</td>
{#if serviceDetail?.subsequentCallingPoints?.callingPointList?.callingPoint} <td>{serviceDetail.std || serviceDetail.sta}</td>
{#if Array.isArray(serviceDetail?.subsequentCallingPoints?.callingPointList?.callingPoint)} <td class="time {parseTime(serviceDetail.etd || serviceDetail.eta).changed}">{parseTime(serviceDetail.etd || serviceDetail.eta).data}</td>
{#each serviceDetail.subsequentCallingPoints.callingPointList.callingPoint as nextPoint} </tr>
<tr> {#if serviceDetail?.subsequentCallingPoints?.callingPointList?.callingPoint}
<td>{nextPoint.locationName}</td> {#if Array.isArray(serviceDetail?.subsequentCallingPoints?.callingPointList?.callingPoint)}
<td>{nextPoint.st}</td> {#each serviceDetail.subsequentCallingPoints.callingPointList.callingPoint as nextPoint}
<td class="time {parseTime(nextPoint.et).changed}">{parseTime(nextPoint.et).data}</td> <tr>
</tr> <td>{nextPoint.locationName}</td>
{/each} <td>{nextPoint.st}</td>
{:else} <td class="time {parseTime(nextPoint.et).changed}">{parseTime(nextPoint.et).data}</td>
<tr class="detailRow"> </tr>
<td>{serviceDetail.subsequentCallingPoints.callingPointList.callingPoint.locationName}</td> {/each}
<td>{serviceDetail.subsequentCallingPoints.callingPointList.callingPoint.st}</td> {:else}
<td class="time {parseTime(serviceDetail.subsequentCallingPoints.callingPointList.callingPoint.et).changed}" <tr class="detailRow">
>{parseTime(serviceDetail.subsequentCallingPoints.callingPointList.callingPoint.et).data}</td <td>{serviceDetail.subsequentCallingPoints.callingPointList.callingPoint.locationName}</td>
> <td>{serviceDetail.subsequentCallingPoints.callingPointList.callingPoint.st}</td>
</tr> <td class="time {parseTime(serviceDetail.subsequentCallingPoints.callingPointList.callingPoint.et).changed}"
{/if} >{parseTime(serviceDetail.subsequentCallingPoints.callingPointList.callingPoint.et).data}</td
{/if} >
</table> </tr>
</div> {/if}
</OverlayIsland> {/if}
</table>
</div>
</OverlayIsland>
{/if} {/if}
<style> <style>
#timestamp { #timestamp {
margin: auto; margin: auto;
text-align: left; text-align: left;
font-size: 14px; font-size: 14px;
} }
.ldbTable { .ldbTable {
width: 100%; width: 100%;
min-width: 300px; min-width: 300px;
margin: auto; margin: auto;
padding-right: 2px; padding-right: 2px;
padding-left: 0px; padding-left: 0px;
color: white; color: white;
font-size: 13px; font-size: 13px;
}
.service-detail {
color: cyan;
text-align: left;
font-size: 12px;
padding: 0;
margin: 0;
}
.transport-mode {
width: 30px;
}
.table-head-text {
color: white;
font-size: 14px;
}
@media (min-width: 800px) {
table {
font-size: 15px;
max-width: 850px;
} }
.service-detail { .service-detail {
font-size: 14px; color: cyan;
text-align: left;
font-size: 12px;
padding: 0;
margin: 0;
} }
.transport-mode { .transport-mode {
width: 50px; width: 30px;
}
#timestamp {
font-size: 16px;
}
}
@media (min-width: 1000px) {
table {
font-size: 17px;
}
.service-detail {
font-size: 16px;
} }
.table-head-text { .table-head-text {
font-size: 16px; color: white;
font-size: 14px;
} }
} @media (min-width: 800px) {
@media (min-width: 1600px) { table {
table { font-size: 15px;
font-size: 19px; max-width: 850px;
}
.service-detail {
font-size: 14px;
}
.transport-mode {
width: 50px;
}
#timestamp {
font-size: 16px;
}
} }
.service-detail { @media (min-width: 1000px) {
font-size: 18px; table {
font-size: 17px;
}
.service-detail {
font-size: 16px;
}
.table-head-text {
font-size: 16px;
}
}
@media (min-width: 1600px) {
table {
font-size: 19px;
}
.service-detail {
font-size: 18px;
}
}
.origdest {
color: yellow;
}
.from {
width: 25%;
text-align: left;
}
.to {
width: 25%;
text-align: left;
}
.plat {
width: 10%;
}
.time {
width: 10%;
}
.changed {
animation: pulse-change 1.5s linear infinite;
} }
}
.origdest {
color: yellow;
}
.from {
width: 25%;
text-align: left;
}
.to {
width: 25%;
text-align: left;
}
.plat {
width: 10%;
}
.time {
width: 10%;
}
.changed {
animation: pulse-change 1.5s linear infinite;
}
.cancelled { .cancelled {
animation: pulse-cancel 1.5s linear infinite; animation: pulse-cancel 1.5s linear infinite;
}
@keyframes pulse-change {
50% {
color: var(--main-warning-color);
} }
}
@keyframes pulse-cancel { @keyframes pulse-change {
50% { 50% {
color: var(--main-alert-color); color: var(--main-warning-color);
}
}
@keyframes pulse-cancel {
50% {
color: var(--main-alert-color);
}
}
#detailBox {
width: 100%;
}
h6 {
position: absolute;
top: -25px;
left: 20px;
font-size: 18px;
}
#closeService {
position: absolute;
top: 10px;
right: 10px;
border: none;
border-radius: 60px;
width: 35px;
height: 35px;
background-color: var(--main-bg-color);
color: white;
font-weight: 700;
font-size: 16px;
}
#detailTable {
margin-top: 40px;
color: white;
font-size: 15px;
}
.thisStop {
color: yellow;
} }
}
#detailBox {
width: 100%;
}
h6 {
position: absolute;
top: -25px;
left: 20px;
font-size: 18px;
}
#closeService {
position: absolute;
top: 10px;
right: 10px;
border: none;
border-radius: 60px;
width: 35px;
height: 35px;
background-color: var(--main-bg-color);
color: white;
font-weight: 700;
font-size: 16px;
}
#detailTable {
margin-top: 40px;
color: white;
font-size: 15px;
}
.thisStop {
color: yellow;
}
</style> </style>

54
src/lib/ldb/staff/fetch.ts
View File

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

142
src/lib/ldb/staff/staff-ldb.svelte
View File

@ -1,89 +1,89 @@
<script lang="ts"> <script lang="ts">
import TableGenerator from './table/table-generator.svelte'; import TableGenerator from "./table/table-generator.svelte";
import Loading from '$lib/navigation/loading.svelte'; import Loading from "$lib/navigation/loading.svelte";
import type { ApiResponse, StaffLdb } from '@owlboard/ts-types'; import type { ApiResponse, StaffLdb } from "@owlboard/ts-types";
import { detailInit, defineDetail } from './train-detail'; import { detailInit, defineDetail } from "./train-detail";
import TrainDetail from './train-detail.svelte'; import TrainDetail from "./train-detail.svelte";
import { fetchStaffLdb } from './fetch'; import { fetchStaffLdb } from "./fetch";
import AlertBar from '../nrcc/alert-bar.svelte'; import AlertBar from "../nrcc/alert-bar.svelte";
export let station: string; export let station: string;
export let title: string | undefined = 'Loading...'; export let title: string | undefined = "Loading...";
let errorDetail = { let errorDetail = {
code: '', code: "",
message: '' message: ""
}; };
let nrcc: string[] = []; let nrcc: string[] = [];
let detail = detailInit(); let detail = detailInit();
function hideDetail() { function hideDetail() {
detail = detailInit(); detail = detailInit();
} }
function showDetail(rid: string, uid: string, tid: string) { function showDetail(rid: string, uid: string, tid: string) {
detail = defineDetail(rid, uid, tid); detail = defineDetail(rid, uid, tid);
} }
console.log(`Station: ${station}`); console.log(`Station: ${station}`);
async function callFetch(station: string): Promise<StaffLdb> { async function callFetch(station: string): Promise<StaffLdb> {
const data = await fetchStaffLdb(station); const data = await fetchStaffLdb(station);
if (data.data) { if (data.data) {
title = data.data.locationName; title = data.data.locationName;
if (data.data?.nrccMessages) { if (data.data?.nrccMessages) {
for (const msg of data.data.nrccMessages) { for (const msg of data.data.nrccMessages) {
nrcc.push(msg.xhtmlMessage); nrcc.push(msg.xhtmlMessage);
} }
} }
return data.data; return data.data;
}
errorDetail.code = data.obStatus.toString() || "UNKNOWN";
errorDetail.message = data.obMsg || "An unknown error occoured";
throw new Error("Unable to Fetch Data");
} }
errorDetail.code = data.obStatus.toString() || 'UNKNOWN';
errorDetail.message = data.obMsg || 'An unknown error occoured';
throw new Error('Unable to Fetch Data');
}
</script> </script>
{#key detail} {#key detail}
{#if detail.show} {#if detail.show}
<TrainDetail {detail} close={hideDetail} /> <TrainDetail {detail} close={hideDetail} />
{/if} {/if}
{/key} {/key}
{#await callFetch(station)} {#await callFetch(station)}
<Loading /> <Loading />
{:then data} {:then data}
{#if data} {#if data}
<p class="generatedTime">Updated: {new Date(data.generatedAt).toLocaleTimeString()}</p> <p class="generatedTime">Updated: {new Date(data.generatedAt).toLocaleTimeString()}</p>
{#if data.trainServices?.length} {#if data.trainServices?.length}
<TableGenerator services={data.trainServices} click={showDetail} /> <TableGenerator services={data.trainServices} click={showDetail} />
{/if}
{#if data.busServices?.length}
<img class="transport-mode" src="/images/transport-modes/bus.svg" alt="Bus services" /><br />
<span class="table-head-text">Bus Services</span>
<TableGenerator services={data.busServices} click={showDetail} />
{/if}
{#if data.ferryServices?.length}
<img class="transport-mode" src="/images/transport-modes/ferry.svg" alt="Ferry services" /><br />
<span class="table-head-text">Ferry Services</span>
<TableGenerator services={data.ferryServices} click={showDetail} />
{/if}
{#if nrcc.length}
<AlertBar alerts={nrcc} />
{/if}
<!-- NRCC Alerts are not available -->
{/if} {/if}
{#if data.busServices?.length}
<img class="transport-mode" src="/images/transport-modes/bus.svg" alt="Bus services" /><br />
<span class="table-head-text">Bus Services</span>
<TableGenerator services={data.busServices} click={showDetail} />
{/if}
{#if data.ferryServices?.length}
<img class="transport-mode" src="/images/transport-modes/ferry.svg" alt="Ferry services" /><br />
<span class="table-head-text">Ferry Services</span>
<TableGenerator services={data.ferryServices} click={showDetail} />
{/if}
{#if nrcc.length}
<AlertBar alerts={nrcc} />
{/if}
<!-- NRCC Alerts are not available -->
{/if}
{:catch} {:catch}
<h2>Error</h2> <h2>Error</h2>
<p>ERR-CODE: {errorDetail.code}</p> <p>ERR-CODE: {errorDetail.code}</p>
<p>Message:<br />{errorDetail.message}</p> <p>Message:<br />{errorDetail.message}</p>
{/await} {/await}
<style> <style>
.transport-mode { .transport-mode {
padding-top: 20px; padding-top: 20px;
height: 17px; height: 17px;
} }
.table-head-text { .table-head-text {
color: white; color: white;
} }
</style> </style>

564
src/lib/ldb/staff/table/table-generator.svelte
View File

@ -1,319 +1,319 @@
<script lang="ts"> <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";
import type { TrainServices, ServiceLocation } from '@owlboard/ts-types'; import type { TrainServices, ServiceLocation } from "@owlboard/ts-types";
export let services: TrainServices[]; export let services: TrainServices[];
export let click: Function; export let click: Function;
function detail(event: any, rid: string, uid: string, tid: string) { function detail(event: any, rid: string, uid: string, tid: string) {
const target = event.target; const target = event.target;
click(rid, uid, tid); 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[]) { async function formatLocations(locations: ServiceLocation[]): Promise<string> {
if (originalTime !== undefined && comparedTime instanceof Date) { let tiplocs: string[] = [];
if (originalTime < comparedTime) { for (const location of locations) {
arr.push('late'); tiplocs.push(location.tiploc);
} else if (originalTime > comparedTime) {
arr.push('early');
} }
} return tiplocs.join(" & ");
} }
checkLateEarly(service.sta, service.eta, arrArr); async function classGenerator(service: TrainServices) {
checkLateEarly(service.sta, service.ata, arrArr); // This function needs updating next
checkLateEarly(service.std, service.etd, depArr); let otherArr: string[] = [];
checkLateEarly(service.std, service.atd, depArr); let arrArr: string[] = [];
let depArr: string[] = [];
let platArr: string[] = [];
return { if (service.isCancelled) {
other: otherArr.join(' '), otherArr.push("canc");
arr: arrArr.join(' '), }
dep: depArr.join(' '), if (service.serviceIsSupressed) {
plat: platArr.join(' ') otherArr.push("nonPass");
}; }
} if (service.platformIsHidden) {
platArr.push("nonPass");
}
function fmtTime(date: Date | string | undefined): string | false { function checkLateEarly(originalTime: Date | undefined, comparedTime: Date | undefined, arr: string[]) {
if (typeof date === 'string') return date; if (originalTime !== undefined && comparedTime instanceof Date) {
if (date instanceof Date) { if (originalTime < comparedTime) {
const hours = date.getHours().toString().padStart(2, '0'); arr.push("late");
const minutes = date.getMinutes().toString().padStart(2, '0'); } else if (originalTime > comparedTime) {
return `${hours}:${minutes}`; arr.push("early");
} else { }
return false; }
}
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> </script>
<p class="smallScreen">Your display is too small to view this data</p> <p class="smallScreen">Your display is too small to view this data</p>
<p class="smallScreen">Try rotating your device</p> <p class="smallScreen">Try rotating your device</p>
<table> <table>
<tr> <tr>
<th class="id">ID</th> <th class="id">ID</th>
<th class="from">From</th> <th class="from">From</th>
<th class="to">To</th> <th class="to">To</th>
<th class="plat">Plat</th> <th class="plat">Plat</th>
<th class="time arrsch">Sch</th> <th class="time arrsch">Sch</th>
<th class="time arrexp">Exp</th> <th class="time arrexp">Exp</th>
<th class="time depsch">Sch</th> <th class="time depsch">Sch</th>
<th class="time depexp">Exp</th> <th class="time depexp">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}
<!-- HEADCODE -->
<td class="id">{service.trainid}</td>
<!-- ORIGIN -->
<td class="loc from {classes.other}">{#await formatLocations(service.origin) then origin}{origin}{/await}</td>
<!-- DESTINATION -->
<td class="loc to {classes.other}">{#await formatLocations(service.destination) then dest}<span class="locName">{dest}</span>{/await}</td>
<!-- PLATFORM -->
<td class="plat {classes.other} {classes.plat}">{service.platform || '-'}</td>
<!-- SCHEDULED ARR -->
<td class="time schTime {classes.other}">{fmtTime(service?.sta) || '-'}</td>
<!-- EXPECTED/ACTUAL ARR -->
<td class="time {classes.other} {classes.arr}">{fmtTime(service.eta) || fmtTime(service.ata) || '-'}</td>
<!-- SCHEDULED DEP -->
<td class="time schTime {classes.other}">{fmtTime(service.std) || '-'}</td>
<!-- EXPECTED/ACTUAL DEP -->
<td class="time {classes.other} {classes.dep}">{fmtTime(service.etd) || fmtTime(service.atd) || '-'}</td>
{/await}
</tr> </tr>
<tr> <tr>
<td colspan="1" /> <th class="other" colspan="4" />
<td class="tableTxt" colspan="7"> <th class="timepair" colspan="2">Arrival</th>
{#if service.destination?.[0] && service.destination[0].via}<span class="via">{service.destination[0].via}</span><br />{/if} <th class="timepair" colspan="2">Departure</th>
{tocMap.get(service.operatorCode.toLowerCase()) || service.operatorCode}
{#if service.length} | {service.length} carriages{/if}
{#if service.delayReason}
<br />
<span class="delayTxt">
<Reason type={'delay'} code={service.delayReason} />
</span>
{/if}
{#if service.cancelReason}
<br />
<span class="cancTxt">
<Reason type={'cancel'} code={service.cancelReason} />
</span>
{/if}
</td>
</tr> </tr>
{/each} {#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}
<!-- HEADCODE -->
<td class="id">{service.trainid}</td>
<!-- ORIGIN -->
<td class="loc from {classes.other}">{#await formatLocations(service.origin) then origin}{origin}{/await}</td>
<!-- DESTINATION -->
<td class="loc to {classes.other}">{#await formatLocations(service.destination) then dest}<span class="locName">{dest}</span>{/await}</td>
<!-- PLATFORM -->
<td class="plat {classes.other} {classes.plat}">{service.platform || "-"}</td>
<!-- SCHEDULED ARR -->
<td class="time schTime {classes.other}">{fmtTime(service?.sta) || "-"}</td>
<!-- EXPECTED/ACTUAL ARR -->
<td class="time {classes.other} {classes.arr}">{fmtTime(service.eta) || fmtTime(service.ata) || "-"}</td>
<!-- SCHEDULED DEP -->
<td class="time schTime {classes.other}">{fmtTime(service.std) || "-"}</td>
<!-- EXPECTED/ACTUAL DEP -->
<td class="time {classes.other} {classes.dep}">{fmtTime(service.etd) || fmtTime(service.atd) || "-"}</td>
{/await}
</tr>
<tr>
<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.length} | {service.length} carriages{/if}
{#if service.delayReason}
<br />
<span class="delayTxt">
<Reason type={"delay"} code={service.delayReason} />
</span>
{/if}
{#if service.cancelReason}
<br />
<span class="cancTxt">
<Reason type={"cancel"} code={service.cancelReason} />
</span>
{/if}
</td>
</tr>
{/each}
</table> </table>
<style> <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: top;
cursor: pointer;
font-size: 16px;
line-height: 1;
padding: 0;
margin: 0;
}
/* 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 {
text-align: right;
}
td.from,
th.from {
text-align: left;
}
td.time {
font-size: 15px;
vertical-align: top;
}
.tableTxt {
text-align: left;
padding-left: 2px;
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;
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 { table {
display: none; table-layout: fixed;
width: 100%;
max-width: 875px;
margin: auto;
padding: 0px;
color: white;
}
th {
font-size: 12px;
margin: 0px;
} }
.smallScreen {
display: block;
}
}
/* Handle Large Screens */
@media screen and (min-width: 375px) {
.dataRow { .dataRow {
font-size: 18px; font-family: ubuntu, monospace;
vertical-align: top;
cursor: pointer;
font-size: 16px;
line-height: 1;
padding: 0;
margin: 0;
}
/* 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 {
text-align: right;
}
td.from,
th.from {
text-align: left;
} }
td.time { td.time {
font-size: 16px; font-size: 15px;
} vertical-align: top;
}
@media screen and (min-width: 450px) {
.dataRow {
font-size: 20px;
}
td.time {
font-size: 19px;
} }
.tableTxt { .tableTxt {
font-size: 14px; text-align: left;
padding-left: 2px;
color: var(--secondary-text-color);
vertical-align: top;
font-size: 12px;
padding-bottom: 10px;
} }
td.to, .delayTxt {
td.from, color: var(--main-warning-color);
th.to,
th.from {
text-align: left;
} }
} .cancTxt {
color: var(--main-alert-color);
/* Conditional Classes */
.loc.canc,
.canc {
color: grey;
text-decoration: line-through;
opacity: 0.8;
}
.nonPass {
opacity: 0.4;
}
.late {
animation: pulse-late 1.5s linear infinite;
}
.canc.time {
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);
} }
} .via {
color: yellow;
@keyframes pulse-cancel { padding-left: 0px;
50% {
color: var(--main-alert-color);
} }
} /* Handle small screens */
.smallScreen {
@keyframes pulse-early { display: none;
50% { margin: 20px;
color: rgb(136, 164, 255); }
@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: left;
}
}
/* Conditional Classes */
.loc.canc,
.canc {
color: grey;
text-decoration: line-through;
opacity: 0.8;
}
.nonPass {
opacity: 0.4;
}
.late {
animation: pulse-late 1.5s linear infinite;
}
.canc.time {
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> </style>

526
src/lib/ldb/staff/train-detail.svelte
View File

@ -1,286 +1,286 @@
<script> <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'; import { getApiUrl } from "$lib/scripts/upstream";
export let detail = { export let detail = {
uid: '', uid: "",
rid: '', rid: "",
headcode: '', headcode: "",
show: true show: true
};
export let close;
function handleClick() {
close();
}
async function getTrain(rid) {
try {
console.log(`Requested Station: ${rid}`);
const url = `${getApiUrl()}/api/v2/live/train/rid/${rid}`;
const opt = {
method: 'GET',
headers: {
uuid: $uuid
}
};
const data = await fetch(url, opt);
return await data.json();
} catch (error) {
console.error('Error fetching data:', error);
}
}
async function parseDelay(location) {
let string, state;
if (location?.lateness) {
try {
const result = Math.floor(location.lateness / 60);
if (result === 0) {
(string = 'RT'), (state = '');
} else if (result < 0) {
(string = -result + 'E'), (state = 'early');
} else if (result > 0) {
(string = result + 'L'), (state = 'late');
}
} catch {
(string = ''), (state = '');
}
} else if (location.arrivalType === 'Delayed') {
(string = ''), (state = 'late');
} else {
(string = ''), (state = 'noreport');
}
return {
string: string,
state: state
}; };
} export let close;
function parseTime(date) { function handleClick() {
const parsedTime = date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }); close();
return parsedTime !== 'Invalid Date' ? parsedTime : null; }
}
function parseTimes(service) { async function getTrain(rid) {
const sta = new Date(service.sta), try {
eta = new Date(service.eta), console.log(`Requested Station: ${rid}`);
ata = new Date(service.ata); const url = `${getApiUrl()}/api/v2/live/train/rid/${rid}`;
const std = new Date(service.std), const opt = {
etd = new Date(service.etd), method: "GET",
atd = new Date(service.atd); headers: {
let parsedSta = parseTime(sta), uuid: $uuid
parsedEta = parseTime(eta), }
parsedAta = parseTime(ata); };
let parsedStd = parseTime(std), const data = await fetch(url, opt);
parsedEtd = parseTime(etd), return await data.json();
parsedAtd = parseTime(atd); } catch (error) {
if (service.isCancelled) { console.error("Error fetching data:", error);
(parsedEta = 'CANC'), (parsedEtd = 'CANC'); }
} }
let times = {
sta: parsedSta || '-', async function parseDelay(location) {
eata: parsedEta || parsedAta || '-', let string, state;
aEst: parsedEta ? 'estimate' : '', if (location?.lateness) {
std: parsedStd || '-', try {
eatd: parsedEtd || parsedAtd || '-', const result = Math.floor(location.lateness / 60);
dEst: parsedEtd ? 'estimate' : '' if (result === 0) {
}; (string = "RT"), (state = "");
if (service.isCancelled) { } else if (result < 0) {
(parsedEta = 'CANC'), (parsedEtd = 'CANC'); (string = -result + "E"), (state = "early");
(times.aEst = 'canc'), (times.dEst = 'canc'); } else if (result > 0) {
(string = result + "L"), (state = "late");
}
} catch {
(string = ""), (state = "");
}
} else if (location.arrivalType === "Delayed") {
(string = ""), (state = "late");
} else {
(string = ""), (state = "noreport");
}
return {
string: string,
state: state
};
}
function parseTime(date) {
const parsedTime = date.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
return parsedTime !== "Invalid Date" ? parsedTime : null;
}
function parseTimes(service) {
const sta = new Date(service.sta),
eta = new Date(service.eta),
ata = new Date(service.ata);
const std = new Date(service.std),
etd = new Date(service.etd),
atd = new Date(service.atd);
let parsedSta = parseTime(sta),
parsedEta = parseTime(eta),
parsedAta = parseTime(ata);
let parsedStd = parseTime(std),
parsedEtd = parseTime(etd),
parsedAtd = parseTime(atd);
if (service.isCancelled) {
(parsedEta = "CANC"), (parsedEtd = "CANC");
}
let times = {
sta: parsedSta || "-",
eata: parsedEta || parsedAta || "-",
aEst: parsedEta ? "estimate" : "",
std: parsedStd || "-",
eatd: parsedEtd || parsedAtd || "-",
dEst: parsedEtd ? "estimate" : ""
};
if (service.isCancelled) {
(parsedEta = "CANC"), (parsedEtd = "CANC");
(times.aEst = "canc"), (times.dEst = "canc");
}
return times;
} }
return times;
}
</script> </script>
<OverlayIsland> <OverlayIsland>
<div id="detailBox"> <div id="detailBox">
<button type="button" id="closeService" on:click={handleClick}>X</button> <button type="button" id="closeService" on:click={handleClick}>X</button>
{#await getTrain(detail.rid)} {#await getTrain(detail.rid)}
<h6>{detail.headcode}</h6> <h6>{detail.headcode}</h6>
<p in:fade id="loading">Loading Data...</p> <p in:fade id="loading">Loading Data...</p>
{:then train} {:then train}
<h6><StylesToc toc={train.GetServiceDetailsResult.operatorCode} full={true} /> {detail.headcode}</h6> <h6><StylesToc toc={train.GetServiceDetailsResult.operatorCode} full={true} /> {detail.headcode}</h6>
<p> <p>
Locations in grey are not scheduled stops Locations in grey are not scheduled stops
<br /> <br />
Times in <span class="estimate">yellow</span> are estimated times Times in <span class="estimate">yellow</span> are estimated times
</p> </p>
{#if train.GetServiceDetailsResult.delayReason} {#if train.GetServiceDetailsResult.delayReason}
<p class="reason late"> <p class="reason late">
<Reason type="delay" code={train.GetServiceDetailsResult.delayReason} /> <Reason type="delay" code={train.GetServiceDetailsResult.delayReason} />
</p> </p>
{/if} {/if}
{#if train.GetServiceDetailsResult.cancelReason} {#if train.GetServiceDetailsResult.cancelReason}
<p class="reason canc"> <p class="reason canc">
<Reason type="cancel" code={train.GetServiceDetailsResult.cancelReason} /> <Reason type="cancel" code={train.GetServiceDetailsResult.cancelReason} />
</p> </p>
{/if} {/if}
<table id="detailTable"> <table id="detailTable">
<tr> <tr>
<th class="tableLocation">Loc.</th> <th class="tableLocation">Loc.</th>
<th class="tablePlatform">Pl.</th> <th class="tablePlatform">Pl.</th>
<th class="tableTime">Sch</th> <th class="tableTime">Sch</th>
<th class="tableTime">Est/<br />Act</th> <th class="tableTime">Est/<br />Act</th>
<th class="tableTime">Sch</th> <th class="tableTime">Sch</th>
<th class="tableTime">Est/<br />Act</th> <th class="tableTime">Est/<br />Act</th>
<th class="tableDelay" /> <th class="tableDelay" />
</tr> </tr>
<tr> <tr>
<th colspan="2" /> <th colspan="2" />
<th colspan="2">Arrival</th> <th colspan="2">Arrival</th>
<th colspan="2">Departure</th> <th colspan="2">Departure</th>
<th /> <th />
</tr> </tr>
{#each train.GetServiceDetailsResult.locations.location as location} {#each train.GetServiceDetailsResult.locations.location as location}
<tr> <tr>
<td class="location {location?.isPass === 'true' ? 'pass' : ''}">{location.tiploc}</td> <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)} {#await parseTimes(location)}
<td /> <td />
<td /> <td />
<td /> <td />
<td /> <td />
{:then times} {: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.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> <td class="{location?.isPass === 'true' ? 'pass' : ''} {times.dEst}">{times.eatd}</td>
{/await} {/await}
{#await parseDelay(location)} {#await parseDelay(location)}
<td>-</td> <td>-</td>
{:then delay} {:then delay}
<td class={delay.state}>{delay.string}</td> <td class={delay.state}>{delay.string}</td>
{/await} {/await}
</tr> </tr>
{/each} {/each}
</table> </table>
{:catch} {:catch}
<h6>Error loading data</h6> <h6>Error loading data</h6>
{/await} {/await}
</div> </div>
</OverlayIsland> </OverlayIsland>
<style> <style>
#detailBox { #detailBox {
width: 100%; width: 100%;
min-height: 100px; min-height: 100px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
} }
h6 { h6 {
position: absolute; position: absolute;
top: -16px; top: -16px;
left: 20px; left: 20px;
font-size: 14px; font-size: 14px;
color: whitesmoke; color: whitesmoke;
} }
#loading { #loading {
color: white; color: white;
animation: pulse-early 2.5s linear infinite; animation: pulse-early 2.5s linear infinite;
} }
p { p {
margin-top: 45px; margin-top: 45px;
margin-bottom: 0px; margin-bottom: 0px;
} }
p.reason { p.reason {
margin-top: 5px; margin-top: 5px;
} }
#closeService { #closeService {
position: absolute; position: absolute;
top: 10px; top: 10px;
right: 10px; right: 10px;
border: none; border: none;
border-radius: 60px; border-radius: 60px;
width: 35px; width: 35px;
height: 35px; height: 35px;
background-color: var(--main-bg-color); background-color: var(--main-bg-color);
color: white; color: white;
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
} }
#detailTable {
margin-top: 10px;
table-layout: fixed;
width: 100%;
margin-top: 12px;
margin-left: 0px;
margin-right: 0px;
padding: 0px;
color: white;
font-family: ubuntu, monospace;
font-size: 16px;
}
@media screen and (max-width: 338px) {
#detailTable { #detailTable {
font-size: 14px; margin-top: 10px;
table-layout: fixed;
width: 100%;
margin-top: 12px;
margin-left: 0px;
margin-right: 0px;
padding: 0px;
color: white;
font-family: ubuntu, monospace;
font-size: 16px;
} }
} @media screen and (max-width: 338px) {
@media screen and (max-width: 301px) { #detailTable {
#detailTable { font-size: 14px;
font-size: 12px; }
} }
} @media screen and (max-width: 301px) {
@media screen and (min-width: 469px) { #detailTable {
#detailTable { font-size: 12px;
font-size: 20px; }
}
@media screen and (min-width: 469px) {
#detailTable {
font-size: 20px;
}
}
.tableLocation {
width: 18%;
}
td.location {
color: yellow;
}
.tablePlatform {
width: 9%;
}
.tableTime {
width: 14%;
}
.tableDelay {
width: 7%;
}
.estimate {
color: rgb(255, 255, 119);
}
.pass {
color: white !important;
opacity: 0.45;
}
.canc {
color: white;
animation: pulse-cancel 1.5s linear infinite;
} }
}
.tableLocation {
width: 18%;
}
td.location {
color: yellow;
}
.tablePlatform {
width: 9%;
}
.tableTime {
width: 14%;
}
.tableDelay {
width: 7%;
}
.estimate {
color: rgb(255, 255, 119);
}
.pass {
color: white !important;
opacity: 0.45;
}
.canc {
color: white;
animation: pulse-cancel 1.5s linear infinite;
}
.early { .early {
animation: pulse-early 1.5s linear infinite; animation: pulse-early 1.5s linear infinite;
}
.late {
color: white;
animation: pulse-late 1.5s linear infinite;
}
@keyframes pulse-late {
50% {
color: var(--main-warning-color);
} }
}
@keyframes pulse-cancel { .late {
50% { color: white;
color: var(--main-alert-color); animation: pulse-late 1.5s linear infinite;
} }
}
@keyframes pulse-early { @keyframes pulse-late {
50% { 50% {
color: rgb(136, 164, 255); color: var(--main-warning-color);
}
}
@keyframes pulse-cancel {
50% {
color: var(--main-alert-color);
}
}
@keyframes pulse-early {
50% {
color: rgb(136, 164, 255);
}
} }
}
</style> </style>

36
src/lib/ldb/staff/train-detail.ts
View File

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

110
src/lib/libauth.ts
View File

@ -1,77 +1,77 @@
import { getApiUrl } from './scripts/upstream'; import { getApiUrl } from "./scripts/upstream";
import { uuid } from './stores/uuid'; import { uuid } from "./stores/uuid";
export interface libauthResponse { export interface libauthResponse {
uuidPresent?: boolean; uuidPresent?: boolean;
serverAuthCheck?: boolean; serverAuthCheck?: boolean;
uuidValue?: string; uuidValue?: string;
serverAuthCheckResponseCode?: number; serverAuthCheckResponseCode?: number;
} }
interface uuidCheckRes { interface uuidCheckRes {
uuidValue?: string; uuidValue?: string;
uuidPresent?: boolean; uuidPresent?: boolean;
} }
export async function checkAuth(): Promise<libauthResponse> { export async function checkAuth(): Promise<libauthResponse> {
let result: libauthResponse = {}; let result: libauthResponse = {};
const uuidCheck = await checkUuid(); const uuidCheck = await checkUuid();
result.uuidPresent = uuidCheck?.uuidPresent; result.uuidPresent = uuidCheck?.uuidPresent;
result.uuidValue = uuidCheck?.uuidValue; result.uuidValue = uuidCheck?.uuidValue;
const serverCheck = await checkServerAuth(result.uuidValue || ''); const serverCheck = await checkServerAuth(result.uuidValue || "");
result.serverAuthCheck = serverCheck.authOk; result.serverAuthCheck = serverCheck.authOk;
result.serverAuthCheckResponseCode = serverCheck.status; result.serverAuthCheckResponseCode = serverCheck.status;
return result; return result;
} }
async function checkUuid(): Promise<uuidCheckRes> { async function checkUuid(): Promise<uuidCheckRes> {
let uuid_value: string = ''; let uuid_value: string = "";
const unsubscribe = uuid.subscribe((value) => { const unsubscribe = uuid.subscribe((value) => {
uuid_value = value; uuid_value = value;
}); });
let res: uuidCheckRes = { let res: uuidCheckRes = {
uuidValue: uuid_value uuidValue: uuid_value
};
console.log('uuid-value is: ', uuid_value);
if (uuid_value && uuid_value != 'null') {
res = {
uuidPresent: true,
uuidValue: uuid_value
}; };
} else { console.log("uuid-value is: ", uuid_value);
res = { if (uuid_value && uuid_value != "null") {
uuidPresent: false, res = {
uuidValue: uuid_value uuidPresent: true,
}; uuidValue: uuid_value
} };
unsubscribe(); } else {
return res; res = {
uuidPresent: false,
uuidValue: uuid_value
};
}
unsubscribe();
return res;
} }
async function checkServerAuth(uuidString: string) { async function checkServerAuth(uuidString: string) {
const url = `${getApiUrl()}/api/v2/user/checkAuth`; const url = `${getApiUrl()}/api/v2/user/checkAuth`;
const options = { const options = {
method: 'GET', method: "GET",
headers: { headers: {
uuid: uuidString uuid: uuidString
}
};
const res = await fetch(url, options);
let ok: boolean;
if (res.status !== 401) {
ok = true;
} else {
ok = false;
} }
}; return {
const res = await fetch(url, options); authOk: ok,
let ok: boolean; status: res.status
if (res.status !== 401) { };
ok = true;
} else {
ok = false;
}
return {
authOk: ok,
status: res.status
};
} }
export async function logout(): Promise<boolean> { export async function logout(): Promise<boolean> {
uuid.set(null); uuid.set(null);
return true; return true;
} }

84
src/lib/main.css
View File

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

34
src/lib/navigation/LogoutButton.svelte
View File

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

54
src/lib/navigation/done.svelte
View File

@ -1,32 +1,32 @@
<div id="container"> <div id="container">
<p id="tick">&#10004;</p> <p id="tick">&#10004;</p>
<p>Done</p> <p>Done</p>
</div> </div>
<style> <style>
#tick { #tick {
font-size: 45px; font-size: 45px;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#container { #container {
position: fixed; position: fixed;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
margin: auto; margin: auto;
background-color: var(--overlay-island-bg-color); background-color: var(--overlay-island-bg-color);
border-radius: 15px; border-radius: 15px;
padding: 20px; padding: 20px;
padding-bottom: 1px; padding-bottom: 1px;
min-width: 90px; min-width: 90px;
max-width: 90px; max-width: 90px;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
p { p {
padding-top: 0px; padding-top: 0px;
font-weight: bolder; font-weight: bolder;
overflow-wrap: normal; overflow-wrap: normal;
color: var(--island-text-color); color: var(--island-text-color);
} }
</style> </style>

86
src/lib/navigation/header.svelte
View File

@ -1,56 +1,56 @@
<script> <script>
export let title = 'title'; export let title = "title";
</script> </script>
<div class="headerBar"> <div class="headerBar">
<a href="/"> <a href="/">
<picture> <picture>
<source srcset="/images/logo/wide_logo.svg" type="image/svg+xml" /> <source srcset="/images/logo/wide_logo.svg" type="image/svg+xml" />
<img src="/images/logo/wide_logo_200.png" alt="OwlBoard Logo" /> <img src="/images/logo/wide_logo_200.png" alt="OwlBoard Logo" />
</picture> </picture>
</a> </a>
<header>{title}</header> <header>{title}</header>
</div> </div>
<div class="headerBlock"> <div class="headerBlock">
<!-- This exists to prevent the headerBar overlapping anything below it --> <!-- This exists to prevent the headerBar overlapping anything below it -->
</div> </div>
<style> <style>
.headerBar { .headerBar {
background: var(--island-bg-solid); background: var(--island-bg-solid);
color: var(--main-header-color); color: var(--main-header-color);
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
height: 50px; height: 50px;
z-index: 20; z-index: 20;
box-shadow: 0 3px 30px var(--box-shadow-color); box-shadow: 0 3px 30px var(--box-shadow-color);
} }
img { img {
position: absolute; position: absolute;
height: 40px; height: 40px;
right: 8px; right: 8px;
top: 5px; top: 5px;
} }
header { header {
position: absolute; position: absolute;
left: 0px; left: 0px;
top: 3px; top: 3px;
font-family: urwgothic, sans-serif; font-family: urwgothic, sans-serif;
font-weight: 600; font-weight: 600;
margin-top: 7px; margin-top: 7px;
margin-left: 20px; margin-left: 20px;
font-size: 15pt; font-size: 15pt;
} }
.headerBlock { .headerBlock {
height: 50px; height: 50px;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
</style> </style>

22
src/lib/navigation/loading-text.svelte
View File

@ -1,16 +1,16 @@
<p id="load">Loading...</p> <p id="load">Loading...</p>
<style> <style>
#load { #load {
margin-top: 5px; margin-top: 5px;
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
color: white; color: white;
animation: pulse-loading 2.5s linear infinite; animation: pulse-loading 2.5s linear infinite;
} }
@keyframes pulse-loading { @keyframes pulse-loading {
50% { 50% {
color: rgb(136, 164, 255); color: rgb(136, 164, 255);
}
} }
}
</style> </style>

88
src/lib/navigation/loading.svelte
View File

@ -1,54 +1,54 @@
<script> <script>
import { fade } from 'svelte/transition'; import { fade } from "svelte/transition";
</script> </script>
<div id="container" in:fade={{ delay: 150, duration: 250 }} out:fade={{ duration: 250 }}> <div id="container" in:fade={{ delay: 150, duration: 250 }} out:fade={{ duration: 250 }}>
<div class="spinner" /> <div class="spinner" />
<p>Loading...</p> <p>Loading...</p>
</div> </div>
<style> <style>
@keyframes spinner { @keyframes spinner {
0% { 0% {
transform: translate3d(-50%, -50%, 0) rotate(0); transform: translate3d(-50%, -50%, 0) rotate(0);
}
100% {
transform: translate3d(-50%, -50%, 0) rotate(360deg);
}
} }
100% { .spinner::before {
transform: translate3d(-50%, -50%, 0) rotate(360deg); animation: 1.5s linear infinite spinner;
animation-play-state: inherit;
border: solid 5px var(--overlay-island-bg-color);
border-bottom-color: white;
border-radius: 50%;
content: "";
height: 40px;
width: 40px;
position: absolute;
top: 30%;
margin: auto;
transform: translate3d(-50%, -50%, 0);
will-change: transform;
}
#container {
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
margin: auto;
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: var(--island-text-color);
} }
}
.spinner::before {
animation: 1.5s linear infinite spinner;
animation-play-state: inherit;
border: solid 5px var(--overlay-island-bg-color);
border-bottom-color: white;
border-radius: 50%;
content: '';
height: 40px;
width: 40px;
position: absolute;
top: 30%;
margin: auto;
transform: translate3d(-50%, -50%, 0);
will-change: transform;
}
#container {
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
margin: auto;
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: var(--island-text-color);
}
</style> </style>

158
src/lib/navigation/nav-ldb.svelte
View File

@ -1,93 +1,93 @@
<script> <script>
const links = [ const links = [
{ {
title: 'Home', title: "Home",
path: '/', path: "/",
icon: IconHome icon: IconHome
} }
]; ];
import { page } from '$app/stores'; import { page } from "$app/stores";
import { IconHome } from '@tabler/icons-svelte'; import { IconHome } from "@tabler/icons-svelte";
</script> </script>
<footer> <footer>
{#each links as item} {#each links as item}
<a class="footerLink" href={item.path} class:active={$page.url.pathname == item.path}> <a class="footerLink" href={item.path} class:active={$page.url.pathname == item.path}>
<svelte:component this={item.icon} /> <svelte:component this={item.icon} />
<br /> <br />
<span>{item.title}</span> <span>{item.title}</span>
</a> </a>
{/each} {/each}
<div class="data-source"> <div class="data-source">
<a href="https://nationalrail.co.uk" target="_blank"> <a href="https://nationalrail.co.uk" target="_blank">
<picture> <picture>
<source srcset="/images/nre/nre-powered_200w.jxl" type="image/jxl" /> <source srcset="/images/nre/nre-powered_200w.jxl" type="image/jxl" />
<source srcset="/images/nre/nre-powered_200w.webp" type="image/webp" /> <source srcset="/images/nre/nre-powered_200w.webp" type="image/webp" />
<img id="nre-logo" src="/images/nre/nre-powered_200w.png" alt="Data sourced from National Rail and others" /> <img id="nre-logo" src="/images/nre/nre-powered_200w.png" alt="Data sourced from National Rail and others" />
</picture> </picture>
</a> </a>
</div> </div>
</footer> </footer>
<style> <style>
footer { footer {
position: fixed; position: fixed;
display: flex; display: flex;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 50px; height: 50px;
background-color: var(--island-bg-solid); background-color: var(--island-bg-solid);
} }
.footerLink { .footerLink {
width: 30%; width: 30%;
height: 100%; height: 100%;
background-color: var(--island-bg-solid); background-color: var(--island-bg-solid);
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
border-top: none; border-top: none;
border-bottom: none; border-bottom: none;
border-color: var(--box-shadow-color); border-color: var(--box-shadow-color);
color: var(--main-text-color); color: var(--main-text-color);
text-decoration: double; text-decoration: double;
font-weight: 600; font-weight: 600;
} }
footer a.active { footer a.active {
background-color: transparent; background-color: transparent;
} }
.data-source {
flex-grow: 2;
background: rgb(255, 255, 255);
}
#nre-logo {
width: 150px;
height: auto;
margin: auto;
margin-top: 13px;
}
@media only screen and (min-width: 475px) {
.data-source { .data-source {
background: rgb(255, 255, 255); flex-grow: 2;
background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 40%); background: rgb(255, 255, 255);
} }
#nre-logo { #nre-logo {
position: absolute; width: 150px;
right: 0; height: auto;
right: 20px; margin: auto;
margin-top: 13px;
}
@media only screen and (min-width: 475px) {
.data-source {
background: rgb(255, 255, 255);
background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 40%);
}
#nre-logo {
position: absolute;
right: 0;
right: 20px;
}
}
img {
height: 20px;
width: 20px;
margin: 0;
margin-top: 3px;
padding: 0;
}
span {
margin: 0;
margin-bottom: 3px;
padding: 0;
} }
}
img {
height: 20px;
width: 20px;
margin: 0;
margin-top: 3px;
padding: 0;
}
span {
margin: 0;
margin-bottom: 3px;
padding: 0;
}
</style> </style>

116
src/lib/navigation/nav.svelte
View File

@ -1,69 +1,69 @@
<script> <script>
const links = [ const links = [
{ {
title: 'Home', title: "Home",
path: '/', path: "/",
icon: IconHome icon: IconHome
}, },
{ {
title: 'PIS Finder', title: "PIS Finder",
path: '/pis/', path: "/pis/",
icon: IconDialpad icon: IconDialpad
}, },
{ {
title: 'Menu', title: "Menu",
path: '/more/', path: "/more/",
icon: IconMenu2 icon: IconMenu2
} }
]; ];
import { page } from '$app/stores'; import { page } from "$app/stores";
import { IconHome, IconMenu2, IconDialpad } from '@tabler/icons-svelte'; import { IconHome, IconMenu2, IconDialpad } from "@tabler/icons-svelte";
</script> </script>
<footer> <footer>
{#each links as item} {#each links as item}
<a href={item.path} class:active={$page.url.pathname == item.path || $page.url.pathname == item.path + '/'}> <a href={item.path} class:active={$page.url.pathname == item.path || $page.url.pathname == item.path + "/"}>
<svelte:component this={item.icon} /> <svelte:component this={item.icon} />
<br /> <br />
<span>{item.title}</span> <span>{item.title}</span>
</a> </a>
{/each} {/each}
</footer> </footer>
<style> <style>
footer { footer {
position: fixed; position: fixed;
display: flex; display: flex;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 50px; height: 50px;
background-color: rgb(54, 54, 54); background-color: rgb(54, 54, 54);
box-shadow: 0 -2px 30px rgba(0, 0, 0, 0.19); box-shadow: 0 -2px 30px rgba(0, 0, 0, 0.19);
} }
footer a { footer a {
flex: 12; flex: 12;
width: 30%; width: 30%;
height: 100%; height: 100%;
background-color: var(--island-bg-solid); background-color: var(--island-bg-solid);
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
border-top: none; border-top: none;
border-bottom: none; border-bottom: none;
border-color: var(--box-shadow-color); border-color: var(--box-shadow-color);
text-decoration: double; text-decoration: double;
color: var(--main-text-color); color: var(--main-text-color);
font-weight: 600; font-weight: 600;
} }
footer a.active { footer a.active {
background-color: transparent; background-color: transparent;
} }
span { span {
margin: 0; margin: 0;
margin-bottom: 3px; margin-bottom: 3px;
padding: 0; padding: 0;
} }
</style> </style>

176
src/lib/overlays/welcome.svelte
View File

@ -1,106 +1,106 @@
<script lang="ts"> <script lang="ts">
import { welcome } from '$lib/stores/welcome'; import { welcome } from "$lib/stores/welcome";
import { fade } from 'svelte/transition'; import { fade } from "svelte/transition";
import { version } from '$lib/stores/version'; import { version } from "$lib/stores/version";
let pageNum: number = 0; let pageNum: number = 0;
function pageUp() { function pageUp() {
pageNum++; pageNum++;
console.log(`Welcome page: ${pageNum}`); console.log(`Welcome page: ${pageNum}`);
} }
function pageDn() { function pageDn() {
pageNum--; pageNum--;
console.log(`Welcome page: ${pageNum}`); console.log(`Welcome page: ${pageNum}`);
} }
function close() { function close() {
welcome.set(version); welcome.set(version);
} }
const pageText: string[] = [ const pageText: string[] = [
'<h3>PIS Codes</h3>' + "<h3>PIS Codes</h3>" +
'<p>An effort has been made to support PIS codes accross the GWR network</p>' + "<p>An effort has been made to support PIS codes accross the GWR network</p>" +
'<p>The vast majority of codes across West, LTV, HEx and Sleeper services are now available.</p>' + "<p>The vast majority of codes across West, LTV, HEx and Sleeper services are now available.</p>" +
'<p>The easiest way to find a PIS code is to type your headcode into the homepage, then select your service</p>', "<p>The easiest way to find a PIS code is to type your headcode into the homepage, then select your service</p>",
'<h3>Resgistration Update</h3>' + "<h3>Resgistration Update</h3>" +
'<p>The registration issue has been fixed and registrations are now open.</p>' + "<p>The registration issue has been fixed and registrations are now open.</p>" +
'<p>Headcode and PIS Lookups will still be possible without registering but only for a limited time.</p>' + "<p>Headcode and PIS Lookups will still be possible without registering but only for a limited time.</p>" +
'<p>You will receive further warning before mandatory registration is re-enabled.</p>' "<p>You will receive further warning before mandatory registration is re-enabled.</p>"
]; ];
</script> </script>
<div id="popup" in:fade={{ delay: 500, duration: 300 }} out:fade={{ duration: 300 }}> <div id="popup" in:fade={{ delay: 500, duration: 300 }} out:fade={{ duration: 300 }}>
<h2>What's new in OwlBoard {version}</h2> <h2>What's new in OwlBoard {version}</h2>
{#key pageNum} {#key pageNum}
<div in:fade={{ delay: 300 }} out:fade={{ duration: 200 }}> <div in:fade={{ delay: 300 }} out:fade={{ duration: 200 }}>
{@html pageText[pageNum] || "You won't see this welcome message again"} {@html pageText[pageNum] || "You won't see this welcome message again"}
</div> </div>
{/key} {/key}
{#if pageNum >= pageText.length - 1} {#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> <button in:fade={{ delay: 350, duration: 250 }} out:fade={{ duration: 250 }} class="navButton" id="buttonCentre" type="button" on:click={close}>X</button>
{/if} {/if}
{#if pageNum > 0 && pageNum < pageText.length} {#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> <button in:fade={{ delay: 350, duration: 250 }} out:fade={{ duration: 250 }} class="navButton" id="buttonLeft" type="button" on:click={pageDn}>&lt;</button>
{/if} {/if}
{#if pageNum < pageText.length - 1} {#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> <button in:fade={{ delay: 350, duration: 250 }} out:fade={{ duration: 250 }} class="navButton" id="buttonRight" type="button" on:click={pageUp}>&gt;</button>
{/if} {/if}
</div> </div>
<style> <style>
#popup { #popup {
position: fixed; position: fixed;
top: 50px; top: 50px;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
width: 85%; width: 85%;
height: 75vh; height: 75vh;
max-height: 600px; max-height: 600px;
overflow-y: auto; overflow-y: auto;
max-width: 400px; max-width: 400px;
margin: auto; margin: auto;
margin-top: 25px; margin-top: 25px;
padding: 10px; padding: 10px;
background-color: var(--island-bg-solid); background-color: var(--island-bg-solid);
border-radius: 10px; border-radius: 10px;
z-index: 2500; z-index: 2500;
box-shadow: 5px 5px 10px var(--box-shadow-color); box-shadow: 5px 5px 10px var(--box-shadow-color);
} }
.navButton { .navButton {
border-radius: 50px; border-radius: 50px;
border: none; border: none;
color: var(--island-link-color); color: var(--island-link-color);
background-color: var(--island-button-color); background-color: var(--island-button-color);
width: 50px; width: 50px;
height: 50px; height: 50px;
font-size: 20px; font-size: 20px;
font-weight: 600; font-weight: 600;
bottom: 50px; bottom: 50px;
} }
#buttonLeft { #buttonLeft {
position: absolute; position: absolute;
margin: auto; margin: auto;
left: 50px; left: 50px;
} }
#buttonCentre { #buttonCentre {
position: absolute; position: absolute;
margin: auto; margin: auto;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
#buttonRight { #buttonRight {
position: absolute; position: absolute;
margin: auto; margin: auto;
right: 50px; right: 50px;
} }
div { div {
color: var(--island-text-color); color: var(--island-text-color);
} }
</style> </style>

82
src/lib/raw-fetchers/reason.svelte
View File

@ -1,49 +1,49 @@
<script> <script>
import { getApiUrl } from '$lib/scripts/upstream'; import { getApiUrl } from "$lib/scripts/upstream";
import { uuid } from '$lib/stores/uuid'; import { uuid } from "$lib/stores/uuid";
export let code = ''; export let code = "";
export let type = ''; export let type = "";
async function getDelay(code = '') { async function getDelay(code = "") {
console.log(`Fetching delay reason ${code}`); console.log(`Fetching delay reason ${code}`);
const data = await getReason(code); const data = await getReason(code);
return data[0].lateReason || 'This train has been delayed'; return data[0].lateReason || "This train has been delayed";
} }
async function getCancel(code = '') { async function getCancel(code = "") {
console.log(`Fetching cancel reason ${code}`); console.log(`Fetching cancel reason ${code}`);
const data = await getReason(code); const data = await getReason(code);
return data[0].cancReason || 'This train has been cancelled'; return data[0].cancReason || "This train has been cancelled";
} }
async function getReason(code = '') { async function getReason(code = "") {
const url = `${getApiUrl()}/api/v2/ref/reasonCode/${code}`; const url = `${getApiUrl()}/api/v2/ref/reasonCode/${code}`;
const options = { const options = {
method: 'GET', method: "GET",
headers: { headers: {
uuid: $uuid uuid: $uuid
} }
}; };
const res = await fetch(url, options); const res = await fetch(url, options);
return await res.json(); return await res.json();
} }
</script> </script>
{#if type === 'cancel'} {#if type === "cancel"}
{#await getCancel(code)} {#await getCancel(code)}
This train has been cancelled This train has been cancelled
{:then reason} {:then reason}
{reason} {reason}
{:catch} {:catch}
This train has been cancelled This train has been cancelled
{/await} {/await}
{:else if type === 'delay'} {:else if type === "delay"}
{#await getDelay(code)} {#await getDelay(code)}
This train has been delayed This train has been delayed
{:then reason} {:then reason}
{reason} {reason}
{:catch} {:catch}
This train has been delayed This train has been delayed
{/await} {/await}
{/if} {/if}

82
src/lib/scripts/apiFetch.ts
View File

@ -1,51 +1,51 @@
import { dev } from '$app/environment'; import { dev } from "$app/environment";
import { uuid } from '$lib/stores/uuid'; import { uuid } from "$lib/stores/uuid";
import type { Unsubscriber } from 'svelte/store'; import type { Unsubscriber } from "svelte/store";
function getUrlString(): string { function getUrlString(): string {
if (dev) { if (dev) {
const testUrl: string = 'http://localhost:8460'; const testUrl: string = "http://localhost:8460";
console.info('DEVMODE active, using testing URL: ', testUrl); console.info("DEVMODE active, using testing URL: ", testUrl);
return testUrl; return testUrl;
} else { } else {
const currentUrl: string = `https://${window.location.host}`; const currentUrl: string = `https://${window.location.host}`;
return currentUrl; return currentUrl;
} }
} }
export async function apiGet(path: string): Promise<any> { export async function apiGet(path: string): Promise<any> {
let uuidString: string = ''; let uuidString: string = "";
let unsubscribe: Unsubscriber; let unsubscribe: Unsubscriber;
try { try {
unsubscribe = uuid.subscribe((value) => { unsubscribe = uuid.subscribe((value) => {
uuidString = value; uuidString = value;
}); });
} catch (err) { } catch (err) {
throw new Error('Unable to read UUID'); throw new Error("Unable to read UUID");
}
const options = {
method: 'GET',
headers: {
uuid: uuidString
} }
};
try { const options = {
const res = await fetch(getUrlString() + path, options); method: "GET",
headers: {
uuid: uuidString
}
};
if (!res.ok) { try {
throw new Error('Network response not ok'); const res = await fetch(getUrlString() + path, options);
if (!res.ok) {
throw new Error("Network response not ok");
}
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();
} }
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();
}
} }

16
src/lib/scripts/upstream.ts
View File

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

32
src/lib/stores/quick-links.ts
View File

@ -1,25 +1,25 @@
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[] { function fromLocalStorage(storageKey: string, fallback: string[]): string[] {
if (browser) { if (browser) {
const storedValue = localStorage.getItem(storageKey); 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;
return fallback;
} }
function toLocalStorage(store: Writable<string[]>, storageKey: string) { function toLocalStorage(store: Writable<string[]>, storageKey: string) {
if (browser) { if (browser) {
store.subscribe((value) => { 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); localStorage.setItem(storageKey, storageValue);
}); });
} }
} }

84
src/lib/stores/tocMap.ts
View File

@ -1,44 +1,44 @@
export const tocs = new Map<string, string>([ export const tocs = new Map<string, string>([
['gw', 'Great Western Railway'], ["gw", "Great Western Railway"],
['sw', 'South Western Railway'], ["sw", "South Western Railway"],
['il', 'Island Line'], ["il", "Island Line"],
['nt', 'Northern'], ["nt", "Northern"],
['aw', 'Trafnidiaeth Cymru'], ["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)'], ["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', 'SuperTram (Sheffield)'], ["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"],
['tw', 'Nexus (Tyne & Wear Metro)'], ["tw", "Nexus (Tyne & Wear Metro)"],
['ld', 'Lumo'], ["ld", "Lumo"],
['so', 'Rail Adventure'], ["so", "Rail Adventure"],
['ln', 'Grand Union Trains'], ["ln", "Grand Union Trains"],
['zz', 'Freight/Charter Company'], ["zz", "Freight/Charter Company"],
['wm', 'West Midlands Railway (WM)'], ["wm", "West Midlands Railway (WM)"],
['uk', 'Unknown Operator'] ["uk", "Unknown Operator"]
]); ]);

30
src/lib/stores/uuid.js
View File

@ -1,23 +1,23 @@
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) { function fromLocalStorage(storageKey, fallback) {
if (browser) { if (browser) {
const storedValue = localStorage.getItem(storageKey); const storedValue = localStorage.getItem(storageKey);
if (storedValue !== 'undefined') { if (storedValue !== "undefined") {
return storedValue; return storedValue;
}
} }
} return fallback;
return fallback;
} }
function toLocalStorage(store, storageKey) { function toLocalStorage(store, storageKey) {
if (browser) { if (browser) {
store.subscribe((value) => { store.subscribe((value) => {
localStorage.setItem(storageKey, value); localStorage.setItem(storageKey, value);
}); });
} }
} }

4
src/lib/stores/version.ts
View File

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

30
src/lib/stores/welcome.ts
View File

@ -1,23 +1,23 @@
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 welcome = writable(fromLocalStorage('welcome', '0')); export const welcome = writable(fromLocalStorage("welcome", "0"));
toLocalStorage(welcome, 'welcome'); toLocalStorage(welcome, "welcome");
function fromLocalStorage(storageKey: string, fallback: string) { function fromLocalStorage(storageKey: string, fallback: string) {
if (browser) { if (browser) {
const storedValue = localStorage.getItem(storageKey); const storedValue = localStorage.getItem(storageKey);
if (storedValue !== 'undefined') { if (storedValue !== "undefined") {
return storedValue; return storedValue;
}
} }
} return fallback;
return fallback;
} }
function toLocalStorage(store: Writable<any>, storageKey: string) { function toLocalStorage(store: Writable<any>, storageKey: string) {
if (browser) { if (browser) {
store.subscribe((value: string) => { store.subscribe((value: string) => {
localStorage.setItem(storageKey, value); localStorage.setItem(storageKey, value);
}); });
} }
} }

36
src/lib/themes.css
View File

@ -19,24 +19,24 @@
/* Main Theme */ /* Main Theme */
:root { :root {
--main-bg-color: #404c55; --main-bg-color: #404c55;
--second-bg-color: #2b343c; --second-bg-color: #2b343c;
--main-header-color: #dff3f3; --main-header-color: #dff3f3;
--main-text-color: #cce9e9; --main-text-color: #cce9e9;
--secondary-text-color: #02fcfc; --secondary-text-color: #02fcfc;
--main-link-color: #00b7b7; --main-link-color: #00b7b7;
--island-bg-color: #3c6f79de; --island-bg-color: #3c6f79de;
--island-bg-solid: #3c6f79; --island-bg-solid: #3c6f79;
--island-button-color: #404c55; --island-button-color: #404c55;
--island-link-color: #e1ebeb; --island-link-color: #e1ebeb;
--island-header-color: #4fd1d1; --island-header-color: #4fd1d1;
--island-text-color: #e1ebeb; --island-text-color: #e1ebeb;
--overlay-island-bg-color: #3c6f79; --overlay-island-bg-color: #3c6f79;
--box-shadow-color: rgba(0, 0, 0, 0.19); --box-shadow-color: rgba(0, 0, 0, 0.19);
--box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.19); --box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.19);
--main-alert-color: #ed6d00; --main-alert-color: #ed6d00;
--second-alert-color: #e77f00; --second-alert-color: #e77f00;
--main-warning-color: orange; --main-warning-color: orange;
} }
/* Christmas Theme /* Christmas Theme

46
src/lib/train/pis-handler.svelte
View File

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

424
src/lib/train/styles-toc.svelte
View File

@ -1,223 +1,223 @@
<script lang="ts"> <script lang="ts">
export let toc: string; export let toc: string;
export let full: boolean = false; export let full: boolean = false;
import { tocs as map } from '$lib/stores/tocMap'; import { tocs as map } from "$lib/stores/tocMap";
let text: string; let text: string;
$: { $: {
if (full) { if (full) {
text = map.get(toc.toLowerCase()) || toc; text = map.get(toc.toLowerCase()) || toc;
} else { } else {
text = toc; text = toc;
}
} }
}
</script> </script>
<span class={toc.toLocaleLowerCase()}>{text}</span> <span class={toc.toLocaleLowerCase()}>{text}</span>
<style> <style>
span { span {
padding: 4px; padding: 4px;
border-radius: 5px; border-radius: 5px;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
background-color: white; background-color: white;
color: black; color: black;
} }
.gw { .gw {
/* GWR */ /* GWR */
background-color: #07352d; background-color: #07352d;
color: white; color: white;
border-color: #041d18; border-color: #041d18;
} }
.sw, .sw,
.il { .il {
/* SWR & Island Line */ /* SWR & Island Line */
background-color: rgb(17, 23, 23); background-color: rgb(17, 23, 23);
color: white; color: white;
} }
.nt { .nt {
/* Northern */ /* Northern */
background-color: rgb(38, 34, 98); background-color: rgb(38, 34, 98);
color: white; color: white;
} }
.aw { .aw {
/* TfW */ /* TfW */
background-color: red; background-color: red;
color: white; color: white;
} }
.cc { .cc {
/* c2c */ /* c2c */
background-color: rgb(168, 25, 127); background-color: rgb(168, 25, 127);
color: white; color: white;
} }
.cs { .cs {
/* Caledonian Sleeper */ /* Caledonian Sleeper */
background-color: #033c3c; background-color: #033c3c;
color: white; color: white;
} }
.ch { .ch {
/* Chiltern Railways */ /* Chiltern Railways */
background-color: white; background-color: white;
color: blue; color: blue;
} }
.xc { .xc {
/* CrossCountry */ /* CrossCountry */
background-color: rgb(76, 18, 58); background-color: rgb(76, 18, 58);
color: white; color: white;
} }
.em { .em {
/* EMR */ /* EMR */
background-color: rgb(69, 29, 69); background-color: rgb(69, 29, 69);
color: white; color: white;
} }
.es { .es {
/* Eurostar */ /* Eurostar */
background-color: rgb(13, 13, 98); background-color: rgb(13, 13, 98);
color: yellow; color: yellow;
} }
.zz { .zz {
/* Freight, Charters, etc */ /* Freight, Charters, etc */
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
color: white; color: white;
} }
.ht { .ht {
/* Hull Trains */ /* Hull Trains */
background-color: rgb(160, 0, 136); background-color: rgb(160, 0, 136);
color: rgb(19, 19, 173); color: rgb(19, 19, 173);
} }
.gn { .gn {
/* GTR Great Northern */ /* GTR Great Northern */
background-color: rgb(79, 0, 128); background-color: rgb(79, 0, 128);
color: white; color: white;
} }
.tl { .tl {
/* GTR Thameslink */ /* GTR Thameslink */
background-color: rgb(191, 25, 183); background-color: rgb(191, 25, 183);
color: white; color: white;
} }
.gc { .gc {
/* Grand Central */ /* Grand Central */
background-color: rgb(40, 40, 40); background-color: rgb(40, 40, 40);
color: rgb(219, 123, 5); color: rgb(219, 123, 5);
} }
.le, .le,
.ga { .ga {
/*Greater Anglia */ /*Greater Anglia */
background-color: rgb(122, 124, 154); background-color: rgb(122, 124, 154);
color: rgb(151, 0, 0); color: rgb(151, 0, 0);
border-color: red; border-color: red;
} }
.hx { .hx {
/* Heathrow Express */ /* Heathrow Express */
background-color: rgb(181, 142, 211); background-color: rgb(181, 142, 211);
color: black; color: black;
} }
.ls { .ls {
/* Locomotive Services Limited */ /* Locomotive Services Limited */
background-color: white; background-color: white;
color: black; color: black;
} }
.lm { .lm {
/* West Midlands Railway */ /* West Midlands Railway */
background-color: rgb(120, 120, 120); background-color: rgb(120, 120, 120);
border-color: rgb(230, 150, 0); border-color: rgb(230, 150, 0);
color: white; color: white;
} }
.lo { .lo {
/*London Overground */ /*London Overground */
background-color: rgb(231, 150, 0); background-color: rgb(231, 150, 0);
color: rgb(0, 0, 210); color: rgb(0, 0, 210);
} }
.lt { .lt {
/* London Underground (when on Network Rail Metals) */ /* London Underground (when on Network Rail Metals) */
background-color: rgb(203, 17, 17); background-color: rgb(203, 17, 17);
color: rgb(0, 0, 210); color: rgb(0, 0, 210);
} }
.me { .me {
/* Merseyrail */ /* Merseyrail */
background-color: rgb(229, 229, 16); background-color: rgb(229, 229, 16);
color: rgb(96, 96, 96); color: rgb(96, 96, 96);
} }
.lr { .lr {
/* NR On-Track Machines */ /* NR On-Track Machines */
background-color: yellow; background-color: yellow;
color: black; color: black;
} }
.tw { .tw {
/* Tyne & Wear Metro (when on Network Rail Metals) */ /* Tyne & Wear Metro (when on Network Rail Metals) */
background-color: rgb(212, 169, 0); background-color: rgb(212, 169, 0);
color: black; color: black;
} }
.sr { .sr {
/* ScotRail */ /* ScotRail */
background-color: rgb(16, 16, 200); background-color: rgb(16, 16, 200);
color: white; color: white;
} }
.sj { .sj {
/* South Yorkshire (Sheffield) SuperTram (When on network rail metals) */ /* South Yorkshire (Sheffield) SuperTram (When on network rail metals) */
background-color: rgb(255, 185, 56); background-color: rgb(255, 185, 56);
color: rgb(58, 58, 255); color: rgb(58, 58, 255);
} }
.se { .se {
/* Southeastern */ /* Southeastern */
background-color: darkblue; background-color: darkblue;
color: rgb(107, 152, 207); color: rgb(107, 152, 207);
} }
.sn { .sn {
/* GTR (Southern) */ /* GTR (Southern) */
background-color: rgb(11, 74, 11); background-color: rgb(11, 74, 11);
color: rgb(231, 231, 188); color: rgb(231, 231, 188);
} }
.xr { .xr {
/* Elizabeth Line (EastWest CrossRail) */ /* Elizabeth Line (EastWest CrossRail) */
background-color: rgb(91, 0, 171); background-color: rgb(91, 0, 171);
color: rgb(207, 207, 255); color: rgb(207, 207, 255);
} }
.tp { .tp {
/* TransPennine Express */ /* TransPennine Express */
background-color: rgb(197, 130, 238); background-color: rgb(197, 130, 238);
color: rgb(0, 98, 226); color: rgb(0, 98, 226);
} }
.vt { .vt {
/* Avanti West Coast */ /* Avanti West Coast */
background-color: rgb(37, 37, 86); background-color: rgb(37, 37, 86);
color: rgb(230, 96, 0); color: rgb(230, 96, 0);
} }
.gr { .gr {
/* LNER */ /* LNER */
background-color: rgb(202, 0, 0); background-color: rgb(202, 0, 0);
color: white; color: white;
} }
.wc { .wc {
/* West Coast Railway (Spot Hire/Charter) */ /* West Coast Railway (Spot Hire/Charter) */
background-color: maroon; background-color: maroon;
color: rgb(225, 190, 92); color: rgb(225, 190, 92);
} }
.ty { .ty {
/* Vintage Trains (Tour Operator) */ /* Vintage Trains (Tour Operator) */
background-color: green; background-color: green;
color: white; color: white;
} }
.ld { .ld {
/* Lumo */ /* Lumo */
background-color: whitesmoke; background-color: whitesmoke;
color: blue; color: blue;
} }
.so { .so {
/* Rail Adventure */ /* Rail Adventure */
background-color: rgb(93, 93, 93); background-color: rgb(93, 93, 93);
color: rgb(93, 195, 93); color: rgb(93, 195, 93);
} }
.ln { .ln {
/* Grand Union Trains */ /* Grand Union Trains */
background-color: rgb(89, 89, 89); background-color: rgb(89, 89, 89);
color: white; color: white;
} }
.uk { .uk {
background-color: whitesmoke; background-color: whitesmoke;
color: black; color: black;
} }
</style> </style>

344
src/lib/train/train-detail.svelte
View File

@ -1,187 +1,187 @@
<script lang="ts"> <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 { getApiUrl } from "$lib/scripts/upstream";
import PisHandler from '$lib/train/pis-handler.svelte'; import PisHandler from "$lib/train/pis-handler.svelte";
import type { OB_TrainTT_service } from '@owlboard/ts-types'; import type { OB_TrainTT_service } from "@owlboard/ts-types";
import TrainIcons from './trainIcons.svelte'; import TrainIcons from "./trainIcons.svelte";
export let service: OB_TrainTT_service; export let service: OB_TrainTT_service;
let isExpanded = false; let isExpanded = false;
async function getTrainByUID(tuid = '') { async function getTrainByUID(tuid = "") {
const url = `${getApiUrl()}/api/v2/timetable/train/now/byTrainUid/${tuid}`; const url = `${getApiUrl()}/api/v2/timetable/train/now/byTrainUid/${tuid}`;
const options = { const options = {
method: 'GET', method: "GET",
headers: { headers: {
uuid: $uuid uuid: $uuid
} }
}; };
const res = await fetch(url, options); const res = await fetch(url, options);
if (res.status === 200) { if (res.status === 200) {
return await res.json(); return await res.json();
} else { } else {
throw new Error('Unable to Fetch'); throw new Error("Unable to Fetch");
}
} }
}
async function expand() { async function expand() {
isExpanded = !isExpanded; isExpanded = !isExpanded;
} }
</script> </script>
<div class="container"> <div class="container">
<div class="container-header" on:click={expand} on:keypress={expand}> <div class="container-header" on:click={expand} on:keypress={expand}>
<span class="header" <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> <span id="container-arrow" class:isExpanded>V</span>
</div>
{#if isExpanded}
<div class="container-detail" in:fly={{ y: -20, duration: 200 }}>
{#await getTrainByUID(service.trainUid)}
<LoadingText />
{:then serviceDetail}
{#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}
<PisHandler pisObject={serviceDetail.pis} />
{/if}
<p class="svc-detail">
Planned Type: {parseInt(serviceDetail.planSpeed) || '--'}mph {serviceDetail.powerType || 'Non-Rail vehicle'}
</p>
<p class="svc-detail">
Days Run: {serviceDetail?.daysRun.join(', ').toUpperCase() || 'Unknown'}
</p>
<p class="svc-detail validity">
Valid From: {new Date(serviceDetail.scheduleStart).toLocaleDateString('en-GB', {
timeZone: 'UTC'
})} - {new Date(serviceDetail.scheduleEnd).toLocaleDateString('en-GB', {
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>
{#each serviceDetail.stops as stop}
<tr>
{#if stop.publicArrival || stop.publicDeparture}
<td>{stop.tiploc}</td>
<td>{stop.platform || '-'}</td>
<td>{stop.publicArrival || '-'}</td>
<td>{stop.publicDeparture || '-'}</td>
{:else if stop.wttArrival || stop.wttDeparture}
<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}
<td class="pass">{stop.tiploc}</td>
<td class="pass">{stop.platform || stop.depLine || stop.arrLine || '-'}</td>
<td class="pass">-</td>
<td class="pass">{stop.pass || '-'}</td>
{/if}
</tr>
{/each}
</table>
{/if}
{:catch}
<p>Unable to fetch train data</p>
{/await}
</div> </div>
{/if} {#if isExpanded}
<div class="container-detail" in:fly={{ y: -20, duration: 200 }}>
{#await getTrainByUID(service.trainUid)}
<LoadingText />
{:then serviceDetail}
{#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}
<PisHandler pisObject={serviceDetail.pis} />
{/if}
<p class="svc-detail">
Planned Type: {parseInt(serviceDetail.planSpeed) || "--"}mph {serviceDetail.powerType || "Non-Rail vehicle"}
</p>
<p class="svc-detail">
Days Run: {serviceDetail?.daysRun.join(", ").toUpperCase() || "Unknown"}
</p>
<p class="svc-detail validity">
Valid From: {new Date(serviceDetail.scheduleStart).toLocaleDateString("en-GB", {
timeZone: "UTC"
})} - {new Date(serviceDetail.scheduleEnd).toLocaleDateString("en-GB", {
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>
{#each serviceDetail.stops as stop}
<tr>
{#if stop.publicArrival || stop.publicDeparture}
<td>{stop.tiploc}</td>
<td>{stop.platform || "-"}</td>
<td>{stop.publicArrival || "-"}</td>
<td>{stop.publicDeparture || "-"}</td>
{:else if stop.wttArrival || stop.wttDeparture}
<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}
<td class="pass">{stop.tiploc}</td>
<td class="pass">{stop.platform || stop.depLine || stop.arrLine || "-"}</td>
<td class="pass">-</td>
<td class="pass">{stop.pass || "-"}</td>
{/if}
</tr>
{/each}
</table>
{/if}
{:catch}
<p>Unable to fetch train data</p>
{/await}
</div>
{/if}
</div> </div>
<style> <style>
.container { .container {
position: relative; position: relative;
margin: auto; margin: auto;
margin-bottom: 20px; margin-bottom: 20px;
width: 95%; width: 95%;
max-width: 600px; max-width: 600px;
height: auto; height: auto;
background-color: var(--island-bg-solid); background-color: var(--island-bg-solid);
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
transition: height 500ms ease-in-out; transition: height 500ms ease-in-out;
box-shadow: 5px 5px 30px var(--box-shadow-color); box-shadow: 5px 5px 30px var(--box-shadow-color);
} }
.container-header { .container-header {
text-align: left; text-align: left;
padding-left: 10px; padding-left: 10px;
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
padding-top: 12px; padding-top: 12px;
padding-bottom: 10px; padding-bottom: 10px;
font-family: ubuntu, monospace; font-family: ubuntu, monospace;
color: var(--island-text-color); color: var(--island-text-color);
} }
#container-arrow { #container-arrow {
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-weight: 600; font-weight: 600;
color: var(--island-text-color); color: var(--island-text-color);
margin: 0; margin: 0;
padding: 0; padding: 0;
position: absolute; position: absolute;
right: 16px; right: 16px;
top: 10px; top: 10px;
transition-duration: 300ms; transition-duration: 300ms;
z-index: 2; z-index: 2;
} }
.isExpanded { .isExpanded {
transform: rotate(180deg); transform: rotate(180deg);
} }
.detailOperator { .detailOperator {
padding-top: 15px; padding-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
font-weight: 600; font-weight: 600;
} }
.svc-detail { .svc-detail {
margin-top: 6px; margin-top: 6px;
margin-bottom: 2px; margin-bottom: 2px;
color: var(--island-text-color); color: var(--island-text-color);
} }
.validity { .validity {
font-size: 14px; font-size: 14px;
} }
table { table {
margin: auto; margin: auto;
padding-top: 5px; padding-top: 5px;
padding-bottom: 10px; padding-bottom: 10px;
color: var(--island-text-color); color: var(--island-text-color);
} }
caption { caption {
padding-top: 15px; padding-top: 15px;
font-size: small; font-size: small;
} }
.wtt { .wtt {
opacity: 0.5; opacity: 0.5;
} }
.pass { .pass {
font-style: italic; font-style: italic;
opacity: 0.5; opacity: 0.5;
} }
.text-message { .text-message {
margin: 5px; margin: 5px;
margin-left: 20px; margin-left: 20px;
margin-right: 20px; margin-right: 20px;
padding-bottom: 10px; padding-bottom: 10px;
} }
</style> </style>

34
src/lib/train/trainIcons.svelte
View File

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

24
src/routes/+error.svelte
View File

@ -1,8 +1,8 @@
<script> <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> </script>
<Header {title} /> <Header {title} />
@ -10,16 +10,16 @@
<h1>{$page.status}: {$page?.error?.message}</h1> <h1>{$page.status}: {$page?.error?.message}</h1>
{#if $page.status === 404} {#if $page.status === 404}
<p>This is not the page you're looking for.</p> <p>This is not the page you're looking for.</p>
<p>The page you are looking for doesn't exist, use the tabs below to find another page.</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} {:else if $page.status === 500}
<p> <p>
Something went wrong loading the app.<br /> Something went wrong loading the app.<br />
Try going <a href="/">home</a> and try again. Try going <a href="/">home</a> and try again.
</p> </p>
<p>If the problem persists, you can report an issue from the 'More' menu.</p> <p>If the problem persists, you can report an issue from the 'More' menu.</p>
{:else} {:else}
<p>Not sure what went wrong, please try again later or report an issue from the 'More' menu.</p> <p>Not sure what went wrong, please try again later or report an issue from the 'More' menu.</p>
{/if} {/if}
<Nav /> <Nav />

40
src/routes/+layout.svelte
View File

@ -1,13 +1,13 @@
<script> <script>
import '$lib/themes.css'; import "$lib/themes.css";
import '$lib/main.css'; import "$lib/main.css";
import { dev } from '$app/environment'; import { dev } from "$app/environment";
import DevBanner from '$lib/DevBanner.svelte'; import DevBanner from "$lib/DevBanner.svelte";
import { page } from '$app/stores'; import { page } from "$app/stores";
</script> </script>
<svelte:head> <svelte:head>
<!-- <!--
___ _ ___ _ ___ _ ___ _
/ _ \__ __ _| | _ ) ___ __ _ _ _ __| | / _ \__ __ _| | _ ) ___ __ _ _ _ __| |
| (_) \ V V / | _ \/ _ \/ _` | '_/ _` | | (_) \ V V / | _ \/ _ \/ _` | '_/ _` |
@ -16,21 +16,21 @@
It's easier to read there It's easier to read there
--> -->
<meta name="application-name" content="OwlBoard" /> <meta name="application-name" content="OwlBoard" />
<meta name="author" content="Frederick Boniface" /> <meta name="author" content="Frederick Boniface" />
<meta <meta
name="description" 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="viewport" content="width=device-width" />
<meta name="theme-color" content="#00b7b7" /> <meta name="theme-color" content="#00b7b7" />
<link rel="canonical" href="https://owlboard.info{$page.url.pathname}" /> <link rel="canonical" href="https://owlboard.info{$page.url.pathname}" />
<link rel="icon" href="/images/icon.svg" type="image/svg+xml" /> <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="apple-touch-icon" href="/images/app-icons/any/apple-192.png" />
<link rel="manifest" href="/manifest.json" /> <link rel="manifest" href="/manifest.json" />
<title>OwlBoard</title> <title>OwlBoard</title>
</svelte:head> </svelte:head>
{#if dev} {#if dev}
<DevBanner /> <DevBanner />
{/if} {/if}
<slot /> <slot />

50
src/routes/+page.svelte
View File

@ -1,36 +1,36 @@
<script> <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 InputIsland from '$lib/islands/input-island-form.svelte'; import InputIsland from "$lib/islands/input-island-form.svelte";
import QuickLinkIsland from '$lib/islands/quick-link-island.svelte'; import QuickLinkIsland from "$lib/islands/quick-link-island.svelte";
import Welcome from '$lib/overlays/welcome.svelte'; import Welcome from "$lib/overlays/welcome.svelte";
import { welcome } from '$lib/stores/welcome'; import { welcome } from "$lib/stores/welcome";
import { version, showWelcome } from '$lib/stores/version'; import { version, showWelcome } from "$lib/stores/version";
const title = 'OwlBoard'; const title = "OwlBoard";
const inputIslands = [ const inputIslands = [
{ {
title: 'Live Departure Boards', title: "Live Departure Boards",
action: '/ldb', action: "/ldb",
placeholder: 'Enter CRS/TIPLOC', placeholder: "Enter CRS/TIPLOC",
queryName: 'station' queryName: "station"
}, },
{ {
title: 'Train Details & PIS', title: "Train Details & PIS",
action: '/train', action: "/train",
placeholder: 'Enter Headcode', placeholder: "Enter Headcode",
queryName: 'headcode' queryName: "headcode"
} }
]; ];
</script> </script>
{#if showWelcome && ($welcome === 'null' || !$welcome || parseInt($welcome.replace(/\./g, '')) < parseInt(version.replace(/\./g, '')))} {#if showWelcome && ($welcome === "null" || !$welcome || parseInt($welcome.replace(/\./g, "")) < parseInt(version.replace(/\./g, "")))}
<Welcome /> <Welcome />
{/if} {/if}
<Header {title} /> <Header {title} />
{#each inputIslands as variables} {#each inputIslands as variables}
<InputIsland {variables} /> <InputIsland {variables} />
{/each} {/each}
<QuickLinkIsland /> <QuickLinkIsland />

18
src/routes/err/404/+page.svelte
View File

@ -1,8 +1,8 @@
<script lang="ts"> <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";
const title = '404 - Not Found'; const title = "404 - Not Found";
</script> </script>
<Header {title} /> <Header {title} />
@ -14,10 +14,10 @@
<Nav /> <Nav />
<style> <style>
.heading { .heading {
color: var(--second-text-color); color: var(--second-text-color);
} }
.err_code { .err_code {
color: white; color: white;
} }
</style> </style>

18
src/routes/err/50x/+page.svelte
View File

@ -1,8 +1,8 @@
<script lang="ts"> <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";
const title = '50x - Server Error'; const title = "50x - Server Error";
</script> </script>
<Header {title} /> <Header {title} />
@ -14,10 +14,10 @@
<Nav /> <Nav />
<style> <style>
.heading { .heading {
color: var(--second-text-color); color: var(--second-text-color);
} }
.err_code { .err_code {
color: white; color: white;
} }
</style> </style>

56
src/routes/ldb/+page.svelte
View File

@ -1,42 +1,42 @@
<script> <script>
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() { async function getHeadcode() {
return new URLSearchParams(window.location.search).get('station'); return new URLSearchParams(window.location.search).get("station");
}
let station = '';
let staff = false;
let uuidValue = '';
$: uuidValue = $uuid;
onMount(async () => {
station = (await getHeadcode()) || '';
if (uuidValue !== null && uuidValue !== '' && uuidValue !== 'null') {
staff = true;
title = 'Staff Board';
} else {
title = 'Public Board';
} }
});
let station = "";
let staff = false;
let uuidValue = "";
$: uuidValue = $uuid;
onMount(async () => {
station = (await getHeadcode()) || "";
if (uuidValue !== null && uuidValue !== "" && uuidValue !== "null") {
staff = true;
title = "Staff Board";
} else {
title = "Public Board";
}
});
</script> </script>
<Header {title} /> <Header {title} />
<!-- If 'uuid' exists in store then load StaffLdb else load PublicLdb --> <!-- If 'uuid' exists in store then load StaffLdb else load PublicLdb -->
{#if !staff} {#if !staff}
<PublicLdb {station} bind:title /> <PublicLdb {station} bind:title />
{:else} {:else}
<StaffLdb {station} bind:title /> <StaffLdb {station} bind:title />
<!--<StaffLdb {station} bind:title={title} /> -- Temporary, Disable StaffLdb - it isn't implemented --> <!--<StaffLdb {station} bind:title={title} /> -- Temporary, Disable StaffLdb - it isn't implemented -->
{/if} {/if}
<Nav /> <Nav />

136
src/routes/more/+page.svelte
View File

@ -1,77 +1,89 @@
<script> <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 { IconCode, IconHelp, IconInfoCircle, IconLocation, IconMessageCode, IconNumber, IconSettings, IconSpy, IconUser, IconUserPlus, IconVersions } from '@tabler/icons-svelte'; import {
const title = 'More'; IconCode,
IconHelp,
IconInfoCircle,
IconLocation,
IconMessageCode,
IconNumber,
IconSettings,
IconSpy,
IconUser,
IconUserPlus,
IconVersions
} from "@tabler/icons-svelte";
const title = "More";
const links = [ const links = [
{ title: 'Your Data', path: '/more/data', icon: IconUser }, { title: "Your Data", path: "/more/data", icon: IconUser },
{ title: 'Registration', path: '/more/reg', icon: IconUserPlus }, { title: "Registration", path: "/more/reg", icon: IconUserPlus },
{ title: 'Settings', path: '/more/settings', icon: IconSettings }, { title: "Settings", path: "/more/settings", icon: IconSettings },
{ title: 'Help', path: '/more/help', icon: IconHelp }, { title: "Help", path: "/more/help", icon: IconHelp },
{ title: 'About', path: '/more/about', icon: IconInfoCircle }, { title: "About", path: "/more/about", icon: IconInfoCircle },
{ title: 'Location Reference Code Lookup', path: '/more/corpus', icon: IconLocation }, { title: "Location Reference Code Lookup", path: "/more/corpus", icon: IconLocation },
{ title: 'Reason Code Lookup', path: '/more/reasons', icon: IconMessageCode }, { title: "Reason Code Lookup", path: "/more/reasons", icon: IconMessageCode },
{ title: 'Privacy Policy', path: '/more/privacy', icon: IconSpy }, { title: "Privacy Policy", path: "/more/privacy", icon: IconSpy },
{ title: 'Component Versions', path: '/more/versions', icon: IconVersions }, { title: "Component Versions", path: "/more/versions", icon: IconVersions },
{ title: 'Statistics', path: '/more/statistics', icon: IconNumber } { title: "Statistics", path: "/more/statistics", icon: IconNumber }
]; ];
</script> </script>
<Header {title} /> <Header {title} />
{#each links as item} {#each links as item}
<a href={item.path}> <a href={item.path}>
<div> <div>
<svelte:component this={item.icon} /> <svelte:component this={item.icon} />
<p>{item.title}</p> <p>{item.title}</p>
</div> </div>
</a> </a>
{/each} {/each}
<Nav /> <Nav />
<style> <style>
div { div {
width: 100%; width: 100%;
background: rgba(0, 0, 0, 0.226); background: rgba(0, 0, 0, 0.226);
border-color: aliceblue; border-color: aliceblue;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-left: none; border-left: none;
padding-left: 0.5rem; padding-left: 0.5rem;
overflow-x: hidden; overflow-x: hidden;
border-right: none; border-right: none;
height: 50px; height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
}
a {
text-decoration: none;
height: 100%;
vertical-align: middle;
overflow-x: hidden;
}
p {
color: white;
margin: 0;
padding-left: 10px;
text-align: left;
line-height: 50px;
vertical-align: middle;
font-weight: 600;
font-size: 20px;
overflow-x: hidden;
}
@media (min-width: 600px) {
p {
text-align: center;
} }
} a {
@media (max-width: 380px) { text-decoration: none;
p { height: 100%;
font-size: 16px; vertical-align: middle;
overflow-x: hidden;
}
p {
color: white;
margin: 0;
padding-left: 10px;
text-align: left;
line-height: 50px;
vertical-align: middle;
font-weight: 600;
font-size: 20px;
overflow-x: hidden;
}
@media (min-width: 600px) {
p {
text-align: center;
}
}
@media (max-width: 380px) {
p {
font-size: 16px;
}
} }
}
</style> </style>

30
src/routes/more/about/+page.svelte
View File

@ -1,9 +1,9 @@
<script> <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> </script>
<Header {title} /> <Header {title} />
@ -13,19 +13,19 @@
<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>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> <p>Data is sourced from National Rail Enquiries, the OwlBoard Project, and Network Rail.</p>
<p> <p>
OwlBoard components are available under various Open Source licenses. Please refer to the OwlBoard components are available under various Open Source licenses. Please refer to the
<a href="https://git.fjla.uk/OwlBoard" target="_blank">code repository</a> <a href="https://git.fjla.uk/OwlBoard" target="_blank">code repository</a>
for more detailed information. for more detailed information.
</p> </p>
<Nav /> <Nav />
<style> <style>
p { p {
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }
.neg { .neg {
margin-top: -40px; margin-top: -40px;
margin-bottom: 40px; margin-bottom: 40px;
} }
</style> </style>

228
src/routes/more/corpus/+page.svelte
View File

@ -1,78 +1,78 @@
<script> <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";
import { getApiUrl } from '$lib/scripts/upstream'; import { getApiUrl } from "$lib/scripts/upstream";
const title = 'Location Codes'; const title = "Location Codes";
let val = { let val = {
crs: '', crs: "",
tiploc: '', tiploc: "",
stanox: '', stanox: "",
nlc: '', nlc: "",
name: '', name: "",
uic: '' uic: ""
};
let isLoading = false;
async function getData(type = '', value = '') {
const url = `${getApiUrl()}/api/v2/ref/locationCode/${type}/${value}`;
const res = await fetch(url);
const data = await res.json();
isLoading = false;
return data;
}
async function processData(data) {
//console.log("data",JSON.stringify(data))
if (data.ERROR == 'Offline') {
return;
}
val = {
crs: data[0]['3ALPHA'] || 'None',
tiploc: data[0]['TIPLOC'] || 'None',
stanox: data[0]['STANOX'] || 'None',
nlc: data[0]['NLC'] || 'None',
name: data[0]['NLCDESC'] || 'None',
uic: data[0]['UIC'] || 'None'
}; };
//console.log("val",JSON.stringify(val));
}
async function submit() { let isLoading = false;
isLoading = true;
let data = []; async function getData(type = "", value = "") {
if (val?.crs) { const url = `${getApiUrl()}/api/v2/ref/locationCode/${type}/${value}`;
data = await getData('crs', val.crs); const res = await fetch(url);
} else if (val?.tiploc) { const data = await res.json();
data = await getData('tiploc', val.tiploc); isLoading = false;
} else if (val?.stanox) { return data;
data = await getData('stanox', val.stanox);
} else if (val?.nlc) {
data = await getData('nlc', val.nlc);
} else {
return;
} }
processData(data);
}
async function reset() { async function processData(data) {
val = { //console.log("data",JSON.stringify(data))
crs: '', if (data.ERROR == "Offline") {
tiploc: '', return;
stanox: '', }
nlc: '', val = {
name: '', crs: data[0]["3ALPHA"] || "None",
uic: '' tiploc: data[0]["TIPLOC"] || "None",
}; stanox: data[0]["STANOX"] || "None",
} nlc: data[0]["NLC"] || "None",
name: data[0]["NLCDESC"] || "None",
uic: data[0]["UIC"] || "None"
};
//console.log("val",JSON.stringify(val));
}
async function submit() {
isLoading = true;
let data = [];
if (val?.crs) {
data = await getData("crs", val.crs);
} else if (val?.tiploc) {
data = await getData("tiploc", val.tiploc);
} else if (val?.stanox) {
data = await getData("stanox", val.stanox);
} else if (val?.nlc) {
data = await getData("nlc", val.nlc);
} else {
return;
}
processData(data);
}
async function reset() {
val = {
crs: "",
tiploc: "",
stanox: "",
nlc: "",
name: "",
uic: ""
};
}
</script> </script>
<Header {title} /> <Header {title} />
{#if isLoading} {#if isLoading}
<Loading /> <Loading />
{/if} {/if}
<p>Enter one of the codes below and press submit.</p> <p>Enter one of the codes below and press submit.</p>
@ -80,59 +80,59 @@
<p class="desc">Some locations only have some applicable location codes.</p> <p class="desc">Some locations only have some applicable location codes.</p>
<div class="inputs"> <div class="inputs">
<form on:submit={submit}> <form on:submit={submit}>
<input type="text" readonly placeholder="Name" bind:value={val.name} /> <input type="text" readonly placeholder="Name" bind:value={val.name} />
<br /> <br />
<input type="text" maxlength="3" autocomplete="off" placeholder="CRS/3ALPHA" bind:value={val.crs} /> <input type="text" maxlength="3" autocomplete="off" placeholder="CRS/3ALPHA" bind:value={val.crs} />
<br /> <br />
<input type="text" maxlength="7" autocomplete="off" placeholder="TIPLOC" bind:value={val.tiploc} /> <input type="text" maxlength="7" autocomplete="off" placeholder="TIPLOC" bind:value={val.tiploc} />
<br /> <br />
<input type="text" maxlength="10" autocomplete="off" placeholder="STANOX" bind:value={val.stanox} /> <input type="text" maxlength="10" autocomplete="off" placeholder="STANOX" bind:value={val.stanox} />
<br /> <br />
<input type="number" maxlength="6" min="0" autocomplete="off" placeholder="NLC" bind:value={val.nlc} /> <input type="number" maxlength="6" min="0" autocomplete="off" placeholder="NLC" bind:value={val.nlc} />
<br /> <br />
<input type="text" readonly autocomplete="off" placeholder="UIC" bind:value={val.uic} /> <input type="text" readonly autocomplete="off" placeholder="UIC" bind:value={val.uic} />
<br /> <br />
<button type="submit">Submit</button> <button type="submit">Submit</button>
<button type="reset" on:click={reset}>Reset</button> <button type="reset" on:click={reset}>Reset</button>
</form> </form>
</div> </div>
<Nav /> <Nav />
<style> <style>
p { p {
margin: 10px; margin: 10px;
} }
input { input {
font-family: urwgothic, sans-serif; font-family: urwgothic, sans-serif;
border-radius: 50px; border-radius: 50px;
border: none; border: none;
width: 60%; width: 60%;
max-width: 200px; max-width: 200px;
min-width: 130px; min-width: 130px;
height: 30px; height: 30px;
margin-bottom: 10px; margin-bottom: 10px;
text-transform: uppercase; text-transform: uppercase;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
button { button {
border-radius: 50px; border-radius: 50px;
font-family: urwgothic, sans-serif; font-family: urwgothic, sans-serif;
background-color: var(--island-bg-color); background-color: var(--island-bg-color);
border: none; border: none;
color: white; color: white;
height: 30px; height: 30px;
width: 20%; width: 20%;
max-width: 100px; max-width: 100px;
min-width: 75px; min-width: 75px;
font-size: 18px; font-size: 18px;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
.desc { .desc {
color: white; color: white;
} }
input { input {
text-align: center; text-align: center;
} }
</style> </style>

94
src/routes/more/data/+page.svelte
View File

@ -1,38 +1,38 @@
<script> <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 { getApiUrl } from '$lib/scripts/upstream'; import { getApiUrl } from "$lib/scripts/upstream";
import { uuid } from '$lib/stores/uuid.js'; import { uuid } from "$lib/stores/uuid.js";
import { onMount } from 'svelte'; import { onMount } from "svelte";
const title = 'Your Data'; const title = "Your Data";
let 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") {
const url = `${getApiUrl()}/api/v2/user/${$uuid}`;
const res = await fetch(url);
const json = await res.json();
if (json.length) {
data = json;
}
}
} }
];
let isLoading = false; onMount(async () => {
isLoading = true;
async function fetchData() { await fetchData();
if ($uuid != 'null') { isLoading = false;
const url = `${getApiUrl()}/api/v2/user/${$uuid}`; });
const res = await fetch(url);
const json = await res.json();
if (json.length) {
data = json;
}
}
}
onMount(async () => {
isLoading = true;
await fetchData();
isLoading = false;
});
</script> </script>
<Header {title} /> <Header {title} />
@ -43,26 +43,26 @@
<br /><br /> <br /><br />
{#if isLoading} {#if isLoading}
<Loading /> <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 /> <LogoutButton />
<p> <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> </p>
{:else} {:else}
<p class="api_response">You are not registered, we don't have any data stored.</p> <p class="api_response">You are not registered, we don't have any data stored.</p>
{/if} {/if}
<Nav /> <Nav />
<style> <style>
p { p {
margin: 10px; margin: 10px;
} }
.api_response { .api_response {
color: white; color: white;
} }
</style> </style>

10
src/routes/more/help/+page.svelte
View File

@ -1,16 +1,16 @@
<script> <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";
</script> </script>
<Header title={'Help'} /> <Header title={"Help"} />
<Nav /> <Nav />
<br /><br /> <br /><br />
<p> <p>
You can find extensive help and documentation at <a href="https://docs.owlboard.info">the documentation site</a>. You can find extensive help and documentation at <a href="https://docs.owlboard.info">the documentation site</a>.
</p> </p>
<p> <p>
You can also use the <a href="https://www.facebook.com/owlboard.support">OwlBoard Support</a> page on Facebook. You can also use the <a href="https://www.facebook.com/owlboard.support">OwlBoard Support</a> page on Facebook.
</p> </p>
<br /><br /> <br /><br />

88
src/routes/more/privacy/+page.svelte
View File

@ -1,57 +1,57 @@
<script> <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> </script>
<Header {title} /> <Header {title} />
<div> <div>
<p> <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 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
that we store, please visit <a href="/more/data">My Data</a>. data that we store, please visit <a href="/more/data">My Data</a>.
</p> </p>
<p>OwlBoard does not utilize any cookies. IP addresses and browser fingerprints are not logged.</p> <p>OwlBoard does not utilize any cookies. IP addresses and browser fingerprints are not logged.</p>
<h2>If You Do Not Sign Up</h2> <h2>If You Do Not Sign Up</h2>
<p> <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 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
your device. leave your device.
</p> </p>
<h2>If You Sign Up</h2> <h2>If You Sign Up</h2>
<p> <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 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
settings are stored locally in your browser and do not leave your device. personal settings are stored locally in your browser and do not leave your device.
</p> </p>
<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 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
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 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
'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. '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>
<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> <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>
<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> <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> <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>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> <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" Any data submitted when reporting an issue will be publicly viewable alongside the <a href="https://git.fjla.uk/owlboard/backend/issues" target="_blank"
>OwlBoard/backend git repository</a >OwlBoard/backend git repository</a
>. >.
</p> </p>
</div> </div>
<Nav /> <Nav />
<style> <style>
div { div {
text-align: left; text-align: left;
} }
h2 { h2 {
color: var(--second-text-color); color: var(--second-text-color);
margin: 10px; margin: 10px;
padding-top: 20px; padding-top: 20px;
} }
p { p {
color: white; color: white;
margin: 10px; margin: 10px;
} }
</style> </style>

188
src/routes/more/reasons/+page.svelte
View File

@ -1,121 +1,121 @@
<script> <script>
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 ResultIsland from "$lib/islands/result-island.svelte";
import { getApiUrl } from '$lib/scripts/upstream'; import { getApiUrl } from "$lib/scripts/upstream";
const title = 'Reason Codes'; const title = "Reason Codes";
let isLoading = false; let isLoading = false;
let inputValue = ''; let inputValue = "";
let resultObject = { let resultObject = {
results: false,
title: '',
resultLines: []
};
function load() {
isLoading = true;
resultObject.results = false;
getData().then((result) => {
handleData(result);
isLoading = false;
});
}
async function getData() {
if (inputValue) {
const url = `${getApiUrl()}/api/v2/ref/reasonCode/${inputValue}`;
const res = await fetch(url);
return await res.json();
} else {
return [];
}
}
async function handleData(data) {
let resultLines = [];
if (data.length) {
resultObject.title = data[0]['code'];
resultLines = [data[0]['lateReason'], data[0]['cancReason']];
} else {
resultObject = {
results: false, results: false,
title: 'Not Found', title: "",
resultLines: [] resultLines: []
}; };
function load() {
isLoading = true;
resultObject.results = false;
getData().then((result) => {
handleData(result);
isLoading = false;
});
} }
resultObject.resultLines = resultLines;
resultObject.results = true;
}
onMount(() => { async function getData() {
isLoading = false; if (inputValue) {
}); const url = `${getApiUrl()}/api/v2/ref/reasonCode/${inputValue}`;
const res = await fetch(url);
return await res.json();
} else {
return [];
}
}
function handleInput(event) { async function handleData(data) {
inputValue = event.target.value; let resultLines = [];
} if (data.length) {
resultObject.title = data[0]["code"];
resultLines = [data[0]["lateReason"], data[0]["cancReason"]];
} else {
resultObject = {
results: false,
title: "Not Found",
resultLines: []
};
}
resultObject.resultLines = resultLines;
resultObject.results = true;
}
function handleSubmit(event) { onMount(() => {
event.preventDefault(); isLoading = false;
load(); });
}
function handleInput(event) {
inputValue = event.target.value;
}
function handleSubmit(event) {
event.preventDefault();
load();
}
</script> </script>
<Header {title} /> <Header {title} />
<p>A reason code is a three digit number that maps to a reason for a delay or cancellation</p> <p>A reason code is a three digit number that maps to a reason for a delay or cancellation</p>
<form on:submit={handleSubmit}> <form on:submit={handleSubmit}>
<input type="text" placeholder="Enter Code" autocomplete="off" bind:value={inputValue} on:input={handleInput} /> <input type="text" placeholder="Enter Code" autocomplete="off" bind:value={inputValue} on:input={handleInput} />
<br /> <br />
<button type="submit">Submit</button> <button type="submit">Submit</button>
</form> </form>
{#if isLoading} {#if isLoading}
<Loading /> <Loading />
{/if} {/if}
{#if resultObject.results} {#if resultObject.results}
<ResultIsland {resultObject} /> <ResultIsland {resultObject} />
{/if} {/if}
<Nav /> <Nav />
<style> <style>
p { p {
margin: 10px; margin: 10px;
margin-top: 20px; margin-top: 20px;
} }
input { input {
width: 25%; width: 25%;
min-width: 150px; min-width: 150px;
height: 32px; height: 32px;
margin-top: 10px; margin-top: 10px;
margin-bottom: 5px; margin-bottom: 5px;
border-radius: 50px; border-radius: 50px;
border: none; border: none;
text-align: center; 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; text-transform: uppercase;
font-size: 15px; font-size: 15px;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
button { button {
width: 15%; width: 15%;
min-width: 100px; min-width: 100px;
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 5px; margin-top: 5px;
border: none; border: none;
border-radius: 20px; border-radius: 20px;
padding: 5px; 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-size: 16px;
font-weight: 400; font-weight: 400;
background-color: var(--island-bg-color); background-color: var(--island-bg-color);
color: var(--main-text-color); color: var(--main-text-color);
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
</style> </style>

254
src/routes/more/reg/+page.svelte
View File

@ -1,144 +1,144 @@
<script lang="ts"> <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 } 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 { getApiUrl } from "$lib/scripts/upstream";
const title = 'Register'; const title = "Register";
let state = 'unreg'; let state = "unreg";
let isLoading = true; let isLoading = true;
let inputValue = ''; let inputValue = "";
function handleInput(event: KeyboardEvent) { function handleInput(event: KeyboardEvent) {
inputValue = event?.target?.value; inputValue = event?.target?.value;
}
async function request() {
isLoading = true;
const url = `${getApiUrl()}/api/v2/user/request`;
const request = {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
email: inputValue
})
};
const res = await fetch(url, request);
if (res.status == 400 || res.status == 403) {
state = 'unauth';
} else if (res.status == 201) {
state = 'sent';
} else {
state = 'error';
} }
isLoading = false;
}
onMount(async () => { async function request() {
const auth = await checkAuth(); isLoading = true;
if (auth.uuidPresent === false) { const url = `${getApiUrl()}/api/v2/user/request`;
state = 'unreg'; const request = {
} else if (auth.uuidPresent === true) { method: "POST",
state = 'reg'; headers: {
"Content-Type": "application/json"
},
body: JSON.stringify({
email: inputValue
})
};
const res = await fetch(url, request);
if (res.status == 400 || res.status == 403) {
state = "unauth";
} else if (res.status == 201) {
state = "sent";
} else {
state = "error";
}
isLoading = false;
} }
isLoading = false;
}); onMount(async () => {
const auth = await checkAuth();
if (auth.uuidPresent === false) {
state = "unreg";
} else if (auth.uuidPresent === true) {
state = "reg";
}
isLoading = false;
});
</script> </script>
<Header {title} /> <Header {title} />
<section class="content"> <section class="content">
{#if isLoading} {#if isLoading}
<Loading /> <Loading />
{:else if state == 'unreg'} {:else if state == "unreg"}
<p>To register, you will need to enter a work email address to receive a confirmation email</p> <p>To register, you will need to enter a work email address to receive a confirmation email</p>
<p class="bold">Already have a registration code? <a href="/more/reg/submit">enter it here</a></p> <p class="bold">Already have a registration code? <a href="/more/reg/submit">enter it here</a></p>
<form on:submit={request}> <form on:submit={request}>
<input type="text" autocomplete="email" placeholder="Enter work email" bind:value={inputValue} on:input={handleInput} /><br /> <input type="text" autocomplete="email" placeholder="Enter work email" bind:value={inputValue} on:input={handleInput} /><br />
<label for="checkbox"> <label for="checkbox">
I have read and accept the terms of the <a href="/more/privacy">Privacy Policy</a><br /> I have read and accept the terms of the <a href="/more/privacy">Privacy Policy</a><br />
<input id="checkbox" type="checkbox" required /> <input id="checkbox" type="checkbox" required />
</label><br /> </label><br />
<button type="submit">Submit</button> <button type="submit">Submit</button>
</form> </form>
<br /> <br />
<p class="bold">What do you get?</p> <p class="bold">What do you get?</p>
<li>Access to Train details</li> <li>Access to Train details</li>
<li>Access to PIS Codes</li> <li>Access to PIS Codes</li>
<li>ECS Movements on departure boards</li> <li>ECS Movements on departure boards</li>
<li>Non-Public trains on departure boards</li> <li>Non-Public trains on departure boards</li>
<li>Hidden platform numbers 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> <li>See up to the next 40 trains departing a station over the next two hours</li>
{:else if state == 'sent'} {:else if state == "sent"}
<p>An email has been sent, enter the code in the email to activate your profile.</p> <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 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>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> <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>The email address you entered does not belong to an authorised business.</p>
<p>If you think this is an error, you can get help on <a href="/more/help">the help page</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>There was an error processing your request.</p>
<p>Check that the email you entered was correct or try again later.</p> <p>Check that the email you entered was correct or try again later.</p>
{:else if state == 'reg'} {:else if state == "reg"}
<p> <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> </p>
<LogoutButton /> <LogoutButton />
{/if} {/if}
</section> </section>
<Nav /> <Nav />
<style> <style>
.bold { .bold {
font-weight: 800; font-weight: 800;
} }
.content { .content {
margin-top: 30px; margin-top: 30px;
} }
p { p {
margin: 10px; margin: 10px;
margin-left: 20px; margin-left: 20px;
margin-right: 20px; margin-right: 20px;
} }
li { li {
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
color: white; color: white;
margin-top: 5px; margin-top: 5px;
margin-left: 15px; margin-left: 15px;
margin-right: 15px; margin-right: 15px;
list-style-type: none; list-style-type: none;
} }
input { input {
height: 40px; height: 40px;
width: 80%; width: 80%;
max-width: 375px; 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; text-align: center;
font-size: 20px; font-size: 20px;
border-radius: 50px; border-radius: 50px;
border: none; border: none;
margin-bottom: 20px; margin-bottom: 20px;
} }
#checkbox { #checkbox {
height: 30px; height: 30px;
width: 30px; width: 30px;
} }
button { button {
border: none; border: none;
background-color: var(--island-bg-color); background-color: var(--island-bg-color);
color: var(--main-text-color); color: var(--main-text-color);
width: 35%; width: 35%;
height: 30px; height: 30px;
border-radius: 50px; border-radius: 50px;
font-size: 18px; font-size: 18px;
} }
</style> </style>

214
src/routes/more/reg/submit/+page.svelte
View File

@ -1,128 +1,128 @@
<script lang="ts"> <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 { getApiUrl } from '$lib/scripts/upstream'; import { getApiUrl } from "$lib/scripts/upstream";
import { uuid } from '$lib/stores/uuid'; import { uuid } from "$lib/stores/uuid";
const title = 'Submit Registration'; const title = "Submit Registration";
let state = false; let state = false;
let status: string; let status: string;
let inputs: { id: string; value: string }[] = [ let inputs: { id: string; value: string }[] = [
{ id: '1', value: '' }, { id: "1", value: "" },
{ id: '2', value: '' }, { id: "2", value: "" },
{ id: '3', value: '' }, { id: "3", value: "" },
{ id: '4', value: '' }, { id: "4", value: "" },
{ id: '5', value: '' }, { id: "5", value: "" },
{ id: '6', value: '' } { id: "6", value: "" }
]; ];
function handleInput(index: number, event: KeyboardEvent): void { function handleInput(index: number, event: KeyboardEvent): void {
if (event.key === 'Backspace' && index > 0 && inputs[index].value === '') { if (event.key === "Backspace" && index > 0 && inputs[index].value === "") {
const prevInput = document.getElementById(`input-${index}`); const prevInput = document.getElementById(`input-${index}`);
if (prevInput) { if (prevInput) {
prevInput.focus(); prevInput.focus();
} }
} else if (inputs[index].value.length === 1) { } else if (inputs[index].value.length === 1) {
const nextInput = document.getElementById(`input-${index + 2}`); const nextInput = document.getElementById(`input-${index + 2}`);
if (nextInput) { if (nextInput) {
nextInput.focus(); nextInput.focus();
} }
}
} }
}
async function handleSubmit() { async function handleSubmit() {
let submitString: string = ''; let submitString: string = "";
for (const input of inputs) { for (const input of inputs) {
submitString += input.value.toUpperCase(); submitString += input.value.toUpperCase();
}
console.log(`Code: ${submitString}`);
const res = await submit(submitString);
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;
} }
console.log(`Code: ${submitString}`);
const res = await submit(submitString);
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: string): Promise<number> { async function submit(id: string): Promise<number> {
const url = `${getApiUrl()}/api/v2/user/register`; const url = `${getApiUrl()}/api/v2/user/register`;
const request = { const request = {
method: 'POST', method: "POST",
headers: { headers: {
'Content-Type': 'application/json' "Content-Type": "application/json"
}, },
body: JSON.stringify({ body: JSON.stringify({
uuid: id uuid: id
}) })
}; };
const res = await fetch(url, request); const res = await fetch(url, request);
const body = await res.json(); const body = await res.json();
if (body.api_key) { if (body.api_key) {
uuid.set(body.api_key); uuid.set(body.api_key);
return 201; return 201;
} else { } else {
return res.status; return res.status;
}
} }
}
</script> </script>
<Header {title} /> <Header {title} />
{#if state} {#if state}
{#if status == 'okay'} {#if status == "okay"}
<p class="title-ish">You are now registered</p> <p class="title-ish">You are now registered</p>
<p>Your secret key will be stored in your browser.</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> <p>If you change browsers, change device or clear your browsing data, you may have to register again.</p>
{:else if status == 'fail'} {:else if status == "fail"}
<p class="title-ish">Your code was not accepted</p> <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> <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}
{:else} {:else}
<p class="title-ish">Enter your registration code below</p> <p class="title-ish">Enter your registration code below</p>
<form on:submit={handleSubmit} id="codeInputForm"> <form on:submit={handleSubmit} id="codeInputForm">
{#each inputs as input, index} {#each inputs as input, index}
<input class="code-in" bind:value={input.value} id={`input-${input.id}`} maxlength="1" autocomplete="off" on:keydown={(event) => handleInput(index, event)} /> <input class="code-in" bind:value={input.value} id={`input-${input.id}`} maxlength="1" autocomplete="off" on:keydown={(event) => handleInput(index, event)} />
{/each} {/each}
<br /> <br />
<button type="submit">Submit</button> <button type="submit">Submit</button>
</form> </form>
{/if} {/if}
<Nav /> <Nav />
<style> <style>
.title-ish { .title-ish {
font-size: 20px; font-size: 20px;
} }
.code-in { .code-in {
margin: 3px; margin: 3px;
margin-bottom: 20px; margin-bottom: 20px;
width: 29px; width: 29px;
height: 39px; height: 39px;
font-size: 30px; font-size: 30px;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
border-radius: 10px; border-radius: 10px;
border: none; border: none;
} }
button { button {
border: none; border: none;
background-color: var(--island-bg-color); background-color: var(--island-bg-color);
color: var(--main-text-color); color: var(--main-text-color);
width: 35%; width: 35%;
min-width: 95px; min-width: 95px;
max-width: 231px; max-width: 231px;
height: 30px; height: 30px;
border-radius: 50px; border-radius: 50px;
font-size: 18px; font-size: 18px;
} }
p { p {
margin-left: 40px; margin-left: 40px;
margin-right: 40px; margin-right: 40px;
} }
</style> </style>

330
src/routes/more/report/+page.svelte
View File

@ -1,188 +1,188 @@
<script> <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'; import { getApiUrl } from "$lib/scripts/upstream";
const title = 'Report Issue'; const title = "Report Issue";
let isLoading = false; let isLoading = false;
let isDone = false; let isDone = false;
let isError = false; let isError = false;
let reportType = '', let reportType = "",
reportSubject = '', reportSubject = "",
reportMsg = '', reportMsg = "",
reportCollected; reportCollected;
onMount(async () => { onMount(async () => {
reportCollected = { reportCollected = {
userAgent: navigator.userAgent, userAgent: navigator.userAgent,
browser: navigator.appName, browser: navigator.appName,
version: navigator.appVersion, version: navigator.appVersion,
platform: navigator.platform, platform: navigator.platform,
viewport: `${window.innerWidth} x ${window.innerHeight}` viewport: `${window.innerWidth} x ${window.innerHeight}`
}; };
});
let preFlight = false;
async function submit() {
console.log(reportType, reportSubject, reportMsg);
preFlight = true;
}
async function send() {
console.log('SEND DATA REQUESTED');
isLoading = true;
const formData = JSON.stringify({
label: reportType,
subject: reportSubject,
msg:
`User Agent: ${reportCollected.userAgent}\n` +
`Browser: ${reportCollected.browser}\n` +
`BrowserVersion: ${reportCollected.version}\n` +
`Platform: ${reportCollected.platform}\n` +
`Viewport: ${reportCollected.viewport}\n\n\n` +
`User Message:\n` +
`${reportMsg}`
}); });
const url = `${getApiUrl()}/misc/issue`;
const options = {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
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 = '/';
} else {
isLoading = false;
isError = true;
}
}
async function cancel() { let preFlight = false;
preFlight = false;
isLoading = false; async function submit() {
isDone = false; console.log(reportType, reportSubject, reportMsg);
isError = false; preFlight = true;
} }
async function send() {
console.log("SEND DATA REQUESTED");
isLoading = true;
const formData = JSON.stringify({
label: reportType,
subject: reportSubject,
msg:
`User Agent: ${reportCollected.userAgent}\n` +
`Browser: ${reportCollected.browser}\n` +
`BrowserVersion: ${reportCollected.version}\n` +
`Platform: ${reportCollected.platform}\n` +
`Viewport: ${reportCollected.viewport}\n\n\n` +
`User Message:\n` +
`${reportMsg}`
});
const url = `${getApiUrl()}/misc/issue`;
const options = {
method: "POST",
headers: {
"Content-Type": "application/json"
},
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 = "/";
} else {
isLoading = false;
isError = true;
}
}
async function cancel() {
preFlight = false;
isLoading = false;
isDone = false;
isError = false;
}
</script> </script>
<Header {title} /> <Header {title} />
{#if isLoading} {#if isLoading}
<Loading /> <Loading />
{/if} {/if}
{#if isDone} {#if isDone}
<Done /> <Done />
{/if} {/if}
{#if !preFlight && !isDone} {#if !preFlight && !isDone}
<p>Get help on the <a href="https://www.facebook.com/owlboard.support">OwlBoard Support Facebook Page</a></p> <p>Get help on the <a href="https://www.facebook.com/owlboard.support">OwlBoard Support Facebook Page</a></p>
<p>
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}>
<select class="formInputs" name="type" bind:value={reportType} placeholder="Choose Category">
<option value="" disabled selected>Choose an Issue Type</option>
<option value="bug">Problem</option>
<option value="enhancement">Feature Request</option>
<option value="question">Question</option>
<option value="user-support">Unable to sign up</option>
</select>
<br />
<input class="formInputs" type="text" bind:value={reportSubject} placeholder="Subject" />
<br />
<textarea class="formInputs" bind:value={reportMsg} placeholder="Enter your message..." />
<br />
<button type="submit">Submit</button>
<button type="reset">Reset</button>
</form>
{:else}
<Island>
<h2>Device Data:</h2>
<p><span class="dataType">User Agent: </span>{reportCollected.userAgent}</p>
<p> <p>
<span class="dataType">Browser: </span>{reportCollected.browser} - {reportCollected.version} 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>
<p><span class="dataType">Platform: </span>{reportCollected.platform}</p> <p>You will be shown all of the collected data before the form is submitted.</p>
<p><span class="dataType">Viewport: </span> {reportCollected.viewport}</p> <form on:submit={submit}>
<h2>Reported Data:</h2> <select class="formInputs" name="type" bind:value={reportType} placeholder="Choose Category">
<p><span class="dataType">Report Type: </span>{reportType}</p> <option value="" disabled selected>Choose an Issue Type</option>
<p>{reportSubject}</p> <option value="bug">Problem</option>
<p>{reportMsg}</p> <option value="enhancement">Feature Request</option>
<button class="overlayButtons" on:click={send}>Send</button> <option value="question">Question</option>
<button class="overlayButtons" on:click={cancel}>Cancel</button> <option value="user-support">Unable to sign up</option>
</Island> </select>
<br />
<input class="formInputs" type="text" bind:value={reportSubject} placeholder="Subject" />
<br />
<textarea class="formInputs" bind:value={reportMsg} placeholder="Enter your message..." />
<br />
<button type="submit">Submit</button>
<button type="reset">Reset</button>
</form>
{:else}
<Island>
<h2>Device Data:</h2>
<p><span class="dataType">User Agent: </span>{reportCollected.userAgent}</p>
<p>
<span class="dataType">Browser: </span>{reportCollected.browser} - {reportCollected.version}
</p>
<p><span class="dataType">Platform: </span>{reportCollected.platform}</p>
<p><span class="dataType">Viewport: </span> {reportCollected.viewport}</p>
<h2>Reported Data:</h2>
<p><span class="dataType">Report Type: </span>{reportType}</p>
<p>{reportSubject}</p>
<p>{reportMsg}</p>
<button class="overlayButtons" on:click={send}>Send</button>
<button class="overlayButtons" on:click={cancel}>Cancel</button>
</Island>
{/if} {/if}
<Nav /> <Nav />
<style> <style>
p { p {
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }
select { select {
text-align: center; text-align: center;
border: none; border: none;
border-radius: 50px; border-radius: 50px;
height: 30px; height: 30px;
background-color: white; background-color: white;
} }
.formInputs { .formInputs {
margin: 10px; margin: 10px;
font-family: urwgothic, sans-serif; font-family: urwgothic, sans-serif;
font-size: 16px; font-size: 16px;
border: none; border: none;
width: 50%; width: 50%;
max-width: 450px; max-width: 450px;
min-width: 250px; min-width: 250px;
} }
input { input {
text-align: center; text-align: center;
border-radius: 50px; border-radius: 50px;
height: 30px; height: 30px;
} }
textarea { textarea {
text-align: left; text-align: left;
border-radius: 10px; border-radius: 10px;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
height: 30vh; height: 30vh;
min-height: 150px; min-height: 150px;
max-height: 400px; max-height: 400px;
} }
button { button {
background-color: var(--island-bg-color); background-color: var(--island-bg-color);
color: var(--main-text-color); color: var(--main-text-color);
font-family: urwgothic, sans-serif; font-family: urwgothic, sans-serif;
font-size: 16px; font-size: 16px;
border: none; border: none;
border-radius: 50px; border-radius: 50px;
width: 25%; width: 25%;
height: 30px; height: 30px;
max-width: 100px; max-width: 100px;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
h2 { h2 {
color: white; color: white;
} }
.dataType { .dataType {
color: white; color: white;
} }
.overlayButtons { .overlayButtons {
background-color: var(--main-bg-color); background-color: var(--main-bg-color);
} }
</style> </style>

8
src/routes/more/settings/+page.svelte
View File

@ -1,8 +1,8 @@
<script> <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'; const title = "Settings";
</script> </script>
<Header {title} /> <Header {title} />

122
src/routes/more/statistics/+page.svelte
View File

@ -1,79 +1,79 @@
<script> <script>
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";
import { getApiUrl } from '$lib/scripts/upstream'; import { getApiUrl } from "$lib/scripts/upstream";
const title = 'Statistics'; const title = "Statistics";
async function getData() { async function getData() {
const url = `${getApiUrl()}/misc/server/stats`; const url = `${getApiUrl()}/misc/server/stats`;
const res = await fetch(url); const res = await fetch(url);
return await res.json(); return await res.json();
} }
function U2L(input) { function U2L(input) {
try { try {
const datetime = new Date(input * 1000); const datetime = new Date(input * 1000);
return datetime.toLocaleString(); return datetime.toLocaleString();
} catch (err) { } catch (err) {
console.log(err); console.log(err);
return false; return false;
}
} }
}
</script> </script>
<Header {title} /> <Header {title} />
{#await getData()} {#await getData()}
<Loading /> <Loading />
{:then data} {:then data}
<br /> <br />
<p>API Server:<br /><span>{data?.hostname}</span></p> <p>API Server:<br /><span>{data?.hostname}</span></p>
<p>Runtime Mode: <span>{data?.runtimeMode}</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> <h2>Last Update</h2>
<p>Timetable: <span>{U2L(data?.updateTimes?.timetable)}</span></p> <p>Timetable: <span>{U2L(data?.updateTimes?.timetable)}</span></p>
<p>Location Ref: <span>{U2L(data?.updateTimes?.corpus)}</span></p> <p>Location Ref: <span>{U2L(data?.updateTimes?.corpus)}</span></p>
<p>PIS Codes: <span>{U2L(data?.updateTimes?.pis)}</span></p> <p>PIS Codes: <span>{U2L(data?.updateTimes?.pis)}</span></p>
<p>Reason Codes: <span>{U2L(data?.updateTimes?.reasonCodes)}</span></p> <p>Reason Codes: <span>{U2L(data?.updateTimes?.reasonCodes)}</span></p>
<h2>Request Counts</h2> <h2>Request Counts</h2>
<p>LDBWS API: <span>{data?.requestCounts?.ldbws_api}</span></p> <p>LDBWS API: <span>{data?.requestCounts?.ldbws_api}</span></p>
<p>LDBSVWS API: <span>{data?.requestCounts?.lsbsvws_api}</span></p> <p>LDBSVWS API: <span>{data?.requestCounts?.lsbsvws_api}</span></p>
<p>Location Reference API: <span>{data?.requestCounts?.corpus_api}</span></p> <p>Location Reference API: <span>{data?.requestCounts?.corpus_api}</span></p>
<p>Timetable: <span>{data?.requestCounts?.timetable_db}</span></p> <p>Timetable: <span>{data?.requestCounts?.timetable_db}</span></p>
<p>PIS: <span>{data?.requestCounts?.pis_db}</span></p> <p>PIS: <span>{data?.requestCounts?.pis_db}</span></p>
<p>Location Reference: <span>{data?.requestCounts?.corpus_db}</span></p> <p>Location Reference: <span>{data?.requestCounts?.corpus_db}</span></p>
<p>Stations: <span>{data?.requestCounts?.stations_db}</span></p> <p>Stations: <span>{data?.requestCounts?.stations_db}</span></p>
<h2>Database Lengths</h2> <h2>Database Lengths</h2>
<p>Users: <span>{data?.dbLengths?.users}</span></p> <p>Users: <span>{data?.dbLengths?.users}</span></p>
<p>Pending Registrations: <span>{data?.dbLengths?.registrations}</span></p> <p>Pending Registrations: <span>{data?.dbLengths?.registrations}</span></p>
<p>CORPUS: <span>{data?.dbLengths?.corpus}</span></p> <p>CORPUS: <span>{data?.dbLengths?.corpus}</span></p>
<p>Stations: <span>{data?.dbLengths?.stations}</span></p> <p>Stations: <span>{data?.dbLengths?.stations}</span></p>
<p>PIS: <span>{data?.dbLengths?.pis}</span></p> <p>PIS: <span>{data?.dbLengths?.pis}</span></p>
<p>Timetable: <span>{data?.dbLengths?.timetable}</span></p> <p>Timetable: <span>{data?.dbLengths?.timetable}</span></p>
<p>Reason Codes: <span>{data?.dbLengths?.reasonCodes}</span></p> <p>Reason Codes: <span>{data?.dbLengths?.reasonCodes}</span></p>
{:catch} {:catch}
<Island> <Island>
<p style="font-weight:600">Unable to connect to server</p> <p style="font-weight:600">Unable to connect to server</p>
</Island> </Island>
{/await} {/await}
<Nav /> <Nav />
<style> <style>
span { span {
color: white; color: white;
} }
p { p {
margin: 0; margin: 0;
color: lightgray; color: lightgray;
} }
h2 { h2 {
font-family: urwgothic, sans-serif; font-family: urwgothic, sans-serif;
margin-bottom: 2px; margin-bottom: 2px;
margin-top: 8px; margin-top: 8px;
} }
</style> </style>

128
src/routes/more/versions/+page.svelte
View File

@ -1,20 +1,20 @@
<script> <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";
import { getApiUrl } from '$lib/scripts/upstream'; import { getApiUrl } from "$lib/scripts/upstream";
import { IconBrandGolang, IconBrandJavascript, IconBrandNodejs, IconBrandPython, IconBrandSvelte, IconBrandTypescript, IconFileTypeSql } from '@tabler/icons-svelte'; import { IconBrandGolang, IconBrandJavascript, IconBrandNodejs, IconBrandPython, IconBrandSvelte, IconBrandTypescript, IconFileTypeSql } from "@tabler/icons-svelte";
import Tooltip from '$lib/Tooltip.svelte'; import Tooltip from "$lib/Tooltip.svelte";
const title = 'Versions'; const title = "Versions";
async function getData() { async function getData() {
const url = `${getApiUrl()}/misc/server/versions`; const url = `${getApiUrl()}/misc/server/versions`;
const res = await fetch(url); const res = await fetch(url);
return await res.json(); return await res.json();
} }
</script> </script>
<Header {title} /> <Header {title} />
@ -22,58 +22,60 @@
<LargeLogo /> <LargeLogo />
{#await getData()} {#await getData()}
<Loading /> <Loading />
{:then data} {:then data}
<Island> <Island>
<p> <p>
<Tooltip text="Svelte"><IconBrandSvelte /></Tooltip> <Tooltip text="Svelte"><IconBrandSvelte /></Tooltip>
<Tooltip text="Javascript"><IconBrandJavascript /></Tooltip> <Tooltip text="Javascript"><IconBrandJavascript /></Tooltip>
<Tooltip text="Typescript"><IconBrandTypescript /></Tooltip> <Tooltip text="Typescript"><IconBrandTypescript /></Tooltip>
<br /> <br />
<a class="data" href="https://git.fjla.uk/owlboard/owlboard-svelte" target="_blank" <a class="data" href="https://git.fjla.uk/owlboard/owlboard-svelte" target="_blank"
>Web-app version<br /><span class="data" >Web-app version<br /><span class="data"
>{version}{#if versionTag}-{versionTag}{/if}</span >{version}{#if versionTag}-{versionTag}{/if}</span
></a ></a
> >
</p> </p>
<p> <p>
<Tooltip text="NodeJS"><IconBrandNodejs /></Tooltip> <Tooltip text="NodeJS"><IconBrandNodejs /></Tooltip>
<Tooltip text="Javascript"><IconBrandJavascript /></Tooltip> <Tooltip text="Javascript"><IconBrandJavascript /></Tooltip>
<Tooltip text="Typescript"><IconBrandTypescript /></Tooltip> <Tooltip text="Typescript"><IconBrandTypescript /></Tooltip>
<br /> <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> <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>
<p> <p>
<Tooltip text="Python"><IconBrandPython /></Tooltip> <Tooltip text="Python"><IconBrandPython /></Tooltip>
<br /> <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> <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>
<p> <p>
<Tooltip text="Go"><IconBrandGolang /></Tooltip> <Tooltip text="Go"><IconBrandGolang /></Tooltip>
<br /> <br />
<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> <a class="data" href="https://git.fjla.uk/owlboard/mq-client" target="_blank"
</p> >MQ Client version<br /><span class="data">{data?.["mq-client"] || "Not installed"}</span></a
</Island> >
</p>
</Island>
{:catch} {:catch}
<Island> <Island>
<p> <p>
<IconBrandSvelte /><IconBrandJavascript /><IconBrandTypescript /><br /> <IconBrandSvelte /><IconBrandJavascript /><IconBrandTypescript /><br />
Web-app Version<br /><span class="data" Web-app Version<br /><span class="data"
>{version}{#if versionTag}-{versionTag}{/if}</span >{version}{#if versionTag}-{versionTag}{/if}</span
> >
</p> </p>
<p>Unable to fetch server application versions</p> <p>Unable to fetch server application versions</p>
</Island> </Island>
{/await} {/await}
<Nav /> <Nav />
<style> <style>
p { p {
text-decoration: none; text-decoration: none;
padding: 15px; padding: 15px;
} }
.data { .data {
color: white; color: white;
text-decoration: none; text-decoration: none;
} }
</style> </style>

312
src/routes/pis/+page.svelte
View File

@ -1,109 +1,109 @@
<script> <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 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 { 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'; import { getApiUrl } from "$lib/scripts/upstream";
const title = 'PIS Finder'; const title = "PIS Finder";
const variables = { title: 'Results' }; const variables = { title: "Results" };
let entryPIS = ''; let entryPIS = "";
let entryStartCRS = ''; let entryStartCRS = "";
let entryEndCRS = ''; let entryEndCRS = "";
let data = []; let data = [];
let error = false; let error = false;
let errMsg = 'Unknown Error'; let errMsg = "Unknown Error";
let isLoading = false; let isLoading = false;
async function findByStartEnd() { async function findByStartEnd() {
isLoading = true; isLoading = true;
const url = `${getApiUrl()}/api/v2/pis/byStartEnd/${entryStartCRS}/${entryEndCRS}`; const url = `${getApiUrl()}/api/v2/pis/byStartEnd/${entryStartCRS}/${entryEndCRS}`;
await fetchData(url); await fetchData(url);
isLoading = false; isLoading = false;
}
async function findByPis() {
isLoading = true;
const url = `${getApiUrl()}/api/v2/pis/byCode/${entryPIS}`;
await fetchData(url);
isLoading = false;
}
async function fetchData(url) {
const options = {
method: 'GET',
headers: {
uuid: $uuid
}
};
const res = await fetch(url, options); // Enable Auth
if (res.status == 401) {
errMsg = 'You must be logged in to the staff version';
error = true;
return false;
} else if (res.status == 500) {
errMsg = 'Server Error, try again later';
error = true;
return false;
} }
const jsonData = await res.json();
if (jsonData.ERROR == 'offline') {
errMsg = 'Connection error, check your internet connection and try again';
error = true;
return false;
}
data = jsonData;
}
async function reset() { async function findByPis() {
data = []; isLoading = true;
error = false; const url = `${getApiUrl()}/api/v2/pis/byCode/${entryPIS}`;
entryPIS = ''; await fetchData(url);
entryStartCRS = ''; isLoading = false;
entryEndCRS = ''; }
}
async function fetchData(url) {
const options = {
method: "GET",
headers: {
uuid: $uuid
}
};
const res = await fetch(url, options); // Enable Auth
if (res.status == 401) {
errMsg = "You must be logged in to the staff version";
error = true;
return false;
} else if (res.status == 500) {
errMsg = "Server Error, try again later";
error = true;
return false;
}
const jsonData = await res.json();
if (jsonData.ERROR == "offline") {
errMsg = "Connection error, check your internet connection and try again";
error = true;
return false;
}
data = jsonData;
}
async function reset() {
data = [];
error = false;
entryPIS = "";
entryStartCRS = "";
entryEndCRS = "";
}
</script> </script>
<Header {title} /> <Header {title} />
{#if isLoading} {#if isLoading}
<Loading /> <Loading />
{/if} {/if}
{#if error} {#if error}
<Island {variables}> <Island {variables}>
<p class="error">{errMsg}</p> <p class="error">{errMsg}</p>
</Island> </Island>
{:else if data.length} {:else if data.length}
<Island {variables}> <Island {variables}>
<table> <table>
<tr> <tr>
<th class="toc">TOC</th> <th class="toc">TOC</th>
<th class="code">Code</th> <th class="code">Code</th>
<th class="stops">Stops</th> <th class="stops">Stops</th>
</tr> </tr>
{#each data as item} {#each data as item}
<tr> <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="code">{item.code}</td>
<td class="stops stops-data">{item.stops.join(' ')}</td> <td class="stops stops-data">{item.stops.join(" ")}</td>
</tr> </tr>
{/each} {/each}
</table> </table>
</Island> </Island>
{:else} {:else}
<p>To search by headcode use the Train Finder on the homepage</p> <p>To search by headcode use the Train Finder on the homepage</p>
<p>This feature now supports all GWR Services</p> <p>This feature now supports all GWR Services</p>
<p class="label">Find By Start/End CRS:</p> <p class="label">Find By Start/End CRS:</p>
<form on:submit={findByStartEnd}> <form on:submit={findByStartEnd}>
<input type="text" maxlength="3" autocomplete="off" placeholder="Start" bind:value={entryStartCRS} /> <input type="text" maxlength="3" autocomplete="off" placeholder="Start" bind:value={entryStartCRS} />
<input type="text" maxlength="3" autocomplete="off" placeholder="End" bind:value={entryEndCRS} /> <input type="text" maxlength="3" autocomplete="off" placeholder="End" bind:value={entryEndCRS} />
<br /> <br />
<button type="submit">Search</button> <button type="submit">Search</button>
</form> </form>
<!-- FIND BY PIS CODE NOT WORKING AT PRESENT <!-- FIND BY PIS CODE NOT WORKING AT PRESENT
<p class="label">Find By PIS Code:</p> <p class="label">Find By PIS Code:</p>
<form on:submit={findByPis}> <form on:submit={findByPis}>
<input type="number" max="9999" autocomplete="off" placeholder="PIS" bind:value={entryPIS} /> <input type="number" max="9999" autocomplete="off" placeholder="PIS" bind:value={entryPIS} />
@ -116,69 +116,69 @@
<Nav /> <Nav />
<style> <style>
p { p {
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }
.label { .label {
font-weight: 600; font-weight: 600;
color: var(--main-text-color); color: var(--main-text-color);
} }
input { input {
border: none; border: none;
border-radius: 50px; border-radius: 50px;
font-family: urwgothic, sans-serif; font-family: urwgothic, sans-serif;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
width: 30%; width: 30%;
max-width: 250px; max-width: 250px;
height: 30px; height: 30px;
font-size: 16px; font-size: 16px;
margin-bottom: 15px; margin-bottom: 15px;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
button { button {
border: none; border: none;
border-radius: 50px; border-radius: 50px;
font-family: urwgothic, sans-serif; font-family: urwgothic, sans-serif;
width: 25%; width: 25%;
max-width: 175px; max-width: 175px;
margin: 0px; margin: 0px;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
height: 30px; height: 30px;
background-color: var(--island-bg-color); background-color: var(--island-bg-color);
color: white; color: white;
font-size: 16px; font-size: 16px;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
} }
table { table {
width: 100%; width: 100%;
margin: auto; margin: auto;
color: white; color: white;
} }
td { td {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
} }
.toc { .toc {
width: 15%; width: 15%;
} }
.code { .code {
width: 20%; width: 20%;
} }
.toc-data { .toc-data {
text-transform: uppercase; text-transform: uppercase;
} }
.stops-data { .stops-data {
text-align: left; text-align: left;
font-family: firamono, monospace; font-family: firamono, monospace;
text-transform: uppercase; text-transform: uppercase;
} }
.error { .error {
color: white; color: white;
} }
#reset { #reset {
margin: 25px; margin: 25px;
} }
</style> </style>

158
src/routes/train/+page.svelte
View File

@ -1,106 +1,106 @@
<script lang="ts"> <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 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 { getApiUrl } from "$lib/scripts/upstream";
let title = 'Timetable Results'; let title = "Timetable Results";
let id = ''; let id = "";
let data = []; let data = [];
let isLoading = true; let isLoading = true;
let error = false; let error = false;
let errMsg = ''; let errMsg = "";
$: { $: {
if (id) { if (id) {
title = id.toUpperCase(); title = id.toUpperCase();
} else { } else {
title = 'Querying Timetable'; title = "Querying Timetable";
}
} }
}
async function getHeadcode() { async function getHeadcode() {
return new URLSearchParams(window.location.search).get('headcode'); return new URLSearchParams(window.location.search).get("headcode");
}
onMount(async () => {
isLoading = true;
id = (await getHeadcode()) || '';
const res = await fetchData(id);
if (res) {
data = res;
if (!data.length) {
error = true;
errMsg = 'No services found';
}
} }
isLoading = false;
});
async function fetchData(id = '') { onMount(async () => {
const date = 'now'; isLoading = true;
const searchType = 'headcode'; id = (await getHeadcode()) || "";
const options = { const res = await fetchData(id);
method: 'GET', if (res) {
headers: { data = res;
uuid: $uuid if (!data.length) {
} error = true;
}; errMsg = "No services found";
const url = `${getApiUrl()}/api/v2/timetable/train/${date}/${searchType}/${id}`; }
try { }
const res = await fetch(url, options); isLoading = false;
if (res.status == 200) { });
return await res.json();
} else if (res.status === 401) { async function fetchData(id = "") {
error = true; const date = "now";
errMsg = 'You must be logged into the staff version for this feature'; const searchType = "headcode";
return false; const options = {
} else { method: "GET",
error = true; headers: {
errMsg = 'Unable to connect, check your connection and try again'; uuid: $uuid
return false; }
} };
} catch (err) { const url = `${getApiUrl()}/api/v2/timetable/train/${date}/${searchType}/${id}`;
error = true; try {
errMsg = 'Connection error, try again later'; const res = await fetch(url, options);
if (res.status == 200) {
return await res.json();
} else if (res.status === 401) {
error = true;
errMsg = "You must be logged into the staff version for this feature";
return false;
} else {
error = true;
errMsg = "Unable to connect, check your connection and try again";
return false;
}
} catch (err) {
error = true;
errMsg = "Connection error, try again later";
}
isLoading = false;
} }
isLoading = false;
}
</script> </script>
<Header {title} /> <Header {title} />
<div id="whitespace" /> <div id="whitespace" />
{#if error} {#if error}
<Island> <Island>
<p style="font-weight:600">{errMsg}</p> <p style="font-weight:600">{errMsg}</p>
</Island> </Island>
{/if} {/if}
{#if isLoading} {#if isLoading}
<Loading /> <Loading />
{/if} {/if}
{#each data as service} {#each data as service}
{#if service} {#if service}
<TrainDetail {service} /> <TrainDetail {service} />
{/if} {/if}
{/each} {/each}
<Nav /> <Nav />
<style> <style>
#whitespace { #whitespace {
height: 15px; height: 15px;
} }
p { p {
color: white; color: white;
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
} }
</style> </style>

78
src/service-worker.js
View File

@ -1,50 +1,50 @@
/// <reference types="@sveltejs/kit" /> /// <reference types="@sveltejs/kit" />
import { build, files, version } from '$service-worker'; import { build, files, version } from "$service-worker";
const cacheName = `ob-${version}`; const cacheName = `ob-${version}`;
const pointlessConstant = true; const pointlessConstant = true;
console.log(`pointlessContant is ${pointlessConstant}`); console.log(`pointlessContant is ${pointlessConstant}`);
const assets = [...build, ...files, '/service-worker.js']; const assets = [...build, ...files, "/service-worker.js"];
self.addEventListener('install', (event) => { self.addEventListener("install", (event) => {
async function addToCache() { async function addToCache() {
const cache = await caches.open(cacheName); const cache = await caches.open(cacheName);
await cache.addAll(assets); await cache.addAll(assets);
}
event.waitUntil(addToCache());
});
self.addEventListener('activate', (event) => {
async function deleteOldCache() {
for (const key of await caches.keys()) {
if (key !== cacheName) {
await caches.delete(key);
}
}
}
event.waitUntil(deleteOldCache());
});
self.addEventListener('fetch', (event) => {
if (event.request.method !== 'GET') {
return;
}
async function respond() {
const cacheRes = await caches.match(event.request, { ignoreSearch: true });
if (cacheRes) {
return cacheRes;
} }
try { event.waitUntil(addToCache());
return await fetch(event.request); });
} catch (err) {
return { error: 'OFFLINE', errorMsg: 'You are offline' }; self.addEventListener("activate", (event) => {
} async function deleteOldCache() {
} for (const key of await caches.keys()) {
if (key !== cacheName) {
event.respondWith(respond()); await caches.delete(key);
}
}
}
event.waitUntil(deleteOldCache());
});
self.addEventListener("fetch", (event) => {
if (event.request.method !== "GET") {
return;
}
async function respond() {
const cacheRes = await caches.match(event.request, { ignoreSearch: true });
if (cacheRes) {
return cacheRes;
}
try {
return await fetch(event.request);
} catch (err) {
return { error: "OFFLINE", errorMsg: "You are offline" };
}
}
event.respondWith(respond());
}); });

198
static/manifest.json
View File

@ -1,104 +1,104 @@
{ {
"name": "OwlBoard", "name": "OwlBoard",
"short_name": "OwlBoard", "short_name": "OwlBoard",
"start_url": "/", "start_url": "/",
"scope": "/", "scope": "/",
"display": "standalone", "display": "standalone",
"background_color": "#404c55", "background_color": "#404c55",
"description": "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.", "description": "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.",
"categories": "travel,utilities", "categories": "travel,utilities",
"lang": "en", "lang": "en",
"orientation": "portrait", "orientation": "portrait",
"theme_color": "#00b7b7", "theme_color": "#00b7b7",
"icons": [ "icons": [
{
"src": "/images/app-icons/maskable/mask-icon.svg",
"sizes": "any",
"type": "image/svg+xml",
"purpose": "maskable"
},
{
"src": "/images/app-icons/any/plain-logo.svg",
"sizes": "any",
"type": "image/svg+xml",
"purpose": "any"
},
{
"src": "/images/app-icons/any/plain-logo-512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "any"
}
],
"screenshots": [
{
"src": "/images/screenshots/narrow-home.png",
"type": "image/png",
"sizes": "720x1480",
"form_factor": "narrow",
"label": "Homescreen of OwlBoard"
},
{
"src": "/images/screenshots/narrow-ldbs.png",
"type": "image/png",
"sizes": "720x1480",
"form_factor": "narrow",
"label": "Live rail departure boards"
},
{
"src": "/images/screenshots/narrow-timetable.png",
"type": "image/png",
"sizes": "720x1480",
"form_factor": "narrow",
"label": "Train details and PIS Codes"
},
{
"src": "/images/screenshots/wide-home.png",
"type": "image/png",
"sizes": "2560x1600",
"form_factor": "wide",
"label": "Homescreen of OwlBoard"
},
{
"src": "/images/screenshots/wide-ldbs.png",
"type": "image/png",
"sizes": "2560x1600",
"form_factor": "wide",
"label": "Live rail departure boards"
},
{
"src": "/images/screenshots/wide-timetable.png",
"type": "image/png",
"sizes": "2560x1600",
"form_factor": "wide",
"label": "Train details and PIS Codes"
}
],
"shortcuts": [
{
"name": "Location Reference",
"short_name": "Loc Reference",
"description": "Lookup location reference data about the UK Rail network",
"url": "/more/corpus",
"icons": [
{ {
"src": "/images/shortcuts/location_ref.png", "src": "/images/app-icons/maskable/mask-icon.svg",
"sizes": "96x96", "sizes": "any",
"type": "image/png" "type": "image/svg+xml",
} "purpose": "maskable"
] },
},
{
"name": "Settings",
"description": "Your OwlBoard settings",
"url": "/more/settings",
"icons": [
{ {
"src": "/images/shortcuts/cog.png", "src": "/images/app-icons/any/plain-logo.svg",
"sizes": "96x96", "sizes": "any",
"type": "image/png" "type": "image/svg+xml",
"purpose": "any"
},
{
"src": "/images/app-icons/any/plain-logo-512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "any"
} }
] ],
} "screenshots": [
] {
"src": "/images/screenshots/narrow-home.png",
"type": "image/png",
"sizes": "720x1480",
"form_factor": "narrow",
"label": "Homescreen of OwlBoard"
},
{
"src": "/images/screenshots/narrow-ldbs.png",
"type": "image/png",
"sizes": "720x1480",
"form_factor": "narrow",
"label": "Live rail departure boards"
},
{
"src": "/images/screenshots/narrow-timetable.png",
"type": "image/png",
"sizes": "720x1480",
"form_factor": "narrow",
"label": "Train details and PIS Codes"
},
{
"src": "/images/screenshots/wide-home.png",
"type": "image/png",
"sizes": "2560x1600",
"form_factor": "wide",
"label": "Homescreen of OwlBoard"
},
{
"src": "/images/screenshots/wide-ldbs.png",
"type": "image/png",
"sizes": "2560x1600",
"form_factor": "wide",
"label": "Live rail departure boards"
},
{
"src": "/images/screenshots/wide-timetable.png",
"type": "image/png",
"sizes": "2560x1600",
"form_factor": "wide",
"label": "Train details and PIS Codes"
}
],
"shortcuts": [
{
"name": "Location Reference",
"short_name": "Loc Reference",
"description": "Lookup location reference data about the UK Rail network",
"url": "/more/corpus",
"icons": [
{
"src": "/images/shortcuts/location_ref.png",
"sizes": "96x96",
"type": "image/png"
}
]
},
{
"name": "Settings",
"description": "Your OwlBoard settings",
"url": "/more/settings",
"icons": [
{
"src": "/images/shortcuts/cog.png",
"sizes": "96x96",
"type": "image/png"
}
]
}
]
} }

26
static/sw.js
View File

@ -1,17 +1,17 @@
// Remove the service worker /sw.js from legacy installations // Remove the service worker /sw.js from legacy installations
// This should then enable the new /service-worker.js to be installed // This should then enable the new /service-worker.js to be installed
self.addEventListener('activate', function (e) { self.addEventListener("activate", function (e) {
console.log(`Unregistering service worker`); console.log(`Unregistering service worker`);
self.registration self.registration
.unregister() .unregister()
.then(function () { .then(function () {
return self.clients.matchAll(); return self.clients.matchAll();
}) })
.then(function (clients) { .then(function (clients) {
clients.forEach((client) => { clients.forEach((client) => {
console.log(`Navigating ${client.url}`); console.log(`Navigating ${client.url}`);
client.navigate(client.url); client.navigate(client.url);
}); });
}); });
}); });

22
svelte.config.js
View File

@ -1,16 +1,16 @@
import adapter from '@sveltejs/adapter-static'; import adapter from "@sveltejs/adapter-static";
import { vitePreprocess } from '@sveltejs/kit/vite'; import { vitePreprocess } from "@sveltejs/kit/vite";
const config = { const config = {
preprocess: vitePreprocess(), preprocess: vitePreprocess(),
kit: { kit: {
adapter: adapter({ adapter: adapter({
pages: 'build', pages: "build",
assets: 'build', assets: "build",
precompress: true, precompress: true,
strict: true strict: true
}) })
} }
}; };
export default config; export default config;

32
tsconfig.json
View File

@ -1,18 +1,18 @@
{ {
"extends": "./.svelte-kit/tsconfig.json", "extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": { "compilerOptions": {
"allowJs": true, "allowJs": true,
"checkJs": true, "checkJs": true,
"esModuleInterop": true, "esModuleInterop": true,
"forceConsistentCasingInFileNames": true, "forceConsistentCasingInFileNames": true,
"resolveJsonModule": true, "resolveJsonModule": true,
"skipLibCheck": true, "skipLibCheck": true,
"sourceMap": true, "sourceMap": true,
"strict": true, "strict": true,
"outDir": "./dist" "outDir": "./dist"
} }
// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
// //
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
// from the referenced tsconfig.json - TypeScript does not merge them in // from the referenced tsconfig.json - TypeScript does not merge them in
} }

6
vite.config.ts
View File

@ -1,6 +1,6 @@
import { sveltekit } from '@sveltejs/kit/vite'; import { sveltekit } from "@sveltejs/kit/vite";
import { defineConfig } from 'vite'; import { defineConfig } from "vite";
export default defineConfig({ export default defineConfig({
plugins: [sveltekit()] plugins: [sveltekit()]
}); });