Added page progress

BUTR · May 15, 2023 · c1ae5f4 · c1ae5f4
1 parent f77a6ff
commit c1ae5f4
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 10 deletions.
diff --git a/src/BUTR.Site.NexusMods.Client/App.razor b/src/BUTR.Site.NexusMods.Client/App.razor
@@ -21,6 +21,9 @@
             </NotFound>
         </Router>
         <NotificationProvider Location="@NotificationLocation.Start" />
+        <PageProgressProvider />
+        <ModalProvider />
+        <MessageProvider />
     </CascadingAuthenticationState>
 </Blazorise.ThemeProvider>
 

diff --git a/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj b/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj
@@ -45,4 +45,8 @@
     <ProjectReference Include="..\BUTR.Site.NexusMods.Shared\BUTR.Site.NexusMods.Shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Components\Modals\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Basic/Profile.razor b/src/BUTR.Site.NexusMods.Client/Pages/Basic/Profile.razor
@@ -2,6 +2,7 @@
 @page "/profile"
 
 @inject NavigationManager _navigationManager
+@inject IPageProgressService _pageProgressService
 @inject IUserClient _userClient
 @inject IDiscordClient _discordClient
 @inject ISteamClient _steamClient
@@ -157,19 +158,23 @@ else
 
     protected override async Task OnInitializedAsync()
     {
+        await _pageProgressService.Go(null, options => options.Color = Color.Info);
+        //await _pageProgressService.Go(25, options => options.Color = Color.Info);
         _user = (await _userClient.ProfileAsync()).Data;
 
         var discordTask = _user?.DiscordUserId is not null ? _discordClient.GetUserInfoAsync() : Task.FromResult<DiscordUserInfoAPIResponse>(new(null!, string.Empty));
         var steamTask = _user?.SteamUserId is not null ? _steamClient.GetUserInfoAsync() : Task.FromResult<SteamUserInfoAPIResponse>(new(null!, string.Empty));
         var gogTask = _user?.GogUserId is not null ? _gogClient.GetUserInfoAsync() : Task.FromResult<GOGUserInfoAPIResponse>(new(null!, string.Empty));
         await Task.WhenAll(discordTask, steamTask, gogTask);
-
+        //await _pageProgressService.Go(75, options => options.Color = Color.Info);
+ 
         _discordUser = await discordTask is { Data: { } dataDiscord } ? new DiscordUserInfo2(dataDiscord) : null;
         _steamUser = await steamTask is { Data: { } dataSteam } ? new SteamUserInfo2(dataSteam) : null;
         _gogUser = await gogTask is { Data: { } dataGog } ? new GOGUserInfo2(dataGog) : null;
 
         if (_gutterRow is not null)
             _gutterRow.Gutter = (5,5);
+        await _pageProgressService.Go(-1);
     }
 
     protected override Task OnParametersSetAsync()

diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Discord/OAuthCallback.razor b/src/BUTR.Site.NexusMods.Client/Pages/Discord/OAuthCallback.razor
@@ -1,10 +1,11 @@
 @attribute [Authorize]
 @page "/discord-oauth-callback"
 
-@inject IDiscordClient _discordClient;
-@inject AuthenticationProvider _authenticationProvider;
-@inject ILocalStorageService _localStorage;
 @inject NavigationManager _navigationManager;
+@inject IPageProgressService _pageProgressService
+@inject ILocalStorageService _localStorage;
+@inject AuthenticationProvider _authenticationProvider;
+@inject IDiscordClient _discordClient;
 
 <Container>
     <Row Flex="@Flex.JustifyContent.Center">
@@ -79,6 +80,7 @@
     {
         await base.OnInitializedAsync();
 
+        await _pageProgressService.Go(0, options => options.Color = Color.Info);
         if (!await _localStorage.ContainKeyAsync("discord_state"))
         {
             _status = "FAILURE";
@@ -102,9 +104,12 @@
                 return;
             }
 
+            await _pageProgressService.Go(25, options => options.Color = Color.Info);
             await _discordClient.LinkAsync(queryCode);
+            await _pageProgressService.Go(50, options => options.Color = Color.Info);
             _ = await _authenticationProvider.ValidateAsync();
 
+            await _pageProgressService.Go(75, options => options.Color = Color.Info);
             var userInfo = await _discordClient.GetUserInfoAsync();
             _userInfo = new DiscordUserInfo2(userInfo.Data);
             _status = "SUCCESS";
@@ -119,6 +124,7 @@
         finally
         {
             await _localStorage.RemoveItemAsync("discord_state");
+            await _pageProgressService.Go(null);
         }
     }
 

diff --git a/src/BUTR.Site.NexusMods.Client/Pages/GOG/OAuthCallback.razor b/src/BUTR.Site.NexusMods.Client/Pages/GOG/OAuthCallback.razor
@@ -1,10 +1,10 @@
 @attribute [Authorize]
 @page "/gog-oauth-callback"
 
-@inject IGOGClient _gogClient;
-@inject AuthenticationProvider _authenticationProvider;
-@inject ILocalStorageService _localStorage;
 @inject NavigationManager _navigationManager;
+@inject IPageProgressService _pageProgressService
+@inject AuthenticationProvider _authenticationProvider;
+@inject IGOGClient _gogClient;
 
 <Container>
     <Row Flex="@Flex.JustifyContent.Center">
@@ -59,14 +59,19 @@
     {
         await base.OnInitializedAsync();
 
+        await _pageProgressService.Go(0, options => options.Color = Color.Info);
+
         var queries = _navigationManager.QueryString();
         var queryCode = queries["code"];
 
         try
         {
+            await _pageProgressService.Go(25, options => options.Color = Color.Info);
             await _gogClient.LinkAsync(queryCode);
+            await _pageProgressService.Go(50, options => options.Color = Color.Info);
             _ = await _authenticationProvider.ValidateAsync();
 
+            await _pageProgressService.Go(75, options => options.Color = Color.Info);
             var userInfo = await _gogClient.GetUserInfoAsync();
             _userInfo = new GOGUserInfo2(userInfo.Data);
             _status = "SUCCESS";
@@ -78,6 +83,10 @@
             _message = "Failed to link!";
             _image = Failure;
         }
+        finally
+        {
+            await _pageProgressService.Go(null);
+        }
     }
 
 }
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Steam/OpenIdCallback.razor b/src/BUTR.Site.NexusMods.Client/Pages/Steam/OpenIdCallback.razor
@@ -1,9 +1,10 @@
 @attribute [Authorize]
 @page "/steam-openid-callback"
 
-@inject ISteamClient _steamClient;
-@inject AuthenticationProvider _authenticationProvider;
 @inject NavigationManager _navigationManager;
+@inject IPageProgressService _pageProgressService
+@inject AuthenticationProvider _authenticationProvider;
+@inject ISteamClient _steamClient;
 
 <Container>
     <Row Flex="@Flex.JustifyContent.Center">
@@ -80,13 +81,18 @@
     {
         await base.OnInitializedAsync();
 
+        await _pageProgressService.Go(0, options => options.Color = Color.Info);
+
         var queries = _navigationManager.QueryString();
 
         try
         {
-            await _steamClient.LinkAsync(queries.AllKeys.Select(x => new { Key = x, Value = queries[x] }).ToDictionary(x => x.Key, x => x.Value));
+            await _pageProgressService.Go(25, options => options.Color = Color.Info);
+            await _steamClient.LinkAsync(queries.AllKeys.Select(x => new {Key = x, Value = queries[x]}).ToDictionary(x => x.Key, x => x.Value));
+            await _pageProgressService.Go(50, options => options.Color = Color.Info);
             _ = await _authenticationProvider.ValidateAsync();
 
+            await _pageProgressService.Go(75, options => options.Color = Color.Info);
             var userInfo = await _steamClient.GetUserInfoAsync();
             _userInfo = new SteamUserInfo2(userInfo.Data);
             _status = "SUCCESS";
@@ -98,6 +104,10 @@
             _message = "Failed to link!";
             _image = Failure;
         }
+        finally
+        {
+            await _pageProgressService.Go(null);
+        }
     }
 
 }