diff --git a/config/sample.settings.json b/config/sample.settings.json index 1a0ac7af67e14b1f9a632891a94ddba35f833c01..21e72b9d5ff2b5e217fc838a5a52feb1dff99468 100644 --- a/config/sample.settings.json +++ b/config/sample.settings.json @@ -3,6 +3,8 @@ "api": { "url": "https://prog-info.o94.at/api.php/", "endpoints": { + "shows": "shows", + "categories": "categories", "programmeCurrent": "current", "programmeToday": "today", "programmeDaily": "daily", diff --git a/src/components/ShowList.svelte b/src/components/ShowList.svelte index 2cf87c1c742c0e86052fc28ce263bf518827a58a..9ca93169b45f38ea22f9a770c7f85f5df19991e9 100644 --- a/src/components/ShowList.svelte +++ b/src/components/ShowList.svelte @@ -2,13 +2,11 @@ import { onMount } from 'svelte' import Spinner from '../common/Spinner.svelte' import Select, { Option } from '@smui/select' - import { fetchApi } from '../common/Common.svelte' + import { settings, fetchApi } from '../common/Common.svelte' import ShowCardMedium from '../cards/ShowCardMedium.svelte' import CategoryHeading from '../elements/CategoryHeading.svelte' export let api = 'https://prog-info.o94.at/api.php' - export let endpointShow = 'shows' - export let endpointCats = 'categories' export let urlShowDetail = undefined export let limit = 300 export let activeonly = true @@ -38,7 +36,7 @@ /* Loads the available categories */ function loadCategories() { - let apiQueryCats = `${api}/${endpointCats}` + let apiQueryCats = `${settings.api.url}/${settings.api.endpoints.categories}` fetchApi(apiQueryCats, processCatsResponse) } @@ -70,7 +68,8 @@ } query = filterQuery - let apiUrl = `${api}/${endpointShow}${filterQuery}limit=${limit}` + let endpointShows = settings.api.endpoints.shows + let apiUrl = `${settings.api.url}/${endpointShows}${filterQuery}limit=${limit}` fetchApi(apiUrl, processResponse) }