fix: app_builder example refactor

Author: MartinKavik

examples/app_builder/src/lib.rs

@@ -2,55 +2,30 @@ use seed::{prelude::*, *};
 use web_sys;
 
 // ------ ------
-//     Model
+// Before Mount
 // ------ ------
 
-#[derive(Default)]
-struct Model {
-    clicks: u32,
+fn before_mount(_: Url) -> BeforeMount {
+    BeforeMount::new()
+        .mount_point("main")
+        .mount_type(MountType::Takeover)
 }
 
 // ------ ------
-//    Update
+//     Model
 // ------ ------
 
-#[derive(Clone)]
-enum Msg {
-    Clicked,
-    UrlChanged(Url),
-    KeyPressed(web_sys::KeyboardEvent),
-    SayHello,
-}
-
-fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>) {
-    match msg {
-        Msg::Clicked => model.clicks += 1,
-        Msg::UrlChanged(url) => {
-            log!(url);
-            orders.skip();
-        }
-        Msg::KeyPressed(event) => {
-            log!(event.key());
-            orders.skip();
-        }
-        Msg::SayHello => {
-            orders.send_g_msg(GMsg::SayHello);
-        }
-    }
+struct Model {
+    clicks: u32,
 }
 
 // ------ ------
-//     View
+//  After Mount
 // ------ ------
 
-fn view(model: &Model) -> impl View<Msg> {
-    vec![
-        button![
-            format!("Clicked: {}", model.clicks),
-            simple_ev(Ev::Click, Msg::Clicked),
-        ],
-        button!["Say hello", simple_ev(Ev::Click, Msg::SayHello),],
-    ]
+fn after_mount(_: Url, _: &mut impl Orders<Msg, GMsg>) -> AfterMount<Model> {
+    let model = Model { clicks: 0 };
+    AfterMount::new(model).url_handling(UrlHandling::None)
 }
 
 // ------ ------
@@ -65,7 +40,7 @@ fn routes(url: Url) -> Option<Msg> {
 // Window Events
 // ------ ------
 
-fn window_events(_model: &Model) -> Vec<Listener<Msg>> {
+fn window_events(_: &Model) -> Vec<Listener<Msg>> {
     vec![keyboard_ev(Ev::KeyDown, Msg::KeyPressed)]
 }
 
@@ -78,28 +53,53 @@ enum GMsg {
     SayHello,
 }
 
-fn sink(g_msg: GMsg, _model: &mut Model, _orders: &mut impl Orders<Msg, GMsg>) {
+fn sink(g_msg: GMsg, _: &mut Model, _: &mut impl Orders<Msg, GMsg>) {
     match g_msg {
         GMsg::SayHello => log!("Hello!"),
     }
 }
 
 // ------ ------
-// Before Mount
+//    Update
 // ------ ------
 
-fn before_mount(_: Url) -> BeforeMount {
-    BeforeMount::new()
-        .mount_point("main")
-        .mount_type(MountType::Takeover)
+#[derive(Clone)]
+enum Msg {
+    Clicked,
+    UrlChanged(Url),
+    KeyPressed(web_sys::KeyboardEvent),
+    SayHello,
+}
+
+fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg, GMsg>) {
+    match msg {
+        Msg::Clicked => model.clicks += 1,
+        Msg::UrlChanged(url) => {
+            log!(url);
+            orders.skip();
+        }
+        Msg::KeyPressed(event) => {
+            log!(event.key());
+            orders.skip();
+        }
+        Msg::SayHello => {
+            orders.send_g_msg(GMsg::SayHello);
+        }
+    }
 }
 
 // ------ ------
-//  After Mount
+//     View
 // ------ ------
 
-fn after_mount(_: Url, _orders: &mut impl Orders<Msg, GMsg>) -> AfterMount<Model> {
-    AfterMount::new(Model { clicks: 0 }).url_handling(UrlHandling::None)
+fn view(model: &Model) -> impl View<Msg> {
+    vec![
+        button![
+            format!("Clicked: {}", model.clicks),
+            simple_ev(Ev::Click, Msg::Clicked),
+        ],
+        button!["Say hello", simple_ev(Ev::Click, Msg::SayHello),],
+    ]
 }
 
 // ------ ------
@@ -109,10 +109,10 @@ fn after_mount(_: Url, _orders: &mut impl Orders<Msg, GMsg>) -> AfterMount<Model
 #[wasm_bindgen(start)]
 pub fn render() {
     App::builder(update, view)
+        .before_mount(before_mount)
+        .after_mount(after_mount)
         .routes(routes)
         .window_events(window_events)
         .sink(sink)
-        .before_mount(before_mount)
-        .after_mount(after_mount)
         .build_and_start();
 }