Compare commits
142 Commits
0d1baac2b7
...
renovate/r
| Author | SHA1 | Date | |
|---|---|---|---|
| f196c18a0d | |||
| d0b8c34ecd | |||
| c3d0120376 | |||
| 842571506f | |||
| e1943dfb8b | |||
| f1d8a6f4c4 | |||
| a12d95b5d1 | |||
| 4594f61725 | |||
| a17baa3d1c | |||
| a5f0e90c39 | |||
| 1a16a562ce | |||
| 8388017788 | |||
| 109a9aff0b | |||
| d6310d75df | |||
| ff5739ea9b | |||
| 9b3d7fd600 | |||
| f26ffee9d2 | |||
| a638bd3f84 | |||
| 688b304eb6 | |||
| eaed7a59bd | |||
| 4abb416a9a | |||
| 19dd75498e | |||
| 912077dbbb | |||
| 5aa0fed50f | |||
| cc2ee8f47f | |||
| c772529f13 | |||
| 713bdd3085 | |||
| aebee1b347 | |||
| 90cdfd8c7a | |||
| 29093662fe | |||
| d5079b5741 | |||
| 1c380f7eee | |||
| b7ca199736 | |||
| 6b43b90028 | |||
| 2b4f43e639 | |||
| 99456da11e | |||
| 504417c3b5 | |||
| d3c6280fba | |||
| bd91e1b624 | |||
| c6e3162f9a | |||
| caa8db3256 | |||
| 29b6da5c62 | |||
| d44a2e6ab0 | |||
| bb6290585f | |||
| bd5223900b | |||
| 3b28567136 | |||
| deb988983b | |||
| f204919cc4 | |||
| dc834c6ae9 | |||
| d3e08402a8 | |||
| b7cfd3d518 | |||
| b1ba264a84 | |||
| 28ec599432 | |||
| 3894a85d99 | |||
| 42be5c1847 | |||
| 63caa0569d | |||
| f9f906e268 | |||
| 8a5b9bacd4 | |||
| 35b2e9408f | |||
| 06cf1c1cd3 | |||
| 73b607d023 | |||
| 1d9375b85d | |||
| f42b452640 | |||
| d6ebf91939 | |||
| 09c15190c8 | |||
| b13f16d451 | |||
| 7d793c360b | |||
| 05f54d6c32 | |||
| 6d5991c406 | |||
| 726e3fc3ba | |||
| 41acf82c96 | |||
| 0cbbb5c087 | |||
| eef82578db | |||
| b77754f79e | |||
| eeebc124c7 | |||
| 230bd453ab | |||
| 53bd6e0e5d | |||
| 8c44776ebf | |||
| 6f5f571abe | |||
| 30d5768a8d | |||
| 05b99ce907 | |||
| 057dd6bd13 | |||
| c99b9b2c09 | |||
| 23be7391ea | |||
| 682661f30f | |||
| 9f3fe2317c | |||
| 1b1872a9f5 | |||
| 5be84cd908 | |||
| 4d4c55d277 | |||
| 52c1d6df7d | |||
| 8b8c6c3233 | |||
| 0bab1c569d | |||
| 9a4d741588 | |||
| aeeb188743 | |||
| 3c62477f11 | |||
| a903c1dad6 | |||
| 36b063eb0b | |||
| a17c6aacd1 | |||
| 5dfbb44dcc | |||
| 1dc8f11a0f | |||
| 964003d8f7 | |||
| a8832a003e | |||
| 0dc184faa7 | |||
| da25666d29 | |||
| 11e0196f48 | |||
| b5527ed2cb | |||
| f917b4e578 | |||
| 5e5a63282d | |||
| aca3c304e7 | |||
| ef8ea24cf3 | |||
| a40f453989 | |||
| 8aaac8f686 | |||
| daf2c957df | |||
| b25aa37065 | |||
| 29c8f9a47a | |||
| ba62f37615 | |||
| cb07c78575 | |||
| 2c65de2f9c | |||
| 8b24b8a5e6 | |||
| ae6706bf71 | |||
| d184d158d9 | |||
| 9a2a26f083 | |||
| af6cd33e10 | |||
| ba006d3533 | |||
| 4667f7da55 | |||
| 30f0cd255f | |||
| 78dfa49d58 | |||
| 5a06288c96 | |||
| 70eda78fe5 | |||
| b6d4b2bafb | |||
| 6267c0a16a | |||
| 24fc1df414 | |||
| 67b714e57c | |||
| 0235a7d8e2 | |||
| 5e73d68edf | |||
| 14f741f1e7 | |||
| ec44b92146 | |||
| e41afdebd1 | |||
| 3b9fd41905 | |||
| ad03f72f51 | |||
| b43b27a17e | |||
| 9a7cabe4a7 |
@@ -5,7 +5,7 @@ name: default
|
||||
|
||||
steps:
|
||||
- name: web_build
|
||||
image: node:23
|
||||
image: node:25
|
||||
volumes:
|
||||
- name: web_app
|
||||
path: /tmp/web_build
|
||||
@@ -63,7 +63,7 @@ steps:
|
||||
|
||||
# Build ESP32 program
|
||||
- name: esp32_compile
|
||||
image: espressif/idf:v5.5.1
|
||||
image: espressif/idf:v5.5.3
|
||||
volumes:
|
||||
- name: releases
|
||||
path: /tmp/releases
|
||||
|
||||
727
central_backend/Cargo.lock
generated
727
central_backend/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -5,23 +5,23 @@ edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
log = "0.4.29"
|
||||
env_logger = "0.11.8"
|
||||
env_logger = "0.11.9"
|
||||
lazy_static = "1.5.0"
|
||||
dotenvy = "0.15.7"
|
||||
clap = { version = "4.5.53", features = ["derive", "env"] }
|
||||
anyhow = "1.0.100"
|
||||
thiserror = "2.0.17"
|
||||
clap = { version = "4.5.60", features = ["derive", "env"] }
|
||||
anyhow = "1.0.102"
|
||||
thiserror = "2.0.18"
|
||||
openssl = { version = "0.10.75" }
|
||||
openssl-sys = "0.9.111"
|
||||
libc = "0.2.178"
|
||||
libc = "0.2.181"
|
||||
foreign-types-shared = "0.1.1"
|
||||
asn1 = "0.23.0"
|
||||
actix-web = { version = "4.12.1", features = ["openssl"] }
|
||||
futures = "0.3.31"
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
reqwest = { version = "0.12.24", features = ["json"] }
|
||||
serde_json = "1.0.145"
|
||||
rand = "0.10.0-rc.5"
|
||||
reqwest = { version = "0.13.2", features = ["json"] }
|
||||
serde_json = "1.0.149"
|
||||
rand = "0.10.0"
|
||||
actix = "0.13.5"
|
||||
actix-identity = "0.9.0"
|
||||
actix-session = { version = "0.11.0", features = ["cookie-session"] }
|
||||
@@ -29,18 +29,18 @@ actix-cors = "0.7.1"
|
||||
actix-multipart = { version = "0.7.2", features = ["derive"] }
|
||||
actix-remote-ip = "0.1.0"
|
||||
futures-util = "0.3.31"
|
||||
uuid = { version = "1.19.0", features = ["v4", "serde"] }
|
||||
uuid = { version = "1.20.0", features = ["v4", "serde"] }
|
||||
semver = { version = "1.0.27", features = ["serde"] }
|
||||
lazy-regex = "3.4.2"
|
||||
tokio = { version = "1.48.0", features = ["full"] }
|
||||
lazy-regex = "3.5.1"
|
||||
tokio = { version = "1.49.0", features = ["full"] }
|
||||
tokio_schedule = "0.3.2"
|
||||
mime_guess = "2.0.5"
|
||||
rust-embed = "8.9.0"
|
||||
jsonwebtoken = { version = "10.2.0", features = ["use_pem", "rust_crypto"] }
|
||||
rust-embed = "8.11.0"
|
||||
jsonwebtoken = { version = "10.3.0", features = ["use_pem", "rust_crypto"] }
|
||||
prettytable-rs = "0.10.0"
|
||||
chrono = "0.4.42"
|
||||
chrono = "0.4.44"
|
||||
serde_yml = "0.0.12"
|
||||
bincode = "2.0.1"
|
||||
bincode-next = "2.0.4"
|
||||
fs4 = { version = "0.13.1", features = ["sync"] }
|
||||
zip = { version = "6.0.0", features = ["bzip2"] }
|
||||
walkdir = "2.5.0"
|
||||
|
||||
@@ -29,9 +29,9 @@ impl ConsumptionHistoryFile {
|
||||
if path.exists() {
|
||||
Ok(Self {
|
||||
day,
|
||||
buff: bincode::decode_from_slice(
|
||||
buff: bincode_next::decode_from_slice(
|
||||
&std::fs::read(path)?,
|
||||
bincode::config::standard(),
|
||||
bincode_next::config::standard(),
|
||||
)?
|
||||
.0,
|
||||
r#type,
|
||||
@@ -94,7 +94,7 @@ impl ConsumptionHistoryFile {
|
||||
let path = AppConfig::get().energy_consumption_history_day(self.day, self.r#type);
|
||||
std::fs::write(
|
||||
path,
|
||||
bincode::encode_to_vec(&self.buff, bincode::config::standard())?,
|
||||
bincode_next::encode_to_vec(&self.buff, bincode_next::config::standard())?,
|
||||
)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
898
central_frontend/package-lock.json
generated
898
central_frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -12,34 +12,34 @@
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.1",
|
||||
"@fontsource/roboto": "^5.2.9",
|
||||
"@fontsource/roboto": "^5.2.10",
|
||||
"@mdi/js": "^7.4.47",
|
||||
"@mdi/react": "^1.6.1",
|
||||
"@mui/icons-material": "^7.3.6",
|
||||
"@mui/material": "^7.3.6",
|
||||
"@mui/x-charts": "^8.21.0",
|
||||
"@mui/x-date-pickers": "^8.21.0",
|
||||
"date-and-time": "^4.1.1",
|
||||
"@mui/icons-material": "^7.3.8",
|
||||
"@mui/material": "^7.3.8",
|
||||
"@mui/x-charts": "^8.26.0",
|
||||
"@mui/x-date-pickers": "^8.26.0",
|
||||
"date-and-time": "^4.2.0",
|
||||
"dayjs": "^1.11.19",
|
||||
"filesize": "^11.0.13",
|
||||
"react": "^19.2.1",
|
||||
"react-dom": "^19.2.1",
|
||||
"react-router-dom": "^7.10.1",
|
||||
"semver": "^7.7.3"
|
||||
"react": "^19.2.4",
|
||||
"react-dom": "^19.2.4",
|
||||
"react-router-dom": "^7.13.1",
|
||||
"semver": "^7.7.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "^19.2.7",
|
||||
"@types/react": "^19.2.14",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"@types/semver": "^7.7.1",
|
||||
"@typescript-eslint/eslint-plugin": "^8.49.0",
|
||||
"@typescript-eslint/parser": "^8.49.0",
|
||||
"@vitejs/plugin-react": "^5.1.2",
|
||||
"eslint": "^9.39.1",
|
||||
"@typescript-eslint/eslint-plugin": "^8.56.0",
|
||||
"@typescript-eslint/parser": "^8.56.0",
|
||||
"@vitejs/plugin-react": "^5.1.4",
|
||||
"eslint": "^9.39.3",
|
||||
"eslint-plugin-react-hooks": "^7.0.1",
|
||||
"eslint-plugin-react-refresh": "^0.4.24",
|
||||
"eslint-plugin-react-refresh": "^0.5.2",
|
||||
"globals": "^16.5.0",
|
||||
"typescript": "^5.9.3",
|
||||
"typescript-eslint": "^8.49.0",
|
||||
"vite": "^7.2.7"
|
||||
"typescript-eslint": "^8.56.0",
|
||||
"vite": "^7.3.1"
|
||||
}
|
||||
}
|
||||
|
||||
60
custom_consumption/Cargo.lock
generated
60
custom_consumption/Cargo.lock
generated
@@ -647,9 +647,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.53"
|
||||
version = "4.5.60"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
|
||||
checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@@ -657,9 +657,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.53"
|
||||
version = "4.5.60"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
|
||||
checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -669,9 +669,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.49"
|
||||
version = "4.5.55"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
|
||||
checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@@ -681,9 +681,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.7.6"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
||||
checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
|
||||
|
||||
[[package]]
|
||||
name = "clipboard-win"
|
||||
@@ -889,9 +889,9 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
|
||||
|
||||
[[package]]
|
||||
name = "ecolor"
|
||||
version = "0.33.2"
|
||||
version = "0.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "084980ebede2fb1ad6c4f54285b3e489052ef2b6aa4016e4c19349417adc75c5"
|
||||
checksum = "71ddb8ac7643d1dba1bb02110e804406dd459a838efcb14011ced10556711a8e"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"emath",
|
||||
@@ -899,9 +899,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "eframe"
|
||||
version = "0.33.2"
|
||||
version = "0.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4f60ee3c69cd01d5725b4ef476ed6a3a6009968c57843a2f1beb96f021e4a54b"
|
||||
checksum = "457481173e6db5ca9fa2be93a58df8f4c7be639587aeb4853b526c6cf87db4e6"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bytemuck",
|
||||
@@ -934,9 +934,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "egui"
|
||||
version = "0.33.2"
|
||||
version = "0.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b75645894de4ca1695ab3ab7201c7953bb95c1725aafeefa6822dc901ad2a81b"
|
||||
checksum = "6a9b567d356674e9a5121ed3fedfb0a7c31e059fe71f6972b691bcd0bfc284e3"
|
||||
dependencies = [
|
||||
"accesskit",
|
||||
"ahash",
|
||||
@@ -952,9 +952,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "egui-wgpu"
|
||||
version = "0.33.2"
|
||||
version = "0.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "acdaac35a6e0ff458aaa5776b2bda578e38334a9d1258f7795042a70372745b7"
|
||||
checksum = "5e4d209971c84b2352a06174abdba701af1e552ce56b144d96f2bd50a3c91236"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bytemuck",
|
||||
@@ -972,9 +972,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "egui-winit"
|
||||
version = "0.33.2"
|
||||
version = "0.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4772ed5f16fa8ec2ba295e58f62b58ee83fcf49e67ec13d2b7ddf4e9a2dea34e"
|
||||
checksum = "ec6687e5bb551702f4ad10ac428bab12acf9d53047ebb1082d4a0ed8c6251a29"
|
||||
dependencies = [
|
||||
"accesskit_winit",
|
||||
"arboard",
|
||||
@@ -994,9 +994,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "egui_glow"
|
||||
version = "0.33.2"
|
||||
version = "0.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "17b94ff67a1d18933fff2519f5f57c388f932c093036c381fb9ae2853b3e1e09"
|
||||
checksum = "6420863ea1d90e750f75075231a260030ad8a9f30a7cef82cdc966492dc4c4eb"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"egui",
|
||||
@@ -1011,9 +1011,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "emath"
|
||||
version = "0.33.2"
|
||||
version = "0.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e561352ae95c22ad179fb56c38d6e6eecd86cf4925cf5c70e738dd01df9b620"
|
||||
checksum = "491bdf728bf25ddd9ad60d4cf1c48588fa82c013a2440b91aa7fc43e34a07c32"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
]
|
||||
@@ -1047,9 +1047,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "env_filter"
|
||||
version = "0.1.4"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
|
||||
checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f"
|
||||
dependencies = [
|
||||
"log",
|
||||
"regex",
|
||||
@@ -1057,9 +1057,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
version = "0.11.8"
|
||||
version = "0.11.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
|
||||
checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -1070,9 +1070,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "epaint"
|
||||
version = "0.33.2"
|
||||
version = "0.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a909ce8cee63e8350fb0c251ad39277a5b24f19add60787e84a3b3ab3f2bd83a"
|
||||
checksum = "009d0dd3c2163823a0abdb899451ecbc78798dec545ee91b43aff1fa790bab62"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"ahash",
|
||||
@@ -1088,9 +1088,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "epaint_default_fonts"
|
||||
version = "0.33.2"
|
||||
version = "0.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ad9649446c23368ae138716910e3e28143995691b598fbb9de16b42b0722cbcc"
|
||||
checksum = "5c4fbe202b6578d3d56428fa185cdf114a05e49da05f477b3c7f0fbb221f1862"
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
|
||||
@@ -4,9 +4,9 @@ version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
env_logger = "0.11.8"
|
||||
env_logger = "0.11.9"
|
||||
log = "0.4.29"
|
||||
clap = { version = "4.5.53", features = ["derive", "env"] }
|
||||
egui = "0.33.2"
|
||||
eframe = "0.33.2"
|
||||
clap = { version = "4.5.60", features = ["derive", "env"] }
|
||||
egui = "0.33.3"
|
||||
eframe = "0.33.3"
|
||||
lazy_static = "1.5.0"
|
||||
|
||||
Reference in New Issue
Block a user