Compare commits
No commits in common. "c8cd0f30d1f305b15cf2dfa4535a3ba6a4383493" and "fddf9cbbafe04b01701e1ab19fd1be06d8691703" have entirely different histories.
c8cd0f30d1
...
fddf9cbbaf
|
@ -64,7 +64,7 @@
|
|||
top: 5px;
|
||||
right: 0;
|
||||
display: flex;
|
||||
gap: 0px;
|
||||
gap: 0px
|
||||
}
|
||||
|
||||
.content {
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
|
||||
<Card config={upstreamConfig}>
|
||||
<form action={config.formAction}>
|
||||
<input type="text" name={config.fieldName} placeholder={config.placeholder} maxlength={config.maxLen} autocomplete="off" />
|
||||
<br />
|
||||
<input type="text" name={config.fieldName} placeholder={config.placeholder} maxlength={config.maxLen} autocomplete="off">
|
||||
<br>
|
||||
<button type="submit">Submit</button>
|
||||
</form>
|
||||
</Card>
|
||||
|
@ -50,10 +50,11 @@
|
|||
|
||||
input:hover {
|
||||
box-shadow: var(--box-shadow-dark);
|
||||
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background-color: rgb(45, 45, 45);
|
||||
box-shadow: var(--box-shadow-dark);
|
||||
}
|
||||
</style>
|
||||
</style>
|
|
@ -6,80 +6,50 @@
|
|||
import type { NearestStationResponse } from "@owlboard/ts-types";
|
||||
import { uuid } from "$lib/stores/uuid";
|
||||
import { location } from "$lib/stores/location";
|
||||
import InLineLoading from "$lib/navigation/InLineLoading.svelte";
|
||||
import { apiGet } from "$lib/scripts/apiFetch";
|
||||
import { onMount } from "svelte";
|
||||
|
||||
let errorMessage: string;
|
||||
let stations: NearestStationResponse[] = [];
|
||||
let stations: NearestStationResponse[];
|
||||
|
||||
let config: CardConfig = {
|
||||
title: "Near to Me",
|
||||
showHelp: true,
|
||||
showRefresh: true,
|
||||
helpText: "Your location may not be accurate on desktop and laptop devices.",
|
||||
onRefresh: refresh,
|
||||
};
|
||||
helpText: "Your location may not be accurate, particularly on desktop and laptop devices.",
|
||||
onRefresh: refresh
|
||||
}
|
||||
|
||||
function turnOnLocation() {
|
||||
location.set(true);
|
||||
location.set(true)
|
||||
getCurrentLocation();
|
||||
toast.success("Done\nTo disable location, go to settings");
|
||||
toast.success("Done\nTo disable location, go to settings")
|
||||
}
|
||||
|
||||
function refresh() {
|
||||
stations = [];
|
||||
getNearestStations();
|
||||
}
|
||||
function refresh() {getNearestStations()}
|
||||
|
||||
async function getNearestStations() {
|
||||
// Get location, then fetch nearest stations and push to `stations` variable
|
||||
const currentLocation = await getCurrentLocation();
|
||||
const apiPath: string = `/api/v2/live/station/nearest/${currentLocation.latitude}/${currentLocation.longitude}`;
|
||||
try {
|
||||
const apiResponse = (await apiGet(apiPath)) as NearestStationResponse[];
|
||||
stations = apiResponse;
|
||||
} catch (err) {
|
||||
errorMessage = err as string;
|
||||
}
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
if ($location) {
|
||||
if ($uuid && $uuid != "null") {
|
||||
getNearestStations();
|
||||
} else {
|
||||
errorMessage = "Register to use this feature";
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<Card {config}>
|
||||
{#if !$uuid || $uuid === "null"}
|
||||
<p><a href="/more/reg">Register to use this feature</a></p>
|
||||
{:else if $location}
|
||||
{#if !stations.length}
|
||||
{#if errorMessage}
|
||||
<p>{errorMessage}</p>
|
||||
{:else}
|
||||
{#if $location}
|
||||
{#if !stations}
|
||||
<p>Fetching locations...</p>
|
||||
{:else}
|
||||
<InLineLoading />
|
||||
{#each stations as station}
|
||||
<a href="/ldb?station={station["3ALPHA"]}">{station.NLCDESC} - {station.miles}mi</a>
|
||||
{/each}
|
||||
{/if}
|
||||
{:else}
|
||||
<div id="buttons">
|
||||
{#each stations as station}
|
||||
<a class="link" href="/ldb?station={station['3ALPHA']}">{station.NLCDESC} - {station.miles}mi</a>
|
||||
{/each}
|
||||
</div>
|
||||
<p><button on:click={turnOnLocation}>Turn on Location</button></p>
|
||||
{/if}
|
||||
{:else}
|
||||
<p><button on:click={turnOnLocation}>Turn on Location</button></p>
|
||||
{/if}
|
||||
</Card>
|
||||
|
||||
<style>
|
||||
a,
|
||||
button {
|
||||
a, button {
|
||||
color: aliceblue;
|
||||
text-decoration: none;
|
||||
margin: auto;
|
||||
|
@ -91,30 +61,8 @@
|
|||
transition: all 0.3s ease;
|
||||
}
|
||||
|
||||
a:hover,
|
||||
button:hover {
|
||||
a:hover, button:hover {
|
||||
background-color: rgb(45, 45, 45);
|
||||
box-shadow: var(--box-shadow-dark);
|
||||
}
|
||||
|
||||
#buttons {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 95%;
|
||||
margin: auto;
|
||||
padding-top: 5px;
|
||||
}
|
||||
.link {
|
||||
display: inline-flex;
|
||||
margin: 5px;
|
||||
border: none;
|
||||
border-radius: 20px;
|
||||
padding: 5px 10px;
|
||||
font-family: urwgothic, "Lucida Sans", "Lucida Sans Regular", "Lucida Grande", "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
|
||||
font-size: 16px;
|
||||
font-weight: 400;
|
||||
white-space: nowrap;
|
||||
}
|
||||
</style>
|
||||
</style>
|
|
@ -1,28 +0,0 @@
|
|||
<script lang="ts">
|
||||
export let size: string = "1em";
|
||||
export let color: string = "aliceblue";
|
||||
</script>
|
||||
|
||||
<div class="spinner" style="--spinner-size: {size}; --spinner-color: {color};" />
|
||||
|
||||
<style>
|
||||
.spinner {
|
||||
display: inline-block;
|
||||
width: var(--spinner-size);
|
||||
height: var(--spinner-size);
|
||||
border: 2px solid transparent;
|
||||
border-top-color: var(--spinner-color);
|
||||
border-radius: 50%;
|
||||
animation: spin 1s linear infinite;
|
||||
margin: 10px;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
</style>
|
|
@ -1,32 +1,32 @@
|
|||
<script lang="ts">
|
||||
import { apiGet } from "$lib/scripts/apiFetch";
|
||||
import { ReasonCode } from "@owlboard/ts-types";
|
||||
<script>
|
||||
import { getApiUrl } from "$lib/scripts/upstream";
|
||||
import { uuid } from "$lib/stores/uuid";
|
||||
|
||||
export let code: string;
|
||||
export let type: string;
|
||||
export let code = "";
|
||||
export let type = "";
|
||||
|
||||
async function getDelay(code: string): Promise<string | undefined> {
|
||||
async function getDelay(code = "") {
|
||||
console.log(`Fetching delay reason ${code}`);
|
||||
const data = await getReason(code);
|
||||
if (data) {
|
||||
return data[0].lateReason || "This train has been delayed";
|
||||
}
|
||||
return data[0].lateReason || "This train has been delayed";
|
||||
}
|
||||
|
||||
async function getCancel(code: string): Promise<string | undefined> {
|
||||
async function getCancel(code = "") {
|
||||
console.log(`Fetching cancel reason ${code}`);
|
||||
const data = await getReason(code);
|
||||
if (data) {
|
||||
return data[0].cancReason || "This train has been cancelled";
|
||||
}
|
||||
return data[0].cancReason || "This train has been cancelled";
|
||||
}
|
||||
|
||||
async function getReason(code: string): Promise<ReasonCode[] | undefined> {
|
||||
const apiString = `/api/v2/ref/reasonCode/${code}`;
|
||||
try {
|
||||
const apiRes = (await apiGet(apiString)) as ReasonCode[];
|
||||
return apiRes;
|
||||
} catch (err) {
|
||||
console.error("Unable to define reason code");
|
||||
}
|
||||
async function getReason(code = "") {
|
||||
const url = `${getApiUrl()}/api/v2/ref/reasonCode/${code}`;
|
||||
const options = {
|
||||
method: "GET",
|
||||
headers: {
|
||||
uuid: $uuid,
|
||||
},
|
||||
};
|
||||
const res = await fetch(url, options);
|
||||
return await res.json();
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
@ -34,12 +34,8 @@ export async function apiGet(path: string): Promise<any> {
|
|||
try {
|
||||
const res = await fetch(getUrlString() + path, options);
|
||||
|
||||
if (res.status === 401) {
|
||||
throw new Error("Registration not accepted. Register at `Menu > Registration`");
|
||||
}
|
||||
|
||||
if (!res.ok) {
|
||||
throw new Error(`Failed: ${res.status}: ${res.statusText}`);
|
||||
throw new Error("Network response not ok");
|
||||
}
|
||||
const contentType = res.headers.get("content-type");
|
||||
if (!contentType || !contentType.includes("application/json")) {
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
export const version: string = "2024.07.2";
|
||||
export const version: string = "2024.07.1";
|
||||
export const versionTag: string = "";
|
||||
export const showWelcome: boolean = false;
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
placeholder: "Enter CRS/TIPLOC/STANOX",
|
||||
maxLen: 7,
|
||||
formAction: "/ldb/",
|
||||
fieldName: "station",
|
||||
fieldName: "station"
|
||||
};
|
||||
|
||||
let TimetableConfig: LookupCardConfig = {
|
||||
|
@ -27,8 +27,8 @@
|
|||
placeholder: "Enter headcode",
|
||||
maxLen: 4,
|
||||
formAction: "/train/",
|
||||
fieldName: "headcode",
|
||||
};
|
||||
fieldName: "headcode"
|
||||
}
|
||||
|
||||
function onRefresh() {
|
||||
console.log("Refresh");
|
||||
|
@ -37,4 +37,4 @@
|
|||
|
||||
<LookupCard config={LookupConfig} />
|
||||
<LookupCard config={TimetableConfig} />
|
||||
<NearToMeCard />
|
||||
<NearToMeCard />
|
Loading…
Reference in New Issue