From 38aa71e1b6b951156d754792bfd57614989bfc84 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Fri, 1 Nov 2024 18:10:56 -0400 Subject: [PATCH] Overhaul Axeos theme (#429) --- .vscode/settings.json | 2 +- main/http_server/axe-os/only-gzip.js | 30 +- .../app/components/home/home.component.html | 269 +- .../src/app/layout/app.footer.component.html | 4 +- .../src/app/layout/app.menu.component.html | 2 +- .../src/app/layout/app.topbar.component.html | 2 +- .../src/app/layout/styles/layout/_topbar.scss | 2 +- .../app/layout/styles/layout/_variables.scss | 2 +- .../styles/theme/theme-base/_colors.scss | 18 + .../styles/theme/theme-base/_common.scss | 75 + .../styles/theme/theme-base/_components.scss | 110 + .../styles/theme/theme-base/_mixins.scss | 339 + .../theme-base/components/button/_button.scss | 625 ++ .../components/button/_speeddial.scss | 96 + .../components/button/_splitbutton.scss | 15 + .../theme-base/components/data/_carousel.scss | 37 + .../components/data/_datatable.scss | 338 + .../theme-base/components/data/_dataview.scss | 46 + .../theme-base/components/data/_filter.scss | 142 + .../components/data/_orderlist.scss | 125 + .../components/data/_organizationchart.scss | 50 + .../components/data/_paginator.scss | 92 + .../theme-base/components/data/_picklist.scss | 125 + .../theme-base/components/data/_timeline.scss | 38 + .../theme-base/components/data/_tree.scss | 172 + .../components/data/_treetable.scss | 278 + .../components/data/_virtualscroller.scss | 28 + .../components/file/_fileupload.scss | 64 + .../components/input/_autocomplete.scss | 146 + .../components/input/_calendar.scss | 267 + .../components/input/_cascadeselect.scss | 152 + .../components/input/_checkbox.scss | 115 + .../theme-base/components/input/_chips.scss | 65 + .../components/input/_colorpicker.scss | 19 + .../components/input/_dropdown.scss | 167 + .../theme-base/components/input/_editor.scss | 122 + .../components/input/_iconfield.scss | 7 + .../components/input/_inputgroup.scss | 74 + .../components/input/_inputicon.scss | 13 + .../components/input/_inputmask.scss | 30 + .../components/input/_inputnumber.scss | 42 + .../components/input/_inputotp.scss | 10 + .../components/input/_inputswitch.scss | 60 + .../components/input/_inputtext.scss | 124 + .../theme-base/components/input/_listbox.scss | 105 + .../components/input/_multiselect.scss | 194 + .../components/input/_password.scss | 52 + .../components/input/_radiobutton.scss | 97 + .../theme-base/components/input/_rating.scss | 66 + .../components/input/_selectbutton.scss | 50 + .../theme-base/components/input/_slider.scss | 74 + .../components/input/_togglebutton.scss | 48 + .../components/input/_treeselect.scss | 151 + .../components/menu/_breadcrumb.scss | 42 + .../components/menu/_contextmenu.scss | 39 + .../theme-base/components/menu/_dock.scss | 95 + .../theme-base/components/menu/_megamenu.scss | 56 + .../theme-base/components/menu/_menu.scss | 37 + .../theme-base/components/menu/_menubar.scss | 142 + .../components/menu/_panelmenu.scss | 153 + .../components/menu/_slidemenu.scss | 59 + .../theme-base/components/menu/_steps.scss | 56 + .../theme-base/components/menu/_tabmenu.scss | 74 + .../components/menu/_tieredmenu.scss | 44 + .../components/messages/_inlinemessage.scss | 69 + .../components/messages/_message.scss | 141 + .../components/messages/_toast.scss | 127 + .../theme-base/components/misc/_avatar.scss | 30 + .../theme-base/components/misc/_badge.scss | 55 + .../theme-base/components/misc/_blockui.scss | 0 .../theme-base/components/misc/_chip.scss | 42 + .../theme-base/components/misc/_inplace.scss | 17 + .../components/misc/_metergroup.scss | 117 + .../components/misc/_progressbar.scss | 17 + .../components/misc/_scrolltop.scss | 25 + .../theme-base/components/misc/_skeleton.scss | 8 + .../theme-base/components/misc/_tag.scss | 52 + .../theme-base/components/misc/_terminal.scss | 12 + .../components/multimedia/_galleria.scss | 155 + .../components/multimedia/_image.scss | 49 + .../components/overlay/_confirmpopup.scss | 72 + .../components/overlay/_dialog.scss | 69 + .../components/overlay/_overlaypanel.scss | 64 + .../components/overlay/_sidebar.scss | 27 + .../components/overlay/_tooltip.scss | 33 + .../components/panel/_accordion.scss | 119 + .../theme-base/components/panel/_card.scss | 30 + .../theme-base/components/panel/_divider.scss | 31 + .../components/panel/_fieldset.scss | 47 + .../theme-base/components/panel/_panel.scss | 63 + .../components/panel/_scrollpanel.scss | 11 + .../components/panel/_splitter.scss | 23 + .../theme-base/components/panel/_stepper.scss | 201 + .../theme-base/components/panel/_tabview.scss | 82 + .../theme-base/components/panel/_toolbar.scss | 11 + .../styles/theme/themes/vela/_extensions.scss | 39 + .../styles/theme/themes/vela/_variables.scss | 955 +++ .../theme/themes/vela/bitaxe/_extensions.scss | 2 + .../theme/themes/vela/bitaxe/_fonts.scss | 1 + .../theme/themes/vela/bitaxe/_variables.scss | 11 + .../theme/themes/vela/bitaxe/theme.scss | 4 + .../layout/styles/theme/vela-blue/theme.css | 6293 ----------------- .../axe-os/src/assets/fonts/AngelWish.ttf | Bin 0 -> 112000 bytes .../axe-os/src/assets/fonts/Nippo-Regular.ttf | Bin 0 -> 46092 bytes .../src/assets/fonts/Nippo-Regular.woff | Bin 0 -> 20164 bytes .../src/assets/fonts/Nippo-Regular.woff2 | Bin 0 -> 15884 bytes main/http_server/axe-os/src/styles.scss | 21 +- main/main.c | 8 +- 108 files changed, 8843 insertions(+), 6463 deletions(-) create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/_colors.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/_common.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/_components.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/_mixins.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/button/_button.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/button/_speeddial.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/button/_splitbutton.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_carousel.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_datatable.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_dataview.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_filter.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_orderlist.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_organizationchart.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_paginator.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_picklist.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_timeline.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_tree.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_treetable.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_virtualscroller.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/file/_fileupload.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_autocomplete.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_calendar.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_cascadeselect.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_checkbox.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_chips.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_colorpicker.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_dropdown.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_editor.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_iconfield.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputgroup.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputicon.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputmask.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputnumber.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputotp.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputswitch.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputtext.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_listbox.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_multiselect.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_password.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_radiobutton.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_rating.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_selectbutton.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_slider.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_togglebutton.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_treeselect.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_breadcrumb.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_contextmenu.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_dock.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_megamenu.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_menu.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_menubar.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_panelmenu.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_slidemenu.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_steps.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_tabmenu.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_tieredmenu.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/messages/_inlinemessage.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/messages/_message.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/messages/_toast.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_avatar.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_badge.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_blockui.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_chip.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_inplace.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_metergroup.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_progressbar.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_scrolltop.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_skeleton.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_tag.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_terminal.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/multimedia/_galleria.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/multimedia/_image.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_confirmpopup.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_dialog.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_overlaypanel.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_sidebar.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_tooltip.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_accordion.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_card.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_divider.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_fieldset.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_panel.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_scrollpanel.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_splitter.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_stepper.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_tabview.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_toolbar.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/_extensions.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/_variables.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/bitaxe/_extensions.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/bitaxe/_fonts.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/bitaxe/_variables.scss create mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/bitaxe/theme.scss delete mode 100644 main/http_server/axe-os/src/app/layout/styles/theme/vela-blue/theme.css create mode 100644 main/http_server/axe-os/src/assets/fonts/AngelWish.ttf create mode 100644 main/http_server/axe-os/src/assets/fonts/Nippo-Regular.ttf create mode 100644 main/http_server/axe-os/src/assets/fonts/Nippo-Regular.woff create mode 100644 main/http_server/axe-os/src/assets/fonts/Nippo-Regular.woff2 diff --git a/.vscode/settings.json b/.vscode/settings.json index c856832..270eaeb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "idf.flashType": "UART", - "idf.portWin": "COM3", + "idf.portWin": "COM72", "idf.adapterTargetName": "esp32s3", "idf.openOcdConfigs": [ "interface/ftdi/esp32_devkitj_v1.cfg", diff --git a/main/http_server/axe-os/only-gzip.js b/main/http_server/axe-os/only-gzip.js index 707e34c..bd78cec 100644 --- a/main/http_server/axe-os/only-gzip.js +++ b/main/http_server/axe-os/only-gzip.js @@ -4,13 +4,27 @@ const path = require('path'); const directory = './dist/axe-os'; fs.readdir(directory, (err, files) => { - if (err) throw err; + if (err) throw err; - for (const file of files) { - if (!file.endsWith('.gz')) { - fs.unlink(path.join(directory, file), err => { - if (err) throw err; - }); + for (const file of files) { + const filePath = path.join(directory, file); + + fs.stat(filePath, (err, stats) => { + if (err) throw err; + + if (stats.isDirectory()) { + // If it's a directory, call rmdir after deleting its contents + fs.rmdir(filePath, { recursive: true }, (err) => { + if (err) throw err; + console.log(`Removed directory: ${filePath}`); + }); + } else if (!file.endsWith('.gz')) { + // If it's a file and doesn't end with .gz, unlink it + fs.unlink(filePath, (err) => { + if (err) throw err; + console.log(`Removed file: ${filePath}`); + }); + } + }); } - } -}); \ No newline at end of file +}); diff --git a/main/http_server/axe-os/src/app/components/home/home.component.html b/main/http_server/axe-os/src/app/components/home/home.component.html index 604700b..f3c7d7d 100644 --- a/main/http_server/axe-os/src/app/components/home/home.component.html +++ b/main/http_server/axe-os/src/app/components/home/home.component.html @@ -3,206 +3,172 @@ -
-
-
-
-
-
-
- Hash Rate -
{{info.hashRate * 1000000000 | hashSuffix}} -
-
-
- +
+
+
+
+
+ Hash Rate +
{{info.hashRate * 1000000000 | hashSuffix}}
- - {{expectedHashRate * 1000000000 | hashSuffix}} - expected -
+ + {{expectedHashRate * 1000000000 | + hashSuffix}} + expected +
-
-
-
-
- Shares -
{{info.sharesAccepted | number: '1.0-0'}}
-
-
- +
+
+
+
+
+ Efficiency +
+ {{info.power / (info.hashRate/1000) | number: '1.2-2'}} J/TH +
- {{info.sharesRejected | number: '1.0-0'}} - rejected
+ + {{info.power / (expectedHashRate/1000) | number: + '1.2-2'}} J/TH + + expected + +
-
-
-
-
- Efficiency -
- {{info.power / (info.hashRate/1000) | number: '1.2-2'}} J/TH - -
-
-
- +
+
+
+
+
+ Shares +
{{info.sharesAccepted | number: '1.0-0'}}
- - {{info.power / (expectedHashRate/1000) | number: '1.2-2'}} J/TH - - expected - -
+ {{info.sharesRejected | number: '1.0-0'}} + rejected
-
-
-
-
- Best Difficulty -
{{info.bestDiff}} - all-time best -
-
-
- -
-
- {{info.bestSessionDiff}} - since system boot - -
-
-
+
+
+
+
+ Best Difficulty +
{{info.bestDiff}} + all-time best +
+
+
+ {{info.bestSessionDiff}} + since system boot + +
+
+
+
+
+
-
+
-
Power
-
-
- - Power +

Power

+
+
+
Power {{info.power}} W
+ + +
-
- - Input Voltage +
+ +
Input Voltage {{info.voltage}} V
+ + + +   Danger: Low voltage
-
- - ASIC Voltage Requested +
+ + +
ASIC Frequency {{info.frequency}} Mhz
+ + +
+
+ +
Measured ASIC Voltage {{info.coreVoltageActual}} V
+ + + +
+
-
+
-
Heat
-
-
- - - ASIC Temperature +

Heat

+
+
+ +
ASIC Temperature {{info.temp}}°C
+ + +   Danger: High Temperature
-
- - Voltage Regulator Temperature +
+ +
Voltage Regulator Temperature {{info.vrTemp}}°C
+ + +   Danger: High Temperature
-
- - Fan % +
+
Fan Speed{{info.fanspeed}}% ({{info.fanrpm}} RPM)
+ + +
-
- - Fan RPM -
-
-
-
-
Performance
-
-
- - ASIC Frequency (MHz) -
-
- - ASIC Voltage Measured -
- - -
- -
-
- - -
@@ -212,7 +178,8 @@ URL: - {{info.stratumURL}} + {{info.stratumURL}} @@ -228,7 +195,9 @@ URL: - {{info.fallbackStratumURL}} + {{info.fallbackStratumURL}} @@ -248,4 +217,4 @@
- + \ No newline at end of file diff --git a/main/http_server/axe-os/src/app/layout/app.footer.component.html b/main/http_server/axe-os/src/app/layout/app.footer.component.html index 3311946..7b86dc3 100644 --- a/main/http_server/axe-os/src/app/layout/app.footer.component.html +++ b/main/http_server/axe-os/src/app/layout/app.footer.component.html @@ -1,3 +1,3 @@ -