From 95e1c66adf72e959949113c38fdb49816c734793 Mon Sep 17 00:00:00 2001 From: Andy Pack Date: Sat, 28 Jan 2023 13:34:10 +0000 Subject: [PATCH] adding past hub and page skeleton to MAUI --- Selector.MAUI/MauiProgram.cs | 12 +++-- Selector.MAUI/Pages/Index.razor | 2 + Selector.MAUI/Pages/Past.razor | 23 +++++++++ Selector.MAUI/Pages/Past.razor.css | 20 ++++++++ Selector.MAUI/Services/SelectorNetClient.cs | 5 +- Selector.MAUI/Shared/NavMenu.razor | 7 ++- Selector.SignalR/PastHubClient.cs | 54 +++++++++++++++++++++ 7 files changed, 116 insertions(+), 7 deletions(-) create mode 100644 Selector.MAUI/Pages/Past.razor create mode 100644 Selector.MAUI/Pages/Past.razor.css create mode 100644 Selector.SignalR/PastHubClient.cs diff --git a/Selector.MAUI/MauiProgram.cs b/Selector.MAUI/MauiProgram.cs index ab50621..3f9deee 100644 --- a/Selector.MAUI/MauiProgram.cs +++ b/Selector.MAUI/MauiProgram.cs @@ -28,15 +28,17 @@ public static class MauiProgram builder.Services.AddBlazorWebViewDeveloperTools(); builder.Logging.AddDebug(); #endif - builder.Services.AddHttpClient(); + builder.Services.AddHttpClient() + .AddTransient(); - builder.Services.AddTransient(); builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); + builder.Services.AddSingleton() + .AddSingleton(); - return builder.Build(); + builder.Services.AddSingleton(); + + return builder.Build(); } } diff --git a/Selector.MAUI/Pages/Index.razor b/Selector.MAUI/Pages/Index.razor index 1c1575e..a375c4c 100644 --- a/Selector.MAUI/Pages/Index.razor +++ b/Selector.MAUI/Pages/Index.razor @@ -2,6 +2,7 @@ @using Selector.SignalR @inject NowHubClient nowClient @inject NowHubCache nowCache +@inject PastHubClient pastClient @inject ILogger logger

run that

@@ -16,6 +17,7 @@ logger.LogInformation("Starting now hub connection"); await nowClient.StartAsync(); + await pastClient.StartAsync(); nowCache.BindClient(); await nowClient.OnConnected(); } diff --git a/Selector.MAUI/Pages/Past.razor b/Selector.MAUI/Pages/Past.razor new file mode 100644 index 0000000..3ecaf25 --- /dev/null +++ b/Selector.MAUI/Pages/Past.razor @@ -0,0 +1,23 @@ +@page "/past" +@using Selector.SignalR; +@using System.Linq; +@implements IDisposable + +

Past

+ +
+ + + +
+ +
+ +@code { + + protected async override Task OnInitializedAsync() + { + + } +} + diff --git a/Selector.MAUI/Pages/Past.razor.css b/Selector.MAUI/Pages/Past.razor.css new file mode 100644 index 0000000..83a10aa --- /dev/null +++ b/Selector.MAUI/Pages/Past.razor.css @@ -0,0 +1,20 @@ +body { +} + +.app { + display: block; +} + + +h1 { + padding-bottom: 20px; +} + +@media (min-width: 641px) { + .app { + display: flex; + align-items: flex-start; + flex-wrap: wrap; + width: 100% + } +} \ No newline at end of file diff --git a/Selector.MAUI/Services/SelectorNetClient.cs b/Selector.MAUI/Services/SelectorNetClient.cs index bf47068..5da73ff 100644 --- a/Selector.MAUI/Services/SelectorNetClient.cs +++ b/Selector.MAUI/Services/SelectorNetClient.cs @@ -17,11 +17,13 @@ public class SelectorNetClient : ISelectorNetClient private readonly HttpClient _client; private readonly string _baseUrl; private readonly NowHubClient _nowClient; + private readonly PastHubClient _pastClient; - public SelectorNetClient(HttpClient client, NowHubClient nowClient) + public SelectorNetClient(HttpClient client, NowHubClient nowClient, PastHubClient pastClient) { _client = client; _nowClient = nowClient; + _pastClient = pastClient; //var baseOverride = Environment.GetEnvironmentVariable("SELECTOR_BASE_URL"); @@ -83,6 +85,7 @@ public class SelectorNetClient : ISelectorNetClient ret.Status = TokenResponseStatus.OK; ret.Token = result.Content.ReadFromJsonAsync().Result.Token; _nowClient.Token = ret.Token; + _pastClient.Token = ret.Token; break; default: break; diff --git a/Selector.MAUI/Shared/NavMenu.razor b/Selector.MAUI/Shared/NavMenu.razor index aa02e08..7e98ca8 100644 --- a/Selector.MAUI/Shared/NavMenu.razor +++ b/Selector.MAUI/Shared/NavMenu.razor @@ -9,7 +9,12 @@
- Now + Now + +
+
+ + Past
diff --git a/Selector.SignalR/PastHubClient.cs b/Selector.SignalR/PastHubClient.cs new file mode 100644 index 0000000..d3b75f8 --- /dev/null +++ b/Selector.SignalR/PastHubClient.cs @@ -0,0 +1,54 @@ +using Microsoft.AspNetCore.SignalR.Client; + +namespace Selector.SignalR; + +public class PastHubClient: BaseSignalRClient, IPastHub, IDisposable +{ + private List SearchResultCallbacks = new(); + private bool disposedValue; + + public PastHubClient(string token = null): base("nowhub", token) + { + } + + public void OnRankResult(Action action) + { + SearchResultCallbacks.Add(hubConnection.On(nameof(OnRankResult), action)); + } + + public Task OnConnected() + { + return hubConnection.InvokeAsync(nameof(OnConnected)); + } + + public Task OnSubmitted(IPastParams param) + { + return hubConnection.InvokeAsync(nameof(OnSubmitted), param); + } + + protected virtual void Dispose(bool disposing) + { + if (!disposedValue) + { + if (disposing) + { + foreach(var callback in SearchResultCallbacks) + { + callback.Dispose(); + } + + base.DisposeAsync(); + } + + disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + GC.SuppressFinalize(this); + } +} +