diff --git a/app/app.py b/app/app.py index 3441d21..5d39a02 100644 --- a/app/app.py +++ b/app/app.py @@ -1,4 +1,5 @@ from flask import Flask, render_template +from datetime import datetime import connexion import config from services import get_services @@ -12,8 +13,8 @@ app.add_api("swagger.yml") @app.route("/") def home (): data = get_services.get_latest_status_for_all_devices() - print(data) - return render_template("home.html", data=data) + time = datetime.now() + return render_template("home.html", data=data, time=time) @app.route("/robots.txt") @app.route("/robots") diff --git a/app/static/styles/main.css b/app/static/styles/main.css index 8e43d12..ef51345 100644 --- a/app/static/styles/main.css +++ b/app/static/styles/main.css @@ -40,6 +40,7 @@ main div .status-bar { padding: 20px; border-top: 2px solid #424242; border-bottom: 2px solid #424242; + margin: 5px 0; } .meter { @@ -60,7 +61,11 @@ main div .status-bar .meter img { } -main div h2 { - font-size: 16px; +main div .server-header, +main div .server-time { + margin: 0; } +main div .server-time { + font-size: 12px; +} diff --git a/app/swagger.yml b/app/swagger.yml index ba20231..ea7275f 100644 --- a/app/swagger.yml +++ b/app/swagger.yml @@ -2,7 +2,7 @@ swagger: "2.0" info: description: >- The 'Return to Ritherdon' project, by Nicola Ellis, is a two year art residency at Ritherdon & Co Ltd, a manufacturer of metal enclosures based in Darwen, Lancashire U.K. This website is part of the many outcomes produced throughout the duration of project. - version: "1.0.0 - Alpha" + version: "1.0.0 - Beta" title: Return to Ritherdon Project A.P.I. consumes: - application/json diff --git a/app/templates/home.html b/app/templates/home.html index 4ff8af3..24de9ed 100644 --- a/app/templates/home.html +++ b/app/templates/home.html @@ -9,7 +9,8 @@

Return to Ritherdon Project

-

Artwork Status

+

Artwork Status

+

Time on Server: {{ time }}