diff --git a/HopFrame.sln b/HopFrame.sln index 95067c5..06d8283 100644 --- a/HopFrame.sln +++ b/HopFrame.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Database", "src\HopFrame.Database\HopFrame.Database.csproj", "{003120AE-F38B-4632-8497-BE4505189627}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestApiTest", "testing\RestApiTest\RestApiTest.csproj", "{921159CE-AF75-44C3-A3F9-6B9B1A4E85CF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Testing.Api", "testing\HopFrame.Testing.Api\HopFrame.Testing.Api.csproj", "{921159CE-AF75-44C3-A3F9-6B9B1A4E85CF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Security", "src\HopFrame.Security\HopFrame.Security.csproj", "{7F82E1C6-4A42-4337-9E03-2EE6429D004F}" EndProject @@ -10,7 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Api", "src\HopFram EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Web", "src\HopFrame.Web\HopFrame.Web.csproj", "{3BE585BC-13A5-4BE4-A806-E9EC2D825956}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrontendTest", "testing\FrontendTest\FrontendTest.csproj", "{8F983A37-63CF-48D5-988D-58B78EF8AECD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Testing.Web", "testing\HopFrame.Testing.Web\HopFrame.Testing.Web.csproj", "{8F983A37-63CF-48D5-988D-58B78EF8AECD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Web.Admin", "src\HopFrame.Web.Admin\HopFrame.Web.Admin.csproj", "{02D9F10A-664A-4EF7-BF19-310C26FF4DEB}" EndProject diff --git a/testing/FrontendTest/.gitignore b/testing/HopFrame.Testing.Api/.gitignore similarity index 100% rename from testing/FrontendTest/.gitignore rename to testing/HopFrame.Testing.Api/.gitignore diff --git a/testing/RestApiTest/Controllers/TestController.cs b/testing/HopFrame.Testing.Api/Controllers/TestController.cs similarity index 95% rename from testing/RestApiTest/Controllers/TestController.cs rename to testing/HopFrame.Testing.Api/Controllers/TestController.cs index 092784f..fb39666 100644 --- a/testing/RestApiTest/Controllers/TestController.cs +++ b/testing/HopFrame.Testing.Api/Controllers/TestController.cs @@ -2,11 +2,11 @@ using HopFrame.Api.Logic; using HopFrame.Database.Models; using HopFrame.Security.Authorization; using HopFrame.Security.Claims; +using HopFrame.Testing.Api.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using RestApiTest.Models; -namespace RestApiTest.Controllers; +namespace HopFrame.Testing.Api.Controllers; [ApiController] [Route("test")] diff --git a/testing/RestApiTest/DatabaseContext.cs b/testing/HopFrame.Testing.Api/DatabaseContext.cs similarity index 80% rename from testing/RestApiTest/DatabaseContext.cs rename to testing/HopFrame.Testing.Api/DatabaseContext.cs index 42ae5d1..4c707f4 100644 --- a/testing/RestApiTest/DatabaseContext.cs +++ b/testing/HopFrame.Testing.Api/DatabaseContext.cs @@ -1,8 +1,8 @@ using HopFrame.Database; +using HopFrame.Testing.Api.Models; using Microsoft.EntityFrameworkCore; -using RestApiTest.Models; -namespace RestApiTest; +namespace HopFrame.Testing.Api; public class DatabaseContext : HopDbContextBase { @@ -12,7 +12,7 @@ public class DatabaseContext : HopDbContextBase { protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { base.OnConfiguring(optionsBuilder); - optionsBuilder.UseSqlite(@"Data Source=C:\Users\leon\Documents\Projekte\HopFrame\testing\RestApiTest\bin\Debug\net8.0\test.db;Mode=ReadWrite;"); + optionsBuilder.UseSqlite(@"Data Source=C:\Users\leon\Documents\Projekte\HopFrame\testing\HopFrame.Testing.Api\bin\Debug\net8.0\test.db;Mode=ReadWrite;"); } protected override void OnModelCreating(ModelBuilder modelBuilder) { diff --git a/testing/RestApiTest/RestApiTest.csproj b/testing/HopFrame.Testing.Api/HopFrame.Testing.Api.csproj similarity index 100% rename from testing/RestApiTest/RestApiTest.csproj rename to testing/HopFrame.Testing.Api/HopFrame.Testing.Api.csproj diff --git a/testing/FrontendTest/Models/Address.cs b/testing/HopFrame.Testing.Api/Models/Address.cs similarity index 92% rename from testing/FrontendTest/Models/Address.cs rename to testing/HopFrame.Testing.Api/Models/Address.cs index 386114d..5688ad1 100644 --- a/testing/FrontendTest/Models/Address.cs +++ b/testing/HopFrame.Testing.Api/Models/Address.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; using Microsoft.AspNetCore.Mvc.ModelBinding; -namespace RestApiTest.Models; +namespace HopFrame.Testing.Api.Models; public class Address { [ForeignKey("Employee")] diff --git a/testing/RestApiTest/Models/Employee.cs b/testing/HopFrame.Testing.Api/Models/Employee.cs similarity index 79% rename from testing/RestApiTest/Models/Employee.cs rename to testing/HopFrame.Testing.Api/Models/Employee.cs index 6f70edc..f7e3e27 100644 --- a/testing/RestApiTest/Models/Employee.cs +++ b/testing/HopFrame.Testing.Api/Models/Employee.cs @@ -1,4 +1,4 @@ -namespace RestApiTest.Models; +namespace HopFrame.Testing.Api.Models; public class Employee { public int EmployeeId { get; set; } diff --git a/testing/RestApiTest/Program.cs b/testing/HopFrame.Testing.Api/Program.cs similarity index 98% rename from testing/RestApiTest/Program.cs rename to testing/HopFrame.Testing.Api/Program.cs index bfcbc38..6651ecd 100644 --- a/testing/RestApiTest/Program.cs +++ b/testing/HopFrame.Testing.Api/Program.cs @@ -1,4 +1,4 @@ -using RestApiTest; +using HopFrame.Testing.Api; using HopFrame.Api.Extensions; using Microsoft.OpenApi.Models; diff --git a/testing/RestApiTest/Properties/launchSettings.json b/testing/HopFrame.Testing.Api/Properties/launchSettings.json similarity index 100% rename from testing/RestApiTest/Properties/launchSettings.json rename to testing/HopFrame.Testing.Api/Properties/launchSettings.json diff --git a/testing/FrontendTest/appsettings.json b/testing/HopFrame.Testing.Api/appsettings.json similarity index 100% rename from testing/FrontendTest/appsettings.json rename to testing/HopFrame.Testing.Api/appsettings.json diff --git a/testing/RestApiTest/.gitignore b/testing/HopFrame.Testing.Web/.gitignore similarity index 100% rename from testing/RestApiTest/.gitignore rename to testing/HopFrame.Testing.Web/.gitignore diff --git a/testing/FrontendTest/AdminContext.cs b/testing/HopFrame.Testing.Web/AdminContext.cs similarity index 90% rename from testing/FrontendTest/AdminContext.cs rename to testing/HopFrame.Testing.Web/AdminContext.cs index 2eaff8d..9d33628 100644 --- a/testing/FrontendTest/AdminContext.cs +++ b/testing/HopFrame.Testing.Web/AdminContext.cs @@ -1,10 +1,10 @@ -using FrontendTest.Providers; using HopFrame.Web.Admin; using HopFrame.Web.Admin.Generators; using HopFrame.Web.Admin.Models; -using RestApiTest.Models; +using HopFrame.Testing.Api.Models; +using HopFrame.Testing.Web.Providers; -namespace FrontendTest; +namespace HopFrame.Testing.Web; public class AdminContext : AdminPagesContext { diff --git a/testing/FrontendTest/Components/App.razor b/testing/HopFrame.Testing.Web/Components/App.razor similarity index 86% rename from testing/FrontendTest/Components/App.razor rename to testing/HopFrame.Testing.Web/Components/App.razor index 35c8065..b3faba0 100644 --- a/testing/FrontendTest/Components/App.razor +++ b/testing/HopFrame.Testing.Web/Components/App.razor @@ -7,7 +7,7 @@ - + diff --git a/testing/FrontendTest/Components/Layout/MainLayout.razor b/testing/HopFrame.Testing.Web/Components/Layout/MainLayout.razor similarity index 100% rename from testing/FrontendTest/Components/Layout/MainLayout.razor rename to testing/HopFrame.Testing.Web/Components/Layout/MainLayout.razor diff --git a/testing/FrontendTest/Components/Layout/MainLayout.razor.css b/testing/HopFrame.Testing.Web/Components/Layout/MainLayout.razor.css similarity index 100% rename from testing/FrontendTest/Components/Layout/MainLayout.razor.css rename to testing/HopFrame.Testing.Web/Components/Layout/MainLayout.razor.css diff --git a/testing/FrontendTest/Components/Layout/NavMenu.razor b/testing/HopFrame.Testing.Web/Components/Layout/NavMenu.razor similarity index 100% rename from testing/FrontendTest/Components/Layout/NavMenu.razor rename to testing/HopFrame.Testing.Web/Components/Layout/NavMenu.razor diff --git a/testing/FrontendTest/Components/Layout/NavMenu.razor.css b/testing/HopFrame.Testing.Web/Components/Layout/NavMenu.razor.css similarity index 100% rename from testing/FrontendTest/Components/Layout/NavMenu.razor.css rename to testing/HopFrame.Testing.Web/Components/Layout/NavMenu.razor.css diff --git a/testing/FrontendTest/Components/Pages/Counter.razor b/testing/HopFrame.Testing.Web/Components/Pages/Counter.razor similarity index 100% rename from testing/FrontendTest/Components/Pages/Counter.razor rename to testing/HopFrame.Testing.Web/Components/Pages/Counter.razor diff --git a/testing/FrontendTest/Components/Pages/Error.razor b/testing/HopFrame.Testing.Web/Components/Pages/Error.razor similarity index 100% rename from testing/FrontendTest/Components/Pages/Error.razor rename to testing/HopFrame.Testing.Web/Components/Pages/Error.razor diff --git a/testing/FrontendTest/Components/Pages/Home.razor b/testing/HopFrame.Testing.Web/Components/Pages/Home.razor similarity index 100% rename from testing/FrontendTest/Components/Pages/Home.razor rename to testing/HopFrame.Testing.Web/Components/Pages/Home.razor diff --git a/testing/FrontendTest/Components/Pages/Weather.razor b/testing/HopFrame.Testing.Web/Components/Pages/Weather.razor similarity index 100% rename from testing/FrontendTest/Components/Pages/Weather.razor rename to testing/HopFrame.Testing.Web/Components/Pages/Weather.razor diff --git a/testing/FrontendTest/Components/Routes.razor b/testing/HopFrame.Testing.Web/Components/Routes.razor similarity index 100% rename from testing/FrontendTest/Components/Routes.razor rename to testing/HopFrame.Testing.Web/Components/Routes.razor diff --git a/testing/FrontendTest/Components/_Imports.razor b/testing/HopFrame.Testing.Web/Components/_Imports.razor similarity index 83% rename from testing/FrontendTest/Components/_Imports.razor rename to testing/HopFrame.Testing.Web/Components/_Imports.razor index b17e0c0..f7abb33 100644 --- a/testing/FrontendTest/Components/_Imports.razor +++ b/testing/HopFrame.Testing.Web/Components/_Imports.razor @@ -6,5 +6,5 @@ @using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using FrontendTest -@using FrontendTest.Components \ No newline at end of file +@using HopFrame.Testing.Web +@using HopFrame.Testing.Web.Components \ No newline at end of file diff --git a/testing/FrontendTest/DatabaseContext.cs b/testing/HopFrame.Testing.Web/DatabaseContext.cs similarity index 80% rename from testing/FrontendTest/DatabaseContext.cs rename to testing/HopFrame.Testing.Web/DatabaseContext.cs index c1d3c7b..bd12346 100644 --- a/testing/FrontendTest/DatabaseContext.cs +++ b/testing/HopFrame.Testing.Web/DatabaseContext.cs @@ -1,8 +1,8 @@ using HopFrame.Database; using Microsoft.EntityFrameworkCore; -using RestApiTest.Models; +using HopFrame.Testing.Api.Models; -namespace FrontendTest; +namespace HopFrame.Testing.Web; public class DatabaseContext : HopDbContextBase { public DbSet Employees { get; set; } @@ -11,7 +11,7 @@ public class DatabaseContext : HopDbContextBase { protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { base.OnConfiguring(optionsBuilder); - optionsBuilder.UseSqlite(@"Data Source=C:\Users\leon\Documents\Projekte\HopFrame\testing\RestApiTest\bin\Debug\net8.0\test.db;Mode=ReadWrite;"); + optionsBuilder.UseSqlite(@"Data Source=C:\Users\leon\Documents\Projekte\HopFrame\testing\HopFrame.Testing.Api\bin\Debug\net8.0\test.db;Mode=ReadWrite;"); } protected override void OnModelCreating(ModelBuilder modelBuilder) { diff --git a/testing/FrontendTest/FrontendTest.csproj b/testing/HopFrame.Testing.Web/HopFrame.Testing.Web.csproj similarity index 100% rename from testing/FrontendTest/FrontendTest.csproj rename to testing/HopFrame.Testing.Web/HopFrame.Testing.Web.csproj diff --git a/testing/RestApiTest/Models/Address.cs b/testing/HopFrame.Testing.Web/Models/Address.cs similarity index 92% rename from testing/RestApiTest/Models/Address.cs rename to testing/HopFrame.Testing.Web/Models/Address.cs index 386114d..5688ad1 100644 --- a/testing/RestApiTest/Models/Address.cs +++ b/testing/HopFrame.Testing.Web/Models/Address.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; using Microsoft.AspNetCore.Mvc.ModelBinding; -namespace RestApiTest.Models; +namespace HopFrame.Testing.Api.Models; public class Address { [ForeignKey("Employee")] diff --git a/testing/FrontendTest/Models/Employee.cs b/testing/HopFrame.Testing.Web/Models/Employee.cs similarity index 79% rename from testing/FrontendTest/Models/Employee.cs rename to testing/HopFrame.Testing.Web/Models/Employee.cs index 6f70edc..f7e3e27 100644 --- a/testing/FrontendTest/Models/Employee.cs +++ b/testing/HopFrame.Testing.Web/Models/Employee.cs @@ -1,4 +1,4 @@ -namespace RestApiTest.Models; +namespace HopFrame.Testing.Api.Models; public class Employee { public int EmployeeId { get; set; } diff --git a/testing/FrontendTest/Program.cs b/testing/HopFrame.Testing.Web/Program.cs similarity index 93% rename from testing/FrontendTest/Program.cs rename to testing/HopFrame.Testing.Web/Program.cs index 7547722..7957fff 100644 --- a/testing/FrontendTest/Program.cs +++ b/testing/HopFrame.Testing.Web/Program.cs @@ -1,5 +1,5 @@ -using FrontendTest; -using FrontendTest.Components; +using HopFrame.Testing.Web; +using HopFrame.Testing.Web.Components; using HopFrame.Web; using HopFrame.Web.Admin; diff --git a/testing/FrontendTest/Properties/launchSettings.json b/testing/HopFrame.Testing.Web/Properties/launchSettings.json similarity index 100% rename from testing/FrontendTest/Properties/launchSettings.json rename to testing/HopFrame.Testing.Web/Properties/launchSettings.json diff --git a/testing/FrontendTest/Providers/AddressProvider.cs b/testing/HopFrame.Testing.Web/Providers/AddressProvider.cs similarity index 91% rename from testing/FrontendTest/Providers/AddressProvider.cs rename to testing/HopFrame.Testing.Web/Providers/AddressProvider.cs index de5f13f..6ed1d6f 100644 --- a/testing/FrontendTest/Providers/AddressProvider.cs +++ b/testing/HopFrame.Testing.Web/Providers/AddressProvider.cs @@ -1,8 +1,8 @@ using HopFrame.Web.Admin; using Microsoft.EntityFrameworkCore; -using RestApiTest.Models; +using HopFrame.Testing.Api.Models; -namespace FrontendTest.Providers; +namespace HopFrame.Testing.Web.Providers; public class AddressProvider(DatabaseContext context) : ModelProvider
{ diff --git a/testing/FrontendTest/Providers/EmployeeProvider.cs b/testing/HopFrame.Testing.Web/Providers/EmployeeProvider.cs similarity index 91% rename from testing/FrontendTest/Providers/EmployeeProvider.cs rename to testing/HopFrame.Testing.Web/Providers/EmployeeProvider.cs index 89f7b84..9078eea 100644 --- a/testing/FrontendTest/Providers/EmployeeProvider.cs +++ b/testing/HopFrame.Testing.Web/Providers/EmployeeProvider.cs @@ -1,8 +1,8 @@ using HopFrame.Web.Admin; using Microsoft.EntityFrameworkCore; -using RestApiTest.Models; +using HopFrame.Testing.Api.Models; -namespace FrontendTest.Providers; +namespace HopFrame.Testing.Web.Providers; public class EmployeeProvider(DatabaseContext context) : ModelProvider { diff --git a/testing/RestApiTest/appsettings.json b/testing/HopFrame.Testing.Web/appsettings.json similarity index 100% rename from testing/RestApiTest/appsettings.json rename to testing/HopFrame.Testing.Web/appsettings.json diff --git a/testing/FrontendTest/wwwroot/app.css b/testing/HopFrame.Testing.Web/wwwroot/app.css similarity index 100% rename from testing/FrontendTest/wwwroot/app.css rename to testing/HopFrame.Testing.Web/wwwroot/app.css diff --git a/testing/FrontendTest/wwwroot/favicon.png b/testing/HopFrame.Testing.Web/wwwroot/favicon.png similarity index 100% rename from testing/FrontendTest/wwwroot/favicon.png rename to testing/HopFrame.Testing.Web/wwwroot/favicon.png