From 05bcc8301cf569e1c2e83415fa3da50cb6f1a06c Mon Sep 17 00:00:00 2001
From: David Trattnig <david@subsquare.at>
Date: Fri, 16 Dec 2022 12:37:03 +0100
Subject: [PATCH] refact: use settings for programme
---
config/sample.settings.json | 13 ++++++-------
src/components/Programme.svelte | 11 +++++------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/config/sample.settings.json b/config/sample.settings.json
index d1810eb..1a0ac7a 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 385b202..41b24eb 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 */
--
GitLab