🏗️ Remove data handling from components

The data sent by matrix_interface senders is now handled by the App.
This commit is contained in:
2023-12-21 22:07:08 +01:00
parent 513b05ddb3
commit c9292fd613
7 changed files with 177 additions and 71 deletions

View File

@@ -1,13 +1,6 @@
use std::cell::RefCell;
use std::time::Duration;
use dioxus::prelude::*;
use fermi::*;
use tokio::time::sleep;
use tracing::debug;
use crate::base::AppSettings;
use crate::base::{ByIdRooms, Room, APP_SETTINGS, ROOMS};
use crate::components::contacts_window::contacts_section::{
filter_people_conversations, filter_room_conversations, ContactsSection,
};
@@ -17,31 +10,6 @@ turf::style_sheet!("src/components/contacts_window/contacts.scss");
pub fn Contacts(cx: Scope) -> Element {
debug!("Contacts rendering");
let app_settings_atom = use_atom_ref(cx, &APP_SETTINGS);
let rooms_atom = use_atom_ref(cx, &ROOMS);
async fn sync_rooms(app_settings: UseAtomRef<AppSettings>, rooms_atom: UseAtomRef<ByIdRooms>) {
loop {
let requester = &app_settings.read().requester;
if requester.is_some() {
let rooms_receiver = &requester.as_ref().unwrap().rooms_receiver;
let room = rooms_receiver.recv_async().await.unwrap();
let room_id = room.id();
dbg!(&room_id);
rooms_atom
.write()
.insert(room_id, RefCell::<Room>::new(room));
} else {
sleep(Duration::from_millis(1000)).await;
}
}
}
use_coroutine(cx, |_: UnboundedReceiver<()>| {
sync_rooms(app_settings_atom.clone(), rooms_atom.clone())
});
// TODO: Test overflow
// TODO: Add offline users ?
cx.render(rsx! {

View File

@@ -2,9 +2,10 @@ use std::str::FromStr;
use dioxus::prelude::*;
use fermi::*;
use matrix_sdk::ruma::user_id;
use tracing::{debug, error};
use crate::base::APP_SETTINGS;
use crate::base::{APP_SETTINGS, SESSION};
use crate::components::avatar_selector::AvatarSelector;
use crate::components::header::Header;
use crate::matrix_interface::client::Client;
@@ -17,9 +18,10 @@ static EMPTY_PLACEHOLDER: &str = "Tmp placeholder";
pub fn Login(cx: Scope) -> Element {
debug!("Login rendering");
let app_settings = use_atom_ref(cx, &APP_SETTINGS);
let session = use_atom_ref(cx, &SESSION);
let invalid_login = use_state(cx, || false);
let login = use_ref(cx, || Login::new());
let password_class = if **invalid_login {
@@ -30,32 +32,19 @@ pub fn Login(cx: Scope) -> Element {
let run_matrix_client = move |_| {
cx.spawn({
to_owned![invalid_login, login, app_settings];
let login_ref = login.read();
let homeserver_url = login_ref.homeserver_url.clone().unwrap();
let username = login_ref.email.clone().unwrap();
let password = login_ref.password.clone().unwrap();
to_owned![session, login];
async move {
let new_matrix_client = Client::spawn(homeserver_url).await;
let login_ref = login.read();
new_matrix_client.init();
match new_matrix_client.login(LoginStyle::Password(username, password)) {
Ok(_) => {
debug!("successfully logged");
app_settings.write().store.is_logged = true;
}
Err(err) => {
error!("Error during login: {err}");
invalid_login.modify(|_| true);
}
}
app_settings.write().requester = Some(new_matrix_client);
session.write().update(
login_ref.homeserver_url.clone(),
login_ref.email.clone(),
login_ref.password.clone(),
);
}
});
})
};
let login_ref = login.read();

View File

@@ -2,15 +2,15 @@ use dioxus::prelude::*;
use fermi::*;
use tracing::debug;
use crate::base::APP_SETTINGS;
use crate::base::SESSION;
use crate::components::contacts_window::contacts_window::ContactsWindow;
use crate::components::login::Login;
pub fn MainWindow(cx: Scope) -> Element {
debug!("MainWindow rendering");
let app_settings = use_atom_ref(cx, &APP_SETTINGS);
let is_logged = app_settings.read().store.is_logged;
let session_ref = use_atom_ref(cx, &SESSION);
let is_logged = session_ref.read().is_logged;
cx.render(rsx! {
if is_logged {