diff --git a/heartbeat/export.py b/heartbeat/export.py index 1275dcc..663bffd 100644 --- a/heartbeat/export.py +++ b/heartbeat/export.py @@ -22,12 +22,13 @@ class ExportHandler(tornado.web.RequestHandler): range = yamiIchiCodes[range] # range = 1d, 3d, 1w ranges = { - "1d": ("2018-11-04 10:00:00","2018-11-05 12:00:00"), + "24h": ("2018-11-04 10:00:00","2018-11-05 12:00:00"), "3d": ("2018-11-04 10:00:00","2018-11-07 12:00:00"), "1w": ("2018-11-04 10:00:00","2018-11-11 12:00:00") } q = "SELECT * FROM beats WHERE recordedAt > ? AND recordedAt < ? ORDER BY recordedAt ASC" + print(range, ranges) # TODO: userid + start time if range not in ranges: # Not found diff --git a/heartbeat/frontend.py b/heartbeat/frontend.py index b32f963..9ec44c3 100644 --- a/heartbeat/frontend.py +++ b/heartbeat/frontend.py @@ -2,7 +2,7 @@ import os import tornado.web import tornado.template - +from .ranges import yamiIchiCodes viewdir = os.path.dirname(os.path.realpath(__file__)) + '/../views' loader = tornado.template.Loader(viewdir) @@ -15,11 +15,27 @@ class FrontendHandler(tornado.web.RequestHandler): """ self.conn = conn - def get(self): - # c = self.conn.cursor() - # c.execute("SELECT * FROM beats ORDER BY createdAt DESC LIMIT 20") - # beats = [row for row in c] - # print(beats) - # html = loader.load("sockets.html").generate(beats=beats) - html = loader.load("plot.html").generate() - self.write(html) + def get(self, page): + print("getting", page) + + if page in yamiIchiCodes: + range = yamiIchiCodes[page] + ranges = { + "24h": ("2018-11-04 10:00:00","2018-11-05 12:00:00"), + "3d": ("2018-11-04 10:00:00","2018-11-07 12:00:00"), + "1w": ("2018-11-04 10:00:00","2018-11-11 12:00:00") + } + startDate = ranges[range][0] + endDate = ranges[range][1] + html = loader.load("redeem.html").generate(code=page, startDate=startDate, endDate=endDate) + self.write(html) + elif page == "yamiichi": + # c = self.conn.cursor() + # c.execute("SELECT * FROM beats ORDER BY createdAt DESC LIMIT 20") + # beats = [row for row in c] + # print(beats) + # html = loader.load("sockets.html").generate(beats=beats) + html = loader.load("plot.html").generate() + self.write(html) + else: + raise tornado.web.HTTPError(404) diff --git a/heartbeat/server.py b/heartbeat/server.py index 3adfc9f..e8fd78e 100644 --- a/heartbeat/server.py +++ b/heartbeat/server.py @@ -39,10 +39,10 @@ def start(args): # use "/" as the root, and the # WebSocketHandler as our handler application = tornado.web.Application([ - (r"/", FrontendHandler, {"conn": conn}), (r"/ws", WebSocketHandler, {"conn": conn, "token": token}), (r"/(.*).csv", ExportHandler, {"conn": conn}), (r"/assets/(.*)", tornado.web.StaticFileHandler, {"path": "assets/"}), + (r"/(.*)", FrontendHandler, {"conn": conn}), ],debug=True) application.listen(8888) diff --git a/views/redeem.html b/views/redeem.html new file mode 100644 index 0000000..e218070 --- /dev/null +++ b/views/redeem.html @@ -0,0 +1,178 @@ + + + Quantified Other: Heart Edition + + + + + +

Data Double Black Market - Redeem code {{ code }}

+
A project by Ruben van de Ven
+

live bpm: ...

+
+
Get as csv
+
+
+ +
+