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

refact: settings for show list

parent 05bcc830
No related branches found
No related tags found
1 merge request!1Local settings via JSON and initial use of Context API
Pipeline #2674 passed
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"api": { "api": {
"url": "https://prog-info.o94.at/api.php/", "url": "https://prog-info.o94.at/api.php/",
"endpoints": { "endpoints": {
"shows": "shows",
"categories": "categories",
"programmeCurrent": "current", "programmeCurrent": "current",
"programmeToday": "today", "programmeToday": "today",
"programmeDaily": "daily", "programmeDaily": "daily",
......
...@@ -2,13 +2,11 @@ ...@@ -2,13 +2,11 @@
import { onMount } from 'svelte' import { onMount } from 'svelte'
import Spinner from '../common/Spinner.svelte' import Spinner from '../common/Spinner.svelte'
import Select, { Option } from '@smui/select' 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 ShowCardMedium from '../cards/ShowCardMedium.svelte'
import CategoryHeading from '../elements/CategoryHeading.svelte' import CategoryHeading from '../elements/CategoryHeading.svelte'
export let api = 'https://prog-info.o94.at/api.php' export let api = 'https://prog-info.o94.at/api.php'
export let endpointShow = 'shows'
export let endpointCats = 'categories'
export let urlShowDetail = undefined export let urlShowDetail = undefined
export let limit = 300 export let limit = 300
export let activeonly = true export let activeonly = true
...@@ -38,7 +36,7 @@ ...@@ -38,7 +36,7 @@
/* Loads the available categories */ /* Loads the available categories */
function loadCategories() { function loadCategories() {
let apiQueryCats = `${api}/${endpointCats}` let apiQueryCats = `${settings.api.url}/${settings.api.endpoints.categories}`
fetchApi(apiQueryCats, processCatsResponse) fetchApi(apiQueryCats, processCatsResponse)
} }
...@@ -70,7 +68,8 @@ ...@@ -70,7 +68,8 @@
} }
query = filterQuery 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) fetchApi(apiUrl, processResponse)
} }
......
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