From 04ca48bc606d44430a7eac96e8e0f959ed561b00 Mon Sep 17 00:00:00 2001 From: Daniel Poss Date: Sun, 16 Mar 2025 02:07:15 -0500 Subject: [PATCH 1/5] Add new icons and update Discord login flow - Added new image assets: JGIcon.webp, BotIcon.webp, MidIcon.webp, TopIcon.webp, and SuppIcon.webp. - Removed mock Discord client import and updated user login logic to fetch current user details. - Adjusted asset paths in pubspec.yaml and improved server selection logic in the UI. --- {assets/images => images}/BotIcon.webp | Bin {assets/images => images}/JGIcon.webp | Bin {assets/images => images}/MidIcon.webp | Bin {assets/images => images}/SuppIcon.webp | Bin {assets/images => images}/TopIcon.webp | Bin lib/globals/global_settings.dart | 1 - lib/main.dart | 4 +- lib/pages/home/page/widgets/team_card.dart | 15 +-- .../intro/step_pages/login_to_discord.dart | 12 +- .../intro/step_pages/select_servers.dart | 17 +-- lib/pages/intro/welcome_page.dart | 9 +- lib/services/discord_service_impl.dart | 105 ++++++++++-------- lib/stores/application_details.store.dart | 48 +++----- lib/stores/discord_details.store.dart | 50 ++++----- pubspec.yaml | 10 +- .../widget/clash_notification_test.mocks.dart | 69 +++++------- 16 files changed, 146 insertions(+), 194 deletions(-) rename {assets/images => images}/BotIcon.webp (100%) rename {assets/images => images}/JGIcon.webp (100%) rename {assets/images => images}/MidIcon.webp (100%) rename {assets/images => images}/SuppIcon.webp (100%) rename {assets/images => images}/TopIcon.webp (100%) diff --git a/assets/images/BotIcon.webp b/images/BotIcon.webp similarity index 100% rename from assets/images/BotIcon.webp rename to images/BotIcon.webp diff --git a/assets/images/JGIcon.webp b/images/JGIcon.webp similarity index 100% rename from assets/images/JGIcon.webp rename to images/JGIcon.webp diff --git a/assets/images/MidIcon.webp b/images/MidIcon.webp similarity index 100% rename from assets/images/MidIcon.webp rename to images/MidIcon.webp diff --git a/assets/images/SuppIcon.webp b/images/SuppIcon.webp similarity index 100% rename from assets/images/SuppIcon.webp rename to images/SuppIcon.webp diff --git a/assets/images/TopIcon.webp b/images/TopIcon.webp similarity index 100% rename from assets/images/TopIcon.webp rename to images/TopIcon.webp diff --git a/lib/globals/global_settings.dart b/lib/globals/global_settings.dart index ffe2ae6..6d622eb 100644 --- a/lib/globals/global_settings.dart +++ b/lib/globals/global_settings.dart @@ -1,5 +1,4 @@ import 'package:clashbot_flutter/clients/discord_client.dart'; -import 'package:clashbot_flutter/clients/mock_discord_client.dart'; import 'package:clashbot_flutter/globals/credentials.dart'; import 'package:oauth2_client/oauth2_helper.dart'; diff --git a/lib/main.dart b/lib/main.dart index c28acf3..41e8d78 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -141,8 +141,8 @@ class _MyAppState extends State { child: Consumer2(builder: (context, ApplicationDetailsStore appStore, ModelFirstTime modelFirstTime, child) { - if (modelFirstTime.visited) { - appStore.loadUserDetails(); + if (modelFirstTime.visited && !appStore.isLoggedIn) { + appStore.discordDetailsStore.fetchCurrentUserDetails(); } return Observer(builder: (_) { return const MainApp(); diff --git a/lib/pages/home/page/widgets/team_card.dart b/lib/pages/home/page/widgets/team_card.dart index a1c2978..142b57b 100644 --- a/lib/pages/home/page/widgets/team_card.dart +++ b/lib/pages/home/page/widgets/team_card.dart @@ -1,10 +1,8 @@ import 'package:clash_bot_api/api.dart'; import 'package:clashbot_flutter/models/clash_team.dart'; -import 'package:clashbot_flutter/pages/home/page/home_v2.dart'; import 'package:clashbot_flutter/snackbars/join_team_snackbar.dart'; import 'package:clashbot_flutter/snackbars/remove_team_snackbar.dart'; import 'package:clashbot_flutter/stores/application_details.store.dart'; -import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:provider/provider.dart'; @@ -54,11 +52,14 @@ class TeamCard extends StatelessWidget { ); }), SizedBox(width: 5), - Text( - team.name.length > 20 - ? '${team.name.substring(0, 20)}...' - : team.name, - style: Theme.of(context).textTheme.titleLarge, + Expanded( + child: Text( + team.name.length > 20 + ? '${team.name.substring(0, 20)}...' + : team.name, + style: Theme.of(context).textTheme.titleLarge, + textAlign: TextAlign.center, + ), ), ], ), diff --git a/lib/pages/intro/step_pages/login_to_discord.dart b/lib/pages/intro/step_pages/login_to_discord.dart index 7877548..a86c260 100644 --- a/lib/pages/intro/step_pages/login_to_discord.dart +++ b/lib/pages/intro/step_pages/login_to_discord.dart @@ -17,12 +17,14 @@ class LoginToDiscordWidget extends StatelessWidget { @override Widget build(BuildContext context) { final appStore = context.read(); - var dispose = - when((_) => appStore.discordDetailsStore.detailsLoaded == true, () { + var dispose = when( + (_) => + appStore.discordDetailsStore.userHasLoggedIn == true && + appStore.discordDetailsStore.discordGuilds.isNotEmpty, () { callback(true); }); return Observer(builder: (_) { - return !appStore.discordDetailsStore.detailsLoaded + return !appStore.discordDetailsStore.userHasLoggedIn ? const AskToLogin() : Column( mainAxisAlignment: MainAxisAlignment.center, @@ -66,7 +68,7 @@ class AskToLogin extends StatelessWidget { children: [ const Text("Lets log you in to Discord!", style: subHeaderStyle), const SizedBox(height: 10), - appStore.discordDetailsStore.status == "NOT_LOADED" + !appStore.discordDetailsStore.loadingData ? const LoginToDiscord() : ElevatedButton.icon( onPressed: null, @@ -89,7 +91,7 @@ class LoginToDiscord extends StatelessWidget { return Consumer( builder: (context, appStore, child) => ElevatedButton( onPressed: () { - appStore.discordDetailsStore.loadEverything(); + appStore.discordDetailsStore.fetchCurrentUserDetails(); }, child: const Text("Login to Discord"))); } diff --git a/lib/pages/intro/step_pages/select_servers.dart b/lib/pages/intro/step_pages/select_servers.dart index 513ebe9..9744e40 100644 --- a/lib/pages/intro/step_pages/select_servers.dart +++ b/lib/pages/intro/step_pages/select_servers.dart @@ -21,7 +21,6 @@ class ServerFormWidget extends StatelessWidget { @override Widget build(BuildContext context) { final applicationDetailsStore = context.read(); - applicationDetailsStore.discordDetailsStore.loadEverything(); return Observer( builder: (_) => ServerFormContent( guilds: applicationDetailsStore.discordDetailsStore.discordGuilds, @@ -87,6 +86,7 @@ class ServerChoiceChip extends StatefulWidget { class _ServerChoiceChipState extends State { @override Widget build(BuildContext context) { + ApplicationDetailsStore appStore = context.read(); return ChoiceChip( avatar: CircleAvatar( backgroundImage: NetworkImage(widget.guild.iconURL), @@ -104,24 +104,17 @@ class _ServerChoiceChipState extends State { onSelected: !widget.selectedServerFormStore.maxServersReached ? (bool selected) { setState(() { - developer.log("Selected: $selected"); - developer.log( - "Max Servers Reached: ${widget.selectedServerFormStore.maxServersReached}"); - developer.log("widget.guild.id: ${widget.guild.id}"); - developer.log( - "listOfSelectedServers: ${widget.selectedServerFormStore.listOfSelectedServers}"); - developer.log( - "Does it contain? ${widget.selectedServerFormStore.listOfSelectedServers.contains(widget.guild.id)}"); if (selected && !widget.selectedServerFormStore.maxServersReached) { - developer.log("Adding server to list ${widget.guild.id}..."); widget.selectedServerFormStore.addServer(widget.guild.id); + appStore.setPreferredServers( + widget.selectedServerFormStore.listOfSelectedServers); } else if (!selected && widget.selectedServerFormStore.listOfSelectedServers .contains(widget.guild.id)) { - developer - .log("Removing server from list ${widget.guild.id}..."); widget.selectedServerFormStore.removeServer(widget.guild.id); + appStore.setPreferredServers( + widget.selectedServerFormStore.listOfSelectedServers); } }); } diff --git a/lib/pages/intro/welcome_page.dart b/lib/pages/intro/welcome_page.dart index 83759eb..c927a34 100644 --- a/lib/pages/intro/welcome_page.dart +++ b/lib/pages/intro/welcome_page.dart @@ -141,14 +141,9 @@ class EndWelcomePageSessionButton extends StatelessWidget { ? null : () { selectedServerFormStore.submittingForm(); - appStore - .createUser( - selectedServerFormStore.listOfSelectedServers.first - .toString(), - selectedServerFormStore.listOfSelectedServers) - .then((value) { + appStore.createUser().then((value) { modelFirstTime.visited = true; - context.goNamed('teams'); + context.goNamed('home'); }).catchError((error) { selectedServerFormStore.callFailed = true; selectedServerFormStore.submitting = false; diff --git a/lib/services/discord_service_impl.dart b/lib/services/discord_service_impl.dart index 80c3704..de560fd 100644 --- a/lib/services/discord_service_impl.dart +++ b/lib/services/discord_service_impl.dart @@ -21,43 +21,48 @@ class DiscordServiceImpl implements DiscordService { @override Future fetchCurrentUserDetails() { return retry( - () => oAuth2Helper - .get( - AppGlobalSettings.apiEndpointURL + - AppGlobalSettings.API_DISCORD_GET_CURRENT_USER, - headers: baseHeaders) - .then((response) { - if (response.statusCode != 200) { - throw ApiException(response.statusCode, response.reasonPhrase); - } - return response; - }).timeout(const Duration(seconds: 5)), - retryIf: (e) => - e is SocketException || - e is TimeoutException || - (e is ApiException && e.code == HttpStatus.tooManyRequests)).then( - (value) => DiscordUser.fromJson(value.body)); + () => oAuth2Helper + .get( + AppGlobalSettings.apiEndpointURL + + AppGlobalSettings.API_DISCORD_GET_CURRENT_USER, + headers: baseHeaders) + .then((response) { + if (response.statusCode != 200) { + throw ApiException( + response.statusCode, response.reasonPhrase); + } + return response; + }).timeout(const Duration(seconds: 5)), + retryIf: (e) => + e is SocketException || + e is TimeoutException || + (e is ApiException && e.code == HttpStatus.tooManyRequests), + delayFactor: const Duration(seconds: 2)) + .then((value) => DiscordUser.fromJson(value.body)); } @override Future> fetchUserGuilds() { return retry( - () => oAuth2Helper - .get( - AppGlobalSettings.apiEndpointURL + - AppGlobalSettings.API_DISCORD_GET_CURRENT_USER_GUILDS, - headers: baseHeaders) - .then((response) { - if (response.statusCode != 200) { - throw ApiException(response.statusCode, response.reasonPhrase); - } - return response; - }).timeout(const Duration(seconds: 5)), - retryIf: (e) => - e is SocketException || - e is TimeoutException || - (e is ApiException && e.code == HttpStatus.tooManyRequests)).then( - (value) { + () => oAuth2Helper + .get( + AppGlobalSettings.apiEndpointURL + + AppGlobalSettings + .API_DISCORD_GET_CURRENT_USER_GUILDS, + headers: baseHeaders) + .then((response) { + if (response.statusCode != 200) { + throw ApiException( + response.statusCode, response.reasonPhrase); + } + return response; + }).timeout(const Duration(seconds: 5)), + retryIf: (e) => + e is SocketException || + e is TimeoutException || + (e is ApiException && e.code == HttpStatus.tooManyRequests), + delayFactor: const Duration(seconds: 2)) + .then((value) { Iterable l = jsonDecode(value.body); return List.from(l.map((model) { return DiscordGuild.fromMap(model); @@ -73,22 +78,24 @@ class DiscordServiceImpl implements DiscordService { @override Future fetchUserDetails(String discordId) { return retry( - () => oAuth2Helper - .get( - AppGlobalSettings.apiEndpointURL + - AppGlobalSettings.API_DISCORD_GET_USER + - discordId, - headers: baseHeaders) - .then((response) { - if (response.statusCode != 200) { - throw ApiException(response.statusCode, response.reasonPhrase); - } - return response; - }).timeout(const Duration(seconds: 5)), - retryIf: (e) => - e is SocketException || - e is TimeoutException || - (e is ApiException && e.code == HttpStatus.tooManyRequests)).then( - (value) => DiscordUser.fromJson(value.body)); + () => oAuth2Helper + .get( + AppGlobalSettings.apiEndpointURL + + AppGlobalSettings.API_DISCORD_GET_USER + + discordId, + headers: baseHeaders) + .then((response) { + if (response.statusCode != 200) { + throw ApiException( + response.statusCode, response.reasonPhrase); + } + return response; + }).timeout(const Duration(seconds: 5)), + retryIf: (e) => + e is SocketException || + e is TimeoutException || + (e is ApiException && e.code == HttpStatus.tooManyRequests), + delayFactor: const Duration(seconds: 2)) + .then((value) => DiscordUser.fromJson(value.body)); } } diff --git a/lib/stores/application_details.store.dart b/lib/stores/application_details.store.dart index ea05840..723f197 100644 --- a/lib/stores/application_details.store.dart +++ b/lib/stores/application_details.store.dart @@ -49,8 +49,10 @@ abstract class _ApplicationDetailsStore with Store { _ApplicationDetailsStore(this._discordService, this._clashBotService, this._riotResourcesService, this._clashBotEventsService) { reaction((_) => id, (_) { - refreshClashBotUser(); - refreshSelectedServers(); + if (id != '0') { + refreshClashBotUser(); + refreshSelectedServers(); + } }); } @@ -76,13 +78,16 @@ abstract class _ApplicationDetailsStore with Store { ObservableList get sortedSelectedServers => ObservableList.of(clashBotUser.selectedServers.sorted()); + @action + void setPreferredServers(List servers) { + preferredServers = ObservableList.of(servers); + } + @action Future refreshSelectedServers() async { preferredServers.clear(); var userDetails = await _clashBotService.getPlayer(id); - developer.log(userDetails.selectedServers.toString()); preferredServers = ObservableList.of(userDetails.selectedServers); - developer.log("Preferred: " + preferredServers.toString()); } @action @@ -106,7 +111,7 @@ abstract class _ApplicationDetailsStore with Store { @computed bool get isLoggedIn => - discordDetailsStore.detailsLoaded && clashBotUser.discordId != '0'; + discordDetailsStore.userHasLoggedIn && clashBotUser.discordId != '0'; @action void triggerError(String errorMessage) { @@ -139,38 +144,13 @@ abstract class _ApplicationDetailsStore with Store { } @action - Future loadUserDetails() async { - try { - await Future.wait([ - discordDetailsStore.loadEverything(), - riotChampionStore.refreshChampionData() - ]); - // _clashBotEventsService.connectClient(() { - // for (var serverId in loggedInClashUser.preferredServers) { - // _clashBotEventsService.setupSubscription( - // id, serverId, notifyUser, loggedInClashUser, discordDetailsStore); - // } - // }, (dynamic error) { - // developer.log("Websocket connection failure.", error: error); - // error = "Failed to connect to Server events."; - // }); - } catch (error) { - developer.log("Failed to load user.", error: error); - this.error = 'Failed to load :(, please try again later.'; - } - } - - @action - Future createUser( - String defaultServerId, List selectedServersToUse) async { + Future createUser() async { try { clashBotUser = await _clashBotService.createPlayer( - id, discordDetailsStore.discordUser.username, defaultServerId); - var updatedSelectedServers = await _clashBotService.createSelectedServers( - id, selectedServersToUse); + id, discordDetailsStore.discordUser.username, preferredServers.first); + var updatedSelectedServers = + await _clashBotService.createSelectedServers(id, preferredServers); clashBotUser.selectedServers = updatedSelectedServers; - preferredServers.clear(); - preferredServers.addAll(updatedSelectedServers); return clashBotUser; } on Exception catch (issue) { error = 'Failed to create new Clash Bot User, please try again.'; diff --git a/lib/stores/discord_details.store.dart b/lib/stores/discord_details.store.dart index f712732..e528822 100644 --- a/lib/stores/discord_details.store.dart +++ b/lib/stores/discord_details.store.dart @@ -14,11 +14,11 @@ abstract class _DiscordDetailsStore with Store { final DiscordService _discordService; final ApplicationDetailsStore _applicationDetailsStore; _DiscordDetailsStore(this._discordService, this._applicationDetailsStore) { - reaction( - (_) => - _applicationDetailsStore.id != '0' || - _applicationDetailsStore.id.isNotEmpty, (_) { - loadEverything(); + reaction((_) => _applicationDetailsStore.id, (_) { + if (_applicationDetailsStore.id != '0' || + _applicationDetailsStore.id.isNotEmpty) { + fetchUserGuilds(); + } }); } @@ -32,10 +32,13 @@ abstract class _DiscordDetailsStore with Store { ObservableMap discordIdToName = ObservableMap(); @observable - String status = 'NOT_LOADED'; + ObservableList callsInProgress = ObservableList(); @computed - bool get detailsLoaded => discordUser.id != '0'; + bool get loadingData => callsInProgress.isNotEmpty; + + @computed + bool get userHasLoggedIn => discordUser.id != '0'; @computed bool get guildDetailsLoaded => discordGuildMap.isNotEmpty; @@ -46,59 +49,46 @@ abstract class _DiscordDetailsStore with Store { @action Future fetchUserDetails(String discordId) async { + callsInProgress.add('fetchUserDetails'); var foundUser; try { foundUser = await _discordService.fetchUserDetails(discordId); discordIdToName.putIfAbsent(discordId, () => foundUser.username); - } on Exception catch (error) {} + } on Exception catch (error) { + _applicationDetailsStore.error = + 'Failed to fetch Discord User details due to ${error.toString()}'; + } + callsInProgress.remove('fetchUserDetails'); return foundUser; } @action Future fetchCurrentUserDetails() async { - status = 'LOADING'; + callsInProgress.add('fetchCurrentUserDetails'); final future = _discordService.fetchCurrentUserDetails(); try { DiscordUser updatedUser = await future; discordUser = updatedUser; _applicationDetailsStore.id = discordUser.id; discordIdToName.putIfAbsent(updatedUser.id, () => updatedUser.username); - status = 'LOADED'; } on Exception catch (error) { _applicationDetailsStore.error = 'Failed to fetch Discord User details due to ${error.toString()}'; - status = 'NOT LOADED'; } + callsInProgress.remove('fetchCurrentUserDetails'); } @action Future fetchUserGuilds() async { - status = 'LOADING'; + callsInProgress.add('fetchUserGuilds'); final future = _discordService.fetchUserGuilds(); try { List guilds = await future; discordGuilds.clear(); discordGuilds.addAll(guilds); - status = 'LOADED'; - } on Exception catch (error) { - _applicationDetailsStore.error = error.toString(); - status = 'NOT LOADED'; - } - } - - @action - Future loadEverything() async { - status = 'LOADING'; - try { - // await _discordService.loginToDiscord(); - await Future.wait([fetchCurrentUserDetails(), fetchUserGuilds()]); - - _applicationDetailsStore.id = discordUser.id; - - status = 'LOADED'; } on Exception catch (error) { _applicationDetailsStore.error = error.toString(); - status = 'NOT LOADED'; } + callsInProgress.remove('fetchUserGuilds'); } } diff --git a/pubspec.yaml b/pubspec.yaml index fac8901..25e0036 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -100,11 +100,11 @@ flutter: # To add assets to your application, add an assets section, like this: assets: - assets/markdown/privacy-policy.md - - assets/images/TopIcon.webp - - assets/images/BotIcon.webp - - assets/images/MidIcon.webp - - assets/images/JGIcon.webp - - assets/images/SuppIcon.webp + - images/TopIcon.webp + - images/BotIcon.webp + - images/MidIcon.webp + - images/JGIcon.webp + - images/SuppIcon.webp # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware diff --git a/test/widget/clash_notification_test.mocks.dart b/test/widget/clash_notification_test.mocks.dart index 9a6769d..e76ef32 100644 --- a/test/widget/clash_notification_test.mocks.dart +++ b/test/widget/clash_notification_test.mocks.dart @@ -291,6 +291,15 @@ class MockApplicationDetailsStore extends _i1.Mock ), ) as _i5.ReactiveContext); + @override + void setPreferredServers(List? servers) => super.noSuchMethod( + Invocation.method( + #setPreferredServers, + [servers], + ), + returnValueForMissingStub: null, + ); + @override _i11.Future refreshSelectedServers() => (super.noSuchMethod( Invocation.method( @@ -358,36 +367,16 @@ class MockApplicationDetailsStore extends _i1.Mock ); @override - _i11.Future loadUserDetails() => (super.noSuchMethod( - Invocation.method( - #loadUserDetails, - [], - ), - returnValue: _i11.Future.value(), - returnValueForMissingStub: _i11.Future.value(), - ) as _i11.Future); - - @override - _i11.Future<_i4.ClashBotUser> createUser( - String? defaultServerId, - List? selectedServersToUse, - ) => - (super.noSuchMethod( + _i11.Future<_i4.ClashBotUser> createUser() => (super.noSuchMethod( Invocation.method( #createUser, - [ - defaultServerId, - selectedServersToUse, - ], + [], ), returnValue: _i11.Future<_i4.ClashBotUser>.value(_FakeClashBotUser_2( this, Invocation.method( #createUser, - [ - defaultServerId, - selectedServersToUse, - ], + [], ), )), ) as _i11.Future<_i4.ClashBotUser>); @@ -460,26 +449,32 @@ class MockDiscordDetailsStore extends _i1.Mock ); @override - String get status => (super.noSuchMethod( - Invocation.getter(#status), - returnValue: _i8.dummyValue( + _i5.ObservableList get callsInProgress => (super.noSuchMethod( + Invocation.getter(#callsInProgress), + returnValue: _FakeObservableList_3( this, - Invocation.getter(#status), + Invocation.getter(#callsInProgress), ), - ) as String); + ) as _i5.ObservableList); @override - set status(String? value) => super.noSuchMethod( + set callsInProgress(_i5.ObservableList? value) => super.noSuchMethod( Invocation.setter( - #status, + #callsInProgress, value, ), returnValueForMissingStub: null, ); @override - bool get detailsLoaded => (super.noSuchMethod( - Invocation.getter(#detailsLoaded), + bool get loadingData => (super.noSuchMethod( + Invocation.getter(#loadingData), + returnValue: false, + ) as bool); + + @override + bool get userHasLoggedIn => (super.noSuchMethod( + Invocation.getter(#userHasLoggedIn), returnValue: false, ) as bool); @@ -539,14 +534,4 @@ class MockDiscordDetailsStore extends _i1.Mock returnValue: _i11.Future.value(), returnValueForMissingStub: _i11.Future.value(), ) as _i11.Future); - - @override - _i11.Future loadEverything() => (super.noSuchMethod( - Invocation.method( - #loadEverything, - [], - ), - returnValue: _i11.Future.value(), - returnValueForMissingStub: _i11.Future.value(), - ) as _i11.Future); } From 22e2f3a54434266072dc1a5b320bba90c487b08c Mon Sep 17 00:00:00 2001 From: Daniel Poss Date: Tue, 18 Mar 2025 18:15:52 -0500 Subject: [PATCH 2/5] Update dependencies, add error handling store, and refactor user models --- lib/globals/credentials.dart | 12 +- lib/main.dart | 147 ++--- lib/models/clashbot_user.dart | 11 + lib/models/discord_user.dart | 7 +- lib/pages/home/page/home_v2.dart | 50 +- .../home/page/widgets/calendar_widget.dart | 17 +- .../home/page/widgets/events_widget.dart | 2 - .../home/page/widgets/server_chip_list.dart | 5 +- lib/pages/home/page/widgets/team_card.dart | 189 ++++-- .../intro/step_pages/login_to_discord.dart | 25 +- .../intro/step_pages/select_servers.dart | 16 +- lib/pages/intro/welcome_page.dart | 17 +- lib/services/clashbot_events_service.dart | 12 - lib/stores/application_details.store.dart | 123 ++-- lib/stores/discord_details.store.dart | 25 +- lib/stores/discordoauth2.store.dart | 39 +- lib/stores/riot_champion.store.dart | 19 +- lib/stores/v2-stores/clash.store.dart | 111 ++-- lib/stores/v2-stores/error_handler.store.dart | 20 + lib/storybook_main.dart | 225 ++++++++ pubspec.lock | 4 +- pubspec.yaml | 2 +- test/widget/clash_notification_test.dart | 70 --- .../widget/clash_notification_test.mocks.dart | 537 ------------------ 24 files changed, 703 insertions(+), 982 deletions(-) create mode 100644 lib/stores/v2-stores/error_handler.store.dart create mode 100644 lib/storybook_main.dart delete mode 100644 test/widget/clash_notification_test.dart delete mode 100644 test/widget/clash_notification_test.mocks.dart diff --git a/lib/globals/credentials.dart b/lib/globals/credentials.dart index dad01de..080c944 100644 --- a/lib/globals/credentials.dart +++ b/lib/globals/credentials.dart @@ -1,7 +1,9 @@ import 'dart:io'; + abstract class Credentials { - static const APP_DISCORD_OAUTH_CLIENT_ID = "837629412328734740"; - static const APP_DISCORD_OAUTH_REDIRECT_URI = "http://localhost:4200/login"; - static const SCOPE = ['identify', 'guilds']; - static final appUserCredentialsFile = new File("~/.myapp/credentials.json"); -} \ No newline at end of file + // static const APP_DISCORD_OAUTH_CLIENT_ID = "837629412328734740"; + static const APP_DISCORD_OAUTH_CLIENT_ID = "839586949748228156"; + static const APP_DISCORD_OAUTH_REDIRECT_URI = "http://localhost:4200/login"; + static const SCOPE = ['identify', 'guilds']; + static final appUserCredentialsFile = new File("~/.myapp/credentials.json"); +} diff --git a/lib/main.dart b/lib/main.dart index 41e8d78..d43c203 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,8 +3,10 @@ import 'dart:developer' as developer; import 'package:clash_bot_api/api.dart'; import 'package:clashbot_flutter/core/config/env.dart'; import 'package:clashbot_flutter/globals/color_schemes.dart'; +import 'package:clashbot_flutter/models/clash_team.dart'; import 'package:clashbot_flutter/models/model_first_time.dart'; import 'package:clashbot_flutter/pages/home/page/home_v2.dart'; +import 'package:clashbot_flutter/pages/home/page/widgets/team_card.dart'; import 'package:clashbot_flutter/pages/intro/welcome_page.dart'; import 'package:clashbot_flutter/routes.dart'; import 'package:clashbot_flutter/services/clashbot_service.dart'; @@ -15,7 +17,10 @@ import 'package:clashbot_flutter/services/discord_service_mock_impl.dart'; import 'package:clashbot_flutter/services/riot_resources_service.dart'; import 'package:clashbot_flutter/services/riot_resources_service_impl.dart'; import 'package:clashbot_flutter/stores/application_details.store.dart'; +import 'package:clashbot_flutter/stores/discord_details.store.dart'; +import 'package:clashbot_flutter/stores/riot_champion.store.dart'; import 'package:clashbot_flutter/stores/v2-stores/clash.store.dart'; +import 'package:clashbot_flutter/stores/v2-stores/error_handler.store.dart'; import 'package:clashbot_flutter/styles.dart'; import 'package:clashbot_flutter/utils/reusable_widgets.dart'; import 'package:flutter/material.dart'; @@ -26,6 +31,7 @@ import 'package:intl/intl.dart'; import 'package:mobx/mobx.dart'; import 'package:provider/provider.dart'; import 'package:validators/validators.dart'; +import 'package:storybook_flutter/storybook_flutter.dart'; import 'generated/git_info.dart'; import 'globals/global_settings.dart'; @@ -128,25 +134,33 @@ class _MyAppState extends State { create: (_) => RiotResourceServiceImpl()), Provider( create: (_) => ClashBotEventsService()), - ProxyProvider4( - update: (_, discordService, clashBotService, riotResourceService, - clashBotEventService, __) => - ApplicationDetailsStore(discordService, clashBotService, - riotResourceService, clashBotEventService)), - ProxyProvider2( - update: (_, applicationDetailsStore, clashBotService, __) => - ClashStore(clashBotService, applicationDetailsStore)) + Provider(create: (_) => ErrorHandlerStore()), + ProxyProvider2( + update: (_, clashBotService, errorHandlerStore, __) => + ClashStore(clashBotService, errorHandlerStore)), + ProxyProvider2( + update: (_, discordService, errorHandlerStore, __) => + DiscordDetailsStore(discordService, errorHandlerStore)), + ProxyProvider2( + update: (_, riotResourceService, errorHandlerStore, __) => + RiotChampionStore(riotResourceService, errorHandlerStore)), + // Depends on ClashStore, DiscordDetailsStore, RiotChampionStore, ErrorHandlerStore + ProxyProvider4( + update: (_, clashStore, discordDetailsStore, riotChampionStore, + errorHandlerStore, __) => + ApplicationDetailsStore(clashStore, discordDetailsStore, + riotChampionStore, errorHandlerStore)), ], child: Consumer2(builder: (context, ApplicationDetailsStore appStore, ModelFirstTime modelFirstTime, child) { if (modelFirstTime.visited && !appStore.isLoggedIn) { - appStore.discordDetailsStore.fetchCurrentUserDetails(); + appStore.refreshDiscordUser(); } - return Observer(builder: (_) { - return const MainApp(); - }); + return const MainApp(); })); } } @@ -270,28 +284,27 @@ class MainContainer extends StatelessWidget { @override Widget build(BuildContext context) { - final appStore = context.read(); + final discordDetailsStore = context.read(); + final errorStore = context.read(); autorun((_) { - if ('' != appStore.error) { + if ('' != errorStore.errorMessage) { ScaffoldMessenger.of(context).showSnackBar(SnackBar( - backgroundColor: Colors.redAccent, content: Text(appStore.error))); - appStore.error = ''; + backgroundColor: Colors.redAccent, + content: Text(errorStore.errorMessage))); + errorStore.errorMessage = ''; } - appStore.discordDetailsStore.discordIdToName.forEach((key, value) { - developer.log("$key => $value"); - }); }); return Consumer( builder: (context, ModelTheme themeNotifier, consChild) { return Scaffold( appBar: AppBar(title: const Text('ClashBot 2.0'), actions: [ - Observer( - builder: (_) => Badge.count( - count: appStore.unreadNotifications.length, - alignment: AlignmentDirectional.bottomStart, - isLabelVisible: appStore.unreadNotifications.isNotEmpty, - child: const ClashBotNotificationsWidget(), - )), + // Observer( + // builder: (_) => Badge.count( + // count: appStore.unreadNotifications.length, + // alignment: AlignmentDirectional.bottomStart, + // isLabelVisible: appStore.unreadNotifications.isNotEmpty, + // child: const ClashBotNotificationsWidget(), + // )), Column( mainAxisSize: MainAxisSize.min, // spacing: 1.0, @@ -322,11 +335,11 @@ class MainContainer extends StatelessWidget { : themeNotifier.isDark = true; }), Observer(builder: (_) { - if (appStore.isLoggedIn) { + if (discordDetailsStore.userHasLoggedIn) { return PopupMenuButton( icon: CircleAvatar( - backgroundImage: NetworkImage(appStore - .discordDetailsStore.discordUser.avatarURL)) + backgroundImage: NetworkImage( + discordDetailsStore.discordUser.avatarURL)) .animate() .shake(duration: const Duration(seconds: 1)), offset: const Offset(0, 50), @@ -354,39 +367,39 @@ class MainContainer extends StatelessWidget { } } -class ClashBotNotificationsWidget extends StatelessWidget { - const ClashBotNotificationsWidget({super.key}); +// class ClashBotNotificationsWidget extends StatelessWidget { +// const ClashBotNotificationsWidget({super.key}); - @override - Widget build(BuildContext context) { - final appStore = context.read(); - return Observer(builder: (_) { - return PopupMenuButton( - icon: const Icon(Icons.add_alert), - tooltip: 'Notifications', - position: PopupMenuPosition.under, - itemBuilder: (BuildContext context) { - return appStore.sortedNotifications.map((notification) { - var discordGuild = appStore - .discordDetailsStore.discordGuildMap[notification.serverId]; - return PopupMenuItem( - value: notification.uuid, - enabled: !notification.read, - padding: const EdgeInsets.all(2.0), - child: ClashBotNotificationBody( - serverName: discordGuild?.name ?? '', - message: notification.message, - causedBy: notification.causedBy, - timestamp: notification.timestamp, - iconUrl: discordGuild?.iconURL ?? '', - )); - }).toList(); - }, - onSelected: (value) => appStore.readNotification(value), - ); - }); - } -} +// @override +// Widget build(BuildContext context) { +// final discordDetailsStore = context.read(); +// return Observer(builder: (_) { +// return PopupMenuButton( +// icon: const Icon(Icons.add_alert), +// tooltip: 'Notifications', +// position: PopupMenuPosition.under, +// itemBuilder: (BuildContext context) { +// return appStore.sortedNotifications.map((notification) { +// var discordGuild = appStore +// .discordDetailsStore.discordGuildMap[notification.serverId]; +// return PopupMenuItem( +// value: notification.uuid, +// enabled: !notification.read, +// padding: const EdgeInsets.all(2.0), +// child: ClashBotNotificationBody( +// serverName: discordGuild?.name ?? '', +// message: notification.message, +// causedBy: notification.causedBy, +// timestamp: notification.timestamp, +// iconUrl: discordGuild?.iconURL ?? '', +// )); +// }).toList(); +// }, +// onSelected: (value) => appStore.readNotification(value), +// ); +// }); +// } +// } class ClashBotNotificationBody extends StatelessWidget { ClashBotNotificationBody({ @@ -474,6 +487,7 @@ class DrawerHeaderContentWidget extends StatelessWidget { @override Widget build(BuildContext context) { final applicationDetailsStore = context.read(); + final discordDetailsStore = context.read(); return Column( children: [ Observer( @@ -482,13 +496,12 @@ class DrawerHeaderContentWidget extends StatelessWidget { return Row(children: [ ListTile( leading: CircleAvatar( - backgroundImage: NetworkImage(applicationDetailsStore - .discordDetailsStore.discordUser.avatarURL), + backgroundImage: + NetworkImage(discordDetailsStore.discordUser.avatarURL), radius: 20, ), title: Text( - applicationDetailsStore - .discordDetailsStore.discordUser.username, + discordDetailsStore.discordUser.username, style: const TextStyle( color: Colors.white, fontSize: 24, @@ -500,7 +513,7 @@ class DrawerHeaderContentWidget extends StatelessWidget { children: [ ListTile( leading: const Icon(Icons.discord), - title: Text(applicationDetailsStore.id, + title: Text(discordDetailsStore.discordUser.id, style: const TextStyle( color: Colors.white, fontSize: 14, diff --git a/lib/models/clashbot_user.dart b/lib/models/clashbot_user.dart index a97ce82..a0dd9a6 100644 --- a/lib/models/clashbot_user.dart +++ b/lib/models/clashbot_user.dart @@ -46,4 +46,15 @@ class ClashBotUser { /// The list of preferred Discord Servers for the player to filter by. List preferredServers; + + ClashBotUser copy() { + return ClashBotUser( + discordId: discordId, + role: role, + champions: champions, + subscriptions: subscriptions, + serverId: serverId, + selectedServers: selectedServers, + preferredServers: preferredServers); + } } diff --git a/lib/models/discord_user.dart b/lib/models/discord_user.dart index 124bff4..a1bee53 100644 --- a/lib/models/discord_user.dart +++ b/lib/models/discord_user.dart @@ -24,7 +24,8 @@ class DiscordUser { late String discriminator; String get userDiscr => "$username#$discriminator"; - String get avatarURL => "${AppGlobalSettings.CND_DISCORD_AVATAR_URL}$id/$avatar.png"; + String get avatarURL => + "${AppGlobalSettings.CND_DISCORD_AVATAR_URL}$id/$avatar.png"; DiscordUser( this.id, @@ -90,4 +91,8 @@ class DiscordUser { avatar.hashCode ^ discriminator.hashCode; } + + DiscordUser copy() { + return DiscordUser(id, username, avatar, discriminator); + } } diff --git a/lib/pages/home/page/home_v2.dart b/lib/pages/home/page/home_v2.dart index 3afb802..d4b8d1d 100644 --- a/lib/pages/home/page/home_v2.dart +++ b/lib/pages/home/page/home_v2.dart @@ -11,13 +11,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:provider/provider.dart'; -class Event { +class HomeEvent { final DateTime date; final String title; final String description; final ClashTeam team; - Event({ + HomeEvent({ required this.date, required this.title, required this.description, @@ -87,16 +87,46 @@ class _HomeV2State extends State { @override Widget build(BuildContext context) { + ClashStore clashStore = context.read(); return Scaffold( - appBar: AppBar( - title: const Text('Clash Tournaments'), + body: LayoutBuilder( + builder: (context, constraints) { + if (constraints.maxWidth > 500) { + return Row( + children: [ + Flexible( + flex: 1, + child: CalendarWidget( + focusedDay: _focusedDay, selectedDay: _selectedDay), + ), + Flexible( + flex: 2, + child: EventsListWidget(), + ), + ], + ); + } else { + return Column( + children: [ + CalendarWidget( + focusedDay: _focusedDay, selectedDay: _selectedDay), + EventsListWidget(), + ], + ); + } + }, ), - body: Column( - children: [ - const ServerChipList(), - CalendarWidget(focusedDay: _focusedDay, selectedDay: _selectedDay), - Expanded(child: EventsListWidget()), - ], + floatingActionButton: Observer( + builder: (_) => clashStore.canCreateTeam + ? FloatingActionButton( + onPressed: () { + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: const Text('Creating team coming soon.'), + )); + }, + child: const Icon(Icons.add), + ) + : Container(), ), ); } diff --git a/lib/pages/home/page/widgets/calendar_widget.dart b/lib/pages/home/page/widgets/calendar_widget.dart index 0de5e98..c2501a9 100644 --- a/lib/pages/home/page/widgets/calendar_widget.dart +++ b/lib/pages/home/page/widgets/calendar_widget.dart @@ -1,7 +1,4 @@ -import 'package:clashbot_flutter/models/clash_team.dart'; -import 'package:clashbot_flutter/models/clash_tournament.dart'; import 'package:clashbot_flutter/pages/home/page/home_v2.dart'; -import 'package:clashbot_flutter/stores/application_details.store.dart'; import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:clashbot_flutter/stores/v2-stores/clash.store.dart'; import 'package:flutter/material.dart'; @@ -53,7 +50,8 @@ class _CalendarWidgetState extends State { @override Widget build(BuildContext context) { bool isDarkMode = Theme.of(context).brightness == Brightness.dark; - ApplicationDetailsStore appStore = context.read(); + DiscordDetailsStore discordDetailsStore = + context.read(); ClashStore clashStore = context.read(); return SizedBox( width: 1000.0, @@ -69,7 +67,7 @@ class _CalendarWidgetState extends State { focusedDay: _focusedDay, hoveredDay: _hoveredDay, isDarkMode: isDarkMode, - appStore: appStore, + discordDetailsStore: discordDetailsStore, clashStore: clashStore, onDaySelected: onDaySelected, onHoveredDayChanged: (day) { @@ -125,7 +123,7 @@ class CalendarBody extends StatelessWidget { final DateTime focusedDay; final DateTime? hoveredDay; final bool isDarkMode; - final ApplicationDetailsStore appStore; + final DiscordDetailsStore discordDetailsStore; final ClashStore clashStore; final Function onDaySelected; final ValueChanged onHoveredDayChanged; @@ -135,7 +133,7 @@ class CalendarBody extends StatelessWidget { required this.focusedDay, required this.hoveredDay, required this.isDarkMode, - required this.appStore, + required this.discordDetailsStore, required this.clashStore, required this.onDaySelected, required this.onHoveredDayChanged, @@ -165,7 +163,7 @@ class CalendarBody extends StatelessWidget { DateTime currentDay = DateTime(focusedDay.year, focusedDay.month, day); return Observer(builder: (_) { - List dayEvents = clashStore.events + List dayEvents = clashStore.events .where((event) => isSameDay(event.date, currentDay)) .toList(); return MouseRegion( @@ -223,8 +221,7 @@ class CalendarBody extends StatelessWidget { child: Observer( builder: (_) => CircleAvatar( backgroundImage: NetworkImage( - appStore - .discordDetailsStore + discordDetailsStore .discordGuildMap[event .team.serverId]! .iconURL), diff --git a/lib/pages/home/page/widgets/events_widget.dart b/lib/pages/home/page/widgets/events_widget.dart index 8a20f46..6dfb9d1 100644 --- a/lib/pages/home/page/widgets/events_widget.dart +++ b/lib/pages/home/page/widgets/events_widget.dart @@ -5,7 +5,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; -import 'dart:developer' as developer; class EventsListWidget extends StatelessWidget { const EventsListWidget({super.key}); @@ -17,7 +16,6 @@ class EventsListWidget extends StatelessWidget { return Observer(builder: (_) { var events = clashStore.tournamentsToTeamsFilteredToADayIfActive.entries.toList(); - developer.log("Events: $events"); return SingleChildScrollView( child: ListView.builder( shrinkWrap: true, diff --git a/lib/pages/home/page/widgets/server_chip_list.dart b/lib/pages/home/page/widgets/server_chip_list.dart index c3e1aaf..df97701 100644 --- a/lib/pages/home/page/widgets/server_chip_list.dart +++ b/lib/pages/home/page/widgets/server_chip_list.dart @@ -1,5 +1,6 @@ import 'package:clashbot_flutter/models/discord_guild.dart'; import 'package:clashbot_flutter/stores/application_details.store.dart'; +import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:clashbot_flutter/stores/v2-stores/clash.store.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; @@ -12,6 +13,8 @@ class ServerChipList extends StatelessWidget { @override Widget build(BuildContext context) { ApplicationDetailsStore appStore = context.read(); + DiscordDetailsStore discordDetailsStore = + context.read(); ClashStore clashStore = context.read(); return Padding( padding: const EdgeInsets.all(8.0), @@ -23,7 +26,7 @@ class ServerChipList extends StatelessWidget { children: appStore.preferredServers.map((serverId) { bool isSelected = clashStore.selectedServers.contains(serverId); DiscordGuild discordGuild = - appStore.discordDetailsStore.discordGuildMap[serverId]!; + discordDetailsStore.discordGuildMap[serverId]!; return Padding( padding: const EdgeInsets.symmetric(horizontal: 4.0), child: FilterChip( diff --git a/lib/pages/home/page/widgets/team_card.dart b/lib/pages/home/page/widgets/team_card.dart index 142b57b..e8fc2d0 100644 --- a/lib/pages/home/page/widgets/team_card.dart +++ b/lib/pages/home/page/widgets/team_card.dart @@ -3,10 +3,13 @@ import 'package:clashbot_flutter/models/clash_team.dart'; import 'package:clashbot_flutter/snackbars/join_team_snackbar.dart'; import 'package:clashbot_flutter/snackbars/remove_team_snackbar.dart'; import 'package:clashbot_flutter/stores/application_details.store.dart'; +import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:provider/provider.dart'; +import 'dart:developer' as developer; + class TeamCard extends StatelessWidget { TeamCard({ super.key, @@ -26,6 +29,8 @@ class TeamCard extends StatelessWidget { Widget build(BuildContext context) { ApplicationDetailsStore applicationDetailsStore = context.read(); + DiscordDetailsStore discordDetailsStore = + context.read(); return Card( surfaceTintColor: Theme.of(context).brightness == Brightness.dark ? const Color.fromARGB( @@ -33,51 +38,48 @@ class TeamCard extends StatelessWidget { : const Color.fromARGB( 255, 38, 0, 255), // Original color for light mode child: ConstrainedBox( - constraints: const BoxConstraints(maxWidth: 330), + constraints: const BoxConstraints(maxHeight: 325, maxWidth: 300), child: Padding( padding: const EdgeInsets.all(8.0), - child: Column( + child: Flex( + direction: Axis.vertical, + spacing: 10, children: [ - Row( + Flex( + direction: Axis.horizontal, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Row( - children: [ - Observer(builder: (_) { - return CircleAvatar( - backgroundImage: NetworkImage(applicationDetailsStore - .discordDetailsStore - .discordGuildMap[team.serverId]! - .iconURL), - ); - }), - SizedBox(width: 5), - Expanded( - child: Text( - team.name.length > 20 - ? '${team.name.substring(0, 20)}...' - : team.name, - style: Theme.of(context).textTheme.titleLarge, - textAlign: TextAlign.center, - ), - ), - ], + Observer(builder: (_) { + return CircleAvatar( + backgroundImage: NetworkImage(discordDetailsStore + .discordGuildMap[team.serverId]!.iconURL)); + }), + Text( + team.name.length > 20 + ? '${team.name.substring(0, 20)}...' + : team.name, + style: Theme.of(context).textTheme.titleLarge, ), + const IconButton.filledTonal( + tooltip: 'Coming soon...', + icon: Icon(Icons.fullscreen), + onPressed: null) ], ), - Column( - children: [ - Flex( - direction: Axis.vertical, - spacing: 4, - children: Role.values.map((role) { - return RoleChip( - image: roleToImage[role] ?? 'Unknown', - role: role, - player: team.members[role], - teamId: team.id); - }).toList()) - ], + Expanded( + child: Flex( + direction: Axis.vertical, + spacing: 4, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: Role.values.map((role) { + return RoleChip( + image: roleToImage[role] ?? 'Unknown', + role: role, + player: team.members[role], + teamId: team.id, + isUser: team.members[role]?.id == + applicationDetailsStore.clashBotUser.discordId); + }).toList()), ), ], ), @@ -93,23 +95,84 @@ class RoleChip extends StatelessWidget { required this.image, required this.role, this.player, - required this.teamId}); + required this.teamId, + required this.isUser}); final String image; final Role role; final PlayerDetails? player; final String teamId; + final bool isUser; @override Widget build(BuildContext context) { return player != null - ? RoleFilledWidget( - role: role, player: player, teamId: teamId, image: image) + ? (isUser + ? UsersFilledButton( + role: role, player: player, teamId: teamId, image: image) + : RoleFilledWidget( + role: role, player: player, teamId: teamId, image: image)) : UnfilledRoleWidget( role: role, player: player, teamId: teamId, image: image); } } +class UsersFilledButton extends StatelessWidget { + const UsersFilledButton({ + super.key, + required this.role, + required this.player, + required this.teamId, + required this.image, + }); + + final Role role; + final PlayerDetails? player; + final String teamId; + final String image; + + @override + Widget build(BuildContext context) { + return FilledButton.tonal( + onPressed: () { + ScaffoldMessenger.of(context).showSnackBar( + removeFromTeam(role, player!.id, player!.name, teamId)); + }, + style: ButtonStyle( + backgroundColor: MaterialStateProperty.all( + Theme.of(context).colorScheme.inversePrimary), + ), + child: Flex( + direction: Axis.horizontal, + spacing: 5, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Flexible( + flex: 1, + child: SizedBox( + width: 15, + height: 15, + child: Image(image: AssetImage(image))), + ), + Expanded( + flex: 3, + child: Center( + child: Text( + player?.name ?? 'Unknown', + style: const TextStyle(fontWeight: FontWeight.bold), + ), + ), + ), + Flexible( + flex: 1, + child: Container( + width: 20, + )) + ]), + ); + } +} + class UnfilledRoleWidget extends StatelessWidget { const UnfilledRoleWidget({ super.key, @@ -137,10 +200,7 @@ class UnfilledRoleWidget extends StatelessWidget { padding: const EdgeInsets.all(4.0), child: Row(spacing: 5, children: [ SizedBox( - width: 15, - height: 15, - child: Image(image: AssetImage(image))), - // Text(role.toString()) + width: 15, height: 15, child: Image(image: AssetImage(image))) ]), )), ); @@ -163,23 +223,30 @@ class RoleFilledWidget extends StatelessWidget { @override Widget build(BuildContext context) { - return FilledButton( - onPressed: () { - ScaffoldMessenger.of(context).showSnackBar( - removeFromTeam(role, player!.id, player!.name, teamId)); - }, - child: SizedBox( - width: 150, - child: Padding( - padding: const EdgeInsets.all(4.0), - child: Row(spacing: 5, children: [ - SizedBox( - width: 15, - height: 15, - child: Image(image: AssetImage(image))), - Text(player?.name ?? 'Unknown') - ]), + return Flex( + direction: Axis.horizontal, + spacing: 5, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Flexible( + flex: 1, + child: SizedBox( + width: 15, height: 15, child: Image(image: AssetImage(image))), + ), + Expanded( + flex: 3, + child: Center( + child: Text( + player?.name ?? 'Unknown', + style: const TextStyle(fontWeight: FontWeight.bold), + ), + ), ), - )); + Flexible( + flex: 1, + child: Container( + width: 20, + )) + ]); } } diff --git a/lib/pages/intro/step_pages/login_to_discord.dart b/lib/pages/intro/step_pages/login_to_discord.dart index a86c260..45f922b 100644 --- a/lib/pages/intro/step_pages/login_to_discord.dart +++ b/lib/pages/intro/step_pages/login_to_discord.dart @@ -1,5 +1,6 @@ import 'package:animated_text_kit/animated_text_kit.dart'; import 'package:clashbot_flutter/stores/application_details.store.dart'; +import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:clashbot_flutter/styles.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; @@ -16,29 +17,29 @@ class LoginToDiscordWidget extends StatelessWidget { @override Widget build(BuildContext context) { - final appStore = context.read(); + final discordDetailsStore = context.read(); var dispose = when( (_) => - appStore.discordDetailsStore.userHasLoggedIn == true && - appStore.discordDetailsStore.discordGuilds.isNotEmpty, () { + discordDetailsStore.userHasLoggedIn == true && + discordDetailsStore.discordGuilds.isNotEmpty, () { callback(true); }); return Observer(builder: (_) { - return !appStore.discordDetailsStore.userHasLoggedIn + return !discordDetailsStore.userHasLoggedIn ? const AskToLogin() : Column( mainAxisAlignment: MainAxisAlignment.center, children: [ CircleAvatar( - backgroundImage: NetworkImage( - appStore.discordDetailsStore.discordUser.avatarURL), + backgroundImage: + NetworkImage(discordDetailsStore.discordUser.avatarURL), radius: 50, ), const SizedBox(height: 10), AnimatedTextKit( animatedTexts: [ TypewriterAnimatedText( - 'Welcome ${appStore.discordDetailsStore.discordUser.username}!', + 'Welcome ${discordDetailsStore.discordUser.username}!', textStyle: subHeaderStyle, speed: const Duration(milliseconds: 150), ), @@ -61,14 +62,14 @@ class AskToLogin extends StatelessWidget { @override Widget build(BuildContext context) { - final appStore = context.read(); + final discordDetailsStore = context.read(); return Observer(builder: (_) { return Column( mainAxisAlignment: MainAxisAlignment.center, children: [ const Text("Lets log you in to Discord!", style: subHeaderStyle), const SizedBox(height: 10), - !appStore.discordDetailsStore.loadingData + !discordDetailsStore.loadingData ? const LoginToDiscord() : ElevatedButton.icon( onPressed: null, @@ -88,10 +89,10 @@ class LoginToDiscord extends StatelessWidget { @override Widget build(BuildContext context) { - return Consumer( - builder: (context, appStore, child) => ElevatedButton( + return Consumer( + builder: (context, discordDetailsStore, child) => ElevatedButton( onPressed: () { - appStore.discordDetailsStore.fetchCurrentUserDetails(); + discordDetailsStore.fetchCurrentUserDetails(); }, child: const Text("Login to Discord"))); } diff --git a/lib/pages/intro/step_pages/select_servers.dart b/lib/pages/intro/step_pages/select_servers.dart index 9744e40..acfe651 100644 --- a/lib/pages/intro/step_pages/select_servers.dart +++ b/lib/pages/intro/step_pages/select_servers.dart @@ -1,7 +1,5 @@ -import 'dart:developer' as developer; - import 'package:clashbot_flutter/models/discord_guild.dart'; -import 'package:clashbot_flutter/stores/application_details.store.dart'; +import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:clashbot_flutter/stores/short-lived/selected_server_form.store.dart'; import 'package:clashbot_flutter/styles.dart'; import 'package:flutter/material.dart'; @@ -20,12 +18,11 @@ class ServerFormWidget extends StatelessWidget { @override Widget build(BuildContext context) { - final applicationDetailsStore = context.read(); + final discordDetailsStore = context.read(); return Observer( builder: (_) => ServerFormContent( - guilds: applicationDetailsStore.discordDetailsStore.discordGuilds, - guildMap: - applicationDetailsStore.discordDetailsStore.discordGuildMap, + guilds: discordDetailsStore.discordGuilds, + guildMap: discordDetailsStore.discordGuildMap, selectedServerFormStore: selectedServerFormStore, )); } @@ -86,7 +83,6 @@ class ServerChoiceChip extends StatefulWidget { class _ServerChoiceChipState extends State { @override Widget build(BuildContext context) { - ApplicationDetailsStore appStore = context.read(); return ChoiceChip( avatar: CircleAvatar( backgroundImage: NetworkImage(widget.guild.iconURL), @@ -107,14 +103,10 @@ class _ServerChoiceChipState extends State { if (selected && !widget.selectedServerFormStore.maxServersReached) { widget.selectedServerFormStore.addServer(widget.guild.id); - appStore.setPreferredServers( - widget.selectedServerFormStore.listOfSelectedServers); } else if (!selected && widget.selectedServerFormStore.listOfSelectedServers .contains(widget.guild.id)) { widget.selectedServerFormStore.removeServer(widget.guild.id); - appStore.setPreferredServers( - widget.selectedServerFormStore.listOfSelectedServers); } }); } diff --git a/lib/pages/intro/welcome_page.dart b/lib/pages/intro/welcome_page.dart index c927a34..3c9b900 100644 --- a/lib/pages/intro/welcome_page.dart +++ b/lib/pages/intro/welcome_page.dart @@ -7,6 +7,7 @@ import 'package:clashbot_flutter/pages/intro/step_pages/select_servers.dart'; import 'package:clashbot_flutter/pages/intro/step_pages/welcome.dart'; import 'package:clashbot_flutter/pages/intro/step_pages/what_is_clash.dart'; import 'package:clashbot_flutter/stores/application_details.store.dart'; +import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:clashbot_flutter/stores/short-lived/selected_server_form.store.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; @@ -131,17 +132,23 @@ class EndWelcomePageSessionButton extends StatelessWidget { @override Widget build(BuildContext context) { - return Consumer2(builder: (context, - ModelFirstTime modelFirstTime, - ApplicationDetailsStore appStore, - consChild) { + return Consumer3( + builder: (context, + ModelFirstTime modelFirstTime, + ApplicationDetailsStore appStore, + DiscordDetailsStore discordDetailsStore, + consChild) { return Observer(builder: (context) { return ElevatedButton.icon( onPressed: !selectedServerFormStore.ableToSubmit ? null : () { selectedServerFormStore.submittingForm(); - appStore.createUser().then((value) { + appStore + .createUser(discordDetailsStore.discordUser.id, + selectedServerFormStore.listOfSelectedServers) + .then((value) { modelFirstTime.visited = true; context.goNamed('home'); }).catchError((error) { diff --git a/lib/services/clashbot_events_service.dart b/lib/services/clashbot_events_service.dart index 4a6ad32..99fd16b 100644 --- a/lib/services/clashbot_events_service.dart +++ b/lib/services/clashbot_events_service.dart @@ -25,12 +25,8 @@ class ClashBotEventsService { onConnect: (p0) => onConnect(), connectionTimeout: const Duration(seconds: 20), beforeConnect: () async { - developer.log('waiting to connect...'); await Future.delayed(Duration(milliseconds: 200)); - developer.log('connecting...'); }, - onDebugMessage: (p0) => developer.log("Debug $p0"), - onStompError: (p0) => developer.log("Error $p0"), onWebSocketError: (error) => onError(error), ), ); @@ -40,7 +36,6 @@ class ClashBotEventsService { void setupSubscription(String loggedInUserId, String serverId, Function notifyUser, DiscordDetailsStore detailsStore) { - developer.log("Subscribing to $serverId..."); if (null != stompClient && stompClient!.connected) { openConnections.putIfAbsent( serverId, @@ -48,7 +43,6 @@ class ClashBotEventsService { destination: '/topic/server/$serverId', callback: (frame) { Event? result = Event.fromJson(json.decode(frame.body!)); - developer.log("Event recieved $result"); var discordId = result?.causedBy ?? ''; var username = detailsStore.discordIdToName[discordId]; if (isNull(username)) { @@ -57,7 +51,6 @@ class ClashBotEventsService { } switch (result!.teamEvent.eventType) { case EventType.CREATED: - developer.log("${result.teamEvent.eventType} triggered."); String message = ''; if (null != result.teamEvent.team) { // clashPlayerStore.updateClashTeam( @@ -106,7 +99,6 @@ class ClashBotEventsService { DateTime.now())); break; case EventType.JOINED: - developer.log("${result.teamEvent.eventType} triggered."); String message = ''; if (null != result.teamEvent.team) { // clashPlayerStore.updateClashTeam( @@ -131,7 +123,6 @@ class ClashBotEventsService { DateTime.now())); break; case EventType.REMOVED: - developer.log("${result.teamEvent.eventType} triggered."); String message = ''; if (null != result.teamEvent.team) { // clashPlayerStore.updateClashTeam( @@ -156,7 +147,6 @@ class ClashBotEventsService { DateTime.now())); break; case EventType.DELETED: - developer.log("Delete Event triggered."); String message = ''; if (null != result.teamEvent.team) { // clashPlayerStore.removeClashTeams( @@ -180,7 +170,6 @@ class ClashBotEventsService { DateTime.now())); break; default: - developer.log("Unknown event type occurred."); throw Error(message: "Unknown event type occurred."); } })); @@ -191,7 +180,6 @@ class ClashBotEventsService { var unsubscribe = openConnections[serverId]; if (null != unsubscribe) { unsubscribe(unsubscribeHeaders: {}); - developer.log("Unsubscribed from $serverId."); openConnections.remove(serverId); } } diff --git a/lib/stores/application_details.store.dart b/lib/stores/application_details.store.dart index 723f197..1d4c4a4 100644 --- a/lib/stores/application_details.store.dart +++ b/lib/stores/application_details.store.dart @@ -1,66 +1,53 @@ -import 'dart:convert'; -import 'dart:math'; - import 'package:clash_bot_api/api.dart'; -import 'package:clashbot_flutter/globals/global_settings.dart'; import 'package:clashbot_flutter/models/clash_notification.dart'; -import 'package:clashbot_flutter/models/clash_tournament.dart'; import 'package:clashbot_flutter/models/clashbot_user.dart'; -import 'package:clashbot_flutter/models/discord_guild.dart'; -import 'package:clashbot_flutter/models/discord_user.dart'; -import 'package:clashbot_flutter/models/model_first_time.dart'; -import 'package:clashbot_flutter/services/clashbot_events_service.dart'; import 'package:clashbot_flutter/services/clashbot_service.dart'; -import 'package:clashbot_flutter/services/discord_service.dart'; -import 'package:clashbot_flutter/services/riot_resources_service.dart'; import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:clashbot_flutter/stores/riot_champion.store.dart'; +import 'package:clashbot_flutter/stores/v2-stores/clash.store.dart'; +import 'package:clashbot_flutter/stores/v2-stores/error_handler.store.dart'; import 'package:collection/collection.dart'; -import 'package:flutter/widgets.dart'; -import 'package:http/http.dart'; import 'package:mobx/mobx.dart'; -import 'package:oauth2_client/oauth2_helper.dart'; -import 'package:shared_preferences/shared_preferences.dart'; import 'dart:developer' as developer; part 'application_details.store.g.dart'; -class ApplicationDetailsStore extends _ApplicationDetailsStore - with _$ApplicationDetailsStore { - ApplicationDetailsStore( - DiscordService discordService, - ClashBotService clashBotService, - RiotResourcesService riotResourcesService, - ClashBotEventsService clashBotEventsService) - : super(discordService, clashBotService, riotResourcesService, - clashBotEventsService) { - discordDetailsStore = DiscordDetailsStore(_discordService, this); - riotChampionStore = RiotChampionStore(_riotResourcesService, this); - } -} +class ApplicationDetailsStore = _ApplicationDetailsStore + with _$ApplicationDetailsStore; abstract class _ApplicationDetailsStore with Store { - late DiscordDetailsStore discordDetailsStore; - final DiscordService _discordService; - final ClashBotService _clashBotService; - late RiotChampionStore riotChampionStore; - final RiotResourcesService _riotResourcesService; - final ClashBotEventsService _clashBotEventsService; - _ApplicationDetailsStore(this._discordService, this._clashBotService, - this._riotResourcesService, this._clashBotEventsService) { - reaction((_) => id, (_) { - if (id != '0') { - refreshClashBotUser(); - refreshSelectedServers(); + late DiscordDetailsStore _discordDetailsStore; + late RiotChampionStore _riotChampionStore; + final ClashStore _clashStore; + final ErrorHandlerStore _errorHandlerStore; + _ApplicationDetailsStore(this._clashStore, this._discordDetailsStore, + this._riotChampionStore, this._errorHandlerStore) { + reaction((_) => _discordDetailsStore.discordUser, (_) { + if (_discordDetailsStore.discordUser.id != '0') { + _clashStore.refreshClashBotUser(_discordDetailsStore.discordUser.id); + _discordDetailsStore.fetchUserGuilds(); + } + }); + reaction((_) => _clashStore.clashBotUser, (_) { + if (_clashStore.clashBotUser.discordId != '0' && + !_clashStore.refreshingUser) { + _clashStore + .refreshClashTournaments(_clashStore.clashBotUser.discordId!); + _clashStore.refreshClashTeams(_clashStore.clashBotUser.discordId!, + _clashStore.clashBotUser.selectedServers); } }); } @observable - String id = '0'; + ClashBotUser clashBotUser = ClashBotUser(); @observable - ClashBotUser clashBotUser = ClashBotUser(); + ObservableList notifications = ObservableList(); + + @computed + bool get isLoggedIn => + _discordDetailsStore.userHasLoggedIn && clashBotUser.discordId != '0'; // Create map of String to subscription @computed @@ -71,35 +58,13 @@ abstract class _ApplicationDetailsStore with Store { value: (e) => e as Subscription, )); - @observable - ObservableList preferredServers = ObservableList(); - @computed ObservableList get sortedSelectedServers => ObservableList.of(clashBotUser.selectedServers.sorted()); - @action - void setPreferredServers(List servers) { - preferredServers = ObservableList.of(servers); - } - - @action - Future refreshSelectedServers() async { - preferredServers.clear(); - var userDetails = await _clashBotService.getPlayer(id); - preferredServers = ObservableList.of(userDetails.selectedServers); - } - - @action - Future refreshClashBotUser() async { - clashBotUser = await _clashBotService.getPlayer(id); - } - - @observable - String error = ''; - - @observable - ObservableList notifications = ObservableList(); + @computed + ObservableList get preferredServers => + ObservableList.of(clashBotUser.selectedServers); @computed List get sortedNotifications => @@ -109,13 +74,9 @@ abstract class _ApplicationDetailsStore with Store { List get unreadNotifications => notifications.where((notification) => !notification.read).toList(); - @computed - bool get isLoggedIn => - discordDetailsStore.userHasLoggedIn && clashBotUser.discordId != '0'; - @action - void triggerError(String errorMessage) { - error = errorMessage; + void refreshDiscordUser() { + _discordDetailsStore.fetchCurrentUserDetails(); } @action @@ -144,17 +105,15 @@ abstract class _ApplicationDetailsStore with Store { } @action - Future createUser() async { + Future createUser(String id, List preferredServers) async { try { - clashBotUser = await _clashBotService.createPlayer( - id, discordDetailsStore.discordUser.username, preferredServers.first); - var updatedSelectedServers = - await _clashBotService.createSelectedServers(id, preferredServers); - clashBotUser.selectedServers = updatedSelectedServers; - return clashBotUser; + _clashStore.createPlayer(id, _discordDetailsStore.discordUser.username, + preferredServers.first); + _clashStore.createSelectedServers(id, preferredServers); + _clashStore.refreshClashBotUser(id); } on Exception catch (issue) { - error = 'Failed to create new Clash Bot User, please try again.'; - developer.log('Failed to create new Clash Bot User', error: issue); + _errorHandlerStore.errorMessage = + 'Failed to create new Clash Bot User, please try again.'; rethrow; } } diff --git a/lib/stores/discord_details.store.dart b/lib/stores/discord_details.store.dart index e528822..434f75a 100644 --- a/lib/stores/discord_details.store.dart +++ b/lib/stores/discord_details.store.dart @@ -3,24 +3,17 @@ import 'dart:async'; import 'package:clashbot_flutter/models/discord_guild.dart'; import 'package:clashbot_flutter/models/discord_user.dart'; import 'package:clashbot_flutter/services/discord_service.dart'; +import 'package:clashbot_flutter/stores/v2-stores/error_handler.store.dart'; import 'package:mobx/mobx.dart'; -import 'application_details.store.dart'; part 'discord_details.store.g.dart'; class DiscordDetailsStore = _DiscordDetailsStore with _$DiscordDetailsStore; abstract class _DiscordDetailsStore with Store { final DiscordService _discordService; - final ApplicationDetailsStore _applicationDetailsStore; - _DiscordDetailsStore(this._discordService, this._applicationDetailsStore) { - reaction((_) => _applicationDetailsStore.id, (_) { - if (_applicationDetailsStore.id != '0' || - _applicationDetailsStore.id.isNotEmpty) { - fetchUserGuilds(); - } - }); - } + final ErrorHandlerStore _errorHandlerStore; + _DiscordDetailsStore(this._discordService, this._errorHandlerStore); @observable DiscordUser discordUser = DiscordUser('0', 'Not Logged In', 'N/A', ''); @@ -48,18 +41,17 @@ abstract class _DiscordDetailsStore with Store { {for (var guild in discordGuilds) guild.id: guild}; @action - Future fetchUserDetails(String discordId) async { + Future fetchUserDetails(String discordId) async { callsInProgress.add('fetchUserDetails'); var foundUser; try { foundUser = await _discordService.fetchUserDetails(discordId); discordIdToName.putIfAbsent(discordId, () => foundUser.username); } on Exception catch (error) { - _applicationDetailsStore.error = + _errorHandlerStore.errorMessage = 'Failed to fetch Discord User details due to ${error.toString()}'; } callsInProgress.remove('fetchUserDetails'); - return foundUser; } @action @@ -68,11 +60,10 @@ abstract class _DiscordDetailsStore with Store { final future = _discordService.fetchCurrentUserDetails(); try { DiscordUser updatedUser = await future; - discordUser = updatedUser; - _applicationDetailsStore.id = discordUser.id; + discordUser = updatedUser.copy(); discordIdToName.putIfAbsent(updatedUser.id, () => updatedUser.username); } on Exception catch (error) { - _applicationDetailsStore.error = + _errorHandlerStore.errorMessage = 'Failed to fetch Discord User details due to ${error.toString()}'; } callsInProgress.remove('fetchCurrentUserDetails'); @@ -87,7 +78,7 @@ abstract class _DiscordDetailsStore with Store { discordGuilds.clear(); discordGuilds.addAll(guilds); } on Exception catch (error) { - _applicationDetailsStore.error = error.toString(); + _errorHandlerStore.errorMessage = error.toString(); } callsInProgress.remove('fetchUserGuilds'); } diff --git a/lib/stores/discordoauth2.store.dart b/lib/stores/discordoauth2.store.dart index d3a541a..cce3731 100644 --- a/lib/stores/discordoauth2.store.dart +++ b/lib/stores/discordoauth2.store.dart @@ -19,10 +19,9 @@ part 'discordoauth2.store.g.dart'; class DiscordOAuth2Store = _DiscordOAuth2Store with _$DiscordOAuth2Store; abstract class _DiscordOAuth2Store with Store { - @observable DiscordUser currentUser = new DiscordUser('0', 'Not Logged In', 'N/A', ''); - + @observable List usersGuilds = []; @@ -42,46 +41,50 @@ abstract class _DiscordOAuth2Store with Store { @action void setOAuth2Helper(OAuth2Helper oAuth2Helper) { - developer.log("SettingOAuth2Helper..."); this.oAuth2Helper = oAuth2Helper; } @observable - ObservableFuture discordUserFuture = ObservableFuture.value(new DiscordUser('0', 'Not Logged In', 'N/A', '')); + ObservableFuture discordUserFuture = + ObservableFuture.value(new DiscordUser('0', 'Not Logged In', 'N/A', '')); @observable - ObservableFuture> discordGuildsFuture = ObservableFuture.value([]); + ObservableFuture> discordGuildsFuture = + ObservableFuture.value([]); @computed bool get userDetailsReady => - discordUserFuture != ObservableFuture.value(new DiscordUser('0', 'Not Logged In', 'N/A', '')) && + discordUserFuture != + ObservableFuture.value( + new DiscordUser('0', 'Not Logged In', 'N/A', '')) && discordUserFuture.status == FutureStatus.fulfilled; @action Future fetchCurrentUserDetails() async { final future = oAuth2Helper?.get( - AppGlobalSettings.apiEndpointURL + AppGlobalSettings.API_DISCORD_GET_CURRENT_USER, - headers: { - 'Content-Type': 'application/x-www-form-urlencoded' - } - ).then((value) => DiscordUser.fromJson(value.body)); + AppGlobalSettings.apiEndpointURL + + AppGlobalSettings.API_DISCORD_GET_CURRENT_USER, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + }).then((value) => DiscordUser.fromJson(value.body)); if (future != null) { discordUserFuture = ObservableFuture(future); return currentUser = await future; } - return ObservableFuture.value(new DiscordUser('0', 'Not Logged In', 'N/A', '')); + return ObservableFuture.value( + new DiscordUser('0', 'Not Logged In', 'N/A', '')); } @action Future> fetchUserGuilds() async { final future = oAuth2Helper?.get( - AppGlobalSettings.apiEndpointURL + AppGlobalSettings.API_DISCORD_GET_CURRENT_USER_GUILDS, - headers: { - 'Content-Type': 'application/x-www-form-urlencoded' - } - ).then((value) { + AppGlobalSettings.apiEndpointURL + + AppGlobalSettings.API_DISCORD_GET_CURRENT_USER_GUILDS, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + }).then((value) { Iterable l = jsonDecode(value.body); return List.from(l.map((model) { return DiscordGuild.fromMap(model); @@ -121,4 +124,4 @@ abstract class _DiscordOAuth2Store with Store { void setUserOAuth2ReponseURL(String url) { userOAuth2ReponseURL = url; } -} \ No newline at end of file +} diff --git a/lib/stores/riot_champion.store.dart b/lib/stores/riot_champion.store.dart index 0a3c69b..bcef7c3 100644 --- a/lib/stores/riot_champion.store.dart +++ b/lib/stores/riot_champion.store.dart @@ -1,25 +1,16 @@ import 'package:clashbot_flutter/models/lol_champion.dart'; import 'package:clashbot_flutter/services/riot_resources_service.dart'; import 'package:clashbot_flutter/stores/application_details.store.dart'; +import 'package:clashbot_flutter/stores/v2-stores/error_handler.store.dart'; import 'package:mobx/mobx.dart'; part 'riot_champion.store.g.dart'; -class RiotChampionStore extends _RiotChampionStoreBase - with _$RiotChampionStore { - RiotChampionStore(RiotResourcesService riotResourcesService, - ApplicationDetailsStore applicationDetailsStore) - : super(riotResourcesService, applicationDetailsStore); -} +class RiotChampionStore = _RiotChampionStore with _$RiotChampionStore; -abstract class _RiotChampionStoreBase with Store { - ApplicationDetailsStore _applicationDetailsStore; +abstract class _RiotChampionStore with Store { RiotResourcesService _riotResourcesService; - _RiotChampionStoreBase( - this._riotResourcesService, this._applicationDetailsStore) { - reaction((_) => _applicationDetailsStore.id, (_) { - refreshChampionData(); - }); - } + ErrorHandlerStore _errorHandlerStore; + _RiotChampionStore(this._riotResourcesService, this._errorHandlerStore); @observable LoLChampionsData lChampionsData = LoLChampionsData(); diff --git a/lib/stores/v2-stores/clash.store.dart b/lib/stores/v2-stores/clash.store.dart index dda0800..673e34b 100644 --- a/lib/stores/v2-stores/clash.store.dart +++ b/lib/stores/v2-stores/clash.store.dart @@ -1,11 +1,11 @@ +import 'package:clash_bot_api/api.dart'; import 'package:clashbot_flutter/models/clash_team.dart'; import 'package:clashbot_flutter/models/clash_tournament.dart'; -import 'package:clashbot_flutter/models/discord_guild.dart'; -import 'package:clashbot_flutter/models/user.dart'; +import 'package:clashbot_flutter/models/clashbot_user.dart'; import 'package:clashbot_flutter/pages/home/page/home_v2.dart'; import 'package:clashbot_flutter/services/clashbot_service.dart'; import 'package:clashbot_flutter/stores/application_details.store.dart'; -import 'package:clashbot_flutter/stores/discord_details.store.dart'; +import 'package:clashbot_flutter/stores/v2-stores/error_handler.store.dart'; import 'package:mobx/mobx.dart'; import 'dart:developer' as developer; @@ -17,25 +17,37 @@ class ClashStore = _ClashStore with _$ClashStore; abstract class _ClashStore with Store { final ClashBotService _clashService; - final ApplicationDetailsStore _applicationDetailsStore; + final ErrorHandlerStore _errorhandlerStore; - _ClashStore(this._clashService, this._applicationDetailsStore) { - reaction((_) => _applicationDetailsStore.id, (_) { - refreshClashTournaments(); - }); - reaction((_) => _applicationDetailsStore.preferredServers, (_) { - resetSelectedServers(); - refreshClashTeams(); - }); - } + _ClashStore(this._clashService, this._errorhandlerStore); + + @observable + ClashBotUser clashBotUser = ClashBotUser(); @observable ObservableList selectedServers = ObservableList(); + @observable + bool filterByDay = false; + + @observable + DateTime filterDate = DateTime.now(); + + @observable + ObservableList tournaments = ObservableList(); + + @observable + ObservableList clashTeams = ObservableList(); + + @observable + bool refreshingUser = false; + @action - void resetSelectedServers() { - selectedServers = - ObservableList.of(_applicationDetailsStore.preferredServers); + Future refreshClashBotUser(String id) async { + refreshingUser = true; + clashBotUser = await _clashService.getPlayer(id); + setSelectedServer(clashBotUser.selectedServers); + refreshingUser = false; } @action @@ -45,10 +57,7 @@ abstract class _ClashStore with Store { @action void addSelectedServer(String server) { - if (_applicationDetailsStore.preferredServers.contains(server) && - !selectedServers.contains(server)) { - selectedServers.add(server); - } + selectedServers.add(server); } @action @@ -56,8 +65,8 @@ abstract class _ClashStore with Store { selectedServers.remove(server); } - @observable - bool filterByDay = false; + @computed + bool get canCreateTeam => filterByDay; @action void turnOnDayFilter() { @@ -69,17 +78,11 @@ abstract class _ClashStore with Store { filterByDay = false; } - @observable - DateTime filterDate = DateTime.now(); - @action void setFilterDate(DateTime date) { filterDate = date; } - @observable - ObservableList tournaments = ObservableList(); - @computed Map> get tournamentsByNameAndDay { Map> tournamentsByNameAndDay = {}; @@ -94,9 +97,6 @@ abstract class _ClashStore with Store { return tournamentsByNameAndDay; } - @observable - ObservableList clashTeams = ObservableList(); - @computed Map> get tournamentsToTeams { Map> tournamentsToTeams = {}; @@ -115,25 +115,24 @@ abstract class _ClashStore with Store { get tournamentsToTeamsFilteredToADayIfActive { Map> ogTeams = tournamentsToTeams; if (filterByDay) { - developer.log("Filtering by day"); - ogTeams = ogTeams.map((key, value) { + var teamy = ogTeams.map((key, value) { return MapEntry( key, value.where((team) { return isSameDay(key.startTime, filterDate); }).toList()); }); + return teamy; } - developer.log("Not filtering by day"); return ogTeams; } @computed - ObservableList get events { - List events = []; + ObservableList get events { + List events = []; for (var entry in tournamentsToTeams.entries) { for (var team in entry.value) { - events.add(Event( + events.add(HomeEvent( date: entry.key.startTime, title: '${entry.key.tournamentName} ${entry.key.tournamentDay}', description: "An event", @@ -150,18 +149,44 @@ abstract class _ClashStore with Store { } @action - Future refreshClashTournaments() async { - tournaments = ObservableList.of( - await _clashService.retrieveTournaments(_applicationDetailsStore.id)); + Future refreshClashTournaments(String id) async { + tournaments = + ObservableList.of(await _clashService.retrieveTournaments(id)); } @action - Future refreshClashTeams() async { - var futureClashTeams = await _clashService.getClashTeams( - _applicationDetailsStore.id, _applicationDetailsStore.preferredServers); + Future refreshClashTeams( + String id, List preferredServers) async { + var futureClashTeams = + await _clashService.getClashTeams(id, preferredServers); clashTeams = ObservableList.of(futureClashTeams); } + @action + Future createTeam(String id, String name, Role role, + ClashTournament clashTournament, String serverId) async { + await _clashService.createClashTeam( + id, + name, + role, + clashTournament.tournamentName, + clashTournament.tournamentDay, + serverId); + refreshClashTeams(id, selectedServers); + } + + @action + Future createPlayer( + String id, String username, String preferredServers) async { + await _clashService.createPlayer(id, username, preferredServers); + } + + @action + Future createSelectedServers( + String id, List preferredServers) async { + await _clashService.createSelectedServers(id, preferredServers); + } + DateTime roundUpToEndOfDay(DateTime date) { return DateTime(date.year, date.month, date.day, 23, 59, 59); } diff --git a/lib/stores/v2-stores/error_handler.store.dart b/lib/stores/v2-stores/error_handler.store.dart new file mode 100644 index 0000000..9d5caaa --- /dev/null +++ b/lib/stores/v2-stores/error_handler.store.dart @@ -0,0 +1,20 @@ +import 'package:mobx/mobx.dart'; + +part 'error_handler.store.g.dart'; + +class ErrorHandlerStore = _ErrorHandlerStore with _$ErrorHandlerStore; + +abstract class _ErrorHandlerStore with Store { + @observable + String errorMessage = ''; + + @action + void setErrorMessage(String message) { + errorMessage = message; + } + + @action + void clearErrorMessage() { + errorMessage = ''; + } +} diff --git a/lib/storybook_main.dart b/lib/storybook_main.dart new file mode 100644 index 0000000..a95a21b --- /dev/null +++ b/lib/storybook_main.dart @@ -0,0 +1,225 @@ +import 'package:clash_bot_api/api.dart'; +import 'package:clashbot_flutter/globals/global_settings.dart'; +import 'package:clashbot_flutter/models/clash_team.dart'; +import 'package:clashbot_flutter/models/clash_tournament.dart'; +import 'package:clashbot_flutter/models/clashbot_user.dart'; +import 'package:clashbot_flutter/models/discord_guild.dart'; +import 'package:clashbot_flutter/models/discord_user.dart'; +import 'package:clashbot_flutter/pages/home/page/widgets/team_card.dart'; +import 'package:clashbot_flutter/services/clashbot_service_impl.dart'; +import 'package:clashbot_flutter/services/discord_service_impl.dart'; +import 'package:clashbot_flutter/services/riot_resources_service_impl.dart'; +import 'package:clashbot_flutter/stores/application_details.store.dart'; +import 'package:clashbot_flutter/stores/discord_details.store.dart'; +import 'package:clashbot_flutter/stores/riot_champion.store.dart'; +import 'package:clashbot_flutter/stores/v2-stores/clash.store.dart'; +import 'package:clashbot_flutter/stores/v2-stores/error_handler.store.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:storybook_flutter/storybook_flutter.dart'; + +class MockApplicationDetailsStore extends ApplicationDetailsStore { + MockApplicationDetailsStore( + ClashBotUser mockClashBotUser, + super._clashStore, + super._discordDetailsStore, + super._riotChampionStore, + super._errorHandlerStore); + + @override + ClashBotUser get clashBotUser => ClashBotUser( + discordId: '123456789', + champions: [], + role: Role.TOP, + serverId: 'server1', + selectedServers: [ + 'server1', + ], + preferredServers: ['server1', 'server2'], + ); +} + +class MockDiscordDetailsStore extends DiscordDetailsStore { + MockDiscordDetailsStore(List guilds, DiscordUser user, + super.discordService, super._errorHandlerStore); +} + +class MockClashStore extends ClashStore { + MockClashStore( + ClashBotUser clashBotUser, + List tournaments, + List clashTeams, + super._clashService, + super._errorhandlerStore); +} + +class MockRiotChampionStore extends RiotChampionStore { + MockRiotChampionStore(super._riotResourcesService, super._errorHandlerStore); +} + +void main() { + var loggedInUserId = '123456789'; + var clashUser = ClashBotUser( + discordId: loggedInUserId, + champions: [], + role: Role.TOP, + serverId: 'server1', + selectedServers: [ + 'server1', + ], + preferredServers: ['server1', 'server2'], + ); + var guilds = [ + DiscordGuild('1', 'Mock Guild 1', '123456789', false), + DiscordGuild('2', 'Mock Guild 2', '123456789', false), + ]; + var tournaments = [ + ClashTournament('1', 'Mock Tournament 1', DateTime.now(), DateTime.now()), + ClashTournament('2', 'Mock Tournament 2', DateTime.now(), DateTime.now()), + ]; + var clashTeams = [ + ClashTeam( + '1', + 'Mock Team 1', + tournaments[0].tournamentName, + tournaments[0].tournamentDay, + { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.SUPP: PlayerDetails('5', 'Player 5', []), + }, + '123456789', + DateTime.now(), + ), + ClashTeam( + '2', + 'Mock Team 2', + tournaments[0].tournamentName, + tournaments[0].tournamentDay, + { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.SUPP: PlayerDetails('5', 'Player 5', []), + }, + '123456789', + DateTime.now(), + ), + ]; + var discordUser = DiscordUser( + loggedInUserId, 'mock_username', '123456789', "mock_discriminator"); + runApp(MultiProvider(providers: [ + Provider(create: (_) => ApiClient(basePath: "http://localhost")), + Provider(create: (_) => ErrorHandlerStore()), + ProxyProvider( + update: (_, errorHandlerStore, __) { + return MockDiscordDetailsStore(guilds, discordUser, + DiscordServiceImpl(setupOauth2Helper()), errorHandlerStore); + }), + ProxyProvider( + update: (_, errorHandlerStore, __) => MockRiotChampionStore( + RiotResourceServiceImpl(), errorHandlerStore)), + ProxyProvider2( + update: (_, errorHandlerStore, apiClient, __) => MockClashStore( + clashUser, + tournaments, + clashTeams, + ClashBotServiceImpl( + UserApi(apiClient), + TeamApi(apiClient), + ChampionsApi(apiClient), + SubscriptionApi(apiClient), + TentativeApi(apiClient), + TournamentApi(apiClient)), + errorHandlerStore)), + ProxyProvider4( + update: (_, clashStore, errorHandlerStore, discordDetailsStore, + riotChampionStore, __) => + MockApplicationDetailsStore(clashUser, clashStore, + discordDetailsStore, riotChampionStore, errorHandlerStore)), + ], child: ClashBotStorybookApp())); +} + +class ClashBotStorybookApp extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Storybook(initialStory: "4Filled", stories: [ + Story( + name: "4Filled", + description: "A card for displaying team information", + builder: (context) { + return TeamCard( + team: ClashTeam( + '1', + 'Mock Team', + 'Tournament 1', + '1', + () { + switch (context.knobs + .text(label: '# of missing roles', initial: '0')) { + case '0': + return { + Role.TOP: PlayerDetails('123456789', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.BOT: PlayerDetails('5', 'Player 4', []), + Role.SUPP: PlayerDetails('5', 'Player 5', []), + }; + case '1': + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.BOT: PlayerDetails('5', 'Player 4', []), + Role.SUPP: null, + }; + case '2': + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.BOT: null, + Role.SUPP: null, + }; + case '3': + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.JG: null, + Role.BOT: null, + Role.SUPP: null, + }; + case '4': + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: null, + Role.MID: null, + Role.BOT: null, + Role.SUPP: null, + }; + case '5': + return { + Role.TOP: null, + Role.JG: null, + Role.MID: null, + Role.BOT: null, + Role.SUPP: null, + }; + default: + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.SUPP: PlayerDetails('5', 'Player 5', []), + }; + } + }(), + '123456789', + DateTime.now(), + )); + }) + ]); + } +} diff --git a/pubspec.lock b/pubspec.lock index ccafc07..9f0472b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1020,10 +1020,10 @@ packages: dependency: "direct main" description: name: storybook_flutter - sha256: "0ef97a82741e12734af3c104ef6c913af1ed808756214d23bff2bd115e547887" + sha256: "68f07d2caf16bd34e9cfbc479d60298a6568abfac552ea1998ef724344c6cc13" url: "https://pub.dev" source: hosted - version: "0.12.0" + version: "0.14.1" stream_channel: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 25e0036..e7ba381 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -49,7 +49,7 @@ dependencies: clash_bot_api: path: clash-bot-api animated_text_kit: ^4.2.2 - storybook_flutter: ^0.12.0 + storybook_flutter: ^0.14.1 validators: ^3.0.0 retry: ^3.1.1 stomp_dart_client: ^0.4.4 diff --git a/test/widget/clash_notification_test.dart b/test/widget/clash_notification_test.dart deleted file mode 100644 index 76c212b..0000000 --- a/test/widget/clash_notification_test.dart +++ /dev/null @@ -1,70 +0,0 @@ -import 'package:clashbot_flutter/globals/color_schemes.dart'; -import 'package:clashbot_flutter/main.dart'; -import 'package:clashbot_flutter/models/clash_notification.dart'; -import 'package:clashbot_flutter/models/discord_guild.dart'; -import 'package:clashbot_flutter/stores/application_details.store.dart'; -import 'package:clashbot_flutter/stores/discord_details.store.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:golden_toolkit/golden_toolkit.dart'; -import 'package:mockito/annotations.dart'; -import 'package:mockito/mockito.dart'; -import 'package:provider/provider.dart'; -import 'clash_notification_test.mocks.dart'; - -@GenerateMocks([ApplicationDetailsStore, DiscordDetailsStore]) -void main() { - testGoldens('Clash Bot Notifications - Golden', (WidgetTester tester) async { - final mockAppStore = MockApplicationDetailsStore(); - final mockDetailsStore = MockDiscordDetailsStore(); - when(mockDetailsStore.discordGuildMap) - .thenReturn(Map.of({"serverId": DiscordGuild("serverId", "Goon Squad", "", false)})); - when(mockAppStore.discordDetailsStore) - .thenReturn(mockDetailsStore); - if (const bool.fromEnvironment("LoadFont")) { - await loadAppFonts(); - } - final builder = GoldenBuilder.column() - ..addScenario( - 'Simple', - SizedBox( - width: 500, - height: 500, - child: MaterialApp( - themeMode: ThemeMode.dark, - debugShowCheckedModeBanner: false, - darkTheme: ThemeData( - brightness: Brightness.dark, - colorScheme: darkColorScheme, - useMaterial3: true, - snackBarTheme: SnackBarThemeData( - behavior: SnackBarBehavior.floating, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10.0), - ), - )), - home: const Scaffold( - body: ClashBotNotificationsWidget(), - ), - ), - )); - await tester.pumpWidgetBuilder(Builder( - builder: (context) { - when(mockAppStore.sortedNotifications) - .thenAnswer((_) => [ - ClashNotification("uuid", false, "Has created a Team New Team", "Roidrage", "serverId", DateTime.now()), - ClashNotification("uuid", true, "message", "Some one", "serverId", DateTime.now()), - ClashNotification("uuid", false, "message", "Shiragaku", "serverId", DateTime.now()) - ]); - return MultiProvider( - providers: [ - Provider(create: (_) => mockAppStore), - ], - child: builder.build()); - } - )); - await tester.tap(find.byType(Icon)); - await screenMatchesGolden(tester, 'clash_bot_notification'); - }); -} diff --git a/test/widget/clash_notification_test.mocks.dart b/test/widget/clash_notification_test.mocks.dart deleted file mode 100644 index e76ef32..0000000 --- a/test/widget/clash_notification_test.mocks.dart +++ /dev/null @@ -1,537 +0,0 @@ -// Mocks generated by Mockito 5.4.5 from annotations -// in clashbot_flutter/test/widget/clash_notification_test.dart. -// Do not manually edit this file. - -// ignore_for_file: no_leading_underscores_for_library_prefixes -import 'dart:async' as _i11; - -import 'package:clash_bot_api/api.dart' as _i10; -import 'package:clashbot_flutter/models/clash_notification.dart' as _i9; -import 'package:clashbot_flutter/models/clashbot_user.dart' as _i4; -import 'package:clashbot_flutter/models/discord_guild.dart' as _i12; -import 'package:clashbot_flutter/models/discord_user.dart' as _i6; -import 'package:clashbot_flutter/stores/application_details.store.dart' as _i7; -import 'package:clashbot_flutter/stores/discord_details.store.dart' as _i2; -import 'package:clashbot_flutter/stores/riot_champion.store.dart' as _i3; -import 'package:mobx/mobx.dart' as _i5; -import 'package:mockito/mockito.dart' as _i1; -import 'package:mockito/src/dummies.dart' as _i8; - -// ignore_for_file: type=lint -// ignore_for_file: avoid_redundant_argument_values -// ignore_for_file: avoid_setters_without_getters -// ignore_for_file: comment_references -// ignore_for_file: deprecated_member_use -// ignore_for_file: deprecated_member_use_from_same_package -// ignore_for_file: implementation_imports -// ignore_for_file: invalid_use_of_visible_for_testing_member -// ignore_for_file: must_be_immutable -// ignore_for_file: prefer_const_constructors -// ignore_for_file: unnecessary_parenthesis -// ignore_for_file: camel_case_types -// ignore_for_file: subtype_of_sealed_class - -class _FakeDiscordDetailsStore_0 extends _i1.SmartFake - implements _i2.DiscordDetailsStore { - _FakeDiscordDetailsStore_0( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -class _FakeRiotChampionStore_1 extends _i1.SmartFake - implements _i3.RiotChampionStore { - _FakeRiotChampionStore_1( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -class _FakeClashBotUser_2 extends _i1.SmartFake implements _i4.ClashBotUser { - _FakeClashBotUser_2( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -class _FakeObservableList_3 extends _i1.SmartFake - implements _i5.ObservableList { - _FakeObservableList_3( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -class _FakeObservableMap_4 extends _i1.SmartFake - implements _i5.ObservableMap { - _FakeObservableMap_4( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -class _FakeReactiveContext_5 extends _i1.SmartFake - implements _i5.ReactiveContext { - _FakeReactiveContext_5( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -class _FakeDiscordUser_6 extends _i1.SmartFake implements _i6.DiscordUser { - _FakeDiscordUser_6( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -/// A class which mocks [ApplicationDetailsStore]. -/// -/// See the documentation for Mockito's code generation for more information. -class MockApplicationDetailsStore extends _i1.Mock - implements _i7.ApplicationDetailsStore { - MockApplicationDetailsStore() { - _i1.throwOnMissingStub(this); - } - - @override - _i2.DiscordDetailsStore get discordDetailsStore => (super.noSuchMethod( - Invocation.getter(#discordDetailsStore), - returnValue: _FakeDiscordDetailsStore_0( - this, - Invocation.getter(#discordDetailsStore), - ), - ) as _i2.DiscordDetailsStore); - - @override - set discordDetailsStore(_i2.DiscordDetailsStore? _discordDetailsStore) => - super.noSuchMethod( - Invocation.setter( - #discordDetailsStore, - _discordDetailsStore, - ), - returnValueForMissingStub: null, - ); - - @override - _i3.RiotChampionStore get riotChampionStore => (super.noSuchMethod( - Invocation.getter(#riotChampionStore), - returnValue: _FakeRiotChampionStore_1( - this, - Invocation.getter(#riotChampionStore), - ), - ) as _i3.RiotChampionStore); - - @override - set riotChampionStore(_i3.RiotChampionStore? _riotChampionStore) => - super.noSuchMethod( - Invocation.setter( - #riotChampionStore, - _riotChampionStore, - ), - returnValueForMissingStub: null, - ); - - @override - String get id => (super.noSuchMethod( - Invocation.getter(#id), - returnValue: _i8.dummyValue( - this, - Invocation.getter(#id), - ), - ) as String); - - @override - set id(String? value) => super.noSuchMethod( - Invocation.setter( - #id, - value, - ), - returnValueForMissingStub: null, - ); - - @override - _i4.ClashBotUser get clashBotUser => (super.noSuchMethod( - Invocation.getter(#clashBotUser), - returnValue: _FakeClashBotUser_2( - this, - Invocation.getter(#clashBotUser), - ), - ) as _i4.ClashBotUser); - - @override - set clashBotUser(_i4.ClashBotUser? value) => super.noSuchMethod( - Invocation.setter( - #clashBotUser, - value, - ), - returnValueForMissingStub: null, - ); - - @override - _i5.ObservableList get preferredServers => (super.noSuchMethod( - Invocation.getter(#preferredServers), - returnValue: _FakeObservableList_3( - this, - Invocation.getter(#preferredServers), - ), - ) as _i5.ObservableList); - - @override - set preferredServers(_i5.ObservableList? value) => super.noSuchMethod( - Invocation.setter( - #preferredServers, - value, - ), - returnValueForMissingStub: null, - ); - - @override - String get error => (super.noSuchMethod( - Invocation.getter(#error), - returnValue: _i8.dummyValue( - this, - Invocation.getter(#error), - ), - ) as String); - - @override - set error(String? value) => super.noSuchMethod( - Invocation.setter( - #error, - value, - ), - returnValueForMissingStub: null, - ); - - @override - _i5.ObservableList<_i9.ClashNotification> get notifications => - (super.noSuchMethod( - Invocation.getter(#notifications), - returnValue: _FakeObservableList_3<_i9.ClashNotification>( - this, - Invocation.getter(#notifications), - ), - ) as _i5.ObservableList<_i9.ClashNotification>); - - @override - set notifications(_i5.ObservableList<_i9.ClashNotification>? value) => - super.noSuchMethod( - Invocation.setter( - #notifications, - value, - ), - returnValueForMissingStub: null, - ); - - @override - _i5.ObservableMap get subscription => - (super.noSuchMethod( - Invocation.getter(#subscription), - returnValue: _FakeObservableMap_4( - this, - Invocation.getter(#subscription), - ), - ) as _i5.ObservableMap); - - @override - _i5.ObservableList get sortedSelectedServers => (super.noSuchMethod( - Invocation.getter(#sortedSelectedServers), - returnValue: _FakeObservableList_3( - this, - Invocation.getter(#sortedSelectedServers), - ), - ) as _i5.ObservableList); - - @override - List<_i9.ClashNotification> get sortedNotifications => (super.noSuchMethod( - Invocation.getter(#sortedNotifications), - returnValue: <_i9.ClashNotification>[], - ) as List<_i9.ClashNotification>); - - @override - List<_i9.ClashNotification> get unreadNotifications => (super.noSuchMethod( - Invocation.getter(#unreadNotifications), - returnValue: <_i9.ClashNotification>[], - ) as List<_i9.ClashNotification>); - - @override - bool get isLoggedIn => (super.noSuchMethod( - Invocation.getter(#isLoggedIn), - returnValue: false, - ) as bool); - - @override - _i5.ReactiveContext get context => (super.noSuchMethod( - Invocation.getter(#context), - returnValue: _FakeReactiveContext_5( - this, - Invocation.getter(#context), - ), - ) as _i5.ReactiveContext); - - @override - void setPreferredServers(List? servers) => super.noSuchMethod( - Invocation.method( - #setPreferredServers, - [servers], - ), - returnValueForMissingStub: null, - ); - - @override - _i11.Future refreshSelectedServers() => (super.noSuchMethod( - Invocation.method( - #refreshSelectedServers, - [], - ), - returnValue: _i11.Future.value(), - returnValueForMissingStub: _i11.Future.value(), - ) as _i11.Future); - - @override - _i11.Future refreshClashBotUser() => (super.noSuchMethod( - Invocation.method( - #refreshClashBotUser, - [], - ), - returnValue: _i11.Future.value(), - returnValueForMissingStub: _i11.Future.value(), - ) as _i11.Future); - - @override - void triggerError(String? errorMessage) => super.noSuchMethod( - Invocation.method( - #triggerError, - [errorMessage], - ), - returnValueForMissingStub: null, - ); - - @override - void notifyUser(_i9.ClashNotification? clashNotification) => - super.noSuchMethod( - Invocation.method( - #notifyUser, - [clashNotification], - ), - returnValueForMissingStub: null, - ); - - @override - void readNotification(String? uuid) => super.noSuchMethod( - Invocation.method( - #readNotification, - [uuid], - ), - returnValueForMissingStub: null, - ); - - @override - void unsubscribeFromServer(String? serverId) => super.noSuchMethod( - Invocation.method( - #unsubscribeFromServer, - [serverId], - ), - returnValueForMissingStub: null, - ); - - @override - void subscribeToServer(String? serverId) => super.noSuchMethod( - Invocation.method( - #subscribeToServer, - [serverId], - ), - returnValueForMissingStub: null, - ); - - @override - _i11.Future<_i4.ClashBotUser> createUser() => (super.noSuchMethod( - Invocation.method( - #createUser, - [], - ), - returnValue: _i11.Future<_i4.ClashBotUser>.value(_FakeClashBotUser_2( - this, - Invocation.method( - #createUser, - [], - ), - )), - ) as _i11.Future<_i4.ClashBotUser>); -} - -/// A class which mocks [DiscordDetailsStore]. -/// -/// See the documentation for Mockito's code generation for more information. -class MockDiscordDetailsStore extends _i1.Mock - implements _i2.DiscordDetailsStore { - MockDiscordDetailsStore() { - _i1.throwOnMissingStub(this); - } - - @override - _i6.DiscordUser get discordUser => (super.noSuchMethod( - Invocation.getter(#discordUser), - returnValue: _FakeDiscordUser_6( - this, - Invocation.getter(#discordUser), - ), - ) as _i6.DiscordUser); - - @override - set discordUser(_i6.DiscordUser? value) => super.noSuchMethod( - Invocation.setter( - #discordUser, - value, - ), - returnValueForMissingStub: null, - ); - - @override - _i5.ObservableList<_i12.DiscordGuild> get discordGuilds => - (super.noSuchMethod( - Invocation.getter(#discordGuilds), - returnValue: _FakeObservableList_3<_i12.DiscordGuild>( - this, - Invocation.getter(#discordGuilds), - ), - ) as _i5.ObservableList<_i12.DiscordGuild>); - - @override - set discordGuilds(_i5.ObservableList<_i12.DiscordGuild>? value) => - super.noSuchMethod( - Invocation.setter( - #discordGuilds, - value, - ), - returnValueForMissingStub: null, - ); - - @override - _i5.ObservableMap get discordIdToName => (super.noSuchMethod( - Invocation.getter(#discordIdToName), - returnValue: _FakeObservableMap_4( - this, - Invocation.getter(#discordIdToName), - ), - ) as _i5.ObservableMap); - - @override - set discordIdToName(_i5.ObservableMap? value) => - super.noSuchMethod( - Invocation.setter( - #discordIdToName, - value, - ), - returnValueForMissingStub: null, - ); - - @override - _i5.ObservableList get callsInProgress => (super.noSuchMethod( - Invocation.getter(#callsInProgress), - returnValue: _FakeObservableList_3( - this, - Invocation.getter(#callsInProgress), - ), - ) as _i5.ObservableList); - - @override - set callsInProgress(_i5.ObservableList? value) => super.noSuchMethod( - Invocation.setter( - #callsInProgress, - value, - ), - returnValueForMissingStub: null, - ); - - @override - bool get loadingData => (super.noSuchMethod( - Invocation.getter(#loadingData), - returnValue: false, - ) as bool); - - @override - bool get userHasLoggedIn => (super.noSuchMethod( - Invocation.getter(#userHasLoggedIn), - returnValue: false, - ) as bool); - - @override - bool get guildDetailsLoaded => (super.noSuchMethod( - Invocation.getter(#guildDetailsLoaded), - returnValue: false, - ) as bool); - - @override - Map get discordGuildMap => (super.noSuchMethod( - Invocation.getter(#discordGuildMap), - returnValue: {}, - ) as Map); - - @override - _i5.ReactiveContext get context => (super.noSuchMethod( - Invocation.getter(#context), - returnValue: _FakeReactiveContext_5( - this, - Invocation.getter(#context), - ), - ) as _i5.ReactiveContext); - - @override - _i11.Future<_i6.DiscordUser> fetchUserDetails(String? discordId) => - (super.noSuchMethod( - Invocation.method( - #fetchUserDetails, - [discordId], - ), - returnValue: _i11.Future<_i6.DiscordUser>.value(_FakeDiscordUser_6( - this, - Invocation.method( - #fetchUserDetails, - [discordId], - ), - )), - ) as _i11.Future<_i6.DiscordUser>); - - @override - _i11.Future fetchCurrentUserDetails() => (super.noSuchMethod( - Invocation.method( - #fetchCurrentUserDetails, - [], - ), - returnValue: _i11.Future.value(), - returnValueForMissingStub: _i11.Future.value(), - ) as _i11.Future); - - @override - _i11.Future fetchUserGuilds() => (super.noSuchMethod( - Invocation.method( - #fetchUserGuilds, - [], - ), - returnValue: _i11.Future.value(), - returnValueForMissingStub: _i11.Future.value(), - ) as _i11.Future); -} From 399b086dc7d8db2902cb5618a665124bd386de7b Mon Sep 17 00:00:00 2001 From: Daniel Poss Date: Tue, 18 Mar 2025 19:18:21 -0500 Subject: [PATCH 3/5] Refactor home page layout to include ServerChipList and improve null handling for Discord icons --- lib/pages/home/page/home_v2.dart | 8 ++++-- .../home/page/widgets/calendar_widget.dart | 17 ++++++++---- .../home/page/widgets/server_chip_list.dart | 26 ++++++++++++++----- lib/pages/home/page/widgets/team_card.dart | 9 +++++-- lib/stores/application_details.store.dart | 5 +++- lib/stores/v2-stores/clash.store.dart | 8 ++++++ 6 files changed, 57 insertions(+), 16 deletions(-) diff --git a/lib/pages/home/page/home_v2.dart b/lib/pages/home/page/home_v2.dart index d4b8d1d..4495b2b 100644 --- a/lib/pages/home/page/home_v2.dart +++ b/lib/pages/home/page/home_v2.dart @@ -96,8 +96,11 @@ class _HomeV2State extends State { children: [ Flexible( flex: 1, - child: CalendarWidget( - focusedDay: _focusedDay, selectedDay: _selectedDay), + child: Flex(direction: Axis.vertical, children: [ + ServerChipList(), + CalendarWidget( + focusedDay: _focusedDay, selectedDay: _selectedDay), + ]), ), Flexible( flex: 2, @@ -108,6 +111,7 @@ class _HomeV2State extends State { } else { return Column( children: [ + ServerChipList(), CalendarWidget( focusedDay: _focusedDay, selectedDay: _selectedDay), EventsListWidget(), diff --git a/lib/pages/home/page/widgets/calendar_widget.dart b/lib/pages/home/page/widgets/calendar_widget.dart index c2501a9..0a20db1 100644 --- a/lib/pages/home/page/widgets/calendar_widget.dart +++ b/lib/pages/home/page/widgets/calendar_widget.dart @@ -220,11 +220,18 @@ class CalendarBody extends StatelessWidget { padding: const EdgeInsets.only(left: 2.0), child: Observer( builder: (_) => CircleAvatar( - backgroundImage: NetworkImage( - discordDetailsStore - .discordGuildMap[event - .team.serverId]! - .iconURL), + backgroundImage: discordDetailsStore + .discordGuildMap[ + event.team + .serverId] != + null + ? NetworkImage( + discordDetailsStore + .discordGuildMap[ + event.team + .serverId]! + .iconURL) + : null, radius: 8.0, )), ); diff --git a/lib/pages/home/page/widgets/server_chip_list.dart b/lib/pages/home/page/widgets/server_chip_list.dart index df97701..8f025df 100644 --- a/lib/pages/home/page/widgets/server_chip_list.dart +++ b/lib/pages/home/page/widgets/server_chip_list.dart @@ -22,25 +22,39 @@ class ServerChipList extends StatelessWidget { scrollDirection: Axis.horizontal, child: Observer( builder: (_) { + developer.log("Preferred servers: ${appStore.preferredServers}"); return Row( children: appStore.preferredServers.map((serverId) { bool isSelected = clashStore.selectedServers.contains(serverId); - DiscordGuild discordGuild = - discordDetailsStore.discordGuildMap[serverId]!; return Padding( padding: const EdgeInsets.symmetric(horizontal: 4.0), child: FilterChip( avatar: CircleAvatar( - backgroundImage: NetworkImage(discordGuild.iconURL), + backgroundImage: discordDetailsStore + .discordGuildMap[serverId]?.iconURL != + null + ? NetworkImage(discordDetailsStore + .discordGuildMap[serverId]!.iconURL) + : null, foregroundColor: isSelected ? Colors.white : Colors.black, ), - label: Text(discordGuild.name ?? 'Unknown'), + label: Text( + discordDetailsStore.discordGuildMap[serverId]?.name ?? + 'Unknown'), selected: isSelected, onSelected: (selected) { if (selected) { - clashStore.addSelectedServer(discordGuild.id); + clashStore.addSelectedServer(discordDetailsStore + .discordGuildMap[serverId] != + null + ? discordDetailsStore.discordGuildMap[serverId]!.id + : ""); } else { - clashStore.removeSelectedServer(discordGuild.id); + clashStore.removeSelectedServer(discordDetailsStore + .discordGuildMap[serverId] != + null + ? discordDetailsStore.discordGuildMap[serverId]!.id + : ""); } }, ), diff --git a/lib/pages/home/page/widgets/team_card.dart b/lib/pages/home/page/widgets/team_card.dart index e8fc2d0..c457cd6 100644 --- a/lib/pages/home/page/widgets/team_card.dart +++ b/lib/pages/home/page/widgets/team_card.dart @@ -51,8 +51,13 @@ class TeamCard extends StatelessWidget { children: [ Observer(builder: (_) { return CircleAvatar( - backgroundImage: NetworkImage(discordDetailsStore - .discordGuildMap[team.serverId]!.iconURL)); + backgroundImage: discordDetailsStore + .discordGuildMap[team.serverId]?.iconURL != + null + ? NetworkImage(discordDetailsStore + .discordGuildMap[team.serverId]!.iconURL) + : null, + ); }), Text( team.name.length > 20 diff --git a/lib/stores/application_details.store.dart b/lib/stores/application_details.store.dart index 1d4c4a4..e41e3ab 100644 --- a/lib/stores/application_details.store.dart +++ b/lib/stores/application_details.store.dart @@ -23,8 +23,11 @@ abstract class _ApplicationDetailsStore with Store { _ApplicationDetailsStore(this._clashStore, this._discordDetailsStore, this._riotChampionStore, this._errorHandlerStore) { reaction((_) => _discordDetailsStore.discordUser, (_) { + developer.log("reaction: _discordDetailsStore.discordUser"); if (_discordDetailsStore.discordUser.id != '0') { + developer.log("Refreshing clash bot user"); _clashStore.refreshClashBotUser(_discordDetailsStore.discordUser.id); + _clashStore.refreshSelectedServers(); _discordDetailsStore.fetchUserGuilds(); } }); @@ -64,7 +67,7 @@ abstract class _ApplicationDetailsStore with Store { @computed ObservableList get preferredServers => - ObservableList.of(clashBotUser.selectedServers); + ObservableList.of(_clashStore.selectedServers); @computed List get sortedNotifications => diff --git a/lib/stores/v2-stores/clash.store.dart b/lib/stores/v2-stores/clash.store.dart index 673e34b..44a1d68 100644 --- a/lib/stores/v2-stores/clash.store.dart +++ b/lib/stores/v2-stores/clash.store.dart @@ -45,14 +45,22 @@ abstract class _ClashStore with Store { @action Future refreshClashBotUser(String id) async { refreshingUser = true; + developer.log("Refreshing clash bot user"); clashBotUser = await _clashService.getPlayer(id); setSelectedServer(clashBotUser.selectedServers); refreshingUser = false; } + @action + void refreshSelectedServers() { + selectedServers = ObservableList.of(clashBotUser.selectedServers); + } + @action void setSelectedServer(List servers) { + developer.log("Setting selected servers: $servers"); selectedServers = ObservableList.of(servers); + developer.log("Selected servers: $selectedServers"); } @action From e1736b5058f40294fea21f98545a7bf882b72c2d Mon Sep 17 00:00:00 2001 From: Daniel Poss Date: Tue, 18 Mar 2025 19:22:45 -0500 Subject: [PATCH 4/5] Add card with placeholder text to home page and update ServerChipList to be constant --- lib/pages/home/page/home_v2.dart | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/pages/home/page/home_v2.dart b/lib/pages/home/page/home_v2.dart index 4495b2b..2950f0e 100644 --- a/lib/pages/home/page/home_v2.dart +++ b/lib/pages/home/page/home_v2.dart @@ -97,12 +97,30 @@ class _HomeV2State extends State { Flexible( flex: 1, child: Flex(direction: Axis.vertical, children: [ - ServerChipList(), + const ServerChipList(), CalendarWidget( focusedDay: _focusedDay, selectedDay: _selectedDay), + Expanded( + child: Card.filled( + color: Theme.of(context).brightness == Brightness.dark + ? Colors.blueGrey + : Colors.blueAccent, + margin: const EdgeInsets.all(16.0), + child: const Padding( + padding: EdgeInsets.all(16.0), + child: Text( + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' + 'Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' + 'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ' + 'nisi ut aliquip ex ea commodo consequat.', + style: TextStyle(fontSize: 16.0), + ), + ), + ), + ), ]), ), - Flexible( + const Flexible( flex: 2, child: EventsListWidget(), ), @@ -124,7 +142,7 @@ class _HomeV2State extends State { builder: (_) => clashStore.canCreateTeam ? FloatingActionButton( onPressed: () { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( + ScaffoldMessenger.of(context).showSnackBar(const SnackBar( content: const Text('Creating team coming soon.'), )); }, From 7e75fd588115c06389759f7a091fdc834c446eed Mon Sep 17 00:00:00 2001 From: Daniel Poss Date: Sat, 22 Mar 2025 12:31:40 -0500 Subject: [PATCH 5/5] Remove unused favicon and maskable icons, update icon references in HTML and manifest, and add SVG asset for home page --- assets/svgs/ClashBot-HomePage.svg | 1 + lib/pages/home/page/home_v2.dart | 29 +- .../home/page/widgets/calendar_widget.dart | 122 +++++--- lib/stores/v2-stores/clash.store.dart | 38 ++- lib/storybook_main.dart | 263 +++++++++++++----- pubspec.yaml | 1 + svgs/ClashBot-HomePage.svg | 1 + web/favicon.png | Bin 917 -> 0 bytes web/favicon.svg | 1 + web/icons/Icon-192.png | Bin 5292 -> 12929 bytes web/icons/Icon-512.png | Bin 8252 -> 38054 bytes web/icons/Icon-maskable-192.png | Bin 5594 -> 0 bytes web/icons/Icon-maskable-512.png | Bin 20998 -> 0 bytes web/index.html | 4 +- web/manifest.json | 8 +- 15 files changed, 342 insertions(+), 126 deletions(-) create mode 100644 assets/svgs/ClashBot-HomePage.svg create mode 100644 svgs/ClashBot-HomePage.svg delete mode 100644 web/favicon.png create mode 100644 web/favicon.svg delete mode 100644 web/icons/Icon-maskable-192.png delete mode 100644 web/icons/Icon-maskable-512.png diff --git a/assets/svgs/ClashBot-HomePage.svg b/assets/svgs/ClashBot-HomePage.svg new file mode 100644 index 0000000..9401f14 --- /dev/null +++ b/assets/svgs/ClashBot-HomePage.svg @@ -0,0 +1 @@ +AAA0RGp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAADQeanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46dXVpZDpmZDIwODgzMS01YTgxLTRiM2MtYmEwNi00NTA5ODZlZTNmZGIAAAABtGp1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAANdqdW1iAAAAJmp1bWRjYm9yABEAEIAAAKoAOJtxA2MycGEuYWN0aW9ucwAAAACpY2JvcqFnYWN0aW9uc4GjZmFjdGlvbmtjMnBhLmVkaXRlZG1zb2Z0d2FyZUFnZW50bUFkb2JlIEZpcmVmbHlxZGlnaXRhbFNvdXJjZVR5cGV4U2h0dHA6Ly9jdi5pcHRjLm9yZy9uZXdzY29kZXMvZGlnaXRhbHNvdXJjZXR5cGUvY29tcG9zaXRlV2l0aFRyYWluZWRBbGdvcml0aG1pY01lZGlhAAAArGp1bWIAAAAoanVtZGNib3IAEQAQgAAAqgA4m3EDYzJwYS5oYXNoLmRhdGEAAAAAfGNib3KlamV4Y2x1c2lvbnOBomVzdGFydBjhZmxlbmd0aBlFsGRuYW1lbmp1bWJmIG1hbmlmZXN0Y2FsZ2ZzaGEyNTZkaGFzaFggyMc6F5cV/0m3EYFBFXDxvH3RiPC0jhJDBYou9EyQDNVjcGFkSQAAAAAAAAAAAAAAAgtqdW1iAAAAJGp1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0AAAAB32Nib3KoaGRjOnRpdGxlb0dlbmVyYXRlZCBJbWFnZWlkYzpmb3JtYXRtaW1hZ2Uvc3ZnK3htbGppbnN0YW5jZUlEeCx4bXA6aWlkOjMwZTQ4ZGE0LTI1MTItNDE2MS05M2MyLWYzMDkzYzEwMmE0Mm9jbGFpbV9nZW5lcmF0b3J4NkFkb2JlX0lsbHVzdHJhdG9yLzI5LjMgYWRvYmVfYzJwYS8wLjcuNiBjMnBhLXJzLzAuMjUuMnRjbGFpbV9nZW5lcmF0b3JfaW5mb4G/ZG5hbWVxQWRvYmUgSWxsdXN0cmF0b3JndmVyc2lvbmQyOS4z/2lzaWduYXR1cmV4GXNlbGYjanVtYmY9YzJwYS5zaWduYXR1cmVqYXNzZXJ0aW9uc4KiY3VybHg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DjBP8h1w5RmXOBD+lo3aQ5vLnY3BhZFkTgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZZAQAB6Q1bOZcwlG4DkrvjTNn6MMTewhS/ZENkuuX7VcrlcJpAC7SH54T9snJDFEbmcvALvSTpFMkJPI6bEjUZuoNu1tDLs1jiHkDB3WIbOXbLwa/40lo5FPahItmjCLhOg5XqOOn9KDHIX6KLZYfRYSoe3bBzhdzxUG6K7UyZgORuZAKovTExDDsFnxOwnULVK0BXmEg0shZAG+bj/V7O7xV1JFxpjWmL+jOzn+N9YcpELLj2/4RUcSM3I21nNSj+ZILW49PY/KDoruC387ya7bwH5LD6dvA+/GKFLLq962ztzPZZgfbyFhGS4x34Dgn0Yq0t88pKUr+dOgO56/rRjdf7 \ No newline at end of file diff --git a/lib/pages/home/page/home_v2.dart b/lib/pages/home/page/home_v2.dart index 2950f0e..4dfca58 100644 --- a/lib/pages/home/page/home_v2.dart +++ b/lib/pages/home/page/home_v2.dart @@ -6,9 +6,11 @@ import 'package:clashbot_flutter/models/discord_guild.dart'; import 'package:clashbot_flutter/pages/home/page/widgets/calendar_widget.dart'; import 'package:clashbot_flutter/pages/home/page/widgets/events_widget.dart'; import 'package:clashbot_flutter/pages/home/page/widgets/server_chip_list.dart'; +import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:clashbot_flutter/stores/v2-stores/clash.store.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:provider/provider.dart'; class HomeEvent { @@ -88,6 +90,8 @@ class _HomeV2State extends State { @override Widget build(BuildContext context) { ClashStore clashStore = context.read(); + DiscordDetailsStore discordDetailsStore = + context.read(); return Scaffold( body: LayoutBuilder( builder: (context, constraints) { @@ -99,21 +103,23 @@ class _HomeV2State extends State { child: Flex(direction: Axis.vertical, children: [ const ServerChipList(), CalendarWidget( - focusedDay: _focusedDay, selectedDay: _selectedDay), + focusedDay: _focusedDay, + selectedDay: _selectedDay, + clashStore: clashStore, + discordDetailsStore: discordDetailsStore), Expanded( child: Card.filled( color: Theme.of(context).brightness == Brightness.dark ? Colors.blueGrey : Colors.blueAccent, margin: const EdgeInsets.all(16.0), - child: const Padding( - padding: EdgeInsets.all(16.0), - child: Text( - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' - 'Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' - 'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ' - 'nisi ut aliquip ex ea commodo consequat.', - style: TextStyle(fontSize: 16.0), + child: Padding( + padding: const EdgeInsets.all(16.0), + child: SvgPicture.asset( + 'svgs/ClashBot-HomePage.svg', + semanticsLabel: 'Clash Bot Home Page', + width: 100, + height: 600, ), ), ), @@ -131,7 +137,10 @@ class _HomeV2State extends State { children: [ ServerChipList(), CalendarWidget( - focusedDay: _focusedDay, selectedDay: _selectedDay), + focusedDay: _focusedDay, + selectedDay: _selectedDay, + clashStore: clashStore, + discordDetailsStore: discordDetailsStore), EventsListWidget(), ], ); diff --git a/lib/pages/home/page/widgets/calendar_widget.dart b/lib/pages/home/page/widgets/calendar_widget.dart index 0a20db1..9619844 100644 --- a/lib/pages/home/page/widgets/calendar_widget.dart +++ b/lib/pages/home/page/widgets/calendar_widget.dart @@ -1,19 +1,29 @@ import 'package:clashbot_flutter/pages/home/page/home_v2.dart'; +import 'package:clashbot_flutter/pages/shimmer_loading_page.dart'; import 'package:clashbot_flutter/stores/discord_details.store.dart'; import 'package:clashbot_flutter/stores/v2-stores/clash.store.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:intl/intl.dart'; -import 'package:provider/provider.dart'; import 'package:table_calendar/table_calendar.dart'; -import 'dart:developer' as developer; +/// This widget requires the following providers: +/// +/// - ClashStore +/// - DiscordDetailsStore class CalendarWidget extends StatefulWidget { final DateTime focusedDay; final DateTime? selectedDay; + // Define all required providers + final ClashStore clashStore; + final DiscordDetailsStore discordDetailsStore; const CalendarWidget( - {super.key, required this.focusedDay, required this.selectedDay}); + {super.key, + required this.focusedDay, + required this.selectedDay, + required this.clashStore, + required this.discordDetailsStore}); @override _CalendarWidgetState createState() => _CalendarWidgetState(); @@ -50,36 +60,82 @@ class _CalendarWidgetState extends State { @override Widget build(BuildContext context) { bool isDarkMode = Theme.of(context).brightness == Brightness.dark; - DiscordDetailsStore discordDetailsStore = - context.read(); - ClashStore clashStore = context.read(); - return SizedBox( - width: 1000.0, - child: Container( - padding: const EdgeInsets.all(16.0), - child: Column( - children: [ - CalendarHeader( - focusedDay: _focusedDay, - onMonthChanged: onMonthChanged, - ), - CalendarBody( - focusedDay: _focusedDay, - hoveredDay: _hoveredDay, - isDarkMode: isDarkMode, - discordDetailsStore: discordDetailsStore, - clashStore: clashStore, - onDaySelected: onDaySelected, - onHoveredDayChanged: (day) { - setState(() { - _hoveredDay = day; - }); - }, - ), - ], - ), - ), - ); + return Observer( + builder: (_) => widget.clashStore.isRefreshingData + ? SizedBox( + width: 1000.0, child: LoadingCalendar(focusedDay: _focusedDay)) + : SizedBox( + width: 1000.0, + child: Container( + padding: const EdgeInsets.all(16.0), + child: Column( + children: [ + CalendarHeader( + focusedDay: _focusedDay, + onMonthChanged: onMonthChanged, + ), + CalendarBody( + focusedDay: _focusedDay, + hoveredDay: _hoveredDay, + isDarkMode: isDarkMode, + discordDetailsStore: widget.discordDetailsStore, + clashStore: widget.clashStore, + onDaySelected: onDaySelected, + onHoveredDayChanged: (day) { + setState(() { + _hoveredDay = day; + }); + }, + ), + ], + ), + ), + )); + } +} + +class LoadingCalendar extends StatelessWidget { + const LoadingCalendar({ + super.key, + required DateTime focusedDay, + }) : _focusedDay = focusedDay; + + final DateTime _focusedDay; + + @override + Widget build(BuildContext context) { + return ShimmyShimmer(child: LayoutBuilder(builder: (context, constraints) { + return Column( + children: [ + Center( + child: Container( + width: constraints.maxWidth < 500 ? 200.0 : 400.0, + height: 50.0, + child: Card(), + )), + GridView.builder( + shrinkWrap: true, + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 7, + childAspectRatio: constraints.maxWidth < 500 ? 1.0 : 1.5, + ), + itemCount: + DateTime(_focusedDay.year, _focusedDay.month + 1, 0).day + + DateTime(_focusedDay.year, _focusedDay.month, 1).weekday - + 1, + itemBuilder: (context, index) { + return Container( + margin: EdgeInsets.all(4.0), + child: const SizedBox( + width: 20.0, + height: 20.0, + child: Card(), + ), + ); + }), + ], + ); + })); } } diff --git a/lib/stores/v2-stores/clash.store.dart b/lib/stores/v2-stores/clash.store.dart index 44a1d68..fd1b961 100644 --- a/lib/stores/v2-stores/clash.store.dart +++ b/lib/stores/v2-stores/clash.store.dart @@ -21,6 +21,11 @@ abstract class _ClashStore with Store { _ClashStore(this._clashService, this._errorhandlerStore); + // Constants for network calls + static const String refreshClashBotUserCall = "refreshClashBotUser"; + static const String refreshClashTournamentsCall = "refreshClashTournaments"; + static const String refreshClashTeamsCall = "refreshClashTeams"; + @observable ClashBotUser clashBotUser = ClashBotUser(); @@ -42,12 +47,37 @@ abstract class _ClashStore with Store { @observable bool refreshingUser = false; + @observable + ObservableList callsInProgress = ObservableList(); + + @computed + bool get isRefreshingData => + callsInProgress.contains(_ClashStore.refreshClashBotUserCall) || + callsInProgress.contains(_ClashStore.refreshClashTournamentsCall) || + callsInProgress.contains(_ClashStore.refreshClashTeamsCall); + + @action + void addCallInProgress(String call) { + callsInProgress.add(call); + } + + @action + void removeCallInProgress(String call) { + callsInProgress.remove(call); + } + + @action + void clearCallsInProgress() { + callsInProgress.clear(); + } + @action Future refreshClashBotUser(String id) async { refreshingUser = true; - developer.log("Refreshing clash bot user"); + callsInProgress.add(_ClashStore.refreshClashBotUserCall); clashBotUser = await _clashService.getPlayer(id); setSelectedServer(clashBotUser.selectedServers); + callsInProgress.remove(_ClashStore.refreshClashBotUserCall); refreshingUser = false; } @@ -58,9 +88,7 @@ abstract class _ClashStore with Store { @action void setSelectedServer(List servers) { - developer.log("Setting selected servers: $servers"); selectedServers = ObservableList.of(servers); - developer.log("Selected servers: $selectedServers"); } @action @@ -158,16 +186,20 @@ abstract class _ClashStore with Store { @action Future refreshClashTournaments(String id) async { + callsInProgress.add(_ClashStore.refreshClashTournamentsCall); tournaments = ObservableList.of(await _clashService.retrieveTournaments(id)); + callsInProgress.remove(_ClashStore.refreshClashTournamentsCall); } @action Future refreshClashTeams( String id, List preferredServers) async { + callsInProgress.add(_ClashStore.refreshClashTeamsCall); var futureClashTeams = await _clashService.getClashTeams(id, preferredServers); clashTeams = ObservableList.of(futureClashTeams); + callsInProgress.remove(_ClashStore.refreshClashTeamsCall); } @action diff --git a/lib/storybook_main.dart b/lib/storybook_main.dart index a95a21b..a18fdbb 100644 --- a/lib/storybook_main.dart +++ b/lib/storybook_main.dart @@ -5,6 +5,7 @@ import 'package:clashbot_flutter/models/clash_tournament.dart'; import 'package:clashbot_flutter/models/clashbot_user.dart'; import 'package:clashbot_flutter/models/discord_guild.dart'; import 'package:clashbot_flutter/models/discord_user.dart'; +import 'package:clashbot_flutter/pages/home/page/widgets/calendar_widget.dart'; import 'package:clashbot_flutter/pages/home/page/widgets/team_card.dart'; import 'package:clashbot_flutter/services/clashbot_service_impl.dart'; import 'package:clashbot_flutter/services/discord_service_impl.dart'; @@ -146,80 +147,194 @@ class ClashBotStorybookApp extends StatelessWidget { @override Widget build(BuildContext context) { return Storybook(initialStory: "4Filled", stories: [ - Story( - name: "4Filled", - description: "A card for displaying team information", - builder: (context) { - return TeamCard( - team: ClashTeam( - '1', - 'Mock Team', - 'Tournament 1', - '1', - () { - switch (context.knobs - .text(label: '# of missing roles', initial: '0')) { - case '0': - return { - Role.TOP: PlayerDetails('123456789', 'Player 1', []), - Role.JG: PlayerDetails('2', 'Player 2', []), - Role.MID: PlayerDetails('3', 'Player 3', []), - Role.BOT: PlayerDetails('5', 'Player 4', []), - Role.SUPP: PlayerDetails('5', 'Player 5', []), - }; - case '1': - return { - Role.TOP: PlayerDetails('1', 'Player 1', []), - Role.JG: PlayerDetails('2', 'Player 2', []), - Role.MID: PlayerDetails('3', 'Player 3', []), - Role.BOT: PlayerDetails('5', 'Player 4', []), - Role.SUPP: null, - }; - case '2': - return { - Role.TOP: PlayerDetails('1', 'Player 1', []), - Role.JG: PlayerDetails('2', 'Player 2', []), - Role.MID: PlayerDetails('3', 'Player 3', []), - Role.BOT: null, - Role.SUPP: null, - }; - case '3': - return { - Role.TOP: PlayerDetails('1', 'Player 1', []), - Role.MID: PlayerDetails('3', 'Player 3', []), - Role.JG: null, - Role.BOT: null, - Role.SUPP: null, - }; - case '4': - return { - Role.TOP: PlayerDetails('1', 'Player 1', []), - Role.JG: null, - Role.MID: null, - Role.BOT: null, - Role.SUPP: null, - }; - case '5': - return { - Role.TOP: null, - Role.JG: null, - Role.MID: null, - Role.BOT: null, - Role.SUPP: null, - }; - default: - return { - Role.TOP: PlayerDetails('1', 'Player 1', []), - Role.JG: PlayerDetails('2', 'Player 2', []), - Role.MID: PlayerDetails('3', 'Player 3', []), - Role.SUPP: PlayerDetails('5', 'Player 5', []), - }; - } - }(), - '123456789', - DateTime.now(), - )); - }) + StoryCalendarWidgetWTournaments(context), + StoryCalendarWidgetWTournamentsLoading(context), + StoryTeamCard() ]); } + + Story StoryTeamCard() { + return Story( + name: "4Filled", + description: "A card for displaying team information", + builder: (context) { + return TeamCard( + team: ClashTeam( + '1', + 'Mock Team', + 'Tournament 1', + '1', + () { + switch (context.knobs + .text(label: '# of missing roles', initial: '0')) { + case '0': + return { + Role.TOP: PlayerDetails('123456789', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.BOT: PlayerDetails('5', 'Player 4', []), + Role.SUPP: PlayerDetails('5', 'Player 5', []), + }; + case '1': + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.BOT: PlayerDetails('5', 'Player 4', []), + Role.SUPP: null, + }; + case '2': + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.BOT: null, + Role.SUPP: null, + }; + case '3': + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.JG: null, + Role.BOT: null, + Role.SUPP: null, + }; + case '4': + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: null, + Role.MID: null, + Role.BOT: null, + Role.SUPP: null, + }; + case '5': + return { + Role.TOP: null, + Role.JG: null, + Role.MID: null, + Role.BOT: null, + Role.SUPP: null, + }; + default: + return { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.SUPP: PlayerDetails('5', 'Player 5', []), + }; + } + }(), + '123456789', + DateTime.now(), + )); + }); + } + + Story StoryCalendarWidgetWTournamentsLoading(BuildContext context) { + DiscordDetailsStore discordDetailsStore = + context.read(); + ClashStore clashStoreW5Tournies = new MockClashStore( + context.read().clashBotUser, + [ + ClashTournament('1', 'Mock Tournament 1', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ClashTournament('2', 'Mock Tournament 2', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ClashTournament('3', 'Mock Tournament 3', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ClashTournament('4', 'Mock Tournament 4', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ClashTournament('5', 'Mock Tournament 5', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ], + [ + ClashTeam( + '1', + 'Mock Team 1', + 'Mock Tournament 1', + '1', + { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.SUPP: PlayerDetails('5', 'Player 5', []), + }, + '123456789', + DateTime.now(), + ) + ], + new ClashBotServiceImpl( + new UserApi(context.read()), + new TeamApi(context.read()), + new ChampionsApi(context.read()), + new SubscriptionApi(context.read()), + new TentativeApi(context.read()), + new TournamentApi(context.read())), + context.read()); + clashStoreW5Tournies.addCallInProgress('getTournaments'); + return Story( + name: "Widgets/Calendar/loading", + description: "ClashBot's main calendar widget loading", + builder: (context) { + return CalendarWidget( + focusedDay: DateTime.now(), + selectedDay: DateTime.now(), + clashStore: clashStoreW5Tournies, + discordDetailsStore: discordDetailsStore); + }, + ); + } +} + +Story StoryCalendarWidgetWTournaments(BuildContext context) { + DiscordDetailsStore discordDetailsStore = context.read(); + ClashStore clashStoreW5Tournies = new MockClashStore( + context.read().clashBotUser, + [ + ClashTournament('1', 'Mock Tournament 1', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ClashTournament('2', 'Mock Tournament 2', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ClashTournament('3', 'Mock Tournament 3', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ClashTournament('4', 'Mock Tournament 4', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ClashTournament('5', 'Mock Tournament 5', DateTime.now(), + DateTime.now().add(Duration(days: 1))), + ], + [ + ClashTeam( + '1', + 'Mock Team 1', + 'Mock Tournament 1', + '1', + { + Role.TOP: PlayerDetails('1', 'Player 1', []), + Role.JG: PlayerDetails('2', 'Player 2', []), + Role.MID: PlayerDetails('3', 'Player 3', []), + Role.SUPP: PlayerDetails('5', 'Player 5', []), + }, + '460520499680641035', + DateTime.now(), + ) + ], + new ClashBotServiceImpl( + new UserApi(context.read()), + new TeamApi(context.read()), + new ChampionsApi(context.read()), + new SubscriptionApi(context.read()), + new TentativeApi(context.read()), + new TournamentApi(context.read())), + context.read()); + return Story( + name: "Widgets/Calendar/filled", + description: "ClashBot's main calendar widget filled", + builder: (context) { + return CalendarWidget( + focusedDay: DateTime.now(), + selectedDay: DateTime.now(), + clashStore: clashStoreW5Tournies, + discordDetailsStore: discordDetailsStore); + }, + ); } diff --git a/pubspec.yaml b/pubspec.yaml index e7ba381..b85a4e6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -105,6 +105,7 @@ flutter: - images/MidIcon.webp - images/JGIcon.webp - images/SuppIcon.webp + - svgs/ClashBot-HomePage.svg # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware diff --git a/svgs/ClashBot-HomePage.svg b/svgs/ClashBot-HomePage.svg new file mode 100644 index 0000000..9401f14 --- /dev/null +++ b/svgs/ClashBot-HomePage.svg @@ -0,0 +1 @@ +AAA0RGp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAADQeanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46dXVpZDpmZDIwODgzMS01YTgxLTRiM2MtYmEwNi00NTA5ODZlZTNmZGIAAAABtGp1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAANdqdW1iAAAAJmp1bWRjYm9yABEAEIAAAKoAOJtxA2MycGEuYWN0aW9ucwAAAACpY2JvcqFnYWN0aW9uc4GjZmFjdGlvbmtjMnBhLmVkaXRlZG1zb2Z0d2FyZUFnZW50bUFkb2JlIEZpcmVmbHlxZGlnaXRhbFNvdXJjZVR5cGV4U2h0dHA6Ly9jdi5pcHRjLm9yZy9uZXdzY29kZXMvZGlnaXRhbHNvdXJjZXR5cGUvY29tcG9zaXRlV2l0aFRyYWluZWRBbGdvcml0aG1pY01lZGlhAAAArGp1bWIAAAAoanVtZGNib3IAEQAQgAAAqgA4m3EDYzJwYS5oYXNoLmRhdGEAAAAAfGNib3KlamV4Y2x1c2lvbnOBomVzdGFydBjhZmxlbmd0aBlFsGRuYW1lbmp1bWJmIG1hbmlmZXN0Y2FsZ2ZzaGEyNTZkaGFzaFggyMc6F5cV/0m3EYFBFXDxvH3RiPC0jhJDBYou9EyQDNVjcGFkSQAAAAAAAAAAAAAAAgtqdW1iAAAAJGp1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0AAAAB32Nib3KoaGRjOnRpdGxlb0dlbmVyYXRlZCBJbWFnZWlkYzpmb3JtYXRtaW1hZ2Uvc3ZnK3htbGppbnN0YW5jZUlEeCx4bXA6aWlkOjMwZTQ4ZGE0LTI1MTItNDE2MS05M2MyLWYzMDkzYzEwMmE0Mm9jbGFpbV9nZW5lcmF0b3J4NkFkb2JlX0lsbHVzdHJhdG9yLzI5LjMgYWRvYmVfYzJwYS8wLjcuNiBjMnBhLXJzLzAuMjUuMnRjbGFpbV9nZW5lcmF0b3JfaW5mb4G/ZG5hbWVxQWRvYmUgSWxsdXN0cmF0b3JndmVyc2lvbmQyOS4z/2lzaWduYXR1cmV4GXNlbGYjanVtYmY9YzJwYS5zaWduYXR1cmVqYXNzZXJ0aW9uc4KiY3VybHg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DjBP8h1w5RmXOBD+lo3aQ5vLnY3BhZFkTgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZZAQAB6Q1bOZcwlG4DkrvjTNn6MMTewhS/ZENkuuX7VcrlcJpAC7SH54T9snJDFEbmcvALvSTpFMkJPI6bEjUZuoNu1tDLs1jiHkDB3WIbOXbLwa/40lo5FPahItmjCLhOg5XqOOn9KDHIX6KLZYfRYSoe3bBzhdzxUG6K7UyZgORuZAKovTExDDsFnxOwnULVK0BXmEg0shZAG+bj/V7O7xV1JFxpjWmL+jOzn+N9YcpELLj2/4RUcSM3I21nNSj+ZILW49PY/KDoruC387ya7bwH5LD6dvA+/GKFLLq962ztzPZZgfbyFhGS4x34Dgn0Yq0t88pKUr+dOgO56/rRjdf7 \ No newline at end of file diff --git a/web/favicon.png b/web/favicon.png deleted file mode 100644 index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM diff --git a/web/favicon.svg b/web/favicon.svg new file mode 100644 index 0000000..c3ba17b --- /dev/null +++ b/web/favicon.svg @@ -0,0 +1 @@ +AAA0RGp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAADQeanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46dXVpZDowYmQ4MWU5MS1lMTQyLTRiOTQtOWQ3OC1jYTYwMTUwNTk3Y2EAAAABtGp1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAANdqdW1iAAAAJmp1bWRjYm9yABEAEIAAAKoAOJtxA2MycGEuYWN0aW9ucwAAAACpY2JvcqFnYWN0aW9uc4GjZmFjdGlvbmtjMnBhLmVkaXRlZG1zb2Z0d2FyZUFnZW50bUFkb2JlIEZpcmVmbHlxZGlnaXRhbFNvdXJjZVR5cGV4U2h0dHA6Ly9jdi5pcHRjLm9yZy9uZXdzY29kZXMvZGlnaXRhbHNvdXJjZXR5cGUvY29tcG9zaXRlV2l0aFRyYWluZWRBbGdvcml0aG1pY01lZGlhAAAArGp1bWIAAAAoanVtZGNib3IAEQAQgAAAqgA4m3EDYzJwYS5oYXNoLmRhdGEAAAAAfGNib3KlamV4Y2x1c2lvbnOBomVzdGFydBjeZmxlbmd0aBlFsGRuYW1lbmp1bWJmIG1hbmlmZXN0Y2FsZ2ZzaGEyNTZkaGFzaFggL3p6VK7pKJexihJ+mGO2n46jbaiXEdyZut8JbyX9tt9jcGFkSQAAAAAAAAAAAAAAAgtqdW1iAAAAJGp1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0AAAAB32Nib3KoaGRjOnRpdGxlb0dlbmVyYXRlZCBJbWFnZWlkYzpmb3JtYXRtaW1hZ2Uvc3ZnK3htbGppbnN0YW5jZUlEeCx4bXA6aWlkOjE1Y2M0NjE3LWE4MTEtNDc0OC1hZDc1LTAxY2QyNWVlMTQwNW9jbGFpbV9nZW5lcmF0b3J4NkFkb2JlX0lsbHVzdHJhdG9yLzI5LjMgYWRvYmVfYzJwYS8wLjcuNiBjMnBhLXJzLzAuMjUuMnRjbGFpbV9nZW5lcmF0b3JfaW5mb4G/ZG5hbWVxQWRvYmUgSWxsdXN0cmF0b3JndmVyc2lvbmQyOS4z/2lzaWduYXR1cmV4GXNlbGYjanVtYmY9YzJwYS5zaWduYXR1cmVqYXNzZXJ0aW9uc4KiY3VybHg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RzwMWOJ27eHPacZcGJYG6aGNwYWRZE4UAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZZAQAQd/4/FathWFaeuS84tLSFPBOfUiRr/QOH8c0zur1CVuiOMDs6x4ih4SSk4SeM1YGLCOVAIpaqoWdm3uwr7H8LQ6pvY0ilfq5qN1la88BVdUxHQ0fzCNsz+Uy3kAAub1u+U5HjvG27DOR3D0HZQg2jM0mmTvojCZF2zZhNRET6x9Z2kSHrMK/ZI67a2wG7Q6efgoGz3ypCcQx5IhSKDF8qIdIewZCTVugE8Dm22zwGRS+SSRtnl/0PXiIP5XIKXy64Pnxs3qEopGVnfp6uc9/JCAkLwsoO+MT9ik50BZ9IZkBmr9T7ugddWglaHrhnf+1d4GydRJ/YOmn62DLkURvP \ No newline at end of file diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png index b749bfef07473333cf1dd31e9eed89862a5d52aa..f828f303ab86687874e893948b19764e30b81bb4 100644 GIT binary patch literal 12929 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 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png index 88cfd48dff1169879ba46840804b412fe02fefd6..7edf04fbd05ffee4fc7134307dcac78e0b1555bb 100644 GIT binary patch literal 38054 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 diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png deleted file mode 100644 index eb9b4d76e525556d5d89141648c724331630325d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5594 zcmdT|`#%%j|KDb2V@0DPm$^(Lx5}lO%Yv(=e*7hl@QqKS50#~#^IQPxBmuh|i9sXnt4ch@VT0F7% zMtrs@KWIOo+QV@lSs66A>2pz6-`9Jk=0vv&u?)^F@HZ)-6HT=B7LF;rdj zskUyBfbojcX#CS>WrIWo9D=DIwcXM8=I5D{SGf$~=gh-$LwY?*)cD%38%sCc?5OsX z-XfkyL-1`VavZ?>(pI-xp-kYq=1hsnyP^TLb%0vKRSo^~r{x?ISLY1i7KjSp z*0h&jG(Rkkq2+G_6eS>n&6>&Xk+ngOMcYrk<8KrukQHzfx675^^s$~<@d$9X{VBbg z2Fd4Z%g`!-P}d#`?B4#S-9x*eNlOVRnDrn#jY@~$jfQ-~3Od;A;x-BI1BEDdvr`pI z#D)d)!2_`GiZOUu1crb!hqH=ezs0qk<_xDm_Kkw?r*?0C3|Io6>$!kyDl;eH=aqg$B zsH_|ZD?jP2dc=)|L>DZmGyYKa06~5?C2Lc0#D%62p(YS;%_DRCB1k(+eLGXVMe+=4 zkKiJ%!N6^mxqM=wq`0+yoE#VHF%R<{mMamR9o_1JH8jfnJ?NPLs$9U!9!dq8 z0B{dI2!M|sYGH&9TAY34OlpIsQ4i5bnbG>?cWwat1I13|r|_inLE?FS@Hxdxn_YZN z3jfUO*X9Q@?HZ>Q{W0z60!bbGh557XIKu1?)u|cf%go`pwo}CD=0tau-}t@R2OrSH zQzZr%JfYa`>2!g??76=GJ$%ECbQh7Q2wLRp9QoyiRHP7VE^>JHm>9EqR3<$Y=Z1K^SHuwxCy-5@z3 zVM{XNNm}yM*pRdLKp??+_2&!bp#`=(Lh1vR{~j%n;cJv~9lXeMv)@}Odta)RnK|6* zC+IVSWumLo%{6bLDpn)Gz>6r&;Qs0^+Sz_yx_KNz9Dlt^ax`4>;EWrIT#(lJ_40<= z750fHZ7hI{}%%5`;lwkI4<_FJw@!U^vW;igL0k+mK)-j zYuCK#mCDK3F|SC}tC2>m$ZCqNB7ac-0UFBJ|8RxmG@4a4qdjvMzzS&h9pQmu^x&*= zGvapd1#K%Da&)8f?<9WN`2H^qpd@{7In6DNM&916TRqtF4;3`R|Nhwbw=(4|^Io@T zIjoR?tB8d*sO>PX4vaIHF|W;WVl6L1JvSmStgnRQq zTX4(>1f^5QOAH{=18Q2Vc1JI{V=yOr7yZJf4Vpfo zeHXdhBe{PyY;)yF;=ycMW@Kb>t;yE>;f79~AlJ8k`xWucCxJfsXf2P72bAavWL1G#W z;o%kdH(mYCM{$~yw4({KatNGim49O2HY6O07$B`*K7}MvgI=4x=SKdKVb8C$eJseA$tmSFOztFd*3W`J`yIB_~}k%Sd_bPBK8LxH)?8#jM{^%J_0|L z!gFI|68)G}ex5`Xh{5pB%GtlJ{Z5em*e0sH+sU1UVl7<5%Bq+YrHWL7?X?3LBi1R@_)F-_OqI1Zv`L zb6^Lq#H^2@d_(Z4E6xA9Z4o3kvf78ZDz!5W1#Mp|E;rvJz&4qj2pXVxKB8Vg0}ek%4erou@QM&2t7Cn5GwYqy%{>jI z)4;3SAgqVi#b{kqX#$Mt6L8NhZYgonb7>+r#BHje)bvaZ2c0nAvrN3gez+dNXaV;A zmyR0z@9h4@6~rJik-=2M-T+d`t&@YWhsoP_XP-NsVO}wmo!nR~QVWU?nVlQjNfgcTzE-PkfIX5G z1?&MwaeuzhF=u)X%Vpg_e@>d2yZwxl6-r3OMqDn8_6m^4z3zG##cK0Fsgq8fcvmhu z{73jseR%X%$85H^jRAcrhd&k!i^xL9FrS7qw2$&gwAS8AfAk#g_E_tP;x66fS`Mn@SNVrcn_N;EQm z`Mt3Z%rw%hDqTH-s~6SrIL$hIPKL5^7ejkLTBr46;pHTQDdoErS(B>``t;+1+M zvU&Se9@T_BeK;A^p|n^krIR+6rH~BjvRIugf`&EuX9u69`9C?9ANVL8l(rY6#mu^i z=*5Q)-%o*tWl`#b8p*ZH0I}hn#gV%|jt6V_JanDGuekR*-wF`u;amTCpGG|1;4A5$ zYbHF{?G1vv5;8Ph5%kEW)t|am2_4ik!`7q{ymfHoe^Z99c|$;FAL+NbxE-_zheYbV z3hb0`uZGTsgA5TG(X|GVDSJyJxsyR7V5PS_WSnYgwc_D60m7u*x4b2D79r5UgtL18 zcCHWk+K6N1Pg2c;0#r-)XpwGX?|Iv)^CLWqwF=a}fXUSM?n6E;cCeW5ER^om#{)Jr zJR81pkK?VoFm@N-s%hd7@hBS0xuCD0-UDVLDDkl7Ck=BAj*^ps`393}AJ+Ruq@fl9 z%R(&?5Nc3lnEKGaYMLmRzKXow1+Gh|O-LG7XiNxkG^uyv zpAtLINwMK}IWK65hOw&O>~EJ}x@lDBtB`yKeV1%GtY4PzT%@~wa1VgZn7QRwc7C)_ zpEF~upeDRg_<#w=dLQ)E?AzXUQpbKXYxkp>;c@aOr6A|dHA?KaZkL0svwB^U#zmx0 zzW4^&G!w7YeRxt<9;d@8H=u(j{6+Uj5AuTluvZZD4b+#+6Rp?(yJ`BC9EW9!b&KdPvzJYe5l7 zMJ9aC@S;sA0{F0XyVY{}FzW0Vh)0mPf_BX82E+CD&)wf2!x@{RO~XBYu80TONl3e+ zA7W$ra6LcDW_j4s-`3tI^VhG*sa5lLc+V6ONf=hO@q4|p`CinYqk1Ko*MbZ6_M05k zSwSwkvu;`|I*_Vl=zPd|dVD0lh&Ha)CSJJvV{AEdF{^Kn_Yfsd!{Pc1GNgw}(^~%)jk5~0L~ms|Rez1fiK~s5t(p1ci5Gq$JC#^JrXf?8 z-Y-Zi_Hvi>oBzV8DSRG!7dm|%IlZg3^0{5~;>)8-+Nk&EhAd(}s^7%MuU}lphNW9Q zT)DPo(ob{tB7_?u;4-qGDo!sh&7gHaJfkh43QwL|bbFVi@+oy;i;M zM&CP^v~lx1U`pi9PmSr&Mc<%HAq0DGH?Ft95)WY`P?~7O z`O^Nr{Py9M#Ls4Y7OM?e%Y*Mvrme%=DwQaye^Qut_1pOMrg^!5u(f9p(D%MR%1K>% zRGw%=dYvw@)o}Fw@tOtPjz`45mfpn;OT&V(;z75J*<$52{sB65$gDjwX3Xa!x_wE- z!#RpwHM#WrO*|~f7z}(}o7US(+0FYLM}6de>gQdtPazXz?OcNv4R^oYLJ_BQOd_l172oSK$6!1r@g+B@0ofJ4*{>_AIxfe-#xp>(1 z@Y3Nfd>fmqvjL;?+DmZk*KsfXJf<%~(gcLwEez%>1c6XSboURUh&k=B)MS>6kw9bY z{7vdev7;A}5fy*ZE23DS{J?8at~xwVk`pEwP5^k?XMQ7u64;KmFJ#POzdG#np~F&H ze-BUh@g54)dsS%nkBb}+GuUEKU~pHcYIg4vSo$J(J|U36bs0Use+3A&IMcR%6@jv$ z=+QI+@wW@?iu}Hpyzlvj-EYeop{f65GX0O%>w#0t|V z1-svWk`hU~m`|O$kw5?Yn5UhI%9P-<45A(v0ld1n+%Ziq&TVpBcV9n}L9Tus-TI)f zd_(g+nYCDR@+wYNQm1GwxhUN4tGMLCzDzPqY$~`l<47{+l<{FZ$L6(>J)|}!bi<)| zE35dl{a2)&leQ@LlDxLQOfUDS`;+ZQ4ozrleQwaR-K|@9T{#hB5Z^t#8 zC-d_G;B4;F#8A2EBL58s$zF-=SCr`P#z zNCTnHF&|X@q>SkAoYu>&s9v@zCpv9lLSH-UZzfhJh`EZA{X#%nqw@@aW^vPcfQrlPs(qQxmC|4tp^&sHy!H!2FH5eC{M@g;ElWNzlb-+ zxpfc0m4<}L){4|RZ>KReag2j%Ot_UKkgpJN!7Y_y3;Ssz{9 z!K3isRtaFtQII5^6}cm9RZd5nTp9psk&u1C(BY`(_tolBwzV_@0F*m%3G%Y?2utyS zY`xM0iDRT)yTyYukFeGQ&W@ReM+ADG1xu@ruq&^GK35`+2r}b^V!m1(VgH|QhIPDE X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png deleted file mode 100644 index d69c56691fbdb0b7efa65097c7cc1edac12a6d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20998 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 MPgg&ebxsLQ025IeI{*Lx diff --git a/web/index.html b/web/index.html index 7b3698e..cad678d 100644 --- a/web/index.html +++ b/web/index.html @@ -26,10 +26,10 @@ - + - + Clash Bot 2.0 diff --git a/web/manifest.json b/web/manifest.json index 51d517d..35fdb72 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -14,23 +14,23 @@ ], "icons": [ { - "src": "icons/Icon-192.png", + "src": "icons/icon-192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "icons/Icon-512.png", + "src": "icons/icon-512.png", "sizes": "512x512", "type": "image/png" }, { - "src": "icons/Icon-maskable-192.png", + "src": "icons/icon-192.png", "sizes": "192x192", "type": "image/png", "purpose": "maskable" }, { - "src": "icons/Icon-maskable-512.png", + "src": "icons/icon-512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable"