🏗️ Rearchitecting the interface with the MatrixClient
- Replace RwStore with channels. - Use of fermi to handle application data. - Use of tracing.
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
use std::str::FromStr;
|
||||
use std::sync::Arc;
|
||||
|
||||
use dioxus::prelude::*;
|
||||
use dioxus_std::utils::rw::UseRw;
|
||||
use fermi::*;
|
||||
use tracing::{debug, error};
|
||||
|
||||
use crate::base::{AppSettings, Store};
|
||||
use crate::base::APP_SETTINGS;
|
||||
use crate::components::avatar_selector::AvatarSelector;
|
||||
use crate::components::header::Header;
|
||||
use crate::matrix_client::{LoginStyle, MatrixClient};
|
||||
@@ -13,14 +13,14 @@ turf::style_sheet!("src/components/login.scss");
|
||||
|
||||
static EMPTY_PLACEHOLDER: &str = "Tmp placeholder";
|
||||
|
||||
#[inline_props]
|
||||
pub fn Login<'a>(cx: Scope, rw_store: &'a UseRw<Store>) -> Element {
|
||||
let app_context = use_shared_state::<AppSettings>(cx).unwrap();
|
||||
pub fn Login(cx: Scope) -> Element {
|
||||
debug!("Login rendering");
|
||||
|
||||
let app_settings = use_atom_ref(cx, &APP_SETTINGS);
|
||||
|
||||
let invalid_login = use_state(cx, || false);
|
||||
let login = use_ref(cx, || Login::new());
|
||||
|
||||
let arc_store = Arc::new(rw_store.to_owned().clone());
|
||||
|
||||
let password_class = if **invalid_login {
|
||||
ClassName::INVALID_INPUT
|
||||
} else {
|
||||
@@ -29,7 +29,7 @@ pub fn Login<'a>(cx: Scope, rw_store: &'a UseRw<Store>) -> Element {
|
||||
|
||||
let run_matrix_client = move |_| {
|
||||
cx.spawn({
|
||||
to_owned![app_context, invalid_login, login, arc_store];
|
||||
to_owned![invalid_login, login, app_settings];
|
||||
|
||||
let login_ref = login.read();
|
||||
let homeserver_url = login_ref.homeserver_url.clone().unwrap();
|
||||
@@ -37,20 +37,22 @@ pub fn Login<'a>(cx: Scope, rw_store: &'a UseRw<Store>) -> Element {
|
||||
let password = login_ref.password.clone().unwrap();
|
||||
|
||||
async move {
|
||||
let requester = MatrixClient::spawn(homeserver_url, arc_store.clone()).await;
|
||||
requester.init();
|
||||
let new_matrix_client = MatrixClient::spawn(homeserver_url).await;
|
||||
|
||||
match requester.login(LoginStyle::Password(username, password)) {
|
||||
new_matrix_client.init();
|
||||
|
||||
match new_matrix_client.login(LoginStyle::Password(username, password)) {
|
||||
Ok(_) => {
|
||||
println!("successfully logged");
|
||||
debug!("successfully logged");
|
||||
app_settings.write().store.is_logged = true;
|
||||
}
|
||||
Err(err) => {
|
||||
println!("Error during login: {err}");
|
||||
error!("Error during login: {err}");
|
||||
invalid_login.modify(|_| true);
|
||||
}
|
||||
}
|
||||
|
||||
app_context.write().requester = Some(Arc::new(requester));
|
||||
app_settings.write().requester = Some(new_matrix_client);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
Reference in New Issue
Block a user