Compare commits

..

No commits in common. "86b072f38723a7a7e235a15a681b6d9212eeeeb1" and "b98c317ba49bcfc69c34039545cb1cc2228117ee" have entirely different histories.

17 changed files with 49 additions and 62 deletions

View File

@ -6,7 +6,6 @@
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';
let requestedStation; let requestedStation;
$: requestedStation = station; $: requestedStation = station;
@ -56,7 +55,7 @@
isLoading = true; // Set loading state isLoading = true; // Set loading state
try { try {
console.log(`Requested Station: ${requestedStation}`); console.log(`Requested Station: ${requestedStation}`);
const data = await fetch(`${getApiUrl()}/api/v2/live/station/${requestedStation}/public`); const data = await fetch(`https://owlboard.info/api/v2/live/station/${requestedStation}/public`);
jsonData = await data.json(); jsonData = await data.json();
} catch (error) { } catch (error) {
console.error('Error fetching data:', error); console.error('Error fetching data:', error);

View File

@ -1,31 +1,33 @@
<script lang="ts"> <script lang="ts">
import { uuid } from '$lib/stores/uuid';
import { getApiUrl } from '$lib/scripts/upstream';
import type { ApiResponse, StaffLdb } from '@owlboard/ts-types';
export let station: string; import { uuid } from "$lib/stores/uuid";
export let title: string | undefined = 'Loading...'; import { getApiUrl } from "$lib/scripts/upstream";
import type { ApiResponse, StaffLdb } from "@owlboard/ts-types";
const fetchUrl = getApiUrl(); export let station: string
export let title: string | undefined = "Loading..."
async function fetchStaffLdb(station: string) { const fetchUrl = getApiUrl();
const url = `${fetchUrl}/api/v2/live/station/${station}/staff`;
async function fetchStaffLdb(station: string) {
const url = `${fetchUrl}/api/v2/live/station/${station}/staff`
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); let jsonData: ApiResponse<StaffLdb>
let jsonData: ApiResponse<StaffLdb>;
if (res.status === 200) { if (res.status === 200) {
jsonData = await res.json(); jsonData = await res.json()
title = jsonData.data?.locationName; title = jsonData.data?.locationName
} else if (res.status === 401) { } else if (res.status === 401) {
console.log(`Request Status: ${res.status}`); console.log(`Request Status: ${res.status}`)
title = 'Unauthorised'; title = "Unauthorised"
}
} }
}
</script> </script>
{#await fetchStaffLdb(station)} {#await fetchStaffLdb(station)}

View File

@ -4,7 +4,6 @@
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';
export let detail = { export let detail = {
uid: '', uid: '',
rid: '', rid: '',
@ -20,7 +19,7 @@
async function getTrain(rid) { async function getTrain(rid) {
try { try {
console.log(`Requested Station: ${rid}`); console.log(`Requested Station: ${rid}`);
const url = `${getApiUrl()}/api/v2/live/train/rid/${rid}`; const url = `https://owlboard.info/api/v2/live/train/rid/${rid}`;
const opt = { const opt = {
method: 'GET', method: 'GET',
headers: { headers: {

View File

@ -1,4 +1,3 @@
import { getApiUrl } from './scripts/upstream';
import { uuid } from './stores/uuid'; import { uuid } from './stores/uuid';
export interface libauthResponse { export interface libauthResponse {
@ -51,7 +50,7 @@ async function checkUuid(): Promise<uuidCheckRes> {
} }
async function checkServerAuth(uuidString: string) { async function checkServerAuth(uuidString: string) {
const url = `${getApiUrl()}/api/v2/user/checkAuth`; const url = 'https://owlboard.info/api/v2/user/checkAuth';
const options = { const options = {
method: 'GET', method: 'GET',
headers: { headers: {

View File

@ -1,5 +1,4 @@
<script> <script>
import { getApiUrl } from '$lib/scripts/upstream';
import { uuid } from '$lib/stores/uuid'; import { uuid } from '$lib/stores/uuid';
export let code = ''; export let code = '';
@ -18,7 +17,7 @@
} }
async function getReason(code = '') { async function getReason(code = '') {
const url = `${getApiUrl()}/api/v2/ref/reasonCode/${code}`; const url = `https://owlboard.info/api/v2/ref/reasonCode/${code}`;
const options = { const options = {
method: 'GET', method: 'GET',
headers: { headers: {

View File

@ -1,9 +1,9 @@
import { dev } from '$app/environment'; import { dev } from "$app/environment";
export function getApiUrl() { export function getApiUrl() {
if (dev) { if (dev) {
console.info('DEVMODE active, using testing URL'); console.info("DEVMODE active, using testing URL")
return 'https://testing.owlboard.info'; return "https://testing.owlboard.info"
} }
return 'https://owlboard.info'; return "https://owlboard.info"
} }

View File

@ -3,14 +3,13 @@
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';
export let service = ''; export let 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 = `https://owlboard.info/api/v2/timetable/train/now/byTrainUid/${tuid}`;
const options = { const options = {
method: 'GET', method: 'GET',
headers: { headers: {

View File

@ -2,7 +2,6 @@
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';
const title = 'Location Codes'; const title = 'Location Codes';
let val = { let val = {
@ -17,7 +16,7 @@
let isLoading = false; let isLoading = false;
async function getData(type = '', value = '') { async function getData(type = '', value = '') {
const url = `${getApiUrl()}/api/v2/ref/locationCode/${type}/${value}`; const url = `https://owlboard.info/api/v2/ref/locationCode/${type}/${value}`;
const res = await fetch(url); const res = await fetch(url);
const data = await res.json(); const data = await res.json();
isLoading = false; isLoading = false;

View File

@ -3,7 +3,6 @@
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 { 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';
@ -19,7 +18,7 @@
async function fetchData() { async function fetchData() {
if ($uuid != 'null') { if ($uuid != 'null') {
const url = `${getApiUrl()}/api/v2/user/${$uuid}`; const url = `https://owlboard.info/api/v2/user/${$uuid}`;
const res = await fetch(url); const res = await fetch(url);
const json = await res.json(); const json = await res.json();
if (json.length) { if (json.length) {

View File

@ -4,7 +4,6 @@
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';
const title = 'Reason Codes'; const title = 'Reason Codes';
let isLoading = false; let isLoading = false;
@ -26,7 +25,7 @@
async function getData() { async function getData() {
if (inputValue) { if (inputValue) {
const url = `${getApiUrl()}/api/v2/ref/reasonCode/${inputValue}`; const url = `https://owlboard.info/api/v2/ref/reasonCode/${inputValue}`;
const res = await fetch(url); const res = await fetch(url);
return await res.json(); return await res.json();
} else { } else {

View File

@ -5,7 +5,6 @@
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { checkAuth, logout } from '$lib/libauth'; import { checkAuth, logout } from '$lib/libauth';
import LogoutButton from '$lib/navigation/LogoutButton.svelte'; import LogoutButton from '$lib/navigation/LogoutButton.svelte';
import { getApiUrl } from '$lib/scripts/upstream';
const title = 'Register'; const title = 'Register';
@ -19,7 +18,7 @@
async function request() { async function request() {
isLoading = true; isLoading = true;
const url = `${getApiUrl()}/api/v2/user/request`; const url = 'https://owlboard.info/api/v2/user/request';
const request = { const request = {
method: 'POST', method: 'POST',
headers: { headers: {

View File

@ -2,7 +2,6 @@
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 { uuid } from '$lib/stores/uuid.js'; import { uuid } from '$lib/stores/uuid.js';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
@ -15,7 +14,7 @@
} }
async function submit(id) { async function submit(id) {
const url = `${getApiUrl()}/api/v2/user/register`; const url = 'https://owlboard.info/api/v2/user/register';
const request = { const request = {
method: 'POST', method: 'POST',
headers: { headers: {

View File

@ -5,7 +5,6 @@
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';
const title = 'Report Issue'; const title = 'Report Issue';
let isLoading = false; let isLoading = false;
@ -48,7 +47,7 @@
`User Message:\n` + `User Message:\n` +
`${reportMsg}` `${reportMsg}`
}); });
const url = `${getApiUrl()}/misc/issue`; const url = `https://owlboard.info/misc/issue`;
const options = { const options = {
method: 'POST', method: 'POST',
headers: { headers: {

View File

@ -3,11 +3,10 @@
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';
const title = 'Statistics'; const title = 'Statistics';
async function getData() { async function getData() {
const url = `${getApiUrl()}/misc/server/stats`; const url = 'https://owlboard.info/misc/server/stats';
const res = await fetch(url); const res = await fetch(url);
return await res.json(); return await res.json();
} }

View File

@ -5,11 +5,10 @@
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';
const title = 'Versions'; const title = 'Versions';
async function getData() { async function getData() {
const url = `${getApiUrl()}/misc/server/versions`; const url = 'https://owlboard.info/misc/server/versions';
const res = await fetch(url); const res = await fetch(url);
return await res.json(); return await res.json();
} }

View File

@ -5,7 +5,6 @@
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';
const title = 'PIS Finder'; const title = 'PIS Finder';
const variables = { title: 'Results' }; const variables = { title: 'Results' };
@ -19,14 +18,14 @@
async function findByStartEnd() { async function findByStartEnd() {
isLoading = true; isLoading = true;
const url = `${getApiUrl()}/api/v2/pis/byStartEnd/${entryStartCRS}/${entryEndCRS}`; const url = `https://owlboard.info/api/v2/pis/byStartEnd/${entryStartCRS}/${entryEndCRS}`;
await fetchData(url); await fetchData(url);
isLoading = false; isLoading = false;
} }
async function findByPis() { async function findByPis() {
isLoading = true; isLoading = true;
const url = `${getApiUrl()}/api/v2/pis/byCode/${entryPIS}`; const url = `https://owlboard.info/api/v2/pis/byCode/${entryPIS}`;
await fetchData(url); await fetchData(url);
isLoading = false; isLoading = false;
} }

View File

@ -7,7 +7,6 @@
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';
let title = 'Timetable Results'; let title = 'Timetable Results';
let id = ''; let id = '';
@ -51,7 +50,7 @@
uuid: $uuid uuid: $uuid
} }
}; };
const url = `${getApiUrl()}/api/v2/timetable/train/${date}/${searchType}/${id}`; const url = `https://owlboard.info/api/v2/timetable/train/${date}/${searchType}/${id}`;
try { try {
const res = await fetch(url, options); const res = await fetch(url, options);
if (res.status == 200) { if (res.status == 200) {