diff --git a/main.py b/main.py
index 830a301..2e3f901 100644
--- a/main.py
+++ b/main.py
@@ -124,7 +124,6 @@ def require_login(request: Request):
@app.get("/", response_class=HTMLResponse)
def login_form(request: Request):
- connect_toggle()
return templates.TemplateResponse("login.html", {"request": request})
@@ -149,6 +148,7 @@ def logout(request: Request):
@app.get("/control", response_class=HTMLResponse)
def control_page(request: Request):
+ can_backend.connect()
if request.session.get("user") != USERNAME:
return RedirectResponse("/", status_code=HTTP_302_FOUND)
return templates.TemplateResponse("control.html", {"request": request})
@@ -170,6 +170,7 @@ def monitor_page(request: Request):
@app.post("/connect_toggle")
def connect_toggle():
logging.info("Toggling CAN connection...")
+ print("CONNECTING")
if can_backend.connected:
can_backend.shutdown()
return {"connected": False}
@@ -180,8 +181,8 @@ def connect_toggle():
raise HTTPException(status_code=500, detail="Connection failed.")
return {"connected": can_backend.connected}
-@app.post("/is_connected")
-def is_can_connected():
+@app.get("/is_connected")
+def is_connected():
return {"connected": can_backend.connected}
diff --git a/templates/control.html b/templates/control.html
index e1b36ec..c4aec24 100644
--- a/templates/control.html
+++ b/templates/control.html
@@ -252,7 +252,7 @@
@@ -360,8 +360,8 @@
const response = await fetch('/connect_toggle', { method: 'POST' });
const data = await response.json();
const connectButton = document.getElementById('connectButton');
- connectButton.classList.toggle('connected', data.connected);
- connectButton.innerHTML = ` ${data.connected ? 'Disconnect' : 'Connect'}`;
+ // connectButton.classList.toggle('connected', data.connected);
+ // connectButton.innerHTML = ` ${data.connected ? 'Disconnect' : 'Connect'}`;
}
@@ -542,6 +542,7 @@ async function fetchMonitorData() {
}
getConnectionStatus();
+ssetInterval(getConnectionStatus, 1000);
setInterval(fetchMonitorData, 1000);
fetchMonitorData();