Small things

index.css: border-radius index.js: bug table headers back platformio.ini: starmod as top entry appmodleds: ledfix add comment
ewowi · Jul 31, 2023 · 4c4d07e · 4c4d07e
1 parent 6d6d595
commit 4c4d07e
Show file tree

Hide file tree

Showing 5 changed files with 329 additions and 317 deletions.
diff --git a/data/index.css b/data/index.css
@@ -27,6 +27,7 @@ text { /*currently only for buttonSaveNode and buttonCancelNode*/
 textarea {
 	width: 100%;
 	height: 100%;
+	border-radius: 12px;
 }
 
 /* for toggleModal */
@@ -43,11 +44,13 @@ textarea {
 	padding: 8px;
 	font-size: 18px; /* WLEDMM: smaller is better (was 20px)*/
 	overflow: auto;
+	border-radius: 42px;
 }
 
 .ndiv {
 	border: 2px solid black;
 	margin-left: 50px;
+	border-radius: 12px;
 }
 
 /*table layout */
@@ -84,10 +87,11 @@ textarea {
 .box {
   border: 3px solid #666;
   background-color: #ddd;
-  border-radius: .5em;
+  /* border-radius: .5em; */
   padding: 10px;
   margin: 10px; /*space around boxes */
   cursor: move;
+  border-radius: 21px;
 }
 
 .box:hover {

diff --git a/data/index.js b/data/index.js
@@ -120,6 +120,7 @@ function generateHTML(parentNode, json) {
       setupBox(newNode);
     }
     else if (json.type == "table") {
+      ndivNeeded = false;
       //add label
       let pNode = cE("p");
       pNode.appendChild(labelNode);
@@ -424,7 +425,7 @@ function processUpdate(json) {
           }
         }
         else
-          console.log("processUpdate id not found in json", key, json);
+          console.log("processUpdate id not found in json", key, json[key]);
       } //key != uiFun
     } //for keys
   } //not id

diff --git a/platformio.ini b/platformio.ini
@@ -6,6 +6,11 @@
 ;    @Copyright (c) 2023 Github StarMod Commit Authors
 ;    @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
 
+[starmod]
+lib_deps =
+    https://github.com/me-no-dev/ESPAsyncWebServer.git
+    https://github.com/bblanchon/ArduinoJson.git
+
 [appmod_leds]
 build_flags = 
   -D APPMOD_LEDS
@@ -49,11 +54,10 @@ monitor_filters = esp32_exception_decoder
 board_build.filesystem = littlefs
 build_flags = 
     ${appmod_leds.build_flags}
-    ; ${usermod_e131.build_flags}
+    ${usermod_e131.build_flags}
 lib_deps =
-    https://github.com/me-no-dev/ESPAsyncWebServer.git
-    https://github.com/bblanchon/ArduinoJson.git
+    ${starmod.lib_deps}
     ${appmod_leds.lib_deps}
-    ; ${usermod_e131.lib_deps}
+    ${usermod_e131.lib_deps}
 ; RAM:   [==        ]  15.6% (used 51124 bytes from 327680 bytes)
 ; Flash: [=======   ]  68.1% (used 892033 bytes from 1310720 bytes)
diff --git a/src/App/AppModLeds.h b/src/App/AppModLeds.h
@@ -155,6 +155,7 @@ class AppModLeds:public Module {
 
   ui->initSelect(parentVar, "ledFix", 0, false, [](JsonObject var) { //uiFun
     web->addResponse(var["id"], "label", "LedFix");
+    web->addResponse(var["id"], "comment", "Fixture to display effect on");
     JsonArray select = web->addResponseA(var["id"], "select");
     files->dirToJson(select, true, "D"); //only files containing D (1D,2D,3D), alphabetically, only looking for D not very destinctive though