clean up

src/Mixcore.sln

@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.database", "platform\mi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.shared", "platform\mix.shared\mix.shared.csproj", "{4B1A6E00-C5E7-4DA7-B234-36EA35CC9B44}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.account", "modules\mix.account\mix.account.csproj", "{19560515-92A4-4955-BDD9-E1CDA7E8A3BC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.signalr", "platform\mix.signalr\mix.signalr.csproj", "{8401BAD4-7658-4357-859C-19F40E731848}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.identity", "platform\mix.identity\mix.identity.csproj", "{681C6E43-9F8E-4A9B-AD03-12702CF47720}"
@@ -125,6 +123,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.mq.lib", "services\mix-
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.mq", "services\mix-message-queue\mix.mq\mix.mq.csproj", "{BB464A87-7C6E-4B4D-805A-91560D81EAA3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mix-auth-service", "mix-auth-service", "{EC933357-1D95-4CDD-B290-7A5984FC1AA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.auth.service", "services\mix-auth-service\mix.auth.service\mix.auth.service.csproj", "{D503F737-90E6-438F-ACB2-1074CACEE407}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -147,10 +149,6 @@ Global
 		{4B1A6E00-C5E7-4DA7-B234-36EA35CC9B44}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B1A6E00-C5E7-4DA7-B234-36EA35CC9B44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B1A6E00-C5E7-4DA7-B234-36EA35CC9B44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19560515-92A4-4955-BDD9-E1CDA7E8A3BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19560515-92A4-4955-BDD9-E1CDA7E8A3BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19560515-92A4-4955-BDD9-E1CDA7E8A3BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19560515-92A4-4955-BDD9-E1CDA7E8A3BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8401BAD4-7658-4357-859C-19F40E731848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8401BAD4-7658-4357-859C-19F40E731848}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8401BAD4-7658-4357-859C-19F40E731848}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -291,6 +289,10 @@ Global
 		{BB464A87-7C6E-4B4D-805A-91560D81EAA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB464A87-7C6E-4B4D-805A-91560D81EAA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB464A87-7C6E-4B4D-805A-91560D81EAA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D503F737-90E6-438F-ACB2-1074CACEE407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D503F737-90E6-438F-ACB2-1074CACEE407}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D503F737-90E6-438F-ACB2-1074CACEE407}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D503F737-90E6-438F-ACB2-1074CACEE407}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -303,7 +305,6 @@ Global
 		{E6801B38-0264-456C-B8E6-A73262B6CBA7} = {6F925183-31E6-4DEB-BAB1-80F330B9E199}
 		{3716FB3C-CDC3-45E7-9809-CF7F2DD30388} = {0027B7D2-664D-4872-AE99-BA2A2BCA6B2E}
 		{4B1A6E00-C5E7-4DA7-B234-36EA35CC9B44} = {147A1144-45E8-448A-9FD7-511C999E5727}
-		{19560515-92A4-4955-BDD9-E1CDA7E8A3BC} = {6F925183-31E6-4DEB-BAB1-80F330B9E199}
 		{8401BAD4-7658-4357-859C-19F40E731848} = {92F3CAD3-DBF4-4587-A14D-8DECE4077D0C}
 		{681C6E43-9F8E-4A9B-AD03-12702CF47720} = {0027B7D2-664D-4872-AE99-BA2A2BCA6B2E}
 		{A92D009D-2C5B-46BC-893A-7AE995EE8814} = {6F925183-31E6-4DEB-BAB1-80F330B9E199}
@@ -356,6 +357,8 @@ Global
 		{C93898B7-2001-4C29-9BBE-33A2E61C350A} = {C0A05428-767E-46C5-A31F-0D220E41F7C5}
 		{70E0E3FE-11A6-4342-AFD7-D2E5E3CB2658} = {C93898B7-2001-4C29-9BBE-33A2E61C350A}
 		{BB464A87-7C6E-4B4D-805A-91560D81EAA3} = {C93898B7-2001-4C29-9BBE-33A2E61C350A}
+		{EC933357-1D95-4CDD-B290-7A5984FC1AA2} = {C0A05428-767E-46C5-A31F-0D220E41F7C5}
+		{D503F737-90E6-438F-ACB2-1074CACEE407} = {EC933357-1D95-4CDD-B290-7A5984FC1AA2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0143C230-7F40-44B2-8BA3-EF5B92D55848}

src/applications/mixcore.host.aspire/mixcore.host.aspire.AppHost/Program.cs

@@ -8,4 +8,6 @@
 
 builder.AddProject<Projects.mix_mq>("mix.mq");
 
+//builder.AddProject<Projects.mix_auth_service>("mix.auth.service");
+
 builder.Build().Run();

src/applications/mixcore.host.aspire/mixcore.host.aspire.AppHost/mixcore.host.aspire.AppHost.csproj

@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\services\mix-auth-service\mix.auth.service\mix.auth.service.csproj" />
     <ProjectReference Include="..\..\..\services\mix-message-queue\mix.mq\mix.mq.csproj" />
     <ProjectReference Include="..\..\mixcore.gateway\mixcore.gateway.csproj" />
     <ProjectReference Include="..\..\mixcore\mixcore.csproj" />

src/applications/mixcore/Controllers/ModuleDataController.cs

@@ -3,6 +3,7 @@
 using Mix.Lib.Dtos;
 using Mix.Lib.Models.Common;
 using Mix.Lib.Services;
+using Mix.Mq.Lib.Models;
 using Mix.SignalR.Interfaces;
 
 namespace Mixcore.Controllers

src/applications/mixcore/Controllers/PageContentApiController.cs

@@ -3,6 +3,7 @@
 using Mix.Heart.Helpers;
 using Mix.Lib.Models.Common;
 using Mix.Lib.Services;
+using Mix.Mq.Lib.Models;
 using Mix.RepoDb.Repositories;
 using Mix.Services.Databases.Lib.Interfaces;
 using Mix.Shared.Models;

src/applications/mixcore/Controllers/PostContentApiController.cs

@@ -5,6 +5,7 @@
 using Mix.Heart.Helpers;
 using Mix.Lib.Models.Common;
 using Mix.Lib.Services;
+using Mix.Mq.Lib.Models;
 using Mix.RepoDb.Repositories;
 using Mix.Services.Databases.Lib.Interfaces;
 using Mix.SignalR.Interfaces;

src/applications/mixcore/Controllers/SecurityController.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal;
 using Microsoft.AspNetCore.Mvc;
 using Mix.Auth.Enums;
 using Mix.Auth.Models;
@@ -17,7 +16,7 @@ public class SecurityController(
         IMixCmsService mixCmsService,
         IPSecurityConfigService ipSecurityConfigService,
         SignInManager<MixUser> signInManager,
-        ILogger<ExternalLoginModel> logger,
+        ILogger<SecurityController> logger,
         MixIdentityService idService,
         TenantUserManager userManager,
         MixEndpointService mixEndpointService,
@@ -26,7 +25,7 @@ public class SecurityController(
     {
         private readonly SignInManager<MixUser> _signInManager = signInManager;
         private readonly TenantUserManager _userManager = userManager;
-        private readonly ILogger<ExternalLoginModel> _logger = logger;
+        private readonly ILogger<SecurityController> _logger = logger;
         private readonly MixIdentityService _idService = idService;
         private readonly MixEndpointService _mixEndpointService = mixEndpointService;
 

src/applications/mixcore/Dockerfile

@@ -35,17 +35,17 @@ COPY ["modules/mix.grpc/mix.grpc.csproj", "modules/mix.grpc/"]
 COPY ["modules/mix.common/mix.common.csproj", "modules/mix.common/"]
 COPY ["modules/mix.messenger/mix.messenger.csproj", "modules/mix.messenger/"]
 COPY ["modules/mix.portal/mix.portal.csproj", "modules/mix.portal/"]
-COPY ["services/mix-databases/mix.services.databases.lib/mix.services.databases.lib.csproj", "services/mix-databases/mix.services.databases.lib/"]
+COPY ["services/core/mix-databases/mix.services.databases.lib/mix.services.databases.lib.csproj", "services/core/mix-databases/mix.services.databases.lib/"]
 COPY ["modules/mix.scheduler/mix.scheduler.csproj", "modules/mix.scheduler/"]
 COPY ["modules/mix.log/mix.log.csproj", "modules/mix.log/"]
 COPY ["modules/mix.storage/mix.storage.csproj", "modules/mix.storage/"]
 COPY ["platform/mix.storage.lib/mix.storage.lib.csproj", "platform/mix.storage.lib/"]
 COPY ["modules/mix.tenancy/mix.tenancy.csproj", "modules/mix.tenancy/"]
-COPY ["services/ecommerces/mix.services.ecommerce/mix.services.ecommerce.csproj", "services/ecommerces/mix.services.ecommerce/"]
-COPY ["services/ecommerces/mix.services.ecommerce.lib/mix.services.ecommerce.lib.csproj", "services/ecommerces/mix.services.ecommerce.lib/"]
-COPY ["services/graphql/mix.services.graphql/mix.services.graphql.csproj", "services/graphql/mix.services.graphql/"]
-COPY ["services/graphql/mix.services.graphql.lib/mix.services.graphql.lib.csproj", "services/graphql/mix.services.graphql.lib/"]
-COPY ["services/mix-databases/mix.servives.databases/mix.services.databases.csproj", "services/mix-databases/mix.servives.databases/"]
+COPY ["services/core/ecommerces/mix.services.ecommerce/mix.services.ecommerce.csproj", "services/core/ecommerces/mix.services.ecommerce/"]
+COPY ["services/core/ecommerces/mix.services.ecommerce.lib/mix.services.ecommerce.lib.csproj", "services/core/ecommerces/mix.services.ecommerce.lib/"]
+COPY ["services/core/graphql/mix.services.graphql/mix.services.graphql.csproj", "services/core/graphql/mix.services.graphql/"]
+COPY ["services/core/graphql/mix.services.graphql.lib/mix.services.graphql.lib.csproj", "services/core/graphql/mix.services.graphql.lib/"]
+COPY ["services/core/mix-databases/mix.servives.databases/mix.services.databases.csproj", "services/core/mix-databases/mix.servives.databases/"]
 RUN dotnet restore "./applications/mixcore/./mixcore.csproj"
 COPY . .
 WORKDIR "/src/applications/mixcore"

src/applications/mixcore/Program.cs

@@ -7,6 +7,16 @@
 using Microsoft.Extensions.FileProviders;
 using Mix.Lib.Middlewares;
 using Mix.Shared.Services;
+using Mix.Shared.Helpers;
+
+var mixContentFolder = new DirectoryInfo(MixFolders.StaticFiles);
+
+// Clone Settings from shared folder
+if (!mixContentFolder.Exists)
+{
+    MixHelper.CopyFolder($"{Environment.CurrentDirectory}/{MixFolders.DefaultMixContentFolder}", MixFolders.MixContentFolder);
+    Console.WriteLine("Clone Settings from shared folder completed.");
+}
 var builder = MixCmsHelper.CreateWebApplicationBuilder(args);
 
 builder.AddServiceDefaults();