diff --git a/zero.Backoffice/Endpoints/Pages/PageTreeService.cs b/zero.Backoffice/Endpoints/Pages/PageTreeService.cs index 968ad011..71d27644 100644 --- a/zero.Backoffice/Endpoints/Pages/PageTreeService.cs +++ b/zero.Backoffice/Endpoints/Pages/PageTreeService.cs @@ -33,7 +33,7 @@ public class PageTreeService : IPageTreeService List items = new(); string[] openIds = Array.Empty(); Paged pages = null; - IList children = null; + IList children = null; bool isSearch = !search.IsNullOrWhiteSpace(); if (isSearch) @@ -60,9 +60,9 @@ public class PageTreeService : IPageTreeService // get hierarchy so we know if we should set the page to open if (!activeId.IsNullOrEmpty()) { - Pages_ByHierarchy.Result result = await Pages.Session.Query() - .ProjectInto() - .Include(x => x.Path.Select(p => p.Id)) + zero_Pages_ByHierarchy.Result result = await Pages.Session.Query() + .ProjectInto() + .Include(x => x.Path.Select(p => p.Id)) .FirstOrDefaultAsync(x => x.Id == activeId); if (result != null) @@ -75,8 +75,8 @@ public class PageTreeService : IPageTreeService // get children for all pages string[] pageIds = pages.Items.Select(x => x.Id).ToArray(); - children = await Pages.Session.Query() - .ProjectInto() + children = await Pages.Session.Query() + .ProjectInto() .Where(x => x.Id.In(pageIds)) .ToListAsync(); } diff --git a/zero.Core/Applications/ApplicationModule.cs b/zero.Core/Applications/ZeroApplicationModule.cs similarity index 91% rename from zero.Core/Applications/ApplicationModule.cs rename to zero.Core/Applications/ZeroApplicationModule.cs index f37d7471..b7edbb68 100644 --- a/zero.Core/Applications/ApplicationModule.cs +++ b/zero.Core/Applications/ZeroApplicationModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Applications; -public class ApplicationModule : ZeroModule +internal class ZeroApplicationModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Architecture/ArchitectureModule.cs b/zero.Core/Architecture/ZeroArchitectureModule.cs similarity index 91% rename from zero.Core/Architecture/ArchitectureModule.cs rename to zero.Core/Architecture/ZeroArchitectureModule.cs index a7aefb34..7c27875e 100644 --- a/zero.Core/Architecture/ArchitectureModule.cs +++ b/zero.Core/Architecture/ZeroArchitectureModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Architecture; -public class ArchitectureModule : ZeroModule +internal class ZeroArchitectureModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Communication/CommunicationModule.cs b/zero.Core/Communication/ZeroCommunicationModule.cs similarity index 90% rename from zero.Core/Communication/CommunicationModule.cs rename to zero.Core/Communication/ZeroCommunicationModule.cs index eb05a0fb..6becb0e8 100644 --- a/zero.Core/Communication/CommunicationModule.cs +++ b/zero.Core/Communication/ZeroCommunicationModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Communication; -public class CommunicationModule : ZeroModule +internal class ZeroCommunicationModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Configuration/ConfigurationModule.cs b/zero.Core/Configuration/ZeroConfigurationModule.cs similarity index 95% rename from zero.Core/Configuration/ConfigurationModule.cs rename to zero.Core/Configuration/ZeroConfigurationModule.cs index fc88f729..10bee414 100644 --- a/zero.Core/Configuration/ConfigurationModule.cs +++ b/zero.Core/Configuration/ZeroConfigurationModule.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Options; namespace zero.Configuration; -public class ConfigurationModule : ZeroModule +internal class ZeroConfigurationModule : ZeroModule { public override int Order => -1000; diff --git a/zero.Core/Context/ContextModule.cs b/zero.Core/Context/ZeroContextModule.cs similarity index 87% rename from zero.Core/Context/ContextModule.cs rename to zero.Core/Context/ZeroContextModule.cs index b9445b73..63083b08 100644 --- a/zero.Core/Context/ContextModule.cs +++ b/zero.Core/Context/ZeroContextModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Context; -public class ContextModule : ZeroModule +internal class ZeroContextModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/FileStorage/FileStorageModule.cs b/zero.Core/FileStorage/ZeroFileStorageModule.cs similarity index 91% rename from zero.Core/FileStorage/FileStorageModule.cs rename to zero.Core/FileStorage/ZeroFileStorageModule.cs index 9e9fa4a9..ae128745 100644 --- a/zero.Core/FileStorage/FileStorageModule.cs +++ b/zero.Core/FileStorage/ZeroFileStorageModule.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Options; namespace zero.FileStorage; -public class FileStorageModule : ZeroModule +internal class ZeroFileStorageModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Identity/IdentityModule.cs b/zero.Core/Identity/ZeroIdentityModule.cs similarity index 94% rename from zero.Core/Identity/IdentityModule.cs rename to zero.Core/Identity/ZeroIdentityModule.cs index e9bb21cb..312ae38f 100644 --- a/zero.Core/Identity/IdentityModule.cs +++ b/zero.Core/Identity/ZeroIdentityModule.cs @@ -5,9 +5,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; -namespace zero.Applications; +namespace zero.Identity; -public class IdentityModule : ZeroModule +internal class ZeroIdentityModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Localization/LocalizationModule.cs b/zero.Core/Localization/ZeroLocalizationModule.cs similarity index 91% rename from zero.Core/Localization/LocalizationModule.cs rename to zero.Core/Localization/ZeroLocalizationModule.cs index 060eb94c..1137b155 100644 --- a/zero.Core/Localization/LocalizationModule.cs +++ b/zero.Core/Localization/ZeroLocalizationModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Localization; -internal class LocalizationModule : ZeroModule +internal class ZeroLocalizationModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Mails/MailsModule.cs b/zero.Core/Mails/ZeroMailModule.cs similarity index 90% rename from zero.Core/Mails/MailsModule.cs rename to zero.Core/Mails/ZeroMailModule.cs index eefad1ea..ddf44cbc 100644 --- a/zero.Core/Mails/MailsModule.cs +++ b/zero.Core/Mails/ZeroMailModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Mails; -public class MailsModule : ZeroModule +internal class ZeroMailModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Mapper/MapperModule.cs b/zero.Core/Mapper/ZeroMapperModule.cs similarity index 86% rename from zero.Core/Mapper/MapperModule.cs rename to zero.Core/Mapper/ZeroMapperModule.cs index 14a25d74..e94d5ae8 100644 --- a/zero.Core/Mapper/MapperModule.cs +++ b/zero.Core/Mapper/ZeroMapperModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Mapper; -public class MapperModule : ZeroModule +internal class ZeroMapperModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Media/MediaModule.cs b/zero.Core/Media/ZeroMediaModule.cs similarity index 97% rename from zero.Core/Media/MediaModule.cs rename to zero.Core/Media/ZeroMediaModule.cs index bc5b96d4..bcba7028 100644 --- a/zero.Core/Media/MediaModule.cs +++ b/zero.Core/Media/ZeroMediaModule.cs @@ -7,7 +7,7 @@ using System.IO; namespace zero.Media; -public class MediaModule : ZeroModule +internal class ZeroMediaModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Pages/Indexes/Pages_AsHistory.cs b/zero.Core/Pages/Indexes/zero_Pages_AsHistory.cs similarity index 85% rename from zero.Core/Pages/Indexes/Pages_AsHistory.cs rename to zero.Core/Pages/Indexes/zero_Pages_AsHistory.cs index 7ba2bf8f..973546dc 100644 --- a/zero.Core/Pages/Indexes/Pages_AsHistory.cs +++ b/zero.Core/Pages/Indexes/zero_Pages_AsHistory.cs @@ -2,7 +2,7 @@ namespace zero.Pages; -public class Pages_AsHistory : ZeroIndex +public class zero_Pages_AsHistory : ZeroIndex { public class Result : ZeroIdEntity, ISupportsDbConventions { diff --git a/zero.Core/Pages/Indexes/Pages_ByHierarchy.cs b/zero.Core/Pages/Indexes/zero_Pages_ByHierarchy.cs similarity index 92% rename from zero.Core/Pages/Indexes/Pages_ByHierarchy.cs rename to zero.Core/Pages/Indexes/zero_Pages_ByHierarchy.cs index b28e53ad..8367549e 100644 --- a/zero.Core/Pages/Indexes/Pages_ByHierarchy.cs +++ b/zero.Core/Pages/Indexes/zero_Pages_ByHierarchy.cs @@ -2,7 +2,7 @@ namespace zero.Pages; -public class Pages_ByHierarchy : ZeroIndex +public class zero_Pages_ByHierarchy : ZeroIndex { public class Result : ZeroIdEntity, ISupportsDbConventions { diff --git a/zero.Core/Pages/Indexes/Pages_ByType.cs b/zero.Core/Pages/Indexes/zero_Pages_ByType.cs similarity index 83% rename from zero.Core/Pages/Indexes/Pages_ByType.cs rename to zero.Core/Pages/Indexes/zero_Pages_ByType.cs index 9e52ed06..3114db17 100644 --- a/zero.Core/Pages/Indexes/Pages_ByType.cs +++ b/zero.Core/Pages/Indexes/zero_Pages_ByType.cs @@ -2,7 +2,7 @@ namespace zero.Pages; -public class Pages_ByType : ZeroIndex +public class zero_Pages_ByType : ZeroIndex { protected override void Create() { diff --git a/zero.Core/Pages/Indexes/Pages_WithChildren.cs b/zero.Core/Pages/Indexes/zero_Pages_WithChildren.cs similarity index 90% rename from zero.Core/Pages/Indexes/Pages_WithChildren.cs rename to zero.Core/Pages/Indexes/zero_Pages_WithChildren.cs index c34840cc..11ac6106 100644 --- a/zero.Core/Pages/Indexes/Pages_WithChildren.cs +++ b/zero.Core/Pages/Indexes/zero_Pages_WithChildren.cs @@ -2,7 +2,7 @@ namespace zero.Pages; -public class Pages_WithChildren : ZeroIndex +public class zero_Pages_WithChildren : ZeroIndex { public class Result : ZeroIdEntity, ISupportsDbConventions { diff --git a/zero.Core/Pages/PageTypeService.cs b/zero.Core/Pages/PageTypeService.cs index 9b125c0e..c3f18438 100644 --- a/zero.Core/Pages/PageTypeService.cs +++ b/zero.Core/Pages/PageTypeService.cs @@ -43,10 +43,10 @@ public class PageTypeService : IPageTypeService if (!pageParentId.IsNullOrEmpty()) { - Pages_ByHierarchy.Result result = await session.Query() - .ProjectInto() - .Include(x => x.Id) - .Include(x => x.Path.Select(p => p.Id)) + zero_Pages_ByHierarchy.Result result = await session.Query() + .ProjectInto() + .Include(x => x.Id) + .Include(x => x.Path.Select(p => p.Id)) .FirstOrDefaultAsync(x => x.Id == pageParentId); if (result != null) diff --git a/zero.Core/Pages/PagesModule.cs b/zero.Core/Pages/ZeroPageModule.cs similarity index 79% rename from zero.Core/Pages/PagesModule.cs rename to zero.Core/Pages/ZeroPageModule.cs index f25510f8..f84aef42 100644 --- a/zero.Core/Pages/PagesModule.cs +++ b/zero.Core/Pages/ZeroPageModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Pages; -internal class PagesModule : ZeroModule +internal class ZeroPageModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { @@ -16,10 +16,10 @@ internal class PagesModule : ZeroModule services.Configure(opts => { - opts.Indexes.Add(); - opts.Indexes.Add(); - opts.Indexes.Add(); - opts.Indexes.Add(); + opts.Indexes.Add(); + opts.Indexes.Add(); + opts.Indexes.Add(); + opts.Indexes.Add(); }); services.Configure(opts => diff --git a/zero.Core/Persistence/PersistenceModule.cs b/zero.Core/Persistence/ZeroPersistenceModule.cs similarity index 97% rename from zero.Core/Persistence/PersistenceModule.cs rename to zero.Core/Persistence/ZeroPersistenceModule.cs index bc2a5179..91ac0e44 100644 --- a/zero.Core/Persistence/PersistenceModule.cs +++ b/zero.Core/Persistence/ZeroPersistenceModule.cs @@ -5,7 +5,7 @@ using Raven.Client.Http; namespace zero.Persistence; -public class PersistenceModule : ZeroModule +internal class ZeroPersistenceModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Rendering/RenderingModule.cs b/zero.Core/Rendering/ZeroRenderingModule.cs similarity index 86% rename from zero.Core/Rendering/RenderingModule.cs rename to zero.Core/Rendering/ZeroRenderingModule.cs index a4cc72dc..5d975059 100644 --- a/zero.Core/Rendering/RenderingModule.cs +++ b/zero.Core/Rendering/ZeroRenderingModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Rendering; -public class RenderingModule : ZeroModule +public class ZeroRenderingModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Routing/PageRouteProvider/PageRouteProvider.cs b/zero.Core/Routing/PageRouteProvider/PageRouteProvider.cs index 8a9fcd1d..353b5613 100644 --- a/zero.Core/Routing/PageRouteProvider/PageRouteProvider.cs +++ b/zero.Core/Routing/PageRouteProvider/PageRouteProvider.cs @@ -82,7 +82,7 @@ public class PageRouteProvider : ZeroRouteProvider if (model is Page) { string id = model.Id; - IList children = await context.Session.Query() + IList children = await context.Session.Query() .Where(x => x.PathIds.In(new[] { id })).ProjectInto().ToListAsync(); foreach (Page child in children) @@ -98,9 +98,9 @@ public class PageRouteProvider : ZeroRouteProvider /// protected virtual async Task> GetParents(RoutingContext context, Page model) { - Pages_ByHierarchy.Result result = await context.Session.Query() - .ProjectInto() - .Include(x => x.Path.Select(p => p.Id)) + zero_Pages_ByHierarchy.Result result = await context.Session.Query() + .ProjectInto() + .Include(x => x.Path.Select(p => p.Id)) .FirstOrDefaultAsync(x => x.Id == model.Id); if (result == null) diff --git a/zero.Core/Routing/PageRouteProvider/PageRouteResolverHelper.cs b/zero.Core/Routing/PageRouteProvider/PageRouteResolverHelper.cs index e5a88b09..11486abc 100644 --- a/zero.Core/Routing/PageRouteProvider/PageRouteResolverHelper.cs +++ b/zero.Core/Routing/PageRouteProvider/PageRouteResolverHelper.cs @@ -173,7 +173,7 @@ public class PageRouteResolverHelper /// protected virtual async Task GetChildIds(RoutingContext context, params string[] pageIds) { - return await context.Session.Query() + return await context.Session.Query() .Where(x => x.PathIds.In(pageIds)) .Select(x => x.Id) .ToArrayAsync(); diff --git a/zero.Core/Routing/RoutingModule.cs b/zero.Core/Routing/ZeroRoutingModule.cs similarity index 96% rename from zero.Core/Routing/RoutingModule.cs rename to zero.Core/Routing/ZeroRoutingModule.cs index 5894a993..8f43f3fd 100644 --- a/zero.Core/Routing/RoutingModule.cs +++ b/zero.Core/Routing/ZeroRoutingModule.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions; namespace zero.Routing; -public class RoutingModule : ZeroModule +internal class ZeroRoutingModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Spaces/SpacesModule.cs b/zero.Core/Spaces/ZeroSpaceModule.cs similarity index 92% rename from zero.Core/Spaces/SpacesModule.cs rename to zero.Core/Spaces/ZeroSpaceModule.cs index deb30974..436c4065 100644 --- a/zero.Core/Spaces/SpacesModule.cs +++ b/zero.Core/Spaces/ZeroSpaceModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Spaces; -public class SpacesModule : ZeroModule +internal class ZeroSpaceModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/Stores/StoresModule.cs b/zero.Core/Stores/ZeroStoreModule.cs similarity index 96% rename from zero.Core/Stores/StoresModule.cs rename to zero.Core/Stores/ZeroStoreModule.cs index 3ca0edaa..eae99457 100644 --- a/zero.Core/Stores/StoresModule.cs +++ b/zero.Core/Stores/ZeroStoreModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; namespace zero.Stores; -public class StoresModule : ZeroModule +internal class ZeroStoreModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { diff --git a/zero.Core/ZeroBuilder.cs b/zero.Core/ZeroBuilder.cs index a0df17ca..dab3d662 100644 --- a/zero.Core/ZeroBuilder.cs +++ b/zero.Core/ZeroBuilder.cs @@ -13,7 +13,7 @@ public class ZeroBuilder public virtual IMvcBuilder Mvc { get; } - public ZeroModuleCollection Modules { get; } = new(); + protected ZeroModuleCollection Modules { get; } = new(); readonly IConfiguration Configuration; readonly IZeroStartupOptions StartupOptions; @@ -35,24 +35,23 @@ public class ZeroBuilder // adds and discovers additional and built-in assemblies new AssemblyDiscovery(Mvc).Execute(StartupOptions.AssemblyDiscoveryRules); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); - Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); + Modules.Add(); Modules.ConfigureServices(services, configuration);