Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1214886250 | |||
| 4ae3077173 | |||
| 10c20193a6 | |||
| 2c4078847a | |||
| d106df83f8 |
+7
-40
@@ -731,25 +731,9 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
|
||||
"+ 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() {
|
||||
{
|
||||
let user_config = user_config.clone();
|
||||
let mut servers = servers;
|
||||
let mut show_add_modal = show_add_modal;
|
||||
rsx!(AddServerModal {
|
||||
on_save: move |entry: ServerEntry| {
|
||||
servers.write().push(entry);
|
||||
@@ -766,8 +750,6 @@ fn ServerModals(
|
||||
{
|
||||
let user_config_save = user_config.clone();
|
||||
let user_config_del = user_config.clone();
|
||||
let mut servers = servers;
|
||||
let mut editing_index = editing_index;
|
||||
rsx!(EditServerModal {
|
||||
entry,
|
||||
on_save: move |updated: ServerEntry| {
|
||||
@@ -785,6 +767,7 @@ fn ServerModals(
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -843,20 +826,9 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
});
|
||||
let mut password = use_signal(|| String::new());
|
||||
let mut address_paste_pending = use_signal(|| false);
|
||||
let mut submit_attempted = use_signal(|| false);
|
||||
|
||||
let do_save = move |_| {
|
||||
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;
|
||||
}
|
||||
let port_num: u16 = port.read().parse().unwrap_or(64738);
|
||||
on_save.call(ServerEntry {
|
||||
name: name.read().clone(),
|
||||
address: address.read().clone(),
|
||||
@@ -870,12 +842,6 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
});
|
||||
};
|
||||
|
||||
let field_class = if submit_attempted() {
|
||||
"modal-field modal-field--strict"
|
||||
} else {
|
||||
"modal-field"
|
||||
};
|
||||
|
||||
rsx! {
|
||||
div {
|
||||
class: "modal-backdrop",
|
||||
@@ -888,7 +854,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
class: "modal",
|
||||
h2 { "Add Server" }
|
||||
div {
|
||||
class: "{field_class}",
|
||||
class: "modal-field",
|
||||
label { "Name" }
|
||||
input {
|
||||
r#type: "text",
|
||||
@@ -903,7 +869,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
}
|
||||
}
|
||||
div {
|
||||
class: "{field_class}",
|
||||
class: "modal-field",
|
||||
label { "Address" }
|
||||
input {
|
||||
r#type: "text",
|
||||
@@ -938,7 +904,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
}
|
||||
}
|
||||
div {
|
||||
class: "{field_class}",
|
||||
class: "modal-field",
|
||||
label { "Port" }
|
||||
input {
|
||||
r#type: "number",
|
||||
@@ -953,7 +919,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
}
|
||||
}
|
||||
div {
|
||||
class: "{field_class}",
|
||||
class: "modal-field",
|
||||
label { "Username" }
|
||||
input {
|
||||
r#type: "text",
|
||||
@@ -986,6 +952,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
}
|
||||
button {
|
||||
class: "modal-btn modal-btn--primary",
|
||||
disabled: !address_is_valid(&address.read()) || username.read().is_empty(),
|
||||
onclick: do_save,
|
||||
"Save"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user