Compare commits
5 Commits
d107416bb0
...
8c91a50a34
Author | SHA1 | Date |
---|---|---|
Fred Boniface | 8c91a50a34 | |
Fred Boniface | 21eabfc7d7 | |
Fred Boniface | 94434cdcf8 | |
Fred Boniface | b6d3d128bc | |
Fred Boniface | 0f7deee78a |
|
@ -31,7 +31,14 @@ http {
|
|||
proxy_cache_path /var/cache/nginx keys_zone=owl_cache:20m inactive=24h;
|
||||
|
||||
upstream backend {
|
||||
# Within Kubernetes:
|
||||
server owlboard-backend:8460;
|
||||
|
||||
# External to Kubernetes:
|
||||
#server 172.30.129.19:8460;
|
||||
|
||||
# Within Docker:
|
||||
#server owlboard-backend:8460
|
||||
}
|
||||
|
||||
server {
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
export const version: string = '2024.03.2';
|
||||
export const versionTag: string = '';
|
||||
export const version: string = '2024.04.2';
|
||||
export const versionTag: string = 'swarm';
|
||||
export const showWelcome: boolean = true;
|
||||
|
|
|
@ -80,30 +80,29 @@
|
|||
})}
|
||||
</p>
|
||||
<table>
|
||||
<caption>Grey times are non-passenger stops, italics are 'pass' times</caption>
|
||||
<tr>
|
||||
<th>Location</th>
|
||||
<th>Sch Arr.</th>
|
||||
<th>Sch Dep.</th>
|
||||
</tr>
|
||||
{#if serviceDetail.stops[0]['publicDeparture']}
|
||||
{#each serviceDetail.stops as stop}
|
||||
{#if stop.publicArrival || stop.publicDeparture}
|
||||
<tr>
|
||||
<td>{stop.tiploc}</td>
|
||||
<td>{stop.publicArrival || '-'}</td>
|
||||
<td>{stop.publicDeparture || '-'}</td>
|
||||
</tr>
|
||||
{/if}
|
||||
{/each}
|
||||
{:else}
|
||||
{#each serviceDetail.stops as stop}
|
||||
<tr>
|
||||
{#if stop.publicArrival || stop.publicDeparture}
|
||||
<td>{stop.tiploc}</td>
|
||||
<td>{stop.wttArrival || '-'}</td>
|
||||
<td>{stop.wttDeparture || '-'}</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.wttArrival || '-'}</td>
|
||||
<td class="wtt">{stop.wttDeparture || '-'}</td>
|
||||
{:else}
|
||||
<td class="pass">{stop.tiploc}</td>
|
||||
<td class="pass">-</td>
|
||||
<td class="pass">-</td>
|
||||
{/if}
|
||||
</tr>
|
||||
{/each}
|
||||
{/if}
|
||||
</table>
|
||||
{/if}
|
||||
{:catch}
|
||||
|
@ -167,10 +166,21 @@
|
|||
}
|
||||
table {
|
||||
margin: auto;
|
||||
padding-top: 10px;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 10px;
|
||||
color: var(--island-text-color);
|
||||
}
|
||||
caption {
|
||||
padding-top: 15px;
|
||||
font-size: small;
|
||||
}
|
||||
.wtt {
|
||||
opacity: 0.5;
|
||||
}
|
||||
.pass {
|
||||
font-style: italic;
|
||||
opacity: 0.5;
|
||||
}
|
||||
.text-message {
|
||||
margin: 5px;
|
||||
margin-left: 20px;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
import LargeLogo from '$lib/images/large-logo.svelte';
|
||||
import { version, versionTag } from '$lib/stores/version';
|
||||
import { getApiUrl } from '$lib/scripts/upstream';
|
||||
import { IconBrandGolang, IconBrandJavascript, IconBrandPython, IconBrandSvelte, IconBrandTypescript, IconFileTypeSql } from '@tabler/icons-svelte';
|
||||
import { IconBrandGolang, IconBrandJavascript, IconBrandNodejs, IconBrandPython, IconBrandSvelte, IconBrandTypescript, IconFileTypeSql } from '@tabler/icons-svelte';
|
||||
const title = 'Versions';
|
||||
|
||||
async function getData() {
|
||||
|
@ -25,7 +25,7 @@
|
|||
{:then data}
|
||||
<Island>
|
||||
<p>
|
||||
<IconBrandSvelte />
|
||||
<IconBrandSvelte /><IconBrandJavascript /><IconBrandTypescript /><br>
|
||||
<a class="data" href="https://git.fjla.uk/owlboard/owlboard-svelte" target="_blank"
|
||||
>Web-app version<br /><span class="data"
|
||||
>{version}{#if versionTag}-{versionTag}{/if}</span
|
||||
|
@ -33,7 +33,7 @@
|
|||
>
|
||||
</p>
|
||||
<p>
|
||||
<IconBrandTypescript /><br>
|
||||
<IconBrandNodejs /><IconBrandJavascript /><IconBrandTypescript /><br>
|
||||
<a class="data" href="https://git.fjla.uk/owlboard/backend" target="_blank">API Server version<br /><span class="data">{data?.backend || 'Unknown'}</span></a>
|
||||
</p>
|
||||
<p>
|
||||
|
@ -51,7 +51,7 @@
|
|||
<IconBrandSvelte /><IconBrandJavascript /><IconBrandTypescript /><br>
|
||||
Web-app Version<br /><span class="data">{version}{#if versionTag}-{versionTag}{/if}</span>
|
||||
</p>
|
||||
<p>Unable to fetch server versions</p>
|
||||
<p>Unable to fetch server application versions</p>
|
||||
</Island>
|
||||
{/await}
|
||||
<Nav />
|
||||
|
@ -59,6 +59,7 @@
|
|||
<style>
|
||||
p {
|
||||
text-decoration: none;
|
||||
padding: 15px;
|
||||
}
|
||||
.data {
|
||||
color: white;
|
||||
|
|
|
@ -103,13 +103,14 @@
|
|||
<br />
|
||||
<button type="submit">Search</button>
|
||||
</form>
|
||||
|
||||
<!-- FIND BY PIS CODE NOT WORKING AT PRESENT
|
||||
<p class="label">Find By PIS Code:</p>
|
||||
<form on:submit={findByPis}>
|
||||
<input type="number" max="9999" autocomplete="off" placeholder="PIS" bind:value={entryPIS} />
|
||||
<br />
|
||||
<button type="submit">Search</button>
|
||||
</form>
|
||||
-->
|
||||
{/if}
|
||||
<button id="reset" type="reset" on:click={reset}>Reset</button>
|
||||
<Nav />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<script>
|
||||
<script lang="ts">
|
||||
import Header from '$lib/navigation/header.svelte';
|
||||
import Loading from '$lib/navigation/loading.svelte';
|
||||
import Island from '$lib/islands/island.svelte';
|
||||
|
|
Loading…
Reference in New Issue