diff --git a/gui/src/app.rs b/gui/src/app.rs index 484aa11..22d76d1 100644 --- a/gui/src/app.rs +++ b/gui/src/app.rs @@ -558,7 +558,7 @@ pub fn LoginView(config: Resource) -> Element { } }); - let mut address_input = use_signal(|| None::); + let mut address_input = use_signal(|| imp::load_server_url()); let address = use_memo(move || { if let Some(addr) = address_input() { addr.clone() diff --git a/gui/src/imp/desktop.rs b/gui/src/imp/desktop.rs index 330c0d4..47472b7 100644 --- a/gui/src/imp/desktop.rs +++ b/gui/src/imp/desktop.rs @@ -361,10 +361,14 @@ pub fn load_username() -> Option { config.get("username").cloned() } -pub async fn load_config() -> color_eyre::Result { +pub fn load_server_url() -> Option { let config = load_config_map(); + config.get("server").cloned() +} + +pub async fn load_config() -> color_eyre::Result { Ok(ClientConfig { - proxy_url: config.get("server").cloned(), + proxy_url: None, cert_hash: None, any_server: true, }) diff --git a/gui/src/imp/web.rs b/gui/src/imp/web.rs index ade2576..5d8980a 100644 --- a/gui/src/imp/web.rs +++ b/gui/src/imp/web.rs @@ -412,6 +412,10 @@ pub fn load_username() -> Option { .ok()? } +pub fn load_server_url() -> Option { + None +} + pub fn absolute_url(path: &str) -> Result { let window: web_sys::Window = web_sys::window().expect("no global `window` exists"); let location = window.location();