Fixed a bug in routing with search terms

Author: David-OConnor

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "seed"
-version = "0.2.6"
+version = "0.2.7"
 description = "A Rust framework for creating web apps, using WebAssembly"
 authors = ["DavidOConnor <[email protected]>"]
 license = "MIT"

examples/counter/src/lib.rs

@@ -123,7 +123,7 @@ fn view(_state: seed::App<Msg, Model>, model: &Model) -> El<Msg> {
 
 #[wasm_bindgen]
 pub fn render() {
-    let app_builder = seed::App::build(Model::default(), update, view);
-
-    app_builder.clone().finish().run();
+    seed::App::build(Model::default(), update, view)
+        .finish()
+        .run();
 }

examples/server_integration/frontend/src/lib.rs

@@ -9,22 +9,11 @@ use shared::Data;
 
 // Model
 
-#[derive(Clone)]
+#[derive(Clone, Default)]
 struct Model {
     pub data: Data,
 }
 
-impl Default for Model {
-    fn default() -> Self {
-        Self {
-            data: Data {
-                val: 0,
-                text: "".into(),
-            },
-        }
-    }
-}
-
 fn get_data(state: seed::App<Msg, Model>) -> impl Future<Item = (), Error = JsValue> {
     let url = "http://localhost:8001/data";
 

examples/server_interaction/src/lib.rs

@@ -80,8 +80,8 @@ impl Default for Model {
     fn default() -> Self {
         Self {
             data: Branch {
-                name: "Test".into(),
-                commit: Commit { sha: "123".into() },
+                name: "Loading...".into(),
+                commit: Commit { sha: "Loading...".into() },
             },
         }
     }
@@ -121,7 +121,9 @@ fn view(state: seed::App<Msg, Model>, model: &Model) -> El<Msg> {
                 "Repo info: name: {}, sha: {}",
                 model.data.name, model.data.commit.sha
             ),
-            did_mount(move |_| spawn_local(get_data(state.clone())))
+
+            // Another approach that would work for initial loading:
+//            did_mount(move |_| spawn_local(get_data(state.clone())))
         ],
         button![
             raw_ev(Ev::Click, move |_| Msg::Send),
@@ -132,8 +134,10 @@ fn view(state: seed::App<Msg, Model>, model: &Model) -> El<Msg> {
 
 #[wasm_bindgen]
 pub fn render() {
-    seed::App::build(Model::default(), update, view)
+    let state = seed::App::build(Model::default(), update, view)
         .mount("main")
         .finish()
         .run();
+
+    spawn_local(get_data(state));
 }

examples/websocket/README.md

@@ -0,0 +1,6 @@
+## Communicating with a server using WebSocket
+
+Inlcludes an example Rust server (not related to Seed), and client. Both share datastructures
+in `json.rs`. To run, run `cargo run` in one terminal, and `python serve.py` in another.
+
+Written by Flosse.

examples/websocket/build.ps1

@@ -1,4 +1,3 @@
-mkdir -p pkg
 cargo build --lib --target wasm32-unknown-unknown --no-default-features
 wasm-bindgen ../../target/wasm32-unknown-unknown/debug/websocket.wasm --no-modules --out-dir ./pkg
 cargo build --bin server --features server

examples/websocket/build.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-mkdir -p pkg
 cargo build --lib --target wasm32-unknown-unknown --no-default-features
 wasm-bindgen ../../target/wasm32-unknown-unknown/debug/websocket.wasm --no-modules --out-dir ./pkg
 cargo build --bin server --features server

examples/websocket/src/client.rs

@@ -110,12 +110,12 @@ fn open_ws(state: App<Msg, Model>) {
 
     let s = state.clone();
     let on_open = Closure::wrap(Box::new(move |_| {
-        log_1(&"WebSocket connection is open now".into());
+        log!("WebSocket connection is open now");
         s.update(Msg::Connected);
     }) as Box<FnMut(JsValue)>);
 
     let on_close = Closure::wrap(Box::new(|_| {
-        log_1(&"WebSocket connection was closed".into());
+        log!("WebSocket connection was closed");
     }) as Box<FnMut(JsValue)>);
 
     let s = state.clone();
@@ -152,7 +152,7 @@ fn open_ws(state: App<Msg, Model>) {
 
 #[wasm_bindgen]
 pub fn start() {
-    log_1(&"start the websocket client app".into());
+    log!("start the websocket client app");
     let app = App::build(Model::default(), update, view).finish().run();
     open_ws(app);
 }

examples/window_events/src/lib.rs

@@ -2,11 +2,11 @@
 
 #[macro_use]
 extern crate seed;
-use seed::prelude::*;
+use seed::{prelude::*, dom_types::Listener};
 
 // Model
 
-#[derive(Clone)]
+#[derive(Clone, Default)]
 struct Model {
     watching: bool,
     coords: (i32, i32),
@@ -19,16 +19,6 @@ impl Model {
     }
 }
 
-impl Default for Model {
-    fn default() -> Self {
-        Self {
-            watching: false,
-            coords: (0, 0),
-            last_keycode: 0,
-        }
-    }
-}
-
 // Update
 
 #[derive(Clone)]
@@ -92,11 +82,11 @@ fn view(_state: seed::App<Msg, Model>, model: &Model) -> El<Msg> {
     ]
 }
 
-fn window_events(model: Model) -> Vec<seed::Listener<Msg>> {
+fn window_events(model: &Model) -> Vec<Listener<Msg>> {
     let mut result = Vec::new();
     if model.watching {
-        result.push(mouse_ev(Ev::MouseMove, |ev| Msg::UpdateCoords(ev)));
-        result.push(keyboard_ev(Ev::KeyDown, |ev| Msg::KeyPressed(ev)));
+        result.push(mouse_ev(Ev::MouseMove, Msg::UpdateCoords));
+        result.push(keyboard_ev(Ev::KeyDown, Msg::KeyPressed));
     }
     result
 }

src/lib.rs

@@ -133,11 +133,11 @@ pub mod tests {
             div!["Hello world"]
         }
 
-        fn window_events(model: Model) -> Vec<seed::dom_types::Listener<Msg>> {
+        fn window_events(model: &Model) -> Vec<seed::dom_types::Listener<Msg>> {
             vec![mouse_ev("mousemove", |_| Msg::Increment)]
         }
 
-        fn routes(url: seed::Url) -> Msg {
+        fn routes(url: &seed::Url) -> Msg {
             Msg::Increment
         }