iris/openworm
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
iris
2026-02-18 16:47:35 -05:00
parent f9d8fccf40
commit 97fdbbf968
16 changed files with 199 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/client/ui/connect.rs
+11 -8
View File
@@ -1,6 +1,7 @@
use openworm::net::{CreateAccount, CreateAccountResp, Login, LoginResp};
use crate::{
session::Session,
data::{AccountInfo, ClientData, ServerInfo, ServerList},
net::{ConnectInfo, NetHandle},
};
@@ -53,7 +54,7 @@ pub fn start(rsc: &mut Rsc, data: &ClientData) -> WeakWidget {
rsc[ctx.notif].inner = Some(werror(&reason, rsc));
})
};
let net = match NetHandle::connect(
let con = match NetHandle::connect(
async |msg| {
println!("msg recv :joy:");
},
@@ -70,7 +71,7 @@ pub fn start(rsc: &mut Rsc, data: &ClientData) -> WeakWidget {
}
};
let Ok(resp) = net
let Ok(resp) = con
.request(Login {
username: account.username.clone(),
password: password.clone(),
@@ -79,7 +80,7 @@ pub fn start(rsc: &mut Rsc, data: &ClientData) -> WeakWidget {
else {
return fail("failed to create account");
};
let id = match resp {
let user_id = match resp {
LoginResp::Ok { id } => id,
LoginResp::UnknownUsername => {
return fail("unknown username");
@@ -88,8 +89,9 @@ pub fn start(rsc: &mut Rsc, data: &ClientData) -> WeakWidget {
return fail("invalid password");
}
};
let session = Session { con, user_id };
ctx.update(move |ctx, rsc| {
main_view(rsc).set_ptr(ctx.main_ui, rsc);
main_view(rsc, session).set_ptr(ctx.main_ui, rsc);
});
});
});
@@ -148,7 +150,7 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
})
};
keyring::use_native_store(true).unwrap();
let net = match NetHandle::connect(
let con = match NetHandle::connect(
async |msg| {
println!("msg recv :joy:");
},
@@ -165,7 +167,7 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
}
};
let Ok(resp) = net
let Ok(resp) = con
.request(CreateAccount {
username: username.clone(),
password: password.clone(),
@@ -175,7 +177,7 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
else {
return fail("failed to create account");
};
let id = match resp {
let user_id = match resp {
CreateAccountResp::Ok { id } => id,
CreateAccountResp::UsernameExists => {
return fail("username already exists");
@@ -184,8 +186,9 @@ pub fn create_account(rsc: &mut Rsc) -> WeakWidget {
return fail("invalid account token");
}
};
let session = Session { con, user_id };
ctx.update(move |ctx, rsc| {
main_view(rsc).set_ptr(ctx.main_ui, rsc);
main_view(rsc, session).set_ptr(ctx.main_ui, rsc);
ctx.data.create_account(
ServerInfo { cert_hex },
AccountInfo { url, username },
src/bin/client/ui/main.rs
+13 -12
View File
@@ -1,6 +1,6 @@
use std::hash::Hash;
use crate::Rsc;
use crate::{Rsc, session::Session};
use super::*;
@@ -9,24 +9,25 @@ pub const SIZE: u32 = 20;
#[derive(PartialEq, Eq, Hash, Clone, Copy)]
pub enum MainView {
Channel,
Friends,
Server,
}
pub fn main_view(rsc: &mut Rsc) -> WeakWidget {
pub fn main_view(rsc: &mut Rsc, session: Session) -> WeakWidget {
let mut view = WidgetSelector::new(MainView::Channel, channel::view(rsc));
view.set(MainView::Server, server::view(rsc));
view.set(MainView::Server, server::view(rsc, &session));
let view = view.add(rsc);
(top_bar(rsc, view), view).span(Dir::DOWN).add(rsc)
}
pub fn top_bar(rsc: &mut Rsc, view: WeakWidget<WidgetSelector<MainView>>) -> WeakWidget {
let [channel, server] = tabs(
let [channel, friends, server] = tabs(
rsc,
view,
[("channel", MainView::Channel), ("server", MainView::Server)],
[
("channel", MainView::Channel),
("friends", MainView::Friends),
("server", MainView::Server),
],
);
rect(Color::BLACK.alpha(150))
let top_bar = rect(Color::BLACK.alpha(150))
.height(50)
.foreground((channel, server).span(Dir::RIGHT))
.add(rsc)
.foreground((channel, friends, server).span(Dir::RIGHT));
(top_bar, view).span(Dir::DOWN).add(rsc)
}
src/bin/client/ui/misc.rs
+4
View File
@@ -12,6 +12,10 @@ pub fn hint_text(msg: impl Into<String>) -> TextBuilder<Rsc> {
wtext(msg).size(20).color(Color::GRAY)
}
pub fn large_hint_text(msg: impl Into<String>) -> TextBuilder<Rsc> {
wtext(msg).size(30).color(Color::GRAY)
}
pub fn field(default: &str, hint: &str, rsc: &mut Rsc) -> WeakWidget<TextEdit> {
wtext(default)
.editable(EditMode::SingleLine)
src/bin/client/ui/server.rs
+38 -4
View File
@@ -1,3 +1,7 @@
use openworm::net::RequestUsers;
use crate::session::Session;
use super::*;
#[derive(PartialEq, Eq, Hash, Clone, Copy)]
@@ -6,9 +10,9 @@ enum View {
User,
}
pub fn view(rsc: &mut Rsc) -> StrongWidget {
pub fn view(rsc: &mut Rsc, session: &Session) -> StrongWidget {
let mut view = WidgetSelector::new(View::Info, info(rsc));
view.set(View::User, users(rsc));
view.set(View::User, users(rsc, session));
let view = view.add(rsc);
let [info, server] = tabs(rsc, view, [("info", View::Info), ("users", View::User)]);
@@ -23,6 +27,36 @@ fn info(rsc: &mut Rsc) -> StrongWidget {
wtext("server info").center_text().add_strong(rsc)
}
fn users(rsc: &mut Rsc) -> StrongWidget {
wtext("users").center_text().add_strong(rsc)
fn users(rsc: &mut Rsc, session: &Session) -> StrongWidget {
let ptr = WidgetPtr::new(
large_hint_text("loading users...")
.center_text()
.width(rest(1))
.add_strong(rsc),
)
.add(rsc);
let con = session.con.clone();
rsc.events.register(ptr, Draw, move |_, rsc| {
let con = con.clone();
rsc.spawn_task(async move |mut ctx| {
let Ok(resp) = con.request(RequestUsers).await else {
return;
};
ctx.update(move |_, rsc| {
let mut span = Span::empty(Dir::DOWN);
for user in resp.users {
let thing = (
wtext(user.id.to_string()).size(20),
wtext(user.username).size(20),
)
.span(Dir::RIGHT)
.gap(30)
.pad(15);
span.push(thing.add_strong(rsc));
}
span.set_ptr(ptr, rsc);
});
});
});
ptr.upgrade(rsc)
}