From 08f7abb269b9c89a4b83735cb3d8f31a30dbd65e Mon Sep 17 00:00:00 2001 From: Miroito Date: Thu, 16 Mar 2023 13:50:07 +0100 Subject: [PATCH] hotfix: api_url not set properly --- Cargo.lock | 117 +++++++++++++++++++++------ client/src/templates/transactions.rs | 4 +- 2 files changed, 95 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d94eee..6003d60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -95,6 +95,12 @@ dependencies = [ "libc", ] +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + [[package]] name = "arrayvec" version = "0.7.2" @@ -415,6 +421,18 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitvec" +version = "0.19.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block-buffer" version = "0.10.3" @@ -772,13 +790,13 @@ dependencies = [ [[package]] name = "css-minify" -version = "0.3.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874c6e2d19f8d4a285083b11a3241bfbe01ac3ed85f26e1e6b34888d960552bd" +checksum = "692b185e3b7c9af96b3195f3021f53a931d896968ed2ad3fb1cdb6558b30c9ab" dependencies = [ "derive_more", "indexmap", - "nom", + "nom 6.1.2", ] [[package]] @@ -1256,6 +1274,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + [[package]] name = "futures" version = "0.3.26" @@ -1884,6 +1908,19 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec 0.5.2", + "bitflags", + "cfg-if 1.0.0", + "ryu", + "static_assertions", +] + [[package]] name = "libc" version = "0.2.139" @@ -2035,23 +2072,22 @@ dependencies = [ [[package]] name = "minify-html-onepass" -version = "0.10.8" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89548d0be6d3c7295335473fbe5c021fde64de738e01312301c90b9f1dd8476" +checksum = "1d552bca3e100fe7835371eba6b37c83a857a6fe5f400e176dc15a28403e0d1c" dependencies = [ "aho-corasick", "css-minify", "lazy_static", "memchr", "minify-js", - "rustc-hash", ] [[package]] name = "minify-js" -version = "0.4.3" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c300f90ba1138b5c5daf5d9441dc9bdc67b808aac22cf638362a2647bc213be4" +checksum = "7fe033709f5a1159736cf7e22748518ffb75af26f3a6264d52ecc8bb38c68c36" dependencies = [ "lazy_static", "parse-js", @@ -2176,6 +2212,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check 0.9.4", +] + [[package]] name = "nom" version = "7.1.3" @@ -2431,9 +2480,9 @@ dependencies = [ [[package]] name = "parse-js" -version = "0.10.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30534759e6ad87aa144c396544747e1c25b1020bd133356fd758c8facec764e5" +checksum = "66bb85ec60d22b9e6d4adac1e3dbdaf3903a4485f476c5f4dd7ed1285cbf4dad" dependencies = [ "aho-corasick", "lazy_static", @@ -2514,9 +2563,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "perseus" -version = "0.4.0-beta.21" +version = "0.4.0-beta.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579ff750d340ca202fd782e34ea6c55119a50defbcbbaa04858f9dfafcd21cc9" +checksum = "3a3bf9f8bbc387bcc1b5e69e380b78aa598777e1b44872816ed86fc599aa9729" dependencies = [ "async-trait", "chrono", @@ -2545,9 +2594,9 @@ dependencies = [ [[package]] name = "perseus-axum" -version = "0.4.0-beta.19" +version = "0.4.0-beta.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584a80e74289626f89a0defb3a213f5ee44b5d6dc20bf345624be057a91edaa3" +checksum = "7ca2d139e1eb507cca8ffcda8878f1da174285058843bf75d4f8c64b7016d8a8" dependencies = [ "axum", "perseus", @@ -2556,9 +2605,9 @@ dependencies = [ [[package]] name = "perseus-macro" -version = "0.4.0-beta.21" +version = "0.4.0-beta.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749da07e987c60900c2110421554aeb23b79c4914e16851712e3ef635f2592f0" +checksum = "f5620bc354c480258abe55f2bcdaa5569d584a5b76fb7a1dc4fb34a5d5bd9dcf" dependencies = [ "darling", "proc-macro2 1.0.51", @@ -2788,6 +2837,12 @@ dependencies = [ "proc-macro2 1.0.51", ] +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + [[package]] name = "rand" version = "0.8.5" @@ -3170,7 +3225,7 @@ version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13cf35f7140155d02ba4ec3294373d513a3c7baa8364c162b030e33c61520a8" dependencies = [ - "arrayvec", + "arrayvec 0.7.2", "borsh", "bytecheck", "byteorder", @@ -3182,12 +3237,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.2.3" @@ -3730,7 +3779,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" dependencies = [ "itertools", - "nom", + "nom 7.1.3", "unicode_categories", ] @@ -3862,6 +3911,12 @@ dependencies = [ "loom", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "stdweb" version = "0.4.20" @@ -4022,7 +4077,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92914a2f809b636d245b28d8a734801ecb8ff9c4996bbe6ea4176582e12503eb" dependencies = [ - "nom", + "nom 7.1.3", "proc-macro2 1.0.51", "quote 1.0.23", "syn 1.0.108", @@ -4073,6 +4128,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tempfile" version = "3.3.0" @@ -4961,6 +5022,12 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "yansi" version = "0.5.1" diff --git a/client/src/templates/transactions.rs b/client/src/templates/transactions.rs index 10445fd..04b633b 100644 --- a/client/src/templates/transactions.rs +++ b/client/src/templates/transactions.rs @@ -12,6 +12,7 @@ use crate::{ paginated_data_table::{PaginatedTable, PaginatedTableStateRx}, the_header::TheHeader, }, + env::Config, global_state::AppStateRx, }; @@ -48,8 +49,9 @@ fn transactions_page(cx: Scope, state: &TransactionsPageStateRx) -> Vie table_class: create_ref(cx, "".to_string()), }; + let api_url = Config::new().api_url; let async_select_prop: AsyncSelectRx = AsyncSelectRx { - remote_list: create_signal(cx, format!("{}company/", "http://localhost:8000/v1/")), + remote_list: create_signal(cx, format!("{}company", api_url)), selected_item: create_signal(cx, None), };