From bea2cd9493281859fb32a69fe2be7e5c9c470dbf Mon Sep 17 00:00:00 2001
From: David Trattnig <david@subsquare.at>
Date: Fri, 16 Dec 2022 12:53:13 +0100
Subject: [PATCH] refact: settings for show list
---
config/sample.settings.json | 2 ++
src/components/ShowList.svelte | 9 ++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/config/sample.settings.json b/config/sample.settings.json
index 1a0ac7a..21e72b9 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 2cf87c1..9ca9316 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)
}
--
GitLab