derlole/gimmiCoffee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

webclient finish, socket io finish, some changes in main

Browse Source
This commit is contained in:
derlole
2025-05-12 10:36:25 +00:00
parent 41b276c734
commit f7d9c3e8c7
11 changed files with 92 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
routes/esp_routes.py
View File

@@ -8,6 +8,7 @@ import os
from modules.persistence import esp_conn_infos
from datetime import datetime, timedelta
from modules.socketio import resend_static_data
from modules.persistence import load_dict, save_dict
esp = Blueprint('eps', __name__, url_prefix='/unsecure/esp')
@@ -43,6 +44,13 @@ def toggle_machine():
VALUES (?, ?, ?)
""", (fullCommand["command"], fullCommand["status"], fullCommand["command_id"]))
new_status = load_dict("machine")
new_status["state"] = "PENDING"
save_dict("machine", new_status)
resend_static_data()
conn.commit()
conn.close()
client = mqtt.Client()

6
routes/unsecure_routes.py
View File

@@ -13,7 +13,7 @@ def index():
beans = load_dict("beans")
machine = load_dict("machine")
coffee_count = get_coffee_count()
print(f"Water: {water}, Beans: {beans}, Machine: {machine}")
# print(f"[DEBUG] Water: {water}, Beans: {beans}, Machine: {machine}")
return render_template('index.html', title='gimmiCoffee', water=water, beans=beans, machine=machine, esp_conn_infos=esp_conn_infos, coffee_count=coffee_count)
# @unsecure.route('/update')
@@ -51,8 +51,8 @@ def coffees_made():
@unsecure.route('/water')
def water():
water = load_dict("water")
return render_template('water.html', title='gimmiCoffee', last_filled=water["lastFilled"], current_level=water["fill"], total_refills=water["refilled"], coffees_made=water["coffeesOnFill"])
return render_template('water.html', title='gimmiCoffee', last_filled=datetime.strptime(water["lastFilled"], "%Y-%m-%d %H:%M:%S.%f"), current_level=water["fill"], total_refills=water["refilled"], coffees_made=water["coffeesOnFill"])
@unsecure.route('/beans')
def beans():
beans = load_dict("beans")
return render_template('beans.html', title='gimmiCoffee', last_filled=beans["lastFilled"], current_level=beans["fill"], total_refills=beans["refilled"], coffees_made=beans["coffeesOnFill"])
return render_template('beans.html', title='gimmiCoffee', last_filled=datetime.strptime(beans["lastFilled"], "%Y-%m-%d %H:%M:%S.%f"), current_level=beans["fill"], total_refills=beans["refilled"], coffees_made=beans["coffeesOnFill"])