projectmoon
/
tenebrous-dicebot
1
0
Fork 1
Code Issues 12 Pull Requests 1 Projects Releases 10 Wiki Activity

Web API, Web UI #86

Merged
projectmoon merged 37 commits from web-api into master 2021-07-15 15:04:54 +00:00
Conversation 0 Commits 37 Files Changed 49 +6 -10
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da3874986f - Show all commits

16
web-ui/crate/src/components/login.rs
View File

@ -1,9 +1,8 @@
use crate::api;
use crate::error::UiError; use crate::error::UiError;
use crate::state::{Action, Room, WebUiDispatcher}; use crate::state::{Action, WebUiDispatcher};
use crate::{api, state::WebUiState}; use std::rc::Rc;
use std::sync::Arc;
use wasm_bindgen_futures::spawn_local; use wasm_bindgen_futures::spawn_local;
use web_sys::console;
use web_sys::FocusEvent; use web_sys::FocusEvent;
use yew::prelude::*; use yew::prelude::*;
use yewdux::dispatch::Dispatcher; use yewdux::dispatch::Dispatcher;
@ -12,7 +11,7 @@ use yewtil::NeqAssign;
#[doc(hidden)] #[doc(hidden)]
pub(crate) struct YewduxLogin { pub(crate) struct YewduxLogin {
dispatch: Arc<WebUiDispatcher>, dispatch: Rc<WebUiDispatcher>,
link: ComponentLink<YewduxLogin>, link: ComponentLink<YewduxLogin>,
username: String, username: String,
password: String, password: String,
@ -49,7 +48,7 @@ impl Component for YewduxLogin {
fn create(dispatch: Self::Properties, link: ComponentLink<Self>) -> Self { fn create(dispatch: Self::Properties, link: ComponentLink<Self>) -> Self {
Self { Self {
dispatch: Arc::new(dispatch), dispatch: Rc::new(dispatch),
link, link,
username: "".to_string(), username: "".to_string(),
password: "".to_string(), password: "".to_string(),
@ -76,7 +75,7 @@ impl Component for YewduxLogin {
} }
fn change(&mut self, dispatch: Self::Properties) -> ShouldRender { fn change(&mut self, dispatch: Self::Properties) -> ShouldRender {
self.dispatch.neq_assign(Arc::new(dispatch)) self.dispatch.neq_assign(Rc::new(dispatch))
} }
fn rendered(&mut self, first_render: bool) { fn rendered(&mut self, first_render: bool) {
@ -86,9 +85,6 @@ impl Component for YewduxLogin {
} }
fn view(&self) -> Html { fn view(&self) -> Html {
let dispatch = Arc::new(self.dispatch.clone());
let dispatch2 = dispatch.clone();
// let do_the_login = self.dispatch.reduce_callback(|state| { // let do_the_login = self.dispatch.reduce_callback(|state| {
// spawn_local(async move { // spawn_local(async move {
// do_login(state, "user", "pw").await; // do_login(state, "user", "pw").await;