Compare commits
No commits in common. "23d75880b5ef0d8de9ea29756b54ad827e3d1079" and "6505ba7f600d3e11ea6e37db6d3be20f93ad4adf" have entirely different histories.
23d75880b5
...
6505ba7f60
|
@ -8,7 +8,7 @@
|
||||||
"name": "owlboard-svelte",
|
"name": "owlboard-svelte",
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@owlboard/ts-types": "^0.1.3",
|
"@owlboard/ts-types": "^0.0.8",
|
||||||
"@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",
|
||||||
|
@ -583,9 +583,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@owlboard/ts-types": {
|
"node_modules/@owlboard/ts-types": {
|
||||||
"version": "0.1.6",
|
"version": "0.0.8",
|
||||||
"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fts-types/-/0.1.6/ts-types-0.1.6.tgz",
|
"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fts-types/-/0.0.8/ts-types-0.0.8.tgz",
|
||||||
"integrity": "sha512-0gB0ov3xJljcVieC2QavZdljpRpvUsdTnft3tcXgzw2nj9Qnv3qxytKW+kXRhLA77+NrFBAWW6/1uCC5XD0EAg==",
|
"integrity": "sha512-MLAlioXFxqlKxHDZ2KdHQLx5/Kiebt5QtU59LFwGhn+gjtLJLfLdZCh7Kw1T3u+WOVN21fsJWdTRPhdvvFwnKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "GPL-3.0-or-later"
|
"license": "GPL-3.0-or-later"
|
||||||
},
|
},
|
||||||
|
|
|
@ -24,6 +24,6 @@
|
||||||
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>
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
let errorDetail = {
|
let errorDetail = {
|
||||||
code: '',
|
code: '',
|
||||||
message: ''
|
message: '',
|
||||||
};
|
};
|
||||||
let nrcc: string[] = [];
|
let nrcc: string[] = [];
|
||||||
|
|
||||||
|
@ -37,8 +37,8 @@
|
||||||
}
|
}
|
||||||
return data.data;
|
return data.data;
|
||||||
}
|
}
|
||||||
errorDetail.code = data.obStatus.toString() || 'UNKNOWN';
|
errorDetail.code = data.obStatus.toString() || "UNKNOWN";
|
||||||
errorDetail.message = data.obMsg || 'An unknown error occoured';
|
errorDetail.message = data.obMsg || "An unknown error occoured";
|
||||||
throw new Error('Unable to Fetch Data');
|
throw new Error('Unable to Fetch Data');
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -75,7 +75,7 @@
|
||||||
{: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>
|
||||||
|
@ -86,4 +86,4 @@
|
||||||
.table-head-text {
|
.table-head-text {
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
|
@ -38,7 +38,7 @@
|
||||||
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 {
|
||||||
|
|
|
@ -21,9 +21,9 @@
|
||||||
|
|
||||||
const pageText: string[] = [
|
const pageText: string[] = [
|
||||||
'<h3>A small Update</h3>' +
|
'<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>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>You can use it to ask for help and give suggestions</p>' +
|
||||||
'<p>Help links have been updated.</p>'
|
'<p>Help links have been updated.</p>',
|
||||||
];
|
];
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
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;
|
||||||
|
|
|
@ -19,26 +19,27 @@
|
||||||
|
|
||||||
/* 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
|
||||||
:root {
|
:root {
|
||||||
--main-bg-color: #404c55;
|
--main-bg-color: #404c55;
|
||||||
|
@ -56,4 +57,4 @@
|
||||||
--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);
|
||||||
}
|
}
|
||||||
*/
|
*/
|
|
@ -1,15 +0,0 @@
|
||||||
<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,7 +4,6 @@
|
||||||
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';
|
|
||||||
|
|
||||||
export let service = '';
|
export let service = '';
|
||||||
|
|
||||||
|
@ -49,7 +48,7 @@
|
||||||
{:then serviceDetail}
|
{:then serviceDetail}
|
||||||
<div class="detailOperator"><StylesToc toc={service?.operator || ''} full={true} /></div>
|
<div class="detailOperator"><StylesToc toc={service?.operator || ''} full={true} /></div>
|
||||||
{#if serviceDetail.pis}
|
{#if serviceDetail.pis}
|
||||||
<p class="pis">PIS: <PisHandler pisObject={serviceDetail.pis} /></p>
|
<p class="pis">PIS: {serviceDetail.pis}</p>
|
||||||
{/if}
|
{/if}
|
||||||
<p class="svc-detail">
|
<p class="svc-detail">
|
||||||
Planned Type: {parseInt(serviceDetail.planSpeed) || '--'}mph {serviceDetail.powerType || 'Non-Rail vehicle'}
|
Planned Type: {parseInt(serviceDetail.planSpeed) || '--'}mph {serviceDetail.powerType || 'Non-Rail vehicle'}
|
||||||
|
|
|
@ -1,23 +1,23 @@
|
||||||
<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} />
|
||||||
<h1 class="heading">There's no light at the end of this tunnel</h1>
|
<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>The page you were looking for wasn't found</p>
|
||||||
<p>Use the menu bar to try another destination</p>
|
<p>Use the menu bar to try another destination</p>
|
||||||
<br />
|
<br>
|
||||||
<p class="err_code">Status: 404<br />Message: NOT_FOUND</p>
|
<p class="err_code">Status: 404<br>Message: NOT_FOUND</p>
|
||||||
<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>
|
|
@ -1,23 +1,23 @@
|
||||||
<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} />
|
||||||
<h1 class="heading">This page has been delayed by more servers than usual needing repairs at the same time</h1>
|
<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>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>
|
<p>Use the menu bar to try another destination, you can report an issue from the 'Menu'</p>
|
||||||
<br />
|
<br>
|
||||||
<p class="err_code">Status: 50x<br />Message: INTERNAL_SERVER_ERROR</p>
|
<p class="err_code">Status: 50x<br>Message: INTERNAL_SERVER_ERROR</p>
|
||||||
<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>
|
|
@ -1,15 +1,15 @@
|
||||||
<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>
|
|
||||||
|
|
||||||
<Header title={'Help'} />
|
</script>
|
||||||
|
<Header title={"Help"} />
|
||||||
<Nav />
|
<Nav />
|
||||||
<br /><br />
|
<br><br>
|
||||||
<p>
|
<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>
|
</p>
|
||||||
<br /><br />
|
<br><br>
|
||||||
<p>There, you can watch help videos, ask a question or suggest a feature.</p>
|
<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>
|
<p>Alternatively, you can report an issue on the <a href="/more/report">Report an Issue</a> page.</p>
|
|
@ -24,11 +24,7 @@
|
||||||
{:then data}
|
{:then data}
|
||||||
<Island>
|
<Island>
|
||||||
<p>
|
<p>
|
||||||
<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">{version}{#if versionTag}-{versionTag}{/if}</span></a>
|
||||||
>Web-app version<br /><span class="data"
|
|
||||||
>{version}{#if versionTag}-{versionTag}{/if}</span
|
|
||||||
></a
|
|
||||||
>
|
|
||||||
</p>
|
</p>
|
||||||
<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>
|
<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 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'];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue