From c390119f0ec50591c0623e6a1a063c09b965d9cc Mon Sep 17 00:00:00 2001 From: Rory& Date: Sat, 6 Apr 2024 08:39:22 +0200 Subject: Start adding pages --- BugMine.Web/Classes/BugMineStorage.cs | 100 +++++++++++++++++++++ BugMine.Web/Classes/Constants.cs | 9 ++ BugMine.Web/Classes/LocalStorageProviderService.cs | 28 ++++++ .../Classes/SessionStorageProviderService.cs | 28 ++++++ BugMine.Web/Classes/UserAuth.cs | 15 ++++ BugMine.Web/Layout/NavMenu.razor | 9 +- BugMine.Web/Pages/Counter.razor | 19 ---- BugMine.Web/Pages/Home.razor | 7 -- BugMine.Web/Pages/Index.razor | 20 +++++ BugMine.Web/Pages/Projects/Index.razor | 22 +++++ BugMine.Web/Pages/Projects/NewProject.razor | 25 ++++++ BugMine.Web/Pages/Weather.razor | 60 ------------- BugMine.Web/_Imports.razor | 3 +- 13 files changed, 251 insertions(+), 94 deletions(-) create mode 100644 BugMine.Web/Classes/BugMineStorage.cs create mode 100644 BugMine.Web/Classes/Constants.cs create mode 100644 BugMine.Web/Classes/LocalStorageProviderService.cs create mode 100644 BugMine.Web/Classes/SessionStorageProviderService.cs create mode 100644 BugMine.Web/Classes/UserAuth.cs delete mode 100644 BugMine.Web/Pages/Counter.razor delete mode 100644 BugMine.Web/Pages/Home.razor create mode 100644 BugMine.Web/Pages/Index.razor create mode 100644 BugMine.Web/Pages/Projects/Index.razor create mode 100644 BugMine.Web/Pages/Projects/NewProject.razor delete mode 100644 BugMine.Web/Pages/Weather.razor diff --git a/BugMine.Web/Classes/BugMineStorage.cs b/BugMine.Web/Classes/BugMineStorage.cs new file mode 100644 index 0000000..b45e253 --- /dev/null +++ b/BugMine.Web/Classes/BugMineStorage.cs @@ -0,0 +1,100 @@ +using LibMatrix; +using LibMatrix.Homeservers; +using LibMatrix.Services; +using Microsoft.AspNetCore.Components; + +namespace BugMine.Web.Classes; + +public class BugMineStorage(ILogger logger, TieredStorageService storageService, HomeserverProviderService homeserverProviderService, NavigationManager navigationManager) { + public async Task?> GetAllTokens() { + logger.LogTrace("Getting all tokens."); + return await storageService.DataStorageProvider!.LoadObjectAsync>("bugmine.tokens") ?? + new List(); + } + + public async Task GetCurrentToken() { + logger.LogTrace("Getting current token."); + var currentToken = await storageService.DataStorageProvider!.LoadObjectAsync("bugmine.token"); + var allTokens = await GetAllTokens(); + if (allTokens is null or { Count: 0 }) { + await SetCurrentToken(null); + return null; + } + + if (currentToken is null) { + await SetCurrentToken(currentToken = allTokens[0]); + } + + if (!allTokens.Any(x => x.AccessToken == currentToken.AccessToken)) { + await SetCurrentToken(currentToken = allTokens[0]); + } + + return currentToken; + } + + public async Task AddToken(UserAuth UserAuth) { + logger.LogTrace("Adding token."); + var tokens = await GetAllTokens() ?? new List(); + + tokens.Add(UserAuth); + await storageService.DataStorageProvider!.SaveObjectAsync("bugmine.tokens", tokens); + } + + private async Task GetCurrentSession() { + logger.LogTrace("Getting current session."); + var token = await GetCurrentToken(); + if (token == null) { + return null; + } + + return await homeserverProviderService.GetAuthenticatedWithToken(token.Homeserver, token.AccessToken, token.Proxy); + } + + public async Task GetSession(UserAuth userAuth) { + logger.LogTrace("Getting session."); + return await homeserverProviderService.GetAuthenticatedWithToken(userAuth.Homeserver, userAuth.AccessToken, userAuth.Proxy); + } + + public async Task GetCurrentSessionOrNavigate() { + logger.LogTrace("Getting current session or navigating."); + AuthenticatedHomeserverGeneric? session = null; + + try { + //catch if the token is invalid + session = await GetCurrentSession(); + } + catch (MatrixException e) { + if (e.ErrorCode == "M_UNKNOWN_TOKEN") { + var token = await GetCurrentToken(); + logger.LogWarning("Encountered invalid token for {user} on {homeserver}", token.UserId, token.Homeserver); + navigationManager.NavigateTo("/InvalidSession?ctx=" + token.AccessToken); + return null; + } + + throw; + } + + if (session is null) { + logger.LogInformation("No session found. Navigating to login."); + navigationManager.NavigateTo("/Login"); + } + + return session; + } + + public async Task RemoveToken(UserAuth auth) { + logger.LogTrace("Removing token."); + var tokens = await GetAllTokens(); + if (tokens == null) { + return; + } + + tokens.RemoveAll(x => x.AccessToken == auth.AccessToken); + await storageService.DataStorageProvider.SaveObjectAsync("bugmine.tokens", tokens); + } + + public async Task SetCurrentToken(UserAuth? auth) { + logger.LogTrace("Setting current token."); + await storageService.DataStorageProvider.SaveObjectAsync("bugmine.token", auth); + } +} diff --git a/BugMine.Web/Classes/Constants.cs b/BugMine.Web/Classes/Constants.cs new file mode 100644 index 0000000..f222879 --- /dev/null +++ b/BugMine.Web/Classes/Constants.cs @@ -0,0 +1,9 @@ +namespace BugMine.Web.Classes; + +public static class Constants { +#if DEBUG + public const bool Debug = true; +#else + public const bool Debug = false; +#endif +} \ No newline at end of file diff --git a/BugMine.Web/Classes/LocalStorageProviderService.cs b/BugMine.Web/Classes/LocalStorageProviderService.cs new file mode 100644 index 0000000..247d789 --- /dev/null +++ b/BugMine.Web/Classes/LocalStorageProviderService.cs @@ -0,0 +1,28 @@ +using Blazored.LocalStorage; +using LibMatrix.Interfaces.Services; + +namespace BugMine.Web.Classes; + +public class LocalStorageProviderService : IStorageProvider { + private readonly ILocalStorageService _localStorageService; + + public LocalStorageProviderService(ILocalStorageService localStorageService) { + _localStorageService = localStorageService; + } + + Task IStorageProvider.SaveAllChildrenAsync(string key, T value) { + throw new NotImplementedException(); + } + + Task IStorageProvider.LoadAllChildrenAsync(string key) where T : default => throw new NotImplementedException(); + + async Task IStorageProvider.SaveObjectAsync(string key, T value) => await _localStorageService.SetItemAsync(key, value); + + async Task IStorageProvider.LoadObjectAsync(string key) where T : default => await _localStorageService.GetItemAsync(key); + + async Task IStorageProvider.ObjectExistsAsync(string key) => await _localStorageService.ContainKeyAsync(key); + + async Task> IStorageProvider.GetAllKeysAsync() => (await _localStorageService.KeysAsync()).ToList(); + + async Task IStorageProvider.DeleteObjectAsync(string key) => await _localStorageService.RemoveItemAsync(key); +} diff --git a/BugMine.Web/Classes/SessionStorageProviderService.cs b/BugMine.Web/Classes/SessionStorageProviderService.cs new file mode 100644 index 0000000..c9f1c8e --- /dev/null +++ b/BugMine.Web/Classes/SessionStorageProviderService.cs @@ -0,0 +1,28 @@ +using Blazored.SessionStorage; +using LibMatrix.Interfaces.Services; + +namespace BugMine.Web.Classes; + +public class SessionStorageProviderService : IStorageProvider { + private readonly ISessionStorageService _sessionStorageService; + + public SessionStorageProviderService(ISessionStorageService sessionStorage) { + _sessionStorageService = sessionStorage; + } + + Task IStorageProvider.SaveAllChildrenAsync(string key, T value) { + throw new NotImplementedException(); + } + + Task IStorageProvider.LoadAllChildrenAsync(string key) where T : default => throw new NotImplementedException(); + + async Task IStorageProvider.SaveObjectAsync(string key, T value) => await _sessionStorageService.SetItemAsync(key, value); + + async Task IStorageProvider.LoadObjectAsync(string key) where T : default => await _sessionStorageService.GetItemAsync(key); + + async Task IStorageProvider.ObjectExistsAsync(string key) => await _sessionStorageService.ContainKeyAsync(key); + + async Task> IStorageProvider.GetAllKeysAsync() => (await _sessionStorageService.KeysAsync()).ToList(); + + async Task IStorageProvider.DeleteObjectAsync(string key) => await _sessionStorageService.RemoveItemAsync(key); +} diff --git a/BugMine.Web/Classes/UserAuth.cs b/BugMine.Web/Classes/UserAuth.cs new file mode 100644 index 0000000..3085df7 --- /dev/null +++ b/BugMine.Web/Classes/UserAuth.cs @@ -0,0 +1,15 @@ +using LibMatrix.Responses; + +namespace BugMine.Web.Classes; + +public class UserAuth : LoginResponse { + public UserAuth() { } + public UserAuth(LoginResponse login) { + Homeserver = login.Homeserver; + UserId = login.UserId; + AccessToken = login.AccessToken; + DeviceId = login.DeviceId; + } + + public string? Proxy { get; set; } +} diff --git a/BugMine.Web/Layout/NavMenu.razor b/BugMine.Web/Layout/NavMenu.razor index 64246f4..9f5af9d 100644 --- a/BugMine.Web/Layout/NavMenu.razor +++ b/BugMine.Web/Layout/NavMenu.razor @@ -15,13 +15,8 @@
- - Counter - -
-
- - Weather + + Projects
diff --git a/BugMine.Web/Pages/Counter.razor b/BugMine.Web/Pages/Counter.razor deleted file mode 100644 index 372905f..0000000 --- a/BugMine.Web/Pages/Counter.razor +++ /dev/null @@ -1,19 +0,0 @@ -@page "/counter" - -Counter - -

Counter

- -

Current count: @currentCount

- - - -@code { - private int currentCount = 0; - - private void IncrementCount() - { - currentCount++; - } - -} \ No newline at end of file diff --git a/BugMine.Web/Pages/Home.razor b/BugMine.Web/Pages/Home.razor deleted file mode 100644 index dfcdf75..0000000 --- a/BugMine.Web/Pages/Home.razor +++ /dev/null @@ -1,7 +0,0 @@ -@page "/" - -Home - -

Hello, world!

- -Welcome to your new app. \ No newline at end of file diff --git a/BugMine.Web/Pages/Index.razor b/BugMine.Web/Pages/Index.razor new file mode 100644 index 0000000..02f9cd2 --- /dev/null +++ b/BugMine.Web/Pages/Index.razor @@ -0,0 +1,20 @@ +@page "/" + +Home + +

Welcome to BugMine!

+

BugMine is a bug/TODO tracker, built ontop of the [Matrix] protocol.

+ +@if (_debug) { +

Beware! This is a DEBUG build, here be dragons!

+} + +@code { + +#if DEBUG + bool _debug = true; +#else + bool _debug = false; +#endif + +} \ No newline at end of file diff --git a/BugMine.Web/Pages/Projects/Index.razor b/BugMine.Web/Pages/Projects/Index.razor new file mode 100644 index 0000000..a24747c --- /dev/null +++ b/BugMine.Web/Pages/Projects/Index.razor @@ -0,0 +1,22 @@ +@page "/Projects" +

Projects

+ +@if (true) { +

There are no projects to display.

+} + +

Did not find the project board you are looking for?

+Create new board + +@code { + + private List projects = new List(); + + + + protected override async Task OnInitializedAsync() { + + } + + private class Project { } +} \ No newline at end of file diff --git a/BugMine.Web/Pages/Projects/NewProject.razor b/BugMine.Web/Pages/Projects/NewProject.razor new file mode 100644 index 0000000..529813e --- /dev/null +++ b/BugMine.Web/Pages/Projects/NewProject.razor @@ -0,0 +1,25 @@ +@page "/Projects/New" +@using LibMatrix.Responses +@using BugMine.Web.Classes +@using ArcaneLibs.Extensions +

New project

+ +Project name: + +
+Shortname: + +
+ +@if (Constants.Debug) { + Debug: + 
+        @request.ToJson()
+
+
+} + +@code { + private CreateRoomRequest request = new CreateRoomRequest(); + +} \ No newline at end of file diff --git a/BugMine.Web/Pages/Weather.razor b/BugMine.Web/Pages/Weather.razor deleted file mode 100644 index 6770b4c..0000000 --- a/BugMine.Web/Pages/Weather.razor +++ /dev/null @@ -1,60 +0,0 @@ -@page "/weather" -@inject HttpClient Http - -Weather - -

Weather

- -

This component demonstrates fetching data from the server.

- -@if (forecasts == null) -{ -

- Loading... -

-} -else -{ - - - - - - - - - - - @foreach (var forecast in forecasts) - { - - - - - - - } - -
DateTemp. (C)Temp. (F)Summary
@forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
-} - -@code { - private WeatherForecast[]? forecasts; - - protected override async Task OnInitializedAsync() - { - forecasts = await Http.GetFromJsonAsync("sample-data/weather.json"); - } - - public class WeatherForecast - { - public DateOnly Date { get; set; } - - public int TemperatureC { get; set; } - - public string? Summary { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - } - -} \ No newline at end of file diff --git a/BugMine.Web/_Imports.razor b/BugMine.Web/_Imports.razor index ff8b7fb..a65f12e 100644 --- a/BugMine.Web/_Imports.razor +++ b/BugMine.Web/_Imports.razor @@ -7,4 +7,5 @@ @using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.JSInterop @using BugMine.Web -@using BugMine.Web.Layout \ No newline at end of file +@using BugMine.Web.Layout +@using ArcaneLibs.Blazor.Components \ No newline at end of file -- cgit 1.4.1