Specification implementation -- Merge 'dev' into main branch

Cataloguify/Cataloguify.Client/App.razor

@@ -0,0 +1,12 @@
+<Router AppAssembly="@typeof(App).Assembly">
+ <Found Context="routeData">
+ <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+ <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+ </Found>
+ <NotFound>
+ <PageTitle>Not found</PageTitle>
+ <LayoutView Layout="@typeof(MainLayout)">
+ <p role="alert">Sorry, there's nothing at this address.</p>
+ </LayoutView>
+ </NotFound>
+</Router>

Cataloguify/Cataloguify.Client/Areas/Identity/IIdentityService.cs

@@ -0,0 +1,16 @@
+using Cataloguify.Client.DTO;
+using Cataloguify.Client.HttpClients;
+
+namespace Cataloguify.Client.Areas.Identity;
+
+public interface IIdentityService
+{ 
+ string Token { get; }
+ string Email { get; }
+ string Username { get; }
+ bool IsAuthenticated { get; set; }
+
+ Task<HttpResponse<object>> SignUpAsync(string email, string username, string password);
+ Task<HttpResponse<TokenDto>> SignInAsync(string email, string password);
+ Task Logout();
+}

Cataloguify/Cataloguify.Client/Areas/Identity/IdentityService.cs

@@ -0,0 +1,77 @@
+using System.IdentityModel.Tokens.Jwt;
+using Blazored.LocalStorage;
+using Cataloguify.Client.DTO;
+using Microsoft.AspNetCore.Components;
+using Cataloguify.Client.HttpClients;
+
+namespace Cataloguify.Client.Areas.Identity;
+
+public class IdentityService : IIdentityService
+{
+ private readonly IHttpClient _httpClient;
+ private readonly JwtSecurityTokenHandler _jwtHandler;
+ private readonly ILocalStorageService _localStorage;
+ private readonly NavigationManager _navigationManager;
+
+ public string Token { get; private set;}
+ public string Email { get; private set; }
+ public string Username { get; private set; }
+ public bool IsAuthenticated { get; set; }
+
+ public IdentityService(IHttpClient httpClient, ILocalStorageService localStorage,
+ NavigationManager navigationManager)
+ {
+ _httpClient = httpClient;
+ _jwtHandler = new JwtSecurityTokenHandler();
+ _localStorage = localStorage;
+ _navigationManager = navigationManager;
+ }
+
+ public async Task<HttpResponse<object>> SignUpAsync(string email, string username, string password)
+ {
+ return await _httpClient.PostAsync<object, object>("prod/sign-up",
+ new { email, username, password });
+ }
+
+ public async Task<HttpResponse<TokenDto>> SignInAsync(string email, string password)
+ {
+ var response = await _httpClient.PostAsync<object, TokenDto>("prod/generate-token", new { email, password });
+ if (response.ErrorMessage != null)
+ {
+ return response;
+ }
+
+ Token = response.Content.AccessToken;
+ await _localStorage.SetItemAsStringAsync("Token", Token);
+
+ var jwtToken = _jwtHandler.ReadJwtToken(Token);
+ var payload = jwtToken.Payload;
+ Email = payload.Claims.FirstOrDefault(c => c.Type == "http:https://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress")?.Value;
+ Username = payload.Claims.FirstOrDefault(c => c.Type == "http:https://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+ IsAuthenticated = true;
+
+ await _localStorage.SetItemAsStringAsync("Email", email ?? string.Empty);
+ await _localStorage.SetItemAsStringAsync("Username", Username ?? string.Empty);
+ await _localStorage.SetItemAsStringAsync("IsAuthenticated", IsAuthenticated.ToString());
+
+ return response;
+ }
+
+ public async Task Logout()
+ {
+ Token = null;
+ await _localStorage.RemoveItemAsync("Token");
+
+ Email = null;
+ await _localStorage.RemoveItemAsync("Email");
+
+ Username = null;
+ await _localStorage.RemoveItemAsync("Username");
+
+ IsAuthenticated = false;
+ await _localStorage.SetItemAsStringAsync("IsAuthenticated", IsAuthenticated.ToString());
+
+ await _localStorage.RemoveItemAsync("searchImagesCriteria");
+ _navigationManager.NavigateTo("signin", forceLoad: true);
+ }
+}

Cataloguify/Cataloguify.Client/Areas/Images/IImagesService.cs

@@ -0,0 +1,12 @@
+using Cataloguify.Client.DTO;
+using Cataloguify.Client.HttpClients;
+
+namespace Cataloguify.Client.Areas.Images;
+
+public interface IImagesService
+{
+ Task<HttpResponse<object>> UploadImageAsync(string image);
+ Task<HttpResponse<PageableDto>> SearchImagesAsync(IEnumerable<string> tags, int page,
+ int results, string sortOrder);
+ Task DeleteImageAsync(Guid eventId);
+}

Cataloguify/Cataloguify.Client/Areas/Images/ImagesService.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Threading.Tasks;
+using Blazored.LocalStorage;
+using Cataloguify.Client.DTO;
+using Cataloguify.Client.HttpClients;
+using Microsoft.Extensions.Logging;
+using System.Net.Http.Json; 
+
+namespace Cataloguify.Client.Areas.Images
+{
+ public class ImagesService : IImagesService
+ {
+ private readonly IHttpClient _httpClient;
+ private readonly ILocalStorageService _localStorage;
+ private readonly ILogger<ImagesService> _logger;
+
+ public ImagesService(IHttpClient httpClient, ILocalStorageService localStorage, ILogger<ImagesService> logger)
+ {
+ _httpClient = httpClient;
+ _localStorage = localStorage;
+ _logger = logger;
+ }
+
+ public async Task<HttpResponse<object>> UploadImageAsync(string base64Image)
+ {
+ try
+ {
+ var token = await _localStorage.GetItemAsStringAsync("Token");
+ _httpClient.SetAccessToken(token);
+ var imageData = new { image = base64Image };
+
+ _logger.LogInformation($"Sending image to API: {System.Text.Json.JsonSerializer.Serialize(imageData)}");
+ var response = await _httpClient.PostAsJsonAsync("prod/upload-image", imageData);
+
+ if (response.IsSuccessStatusCode)
+ {
+ _logger.LogInformation("Image uploaded successfully!");
+ var content = await response.Content.ReadFromJsonAsync<object>();
+ return new HttpResponse<object>(content);
+ }
+ else
+ {
+ _logger.LogError($"Failed to upload image. Status Code: {response.StatusCode}");
+ return new HttpResponse<object>(new ErrorMessage($"Failed with status code: {response.StatusCode}"));
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"Exception occurred: {ex.Message}");
+ return new HttpResponse<object>(new ErrorMessage(ex.Message));
+ }
+ }
+
+
+
+ public async Task<HttpResponse<PageableDto>> SearchImagesAsync(IEnumerable<string> tags, int page, int results, string sortOrder)
+ {
+ _httpClient.SetAccessToken(await _localStorage.GetItemAsStringAsync("Token"));
+ return await _httpClient.PostAsync<object, PageableDto>("prod/images", new { tags, page, results, sortOrder });
+ }
+
+
+ public async Task DeleteImageAsync(Guid imageKey)
+ {
+ _httpClient.SetAccessToken(await _localStorage.GetItemAsStringAsync("Token"));
+ await _httpClient.DeleteAsync($"prod/images?imageKey={imageKey}");
+ }
+ }
+}

Cataloguify/Cataloguify.Client/Cataloguify.Client.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+ <PropertyGroup>
+ <TargetFramework>net8.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
+ <PackageReference Include="Chronos.Blazor.Cropper" Version="1.2.16" />
+ <PackageReference Include="Cropper.Blazor" Version="1.3.2" />
+ <PackageReference Include="Blazorise" Version="1.5.3" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+ <PackageReference Include="MudBlazor" Version="6.20.0" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+ <PackageReference Include="Polly" Version="8.4.0" />
+ <PackageReference Include="Radzen.Blazor" Version="4.32.4" />
+ <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />
+ </ItemGroup>
+
+</Project>

Cataloguify/Cataloguify.Client/Cataloguify.Client.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cataloguify.Client", "Cataloguify.Client.csproj", "{97D9A8DB-E70E-44F8-AFBE-85A35B13D70E}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {97D9A8DB-E70E-44F8-AFBE-85A35B13D70E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {97D9A8DB-E70E-44F8-AFBE-85A35B13D70E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {97D9A8DB-E70E-44F8-AFBE-85A35B13D70E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {97D9A8DB-E70E-44F8-AFBE-85A35B13D70E}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {FC048B20-FFF4-448C-8CC2-EA90352B4194}
+ EndGlobalSection
+EndGlobal

Cataloguify/Cataloguify.Client/DTO/ImageDto.cs

@@ -0,0 +1,11 @@
+namespace Cataloguify.Client.DTO;
+
+public class ImageDto
+{
+ public Guid ImageKey { get; set; }
+ public Guid UserId { get; set; }
+ public string ImageUrl { get; set; }
+ public IEnumerable<string> Tags { get; set; }
+ public DateTime UploadedAt { get; set; }
+ public bool DeleteSubmitted { get; set; }
+}

Cataloguify/Cataloguify.Client/DTO/PageableDto.cs

@@ -0,0 +1,9 @@
+namespace Cataloguify.Client.DTO;
+
+public class PageableDto
+{
+ public int Page { get; set; }
+ public int Results { get; set; }
+ public int TotalPages { get; set; }
+ public IEnumerable<ImageDto> Content { get; set; }
+}

Cataloguify/Cataloguify.Client/DTO/ResponseDto.cs

@@ -0,0 +1,8 @@
+namespace Cataloguify.Client.DTO;
+
+public class ResponseDto
+{
+ public string Body { get; set; }
+ public int StatusCode { get; set; }
+ public bool IsBase64Encoded { get; set; }
+}

Cataloguify/Cataloguify.Client/DTO/TokenDto.cs

@@ -0,0 +1,6 @@
+namespace Cataloguify.Client.DTO;
+
+public class TokenDto
+{
+ public string AccessToken;
+}