Merge branch 'main' of https://github.com/DavidEggenberger/ModularMon…

…olith.SaaS.Template
DavidEggenberger · Nov 22, 2024 · adcd024 · adcd024
2 parents b33d584 + e65c4f3
commit adcd024
Show file tree

Hide file tree

Showing 34 changed files with 11 additions and 10 deletions.
diff --git a/ModularMonolith.sln b/ModularMonolith.sln
@@ -25,15 +25,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Feat
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Web.Client", "Source\Modules\TenantIdentity\Web\Client\Modules.TenantIdentity.Web.Client.csproj", "{D5015915-70A7-43CE-8E29-34F6C71F960E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Shared", "Source\Modules\TenantIdentity\Web\Shared\Modules.TenantIdentity.Shared.csproj", "{74FE9343-CE51-4716-BADD-2603348C1677}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Shared", "Source\Modules\TenantIdentity\Shared\Modules.TenantIdentity.Shared.csproj", "{74FE9343-CE51-4716-BADD-2603348C1677}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.TenantIdentity.Web.Server", "Source\Modules\TenantIdentity\Web\Server\Modules.TenantIdentity.Web.Server.csproj", "{D5B57887-1F64-4F6F-8793-0530DB9942DB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.Features", "Source\Shared\Features\Shared.Features.csproj", "{F467D121-BDE5-451B-B175-B01F3E7E634F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LandingPages", "LandingPages", "{5A77BA95-9C7B-41BE-A4F4-CF2FE18CFA03}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.LandingPages.Web", "Source\Modules\LandingPages\Modules.LandingPages.Web.Server\Modules.LandingPages.Web.csproj", "{64CFB1A8-0F27-4990-97E8-2023BF6D5DF0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.LandingPages.Web", "Source\Modules\LandingPages\Server\Modules.LandingPages.Web.csproj", "{64CFB1A8-0F27-4990-97E8-2023BF6D5DF0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Subscriptions", "Subscriptions", "{78544110-543F-4351-8096-077CC56B4E1E}"
 EndProject

diff --git a/...s.Web.Server/Components/SignInModal.razor → ...Pages/Server/Components/SignInModal.razor b/...s.Web.Server/Components/SignInModal.razor → ...Pages/Server/Components/SignInModal.razor
diff --git a/...eb.Server/Components/SignInModal.razor.cs → ...es/Server/Components/SignInModal.razor.cs b/...eb.Server/Components/SignInModal.razor.cs → ...es/Server/Components/SignInModal.razor.cs
diff --git a/...s.Web.Server/Components/SignUpModal.razor → ...Pages/Server/Components/SignUpModal.razor b/...s.Web.Server/Components/SignUpModal.razor → ...Pages/Server/Components/SignUpModal.razor
diff --git a/...eb.Server/Components/SignUpModal.razor.cs → ...es/Server/Components/SignUpModal.razor.cs b/...eb.Server/Components/SignUpModal.razor.cs → ...es/Server/Components/SignUpModal.razor.cs
diff --git a/...ingPages.Web.Server/LandingPagesApp.razor → ...LandingPages/Server/LandingPagesApp.razor b/...ingPages.Web.Server/LandingPagesApp.razor → ...LandingPages/Server/LandingPagesApp.razor
diff --git a/...Pages.Web.Server/LandingPagesLayout.razor → ...dingPages/Server/LandingPagesLayout.razor b/...Pages.Web.Server/LandingPagesLayout.razor → ...dingPages/Server/LandingPagesLayout.razor
diff --git a/...es.Web.Server/LandingPagesLayout.razor.cs → ...gPages/Server/LandingPagesLayout.razor.cs b/...es.Web.Server/LandingPagesLayout.razor.cs → ...gPages/Server/LandingPagesLayout.razor.cs
diff --git a/...s.Web.Server/LandingPagesModuleStartup.cs → ...Pages/Server/LandingPagesModuleStartup.cs b/...s.Web.Server/LandingPagesModuleStartup.cs → ...Pages/Server/LandingPagesModuleStartup.cs
diff --git a/...eb.Server/Modules.LandingPages.Web.csproj → ...es/Server/Modules.LandingPages.Web.csproj b/...eb.Server/Modules.LandingPages.Web.csproj → ...es/Server/Modules.LandingPages.Web.csproj
diff --git a/...ingPages.Web.Server/Pages/AboutPage.razor → ...LandingPages/Server/Pages/AboutPage.razor b/...ingPages.Web.Server/Pages/AboutPage.razor → ...LandingPages/Server/Pages/AboutPage.razor
diff --git a/...gPages.Web.Server/Pages/LandingPage.razor → ...ndingPages/Server/Pages/LandingPage.razor b/...gPages.Web.Server/Pages/LandingPage.razor → ...ndingPages/Server/Pages/LandingPage.razor
diff --git a/...ges.Web.Server/Pages/LandingPage.razor.cs → ...ngPages/Server/Pages/LandingPage.razor.cs b/...ges.Web.Server/Pages/LandingPage.razor.cs → ...ngPages/Server/Pages/LandingPage.razor.cs
diff --git a/...gPages.Web.Server/Pages/PricingPage.razor → ...ndingPages/Server/Pages/PricingPage.razor b/...gPages.Web.Server/Pages/PricingPage.razor → ...ndingPages/Server/Pages/PricingPage.razor
diff --git a/...ges.Web.Server/Pages/PricingPage.razor.cs → ...ngPages/Server/Pages/PricingPage.razor.cs b/...ges.Web.Server/Pages/PricingPage.razor.cs → ...ngPages/Server/Pages/PricingPage.razor.cs
diff --git a/...es.LandingPages.Web.Server/_Imports.razor → ...odules/LandingPages/Server/_Imports.razor b/...es.LandingPages.Web.Server/_Imports.razor → ...odules/LandingPages/Server/_Imports.razor
diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features.csproj b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features.csproj
@@ -15,9 +15,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Shared\Features\Shared.Features.csproj" />
-    <ProjectReference Include="..\..\..\Shared\Kernel\Shared.Kernel.csproj" />
     <ProjectReference Include="..\..\Subscriptions\IntegrationEvents\Modules.Subscriptions.IntegrationEvents.csproj" />
     <ProjectReference Include="..\IntegrationEvents\Modules.TenantIdentity.IntegrationEvents.csproj" />
+    <ProjectReference Include="..\Shared\Modules.TenantIdentity.Shared.csproj" />
     <ProjectReference Include="..\Web\Shared\Modules.TenantIdentity.Shared.csproj" />
   </ItemGroup>
 

diff --git a/...DTOs/IdentityOperations/BFFUserInfoDTO.cs → ...DTOs/IdentityOperations/BFFUserInfoDTO.cs b/...DTOs/IdentityOperations/BFFUserInfoDTO.cs → ...DTOs/IdentityOperations/BFFUserInfoDTO.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Modules.TenantIdentity.Web.Shared.DTOs.IdentityOperations
+namespace Modules.TenantIdentity.Shared.DTOs.IdentityOperations
 {
     public class BFFUserInfoDTO
     {

diff --git a/.../DTOs/IdentityOperations/ClaimValueDTO.cs → .../DTOs/IdentityOperations/ClaimValueDTO.cs b/.../DTOs/IdentityOperations/ClaimValueDTO.cs → .../DTOs/IdentityOperations/ClaimValueDTO.cs
@@ -1,4 +1,4 @@
-namespace Modules.TenantIdentity.Web.Shared.DTOs.IdentityOperations
+namespace Modules.TenantIdentity.Shared.DTOs.IdentityOperations
 {
     public class ClaimValueDTO
     {

diff --git a/...Operations/ChangeRoleOfTenantMemberDTO.cs → ...Operations/ChangeRoleOfTenantMemberDTO.cs b/...Operations/ChangeRoleOfTenantMemberDTO.cs → ...Operations/ChangeRoleOfTenantMemberDTO.cs
diff --git a/...DTOs/Tenant/Operations/CreateTenantDTO.cs → ...DTOs/Tenant/Operations/CreateTenantDTO.cs b/...DTOs/Tenant/Operations/CreateTenantDTO.cs → ...DTOs/Tenant/Operations/CreateTenantDTO.cs
diff --git a/...enant/Operations/InviteUserToTenantDTO.cs → ...enant/Operations/InviteUserToTenantDTO.cs b/...enant/Operations/InviteUserToTenantDTO.cs → ...enant/Operations/InviteUserToTenantDTO.cs
diff --git a/...ations/RevokeUserInvitationToTenantDTO.cs → ...ations/RevokeUserInvitationToTenantDTO.cs b/...ations/RevokeUserInvitationToTenantDTO.cs → ...ations/RevokeUserInvitationToTenantDTO.cs
diff --git a/...ntity/Web/Shared/DTOs/Tenant/TenantDTO.cs → ...tIdentity/Shared/DTOs/Tenant/TenantDTO.cs b/...ntity/Web/Shared/DTOs/Tenant/TenantDTO.cs → ...tIdentity/Shared/DTOs/Tenant/TenantDTO.cs
diff --git a/...Web/Shared/DTOs/Tenant/TenantDetailDTO.cs → ...ity/Shared/DTOs/Tenant/TenantDetailDTO.cs b/...Web/Shared/DTOs/Tenant/TenantDetailDTO.cs → ...ity/Shared/DTOs/Tenant/TenantDetailDTO.cs
diff --git a/...Shared/DTOs/Tenant/TenantMembershipDTO.cs → ...Shared/DTOs/Tenant/TenantMembershipDTO.cs b/...Shared/DTOs/Tenant/TenantMembershipDTO.cs → ...Shared/DTOs/Tenant/TenantMembershipDTO.cs
diff --git a/...ared/Modules.TenantIdentity.Shared.csproj → ...ared/Modules.TenantIdentity.Shared.csproj b/...ared/Modules.TenantIdentity.Shared.csproj → ...ared/Modules.TenantIdentity.Shared.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Shared\Kernel\Shared.Kernel.csproj" />
+    <ProjectReference Include="..\..\..\Shared\Kernel\Shared.Kernel.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...Web/Shared/Properties/launchSettings.json → ...ity/Shared/Properties/launchSettings.json b/...Web/Shared/Properties/launchSettings.json → ...ity/Shared/Properties/launchSettings.json
diff --git a/...ules/TenantIdentity/Web/Server/Controllers/Infrastructure/IdentityOperationsController.cs b/...ules/TenantIdentity/Web/Server/Controllers/Infrastructure/IdentityOperationsController.cs
@@ -5,7 +5,7 @@
 using Modules.TenantIdentity.Features.DomainFeatures.Users;
 using Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Commands;
 using Modules.TenantIdentity.Features.DomainFeatures.Users.Application.Queries;
-using Modules.TenantIdentity.Web.Shared.DTOs.IdentityOperations;
+using Modules.TenantIdentity.Shared.DTOs.IdentityOperations;
 using Shared.Features.Server;
 using System;
 using System.Collections.Generic;

diff --git a/Source/Modules/TenantIdentity/Web/Server/Modules.TenantIdentity.Web.Server.csproj b/Source/Modules/TenantIdentity/Web/Server/Modules.TenantIdentity.Web.Server.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Features\Modules.TenantIdentity.Features.csproj" />
-    <ProjectReference Include="..\Shared\Modules.TenantIdentity.Shared.csproj" />
+    <ProjectReference Include="..\..\Shared\Modules.TenantIdentity.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/Shared/Features/Modules/Registrator.cs b/Source/Shared/Features/Modules/Registrator.cs
@@ -33,7 +33,6 @@ public static IServiceCollection AddModule<TModule, TModuleStartup>(this IServic
             var moduleStartup = (IModuleStartup)Activator.CreateInstance(typeof(TModuleStartup));
             moduleStartup.ConfigureServices(services, config);
 
-            var module = ActivatorUtilities.CreateInstance<TModule>(services.BuildServiceProvider());
             services.AddScoped<TModule>();
             services.AddMessagingForModule(typeof(TModule));
 

diff --git a/Source/Web/Client/BuildingBlocks/Auth/HostAuthenticationStateProvider.cs b/Source/Web/Client/BuildingBlocks/Auth/HostAuthenticationStateProvider.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components;
-using Modules.TenantIdentity.Web.Shared.DTOs.IdentityOperations;
 using Shared.Kernel.BuildingBlocks.Auth.Constants;
 using System.Net.Http;
 using System.Net;
@@ -9,6 +8,7 @@
 using System;
 using System.Net.Http.Json;
 using Shared.Kernel.Constants.Endpoints;
+using Modules.TenantIdentity.Shared.DTOs.IdentityOperations;
 
 namespace Web.Client.BuildingBlocks.Auth
 {

diff --git a/Source/Web/Client/Web.Client.csproj b/Source/Web/Client/Web.Client.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Modules\TenantIdentity\Shared\Modules.TenantIdentity.Shared.csproj" />
     <ProjectReference Include="..\..\Modules\TenantIdentity\Web\Client\Modules.TenantIdentity.Web.Client.csproj" />
     <ProjectReference Include="..\..\Shared\Client\Shared.Client.csproj" />
   </ItemGroup>

diff --git a/Source/Web/Server/Web.Server.csproj b/Source/Web/Server/Web.Server.csproj
@@ -24,6 +24,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Modules\LandingPages\Modules.LandingPages.Web.Server\Modules.LandingPages.Web.csproj" />
+    <ProjectReference Include="..\..\Modules\LandingPages\Server\Modules.LandingPages.Web.csproj" />
     <ProjectReference Include="..\..\Modules\Subscriptions\Web\Server\Modules.Subscriptions.Web.Server.csproj" />
     <ProjectReference Include="..\..\Modules\TenantIdentity\Web\Server\Modules.TenantIdentity.Web.Server.csproj" />
     <ProjectReference Include="..\..\Shared\Features\Shared.Features.csproj" />