From 2a2502147a1fc173b53d6a03fa65ff05e3aa3b10 Mon Sep 17 00:00:00 2001 From: PartyDonut Date: Sun, 20 Oct 2024 10:10:38 +0200 Subject: [PATCH] fix: saved servers for web --- lib/screens/login/login_screen.dart | 7 +++++-- lib/screens/login/widgets/discover_servers_widget.dart | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/screens/login/login_screen.dart b/lib/screens/login/login_screen.dart index 5e99a49..657b26c 100644 --- a/lib/screens/login/login_screen.dart +++ b/lib/screens/login/login_screen.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:developer'; import 'package:flutter/material.dart'; @@ -55,6 +54,11 @@ class _LoginPageState extends ConsumerState { addingNewUser = true; editingUsers = false; }); + if (FladderConfig.baseUrl != null) { + serverTextController.text = FladderConfig.baseUrl!; + _parseUrl(FladderConfig.baseUrl!); + retrieveListOfUsers(); + } } @override @@ -224,7 +228,6 @@ class _LoginPageState extends ConsumerState { Future Function()? get enterCredentialsTryLogin => emptyFields() ? null : () async { - log('try login'); serverTextController.text = serverTextController.text.rtrim('/'); ref.read(authProvider.notifier).setServer(serverTextController.text.rtrim('/')); final response = await ref.read(authProvider.notifier).authenticateByName( diff --git a/lib/screens/login/widgets/discover_servers_widget.dart b/lib/screens/login/widgets/discover_servers_widget.dart index dbda9d7..11e5e1b 100644 --- a/lib/screens/login/widgets/discover_servers_widget.dart +++ b/lib/screens/login/widgets/discover_servers_widget.dart @@ -22,6 +22,7 @@ class DiscoverServersWidget extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { + if (FladderConfig.baseUrl?.isNotEmpty == true) return const SizedBox.shrink(); final existingServers = serverCredentials .map( (credentials) => DiscoveryInfo( @@ -59,7 +60,7 @@ class DiscoverServersWidget extends ConsumerWidget { .toList() .addInBetween(const SizedBox(height: 4)), ], - if (!kIsWeb && FladderConfig.baseUrl?.isEmpty == true) ...[ + if (!kIsWeb) ...[ const Divider(), Row( children: [