gui: stricter validation in add and edit modals
This commit is contained in:
@@ -643,6 +643,23 @@ a:visited {
|
||||
box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25);
|
||||
}
|
||||
|
||||
.modal-field input:user-invalid,
|
||||
.modal-field--strict input:invalid {
|
||||
border-color: rgba(255, 90, 90, 0.85);
|
||||
box-shadow: 0 0 0 1px rgba(255, 90, 90, 0.45);
|
||||
}
|
||||
|
||||
.modal-field__error {
|
||||
display: none;
|
||||
font-size: 0.75rem;
|
||||
color: #ff8888;
|
||||
}
|
||||
|
||||
.modal-field:has(input:user-invalid) .modal-field__error,
|
||||
.modal-field--strict:has(input:invalid) .modal-field__error {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Actions row */
|
||||
|
||||
.modal-actions {
|
||||
|
||||
+28
-7
@@ -10,6 +10,12 @@ use mumble_web2_common::{ProxyOverrides, ServerEntry};
|
||||
use Command::*;
|
||||
use ConnectionState::*;
|
||||
|
||||
const ADDRESS_PATTERN: &str = "[A-Za-z0-9.-]+";
|
||||
|
||||
fn address_is_valid(addr: &str) -> bool {
|
||||
!addr.is_empty() && !addr.contains(':')
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||
pub enum UserIcon {
|
||||
Normal,
|
||||
@@ -603,10 +609,7 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
|
||||
|
||||
let version = option_env!("MUMBLE_WEB2_VERSION");
|
||||
|
||||
let is_override_mode = overrides
|
||||
.read()
|
||||
.as_ref()
|
||||
.is_some_and(|c| !c.any_server);
|
||||
let is_override_mode = overrides.read().as_ref().is_some_and(|c| !c.any_server);
|
||||
|
||||
// --- Overrides mode: single preset server, username-only input ---
|
||||
if is_override_mode {
|
||||
@@ -831,6 +834,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
placeholder: "My Mumble Server",
|
||||
value: "{name.read()}",
|
||||
oninput: move |evt| name.set(evt.value().clone()),
|
||||
required: true,
|
||||
}
|
||||
}
|
||||
div {
|
||||
@@ -839,8 +843,14 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
input {
|
||||
r#type: "text",
|
||||
placeholder: "mumble.example.com",
|
||||
pattern: ADDRESS_PATTERN,
|
||||
value: "{address.read()}",
|
||||
oninput: move |evt| address.set(evt.value().clone()),
|
||||
required: true,
|
||||
}
|
||||
div {
|
||||
class: "modal-field__error",
|
||||
"Enter a hostname or IP address only — do not include a port."
|
||||
}
|
||||
}
|
||||
div {
|
||||
@@ -851,6 +861,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
placeholder: "64738",
|
||||
value: "{port.read()}",
|
||||
oninput: move |evt| port.set(evt.value().clone()),
|
||||
required: true,
|
||||
}
|
||||
}
|
||||
div {
|
||||
@@ -861,6 +872,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
placeholder: "Nickname",
|
||||
value: "{username.read()}",
|
||||
oninput: move |evt| username.set(evt.value().clone()),
|
||||
required: true,
|
||||
}
|
||||
}
|
||||
div {
|
||||
@@ -882,7 +894,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
}
|
||||
button {
|
||||
class: "modal-btn modal-btn--primary",
|
||||
disabled: address.read().is_empty() || username.read().is_empty(),
|
||||
disabled: !address_is_valid(&address.read()) || username.read().is_empty(),
|
||||
onclick: do_save,
|
||||
"Save"
|
||||
}
|
||||
@@ -939,16 +951,23 @@ fn EditServerModal(
|
||||
placeholder: "My Mumble Server",
|
||||
value: "{name.read()}",
|
||||
oninput: move |evt| name.set(evt.value().clone()),
|
||||
required: true,
|
||||
}
|
||||
}
|
||||
div {
|
||||
class: "modal-field",
|
||||
class: "modal-field modal-field--strict",
|
||||
label { "Address" }
|
||||
input {
|
||||
r#type: "text",
|
||||
placeholder: "mumble.example.com",
|
||||
pattern: ADDRESS_PATTERN,
|
||||
value: "{address.read()}",
|
||||
oninput: move |evt| address.set(evt.value().clone()),
|
||||
required: true,
|
||||
}
|
||||
div {
|
||||
class: "modal-field__error",
|
||||
"Enter a hostname or IP address only — do not include a port."
|
||||
}
|
||||
}
|
||||
div {
|
||||
@@ -959,6 +978,7 @@ fn EditServerModal(
|
||||
placeholder: "64738",
|
||||
value: "{port.read()}",
|
||||
oninput: move |evt| port.set(evt.value().clone()),
|
||||
required: true,
|
||||
}
|
||||
}
|
||||
div {
|
||||
@@ -969,6 +989,7 @@ fn EditServerModal(
|
||||
placeholder: "Nickname",
|
||||
value: "{username.read()}",
|
||||
oninput: move |evt| username.set(evt.value().clone()),
|
||||
required: true,
|
||||
}
|
||||
}
|
||||
div {
|
||||
@@ -996,7 +1017,7 @@ fn EditServerModal(
|
||||
}
|
||||
button {
|
||||
class: "modal-btn modal-btn--primary",
|
||||
disabled: address.read().is_empty() || username.read().is_empty(),
|
||||
disabled: !address_is_valid(&address.read()) || username.read().is_empty(),
|
||||
onclick: do_save,
|
||||
"Save"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user