From 2486a490ec981265a9c37573404dafed6026e4b4 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Thu, 26 Feb 2026 23:15:28 -0500
Subject: [PATCH 01/15] US-003 - Fix build issues with Api

---
 WardrobeManager.Api/Program.cs                              | 2 +-
 .../Repositories/Implementation/ClothingRepository.cs       | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/WardrobeManager.Api/Program.cs b/WardrobeManager.Api/Program.cs
index c50342a..c9efa9c 100644
--- a/WardrobeManager.Api/Program.cs
+++ b/WardrobeManager.Api/Program.cs
@@ -90,7 +90,7 @@
 
 // Entity Services
 builder.Services.AddScoped<IGenericRepository<Log>, GenericRepository<Log>>();
-builder.Services.AddScoped<ClothingRepository>();
+builder.Services.AddScoped<IClothingRepository, ClothingRepository>();
 
 // add db context
 builder.Services.AddDbContext<DatabaseContext>((serviceProvider, options) =>
diff --git a/WardrobeManager.Api/Repositories/Implementation/ClothingRepository.cs b/WardrobeManager.Api/Repositories/Implementation/ClothingRepository.cs
index 0f07dcd..6033c78 100644
--- a/WardrobeManager.Api/Repositories/Implementation/ClothingRepository.cs
+++ b/WardrobeManager.Api/Repositories/Implementation/ClothingRepository.cs
@@ -5,12 +5,8 @@
 
 namespace WardrobeManager.Api.Repositories.Implementation;
 
-public class ClothingRepository: GenericRepository<ClothingItem>, IClothingRepository
+public class ClothingRepository(DatabaseContext context) : GenericRepository<ClothingItem>(context), IClothingRepository
 {
-    public ClothingRepository(DatabaseContext context, DbSet<ClothingItem> clothingItems) : base(context)
-    {
-    }
-
     public async Task<ClothingItem?> GetAsync(string userId, int itemId)
     {
         return await _dbSet.FirstOrDefaultAsync(item => item.Id == itemId && item.UserId == userId);

From 1ff457fbf0ff13085b8cddb3ae3073ac4b0f2b0b Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 02:30:08 -0500
Subject: [PATCH 02/15] US-003 - Massive commit

Working on adding functionality to allow user to do the typical REST actions to a clothing item (get, post, put, delete).

This means I neeeded to reuse a lot of old code and move things around. Many tests are probably broken too now.
---
 .../Services/ClothingServiceTests.cs          |  7 +-
 .../Endpoints/ClothingEndpoints.cs            | 42 +++++++--
 .../Endpoints/UserEndpoints.cs                |  1 +
 .../Middleware/UserCreationMiddleware.cs      | 31 ++-----
 WardrobeManager.Api/Program.cs                |  2 +
 .../Implementation/ClothingService.cs         | 48 ++++++++--
 .../Services/Implementation/FileService.cs    | 10 +--
 .../Services/Implementation/UserService.cs    |  1 +
 .../Services/Interfaces/IClothingService.cs   |  7 +-
 .../Services/Interfaces/IUserService.cs       |  1 +
 .../Components/Shared/Image.razor             |  4 +-
 .../Components/Shared/Notifications.razor     |  2 +-
 .../CustomHttpMessageHandler.cs               | 49 ++++++++++
 .../Identity/CookieHandler.cs                 | 30 -------
 .../CustomAuthorizationMessageHandler.cs}     |  4 +-
 .../Layout/NavMenu.razor                      | 90 +++++++++++--------
 .../Pages/Authenticated/AddClothingItem.razor | 50 ++++++++++-
 .../Pages/Authenticated/Clothing.razor        | 10 ---
 .../Pages/Authenticated/Wardrobe.razor        | 31 +++++++
 .../Pages/Public/Login.razor                  |  2 +-
 WardrobeManager.Presentation/Program.cs       |  6 +-
 .../Services/Implementation/ApiService.cs     | 29 ++++++
 .../Services/Interfaces/IApiService.cs        | 15 +++-
 .../ViewModels/AddClothingItemViewModel.cs    | 69 ++++++++++++++
 .../ViewModels/LoginViewModel.cs              |  2 -
 .../ViewModels/WardrobeViewModel.cs           | 34 +++++++
 .../DTOs/ClothingItemDTO.cs                   | 18 ++++
 .../{Models => DTOs}/EditedUserDTO.cs         |  2 +-
 .../DTOs/NewClothingItemDTO.cs                | 24 +++++
 .../NewOrEditedClothingItemDTO.cs             |  2 +-
 .../Models/ClientClothingItem.cs              | 16 ----
 .../StaticResources/MiscMethods.cs            |  8 +-
 .../StaticResources/ProjectConstants.cs       |  1 +
 33 files changed, 494 insertions(+), 154 deletions(-)
 create mode 100644 WardrobeManager.Presentation/CustomHttpMessageHandler.cs
 delete mode 100644 WardrobeManager.Presentation/Identity/CookieHandler.cs
 rename WardrobeManager.Presentation/{HelperClasses.cs => Identity/CustomAuthorizationMessageHandler.cs} (85%)
 delete mode 100644 WardrobeManager.Presentation/Pages/Authenticated/Clothing.razor
 create mode 100644 WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
 create mode 100644 WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
 create mode 100644 WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
 create mode 100644 WardrobeManager.Shared/DTOs/ClothingItemDTO.cs
 rename WardrobeManager.Shared/{Models => DTOs}/EditedUserDTO.cs (95%)
 create mode 100644 WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
 rename WardrobeManager.Shared/{Models => DTOs}/NewOrEditedClothingItemDTO.cs (97%)
 delete mode 100644 WardrobeManager.Shared/Models/ClientClothingItem.cs

diff --git a/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs b/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs
index 7f80e69..9c0dbad 100644
--- a/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs
+++ b/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs
@@ -1,4 +1,5 @@
-using FluentAssertions;
+using AutoMapper;
+using FluentAssertions;
 using FluentAssertions.Execution;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
@@ -18,6 +19,7 @@ public class ClothingServiceTests
     private const int DefaultItemId = 1;
 
     private Mock<IClothingRepository> _mockRepo;
+    private Mock<IMapper> _mockMapper;
     private ClothingService _serviceToTest;
 
     [SetUp]
@@ -25,7 +27,8 @@ public void Setup()
     {
         // Mock the service and its dependencies
         _mockRepo = new Mock<IClothingRepository>();
-        _serviceToTest = new ClothingService(_mockRepo.Object);
+        _mockMapper = new Mock<IMapper>();
+        _serviceToTest = new ClothingService(_mockRepo.Object, _mockMapper.Object);
     }
 
     #region GetClothingItem
diff --git a/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs b/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
index 738562d..492c455 100644
--- a/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
+++ b/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
@@ -7,16 +7,22 @@
 using WardrobeManager.Api.Services.Implementation;
 using WardrobeManager.Api.Services.Interfaces;
 using WardrobeManager.Shared.Models;
+using AutoMapper;
+using WardrobeManager.Shared.DTOs;
 
 #endregion
 
 namespace WardrobeManager.Api.Endpoints;
 
-public static class ClothingEndpoints {
-    public static void MapClothingEndpoints(this IEndpointRouteBuilder app) {
+public static class ClothingEndpoints
+{
+    public static void MapClothingEndpoints(this IEndpointRouteBuilder app)
+    {
         var group = app.MapGroup("/clothing").RequireAuthorization();
 
         group.MapGet("", GetClothing);
+        group.MapPost("/add", AddNewClothingItem);
+        group.MapPost("/delete", RemoveClothingItem);
         // maybe should get a GET request, idc rn
     }
 
@@ -24,8 +30,9 @@ public static void MapClothingEndpoints(this IEndpointRouteBuilder app) {
     // Get all clothing items
     // ---------------------
     public static async Task<IResult> GetClothing(
-            HttpContext context, IClothingService clothingService, DatabaseContext _context
-            ){
+        HttpContext context, IClothingService clothingService
+    )
+    {
         User? user = context.Items["user"] as User;
         Debug.Assert(user != null, "Cannot get user");
 
@@ -34,4 +41,29 @@ public static async Task<IResult> GetClothing(
         return Results.Ok(clothes);
     }
 
-}
+    public static async Task<IResult> AddNewClothingItem(
+        [FromBody] NewClothingItemDTO newNewClothingItem,
+        HttpContext context, IClothingService clothingService, IMapper mapper
+    )
+    {
+        User? user = context.Items["user"] as User;
+        Debug.Assert(user != null, "Cannot get user");
+
+        await clothingService.AddNewClothingItem(user.Id ,newNewClothingItem);
+
+        return Results.Ok();
+    }
+    
+    public static async Task<IResult> RemoveClothingItem(
+        [FromBody] int itemId,
+        HttpContext context, IClothingService clothingService, IMapper mapper
+    )
+    {
+        User? user = context.Items["user"] as User;
+        Debug.Assert(user != null, "Cannot get user");
+
+        await clothingService.RemoveClothingItem(user.Id ,itemId);
+
+        return Results.Ok();
+    }
+}
\ No newline at end of file
diff --git a/WardrobeManager.Api/Endpoints/UserEndpoints.cs b/WardrobeManager.Api/Endpoints/UserEndpoints.cs
index c1d7ded..8466a70 100644
--- a/WardrobeManager.Api/Endpoints/UserEndpoints.cs
+++ b/WardrobeManager.Api/Endpoints/UserEndpoints.cs
@@ -5,6 +5,7 @@
 using WardrobeManager.Api.Database.Entities;
 using WardrobeManager.Api.Services.Implementation;
 using WardrobeManager.Api.Services.Interfaces;
+using WardrobeManager.Shared.DTOs;
 using WardrobeManager.Shared.Models;
 
 #endregion
diff --git a/WardrobeManager.Api/Middleware/UserCreationMiddleware.cs b/WardrobeManager.Api/Middleware/UserCreationMiddleware.cs
index 4fa51f4..04a40da 100644
--- a/WardrobeManager.Api/Middleware/UserCreationMiddleware.cs
+++ b/WardrobeManager.Api/Middleware/UserCreationMiddleware.cs
@@ -23,28 +23,15 @@ public UserCreationMiddleware(RequestDelegate next)
 
     public async Task InvokeAsync(HttpContext context)
     {
-        
-        // var userService = context.RequestServices.GetRequiredService<IUserService>();
-
-        // -------------- !!IMPORTANT!! -------------
-        // Previously I was using Auth0 as an authentication provider.
-        // Coincidentally, Microsoft Identity and Auto0 used the NameIdentifier claim for a user
-        // So all the old code still works 100% fine. 
-        // For this reason I will not be modifying anything Auth0 at the moment
-        // var Auth0Id = context.User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
-
-        // only create the user if the consumer of the api is authorized
-        // if (Auth0Id != null)
-        // {
-        //     await userService.CreateUser(Auth0Id);
-        //     Debug.Assert(await userService.DoesUserExist(Auth0Id) == true, "User finding/creating is broken");
-        //
-        //     var user = await userService.GetUser(Auth0Id);
-        //     Debug.Assert(user != null, "At this point in the pipeline user should exist");
-        //
-        //     // pass along to controllers
-        //     context.Items["user"] = user;
-        // }
+        var userService = context.RequestServices.GetRequiredService<IUserService>();
+        var userId = context.User.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? "";
+
+        var user = await userService.GetUser(userId);
+        if (user != null)
+        {
+            // pass along to controllers
+            context.Items["user"] = user;
+        }
 
         await _next(context);
     }
diff --git a/WardrobeManager.Api/Program.cs b/WardrobeManager.Api/Program.cs
index c9efa9c..88fe4dd 100644
--- a/WardrobeManager.Api/Program.cs
+++ b/WardrobeManager.Api/Program.cs
@@ -86,6 +86,8 @@
     
     // Add your maps here directly
     cfg.CreateMap<Log, LogDTO>().ReverseMap();
+    cfg.CreateMap<NewClothingItemDTO, ClothingItem>();
+    cfg.CreateMap<ClothingItemDTO, ClothingItem>().ReverseMap();
 });
 
 // Entity Services
diff --git a/WardrobeManager.Api/Services/Implementation/ClothingService.cs b/WardrobeManager.Api/Services/Implementation/ClothingService.cs
index 4ff53a8..40990f3 100644
--- a/WardrobeManager.Api/Services/Implementation/ClothingService.cs
+++ b/WardrobeManager.Api/Services/Implementation/ClothingService.cs
@@ -1,11 +1,14 @@
 #region
 
+using AutoMapper;
 using Microsoft.EntityFrameworkCore;
+using SQLitePCL;
 using WardrobeManager.Api.Database;
 using WardrobeManager.Api.Database.Entities;
 using WardrobeManager.Api.Repositories;
 using WardrobeManager.Api.Repositories.Interfaces;
 using WardrobeManager.Api.Services.Interfaces;
+using WardrobeManager.Shared.DTOs;
 using WardrobeManager.Shared.Enums;
 using WardrobeManager.Shared.Models;
 using WardrobeManager.Shared.StaticResources;
@@ -14,22 +17,51 @@
 
 namespace WardrobeManager.Api.Services.Implementation;
 
-public class ClothingService(IClothingRepository clothingRepository)
+public class ClothingService(IClothingRepository clothingRepository, IMapper mapper, IFileService fileService, ILogger<ClothingService> logger)
     : IClothingService
 {
-
-
     // ---- Methods for multiple clothing items ---
-    public async Task<List<ClothingItem>?> GetAllClothingAsync(string userId)
+    public async Task<List<ClothingItemDTO>?> GetAllClothingAsync(string userId)
     {
-        return await clothingRepository.GetAllAsync(userId);
+        var res = await clothingRepository.GetAllAsync(userId);
+        return mapper.Map<List<ClothingItemDTO>>(res);
     }
 
     // ---- Methods for one clothing item ---
-    public async Task<ClothingItem?> GetClothingItemAsync(string userId, int itemId)
+    public async Task<ClothingItemDTO?> GetClothingItemAsync(string userId, int itemId)
     {
-       return await clothingRepository.GetAsync(userId, itemId);
+        var res = await clothingRepository.GetAsync(userId, itemId);
+        return mapper.Map<ClothingItemDTO>(res);
     }
 
+    public async Task AddNewClothingItem(string userId, NewClothingItemDTO newNewClothingItem)
+    {
+        var res = mapper.Map<ClothingItem>(newNewClothingItem);
+        Guid? newItemGuid = null;
+        if (MiscMethods.IsValidBase64(newNewClothingItem.ImageBase64))
+        {
+            newItemGuid = Guid.NewGuid();
+            // decode and save file to place on disk with guid as name
+            await fileService.SaveImage(newItemGuid, newNewClothingItem.ImageBase64!);
+        }
 
-}
+        res.UserId = userId;
+        res.ImageGuid = newItemGuid;
+        await clothingRepository.CreateAsync(res);
+        await clothingRepository.SaveAsync();
+    }
+
+    public async Task RemoveClothingItem(string userId, int itemId)
+    {
+        var res = await clothingRepository.GetAsync(userId, itemId);
+        if (res != null)
+        {
+            clothingRepository.Remove(res);
+            await clothingRepository.SaveAsync();
+        }
+        else
+        {
+            logger.LogInformation($"Clothing item {itemId} not found");
+        }
+    }
+}
\ No newline at end of file
diff --git a/WardrobeManager.Api/Services/Implementation/FileService.cs b/WardrobeManager.Api/Services/Implementation/FileService.cs
index b685b0d..c698e55 100644
--- a/WardrobeManager.Api/Services/Implementation/FileService.cs
+++ b/WardrobeManager.Api/Services/Implementation/FileService.cs
@@ -31,14 +31,14 @@ public async Task SaveImage(Guid? guid, string ImageBase64)
         byte[] imageBytes = Convert.FromBase64String(ImageBase64);
 
         // 5MB default max file size
-        var max_file_size = configuration["WM_MAX_IMAGE_UPLOAD_SIZE_IN_MB"] ?? "5";
-        int max_file_size_num = Convert.ToInt32(max_file_size);
-        max_file_size_num *= 1024;
+        var maxFileSize = configuration["WM_MAX_IMAGE_UPLOAD_SIZE_IN_MB"] ?? "5";
+        int maxFileSizeNum = Convert.ToInt32(maxFileSize);
+        maxFileSizeNum *= 1024 * 1024;
 
-        if (imageBytes.Length > max_file_size_num)
+        if (imageBytes.Length > maxFileSizeNum)
         {
             throw new Exception(
-                $"File size too large! Received file size: {imageBytes.Length / 1024} MB. Max file size: {max_file_size_num / 1024} MB");
+                $"File size too large! Received file size: {imageBytes.Length / 1024} MB. Max file size: {maxFileSizeNum / 1024} MB");
         }
 
         string path = Path.Combine(dataDirectoryService.GetUploadsDirectory(), ParseGuid(properGuid));
diff --git a/WardrobeManager.Api/Services/Implementation/UserService.cs b/WardrobeManager.Api/Services/Implementation/UserService.cs
index 63bce2a..42ee7ae 100644
--- a/WardrobeManager.Api/Services/Implementation/UserService.cs
+++ b/WardrobeManager.Api/Services/Implementation/UserService.cs
@@ -8,6 +8,7 @@
 using WardrobeManager.Api.Database.Entities;
 using WardrobeManager.Api.Repositories;
 using WardrobeManager.Api.Services.Interfaces;
+using WardrobeManager.Shared.DTOs;
 using WardrobeManager.Shared.Enums;
 using WardrobeManager.Shared.Models;
 
diff --git a/WardrobeManager.Api/Services/Interfaces/IClothingService.cs b/WardrobeManager.Api/Services/Interfaces/IClothingService.cs
index 9182ebc..998cb91 100644
--- a/WardrobeManager.Api/Services/Interfaces/IClothingService.cs
+++ b/WardrobeManager.Api/Services/Interfaces/IClothingService.cs
@@ -1,6 +1,7 @@
 #region
 
 using WardrobeManager.Api.Database.Entities;
+using WardrobeManager.Shared.DTOs;
 using WardrobeManager.Shared.Enums;
 using WardrobeManager.Shared.Models;
 
@@ -9,7 +10,9 @@
 namespace WardrobeManager.Api.Services.Interfaces;
 public interface IClothingService
 {
-    Task<List<ClothingItem>?> GetAllClothingAsync(string userId);
+    Task<List<ClothingItemDTO>?> GetAllClothingAsync(string userId);
     
-    Task<ClothingItem?> GetClothingItemAsync(string userId, int itemId);
+    Task<ClothingItemDTO?> GetClothingItemAsync(string userId, int itemId);
+    Task AddNewClothingItem(string userId, NewClothingItemDTO newNewClothingItem);
+    Task RemoveClothingItem(string userId, int itemId);
 }
diff --git a/WardrobeManager.Api/Services/Interfaces/IUserService.cs b/WardrobeManager.Api/Services/Interfaces/IUserService.cs
index 1de68d7..7aba802 100644
--- a/WardrobeManager.Api/Services/Interfaces/IUserService.cs
+++ b/WardrobeManager.Api/Services/Interfaces/IUserService.cs
@@ -1,4 +1,5 @@
 using WardrobeManager.Api.Database.Entities;
+using WardrobeManager.Shared.DTOs;
 using WardrobeManager.Shared.Models;
 
 namespace WardrobeManager.Api.Services.Interfaces;
diff --git a/WardrobeManager.Presentation/Components/Shared/Image.razor b/WardrobeManager.Presentation/Components/Shared/Image.razor
index 337f93b..f705497 100644
--- a/WardrobeManager.Presentation/Components/Shared/Image.razor
+++ b/WardrobeManager.Presentation/Components/Shared/Image.razor
@@ -3,7 +3,7 @@
 <img src="@_config["WM_BACKEND_URL"]/images/@_imagePath" class="@Css"/>
 
 @code {
-    [Parameter] public required Guid? ImageGuid { get; set; }
+    [Parameter] public required string? ImageGuid { get; set; }
     [Parameter] public required string Css { get; set; }
 
     string _imagePath = string.Empty;
@@ -13,7 +13,7 @@
         // the way my api controller matches routes you need to supply a path for /images/{image_id}
         // because some clothing items can have no image the Guid with therefore be null and /images/ will be called which doesn't trigger the api
         // suppress nullable error because it doesn't realize i'm already checking it
-        _imagePath = (string.IsNullOrEmpty(ImageGuid.ToString()) ? "fakepath" : ImageGuid.ToString())!;
+        _imagePath = (string.IsNullOrEmpty(ImageGuid) ? "fakepath" : ImageGuid);
 
         await base.OnParametersSetAsync();
     }
diff --git a/WardrobeManager.Presentation/Components/Shared/Notifications.razor b/WardrobeManager.Presentation/Components/Shared/Notifications.razor
index 9f7257c..0b528f5 100644
--- a/WardrobeManager.Presentation/Components/Shared/Notifications.razor
+++ b/WardrobeManager.Presentation/Components/Shared/Notifications.razor
@@ -8,7 +8,7 @@
     {
         var cssClass = GetNotificationButtonType(notification.Type);
 
-        <Toast Show="@true">
+        <Toast Show="@true" >
             @notification.Message 
         </Toast>
     }
diff --git a/WardrobeManager.Presentation/CustomHttpMessageHandler.cs b/WardrobeManager.Presentation/CustomHttpMessageHandler.cs
new file mode 100644
index 0000000..e52288a
--- /dev/null
+++ b/WardrobeManager.Presentation/CustomHttpMessageHandler.cs
@@ -0,0 +1,49 @@
+#region
+
+using Microsoft.AspNetCore.Components.WebAssembly.Http;
+using WardrobeManager.Presentation.Services.Interfaces;
+using WardrobeManager.Shared.Enums;
+
+#endregion
+
+namespace WardrobeManager.Presentation;
+
+/// <summary>
+/// Handler to ensure cookie credentials are automatically sent over with each request.
+/// </summary>
+public class CustomHttpMessageHandler(INotificationService notificationService) : DelegatingHandler
+{
+    /// <summary>
+    /// Main method to override for the handler.
+    /// </summary>
+    /// <param name="request">The original request.</param>
+    /// <param name="cancellationToken">The token to handle cancellations.</param>
+    /// <returns>The <see cref="HttpResponseMessage"/>.</returns>
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        // include cookies!
+        request.SetBrowserRequestCredentials(BrowserRequestCredentials.Include);
+        request.Headers.Add("X-Requested-With", ["XMLHttpRequest"]);
+        
+        try
+        {
+            // This sends the actual HTTP request
+            var response = await base.SendAsync(request, cancellationToken);
+
+            // 1. Check for standard HTTP errors (like 404 Not Found, 500 Server Error)
+            if (!response.IsSuccessStatusCode)
+            {
+                notificationService.AddNotification($"Server Error: {(int)response.StatusCode}", NotificationType.Error);
+            }
+
+            return response;
+        }
+        catch (HttpRequestException ex) // 2. Catch network failures (offline, CORS, server dead)
+        {
+            notificationService.AddNotification($"HttpRequestException: {ex.Message}", NotificationType.Error);
+            // rethrow so exception is not lost, we just want to log it here.
+            // If we don't rethrow code called after the http request will still run
+            throw;  
+        }
+    }
+}
diff --git a/WardrobeManager.Presentation/Identity/CookieHandler.cs b/WardrobeManager.Presentation/Identity/CookieHandler.cs
deleted file mode 100644
index cee1447..0000000
--- a/WardrobeManager.Presentation/Identity/CookieHandler.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-#region
-
-using Microsoft.AspNetCore.Components.WebAssembly.Http;
-
-#endregion
-
-namespace WardrobeManager.Presentation.Identity;
-
-/// <summary>
-/// Handler to ensure cookie credentials are automatically sent over with each request.
-/// </summary>
-public class CookieHandler : DelegatingHandler
-{
-    /// <summary>
-    /// Main method to override for the handler.
-    /// </summary>
-    /// <param name="request">The original request.</param>
-    /// <param name="cancellationToken">The token to handle cancellations.</param>
-    /// <returns>The <see cref="HttpResponseMessage"/>.</returns>
-    protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-    {
-        // include cookies!
-        request.SetBrowserRequestCredentials(BrowserRequestCredentials.Include);
-        request.Headers.Add("X-Requested-With", ["XMLHttpRequest"]);
-
-        return base.SendAsync(request, cancellationToken);
-        
-        
-    }
-}
\ No newline at end of file
diff --git a/WardrobeManager.Presentation/HelperClasses.cs b/WardrobeManager.Presentation/Identity/CustomAuthorizationMessageHandler.cs
similarity index 85%
rename from WardrobeManager.Presentation/HelperClasses.cs
rename to WardrobeManager.Presentation/Identity/CustomAuthorizationMessageHandler.cs
index 6a18c1e..3f89b1e 100644
--- a/WardrobeManager.Presentation/HelperClasses.cs
+++ b/WardrobeManager.Presentation/Identity/CustomAuthorizationMessageHandler.cs
@@ -2,6 +2,8 @@
 
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using WardrobeManager.Presentation.Services.Interfaces;
+using WardrobeManager.Shared.Enums;
 
 #endregion
 
@@ -17,4 +19,4 @@ public CustomAuthorizationMessageHandler(IAccessTokenProvider provider,
             authorizedUrls: new[] { "https://localhost:7026" });
             //scopes: new[] { "example.read", "example.write" });
     }
-}
\ No newline at end of file
+}
diff --git a/WardrobeManager.Presentation/Layout/NavMenu.razor b/WardrobeManager.Presentation/Layout/NavMenu.razor
index 0debe40..2c7ed9b 100644
--- a/WardrobeManager.Presentation/Layout/NavMenu.razor
+++ b/WardrobeManager.Presentation/Layout/NavMenu.razor
@@ -49,54 +49,74 @@
                 </NotAuthorized>
                 <Authorized>
                         <div class="flex flex-wrap gap-3">
-                                <Button Type="ButtonType.Outline"
-                                        Text="Dashboard"
-                                        Icon="Home"
-                                />
-                                <Button Type="ButtonType.Outline"
-                                        Text="My Wardrobe"
-                                        Icon="Person"
-                                />
-                                <Button Type="ButtonType.Outline"
-                                        Text="Outfits"
-                                        Icon="Palette"
-                                />
-                                <Button Type="ButtonType.Outline"
-                                        Text="Planning"
-                                        Icon="Calendar_Month"
-                                />
-                                <Button Type="ButtonType.Outline"
-                                        Text="Analytics"
-                                        Icon="ssid_chart"
-                                />
-                                <Button Type="ButtonType.Primary"
-                                        Text="Add Item"
-                                        Icon="Add"
-                                />
-                                <Button Type="ButtonType.Secondary"
-                                        Text="Photo"
-                                        Icon="Camera"
-                                />
-                                <Button Type="ButtonType.Ghost"
-                                        Icon="Settings"
-                                />
-                                <Avatar Name="Musa Ahmed" Size="AvatarSize.Regular" Id="userPopover"
+
+                                <a href="/wardrobe">
+                                        <Button Type="ButtonType.Outline"
+                                                Text="My Wardrobe"
+                                                Icon="Person"/>
+                                </a>
+
+                                <a href="/outfits">
+                                        <Button Type="ButtonType.Outline"
+                                                Text="Outfits"
+                                                Icon="Palette"/>
+                                </a>
+
+                                <a href="/planning">
+                                        <Button Type="ButtonType.Outline"
+                                                Text="Planning"
+                                                Icon="Calendar_Month"/>
+                                </a>
+
+                                <a href="/analytics">
+                                        <Button Type="ButtonType.Outline"
+                                                Text="Analytics"
+                                                Icon="ssid_chart"/>
+                                </a>
+
+                                <a href="/add">
+                                        <Button Type="ButtonType.Primary"
+                                                Text="Add Item"
+                                                Icon="Add"/>
+                                </a>
+
+                                <a href="/photo">
+                                        <Button Type="ButtonType.Secondary"
+                                                Text="Photo"
+                                                Icon="Camera"/>
+                                </a>
+
+                                <a href="/settings">
+                                        <Button Type="ButtonType.Ghost"
+                                                Icon="Settings"/>
+                                </a>
+
+                                <Avatar Name="Musa Ahmed"
+                                        Size="AvatarSize.Regular"
+                                        Id="userPopover"
                                         OnClick="ViewModel.ToggleUserPopover"/>
-                                <Popover Show="ViewModel.ShowUserPopover" ParentId="userPopover"
+
+                                <Popover Show="ViewModel.ShowUserPopover"
+                                         ParentId="userPopover"
                                          Class="mt-[8vh] ml-[85vw]">
                                         <Card>
                                                 <CardHeader>
                                                         <h4 class="large">User Settings</h4>
-                                                        <p class="muted">Welcome @ViewModel.UsersName! Configure quick user options from here</p>
+                                                        <p class="muted">
+                                                                Welcome @ViewModel.UsersName! Configure quick user
+                                                                options from here
+                                                        </p>
                                                 </CardHeader>
                                                 <CardContent>
                                                         <div class="pb-4">
-                                                                <Button Type="ButtonType.Primary" Text="Log out"
+                                                                <Button Type="ButtonType.Primary"
+                                                                        Text="Log out"
                                                                         OnClick="@ViewModel.LogoutAsync"/>
                                                         </div>
                                                 </CardContent>
                                         </Card>
                                 </Popover>
+
                         </div>
                 </Authorized>
         </AuthorizeView>
diff --git a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
index 3b9b749..673f134 100644
--- a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
+++ b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
@@ -1,6 +1,52 @@
 @page "/add"
 @using WardrobeManager.Presentation.Components.Clothing
-
+@using WardrobeManager.Presentation.Components.FormItems
+@using WardrobeManager.Shared.StaticResources
 @namespace WardrobeManager.Presentation.Pages.Authenticated
+@inherits MvvmComponentBase<AddClothingItemViewModel>
+
+<div class="max-w-[50rem] w-full mx-auto flex flex-col gap-5 items-center">
+    <h1 class="heading-text">Add a clothing item</h1>
+    <div class="flex gap-10">
+        <EditForm class="flex flex-col gap-4 w-full max-w-100 mx-auto"
+                  Model="@ViewModel.NewNewClothingItem">
+            <Label Text="Name" Info="Choose a descriptive name for this item"/>
+            <Input TItem="string"
+                   Value="@ViewModel.NewNewClothingItem.Name"
+                   ValueChanged="@((newValue) => ViewModel.NewNewClothingItem.Name = newValue ?? "")"
+                   Placeholder="Familiar name for clothing item"
+            />
+
+            <Label Text="Category" Info="Why type of clothing is this?"/>
+            <Select TItem="ClothingCategory"
+                    Items="@ViewModel.ClothingCategories"
+                    Display="x => MiscMethods.GetNameWithSpacesAndEmoji(x)"
+                    SelectedItem="@ViewModel.NewNewClothingItem.Category"
+                    OnItemSelect="@((val) => ViewModel.NewNewClothingItem.Category = val)"
+                    Width="25rem"
+            />
+
+            <div class="flex flex-col gap-2 w-full">
+                <Label Text="Upload image" Info="Choose an image you think best represents this item"/>
+                <Button Type="ButtonType.Secondary" Width="100%">
+                    <InputFile accept="image/*" capture OnChange="@ViewModel.UploadImage" class=""/>
+                </Button>
+            </div>
+
+            <Button Type="ButtonType.Primary" Text="Create New Item" OnClick="@ViewModel.SubmitAsync"
+                    Class="self-center mt-6"/>
+        </EditForm>
+
+        @if (!string.IsNullOrEmpty(ViewModel.NewNewClothingItem.ImageBase64))
+        {
+            <div class="flex flex-col items-center h-full justify-around">
+                <h3 class="subheading-text">Uploaded Image</h3>
+                @{
+                    string src = $"data:image/png;base64, {ViewModel.NewNewClothingItem.ImageBase64}";
+                    <img src="@src" class="w-5/6 object-contain rounded-xl"/>
+                }
+            </div>
+        }
 
-<h1 class="text-4xl">Add Clothing Item!</h1>
\ No newline at end of file
+    </div>
+</div>
\ No newline at end of file
diff --git a/WardrobeManager.Presentation/Pages/Authenticated/Clothing.razor b/WardrobeManager.Presentation/Pages/Authenticated/Clothing.razor
deleted file mode 100644
index 4abcc4d..0000000
--- a/WardrobeManager.Presentation/Pages/Authenticated/Clothing.razor
+++ /dev/null
@@ -1,10 +0,0 @@
-@page "/clothing"
-@attribute [Authorize]
-
-
-@inject INotificationService _notificationService
-
-<PageTitle>Clothing</PageTitle>
-
-<h1 class="text-4xl">Dashboard!</h1>
-
diff --git a/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
new file mode 100644
index 0000000..2f1b934
--- /dev/null
+++ b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
@@ -0,0 +1,31 @@
+@page "/wardrobe"
+@attribute [Authorize]
+@using WardrobeManager.Shared.DTOs
+@inherits MvvmComponentBase<WardrobeViewModel>
+
+<PageTitle>Wardrobe</PageTitle>
+
+<div class="max-w-[80%] mx-auto w-full">
+    <h1 class="heading-text">View your wardrobe here</h1>
+
+    @if (@ViewModel.ClothingItems != null)
+    {
+        <DataTable Items="@ViewModel.ClothingItems" TItem="ClothingItemDTO">
+            <DataColumns>
+                <DataTableColumn>
+                    <Template>
+                        <Button Type="ButtonType.Destructive" Text="Delete" OnClick="@(() => ViewModel.RemoveItem(context.Id))"/>
+                    </Template>
+                </DataTableColumn>
+                <DataTableColumn Property="x => x.ImageGuid">
+                    <Template>
+                        <Image ImageGuid="@context.ImageGuid.ToString()" Css="h-full object-contain rounded-xl mx-auto mt-4 max-w-[5rem]"/>
+                    </Template>
+                </DataTableColumn>
+                <DataTableColumn Property="x => x.Name"/>
+                <DataTableColumn Property="x => x.Category"/>
+            </DataColumns>
+        </DataTable>
+    }
+
+</div>
\ No newline at end of file
diff --git a/WardrobeManager.Presentation/Pages/Public/Login.razor b/WardrobeManager.Presentation/Pages/Public/Login.razor
index b6116d8..d4ce391 100644
--- a/WardrobeManager.Presentation/Pages/Public/Login.razor
+++ b/WardrobeManager.Presentation/Pages/Public/Login.razor
@@ -7,7 +7,7 @@
 <div class="w-full bg-primary grow">
     <div class="max-w-90 mx-auto flex flex-col items-center justify-center h-full">
         <h2 class="heading-text text-primary-content">Log in</h2>
-        <EditForm class="w-full py-8 flex flex-col items-center gap-3" @ref="@ViewModel.EditForm"
+        <EditForm class="w-full py-8 flex flex-col items-center gap-3"
                   Model="@ViewModel.AuthenticationCredentialsModel" OnSubmit="@ViewModel.LoginAsync">
             <Input TItem="string"
                    Value="@ViewModel.AuthenticationCredentialsModel.Email"
diff --git a/WardrobeManager.Presentation/Program.cs b/WardrobeManager.Presentation/Program.cs
index a4399f4..8d6ab5d 100644
--- a/WardrobeManager.Presentation/Program.cs
+++ b/WardrobeManager.Presentation/Program.cs
@@ -19,13 +19,11 @@
 // https://learn.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-8.0
 string BackendUrl = builder.Configuration["WM_BACKEND_URL"] ?? throw new Exception("WM_BACKEND_URL: configuration value not set");
 
-Console.WriteLine("Hello man" + BackendUrl);
-
 builder.RootComponents.Add<App>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
 
 // Kind of like HttpClient middleware that adds a cookie to the request 
-builder.Services.AddTransient<CookieHandler>();
+builder.Services.AddTransient<CustomHttpMessageHandler>();
 
 // Setup authorization
 builder.Services.AddAuthorizationCore();
@@ -42,7 +40,7 @@
 // configure client for auth interactions
 builder.Services.AddHttpClient("Auth", opt => 
         opt.BaseAddress = new Uri(BackendUrl))
-    .AddHttpMessageHandler<CookieHandler>();
+    .AddHttpMessageHandler<CustomHttpMessageHandler>();
 
 // My Services
 builder.Services.AddScoped<IApiService, ApiService>(sp => new ApiService(BackendUrl, sp.GetRequiredService<IHttpClientFactory>()));
diff --git a/WardrobeManager.Presentation/Services/Implementation/ApiService.cs b/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
index b4057b9..addc167 100644
--- a/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
+++ b/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
@@ -3,6 +3,7 @@
 using System.Net.Http.Json;
 using WardrobeManager.Presentation.Services.Interfaces;
 using WardrobeManager.Shared.DTOs;
+using WardrobeManager.Shared.Enums;
 using WardrobeManager.Shared.Models;
 
 #endregion
@@ -13,6 +14,7 @@ public class ApiService : IAsyncDisposable, IApiService
 {
     private readonly string _apiEndpoint;
     private readonly HttpClient _httpClient;
+    private readonly INotificationService _notificationService;
 
     public ApiService(string apiEndpoint, IHttpClientFactory factory)
     {
@@ -20,6 +22,27 @@ public ApiService(string apiEndpoint, IHttpClientFactory factory)
         _httpClient = factory.CreateClient("Auth");
     }
 
+    #region Clothing
+
+    public async Task<List<ClothingItemDTO>> GetAllClothingItems()
+    {
+        return await _httpClient.GetFromJsonAsync<List<ClothingItemDTO>>("/clothing") ?? [];
+    }
+
+    public async Task AddNewClothingItem(NewClothingItemDTO newNewClothingItem)
+    {
+        await _httpClient.PostAsJsonAsync<NewClothingItemDTO>("/clothing/add", newNewClothingItem);
+    }
+
+    public async Task RemoveClothingItem(int itemId)
+    {
+        await _httpClient.PostAsJsonAsync<int>("/clothing/delete", itemId);
+    }
+
+    #endregion
+
+    #region Misc
+
     public async Task<bool> CheckApiConnection()
     {
         // Probably not the best way since this would require wrapping each method in a try/catch but it works for now
@@ -40,6 +63,10 @@ public async Task<HttpResponseMessage> AddLog(LogDTO log)
         return con;
     }
 
+    #endregion
+
+    #region Onboarding
+
     public async Task<bool> DoesAdminUserExist()
     {
         var res = await _httpClient.GetAsync("/does-admin-user-exist");
@@ -64,6 +91,8 @@ public async Task<bool> DoesAdminUserExist()
         return (res.IsSuccessStatusCode, content);
     }
 
+    #endregion
+
     public async ValueTask DisposeAsync()
     {
         _httpClient.Dispose();
diff --git a/WardrobeManager.Presentation/Services/Interfaces/IApiService.cs b/WardrobeManager.Presentation/Services/Interfaces/IApiService.cs
index 20627bf..819c622 100644
--- a/WardrobeManager.Presentation/Services/Interfaces/IApiService.cs
+++ b/WardrobeManager.Presentation/Services/Interfaces/IApiService.cs
@@ -9,14 +9,23 @@ namespace WardrobeManager.Presentation.Services.Interfaces;
 public interface IApiService
 {
     ValueTask DisposeAsync();
-
+    
+    // Clothing
+    Task<List<ClothingItemDTO>> GetAllClothingItems();
+    Task AddNewClothingItem(NewClothingItemDTO newNewClothingItem);
+    Task RemoveClothingItem( int itemId);
+    
     // Misc 
     Task<bool> CheckApiConnection();
     Task<HttpResponseMessage> AddLog(LogDTO log);
     
-    // User Management
+    // Onboarding
     Task<bool> DoesAdminUserExist();
     
-    // bool: succeeded?, string: text description
+    /// <summary>
+    /// Creates an admin user if one doesn't exist (used for onboarding) 
+    /// </summary>
+    /// <param name="credentials">Onboarding user credentials</param>
+    /// <returns>bool: succeeded, string: text description</returns>
     Task<(bool, string)> CreateAdminUserIfMissing(AdminUserCredentials credentials);
 }
diff --git a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
new file mode 100644
index 0000000..23b7eaa
--- /dev/null
+++ b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
@@ -0,0 +1,69 @@
+using Blazing.Mvvm.ComponentModel;
+using Blazing.Mvvm.Components;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel.__Internals;
+using Microsoft.AspNetCore.Components.Forms;
+using WardrobeManager.Presentation.Services.Interfaces;
+using WardrobeManager.Shared.DTOs;
+using WardrobeManager.Shared.Enums;
+using WardrobeManager.Shared.StaticResources;
+
+namespace WardrobeManager.Presentation.ViewModels;
+
+[ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
+public partial class AddClothingItemViewModel(
+    IMvvmNavigationManager navManager,
+    IApiService apiService,
+    INotificationService notificationService,
+    IConfiguration  configuration
+)
+    : ViewModelBase
+{
+    // Public Properties
+    [ObservableProperty]
+    private NewClothingItemDTO _newNewClothingItem = new NewClothingItemDTO("", ClothingCategory.None, "");
+
+    public ICollection<ClothingCategory> ClothingCategories { get; set; } =
+        MiscMethods.ConvertEnumToCollection<ClothingCategory>();
+
+    public async Task SubmitAsync()
+    {
+        await apiService.AddNewClothingItem(NewNewClothingItem);
+        notificationService.AddNotification($"Clothing Item {NewNewClothingItem.Name} Added!", NotificationType.Success);
+        NewNewClothingItem = new NewClothingItemDTO("", ClothingCategory.None, "");
+    }
+    
+    public async Task UploadImage(InputFileChangeEventArgs e)
+    {
+        try
+        {
+            var img = new MemoryStream();
+            
+            // 5MB default max file size
+            var maxFileSize = configuration["WM_MAX_IMAGE_UPLOAD_SIZE_IN_MB"];
+            int maxFileSizeNum;
+            if (maxFileSize == null)
+            {
+                maxFileSizeNum = ProjectConstants.MaxImageSizeInMBFallback;
+            }
+            else
+            {
+                maxFileSizeNum = Convert.ToInt32(maxFileSize);
+            }
+            maxFileSizeNum *= 1024 * 1024; // int to megabytes
+            
+            await e.File.OpenReadStream(maxAllowedSize: maxFileSizeNum).CopyToAsync(img);
+
+            NewNewClothingItem.ImageBase64 = Convert.ToBase64String(img.ToArray());
+
+            if (NewNewClothingItem.ImageBase64 == string.Empty)
+            {
+                notificationService.AddNotification("Image size too large, try again.", NotificationType.Warning);
+            }
+        }
+        catch (IOException ex)
+        {
+            notificationService.AddNotification($"Error uploading image: {ex.Message}", NotificationType.Error);
+        }
+    }
+}
\ No newline at end of file
diff --git a/WardrobeManager.Presentation/ViewModels/LoginViewModel.cs b/WardrobeManager.Presentation/ViewModels/LoginViewModel.cs
index 1f6f2c8..3a623ad 100644
--- a/WardrobeManager.Presentation/ViewModels/LoginViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/LoginViewModel.cs
@@ -23,8 +23,6 @@ IIdentityService identityService
     [ObservableProperty]
     private AuthenticationCredentialsModel _authenticationCredentialsModel = new();
 
-    public EditForm? EditForm { get; set; }
-
     // Public Methods
     // Stupid that i'm doing this but its the easiest solution and idk what the best method is
     public void SetEmail(string email)
diff --git a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
new file mode 100644
index 0000000..ef826c0
--- /dev/null
+++ b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
@@ -0,0 +1,34 @@
+using Blazing.Mvvm.ComponentModel;
+using Blazing.Mvvm.Components;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Web;
+using WardrobeManager.Presentation.Identity;
+using WardrobeManager.Presentation.Services.Interfaces;
+using WardrobeManager.Shared.DTOs;
+using WardrobeManager.Shared.Enums;
+using WardrobeManager.Shared.Models;
+
+namespace WardrobeManager.Presentation.ViewModels;
+
+[ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
+public partial class WardrobeViewModel(
+    IMvvmNavigationManager navManager,
+    IApiService apiService
+)
+    : ViewModelBase
+{
+   // Public Properties
+   [ObservableProperty] private List<ClothingItemDTO> _clothingItems;
+
+   public override async Task OnInitializedAsync()
+   {
+       ClothingItems = await apiService.GetAllClothingItems();
+   }
+
+   public async Task RemoveItem(int itemId)
+   {
+       await apiService.RemoveClothingItem(itemId);
+       ClothingItems = await apiService.GetAllClothingItems();
+   }
+}
\ No newline at end of file
diff --git a/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs b/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs
new file mode 100644
index 0000000..142733c
--- /dev/null
+++ b/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs
@@ -0,0 +1,18 @@
+#region
+
+using WardrobeManager.Shared.Enums;
+
+#endregion
+
+namespace WardrobeManager.Shared.DTOs;
+
+public class ClothingItemDTO
+{
+    public ClothingItemDTO() {}
+    
+    public int Id { get; set; }
+    public string Name { get; set; }
+    public ClothingCategory Category { get; set; }
+    public Guid? ImageGuid { get; set; }
+}
+
diff --git a/WardrobeManager.Shared/Models/EditedUserDTO.cs b/WardrobeManager.Shared/DTOs/EditedUserDTO.cs
similarity index 95%
rename from WardrobeManager.Shared/Models/EditedUserDTO.cs
rename to WardrobeManager.Shared/DTOs/EditedUserDTO.cs
index 105c7df..8a3e785 100644
--- a/WardrobeManager.Shared/Models/EditedUserDTO.cs
+++ b/WardrobeManager.Shared/DTOs/EditedUserDTO.cs
@@ -1,4 +1,4 @@
-namespace WardrobeManager.Shared.Models;
+namespace WardrobeManager.Shared.DTOs;
 
 /// <summary> DTO that client sends to edit their user details</summary>
 public class EditedUserDTO
diff --git a/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs b/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
new file mode 100644
index 0000000..ed59d1a
--- /dev/null
+++ b/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
@@ -0,0 +1,24 @@
+#region
+
+using WardrobeManager.Shared.Enums;
+
+#endregion
+
+namespace WardrobeManager.Shared.DTOs;
+
+public class NewClothingItemDTO
+{
+    public NewClothingItemDTO() {}
+    public NewClothingItemDTO(string name, ClothingCategory category, string imageBase64)
+    {
+        Name = name;
+        Category = category;
+        ImageBase64 = imageBase64;
+    }
+    
+    
+    public string Name { get; set; }
+    public ClothingCategory Category { get; set; }
+    public string? ImageBase64 { get; set; } 
+}
+
diff --git a/WardrobeManager.Shared/Models/NewOrEditedClothingItemDTO.cs b/WardrobeManager.Shared/DTOs/NewOrEditedClothingItemDTO.cs
similarity index 97%
rename from WardrobeManager.Shared/Models/NewOrEditedClothingItemDTO.cs
rename to WardrobeManager.Shared/DTOs/NewOrEditedClothingItemDTO.cs
index c9218c5..2c55a7c 100644
--- a/WardrobeManager.Shared/Models/NewOrEditedClothingItemDTO.cs
+++ b/WardrobeManager.Shared/DTOs/NewOrEditedClothingItemDTO.cs
@@ -4,7 +4,7 @@
 
 #endregion
 
-namespace WardrobeManager.Shared.Models;
+namespace WardrobeManager.Shared.DTOs;
 
 /// <summary> DTO that client sends to create new clothing item </summary>
 public class NewOrEditedClothingItemDTO
diff --git a/WardrobeManager.Shared/Models/ClientClothingItem.cs b/WardrobeManager.Shared/Models/ClientClothingItem.cs
deleted file mode 100644
index 03b267b..0000000
--- a/WardrobeManager.Shared/Models/ClientClothingItem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-#region
-
-using WardrobeManager.Shared.Enums;
-
-#endregion
-
-namespace WardrobeManager.Shared.Models;
-
-public class ClientClothingItem(string name, ClothingCategory category, string ImageBase64)
-{
-    public int Id { get; set; }
-    public string Name { get; set; } = name;
-    public ClothingCategory Category { get; set; } = category;
-    public string ImageBase64 { get; set; } = ImageBase64;
-}
-
diff --git a/WardrobeManager.Shared/StaticResources/MiscMethods.cs b/WardrobeManager.Shared/StaticResources/MiscMethods.cs
index 5b67805..c2a4a0c 100644
--- a/WardrobeManager.Shared/StaticResources/MiscMethods.cs
+++ b/WardrobeManager.Shared/StaticResources/MiscMethods.cs
@@ -2,6 +2,7 @@
 
 using System.Security.Cryptography;
 using System.Text.RegularExpressions;
+using WardrobeManager.Shared.DTOs;
 using WardrobeManager.Shared.Enums;
 using WardrobeManager.Shared.Models;
 
@@ -79,7 +80,7 @@ public static string GetNameWithSpacesFromEnum<T>(T givenEnum) where T : Enum {
         return $"{withSpaces}";
     }
     
-    public static bool IsValidBase64(string input)
+    public static bool IsValidBase64(string? input)
     {
         try
         {
@@ -96,4 +97,9 @@ public static bool IsValidBase64(string input)
 
         }
     }
+
+    public static ICollection<T> ConvertEnumToCollection<T>() where T : Enum
+    {
+        return Enum.GetValues(typeof(T)).Cast<T>().ToList();
+    }
 }
\ No newline at end of file
diff --git a/WardrobeManager.Shared/StaticResources/ProjectConstants.cs b/WardrobeManager.Shared/StaticResources/ProjectConstants.cs
index bfb5dd3..68933b5 100644
--- a/WardrobeManager.Shared/StaticResources/ProjectConstants.cs
+++ b/WardrobeManager.Shared/StaticResources/ProjectConstants.cs
@@ -10,4 +10,5 @@ public static class ProjectConstants
     public const string ProfileImage = "https://upload.internal.connectwithmusa.com/file/eel-falcon-pig";
     public const string DefaultItemImage = "/img/defaultItem.webp";
     public const string HomeBackgroundImage = "/img/home-background.webp";
+    public const int MaxImageSizeInMBFallback = 5;
 }

From bb6bb3121191d60e6eac4ab23aea3fe958745092 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 13:13:02 -0500
Subject: [PATCH 03/15] US-003 - Added size to clothing item and made pages
 responsive

---
 .../Database/Entities/ClothingItem.cs         |   1 +
 ...27172446_AddSizeToClothingItem.Designer.cs | 391 ++++++++++++++++++
 .../20260227172446_AddSizeToClothingItem.cs   |  29 ++
 .../DatabaseContextModelSnapshot.cs           |  63 +--
 .../Pages/Authenticated/AddClothingItem.razor |  21 +-
 .../Pages/Authenticated/Wardrobe.razor        |   9 +-
 .../ViewModels/AddClothingItemViewModel.cs    |  10 +-
 WardrobeManager.Presentation/tailwind.css     |  66 ++-
 .../wwwroot/css/custom.css                    |  51 ---
 .../wwwroot/css/sysinfocus-styles.css         |  32 +-
 .../wwwroot/index.html                        |   2 +-
 .../DTOs/ClothingItemDTO.cs                   |   1 +
 .../DTOs/NewClothingItemDTO.cs                |  15 +-
 .../DTOs/NewOrEditedClothingItemDTO.cs        |  38 --
 WardrobeManager.Shared/Enums/ClothingSize.cs  |  13 +
 .../StaticResources/MiscMethods.cs            |   6 -
 16 files changed, 579 insertions(+), 169 deletions(-)
 create mode 100644 WardrobeManager.Api/Migrations/20260227172446_AddSizeToClothingItem.Designer.cs
 create mode 100644 WardrobeManager.Api/Migrations/20260227172446_AddSizeToClothingItem.cs
 delete mode 100644 WardrobeManager.Shared/DTOs/NewOrEditedClothingItemDTO.cs
 create mode 100644 WardrobeManager.Shared/Enums/ClothingSize.cs

diff --git a/WardrobeManager.Api/Database/Entities/ClothingItem.cs b/WardrobeManager.Api/Database/Entities/ClothingItem.cs
index bc3c69a..5b805a9 100644
--- a/WardrobeManager.Api/Database/Entities/ClothingItem.cs
+++ b/WardrobeManager.Api/Database/Entities/ClothingItem.cs
@@ -50,6 +50,7 @@ public ClothingItem
     public string Name { get; set; }
     public ClothingCategory Category { get; set; } = ClothingCategory.None;
     public Season Season { get; set; } = Season.None;
+    public ClothingSize Size { get; set; } = ClothingSize.NotSpecified;
 
     public WearLocation WearLocation { get; set; } = WearLocation.None;
 
diff --git a/WardrobeManager.Api/Migrations/20260227172446_AddSizeToClothingItem.Designer.cs b/WardrobeManager.Api/Migrations/20260227172446_AddSizeToClothingItem.Designer.cs
new file mode 100644
index 0000000..1df3466
--- /dev/null
+++ b/WardrobeManager.Api/Migrations/20260227172446_AddSizeToClothingItem.Designer.cs
@@ -0,0 +1,391 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using WardrobeManager.Api.Database;
+
+#nullable disable
+
+namespace WardrobeManager.Api.Migrations
+{
+    [DbContext(typeof(DatabaseContext))]
+    [Migration("20260227172446_AddSizeToClothingItem")]
+    partial class AddSizeToClothingItem
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.3");
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.ClothingItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Category")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateUpdated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DesiredTimesWornBeforeWash")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Favourited")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("ImageGuid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastWorn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Season")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Size")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TimesWornSinceWash")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TimesWornTotal")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("WearLocation")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ClothingItems");
+                });
+
+            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.Log", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Origin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Logs");
+                });
+
+            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.User", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ProfilePictureBase64")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.HasOne("WardrobeManager.Api.Database.Entities.User", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("WardrobeManager.Api.Database.Entities.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("WardrobeManager.Api.Database.Entities.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("WardrobeManager.Api.Database.Entities.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("WardrobeManager.Api.Database.Entities.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.ClothingItem", b =>
+                {
+                    b.HasOne("WardrobeManager.Api.Database.Entities.User", "User")
+                        .WithMany("ServerClothingItems")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.User", b =>
+                {
+                    b.Navigation("Roles");
+
+                    b.Navigation("ServerClothingItems");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/WardrobeManager.Api/Migrations/20260227172446_AddSizeToClothingItem.cs b/WardrobeManager.Api/Migrations/20260227172446_AddSizeToClothingItem.cs
new file mode 100644
index 0000000..240826d
--- /dev/null
+++ b/WardrobeManager.Api/Migrations/20260227172446_AddSizeToClothingItem.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace WardrobeManager.Api.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddSizeToClothingItem : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "Size",
+                table: "ClothingItems",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Size",
+                table: "ClothingItems");
+        }
+    }
+}
diff --git a/WardrobeManager.Api/Migrations/DatabaseContextModelSnapshot.cs b/WardrobeManager.Api/Migrations/DatabaseContextModelSnapshot.cs
index 04ed636..e2e89a2 100644
--- a/WardrobeManager.Api/Migrations/DatabaseContextModelSnapshot.cs
+++ b/WardrobeManager.Api/Migrations/DatabaseContextModelSnapshot.cs
@@ -150,35 +150,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("AspNetUserTokens", (string)null);
                 });
 
-            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.Log", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("Created")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("Origin")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Logs");
-                });
-
-            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.ServerClothingItem", b =>
+            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.ClothingItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -212,6 +184,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<int>("Season")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int>("Size")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("TimesWornSinceWash")
                         .HasColumnType("INTEGER");
 
@@ -232,6 +207,34 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("ClothingItems");
                 });
 
+            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.Log", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Origin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Logs");
+                });
+
             modelBuilder.Entity("WardrobeManager.Api.Database.Entities.User", b =>
                 {
                     b.Property<string>("Id")
@@ -362,7 +365,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.ServerClothingItem", b =>
+            modelBuilder.Entity("WardrobeManager.Api.Database.Entities.ClothingItem", b =>
                 {
                     b.HasOne("WardrobeManager.Api.Database.Entities.User", "User")
                         .WithMany("ServerClothingItems")
diff --git a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
index 673f134..2e933e2 100644
--- a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
+++ b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
@@ -5,10 +5,10 @@
 @namespace WardrobeManager.Presentation.Pages.Authenticated
 @inherits MvvmComponentBase<AddClothingItemViewModel>
 
-<div class="max-w-[50rem] w-full mx-auto flex flex-col gap-5 items-center">
-    <h1 class="heading-text">Add a clothing item</h1>
-    <div class="flex gap-10">
-        <EditForm class="flex flex-col gap-4 w-full max-w-100 mx-auto"
+<div class="max-w-75 sm:max-w-200 w-full mx-auto flex flex-col gap-5 items-center pb-10">
+    <h1 class="subheading-text sm:heading-text text-center">Add a clothing item</h1>
+    <div class="flex gap-10 w-full">
+        <EditForm class="flex flex-col gap-4 w-full sm:max-w-100 mx-auto"
                   Model="@ViewModel.NewNewClothingItem">
             <Label Text="Name" Info="Choose a descriptive name for this item"/>
             <Input TItem="string"
@@ -17,13 +17,22 @@
                    Placeholder="Familiar name for clothing item"
             />
 
-            <Label Text="Category" Info="Why type of clothing is this?"/>
+            <Label Text="Category" Info="What type of clothing is this?"/>
             <Select TItem="ClothingCategory"
                     Items="@ViewModel.ClothingCategories"
                     Display="x => MiscMethods.GetNameWithSpacesAndEmoji(x)"
                     SelectedItem="@ViewModel.NewNewClothingItem.Category"
                     OnItemSelect="@((val) => ViewModel.NewNewClothingItem.Category = val)"
-                    Width="25rem"
+                    Width="100%"
+            />
+            
+            <Label Text="Size" />
+            <Select TItem="ClothingSize"
+                    Items="@ViewModel.ClothingSizes"
+                    Display="x => MiscMethods.GetNameWithSpacesFromEnum(x)"
+                    SelectedItem="@ViewModel.NewNewClothingItem.Size"
+                    OnItemSelect="@((val) => ViewModel.NewNewClothingItem.Size = val)"
+                    Width="100%"
             />
 
             <div class="flex flex-col gap-2 w-full">
diff --git a/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
index 2f1b934..0d827c2 100644
--- a/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
+++ b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
@@ -5,25 +5,26 @@
 
 <PageTitle>Wardrobe</PageTitle>
 
-<div class="max-w-[80%] mx-auto w-full">
-    <h1 class="heading-text">View your wardrobe here</h1>
+<div class="max-w-[80%] mx-auto w-full text-center">
+    <h1 class="sm:heading-text subheading-text">View your wardrobe here</h1>
 
     @if (@ViewModel.ClothingItems != null)
     {
         <DataTable Items="@ViewModel.ClothingItems" TItem="ClothingItemDTO">
             <DataColumns>
-                <DataTableColumn>
+                <DataTableColumn Property="x => x.Id" Header="Actions">
                     <Template>
                         <Button Type="ButtonType.Destructive" Text="Delete" OnClick="@(() => ViewModel.RemoveItem(context.Id))"/>
                     </Template>
                 </DataTableColumn>
                 <DataTableColumn Property="x => x.ImageGuid">
                     <Template>
-                        <Image ImageGuid="@context.ImageGuid.ToString()" Css="h-full object-contain rounded-xl mx-auto mt-4 max-w-[5rem]"/>
+                        <Image ImageGuid="@context.ImageGuid.ToString()" Css="h-full object-contain rounded-xl max-w-[3rem] w-full"/>
                     </Template>
                 </DataTableColumn>
                 <DataTableColumn Property="x => x.Name"/>
                 <DataTableColumn Property="x => x.Category"/>
+                <DataTableColumn Property="x => x.Size"/>
             </DataColumns>
         </DataTable>
     }
diff --git a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
index 23b7eaa..8d1e5c1 100644
--- a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
@@ -21,16 +21,16 @@ IConfiguration  configuration
 {
     // Public Properties
     [ObservableProperty]
-    private NewClothingItemDTO _newNewClothingItem = new NewClothingItemDTO("", ClothingCategory.None, "");
+    private NewClothingItemDTO _newNewClothingItem = new NewClothingItemDTO();
 
-    public ICollection<ClothingCategory> ClothingCategories { get; set; } =
-        MiscMethods.ConvertEnumToCollection<ClothingCategory>();
+    public ICollection<ClothingCategory> ClothingCategories { get; set; } = MiscMethods.ConvertEnumToCollection<ClothingCategory>();
+    public ICollection<ClothingSize> ClothingSizes { get; set; } = MiscMethods.ConvertEnumToCollection<ClothingSize>();
 
     public async Task SubmitAsync()
     {
         await apiService.AddNewClothingItem(NewNewClothingItem);
-        notificationService.AddNotification($"Clothing Item {NewNewClothingItem.Name} Added!", NotificationType.Success);
-        NewNewClothingItem = new NewClothingItemDTO("", ClothingCategory.None, "");
+        notificationService.AddNotification($"Clothing Item \"{NewNewClothingItem.Name}\" Added!", NotificationType.Success);
+        NewNewClothingItem = new NewClothingItemDTO();
     }
     
     public async Task UploadImage(InputFileChangeEventArgs e)
diff --git a/WardrobeManager.Presentation/tailwind.css b/WardrobeManager.Presentation/tailwind.css
index d34b175..e45a7c2 100644
--- a/WardrobeManager.Presentation/tailwind.css
+++ b/WardrobeManager.Presentation/tailwind.css
@@ -16,4 +16,68 @@
   ::file-selector-button {
     border-color: var(--color-gray-200, currentcolor);
   }
-}
\ No newline at end of file
+}
+
+@theme {
+    --font-serif: "DM Serif Display", serif;
+    --font-sans: "DM Sans", sans-serif;
+
+    --font-size-title: 6rem;
+    --font-size-heading: 4rem;
+    --font-size-subheading: 2.25rem;
+    --font-size-subtitle: 1.5rem;
+    --font-size-body: 1rem;
+    --font-size-small: 0.7rem;
+}
+
+
+@utility title-text {
+    font-family: theme(--font-serif);
+    font-weight: 400;
+    font-style: normal;
+    font-size: theme(--font-size-title);
+}
+
+@utility title-text-italic {
+    font-family: theme(--font-serif);
+    font-weight: 400;
+    font-style: italic;
+    font-size: theme(--font-size-title);
+}
+
+@utility heading-text {
+    font-family: theme(--font-serif);
+    font-weight: 400;
+    font-style: normal;
+    font-size: theme(--font-size-heading);
+}
+
+@utility subheading-text {
+    font-family: theme(--font-serif);
+    font-weight: 400;
+    font-style: normal;
+    font-size: theme(--font-size-subheading);
+}
+
+@utility subtitle-text {
+    font-family: theme(--font-sans);
+    font-weight: 400;
+    font-style: normal;
+    font-size: theme(--font-size-subtitle);
+}
+
+@utility body-text {
+    font-family: theme(--font-sans);
+    font-optical-sizing: auto;
+    font-weight: 400;
+    font-style: normal;
+    font-size: theme(--font-size-body);
+}
+
+@utility small-text {
+    font-family: theme(--font-sans);
+    font-optical-sizing: auto;
+    font-weight: 400;
+    font-style: normal;
+    font-size: theme(--font-size-small);
+}
diff --git a/WardrobeManager.Presentation/wwwroot/css/custom.css b/WardrobeManager.Presentation/wwwroot/css/custom.css
index c34cffe..e69de29 100644
--- a/WardrobeManager.Presentation/wwwroot/css/custom.css
+++ b/WardrobeManager.Presentation/wwwroot/css/custom.css
@@ -1,51 +0,0 @@
-/* Font Classes with size */
-.title-text {
-    font-family: "DM Serif Display", serif;
-    font-weight: 400;
-    font-style: normal;
-    font-size: 6rem;
-}
-
-.title-text-italic {
-    font-family: "DM Serif Display", serif;
-    font-weight: 400;
-    font-style: italic;
-    font-size: 6rem;
-}
-
-.heading-text {
-    font-family: "DM Serif Display", serif;
-    font-weight: 400;
-    font-style: normal;
-    font-size: 4rem;
-}
-
-.subheading-text {
-    font-family: "DM Serif Display", serif;
-    font-weight: 400;
-    font-style: normal;
-    font-size: 2.25rem;
-}
-
-.subtitle-text {
-    font-family: "DM Sans", sans-serif;
-    font-weight: 400;
-    font-style: normal;
-    font-size: 1.5rem;
-}
-
-.body-text {
-    font-family: "DM Sans", sans-serif;
-    font-optical-sizing: auto;
-    font-weight: 400; /* 100-1000 */
-    font-style: normal;
-    font-size: 1rem;
-}
-
-.small-text{
-    font-family: "DM Sans", sans-serif;
-    font-optical-sizing: auto;
-    font-weight: 400; /* 100-1000 */
-    font-style: normal;
-    font-size: 0.7rem;
-}
diff --git a/WardrobeManager.Presentation/wwwroot/css/sysinfocus-styles.css b/WardrobeManager.Presentation/wwwroot/css/sysinfocus-styles.css
index cde812d..512d953 100644
--- a/WardrobeManager.Presentation/wwwroot/css/sysinfocus-styles.css
+++ b/WardrobeManager.Presentation/wwwroot/css/sysinfocus-styles.css
@@ -289,25 +289,25 @@ input, textarea, select, button {
     gap: 12px;
 }
 
-h1 {
-    font-size: 36px;
-    letter-spacing: -0.85px;
-}
+/*h1 {*/
+/*    font-size: 36px;*/
+/*    letter-spacing: -0.85px;*/
+/*}*/
 
-h2 {
-    font-size: 30px;
-    letter-spacing: -0.85px;
-}
+/*h2 {*/
+/*    font-size: 30px;*/
+/*    letter-spacing: -0.85px;*/
+/*}*/
 
-h3 {
-    font-size: 24px;
-    letter-spacing: -0.85px;
-}
+/*h3 {*/
+/*    font-size: 24px;*/
+/*    letter-spacing: -0.85px;*/
+/*}*/
 
-h4 {
-    font-size: 20px;
-    letter-spacing: -0.25px;
-}
+/*h4 {*/
+/*    font-size: 20px;*/
+/*    letter-spacing: -0.25px;*/
+/*}*/
 
 .lead {
     font-size: 20px;
diff --git a/WardrobeManager.Presentation/wwwroot/index.html b/WardrobeManager.Presentation/wwwroot/index.html
index 7333cf8..54ce78e 100644
--- a/WardrobeManager.Presentation/wwwroot/index.html
+++ b/WardrobeManager.Presentation/wwwroot/index.html
@@ -14,7 +14,7 @@
 <!--    <link rel="stylesheet" href="_content/Sysinfocus.AspNetCore.Components/styles.css">-->
     <link rel="stylesheet" href="_content/Sysinfocus.AspNetCore.Components/Sysinfocus.AspNetCore.Components.bundle.scp.css">
     <link href="./css/tailwind.css" rel="stylesheet" type="text/css">
-    <link href="./css/custom.css" rel="stylesheet" type="text/css" />
+<!--    <link href="./css/custom.css" rel="stylesheet" type="text/css" />-->
     <link href="./css/sysinfocus-styles.css" rel="stylesheet" type="text/css" />
 
     <!-- JS -->
diff --git a/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs b/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs
index 142733c..9a75432 100644
--- a/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs
+++ b/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs
@@ -13,6 +13,7 @@ public ClothingItemDTO() {}
     public int Id { get; set; }
     public string Name { get; set; }
     public ClothingCategory Category { get; set; }
+    public ClothingSize Size { get; set; }
     public Guid? ImageGuid { get; set; }
 }
 
diff --git a/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs b/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
index ed59d1a..0ae14c2 100644
--- a/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
+++ b/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
@@ -9,16 +9,9 @@ namespace WardrobeManager.Shared.DTOs;
 public class NewClothingItemDTO
 {
     public NewClothingItemDTO() {}
-    public NewClothingItemDTO(string name, ClothingCategory category, string imageBase64)
-    {
-        Name = name;
-        Category = category;
-        ImageBase64 = imageBase64;
-    }
-    
-    
-    public string Name { get; set; }
-    public ClothingCategory Category { get; set; }
-    public string? ImageBase64 { get; set; } 
+    public string Name { get; set; } = string.Empty;
+    public ClothingCategory Category { get; set; }  = ClothingCategory.None;
+    public string? ImageBase64 { get; set; } = null;
+    public ClothingSize Size { get; set; }  = ClothingSize.NotSpecified;
 }
 
diff --git a/WardrobeManager.Shared/DTOs/NewOrEditedClothingItemDTO.cs b/WardrobeManager.Shared/DTOs/NewOrEditedClothingItemDTO.cs
deleted file mode 100644
index 2c55a7c..0000000
--- a/WardrobeManager.Shared/DTOs/NewOrEditedClothingItemDTO.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-#region
-
-using WardrobeManager.Shared.Enums;
-
-#endregion
-
-namespace WardrobeManager.Shared.DTOs;
-
-/// <summary> DTO that client sends to create new clothing item </summary>
-public class NewOrEditedClothingItemDTO
-{
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-    public NewOrEditedClothingItemDTO() { } // ONLY FOR DESERIALIZER. THIS SHIT BETTER HAVE NO REFERENCES
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-
-
-    public NewOrEditedClothingItemDTO
-        (
-         string name, ClothingCategory category, Season season, bool favourited,
-         WearLocation wearLocation, int desiredTimesWornBeforeWash, string imageBase64
-        ) {
-            this.Name = name;
-            this.Category = category;
-            this.Season = season;
-            this.Favourited = favourited;
-            this.WearLocation = wearLocation;
-            this.DesiredTimesWornBeforeWash = desiredTimesWornBeforeWash;
-            this.ImageBase64 = imageBase64;
-        }
-
-    public string Name { get; set; }
-    public ClothingCategory Category { get; set; }
-    public Season Season { get; set; }
-    public bool Favourited { get; set; }
-    public WearLocation WearLocation { get; set; }
-    public int DesiredTimesWornBeforeWash { get; set; }
-    public string ImageBase64 { get; set; }
-}
diff --git a/WardrobeManager.Shared/Enums/ClothingSize.cs b/WardrobeManager.Shared/Enums/ClothingSize.cs
new file mode 100644
index 0000000..7eaea5d
--- /dev/null
+++ b/WardrobeManager.Shared/Enums/ClothingSize.cs
@@ -0,0 +1,13 @@
+namespace WardrobeManager.Shared.Enums;
+
+public enum ClothingSize
+{
+    NotSpecified = 0,
+    ExtraExtraSmall = 1,
+    ExtraSmall = 2,
+    Small = 3,
+    Medium = 4,
+    Large = 5,
+    ExtraLarge = 6,
+    ExtraExtraLarge = 7,
+}
\ No newline at end of file
diff --git a/WardrobeManager.Shared/StaticResources/MiscMethods.cs b/WardrobeManager.Shared/StaticResources/MiscMethods.cs
index c2a4a0c..7b3a5cd 100644
--- a/WardrobeManager.Shared/StaticResources/MiscMethods.cs
+++ b/WardrobeManager.Shared/StaticResources/MiscMethods.cs
@@ -12,12 +12,6 @@ namespace WardrobeManager.Shared.StaticResources;
 
 public static class MiscMethods
 {
-    
-    public static NewOrEditedClothingItemDTO CreateDefaultNewOrEditedClothingItemDTO() {
-        return new NewOrEditedClothingItemDTO("My Favourite Green T-Shirt", ClothingCategory.TShirt, Season.Fall, false, WearLocation.HomeAndOutside, 5, "");
-    }
-    
-    // This is by no means actually random
     public static string GenerateRandomId()
     {
         const string chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

From 44fb677b93e9593fd252f1f3ebf38c6139bcf0a1 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 13:41:59 -0500
Subject: [PATCH 04/15] US-003 - Adding Delete Confirmation

---
 .../Pages/Authenticated/Wardrobe.razor        | 18 +++++++++++++++--
 .../ViewModels/WardrobeViewModel.cs           | 20 ++++++++++++++++++-
 .../WardrobeManager.Presentation.csproj       |  1 +
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
index 0d827c2..2364a17 100644
--- a/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
+++ b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
@@ -14,10 +14,24 @@
             <DataColumns>
                 <DataTableColumn Property="x => x.Id" Header="Actions">
                     <Template>
-                        <Button Type="ButtonType.Destructive" Text="Delete" OnClick="@(() => ViewModel.RemoveItem(context.Id))"/>
+                        <Button Type="ButtonType.Destructive" Text="Delete" OnClick="() => ViewModel.ActionDialogStates[context.Id].ShowDelete = true"/>
+                        <Dialog Show="@ViewModel.ActionDialogStates[context.Id].ShowDelete" OnClose="() => ViewModel.ActionDialogStates[context.Id].ShowDelete = false">
+                            <Header>
+                                <div class="flex-col flex g4">
+                                    <p class="large">Are you sure you want to delete this item?</p>
+                                    <p class="muted">This action is permanent.</p>
+                                </div>
+                            </Header>
+                            <Content>
+                                <p>blah</p>
+                            </Content>
+                            <Footer>
+                                <Button Type="ButtonType.Destructive" Text="Delete" OnClick="() => ViewModel.RemoveItem(context.Id)"/>
+                            </Footer>
+                        </Dialog>
                     </Template>
                 </DataTableColumn>
-                <DataTableColumn Property="x => x.ImageGuid">
+                <DataTableColumn Property="@(x => x.ImageGuid ?? Guid.NewGuid() )">
                     <Template>
                         <Image ImageGuid="@context.ImageGuid.ToString()" Css="h-full object-contain rounded-xl max-w-[3rem] w-full"/>
                     </Template>
diff --git a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
index ef826c0..208967e 100644
--- a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
@@ -20,15 +20,33 @@ IApiService apiService
 {
    // Public Properties
    [ObservableProperty] private List<ClothingItemDTO> _clothingItems;
+   [ObservableProperty] private Dictionary<int, ShowActionDialog> _actionDialogStates;
+   private bool show;
 
    public override async Task OnInitializedAsync()
+   {
+       await FetchItemAndUpdate();
+   }
+
+   public async Task FetchItemAndUpdate()
    {
        ClothingItems = await apiService.GetAllClothingItems();
+       ActionDialogStates = new Dictionary<int, ShowActionDialog>();
+       foreach (var item in ClothingItems)
+       {
+           ActionDialogStates.Add(item.Id, new ShowActionDialog());
+       }
    }
 
    public async Task RemoveItem(int itemId)
    {
        await apiService.RemoveClothingItem(itemId);
-       ClothingItems = await apiService.GetAllClothingItems();
+       await FetchItemAndUpdate();
    }
+}
+
+public record ShowActionDialog
+{
+    public bool ShowDelete = false;
+    public bool ShowEdit = false;
 }
\ No newline at end of file
diff --git a/WardrobeManager.Presentation/WardrobeManager.Presentation.csproj b/WardrobeManager.Presentation/WardrobeManager.Presentation.csproj
index a01caed..7ec690a 100644
--- a/WardrobeManager.Presentation/WardrobeManager.Presentation.csproj
+++ b/WardrobeManager.Presentation/WardrobeManager.Presentation.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>cbbf5e07-4619-4677-ae57-34c9bddbe174</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

From 8810b087af8ca75dc23a2cb77c57b6e58749de66 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 13:54:08 -0500
Subject: [PATCH 05/15] US-003 - Delete confirmation working

---
 .../Pages/Authenticated/Wardrobe.razor        |  9 +-
 .../ViewModels/WardrobeViewModel.cs           | 99 ++++++++++++++-----
 2 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
index 2364a17..c17c2b5 100644
--- a/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
+++ b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
@@ -1,6 +1,7 @@
 @page "/wardrobe"
 @attribute [Authorize]
 @using WardrobeManager.Shared.DTOs
+@using ActionType = WardrobeManager.Presentation.ViewModels.ActionType
 @inherits MvvmComponentBase<WardrobeViewModel>
 
 <PageTitle>Wardrobe</PageTitle>
@@ -8,14 +9,14 @@
 <div class="max-w-[80%] mx-auto w-full text-center">
     <h1 class="sm:heading-text subheading-text">View your wardrobe here</h1>
 
-    @if (@ViewModel.ClothingItems != null)
+    @if (ViewModel.ClothingItems != null)
     {
         <DataTable Items="@ViewModel.ClothingItems" TItem="ClothingItemDTO">
             <DataColumns>
                 <DataTableColumn Property="x => x.Id" Header="Actions">
                     <Template>
-                        <Button Type="ButtonType.Destructive" Text="Delete" OnClick="() => ViewModel.ActionDialogStates[context.Id].ShowDelete = true"/>
-                        <Dialog Show="@ViewModel.ActionDialogStates[context.Id].ShowDelete" OnClose="() => ViewModel.ActionDialogStates[context.Id].ShowDelete = false">
+                        <Button Type="ButtonType.Destructive" Text="Delete" OnClick="() => ViewModel.UpdateActionDialogState(context.Id, ActionType.Delete, true)"/>
+                        <Dialog Show="ViewModel.GetActionStateSafely(context.Id, ActionType.Delete)" OnClose="() => ViewModel.UpdateActionDialogState(context.Id, ActionType.Delete, false)">
                             <Header>
                                 <div class="flex-col flex g4">
                                     <p class="large">Are you sure you want to delete this item?</p>
@@ -23,7 +24,7 @@
                                 </div>
                             </Header>
                             <Content>
-                                <p>blah</p>
+                                <p>Item Name: @context.Name</p>
                             </Content>
                             <Footer>
                                 <Button Type="ButtonType.Destructive" Text="Delete" OnClick="() => ViewModel.RemoveItem(context.Id)"/>
diff --git a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
index 208967e..cead7ab 100644
--- a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
@@ -14,39 +14,86 @@ namespace WardrobeManager.Presentation.ViewModels;
 [ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
 public partial class WardrobeViewModel(
     IMvvmNavigationManager navManager,
-    IApiService apiService
+    IApiService apiService,
+    INotificationService notificationService
 )
     : ViewModelBase
 {
-   // Public Properties
-   [ObservableProperty] private List<ClothingItemDTO> _clothingItems;
-   [ObservableProperty] private Dictionary<int, ShowActionDialog> _actionDialogStates;
-   private bool show;
-
-   public override async Task OnInitializedAsync()
-   {
-       await FetchItemAndUpdate();
-   }
-
-   public async Task FetchItemAndUpdate()
-   {
-       ClothingItems = await apiService.GetAllClothingItems();
-       ActionDialogStates = new Dictionary<int, ShowActionDialog>();
-       foreach (var item in ClothingItems)
-       {
-           ActionDialogStates.Add(item.Id, new ShowActionDialog());
-       }
-   }
-
-   public async Task RemoveItem(int itemId)
-   {
-       await apiService.RemoveClothingItem(itemId);
-       await FetchItemAndUpdate();
-   }
+    // Public Properties
+    [ObservableProperty] private List<ClothingItemDTO>? _clothingItems;
+
+    [ObservableProperty]
+    private Dictionary<int, ShowActionDialog> _actionDialogStates = new Dictionary<int, ShowActionDialog>();
+
+    public override async Task OnInitializedAsync()
+    {
+        await FetchItemAndUpdate();
+    }
+
+    public async Task FetchItemAndUpdate()
+    {
+        ClothingItems = await apiService.GetAllClothingItems();
+        // Reset dialogs states (in case items are removed, they wont exist in this anymore)
+        ActionDialogStates = new Dictionary<int, ShowActionDialog>();
+        foreach (var item in ClothingItems)
+        {
+            ActionDialogStates.Add(item.Id, new ShowActionDialog());
+        }
+    }
+
+    public async Task RemoveItem(int itemId)
+    {
+        await apiService.RemoveClothingItem(itemId);
+        await FetchItemAndUpdate();
+    }
+
+    public void UpdateActionDialogState(int itemId, ActionType actionType, bool value)
+    {
+        if (ActionDialogStates.ContainsKey(itemId))
+        {
+            switch(actionType)
+            {
+               case ActionType.Delete:
+                   ActionDialogStates[itemId].ShowDelete = value;
+                   break;
+               case ActionType.Edit:
+                   ActionDialogStates[itemId].ShowEdit = value;
+                   break;
+               default:
+                   notificationService.AddNotification("Action type not recognized!", NotificationType.Warning);
+                   break;
+            }
+        }
+        else
+        {
+            notificationService.AddNotification("Cannot change dialog state for not existing item!", NotificationType.Error);
+        }
+    }
+
+    public bool GetActionStateSafely(int itemId, ActionType actionType)
+    {
+        if (ActionDialogStates.ContainsKey(itemId))
+        {
+            switch (actionType)
+            {
+                case ActionType.Delete:
+                    return ActionDialogStates[itemId].ShowDelete;
+                case ActionType.Edit:
+                    return ActionDialogStates[itemId].ShowEdit;
+            }
+        }
+        return false;
+    }
 }
 
 public record ShowActionDialog
 {
     public bool ShowDelete = false;
     public bool ShowEdit = false;
+}
+
+public enum ActionType
+{
+    Delete,
+    Edit,
 }
\ No newline at end of file

From be5c379dfe11442055d22ebc1295fa0805b44064 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 14:15:44 -0500
Subject: [PATCH 06/15] US-003 - Move deleted images to deleted folder
 (groundwork for "restore deleted items" feature)

---
 .../Services/Implementation/ClothingService.cs  | 10 +++++++++-
 .../Implementation/DataDirectoryService.cs      |  6 ++++++
 .../Services/Implementation/FileService.cs      | 17 +++++++++++++++++
 .../Interfaces/IDataDirectoryService.cs         |  1 +
 .../Services/Interfaces/IFileService.cs         |  3 ++-
 5 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/WardrobeManager.Api/Services/Implementation/ClothingService.cs b/WardrobeManager.Api/Services/Implementation/ClothingService.cs
index 40990f3..9415528 100644
--- a/WardrobeManager.Api/Services/Implementation/ClothingService.cs
+++ b/WardrobeManager.Api/Services/Implementation/ClothingService.cs
@@ -17,7 +17,11 @@
 
 namespace WardrobeManager.Api.Services.Implementation;
 
-public class ClothingService(IClothingRepository clothingRepository, IMapper mapper, IFileService fileService, ILogger<ClothingService> logger)
+public class ClothingService(
+    IClothingRepository clothingRepository,
+    IMapper mapper,
+    IFileService fileService,
+    ILogger<ClothingService> logger)
     : IClothingService
 {
     // ---- Methods for multiple clothing items ---
@@ -58,6 +62,10 @@ public async Task RemoveClothingItem(string userId, int itemId)
         {
             clothingRepository.Remove(res);
             await clothingRepository.SaveAsync();
+            if (res.ImageGuid != null)
+            {
+                await fileService.DeleteImage((Guid)res.ImageGuid);
+            }
         }
         else
         {
diff --git a/WardrobeManager.Api/Services/Implementation/DataDirectoryService.cs b/WardrobeManager.Api/Services/Implementation/DataDirectoryService.cs
index 761ff41..5308cb3 100644
--- a/WardrobeManager.Api/Services/Implementation/DataDirectoryService.cs
+++ b/WardrobeManager.Api/Services/Implementation/DataDirectoryService.cs
@@ -44,4 +44,10 @@ public string GetUploadsDirectory()
         Directory.CreateDirectory(path);
         return path;
     }
+    public string GetDeletedUploadsDirectory()
+    {
+        var path = Path.Combine(GetImagesDirectory(), "deleted");
+        Directory.CreateDirectory(path);
+        return path;
+    }
 }
\ No newline at end of file
diff --git a/WardrobeManager.Api/Services/Implementation/FileService.cs b/WardrobeManager.Api/Services/Implementation/FileService.cs
index c698e55..570caf1 100644
--- a/WardrobeManager.Api/Services/Implementation/FileService.cs
+++ b/WardrobeManager.Api/Services/Implementation/FileService.cs
@@ -1,5 +1,6 @@
 #region
 
+using SQLitePCL;
 using WardrobeManager.Api.Services.Interfaces;
 
 #endregion
@@ -9,6 +10,7 @@ namespace WardrobeManager.Api.Services.Implementation;
 public class FileService(
     IDataDirectoryService dataDirectoryService,
     IWebHostEnvironment webHostEnvironment,
+    ILogger<FileService> logger,
     IConfiguration configuration)
     : IFileService
 {
@@ -63,4 +65,19 @@ public async Task<byte[]> GetImage(string guid)
             return imageBytes;
         }
     }
+
+    public async Task DeleteImage(Guid givenGuid)
+    {
+        var guid = ParseGuid(givenGuid);
+        string path = Path.Combine(dataDirectoryService.GetUploadsDirectory(), guid);
+        string deletePath = Path.Combine(dataDirectoryService.GetDeletedUploadsDirectory(), guid);
+
+        if (File.Exists(path))
+        {
+            File.Move(path, deletePath);
+            return;
+        }
+
+        logger.LogError($"Could not delete image {guid} as it does not exist");
+    }
 }
\ No newline at end of file
diff --git a/WardrobeManager.Api/Services/Interfaces/IDataDirectoryService.cs b/WardrobeManager.Api/Services/Interfaces/IDataDirectoryService.cs
index 047cb9f..9fed5fe 100644
--- a/WardrobeManager.Api/Services/Interfaces/IDataDirectoryService.cs
+++ b/WardrobeManager.Api/Services/Interfaces/IDataDirectoryService.cs
@@ -6,4 +6,5 @@ public interface IDataDirectoryService
     public string GetDatabaseDirectory();
     public string GetImagesDirectory();
     public string GetUploadsDirectory();
+    public string GetDeletedUploadsDirectory();
 }
diff --git a/WardrobeManager.Api/Services/Interfaces/IFileService.cs b/WardrobeManager.Api/Services/Interfaces/IFileService.cs
index 91ba561..b776a4a 100644
--- a/WardrobeManager.Api/Services/Interfaces/IFileService.cs
+++ b/WardrobeManager.Api/Services/Interfaces/IFileService.cs
@@ -7,5 +7,6 @@ public interface IFileService
     /// <returns>byte array of image </returns>
     Task<byte[]> GetImage(string guid);
     string ParseGuid(Guid guid);
-    Task SaveImage(Guid? guid, string ImageBase64);
+    Task SaveImage(Guid? guid, string imageBase64);
+    Task DeleteImage(Guid givenGuid);
 }

From 734283c5f00e122a45fdd99bffb43bc0c9a7dc5f Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 14:31:53 -0500
Subject: [PATCH 07/15] US-003 - Add client side validation

---
 .../Services/Implementation/FileService.cs    |  3 +-
 .../Pages/Authenticated/AddClothingItem.razor | 31 +++++++++----------
 .../Pages/Authenticated/Wardrobe.razor        |  2 +-
 .../ViewModels/AddClothingItemViewModel.cs    | 18 +++++++----
 .../DTOs/NewClothingItemDTO.cs                |  1 +
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/WardrobeManager.Api/Services/Implementation/FileService.cs b/WardrobeManager.Api/Services/Implementation/FileService.cs
index 570caf1..bdd6b12 100644
--- a/WardrobeManager.Api/Services/Implementation/FileService.cs
+++ b/WardrobeManager.Api/Services/Implementation/FileService.cs
@@ -71,7 +71,8 @@ public async Task DeleteImage(Guid givenGuid)
         var guid = ParseGuid(givenGuid);
         string path = Path.Combine(dataDirectoryService.GetUploadsDirectory(), guid);
         string deletePath = Path.Combine(dataDirectoryService.GetDeletedUploadsDirectory(), guid);
-
+    
+        // Move deleted images to deleted folder (groundwork for "restore deleted items" feature)
         if (File.Exists(path))
         {
             File.Move(path, deletePath);
diff --git a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
index 2e933e2..3646056 100644
--- a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
+++ b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
@@ -9,31 +9,28 @@
     <h1 class="subheading-text sm:heading-text text-center">Add a clothing item</h1>
     <div class="flex gap-10 w-full">
         <EditForm class="flex flex-col gap-4 w-full sm:max-w-100 mx-auto"
-                  Model="@ViewModel.NewNewClothingItem">
+                  Model="@ViewModel.NewClothingItem">
             <Label Text="Name" Info="Choose a descriptive name for this item"/>
             <Input TItem="string"
-                   Value="@ViewModel.NewNewClothingItem.Name"
-                   ValueChanged="@((newValue) => ViewModel.NewNewClothingItem.Name = newValue ?? "")"
-                   Placeholder="Familiar name for clothing item"
-            />
+                   Value="@ViewModel.NewClothingItem.Name"
+                   ValueChanged="@((newValue) => ViewModel.NewClothingItem.Name = newValue ?? "")"
+                   Placeholder="Familiar name for clothing item"/>
 
             <Label Text="Category" Info="What type of clothing is this?"/>
             <Select TItem="ClothingCategory"
                     Items="@ViewModel.ClothingCategories"
                     Display="x => MiscMethods.GetNameWithSpacesAndEmoji(x)"
-                    SelectedItem="@ViewModel.NewNewClothingItem.Category"
-                    OnItemSelect="@((val) => ViewModel.NewNewClothingItem.Category = val)"
-                    Width="100%"
-            />
-            
-            <Label Text="Size" />
+                    SelectedItem="@ViewModel.NewClothingItem.Category"
+                    OnItemSelect="@((val) => ViewModel.NewClothingItem.Category = val)"
+                    Width="100%"/>
+
+            <Label Text="Size"/>
             <Select TItem="ClothingSize"
                     Items="@ViewModel.ClothingSizes"
                     Display="x => MiscMethods.GetNameWithSpacesFromEnum(x)"
-                    SelectedItem="@ViewModel.NewNewClothingItem.Size"
-                    OnItemSelect="@((val) => ViewModel.NewNewClothingItem.Size = val)"
-                    Width="100%"
-            />
+                    SelectedItem="@ViewModel.NewClothingItem.Size"
+                    OnItemSelect="@((val) => ViewModel.NewClothingItem.Size = val)"
+                    Width="100%"/>
 
             <div class="flex flex-col gap-2 w-full">
                 <Label Text="Upload image" Info="Choose an image you think best represents this item"/>
@@ -46,12 +43,12 @@
                     Class="self-center mt-6"/>
         </EditForm>
 
-        @if (!string.IsNullOrEmpty(ViewModel.NewNewClothingItem.ImageBase64))
+        @if (!string.IsNullOrEmpty(ViewModel.NewClothingItem.ImageBase64))
         {
             <div class="flex flex-col items-center h-full justify-around">
                 <h3 class="subheading-text">Uploaded Image</h3>
                 @{
-                    string src = $"data:image/png;base64, {ViewModel.NewNewClothingItem.ImageBase64}";
+                    string src = $"data:image/png;base64, {ViewModel.NewClothingItem.ImageBase64}";
                     <img src="@src" class="w-5/6 object-contain rounded-xl"/>
                 }
             </div>
diff --git a/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
index c17c2b5..f8738e1 100644
--- a/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
+++ b/WardrobeManager.Presentation/Pages/Authenticated/Wardrobe.razor
@@ -34,7 +34,7 @@
                 </DataTableColumn>
                 <DataTableColumn Property="@(x => x.ImageGuid ?? Guid.NewGuid() )">
                     <Template>
-                        <Image ImageGuid="@context.ImageGuid.ToString()" Css="h-full object-contain rounded-xl max-w-[3rem] w-full"/>
+                        <Image ImageGuid="@context.ImageGuid.ToString()" Css="h-full object-contain rounded-xl max-w-[3rem] min-w-[2rem] w-full"/>
                     </Template>
                 </DataTableColumn>
                 <DataTableColumn Property="x => x.Name"/>
diff --git a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
index 8d1e5c1..a9e2519 100644
--- a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
@@ -21,16 +21,22 @@ IConfiguration  configuration
 {
     // Public Properties
     [ObservableProperty]
-    private NewClothingItemDTO _newNewClothingItem = new NewClothingItemDTO();
+    private NewClothingItemDTO _newClothingItem = new NewClothingItemDTO();
 
     public ICollection<ClothingCategory> ClothingCategories { get; set; } = MiscMethods.ConvertEnumToCollection<ClothingCategory>();
     public ICollection<ClothingSize> ClothingSizes { get; set; } = MiscMethods.ConvertEnumToCollection<ClothingSize>();
 
     public async Task SubmitAsync()
     {
-        await apiService.AddNewClothingItem(NewNewClothingItem);
-        notificationService.AddNotification($"Clothing Item \"{NewNewClothingItem.Name}\" Added!", NotificationType.Success);
-        NewNewClothingItem = new NewClothingItemDTO();
+        // Crude error checking, in the future i'd prefer to use a form with error validation
+        if (string.IsNullOrEmpty(NewClothingItem.Name))
+        {
+            notificationService.AddNotification("New item must have name. Please enter a name.", NotificationType.Error);
+            return;
+        }
+        await apiService.AddNewClothingItem(NewClothingItem);
+        notificationService.AddNotification($"Clothing Item \"{NewClothingItem.Name}\" Added!", NotificationType.Success);
+        NewClothingItem = new NewClothingItemDTO();
     }
     
     public async Task UploadImage(InputFileChangeEventArgs e)
@@ -54,9 +60,9 @@ public async Task UploadImage(InputFileChangeEventArgs e)
             
             await e.File.OpenReadStream(maxAllowedSize: maxFileSizeNum).CopyToAsync(img);
 
-            NewNewClothingItem.ImageBase64 = Convert.ToBase64String(img.ToArray());
+            NewClothingItem.ImageBase64 = Convert.ToBase64String(img.ToArray());
 
-            if (NewNewClothingItem.ImageBase64 == string.Empty)
+            if (NewClothingItem.ImageBase64 == string.Empty)
             {
                 notificationService.AddNotification("Image size too large, try again.", NotificationType.Warning);
             }
diff --git a/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs b/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
index 0ae14c2..6d8331b 100644
--- a/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
+++ b/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
@@ -1,5 +1,6 @@
 #region
 
+using System.ComponentModel.DataAnnotations;
 using WardrobeManager.Shared.Enums;
 
 #endregion

From 074d1c87ca8919075462e2784b20f8749eee6163 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 15:23:14 -0500
Subject: [PATCH 08/15] US-003 - Added client side and server side static
 validation

I LOVE VALIDATION
---
 .../Endpoints/ClothingEndpoints.cs            | 12 +++--
 .../CustomAuthorizationMessageHandler.cs      |  4 +-
 .../ViewModels/AddClothingItemViewModel.cs    | 26 ++++++----
 WardrobeManager.Shared/Models/Result.cs       |  8 +++
 .../StaticResources/StaticValidators.cs       | 49 +++++++++++++++++++
 .../WardrobeManager.Shared.csproj             |  4 ++
 6 files changed, 87 insertions(+), 16 deletions(-)
 create mode 100644 WardrobeManager.Shared/Models/Result.cs
 create mode 100644 WardrobeManager.Shared/StaticResources/StaticValidators.cs

diff --git a/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs b/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
index 492c455..b6892e6 100644
--- a/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
+++ b/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
@@ -9,6 +9,7 @@
 using WardrobeManager.Shared.Models;
 using AutoMapper;
 using WardrobeManager.Shared.DTOs;
+using WardrobeManager.Shared.StaticResources;
 
 #endregion
 
@@ -42,14 +43,19 @@ public static async Task<IResult> GetClothing(
     }
 
     public static async Task<IResult> AddNewClothingItem(
-        [FromBody] NewClothingItemDTO newNewClothingItem,
+        [FromBody] NewClothingItemDTO newClothingItem,
         HttpContext context, IClothingService clothingService, IMapper mapper
     )
     {
         User? user = context.Items["user"] as User;
         Debug.Assert(user != null, "Cannot get user");
 
-        await clothingService.AddNewClothingItem(user.Id ,newNewClothingItem);
+        var res = StaticValidators.Validate(newClothingItem);
+        if (!res.Success)
+        {
+            return Results.BadRequest(res.Message);
+        }
+        await clothingService.AddNewClothingItem(user.Id ,newClothingItem);
 
         return Results.Ok();
     }
@@ -61,7 +67,7 @@ public static async Task<IResult> RemoveClothingItem(
     {
         User? user = context.Items["user"] as User;
         Debug.Assert(user != null, "Cannot get user");
-
+    
         await clothingService.RemoveClothingItem(user.Id ,itemId);
 
         return Results.Ok();
diff --git a/WardrobeManager.Presentation/Identity/CustomAuthorizationMessageHandler.cs b/WardrobeManager.Presentation/Identity/CustomAuthorizationMessageHandler.cs
index 3f89b1e..d686ca2 100644
--- a/WardrobeManager.Presentation/Identity/CustomAuthorizationMessageHandler.cs
+++ b/WardrobeManager.Presentation/Identity/CustomAuthorizationMessageHandler.cs
@@ -2,12 +2,10 @@
 
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
-using WardrobeManager.Presentation.Services.Interfaces;
-using WardrobeManager.Shared.Enums;
 
 #endregion
 
-namespace WardrobeManager.Presentation;
+namespace WardrobeManager.Presentation.Identity;
 
 public class CustomAuthorizationMessageHandler : AuthorizationMessageHandler
 {
diff --git a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
index a9e2519..5b03ef7 100644
--- a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
@@ -15,36 +15,40 @@ public partial class AddClothingItemViewModel(
     IMvvmNavigationManager navManager,
     IApiService apiService,
     INotificationService notificationService,
-    IConfiguration  configuration
+    IConfiguration configuration
 )
     : ViewModelBase
 {
     // Public Properties
-    [ObservableProperty]
-    private NewClothingItemDTO _newClothingItem = new NewClothingItemDTO();
+    [ObservableProperty] private NewClothingItemDTO _newClothingItem = new NewClothingItemDTO();
+
+    public ICollection<ClothingCategory> ClothingCategories { get; set; } =
+        MiscMethods.ConvertEnumToCollection<ClothingCategory>();
 
-    public ICollection<ClothingCategory> ClothingCategories { get; set; } = MiscMethods.ConvertEnumToCollection<ClothingCategory>();
     public ICollection<ClothingSize> ClothingSizes { get; set; } = MiscMethods.ConvertEnumToCollection<ClothingSize>();
 
     public async Task SubmitAsync()
     {
         // Crude error checking, in the future i'd prefer to use a form with error validation
-        if (string.IsNullOrEmpty(NewClothingItem.Name))
+        var res = StaticValidators.Validate(NewClothingItem);
+        if (!res.Success)
         {
-            notificationService.AddNotification("New item must have name. Please enter a name.", NotificationType.Error);
+            notificationService.AddNotification(res.Message, NotificationType.Error);
             return;
         }
+
         await apiService.AddNewClothingItem(NewClothingItem);
-        notificationService.AddNotification($"Clothing Item \"{NewClothingItem.Name}\" Added!", NotificationType.Success);
+        notificationService.AddNotification($"Clothing Item \"{NewClothingItem.Name}\" Added!",
+            NotificationType.Success);
         NewClothingItem = new NewClothingItemDTO();
     }
-    
+
     public async Task UploadImage(InputFileChangeEventArgs e)
     {
         try
         {
             var img = new MemoryStream();
-            
+
             // 5MB default max file size
             var maxFileSize = configuration["WM_MAX_IMAGE_UPLOAD_SIZE_IN_MB"];
             int maxFileSizeNum;
@@ -56,14 +60,16 @@ public async Task UploadImage(InputFileChangeEventArgs e)
             {
                 maxFileSizeNum = Convert.ToInt32(maxFileSize);
             }
+
             maxFileSizeNum *= 1024 * 1024; // int to megabytes
-            
+
             await e.File.OpenReadStream(maxAllowedSize: maxFileSizeNum).CopyToAsync(img);
 
             NewClothingItem.ImageBase64 = Convert.ToBase64String(img.ToArray());
 
             if (NewClothingItem.ImageBase64 == string.Empty)
             {
+                // If the image is too large it become an empty string. This is an edgecase but I can't remember how to reproduce it.
                 notificationService.AddNotification("Image size too large, try again.", NotificationType.Warning);
             }
         }
diff --git a/WardrobeManager.Shared/Models/Result.cs b/WardrobeManager.Shared/Models/Result.cs
new file mode 100644
index 0000000..5f0dcf5
--- /dev/null
+++ b/WardrobeManager.Shared/Models/Result.cs
@@ -0,0 +1,8 @@
+namespace WardrobeManager.Shared.Models;
+
+public record Result<T>(T Data, bool Success, string Message = "")
+{
+    public T Data { get; set; } = Data;
+    public bool Success { get; set; } = Success;
+    public string Message { get; set; } = Message;
+}
\ No newline at end of file
diff --git a/WardrobeManager.Shared/StaticResources/StaticValidators.cs b/WardrobeManager.Shared/StaticResources/StaticValidators.cs
new file mode 100644
index 0000000..c35b007
--- /dev/null
+++ b/WardrobeManager.Shared/StaticResources/StaticValidators.cs
@@ -0,0 +1,49 @@
+using WardrobeManager.Shared.DTOs;
+using FluentValidation;
+using WardrobeManager.Shared.Models;
+
+namespace WardrobeManager.Shared.StaticResources;
+
+// Generic validation method for all validators
+public static class StaticValidators
+{
+    // A registry of validators (Map Type -> Validator Instance)
+    private static readonly Dictionary<Type, IValidator> _validators = new()
+    {
+        { typeof(NewClothingItemDTO), new NewClothingItemDTOValidator() }
+    };
+
+    public static Result<T> Validate<T>(T input)
+    {
+        if (input is null) return new Result<T>(input, false, "Input cannot be null");
+
+        // Look for a registered validator for this type
+        if (_validators.TryGetValue(typeof(T), out var validator))
+        {
+            var context = new ValidationContext<T>(input);
+            var validationResult = validator.Validate(context);
+
+            if (!validationResult.IsValid)
+            {
+                // Join all error messages into one string
+                string errors = string.Join(" ", validationResult.Errors.Select(e => e.ErrorMessage));
+                return new Result<T>(input, false, errors);
+            }
+        }
+
+        // If no validator is found, we assume it's valid by default
+        return new Result<T>(input, true);
+    }
+}
+
+
+// All static validators below (in one file to stay clean)
+public class NewClothingItemDTOValidator : AbstractValidator<NewClothingItemDTO>
+{
+    public NewClothingItemDTOValidator()
+    {
+        RuleFor(x => x.Name)
+            .NotEmpty().WithMessage("New clothing item must have a name.")
+            .MaximumLength(50).WithMessage("Name is too long.");
+    }
+}
diff --git a/WardrobeManager.Shared/WardrobeManager.Shared.csproj b/WardrobeManager.Shared/WardrobeManager.Shared.csproj
index b760144..df55074 100644
--- a/WardrobeManager.Shared/WardrobeManager.Shared.csproj
+++ b/WardrobeManager.Shared/WardrobeManager.Shared.csproj
@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="FluentValidation" Version="12.1.1" />
+  </ItemGroup>
+
 </Project>

From 23f073cc64b6741fa31612bb8b59e768b8d8f67e Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 15:24:29 -0500
Subject: [PATCH 09/15] US-003 - Make image loading lazy

---
 WardrobeManager.Presentation/Components/Shared/Image.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WardrobeManager.Presentation/Components/Shared/Image.razor b/WardrobeManager.Presentation/Components/Shared/Image.razor
index f705497..b2ba61b 100644
--- a/WardrobeManager.Presentation/Components/Shared/Image.razor
+++ b/WardrobeManager.Presentation/Components/Shared/Image.razor
@@ -1,6 +1,6 @@
 @namespace WardrobeManager.Presentation.Components.Shared
 
-<img src="@_config["WM_BACKEND_URL"]/images/@_imagePath" class="@Css"/>
+<img src="@_config["WM_BACKEND_URL"]/images/@_imagePath" loading="lazy" class="@Css"/>
 
 @code {
     [Parameter] public required string? ImageGuid { get; set; }

From e6ee802bf9a53dcfce0e9ba2cfafda2b8ff6504f Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 15:30:30 -0500
Subject: [PATCH 10/15] US-003 - Make AddClothingItem.razor authorized and
 NotAuthenticated.razor responsive

---
 .../Components/Identity/NotAuthenticated.razor              | 6 +++---
 .../Pages/Authenticated/AddClothingItem.razor               | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WardrobeManager.Presentation/Components/Identity/NotAuthenticated.razor b/WardrobeManager.Presentation/Components/Identity/NotAuthenticated.razor
index 908331d..2b51e03 100644
--- a/WardrobeManager.Presentation/Components/Identity/NotAuthenticated.razor
+++ b/WardrobeManager.Presentation/Components/Identity/NotAuthenticated.razor
@@ -1,7 +1,7 @@
 @namespace WardrobeManager.Presentation.Components.Identity
 
 
-<div class="flex flex-col justify-center items-center w-full h-full">
-    <h1 class="title-text text-base-content">You are not authenticated</h1>
-    <p class="heading-text text-primary">Please log in <a class="text-accent" href="/login">here</a></p>
+<div class="flex flex-col justify-center items-center w-full h-full text-center gap-5">
+    <h1 class="subheading-text sm:title-text text-base-content">You are not authenticated</h1>
+    <p class="subtitle-text sm:heading-text text-primary">Please log in <a class="text-blue-500" href="/login">here</a></p>
 </div>
diff --git a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
index 3646056..899ea96 100644
--- a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
+++ b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
@@ -3,6 +3,7 @@
 @using WardrobeManager.Presentation.Components.FormItems
 @using WardrobeManager.Shared.StaticResources
 @namespace WardrobeManager.Presentation.Pages.Authenticated
+@attribute [Authorize]
 @inherits MvvmComponentBase<AddClothingItemViewModel>
 
 <div class="max-w-75 sm:max-w-200 w-full mx-auto flex flex-col gap-5 items-center pb-10">

From a02184234cee4358689490feef8ecd50d15348e3 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 20:58:12 -0500
Subject: [PATCH 11/15] US-003 - Add test coverage for new methods in clothing
 service

---
 .../Services/ClothingServiceTests.cs          | 241 ++++++++++++++++--
 WardrobeManager.Api/Program.cs                |   2 +
 .../Implementation/ClothingService.cs         |  12 +-
 .../Pages/Authenticated/AddClothingItem.razor |   4 +-
 WardrobeManager.Presentation/Program.cs       |   2 +
 .../ViewModels/AddClothingItemViewModel.cs    |   8 +-
 .../Services/IMiscMethods.cs                  |  15 ++
 .../MiscMethods.cs                            |  68 +++--
 8 files changed, 296 insertions(+), 56 deletions(-)
 create mode 100644 WardrobeManager.Shared/Services/IMiscMethods.cs
 rename WardrobeManager.Shared/{StaticResources => Services}/MiscMethods.cs (73%)

diff --git a/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs b/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs
index 9c0dbad..bbcdbb2 100644
--- a/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs
+++ b/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs
@@ -9,7 +9,9 @@
 using WardrobeManager.Api.Repositories.Interfaces;
 using WardrobeManager.Api.Services.Implementation;
 using WardrobeManager.Api.Services.Interfaces;
+using WardrobeManager.Shared.DTOs;
 using WardrobeManager.Shared.Enums;
+using WardrobeManager.Shared.StaticResources;
 
 namespace WardrobeManager.Api.Tests.Services;
 
@@ -17,9 +19,13 @@ public class ClothingServiceTests
 {
     private const string DefaultUserId = "test-userid";
     private const int DefaultItemId = 1;
+    private const string ValidBase64 = "YQ=="; // a
 
     private Mock<IClothingRepository> _mockRepo;
     private Mock<IMapper> _mockMapper;
+    private FakeLogger<ClothingService> _fakeLogger;
+    private Mock<IFileService> _mockFileService;
+    private Mock<IMiscMethods> _mockMiscMethods;
     private ClothingService _serviceToTest;
 
     [SetUp]
@@ -28,7 +34,12 @@ public void Setup()
         // Mock the service and its dependencies
         _mockRepo = new Mock<IClothingRepository>();
         _mockMapper = new Mock<IMapper>();
-        _serviceToTest = new ClothingService(_mockRepo.Object, _mockMapper.Object);
+        _fakeLogger = new FakeLogger<ClothingService>();
+        _mockFileService = new Mock<IFileService>();
+        _mockMiscMethods = new Mock<IMiscMethods>();
+
+        _serviceToTest = new ClothingService(_mockRepo.Object, _mockMapper.Object, _mockFileService.Object,
+            _fakeLogger, _mockMiscMethods.Object);
     }
 
     #region GetClothingItem
@@ -38,14 +49,19 @@ public async Task GetClothingItem_ClothingItemExists_ReturnsClothingItem()
     {
         // Arrange
         var clothingItem = CreateSampleClothingItem();
+        var clothingItemDto = CreateSampleClothingItemDTO();
         _mockRepo
             .Setup(r => r.GetAsync(clothingItem.UserId, clothingItem.Id))
             .ReturnsAsync(clothingItem);
-        // Act
+        _mockMapper
+            .Setup(m => m.Map<ClothingItemDTO>(clothingItem))
+            .Returns(clothingItemDto);
+
+// Act
         var result = await _serviceToTest.GetClothingItemAsync(clothingItem.UserId, clothingItem.Id);
-        // Assert
-        _mockRepo.Verify(r => r.GetAsync(clothingItem.UserId, clothingItem.Id), Times.Once);
-        result.Should().BeEquivalentTo(clothingItem);
+
+// Assert
+        result.Should().BeEquivalentTo(clothingItemDto);
     }
 
     [Test]
@@ -71,15 +87,21 @@ public async Task GetClothingItem_ClothingItemDoesNotExist_ReturnsNull()
     public async Task GetAllClothingAsync_OneItemExists_ReturnsOneItem()
     {
         // Arrange
-        var items = CreateSampleClothingItems(1);
+        var items = CreateSampleClothingItems(5);
+        var itemsDto = CreateSampleClothingItemsDTO(5);
+
         _mockRepo
-            .Setup(r => r.GetAllAsync(items.First().UserId))
+            .Setup(r => r.GetAllAsync(DefaultUserId))
             .ReturnsAsync(items);
+
+        _mockMapper
+            .Setup(m => m.Map<List<ClothingItemDTO>>(items))
+            .Returns(itemsDto);
         // Act
         var result = await _serviceToTest.GetAllClothingAsync(items.First().UserId);
         // Assert
         _mockRepo.Verify(r => r.GetAllAsync(items.First().UserId), Times.Once);
-        result.Should().BeEquivalentTo(items);
+        result.Should().BeEquivalentTo(itemsDto);
     }
 
     [Test]
@@ -87,14 +109,20 @@ public async Task GetAllClothingAsync_MultipleItemsExists_ReturnsAllItems()
     {
         // Arrange
         var items = CreateSampleClothingItems(5);
+        var itemsDto = CreateSampleClothingItemsDTO(5);
+
         _mockRepo
-            .Setup(r => r.GetAllAsync(items.First().UserId))
+            .Setup(r => r.GetAllAsync(DefaultUserId))
             .ReturnsAsync(items);
+
+        _mockMapper
+            .Setup(m => m.Map<List<ClothingItemDTO>>(items))
+            .Returns(itemsDto);
         // Act
-        var result = await _serviceToTest.GetAllClothingAsync(items.First().UserId);
+        var result = await _serviceToTest.GetAllClothingAsync(DefaultUserId);
+
         // Assert
-        _mockRepo.Verify(r => r.GetAllAsync(items.First().UserId), Times.Once);
-        result.Should().BeEquivalentTo(items);
+        result.Should().BeEquivalentTo(itemsDto);
     }
 
     [Test]
@@ -102,34 +130,147 @@ public async Task GetAllClothingAsync_NoClothingItemsExist_ReturnsEmptyList()
     {
         // Arrange
         var items = new List<ClothingItem>();
-        _mockRepo
-            .Setup(r => r.GetAllAsync(DefaultUserId))
-            .ReturnsAsync(items);
+        var itemsDto = new List<ClothingItemDTO>();
+
+        _mockRepo.Setup(r => r.GetAllAsync(DefaultUserId)).ReturnsAsync(items);
+        _mockMapper.Setup(m => m.Map<List<ClothingItemDTO>>(items)).Returns(itemsDto);
+
         // Act
         var result = await _serviceToTest.GetAllClothingAsync(DefaultUserId);
-        // Assert
-        _mockRepo.Verify(r => r.GetAllAsync(DefaultUserId), Times.Once);
 
+        // Assert
         using (new AssertionScope())
         {
-            result.Should().BeEquivalentTo(items);
+            result.Should().BeEquivalentTo(itemsDto);
             result.Should().BeEmpty();
         }
     }
 
     #endregion
 
+    #region AddNewClothingItem
+
+    [Test]
+    public async Task AddNewClothingItem_InvalidImageBase64_DoesNotCreateImageFile()
+    {
+        // Arrange
+        var clothingItem = CreateSampleClothingItem();
+        var newClothingItem = CreateSampleNewClothingItem();
+        _mockMapper.Setup(m => m.Map<ClothingItem>(newClothingItem)).Returns(clothingItem);
+        _mockMiscMethods
+            .Setup(x => x.IsValidBase64(newClothingItem.ImageBase64))
+            .Returns(false);
+        // Act
+        await _serviceToTest.AddNewClothingItem(clothingItem.UserId, newClothingItem);
+        // Assert
+        _mockMapper.Verify(x => x.Map<ClothingItem>(newClothingItem), Times.Once);
+        _mockMiscMethods.Verify(x => x.IsValidBase64(newClothingItem.ImageBase64), Times.Once);
+        _mockFileService.Verify(
+            x => x.SaveImage(It.Is<Guid>(g => g != Guid.Empty), It.IsAny<string>()),
+            Times.Never);
+        _mockRepo.Verify(x => x.CreateAsync(It.Is<ClothingItem>(ci =>
+            ci.UserId == clothingItem.UserId &&
+            ci.ImageGuid == null
+        )), Times.Once);
+        _mockRepo.Verify(x => x.SaveAsync(), Times.Once);
+    }
+
+    [Test]
+    public async Task AddNewClothingItem_ValidImageBase64_CreatesImageFile()
+    {
+        // Arrange
+        var clothingItem = CreateSampleClothingItem();
+        var newClothingItem = CreateSampleNewClothingItem(ValidBase64);
+        _mockMapper.Setup(m => m.Map<ClothingItem>(newClothingItem)).Returns(clothingItem);
+        _mockMiscMethods
+            .Setup(x => x.IsValidBase64(newClothingItem.ImageBase64))
+            .Returns(true);
+        // Act
+        await _serviceToTest.AddNewClothingItem(clothingItem.UserId, newClothingItem);
+        // Assert
+        _mockMapper.Verify(x => x.Map<ClothingItem>(newClothingItem), Times.Once);
+        _mockMiscMethods.Verify(x => x.IsValidBase64(newClothingItem.ImageBase64), Times.Once);
+        _mockFileService.Verify(
+            x => x.SaveImage(It.Is<Guid>(g => g != Guid.Empty), It.Is<string>(s => s == ValidBase64)),
+            Times.Once);
+        _mockRepo.Verify(x => x.CreateAsync(It.Is<ClothingItem>(ci =>
+            ci.UserId == clothingItem.UserId &&
+            ci.ImageGuid != null
+        )), Times.Once);
+        _mockRepo.Verify(x => x.SaveAsync(), Times.Once);
+    }
+
+    #endregion
+
+    #region RemoveClothingItem
+
+    [Test]
+    public async Task RemoveClothingItem_ItemDoesNotExist_ErrorLogged()
+    {
+        // Arrange
+        var clothingItem = CreateSampleClothingItem(DefaultUserId, DefaultItemId);
+        _mockRepo
+            .Setup(r => r.GetAsync(clothingItem.UserId, clothingItem.Id))
+            .ReturnsAsync(null as ClothingItem);
+        // Act
+        await _serviceToTest.RemoveClothingItem(clothingItem.UserId, clothingItem.Id);
+        // Assert
+        var latestLog = _fakeLogger.Collector.LatestRecord;
+        latestLog.Should().NotBeNull();
+        latestLog.Level.Should().Be(LogLevel.Information);
+        latestLog.Message.Should().Contain("not found"); // or whatever your message is
+    }
+
+    [Test]
+    public async Task RemoveClothingItem_ItemExistsAndImageGuidNull_FileNotDeleted()
+    {
+        // Arrange
+        var clothingItem = CreateSampleClothingItem(DefaultUserId, DefaultItemId);
+        _mockRepo
+            .Setup(r => r.GetAsync(DefaultUserId, DefaultItemId))
+            .ReturnsAsync(clothingItem);
+        // Act
+        await _serviceToTest.RemoveClothingItem(DefaultUserId, DefaultItemId);
+        // Assert
+        _mockRepo.Verify(x => x.Remove(clothingItem), Times.Once);
+        _mockRepo.Verify(x => x.SaveAsync(), Times.Once);
+        _mockFileService.Verify(x => x.DeleteImage(It.Is<Guid>(s => s == clothingItem.ImageGuid)), Times.Never);
+    }
+
+    [Test]
+    public async Task RemoveClothingItem_ItemExistsAndImageGuidExists_FileDeleted()
+    {
+        // Arrange
+        var clothingItem = CreateSampleClothingItem(DefaultUserId, DefaultItemId);
+        clothingItem.ImageGuid = Guid.NewGuid();
+        _mockRepo
+            .Setup(r => r.GetAsync(DefaultUserId, DefaultItemId))
+            .ReturnsAsync(clothingItem);
+        // Act
+        await _serviceToTest.RemoveClothingItem(DefaultUserId, DefaultItemId);
+        // Assert
+        _mockRepo.Verify(x => x.Remove(clothingItem), Times.Once);
+        _mockRepo.Verify(x => x.SaveAsync(), Times.Once);
+        _mockFileService.Verify(x => x.DeleteImage(It.Is<Guid>(s => s == clothingItem.ImageGuid)), Times.Once);
+    }
+
+    #endregion
+
     #region Private methods
 
-    private ClothingItem CreateSampleClothingItem()
+    private ClothingItem CreateSampleClothingItem(Guid? imageGuid = null)
     {
-        var clothingItem = new ClothingItem("T-shirt", ClothingCategory.TShirt, Season.None,
-            WearLocation.HomeAndOutside, false, 0, Guid.NewGuid())
+        var clothingItem = new ClothingItem
         {
+            Name = "test",
+            Category = ClothingCategory.None,
+            Season = Season.None,
+            Size = ClothingSize.NotSpecified,
+            WearLocation = WearLocation.None,
+            ImageGuid = imageGuid,
             UserId = DefaultUserId,
             Id = DefaultItemId
         };
-
         return clothingItem;
     }
 
@@ -153,5 +294,61 @@ private List<ClothingItem> CreateSampleClothingItems(int amount, string userId =
         return items;
     }
 
+    private ClothingItemDTO CreateSampleClothingItemDTO(Guid? imageGuid = null)
+    {
+        var clothingItem = new ClothingItemDTO
+        {
+            Name = "test",
+            Category = ClothingCategory.None,
+            Size = ClothingSize.NotSpecified,
+            ImageGuid = imageGuid,
+            Id = DefaultItemId
+        };
+        return clothingItem;
+    }
+
+    private ClothingItemDTO CreateSampleClothingItemDTO(int itemId)
+    {
+        var item = CreateSampleClothingItemDTO();
+        item.Id = itemId;
+        return item;
+    }
+
+    private List<ClothingItemDTO> CreateSampleClothingItemsDTO(int amount, string userId = DefaultUserId)
+    {
+        List<ClothingItemDTO> items = [];
+        var currentItemId = DefaultItemId;
+        for (int i = 0; i < amount; i++)
+        {
+            items.Add(CreateSampleClothingItemDTO(currentItemId++));
+        }
+
+        return items;
+    }
+
+
+    private NewClothingItemDTO CreateSampleNewClothingItem(string? imageBase64 = null)
+    {
+        var item = new NewClothingItemDTO
+        {
+            Name = "test",
+            Category = ClothingCategory.None,
+            ImageBase64 = imageBase64,
+            Size = ClothingSize.NotSpecified
+        };
+        return item;
+    }
+
+    private List<NewClothingItemDTO> CreateSampleNewClothingItems(int amount)
+    {
+        List<NewClothingItemDTO> items = [];
+        for (int i = 0; i < amount; i++)
+        {
+            items.Add(CreateSampleNewClothingItem());
+        }
+
+        return items;
+    }
+
     #endregion
 }
\ No newline at end of file
diff --git a/WardrobeManager.Api/Program.cs b/WardrobeManager.Api/Program.cs
index 88fe4dd..936fed3 100644
--- a/WardrobeManager.Api/Program.cs
+++ b/WardrobeManager.Api/Program.cs
@@ -13,6 +13,7 @@
 using WardrobeManager.Api.Services.Implementation;
 using WardrobeManager.Api.Services.Interfaces;
 using WardrobeManager.Shared.DTOs;
+using WardrobeManager.Shared.StaticResources;
 
 #endregion
 
@@ -93,6 +94,7 @@
 // Entity Services
 builder.Services.AddScoped<IGenericRepository<Log>, GenericRepository<Log>>();
 builder.Services.AddScoped<IClothingRepository, ClothingRepository>();
+builder.Services.AddScoped<IMiscMethods, MiscMethods>();
 
 // add db context
 builder.Services.AddDbContext<DatabaseContext>((serviceProvider, options) =>
diff --git a/WardrobeManager.Api/Services/Implementation/ClothingService.cs b/WardrobeManager.Api/Services/Implementation/ClothingService.cs
index 9415528..f0d98a8 100644
--- a/WardrobeManager.Api/Services/Implementation/ClothingService.cs
+++ b/WardrobeManager.Api/Services/Implementation/ClothingService.cs
@@ -21,7 +21,9 @@ public class ClothingService(
     IClothingRepository clothingRepository,
     IMapper mapper,
     IFileService fileService,
-    ILogger<ClothingService> logger)
+    ILogger<ClothingService> logger,
+    IMiscMethods miscMethods
+)
     : IClothingService
 {
     // ---- Methods for multiple clothing items ---
@@ -38,15 +40,15 @@ public class ClothingService(
         return mapper.Map<ClothingItemDTO>(res);
     }
 
-    public async Task AddNewClothingItem(string userId, NewClothingItemDTO newNewClothingItem)
+    public async Task AddNewClothingItem(string userId, NewClothingItemDTO newClothingItem)
     {
-        var res = mapper.Map<ClothingItem>(newNewClothingItem);
+        var res = mapper.Map<ClothingItem>(newClothingItem);
         Guid? newItemGuid = null;
-        if (MiscMethods.IsValidBase64(newNewClothingItem.ImageBase64))
+        if (miscMethods.IsValidBase64(newClothingItem.ImageBase64))
         {
             newItemGuid = Guid.NewGuid();
             // decode and save file to place on disk with guid as name
-            await fileService.SaveImage(newItemGuid, newNewClothingItem.ImageBase64!);
+            await fileService.SaveImage(newItemGuid, newClothingItem.ImageBase64!);
         }
 
         res.UserId = userId;
diff --git a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
index 899ea96..3a12064 100644
--- a/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
+++ b/WardrobeManager.Presentation/Pages/Authenticated/AddClothingItem.razor
@@ -20,7 +20,7 @@
             <Label Text="Category" Info="What type of clothing is this?"/>
             <Select TItem="ClothingCategory"
                     Items="@ViewModel.ClothingCategories"
-                    Display="x => MiscMethods.GetNameWithSpacesAndEmoji(x)"
+                    Display="x => ViewModel.GetNameWithSpacesAndEmoji(x)"
                     SelectedItem="@ViewModel.NewClothingItem.Category"
                     OnItemSelect="@((val) => ViewModel.NewClothingItem.Category = val)"
                     Width="100%"/>
@@ -28,7 +28,7 @@
             <Label Text="Size"/>
             <Select TItem="ClothingSize"
                     Items="@ViewModel.ClothingSizes"
-                    Display="x => MiscMethods.GetNameWithSpacesFromEnum(x)"
+                    Display="x => ViewModel.GetNameWithSpacesAndEmoji(x)"
                     SelectedItem="@ViewModel.NewClothingItem.Size"
                     OnItemSelect="@((val) => ViewModel.NewClothingItem.Size = val)"
                     Width="100%"/>
diff --git a/WardrobeManager.Presentation/Program.cs b/WardrobeManager.Presentation/Program.cs
index 8d6ab5d..4754a19 100644
--- a/WardrobeManager.Presentation/Program.cs
+++ b/WardrobeManager.Presentation/Program.cs
@@ -9,6 +9,7 @@
 using WardrobeManager.Presentation.Identity;
 using WardrobeManager.Presentation.Services.Implementation;
 using WardrobeManager.Presentation.Services.Interfaces;
+using WardrobeManager.Shared.StaticResources;
 
 #endregion
 
@@ -46,6 +47,7 @@
 builder.Services.AddScoped<IApiService, ApiService>(sp => new ApiService(BackendUrl, sp.GetRequiredService<IHttpClientFactory>()));
 builder.Services.AddSingleton<INotificationService, NotificationService>();
 builder.Services.AddScoped<IIdentityService, IdentityService>();
+builder.Services.AddScoped<IMiscMethods, MiscMethods>();
 
 // Libraries
 builder.Services.AddSysinfocus();
diff --git a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
index 5b03ef7..e702ecf 100644
--- a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
@@ -15,6 +15,7 @@ public partial class AddClothingItemViewModel(
     IMvvmNavigationManager navManager,
     IApiService apiService,
     INotificationService notificationService,
+    IMiscMethods miscMethods,
     IConfiguration configuration
 )
     : ViewModelBase
@@ -22,10 +23,13 @@ IConfiguration configuration
     // Public Properties
     [ObservableProperty] private NewClothingItemDTO _newClothingItem = new NewClothingItemDTO();
 
+    public string GetNameWithSpacesAndEmoji<T>(T value) where T : Enum
+        => miscMethods.GetNameWithSpacesFromEnum(value);
+    
     public ICollection<ClothingCategory> ClothingCategories { get; set; } =
-        MiscMethods.ConvertEnumToCollection<ClothingCategory>();
+        miscMethods.ConvertEnumToCollection<ClothingCategory>();
 
-    public ICollection<ClothingSize> ClothingSizes { get; set; } = MiscMethods.ConvertEnumToCollection<ClothingSize>();
+    public ICollection<ClothingSize> ClothingSizes { get; set; } = miscMethods.ConvertEnumToCollection<ClothingSize>();
 
     public async Task SubmitAsync()
     {
diff --git a/WardrobeManager.Shared/Services/IMiscMethods.cs b/WardrobeManager.Shared/Services/IMiscMethods.cs
new file mode 100644
index 0000000..414855e
--- /dev/null
+++ b/WardrobeManager.Shared/Services/IMiscMethods.cs
@@ -0,0 +1,15 @@
+using WardrobeManager.Shared.Enums;
+
+namespace WardrobeManager.Shared.StaticResources;
+
+public interface IMiscMethods
+{
+    string GenerateRandomId();
+    string GetEmoji(ClothingCategory category);
+    string GetEmoji(Season season);
+    string GetNameWithSpacesAndEmoji(ClothingCategory category);
+    string GetNameWithSpacesAndEmoji(Season season);
+    string GetNameWithSpacesFromEnum<T>(T givenEnum) where T : Enum;
+    bool IsValidBase64(string? input);
+    ICollection<T> ConvertEnumToCollection<T>() where T : Enum;
+}
\ No newline at end of file
diff --git a/WardrobeManager.Shared/StaticResources/MiscMethods.cs b/WardrobeManager.Shared/Services/MiscMethods.cs
similarity index 73%
rename from WardrobeManager.Shared/StaticResources/MiscMethods.cs
rename to WardrobeManager.Shared/Services/MiscMethods.cs
index 7b3a5cd..fb2a09e 100644
--- a/WardrobeManager.Shared/StaticResources/MiscMethods.cs
+++ b/WardrobeManager.Shared/Services/MiscMethods.cs
@@ -10,15 +10,16 @@
 
 namespace WardrobeManager.Shared.StaticResources;
 
-public static class MiscMethods
+public class MiscMethods : IMiscMethods
 {
-    public static string GenerateRandomId()
+    public string GenerateRandomId()
     {
         const string chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
         string id = RandomNumberGenerator.GetString(chars, 8);
         return $"id{id}"; // id needs to start with letter
     }
-    public static string GetEmoji(ClothingCategory category)
+
+    public string GetEmoji(ClothingCategory category)
     {
         return category switch
         {
@@ -32,7 +33,8 @@ public static string GetEmoji(ClothingCategory category)
             _ => ""
         };
     }
-    public static string GetEmoji(Season season)
+
+    public string GetEmoji(Season season)
     {
         return season switch
         {
@@ -49,32 +51,24 @@ public static string GetEmoji(Season season)
         };
     }
 
-    public static string GetNameWithSpacesAndEmoji(ClothingCategory category)
+    public string GetNameWithSpacesFromEnum<T>(T givenEnum) where T : Enum
     {
-        var words = Regex.Matches(category.ToString(), @"([A-Z][a-z]+)").Select(m => m.Value);
-        var cat = category;
-        var withSpaces = string.Join(" ", words);
-        var emoji = GetEmoji(cat);
-
-        return $"{emoji} {withSpaces}";
+        return givenEnum switch
+        {
+            ClothingCategory category => GetNameWithSpacesAndEmoji(category),
+            Season season => GetNameWithSpacesAndEmoji(season),
+            _ => GetNameWithSpaces(givenEnum)
+        };
     }
-    public static string GetNameWithSpacesAndEmoji(Season season)
-    {
-        var words = Regex.Matches(season.ToString(), @"([A-Z][a-z]+)").Select(m => m.Value);
-        var cat = season;
-        var withSpaces = string.Join(" ", words);
-        var emoji = GetEmoji(cat);
 
-        return $"{emoji} {withSpaces}";
-    }
-    
-    public static string GetNameWithSpacesFromEnum<T>(T givenEnum) where T : Enum {
+    private string GetNameWithSpaces<T>(T givenEnum) where T : Enum
+    {
         var words = Regex.Matches(givenEnum.ToString(), @"([A-Z][a-z]+)").Select(m => m.Value);
         var withSpaces = string.Join(" ", words);
         return $"{withSpaces}";
     }
-    
-    public static bool IsValidBase64(string? input)
+
+    public bool IsValidBase64(string? input)
     {
         try
         {
@@ -82,18 +76,42 @@ public static bool IsValidBase64(string? input)
             {
                 return false;
             }
+
             Convert.FromBase64String(input);
             return true;
         }
         catch
         {
             return false;
-
         }
     }
 
-    public static ICollection<T> ConvertEnumToCollection<T>() where T : Enum
+    public ICollection<T> ConvertEnumToCollection<T>() where T : Enum
     {
         return Enum.GetValues(typeof(T)).Cast<T>().ToList();
     }
+
+    #region Private Methods
+
+    public string GetNameWithSpacesAndEmoji(ClothingCategory category)
+    {
+        var words = Regex.Matches(category.ToString(), @"([A-Z][a-z]+)").Select(m => m.Value);
+        var cat = category;
+        var withSpaces = string.Join(" ", words);
+        var emoji = GetEmoji(cat);
+
+        return $"{emoji} {withSpaces}";
+    }
+
+    public string GetNameWithSpacesAndEmoji(Season season)
+    {
+        var words = Regex.Matches(season.ToString(), @"([A-Z][a-z]+)").Select(m => m.Value);
+        var cat = season;
+        var withSpaces = string.Join(" ", words);
+        var emoji = GetEmoji(cat);
+
+        return $"{emoji} {withSpaces}";
+    }
+
+    #endregion
 }
\ No newline at end of file

From 2dfc55814a85d68966b94ab9248301096fb219c1 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 21:05:00 -0500
Subject: [PATCH 12/15] US-003 - Unify names for API services

---
 .../Services/ClothingServiceTests.cs          |  6 ++---
 .../Endpoints/ClothingEndpoints.cs            |  6 ++---
 .../Implementation/ClothingService.cs         |  2 +-
 .../Services/Interfaces/IClothingService.cs   |  2 +-
 .../Services/Implementation/ApiService.cs     |  6 ++---
 .../Services/Interfaces/IApiService.cs        |  6 ++---
 .../ViewModels/AddClothingItemViewModel.cs    |  2 +-
 .../ViewModels/WardrobeViewModel.cs           |  4 ++--
 .../StaticResources/MiscMethodsTests.cs       | 23 -------------------
 .../WardrobeManager.Shared.Tests.csproj       |  1 +
 10 files changed, 18 insertions(+), 40 deletions(-)
 delete mode 100644 WardrobeManager.Shared.Tests/StaticResources/MiscMethodsTests.cs

diff --git a/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs b/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs
index bbcdbb2..9ecfab6 100644
--- a/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs
+++ b/WardrobeManager.Api.Tests/Services/ClothingServiceTests.cs
@@ -213,7 +213,7 @@ public async Task RemoveClothingItem_ItemDoesNotExist_ErrorLogged()
             .Setup(r => r.GetAsync(clothingItem.UserId, clothingItem.Id))
             .ReturnsAsync(null as ClothingItem);
         // Act
-        await _serviceToTest.RemoveClothingItem(clothingItem.UserId, clothingItem.Id);
+        await _serviceToTest.DeleteClothingItem(clothingItem.UserId, clothingItem.Id);
         // Assert
         var latestLog = _fakeLogger.Collector.LatestRecord;
         latestLog.Should().NotBeNull();
@@ -230,7 +230,7 @@ public async Task RemoveClothingItem_ItemExistsAndImageGuidNull_FileNotDeleted()
             .Setup(r => r.GetAsync(DefaultUserId, DefaultItemId))
             .ReturnsAsync(clothingItem);
         // Act
-        await _serviceToTest.RemoveClothingItem(DefaultUserId, DefaultItemId);
+        await _serviceToTest.DeleteClothingItem(DefaultUserId, DefaultItemId);
         // Assert
         _mockRepo.Verify(x => x.Remove(clothingItem), Times.Once);
         _mockRepo.Verify(x => x.SaveAsync(), Times.Once);
@@ -247,7 +247,7 @@ public async Task RemoveClothingItem_ItemExistsAndImageGuidExists_FileDeleted()
             .Setup(r => r.GetAsync(DefaultUserId, DefaultItemId))
             .ReturnsAsync(clothingItem);
         // Act
-        await _serviceToTest.RemoveClothingItem(DefaultUserId, DefaultItemId);
+        await _serviceToTest.DeleteClothingItem(DefaultUserId, DefaultItemId);
         // Assert
         _mockRepo.Verify(x => x.Remove(clothingItem), Times.Once);
         _mockRepo.Verify(x => x.SaveAsync(), Times.Once);
diff --git a/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs b/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
index b6892e6..1f4f4a4 100644
--- a/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
+++ b/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
@@ -23,7 +23,7 @@ public static void MapClothingEndpoints(this IEndpointRouteBuilder app)
 
         group.MapGet("", GetClothing);
         group.MapPost("/add", AddNewClothingItem);
-        group.MapPost("/delete", RemoveClothingItem);
+        group.MapPost("/delete", DeleteClothingItem);
         // maybe should get a GET request, idc rn
     }
 
@@ -60,7 +60,7 @@ public static async Task<IResult> AddNewClothingItem(
         return Results.Ok();
     }
     
-    public static async Task<IResult> RemoveClothingItem(
+    public static async Task<IResult> DeleteClothingItem(
         [FromBody] int itemId,
         HttpContext context, IClothingService clothingService, IMapper mapper
     )
@@ -68,7 +68,7 @@ public static async Task<IResult> RemoveClothingItem(
         User? user = context.Items["user"] as User;
         Debug.Assert(user != null, "Cannot get user");
     
-        await clothingService.RemoveClothingItem(user.Id ,itemId);
+        await clothingService.DeleteClothingItem(user.Id ,itemId);
 
         return Results.Ok();
     }
diff --git a/WardrobeManager.Api/Services/Implementation/ClothingService.cs b/WardrobeManager.Api/Services/Implementation/ClothingService.cs
index f0d98a8..153d2df 100644
--- a/WardrobeManager.Api/Services/Implementation/ClothingService.cs
+++ b/WardrobeManager.Api/Services/Implementation/ClothingService.cs
@@ -57,7 +57,7 @@ public async Task AddNewClothingItem(string userId, NewClothingItemDTO newClothi
         await clothingRepository.SaveAsync();
     }
 
-    public async Task RemoveClothingItem(string userId, int itemId)
+    public async Task DeleteClothingItem(string userId, int itemId)
     {
         var res = await clothingRepository.GetAsync(userId, itemId);
         if (res != null)
diff --git a/WardrobeManager.Api/Services/Interfaces/IClothingService.cs b/WardrobeManager.Api/Services/Interfaces/IClothingService.cs
index 998cb91..4be74be 100644
--- a/WardrobeManager.Api/Services/Interfaces/IClothingService.cs
+++ b/WardrobeManager.Api/Services/Interfaces/IClothingService.cs
@@ -14,5 +14,5 @@ public interface IClothingService
     
     Task<ClothingItemDTO?> GetClothingItemAsync(string userId, int itemId);
     Task AddNewClothingItem(string userId, NewClothingItemDTO newNewClothingItem);
-    Task RemoveClothingItem(string userId, int itemId);
+    Task DeleteClothingItem(string userId, int itemId);
 }
diff --git a/WardrobeManager.Presentation/Services/Implementation/ApiService.cs b/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
index addc167..412ac48 100644
--- a/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
+++ b/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
@@ -24,17 +24,17 @@ public ApiService(string apiEndpoint, IHttpClientFactory factory)
 
     #region Clothing
 
-    public async Task<List<ClothingItemDTO>> GetAllClothingItems()
+    public async Task<List<ClothingItemDTO>> GetAllClothingItemsAsync()
     {
         return await _httpClient.GetFromJsonAsync<List<ClothingItemDTO>>("/clothing") ?? [];
     }
 
-    public async Task AddNewClothingItem(NewClothingItemDTO newNewClothingItem)
+    public async Task AddNewClothingItemAsync(NewClothingItemDTO newNewClothingItem)
     {
         await _httpClient.PostAsJsonAsync<NewClothingItemDTO>("/clothing/add", newNewClothingItem);
     }
 
-    public async Task RemoveClothingItem(int itemId)
+    public async Task DeleteClothingItemAsync(int itemId)
     {
         await _httpClient.PostAsJsonAsync<int>("/clothing/delete", itemId);
     }
diff --git a/WardrobeManager.Presentation/Services/Interfaces/IApiService.cs b/WardrobeManager.Presentation/Services/Interfaces/IApiService.cs
index 819c622..2573611 100644
--- a/WardrobeManager.Presentation/Services/Interfaces/IApiService.cs
+++ b/WardrobeManager.Presentation/Services/Interfaces/IApiService.cs
@@ -11,9 +11,9 @@ public interface IApiService
     ValueTask DisposeAsync();
     
     // Clothing
-    Task<List<ClothingItemDTO>> GetAllClothingItems();
-    Task AddNewClothingItem(NewClothingItemDTO newNewClothingItem);
-    Task RemoveClothingItem( int itemId);
+    Task<List<ClothingItemDTO>> GetAllClothingItemsAsync();
+    Task AddNewClothingItemAsync(NewClothingItemDTO newNewClothingItem);
+    Task DeleteClothingItemAsync( int itemId);
     
     // Misc 
     Task<bool> CheckApiConnection();
diff --git a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
index e702ecf..ef96de5 100644
--- a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
@@ -41,7 +41,7 @@ public async Task SubmitAsync()
             return;
         }
 
-        await apiService.AddNewClothingItem(NewClothingItem);
+        await apiService.AddNewClothingItemAsync(NewClothingItem);
         notificationService.AddNotification($"Clothing Item \"{NewClothingItem.Name}\" Added!",
             NotificationType.Success);
         NewClothingItem = new NewClothingItemDTO();
diff --git a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
index cead7ab..d88dcbf 100644
--- a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
@@ -32,7 +32,7 @@ public override async Task OnInitializedAsync()
 
     public async Task FetchItemAndUpdate()
     {
-        ClothingItems = await apiService.GetAllClothingItems();
+        ClothingItems = await apiService.GetAllClothingItemsAsync();
         // Reset dialogs states (in case items are removed, they wont exist in this anymore)
         ActionDialogStates = new Dictionary<int, ShowActionDialog>();
         foreach (var item in ClothingItems)
@@ -43,7 +43,7 @@ public async Task FetchItemAndUpdate()
 
     public async Task RemoveItem(int itemId)
     {
-        await apiService.RemoveClothingItem(itemId);
+        await apiService.DeleteClothingItemAsync(itemId);
         await FetchItemAndUpdate();
     }
 
diff --git a/WardrobeManager.Shared.Tests/StaticResources/MiscMethodsTests.cs b/WardrobeManager.Shared.Tests/StaticResources/MiscMethodsTests.cs
deleted file mode 100644
index 1092086..0000000
--- a/WardrobeManager.Shared.Tests/StaticResources/MiscMethodsTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using FluentAssertions;
-using WardrobeManager.Shared.StaticResources;
-
-namespace WardrobeManager.Shared.Tests.StaticResources;
-
-public class MiscMethodsTests
-{
-    [SetUp]
-    public void Setup()
-    {
-    }
-
-    [Test]
-    public void GenerateRandomId_DefaultScenario_CorrectFormat()
-    {
-        // Arrange
-        // Act
-        var randomId = MiscMethods.GenerateRandomId();
-        // Assert
-        randomId.Length.Should().Be(10);
-        randomId.Should().StartWith("id");
-    }
-}
\ No newline at end of file
diff --git a/WardrobeManager.Shared.Tests/WardrobeManager.Shared.Tests.csproj b/WardrobeManager.Shared.Tests/WardrobeManager.Shared.Tests.csproj
index a4dc5db..686c750 100644
--- a/WardrobeManager.Shared.Tests/WardrobeManager.Shared.Tests.csproj
+++ b/WardrobeManager.Shared.Tests/WardrobeManager.Shared.Tests.csproj
@@ -29,6 +29,7 @@
     <ItemGroup>
       <Folder Include="DTOs\" />
       <Folder Include="Enums\" />
+      <Folder Include="StaticResources\" />
     </ItemGroup>
 
 </Project>

From 8fc73191f8011ac4555a59e2e42ae9b34e18c4f4 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 21:20:20 -0500
Subject: [PATCH 13/15] US-003 - Fix all warnings (mostly getting rid of unused
 stuff) and add warning suppressions for CS8618

---
 .../Database/Entities/ClothingItem.cs         |  2 -
 .../WardrobeManager.Api.csproj                | 65 ++++++++++---------
 .../CookieAuthenticationStateProvider.cs      |  8 ---
 .../Services/Implementation/ApiService.cs     |  1 -
 .../ViewModels/AddClothingItemViewModel.cs    |  1 -
 .../ViewModels/DashboardViewModel.cs          |  5 --
 .../ViewModels/HomeViewModel.cs               |  5 --
 .../ViewModels/LoginViewModel.cs              |  2 -
 .../ViewModels/NavMenuViewModel.cs            |  3 +-
 .../ViewModels/SignupViewModel.cs             |  1 -
 .../ViewModels/WardrobeViewModel.cs           |  1 -
 .../WardrobeManager.Shared.csproj             | 19 +++---
 12 files changed, 46 insertions(+), 67 deletions(-)

diff --git a/WardrobeManager.Api/Database/Entities/ClothingItem.cs b/WardrobeManager.Api/Database/Entities/ClothingItem.cs
index 5b805a9..cabb425 100644
--- a/WardrobeManager.Api/Database/Entities/ClothingItem.cs
+++ b/WardrobeManager.Api/Database/Entities/ClothingItem.cs
@@ -9,11 +9,9 @@ namespace WardrobeManager.Api.Database.Entities;
 
 public class ClothingItem : IDatabaseEntity
 {
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public ClothingItem()
     {
     } // ONLY FOR DESERIALIZER, DO NOT USE THIS. THIS SHIT BETTER HAVE NO REFERENCES
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 
     // deserializer needs a way to create the object without any fields so it can assign them if they exist
 
diff --git a/WardrobeManager.Api/WardrobeManager.Api.csproj b/WardrobeManager.Api/WardrobeManager.Api.csproj
index 135b6d2..54482d8 100644
--- a/WardrobeManager.Api/WardrobeManager.Api.csproj
+++ b/WardrobeManager.Api/WardrobeManager.Api.csproj
@@ -1,38 +1,41 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>0c85772c-6d6d-44fd-b892-8607c38600f6</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <UserSecretsId>0c85772c-6d6d-44fd-b892-8607c38600f6</UserSecretsId>
+        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+        <!-- Many models need empty constructors for Automapper to function so we are globally disabling this warning -->
+        <!-- Also using empty constructors is useful in tests -->
+        <NoWarn>CS8618</NoWarn>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="16.0.0" />
-    <PackageReference Include="Dumpify" Version="0.6.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.16.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.3" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="AutoMapper" Version="16.0.0"/>
+        <PackageReference Include="Dumpify" Version="0.6.6"/>
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3"/>
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3"/>
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.3"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.16.0"/>
+        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0"/>
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.3"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\WardrobeManager.Shared\WardrobeManager.Shared.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\WardrobeManager.Shared\WardrobeManager.Shared.csproj"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Migrations\" />
-    <Folder Include="Validators\" />
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
+    <ItemGroup>
+        <Folder Include="Migrations\"/>
+        <Folder Include="Validators\"/>
+        <Folder Include="wwwroot\"/>
+    </ItemGroup>
 
 </Project>
diff --git a/WardrobeManager.Presentation/Identity/CookieAuthenticationStateProvider.cs b/WardrobeManager.Presentation/Identity/CookieAuthenticationStateProvider.cs
index 9082188..d8115bd 100644
--- a/WardrobeManager.Presentation/Identity/CookieAuthenticationStateProvider.cs
+++ b/WardrobeManager.Presentation/Identity/CookieAuthenticationStateProvider.cs
@@ -30,11 +30,6 @@ public class CookieAuthenticationStateProvider : AuthenticationStateProvider, IA
     /// </summary>
     private readonly HttpClient _httpClient;
 
-    /// <summary>
-    /// Authentication state.
-    /// </summary>
-    private bool _authenticated = false;
-
     /// <summary>
     /// Default principal for anonymous (not authenticated) users.
     /// </summary>
@@ -166,8 +161,6 @@ public async Task<FormResult> LoginAsync(string email, string password)
     /// <returns>The authentication state asynchronous request.</returns>
     public override async Task<AuthenticationState> GetAuthenticationStateAsync()
     {
-        _authenticated = false;
-
         // default to not authenticated
         var user = Unauthenticated;
 
@@ -226,7 +219,6 @@ public override async Task<AuthenticationState> GetAuthenticationStateAsync()
                 // set the principal
                 var id = new ClaimsIdentity(claims, nameof(CookieAuthenticationStateProvider));
                 user = new ClaimsPrincipal(id);
-                _authenticated = true;
             }
         }
         catch
diff --git a/WardrobeManager.Presentation/Services/Implementation/ApiService.cs b/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
index 412ac48..38f63ec 100644
--- a/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
+++ b/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
@@ -14,7 +14,6 @@ public class ApiService : IAsyncDisposable, IApiService
 {
     private readonly string _apiEndpoint;
     private readonly HttpClient _httpClient;
-    private readonly INotificationService _notificationService;
 
     public ApiService(string apiEndpoint, IHttpClientFactory factory)
     {
diff --git a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
index ef96de5..8d83068 100644
--- a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
@@ -12,7 +12,6 @@ namespace WardrobeManager.Presentation.ViewModels;
 
 [ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
 public partial class AddClothingItemViewModel(
-    IMvvmNavigationManager navManager,
     IApiService apiService,
     INotificationService notificationService,
     IMiscMethods miscMethods,
diff --git a/WardrobeManager.Presentation/ViewModels/DashboardViewModel.cs b/WardrobeManager.Presentation/ViewModels/DashboardViewModel.cs
index e5a7247..7b7c158 100644
--- a/WardrobeManager.Presentation/ViewModels/DashboardViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/DashboardViewModel.cs
@@ -14,11 +14,6 @@ namespace WardrobeManager.Presentation.ViewModels;
 
 [ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
 public partial class DashboardViewModel(
-    INotificationService notificationService,
-    NavigationManager navigationManager,
-    IMvvmNavigationManager navManager,
-    
-    IIdentityService identityService
     )
     : ViewModelBase
 {
diff --git a/WardrobeManager.Presentation/ViewModels/HomeViewModel.cs b/WardrobeManager.Presentation/ViewModels/HomeViewModel.cs
index 6995e53..3a063b0 100644
--- a/WardrobeManager.Presentation/ViewModels/HomeViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/HomeViewModel.cs
@@ -14,11 +14,6 @@ namespace WardrobeManager.Presentation.ViewModels;
 
 [ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
 public partial class HomeViewModel(
-    INotificationService notificationService,
-    NavigationManager navigationManager,
-    IMvvmNavigationManager navManager,
-    
-    IIdentityService identityService
     )
     : ViewModelBase
 {
diff --git a/WardrobeManager.Presentation/ViewModels/LoginViewModel.cs b/WardrobeManager.Presentation/ViewModels/LoginViewModel.cs
index 3a623ad..3e37795 100644
--- a/WardrobeManager.Presentation/ViewModels/LoginViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/LoginViewModel.cs
@@ -12,8 +12,6 @@ namespace WardrobeManager.Presentation.ViewModels;
 
 [ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
 public partial class LoginViewModel(
-    IAccountManagement accountManagement,
-    INotificationService notificationService,
     IMvvmNavigationManager navManager,
     IIdentityService identityService
     )
diff --git a/WardrobeManager.Presentation/ViewModels/NavMenuViewModel.cs b/WardrobeManager.Presentation/ViewModels/NavMenuViewModel.cs
index 9a4e690..abcc186 100644
--- a/WardrobeManager.Presentation/ViewModels/NavMenuViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/NavMenuViewModel.cs
@@ -8,7 +8,6 @@ namespace WardrobeManager.Presentation.ViewModels;
 
 [ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
 public partial class NavBarViewModel(
-    INotificationService notificationService,
     IMvvmNavigationManager navManager,
     IIdentityService identityService,
     IApiService apiService
@@ -17,7 +16,7 @@ IApiService apiService
 {
     [ObservableProperty] private bool _showUserPopover;
     [ObservableProperty] private bool _canConnectToBackend;
-    [ObservableProperty] private string _usersName;
+    [ObservableProperty] private string _usersName = string.Empty;
 
     public void ToggleUserPopover() => ShowUserPopover = !ShowUserPopover;
 
diff --git a/WardrobeManager.Presentation/ViewModels/SignupViewModel.cs b/WardrobeManager.Presentation/ViewModels/SignupViewModel.cs
index 4f74ee4..3dce53f 100644
--- a/WardrobeManager.Presentation/ViewModels/SignupViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/SignupViewModel.cs
@@ -12,7 +12,6 @@ namespace WardrobeManager.Presentation.ViewModels;
 
 [ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
 public partial class SignupViewModel(
-    IAccountManagement accountManagement,
     INotificationService notificationService,
     IMvvmNavigationManager navManager,
     IIdentityService identityService
diff --git a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
index d88dcbf..d4ead12 100644
--- a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
@@ -13,7 +13,6 @@ namespace WardrobeManager.Presentation.ViewModels;
 
 [ViewModelDefinition(Lifetime = ServiceLifetime.Scoped)]
 public partial class WardrobeViewModel(
-    IMvvmNavigationManager navManager,
     IApiService apiService,
     INotificationService notificationService
 )
diff --git a/WardrobeManager.Shared/WardrobeManager.Shared.csproj b/WardrobeManager.Shared/WardrobeManager.Shared.csproj
index df55074..e9b37a4 100644
--- a/WardrobeManager.Shared/WardrobeManager.Shared.csproj
+++ b/WardrobeManager.Shared/WardrobeManager.Shared.csproj
@@ -1,13 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <!-- Many models need empty constructors for Automapper to function so we are globally disabling this warning -->
+        <!-- Also using empty constructors is useful in tests -->
+        <NoWarn>CS8618</NoWarn>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="12.1.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="FluentValidation" Version="12.1.1"/>
+    </ItemGroup>
 
 </Project>

From 1e0224d32fab645bbc19ee4b27af55f81bc30135 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 21:55:33 -0500
Subject: [PATCH 14/15] US-003 - Fix DeepSource issues

---
 .../Endpoints/ClothingEndpoints.cs            | 12 +++----
 .../Services/Implementation/FileService.cs    |  2 +-
 .../ViewModels/AddClothingItemViewModel.cs    | 14 +++-----
 .../ViewModels/WardrobeViewModel.cs           | 36 +++++++++++--------
 .../DTOs/ClothingItemDTO.cs                   |  2 --
 .../DTOs/NewClothingItemDTO.cs                |  1 -
 6 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs b/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
index 1f4f4a4..a61febe 100644
--- a/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
+++ b/WardrobeManager.Api/Endpoints/ClothingEndpoints.cs
@@ -21,16 +21,16 @@ public static void MapClothingEndpoints(this IEndpointRouteBuilder app)
     {
         var group = app.MapGroup("/clothing").RequireAuthorization();
 
-        group.MapGet("", GetClothing);
-        group.MapPost("/add", AddNewClothingItem);
-        group.MapPost("/delete", DeleteClothingItem);
+        group.MapGet("", GetClothingAsync);
+        group.MapPost("/add", AddNewClothingItemAsync);
+        group.MapPost("/delete", DeleteClothingItemAsync);
         // maybe should get a GET request, idc rn
     }
 
     // ---------------------
     // Get all clothing items
     // ---------------------
-    public static async Task<IResult> GetClothing(
+    public static async Task<IResult> GetClothingAsync(
         HttpContext context, IClothingService clothingService
     )
     {
@@ -42,7 +42,7 @@ public static async Task<IResult> GetClothing(
         return Results.Ok(clothes);
     }
 
-    public static async Task<IResult> AddNewClothingItem(
+    public static async Task<IResult> AddNewClothingItemAsync(
         [FromBody] NewClothingItemDTO newClothingItem,
         HttpContext context, IClothingService clothingService, IMapper mapper
     )
@@ -60,7 +60,7 @@ public static async Task<IResult> AddNewClothingItem(
         return Results.Ok();
     }
     
-    public static async Task<IResult> DeleteClothingItem(
+    public static async Task<IResult> DeleteClothingItemAsync(
         [FromBody] int itemId,
         HttpContext context, IClothingService clothingService, IMapper mapper
     )
diff --git a/WardrobeManager.Api/Services/Implementation/FileService.cs b/WardrobeManager.Api/Services/Implementation/FileService.cs
index bdd6b12..91b3096 100644
--- a/WardrobeManager.Api/Services/Implementation/FileService.cs
+++ b/WardrobeManager.Api/Services/Implementation/FileService.cs
@@ -39,7 +39,7 @@ public async Task SaveImage(Guid? guid, string ImageBase64)
 
         if (imageBytes.Length > maxFileSizeNum)
         {
-            throw new Exception(
+            throw new ArgumentOutOfRangeException(
                 $"File size too large! Received file size: {imageBytes.Length / 1024} MB. Max file size: {maxFileSizeNum / 1024} MB");
         }
 
diff --git a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
index 8d83068..2c5557e 100644
--- a/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/AddClothingItemViewModel.cs
@@ -20,7 +20,7 @@ IConfiguration configuration
     : ViewModelBase
 {
     // Public Properties
-    [ObservableProperty] private NewClothingItemDTO _newClothingItem = new NewClothingItemDTO();
+    [ObservableProperty] private NewClothingItemDTO _newClothingItem = new();
 
     public string GetNameWithSpacesAndEmoji<T>(T value) where T : Enum
         => miscMethods.GetNameWithSpacesFromEnum(value);
@@ -54,15 +54,9 @@ public async Task UploadImage(InputFileChangeEventArgs e)
 
             // 5MB default max file size
             var maxFileSize = configuration["WM_MAX_IMAGE_UPLOAD_SIZE_IN_MB"];
-            int maxFileSizeNum;
-            if (maxFileSize == null)
-            {
-                maxFileSizeNum = ProjectConstants.MaxImageSizeInMBFallback;
-            }
-            else
-            {
-                maxFileSizeNum = Convert.ToInt32(maxFileSize);
-            }
+            int maxFileSizeNum = maxFileSize == null
+                ? ProjectConstants.MaxImageSizeInMBFallback
+                : Convert.ToInt32(maxFileSize);
 
             maxFileSizeNum *= 1024 * 1024; // int to megabytes
 
diff --git a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
index d4ead12..dd73d4d 100644
--- a/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
+++ b/WardrobeManager.Presentation/ViewModels/WardrobeViewModel.cs
@@ -48,39 +48,45 @@ public async Task RemoveItem(int itemId)
 
     public void UpdateActionDialogState(int itemId, ActionType actionType, bool value)
     {
-        if (ActionDialogStates.ContainsKey(itemId))
+        if (ActionDialogStates.TryGetValue(itemId, out ShowActionDialog? actionDialog))
         {
-            switch(actionType)
+            switch (actionType)
             {
-               case ActionType.Delete:
-                   ActionDialogStates[itemId].ShowDelete = value;
-                   break;
-               case ActionType.Edit:
-                   ActionDialogStates[itemId].ShowEdit = value;
-                   break;
-               default:
-                   notificationService.AddNotification("Action type not recognized!", NotificationType.Warning);
-                   break;
+                case ActionType.Delete:
+                    actionDialog.ShowDelete = value;
+                    break;
+                case ActionType.Edit:
+                    actionDialog.ShowDelete = value;
+                    break;
+                default:
+                    notificationService.AddNotification("Action type not recognized!", NotificationType.Warning);
+                    break;
             }
         }
         else
         {
-            notificationService.AddNotification("Cannot change dialog state for not existing item!", NotificationType.Error);
+            notificationService.AddNotification("Cannot change dialog state for not existing item!",
+                NotificationType.Error);
         }
     }
 
     public bool GetActionStateSafely(int itemId, ActionType actionType)
     {
-        if (ActionDialogStates.ContainsKey(itemId))
+        if (ActionDialogStates.TryGetValue(itemId, out ShowActionDialog? actionDialog))
         {
             switch (actionType)
             {
                 case ActionType.Delete:
-                    return ActionDialogStates[itemId].ShowDelete;
+                    return actionDialog.ShowDelete;
+
                 case ActionType.Edit:
-                    return ActionDialogStates[itemId].ShowEdit;
+                    return actionDialog.ShowEdit;
+                default:
+                    notificationService.AddNotification("Action type not recognized!", NotificationType.Warning);
+                    break;
             }
         }
+
         return false;
     }
 }
diff --git a/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs b/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs
index 9a75432..d06dabd 100644
--- a/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs
+++ b/WardrobeManager.Shared/DTOs/ClothingItemDTO.cs
@@ -8,8 +8,6 @@ namespace WardrobeManager.Shared.DTOs;
 
 public class ClothingItemDTO
 {
-    public ClothingItemDTO() {}
-    
     public int Id { get; set; }
     public string Name { get; set; }
     public ClothingCategory Category { get; set; }
diff --git a/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs b/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
index 6d8331b..54a6394 100644
--- a/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
+++ b/WardrobeManager.Shared/DTOs/NewClothingItemDTO.cs
@@ -9,7 +9,6 @@ namespace WardrobeManager.Shared.DTOs;
 
 public class NewClothingItemDTO
 {
-    public NewClothingItemDTO() {}
     public string Name { get; set; } = string.Empty;
     public ClothingCategory Category { get; set; }  = ClothingCategory.None;
     public string? ImageBase64 { get; set; } = null;

From 87842c29bd497a7d8614fb18573c78490e79f9c1 Mon Sep 17 00:00:00 2001
From: Musa Ahmed <musaa.ahmed7@gmail.com>
Date: Fri, 27 Feb 2026 22:08:35 -0500
Subject: [PATCH 15/15] US-003 - Ensure status code for api requests

---
 .../Services/Implementation/ApiService.cs                   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/WardrobeManager.Presentation/Services/Implementation/ApiService.cs b/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
index 38f63ec..2a90f5d 100644
--- a/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
+++ b/WardrobeManager.Presentation/Services/Implementation/ApiService.cs
@@ -30,12 +30,14 @@ public async Task<List<ClothingItemDTO>> GetAllClothingItemsAsync()
 
     public async Task AddNewClothingItemAsync(NewClothingItemDTO newNewClothingItem)
     {
-        await _httpClient.PostAsJsonAsync<NewClothingItemDTO>("/clothing/add", newNewClothingItem);
+        var response = await _httpClient.PostAsJsonAsync<NewClothingItemDTO>("/clothing/add", newNewClothingItem);
+        response.EnsureSuccessStatusCode();
     }
 
     public async Task DeleteClothingItemAsync(int itemId)
     {
-        await _httpClient.PostAsJsonAsync<int>("/clothing/delete", itemId);
+        var response = await _httpClient.PostAsJsonAsync<int>("/clothing/delete", itemId);
+        response.EnsureSuccessStatusCode();
     }
 
     #endregion