Merge pull request #106 from infoshareacademy/feature/ja-114-blazor-c…

…omponents-configuration

Feature/JA-114 Blazor components configuration

Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetAdDetailsTests.cs

@@ -1,6 +1,6 @@
-using TutorLizard.BusinessLogic.Enums;
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
-using TutorLizard.BusinessLogic.Models;
+using TutorLizard.BusinessLogic.Models;
+using TutorLizard.Shared.Enums;
+using TutorLizard.Shared.Models.DTOs.Requests;
 
 namespace TutorLizard.BusinessLogic.Tests.Services.Browse;
 public class BrowseServiceGetAdDetailsTests : BrowseServiceTestsBase

Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetBrowseAdsPageTests.cs

@@ -1,8 +1,8 @@
 using TutorLizard.BusinessLogic.Models;
-using TutorLizard.BusinessLogic.Models.DTOs;
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
-using TutorLizard.BusinessLogic.Models.DTOs.Responses;
 using TutorLizard.BusinessLogic.Services;
+using TutorLizard.Shared.Models.DTOs;
+using TutorLizard.Shared.Models.DTOs.Requests;
+using TutorLizard.Shared.Models.DTOs.Responses;
 
 namespace TutorLizard.BusinessLogic.Tests.Services.Browse;
 public class BrowseServiceGetBrowseAdsPageTests : BrowseServiceTestsBase

Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceGetUsersScheduleTests.cs

@@ -1,7 +1,7 @@
 using TutorLizard.BusinessLogic.Models;
-using TutorLizard.BusinessLogic.Models.DTOs;
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
 using TutorLizard.BusinessLogic.Services;
+using TutorLizard.Shared.Models.DTOs;
+using TutorLizard.Shared.Models.DTOs.Requests;
 
 namespace TutorLizard.BusinessLogic.Tests.Services.Browse;
 public class BrowseServiceGetUsersScheduleTests : BrowseServiceTestsBase

Tests/TutorLizard.BusinessLogic.Tests/Services/Browse/BrowseServiceTestsBase.cs

@@ -1,7 +1,5 @@
 using AutoFixture;
-using Microsoft.EntityFrameworkCore;
 using Moq;
-using TutorLizard.BusinessLogic.Data;
 using TutorLizard.BusinessLogic.Interfaces.Data.Repositories;
 using TutorLizard.BusinessLogic.Models;
 using TutorLizard.BusinessLogic.Services;

Tests/TutorLizard.BusinessLogic.Tests/Services/Student/StudentServiceScheduleItemRequestTests.cs

@@ -1,6 +1,6 @@
 using Moq;
 using TutorLizard.BusinessLogic.Models;
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
+using TutorLizard.Shared.Models.DTOs.Requests;
 using TutorLizard.BusinessLogic.Services;
 
 namespace TutorLizard.BusinessLogic.Tests.Services.Student

Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdDetailsTests.cs

@@ -1,8 +1,8 @@
 using AutoFixture;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
-using TutorLizard.BusinessLogic.Models.DTOs.Responses;
+using TutorLizard.Shared.Models.DTOs.Requests;
+using TutorLizard.Shared.Models.DTOs.Responses;
 
 namespace TutorLizard.Web.Tests.Controllers.Browse;
 public class BrowseControllerAdDetailsTests : BrowseControllerTestsBase

Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerAdsTests.cs

@@ -1,8 +1,8 @@
 using AutoFixture;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
-using TutorLizard.BusinessLogic.Models.DTOs.Responses;
+using TutorLizard.Shared.Models.DTOs.Requests;
+using TutorLizard.Shared.Models.DTOs.Responses;
 
 namespace TutorLizard.Web.Tests.Controllers.Browse;
 public class BrowseControllerAdsTests : BrowseControllerTestsBase

Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerScheduleTests.cs

@@ -1,8 +1,8 @@
 using AutoFixture;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
-using TutorLizard.BusinessLogic.Models.DTOs.Responses;
+using TutorLizard.Shared.Models.DTOs.Requests;
+using TutorLizard.Shared.Models.DTOs.Responses;
 
 namespace TutorLizard.Web.Tests.Controllers.Browse;
 public class BrowseControllerScheduleTests : BrowseControllerTestsBase

TutorLizard.Blazor/Components/_Imports.razor

@@ -0,0 +1,10 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using TutorLizard.Blazor
+@using TutorLizard.Blazor.Components

TutorLizard.Blazor/Program.cs

@@ -0,0 +1,5 @@
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+
+await builder.Build().RunAsync();

TutorLizard.Blazor/TutorLizard.Blazor.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
+    <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\TutorLizard.Shared\TutorLizard.Shared.csproj" />
+  </ItemGroup>
+
+</Project>

TutorLizard.BusinessLogic/Data/Repositories/Json/UserJsonRepository.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.Options;
-using TutorLizard.BusinessLogic.Enums;
+using TutorLizard.Shared.Enums;
 using TutorLizard.BusinessLogic.Interfaces.Data.Repositories;
 using TutorLizard.BusinessLogic.Models;
 using TutorLizard.BusinessLogic.Options;

TutorLizard.BusinessLogic/Extensions/DtoExtensions.cs

@@ -1,30 +1,19 @@
 using TutorLizard.BusinessLogic.Models;
-using TutorLizard.BusinessLogic.Models.DTOs;
+using TutorLizard.Shared.Models.DTOs;
 
 namespace TutorLizard.BusinessLogic.Extensions;
 public static class DtoExtensions
 {
-    private static readonly ScheduleItemDto.ScheduleItemRequestStatus status;
+    public static CategoryDto ToDto(this Category category)
+        => new CategoryDto(category.Id,
+                           category.Name,
+                           category.Description);
 
-    public static AdDto ToDto(this Ad ad) => new AdDto(ad);
-    public static AdRequestDto ToDto(this AdRequest adRequest) => new AdRequestDto(adRequest);
-    public static CategoryDto ToDto(this Category category) => new CategoryDto(category);
-    public static ScheduleItemDto ToDto(this ScheduleItem scheduleItem) => new ScheduleItemDto(scheduleItem, status);
-    public static ScheduleItemRequestDto ToDto(this ScheduleItemRequest scheduleItemRequest) => new ScheduleItemRequestDto(scheduleItemRequest);
-    public static UserDto ToDto(this User user) => new UserDto(user);
-
-    public static AdListItemDto ToAdListItemDto(this Ad ad)
-    {
-        return new AdListItemDto(id: ad.Id,
-                                 tutorId: ad.TutorId,
-                                 tutorName: ad.User.Name,
-                                 subject: ad.Subject,
-                                 title: ad.Title,
-                                 description: ad.Description,
-                                 categoryId: ad.CategoryId,
-                                 categoryName: ad.Category.Name,
-                                 price: ad.Price,
-                                 location: ad.Location,
-                                 isRemote: ad.IsRemote);
-    }
+    public static UserDto ToDto(this User user)
+        => new UserDto(user.Id,
+                       user.Name,
+                       user.UserType,
+                       user.Email,
+                       user.DateCreated,
+                       user.GoogleId);
 }

TutorLizard.BusinessLogic/Interfaces/Data/Repositories/IUserRepository.cs

@@ -1,6 +1,5 @@
-using TutorLizard.BusinessLogic.Enums;
+using TutorLizard.Shared.Enums;
 using TutorLizard.BusinessLogic.Models;
-using TutorLizard.BusinessLogic.Models.DTOs;
 
 namespace TutorLizard.BusinessLogic.Interfaces.Data.Repositories;
 public interface IUserRepository

TutorLizard.BusinessLogic/Interfaces/Services/IBrowseService.cs

@@ -1,5 +1,5 @@
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
-using TutorLizard.BusinessLogic.Models.DTOs.Responses;
+using TutorLizard.Shared.Models.DTOs.Requests;
+using TutorLizard.Shared.Models.DTOs.Responses;
 
 namespace TutorLizard.BusinessLogic.Interfaces.Services;
 

TutorLizard.BusinessLogic/Interfaces/Services/IStudentService.cs

@@ -1,16 +1,15 @@
-using TutorLizard.BusinessLogic.Models;
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
-using TutorLizard.BusinessLogic.Models.DTOs.Responses;
+using TutorLizard.Shared.Models.DTOs.Requests;
+using TutorLizard.Shared.Models.DTOs.Responses;
 
 namespace TutorLizard.BusinessLogic.Interfaces.Services;
 
 public interface IStudentService
 {
-    Task<StudentsAcceptedAdsResponse> ViewAcceptedAds(StudentsAcceptedAdsRequest request);
-    Task<StudentsAdRequestsResponse> ViewAdRequests(StudentsAdRequestsRequest request);
-    Task<AdRequestStatusResponse> ViewAdRequestStatus(AdRequestStatusRequest request);
-    Task<StudentCancelAdRequestResponse> DeleteAdRequest(StudentCancelAdRequestRequest request);
+    Task<GetStudentsAcceptedAdsResponse> GetStudentsAcceptedAds(GetStudentsAcceptedAdsRequest request);
+    Task<GetStudentsAdRequestsResponse> GetStudentsAdRequests(GetStudentsAdRequestsRequest request);
+    Task<GetAdRequestStatusResponse> GetAdRequestStatus(GetAdRequestStatusRequest request);
+    Task<DeleteAdRequestResponse> DeleteAdRequest(DeleteAdRequestRequest request);
     Task<CreateScheduleItemRequestResponse> CreateScheduleItemRequest(CreateScheduleItemRequestRequest request);
-    Task<AvailableScheduleForAdResponse> GetAvailableScheduleForAd(AvailableScheduleForAdRequest request);
+    Task<GetAvailableScheduleForAdResponse> GetAvailableScheduleForAd(GetAvailableScheduleForAdRequest request);
     Task<CreateAdRequestResponse> CreateAdRequest(CreateAdRequestRequest request);
 }

TutorLizard.BusinessLogic/Interfaces/Services/ITutorService.cs

@@ -1,18 +1,18 @@
-using TutorLizard.BusinessLogic.Models.DTOs.Requests;
-using TutorLizard.BusinessLogic.Models.DTOs.Responses;
+using TutorLizard.Shared.Models.DTOs.Requests;
+using TutorLizard.Shared.Models.DTOs.Responses;
 
 namespace TutorLizard.BusinessLogic.Interfaces.Services;
 
 public interface ITutorService
 {
     Task<AcceptScheduleItemRequestResponse> AcceptScheduleItemRequest(AcceptScheduleItemRequestRequest request);
     Task<CreateAdResponse> CrateAd(CreateAdRequest request);
-    Task<TutorsScheduleForAdResponse> GetTutorsScheduleForAd(TutorsScheduleForAdRequest request);
+    Task<GetTutorsScheduleForAdResponse> GetTutorsScheduleForAd(GetTutorsScheduleForAdRequest request);
     Task<CreateScheduleItemResponse> CreateScheduleItem(CreateScheduleItemRequest request);
     Task<IsUserTheAdOwnerResponse> IsUserTheAdOwner(IsUserTheAdOwnerRequest request);
     Task<UnacceptScheduleItemRequestResponse> UnacceptScheduleItemRequest(UnacceptScheduleItemRequestRequest request);
-    Task<UpdateTutorsPendingAdRequestResponse> UpdateAdRequest(UpdateTutorsPendingAdRequestRequest request);
-    Task<TutorsPendingAdRequestsResponse> ViewAllPendingAdRequests(TutorsPendingAdRequestsRequest request);
-    Task<TutorAllAdRequestsResponse> ViewAllAdRequests(TutorAllAdRequestsRequest request);
-    Task<TutorsAdsResponse> ViewTutorsAds(TutorsAdsRequest request);
+    Task<UpdateAdRequestResponse> UpdateAdRequest(UpdateAdRequestRequest request);
+    Task<GetTutorsPendingAdRequestsResponse> GetTutorsPendingAdRequests(GetTutorsPendingAdRequestsRequest request);
+    Task<GetTutorsAllAdRequestsResponse> GetTutorsAllAdRequests(GetTutorsAllAdRequestsRequest request);
+    Task<GetTutorsAdsResponse> GetTutorsAds(GetTutorsAdsRequest request);
 }

TutorLizard.BusinessLogic/Interfaces/Services/IUserService.cs

@@ -1,14 +1,13 @@
-using TutorLizard.BusinessLogic.Enums;
-using TutorLizard.BusinessLogic.Models;
-using TutorLizard.BusinessLogic.Models.DTOs;
+using TutorLizard.Shared.Enums;
+using TutorLizard.Shared.Models.DTOs;
 
 namespace TutorLizard.BusinessLogic.Interfaces.Services;
 
 public interface IUserService
 {
     public Task<LogInResult> LogIn(string username, string password);
     public Task<bool> RegisterUser(string userName, UserType type, string email, string password, string activationCode);
-    Task<ActivationResult> ActivateUserAsync(string activationCode);
+    Task<ActivationResultDto> ActivateUserAsync(string activationCode);
     public Task<bool> RegisterUserWithGoogle(string username, string email, string googleId);
     public Task<bool> IsTheGoogleUserRegistered(string googleId);
     public Task<UserDto?> LogInWithGoogle(string username, string googleId);