From 0ff5419c23f4f0211b80d738b3acf9fca0a88284 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Fri, 30 Aug 2024 18:11:23 +0200 Subject: [PATCH 1/9] Added some SEO and ran cargo update Signed-off-by: Tuan-Dat Tran --- Cargo.lock | 625 ++++++++++++++++++++---------------------- Cargo.toml | 3 +- src/components/mod.rs | 15 +- src/layout/mod.rs | 12 +- src/main.rs | 52 +++- 5 files changed, 366 insertions(+), 341 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc64ebf..7cf5389 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "anymap" @@ -76,39 +76,27 @@ checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", - "pin-project-lite", -] - [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -117,7 +105,7 @@ dependencies = [ [[package]] name = "athome" -version = "0.2.1" +version = "0.2.2" dependencies = [ "dioxus", "dioxus-free-icons", @@ -137,9 +125,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -154,9 +142,9 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", "itoa", "matchit", @@ -190,7 +178,7 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", @@ -215,9 +203,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -251,9 +239,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -269,18 +257,15 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] @@ -297,15 +282,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -335,9 +320,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.95" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "shlex", +] [[package]] name = "cfb" @@ -376,7 +364,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -408,9 +396,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -472,24 +460,24 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -509,9 +497,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -519,9 +507,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", @@ -532,9 +520,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", @@ -556,9 +544,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "digest" @@ -654,9 +642,9 @@ checksum = "2ea539174bb236e0e7dc9c12b19b88eae3cb574dedbd0252a2d43ea7e6de13e2" [[package]] name = "dioxus-free-icons" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b60c5a6f9c15bc3b0e12291f8a91162042b9eb5b3015f561185aac813df834" +checksum = "bfbba8b2089b185e4cebc394fb36353c7269a3230b542d97d3d192ccd864d48b" dependencies = [ "dioxus", ] @@ -681,7 +669,7 @@ dependencies = [ "dioxus_server_macro", "futures-util", "http 1.1.0", - "hyper 1.3.1", + "hyper 1.4.1", "once_cell", "pin-project", "serde", @@ -824,9 +812,9 @@ dependencies = [ [[package]] name = "dioxus-logger" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39140fb281606f471350fd0cd559c1472242b93d0e83f3995b745e987e03bda" +checksum = "81fe09dc9773dc1f1bb0d38529203d6555d08f67aadca5cf955ac3d1a9e69880" dependencies = [ "console_error_panic_hook", "tracing", @@ -976,9 +964,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -996,18 +984,18 @@ dependencies = [ [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ "darling", "proc-macro2", @@ -1023,9 +1011,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1033,9 +1021,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.9" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" dependencies = [ "num-traits", "serde", @@ -1043,20 +1031,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1065,29 +1042,19 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" -dependencies = [ - "event-listener 5.3.0", + "event-listener", "pin-project-lite", ] [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fixedbitset" @@ -1245,9 +1212,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1258,9 +1225,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gloo" @@ -1365,15 +1332,15 @@ dependencies = [ [[package]] name = "gloo-net" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" +checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580" dependencies = [ "futures-channel", "futures-core", "futures-sink", "gloo-utils 0.2.0", - "http 0.2.12", + "http 1.1.0", "js-sys", "pin-project", "serde", @@ -1493,9 +1460,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -1557,9 +1524,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -1567,28 +1534,28 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] [[package]] name = "http-range-header" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe" +checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1598,9 +1565,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1622,15 +1589,15 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", @@ -1646,7 +1613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.28", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", @@ -1654,17 +1621,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", - "socket2", "tokio", ] @@ -1709,9 +1675,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown", @@ -1782,9 +1748,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1795,7 +1761,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "unicode-segmentation", ] @@ -1815,21 +1781,21 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -1843,9 +1809,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "longest-increasing-subsequence" @@ -1855,9 +1821,9 @@ checksum = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86" [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown", ] @@ -1916,9 +1882,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -1928,9 +1894,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -1938,36 +1904,36 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "multer" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" dependencies = [ "bytes", "encoding_rs", "futures-util", "http 1.1.0", "httparse", - "log", "memchr", "mime", "spin", @@ -1976,11 +1942,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2004,28 +1969,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" -version = "0.32.2" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2038,11 +1993,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -2070,9 +2025,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2103,9 +2058,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2121,7 +2076,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2132,9 +2087,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -2174,9 +2129,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -2191,15 +2146,18 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "prettyplease" -version = "0.2.19" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", "syn", @@ -2207,18 +2165,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2255,11 +2213,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2276,7 +2234,7 @@ dependencies = [ "h2", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.30", "hyper-tls", "ipnet", "js-sys", @@ -2304,9 +2262,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -2316,20 +2274,20 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2347,15 +2305,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -2374,11 +2332,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2387,9 +2345,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -2397,9 +2355,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -2415,9 +2373,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.198" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] @@ -2445,9 +2403,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", @@ -2456,11 +2414,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2499,9 +2458,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2520,19 +2479,19 @@ dependencies = [ [[package]] name = "server_fn" -version = "0.6.11" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536a5b959673643ee01e59ae41bf01425482c8070dee95d7061ee2d45296b59c" +checksum = "024b400db1aca5bd4188714f7bbbf7a2e1962b9a12a80b2a21e937e509086963" dependencies = [ "axum", "bytes", "const_format", "dashmap", "futures", - "gloo-net 0.5.0", + "gloo-net 0.6.0", "http 1.1.0", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "inventory", "js-sys", "once_cell", @@ -2554,9 +2513,9 @@ dependencies = [ [[package]] name = "server_fn_macro" -version = "0.6.11" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064dd9b256e78bf2886774f265cc34d2aefdd05b430c58c78a69eceef21b5e60" +checksum = "9cf0e6f71fc924df36e87f27dfbd447f0bedd092d365db3a5396878256d9f00c" dependencies = [ "const_format", "convert_case", @@ -2568,9 +2527,9 @@ dependencies = [ [[package]] name = "server_fn_macro_default" -version = "0.6.11" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ad11700cbccdbd313703916eb8c97301ee423c4a06e5421b77956fdcb36a9f" +checksum = "556e4fd51eb9ee3e7d9fb0febec6cef486dcbc8f7f427591dfcfebee1abe1ad4" dependencies = [ "server_fn_macro", "syn", @@ -2596,6 +2555,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -2626,9 +2591,9 @@ dependencies = [ [[package]] name = "sledgehammer_bindgen_macro" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd941cc539bd3dc694edaf9d0c4e1221d02baa67c6b45ec04fad1024d9e8139" +checksum = "edc90d3e8623d29a664cd8dba5078b600dd203444f00b9739f744e4c6e7aeaf2" dependencies = [ "quote", "syn", @@ -2663,9 +2628,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2688,9 +2653,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -2732,30 +2697,31 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -2774,18 +2740,18 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2804,28 +2770,27 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -2868,9 +2833,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -2879,7 +2844,6 @@ dependencies = [ "hashbrown", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -2896,9 +2860,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -2938,11 +2902,11 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "http-range-header", "httpdate", @@ -2959,15 +2923,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -3136,15 +3100,15 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3166,9 +3130,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "wasm-bindgen", @@ -3188,9 +3152,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "want" @@ -3209,19 +3173,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -3234,9 +3199,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -3246,9 +3211,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3256,9 +3221,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -3269,9 +3234,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" @@ -3288,9 +3253,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -3324,7 +3289,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3342,7 +3307,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3362,18 +3336,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3384,9 +3358,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3396,9 +3370,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3408,15 +3382,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3426,9 +3400,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3438,9 +3412,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3450,9 +3424,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3462,9 +3436,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -3487,24 +3461,25 @@ dependencies = [ [[package]] name = "xxhash-rust" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 6af4e40..04df9ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "athome" -version = "0.2.1" +version = "0.2.2" authors = ["Tuan-Dat Tran "] edition = "2021" @@ -8,7 +8,6 @@ edition = "2021" [dependencies] serde = { version = "1.0.197", features = ["derive"] } - dioxus = { version = "0.5", features = ["fullstack", "router"] } # Debug diff --git a/src/components/mod.rs b/src/components/mod.rs index 03f09b4..0e70e4b 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -21,6 +21,19 @@ pub fn P(props: PProps) -> Element { } } +#[component] +pub fn Title(props: PProps) -> Element { + rsx! { + div { + class: "{props.class}", + h1 { + class: "mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white", + {props.children} + } + } + } +} + #[component] pub fn H1(props: PProps) -> Element { rsx! { @@ -84,7 +97,7 @@ pub fn Card(prop: CardProp) -> Element { Picture {src: "{prop.picture}"}, } } - H5 { "{prop.name}", span { class: "text-grey-600 dark:text-grey-500 text-lg", " {prop.gender}" } }, + Title { "{prop.name}", span { class: "text-grey-600 dark:text-grey-500 text-lg", " {prop.gender}" } }, { prop.children } } } diff --git a/src/layout/mod.rs b/src/layout/mod.rs index 2d49210..fea89e3 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; -mod footer; -mod header; +pub mod footer; +pub mod header; use crate::{Body, Route}; use footer::Footer; @@ -9,17 +9,13 @@ use header::Header; pub fn Layout() -> Element { rsx! { - meta { - name: "description", - content: "Explore Tuan-Dat Tran's personal website featuring his CV, publications, projects, and consulting services. Get insights into his professional journey and connect for collaboration opportunities.", - } div { - class: "flex flex-col min-h-screen" , + class: "flex flex-col min-h-screen", Header {}, Body { Outlet:: {}, - } Footer {}, + } } } } diff --git a/src/main.rs b/src/main.rs index 8bb50a6..7bd5a6e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,9 +2,12 @@ use std::str::FromStr; +use components::H1; use dioxus::prelude::*; use dioxus_sdk::i18n::*; +use layout::footer::Footer; +use layout::header::Header; use tracing::Level; pub mod components; @@ -60,6 +63,41 @@ fn App() -> Element { }); rsx! { + meta { + name: "description", + content: "Visit Tuan-Dat Tran's website for his CV, publications, projects, and consulting services. Connect for collaboration.", + }, + script { + r#type: "application/ld+json", + " + {{ + \"@context\": \"https://schema.org\", + \"@type\": \"ProfilePage\", + \"mainEntity\": {{ + \"@type\": \"Person\", + \"name\": \"Tuan-Dat Tran\", + \"alternateName\": \"TuDatTr\", + \"image\": \"https://www.tudattr.dev/pictures/headshot.webp\", + }} + }} + " + } + // meta { + // property: "og:title", + // content: "Tuan-Dat Trans Personal Website", + // } + // meta { + // property: "og:description", + // content: "Explore Tuan-Dat Tran's personal website featuring his CV, publications, projects, and consulting services. Get insights into his professional journey and connect for collaboration opportunities.", + // } + // meta { + // property: "og:image", + // content: "https://www.tudattr.dev/pictures/headshot.webp", + // } + // meta { + // property: "og:url", + // content: "https://tudattr.dev", + // } div { class: "bg-white dark:bg-gray-900 min-h-screen", Router:: {}, @@ -71,12 +109,16 @@ fn App() -> Element { fn PageNotFound(route: Vec) -> Element { rsx! { div { - class: "h-screen items-center justify-center", - img { - class: "size-auto", - src: "https://raw.githubusercontent.com/SAWARATSUKI/ServiceLogos/main/404Notfound/NotFound.png" + class: "flex flex-col min-h-screen items", + Header {}, + div { + class: "container mx-auto p-4 flex items-center justify-center max-w-md w-full", + H1 { + "Site not found (404)" + }, } - } + Footer {} + }, } } From f76a7a8c4c00ecc2cfb1491432651a6f7b696d7b Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Mon, 2 Sep 2024 18:18:08 +0200 Subject: [PATCH 2/9] Added Social and tweaked Home Signed-off-by: Tuan-Dat Tran --- assets/pictures/Gitea_Logo.svg | 1 + assets/pictures/LI-Bug.svg.original.svg | 5 +++++ assets/tailwind.css | 15 ++++++++------- src/cv.rs | 24 +++++++++++++++++++----- src/home.rs | 5 +++-- src/languages/de-DE.json | 10 +++++++--- src/languages/en-GB.json | 10 +++++++--- 7 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 assets/pictures/Gitea_Logo.svg create mode 100644 assets/pictures/LI-Bug.svg.original.svg diff --git a/assets/pictures/Gitea_Logo.svg b/assets/pictures/Gitea_Logo.svg new file mode 100644 index 0000000..7ed0012 --- /dev/null +++ b/assets/pictures/Gitea_Logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/pictures/LI-Bug.svg.original.svg b/assets/pictures/LI-Bug.svg.original.svg new file mode 100644 index 0000000..48b7efe --- /dev/null +++ b/assets/pictures/LI-Bug.svg.original.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/assets/tailwind.css b/assets/tailwind.css index 3b1b1fc..f82d366 100644 --- a/assets/tailwind.css +++ b/assets/tailwind.css @@ -676,11 +676,6 @@ video { display: flex; } -.size-auto { - width: auto; - height: auto; -} - .h-16 { height: 4rem; } @@ -705,8 +700,8 @@ video { height: 1px; } -.h-screen { - height: 100vh; +.h-32 { + height: 8rem; } .min-h-screen { @@ -802,6 +797,12 @@ video { margin-bottom: calc(0.5rem * var(--tw-space-y-reverse)); } +.space-x-4 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(1rem * var(--tw-space-x-reverse)); + margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse))); +} + .overflow-x-auto { overflow-x: auto; } diff --git a/src/cv.rs b/src/cv.rs index 46d357c..f1fa6b5 100644 --- a/src/cv.rs +++ b/src/cv.rs @@ -8,7 +8,12 @@ pub fn CV() -> Element { rsx! { div { class: "flex flex-col ", - Introduction {}, + div { + class: "flex justify-between", + Introduction {}, + Socials {} + }, + HR {} div { class: "flex justify-between", @@ -16,7 +21,6 @@ pub fn CV() -> Element { Miscellaneous {}, }, HR {}, - Socials {} } } } @@ -27,12 +31,14 @@ fn Introduction() -> Element { rsx! { div { class: "flex", + img { class: "rounded-full w-16 h-16 mx-16", src: "/pictures/headshot.webp" } - P { { translate!(i18, "cv.introduction") }} - } + P { { translate!(i18, "cv.introduction_0") } }, + P { { translate!(i18, "cv.introduction_1") } } + }, } } @@ -228,9 +234,17 @@ fn random_badge_color(seed: usize) -> String { } fn Socials() -> Element { + let i18 = use_i18(); + rsx! { div { - "todo!()" + class: "ms-8 max-w-3/4", + H4 { { translate!(i18, "cv.socials.title") } }, + div { + class: "flex justify-center items-center space-x-4", + P { Link { to:"https://www.linkedin.com/in/tudattr/", class:"hover:underline", new_tab: true, img { class: "h-8", src:"/pictures/LI-Bug.svg.original.svg", alt:"LinkedIn Logo" } }}, + P { Link { to:"https://git.tudattr.dev/tudattr", class:"hover:underline", new_tab: true, img { class: "h-8", src:"/pictures/Gitea_Logo.svg", alt:"Gitea Logo" } }}, + } } } } diff --git a/src/home.rs b/src/home.rs index 575a974..2cf72cb 100644 --- a/src/home.rs +++ b/src/home.rs @@ -18,13 +18,14 @@ pub fn Home() -> Element { class: "mb-2", P { { translate!(i18, "home.card.l1") } }, P { { translate!(i18, "home.card.l2") } }, - P { { translate!(i18, "home.card.l3") }, + P { { translate!(i18, "home.card.l3") } }, + P { { translate!(i18, "home.card.l4") } Link { to: "https://git.tudattr.dev/explore/repos", new_tab: true, class: "items-center font-medium hover:underline", "gitea"}, - { translate!(i18, "home.card.l3_1") } + { translate!(i18, "home.card.l4_1") } }, }, }, diff --git a/src/languages/de-DE.json b/src/languages/de-DE.json index 63246a3..5bf1b23 100644 --- a/src/languages/de-DE.json +++ b/src/languages/de-DE.json @@ -18,13 +18,14 @@ "gender": "", "l1": "Hallihallo! 👋🏻👋🏼👋🏽👋🏾👋🏿", "l2": "Willkommen auf meiner kleinen Webseite im World Wide Web.", - "l3": "Während du hier bist, schau dir doch meine Projekte auf ", - "l3_1": " an.", + "l3": "Mein Name ist Tuan und ich bin Linux-Bastler, IT-Security Nerd und Automatisierer aus Leidenschaft.", + "l4": "Während du hier bist, schau dir doch meine Projekte auf ", + "l4_1": " an.", "contact_button": "Get in touch." } }, "cv": { - "introduction": "Während meines Bachelorstudiums habe ich viele Erfahrungen in der Industrie und im Studium gesammelt. Meine beruflichen und persönlichen Interessen sind DevOps/IaC, Systems/Software Security und Computer Networking. All diese Interessen vertiefe ich in persönlichen Projekten wie meinem Homelab und CTF-Challenges.", + "introduction_0": "Während meines Bachelorstudiums habe ich viele Erfahrungen in der Industrie und im Studium gesammelt. Meine beruflichen und persönlichen Interessen sind DevOps/IaC, Systems/Software Security und Computer Networking. All diese Interessen vertiefe ich in persönlichen Projekten wie meinem Homelab und CTF-Challenges.", "workexperience": { "title": "Berufserfahrung", "se1_gefeba": { @@ -53,6 +54,9 @@ "description": "Während meiner Tätigkeit als wissenschaftlicher Mitarbeiter in der Network Communication System Research Group an der Universität Duisburg-Essen habe ich an der Forschung rund um Software Defined Networking, 5G, Staukontrollalgorithmen und föderiertes maschinelles Lernen mitgearbeitet. Ich habe die On-Premise- und Cloud-Infrastruktur, das Inventarsystem und die Online-Präsenz der Forschungsgruppe aufgebaut und verwaltet." } }, + "socials": { + "title": "Profile" + }, "education": { "title": "Bildungsweg", "bachelor": { diff --git a/src/languages/en-GB.json b/src/languages/en-GB.json index e57df45..888fcc9 100644 --- a/src/languages/en-GB.json +++ b/src/languages/en-GB.json @@ -18,13 +18,14 @@ "gender": "(He/Him)", "l1": "Hey there! 👋🏻👋🏼👋🏽👋🏾👋🏿", "l2": "Welcome to my little place on the internet.", - "l3": "While you're here, why don't you check out my projects over on ", - "l3_1": "?", + "l3": "My name is Tuan and I'm passionate about Linux, system security, automation, network performance tweaking and all things tech.", + "l4": "While you're here, why don't you check out my projects over on ", + "l4_1": "?", "contact_button": "Get in touch." } }, "cv": { - "introduction": "While studying for my bachelors degree I accumulated a lot of industry and academic experience. My professional and personal intererests are DevOps/IaC, Systems/Software Security and Computer Networking. All of which I deepen in personal projects such as my homelab and CTF challenges.", + "introduction_0": "While studying for my bachelors degree I accumulated a lot of industry and academic experience. My professional and personal intererests are DevOps/IaC, Systems/Software Security and Computer Networking. All of which I deepen in personal projects such as my homelab and CTF challenges.", "workexperience": { "title": "Work Experience", "se1_gefeba": { @@ -53,6 +54,9 @@ "description": "While working for the Network Communication System Research Group at the University Duisburg-Essen as a research assistant I've assisted in research around software defined networking, 5G, congestion control algorithms and federated machine learning. I've established and managed the research groups on-premise and cloud infractructure, inventory system and online presence." } }, + "socials": { + "title": "Socials" + }, "education": { "title": "Education", "bachelor": { From bec4c608f17c0b904e335b681f15f222ad7fac0a Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Tue, 3 Sep 2024 11:23:00 +0200 Subject: [PATCH 3/9] Fixed flex-boxes in CV section Signed-off-by: Tuan-Dat Tran --- README.md | 10 +++++++++ assets/tailwind.css | 53 ++++++++++++++++++++++++++++++++++++++------- src/cv.rs | 18 +++++++-------- 3 files changed, 64 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index a72d009..b1cf2a6 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,16 @@ My personal website. +## Usage + +```sh +npx tailwindcss -i ./input.css -o ./assets/tailwind.css --watch +``` + +```sh + dx serve --platform fullstack +``` + ## Screenshot [[./resources/screenshot.webp]] diff --git a/assets/tailwind.css b/assets/tailwind.css index f82d366..6b7d51d 100644 --- a/assets/tailwind.css +++ b/assets/tailwind.css @@ -608,6 +608,10 @@ video { inset-inline-start: -0.375rem; } +.m-16 { + margin: 4rem; +} + .mx-16 { margin-left: 4rem; margin-right: 4rem; @@ -628,6 +632,16 @@ video { margin-bottom: 2rem; } +.my-16 { + margin-top: 4rem; + margin-bottom: 4rem; +} + +.mx-8 { + margin-left: 2rem; + margin-right: 2rem; +} + .mb-1 { margin-bottom: 0.25rem; } @@ -700,10 +714,6 @@ video { height: 1px; } -.h-32 { - height: 8rem; -} - .min-h-screen { min-height: 100vh; } @@ -785,6 +795,16 @@ video { gap: 1rem; } +.gap-2 { + gap: 0.5rem; +} + +.space-x-4 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(1rem * var(--tw-space-x-reverse)); + margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse))); +} + .space-x-8 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(2rem * var(--tw-space-x-reverse)); @@ -797,10 +817,16 @@ video { margin-bottom: calc(0.5rem * var(--tw-space-y-reverse)); } -.space-x-4 > :not([hidden]) ~ :not([hidden]) { - --tw-space-x-reverse: 0; - margin-right: calc(1rem * var(--tw-space-x-reverse)); - margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse))); +.space-y-4 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(1rem * var(--tw-space-y-reverse)); +} + +.space-y-8 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(2rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(2rem * var(--tw-space-y-reverse)); } .overflow-x-auto { @@ -1279,6 +1305,11 @@ video { } @media (min-width: 640px) { + .sm\:my-16 { + margin-top: 4rem; + margin-bottom: 4rem; + } + .sm\:mt-0 { margin-top: 0px; } @@ -1293,6 +1324,12 @@ video { margin-bottom: calc(0px * var(--tw-space-y-reverse)); } + .sm\:space-x-8 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(2rem * var(--tw-space-x-reverse)); + margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); + } + .sm\:text-center { text-align: center; } diff --git a/src/cv.rs b/src/cv.rs index f1fa6b5..e737916 100644 --- a/src/cv.rs +++ b/src/cv.rs @@ -7,16 +7,21 @@ use crate::components::{H4, HR}; pub fn CV() -> Element { rsx! { div { - class: "flex flex-col ", + class: "flex flex-col", div { - class: "flex justify-between", + class: "flex flex-col sm:flex-row justify-center items-center sm:space-x-8 space-y-8 sm:space-y-0", + img { + class: "rounded-full w-24 h-24", + alt: "headshot", + src: "/pictures/headshot.webp" + } Introduction {}, Socials {} }, HR {} div { - class: "flex justify-between", + class: "flex flex-col justify-between sm:flex-row", WorkExperience {}, Miscellaneous {}, }, @@ -31,11 +36,6 @@ fn Introduction() -> Element { rsx! { div { class: "flex", - - img { - class: "rounded-full w-16 h-16 mx-16", - src: "/pictures/headshot.webp" - } P { { translate!(i18, "cv.introduction_0") } }, P { { translate!(i18, "cv.introduction_1") } } }, @@ -195,7 +195,7 @@ fn CVEntry(props: CVEntryProps) -> Element { time { class:"mb-1 text-sm font-normal leading-none text-gray-400 dark:text-gray-500", "{props.time}"}, h6 { class: "text-lg font-semibold text-gray-900 dark:text-white", "{props.title}"} ul { - class: "flex", + class: "flex flex-wrap gap-2", for (index, value) in props.technologies.iter().enumerate() { li { key: "{index}", RandomBadge { text: "{value}"} } } From 3610f338aab86ab9310443c4bda828e19a1ec2e8 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Tue, 3 Sep 2024 12:40:48 +0200 Subject: [PATCH 4/9] centralize header Signed-off-by: Tuan-Dat Tran --- assets/tailwind.css | 4 ++++ src/layout/header.rs | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/assets/tailwind.css b/assets/tailwind.css index 6b7d51d..e1f32ae 100644 --- a/assets/tailwind.css +++ b/assets/tailwind.css @@ -1318,6 +1318,10 @@ video { flex-direction: row; } + .sm\:items-center { + align-items: center; + } + .sm\:space-y-0 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse))); diff --git a/src/layout/header.rs b/src/layout/header.rs index d10dc77..cb318f8 100644 --- a/src/layout/header.rs +++ b/src/layout/header.rs @@ -13,7 +13,9 @@ pub fn Header() -> Element { class: "container mx-auto p-4", ul { - class:"flex flex-col justify-between sm:flex-row justify-center space-y-2 sm:space-y-0 sm:space-s-4", + class:"flex flex-col justify-between items-center sm:flex-row justify-center space-y-2 sm:space-y-0 sm:space-s-4", + + // class:"flex flex-col sm:flex-row justify-center items-center sm:space-x-8 space-y-8 sm:space-y-0", li { Link { to: Route::Home {}, From ac80065e8294b4bc4ab961f69d3477a5ea904fe4 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Sun, 8 Sep 2024 22:53:48 +0200 Subject: [PATCH 5/9] Fixed multi component i18n strings and added serverside impressum Signed-off-by: Tuan-Dat Tran --- Cargo.lock | 1 + Cargo.toml | 1 + Dockerfile | 2 +- assets/tailwind.css | 58 +++------------------- src/components/mod.rs | 102 +++++++++++++++++++++++++++++++++++++++ src/consulting.rs | 10 ---- src/home.rs | 24 ++++----- src/impressum.rs | 70 ++++++++++++++++----------- src/languages/de-DE.json | 6 +-- src/languages/en-GB.json | 8 +-- src/layout/footer.rs | 41 +--------------- src/layout/header.rs | 20 ++++---- src/layout/mod.rs | 4 +- src/main.rs | 4 -- src/publications.rs | 34 +++---------- 15 files changed, 190 insertions(+), 195 deletions(-) delete mode 100644 src/consulting.rs diff --git a/Cargo.lock b/Cargo.lock index 7cf5389..1109031 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,6 +114,7 @@ dependencies = [ "lazy_static", "manganis", "serde", + "tokio", "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index 04df9ed..2d0cdae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,7 @@ edition = "2021" [dependencies] serde = { version = "1.0.197", features = ["derive"] } dioxus = { version = "0.5", features = ["fullstack", "router"] } +tokio = { version = "1", features = ["full"], optional = true } # Debug tracing = "0.1.40" diff --git a/Dockerfile b/Dockerfile index 1722d77..76d08b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.79.0 AS dioxus +FROM rust:1.80.1 AS dioxus RUN cargo install dioxus-cli@^0.5 FROM dioxus AS builder diff --git a/assets/tailwind.css b/assets/tailwind.css index e1f32ae..52ddfd2 100644 --- a/assets/tailwind.css +++ b/assets/tailwind.css @@ -608,15 +608,6 @@ video { inset-inline-start: -0.375rem; } -.m-16 { - margin: 4rem; -} - -.mx-16 { - margin-left: 4rem; - margin-right: 4rem; -} - .mx-auto { margin-left: auto; margin-right: auto; @@ -632,16 +623,6 @@ video { margin-bottom: 2rem; } -.my-16 { - margin-top: 4rem; - margin-bottom: 4rem; -} - -.mx-8 { - margin-left: 2rem; - margin-right: 2rem; -} - .mb-1 { margin-bottom: 0.25rem; } @@ -690,10 +671,6 @@ video { display: flex; } -.h-16 { - height: 4rem; -} - .h-24 { height: 6rem; } @@ -718,10 +695,6 @@ video { min-height: 100vh; } -.w-16 { - width: 4rem; -} - .w-24 { width: 6rem; } @@ -791,14 +764,14 @@ video { justify-content: space-between; } -.gap-4 { - gap: 1rem; -} - .gap-2 { gap: 0.5rem; } +.gap-4 { + gap: 1rem; +} + .space-x-4 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(1rem * var(--tw-space-x-reverse)); @@ -817,12 +790,6 @@ video { margin-bottom: calc(0.5rem * var(--tw-space-y-reverse)); } -.space-y-4 > :not([hidden]) ~ :not([hidden]) { - --tw-space-y-reverse: 0; - margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse))); - margin-bottom: calc(1rem * var(--tw-space-y-reverse)); -} - .space-y-8 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; margin-top: calc(2rem * calc(1 - var(--tw-space-y-reverse))); @@ -1305,11 +1272,6 @@ video { } @media (min-width: 640px) { - .sm\:my-16 { - margin-top: 4rem; - margin-bottom: 4rem; - } - .sm\:mt-0 { margin-top: 0px; } @@ -1318,8 +1280,10 @@ video { flex-direction: row; } - .sm\:items-center { - align-items: center; + .sm\:space-x-8 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(2rem * var(--tw-space-x-reverse)); + margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); } .sm\:space-y-0 > :not([hidden]) ~ :not([hidden]) { @@ -1328,12 +1292,6 @@ video { margin-bottom: calc(0px * var(--tw-space-y-reverse)); } - .sm\:space-x-8 > :not([hidden]) ~ :not([hidden]) { - --tw-space-x-reverse: 0; - margin-right: calc(2rem * var(--tw-space-x-reverse)); - margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); - } - .sm\:text-center { text-align: center; } diff --git a/src/components/mod.rs b/src/components/mod.rs index 0e70e4b..8669da8 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -142,3 +142,105 @@ pub fn HR() -> Element { hr { class:"h-px my-8 bg-gray-200 border-0 dark:bg-gray-700"} } } + +#[derive(Clone, PartialEq, Props)] +pub struct BoldingProp { + authors: String, + patterns: Vec, +} + +pub fn Bolding(prop: BoldingProp) -> Element { + let mut elements = vec![]; + let mut last_index = 0; + let authors_text = &prop.authors; + + let mut matches: Vec<(usize, usize, &str)> = vec![]; + + for pattern in &prop.patterns { + for (start, _) in authors_text.match_indices(pattern) { + matches.push((start, start + pattern.len(), pattern)); + } + } + + matches.sort_by_key(|(start, _, _)| *start); + + for (start, end, matched_pattern) in matches { + if last_index < start { + elements.push(rsx! { "{&authors_text[last_index..start]}" }); + } + + elements.push(rsx! { b { "{matched_pattern}" } }); + last_index = end; + } + + if last_index < authors_text.len() { + elements.push(rsx! { "{&authors_text[last_index..]}" }); + } + + rsx! { + div { + P { + for i in elements { + {i} + } + } + } + } +} + +#[derive(Clone, PartialEq, Props)] +pub struct UrlingProp { + #[props(default = "".to_string())] + class: String, + text: String, + patterns: Vec, + url: String, + #[props(default = true)] + new_tab: bool, +} + +pub fn Urling(prop: UrlingProp) -> Element { + let mut elements = vec![]; + let mut last_index = 0; + let text = &prop.text; + + let mut matches: Vec<(usize, usize, &str)> = vec![]; + + for pattern in &prop.patterns { + for (start, _) in text.match_indices(pattern) { + matches.push((start, start + pattern.len(), pattern)); + } + } + + matches.sort_by_key(|(start, _, _)| *start); + + for (start, end, matched_pattern) in matches { + if last_index < start { + elements.push(rsx! { "{&text[last_index..start]}" }); + } + + elements.push(rsx! { + Link { + class: "{prop.class}", + to: "{prop.url}", + new_tab: prop.new_tab, + "{matched_pattern}" + } + }); + last_index = end; + } + + if last_index < text.len() { + elements.push(rsx! { "{&text[last_index..]}" }); + } + + rsx! { + div { + P { + for i in elements { + {i} + } + } + } + } +} diff --git a/src/consulting.rs b/src/consulting.rs deleted file mode 100644 index 920ed43..0000000 --- a/src/consulting.rs +++ /dev/null @@ -1,10 +0,0 @@ -use dioxus::prelude::*; - -use crate::components::UnderConstruction; - -#[component] -pub fn Consulting() -> Element { - rsx! { - UnderConstruction { }, - } -} diff --git a/src/home.rs b/src/home.rs index 2cf72cb..010316b 100644 --- a/src/home.rs +++ b/src/home.rs @@ -1,10 +1,11 @@ -use crate::components::{Card, P}; +use crate::components::{Card, Urling, P}; use dioxus::prelude::*; use dioxus_sdk::{i18n::use_i18, translate}; #[component] pub fn Home() -> Element { let i18 = use_i18(); + rsx! { div { class: "container mx-auto p-4 flex items-center justify-center max-w-md w-full", @@ -16,17 +17,16 @@ pub fn Home() -> Element { class: "py-4", div { class: "mb-2", - P { { translate!(i18, "home.card.l1") } }, - P { { translate!(i18, "home.card.l2") } }, - P { { translate!(i18, "home.card.l3") } }, - P { { translate!(i18, "home.card.l4") } - Link { - to: "https://git.tudattr.dev/explore/repos", - new_tab: true, - class: "items-center font-medium hover:underline", - "gitea"}, - { translate!(i18, "home.card.l4_1") } - }, + for line in translate!(i18, "home.card.text").split("\n").into_iter() { + P { + Urling { + class: "items-center font-medium hover:underline", + text: line, + patterns: vec!["Gitea".to_string()], + url: "https://git.tudattr.dev/explore/repos" + } + } + } }, }, Link { diff --git a/src/impressum.rs b/src/impressum.rs index a4f7127..3134acc 100644 --- a/src/impressum.rs +++ b/src/impressum.rs @@ -1,48 +1,60 @@ use dioxus::prelude::*; use dioxus_sdk::{i18n::use_i18, translate}; -use tracing::info; use crate::components::{H1, HR, P}; #[component] pub fn Impressum() -> Element { - let mut show_impressum = use_signal(|| false); let i18 = use_i18(); + let mut impressum = use_signal(Vec::::new); + let mut contact = use_signal(Vec::::new); rsx! { - if show_impressum() { + div { div { - div { - class: "flex flex-col items-center", - button { - onclick: move |_| { - info!("Hide impressum."); - }, - H1 { { translate!(i18, "impressum.on") } }, - }, - P { "Tuan-Dat Tran" }, - P { "c/o AutorenServices.de" }, - P { "Birkenallee 24" }, - P { "36037 Fulda" }, - }, - HR {} - div { - class: "flex flex-col items-center", - P { "tuan-dat.tran@tudattr.dev" }, - P { "+49 176 83468388" }, - } - } - } else { - div { - class: "flex flex-col items-center p-3", + class: "flex flex-col items-center", button { onclick: move |_| async move { - show_impressum.set(true); + if let Ok(data) = get_impressum().await { + impressum.set(data.clone()); + } + if let Ok(data) = get_contact().await { + contact.set(data.clone()); + } }, - - H1 { { translate!(i18, "impressum.off") } }, + H1 { { translate!(i18, "impressum.on") } }, }, + }, + div { + class: "flex flex-col items-center", + for line in impressum() { + P { {line} } + } + } + if !impressum.read().is_empty() { HR{} }, + div { + class: "flex flex-col items-center", + for line in contact() { + P { {line} } + } } } } } + +#[server(GetServerData)] +async fn get_impressum() -> Result, ServerFnError> { + Ok(vec![ + "Tuan-Dat Tran".to_string(), + "c/o AutorenServices.de".to_string(), + "Birkenallee 24".to_string(), + "36037 Fulda".to_string(), + ]) +} + +async fn get_contact() -> Result, ServerFnError> { + Ok(vec![ + "tuan-dat.tran@tudattr.dev".to_string(), + "+49 176 83468388".to_string(), + ]) +} diff --git a/src/languages/de-DE.json b/src/languages/de-DE.json index 5bf1b23..a6fa17d 100644 --- a/src/languages/de-DE.json +++ b/src/languages/de-DE.json @@ -16,11 +16,7 @@ "card": { "name": "Tuan-Dat Tran", "gender": "", - "l1": "Hallihallo! 👋🏻👋🏼👋🏽👋🏾👋🏿", - "l2": "Willkommen auf meiner kleinen Webseite im World Wide Web.", - "l3": "Mein Name ist Tuan und ich bin Linux-Bastler, IT-Security Nerd und Automatisierer aus Leidenschaft.", - "l4": "Während du hier bist, schau dir doch meine Projekte auf ", - "l4_1": " an.", + "text": "Hallihallo! 👋🏻👋🏼👋🏽👋🏾👋🏿\nWillkommen auf meiner kleinen Webseite im World Wide Web.\nMein Name ist Tuan und ich bin Linux-Bastler, IT-Security Nerd und Automatisierer aus Leidenschaft.\nWährend du hier bist, schau dir doch meine Projekte auf Gitea an.\n", "contact_button": "Get in touch." } }, diff --git a/src/languages/en-GB.json b/src/languages/en-GB.json index 888fcc9..957fbaf 100644 --- a/src/languages/en-GB.json +++ b/src/languages/en-GB.json @@ -3,7 +3,7 @@ "texts": { "headers": { "home": "Home", - "cv": "CV", + "cv": "Résumé", "publications_projects": "Publications/Projects", "consulting": "Consulting", "about": "About", @@ -16,11 +16,7 @@ "card": { "name": "Tuan-Dat Tran", "gender": "(He/Him)", - "l1": "Hey there! 👋🏻👋🏼👋🏽👋🏾👋🏿", - "l2": "Welcome to my little place on the internet.", - "l3": "My name is Tuan and I'm passionate about Linux, system security, automation, network performance tweaking and all things tech.", - "l4": "While you're here, why don't you check out my projects over on ", - "l4_1": "?", + "text": "Hey there! 👋🏻👋🏼👋🏽👋🏾👋🏿\nWelcome to my little place on the internet\nMy name is Tuan and I'm passionate about Linux, system security, automation, network performance tweaking and all things tech.\nWhile you're here, why don't you check out my projects over on Gitea?", "contact_button": "Get in touch." } }, diff --git a/src/layout/footer.rs b/src/layout/footer.rs index 3dab258..628f162 100644 --- a/src/layout/footer.rs +++ b/src/layout/footer.rs @@ -1,15 +1,12 @@ use dioxus::prelude::*; use dioxus_sdk::{i18n::use_i18, translate}; -use crate::components::H1; - pub fn Footer() -> Element { let i18 = use_i18(); rsx! { div { - class: "container mx-auto", - // ToolsUsed {}, + class: "container mx-auto pb-4", footer { class:"bg-white rounded-lg shadow dark:bg-gray-800", div { @@ -32,42 +29,6 @@ pub fn Footer() -> Element { } } -#[allow(dead_code)] -fn ToolsUsed() -> Element { - rsx! { - div { - class:"items-center bg-white rounded-lg shadow dark:bg-gray-800 p-4 my-4", - div { - H1 {class: "justify-center", "Tools used" }, - } - div { - class: "flex h-fill overflow-x-auto", - Logo { - src: "https://raw.githubusercontent.com/SAWARATSUKI/Logogs/main/Rust/Rust.png", - alt: "Rust" - }, - Logo { - src: "https://raw.githubusercontent.com/SAWARATSUKI/Logogs/main/Tailwindcss/Tailwindcss6.png", - alt: "Tailwindcss" - }, - Logo { - src: "https://raw.githubusercontent.com/SAWARATSUKI/Logogs/main/Html/HTML.png", - alt: "HTML" - }, - Logo { - src: "https://raw.githubusercontent.com/Aikoyori/ProgrammingVTuberLogos/main/Docker/DockerLogo.png", - alt: "Docker" - }, - Logo { - src: "https://raw.githubusercontent.com/Aikoyori/ProgrammingVTuberLogos/main/Neovim/NeovimLogo.png", - alt: "NeoVim" - }, - - } - } - } -} - #[component] fn Logo(src: String, alt: String) -> Element { rsx! { diff --git a/src/layout/header.rs b/src/layout/header.rs index cb318f8..dfe3feb 100644 --- a/src/layout/header.rs +++ b/src/layout/header.rs @@ -9,13 +9,10 @@ pub fn Header() -> Element { rsx! { nav { div { - // class: "justify-between p-4 space-x-8", - class: "container mx-auto p-4", + class: "container mx-auto py-4", ul { - class:"flex flex-col justify-between items-center sm:flex-row justify-center space-y-2 sm:space-y-0 sm:space-s-4", - - // class:"flex flex-col sm:flex-row justify-center items-center sm:space-x-8 space-y-8 sm:space-y-0", + class:"flex flex-col justify-between items-center justify-center space-y-2 sm:flex-row sm:space-y-0 sm:space-s-4", li { Link { to: Route::Home {}, @@ -26,7 +23,6 @@ pub fn Header() -> Element { li { HeaderLink { url: Route::Home {}, text: translate!(i18, "headers.home")} }, li { HeaderLink { url: Route::CV {}, text: translate!(i18, "headers.cv") } }, li { HeaderLink { url: Route::PublicationsProjects {}, text: translate!(i18, "headers.publications_projects") } }, - li { HeaderLink { url: Route::Consulting {}, text: translate!(i18, "headers.consulting") } }, li { HeaderLink { url: Route::Impressum {}, text: translate!(i18, "headers.about") } }, li { LanguageButtonGroup {} }, }, @@ -44,9 +40,15 @@ fn LanguageButtonGroup() -> Element { rsx! { div { - class: "rounded-md shadow-sm justify-end", - button { class: "px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-s-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white", onclick: change_to_english, label { { translate!(i18, "headers.language_buttons.english") } } }, - button { class: "px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-e-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white", onclick: change_to_german, label { { translate!(i18, "headers.language_buttons.german") } } } + class: "rounded-md shadow-sm justify-end", + button { + class: "px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-s-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white", + onclick: change_to_english, + label { { translate!(i18, "headers.language_buttons.english") } } }, + button { + class: "px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-e-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white", + onclick: change_to_german, + label { { translate!(i18, "headers.language_buttons.german") } } } } } } diff --git a/src/layout/mod.rs b/src/layout/mod.rs index fea89e3..66daaec 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -14,8 +14,8 @@ pub fn Layout() -> Element { Header {}, Body { Outlet:: {}, - Footer {}, - } + }, + Footer {} } } } diff --git a/src/main.rs b/src/main.rs index 7bd5a6e..c9d69ae 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,6 @@ use layout::header::Header; use tracing::Level; pub mod components; -mod consulting; mod cv; mod home; mod impressum; @@ -19,7 +18,6 @@ mod languages; mod layout; mod publications; -use crate::consulting::Consulting; use crate::cv::CV; use crate::home::Home; use crate::impressum::Impressum; @@ -39,8 +37,6 @@ pub enum Route { PublicationsProjects {}, #[route("/resume")] CV {}, - #[route("/consulting")] - Consulting {}, #[end_layout] #[route("/:..route")] PageNotFound { route: Vec }, diff --git a/src/publications.rs b/src/publications.rs index 6cdb80c..815c733 100644 --- a/src/publications.rs +++ b/src/publications.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; use dioxus_sdk::{i18n::use_i18, translate}; -use crate::components::{UnderConstruction, H1, HR}; +use crate::components::{Bolding, UnderConstruction, H1, HR}; #[component] pub fn PublicationsProjects() -> Element { @@ -60,7 +60,7 @@ fn Publications() -> Element { } } fn Publication(prop: PublicationProp) -> Element { - let pattern = "T.-D. Tran"; + let pattern = vec!["T.-D. Tran".to_string(), "Tuan-Dat Tran".to_string()]; rsx! { Link { class:"block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700", @@ -73,9 +73,9 @@ fn Publication(prop: PublicationProp) -> Element { span { class: "text-lg text-gray-900 dark:text-white", "{prop.conference}" }, p { class:"font-normal text-gray-700 dark:text-gray-400 italic", - Authors { + Bolding { authors: "{prop.authors}", - pattern: "{pattern}", + patterns: pattern, }, } p { @@ -129,7 +129,7 @@ struct ProjectProp { } fn Project(prop: ProjectProp) -> Element { - let pattern = "T.-D. Tran"; + let pattern = vec!["T.-D. Tran".to_string(), "Tuan-Dat Tran".to_string()]; rsx! { Link { @@ -143,9 +143,9 @@ fn Project(prop: ProjectProp) -> Element { p { class: "text-lg text-gray-900 dark:text-white", "{prop.kind}" }, p { class:"font-normal text-gray-700 dark:text-gray-400", - Authors { + Bolding { authors: "{prop.authors}", - pattern: "{pattern}", + patterns: pattern, }, } p { @@ -155,23 +155,3 @@ fn Project(prop: ProjectProp) -> Element { } } } - -#[derive(Clone, PartialEq, Props)] -struct AuthorProp { - authors: String, - pattern: String, -} - -fn Authors(prop: AuthorProp) -> Element { - if let Some(start) = prop.authors.find(&prop.pattern) { - let end = start + prop.pattern.len(); - let left = &prop.authors[..start]; - let middle = &prop.authors[start..end]; - let right = &prop.authors[end..]; - rsx! { - "{left}" , b { "{middle}" }, "{right}", - } - } else { - rsx! { "{prop.authors}" } - } -} From 74f68eff5b8e1670452d6682d6997ef77efba701 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Wed, 11 Dec 2024 23:28:12 +0100 Subject: [PATCH 6/9] chore(dioxus): Upgraded to dioxus 0.6.0 Signed-off-by: Tuan-Dat Tran --- Cargo.lock | 3753 +++++++++++++++++++++++------ Cargo.toml | 26 +- Dioxus.toml | 16 - assets/android-chrome-192x192.png | Bin 27347 -> 0 bytes assets/android-chrome-512x512.png | Bin 112643 -> 0 bytes assets/apple-touch-icon.png | Bin 24259 -> 0 bytes assets/favicon-16x16.png | Bin 742 -> 0 bytes assets/favicon-32x32.png | Bin 1918 -> 0 bytes src/components/mod.rs | 6 +- src/cv.rs | 93 +- src/home.rs | 14 +- src/impressum.rs | 5 +- src/languages.rs | 2 - src/languages/de-DE.ftl | 90 + src/languages/de-DE.json | 151 -- src/languages/en-GB.ftl | 90 + src/languages/en-GB.json | 151 -- src/layout/footer.rs | 12 +- src/layout/header.rs | 24 +- src/main.rs | 33 +- src/publications.rs | 62 +- 21 files changed, 3317 insertions(+), 1211 deletions(-) delete mode 100644 assets/android-chrome-192x192.png delete mode 100644 assets/android-chrome-512x512.png delete mode 100644 assets/apple-touch-icon.png delete mode 100644 assets/favicon-16x16.png delete mode 100644 assets/favicon-32x32.png delete mode 100644 src/languages.rs create mode 100644 src/languages/de-DE.ftl delete mode 100644 src/languages/de-DE.json create mode 100644 src/languages/en-GB.ftl delete mode 100644 src/languages/en-GB.json diff --git a/Cargo.lock b/Cargo.lock index 1109031..5216d05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,22 +18,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "ahash" -version = "0.8.11" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", + "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-tzdata" @@ -51,22 +54,21 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.86" +name = "ashpd" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "anymap" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" - -[[package]] -name = "anymap2" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "rand 0.8.5", + "serde", + "serde_repr", + "tokio", + "url", + "zbus", +] [[package]] name = "askama_escape" @@ -74,6 +76,18 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-channel" version = "2.3.1" @@ -86,6 +100,84 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-io" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" +dependencies = [ + "async-channel", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "tracing", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "async-signal" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", +] + [[package]] name = "async-task" version = "4.7.1" @@ -100,7 +192,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -109,6 +201,7 @@ version = "0.2.2" dependencies = [ "dioxus", "dioxus-free-icons", + "dioxus-i18n", "dioxus-logger", "dioxus-sdk", "lazy_static", @@ -118,6 +211,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "atk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" +dependencies = [ + "atk-sys", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -132,9 +248,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", @@ -142,12 +258,12 @@ dependencies = [ "base64", "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-util", - "itoa", + "itoa 1.0.11", "matchit", "memchr", "mime", @@ -160,10 +276,10 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper 1.0.1", + "sync_wrapper", "tokio", "tokio-tungstenite", - "tower", + "tower 0.5.2", "tower-layer", "tower-service", "tracing", @@ -171,20 +287,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper", "tower-layer", "tower-service", "tracing", @@ -192,14 +308,13 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa" +checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ - "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -212,25 +327,16 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" @@ -247,6 +353,12 @@ dependencies = [ "serde", ] +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + [[package]] name = "block-buffer" version = "0.10.4" @@ -256,6 +368,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + [[package]] name = "blocking" version = "1.6.1" @@ -288,37 +409,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] -name = "camino" -version = "1.1.9" +name = "cairo-rs" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", + "bitflags 2.6.0", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", "thiserror", ] +[[package]] +name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + [[package]] name = "cc" version = "1.1.15" @@ -328,6 +442,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfb" version = "0.7.3" @@ -346,6 +466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -356,9 +477,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -395,6 +516,76 @@ dependencies = [ "half", ] +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" +dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa-foundation 0.2.0", + "core-foundation 0.10.0", + "core-graphics 0.24.0", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", + "libc", + "objc", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concurrent-queue" version = "2.5.0" @@ -414,6 +605,27 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "const-serialize" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08edfb80c2a97c985743a0a3ca8f9fa330354681e2fe4f1c6027ee1222b34dc" +dependencies = [ + "const-serialize-macro", + "serde", +] + +[[package]] +name = "const-serialize-macro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc9be2fb280bda7c4c2d8dda905f38ec64ec85436fd11a42dc67fdbd2f7bf4c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + [[package]] name = "const_format" version = "0.2.32" @@ -435,10 +647,10 @@ dependencies = [ ] [[package]] -name = "constcat" -version = "0.3.1" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "convert_case" @@ -459,12 +671,70 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "libc", +] + [[package]] name = "cpufeatures" version = "0.2.13" @@ -474,6 +744,24 @@ dependencies = [ "libc", ] +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.20" @@ -496,6 +784,33 @@ dependencies = [ "typenum", ] +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.76", +] + [[package]] name = "darling" version = "0.20.10" @@ -516,7 +831,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -527,7 +842,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -537,7 +852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -549,6 +864,30 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case 0.4.0", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.76", +] + [[package]] name = "digest" version = "0.10.7" @@ -561,42 +900,45 @@ dependencies = [ [[package]] name = "dioxus" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e7fe217b50d43b27528b0f24c89b411f742a3e7564d1cfbf85253f967954db" +checksum = "16c89dda102f1ff3bbe54a8d3daa4cf5cae17595f54b6338e2c42593a994303a" dependencies = [ + "dioxus-cli-config", "dioxus-config-macro", "dioxus-core", "dioxus-core-macro", + "dioxus-desktop", + "dioxus-devtools", + "dioxus-document", "dioxus-fullstack", + "dioxus-history", "dioxus-hooks", - "dioxus-hot-reload", "dioxus-html", "dioxus-liveview", + "dioxus-logger", "dioxus-router", "dioxus-signals", "dioxus-ssr", "dioxus-web", + "manganis", "serde", ] [[package]] name = "dioxus-cli-config" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7dffc452ed91af6ef772b0d9a5899573f6785314e97c533733ec55413c01df3" +checksum = "27a7caafe149ef8b1bb526ac7dfc6687a6b610a91a7fa8b9f9c2f64825538462" dependencies = [ - "once_cell", - "serde", - "serde_json", - "tracing", + "wasm-bindgen", ] [[package]] name = "dioxus-config-macro" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb1a1aa34cc04c1f7fcbb7a10791ba773cc02d834fe3ec1fe05647699f3b101f" +checksum = "bfcfe6920e96c7f3aeb946479d49b46d253683aa05495c1c291891861e5a7978" dependencies = [ "proc-macro2", "quote", @@ -604,83 +946,186 @@ dependencies = [ [[package]] name = "dioxus-core" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3730d2459ab66951cedf10b09eb84141a6eda7f403c28057cbe010495be156b7" +checksum = "39093c4358bc8b6c80728f9cdc7e8854cdd8ecf8b932fa2864817f6df0103ff0" dependencies = [ + "const_format", + "dioxus-core-types", "futures-channel", "futures-util", "generational-box", "longest-increasing-subsequence", "rustc-hash", + "rustversion", "serde", "slab", "slotmap", "tracing", - "tracing-subscriber", + "warnings", ] [[package]] name = "dioxus-core-macro" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d9c0dfe0e6a46626fa716c4aa1d2ccb273441337909cfeacad5bb6fcfb947d2" +checksum = "59cb17b8f2cea9a43b34f70412b7d77ca4c78f696546cfa717837d98c7be4117" dependencies = [ - "constcat", - "convert_case", + "convert_case 0.6.0", "dioxus-rsx", - "prettyplease", "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] -name = "dioxus-debug-cell" -version = "0.1.1" +name = "dioxus-core-types" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ea539174bb236e0e7dc9c12b19b88eae3cb574dedbd0252a2d43ea7e6de13e2" +checksum = "5a6f64e5d70de1e1492bc845c1f99e3687195a6134598437be6186b768315aa0" +dependencies = [ + "once_cell", +] + +[[package]] +name = "dioxus-desktop" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf5999ad0fe42a86a0bd34c0b02ddd1977f8d4ec273466232dfd9bf0481f3979" +dependencies = [ + "async-trait", + "cocoa 0.25.0", + "core-foundation 0.9.4", + "dioxus-cli-config", + "dioxus-core", + "dioxus-devtools", + "dioxus-document", + "dioxus-history", + "dioxus-hooks", + "dioxus-html", + "dioxus-interpreter-js", + "dioxus-signals", + "dunce", + "futures-channel", + "futures-util", + "generational-box", + "global-hotkey", + "infer", + "jni", + "lazy-js-bundle", + "muda 0.11.5", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "objc_id", + "once_cell", + "rfd", + "rustc-hash", + "serde", + "serde_json", + "signal-hook", + "slab", + "tao", + "thiserror", + "tokio", + "tracing", + "tray-icon", + "urlencoding", + "webbrowser", + "wry", +] + +[[package]] +name = "dioxus-devtools" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "961ce08b113c43b0797ef61fb63f358c7303581dd2bf77521a540f361f253911" +dependencies = [ + "dioxus-core", + "dioxus-devtools-types", + "dioxus-signals", + "serde", + "serde_json", + "tracing", + "tungstenite 0.23.0", + "warnings", +] + +[[package]] +name = "dioxus-devtools-types" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97f6e0ad1964805c50eff72436be938f2c4b9cdc707d51b5548d4766ec2e2beb" +dependencies = [ + "dioxus-core", + "serde", +] + +[[package]] +name = "dioxus-document" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3543ab4217947ee27b86826d486e8e2889c6d271fb3ebe886b9c67081893951d" +dependencies = [ + "dioxus-core", + "dioxus-core-macro", + "dioxus-core-types", + "dioxus-html", + "futures-channel", + "futures-util", + "generational-box", + "lazy-js-bundle", + "serde", + "serde_json", + "tracing", +] [[package]] name = "dioxus-free-icons" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfbba8b2089b185e4cebc394fb36353c7269a3230b542d97d3d192ccd864d48b" +checksum = "cd226c24168bb63d12d69cc0e7a6d73faa970574445c8e79c29965892f1a2ad8" dependencies = [ "dioxus", ] [[package]] name = "dioxus-fullstack" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80f0ac18166302341164e681322e0385131c08a11c3cc1c51ee8df799ab0d3d" +checksum = "ffe83189fc0139a34a4cc195aa3eb917f5b6a3317bf3f4183d9e8f1e110a9bab" dependencies = [ - "anymap", "async-trait", "axum", "base64", "bytes", "ciborium", "dioxus-cli-config", - "dioxus-hot-reload", + "dioxus-desktop", + "dioxus-devtools", + "dioxus-history", + "dioxus-interpreter-js", + "dioxus-isrg", "dioxus-lib", "dioxus-ssr", "dioxus-web", "dioxus_server_macro", + "futures-channel", "futures-util", - "http 1.1.0", - "hyper 1.4.1", + "generational-box", + "http", + "hyper", "once_cell", + "parking_lot", "pin-project", "serde", - "serde_json", "server_fn", "thiserror", "tokio", "tokio-stream", "tokio-util", - "tower", + "tower 0.4.13", "tower-http", "tower-layer", "tracing", @@ -689,81 +1134,93 @@ dependencies = [ ] [[package]] -name = "dioxus-hooks" -version = "0.5.6" +name = "dioxus-history" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8f9c661eea82295219d25555d5c0b597e74186b029038ceb5e3700ccbd4380" +checksum = "718e5bb9dfbdaef69f34a631b503c059594ed4d990225576c127d95ff43850ee" dependencies = [ "dioxus-core", - "dioxus-debug-cell", - "dioxus-signals", - "futures-channel", - "futures-util", - "generational-box", - "slab", - "thiserror", "tracing", ] [[package]] -name = "dioxus-hot-reload" -version = "0.5.6" +name = "dioxus-hooks" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d01246cb1b93437fb0bbd0dd11cfc66342d86b4311819e76654f2017ce1473" +checksum = "28dc7127b10fd8e50cec15510674c7852cfa44069cc3771ccace8130a29714b2" dependencies = [ "dioxus-core", - "dioxus-html", - "dioxus-rsx", - "interprocess-docfix", - "serde", - "serde_json", + "dioxus-signals", + "futures-channel", + "futures-util", + "generational-box", + "rustversion", + "slab", + "tracing", + "warnings", ] [[package]] name = "dioxus-html" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f01a0826f179adad6ea8d6586746e8edde0c602cc86f4eb8e5df7a3b204c4018" +checksum = "e6464a7b8da0f7c63778ddb96c2a55c5e159c58aed07c582991654ba12356eb1" dependencies = [ "async-trait", "dioxus-core", + "dioxus-core-macro", + "dioxus-core-types", + "dioxus-hooks", "dioxus-html-internal-macro", "enumset", "euclid", "futures-channel", "generational-box", "keyboard-types", + "lazy-js-bundle", + "rustversion", "serde", - "serde-value", "serde_json", "serde_repr", "tracing", - "wasm-bindgen", - "web-sys", ] [[package]] name = "dioxus-html-internal-macro" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b96f35a608d0ab8f4ca6f66ce1828354e4ebd41580b12454f490221a11da93c" +checksum = "7d6921c8f0374c8d2fc9024db455f9e1a71ba1b723d80c60ea5d575aea3de163" dependencies = [ - "convert_case", + "convert_case 0.6.0", "proc-macro2", "quote", - "syn", + "syn 2.0.76", +] + +[[package]] +name = "dioxus-i18n" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaa2df724b94e2a93229609951a0570a4b8807215c588e78f88a8532bdde319f" +dependencies = [ + "dioxus-lib", + "fluent", + "unic-langid", ] [[package]] name = "dioxus-interpreter-js" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351fad098c657d14f3ac2900362d2b86e83c22c4c620a404839e1ab628f3395b" +checksum = "e9d9d868af71da85d1c1014ca254afd8b6cf2201f660581d3510517adbde5571" dependencies = [ "dioxus-core", + "dioxus-core-types", "dioxus-html", "js-sys", - "md5", + "lazy-js-bundle", + "rustc-hash", + "serde", "sledgehammer_bindgen", "sledgehammer_utils", "wasm-bindgen", @@ -772,13 +1229,30 @@ dependencies = [ ] [[package]] -name = "dioxus-lib" -version = "0.5.6" +name = "dioxus-isrg" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd39b2c41dd1915dcb91d914ea72d8b646f1f8995aaeff82816b862ec586ecd" +checksum = "8b9777b9a71c9ecede300e52d217b800c5f884654b5af2da2a534c7f8bded7d0" dependencies = [ + "chrono", + "http", + "lru", + "rustc-hash", + "thiserror", + "tracing", +] + +[[package]] +name = "dioxus-lib" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500725dbb131d35567a0e79a650644aea6e9b317206927507b77798578190b55" +dependencies = [ + "dioxus-config-macro", "dioxus-core", "dioxus-core-macro", + "dioxus-document", + "dioxus-history", "dioxus-hooks", "dioxus-html", "dioxus-rsx", @@ -787,14 +1261,16 @@ dependencies = [ [[package]] name = "dioxus-liveview" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ada18a8fe0764f492fd4fb169b818877799e887dbb6ffb19289801d924faf18" +checksum = "0df966bf26040e5875908caa4e59bb2152f3532cca97937a34dd1057168c023f" dependencies = [ "axum", "dioxus-cli-config", "dioxus-core", - "dioxus-hot-reload", + "dioxus-devtools", + "dioxus-document", + "dioxus-history", "dioxus-html", "dioxus-interpreter-js", "futures-channel", @@ -813,11 +1289,12 @@ dependencies = [ [[package]] name = "dioxus-logger" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe09dc9773dc1f1bb0d38529203d6555d08f67aadca5cf955ac3d1a9e69880" +checksum = "86c9db554355b5418ce754c9a98482862f6f71ea1d87f00ee027cd081ad282e6" dependencies = [ "console_error_panic_hook", + "dioxus-cli-config", "tracing", "tracing-subscriber", "tracing-wasm", @@ -825,74 +1302,63 @@ dependencies = [ [[package]] name = "dioxus-router" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c235c5dbeb528c0c2b0424763da812e7500df69b82eddac54db6f4975e065c5f" +checksum = "578d87a3f0a6b71e5d9192121b9fdc5907f704e879ab9f6bb4a7c890c52f5cba" dependencies = [ "dioxus-cli-config", - "dioxus-fullstack", + "dioxus-history", "dioxus-lib", "dioxus-router-macro", - "dioxus-ssr", - "gloo", - "gloo-utils 0.1.7", - "js-sys", - "tokio", + "rustversion", "tracing", "url", "urlencoding", - "wasm-bindgen", - "web-sys", ] [[package]] name = "dioxus-router-macro" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7cd1c5137ba361f2150cdea6b3bc9ddda7b1af84b22c9ee6b5499bf43e1381" +checksum = "4b6f01d38b66a1f3483b9d7c522b48df5196d1c6c9893d3d851a02065149cb37" dependencies = [ "proc-macro2", "quote", "slab", - "syn", + "syn 2.0.76", ] [[package]] name = "dioxus-rsx" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c400bc8a779107d8f3a67b14375db07dbd2bc31163bf085a8e9097f36f7179" +checksum = "f37fa830dd01a3b727fa145f5c10f45e0972434ee4d64270a3abb46da3dc78c4" dependencies = [ - "dioxus-core", - "internment", - "krates", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn", - "tracing", + "syn 2.0.76", ] [[package]] name = "dioxus-sdk" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271adf41837fbbceb955fefd71816d4a3fbbab2829f8c0ea0364584b531ce999" +checksum = "3b7b74aede7070ec1c0ef582dbec8bce93a5c40421155459fcdbcaa0e6ef0bf0" dependencies = [ "cfg-if", "dioxus", "js-sys", - "serde", - "serde_json", "tracing", - "unic-langid", "uuid", + "warnings", ] [[package]] name = "dioxus-signals" -version = "0.5.7" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3e224cd3d3713f159f0199fc088c292a0f4adb94996b48120157f6a8f8342d" +checksum = "1a8e2ac4e906dd26b25f7a9a7c7146cc27e670c793d5c34ef2b64b55f0135cd6" dependencies = [ "dioxus-core", "futures-channel", @@ -902,44 +1368,43 @@ dependencies = [ "parking_lot", "rustc-hash", "tracing", + "warnings", ] [[package]] name = "dioxus-ssr" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "753b1eb29372bb3afcdbc0ac603893802a8b7b70fa94b86a1641408e2b87173b" +checksum = "e6cd3d309a60d654bafcf49b32b96fa72da6d9155582eba9b5c608c07ab0c850" dependencies = [ "askama_escape", - "async-trait", - "chrono", "dioxus-core", - "dioxus-html", - "generational-box", - "http 1.1.0", - "lru", + "dioxus-core-types", "rustc-hash", - "serde_json", - "thiserror", - "tokio", - "tracing", ] [[package]] name = "dioxus-web" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0855ac81fcc9252a0863930a7a7cbb2504fc1b6efe893489c8d0e23aaeb2cb9" +checksum = "57f6760fc88bd79c79eb2467b0661449dff5968320c3c6886c35c861ba05c695" dependencies = [ "async-trait", - "console_error_panic_hook", + "ciborium", + "dioxus-cli-config", "dioxus-core", + "dioxus-core-types", + "dioxus-devtools", + "dioxus-document", + "dioxus-history", "dioxus-html", "dioxus-interpreter-js", + "dioxus-signals", "futures-channel", "futures-util", "generational-box", "js-sys", + "lazy-js-bundle", "rustc-hash", "serde", "serde-wasm-bindgen", @@ -952,17 +1417,43 @@ dependencies = [ [[package]] name = "dioxus_server_macro" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ef2cad17001c1155f019cb69adbacd620644566d78a77d0778807bb106a337" +checksum = "1d63d9edbc70dc06393f0e23efff095fe4025010437648a048fa6208e1a6cdb1" dependencies = [ - "convert_case", "proc-macro2", "quote", "server_fn_macro", - "syn", + "syn 2.0.76", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + [[package]] name = "displaydoc" version = "0.2.5" @@ -971,18 +1462,95 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] -name = "encoding_rs" -version = "0.8.34" +name = "dlopen2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + [[package]] name = "enumset" version = "1.1.5" @@ -1001,7 +1569,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -1012,9 +1580,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1043,9 +1611,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ "event-listener", "pin-project-lite", @@ -1053,15 +1621,82 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] -name = "fixedbitset" -version = "0.4.2" +name = "fdeflate" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "flate2" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +dependencies = [ + "crc32fast", + "miniz_oxide 0.8.0", +] + +[[package]] +name = "fluent" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" +dependencies = [ + "thiserror", +] [[package]] name = "fnv" @@ -1069,13 +1704,40 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", ] [[package]] @@ -1084,6 +1746,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1093,6 +1761,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + [[package]] name = "futures" version = "0.3.30" @@ -1143,11 +1821,14 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ + "fastrand", "futures-core", + "futures-io", + "parking", "pin-project-lite", ] @@ -1159,7 +1840,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -1193,12 +1874,121 @@ dependencies = [ ] [[package]] -name = "generational-box" -version = "0.5.6" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "557cf2cbacd0504c6bf8c29f52f8071e0de1d9783346713dc6121d7fa1e5d0e0" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkx11" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe" +dependencies = [ + "gdk", + "gdkx11-sys", + "gio", + "glib", + "libc", + "x11", +] + +[[package]] +name = "gdkx11-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps", + "x11", +] + +[[package]] +name = "generational-box" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbef36525d55a549ea17c1a33ddbd0dcfd153029e640c9eef845b24ae053dbed" dependencies = [ "parking_lot", + "tracing", ] [[package]] @@ -1211,6 +2001,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + [[package]] name = "getrandom" version = "0.2.15" @@ -1220,7 +2021,7 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -1231,104 +2032,99 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] -name = "gloo" -version = "0.8.1" +name = "gio" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" -dependencies = [ - "gloo-console", - "gloo-dialogs", - "gloo-events", - "gloo-file", - "gloo-history", - "gloo-net 0.3.1", - "gloo-render", - "gloo-storage", - "gloo-timers", - "gloo-utils 0.1.7", - "gloo-worker", -] - -[[package]] -name = "gloo-console" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" -dependencies = [ - "gloo-utils 0.1.7", - "js-sys", - "serde", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-dialogs" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-events" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-file" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" -dependencies = [ - "gloo-events", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-history" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" -dependencies = [ - "gloo-events", - "gloo-utils 0.1.7", - "serde", - "serde-wasm-bindgen", - "serde_urlencoded", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-net" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ "futures-channel", "futures-core", - "futures-sink", - "gloo-utils 0.1.7", - "http 0.2.12", - "js-sys", - "pin-project", - "serde", - "serde_json", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", +] + +[[package]] +name = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" +dependencies = [ + "bitflags 2.6.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" +dependencies = [ + "heck 0.4.1", + "proc-macro-crate 2.0.2", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "global-hotkey" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b436093d1598b05e3b7fddc097b2bad32763f53a1beb25ab6f9718c6a60acd09" +dependencies = [ + "bitflags 2.6.0", + "cocoa 0.25.0", + "crossbeam-channel", + "keyboard-types", + "objc", + "once_cell", + "thiserror", + "windows-sys 0.52.0", + "x11-dl", ] [[package]] @@ -1340,8 +2136,8 @@ dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0", - "http 1.1.0", + "gloo-utils", + "http", "js-sys", "pin-project", "serde", @@ -1352,54 +2148,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-render" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-storage" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" -dependencies = [ - "gloo-utils 0.1.7", - "js-sys", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-utils" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-utils" version = "0.2.0" @@ -1414,39 +2162,66 @@ dependencies = [ ] [[package]] -name = "gloo-worker" -version = "0.2.1" +name = "gobject-sys" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ - "anymap2", - "bincode", - "gloo-console", - "gloo-utils 0.1.7", - "js-sys", - "serde", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", + "glib-sys", + "libc", + "system-deps", ] [[package]] -name = "h2" -version = "0.3.26" +name = "gtk" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", + "atk", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.76", ] [[package]] @@ -1459,14 +2234,27 @@ dependencies = [ "crunchy", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ - "ahash", "allocator-api2", + "equivalent", + "foldhash", ] [[package]] @@ -1475,12 +2263,30 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "home" version = "0.5.9" @@ -1491,14 +2297,17 @@ dependencies = [ ] [[package]] -name = "http" -version = "0.2.12" +name = "html5ever" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ - "bytes", - "fnv", - "itoa", + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -1509,18 +2318,7 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", + "itoa 1.0.11", ] [[package]] @@ -1530,7 +2328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] @@ -1541,16 +2339,16 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] [[package]] name = "http-range-header" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" +checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" [[package]] name = "httparse" @@ -1566,87 +2364,71 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.30" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", "httparse", "httpdate", - "itoa", + "itoa 1.0.11", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", "tower-service", "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.30", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyper-util" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" -dependencies = [ - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", - "pin-project-lite", - "tokio", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1676,12 +2458,22 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] @@ -1694,40 +2486,32 @@ dependencies = [ ] [[package]] -name = "internment" -version = "0.7.5" +name = "instant" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8e537b529b8674e97e9fb82c10ff168a290ac3867a0295f112061ffbca1ef" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ - "hashbrown", - "parking_lot", -] - -[[package]] -name = "interprocess-docfix" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b84ee245c606aeb0841649a9288e3eae8c61b853a8cd5c0e14450e96d53d28f" -dependencies = [ - "blocking", "cfg-if", - "futures-core", - "futures-io", - "intmap", - "libc", - "once_cell", - "rustc_version", - "spinning", - "thiserror", - "to_method", - "winapi", ] [[package]] -name = "intmap" -version = "0.7.1" +name = "intl-memoizer" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] [[package]] name = "inventory" @@ -1737,9 +2521,15 @@ checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" @@ -1747,6 +2537,51 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "javascriptcore-rs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "js-sys" version = "0.3.70" @@ -1768,30 +2603,99 @@ dependencies = [ ] [[package]] -name = "krates" -version = "0.16.10" +name = "kuchikiki" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcb3baf2360eb25ad31f0ada3add63927ada6db457791979b82ac199f835cb9" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" dependencies = [ - "cargo-platform", - "cargo_metadata", - "cfg-expr", - "petgraph", - "semver", + "cssparser", + "html5ever", + "indexmap 1.9.3", + "matches", + "selectors", ] +[[package]] +name = "lazy-js-bundle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703fcd40f2de720718e8b45a68bab510a4a8ee22484f75d0874b202f1eed5aa8" + [[package]] name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +[[package]] +name = "libappindicator" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + [[package]] name = "libc" version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "libxdo" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db" +dependencies = [ + "libxdo-sys", +] + +[[package]] +name = "libxdo-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212" +dependencies = [ + "libc", + "x11", +] + [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -1822,71 +2726,104 @@ checksum = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown", + "hashbrown 0.15.2", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", ] [[package]] name = "manganis" -version = "0.2.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c211cfb4529c79b32307b606e83a1bb15d491b3b4a1ab97159b161d7af9d1b72" +checksum = "287c60ae66fb8a089e4c2c256079dd76e4f9cb147d352b3278ca352e8ed0bf02" dependencies = [ - "dioxus-core", + "const-serialize", + "manganis-core", "manganis-macro", ] [[package]] -name = "manganis-common" -version = "0.2.4" +name = "manganis-core" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542300f1e7d9313de5b7e5b92d273ba42ab547c068d773559d616aa14987de43" +checksum = "c7b349d520edba475a760112e6105c55125d8ab1e94147b219fb2f2e3303fad9" dependencies = [ - "anyhow", - "base64", - "home", - "infer", - "reqwest", + "const-serialize", + "dioxus-cli-config", + "dioxus-core-types", "serde", - "toml", - "tracing", - "url", ] [[package]] name = "manganis-macro" -version = "0.2.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704a0123ac90fa630b21a04fde56c29dfd5a7665c5e8f3639567989daa2d29d1" +checksum = "d7024fc969bf2f2fd874bcd0a5d6ae8f85a2853ba86773a024a744b32f716426" dependencies = [ - "manganis-common", + "manganis-core", "proc-macro2", "quote", - "syn", - "tracing-subscriber", + "syn 2.0.76", ] +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + [[package]] name = "matchit" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - [[package]] name = "memchr" version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.17" @@ -1912,18 +2849,66 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", + "simd-adler32", +] + [[package]] name = "mio" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] +[[package]] +name = "muda" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c47e7625990fc1af2226ea4f34fb2412b03c12639fcb91868581eb3a6893453" +dependencies = [ + "cocoa 0.25.0", + "crossbeam-channel", + "gtk", + "keyboard-types", + "libxdo", + "objc", + "once_cell", + "png", + "thiserror", + "windows-sys 0.52.0", +] + +[[package]] +name = "muda" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdae9c00e61cc0579bcac625e8ad22104c60548a025bfc972dc83868a28e1484" +dependencies = [ + "crossbeam-channel", + "dpi", + "gtk", + "keyboard-types", + "libxdo", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "once_cell", + "png", + "thiserror", + "windows-sys 0.59.0", +] + [[package]] name = "multer" version = "3.1.0" @@ -1933,7 +2918,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 1.1.0", + "http", "httparse", "memchr", "mime", @@ -1959,15 +2944,59 @@ dependencies = [ ] [[package]] -name = "nu-ansi-term" -version = "0.46.0" +name = "ndk" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "overload", - "winapi", + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle 0.6.2", + "thiserror", ] +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + [[package]] name = "num-traits" version = "0.2.19" @@ -1977,6 +3006,165 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate 2.0.2", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + [[package]] name = "object" version = "0.36.4" @@ -1994,13 +3182,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -2015,7 +3203,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -2026,9 +3214,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2037,25 +3225,51 @@ dependencies = [ ] [[package]] -name = "ordered-float" -version = "2.10.1" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" dependencies = [ - "num-traits", + "futures-core", + "pin-project-lite", ] [[package]] -name = "overload" -version = "0.1.1" +name = "pango" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +dependencies = [ + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -2087,13 +3301,95 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] -name = "petgraph" -version = "0.6.5" +name = "phf" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "fixedbitset", - "indexmap", + "phf_macros", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", ] [[package]] @@ -2113,7 +3409,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -2141,9 +3437,43 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "png" +version = "0.17.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.8.0", +] + +[[package]] +name = "polling" +version = "3.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" [[package]] name = "ppv-lite86" @@ -2155,15 +3485,61 @@ dependencies = [ ] [[package]] -name = "prettyplease" -version = "0.2.22" +name = "precomputed-hash" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", - "syn", + "quote", + "version_check", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + [[package]] name = "proc-macro2" version = "1.0.86" @@ -2173,6 +3549,18 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", + "version_check", +] + [[package]] name = "quote" version = "1.0.37" @@ -2182,6 +3570,20 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + [[package]] name = "rand" version = "0.8.5" @@ -2189,8 +3591,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] @@ -2200,7 +3612,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", ] [[package]] @@ -2209,9 +3630,39 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + [[package]] name = "redox_syscall" version = "0.5.3" @@ -2222,25 +3673,66 @@ dependencies = [ ] [[package]] -name = "reqwest" -version = "0.11.27" +name = "redox_users" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "reqwest" +version = "0.12.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "http", + "http-body", + "http-body-util", + "hyper", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", @@ -2249,16 +3741,40 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", + "sync_wrapper", "tokio", "tokio-native-tls", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", - "winreg", + "windows-registry", +] + +[[package]] +name = "rfd" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +dependencies = [ + "ashpd", + "block", + "dispatch", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "pollster", + "raw-window-handle 0.6.2", + "urlencoding", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2284,9 +3800,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -2297,13 +3813,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + [[package]] name = "rustversion" version = "1.0.17" @@ -2317,12 +3839,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] -name = "schannel" -version = "0.1.23" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" dependencies = [ - "windows-sys 0.52.0", + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +dependencies = [ + "windows-sys 0.59.0", ] [[package]] @@ -2338,7 +3869,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", @@ -2346,22 +3877,54 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", ] +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "self_cell" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.1.0", +] + +[[package]] +name = "self_cell" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe" + [[package]] name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] [[package]] name = "send_wrapper" @@ -2381,16 +3944,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde-wasm-bindgen" version = "0.5.0" @@ -2410,7 +3963,7 @@ checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -2419,7 +3972,7 @@ version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "itoa", + "itoa 1.0.11", "memchr", "ryu", "serde", @@ -2431,7 +3984,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ - "itoa", + "itoa 1.0.11", "serde", ] @@ -2454,14 +4007,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -2473,7 +4026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.11", "ryu", "serde", ] @@ -2489,20 +4042,21 @@ dependencies = [ "const_format", "dashmap", "futures", - "gloo-net 0.6.0", - "http 1.1.0", + "gloo-net", + "http", "http-body-util", - "hyper 1.4.1", + "hyper", "inventory", "js-sys", "once_cell", + "reqwest", "send_wrapper", "serde", "serde_json", "serde_qs", "server_fn_macro_default", "thiserror", - "tower", + "tower 0.4.13", "tower-layer", "url", "wasm-bindgen", @@ -2519,10 +4073,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf0e6f71fc924df36e87f27dfbd447f0bedd092d365db3a5396878256d9f00c" dependencies = [ "const_format", - "convert_case", + "convert_case 0.6.0", "proc-macro2", "quote", - "syn", + "syn 2.0.76", "xxhash-rust", ] @@ -2533,7 +4087,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "556e4fd51eb9ee3e7d9fb0febec6cef486dcbc8f7f427591dfcfebee1abe1ad4" dependencies = [ "server_fn_macro", - "syn", + "syn 2.0.76", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", ] [[package]] @@ -2547,6 +4111,17 @@ dependencies = [ "digest", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -2562,6 +4137,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -2571,6 +4156,18 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "slab" version = "0.4.9" @@ -2582,9 +4179,9 @@ dependencies = [ [[package]] name = "sledgehammer_bindgen" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfaf791ff02f48f3518ce825d32cf419c13a43c1d8b1232f74ac89f339c46d2" +checksum = "49e83e178d176459c92bc129cfd0958afac3ced925471b889b3a75546cfc4133" dependencies = [ "sledgehammer_bindgen_macro", "wasm-bindgen", @@ -2592,22 +4189,20 @@ dependencies = [ [[package]] name = "sledgehammer_bindgen_macro" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc90d3e8623d29a664cd8dba5078b600dd203444f00b9739f744e4c6e7aeaf2" +checksum = "33a1b4f13e2bbf2f5b29d09dfebc9de69229ffee245aed80e3b70f9b5fd28c06" dependencies = [ "quote", - "syn", + "syn 2.0.76", ] [[package]] name = "sledgehammer_utils" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f20798defa0e9d4eff9ca451c7f84774c7378a9c3b5a40112cfa2b3eadb97ae2" +checksum = "debdd4b83524961983cea3c55383b3910fd2f24fd13a188f5b091d2d504a61ae" dependencies = [ - "lru", - "once_cell", "rustc-hash", ] @@ -2637,6 +4232,32 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "soup3" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" +dependencies = [ + "futures-channel", + "gio", + "glib", + "libc", + "soup3-sys", +] + +[[package]] +name = "soup3-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + [[package]] name = "spin" version = "0.9.8" @@ -2644,12 +4265,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "spinning" -version = "0.1.0" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ - "lock_api", + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] @@ -2665,42 +4326,88 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", + "futures-core", ] [[package]] -name = "system-configuration-sys" -version = "0.5.0" +name = "system-deps" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "core-foundation-sys", + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "tao" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a93f2c6b8fdaeb7f417bda89b5bc767999745c3052969664ae1fa65892deb7e" +dependencies = [ + "bitflags 2.6.0", + "cocoa 0.26.0", + "core-foundation 0.10.0", + "core-graphics 0.24.0", + "crossbeam-channel", + "dispatch", + "dlopen2", + "dpi", + "gdkwayland-sys", + "gdkx11-sys", + "gtk", + "instant", + "jni", + "lazy_static", "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.2", + "scopeguard", + "tao-macros", + "unicode-segmentation", + "url", + "windows", + "windows-core 0.58.0", + "windows-version", + "x11-dl", ] +[[package]] +name = "tao-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -2709,6 +4416,23 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + [[package]] name = "thiserror" version = "1.0.63" @@ -2726,7 +4450,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -2763,12 +4487,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "to_method" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" - [[package]] name = "tokio" version = "1.40.0" @@ -2784,6 +4502,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", + "tracing", "windows-sys 0.52.0", ] @@ -2795,7 +4514,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -2810,9 +4529,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -2822,48 +4541,48 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.24.0", ] [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", "futures-sink", "futures-util", - "hashbrown", + "hashbrown 0.14.5", "pin-project-lite", "tokio", ] [[package]] name = "toml" -version = "0.7.8" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] @@ -2874,7 +4593,18 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.7.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -2891,6 +4621,21 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -2906,8 +4651,8 @@ dependencies = [ "bitflags 2.6.0", "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", "http-range-header", "httpdate", @@ -2954,7 +4699,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", ] [[package]] @@ -2964,7 +4709,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", ] [[package]] @@ -2977,29 +4721,15 @@ dependencies = [ "tracing", ] -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "nu-ansi-term", "sharded-slab", - "smallvec", "thread_local", "tracing-core", - "tracing-log", ] [[package]] @@ -3013,6 +4743,26 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "tray-icon" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b" +dependencies = [ + "core-graphics 0.24.0", + "crossbeam-channel", + "dirs", + "libappindicator", + "muda 0.15.3", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "once_cell", + "png", + "thiserror", + "windows-sys 0.59.0", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -3021,29 +4771,66 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.1.0", + "http", "httparse", "log", - "rand", + "rand 0.8.5", "sha1", "thiserror", - "url", "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand 0.8.5", + "sha1", + "thiserror", + "utf-8", +] + +[[package]] +name = "type-map" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" +dependencies = [ + "rustc-hash", +] + [[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + [[package]] name = "unic-langid" version = "0.9.5" @@ -3051,6 +4838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", + "unic-langid-macros", ] [[package]] @@ -3059,19 +4847,39 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ - "serde", "tinystr", ] [[package]] -name = "unicase" -version = "2.7.0" +name = "unic-langid-macros" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +checksum = "0da1cd2c042d3c7569a1008806b02039e7a4a2bdf8f8e96bd3c792434a0e275e" dependencies = [ - "version_check", + "proc-macro-hack", + "tinystr", + "unic-langid-impl", + "unic-langid-macros-impl", ] +[[package]] +name = "unic-langid-macros-impl" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b" +dependencies = [ + "proc-macro-hack", + "quote", + "syn 2.0.76", + "unic-langid-impl", +] + +[[package]] +name = "unicase" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -3135,28 +4943,38 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "getrandom", + "getrandom 0.2.15", "wasm-bindgen", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + [[package]] name = "version_check" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -3166,6 +4984,34 @@ dependencies = [ "try-lock", ] +[[package]] +name = "warnings" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f68998838dab65727c9b30465595c6f7c953313559371ca8bf31759b3680ad" +dependencies = [ + "pin-project", + "tracing", + "warnings-macro", +] + +[[package]] +name = "warnings-macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59195a1db0e95b920366d949ba5e0d3fc0e70b67c09be15ce5abb790106b0571" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3174,9 +5020,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -3185,16 +5031,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.76", "wasm-bindgen-shared", ] @@ -3212,9 +5057,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3222,22 +5067,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasm-streams" @@ -3262,6 +5107,103 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webbrowser" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" +dependencies = [ + "core-foundation 0.9.4", + "home", + "jni", + "log", + "ndk-context", + "objc", + "raw-window-handle 0.5.2", + "url", + "web-sys", +] + +[[package]] +name = "webkit2gtk" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup3", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pkg-config", + "soup3-sys", + "system-deps", +] + +[[package]] +name = "webview2-com" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows", + "windows-core 0.58.0", + "windows-implement", + "windows-interface", +] + +[[package]] +name = "webview2-com-macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "webview2-com-sys" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" +dependencies = [ + "thiserror", + "windows", + "windows-core 0.58.0", +] + [[package]] name = "winapi" version = "0.3.9" @@ -3278,12 +5220,31 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -3293,6 +5254,80 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -3320,6 +5355,21 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -3351,6 +5401,21 @@ dependencies = [ "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -3363,6 +5428,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -3375,6 +5446,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -3393,6 +5470,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -3405,6 +5488,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -3417,6 +5506,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -3429,6 +5524,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -3451,13 +5552,74 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" +name = "wry" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "ac0099a336829fbf54c26b5f620c68980ebbe37196772aeaf6118df4931b5cb0" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "base64", + "block", + "cocoa 0.26.0", + "core-graphics 0.24.0", + "crossbeam-channel", + "dpi", + "dunce", + "gdkx11", + "gtk", + "html5ever", + "http", + "javascriptcore-rs", + "jni", + "kuchikiki", + "libc", + "ndk", + "objc", + "objc_id", + "once_cell", + "percent-encoding", + "raw-window-handle 0.6.2", + "sha2", + "soup3", + "tao-macros", + "thiserror", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows", + "windows-core 0.58.0", + "windows-version", + "x11-dl", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "xdg-home" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +dependencies = [ + "libc", + "windows-sys 0.59.0", ] [[package]] @@ -3466,6 +5628,65 @@ version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" +[[package]] +name = "zbus" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" +dependencies = [ + "async-broadcast", + "async-process", + "async-recursion", + "async-trait", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a3e850ff1e7217a3b7a07eba90d37fe9bb9e89a310f718afcde5885ca9b6d7" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -3484,5 +5705,43 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.76", +] + +[[package]] +name = "zvariant" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e09e8be97d44eeab994d752f341e67b3b0d80512a8b315a0671d47232ef1b65" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a5857e2856435331636a9fbb415b09243df4521a267c5bedcd5289b4d5799e" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] diff --git a/Cargo.toml b/Cargo.toml index 2d0cdae..f2b94d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,18 +8,32 @@ edition = "2021" [dependencies] serde = { version = "1.0.197", features = ["derive"] } -dioxus = { version = "0.5", features = ["fullstack", "router"] } +dioxus = { version = "0.6", features = ["fullstack", "router"] } tokio = { version = "1", features = ["full"], optional = true } # Debug tracing = "0.1.40" -dioxus-logger = "0.5.0" -manganis = "0.2.2" -dioxus-free-icons = { version = "0.8", features = ["font-awesome-brands"] } -dioxus-sdk = { version = "0.5.0", features = ["i18n"] } +dioxus-logger = "0.6.0" +manganis = "0.6.0" +dioxus-free-icons = { version = "0.9", features = ["font-awesome-brands"] } +dioxus-sdk = "0.6.0" lazy_static = "1.4.0" +dioxus-i18n = "0.3.0" [features] default = [] -server = ["dioxus/axum"] web = ["dioxus/web"] +desktop = ["dioxus/desktop"] +server = ["dioxus/server"] + +[profile] + +[profile.wasm-dev] +inherits = "dev" +opt-level = 1 + +[profile.server-dev] +inherits = "dev" + +[profile.android-dev] +inherits = "dev" diff --git a/Dioxus.toml b/Dioxus.toml index c8a3e86..fd4569c 100644 --- a/Dioxus.toml +++ b/Dioxus.toml @@ -25,19 +25,3 @@ reload_html = true # which files or dirs will be watcher monitoring watch_path = ["src", "assets"] - -# include `assets` in web platform -[web.resource] - -# CSS style file - -style = ["tailwind.css"] - -# Javascript code file -script = [] - -[web.resource.dev] - -# Javascript code file -# serve: [dev-server] only -script = [] diff --git a/assets/android-chrome-192x192.png b/assets/android-chrome-192x192.png deleted file mode 100644 index a40182c81bba3b6dd6612e4b4e37c97738b90534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27347 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 KMNUMnLSTYr7B$`g diff --git a/assets/android-chrome-512x512.png b/assets/android-chrome-512x512.png deleted file mode 100644 index d965cab0bcac634d202c64d49f62160f88f8098f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112643 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 Jlu4QR{~stdJWl`s diff --git a/assets/apple-touch-icon.png b/assets/apple-touch-icon.png deleted file mode 100644 index 66e45e41a07acbafb268aa02260cce44cd8cdeaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24259 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 Y4Pe>^c#^}yjsO4v07*qoM6N<$f&hYD_y7O^ diff --git a/assets/favicon-32x32.png b/assets/favicon-32x32.png deleted file mode 100644 index 7bad8bb0e45c6ed02fa25b67d13aaa14faeb3913..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1918 zcmV-^2Z8vBP)>3L?t^1yoZ%`}fgrAmjT>yMYp572v_+2fLa3l9x>ilQ-PWpcH`sc_Xk%z> z)mqzCS&iMrT{_faY$T#$LzjQh>;~xVVcYB_(0O!NCtbpNwP2jvd&) zfB)AGhhrT*)ch!rkpQSBO`24B{`~pL!x%gi$}i?P zj>Ex&2f6j@*KZ?;4`^#PDS4bi)k-VQm(vVu)~u;NaNt15NR4|-b>hSckP_W9XU^0f zK73fTcJ11mroIJ#GQ&SVd z!or|bDo0I}l$2C*_UzgDj{?vvUApupQ5qh!!UL^Xu>uPgEEp94pBEt^A$vPII^G=? zK&@7PSXWo~c2rc(STOhv7nGGMR+;BO@aR&*Asz+$`ESF&uz? z)v8ryN*2Y#T;x6A6OtMdsQ-hq8OM$t6CU+W)N|*~Vc))eu-R^m$O(M1uK-Lhqi>Y)G?X0vkJTW^(~`SQznns~y2yn)KfN*p0>O*GB@7W{0rLrn+27^a6@EJmBvhL(F) zbPYHMXyg=sclFvgTb3;eiin6vO#tjJH!O7d$)pHTsUQ|Ju(>=0 zVnIv44FewbCl1{4&$j)e?##);7inrP4G0JbEh;J!dc}i_|A3+1kk6FdYW^n+W=V)j zu87fTAeV@7qrC^A{z}{1{L2lIVcIjKrnp9TS?~Yop;e`chWEJ7Q?bfcW-#Z zRB^5}dCr_Uf0jz6{lm_Jswz&}s%cJUIcB*+EO}KdVk9v-e>}r`O&ZsBbV5(^ci9JM z&yPam2Pf-6OX1N-mI_vCO>zX@^Rx>2v@Pm6wI)a zW#q+jf0<-5OI}abYsqUR8D&x3)`egSQ@eEl(bRBwm4yA)E~sS^v|Ai-awOp(hS1*V z7jwZU0PhU``nLH63Ue;QaEpT!a*f?hO@*pQqmaQ)`EaeZ6VH-LW{VZE1|77tKS0l1 zYUvOvY;bYx6^50jj2Phl0miB-l}H<$M)KxLMMwx$D@7Kki;QaFPo>INP%SAFPN8Y0 zQngUYdIjQix7d@lA|k>*Y5;Fl{(HN1yu|IyVHqsQ?6@dFNGy@o8Q*#0xyPOOy9HWpa!~9g#O|9s2xk)VcZ>dq^ zyg$#ME`YZxG}r<>jBE+ZaVx=yCzGX|)Tn1qKiCof51wlX%tBVM Element { } pub fn UnderConstruction() -> Element { - let i18 = use_i18(); - rsx! { div { class:"rounded justify-between w-full p-4 border-b border-gray-200 bg-gray-50 dark:bg-gray-700 dark:border-gray-600 my-8", @@ -130,7 +128,7 @@ pub fn UnderConstruction() -> Element { class:"items-center mx-auto", p { class:"items-center text-sm font-normal text-gray-500 dark:text-gray-400", - span { { translate!(i18, "components.under_construction") } } + span { { t!("component_under_construction") } } } } } diff --git a/src/cv.rs b/src/cv.rs index e737916..293eb12 100644 --- a/src/cv.rs +++ b/src/cv.rs @@ -1,5 +1,5 @@ use dioxus::prelude::*; -use dioxus_sdk::{i18n::use_i18, translate}; +use dioxus_i18n::t; use crate::components::{H4, HR}; @@ -13,7 +13,7 @@ pub fn CV() -> Element { img { class: "rounded-full w-24 h-24", alt: "headshot", - src: "/pictures/headshot.webp" + src: asset!("./assets/pictures/headshot.webp") } Introduction {}, Socials {} @@ -31,45 +31,40 @@ pub fn CV() -> Element { } fn Introduction() -> Element { - let i18 = use_i18(); - rsx! { div { class: "flex", - P { { translate!(i18, "cv.introduction_0") } }, - P { { translate!(i18, "cv.introduction_1") } } + P { { t!("cv_introduction_0") } }, }, } } fn WorkExperience() -> Element { - let i18 = use_i18(); - rsx! { div { class: "ms-8 max-w-3/4", - H4 { { translate!(i18, "cv.workexperience.title") } }, + H4 { { t!("cv_workexperience_title") } }, ol { class:"relative border-s border-gray-200 dark:border-gray-700", - CVEntry {time: translate!(i18, "cv.workexperience.ra_ude.time"), title: translate!(i18, "cv.workexperience.ra_ude.title"), + CVEntry {time: t!("cv_workexperience_ra_ude_time"), title: t!("cv_workexperience_ra_ude_title"), technologies: vec!["Rust".to_string(), "Python".to_string(), "P4".to_string(), "Linux".to_string(), "Docker".to_string(), "Kubernetes".to_string()], - description: translate!(i18, "cv.workexperience.ra_ude.description") + description: t!("cv_workexperience_ra_ude_description") }, - CVEntry {time: translate!(i18, "cv.workexperience.mentoring_ude.time"), title: translate!(i18, "cv.workexperience.mentoring_ude.title"), + CVEntry {time: t!("cv_workexperience_mentoring_ude_time"), title: t!("cv_workexperience_mentoring_ude_title"), technologies: vec!["Powerpoint".to_string()], - description: translate!(i18, "cv.workexperience.mentoring_ude.description") + description: t!("cv_workexperience_mentoring_ude_description") }, - CVEntry {time: translate!(i18, "cv.workexperience.se2_gefeba.time"), title: translate!(i18, "cv.workexperience.se2_gefeba.title"), + CVEntry {time: t!("cv_workexperience_se2_gefeba_time"), title: t!("cv_workexperience_se2_gefeba_title"), technologies: vec!["C#".to_string(), "Angular".to_string(), "bootstrap".to_string(), "Entity Framework".to_string()], - description: translate!(i18, "cv.workexperience.se2_gefeba.description") + description: t!("cv_workexperience_se2_gefeba_description") }, - CVEntry {time: translate!(i18, "cv.workexperience.student_fse.time"), title: translate!(i18, "cv.workexperience.student_fse.title"), + CVEntry {time: t!("cv_workexperience_student_fse_time"), title: t!("cv_workexperience_student_fse_title"), technologies: vec!["Linux".to_string(), "Networking".to_string(), "LaTeX".to_string()], - description: translate!(i18, "cv.workexperience.student_fse.description") + description: t!("cv_workexperience_student_fse_description") }, - CVEntry {time: translate!(i18, "cv.workexperience.se1_gefeba.time"), title: translate!(i18, "cv.workexperience.se1_gefeba.title"), + CVEntry {time: t!("cv_workexperience_se1_gefeba_time"), title: t!("cv_workexperience_se1_gefeba_title"), technologies: vec!["C#".to_string(), "HTML".to_string(), "Javascript".to_string(), "CSS".to_string()], - description: translate!(i18, "cv.workexperience.se1_gefeba.description") + description: t!("cv_workexperience_se1_gefeba_description") }, } }, @@ -89,67 +84,59 @@ fn Miscellaneous() -> Element { } fn Education() -> Element { - let i18 = use_i18(); - rsx! { div { - H4 { { translate!(i18, "cv.education.title") } }, + H4 { { t!("cv_education_title") } }, Entry { - title: translate!(i18, "cv.education.bachelor.title"), - time { class:"mb-1 text-sm font-normal leading-none text-gray-400 dark:text-gray-500", { translate!(i18, "cv.education.bachelor.time") } }, + title: t!("cv_education_bachelor_title"), + time { class:"mb-1 text-sm font-normal leading-none text-gray-400 dark:text-gray-500", { t!("cv_education_bachelor_time") } }, }, } } } fn Skills() -> Element { - let i18 = use_i18(); - rsx! { div { - H4 { { translate!(i18, "cv.skills.title") }}, + H4 { { t!("cv_skills_title") }}, Entry { - title: translate!(i18, "cv.skills.devops.title"), - P { { translate!(i18, "cv.skills.devops.ansible") } }, - P { { translate!(i18, "cv.skills.devops.kubernetes") } }, - P { { translate!(i18, "cv.skills.devops.gitops") } }, + title: t!("cv_skills_devops_title"), + P { { t!("cv_skills_devops_ansible") } }, + P { { t!("cv_skills_devops_kubernetes") } }, + P { { t!("cv_skills_devops_gitops") } }, }Entry { - title: translate!(i18, "cv.skills.software_engineering.title"), - P { { translate!(i18, "cv.skills.software_engineering.rust") } }, - P { { translate!(i18, "cv.skills.software_engineering.python") } }, - P { { translate!(i18, "cv.skills.software_engineering.csharp") } }, + title: t!("cv_skills_software_engineering_title"), + P { { t!("cv_skills_software_engineering_rust") } }, + P { { t!("cv_skills_software_engineering_python") } }, + P { { t!("cv_skills_software_engineering_csharp") } }, } } } } fn Languages() -> Element { - let i18 = use_i18(); - rsx! { div { - H4 { { translate!(i18, "cv.languages.title") } }, + H4 { { t!("cv_languages_title") } }, Entry { - P { {translate!(i18, "cv.languages.german") } }, - P { {translate!(i18, "cv.languages.english") } }, - P { {translate!(i18, "cv.languages.vietnamese") } }, - P { {translate!(i18, "cv.languages.japanese") } }, + P { {t!("cv_languages_german") } }, + P { {t!("cv_languages_english") } }, + P { {t!("cv_languages_vietnamese") } }, + P { {t!("cv_languages_japanese") } }, } } } } fn Interests() -> Element { - let i18 = use_i18(); - rsx! { div { - H4 { { translate!(i18, "cv.interests.title") } }, + H4 { { t!("cv_interests_title") } }, Entry { - P { { translate!(i18, "cv.interests.coffee") } }, - P { { translate!(i18, "cv.interests.tech_it") } }, - P { { translate!(i18, "cv.interests.guitar") } }, - P { { translate!(i18, "cv.interests.mechanical_keyboards") } }, + P { { t!("cv_interests_coffee") } }, + P { { t!("cv_interests_tech_it") } }, + P { { t!("cv_interests_guitar") } }, + P { { t!("cv_interests_mechanical_keyboards") } }, } } } @@ -234,16 +221,14 @@ fn random_badge_color(seed: usize) -> String { } fn Socials() -> Element { - let i18 = use_i18(); - rsx! { div { class: "ms-8 max-w-3/4", - H4 { { translate!(i18, "cv.socials.title") } }, + H4 { { t!("cv_socials_title") } }, div { class: "flex justify-center items-center space-x-4", - P { Link { to:"https://www.linkedin.com/in/tudattr/", class:"hover:underline", new_tab: true, img { class: "h-8", src:"/pictures/LI-Bug.svg.original.svg", alt:"LinkedIn Logo" } }}, - P { Link { to:"https://git.tudattr.dev/tudattr", class:"hover:underline", new_tab: true, img { class: "h-8", src:"/pictures/Gitea_Logo.svg", alt:"Gitea Logo" } }}, + P { Link { to:"https://www.linkedin.com/in/tudattr/", class:"hover:underline", new_tab: true, img { class: "h-8", src:asset!("./assets/pictures/LI-Bug.svg.original.svg"), alt:"LinkedIn Logo" } }}, + P { Link { to:"https://git.tudattr.dev/tudattr", class:"hover:underline", new_tab: true, img { class: "h-8", src: asset!("./assets/pictures/Gitea_Logo.svg"), alt:"Gitea Logo" } }}, } } } diff --git a/src/home.rs b/src/home.rs index 010316b..ed69707 100644 --- a/src/home.rs +++ b/src/home.rs @@ -1,23 +1,21 @@ use crate::components::{Card, Urling, P}; use dioxus::prelude::*; -use dioxus_sdk::{i18n::use_i18, translate}; +use dioxus_i18n::t; #[component] pub fn Home() -> Element { - let i18 = use_i18(); - rsx! { div { class: "container mx-auto p-4 flex items-center justify-center max-w-md w-full", Card { - name: translate!(i18, "home.card.name"), - gender: translate!(i18, "home.card.gender"), - picture: "/pictures/headshot.webp", + name: t!("home_card_name"), + gender: t!("home_card_gender"), + picture: asset!("./assets/pictures/headshot.webp"), div { class: "py-4", div { class: "mb-2", - for line in translate!(i18, "home.card.text").split("\n").into_iter() { + for line in t!("home_card_text").split("\n").into_iter() { P { Urling { class: "items-center font-medium hover:underline", @@ -32,7 +30,7 @@ pub fn Home() -> Element { Link { to: "mailto:tuan-dat.tran@tudattr.dev", class: "text-gray-900 bg-gradient-to-br from-green-400 to-blue-600 group-hover:from-green-400 group-hover:to-blue-600 hover:text-white rounded-full shadow-lg py-4 px-4", - { translate!(i18, "home.card.contact_button") } + { t!("home_card_contact_button") } } }, } diff --git a/src/impressum.rs b/src/impressum.rs index 3134acc..ef0e2be 100644 --- a/src/impressum.rs +++ b/src/impressum.rs @@ -1,11 +1,10 @@ use dioxus::prelude::*; -use dioxus_sdk::{i18n::use_i18, translate}; +use dioxus_i18n::t; use crate::components::{H1, HR, P}; #[component] pub fn Impressum() -> Element { - let i18 = use_i18(); let mut impressum = use_signal(Vec::::new); let mut contact = use_signal(Vec::::new); @@ -22,7 +21,7 @@ pub fn Impressum() -> Element { contact.set(data.clone()); } }, - H1 { { translate!(i18, "impressum.on") } }, + H1 { { t!("impressum_on") } }, }, }, div { diff --git a/src/languages.rs b/src/languages.rs deleted file mode 100644 index 1e4e55d..0000000 --- a/src/languages.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub static EN_GB: &str = include_str!("./languages/en-GB.json"); -pub static DE_DE: &str = include_str!("./languages/de-DE.json"); diff --git a/src/languages/de-DE.ftl b/src/languages/de-DE.ftl new file mode 100644 index 0000000..14f1001 --- /dev/null +++ b/src/languages/de-DE.ftl @@ -0,0 +1,90 @@ +headers_home = Home +headers_cv = Lebenslauf +headers_publications_projects = Artikel/Projekte +headers_consulting = Consulting +headers_about = Impressum +headers_language_buttons_english = 🇬🇧 Englisch +headers_language_buttons_german = 🇩🇪 Deutsch +home_card_name = Tuan-Dat Tran +home_card_gender = "" +home_card_text = + Hallihallo! 👋🏻👋🏼👋🏽👋🏾👋🏿 + Willkommen auf meiner kleinen Webseite im World Wide Web. + Mein Name ist Tuan und ich bin Linux-Bastler, IT-Security Nerd und Automatisierer aus Leidenschaft. + Während du hier bist, schau dir doch meine Projekte auf Gitea an. +home_card_contact_button = Get in touch. +cv_introduction_0 = Während meines Bachelorstudiums habe ich viele Erfahrungen in der Industrie und im Studium gesammelt. Meine beruflichen und persönlichen Interessen sind DevOps/IaC, Systems/Software Security und Computer Networking. All diese Interessen vertiefe ich in persönlichen Projekten wie meinem Homelab und CTF-Challenges. +cv_workexperience_title = Berufserfahrung +cv_workexperience_se1_gefeba_title = Software Entwickler @ gefeba Engineering GmbH +cv_workexperience_se1_gefeba_time = 2013 - 2015 +cv_workexperience_se1_gefeba_description = Nach einem Schulpraktikum wurde mir eine Stelle als Software Entwickler angeboten. Ich arbeitete hauptsächlich an internen ERP-Projekten, entwickelte ein Tool, das bei der Verwaltung des projektbezogenen E-Mail-Verkehrs half, und arbeitete an dem internen Stammdatenmanagement-Tool. +cv_workexperience_student_fse_title = Fachschaftsratsmitglied @ UDE +cv_workexperience_student_fse_time = 2016 - 2019 +cv_workexperience_student_fse_description = Als Fachschaftsratsmitglied wirkte ich in Fakultätsausschüssen mit und organisierte soziale Veranstaltungen. Meine Hauptaufgaben als Mitglied waren die Verwaltung der IT-Infrastruktur und die Unterstützung der Studierenden, sei es organisatorisch oder fachspezifisch. +cv_workexperience_se2_gefeba_title = Software Entwickler @ gefeba Engineering GmbH +cv_workexperience_se2_gefeba_time = 2018 - 2020 +cv_workexperience_se2_gefeba_description = Als Software Entwickler bei gefeba Engineering arbeitete ich an dem Hauptprodukt des Unternehmens, einem Frame-basierten Datenaustauschsystem zur Überwachung von Industriemaschinen mit C# und Entity Framework. Ein weiteres Projekt, an dem ich gearbeitet habe, war eine Echtzeit-Anwendung zur Visualisierung von Protokollen für dieselben Maschinen. +cv_workexperience_mentoring_ude_title = Mentoring @ UDE +cv_workexperience_mentoring_ude_time = 2021 - 2022 +cv_workexperience_mentoring_ude_description = Als Mentor für Studienanfänger im Studiengang Informatik der Universität Duisburg-Essen habe ich zu Beginn jedes Semesters Gruppen von ~20 Studienanfängern in ihr neues akademisches Umfeld eingeführt. Ich bot zusätzliche organisatorische und technische Unterstützung für das erste Jahr an der Universität an. +cv_workexperience_ra_ude_title = Studentische Hilfskraft @ UDE +cv_workexperience_ra_ude_time = 2021 - jetzt +cv_workexperience_ra_ude_description = Während meiner Tätigkeit als wissenschaftlicher Mitarbeiter in der Network Communication System Research Group an der Universität Duisburg-Essen habe ich an der Forschung rund um Software Defined Networking, 5G, Staukontrollalgorithmen und föderiertes maschinelles Lernen mitgearbeitet. Ich habe die On-Premise- und Cloud-Infrastruktur, das Inventarsystem und die Online-Präsenz der Forschungsgruppe aufgebaut und verwaltet. +cv_socials_title = Profile +cv_education_title = Bildungsweg +cv_education_bachelor_title = BSc Angewandte Informatik - Systems Engineering +cv_education_bachelor_time = 2015 - jetzt +cv_education_bachelor_description = "" +cv_skills_title = Fähigkeiten +cv_skills_devops_title = DevOps +cv_skills_devops_ansible = Ansible +cv_skills_devops_kubernetes = Kubernetes +cv_skills_devops_gitops = GitOps +cv_skills_software_engineering_title = Programmiersprachen +cv_skills_software_engineering_rust = Rust +cv_skills_software_engineering_python = Python +cv_skills_software_engineering_csharp = C# +cv_languages_title = Sprachkenntnisse +cv_languages_german = Deutsch (Muttersprache) +cv_languages_english = Englisch (C2) +cv_languages_vietnamese = Vietnamesisch (B1) +cv_languages_japanese = Japanisch (A1) +cv_interests_title = Interessen +cv_interests_coffee = Kaffee +cv_interests_tech_it = Tech/IT +cv_interests_guitar = Gitarre +cv_interests_mechanical_keyboards = Mechanische Tastaturen +publication_projects_publications_title = Veröffentlichungen +publication_projects_publications_rpm_title = RPM: Reverse Path Congestion Marking on P4 Programmable Switches +publication_projects_publications_rpm_authors = N. Baganal-Krishna, T.-D. Tran, R. Kundel and A. Rizk +publication_projects_publications_rpm_conference = IEEE LCN 2023 +publication_projects_publications_rpm_url = https://doi.org/10.48550/arXiv.2307.09639 +publication_projects_publications_rpm_description = In diesem Artikel stellen wir Reverse Path Congestion Marking (RPM) vor, um die Reaktion auf Netzwerküberlastungen zu beschleunigen, ohne den End-Host-Stack zu verändern. RPM entkoppelt das Stausignal vom nachgelagerten Pfad nach dem Engpass, während die Stabilität der Staukontrollschleife erhalten bleibt. Wir zeigen, dass RPM die Durchsatzfairness für RTT bei heterogenen TCP-Flüssen sowie die Flussabwicklungszeit verbessert, insbesondere für kleine Data Center TCP (DCTCP)-Flows um P4 programmierbare ASIC-Switches. +publication_projects_publications_iot_fuzzers_title = Overview of IoT Fuzzing Techniques +publication_projects_publications_iot_fuzzers_authors = Tuan-Dat Tran +publication_projects_publications_iot_fuzzers_conference = Seminar +publication_projects_publications_iot_fuzzers_url = https://git.tudattr.dev/AISE/seminar/src/branch/main/paper.pdf +publication_projects_publications_iot_fuzzers_description = In dieser Arbeit vergleichen wir Methoden, die speziell von IoT Fuzzern genutzt werden um die von IoT Geräten stammenden Herausforderungen und Einschränkungen zu umgehen. +publication_projects_projects_title = Projekte +publication_projects_projects_bachelorproject_title = Unbenannter Ethereum Smart Contract Fuzzer +publication_projects_projects_bachelorproject_authors = Tuan-Dat Tran +publication_projects_projects_bachelorproject_kind = Bachelorprojekt +publication_projects_projects_bachelorproject_url = https://git.ude-syssec.de/uni-due-syssec/students/2022_tuan-dat_tran_libAFLEVMFuzzer/ethfuzz/ +publication_projects_projects_bachelorproject_description = In diesem aktuell laufendem Projekt entwickle ich einen Ethereum Smart Contract Fuzzer. Mehr Infos folgen... +publication_projects_projects_dotfiles_title = .dotfiles +publication_projects_projects_dotfiles_authors = Tuan-Dat Tran +publication_projects_projects_dotfiles_kind = Personal +publication_projects_projects_dotfiles_url = https://git.tudattr.dev/tudattr/dotfiles +publication_projects_projects_dotfiles_description = dotfiles ist ein umgangssprachlicher Begriff, der normalerweise für Konfigurationsdateien in Linux-basierten Systemen verwendet wird. Meine Dotfiles enthalten Konfigurationen für Tools, die ich häufig verwende, sowie eine Dokumentation zur Einrichtung meines täglich genutzten Notebooks. Sie bieten eine Grundlage für jedes persönliche Linux-System, das ich einrichte, und ermöglichen Wiederholbarkeit, was den Prozess der Einrichtung eines ArchLinux-basierten Systems vereinfacht. +publication_projects_projects_homelab_title = Homelab +publication_projects_projects_homelab_authors = Tuan-Dat Tran +publication_projects_projects_homelab_kind = Personal +publication_projects_projects_homelab_url = https://git.tudattr.dev/tudattr/ansible +publication_projects_projects_homelab_description = Ansible ist eine Automatisierungs-Engine, die eine automatische Bereitstellung, Konfigurationsverwaltung und Anwendungsbereitstellung ermöglicht. Ich verwende Ansible, um mein Homelab einzurichten, das mir als Plattform zum Ausprobieren und Lernen neuer Technologien dient. +impressum_off = Impressum anzeigen +impressum_on = Impressum +component_under_construction = Diese Seite befindet sich gerade im Aufbau +footer_year = © 2024 +footer_name = Tuan-Dat Tran +footer_rights = . All Rights Reserved. +footer_contact = Kontakt diff --git a/src/languages/de-DE.json b/src/languages/de-DE.json deleted file mode 100644 index a6fa17d..0000000 --- a/src/languages/de-DE.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "id": "de-DE", - "texts": { - "headers": { - "home": "Home", - "cv": "Lebenslauf", - "publications_projects": "Artikel/Projekte", - "consulting": "Consulting", - "about": "Impressum", - "language_buttons": { - "english": "🇬🇧 Englisch", - "german": "🇩🇪 Deutsch" - } - }, - "home": { - "card": { - "name": "Tuan-Dat Tran", - "gender": "", - "text": "Hallihallo! 👋🏻👋🏼👋🏽👋🏾👋🏿\nWillkommen auf meiner kleinen Webseite im World Wide Web.\nMein Name ist Tuan und ich bin Linux-Bastler, IT-Security Nerd und Automatisierer aus Leidenschaft.\nWährend du hier bist, schau dir doch meine Projekte auf Gitea an.\n", - "contact_button": "Get in touch." - } - }, - "cv": { - "introduction_0": "Während meines Bachelorstudiums habe ich viele Erfahrungen in der Industrie und im Studium gesammelt. Meine beruflichen und persönlichen Interessen sind DevOps/IaC, Systems/Software Security und Computer Networking. All diese Interessen vertiefe ich in persönlichen Projekten wie meinem Homelab und CTF-Challenges.", - "workexperience": { - "title": "Berufserfahrung", - "se1_gefeba": { - "title": "Software Entwickler @ gefeba Engineering GmbH", - "time": "2013 - 2015", - "description": "Nach einem Schulpraktikum wurde mir eine Stelle als Software Entwickler angeboten. Ich arbeitete hauptsächlich an internen ERP-Projekten, entwickelte ein Tool, das bei der Verwaltung des projektbezogenen E-Mail-Verkehrs half, und arbeitete an dem internen Stammdatenmanagement-Tool." - }, - "student_fse": { - "title": "Fachschaftsratsmitglied @ UDE", - "time": "2016 - 2019", - "description": "Als Fachschaftsratsmitglied wirkte ich in Fakultätsausschüssen mit und organisierte soziale Veranstaltungen. Meine Hauptaufgaben als Mitglied waren die Verwaltung der IT-Infrastruktur und die Unterstützung der Studierenden, sei es organisatorisch oder fachspezifisch." - }, - "se2_gefeba": { - "title": "Software Entwickler @ gefeba Engineering GmbH", - "time": "2018 - 2020", - "description": "Als Software Entwickler bei gefeba Engineering arbeitete ich an dem Hauptprodukt des Unternehmens, einem Frame-basierten Datenaustauschsystem zur Überwachung von Industriemaschinen mit C# und Entity Framework. Ein weiteres Projekt, an dem ich gearbeitet habe, war eine Echtzeit-Anwendung zur Visualisierung von Protokollen für dieselben Maschinen." - }, - "mentoring_ude": { - "title": "Mentoring @ UDE", - "time": "2021 - 2022", - "description": "Als Mentor für Studienanfänger im Studiengang Informatik der Universität Duisburg-Essen habe ich zu Beginn jedes Semesters Gruppen von ~20 Studienanfängern in ihr neues akademisches Umfeld eingeführt. Ich bot zusätzliche organisatorische und technische Unterstützung für das erste Jahr an der Universität an." - }, - "ra_ude": { - "title": "Studentische Hilfskraft @ UDE", - "time": "2021 - jetzt", - "description": "Während meiner Tätigkeit als wissenschaftlicher Mitarbeiter in der Network Communication System Research Group an der Universität Duisburg-Essen habe ich an der Forschung rund um Software Defined Networking, 5G, Staukontrollalgorithmen und föderiertes maschinelles Lernen mitgearbeitet. Ich habe die On-Premise- und Cloud-Infrastruktur, das Inventarsystem und die Online-Präsenz der Forschungsgruppe aufgebaut und verwaltet." - } - }, - "socials": { - "title": "Profile" - }, - "education": { - "title": "Bildungsweg", - "bachelor": { - "title": "BSc Angewandte Informatik - Systems Engineering", - "time": "2015 - jetzt", - "description": "" - } - }, - "skills": { - "title": "Fähigkeiten", - "devops": { - "title": "DevOps", - "ansible": "Ansible", - "kubernetes": "Kubernetes", - "gitops": "GitOps" - }, - "software_engineering": { - "title": "Programmiersprachen", - "rust": "Rust", - "python": "Python", - "csharp": "C#" - } - }, - "languages": { - "title": "Sprachkenntnisse", - "german": "Deutsch (Muttersprache)", - "english": "Englisch (C2)", - "vietnamese": "Vietnamesisch (B1)", - "japanese": "Japanisch (A1)" - }, - "interests": { - "title": "Interessen", - "coffee": "Kaffee", - "tech_it": "Tech/IT", - "guitar": "Gitarre", - "mechanical_keyboards": "Mechanische Tastaturen" - } - }, - "publications_projects": { - "publications": { - "title": "Veröffentlichungen", - "rpm": { - "title": "RPM: Reverse Path Congestion Marking on P4 Programmable Switches", - "authors": "N. Baganal-Krishna, T.-D. Tran, R. Kundel and A. Rizk", - "conference": "IEEE LCN 2023", - "url": "https://doi.org/10.48550/arXiv.2307.09639", - "description": "In diesem Artikel stellen wir Reverse Path Congestion Marking (RPM) vor, um die Reaktion auf Netzwerküberlastungen zu beschleunigen, ohne den End-Host-Stack zu verändern. RPM entkoppelt das Stausignal vom nachgelagerten Pfad nach dem Engpass, während die Stabilität der Staukontrollschleife erhalten bleibt. Wir zeigen, dass RPM die Durchsatzfairness für RTT bei heterogenen TCP-Flüssen sowie die Flussabwicklungszeit verbessert, insbesondere für kleine Data Center TCP (DCTCP)-Flows um P4 programmierbare ASIC-Switches." - }, - "iot_fuzzers": { - "title": "Overview of IoT Fuzzing Techniques", - "authors": "Tuan-Dat Tran", - "conference": "Seminar", - "url": "https://git.tudattr.dev/AISE/seminar/src/branch/main/paper.pdf", - "description": "In dieser Arbeit vergleichen wir Methoden, die speziell von IoT Fuzzern genutzt werden um die von IoT Geräten stammenden Herausforderungen und Einschränkungen zu umgehen." - } - }, - "projects": { - "title": "Projekte", - "bachelorproject": { - "title": "Unbenannter Ethereum Smart Contract Fuzzer", - "authors": "Tuan-Dat Tran", - "kind": "Bachelorprojekt", - "url": "https://git.ude-syssec.de/uni-due-syssec/students/2022_tuan-dat_tran_libAFLEVMFuzzer/ethfuzz/", - "description": "In diesem aktuell laufendem Projekt entwickle ich einen Ethereum Smart Contract Fuzzer. Mehr Infos folgen..." - }, - "dotfiles": { - "title": ".dotfiles", - "authors": "Tuan-Dat Tran", - "kind": "Personal", - "url": "https://git.tudattr.dev/tudattr/dotfiles", - "description": "dotfiles ist ein umgangssprachlicher Begriff, der normalerweise für Konfigurationsdateien in Linux-basierten Systemen verwendet wird. Meine Dotfiles enthalten Konfigurationen für Tools, die ich häufig verwende, sowie eine Dokumentation zur Einrichtung meines täglich genutzten Notebooks. Sie bieten eine Grundlage für jedes persönliche Linux-System, das ich einrichte, und ermöglichen Wiederholbarkeit, was den Prozess der Einrichtung eines ArchLinux-basierten Systems vereinfacht." - }, - "homelab": { - "title": "Homelab", - "authors": "Tuan-Dat Tran", - "kind": "Personal", - "url": "https://git.tudattr.dev/tudattr/ansible", - "description": "Ansible ist eine Automatisierungs-Engine, die eine automatische Bereitstellung, Konfigurationsverwaltung und Anwendungsbereitstellung ermöglicht. Ich verwende Ansible, um mein Homelab einzurichten, das mir als Plattform zum Ausprobieren und Lernen neuer Technologien dient." - } - } - }, - "impressum": { - "off": "Impressum anzeigen", - "on": "Impressum" - }, - "components": { - "under_construction": "Diese Seite befindet sich gerade im Aufbau" - }, - "footer": { - "year": "© 2024 ", - "name": "Tuan-Dat Tran", - "rights": ". All Rights Reserved.", - "contact": "Kontakt" - } - } -} diff --git a/src/languages/en-GB.ftl b/src/languages/en-GB.ftl new file mode 100644 index 0000000..48cc4dc --- /dev/null +++ b/src/languages/en-GB.ftl @@ -0,0 +1,90 @@ +headers_home = Home +headers_cv = Résumé +headers_publications_projects = Publications/Projects +headers_consulting = Consulting +headers_about = About +headers_language_buttons_english = 🇬🇧 English +headers_language_buttons_german = 🇩🇪 German +home_card_name = Tuan-Dat Tran +home_card_gender = (He/Him) +home_card_text = + Hey there! 👋🏻👋🏼👋🏽👋🏾👋🏿 + Welcome to my little place on the internet + My name is Tuan and I'm passionate about Linux, system security, automation, network performance tweaking and all things tech. + While you're here, why don't you check out my projects over on Gitea? +home_card_contact_button = Get in touch. +cv_introduction_0 = While studying for my bachelors degree I accumulated a lot of industry and academic experience. My professional and personal intererests are DevOps/IaC, Systems/Software Security and Computer Networking. All of which I deepen in personal projects such as my homelab and CTF challenges. +cv_workexperience_title = Work Experience +cv_workexperience_se1_gefeba_title = Software Engineer @ gefeba Engineering GmbH +cv_workexperience_se1_gefeba_time = 2013 - 2015 +cv_workexperience_se1_gefeba_description = After a school internship I got offered a job as a Software Engineer. I mostly worked on internal ERP projects, designed a tool which aided in managing project related mail traffic and worked on the internal master data management tool. +cv_workexperience_student_fse_title = Student Council Member @ UDE +cv_workexperience_student_fse_time = 2016 - 2019 +cv_workexperience_student_fse_description = As a student council member I participated in faculty committees and organized social events. My main responsibilities as a member were the management of the IT infrastructure and supporting students, be it organizationally or subject-specific. +cv_workexperience_se2_gefeba_title = Software Engineer @ gefeba Engineering GmbH +cv_workexperience_se2_gefeba_time = 2018 - 2020 +cv_workexperience_se2_gefeba_description = As a software engineer at gefeba Engineering I worked on the companies main software product, which was a frame-based data exchange system to monitor industry machinery using C# and Entity Framework. Another project I worked on was a real time log visualization application for the same machinery. +cv_workexperience_mentoring_ude_title = Mentoring @ UDE +cv_workexperience_mentoring_ude_time = 2021 - 2022 +cv_workexperience_mentoring_ude_description = As a mentor for students enrolling into the computer science program of the University Duisburg-Essen I introduced groups of ~20 freshmen to their new academic environment at the beginning of each semester. Offering additional organizational and technical guidance for their first year in university. +cv_workexperience_ra_ude_title = Research Assistant @ UDE +cv_workexperience_ra_ude_time = 2021 - now +cv_workexperience_ra_ude_description = While working for the Network Communication System Research Group at the University Duisburg-Essen as a research assistant I've assisted in research around software defined networking, 5G, congestion control algorithms and federated machine learning. I've established and managed the research groups on-premise and cloud infractructure, inventory system and online presence. +cv_socials_title = Socials +cv_education_title = Education +cv_education_bachelor_title = BSc Systems Engineering +cv_education_bachelor_time = 2015 - now +cv_education_bachelor_description = "" +cv_skills_title = Skills +cv_skills_devops_title = DevOps +cv_skills_devops_ansible = Ansible +cv_skills_devops_kubernetes = Kubernetes +cv_skills_devops_gitops = GitOps +cv_skills_software_engineering_title = Software Engineering +cv_skills_software_engineering_rust = Rust +cv_skills_software_engineering_python = Python +cv_skills_software_engineering_csharp = C# +cv_languages_title = Languages +cv_languages_german = German (Native) +cv_languages_english = English (C2) +cv_languages_vietnamese = Vietnamese (B1) +cv_languages_japanese = Japanese (A1) +cv_interests_title = Interests +cv_interests_coffee = Coffee +cv_interests_tech_it = Tech/IT +cv_interests_guitar = Guitar +cv_interests_mechanical_keyboards = Mechanical Keyboards +publications_projects_publications_title = Publications +publications_projects_publications_rpm_title = RPM: Reverse Path Congestion Marking on P4 Programmable Switches +publications_projects_publications_rpm_authors = N. Baganal-Krishna, T.-D. Tran, R. Kundel and A. Rizk +publications_projects_publications_rpm_conference = IEEE LCN 2023 +publications_projects_publications_rpm_url = https://doi.org/10.48550/arXiv.2307.09639 +publications_projects_publications_rpm_description = In this paper, we present Reverse Path Congestion Marking (RPM) to accelerate the reaction to network congestion events without changing the end-host stack. RPM decouples the congestion signal from the downstream path after the bottleneck while maintaining the stability of the congestion control loop. We show that RPM improves throughput fairness for RTT on heterogeneous TCP flows as well as the flow completion time, especially for small Data Center TCP (DCTCP) flows around P4 programmable ASIC switches. +publications_projects_publications_iot_fuzzers_title = Overview of IoT Fuzzing Techniques +publications_projects_publications_iot_fuzzers_authors = Tuan-Dat Tran +publications_projects_publications_iot_fuzzers_conference = Seminar +publications_projects_publications_iot_fuzzers_url = https://git.tudattr.dev/AISE/seminar/src/branch/main/paper.pdf +publications_projects_publications_iot_fuzzers_description = In this paper, we are comparing techniques used by IoT fuzzers to circumvent the challenges presented by IoT devices and the constraints of the solutions proposed by the IoT fuzzers. +publications_projects_projects_title = Projects +publications_projects_projects_bachelorproject_title = Undisclosed Ethereum Smart Contract Fuzzer +publications_projects_projects_bachelorproject_authors = Tuan-Dat Tran +publications_projects_projects_bachelorproject_kind = Bachelorproject +publications_projects_projects_bachelorproject_url = https://git.ude-syssec.de/uni-due-syssec/students/2022_tuan-dat_tran_libAFLEVMFuzzer/ethfuzz/ +publications_projects_projects_bachelorproject_description = In this ongoing project I am building an Ethereum Smart Contract Fuzzer. More info will follow. +publications_projects_projects_dotfiles_title = .dotfiles +publications_projects_projects_dotfiles_authors = Tuan-Dat Tran +publications_projects_projects_dotfiles_kind = Personal +publications_projects_projects_dotfiles_url = https://git.tudattr.dev/tudattr/dotfiles +publications_projects_projects_dotfiles_description = dotfiles is a slang term usually used for configuration files in Linux based systems. My dotfiles contain configurations for tools I frequently use as well as a documentation on how to set up my daily-use notebook. It provides a baseline for any personal Linux system I set up and allows for repeatability simplifies the process of setting up an ArchLinux based system. +publications_projects_projects_homelab_title = Homelab +publications_projects_projects_homelab_authors = Tuan-Dat Tran +publications_projects_projects_homelab_kind = Personal +publications_projects_projects_homelab_url = https://git.tudattr.dev/tudattr/ansible +publications_projects_projects_homelab_description = Ansible is a automation engine which allows for automatic provisioning, configuration management and application deployment. I use ansible to set up my homelab, which serves as a platform for me to try out and learn new technologies. +impressum_off = Show Impressum +impressum_on = Impressum +component_under_construction = This page is currently under construction +footer_year = © 2024 +footer_name = Tuan-Dat Tran +footer_rights = . All Rights Reserved. +footer_contact = Contact diff --git a/src/languages/en-GB.json b/src/languages/en-GB.json deleted file mode 100644 index 957fbaf..0000000 --- a/src/languages/en-GB.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "id": "en-GB", - "texts": { - "headers": { - "home": "Home", - "cv": "Résumé", - "publications_projects": "Publications/Projects", - "consulting": "Consulting", - "about": "About", - "language_buttons": { - "english": "🇬🇧 English", - "german": "🇩🇪 German" - } - }, - "home": { - "card": { - "name": "Tuan-Dat Tran", - "gender": "(He/Him)", - "text": "Hey there! 👋🏻👋🏼👋🏽👋🏾👋🏿\nWelcome to my little place on the internet\nMy name is Tuan and I'm passionate about Linux, system security, automation, network performance tweaking and all things tech.\nWhile you're here, why don't you check out my projects over on Gitea?", - "contact_button": "Get in touch." - } - }, - "cv": { - "introduction_0": "While studying for my bachelors degree I accumulated a lot of industry and academic experience. My professional and personal intererests are DevOps/IaC, Systems/Software Security and Computer Networking. All of which I deepen in personal projects such as my homelab and CTF challenges.", - "workexperience": { - "title": "Work Experience", - "se1_gefeba": { - "title": "Software Engineer @ gefeba Engineering GmbH", - "time": "2013 - 2015", - "description": "After a school internship I got offered a job as a Software Engineer. I mostly worked on internal ERP projects, designed a tool which aided in managing project related mail traffic and worked on the internal master data management tool." - }, - "student_fse": { - "title": "Student Council Member @ UDE", - "time": "2016 - 2019", - "description": "As a student council member I participated in faculty committees and organized social events. My main responsibilities as a member were the management of the IT infrastructure and supporting students, be it organizationally or subject-specific." - }, - "se2_gefeba": { - "title": "Software Engineer @ gefeba Engineering GmbH", - "time": "2018 - 2020", - "description": "As a software engineer at gefeba Engineering I worked on the companies main software product, which was a frame-based data exchange system to monitor industry machinery using C# and Entity Framework. Another project I worked on was a real time log visualization application for the same machinery." - }, - "mentoring_ude": { - "title": "Mentoring @ UDE", - "time": "2021 - 2022", - "description": "As a mentor for students enrolling into the computer science program of the University Duisburg-Essen I introduced groups of ~20 freshmen to their new academic environment at the beginning of each semester. Offering additional organizational and technical guidance for their first year in university." - }, - "ra_ude": { - "title": "Research Assistant @ UDE", - "time": "2021 - now", - "description": "While working for the Network Communication System Research Group at the University Duisburg-Essen as a research assistant I've assisted in research around software defined networking, 5G, congestion control algorithms and federated machine learning. I've established and managed the research groups on-premise and cloud infractructure, inventory system and online presence." - } - }, - "socials": { - "title": "Socials" - }, - "education": { - "title": "Education", - "bachelor": { - "title": "BSc Systems Engineering", - "time": "2015 - now", - "description": "" - } - }, - "skills": { - "title": "Skills", - "devops": { - "title": "DevOps", - "ansible": "Ansible", - "kubernetes": "Kubernetes", - "gitops": "GitOps" - }, - "software_engineering": { - "title": "Software Engineering", - "rust": "Rust", - "python": "Python", - "csharp": "C#" - } - }, - "languages": { - "title": "Languages", - "german": "German (Native)", - "english": "English (C2)", - "vietnamese": "Vietnamese (B1)", - "japanese": "Japanese (A1)" - }, - "interests": { - "title": "Interests", - "coffee": "Coffee", - "tech_it": "Tech/IT", - "guitar": "Guitar", - "mechanical_keyboards": "Mechanical Keyboards" - } - }, - "publications_projects": { - "publications": { - "title": "Publications", - "rpm": { - "title": "RPM: Reverse Path Congestion Marking on P4 Programmable Switches", - "authors": "N. Baganal-Krishna, T.-D. Tran, R. Kundel and A. Rizk", - "conference": "IEEE LCN 2023", - "url": "https://doi.org/10.48550/arXiv.2307.09639", - "description": "In this paper, we present Reverse Path Congestion Marking (RPM) to accelerate the reaction to network congestion events without changing the end-host stack. RPM decouples the congestion signal from the downstream path after the bottleneck while maintaining the stability of the congestion control loop. We show that RPM improves throughput fairness for RTT on heterogeneous TCP flows as well as the flow completion time, especially for small Data Center TCP (DCTCP) flows around P4 programmable ASIC switches." - }, - "iot_fuzzers": { - "title": "Overview of IoT Fuzzing Techniques", - "authors": "Tuan-Dat Tran", - "conference": "Seminar", - "url": "https://git.tudattr.dev/AISE/seminar/src/branch/main/paper.pdf", - "description": "In this paper, we are comparing techniques used by IoT fuzzers to circumvent the challenges presented by IoT devices and the constraints of the solutions proposed by the IoT fuzzers." - } - }, - "projects": { - "title": "Projects", - "bachelorproject": { - "title": "Undisclosed Ethereum Smart Contract Fuzzer", - "authors": "Tuan-Dat Tran", - "kind": "Bachelorproject", - "url": "https://git.ude-syssec.de/uni-due-syssec/students/2022_tuan-dat_tran_libAFLEVMFuzzer/ethfuzz/", - "description": "In this ongoing project I am building an Ethereum Smart Contract Fuzzer. More info will follow." - }, - "dotfiles": { - "title": ".dotfiles", - "authors": "Tuan-Dat Tran", - "kind": "Personal", - "url": "https://git.tudattr.dev/tudattr/dotfiles", - "description": "dotfiles is a slang term usually used for configuration files in Linux based systems. My dotfiles contain configurations for tools I frequently use as well as a documentation on how to set up my daily-use notebook. It provides a baseline for any personal Linux system I set up and allows for repeatability simplifies the process of setting up an ArchLinux based system. " - }, - "homelab": { - "title": "Homelab", - "authors": "Tuan-Dat Tran", - "kind": "Personal", - "url": "https://git.tudattr.dev/tudattr/ansible", - "description": "Ansible is a automation engine which allows for automatic provisioning, configuration management and application deployment. I use ansible to set up my homelab, which serves as a platform for me to try out and learn new technologies. " - } - } - }, - "impressum": { - "off": "Show Impressum", - "on": "Impressum" - }, - "components": { - "under_construction": "This page is currently under construction" - }, - "footer": { - "year": "© 2024 ", - "name": "Tuan-Dat Tran", - "rights": ". All Rights Reserved.", - "contact": "Contact" - } - } -} diff --git a/src/layout/footer.rs b/src/layout/footer.rs index 628f162..c14ba29 100644 --- a/src/layout/footer.rs +++ b/src/layout/footer.rs @@ -1,9 +1,7 @@ use dioxus::prelude::*; -use dioxus_sdk::{i18n::use_i18, translate}; +use dioxus_i18n::t; pub fn Footer() -> Element { - let i18 = use_i18(); - rsx! { div { class: "container mx-auto pb-4", @@ -13,14 +11,14 @@ pub fn Footer() -> Element { class:"w-full mx-auto p-4 flex items-center justify-between", span { class:"text-sm text-gray-500 sm:text-center dark:text-gray-400", - { translate!(i18, "footer.year") }, - a { href: "#", class: "hover:underline", { translate!(i18, "footer.name") }}, - { translate!(i18, "footer.rights") } + { t!("footer_year") }, + a { href: "#", class: "hover:underline", { t!("footer_name") }}, + { t!("footer_rights") } } ul { class:"flex flex-wrap items-center mt-3 text-sm font-medium text-gray-500 dark:text-gray-400 sm:mt-0", li { - Link { to:"mailto:tuan-dat.tran@tudattr.dev", class:"hover:underline", { translate!(i18, "footer.contact") } } + Link { to:"mailto:tuan-dat.tran@tudattr.dev", class:"hover:underline", { t!("footer_contact") } } }, } } diff --git a/src/layout/header.rs b/src/layout/header.rs index dfe3feb..acdd031 100644 --- a/src/layout/header.rs +++ b/src/layout/header.rs @@ -1,11 +1,9 @@ use dioxus::prelude::*; -use dioxus_sdk::{i18n::*, translate}; +use dioxus_i18n::{prelude::i18n, t, unic_langid::langid}; use crate::Route; pub fn Header() -> Element { - let i18 = use_i18(); - rsx! { nav { div { @@ -17,13 +15,13 @@ pub fn Header() -> Element { Link { to: Route::Home {}, class: "rounded-md shadow-sm", - img { src:"/pictures/ClackCat_t.webp", class:"rounded-full h-8", alt:"TuDatTr Logo" }, + img { src:asset!("./assets/pictures/ClackCat_t.webp"), class:"rounded-full h-8", alt:"TuDatTr Logo" }, }, }, - li { HeaderLink { url: Route::Home {}, text: translate!(i18, "headers.home")} }, - li { HeaderLink { url: Route::CV {}, text: translate!(i18, "headers.cv") } }, - li { HeaderLink { url: Route::PublicationsProjects {}, text: translate!(i18, "headers.publications_projects") } }, - li { HeaderLink { url: Route::Impressum {}, text: translate!(i18, "headers.about") } }, + li { HeaderLink { url: Route::Home {}, text: t!("headers_home")} }, + li { HeaderLink { url: Route::CV {}, text: t!("headers_cv") } }, + li { HeaderLink { url: Route::PublicationsProjects {}, text: t!("headers_publications_projects") } }, + li { HeaderLink { url: Route::Impressum {}, text: t!("headers_about") } }, li { LanguageButtonGroup {} }, }, } @@ -33,10 +31,10 @@ pub fn Header() -> Element { #[component] fn LanguageButtonGroup() -> Element { - let mut i18 = use_i18(); + let mut i18n = i18n(); - let change_to_english = move |_| i18.set_language("en-GB".parse().unwrap()); - let change_to_german = move |_| i18.set_language("de-DE".parse().unwrap()); + let change_to_english = move |_| i18n.set_language(langid!("en-GB")); + let change_to_german = move |_| i18n.set_language(langid!("de-DE")); rsx! { div { @@ -44,11 +42,11 @@ fn LanguageButtonGroup() -> Element { button { class: "px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-s-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white", onclick: change_to_english, - label { { translate!(i18, "headers.language_buttons.english") } } }, + label { { t!("headers_language_buttons_english") } } }, button { class: "px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-e-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white", onclick: change_to_german, - label { { translate!(i18, "headers.language_buttons.german") } } } + label { { t!("headers_language_buttons_german") } } } } } } diff --git a/src/main.rs b/src/main.rs index c9d69ae..295f31a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,11 +1,12 @@ #![allow(non_snake_case)] -use std::str::FromStr; - use components::H1; use dioxus::prelude::*; -use dioxus_sdk::i18n::*; +use dioxus_i18n::prelude::use_init_i18n; +use dioxus_i18n::prelude::I18nConfig; +use dioxus_i18n::prelude::Locale; +use dioxus_i18n::unic_langid::langid; use layout::footer::Footer; use layout::header::Header; use tracing::Level; @@ -14,15 +15,12 @@ pub mod components; mod cv; mod home; mod impressum; -mod languages; mod layout; mod publications; use crate::cv::CV; use crate::home::Home; use crate::impressum::Impressum; -use crate::languages::DE_DE; -use crate::languages::EN_GB; use crate::layout::Layout; use crate::publications::PublicationsProjects; @@ -44,21 +42,26 @@ pub enum Route { fn main() { dioxus_logger::init(Level::DEBUG).expect("failed to init logger"); - LaunchBuilder::fullstack() - .with_cfg(server_only!(dioxus::fullstack::Config::new().addr( - std::net::SocketAddrV4::new(std::net::Ipv4Addr::new(0, 0, 0, 0), 8080,) - ))) - .launch(App) + LaunchBuilder::new().launch(App) } fn App() -> Element { - use_init_i18n("en-GB".parse().unwrap(), "en-GB".parse().unwrap(), || { - let en_gb = Language::from_str(EN_GB).unwrap(); - let de_de = Language::from_str(DE_DE).unwrap(); - vec![en_gb, de_de] + use_init_i18n(|| { + I18nConfig::new(langid!("en-GB")) + .with_locale(Locale::new_static( + langid!("en-GB"), + include_str!("./languages/en-GB.ftl"), + )) + .with_locale(Locale::new_static( + langid!("de-DE"), + include_str!("./languages/de-DE.ftl"), + )) }); rsx! { + document::Link { rel: "stylesheet", href: asset!("./assets/tailwind.css") } + document::Link { rel: "icon", href: asset!("./assets/favicon.ico") } + // meta { name: "description", content: "Visit Tuan-Dat Tran's website for his CV, publications, projects, and consulting services. Connect for collaboration.", diff --git a/src/publications.rs b/src/publications.rs index 815c733..1cafec6 100644 --- a/src/publications.rs +++ b/src/publications.rs @@ -1,23 +1,21 @@ use dioxus::prelude::*; -use dioxus_sdk::{i18n::use_i18, translate}; +use dioxus_i18n::t; use crate::components::{Bolding, UnderConstruction, H1, HR}; #[component] pub fn PublicationsProjects() -> Element { - let i18 = use_i18(); - rsx! { div { class: "flex flex-col ", UnderConstruction { }, div { - H1 { { translate!(i18, "publications_projects.publications.title") } } + H1 { { t!("publications_projects_publications_title") } } Publications { }, }, HR {}, div { - H1 { { translate!(i18, "publications_projects.projects.title") } } + H1 { { t!("publications_projects_projects_title") } } Projects { }, } } @@ -36,25 +34,23 @@ struct PublicationProp { } fn Publications() -> Element { - let i18 = use_i18(); - rsx! { div { class: "flex gap-4 items-center flex-wrap", Publication { - title: translate!(i18, "publications_projects.publications.rpm.title"), - authors: translate!(i18, "publications_projects.publications.rpm.authors"), - conference: translate!(i18, "publications_projects.publications.rpm.conference"), - doi: translate!(i18, "publications_projects.publications.rpm.url"), - description: translate!(i18, "publications_projects.publications.rpm.description") + title: t!("publications_projects_publications_rpm_title"), + authors: t!("publications_projects_publications_rpm_authors"), + conference: t!("publications_projects_publications_rpm_conference"), + doi: t!("publications_projects_publications_rpm_url"), + description: t!("publications_projects_publications_rpm_description") }, Publication { - title: translate!(i18, "publications_projects.publications.iot_fuzzers.title"), - authors: translate!(i18, "publications_projects.publications.iot_fuzzers.authors"), - conference: translate!(i18, "publications_projects.publications.iot_fuzzers.conference"), - doi: translate!(i18, "publications_projects.publications.iot_fuzzers.url"), - description: translate!(i18, "publications_projects.publications.iot_fuzzers.description") + title: t!("publications_projects_publications_iot_fuzzers_title"), + authors: t!("publications_projects_publications_iot_fuzzers_authors"), + conference: t!("publications_projects_publications_iot_fuzzers_conference"), + doi: t!("publications_projects_publications_iot_fuzzers_url"), + description: t!("publications_projects_publications_iot_fuzzers_description") }, } } @@ -87,31 +83,29 @@ fn Publication(prop: PublicationProp) -> Element { } fn Projects() -> Element { - let i18 = use_i18(); - rsx! { div { class: "flex gap-4 items-center flex-wrap", Project { - title: translate!(i18, "publications_projects.projects.bachelorproject.title"), - authors: translate!(i18, "publications_projects.projects.bachelorproject.authors"), - kind: translate!(i18, "publications_projects.projects.bachelorproject.kind"), - url: translate!(i18, "publications_projects.projects.bachelorproject.url"), - description: translate!(i18, "publications_projects.projects.bachelorproject.description") + title: t!("publications_projects_projects_bachelorproject_title"), + authors: t!("publications_projects_projects_bachelorproject_authors"), + kind: t!("publications_projects_projects_bachelorproject_kind"), + url: t!("publications_projects_projects_bachelorproject_url"), + description: t!("publications_projects_projects_bachelorproject_description") }, Project { - title: translate!(i18, "publications_projects.projects.dotfiles.title"), - authors: translate!(i18, "publications_projects.projects.dotfiles.authors"), - kind: translate!(i18, "publications_projects.projects.dotfiles.kind"), - url: translate!(i18, "publications_projects.projects.dotfiles.url"), - description: translate!(i18, "publications_projects.projects.dotfiles.description") + title: t!("publications_projects_projects_dotfiles_title"), + authors: t!("publications_projects_projects_dotfiles_authors"), + kind: t!("publications_projects_projects_dotfiles_kind"), + url: t!("publications_projects_projects_dotfiles_url"), + description: t!("publications_projects_projects_dotfiles_description") }, Project { - title: translate!(i18, "publications_projects.projects.homelab.title"), - authors: translate!(i18, "publications_projects.projects.homelab.authors"), - kind: translate!(i18, "publications_projects.projects.homelab.kind"), - url: translate!(i18, "publications_projects.projects.homelab.url"), - description: translate!(i18, "publications_projects.projects.homelab.description") + title: t!("publications_projects_projects_homelab_title"), + authors: t!("publications_projects_projects_homelab_authors"), + kind: t!("publications_projects_projects_homelab_kind"), + url: t!("publications_projects_projects_homelab_url"), + description: t!("publications_projects_projects_homelab_description") } } } From 5db82448c4e048e61eb501b9c067e0c12e8e2086 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Wed, 11 Dec 2024 23:44:07 +0100 Subject: [PATCH 7/9] chore(dependencies): Removed unused dependencies with cargo-machete Signed-off-by: Tuan-Dat Tran --- Cargo.lock | 35 ----------------------------------- Cargo.toml | 5 ----- 2 files changed, 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5216d05..ebaf9ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -200,14 +200,9 @@ name = "athome" version = "0.2.2" dependencies = [ "dioxus", - "dioxus-free-icons", "dioxus-i18n", "dioxus-logger", - "dioxus-sdk", - "lazy_static", - "manganis", "serde", - "tokio", "tracing", ] @@ -1081,15 +1076,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "dioxus-free-icons" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd226c24168bb63d12d69cc0e7a6d73faa970574445c8e79c29965892f1a2ad8" -dependencies = [ - "dioxus", -] - [[package]] name = "dioxus-fullstack" version = "0.6.0" @@ -1340,20 +1326,6 @@ dependencies = [ "syn 2.0.76", ] -[[package]] -name = "dioxus-sdk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7b74aede7070ec1c0ef582dbec8bce93a5c40421155459fcdbcaa0e6ef0bf0" -dependencies = [ - "cfg-if", - "dioxus", - "js-sys", - "tracing", - "uuid", - "warnings", -] - [[package]] name = "dioxus-signals" version = "0.6.0" @@ -2019,10 +1991,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -4497,7 +4467,6 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -4942,10 +4911,6 @@ name = "uuid" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom 0.2.15", - "wasm-bindgen", -] [[package]] name = "vcpkg" diff --git a/Cargo.toml b/Cargo.toml index f2b94d5..a26e95a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,15 +9,10 @@ edition = "2021" [dependencies] serde = { version = "1.0.197", features = ["derive"] } dioxus = { version = "0.6", features = ["fullstack", "router"] } -tokio = { version = "1", features = ["full"], optional = true } # Debug tracing = "0.1.40" dioxus-logger = "0.6.0" -manganis = "0.6.0" -dioxus-free-icons = { version = "0.9", features = ["font-awesome-brands"] } -dioxus-sdk = "0.6.0" -lazy_static = "1.4.0" dioxus-i18n = "0.3.0" [features] From bfe89fa81157e0d331e861027038dd1ead45850b Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Wed, 11 Dec 2024 23:46:55 +0100 Subject: [PATCH 8/9] chore(tailwind): Reran tailwind compilation to match current project css-classes Signed-off-by: Tuan-Dat Tran --- assets/tailwind.css | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/assets/tailwind.css b/assets/tailwind.css index 52ddfd2..71a710f 100644 --- a/assets/tailwind.css +++ b/assets/tailwind.css @@ -588,10 +588,6 @@ video { } } -.static { - position: static; -} - .absolute { position: absolute; } @@ -613,11 +609,6 @@ video { margin-right: auto; } -.my-4 { - margin-top: 1rem; - margin-bottom: 1rem; -} - .my-8 { margin-top: 2rem; margin-bottom: 2rem; @@ -778,12 +769,6 @@ video { margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse))); } -.space-x-8 > :not([hidden]) ~ :not([hidden]) { - --tw-space-x-reverse: 0; - margin-right: calc(2rem * var(--tw-space-x-reverse)); - margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); -} - .space-y-2 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse))); @@ -796,10 +781,6 @@ video { margin-bottom: calc(2rem * var(--tw-space-y-reverse)); } -.overflow-x-auto { - overflow-x: auto; -} - .rounded { border-radius: 0.25rem; } @@ -950,10 +931,6 @@ video { background-clip: text; } -.p-3 { - padding: 0.75rem; -} - .p-4 { padding: 1rem; } From 0d0638fa145cd43bd4be39828fd62e5309720c05 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Wed, 11 Dec 2024 23:53:45 +0100 Subject: [PATCH 9/9] chore(project): Updated project version number Signed-off-by: Tuan-Dat Tran --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ebaf9ec..a0b9cc5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -197,7 +197,7 @@ dependencies = [ [[package]] name = "athome" -version = "0.2.2" +version = "0.3.0" dependencies = [ "dioxus", "dioxus-i18n", diff --git a/Cargo.toml b/Cargo.toml index a26e95a..fab26b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "athome" -version = "0.2.2" +version = "0.3.0" authors = ["Tuan-Dat Tran "] edition = "2021"