diff --git a/data/header.html b/data/header.html index 224a246..4af73c8 100644 --- a/data/header.html +++ b/data/header.html @@ -7,12 +7,12 @@
diff --git a/data/waage.html b/data/waage.html index d82f435..b45343d 100644 --- a/data/waage.html +++ b/data/waage.html @@ -30,10 +30,15 @@ +
+
+ F +
+
+
diff --git a/src/commonFS.cpp b/src/commonFS.cpp index b58f68d..b14736f 100644 --- a/src/commonFS.cpp +++ b/src/commonFS.cpp @@ -50,6 +50,21 @@ bool loadJsonValue(const char* filename, JsonDocument& doc) { return true; } +String readFile(const char* filename) { + File file = LittleFS.open(filename, "r"); + if (!file) { + Serial.print("Fehler beim Öffnen der Datei: "); + Serial.println(filename); + return ""; + } + String content = ""; + while (file.available()) { + content += (char)file.read(); + } + file.close(); + return content; +} + void initializeFileSystem() { if (!LittleFS.begin(true)) { Serial.println("LittleFS Mount Failed"); diff --git a/src/commonFS.h b/src/commonFS.h index 6cc2725..767049c 100644 --- a/src/commonFS.h +++ b/src/commonFS.h @@ -8,6 +8,7 @@ bool removeJsonValue(const char* filename); bool saveJsonValue(const char* filename, const JsonDocument& doc); bool loadJsonValue(const char* filename, JsonDocument& doc); +String readFile(const char* filename); void initializeFileSystem(); #endif diff --git a/src/website.cpp b/src/website.cpp index c6dedaa..da4ae8a 100644 --- a/src/website.cpp +++ b/src/website.cpp @@ -128,14 +128,19 @@ void setupWebserver(AsyncWebServer &server) { server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){ Serial.println("Web: Request /waage"); - AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html", "text/html"); + String html = readFile("/waage.html"); + html.replace("{{autoTare}}", autoTare ? "checked" : ""); + auto response = request->beginResponse(200, "text/html", html); response->addHeader("Cache-Control", NO_CACHE); request->send(response); }); server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){ Serial.println("Web: Request /setup"); - AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/setup.html", "text/html"); + String html = readFile("/setup.html"); + html.replace("{{registered}}", filamanRegistered ? "Registered" : "Not Registered"); + html.replace("{{filamanUrl}}", filamanUrl); + auto response = request->beginResponse(200, "text/html", html); response->addHeader("Cache-Control", NO_CACHE); request->send(response); }); @@ -154,6 +159,12 @@ void setupWebserver(AsyncWebServer &server) { request->send(response); }); + server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){ + AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/version.txt", "text/plain"); + response->addHeader("Cache-Control", NO_CACHE); + request->send(response); + }); + server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){ AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css"); response->addHeader("Cache-Control", NO_CACHE);