From a05e208348607f5d3b91301a51cf9766d6cc6136 Mon Sep 17 00:00:00 2001 From: Filip Znachor Date: Mon, 12 Dec 2022 14:54:23 +0100 Subject: [PATCH] Added stops endpoint & updated app --- server/api.py | 29 +++++++++++++++----------- server/static/index.html | 44 +++++++++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 24 deletions(-) diff --git a/server/api.py b/server/api.py index 1d35cae..5fe70e0 100644 --- a/server/api.py +++ b/server/api.py @@ -16,21 +16,26 @@ class Server(ServerAdapter): def stop(self): self.server.shutdown() -@route('/departures/') -def index(stop_id: int): - return {'departures': Departure.get(stop_id)} - -@get("/") -def static(): - return static_file("index.html", root="static") - -@error(404) -def error404(err): - return '' - class API: def __init__(self, main): + + @route('/departures/') + def departures(stop_id: int): + return {'departures': Departure.get(stop_id)} + + @route('/stops') + def stop(): + return {'stops': main.config["stops"]} + + @get("/") + def static(): + return static_file("index.html", root="static") + + @error(404) + def error404(err): + return '' + self.server = Server(host=main.config["http"]["host"], port=main.config["http"]["port"]) self.thread = threading.Thread(target=self.start) self.thread.start() diff --git a/server/static/index.html b/server/static/index.html index 15927ee..8f30e29 100644 --- a/server/static/index.html +++ b/server/static/index.html @@ -37,8 +37,8 @@
-
-

Borský park

+
+

{{ stop.name }}

@@ -62,11 +62,38 @@ data() { return { top: 0, + interval: null, + stop: null, + stops: [], departures: [] } + }, + methods: { + async update() { + if(app.$data.stop) app.$data.departures = (await api("/departures/"+app.$data.stop.id)).departures; + }, + async setup() { + app.$data.stops = (await api("/stops")).stops; + if(app.$data.stops.length < 1) { + alert("Žádné zastávky nejsou k dispozici!"); + if(app.$data.interval) clearTimeout(app.$data.interval); + return; + } + if(localStorage.getItem("favstop")) { + app.$data.stops.forEach(stop => { + if(stop.id == localStorage.getItem("favstop")) app.$data.stop = stop; + }); + } + if(!app.$data.stop) app.$data.stop = app.$data.stops[0]; + window.addEventListener("scroll", () => { + app.$data.top = document.querySelector('html').scrollTop; + }); + app.$data.interval = setInterval(app.update, 5000); + app.update(); + } } }).mount('#app'); - async function api() { + async function api(url) { return new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); xhr.onreadystatechange = function() { @@ -78,18 +105,11 @@ resolve(null); } }; - xhr.open("GET", "/departures/40", true); + xhr.open("GET", url, true); xhr.send(); }); } - window.addEventListener("scroll", () => { - app.$data.top = document.querySelector('html').scrollTop; - }) - async function update() { - app.$data.departures = (await api()).departures; - } - setInterval(update, 5000); - update(); + app.setup(); \ No newline at end of file