Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1214886250 | |||
| 4ae3077173 | |||
| 10c20193a6 | |||
| 2c4078847a | |||
| d106df83f8 |
+37
-70
@@ -731,59 +731,42 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
|
|||||||
"+ Add Server"
|
"+ Add Server"
|
||||||
}
|
}
|
||||||
|
|
||||||
ServerModals { servers, show_add_modal, editing_index }
|
if *show_add_modal.read() {
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[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);
|
|
||||||
user_config.config_set("servers", &*servers.read());
|
|
||||||
show_add_modal.set(false);
|
|
||||||
},
|
|
||||||
on_cancel: move |_| show_add_modal.set(false),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(idx) = *editing_index.read() {
|
|
||||||
if let Some(entry) = servers.read().get(idx).cloned() {
|
|
||||||
{
|
{
|
||||||
let user_config_save = user_config.clone();
|
let user_config = user_config.clone();
|
||||||
let user_config_del = user_config.clone();
|
rsx!(AddServerModal {
|
||||||
let mut servers = servers;
|
on_save: move |entry: ServerEntry| {
|
||||||
let mut editing_index = editing_index;
|
servers.write().push(entry);
|
||||||
rsx!(EditServerModal {
|
user_config.config_set("servers", &*servers.read());
|
||||||
entry,
|
show_add_modal.set(false);
|
||||||
on_save: move |updated: ServerEntry| {
|
|
||||||
servers.write()[idx] = updated;
|
|
||||||
user_config_save.config_set("servers", &*servers.read());
|
|
||||||
editing_index.set(None);
|
|
||||||
},
|
},
|
||||||
on_delete: move |_| {
|
on_cancel: move |_| show_add_modal.set(false),
|
||||||
servers.write().remove(idx);
|
|
||||||
user_config_del.config_set("servers", &*servers.read());
|
|
||||||
editing_index.set(None);
|
|
||||||
},
|
|
||||||
on_cancel: move |_| editing_index.set(None),
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if let Some(idx) = *editing_index.read() {
|
||||||
|
if let Some(entry) = servers.read().get(idx).cloned() {
|
||||||
|
{
|
||||||
|
let user_config_save = user_config.clone();
|
||||||
|
let user_config_del = user_config.clone();
|
||||||
|
rsx!(EditServerModal {
|
||||||
|
entry,
|
||||||
|
on_save: move |updated: ServerEntry| {
|
||||||
|
servers.write()[idx] = updated;
|
||||||
|
user_config_save.config_set("servers", &*servers.read());
|
||||||
|
editing_index.set(None);
|
||||||
|
},
|
||||||
|
on_delete: move |_| {
|
||||||
|
servers.write().remove(idx);
|
||||||
|
user_config_del.config_set("servers", &*servers.read());
|
||||||
|
editing_index.set(None);
|
||||||
|
},
|
||||||
|
on_cancel: move |_| editing_index.set(None),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -843,20 +826,9 @@ 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 Ok(port_num) = port.read().parse::<u16>() else {
|
let port_num: u16 = port.read().parse().unwrap_or(64738);
|
||||||
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(),
|
||||||
@@ -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! {
|
rsx! {
|
||||||
div {
|
div {
|
||||||
class: "modal-backdrop",
|
class: "modal-backdrop",
|
||||||
@@ -888,7 +854,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
class: "modal",
|
class: "modal",
|
||||||
h2 { "Add Server" }
|
h2 { "Add Server" }
|
||||||
div {
|
div {
|
||||||
class: "{field_class}",
|
class: "modal-field",
|
||||||
label { "Name" }
|
label { "Name" }
|
||||||
input {
|
input {
|
||||||
r#type: "text",
|
r#type: "text",
|
||||||
@@ -903,7 +869,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
class: "{field_class}",
|
class: "modal-field",
|
||||||
label { "Address" }
|
label { "Address" }
|
||||||
input {
|
input {
|
||||||
r#type: "text",
|
r#type: "text",
|
||||||
@@ -938,7 +904,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
class: "{field_class}",
|
class: "modal-field",
|
||||||
label { "Port" }
|
label { "Port" }
|
||||||
input {
|
input {
|
||||||
r#type: "number",
|
r#type: "number",
|
||||||
@@ -953,7 +919,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
class: "{field_class}",
|
class: "modal-field",
|
||||||
label { "Username" }
|
label { "Username" }
|
||||||
input {
|
input {
|
||||||
r#type: "text",
|
r#type: "text",
|
||||||
@@ -986,6 +952,7 @@ 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