From 45a5e3fc5ef5cd5301a530aeb6618a271b799ce0 Mon Sep 17 00:00:00 2001 From: Ross Miller Date: Mon, 2 Mar 2026 11:50:08 +0000 Subject: [PATCH] WIP --- BudgetApp/BudgetApp.csproj | 2 + BudgetApp/Components/Layout/NavMenu.razor | 8 +- BudgetApp/Components/Layout/NavMenu.razor.css | 6 + BudgetApp/Components/Pages/About.razor | 57 +++++++ BudgetApp/Components/Pages/Home.razor | 74 ++++++--- BudgetApp/Components/Pages/Login.razor | 55 +++++++ BudgetApp/Components/Pages/Transactions.razor | 143 +++++++++++++++--- BudgetApp/Program.cs | 100 ++++++++++++ BudgetApp/appsettings.json | 23 ++- BudgetApp/budgetapp.db-shm | Bin 32768 -> 32768 bytes BudgetApp/budgetapp.db-wal | Bin 1182472 -> 1252512 bytes 11 files changed, 428 insertions(+), 40 deletions(-) create mode 100644 BudgetApp/Components/Pages/About.razor diff --git a/BudgetApp/BudgetApp.csproj b/BudgetApp/BudgetApp.csproj index 40cfd13..8133746 100644 --- a/BudgetApp/BudgetApp.csproj +++ b/BudgetApp/BudgetApp.csproj @@ -12,6 +12,8 @@ + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/BudgetApp/Components/Layout/NavMenu.razor b/BudgetApp/Components/Layout/NavMenu.razor index 27f7eb9..d33c7f7 100644 --- a/BudgetApp/Components/Layout/NavMenu.razor +++ b/BudgetApp/Components/Layout/NavMenu.razor @@ -1,6 +1,7 @@ @inject AccountService AccountService @inject AuthenticationStateProvider AuthStateProvider @inject AppState AppState +@inject NavigationManager Navigation @implements IDisposable @rendermode InteractiveServer @@ -57,7 +58,7 @@
Balances
@foreach (var account in accounts) { -
+
@account.Name @@ -103,5 +104,10 @@ { AppState.OnAccountsChanged -= HandleAccountsChanged; } + + private void NavigateToAccounts() + { + Navigation.NavigateTo("accounts"); + } } diff --git a/BudgetApp/Components/Layout/NavMenu.razor.css b/BudgetApp/Components/Layout/NavMenu.razor.css index e5ebe6c..79d8dc4 100644 --- a/BudgetApp/Components/Layout/NavMenu.razor.css +++ b/BudgetApp/Components/Layout/NavMenu.razor.css @@ -141,6 +141,12 @@ align-items: center; gap: 0.5rem; padding: 0.35rem 0; + border-radius: 4px; + transition: background-color 0.15s; +} + +.balance-item:hover { + background-color: rgba(255, 255, 255, 0.1); } .balance-color { diff --git a/BudgetApp/Components/Pages/About.razor b/BudgetApp/Components/Pages/About.razor new file mode 100644 index 0000000..9d5dacf --- /dev/null +++ b/BudgetApp/Components/Pages/About.razor @@ -0,0 +1,57 @@ +@page "/about" +@layout AuthLayout +@inject IConfiguration Configuration + +Budgeteer — About + +

💰 Budgeteer

+ +

+ A personal finance dashboard built with Blazor Server. +

+ +@if (links.Count > 0) +{ +
+ @foreach (var link in links) + { + + @((MarkupString)link.Icon) @link.Label + + } +
+} + +

+ Sign in or Register +

+ +@code { + private record ContactLink(string Label, string Url, string Icon); + private List links = []; + + protected override void OnInitialized() + { + var about = Configuration.GetSection("About"); + + var email = about["Email"]; + if (!string.IsNullOrWhiteSpace(email)) + links.Add(new("Email", $"mailto:{email}", "")); + + var discord = about["Discord"]; + if (!string.IsNullOrWhiteSpace(discord)) + links.Add(new("Discord", discord, "")); + + var github = about["GitHub"]; + if (!string.IsNullOrWhiteSpace(github)) + links.Add(new("GitHub", github, "")); + + var twitter = about["Twitter"]; + if (!string.IsNullOrWhiteSpace(twitter)) + links.Add(new("Twitter", twitter, "")); + + var mastodon = about["Mastodon"]; + if (!string.IsNullOrWhiteSpace(mastodon)) + links.Add(new("Mastodon", mastodon, "")); + } +} diff --git a/BudgetApp/Components/Pages/Home.razor b/BudgetApp/Components/Pages/Home.razor index a323421..2e381d0 100644 --- a/BudgetApp/Components/Pages/Home.razor +++ b/BudgetApp/Components/Pages/Home.razor @@ -137,8 +137,8 @@ else }
-
-
    +
    +
    - +
    + + +
    @if (data.Accounts.Count > 1) { @@ -303,19 +307,31 @@ else
    -
    Delete Recurring Transaction
    +
    @(pendingDeleteIsRecurring ? "Delete Recurring Transaction" : "Delete Transaction")
    -

    - @pendingDeleteTransaction.Description is part of a recurring series. -

    -

    Would you like to delete just this transaction, or all future transactions in the series?

    +

    Are you sure you want to delete @pendingDeleteTransaction.Description?

    + @if (pendingDeleteIsRecurring) + { +

    This transaction is part of a recurring series. Would you like to delete just this one, or all future transactions in the series?

    + } + else + { +

    This action cannot be undone.

    + }
    - - + @if (pendingDeleteIsRecurring) + { + + + } + else + { + + }
    @@ -347,12 +363,29 @@ else // Account filter private HashSet hiddenAccountIds = []; + private string dashboardSearchQuery = string.Empty; private List filteredRecent => data is null ? [] - : data.RecentTransactions.Where(t => !hiddenAccountIds.Contains(t.AccountId)).ToList(); + : data.RecentTransactions + .Where(t => !hiddenAccountIds.Contains(t.AccountId)) + .Where(t => MatchesSearch(t)) + .ToList(); private List filteredUpcoming => data is null ? [] - : data.UpcomingTransactions.Where(t => !hiddenAccountIds.Contains(t.AccountId)).ToList(); + : data.UpcomingTransactions + .Where(t => !hiddenAccountIds.Contains(t.AccountId)) + .Where(t => MatchesSearch(t)) + .ToList(); + + private bool MatchesSearch(Transaction t) + { + if (string.IsNullOrWhiteSpace(dashboardSearchQuery)) return true; + var q = dashboardSearchQuery.Trim(); + return t.Description.Contains(q, StringComparison.OrdinalIgnoreCase) + || t.Account.Name.Contains(q, StringComparison.OrdinalIgnoreCase) + || (t.Category?.Name?.Contains(q, StringComparison.OrdinalIgnoreCase) ?? false) + || t.Amount.ToString("F2").Contains(q, StringComparison.OrdinalIgnoreCase); + } private void ToggleAccountFilter(int accountId) { @@ -362,6 +395,12 @@ else upcomingPage = 1; } + private void OnDashboardSearchChanged() + { + recentPage = 1; + upcomingPage = 1; + } + // Pagination private int recentPage = 1; private int upcomingPage = 1; @@ -509,18 +548,13 @@ else // Delete confirmation state private bool showDeleteModal; private Transaction? pendingDeleteTransaction; + private bool pendingDeleteIsRecurring; private void ConfirmDelete(Transaction t) { pendingDeleteTransaction = t; - if (t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null) - { - showDeleteModal = true; - } - else - { - _ = DeleteSingle(); - } + pendingDeleteIsRecurring = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; + showDeleteModal = true; } private async Task DeleteSingle() diff --git a/BudgetApp/Components/Pages/Login.razor b/BudgetApp/Components/Pages/Login.razor index 96b7aa8..d30c84f 100644 --- a/BudgetApp/Components/Pages/Login.razor +++ b/BudgetApp/Components/Pages/Login.razor @@ -1,8 +1,10 @@ @page "/login" @layout AuthLayout +@using Microsoft.AspNetCore.Authentication @using Microsoft.AspNetCore.Identity @inject SignInManager SignInManager @inject NavigationManager Navigation +@inject IAuthenticationSchemeProvider SchemeProvider Budgeteer — Sign In @@ -31,6 +33,26 @@ +@if (externalProviders.Count > 0) +{ +
    +

    Or sign in with

    +
    + @foreach (var provider in externalProviders) + { +
    + + + + +
    + } +
    +} +

    Don't have an account? Register

    @@ -40,6 +62,31 @@ private LoginModel Model { get; set; } = new(); private string? errorMessage; + private List externalProviders = []; + private string antiforgeryToken = string.Empty; + + [CascadingParameter] + private HttpContext? HttpContext { get; set; } + + protected override async Task OnInitializedAsync() + { + var schemes = await SchemeProvider.GetAllSchemesAsync(); + externalProviders = schemes + .Where(s => !string.IsNullOrEmpty(s.DisplayName) + && s.Name != IdentityConstants.ApplicationScheme + && s.Name != IdentityConstants.ExternalScheme + && s.Name != IdentityConstants.TwoFactorUserIdScheme + && s.Name != IdentityConstants.TwoFactorRememberMeScheme) + .ToList(); + + if (HttpContext is not null) + { + var tokens = HttpContext.RequestServices + .GetRequiredService() + .GetAndStoreTokens(HttpContext); + antiforgeryToken = tokens.RequestToken ?? string.Empty; + } + } private async Task HandleLogin() { @@ -58,6 +105,14 @@ } } + private static MarkupString GetProviderIcon(string provider) => provider switch + { + "Google" => new MarkupString(""), + "Microsoft" => new MarkupString(""), + "GitHub" => new MarkupString(""), + _ => new MarkupString("") + }; + private sealed class LoginModel { [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Email is required")] diff --git a/BudgetApp/Components/Pages/Transactions.razor b/BudgetApp/Components/Pages/Transactions.razor index c2c5801..d25be1b 100644 --- a/BudgetApp/Components/Pages/Transactions.razor +++ b/BudgetApp/Components/Pages/Transactions.razor @@ -119,6 +119,8 @@ else } } +
    + Date @SortIndicator("date") Description @SortIndicator("description") Account @@ -146,6 +151,9 @@ else @foreach (var t in pagedTransactions) { + + + @t.Date.ToString("MMM dd, yyyy") @t.Description @@ -197,37 +205,75 @@ else {
    - Page @currentPage of @totalPages (@filteredTransactions.Count transactions) +
    + @if (selectedIds.Count > 0) + { + + } + Page @currentPage of @totalPages (@filteredTransactions.Count transactions) +
    } else { -
    +
    @filteredTransactions.Count transactions + @if (selectedIds.Count > 0) + { + + }
    }
    - @if (showDeleteModal && pendingDeleteTransaction is not null) + @if (showDeleteModal) {
    -
    Delete Recurring Transaction
    +
    @deleteModalTitle
    -

    - @pendingDeleteTransaction.Description is part of a recurring series. -

    -

    Would you like to delete just this transaction, or all future transactions in the series?

    + @if (bulkDeleteCount > 0) + { +

    Are you sure you want to delete @bulkDeleteCount selected transactions?

    +

    This action cannot be undone.

    + } + else if (pendingDeleteTransaction is not null) + { +

    Are you sure you want to delete @pendingDeleteTransaction.Description?

    + @if (pendingDeleteIsRecurring) + { +

    This transaction is part of a recurring series. Would you like to delete just this one, or all future transactions in the series?

    + } + else + { +

    This action cannot be undone.

    + } + }
    - - + @if (bulkDeleteCount > 0) + { + + } + else if (pendingDeleteIsRecurring) + { + + + } + else + { + + }
    @@ -315,6 +361,7 @@ else private TransactionForm formModel = new(); private string? userId; private int? filterAccountId; + private string searchQuery = string.Empty; // Pagination state private int currentPage = 1; @@ -338,6 +385,16 @@ else if (filterAccountId is not null) list = list.Where(t => t.AccountId == filterAccountId); + if (!string.IsNullOrWhiteSpace(searchQuery)) + { + var q = searchQuery.Trim(); + list = list.Where(t => + t.Description.Contains(q, StringComparison.OrdinalIgnoreCase) + || t.Account.Name.Contains(q, StringComparison.OrdinalIgnoreCase) + || (t.Category?.Name?.Contains(q, StringComparison.OrdinalIgnoreCase) ?? false) + || t.Amount.ToString("F2").Contains(q, StringComparison.OrdinalIgnoreCase)); + } + list = sortColumn switch { "description" => sortAscending @@ -361,6 +418,8 @@ else currentPage = 1; } + private void OnSearchChanged() => currentPage = 1; + private void OnPageSizeChanged(ChangeEventArgs e) { if (int.TryParse(e.Value?.ToString(), out var size)) @@ -433,9 +492,37 @@ else await LoadData(); } + // Selection state + private HashSet selectedIds = []; + + private void ToggleSelect(int id) + { + if (!selectedIds.Remove(id)) + selectedIds.Add(id); + } + + private bool IsAllPageSelected() => pagedTransactions.Count > 0 && pagedTransactions.All(t => selectedIds.Contains(t.Id)); + + private void ToggleSelectAll(ChangeEventArgs e) + { + if (e.Value is true) + { + foreach (var t in pagedTransactions) + selectedIds.Add(t.Id); + } + else + { + foreach (var t in pagedTransactions) + selectedIds.Remove(t.Id); + } + } + // Delete confirmation state private bool showDeleteModal; private Transaction? pendingDeleteTransaction; + private bool pendingDeleteIsRecurring; + private int bulkDeleteCount; + private string deleteModalTitle = "Delete Transaction"; // Edit modal state private bool showEditModal; @@ -481,14 +568,19 @@ else private void ConfirmDelete(Transaction t) { pendingDeleteTransaction = t; - if (t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null) - { - showDeleteModal = true; - } - else - { - _ = DeleteSingle(); - } + pendingDeleteIsRecurring = t.RecurrenceType != RecurrenceType.None || t.ParentTransactionId is not null; + bulkDeleteCount = 0; + deleteModalTitle = pendingDeleteIsRecurring ? "Delete Recurring Transaction" : "Delete Transaction"; + showDeleteModal = true; + } + + private void ConfirmBulkDelete() + { + pendingDeleteTransaction = null; + pendingDeleteIsRecurring = false; + bulkDeleteCount = selectedIds.Count; + deleteModalTitle = $"Delete {bulkDeleteCount} Transactions"; + showDeleteModal = true; } private async Task DeleteSingle() @@ -496,6 +588,7 @@ else if (userId is null || pendingDeleteTransaction is null) return; showDeleteModal = false; await TransactionService.DeleteTransactionAsync(pendingDeleteTransaction.Id, userId); + selectedIds.Remove(pendingDeleteTransaction.Id); pendingDeleteTransaction = null; await LoadData(); } @@ -505,14 +598,28 @@ else if (userId is null || pendingDeleteTransaction is null) return; showDeleteModal = false; await TransactionService.DeleteTransactionSeriesAsync(pendingDeleteTransaction.Id, userId); + selectedIds.Remove(pendingDeleteTransaction.Id); pendingDeleteTransaction = null; await LoadData(); } + private async Task ExecuteBulkDelete() + { + if (userId is null) return; + showDeleteModal = false; + foreach (var id in selectedIds) + { + await TransactionService.DeleteTransactionAsync(id, userId); + } + selectedIds.Clear(); + await LoadData(); + } + private void CancelDelete() { showDeleteModal = false; pendingDeleteTransaction = null; + bulkDeleteCount = 0; } private sealed class TransactionForm : System.ComponentModel.DataAnnotations.IValidatableObject diff --git a/BudgetApp/Program.cs b/BudgetApp/Program.cs index cc55c78..607f44a 100644 --- a/BudgetApp/Program.cs +++ b/BudgetApp/Program.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; using BudgetApp.Components; @@ -34,6 +35,47 @@ builder.Services.ConfigureApplicationCookie(options => options.LogoutPath = "/logout"; }); +// External authentication providers (only registered when configured) +var authBuilder = builder.Services.AddAuthentication(); + +var googleSection = builder.Configuration.GetSection("Authentication:Google"); +if (!string.IsNullOrEmpty(googleSection["ClientId"]) && !string.IsNullOrEmpty(googleSection["ClientSecret"])) +{ + authBuilder.AddGoogle(options => + { + options.ClientId = googleSection["ClientId"]!; + options.ClientSecret = googleSection["ClientSecret"]!; + }); +} + +var microsoftSection = builder.Configuration.GetSection("Authentication:Microsoft"); +if (!string.IsNullOrEmpty(microsoftSection["ClientId"]) && !string.IsNullOrEmpty(microsoftSection["ClientSecret"])) +{ + authBuilder.AddMicrosoftAccount(options => + { + options.ClientId = microsoftSection["ClientId"]!; + options.ClientSecret = microsoftSection["ClientSecret"]!; + }); +} + +var githubSection = builder.Configuration.GetSection("Authentication:GitHub"); +if (!string.IsNullOrEmpty(githubSection["ClientId"]) && !string.IsNullOrEmpty(githubSection["ClientSecret"])) +{ + authBuilder.AddOAuth("GitHub", "GitHub", options => + { + options.ClientId = githubSection["ClientId"]!; + options.ClientSecret = githubSection["ClientSecret"]!; + options.AuthorizationEndpoint = "https://github.com/login/oauth/authorize"; + options.TokenEndpoint = "https://github.com/login/oauth/access_token"; + options.UserInformationEndpoint = "https://api.github.com/user"; + options.CallbackPath = "/signin-github"; + options.Scope.Add("user:email"); + options.ClaimActions.MapJsonKey(System.Security.Claims.ClaimTypes.NameIdentifier, "id"); + options.ClaimActions.MapJsonKey(System.Security.Claims.ClaimTypes.Name, "login"); + options.ClaimActions.MapJsonKey(System.Security.Claims.ClaimTypes.Email, "email"); + }); +} + // Application services builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -75,4 +117,62 @@ app.MapStaticAssets(); app.MapRazorComponents() .AddInteractiveServerRenderMode(); +// External authentication endpoints +app.MapPost("/api/auth/external-login", (HttpContext context) => +{ + var provider = context.Request.Form["provider"].ToString(); + var returnUrl = context.Request.Form["returnUrl"].ToString(); + if (string.IsNullOrEmpty(returnUrl)) returnUrl = "/"; + + var redirectUrl = $"/api/auth/external-callback?returnUrl={Uri.EscapeDataString(returnUrl)}"; + var properties = new Microsoft.AspNetCore.Authentication.AuthenticationProperties { RedirectUri = redirectUrl }; + return Results.Challenge(properties, [provider]); +}); + +app.MapGet("/api/auth/external-callback", async ( + HttpContext context, + SignInManager signInManager, + UserManager userManager, + string? returnUrl) => +{ + returnUrl ??= "/"; + var info = await signInManager.GetExternalLoginInfoAsync(); + if (info is null) + return Results.Redirect("/login"); + + var signInResult = await signInManager.ExternalLoginSignInAsync( + info.LoginProvider, info.ProviderKey, isPersistent: false); + + if (signInResult.Succeeded) + return Results.Redirect(returnUrl); + + // Auto-register: create user from external claims + var email = info.Principal.FindFirst(System.Security.Claims.ClaimTypes.Email)?.Value; + var userName = email ?? info.Principal.FindFirst(System.Security.Claims.ClaimTypes.Name)?.Value + ?? $"{info.LoginProvider}_{info.ProviderKey}"; + + var user = new ApplicationUser { UserName = userName, Email = email }; + var createResult = await userManager.CreateAsync(user); + if (createResult.Succeeded) + { + await userManager.AddLoginAsync(user, info); + await signInManager.SignInAsync(user, isPersistent: false); + return Results.Redirect(returnUrl); + } + + // If the email is already taken, try linking + if (email is not null) + { + var existingUser = await userManager.FindByEmailAsync(email); + if (existingUser is not null) + { + await userManager.AddLoginAsync(existingUser, info); + await signInManager.SignInAsync(existingUser, isPersistent: false); + return Results.Redirect(returnUrl); + } + } + + return Results.Redirect("/login"); +}); + app.Run(); diff --git a/BudgetApp/appsettings.json b/BudgetApp/appsettings.json index 6f0530f..96ab433 100644 --- a/BudgetApp/appsettings.json +++ b/BudgetApp/appsettings.json @@ -8,5 +8,26 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "About": { + "Email": "rossajmiller76@gmail.com", + "Discord": "", + "GitHub": "", + "Twitter": "", + "Mastodon": "" + }, + "Authentication": { + "Google": { + "ClientId": "", + "ClientSecret": "" + }, + "Microsoft": { + "ClientId": "", + "ClientSecret": "" + }, + "GitHub": { + "ClientId": "", + "ClientSecret": "" + } + } } diff --git a/BudgetApp/budgetapp.db-shm b/BudgetApp/budgetapp.db-shm index 5e4267e8564e4b2421e30ce0dc769695db4a4501..61c71954268849660a94f8815470dc7109be4a87 100644 GIT binary patch delta 273 zcmZo@U}|V!s+V}A%K!o_K+MR%AYcF_l!5Hyi+@UZRj*yyvb&(X@c^5nVvpv{Wxr<` zkg6VJHVA;s{f`77q6|z7sv8@dStiFYb4>POk(m5}g=KO9i@?MS0-IS_du%3OaZF=X zV$@{R-TX1(EaPMW)?=G5x%4rzD=;cDsxhjAMK=qu?hu{)CRT@01IS;_IQc+)8mls+ p7Ng$ej|uxXze=!TVpU<(X4HqNKEgbCS4Ix2Dx(gg0ZfcT6aazqS*`#8 delta 224 zcmZo@U}|V!s+V}A%K!pQK+MR%ARrGUl!0s=kI#v-8um|Y*!U^6*^HDK};$F$9#63#FJIcGLsa_M6P^EM~2 p9uS@UCRPW?TfsQ_Kz!QdPYFjhze=!Tg2|s^p1dm~2gc(Q1pt_kRZIW? diff --git a/BudgetApp/budgetapp.db-wal b/BudgetApp/budgetapp.db-wal index 54f2efaf579c04da6a674716315d8d09d7a06624..1c1552b1fc20b139090a510790571b368e98f193 100644 GIT binary patch delta 937 zcmeB}=CNR>PeTi13sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3ttO=i$IIu79kGq=^uUx z3UKV^xLK$mCe*NfLom||egh)~LqjVQQ!5h-Jrgry12Z#YZ36=<0|N#I1|}d@ZrNQ> z-gtn`vGdGkgJ33P23k+IIcIZxi*bQ(&#zWupYY@T&u**;&C#6_J&O zSAR*)zE}dZ}WDLAa4A&jKP1Rla%$i8@c#kX_f`$GTi z6PEKI;%BsIh0|zHF53iAdk(sW6v96K9bnZ}Q zS%F}clzEGGdiJmO5`0mG2mW}xrV}%JN3rw#{{9Jr| g<=Sd5lw^VF)ioR%z_8H3;a3H4J_2T?kksN50IO#Z+5i9m delta 45 zcmZ3m)2CyaM?(u^3sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3ttO=i$IIu79kF90ApAU A!T