Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e13f71c270 | |||
| c86226b40d | |||
| 614c7f7d56 | |||
| 5156338eb3 | |||
| 451ccf42ac |
+40
-10
@@ -517,7 +517,6 @@ fn ServerCard(
|
|||||||
editing_index: Signal<Option<usize>>,
|
editing_index: Signal<Option<usize>>,
|
||||||
overrides: Resource<ProxyOverrides>,
|
overrides: Resource<ProxyOverrides>,
|
||||||
) -> Element {
|
) -> Element {
|
||||||
let user_config = use_context::<ConfigSystem>();
|
|
||||||
let net: Coroutine<Command> = use_coroutine_handle();
|
let net: Coroutine<Command> = use_coroutine_handle();
|
||||||
|
|
||||||
let address = format!("{}:{}", server.address, server.port);
|
let address = format!("{}:{}", server.address, server.port);
|
||||||
@@ -552,9 +551,7 @@ fn ServerCard(
|
|||||||
class: "server-card__action server-card__action--connect",
|
class: "server-card__action server-card__action--connect",
|
||||||
onclick: {
|
onclick: {
|
||||||
let entry = connect_entry.clone();
|
let entry = connect_entry.clone();
|
||||||
let user_config = user_config.clone();
|
|
||||||
move |_| {
|
move |_| {
|
||||||
user_config.config_set("username", &entry.username);
|
|
||||||
net.send(Connect {
|
net.send(Connect {
|
||||||
target: ConnectTarget::Direct {
|
target: ConnectTarget::Direct {
|
||||||
host: entry.address.clone(),
|
host: entry.address.clone(),
|
||||||
@@ -731,9 +728,25 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
|
|||||||
"+ Add Server"
|
"+ Add Server"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ServerModals { servers, show_add_modal, editing_index }
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
fn ServerModals(
|
||||||
|
servers: Signal<Vec<ServerEntry>>,
|
||||||
|
show_add_modal: Signal<bool>,
|
||||||
|
editing_index: Signal<Option<usize>>,
|
||||||
|
) -> Element {
|
||||||
|
let user_config = use_context::<ConfigSystem>();
|
||||||
|
|
||||||
|
rsx!(
|
||||||
if *show_add_modal.read() {
|
if *show_add_modal.read() {
|
||||||
{
|
{
|
||||||
let user_config = user_config.clone();
|
let user_config = user_config.clone();
|
||||||
|
let mut servers = servers;
|
||||||
|
let mut show_add_modal = show_add_modal;
|
||||||
rsx!(AddServerModal {
|
rsx!(AddServerModal {
|
||||||
on_save: move |entry: ServerEntry| {
|
on_save: move |entry: ServerEntry| {
|
||||||
servers.write().push(entry);
|
servers.write().push(entry);
|
||||||
@@ -750,6 +763,8 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
|
|||||||
{
|
{
|
||||||
let user_config_save = user_config.clone();
|
let user_config_save = user_config.clone();
|
||||||
let user_config_del = user_config.clone();
|
let user_config_del = user_config.clone();
|
||||||
|
let mut servers = servers;
|
||||||
|
let mut editing_index = editing_index;
|
||||||
rsx!(EditServerModal {
|
rsx!(EditServerModal {
|
||||||
entry,
|
entry,
|
||||||
on_save: move |updated: ServerEntry| {
|
on_save: move |updated: ServerEntry| {
|
||||||
@@ -767,7 +782,6 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -826,9 +840,20 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
});
|
});
|
||||||
let mut password = use_signal(|| String::new());
|
let mut password = use_signal(|| String::new());
|
||||||
let mut address_paste_pending = use_signal(|| false);
|
let mut address_paste_pending = use_signal(|| false);
|
||||||
|
let mut submit_attempted = use_signal(|| false);
|
||||||
|
|
||||||
let do_save = move |_| {
|
let do_save = move |_| {
|
||||||
let port_num: u16 = port.read().parse().unwrap_or(64738);
|
let Ok(port_num) = port.read().parse::<u16>() else {
|
||||||
|
submit_attempted.set(true);
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
if name.read().is_empty()
|
||||||
|
|| !address_is_valid(&address.read())
|
||||||
|
|| username.read().is_empty()
|
||||||
|
{
|
||||||
|
submit_attempted.set(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
on_save.call(ServerEntry {
|
on_save.call(ServerEntry {
|
||||||
name: name.read().clone(),
|
name: name.read().clone(),
|
||||||
address: address.read().clone(),
|
address: address.read().clone(),
|
||||||
@@ -842,6 +867,12 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let field_class = if submit_attempted() {
|
||||||
|
"modal-field modal-field--strict"
|
||||||
|
} else {
|
||||||
|
"modal-field"
|
||||||
|
};
|
||||||
|
|
||||||
rsx! {
|
rsx! {
|
||||||
div {
|
div {
|
||||||
class: "modal-backdrop",
|
class: "modal-backdrop",
|
||||||
@@ -854,7 +885,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
class: "modal",
|
class: "modal",
|
||||||
h2 { "Add Server" }
|
h2 { "Add Server" }
|
||||||
div {
|
div {
|
||||||
class: "modal-field",
|
class: "{field_class}",
|
||||||
label { "Name" }
|
label { "Name" }
|
||||||
input {
|
input {
|
||||||
r#type: "text",
|
r#type: "text",
|
||||||
@@ -869,7 +900,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
class: "modal-field",
|
class: "{field_class}",
|
||||||
label { "Address" }
|
label { "Address" }
|
||||||
input {
|
input {
|
||||||
r#type: "text",
|
r#type: "text",
|
||||||
@@ -904,7 +935,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
class: "modal-field",
|
class: "{field_class}",
|
||||||
label { "Port" }
|
label { "Port" }
|
||||||
input {
|
input {
|
||||||
r#type: "number",
|
r#type: "number",
|
||||||
@@ -919,7 +950,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
class: "modal-field",
|
class: "{field_class}",
|
||||||
label { "Username" }
|
label { "Username" }
|
||||||
input {
|
input {
|
||||||
r#type: "text",
|
r#type: "text",
|
||||||
@@ -952,7 +983,6 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
}
|
}
|
||||||
button {
|
button {
|
||||||
class: "modal-btn modal-btn--primary",
|
class: "modal-btn modal-btn--primary",
|
||||||
disabled: !address_is_valid(&address.read()) || username.read().is_empty(),
|
|
||||||
onclick: do_save,
|
onclick: do_save,
|
||||||
"Save"
|
"Save"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user