summaryrefslogtreecommitdiff
path: root/dashboard_website/dashboard.py
diff options
context:
space:
mode:
Diffstat (limited to 'dashboard_website/dashboard.py')
-rw-r--r--dashboard_website/dashboard.py39
1 files changed, 30 insertions, 9 deletions
diff --git a/dashboard_website/dashboard.py b/dashboard_website/dashboard.py
index 9164656..6d4d1f7 100644
--- a/dashboard_website/dashboard.py
+++ b/dashboard_website/dashboard.py
@@ -3,7 +3,7 @@
# dashboard.py contains web interface to clue DB + router
#
-from flask import Flask, flash, request, redirect, render_template, send_from_directory
+from flask import Flask, flash, request, redirect, render_template, send_from_directory, jsonify
import db
app = Flask(__name__)
@@ -78,19 +78,40 @@ def updateTeamLocation():
pass
#
-# WEB PAGES
+# WEB PAGES + DASHBOARD API
#
+# send updated bike/clue/home info
+# POST = request above
+@app.route("/getLatestInfo", methods=['POST'])
+def getLatestInfo():
+ db.moveBike2Test()
+ content = request.get_json()
+ last_timestamp = content['info_age']
+ data = {'timestamp' : db.getTime(),
+ 'clues_changed' : False,
+ 'home_changed' : False}
+ cl = db.getCluesJSON(last_timestamp)
+ if cl != False:
+ data['clues_changed'] = True
+ data['clues'] = cl
+ h = db.getHomeBaseJSON(last_timestamp)
+ if h != False:
+ data['home_changed'] = True
+ data['homebase'] = h
+ data['bikes'] = db.getBikesJSON()
+ data['status'] = "OK"
+
+ return jsonify(data)
+
+
# main page
# GET = get main page
-# POST = request clue/bike updates
-@app.route("/", methods=['GET', 'POST'])
+@app.route("/", methods=['GET'])
def siteIndex():
- if request.method == "GET":
- #clues = db.getClues(); bikes = db.getBikes()
- return render_template("index.html", homebase=db.getHomeBaseJSON(), clues=db.getCluesJSON(), bikes=[])#, clues=clues, bikes=bikes)
- else:
- return
+ #clues = db.getClues(); bikes = db.getBikes()
+ return render_template("index.html")#, clues=clues, bikes=bikes)
+
if __name__ == "__main__":