From 8c756a4eb62d36743c7f35cdbdf2d03920f52a5c Mon Sep 17 00:00:00 2001 From: antifallobst Date: Sat, 30 Sep 2023 22:12:57 +0200 Subject: [PATCH] feat: added a session struct to communicate with the api and added it as context --- Cargo.lock | 7 +++++++ Cargo.toml | 1 + src/backend/mod.rs | 34 ++++++++++++++++++++++++++++++ src/main.rs | 42 +++++++++++++++++++++++++++----------- src/state.rs | 10 --------- src/topbar/guest/mod.rs | 4 +++- src/topbar/guest/signin.rs | 12 ++++++++--- src/topbar/mod.rs | 7 +++---- 8 files changed, 87 insertions(+), 30 deletions(-) create mode 100644 src/backend/mod.rs delete mode 100644 src/state.rs diff --git a/Cargo.lock b/Cargo.lock index 0710ce1..399ade9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + [[package]] name = "anymap2" version = "0.13.0" @@ -121,6 +127,7 @@ dependencies = [ name = "frontend" version = "0.1.0" dependencies = [ + "anyhow", "gloo 0.10.0", "wasm-bindgen", "web-sys", diff --git a/Cargo.toml b/Cargo.toml index 3252e18..035de76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,3 +11,4 @@ yew-router = "0.17.0" web-sys = { version = "0.3.64", features = ["HtmlInputElement"] } wasm-bindgen = "0.2.87" gloo = "0.10.0" +anyhow = "1.0.75" \ No newline at end of file diff --git a/src/backend/mod.rs b/src/backend/mod.rs new file mode 100644 index 0000000..e81c400 --- /dev/null +++ b/src/backend/mod.rs @@ -0,0 +1,34 @@ +use anyhow::Result; + +#[derive(Clone, PartialEq)] +pub struct Session { + base_url: String, + auth_token: Option, +} + +impl Default for Session { + fn default() -> Self { + Self { + base_url: "https://api.nerdcult.net".to_owned(), + auth_token: None, + } + } +} + +impl Session { + pub fn new(base_url: String) -> Self { + Self { + base_url, + auth_token: None, + } + } + + pub fn login(&mut self, username: &str, password: &str) -> Result<()> { + gloo::console::log!("Login: ", username, " || ", password); + Ok(()) + } + + pub fn is_authenticated(&self) -> bool { + self.auth_token.is_some() + } +} \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index e3ea2ee..6a0f0e5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,10 @@ +mod backend; mod content; -mod state; mod topbar; +use backend::Session; use content::{error, home::Home}; -use state::State; -use std::rc::Rc; +use std::ops::Deref; use topbar::TopBar; use yew::prelude::*; use yew_router::prelude::*; @@ -34,19 +34,37 @@ fn switch(routes: Route) -> Html { } } +#[derive(Clone, PartialEq)] +pub struct Callbacks { + pub sign_in_callback: Callback<(String, String)>, +} + #[function_component] fn App() -> Html { - let state = use_memo(|_| State::default(), ()); + let state = use_state(Session::default); + + let cloned_state = state.clone(); + let callbacks = use_state(move || Callbacks { + sign_in_callback: Callback::from(move |data: (String, String)| { + let mut new_state = cloned_state.deref().clone(); + new_state + .login(data.0.as_str(), data.1.as_str()) + .expect("Login failed"); + cloned_state.set(new_state); + }), + }); html! { - > context={state}> - -
- - render={switch} /> - -
- >> + context={state.deref().clone()}> + context={callbacks.deref().clone()}> + +
+ + render={switch} /> + +
+ > + > } } diff --git a/src/state.rs b/src/state.rs deleted file mode 100644 index 23a00c0..0000000 --- a/src/state.rs +++ /dev/null @@ -1,10 +0,0 @@ -#[derive(Clone, PartialEq)] -pub struct State { - pub auth_token: Option, -} - -impl Default for State { - fn default() -> Self { - Self { auth_token: None } - } -} diff --git a/src/topbar/guest/mod.rs b/src/topbar/guest/mod.rs index eaad046..f6c207f 100644 --- a/src/topbar/guest/mod.rs +++ b/src/topbar/guest/mod.rs @@ -2,6 +2,7 @@ mod signin; mod signup; use crate::topbar::Tab; +use crate::Callbacks; use signin::SignIn; use signup::SignUp; use std::rc::Rc; @@ -49,6 +50,7 @@ impl Reducible for State { #[function_component] pub fn TopBar() -> Html { let state = use_reducer(State::default); + let callbacks = use_context::().expect("Callbacks context not available!"); let sign_in_onclick = { let state = state.clone(); @@ -75,7 +77,7 @@ pub fn TopBar() -> Html { if state.sign_in { - + } if state.sign_up { diff --git a/src/topbar/guest/signin.rs b/src/topbar/guest/signin.rs index 55c5ec0..11bfe8b 100644 --- a/src/topbar/guest/signin.rs +++ b/src/topbar/guest/signin.rs @@ -9,8 +9,13 @@ struct Data { pub password: String, } +#[derive(Properties, PartialEq)] +pub struct Props { + pub callback: Callback<(String, String)>, +} + #[function_component] -pub fn SignIn() -> Html { +pub fn SignIn(props: &Props) -> Html { let state = use_state(|| Data::default()); let cloned_state = state.clone(); @@ -40,12 +45,13 @@ pub fn SignIn() -> Html { }); let cloned_state = state.clone(); + let callback = props.callback.clone(); let onsubmit = Callback::from(move |event: SubmitEvent| { event.prevent_default(); let data = cloned_state.deref().clone(); - gloo::console::log!("username: ", data.username); - gloo::console::log!("password: ", data.password); + + callback.emit((data.username, data.password)); }); html! { diff --git a/src/topbar/mod.rs b/src/topbar/mod.rs index da7457f..0a3815f 100644 --- a/src/topbar/mod.rs +++ b/src/topbar/mod.rs @@ -1,8 +1,7 @@ mod guest; mod user; -use crate::state::State; -use std::rc::Rc; +use crate::backend::Session; use yew::prelude::*; #[derive(Properties, PartialEq)] @@ -27,10 +26,10 @@ fn Tab(props: &TabProps) -> Html { #[function_component] pub fn TopBar() -> Html { - let ctx = use_context::>().expect("No context found!"); + let session = use_context::().unwrap_or_default(); html! { - if ctx.auth_token.is_some() { + if session.is_authenticated() { } else {