diff --git a/config/sample.settings.json b/config/sample.settings.json index d1810eb9a3ba0515af69d7a667af6f55ffb26a88..1a0ac7af67e14b1f9a632891a94ddba35f833c01 100644 --- a/config/sample.settings.json +++ b/config/sample.settings.json @@ -1,16 +1,15 @@ { "appVersion": "__APP_VERSION__", - "renderHtml": true, "api": { - "url": "https://prog-info.o94.at/api.php", + "url": "https://prog-info.o94.at/api.php/", "endpoints": { - "programme": "", - "currentProgramme": "" + "programmeCurrent": "current", + "programmeToday": "today", + "programmeDaily": "daily", + "trackservice": "trackservice" } }, "components": { - "programme": { - - } + "programme": {} } } \ No newline at end of file diff --git a/src/components/Programme.svelte b/src/components/Programme.svelte index 385b202eb5f1e45dccfeae8158f37150ee8f75b4..41b24ebe281e8acf91ecaa827922e7b710880b28 100644 --- a/src/components/Programme.svelte +++ b/src/components/Programme.svelte @@ -2,7 +2,7 @@ import { onMount } from 'svelte' import Spinner from '../common/Spinner.svelte' import { - appVersion, + settings, continuousFetch, isCurrentShow, fillEmptyTimeslots, @@ -11,8 +11,6 @@ import TimeslotCard from '../cards/TimeslotCard.svelte' import ProgrammePaper from '../paper/ProgrammePaper.svelte' - export let api = 'https://prog-info.o94.at/api.php' - export let endpoint = 'daily' export let date = null // YYYY-MM-DD export let limitCount = 9 export let startActive = false @@ -34,6 +32,7 @@ /* Initialize the component */ onMount(() => { + let endpoint = settings.api.endpoints.programmeDaily let url = new URL(window.location.href) // Filter by date @@ -42,13 +41,13 @@ let urlDate = url.searchParams.get('date') if (urlDate) date = urlDate } else if (date == 'today') { - endpoint = 'today' + endpoint = settings.api.endpoints.programmeToday date = '' } - let apiQuery = `${api}/${endpoint}/${date}` + let apiQuery = `${settings.api.url}/${endpoint}/${date}` continuousFetch(apiQuery, refreshTime, processResponse) - console.log(`Initialized Programme v${appVersion}`) + console.log(`Initialized Programme v${settings.appVersion}`) }) /* Callback to process the API response */