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

accounts are now real

Browse Source
This commit is contained in:
iris
2025-12-03 22:51:57 -05:00
parent 4aa22de61b
commit 24bb65bf7b
15 changed files with 679 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/client/ui/login.rs
+110 -44
View File
@@ -1,53 +1,65 @@
use crate::net::NetState;
use openworm::net::ClientMsg;
use crate::state::ClientState;
use super::*;
pub fn login_screen(client: &mut Client) -> WidgetId {
let Client {
ui, handle, data, ..
} = client;
pub fn field_widget(name: &str, hint_text: &str, ui: &mut Ui) -> WidgetId<TextEdit> {
wtext(name)
.editable(true)
.size(20)
.hint(hint(hint_text))
.add(ui)
}
let mut field = |name, hint_| text(name).editable(true).size(20).hint(hint(hint_)).add(ui);
let ip = field(&data.ip, "ip");
let username = field(&data.username, "username");
// let password = field("password");
pub fn field_box(field: WidgetId<TextEdit>, ui: &mut Ui) -> WidgetId {
field
.clone()
.pad(10)
.background(rect(Color::BLACK.brighter(0.1)).radius(15))
.attr::<Selector>(field)
.add(ui)
.any()
}
let fbx = |field: WidgetId<TextEdit>| {
field
.clone()
.pad(10)
.background(rect(Color::BLACK.brighter(0.1)).radius(15))
.attr::<Selector>(field)
};
// I LAV NOT HAVING ERGONOMIC CLONES
let handle = handle.clone();
let ip_ = ip.clone();
let username_ = username.clone();
pub fn submit_button(text: &str, on_submit: impl Fn(&mut Client) + 'static) -> impl WidgetRet {
let color = Color::GREEN;
let submit = rect(color)
rect(color)
.radius(15)
.id_on(CursorSense::click(), move |id, client: &mut Client, _| {
client.ui[id].color = color.darker(0.3);
let ip = client.ui[&ip_].content();
let username = client.ui[&username_].content();
let th = connect(handle.clone(), ConnectInfo { ip, username });
client.net = NetState::Connecting(th);
on_submit(client);
})
.height(40);
let modal = (
text("login").text_align(Align::CENTER).size(30),
fbx(ip
.id_on(Edited, |id, client: &mut Client, _| {
.height(40)
.foreground(wtext(text).size(20).text_align(Align::CENTER))
.to_any()
}
pub fn connect_screen(client: &mut Client) -> WidgetId {
let Client {
data, ui, handle, ..
} = client;
let ip = field_widget(&data.ip, "ip", ui);
let ip_ = ip.clone();
let handle = handle.clone();
let submit = submit_button("connect", move |client| {
let ClientState::Connect(state) = &mut client.state else {
return;
};
let ip = client.ui[&ip_].content();
state.handle = Some(connect(handle.clone(), ConnectInfo { ip }));
});
(
wtext("connect to a server")
.text_align(Align::CENTER)
.size(30),
field_box(
ip.id_on(Edited, |id, client: &mut Client, _| {
client.data.ip = client.ui[id].content();
})
.add(ui)),
fbx(username
.id_on(Edited, |id, client: &mut Client, _| {
client.data.username = client.ui[id].content();
})
.add(ui)),
// fbx(password),
.add(ui),
ui,
),
submit,
)
.span(Dir::DOWN)
@@ -55,10 +67,64 @@ pub fn login_screen(client: &mut Client) -> WidgetId {
.pad(15)
.background(rect(Color::BLACK.brighter(0.2)).radius(15))
.width(400)
.align(Align::CENTER);
let err = WidgetPtr::default().add(ui);
client.error = Some(err.clone());
(modal, err.align(Align::TOP_CENTER)).stack().add(ui).any()
.align(Align::CENTER)
.add(ui)
.any()
}
pub fn login_screen(client: &mut Client) -> WidgetId {
let Client { data, ui, .. } = client;
let username = field_widget(&data.username, "username", ui);
let password = field_widget(&data.password, "password", ui);
let username_ = username.clone();
let password_ = password.clone();
let submit = submit_button("login", move |client| {
let ClientState::Login(state) = &mut client.state else {
return;
};
let username = client.ui[&username_].content();
let password = client.ui[&password_].content();
state.handle.send(ClientMsg::Login { username, password });
});
let username_ = username.clone();
let password_ = password.clone();
let create_button = submit_button("create account", move |client| {
let ClientState::Login(state) = &mut client.state else {
return;
};
let username = client.ui[&username_].content();
let password = client.ui[&password_].content();
state
.handle
.send(ClientMsg::CreateAccount { username, password });
});
(
wtext("login to server").text_align(Align::CENTER).size(30),
field_box(
username
.id_on(Edited, |id, client: &mut Client, _| {
client.data.username = client.ui[id].content();
})
.add(ui),
ui,
),
field_box(
password
.id_on(Edited, |id, client: &mut Client, _| {
client.data.password = client.ui[id].content();
})
.add(ui),
ui,
),
submit,
create_button,
)
.span(Dir::DOWN)
.gap(10)
.pad(15)
.background(rect(Color::BLACK.brighter(0.2)).radius(15))
.width(400)
.align(Align::CENTER)
.add(ui)
.any()
}
src/bin/client/ui/main.rs
+24 -15
View File
@@ -1,9 +1,15 @@
use super::*;
use crate::state::{ClientState, LoggedIn};
use iris::layout::len_fns::*;
use openworm::net::{ClientMsg, NetClientMsg, NetServerMsg};
pub const SIZE: u32 = 20;
pub fn main_view(client: &mut Client, network: NetSender) -> WidgetId {
let msg_panel = msg_panel(client, network);
pub fn main_view(client: &mut Client) -> WidgetId {
let ClientState::LoggedIn(state) = &mut client.state else {
panic!("we ain't logged in buh");
};
let msg_panel = msg_panel(&mut client.ui, state);
let side_bar = rect(Color::BLACK.brighter(0.05)).width(80);
let bg = (
@@ -18,13 +24,13 @@ pub fn main_view(client: &mut Client, network: NetSender) -> WidgetId {
.any()
}
pub fn msg_widget(msg: NetMsg) -> impl WidgetLike<FnTag> {
let content = text(msg.content)
pub fn msg_widget(username: &str, content: &str) -> impl WidgetRet {
let content = wtext(content)
.editable(false)
.size(SIZE)
.wrap(true)
.attr::<Selectable>(());
let header = text(msg.user).size(SIZE);
let header = wtext(username).size(SIZE);
(
image(include_bytes!("../assets/sungals.png"))
.sized((70, 70))
@@ -37,14 +43,14 @@ pub fn msg_widget(msg: NetMsg) -> impl WidgetLike<FnTag> {
)
.span(Dir::RIGHT)
.gap(10)
.to_any()
}
pub fn msg_panel(client: &mut Client, network: NetSender) -> impl WidgetFn<Sized> + use<> {
let Client { ui, channel, .. } = client;
pub fn msg_panel(ui: &mut Ui, state: &mut LoggedIn) -> impl WidgetRet + use<> {
let msg_area = Span::empty(Dir::DOWN).gap(15).add(ui);
*channel = Some(msg_area.clone());
state.channel = Some(msg_area.clone());
let send_text = text("")
let send_text = wtext("")
.editable(false)
.size(SIZE)
.wrap(true)
@@ -60,13 +66,15 @@ pub fn msg_panel(client: &mut Client, network: NetSender) -> impl WidgetFn<Sized
send_text
.clone()
.id_on(Submit, move |id, client: &mut Client, _| {
let content = client.ui.text(id).take();
let msg = NetMsg {
content: content.clone(),
user: client.username.clone(),
let ClientState::LoggedIn(state) = &mut client.state else {
panic!("we ain't logged in buh");
};
network.send(ClientMsg::SendMsg(msg.clone()));
let msg = msg_widget(msg).add(&mut client.ui);
let content = client.ui.text(id).take();
let msg = NetClientMsg {
content: content.clone(),
};
state.network.send(ClientMsg::SendMsg(msg.clone()));
let msg = msg_widget(&client.data.username, &content).add(&mut client.ui);
client.ui[&msg_area].children.push(msg.any());
})
.pad(15)
@@ -80,4 +88,5 @@ pub fn msg_panel(client: &mut Client, network: NetSender) -> impl WidgetFn<Sized
)
.span(Dir::DOWN)
.width(rest(1))
.to_any()
}
src/bin/client/ui/misc.rs
+4 -4
View File
@@ -2,11 +2,11 @@ use std::time::{Duration, Instant};
use super::*;
pub fn error(ui: &mut Ui, msg: &str) -> WidgetId {
text(msg)
pub fn werror(ui: &mut Ui, msg: &str) -> WidgetId {
wtext(msg)
.size(20)
.color(Color::RED.brighter(0.3))
.pad(10)
.background(rect(Color::RED).radius(10))
.add(ui)
.any()
}
@@ -69,5 +69,5 @@ fn select(id: WidgetId<TextEdit>, client: &mut Client, data: CursorData) {
}
pub fn hint(msg: impl Into<String>) -> TextBuilder {
text(msg).size(20).color(Color::GRAY)
wtext(msg).size(20).color(Color::GRAY)
}
src/bin/client/ui/mod.rs
+2 -8
View File
@@ -1,16 +1,14 @@
use crate::{
Client,
net::{ConnectInfo, NetSender, connect},
ui::login::login_screen,
net::{ConnectInfo, connect},
};
use iris::prelude::*;
use len_fns::*;
use openworm::net::{ClientMsg, NetMsg};
use winit::dpi::{LogicalPosition, LogicalSize};
mod login;
mod main;
mod misc;
pub use login::*;
pub use main::*;
pub use misc::*;
@@ -27,7 +25,3 @@ impl DefaultEvent for Submit {
impl DefaultEvent for Edited {
type Data = ();
}
pub fn init(client: &mut Client) {
login_screen(client).set_root(&mut client.ui);
}