Skip to content

Commit 80117d9

Browse files
authored
Merge branch 'adding_json_reading' into main
2 parents 9e7cba7 + c0bbd4d commit 80117d9

3 files changed

Lines changed: 7 additions & 173 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 171 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ license = "MIT"
77
repository = "https://github.com/aknarts/yew-custom-components/tree/main/examples/overview"
88
keywords = ["yew", "web-components", "custom-elements", "wasm"]
99
categories = ["web-programming", "wasm"]
10+
resolver = "2"
1011

1112
[dependencies]
1213
console_error_panic_hook = "0.1"
1314
gloo-storage = "0.3"
1415
lazy_static = "1.4"
15-
serde = { version = "1", features = ["derive"] }
16+
serde = { version = "1.0", features = ["derive"] }
1617
serde-value = "0.7"
18+
serde_json = "1.0"
1719
tracing = "0.1"
1820
tracing-wasm = "0.2"
1921
yew = { version = "0.21.0", features = ["csr"] }
@@ -22,3 +24,6 @@ serde_json = "1.0.117"
2224
yew-hooks = "0.3"
2325
yew-router = "0.18"
2426
web-sys = { version = "0.3", features = ["HtmlInputElement","Document", "Window"] }
27+
reqwest = { version = "0.11", features = ["json"] }
28+
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
29+
tokio = { version = "1", features = ["full"] }

src/sauce/home.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub fn home() -> Html {
3636

3737
// Column definition
3838
let columns = vec![
39-
ColumnBuilder::new("select").orderable(true).short_name("Sum").data_property("select").header_class("user-select-none").build(),
39+
ColumnBuilder::new("select").orderable(true).short_name("Select").data_property("select").header_class("user-select-none").build(),
4040
ColumnBuilder::new("id").orderable(true).short_name("ID").data_property("id").header_class("user-select-none").build(),
4141
ColumnBuilder::new("name").orderable(true).short_name("Name").data_property("name").header_class("user-select-none").build(),
4242
ColumnBuilder::new("value").orderable(true).short_name("Value").data_property("value").header_class("user-select-none").build(),

0 commit comments

Comments
 (0)