From babe8627394c47491348b7e3cec54ce02a31e3b2 Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Wed, 16 Feb 2022 14:11:31 -0500
Subject: [PATCH] fix: login example to use proper methods

---
 examples/login_form.rs                 | 23 +++++++++++------------
 packages/router/src/hooks/use_route.rs |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/examples/login_form.rs b/examples/login_form.rs
index 62c6f982..cdf05d7c 100644
--- a/examples/login_form.rs
+++ b/examples/login_form.rs
@@ -3,20 +3,20 @@
 
 use dioxus::events::*;
 use dioxus::prelude::*;
-use dioxus::router::{Link, Route, Router, RouterService};
+use dioxus::router::{use_router, Link, Route, Router};
 
 fn main() {
-    dioxus::desktop::launch(APP);
+    dioxus::desktop::launch(app);
 }
 
-static APP: Component = |cx| {
+fn app(cx: Scope) -> Element {
     cx.render(rsx! {
         Router {
             Route { to: "/", home() }
             Route { to: "/login", login() }
         }
     })
-};
+}
 
 fn home(cx: Scope) -> Element {
     cx.render(rsx! {
@@ -26,7 +26,7 @@ fn home(cx: Scope) -> Element {
 }
 
 fn login(cx: Scope) -> Element {
-    let service = cx.consume_context::<RouterService>()?;
+    let service = use_router(&cx);
 
     let onsubmit = move |evt: FormEvent| {
         to_owned![service];
@@ -42,10 +42,10 @@ fn login(cx: Scope) -> Element {
 
             match resp {
                 // Parse data from here, such as storing a response token
-                Ok(data) => service.push_route("/"),
+                Ok(_data) => service.push_route("/"),
 
                 //Handle any errors from the fetch here
-                Err(err) => {}
+                Err(_err) => {}
             }
         });
     };
@@ -55,13 +55,12 @@ fn login(cx: Scope) -> Element {
         form {
             onsubmit: onsubmit,
             prevent_default: "onsubmit", // Prevent the default behavior of <form> to post
-            input { r#type: "text" }
+
+            input { "type": "text" }
             label { "Username" }
             br {}
-            input { r#type: "password" }
-            label {
-                "Password"
-            }
+            input { "type": "password" }
+            label { "Password" }
             br {}
             button { "Login" }
         }
diff --git a/packages/router/src/hooks/use_route.rs b/packages/router/src/hooks/use_route.rs
index 31a157a8..4de6dff1 100644
--- a/packages/router/src/hooks/use_route.rs
+++ b/packages/router/src/hooks/use_route.rs
@@ -106,7 +106,7 @@ impl Drop for UseRouteListener {
 }
 
 /// This hook provides access to the `RouterService` for the app.
-pub fn use_router(cx: &ScopeState) -> &RouterService {
+pub fn use_router(cx: &ScopeState) -> &Rc<RouterService> {
     cx.use_hook(|_| {
         cx.consume_context::<RouterService>()
             .expect("Cannot call use_route outside the scope of a Router component")