diff --git a/Cargo.lock b/Cargo.lock index 266374e..f9e1802 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -231,9 +231,9 @@ dependencies = [ [[package]] name = "async-std" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" +checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24" dependencies = [ "async-channel 1.9.0", "async-global-executor", @@ -401,11 +401,22 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" -version = "1.3.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" dependencies = [ + "bincode_derive", "serde", + "unty", +] + +[[package]] +name = "bincode_derive" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" +dependencies = [ + "virtue", ] [[package]] @@ -462,9 +473,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.11.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94feba04f99cbce6558bbe1c18e38692a056981cb66c96f0878c2452aa28023" +checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", "regex-automata", @@ -558,9 +569,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -569,7 +580,7 @@ dependencies = [ "pure-rust-locales", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -950,9 +961,9 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", "serde", @@ -984,9 +995,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.2.7" +version = "2.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04001f23ba8843dc315804fa324000376084dfb1c30794ff68dd279e6e5696d5" +checksum = "229850a212cd9b84d4f0290ad9d294afc0ae70fccaa8949dbe8b43ffafa1e20c" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -1336,9 +1347,9 @@ dependencies = [ [[package]] name = "dioxus-i18n" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97da8c5cbb956baaa8faffeb7ffba342dc8f2dc02f16aeaf9d94708bcf2b221" +checksum = "159eac1082ac62f2655f36e99967509c71d75c19f6fe40b241ea0f6d2e75a3e8" dependencies = [ "dioxus-lib", "fluent", @@ -1456,9 +1467,9 @@ dependencies = [ [[package]] name = "dioxus-query" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa7b522f5af76a3604845b07eb0be98e1a7aa7de54e85daf9ef303b92d8689f" +checksum = "155df4befc5ae7c6393114720efbe5c9592941fdff8c98366e8e50ea950d251d" dependencies = [ "dioxus-lib", "futures-util", @@ -1687,6 +1698,12 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + [[package]] name = "either" version = "1.13.0" @@ -1820,14 +1837,13 @@ dependencies = [ [[package]] name = "feruca" -version = "0.10.1" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06eccaab9dc53ad4bffb4ed748baf5c1f9475d5e9cac35e1b8eac69dac56899e" +checksum = "9cb481799628afdf9ca9ba017c67b883cd3d031256145ceb97b7837f3f2b575c" dependencies = [ "bincode", "bstr", - "once_cell", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "unicode-canonical-combining-class", ] @@ -2661,7 +2677,7 @@ dependencies = [ "displaydoc", "yoke", "zerofrom", - "zerovec", + "zerovec 0.10.4", ] [[package]] @@ -2672,9 +2688,9 @@ checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" dependencies = [ "displaydoc", "litemap", - "tinystr", + "tinystr 0.7.6", "writeable", - "zerovec", + "zerovec 0.10.4", ] [[package]] @@ -2687,8 +2703,8 @@ dependencies = [ "icu_locid", "icu_locid_transform_data", "icu_provider", - "tinystr", - "zerovec", + "tinystr 0.7.6", + "zerovec 0.10.4", ] [[package]] @@ -2712,7 +2728,7 @@ dependencies = [ "utf16_iter", "utf8_iter", "write16", - "zerovec", + "zerovec 0.10.4", ] [[package]] @@ -2732,8 +2748,8 @@ dependencies = [ "icu_locid_transform", "icu_properties_data", "icu_provider", - "tinystr", - "zerovec", + "tinystr 0.7.6", + "zerovec 0.10.4", ] [[package]] @@ -2752,11 +2768,11 @@ dependencies = [ "icu_locid", "icu_provider_macros", "stable_deref_trait", - "tinystr", + "tinystr 0.7.6", "writeable", "yoke", "zerofrom", - "zerovec", + "zerovec 0.10.4", ] [[package]] @@ -4128,6 +4144,26 @@ dependencies = [ "thiserror 1.0.63", ] +[[package]] +name = "ref-cast" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.94", +] + [[package]] name = "regex" version = "1.10.6" @@ -4236,9 +4272,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustc_version" @@ -4307,6 +4343,30 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -4388,9 +4448,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -4408,9 +4468,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -4419,9 +4479,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.138" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" dependencies = [ "itoa 1.0.11", "memchr", @@ -4484,15 +4544,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" +checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" dependencies = [ "base64", "chrono", "hex", "indexmap 1.9.3", "indexmap 2.4.0", + "schemars 0.9.0", + "schemars 1.0.4", "serde", "serde_derive", "serde_json", @@ -4502,9 +4564,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" +checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" dependencies = [ "darling", "proc-macro2", @@ -4989,9 +5051,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.37" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa 1.0.11", @@ -5004,15 +5066,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.19" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", @@ -5025,7 +5087,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", - "zerovec", + "zerovec 0.10.4", +] + +[[package]] +name = "tinystr" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +dependencies = [ + "displaydoc", + "zerovec 0.11.4", ] [[package]] @@ -5422,12 +5494,12 @@ dependencies = [ [[package]] name = "unic-langid-impl" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" +checksum = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658" dependencies = [ "serde", - "tinystr", + "tinystr 0.8.1", ] [[package]] @@ -5437,7 +5509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0da1cd2c042d3c7569a1008806b02039e7a4a2bdf8f8e96bd3c792434a0e275e" dependencies = [ "proc-macro-hack", - "tinystr", + "tinystr 0.7.6", "unic-langid-impl", "unic-langid-macros-impl", ] @@ -5502,6 +5574,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +[[package]] +name = "unty" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" + [[package]] name = "url" version = "2.5.2" @@ -5546,9 +5624,9 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "validator" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b4a29d8709210980a09379f27ee31549b73292c87ab9899beee1c0d3be6303" +checksum = "43fb22e1a008ece370ce08a3e9e4447a910e92621bb49b85d6e48a45397e7cfa" dependencies = [ "idna 1.0.3", "once_cell", @@ -5562,9 +5640,9 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac855a2ce6f843beb229757e6e570a42e837bcb15e5f449dd48d5747d41bf77" +checksum = "b7df16e474ef958526d1205f6dda359fdfab79d9aa6d54bafcb92dcd07673dca" dependencies = [ "darling", "once_cell", @@ -5598,6 +5676,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "virtue" +version = "0.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" + [[package]] name = "voca_rs" version = "1.15.2" @@ -5933,6 +6017,12 @@ dependencies = [ "syn 2.0.94", ] +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + [[package]] name = "windows-registry" version = "0.2.0" @@ -6420,6 +6510,15 @@ dependencies = [ "zerovec-derive", ] +[[package]] +name = "zerovec" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" +dependencies = [ + "zerofrom", +] + [[package]] name = "zerovec-derive" version = "0.10.3" diff --git a/Cargo.toml b/Cargo.toml index d6b05c9..62fe3ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,29 +2,29 @@ name = "todo-baggins" version = "0.1.0" authors = ["Matouš Volf "] -edition = "2021" +edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -chrono = { version = "0.4.39", features = ["serde", "unstable-locales"] } +chrono = { version = "0.4.41", features = ["serde", "unstable-locales"] } dioxus = { version = "0.6.3", features = ["fullstack", "router"] } -feruca = { version = "0.10.1" } -serde = { version = "1.0.217" } -serde_json = { version = "1.0.138" } -serde_with = { version = "3.12.0", features = ["chrono_0_4"] } +feruca = { version = "0.11.4" } +serde = { version = "1.0.219" } +serde_json = { version = "1.0.142" } +serde_with = { version = "3.14.0", features = ["chrono_0_4"] } tracing = "0.1.41" -unic-langid-impl = { version = "0.9.5", features = ["serde"] } -validator = { version = "0.19.0", features = ["derive"] } +unic-langid-impl = { version = "0.9.6", features = ["serde"] } +validator = { version = "0.20.0", features = ["derive"] } -diesel = { version = "2.2.7", features = ["chrono", "postgres", "postgres_backend", "serde_json"], optional = true } +diesel = { version = "2.2.12", features = ["chrono", "postgres", "postgres_backend", "serde_json"], optional = true } diesel_migrations = { version = "2.2.0", features = ["postgres"], optional = true } dotenvy = { version = "0.15.7", optional = true } -time = { version = "0.3.37", optional = true } +time = { version = "0.3.41", optional = true } -async-std = { version = "1.13.0", optional = true } -dioxus-i18n = { version = "0.4.2", optional = true } -dioxus-query = { version = "0.6.0", optional = true } +async-std = { version = "1.13.1", optional = true } +dioxus-i18n = { version = "0.4.3", optional = true } +dioxus-query = { version = "0.6.1", optional = true } voca_rs = { version = "1.15.2", optional = true } [features] diff --git a/docker/dev/app/Dockerfile b/docker/dev/app/Dockerfile index fb4e808..5407fbf 100644 --- a/docker/dev/app/Dockerfile +++ b/docker/dev/app/Dockerfile @@ -1,5 +1,4 @@ -# 1.83.0-bookworm -FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b +FROM rust:1.88.0-bookworm@sha256:5771a3cc2081935c59ac52b92d49c9e164d4fed92c9f6420aa8cc50364aead6e RUN cargo install dioxus-cli --version 0.6.3 \ && cargo install diesel_cli --version 2.2.7 @@ -14,4 +13,4 @@ HEALTHCHECK CMD curl --fail -H "Accept: text/html" http://localhost:8000 || exit USER 1000:1000 -CMD ["dx", "serve", "--addr", "0.0.0.0", "--port", "8000"] +CMD ["sleep", "infinity"] diff --git a/docker/prod/app/Dockerfile b/docker/prod/app/Dockerfile index 171ca3c..cde30a1 100644 --- a/docker/prod/app/Dockerfile +++ b/docker/prod/app/Dockerfile @@ -1,5 +1,4 @@ -# 1.83.0-bookworm -FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b AS builder +FROM rust:1.88.0-bookworm@sha256:5771a3cc2081935c59ac52b92d49c9e164d4fed92c9f6420aa8cc50364aead6e AS builder RUN apt-get update && apt-get install -y --no-install-recommends \ nodejs=18.19.0+dfsg-6~deb12u2 \ @@ -16,8 +15,7 @@ RUN npm install \ && npm run build \ && dx bundle -# bookworm -FROM debian@sha256:b877a1a3fdf02469440f1768cf69c9771338a875b7add5e80c45b756c92ac20a AS runner +FROM debian:bookworm@sha256:b877a1a3fdf02469440f1768cf69c9771338a875b7add5e80c45b756c92ac20a AS runner RUN apt-get update \ && apt-get install -y --no-install-recommends libpq5=15.10-0+deb12u1 \ diff --git a/src/components/pages/category_calendar_page.rs b/src/components/pages/category_calendar_page.rs index 09db976..4b04825 100644 --- a/src/components/pages/category_calendar_page.rs +++ b/src/components/pages/category_calendar_page.rs @@ -2,8 +2,8 @@ use crate::components::task_list::TaskList; use crate::internationalization::LocaleFromLanguageIdentifier; use crate::models::category::Category; use crate::models::task::TaskWithSubtasks; -use crate::query::tasks::use_tasks_with_subtasks_in_category_query; use crate::query::QueryValue; +use crate::query::tasks::use_tasks_with_subtasks_in_category_query; use chrono::{Datelike, Local}; use dioxus::core_macro::rsx; use dioxus::dioxus_core::Element; diff --git a/src/components/pages/category_page.rs b/src/components/pages/category_page.rs index 8d8ba37..533cbce 100644 --- a/src/components/pages/category_page.rs +++ b/src/components/pages/category_page.rs @@ -1,7 +1,7 @@ use crate::components::task_list::TaskList; use crate::models::category::Category; -use crate::query::tasks::use_tasks_with_subtasks_in_category_query; use crate::query::QueryValue; +use crate::query::tasks::use_tasks_with_subtasks_in_category_query; use dioxus::core_macro::rsx; use dioxus::dioxus_core::Element; use dioxus::prelude::*; diff --git a/src/components/pages/category_today_page.rs b/src/components/pages/category_today_page.rs index bec69a6..6e4a873 100644 --- a/src/components/pages/category_today_page.rs +++ b/src/components/pages/category_today_page.rs @@ -3,8 +3,8 @@ use crate::components::task_list_item::TaskListItem; use crate::internationalization::LocaleFromLanguageIdentifier; use crate::models::category::Category; use crate::models::task::TaskWithSubtasks; -use crate::query::tasks::use_tasks_with_subtasks_in_category_query; use crate::query::QueryValue; +use crate::query::tasks::use_tasks_with_subtasks_in_category_query; use chrono::Local; use dioxus::prelude::*; use dioxus_i18n::t; diff --git a/src/components/pages/projects_page.rs b/src/components/pages/projects_page.rs index dd6f3dc..7218433 100644 --- a/src/components/pages/projects_page.rs +++ b/src/components/pages/projects_page.rs @@ -1,6 +1,6 @@ use crate::models::project::Project; -use crate::query::projects::use_projects_query; use crate::query::QueryValue; +use crate::query::projects::use_projects_query; use dioxus::prelude::*; use dioxus_query::prelude::QueryResult; diff --git a/src/components/subtasks_form.rs b/src/components/subtasks_form.rs index dbc07d3..f18dc36 100644 --- a/src/components/subtasks_form.rs +++ b/src/components/subtasks_form.rs @@ -6,7 +6,7 @@ use crate::server::subtasks::{create_subtask, delete_subtask, edit_subtask}; use dioxus::core_macro::{component, rsx}; use dioxus::dioxus_core::Element; use dioxus::prelude::*; -use dioxus_query::prelude::{use_query_client, QueryResult}; +use dioxus_query::prelude::{QueryResult, use_query_client}; #[component] pub(crate) fn SubtasksForm(task: Task) -> Element { diff --git a/src/components/task_form.rs b/src/components/task_form.rs index 99d5f5f..b178502 100644 --- a/src/components/task_form.rs +++ b/src/components/task_form.rs @@ -13,7 +13,7 @@ use dioxus::core_macro::{component, rsx}; use dioxus::dioxus_core::Element; use dioxus::prelude::*; use dioxus_i18n::t; -use dioxus_query::prelude::{use_query_client, QueryResult}; +use dioxus_query::prelude::{QueryResult, use_query_client}; const REMINDER_OFFSETS: [Option; 17] = [ None, diff --git a/src/errors/project_error.rs b/src/errors/project_error.rs index 201cb67..138ab0d 100644 --- a/src/errors/project_error.rs +++ b/src/errors/project_error.rs @@ -16,7 +16,7 @@ impl From for ErrorVec { validation_errors .errors() .iter() - .flat_map(|(&field, error_kind)| match field { + .flat_map(|(field, error_kind)| match field.as_ref() { "title" => match error_kind { ValidationErrorsKind::Field(validation_errors) => validation_errors .iter() diff --git a/src/errors/subtask_error.rs b/src/errors/subtask_error.rs index f03530e..3a0195d 100644 --- a/src/errors/subtask_error.rs +++ b/src/errors/subtask_error.rs @@ -17,7 +17,7 @@ impl From for ErrorVec { validation_errors .errors() .iter() - .flat_map(|(&field, error_kind)| match field { + .flat_map(|(field, error_kind)| match field.as_ref() { "title" => match error_kind { ValidationErrorsKind::Field(validation_errors) => validation_errors .iter() diff --git a/src/errors/task_error.rs b/src/errors/task_error.rs index d01ffb5..170d3fd 100644 --- a/src/errors/task_error.rs +++ b/src/errors/task_error.rs @@ -17,7 +17,7 @@ impl From for ErrorVec { validation_errors .errors() .iter() - .flat_map(|(&field, error_kind)| match field { + .flat_map(|(field, error_kind)| match field.as_ref() { "title" => match error_kind { ValidationErrorsKind::Field(validation_errors) => validation_errors .iter() diff --git a/src/migrations/mod.rs b/src/migrations/mod.rs index 9fadaae..9847cb8 100644 --- a/src/migrations/mod.rs +++ b/src/migrations/mod.rs @@ -1,4 +1,4 @@ -use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness}; +use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations}; use std::error::Error; const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations"); diff --git a/src/query/projects.rs b/src/query/projects.rs index 1320c59..7bb1b10 100644 --- a/src/query/projects.rs +++ b/src/query/projects.rs @@ -1,7 +1,7 @@ use crate::query::{QueryErrors, QueryKey, QueryValue}; use crate::server::projects::get_projects; use dioxus::prelude::ServerFnError; -use dioxus_query::prelude::{use_get_query, QueryResult, UseQuery}; +use dioxus_query::prelude::{QueryResult, UseQuery, use_get_query}; pub(crate) fn use_projects_query() -> UseQuery { use_get_query([QueryKey::Projects, QueryKey::Tasks], fetch_projects) diff --git a/src/query/subtasks.rs b/src/query/subtasks.rs index 7ac1302..f0216c2 100644 --- a/src/query/subtasks.rs +++ b/src/query/subtasks.rs @@ -1,7 +1,7 @@ use crate::query::{QueryErrors, QueryKey, QueryValue}; use crate::server::subtasks::get_subtasks_of_task; use dioxus::prelude::ServerFnError; -use dioxus_query::prelude::{use_get_query, QueryResult, UseQuery}; +use dioxus_query::prelude::{QueryResult, UseQuery, use_get_query}; pub(crate) fn use_subtasks_of_task_query( task_id: i32, diff --git a/src/query/tasks.rs b/src/query/tasks.rs index 9090af3..e23b5b4 100644 --- a/src/query/tasks.rs +++ b/src/query/tasks.rs @@ -2,7 +2,7 @@ use crate::models::category::Category; use crate::query::{QueryErrors, QueryKey, QueryValue}; use crate::server::tasks::{get_tasks_in_category, get_tasks_with_subtasks_in_category}; use dioxus::prelude::ServerFnError; -use dioxus_query::prelude::{use_get_query, QueryResult, UseQuery}; +use dioxus_query::prelude::{QueryResult, UseQuery, use_get_query}; #[allow(dead_code)] pub(crate) fn use_tasks_in_category_query(