Skip to content
Snippets Groups Projects
Commit 0d14189b authored by David Trattnig's avatar David Trattnig
Browse files

refact: consolidate endpoint scheme

parent d93259da
No related branches found
No related tags found
1 merge request!1Local settings via JSON and initial use of Context API
{
"appVersion": "__APP_VERSION__",
"api": {
"url": "https://prog-info.o94.at/api.php/",
"url": "https://prog-info.o94.at/api.php",
"endpoints": {
"shows": "shows",
"episodes": "timeslots",
"categories": "categories",
"host": "hosts",
"show": "shows",
"episode": "timeslots",
"category": "categories",
"programmeCurrent": "current",
"programmeToday": "today",
"programmeDaily": "daily",
......
......@@ -26,8 +26,8 @@
export let urlShowList = undefined
export let radioEpoch = new Date('1998-08-17')
let endpointShows = settings.api.endpoints.shows
let endpointEpisodes = settings.api.endpoints.episodes
let endpointShow = settings.api.endpoints.show
let endpointEpisode = settings.api.endpoints.episode
let tmp_show // FIXME Workaround for current API limitations: It's not possible to fetch everything in one request (see below)
let show
let episodes
......@@ -42,7 +42,7 @@
let fromDate = radioEpoch
fromDate = formatApiDate(fromDate)
let toDate = formatApiDate(new Date())
let baseUrl = `${settings.api.url}/${endpointShows}/${tmp_show.id}/${endpointEpisodes}`
let baseUrl = `${settings.api.url}/${endpointShow}/${tmp_show.id}/${endpointEpisode}`
let episodeUrl = `${baseUrl}?&withNote&start=${fromDate}&end=${toDate}`
fetchApi(episodeUrl, processMoreEpisodes)
}
......@@ -54,7 +54,7 @@
let url = new URL(window.location.href)
let urlSlug = url.searchParams.get('slug')
if (urlSlug) showSlug = urlSlug
let showUrl = `${settings.api.url}/${endpointShows}/${showSlug}?withHostDetails=true`
let showUrl = `${settings.api.url}/${endpointShow}/${showSlug}?withHostDetails=true`
console.log('Show API Url:' + showUrl)
fetchApi(showUrl, processShowResponse)
})
......@@ -77,7 +77,7 @@
pastDate = formatApiDate(pastDate)
futureDate = formatApiDate(futureDate)
let baseUrl = `${settings.api.url}/${endpointShows}/${tmp_show.id}/${endpointEpisodes}`
let baseUrl = `${settings.api.url}/${endpointShow}/${tmp_show.id}/${endpointEpisode}`
let episodeUrl = `${baseUrl}?&withNote&start=${pastDate}&end=${futureDate}`
fetchApi(episodeUrl, processEpisodesResponse)
}
......
......@@ -36,7 +36,7 @@
/* Loads the available categories */
function loadCategories() {
let apiQueryCats = `${settings.api.url}/${settings.api.endpoints.categories}`
let apiQueryCats = `${settings.api.url}/${settings.api.endpoints.category}`
fetchApi(apiQueryCats, processCatsResponse)
}
......@@ -68,7 +68,7 @@
}
query = filterQuery
let endpointShows = settings.api.endpoints.shows
let endpointShows = settings.api.endpoints.show
let apiUrl = `${settings.api.url}/${endpointShows}${filterQuery}limit=${limit}`
fetchApi(apiUrl, processResponse)
}
......
......@@ -11,7 +11,7 @@
/* Initialize the component */
onMount(() => {
fetchApi(
settings.api.url + settings.api.endpoints.trackservice,
settings.api.url + '/' + settings.api.endpoints.trackservice,
processResponse,
)
console.log(`Initialized TrackService v${settings.appVersion}`)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment