From e8874768e9627b2d4777bf083aac6537500bb381 Mon Sep 17 00:00:00 2001 From: yeet Date: Tue, 4 Jan 2022 00:20:35 +0200 Subject: [PATCH] more cleanup --- src/{flask => web_app}/HTP | Bin src/{flask => web_app}/api/all.json | 7 +++++++ src/{flask => web_app}/api/daily.json | 0 src/{flask => web_app}/main.py | 4 ++-- src/{flask => web_app}/saver.py | 0 src/{flask => web_app}/static/style.css | 0 src/{flask => web_app}/templates/index.html | 0 7 files changed, 9 insertions(+), 2 deletions(-) rename src/{flask => web_app}/HTP (100%) rename src/{flask => web_app}/api/all.json (97%) rename src/{flask => web_app}/api/daily.json (100%) rename src/{flask => web_app}/main.py (96%) rename src/{flask => web_app}/saver.py (100%) rename src/{flask => web_app}/static/style.css (100%) rename src/{flask => web_app}/templates/index.html (100%) diff --git a/src/flask/HTP b/src/web_app/HTP similarity index 100% rename from src/flask/HTP rename to src/web_app/HTP diff --git a/src/flask/api/all.json b/src/web_app/api/all.json similarity index 97% rename from src/flask/api/all.json rename to src/web_app/api/all.json index 584543c..7e54c51 100644 --- a/src/flask/api/all.json +++ b/src/web_app/api/all.json @@ -334,5 +334,12 @@ "humidity": "25.90%", "air_pollution": false, "time": "00:04:22" + }, + "00:17:54&01/04/22": { + "temperature": "23.41C", + "pressure": "952.89hPa", + "humidity": "26.03%", + "air_pollution": false, + "time": "00:17:54" } } \ No newline at end of file diff --git a/src/flask/api/daily.json b/src/web_app/api/daily.json similarity index 100% rename from src/flask/api/daily.json rename to src/web_app/api/daily.json diff --git a/src/flask/main.py b/src/web_app/main.py similarity index 96% rename from src/flask/main.py rename to src/web_app/main.py index 2c3bd77..910b8b7 100644 --- a/src/flask/main.py +++ b/src/web_app/main.py @@ -6,7 +6,7 @@ import json import saver # Change this if you change the dir -HOME_DIR = "/home/pi/PWSS/" +HOME_DIR = "/home/pi/PWSS/src/web_app" # MQ-135 gas sensor def stinker(): @@ -77,4 +77,4 @@ def save_data(): if __name__=="__main__": - app.run(host='0.0.0.0') \ No newline at end of file + app.run(host='0.0.0.0') diff --git a/src/flask/saver.py b/src/web_app/saver.py similarity index 100% rename from src/flask/saver.py rename to src/web_app/saver.py diff --git a/src/flask/static/style.css b/src/web_app/static/style.css similarity index 100% rename from src/flask/static/style.css rename to src/web_app/static/style.css diff --git a/src/flask/templates/index.html b/src/web_app/templates/index.html similarity index 100% rename from src/flask/templates/index.html rename to src/web_app/templates/index.html