Compare commits
2 Commits
6505ba7f60
...
23d75880b5
Author | SHA1 | Date |
---|---|---|
Fred Boniface | 23d75880b5 | |
Fred Boniface | e6ee0dc321 |
|
@ -8,7 +8,7 @@
|
|||
"name": "owlboard-svelte",
|
||||
"version": "0.0.1",
|
||||
"devDependencies": {
|
||||
"@owlboard/ts-types": "^0.0.8",
|
||||
"@owlboard/ts-types": "^0.1.3",
|
||||
"@sveltejs/adapter-auto": "^2.0.0",
|
||||
"@sveltejs/adapter-static": "^2.0.2",
|
||||
"@sveltejs/kit": "^1.5.0",
|
||||
|
@ -583,9 +583,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@owlboard/ts-types": {
|
||||
"version": "0.0.8",
|
||||
"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fts-types/-/0.0.8/ts-types-0.0.8.tgz",
|
||||
"integrity": "sha512-MLAlioXFxqlKxHDZ2KdHQLx5/Kiebt5QtU59LFwGhn+gjtLJLfLdZCh7Kw1T3u+WOVN21fsJWdTRPhdvvFwnKw==",
|
||||
"version": "0.1.6",
|
||||
"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fts-types/-/0.1.6/ts-types-0.1.6.tgz",
|
||||
"integrity": "sha512-0gB0ov3xJljcVieC2QavZdljpRpvUsdTnft3tcXgzw2nj9Qnv3qxytKW+kXRhLA77+NrFBAWW6/1uCC5XD0EAg==",
|
||||
"dev": true,
|
||||
"license": "GPL-3.0-or-later"
|
||||
},
|
||||
|
|
|
@ -24,6 +24,6 @@
|
|||
padding: 10px;
|
||||
background-color: var(--island-bg-color);
|
||||
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>
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
let errorDetail = {
|
||||
code: '',
|
||||
message: '',
|
||||
message: ''
|
||||
};
|
||||
let nrcc: string[] = [];
|
||||
|
||||
|
@ -37,8 +37,8 @@
|
|||
}
|
||||
return data.data;
|
||||
}
|
||||
errorDetail.code = data.obStatus.toString() || "UNKNOWN";
|
||||
errorDetail.message = data.obMsg || "An unknown error occoured";
|
||||
errorDetail.code = data.obStatus.toString() || 'UNKNOWN';
|
||||
errorDetail.message = data.obMsg || 'An unknown error occoured';
|
||||
throw new Error('Unable to Fetch Data');
|
||||
}
|
||||
</script>
|
||||
|
@ -75,7 +75,7 @@
|
|||
{:catch}
|
||||
<h2>Error</h2>
|
||||
<p>ERR-CODE: {errorDetail.code}</p>
|
||||
<p>Message:<br>{errorDetail.message}</p>
|
||||
<p>Message:<br />{errorDetail.message}</p>
|
||||
{/await}
|
||||
|
||||
<style>
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
width: 100%;
|
||||
height: 50px;
|
||||
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 {
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
const pageText: string[] = [
|
||||
'<h3>A small Update</h3>' +
|
||||
"<p>There is a new Facebook Support page <a href='https://www.facebook.com/owlboard.support'>'OwlBoard Support'</a></p>" +
|
||||
'<p>You can use it to ask for help and give suggestions</p>' +
|
||||
'<p>Help links have been updated.</p>',
|
||||
"<p>There is a new Facebook Support page <a href='https://www.facebook.com/owlboard.support'>'OwlBoard Support'</a></p>" +
|
||||
'<p>You can use it to ask for help and give suggestions</p>' +
|
||||
'<p>Help links have been updated.</p>'
|
||||
];
|
||||
</script>
|
||||
|
||||
|
|
|
@ -19,27 +19,26 @@
|
|||
|
||||
/* Main Theme */
|
||||
:root {
|
||||
--main-bg-color: #404c55;
|
||||
--second-bg-color: #2b343c;
|
||||
--main-header-color: #dff3f3;
|
||||
--main-text-color: #cce9e9;
|
||||
--secondary-text-color: #02fcfc;
|
||||
--main-link-color: #00b7b7;
|
||||
--island-bg-color: #3c6f79de;
|
||||
--island-bg-solid: #3c6f79;
|
||||
--island-button-color: #404c55;
|
||||
--island-link-color: #e1ebeb;
|
||||
--island-header-color: #4fd1d1;
|
||||
--island-text-color: #e1ebeb;
|
||||
--overlay-island-bg-color: #3c6f79;
|
||||
--box-shadow-color: rgba(0,0,0,0.19);
|
||||
--box-shadow: 2px 2px 4px rgba(0,0,0,0.19);
|
||||
--main-alert-color: #ed6d00;
|
||||
--second-alert-color: #e77f00;
|
||||
--main-warning-color: orange;
|
||||
--main-bg-color: #404c55;
|
||||
--second-bg-color: #2b343c;
|
||||
--main-header-color: #dff3f3;
|
||||
--main-text-color: #cce9e9;
|
||||
--secondary-text-color: #02fcfc;
|
||||
--main-link-color: #00b7b7;
|
||||
--island-bg-color: #3c6f79de;
|
||||
--island-bg-solid: #3c6f79;
|
||||
--island-button-color: #404c55;
|
||||
--island-link-color: #e1ebeb;
|
||||
--island-header-color: #4fd1d1;
|
||||
--island-text-color: #e1ebeb;
|
||||
--overlay-island-bg-color: #3c6f79;
|
||||
--box-shadow-color: rgba(0, 0, 0, 0.19);
|
||||
--box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.19);
|
||||
--main-alert-color: #ed6d00;
|
||||
--second-alert-color: #e77f00;
|
||||
--main-warning-color: orange;
|
||||
}
|
||||
|
||||
|
||||
/* Christmas Theme
|
||||
:root {
|
||||
--main-bg-color: #404c55;
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
<script lang="ts">
|
||||
import type { OB_Pis_SimpleObject } from '@owlboard/ts-types';
|
||||
|
||||
export let pisObject: OB_Pis_SimpleObject;
|
||||
</script>
|
||||
|
||||
{#if pisObject}
|
||||
{#if typeof pisObject === 'string' || typeof pisObject === 'number'}
|
||||
{pisObject}
|
||||
{:else if pisObject['skipCount'] === 0}
|
||||
{pisObject.code}
|
||||
{:else if pisObject['skipCount'] > 0}
|
||||
{pisObject.code} - (Skip {pisObject.skipType}{#if pisObject.skipCount > 1} {pisObject.skipCount} stops{:else} stop{/if})
|
||||
{/if}
|
||||
{/if}
|
|
@ -4,6 +4,7 @@
|
|||
import LoadingText from '$lib/navigation/loading-text.svelte';
|
||||
import StylesToc from './styles-toc.svelte';
|
||||
import { getApiUrl } from '$lib/scripts/upstream';
|
||||
import PisHandler from '$lib/train/pis-handler.svelte';
|
||||
|
||||
export let service = '';
|
||||
|
||||
|
@ -48,7 +49,7 @@
|
|||
{:then serviceDetail}
|
||||
<div class="detailOperator"><StylesToc toc={service?.operator || ''} full={true} /></div>
|
||||
{#if serviceDetail.pis}
|
||||
<p class="pis">PIS: {serviceDetail.pis}</p>
|
||||
<p class="pis">PIS: <PisHandler pisObject={serviceDetail.pis} /></p>
|
||||
{/if}
|
||||
<p class="svc-detail">
|
||||
Planned Type: {parseInt(serviceDetail.planSpeed) || '--'}mph {serviceDetail.powerType || 'Non-Rail vehicle'}
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
<script lang="ts">
|
||||
import Header from "$lib/navigation/header.svelte";
|
||||
import Nav from "$lib/navigation/nav.svelte";
|
||||
import Header from '$lib/navigation/header.svelte';
|
||||
import Nav from '$lib/navigation/nav.svelte';
|
||||
|
||||
const title = "404 - Not Found"
|
||||
const title = '404 - Not Found';
|
||||
</script>
|
||||
|
||||
<Header {title} />
|
||||
<h1 class="heading">There's no light at the end of this tunnel</h1>
|
||||
<p>The page you were looking for wasn't found</p>
|
||||
<p>Use the menu bar to try another destination</p>
|
||||
<br>
|
||||
<p class="err_code">Status: 404<br>Message: NOT_FOUND</p>
|
||||
<br />
|
||||
<p class="err_code">Status: 404<br />Message: NOT_FOUND</p>
|
||||
<Nav />
|
||||
|
||||
<style>
|
||||
.heading {
|
||||
color: var(--second-text-color);
|
||||
}
|
||||
.err_code {
|
||||
color: white;
|
||||
}
|
||||
.heading {
|
||||
color: var(--second-text-color);
|
||||
}
|
||||
.err_code {
|
||||
color: white;
|
||||
}
|
||||
</style>
|
|
@ -1,23 +1,23 @@
|
|||
<script lang="ts">
|
||||
import Header from "$lib/navigation/header.svelte";
|
||||
import Nav from "$lib/navigation/nav.svelte";
|
||||
import Header from '$lib/navigation/header.svelte';
|
||||
import Nav from '$lib/navigation/nav.svelte';
|
||||
|
||||
const title = "50x - Server Error"
|
||||
</script>
|
||||
const title = '50x - Server Error';
|
||||
</script>
|
||||
|
||||
<Header {title} />
|
||||
<h1 class="heading">This page has been delayed by more servers than usual needing repairs at the same time</h1>
|
||||
<p>There was an error with the server, please try again later</p>
|
||||
<p>Use the menu bar to try another destination, you can report an issue from the 'Menu'</p>
|
||||
<br>
|
||||
<p class="err_code">Status: 50x<br>Message: INTERNAL_SERVER_ERROR</p>
|
||||
<Nav />
|
||||
<Header {title} />
|
||||
<h1 class="heading">This page has been delayed by more servers than usual needing repairs at the same time</h1>
|
||||
<p>There was an error with the server, please try again later</p>
|
||||
<p>Use the menu bar to try another destination, you can report an issue from the 'Menu'</p>
|
||||
<br />
|
||||
<p class="err_code">Status: 50x<br />Message: INTERNAL_SERVER_ERROR</p>
|
||||
<Nav />
|
||||
|
||||
<style>
|
||||
.heading {
|
||||
color: var(--second-text-color);
|
||||
}
|
||||
.err_code {
|
||||
color: white;
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
.heading {
|
||||
color: var(--second-text-color);
|
||||
}
|
||||
.err_code {
|
||||
color: white;
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
<script>
|
||||
import Header from "$lib/navigation/header.svelte";
|
||||
import Nav from "$lib/navigation/nav.svelte";
|
||||
|
||||
import Header from '$lib/navigation/header.svelte';
|
||||
import Nav from '$lib/navigation/nav.svelte';
|
||||
</script>
|
||||
<Header title={"Help"} />
|
||||
|
||||
<Header title={'Help'} />
|
||||
<Nav />
|
||||
<br><br>
|
||||
<br /><br />
|
||||
<p>
|
||||
If you need help you can use the <a href="https://www.facebook.com/owlboard.support">OwlBoard Support</a> page on Facebook.
|
||||
If you need help you can use the <a href="https://www.facebook.com/owlboard.support">OwlBoard Support</a> page on Facebook.
|
||||
</p>
|
||||
<br><br>
|
||||
<br /><br />
|
||||
<p>There, you can watch help videos, ask a question or suggest a feature.</p>
|
||||
|
||||
<p>Alternatively, you can report an issue on the <a href="/more/report">Report an Issue</a> page.</p>
|
|
@ -24,7 +24,11 @@
|
|||
{:then data}
|
||||
<Island>
|
||||
<p>
|
||||
<a class="data" href="https://git.fjla.uk/owlboard/owlboard-svelte" target="_blank">Web-app version<br /><span class="data">{version}{#if versionTag}-{versionTag}{/if}</span></a>
|
||||
<a class="data" href="https://git.fjla.uk/owlboard/owlboard-svelte" target="_blank"
|
||||
>Web-app version<br /><span class="data"
|
||||
>{version}{#if versionTag}-{versionTag}{/if}</span
|
||||
></a
|
||||
>
|
||||
</p>
|
||||
<p>
|
||||
<a class="data" href="https://git.fjla.uk/owlboard/backend" target="_blank">API Server version<br /><span class="data">{data?.backend || 'Unknown'}</span></a>
|
||||
|
|
|
@ -4,7 +4,7 @@ import { build, files, version } from '$service-worker';
|
|||
|
||||
const cacheName = `ob-${version}`;
|
||||
const pointlessConstant = true;
|
||||
console.log(`pointlessContant is ${pointlessConstant}`)
|
||||
console.log(`pointlessContant is ${pointlessConstant}`);
|
||||
|
||||
const assets = [...build, ...files, '/service-worker.js'];
|
||||
|
||||
|
|
Loading…
Reference in New Issue