From ae2f1b970211a849274a3b27de08d4d785d2c063 Mon Sep 17 00:00:00 2001 From: bogdan Date: Tue, 30 May 2023 00:53:34 +0200 Subject: [PATCH] color schemes frontend added --- HTML/res/appstyles.css | 17 ++++++++++------- HTML/system.html | 17 +++++++++++++++++ components/webguiapp | 2 +- sdkconfig | 18 +++++++++++++++--- sdkconfig.old | 20 ++++++++++++++++---- 5 files changed, 59 insertions(+), 15 deletions(-) diff --git a/HTML/res/appstyles.css b/HTML/res/appstyles.css index 264baf1..e11fb62 100644 --- a/HTML/res/appstyles.css +++ b/HTML/res/appstyles.css @@ -1,12 +1,14 @@ :root { /*========== Colors ==========*/ - --bgr-color: #1D2327; - --panel-bgr-color: #2c3338; - --menu-bgr-color: #3c434a; + --bgr-color: ~bgrclr~; + --panel-bgr-color: ~pnlclr~; + --menu-bgr-color: ~mnuclr~; --accent-color: ~actclr~; - --neutral-grey: #606060; - --text-color:#F0F0F1; - --border-color: #ffffff66; + --text-color: ~fntclr~; + --border-color: ~brdclr~; + + --neutral-grey: #b0b0b0; + --light-grey: #d8d8d8; /*========== Font and typography ==========*/ --body-font: 'Consolas','Roboto', monospace; @@ -19,6 +21,7 @@ --font-medium: 500; --font-semi-bold: 600; } + .rl{text-align:right;} input, select, .btn, .lab, textarea { @@ -183,7 +186,7 @@ input:checked + span{background-color: var(--accent-color);} width: 18px; left: 3px; bottom: 3px; - background-color: var(--text-color); + background-color: var(--light-grey); -webkit-transition: .4s; transition: .4s; } diff --git a/HTML/system.html b/HTML/system.html index 3e26f2d..9d742e7 100644 --- a/HTML/system.html +++ b/HTML/system.html @@ -85,6 +85,23 @@ +
+
+
+
APPEARANCE
+ + + + +
Color scheme:
+ +
+
+
+ diff --git a/components/webguiapp b/components/webguiapp index ab665c8..1645807 160000 --- a/components/webguiapp +++ b/components/webguiapp @@ -1 +1 @@ -Subproject commit ab665c8e8acf60a1ffb0afaecbe458c72011ac39 +Subproject commit 164580725651933150afb09431b262f05f50f14d diff --git a/sdkconfig b/sdkconfig index 7b78505..d27efb6 100644 --- a/sdkconfig +++ b/sdkconfig @@ -32,7 +32,7 @@ CONFIG_APP_COMPILE_TIME_DATE=y # CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set CONFIG_APP_PROJECT_VER_FROM_CONFIG=y -CONFIG_APP_PROJECT_VER="0.0.0.0" +CONFIG_APP_PROJECT_VER="0.0.0.1" CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 # end of Application manager @@ -1273,20 +1273,31 @@ CONFIG_DEVICE_MODEL_NAME="DEVICE MODEL NAME" CONFIG_WEBGUIAPP_HOSTNAME="DEVICE_HOSTNAME" CONFIG_WEBGUIAPP_USERNAME="user" CONFIG_WEBGUIAPP_USERPASS="password" -CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=15 +CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=-1 # CONFIG_DEBUG_MODE_ENABLE is not set # CONFIG_RESET_MODE_ENABLE is not set # # Web UI settings # +CONFIG_WEBGUIAPP_DEFAULT_COLOR_SCHEME=1 CONFIG_WEBGUIAPP_ACCENT_COLOR="#dba617" +CONFIG_WEBGUIAPP_SCH1_BACKGROUNG_COLOR="#e0e0dd" +CONFIG_WEBGUIAPP_SCH1_PANEL_COLOR="#f0f0ed" +CONFIG_WEBGUIAPP_SCH1_MENU_COLOR="#ededea" +CONFIG_WEBGUIAPP_SCH1_TEXT_COLOR="#404040" +CONFIG_WEBGUIAPP_SCH1_BORDER_COLOR="#00000066" +CONFIG_WEBGUIAPP_SCH2_BACKGROUNG_COLOR="#1D2327" +CONFIG_WEBGUIAPP_SCH2_PANEL_COLOR="#2c3338" +CONFIG_WEBGUIAPP_SCH2_MENU_COLOR="#3c434a" +CONFIG_WEBGUIAPP_SCH2_TEXT_COLOR="#F0F0F0" +CONFIG_WEBGUIAPP_SCH2_BORDER_COLOR="#ffffff66" # end of Web UI settings # # OTA settings # -# CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_ENABLE is not set +CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_ENABLE=y # CONFIG_WEBGUIAPP_OTA_RESET_ENABLE is not set CONFIG_WEBGUIAPP_OTA_HOST="https://iotronic.cloud/firmware/firmware.bin" CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_PERIOD=3600 @@ -1379,6 +1390,7 @@ CONFIG_WEBGUIAPP_MQTT_SYSTEM_NAME="SYSTEMNAME" CONFIG_WEBGUIAPP_MQTT_GROUP_NAME="GROUPNAME" CONFIG_WEBGUIAPP_MQTT_USERNAME="username" CONFIG_WEBGUIAPP_MQTT_PASSWORD="password" +CONFIG_WEBGUIAPP_MQTT_DEBUG_LEVEL=1 # end of MQTT settings # diff --git a/sdkconfig.old b/sdkconfig.old index d7b2024..9bedc91 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -32,7 +32,7 @@ CONFIG_APP_COMPILE_TIME_DATE=y # CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set CONFIG_APP_PROJECT_VER_FROM_CONFIG=y -CONFIG_APP_PROJECT_VER="0.0.0.0" +CONFIG_APP_PROJECT_VER="0.0.0.1" CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 # end of Application manager @@ -1273,20 +1273,31 @@ CONFIG_DEVICE_MODEL_NAME="DEVICE MODEL NAME" CONFIG_WEBGUIAPP_HOSTNAME="DEVICE_HOSTNAME" CONFIG_WEBGUIAPP_USERNAME="user" CONFIG_WEBGUIAPP_USERPASS="password" -CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=15 +CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=-1 # CONFIG_DEBUG_MODE_ENABLE is not set # CONFIG_RESET_MODE_ENABLE is not set # # Web UI settings # -CONFIG_WEBGUIAPP_ACCENT_COLOR="dba617#" +CONFIG_WEBGUIAPP_DEFAULT_COLOR_SCHEME=1 +CONFIG_WEBGUIAPP_ACCENT_COLOR="#dba617" +CONFIG_WEBGUIAPP_SCH1_BACKGROUNG_COLOR="#1D2327" +CONFIG_WEBGUIAPP_SCH1_PANEL_COLOR="#2c3338" +CONFIG_WEBGUIAPP_SCH1_MENU_COLOR="#3c434a" +CONFIG_WEBGUIAPP_SCH1_TEXT_COLOR="#F0F0F0" +CONFIG_WEBGUIAPP_SCH1_BORDER_COLOR="#ffffff66" +CONFIG_WEBGUIAPP_SCH2_BACKGROUNG_COLOR="#e0e0dd" +CONFIG_WEBGUIAPP_SCH2_PANEL_COLOR="#f0f0ed" +CONFIG_WEBGUIAPP_SCH2_MENU_COLOR="#ededea" +CONFIG_WEBGUIAPP_SCH2_TEXT_COLOR="#404040" +CONFIG_WEBGUIAPP_SCH2_BORDER_COLOR="#00000066" # end of Web UI settings # # OTA settings # -# CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_ENABLE is not set +CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_ENABLE=y # CONFIG_WEBGUIAPP_OTA_RESET_ENABLE is not set CONFIG_WEBGUIAPP_OTA_HOST="https://iotronic.cloud/firmware/firmware.bin" CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_PERIOD=3600 @@ -1379,6 +1390,7 @@ CONFIG_WEBGUIAPP_MQTT_SYSTEM_NAME="SYSTEMNAME" CONFIG_WEBGUIAPP_MQTT_GROUP_NAME="GROUPNAME" CONFIG_WEBGUIAPP_MQTT_USERNAME="username" CONFIG_WEBGUIAPP_MQTT_PASSWORD="password" +CONFIG_WEBGUIAPP_MQTT_DEBUG_LEVEL=1 # end of MQTT settings #