Fix (Fixes main.tsx): The main.tsx was incorrectly named.

Add or update the Azure App Service build and deployment workflow config

Fix (API Publish): Makes changes to get API to publish.

Updates api pipeline file.

Fixes api pipeline

Updates api pipeline.

Updates api pipeline

Updates pipeline for api

Updates api pipeline

Fixes authenication redirect issue.

Adds padding to top of page for mobile.

Adds more padding to top for mobile.

Upgrades vulnerable dependencies.

Upgrades ESbuild

Fix (Bugs): Fixes bug that caused a budgets expenses not to be updated and a bug that didnt allow the income creation button to be clicked

Fix (Initialization error): Fixes issue that is caused by the budget service not being properly initalized in the category controller.

Fix (Login): Fixes login button so it doesnt redirect you before the login process is finished.

Fix (login): Attempts to fix login to redirect properly.

Fix (Login): Removes redirect after login since MSAL doesn't seem to work great.

Fix (Auth)

Update appsettings.json

Remove appsettings.json from repository

Fix (Merge issues): Fixes issues after merging.

Minor auth changes

Fix

Feat (Auth): Changes auth depending on device type

Update README.md

Auth: Creates new auth provider setup.

Creates new auth provider setup to hopefully make auth work better on mobile.

Branch cleanup

Removes Entra ID

Author: seannkelleyy

.DS_Store

@@ -0,0 +1,68 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy ASP.Net Core app to Azure Web App - breeze-api
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read #This is required for actions/checkout
+      id-token: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up .NET Core
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9.x'
+
+      - name: Build with dotnet
+        run: dotnet build --configuration Release
+
+      - name: dotnet publish
+        run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/Breeze.Api
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v4
+        with:
+          name: .net-app
+          path: ${{env.DOTNET_ROOT}}/Breeze.Api
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT
+      contents: read #This is required for actions/checkout
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: .net-app
+
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_D2C44B7234164FC5B56F9FFDB1CD3E6E }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_71006F9196DA495986F4A424FB8FED38 }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_0EB6021EB97A4E5A83F60242A79EA2F0 }}
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v3
+        with:
+          app-name: 'breeze-api'
+          slot-name: 'Production'
+          package: .

.github/workflows/master_breeze-api.yml

@@ -284,6 +284,8 @@ FakesAssemblies/
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
 node_modules/
+dist/
+build/
 
 # Visual Studio 6 build log
 *.plg

.gitignore

@@ -1,7 +1,7 @@
 {
 	"appService.zipIgnorePattern": [".vscode{,/**}"],
 	"appService.defaultWebAppToDeploy": "None",
-	"appService.deploySubpath": "Breeze.Api/bin/Release/net8.0",
+	"appService.deploySubpath": "Breeze.Api/bin/Release/net9.0/publish",
 	"appService.showBuildDuringDeployPrompt": false,
 	"sqltools.connections": [
 		{

.vscode/settings.json

@@ -1,4 +1,5 @@
-using Breeze.Api.Categories.RequestResponseObjects;
+using Breeze.Api.Budgets;
+using Breeze.Api.Categories.RequestResponseObjects;
 using Breeze.Api.Expenses.RequestResponseObjects;
 using Breeze.Data;
 using Breeze.Domain;
@@ -10,6 +11,7 @@ namespace Breeze.Api.Categories
     /// </summary>
     public class CategoryService
     {
+        private readonly BudgetService budgets;
         private IConfiguration _config;
         private readonly ILogger _logger;
         private readonly BreezeContext db;
@@ -22,6 +24,7 @@ public class CategoryService
         /// <param name="logger">Logger for logging errors and information.</param>
         public CategoryService(IConfiguration config, BreezeContext dbContext, ILogger logger)
         {
+            budgets = new BudgetService(config, dbContext, logger);
             _config = config;
             _logger = logger;
             db = dbContext;
@@ -255,6 +258,12 @@ public int CalculateCategoryExpenses(string userId, int categoryId, List<Expense
                 var amountSpent = expenses.Sum(expense => expense.Amount);
 
                 existingCategory.CurrentSpend = amountSpent;
+                var categories = GetCategoriesByBudgetId(userId, existingCategory.BudgetId);
+                if (categories == null)
+                {
+                    return -2;
+                }
+                budgets.CalculateBudgetCategories(userId, existingCategory.BudgetId, categories);
                 db.SaveChanges();
                 return existingCategory.Id;
             }

Breeze.Api/Categories/CategoryServices.cs

@@ -1,4 +1,5 @@
-using Breeze.Api.Categories;
+using Breeze.Api.Budgets;
+using Breeze.Api.Categories;
 using Breeze.Api.Expenses.RequestResponseObjects;
 using Breeze.Data;
 using Microsoft.AspNetCore.Authorization;
@@ -81,6 +82,7 @@ public IActionResult PostExpsense(ExpenseRequest expenseRequest)
                     return BadRequest("Expenses not found");
                 }
                 categories.CalculateCategoryExpenses(userId, expenseRequest.CategoryId, expenseList);
+
                 return Ok(response);
             }
             catch (Exception ex)

Breeze.Api/Expenses/ExpenseController.cs

@@ -82,6 +82,9 @@
     });
 });
 
+builder.Services.AddControllers();
+
+
 var app = builder.Build();
 
 app.UseSwagger();
@@ -96,6 +99,13 @@
     app.UseCors("production");
 }
 
+builder.Services.AddLogging(options =>
+{
+    options.AddConsole();
+    options.AddDebug();
+});
+
+
 app.UseHttpsRedirection();
 
 app.UseRouting();

Breeze.Api/Program.cs

@@ -53,7 +53,6 @@
     <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
-  <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
   <ItemGroup>
     <Folder Include="Properties" />
   </ItemGroup>