From 27088f8217c2632da92ab213edc440e477ac6e0a Mon Sep 17 00:00:00 2001 From: Leon Hoppe Date: Thu, 26 Sep 2024 10:20:30 +0200 Subject: [PATCH] Reorganized folder structure --- FrontendTest/appsettings.Development.json | 8 -------- HopFrame.sln | 16 ++++++---------- .../Controller/SecurityController.cs | 5 +++-- .../HopFrame.Api}/Extensions/MvcExtensions.cs | 0 .../Extensions/ServiceCollectionExtensions.cs | 0 .../HopFrame.Api}/HopFrame.Api.csproj | 0 .../HopFrame.Api}/Logic/ILogicResult.cs | 0 .../HopFrame.Api}/Logic/LogicResult.cs | 0 .../HopFrame.Api}/Models/SingleValueResult.cs | 0 .../Models/UserPasswordValidation.cs | 0 {HopFrame.Api => src/HopFrame.Api}/README.md | 0 .../HopFrame.Database}/HopDbContextBase.cs | 0 .../HopFrame.Database}/HopFrame.Database.csproj | 0 .../Models/Entries/GroupEntry.cs | 0 .../Models/Entries/PermissionEntry.cs | 0 .../Models/Entries/TokenEntry.cs | 0 .../Models/Entries/UserEntry.cs | 0 .../Models/ModelExtensions.cs | 0 .../HopFrame.Database}/Models/Permission.cs | 0 .../Models/PermissionGroup.cs | 0 .../HopFrame.Database}/Models/User.cs | 0 .../HopFrame.Database}/README.md | 0 .../HopFrame.Security}/AdminPermissions.cs | 0 .../Authentication/HopFrameAuthentication.cs | 0 .../HopFrameAuthenticationExtensions.cs | 0 .../Authorization/AuthorizedAttribute.cs | 0 .../Authorization/AuthorizedFilter.cs | 0 .../Authorization/PermissionValidator.cs | 0 .../Claims/HopFrameClaimTypes.cs | 0 .../HopFrame.Security}/Claims/ITokenContext.cs | 0 .../Claims/TokenContextImplementor.cs | 0 .../HopFrame.Security}/EncryptionManager.cs | 0 .../HopFrame.Security}/HopFrame.Security.csproj | 0 .../HopFrame.Security}/Models/UserLogin.cs | 0 .../HopFrame.Security}/Models/UserRegister.cs | 0 .../HopFrame.Security}/README.md | 0 .../Services/IPermissionService.cs | 0 .../HopFrame.Security}/Services/IUserService.cs | 0 .../Implementation/PermissionService.cs | 0 .../Services/Implementation/UserService.cs | 0 .../HopFrame.Web}/AdminPermissions.cs | 0 .../HopFrame.Web}/AuthMiddleware.cs | 0 .../Administration/GroupAddModal.razor | 0 .../Administration/HopIconDisplay.razor | 0 .../Administration/UserAddModal.razor | 0 .../Administration/UserEditModal.razor | 0 .../Components/AuthorizedView.razor | 0 .../HopFrame.Web}/HopFrame.Web.csproj | 0 .../HopFrame.Web}/Model/NavigationItem.cs | 0 .../HopFrame.Web}/Model/PermissionGroupAdd.cs | 0 .../HopFrame.Web}/Model/RegisterData.cs | 0 .../HopFrame.Web}/Model/UserAdd.cs | 0 .../Pages/Administration/AdminDashboard.razor | 0 .../Pages/Administration/AdminLogin.razor | 0 .../Pages/Administration/AdminLogin.razor.css | 0 .../Pages/Administration/GroupsPage.razor | 0 .../Pages/Administration/GroupsPage.razor.css | 0 .../Administration/Layout/AdminLayout.razor | 0 .../Pages/Administration/Layout/AdminMenu.razor | 0 .../Administration/Layout/EmptyLayout.razor | 0 .../Pages/Administration/UsersPage.razor | 0 .../Pages/Administration/UsersPage.razor.css | 0 {HopFrame.Web => src/HopFrame.Web}/README.md | 0 .../ServiceCollectionExtensions.cs | 2 -- .../HopFrame.Web}/Services/IAuthService.cs | 0 .../Services/Implementation/AuthService.cs | 0 {FrontendTest => test/FrontendTest}/.gitignore | 0 .../FrontendTest}/Components/App.razor | 0 .../Components/Layout/MainLayout.razor | 0 .../Components/Layout/MainLayout.razor.css | 0 .../Components/Layout/NavMenu.razor | 0 .../Components/Layout/NavMenu.razor.css | 0 .../Components/Pages/Counter.razor | 0 .../FrontendTest}/Components/Pages/Error.razor | 0 .../FrontendTest}/Components/Pages/Home.razor | 0 .../Components/Pages/Weather.razor | 0 .../FrontendTest}/Components/Routes.razor | 0 .../FrontendTest}/Components/_Imports.razor | 0 .../FrontendTest}/DatabaseContext.cs | 2 +- .../FrontendTest}/FrontendTest.csproj | 8 ++++---- {FrontendTest => test/FrontendTest}/Program.cs | 0 .../Properties/launchSettings.json | 0 .../FrontendTest}/appsettings.json | 0 .../FrontendTest}/wwwroot/app.css | 0 .../FrontendTest}/wwwroot/favicon.png | Bin {RestApiTest => test/RestApiTest}/.gitignore | 0 .../RestApiTest}/Controllers/TestController.cs | 0 .../RestApiTest}/DatabaseContext.cs | 2 +- {RestApiTest => test/RestApiTest}/Program.cs | 0 .../RestApiTest}/Properties/launchSettings.json | 0 .../RestApiTest}/RestApiTest.csproj | 4 +--- .../RestApiTest}/appsettings.json | 0 92 files changed, 16 insertions(+), 31 deletions(-) delete mode 100644 FrontendTest/appsettings.Development.json rename {HopFrame.Api => src/HopFrame.Api}/Controller/SecurityController.cs (97%) rename {HopFrame.Api => src/HopFrame.Api}/Extensions/MvcExtensions.cs (100%) rename {HopFrame.Api => src/HopFrame.Api}/Extensions/ServiceCollectionExtensions.cs (100%) rename {HopFrame.Api => src/HopFrame.Api}/HopFrame.Api.csproj (100%) rename {HopFrame.Api => src/HopFrame.Api}/Logic/ILogicResult.cs (100%) rename {HopFrame.Api => src/HopFrame.Api}/Logic/LogicResult.cs (100%) rename {HopFrame.Api => src/HopFrame.Api}/Models/SingleValueResult.cs (100%) rename {HopFrame.Api => src/HopFrame.Api}/Models/UserPasswordValidation.cs (100%) rename {HopFrame.Api => src/HopFrame.Api}/README.md (100%) rename {HopFrame.Database => src/HopFrame.Database}/HopDbContextBase.cs (100%) rename {HopFrame.Database => src/HopFrame.Database}/HopFrame.Database.csproj (100%) rename {HopFrame.Database => src/HopFrame.Database}/Models/Entries/GroupEntry.cs (100%) rename {HopFrame.Database => src/HopFrame.Database}/Models/Entries/PermissionEntry.cs (100%) rename {HopFrame.Database => src/HopFrame.Database}/Models/Entries/TokenEntry.cs (100%) rename {HopFrame.Database => src/HopFrame.Database}/Models/Entries/UserEntry.cs (100%) rename {HopFrame.Database => src/HopFrame.Database}/Models/ModelExtensions.cs (100%) rename {HopFrame.Database => src/HopFrame.Database}/Models/Permission.cs (100%) rename {HopFrame.Database => src/HopFrame.Database}/Models/PermissionGroup.cs (100%) rename {HopFrame.Database => src/HopFrame.Database}/Models/User.cs (100%) rename {HopFrame.Database => src/HopFrame.Database}/README.md (100%) rename {HopFrame.Security => src/HopFrame.Security}/AdminPermissions.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Authentication/HopFrameAuthentication.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Authentication/HopFrameAuthenticationExtensions.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Authorization/AuthorizedAttribute.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Authorization/AuthorizedFilter.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Authorization/PermissionValidator.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Claims/HopFrameClaimTypes.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Claims/ITokenContext.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Claims/TokenContextImplementor.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/EncryptionManager.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/HopFrame.Security.csproj (100%) rename {HopFrame.Security => src/HopFrame.Security}/Models/UserLogin.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Models/UserRegister.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/README.md (100%) rename {HopFrame.Security => src/HopFrame.Security}/Services/IPermissionService.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Services/IUserService.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Services/Implementation/PermissionService.cs (100%) rename {HopFrame.Security => src/HopFrame.Security}/Services/Implementation/UserService.cs (100%) rename {HopFrame.Web => src/HopFrame.Web}/AdminPermissions.cs (100%) rename {HopFrame.Web => src/HopFrame.Web}/AuthMiddleware.cs (100%) rename {HopFrame.Web => src/HopFrame.Web}/Components/Administration/GroupAddModal.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Components/Administration/HopIconDisplay.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Components/Administration/UserAddModal.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Components/Administration/UserEditModal.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Components/AuthorizedView.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/HopFrame.Web.csproj (100%) rename {HopFrame.Web => src/HopFrame.Web}/Model/NavigationItem.cs (100%) rename {HopFrame.Web => src/HopFrame.Web}/Model/PermissionGroupAdd.cs (100%) rename {HopFrame.Web => src/HopFrame.Web}/Model/RegisterData.cs (100%) rename {HopFrame.Web => src/HopFrame.Web}/Model/UserAdd.cs (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/AdminDashboard.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/AdminLogin.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/AdminLogin.razor.css (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/GroupsPage.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/GroupsPage.razor.css (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/Layout/AdminLayout.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/Layout/AdminMenu.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/Layout/EmptyLayout.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/UsersPage.razor (100%) rename {HopFrame.Web => src/HopFrame.Web}/Pages/Administration/UsersPage.razor.css (100%) rename {HopFrame.Web => src/HopFrame.Web}/README.md (100%) rename {HopFrame.Web => src/HopFrame.Web}/ServiceCollectionExtensions.cs (95%) rename {HopFrame.Web => src/HopFrame.Web}/Services/IAuthService.cs (100%) rename {HopFrame.Web => src/HopFrame.Web}/Services/Implementation/AuthService.cs (100%) rename {FrontendTest => test/FrontendTest}/.gitignore (100%) rename {FrontendTest => test/FrontendTest}/Components/App.razor (100%) rename {FrontendTest => test/FrontendTest}/Components/Layout/MainLayout.razor (100%) rename {FrontendTest => test/FrontendTest}/Components/Layout/MainLayout.razor.css (100%) rename {FrontendTest => test/FrontendTest}/Components/Layout/NavMenu.razor (100%) rename {FrontendTest => test/FrontendTest}/Components/Layout/NavMenu.razor.css (100%) rename {FrontendTest => test/FrontendTest}/Components/Pages/Counter.razor (100%) rename {FrontendTest => test/FrontendTest}/Components/Pages/Error.razor (100%) rename {FrontendTest => test/FrontendTest}/Components/Pages/Home.razor (100%) rename {FrontendTest => test/FrontendTest}/Components/Pages/Weather.razor (100%) rename {FrontendTest => test/FrontendTest}/Components/Routes.razor (100%) rename {FrontendTest => test/FrontendTest}/Components/_Imports.razor (100%) rename {FrontendTest => test/FrontendTest}/DatabaseContext.cs (77%) rename {FrontendTest => test/FrontendTest}/FrontendTest.csproj (87%) rename {FrontendTest => test/FrontendTest}/Program.cs (100%) rename {FrontendTest => test/FrontendTest}/Properties/launchSettings.json (100%) rename {FrontendTest => test/FrontendTest}/appsettings.json (100%) rename {FrontendTest => test/FrontendTest}/wwwroot/app.css (100%) rename {FrontendTest => test/FrontendTest}/wwwroot/favicon.png (100%) rename {RestApiTest => test/RestApiTest}/.gitignore (100%) rename {RestApiTest => test/RestApiTest}/Controllers/TestController.cs (100%) rename {RestApiTest => test/RestApiTest}/DatabaseContext.cs (77%) rename {RestApiTest => test/RestApiTest}/Program.cs (100%) rename {RestApiTest => test/RestApiTest}/Properties/launchSettings.json (100%) rename {RestApiTest => test/RestApiTest}/RestApiTest.csproj (77%) rename {RestApiTest => test/RestApiTest}/appsettings.json (100%) diff --git a/FrontendTest/appsettings.Development.json b/FrontendTest/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/FrontendTest/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/HopFrame.sln b/HopFrame.sln index 453dbcf..f9217e8 100644 --- a/HopFrame.sln +++ b/HopFrame.sln @@ -1,18 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Database", "HopFrame.Database\HopFrame.Database.csproj", "{003120AE-F38B-4632-8497-BE4505189627}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Database", "src\HopFrame.Database\HopFrame.Database.csproj", "{003120AE-F38B-4632-8497-BE4505189627}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{58703056-8DAD-4221-BBE3-42425D2F4929}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestApiTest", "test\RestApiTest\RestApiTest.csproj", "{921159CE-AF75-44C3-A3F9-6B9B1A4E85CF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestApiTest", "RestApiTest\RestApiTest.csproj", "{921159CE-AF75-44C3-A3F9-6B9B1A4E85CF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Security", "src\HopFrame.Security\HopFrame.Security.csproj", "{7F82E1C6-4A42-4337-9E03-2EE6429D004F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Security", "HopFrame.Security\HopFrame.Security.csproj", "{7F82E1C6-4A42-4337-9E03-2EE6429D004F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Api", "src\HopFrame.Api\HopFrame.Api.csproj", "{1E821490-AEDC-4F55-B758-52F4FADAB53A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HopFrame.Api", "HopFrame.Api\HopFrame.Api.csproj", "{1E821490-AEDC-4F55-B758-52F4FADAB53A}" +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}") = "HopFrame.Web", "HopFrame.Web\HopFrame.Web.csproj", "{3BE585BC-13A5-4BE4-A806-E9EC2D825956}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrontendTest", "FrontendTest\FrontendTest.csproj", "{8F983A37-63CF-48D5-988D-58B78EF8AECD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrontendTest", "test\FrontendTest\FrontendTest.csproj", "{8F983A37-63CF-48D5-988D-58B78EF8AECD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -46,7 +44,5 @@ Global {8F983A37-63CF-48D5-988D-58B78EF8AECD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution - {921159CE-AF75-44C3-A3F9-6B9B1A4E85CF} = {58703056-8DAD-4221-BBE3-42425D2F4929} - {8F983A37-63CF-48D5-988D-58B78EF8AECD} = {58703056-8DAD-4221-BBE3-42425D2F4929} EndGlobalSection EndGlobal diff --git a/HopFrame.Api/Controller/SecurityController.cs b/src/HopFrame.Api/Controller/SecurityController.cs similarity index 97% rename from HopFrame.Api/Controller/SecurityController.cs rename to src/HopFrame.Api/Controller/SecurityController.cs index fe6ea8e..de9a50a 100644 --- a/HopFrame.Api/Controller/SecurityController.cs +++ b/src/HopFrame.Api/Controller/SecurityController.cs @@ -24,7 +24,7 @@ public class SecurityController(TDbContext context, IUserService use if (user is null) return LogicResult>.NotFound("The provided email address was not found"); - if (await users.CheckUserPassword(user, login.Password)) + if (!await users.CheckUserPassword(user, login.Password)) return LogicResult>.Forbidden("The provided password is not correct"); var refreshToken = new TokenEntry { @@ -162,12 +162,13 @@ public class SecurityController(TDbContext context, IUserService use public async Task Delete([FromBody] UserPasswordValidation validation) { var user = tokenContext.User; - if (await users.CheckUserPassword(user, validation.Password)) + if (!await users.CheckUserPassword(user, validation.Password)) return LogicResult.Forbidden("The provided password is not correct"); await users.DeleteUser(user); HttpContext.Response.Cookies.Delete(ITokenContext.RefreshTokenType); + HttpContext.Response.Cookies.Delete(ITokenContext.AccessTokenType); return LogicResult.Ok(); } diff --git a/HopFrame.Api/Extensions/MvcExtensions.cs b/src/HopFrame.Api/Extensions/MvcExtensions.cs similarity index 100% rename from HopFrame.Api/Extensions/MvcExtensions.cs rename to src/HopFrame.Api/Extensions/MvcExtensions.cs diff --git a/HopFrame.Api/Extensions/ServiceCollectionExtensions.cs b/src/HopFrame.Api/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from HopFrame.Api/Extensions/ServiceCollectionExtensions.cs rename to src/HopFrame.Api/Extensions/ServiceCollectionExtensions.cs diff --git a/HopFrame.Api/HopFrame.Api.csproj b/src/HopFrame.Api/HopFrame.Api.csproj similarity index 100% rename from HopFrame.Api/HopFrame.Api.csproj rename to src/HopFrame.Api/HopFrame.Api.csproj diff --git a/HopFrame.Api/Logic/ILogicResult.cs b/src/HopFrame.Api/Logic/ILogicResult.cs similarity index 100% rename from HopFrame.Api/Logic/ILogicResult.cs rename to src/HopFrame.Api/Logic/ILogicResult.cs diff --git a/HopFrame.Api/Logic/LogicResult.cs b/src/HopFrame.Api/Logic/LogicResult.cs similarity index 100% rename from HopFrame.Api/Logic/LogicResult.cs rename to src/HopFrame.Api/Logic/LogicResult.cs diff --git a/HopFrame.Api/Models/SingleValueResult.cs b/src/HopFrame.Api/Models/SingleValueResult.cs similarity index 100% rename from HopFrame.Api/Models/SingleValueResult.cs rename to src/HopFrame.Api/Models/SingleValueResult.cs diff --git a/HopFrame.Api/Models/UserPasswordValidation.cs b/src/HopFrame.Api/Models/UserPasswordValidation.cs similarity index 100% rename from HopFrame.Api/Models/UserPasswordValidation.cs rename to src/HopFrame.Api/Models/UserPasswordValidation.cs diff --git a/HopFrame.Api/README.md b/src/HopFrame.Api/README.md similarity index 100% rename from HopFrame.Api/README.md rename to src/HopFrame.Api/README.md diff --git a/HopFrame.Database/HopDbContextBase.cs b/src/HopFrame.Database/HopDbContextBase.cs similarity index 100% rename from HopFrame.Database/HopDbContextBase.cs rename to src/HopFrame.Database/HopDbContextBase.cs diff --git a/HopFrame.Database/HopFrame.Database.csproj b/src/HopFrame.Database/HopFrame.Database.csproj similarity index 100% rename from HopFrame.Database/HopFrame.Database.csproj rename to src/HopFrame.Database/HopFrame.Database.csproj diff --git a/HopFrame.Database/Models/Entries/GroupEntry.cs b/src/HopFrame.Database/Models/Entries/GroupEntry.cs similarity index 100% rename from HopFrame.Database/Models/Entries/GroupEntry.cs rename to src/HopFrame.Database/Models/Entries/GroupEntry.cs diff --git a/HopFrame.Database/Models/Entries/PermissionEntry.cs b/src/HopFrame.Database/Models/Entries/PermissionEntry.cs similarity index 100% rename from HopFrame.Database/Models/Entries/PermissionEntry.cs rename to src/HopFrame.Database/Models/Entries/PermissionEntry.cs diff --git a/HopFrame.Database/Models/Entries/TokenEntry.cs b/src/HopFrame.Database/Models/Entries/TokenEntry.cs similarity index 100% rename from HopFrame.Database/Models/Entries/TokenEntry.cs rename to src/HopFrame.Database/Models/Entries/TokenEntry.cs diff --git a/HopFrame.Database/Models/Entries/UserEntry.cs b/src/HopFrame.Database/Models/Entries/UserEntry.cs similarity index 100% rename from HopFrame.Database/Models/Entries/UserEntry.cs rename to src/HopFrame.Database/Models/Entries/UserEntry.cs diff --git a/HopFrame.Database/Models/ModelExtensions.cs b/src/HopFrame.Database/Models/ModelExtensions.cs similarity index 100% rename from HopFrame.Database/Models/ModelExtensions.cs rename to src/HopFrame.Database/Models/ModelExtensions.cs diff --git a/HopFrame.Database/Models/Permission.cs b/src/HopFrame.Database/Models/Permission.cs similarity index 100% rename from HopFrame.Database/Models/Permission.cs rename to src/HopFrame.Database/Models/Permission.cs diff --git a/HopFrame.Database/Models/PermissionGroup.cs b/src/HopFrame.Database/Models/PermissionGroup.cs similarity index 100% rename from HopFrame.Database/Models/PermissionGroup.cs rename to src/HopFrame.Database/Models/PermissionGroup.cs diff --git a/HopFrame.Database/Models/User.cs b/src/HopFrame.Database/Models/User.cs similarity index 100% rename from HopFrame.Database/Models/User.cs rename to src/HopFrame.Database/Models/User.cs diff --git a/HopFrame.Database/README.md b/src/HopFrame.Database/README.md similarity index 100% rename from HopFrame.Database/README.md rename to src/HopFrame.Database/README.md diff --git a/HopFrame.Security/AdminPermissions.cs b/src/HopFrame.Security/AdminPermissions.cs similarity index 100% rename from HopFrame.Security/AdminPermissions.cs rename to src/HopFrame.Security/AdminPermissions.cs diff --git a/HopFrame.Security/Authentication/HopFrameAuthentication.cs b/src/HopFrame.Security/Authentication/HopFrameAuthentication.cs similarity index 100% rename from HopFrame.Security/Authentication/HopFrameAuthentication.cs rename to src/HopFrame.Security/Authentication/HopFrameAuthentication.cs diff --git a/HopFrame.Security/Authentication/HopFrameAuthenticationExtensions.cs b/src/HopFrame.Security/Authentication/HopFrameAuthenticationExtensions.cs similarity index 100% rename from HopFrame.Security/Authentication/HopFrameAuthenticationExtensions.cs rename to src/HopFrame.Security/Authentication/HopFrameAuthenticationExtensions.cs diff --git a/HopFrame.Security/Authorization/AuthorizedAttribute.cs b/src/HopFrame.Security/Authorization/AuthorizedAttribute.cs similarity index 100% rename from HopFrame.Security/Authorization/AuthorizedAttribute.cs rename to src/HopFrame.Security/Authorization/AuthorizedAttribute.cs diff --git a/HopFrame.Security/Authorization/AuthorizedFilter.cs b/src/HopFrame.Security/Authorization/AuthorizedFilter.cs similarity index 100% rename from HopFrame.Security/Authorization/AuthorizedFilter.cs rename to src/HopFrame.Security/Authorization/AuthorizedFilter.cs diff --git a/HopFrame.Security/Authorization/PermissionValidator.cs b/src/HopFrame.Security/Authorization/PermissionValidator.cs similarity index 100% rename from HopFrame.Security/Authorization/PermissionValidator.cs rename to src/HopFrame.Security/Authorization/PermissionValidator.cs diff --git a/HopFrame.Security/Claims/HopFrameClaimTypes.cs b/src/HopFrame.Security/Claims/HopFrameClaimTypes.cs similarity index 100% rename from HopFrame.Security/Claims/HopFrameClaimTypes.cs rename to src/HopFrame.Security/Claims/HopFrameClaimTypes.cs diff --git a/HopFrame.Security/Claims/ITokenContext.cs b/src/HopFrame.Security/Claims/ITokenContext.cs similarity index 100% rename from HopFrame.Security/Claims/ITokenContext.cs rename to src/HopFrame.Security/Claims/ITokenContext.cs diff --git a/HopFrame.Security/Claims/TokenContextImplementor.cs b/src/HopFrame.Security/Claims/TokenContextImplementor.cs similarity index 100% rename from HopFrame.Security/Claims/TokenContextImplementor.cs rename to src/HopFrame.Security/Claims/TokenContextImplementor.cs diff --git a/HopFrame.Security/EncryptionManager.cs b/src/HopFrame.Security/EncryptionManager.cs similarity index 100% rename from HopFrame.Security/EncryptionManager.cs rename to src/HopFrame.Security/EncryptionManager.cs diff --git a/HopFrame.Security/HopFrame.Security.csproj b/src/HopFrame.Security/HopFrame.Security.csproj similarity index 100% rename from HopFrame.Security/HopFrame.Security.csproj rename to src/HopFrame.Security/HopFrame.Security.csproj diff --git a/HopFrame.Security/Models/UserLogin.cs b/src/HopFrame.Security/Models/UserLogin.cs similarity index 100% rename from HopFrame.Security/Models/UserLogin.cs rename to src/HopFrame.Security/Models/UserLogin.cs diff --git a/HopFrame.Security/Models/UserRegister.cs b/src/HopFrame.Security/Models/UserRegister.cs similarity index 100% rename from HopFrame.Security/Models/UserRegister.cs rename to src/HopFrame.Security/Models/UserRegister.cs diff --git a/HopFrame.Security/README.md b/src/HopFrame.Security/README.md similarity index 100% rename from HopFrame.Security/README.md rename to src/HopFrame.Security/README.md diff --git a/HopFrame.Security/Services/IPermissionService.cs b/src/HopFrame.Security/Services/IPermissionService.cs similarity index 100% rename from HopFrame.Security/Services/IPermissionService.cs rename to src/HopFrame.Security/Services/IPermissionService.cs diff --git a/HopFrame.Security/Services/IUserService.cs b/src/HopFrame.Security/Services/IUserService.cs similarity index 100% rename from HopFrame.Security/Services/IUserService.cs rename to src/HopFrame.Security/Services/IUserService.cs diff --git a/HopFrame.Security/Services/Implementation/PermissionService.cs b/src/HopFrame.Security/Services/Implementation/PermissionService.cs similarity index 100% rename from HopFrame.Security/Services/Implementation/PermissionService.cs rename to src/HopFrame.Security/Services/Implementation/PermissionService.cs diff --git a/HopFrame.Security/Services/Implementation/UserService.cs b/src/HopFrame.Security/Services/Implementation/UserService.cs similarity index 100% rename from HopFrame.Security/Services/Implementation/UserService.cs rename to src/HopFrame.Security/Services/Implementation/UserService.cs diff --git a/HopFrame.Web/AdminPermissions.cs b/src/HopFrame.Web/AdminPermissions.cs similarity index 100% rename from HopFrame.Web/AdminPermissions.cs rename to src/HopFrame.Web/AdminPermissions.cs diff --git a/HopFrame.Web/AuthMiddleware.cs b/src/HopFrame.Web/AuthMiddleware.cs similarity index 100% rename from HopFrame.Web/AuthMiddleware.cs rename to src/HopFrame.Web/AuthMiddleware.cs diff --git a/HopFrame.Web/Components/Administration/GroupAddModal.razor b/src/HopFrame.Web/Components/Administration/GroupAddModal.razor similarity index 100% rename from HopFrame.Web/Components/Administration/GroupAddModal.razor rename to src/HopFrame.Web/Components/Administration/GroupAddModal.razor diff --git a/HopFrame.Web/Components/Administration/HopIconDisplay.razor b/src/HopFrame.Web/Components/Administration/HopIconDisplay.razor similarity index 100% rename from HopFrame.Web/Components/Administration/HopIconDisplay.razor rename to src/HopFrame.Web/Components/Administration/HopIconDisplay.razor diff --git a/HopFrame.Web/Components/Administration/UserAddModal.razor b/src/HopFrame.Web/Components/Administration/UserAddModal.razor similarity index 100% rename from HopFrame.Web/Components/Administration/UserAddModal.razor rename to src/HopFrame.Web/Components/Administration/UserAddModal.razor diff --git a/HopFrame.Web/Components/Administration/UserEditModal.razor b/src/HopFrame.Web/Components/Administration/UserEditModal.razor similarity index 100% rename from HopFrame.Web/Components/Administration/UserEditModal.razor rename to src/HopFrame.Web/Components/Administration/UserEditModal.razor diff --git a/HopFrame.Web/Components/AuthorizedView.razor b/src/HopFrame.Web/Components/AuthorizedView.razor similarity index 100% rename from HopFrame.Web/Components/AuthorizedView.razor rename to src/HopFrame.Web/Components/AuthorizedView.razor diff --git a/HopFrame.Web/HopFrame.Web.csproj b/src/HopFrame.Web/HopFrame.Web.csproj similarity index 100% rename from HopFrame.Web/HopFrame.Web.csproj rename to src/HopFrame.Web/HopFrame.Web.csproj diff --git a/HopFrame.Web/Model/NavigationItem.cs b/src/HopFrame.Web/Model/NavigationItem.cs similarity index 100% rename from HopFrame.Web/Model/NavigationItem.cs rename to src/HopFrame.Web/Model/NavigationItem.cs diff --git a/HopFrame.Web/Model/PermissionGroupAdd.cs b/src/HopFrame.Web/Model/PermissionGroupAdd.cs similarity index 100% rename from HopFrame.Web/Model/PermissionGroupAdd.cs rename to src/HopFrame.Web/Model/PermissionGroupAdd.cs diff --git a/HopFrame.Web/Model/RegisterData.cs b/src/HopFrame.Web/Model/RegisterData.cs similarity index 100% rename from HopFrame.Web/Model/RegisterData.cs rename to src/HopFrame.Web/Model/RegisterData.cs diff --git a/HopFrame.Web/Model/UserAdd.cs b/src/HopFrame.Web/Model/UserAdd.cs similarity index 100% rename from HopFrame.Web/Model/UserAdd.cs rename to src/HopFrame.Web/Model/UserAdd.cs diff --git a/HopFrame.Web/Pages/Administration/AdminDashboard.razor b/src/HopFrame.Web/Pages/Administration/AdminDashboard.razor similarity index 100% rename from HopFrame.Web/Pages/Administration/AdminDashboard.razor rename to src/HopFrame.Web/Pages/Administration/AdminDashboard.razor diff --git a/HopFrame.Web/Pages/Administration/AdminLogin.razor b/src/HopFrame.Web/Pages/Administration/AdminLogin.razor similarity index 100% rename from HopFrame.Web/Pages/Administration/AdminLogin.razor rename to src/HopFrame.Web/Pages/Administration/AdminLogin.razor diff --git a/HopFrame.Web/Pages/Administration/AdminLogin.razor.css b/src/HopFrame.Web/Pages/Administration/AdminLogin.razor.css similarity index 100% rename from HopFrame.Web/Pages/Administration/AdminLogin.razor.css rename to src/HopFrame.Web/Pages/Administration/AdminLogin.razor.css diff --git a/HopFrame.Web/Pages/Administration/GroupsPage.razor b/src/HopFrame.Web/Pages/Administration/GroupsPage.razor similarity index 100% rename from HopFrame.Web/Pages/Administration/GroupsPage.razor rename to src/HopFrame.Web/Pages/Administration/GroupsPage.razor diff --git a/HopFrame.Web/Pages/Administration/GroupsPage.razor.css b/src/HopFrame.Web/Pages/Administration/GroupsPage.razor.css similarity index 100% rename from HopFrame.Web/Pages/Administration/GroupsPage.razor.css rename to src/HopFrame.Web/Pages/Administration/GroupsPage.razor.css diff --git a/HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor b/src/HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor similarity index 100% rename from HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor rename to src/HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor diff --git a/HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor b/src/HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor similarity index 100% rename from HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor rename to src/HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor diff --git a/HopFrame.Web/Pages/Administration/Layout/EmptyLayout.razor b/src/HopFrame.Web/Pages/Administration/Layout/EmptyLayout.razor similarity index 100% rename from HopFrame.Web/Pages/Administration/Layout/EmptyLayout.razor rename to src/HopFrame.Web/Pages/Administration/Layout/EmptyLayout.razor diff --git a/HopFrame.Web/Pages/Administration/UsersPage.razor b/src/HopFrame.Web/Pages/Administration/UsersPage.razor similarity index 100% rename from HopFrame.Web/Pages/Administration/UsersPage.razor rename to src/HopFrame.Web/Pages/Administration/UsersPage.razor diff --git a/HopFrame.Web/Pages/Administration/UsersPage.razor.css b/src/HopFrame.Web/Pages/Administration/UsersPage.razor.css similarity index 100% rename from HopFrame.Web/Pages/Administration/UsersPage.razor.css rename to src/HopFrame.Web/Pages/Administration/UsersPage.razor.css diff --git a/HopFrame.Web/README.md b/src/HopFrame.Web/README.md similarity index 100% rename from HopFrame.Web/README.md rename to src/HopFrame.Web/README.md diff --git a/HopFrame.Web/ServiceCollectionExtensions.cs b/src/HopFrame.Web/ServiceCollectionExtensions.cs similarity index 95% rename from HopFrame.Web/ServiceCollectionExtensions.cs rename to src/HopFrame.Web/ServiceCollectionExtensions.cs index c6438d5..b6770d7 100644 --- a/HopFrame.Web/ServiceCollectionExtensions.cs +++ b/src/HopFrame.Web/ServiceCollectionExtensions.cs @@ -18,8 +18,6 @@ public static class ServiceCollectionExtensions { // Component library's services.AddSweetAlert2(); services.AddBlazorStrap(); - - //TODO: Use https://blazorstrap.io/V5/V5 services.AddHopFrameAuthentication(); diff --git a/HopFrame.Web/Services/IAuthService.cs b/src/HopFrame.Web/Services/IAuthService.cs similarity index 100% rename from HopFrame.Web/Services/IAuthService.cs rename to src/HopFrame.Web/Services/IAuthService.cs diff --git a/HopFrame.Web/Services/Implementation/AuthService.cs b/src/HopFrame.Web/Services/Implementation/AuthService.cs similarity index 100% rename from HopFrame.Web/Services/Implementation/AuthService.cs rename to src/HopFrame.Web/Services/Implementation/AuthService.cs diff --git a/FrontendTest/.gitignore b/test/FrontendTest/.gitignore similarity index 100% rename from FrontendTest/.gitignore rename to test/FrontendTest/.gitignore diff --git a/FrontendTest/Components/App.razor b/test/FrontendTest/Components/App.razor similarity index 100% rename from FrontendTest/Components/App.razor rename to test/FrontendTest/Components/App.razor diff --git a/FrontendTest/Components/Layout/MainLayout.razor b/test/FrontendTest/Components/Layout/MainLayout.razor similarity index 100% rename from FrontendTest/Components/Layout/MainLayout.razor rename to test/FrontendTest/Components/Layout/MainLayout.razor diff --git a/FrontendTest/Components/Layout/MainLayout.razor.css b/test/FrontendTest/Components/Layout/MainLayout.razor.css similarity index 100% rename from FrontendTest/Components/Layout/MainLayout.razor.css rename to test/FrontendTest/Components/Layout/MainLayout.razor.css diff --git a/FrontendTest/Components/Layout/NavMenu.razor b/test/FrontendTest/Components/Layout/NavMenu.razor similarity index 100% rename from FrontendTest/Components/Layout/NavMenu.razor rename to test/FrontendTest/Components/Layout/NavMenu.razor diff --git a/FrontendTest/Components/Layout/NavMenu.razor.css b/test/FrontendTest/Components/Layout/NavMenu.razor.css similarity index 100% rename from FrontendTest/Components/Layout/NavMenu.razor.css rename to test/FrontendTest/Components/Layout/NavMenu.razor.css diff --git a/FrontendTest/Components/Pages/Counter.razor b/test/FrontendTest/Components/Pages/Counter.razor similarity index 100% rename from FrontendTest/Components/Pages/Counter.razor rename to test/FrontendTest/Components/Pages/Counter.razor diff --git a/FrontendTest/Components/Pages/Error.razor b/test/FrontendTest/Components/Pages/Error.razor similarity index 100% rename from FrontendTest/Components/Pages/Error.razor rename to test/FrontendTest/Components/Pages/Error.razor diff --git a/FrontendTest/Components/Pages/Home.razor b/test/FrontendTest/Components/Pages/Home.razor similarity index 100% rename from FrontendTest/Components/Pages/Home.razor rename to test/FrontendTest/Components/Pages/Home.razor diff --git a/FrontendTest/Components/Pages/Weather.razor b/test/FrontendTest/Components/Pages/Weather.razor similarity index 100% rename from FrontendTest/Components/Pages/Weather.razor rename to test/FrontendTest/Components/Pages/Weather.razor diff --git a/FrontendTest/Components/Routes.razor b/test/FrontendTest/Components/Routes.razor similarity index 100% rename from FrontendTest/Components/Routes.razor rename to test/FrontendTest/Components/Routes.razor diff --git a/FrontendTest/Components/_Imports.razor b/test/FrontendTest/Components/_Imports.razor similarity index 100% rename from FrontendTest/Components/_Imports.razor rename to test/FrontendTest/Components/_Imports.razor diff --git a/FrontendTest/DatabaseContext.cs b/test/FrontendTest/DatabaseContext.cs similarity index 77% rename from FrontendTest/DatabaseContext.cs rename to test/FrontendTest/DatabaseContext.cs index 20945c9..5da7d59 100644 --- a/FrontendTest/DatabaseContext.cs +++ b/test/FrontendTest/DatabaseContext.cs @@ -7,6 +7,6 @@ public class DatabaseContext : HopDbContextBase { protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { base.OnConfiguring(optionsBuilder); - optionsBuilder.UseSqlite("Data Source=C:\\Users\\Remote\\Documents\\Projekte\\HopFrame\\RestApiTest\\bin\\Debug\\net8.0\\test.db;Mode=ReadWrite;"); + optionsBuilder.UseSqlite("Data Source=C:\\Users\\Remote\\Documents\\Projekte\\HopFrame\\test\\RestApiTest\\bin\\Debug\\net8.0\\test.db;Mode=ReadWrite;"); } } \ No newline at end of file diff --git a/FrontendTest/FrontendTest.csproj b/test/FrontendTest/FrontendTest.csproj similarity index 87% rename from FrontendTest/FrontendTest.csproj rename to test/FrontendTest/FrontendTest.csproj index 79d6740..312aa4b 100644 --- a/FrontendTest/FrontendTest.csproj +++ b/test/FrontendTest/FrontendTest.csproj @@ -6,10 +6,6 @@ enable - - - - @@ -19,4 +15,8 @@ <_ContentIncludedByDefault Remove="wwwroot\bootstrap\bootstrap.min.css.map" /> + + + + diff --git a/FrontendTest/Program.cs b/test/FrontendTest/Program.cs similarity index 100% rename from FrontendTest/Program.cs rename to test/FrontendTest/Program.cs diff --git a/FrontendTest/Properties/launchSettings.json b/test/FrontendTest/Properties/launchSettings.json similarity index 100% rename from FrontendTest/Properties/launchSettings.json rename to test/FrontendTest/Properties/launchSettings.json diff --git a/FrontendTest/appsettings.json b/test/FrontendTest/appsettings.json similarity index 100% rename from FrontendTest/appsettings.json rename to test/FrontendTest/appsettings.json diff --git a/FrontendTest/wwwroot/app.css b/test/FrontendTest/wwwroot/app.css similarity index 100% rename from FrontendTest/wwwroot/app.css rename to test/FrontendTest/wwwroot/app.css diff --git a/FrontendTest/wwwroot/favicon.png b/test/FrontendTest/wwwroot/favicon.png similarity index 100% rename from FrontendTest/wwwroot/favicon.png rename to test/FrontendTest/wwwroot/favicon.png diff --git a/RestApiTest/.gitignore b/test/RestApiTest/.gitignore similarity index 100% rename from RestApiTest/.gitignore rename to test/RestApiTest/.gitignore diff --git a/RestApiTest/Controllers/TestController.cs b/test/RestApiTest/Controllers/TestController.cs similarity index 100% rename from RestApiTest/Controllers/TestController.cs rename to test/RestApiTest/Controllers/TestController.cs diff --git a/RestApiTest/DatabaseContext.cs b/test/RestApiTest/DatabaseContext.cs similarity index 77% rename from RestApiTest/DatabaseContext.cs rename to test/RestApiTest/DatabaseContext.cs index fed4058..3133353 100644 --- a/RestApiTest/DatabaseContext.cs +++ b/test/RestApiTest/DatabaseContext.cs @@ -7,6 +7,6 @@ public class DatabaseContext : HopDbContextBase { protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { base.OnConfiguring(optionsBuilder); - optionsBuilder.UseSqlite("Data Source=C:\\Users\\Remote\\Documents\\Projekte\\HopFrame\\RestApiTest\\bin\\Debug\\net8.0\\test.db;Mode=ReadWrite;"); + optionsBuilder.UseSqlite("Data Source=C:\\Users\\Remote\\Documents\\Projekte\\HopFrame\\test\\RestApiTest\\bin\\Debug\\net8.0\\test.db;Mode=ReadWrite;"); } } \ No newline at end of file diff --git a/RestApiTest/Program.cs b/test/RestApiTest/Program.cs similarity index 100% rename from RestApiTest/Program.cs rename to test/RestApiTest/Program.cs diff --git a/RestApiTest/Properties/launchSettings.json b/test/RestApiTest/Properties/launchSettings.json similarity index 100% rename from RestApiTest/Properties/launchSettings.json rename to test/RestApiTest/Properties/launchSettings.json diff --git a/RestApiTest/RestApiTest.csproj b/test/RestApiTest/RestApiTest.csproj similarity index 77% rename from RestApiTest/RestApiTest.csproj rename to test/RestApiTest/RestApiTest.csproj index 936e228..2549297 100644 --- a/RestApiTest/RestApiTest.csproj +++ b/test/RestApiTest/RestApiTest.csproj @@ -17,9 +17,7 @@ - - - + diff --git a/RestApiTest/appsettings.json b/test/RestApiTest/appsettings.json similarity index 100% rename from RestApiTest/appsettings.json rename to test/RestApiTest/appsettings.json