From 09074ba812c86783fc34c8c491164fc7a5b40b7f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 25 Nov 2016 08:06:01 +0100 Subject: [PATCH] Namespaces fixed --- .../{Configurations => Config}/Constants.cs | 3 ++- .../Domain/InfrastructureModule.cs | 2 +- .../Domain/ReadModule.cs | 2 +- .../Domain/Serializers.cs | 2 +- .../Domain/WriteModule.cs | 2 +- .../EventStore/EventStoreModule.cs | 2 +- .../EventStore/EventStoreUsage.cs | 2 +- .../EventStore/MyEventStoreOptions.cs | 2 +- .../Identity/Cert/IdentityCert.snk | Bin .../Identity/IdentityServices.cs | 4 ++-- .../Identity/IdentityUsage.cs | 2 +- .../Identity/LazyClientStore.cs | 2 +- .../Identity/MyIdentityOptions.cs | 2 +- .../Identity/SwaggerIdentityUsage.cs | 4 ++-- .../MyUrlsOptions.cs | 2 +- .../Swagger/SwaggerUsage.cs | 19 ++---------------- .../Swagger/XmlResponseTypesProcessor.cs | 4 ++-- .../Swagger/XmlTagProcessor.cs | 2 +- .../Web/WebDependencies.cs | 4 ++-- .../Web/WebModule.cs | 2 +- .../Web/WebpackServices.cs | 2 +- .../Web/WebpackUsage.cs | 2 +- .../Identity/Cert/IdentityCert.pfx | Bin 2573 -> 0 bytes .../Api/Apps/AppClientsController.cs | 8 ++++---- .../Api/Apps/AppContributorsController.cs | 4 ++-- .../Api/Apps/AppController.cs | 6 +++--- .../Api/Apps/AppLanguagesController.cs | 4 ++-- .../Api/Apps/Models/AppDto.cs | 2 +- .../Api/Apps/Models/AssignContributorDto.cs | 2 +- .../Api/Apps/Models/AttachClientDto.cs | 2 +- .../Api/Apps/Models/ClientDto.cs | 2 +- .../Api/Apps/Models/ConfigureLanguagesDto.cs | 2 +- .../Api/Apps/Models/ContributorDto.cs | 2 +- .../Api/Apps/Models/CreateAppDto.cs | 2 +- .../Api/Docs/DocsController.cs | 2 +- .../Api/EntityCreatedDto.cs | 2 +- .../{Modules => Controllers}/Api/ErrorDto.cs | 2 +- .../Api/LanguageDto.cs | 2 +- .../Api/Languages/LanguagesController.cs | 2 +- .../Api/Schemas/Models/CreateSchemaDto.cs | 2 +- .../Api/Schemas/Models/FieldDto.cs | 4 ++-- .../Api/Schemas/Models/Fields/NumberField.cs | 2 +- .../Api/Schemas/Models/Fields/StringField.cs | 2 +- .../Api/Schemas/Models/SchemaDetailsDto.cs | 2 +- .../Api/Schemas/Models/SchemaDto.cs | 2 +- .../Api/Schemas/Models/UpdateSchemaDto.cs | 2 +- .../Api/Schemas/SchemaFieldsController.cs | 4 ++-- .../Api/Schemas/SchemasController.cs | 4 ++-- .../Api/Users/Models/UserDto.cs | 2 +- .../Api/Users/UsersController.cs | 4 ++-- .../ControllerBase.cs | 2 +- .../UI/Account/AccountController.cs | 2 +- .../UI/Account/ExternalProvider.cs | 2 +- .../UI/Account/LoginVM.cs | 2 +- .../Pipeline/ApiExceptionFilterAttribute.cs | 2 +- src/Squidex/Startup.cs | 12 +++++------ src/Squidex/Views/Account/Login.cshtml | 2 +- 57 files changed, 77 insertions(+), 91 deletions(-) rename src/Squidex/{Configurations => Config}/Constants.cs (95%) rename src/Squidex/{Configurations => Config}/Domain/InfrastructureModule.cs (97%) rename src/Squidex/{Configurations => Config}/Domain/ReadModule.cs (96%) rename src/Squidex/{Configurations => Config}/Domain/Serializers.cs (98%) rename src/Squidex/{Configurations => Config}/Domain/WriteModule.cs (97%) rename src/Squidex/{Configurations => Config}/EventStore/EventStoreModule.cs (97%) rename src/Squidex/{Configurations => Config}/EventStore/EventStoreUsage.cs (95%) rename src/Squidex/{Configurations => Config}/EventStore/MyEventStoreOptions.cs (93%) rename src/Squidex/{Configurations => Config}/Identity/Cert/IdentityCert.snk (100%) rename src/Squidex/{Configurations => Config}/Identity/IdentityServices.cs (96%) rename src/Squidex/{Configurations => Config}/Identity/IdentityUsage.cs (99%) rename src/Squidex/{Configurations => Config}/Identity/LazyClientStore.cs (98%) rename src/Squidex/{Configurations => Config}/Identity/MyIdentityOptions.cs (93%) rename src/Squidex/{Configurations => Config}/Identity/SwaggerIdentityUsage.cs (92%) rename src/Squidex/{Configurations => Config}/MyUrlsOptions.cs (96%) rename src/Squidex/{Configurations => Config}/Swagger/SwaggerUsage.cs (81%) rename src/Squidex/{Configurations => Config}/Swagger/XmlResponseTypesProcessor.cs (97%) rename src/Squidex/{Configurations => Config}/Swagger/XmlTagProcessor.cs (98%) rename src/Squidex/{Configurations => Config}/Web/WebDependencies.cs (88%) rename src/Squidex/{Configurations => Config}/Web/WebModule.cs (94%) rename src/Squidex/{Configurations => Config}/Web/WebpackServices.cs (94%) rename src/Squidex/{Configurations => Config}/Web/WebpackUsage.cs (96%) delete mode 100644 src/Squidex/Configurations/Identity/Cert/IdentityCert.pfx rename src/Squidex/{Modules => Controllers}/Api/Apps/AppClientsController.cs (93%) rename src/Squidex/{Modules => Controllers}/Api/Apps/AppContributorsController.cs (97%) rename src/Squidex/{Modules => Controllers}/Api/Apps/AppController.cs (96%) rename src/Squidex/{Modules => Controllers}/Api/Apps/AppLanguagesController.cs (97%) rename src/Squidex/{Modules => Controllers}/Api/Apps/Models/AppDto.cs (96%) rename src/Squidex/{Modules => Controllers}/Api/Apps/Models/AssignContributorDto.cs (95%) rename src/Squidex/{Modules => Controllers}/Api/Apps/Models/AttachClientDto.cs (93%) rename src/Squidex/{Modules => Controllers}/Api/Apps/Models/ClientDto.cs (95%) rename src/Squidex/{Modules => Controllers}/Api/Apps/Models/ConfigureLanguagesDto.cs (93%) rename src/Squidex/{Modules => Controllers}/Api/Apps/Models/ContributorDto.cs (95%) rename src/Squidex/{Modules => Controllers}/Api/Apps/Models/CreateAppDto.cs (93%) rename src/Squidex/{Modules => Controllers}/Api/Docs/DocsController.cs (94%) rename src/Squidex/{Modules => Controllers}/Api/EntityCreatedDto.cs (94%) rename src/Squidex/{Modules => Controllers}/Api/ErrorDto.cs (96%) rename src/Squidex/{Modules => Controllers}/Api/LanguageDto.cs (93%) rename src/Squidex/{Modules => Controllers}/Api/Languages/LanguagesController.cs (96%) rename src/Squidex/{Modules => Controllers}/Api/Schemas/Models/CreateSchemaDto.cs (92%) rename src/Squidex/{Modules => Controllers}/Api/Schemas/Models/FieldDto.cs (93%) rename src/Squidex/{Modules => Controllers}/Api/Schemas/Models/Fields/NumberField.cs (94%) rename src/Squidex/{Modules => Controllers}/Api/Schemas/Models/Fields/StringField.cs (95%) rename src/Squidex/{Modules => Controllers}/Api/Schemas/Models/SchemaDetailsDto.cs (97%) rename src/Squidex/{Modules => Controllers}/Api/Schemas/Models/SchemaDto.cs (95%) rename src/Squidex/{Modules => Controllers}/Api/Schemas/Models/UpdateSchemaDto.cs (93%) rename src/Squidex/{Modules => Controllers}/Api/Schemas/SchemaFieldsController.cs (98%) rename src/Squidex/{Modules => Controllers}/Api/Schemas/SchemasController.cs (98%) rename src/Squidex/{Modules => Controllers}/Api/Users/Models/UserDto.cs (95%) rename src/Squidex/{Modules => Controllers}/Api/Users/UsersController.cs (96%) rename src/Squidex/{Modules => Controllers}/ControllerBase.cs (97%) rename src/Squidex/{Modules => Controllers}/UI/Account/AccountController.cs (99%) rename src/Squidex/{Modules => Controllers}/UI/Account/ExternalProvider.cs (94%) rename src/Squidex/{Modules => Controllers}/UI/Account/LoginVM.cs (92%) diff --git a/src/Squidex/Configurations/Constants.cs b/src/Squidex/Config/Constants.cs similarity index 95% rename from src/Squidex/Configurations/Constants.cs rename to src/Squidex/Config/Constants.cs index f12824017..19b7a0d0c 100644 --- a/src/Squidex/Configurations/Constants.cs +++ b/src/Squidex/Config/Constants.cs @@ -5,7 +5,8 @@ // Copyright (c) Squidex Group // All rights reserved. // ========================================================================== -namespace Squidex.Configurations + +namespace Squidex.Config { public class Constants { diff --git a/src/Squidex/Configurations/Domain/InfrastructureModule.cs b/src/Squidex/Config/Domain/InfrastructureModule.cs similarity index 97% rename from src/Squidex/Configurations/Domain/InfrastructureModule.cs rename to src/Squidex/Config/Domain/InfrastructureModule.cs index aa6772283..8a55aaf2e 100644 --- a/src/Squidex/Configurations/Domain/InfrastructureModule.cs +++ b/src/Squidex/Config/Domain/InfrastructureModule.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.CQRS.EventStore; using Squidex.Store.MongoDb.Infrastructure; -namespace Squidex.Configurations.Domain +namespace Squidex.Config.Domain { public class InfrastructureModule : Module { diff --git a/src/Squidex/Configurations/Domain/ReadModule.cs b/src/Squidex/Config/Domain/ReadModule.cs similarity index 96% rename from src/Squidex/Configurations/Domain/ReadModule.cs rename to src/Squidex/Config/Domain/ReadModule.cs index e029dc3f4..54845d408 100644 --- a/src/Squidex/Configurations/Domain/ReadModule.cs +++ b/src/Squidex/Config/Domain/ReadModule.cs @@ -13,7 +13,7 @@ using Squidex.Read.Apps.Services.Implementations; using Squidex.Read.Schemas.Services; using Squidex.Read.Schemas.Services.Implementations; -namespace Squidex.Configurations.Domain +namespace Squidex.Config.Domain { public sealed class ReadModule : Module { diff --git a/src/Squidex/Configurations/Domain/Serializers.cs b/src/Squidex/Config/Domain/Serializers.cs similarity index 98% rename from src/Squidex/Configurations/Domain/Serializers.cs rename to src/Squidex/Config/Domain/Serializers.cs index ee6bbc5ad..8e1c15ce8 100644 --- a/src/Squidex/Configurations/Domain/Serializers.cs +++ b/src/Squidex/Config/Domain/Serializers.cs @@ -16,7 +16,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.CQRS.EventStore; using Squidex.Infrastructure.Json; -namespace Squidex.Configurations.Domain +namespace Squidex.Config.Domain { public static class Serializers { diff --git a/src/Squidex/Configurations/Domain/WriteModule.cs b/src/Squidex/Config/Domain/WriteModule.cs similarity index 97% rename from src/Squidex/Configurations/Domain/WriteModule.cs rename to src/Squidex/Config/Domain/WriteModule.cs index 4503b7995..6fa0e768b 100644 --- a/src/Squidex/Configurations/Domain/WriteModule.cs +++ b/src/Squidex/Config/Domain/WriteModule.cs @@ -12,7 +12,7 @@ using Squidex.Pipeline.CommandHandlers; using Squidex.Write.Apps; using Squidex.Write.Schemas; -namespace Squidex.Configurations.Domain +namespace Squidex.Config.Domain { public class WriteModule : Module { diff --git a/src/Squidex/Configurations/EventStore/EventStoreModule.cs b/src/Squidex/Config/EventStore/EventStoreModule.cs similarity index 97% rename from src/Squidex/Configurations/EventStore/EventStoreModule.cs rename to src/Squidex/Config/EventStore/EventStoreModule.cs index 925cbf83f..dffe83f13 100644 --- a/src/Squidex/Configurations/EventStore/EventStoreModule.cs +++ b/src/Squidex/Config/EventStore/EventStoreModule.cs @@ -13,7 +13,7 @@ using EventStore.ClientAPI.SystemData; using Microsoft.Extensions.Options; using Squidex.Infrastructure.CQRS.EventStore; -namespace Squidex.Configurations.EventStore +namespace Squidex.Config.EventStore { public class EventStoreModule : Module { diff --git a/src/Squidex/Configurations/EventStore/EventStoreUsage.cs b/src/Squidex/Config/EventStore/EventStoreUsage.cs similarity index 95% rename from src/Squidex/Configurations/EventStore/EventStoreUsage.cs rename to src/Squidex/Config/EventStore/EventStoreUsage.cs index 806c57d15..1e97dde59 100644 --- a/src/Squidex/Configurations/EventStore/EventStoreUsage.cs +++ b/src/Squidex/Config/EventStore/EventStoreUsage.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Squidex.Infrastructure.CQRS.EventStore; -namespace Squidex.Configurations.EventStore +namespace Squidex.Config.EventStore { public static class EventStoreUsage { diff --git a/src/Squidex/Configurations/EventStore/MyEventStoreOptions.cs b/src/Squidex/Config/EventStore/MyEventStoreOptions.cs similarity index 93% rename from src/Squidex/Configurations/EventStore/MyEventStoreOptions.cs rename to src/Squidex/Config/EventStore/MyEventStoreOptions.cs index 244bd4415..890598bd2 100644 --- a/src/Squidex/Configurations/EventStore/MyEventStoreOptions.cs +++ b/src/Squidex/Config/EventStore/MyEventStoreOptions.cs @@ -5,7 +5,7 @@ // Copyright (c) Squidex Group // All rights reserved. // ========================================================================== -namespace Squidex.Configurations.EventStore +namespace Squidex.Config.EventStore { public sealed class MyEventStoreOptions { diff --git a/src/Squidex/Configurations/Identity/Cert/IdentityCert.snk b/src/Squidex/Config/Identity/Cert/IdentityCert.snk similarity index 100% rename from src/Squidex/Configurations/Identity/Cert/IdentityCert.snk rename to src/Squidex/Config/Identity/Cert/IdentityCert.snk diff --git a/src/Squidex/Configurations/Identity/IdentityServices.cs b/src/Squidex/Config/Identity/IdentityServices.cs similarity index 96% rename from src/Squidex/Configurations/Identity/IdentityServices.cs rename to src/Squidex/Config/Identity/IdentityServices.cs index 493424a91..94ccd9644 100644 --- a/src/Squidex/Configurations/Identity/IdentityServices.cs +++ b/src/Squidex/Config/Identity/IdentityServices.cs @@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Identity.MongoDB; using Microsoft.Extensions.DependencyInjection; using Squidex.Infrastructure.Security; -namespace Squidex.Configurations.Identity +namespace Squidex.Config.Identity { public static class IdentityServices { @@ -28,7 +28,7 @@ namespace Squidex.Configurations.Identity var assemblyName = new AssemblyName("Squidex"); var assemblyRef = Assembly.Load(assemblyName); - using (var certStream = assemblyRef.GetManifestResourceStream("Squidex.Configurations.Identity.Cert.IdentityCert.pfx")) + using (var certStream = assemblyRef.GetManifestResourceStream("Squidex.Config.Identity.Cert.IdentityCert.pfx")) { var certData = new byte[certStream.Length]; diff --git a/src/Squidex/Configurations/Identity/IdentityUsage.cs b/src/Squidex/Config/Identity/IdentityUsage.cs similarity index 99% rename from src/Squidex/Configurations/Identity/IdentityUsage.cs rename to src/Squidex/Config/Identity/IdentityUsage.cs index a7d087684..f33d413ff 100644 --- a/src/Squidex/Configurations/Identity/IdentityUsage.cs +++ b/src/Squidex/Config/Identity/IdentityUsage.cs @@ -22,7 +22,7 @@ using Squidex.Infrastructure.Security; // ReSharper disable InvertIf -namespace Squidex.Configurations.Identity +namespace Squidex.Config.Identity { public static class IdentityUsage { diff --git a/src/Squidex/Configurations/Identity/LazyClientStore.cs b/src/Squidex/Config/Identity/LazyClientStore.cs similarity index 98% rename from src/Squidex/Configurations/Identity/LazyClientStore.cs rename to src/Squidex/Config/Identity/LazyClientStore.cs index 2e35aa255..757395bde 100644 --- a/src/Squidex/Configurations/Identity/LazyClientStore.cs +++ b/src/Squidex/Config/Identity/LazyClientStore.cs @@ -17,7 +17,7 @@ using Squidex.Infrastructure; using Squidex.Read.Apps; using Squidex.Read.Apps.Services; -namespace Squidex.Configurations.Identity +namespace Squidex.Config.Identity { public class LazyClientStore : IClientStore { diff --git a/src/Squidex/Configurations/Identity/MyIdentityOptions.cs b/src/Squidex/Config/Identity/MyIdentityOptions.cs similarity index 93% rename from src/Squidex/Configurations/Identity/MyIdentityOptions.cs rename to src/Squidex/Config/Identity/MyIdentityOptions.cs index bbd8339a2..8b2cc4cf6 100644 --- a/src/Squidex/Configurations/Identity/MyIdentityOptions.cs +++ b/src/Squidex/Config/Identity/MyIdentityOptions.cs @@ -6,7 +6,7 @@ // All rights reserved. // ========================================================================== -namespace Squidex.Configurations.Identity +namespace Squidex.Config.Identity { public sealed class MyIdentityOptions { diff --git a/src/Squidex/Configurations/Identity/SwaggerIdentityUsage.cs b/src/Squidex/Config/Identity/SwaggerIdentityUsage.cs similarity index 92% rename from src/Squidex/Configurations/Identity/SwaggerIdentityUsage.cs rename to src/Squidex/Config/Identity/SwaggerIdentityUsage.cs index 39839d250..2dd974e2b 100644 --- a/src/Squidex/Configurations/Identity/SwaggerIdentityUsage.cs +++ b/src/Squidex/Config/Identity/SwaggerIdentityUsage.cs @@ -12,7 +12,7 @@ using NSwag; using NSwag.AspNetCore; using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors.Security; -namespace Squidex.Configurations.Identity +namespace Squidex.Config.Identity { public static class SwaggerIdentityUsage { @@ -22,7 +22,7 @@ namespace Squidex.Configurations.Identity $ curl -X POST '{0}' -H 'Content-Type: application/x-www-form-urlencoded' - -d 'grant_type=client_credentials&client_id=[APP_NAME]&client_secret=[CLIENT_KEY]'"; + -d 'grant_type=client_credentials&client_id=[APP_NAME]:[CLIENT_NAME]&client_secret=[CLIENT_SECRET]'"; public static SwaggerOwinSettings ConfigureIdentity(this SwaggerOwinSettings settings, MyUrlsOptions options) { diff --git a/src/Squidex/Configurations/MyUrlsOptions.cs b/src/Squidex/Config/MyUrlsOptions.cs similarity index 96% rename from src/Squidex/Configurations/MyUrlsOptions.cs rename to src/Squidex/Config/MyUrlsOptions.cs index af0d3a618..5dad40c97 100644 --- a/src/Squidex/Configurations/MyUrlsOptions.cs +++ b/src/Squidex/Config/MyUrlsOptions.cs @@ -8,7 +8,7 @@ using System; -namespace Squidex.Configurations +namespace Squidex.Config { public sealed class MyUrlsOptions { diff --git a/src/Squidex/Configurations/Swagger/SwaggerUsage.cs b/src/Squidex/Config/Swagger/SwaggerUsage.cs similarity index 81% rename from src/Squidex/Configurations/Swagger/SwaggerUsage.cs rename to src/Squidex/Config/Swagger/SwaggerUsage.cs index 52ff8f235..35ed2a082 100644 --- a/src/Squidex/Configurations/Swagger/SwaggerUsage.cs +++ b/src/Squidex/Config/Swagger/SwaggerUsage.cs @@ -14,28 +14,13 @@ using Microsoft.Extensions.Options; using NJsonSchema; using NJsonSchema.Generation.TypeMappers; using NSwag.AspNetCore; -using Squidex.Configurations.Identity; +using Squidex.Config.Identity; using Squidex.Infrastructure; -namespace Squidex.Configurations.Swagger +namespace Squidex.Config.Swagger { public static class SwaggerUsage { - /* - class TypeNameGenerator : DefaultTypeNameGenerator - { - public override string Generate(JsonSchema4 schema, string typeNameHint) - { - try - { - return TypeNameRegistry.GetName(schema.Ty); - } - catch - { - return base.Generate(schema, typeNameHint); - } - } - }*/ public static void UseMySwagger(this IApplicationBuilder app) { var options = app.ApplicationServices.GetService>().Value; diff --git a/src/Squidex/Configurations/Swagger/XmlResponseTypesProcessor.cs b/src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs similarity index 97% rename from src/Squidex/Configurations/Swagger/XmlResponseTypesProcessor.cs rename to src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs index 986d9c3b1..c72839679 100644 --- a/src/Squidex/Configurations/Swagger/XmlResponseTypesProcessor.cs +++ b/src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs @@ -13,10 +13,10 @@ using NJsonSchema.Infrastructure; using NSwag; using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors; using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors.Contexts; -using Squidex.Modules.Api; +using Squidex.Controllers.Api; // ReSharper disable UseObjectOrCollectionInitializer -namespace Squidex.Configurations.Swagger +namespace Squidex.Config.Swagger { public sealed class XmlResponseTypesProcessor : IOperationProcessor { diff --git a/src/Squidex/Configurations/Swagger/XmlTagProcessor.cs b/src/Squidex/Config/Swagger/XmlTagProcessor.cs similarity index 98% rename from src/Squidex/Configurations/Swagger/XmlTagProcessor.cs rename to src/Squidex/Config/Swagger/XmlTagProcessor.cs index 3f5432390..ecaf8831a 100644 --- a/src/Squidex/Configurations/Swagger/XmlTagProcessor.cs +++ b/src/Squidex/Config/Swagger/XmlTagProcessor.cs @@ -14,7 +14,7 @@ using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors.Contexts; // ReSharper disable InvertIf -namespace Squidex.Configurations.Swagger +namespace Squidex.Config.Swagger { public sealed class XmlTagProcessor : IOperationProcessor, IDocumentProcessor { diff --git a/src/Squidex/Configurations/Web/WebDependencies.cs b/src/Squidex/Config/Web/WebDependencies.cs similarity index 88% rename from src/Squidex/Configurations/Web/WebDependencies.cs rename to src/Squidex/Config/Web/WebDependencies.cs index 4287ee83a..019def3c5 100644 --- a/src/Squidex/Configurations/Web/WebDependencies.cs +++ b/src/Squidex/Config/Web/WebDependencies.cs @@ -7,9 +7,9 @@ // ========================================================================== using Microsoft.Extensions.DependencyInjection; -using Squidex.Configurations.Domain; +using Squidex.Config.Domain; -namespace Squidex.Configurations.Web +namespace Squidex.Config.Web { public static class WebDependencies { diff --git a/src/Squidex/Configurations/Web/WebModule.cs b/src/Squidex/Config/Web/WebModule.cs similarity index 94% rename from src/Squidex/Configurations/Web/WebModule.cs rename to src/Squidex/Config/Web/WebModule.cs index de781f245..500284c68 100644 --- a/src/Squidex/Configurations/Web/WebModule.cs +++ b/src/Squidex/Config/Web/WebModule.cs @@ -9,7 +9,7 @@ using Autofac; using Squidex.Pipeline; -namespace Squidex.Configurations.Web +namespace Squidex.Config.Web { public class WebModule : Module { diff --git a/src/Squidex/Configurations/Web/WebpackServices.cs b/src/Squidex/Config/Web/WebpackServices.cs similarity index 94% rename from src/Squidex/Configurations/Web/WebpackServices.cs rename to src/Squidex/Config/Web/WebpackServices.cs index 187761b66..728fe4c90 100644 --- a/src/Squidex/Configurations/Web/WebpackServices.cs +++ b/src/Squidex/Config/Web/WebpackServices.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.DependencyInjection; using Squidex.Pipeline; -namespace Squidex.Configurations.Web +namespace Squidex.Config.Web { public static class WebpackServices { diff --git a/src/Squidex/Configurations/Web/WebpackUsage.cs b/src/Squidex/Config/Web/WebpackUsage.cs similarity index 96% rename from src/Squidex/Configurations/Web/WebpackUsage.cs rename to src/Squidex/Config/Web/WebpackUsage.cs index 2c0cce1ae..738657b45 100644 --- a/src/Squidex/Configurations/Web/WebpackUsage.cs +++ b/src/Squidex/Config/Web/WebpackUsage.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Squidex.Pipeline; -namespace Squidex.Configurations.Web +namespace Squidex.Config.Web { public static class WebpackExtensions { diff --git a/src/Squidex/Configurations/Identity/Cert/IdentityCert.pfx b/src/Squidex/Configurations/Identity/Cert/IdentityCert.pfx deleted file mode 100644 index 7a70ee610be6df1871798d3f87c0f6a5f62ca605..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2573 zcmY+^cQhM}8U}EYM8t?%rADpVE7GF&Xc7BEjoKEOH0HA@xK(zbIqsEDqBy(zNTB;}< zNNl~g^OZo7Q0}@#ZDE*izrE)4cpe{LNQQIjL*Q$R=cSozZfnlze8BKJ0VZ!uY<%0N zGV>T#BhVwA`fSx;iNb!i#|+l4vdM9h-jn$s)UhGup5N#!>u}PdMcJqndewa0QD==a zGfg82jxKNT3Xrbr6GAM!YgVIy;*2DUDQWI}204vLKz5SvX-3L1=TZN`zZA!lNx~f8 z;QeOzqBl_u-_O)`{90JEEOa+-|CK8Wy1!+|n2PTlY8-gKBSw73W)+&krkNzsszoq~ zfYqWvwNH-no^gZL^+~6POPstTt+?{h81Eaf(LE-BR#`TG!@+yKzA&#n#Vj&8;kHg| zz^wzZa#UAte9PI@6%SY?U9qo0n$OQzQKRNcJ3%*mLTQfU3EBtkm5H}mr38sN>jP2< z2@fP42R|F*Ur1YQiiiH_pN|XN3zaicB*MR;TIfrIH9Gt*r>U{zWY+o4?#_26mcyQy z@iU&%6~|WK$yQd{KNSm`vL!0fUKzvnA?Kbhgn*p(5Rs&SCL0VgZtZF^!;2hW)Ik@s zE?CV^Nam3<*zb*l%`3xVH>EpM0gTeZ1AYcG?%RH7?6sfI+iMjh%#9_!9zqazSz(2& zj;@-Kjp@nyn(+kh35FCauYrnUHEU{iopt31LN_>A{O)u;<73eRcpux_= zSK=MM5(zW2{#%Q7&Dxn#XnYI1ypol6J7o_crC6?VUf{i<8f;wBFpQ%`G|`yqy6cVb z9#xpOnPhO=E>5a0QEt05Gv0Q4pq&<bW)7f=;@&)Zvnk~J#ClkwHA4ff*`SN~cL}LDVjwIMhDP&me{A{&`?6=3A^;OR! z-+o7VoNtjZlvh@u@LqTC`kVTo^xp-XZAdpMmm<-M_=R%%*+*|9jZVoy^k!2FSv_A^ zw-%I{c?y+_Z7$W+1nSy1e@ro!S_{<>c|Aiom^_#=vzjTKqP2=>G>y9&cIDgbKEhO_ zF_?--AJ<=a4tH;e?^P}4?3ZTxg18=2_!oTmZIX^RYq38sg=Q|q9%46n1tJ7<+F_d& zhai=rr3YXd5mEU;;T$-J!V%SutZx7(v5dW*vI$v>P!Z)o7K^9lt@OI}C{i!M@F6@L zoCQ4%+sO1=)poSsbke}@Vb~rj^cu(Oc;qtCuZQ1QmmCyw@d;n1AyB~;47NF+@-u}& z>>N)!=VfgR6Y8$Di_=cbo(3q7OvHm&v??3Wu{x3{Nl=%%eANiOhGtvxOaAGsl<3I< zbt$cqJW~&3)!4hh%O=;JmGa8;pP_9bIluJN$D|;Qu}XppM!`_6MK_>J!~xg#i4ggQ zNm>F#UhqfB;1AC4bqy*dB&IFnR9QDT4y^S*u$17y2oMe|a}i5ioCpp5f0&^IP+xeo zdjZkr|LFt#Tc6h$KX&+SSDU}}0pURX+^ebd3tLXrlB~v?lGC!jsqKB`A4;A^u;9(B zZa<5j*E}CS#ITb?v}>*vW%P_j=|?;E(AqlAC7AP;QqfODSQ1_Av07#KXdRn0K1yfF z$?w_$Rx|EA^CF{`ON=x~jmQ?K;@;jJ~aHDVE@S=rXReqz1Ug18n3c;OWYJErtAK>o-2B ziG&rqev`C>a_XP3d=W;`Z%itF)lQ@ogh#7kq*f z=o=2kQk6IvgPBG%n4)(|njP2#%;(dcrUSE$-GkQ|--kX1X&XJz4DWGT+18`o`EGSu z%~g@H!i-Uw$i+AsGKn;gcF`|Kx(krJMIv)5SBY0`M z40(d2pmebqU9Ss&_UIQV{jMcYky%A+pu{$!D;4dUi8^!M{=rE1gJexaf25-{`RUZ1r7Ag=bi46&%(f#TQGuK zV?7x^u~o%Itrj%CpCgfRRhMoiloR9xx{O%Jmp@lbc8pR!9&lr)u8UItlHkcSVUg#| zKoyK8`=>v@Nor@Qs#Fcr;0N>u7e2wip=jkAIXv(p{&wX(&RURrK1UYa`JUG0U1kby zwALJ|EeTF?I$mYGkCJm)4*1~4;0Z7g7?1)JOnt=iBGU(c&~Z))jr*(L==PRPBtn>R zK<7<-`PhsK)?8S{ZKdDPf!F6C=p)X5f^^G*5nGHnGIWZEC|aawnf)BWFmiMbRZQM> z+b*)o(x6B$Ca430%Y1Cn&-Cv9^4s{ZpNRI2v=;^saWi~b9$&EYC)F7;vCd<&!2$%u%9*pj zkOWql-!zBB=hNlu9iSf;zBR*rZ0vC+9I7v};c*Rl)N$e8@m_yc{o=be!IZVTjd5qW z#VbzoP8A8}At6jBSLVEwkZ8YBPkn?8qw$7&Acp?XaVlq^%+22_c1Y=cY}Ni!x8!4z zQwD&MI#PQ+fOb-@)()c&6jQvrQK2>@w>a6@@9v&|XXWKRF3<+Jvk`w6fz+BT7S_E#O~qg7@|eiMKxD^Ux5OHiB`Iyu1!R9&e>n4!;|zV=xa5)& z<=(eO#l0D*y%MgbezBsim@I`L1eso zo`bTCC(Ts1vrzWnn!mnPBg9Oc7;`CSP-gHfC+Dkyz0k5<_PZ1AxnorfB3Gc3K(6G8y;23s5Q^!sXxsa3~E}5(cE^0#kw5c#YZ(u6WJV d3#a{p*IUMvALen>foSJ8i*;p>ctrnJ@?ZE`raAxs diff --git a/src/Squidex/Modules/Api/Apps/AppClientsController.cs b/src/Squidex/Controllers/Api/Apps/AppClientsController.cs similarity index 93% rename from src/Squidex/Modules/Api/Apps/AppClientsController.cs rename to src/Squidex/Controllers/Api/Apps/AppClientsController.cs index 97bab76c5..081abc2b8 100644 --- a/src/Squidex/Modules/Api/Apps/AppClientsController.cs +++ b/src/Squidex/Controllers/Api/Apps/AppClientsController.cs @@ -13,13 +13,13 @@ using Microsoft.AspNetCore.Mvc; using NSwag.Annotations; using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.Reflection; -using Squidex.Modules.Api.Apps.Models; +using Squidex.Controllers.Api.Apps.Models; using Squidex.Pipeline; using Squidex.Read.Apps.Services; using Squidex.Write.Apps; using Squidex.Write.Apps.Commands; -namespace Squidex.Modules.Api.Apps +namespace Squidex.Controllers.Api.Apps { /// /// Manages and configures apps. @@ -76,8 +76,8 @@ namespace Squidex.Modules.Api.Apps /// 404 => App not found. /// /// - /// Create a new client key for the app with the specified name. - /// The client key is auto generated on the server and returned. + /// Create a new key for the app with the specified name. + /// The client secret is auto generated on the server and returned. The client is valid for one year. /// [HttpPost] [Route("apps/{app}/clients/")] diff --git a/src/Squidex/Modules/Api/Apps/AppContributorsController.cs b/src/Squidex/Controllers/Api/Apps/AppContributorsController.cs similarity index 97% rename from src/Squidex/Modules/Api/Apps/AppContributorsController.cs rename to src/Squidex/Controllers/Api/Apps/AppContributorsController.cs index 0af0b22c7..c9d3d9d85 100644 --- a/src/Squidex/Modules/Api/Apps/AppContributorsController.cs +++ b/src/Squidex/Controllers/Api/Apps/AppContributorsController.cs @@ -13,12 +13,12 @@ using Microsoft.AspNetCore.Mvc; using NSwag.Annotations; using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.Reflection; -using Squidex.Modules.Api.Apps.Models; +using Squidex.Controllers.Api.Apps.Models; using Squidex.Pipeline; using Squidex.Read.Apps.Services; using Squidex.Write.Apps.Commands; -namespace Squidex.Modules.Api.Apps +namespace Squidex.Controllers.Api.Apps { /// /// Manages and configures apps. diff --git a/src/Squidex/Modules/Api/Apps/AppController.cs b/src/Squidex/Controllers/Api/Apps/AppController.cs similarity index 96% rename from src/Squidex/Modules/Api/Apps/AppController.cs rename to src/Squidex/Controllers/Api/Apps/AppController.cs index 43dd05d7a..666be4c1a 100644 --- a/src/Squidex/Modules/Api/Apps/AppController.cs +++ b/src/Squidex/Controllers/Api/Apps/AppController.cs @@ -15,12 +15,12 @@ using NSwag.Annotations; using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Security; -using Squidex.Modules.Api.Apps.Models; +using Squidex.Controllers.Api.Apps.Models; using Squidex.Pipeline; using Squidex.Read.Apps.Repositories; using Squidex.Write.Apps.Commands; -namespace Squidex.Modules.Api.Apps +namespace Squidex.Controllers.Api.Apps { /// /// Manages and configures apps. @@ -78,7 +78,7 @@ namespace Squidex.Modules.Api.Apps /// 409 => App name is already in use. /// /// - /// You can only create an app when you are authenticated as a user (OpenID implicit flow). + /// You can only create an app when you are authenticated as a user (OpenID implicit flow). /// You will be assigned as owner of the new app automatically. /// [HttpPost] diff --git a/src/Squidex/Modules/Api/Apps/AppLanguagesController.cs b/src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs similarity index 97% rename from src/Squidex/Modules/Api/Apps/AppLanguagesController.cs rename to src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs index 71aa13a18..d749943bd 100644 --- a/src/Squidex/Modules/Api/Apps/AppLanguagesController.cs +++ b/src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs @@ -13,12 +13,12 @@ using Microsoft.AspNetCore.Mvc; using NSwag.Annotations; using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.Reflection; -using Squidex.Modules.Api.Apps.Models; +using Squidex.Controllers.Api.Apps.Models; using Squidex.Pipeline; using Squidex.Read.Apps.Services; using Squidex.Write.Apps.Commands; -namespace Squidex.Modules.Api.Apps +namespace Squidex.Controllers.Api.Apps { /// /// Manages and configures apps. diff --git a/src/Squidex/Modules/Api/Apps/Models/AppDto.cs b/src/Squidex/Controllers/Api/Apps/Models/AppDto.cs similarity index 96% rename from src/Squidex/Modules/Api/Apps/Models/AppDto.cs rename to src/Squidex/Controllers/Api/Apps/Models/AppDto.cs index bbde1c276..8f3903bdb 100644 --- a/src/Squidex/Modules/Api/Apps/Models/AppDto.cs +++ b/src/Squidex/Controllers/Api/Apps/Models/AppDto.cs @@ -12,7 +12,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Squidex.Core.Apps; -namespace Squidex.Modules.Api.Apps.Models +namespace Squidex.Controllers.Api.Apps.Models { public sealed class AppDto { diff --git a/src/Squidex/Modules/Api/Apps/Models/AssignContributorDto.cs b/src/Squidex/Controllers/Api/Apps/Models/AssignContributorDto.cs similarity index 95% rename from src/Squidex/Modules/Api/Apps/Models/AssignContributorDto.cs rename to src/Squidex/Controllers/Api/Apps/Models/AssignContributorDto.cs index e7be995e7..7c0c5201c 100644 --- a/src/Squidex/Modules/Api/Apps/Models/AssignContributorDto.cs +++ b/src/Squidex/Controllers/Api/Apps/Models/AssignContributorDto.cs @@ -11,7 +11,7 @@ using Newtonsoft.Json.Converters; using Squidex.Core.Apps; using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api.Apps.Models +namespace Squidex.Controllers.Api.Apps.Models { public class AssignContributorDto { diff --git a/src/Squidex/Modules/Api/Apps/Models/AttachClientDto.cs b/src/Squidex/Controllers/Api/Apps/Models/AttachClientDto.cs similarity index 93% rename from src/Squidex/Modules/Api/Apps/Models/AttachClientDto.cs rename to src/Squidex/Controllers/Api/Apps/Models/AttachClientDto.cs index 91f1bd6a3..1440dd02d 100644 --- a/src/Squidex/Modules/Api/Apps/Models/AttachClientDto.cs +++ b/src/Squidex/Controllers/Api/Apps/Models/AttachClientDto.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api.Apps.Models +namespace Squidex.Controllers.Api.Apps.Models { public class AttachClientDto { diff --git a/src/Squidex/Modules/Api/Apps/Models/ClientDto.cs b/src/Squidex/Controllers/Api/Apps/Models/ClientDto.cs similarity index 95% rename from src/Squidex/Modules/Api/Apps/Models/ClientDto.cs rename to src/Squidex/Controllers/Api/Apps/Models/ClientDto.cs index 6d8b713d8..62e1c67a8 100644 --- a/src/Squidex/Modules/Api/Apps/Models/ClientDto.cs +++ b/src/Squidex/Controllers/Api/Apps/Models/ClientDto.cs @@ -9,7 +9,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api.Apps.Models +namespace Squidex.Controllers.Api.Apps.Models { public sealed class ClientDto { diff --git a/src/Squidex/Modules/Api/Apps/Models/ConfigureLanguagesDto.cs b/src/Squidex/Controllers/Api/Apps/Models/ConfigureLanguagesDto.cs similarity index 93% rename from src/Squidex/Modules/Api/Apps/Models/ConfigureLanguagesDto.cs rename to src/Squidex/Controllers/Api/Apps/Models/ConfigureLanguagesDto.cs index 02e802625..dba0d38fb 100644 --- a/src/Squidex/Modules/Api/Apps/Models/ConfigureLanguagesDto.cs +++ b/src/Squidex/Controllers/Api/Apps/Models/ConfigureLanguagesDto.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using Squidex.Infrastructure; -namespace Squidex.Modules.Api.Apps.Models +namespace Squidex.Controllers.Api.Apps.Models { public class ConfigureLanguagesDto { diff --git a/src/Squidex/Modules/Api/Apps/Models/ContributorDto.cs b/src/Squidex/Controllers/Api/Apps/Models/ContributorDto.cs similarity index 95% rename from src/Squidex/Modules/Api/Apps/Models/ContributorDto.cs rename to src/Squidex/Controllers/Api/Apps/Models/ContributorDto.cs index 08b5dc0f2..0ae8d11f1 100644 --- a/src/Squidex/Modules/Api/Apps/Models/ContributorDto.cs +++ b/src/Squidex/Controllers/Api/Apps/Models/ContributorDto.cs @@ -11,7 +11,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Squidex.Core.Apps; -namespace Squidex.Modules.Api.Apps.Models +namespace Squidex.Controllers.Api.Apps.Models { public sealed class ContributorDto { diff --git a/src/Squidex/Modules/Api/Apps/Models/CreateAppDto.cs b/src/Squidex/Controllers/Api/Apps/Models/CreateAppDto.cs similarity index 93% rename from src/Squidex/Modules/Api/Apps/Models/CreateAppDto.cs rename to src/Squidex/Controllers/Api/Apps/Models/CreateAppDto.cs index 18ba13fc3..f9b0ab99d 100644 --- a/src/Squidex/Modules/Api/Apps/Models/CreateAppDto.cs +++ b/src/Squidex/Controllers/Api/Apps/Models/CreateAppDto.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api.Apps.Models +namespace Squidex.Controllers.Api.Apps.Models { public sealed class CreateAppDto { diff --git a/src/Squidex/Modules/Api/Docs/DocsController.cs b/src/Squidex/Controllers/Api/Docs/DocsController.cs similarity index 94% rename from src/Squidex/Modules/Api/Docs/DocsController.cs rename to src/Squidex/Controllers/Api/Docs/DocsController.cs index b2cd6659e..2a086305d 100644 --- a/src/Squidex/Modules/Api/Docs/DocsController.cs +++ b/src/Squidex/Controllers/Api/Docs/DocsController.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc; using NSwag.Annotations; -namespace Squidex.Modules.Api.Docs +namespace Squidex.Controllers.Api.Docs { [SwaggerIgnore] public sealed class DocsController : Controller diff --git a/src/Squidex/Modules/Api/EntityCreatedDto.cs b/src/Squidex/Controllers/Api/EntityCreatedDto.cs similarity index 94% rename from src/Squidex/Modules/Api/EntityCreatedDto.cs rename to src/Squidex/Controllers/Api/EntityCreatedDto.cs index 0184fa90e..fad9e6c60 100644 --- a/src/Squidex/Modules/Api/EntityCreatedDto.cs +++ b/src/Squidex/Controllers/Api/EntityCreatedDto.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api +namespace Squidex.Controllers.Api { public class EntityCreatedDto { diff --git a/src/Squidex/Modules/Api/ErrorDto.cs b/src/Squidex/Controllers/Api/ErrorDto.cs similarity index 96% rename from src/Squidex/Modules/Api/ErrorDto.cs rename to src/Squidex/Controllers/Api/ErrorDto.cs index 6a10d4336..177a96b04 100644 --- a/src/Squidex/Modules/Api/ErrorDto.cs +++ b/src/Squidex/Controllers/Api/ErrorDto.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api +namespace Squidex.Controllers.Api { public sealed class ErrorDto { diff --git a/src/Squidex/Modules/Api/LanguageDto.cs b/src/Squidex/Controllers/Api/LanguageDto.cs similarity index 93% rename from src/Squidex/Modules/Api/LanguageDto.cs rename to src/Squidex/Controllers/Api/LanguageDto.cs index 6a6304e3a..9deb1e34e 100644 --- a/src/Squidex/Modules/Api/LanguageDto.cs +++ b/src/Squidex/Controllers/Api/LanguageDto.cs @@ -6,7 +6,7 @@ // All rights reserved. // ========================================================================== -namespace Squidex.Modules.Api +namespace Squidex.Controllers.Api { public class LanguageDto { diff --git a/src/Squidex/Modules/Api/Languages/LanguagesController.cs b/src/Squidex/Controllers/Api/Languages/LanguagesController.cs similarity index 96% rename from src/Squidex/Modules/Api/Languages/LanguagesController.cs rename to src/Squidex/Controllers/Api/Languages/LanguagesController.cs index 1a3c421e3..a8801aaf8 100644 --- a/src/Squidex/Modules/Api/Languages/LanguagesController.cs +++ b/src/Squidex/Controllers/Api/Languages/LanguagesController.cs @@ -14,7 +14,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; using Squidex.Pipeline; -namespace Squidex.Modules.Api.Languages +namespace Squidex.Controllers.Api.Languages { /// /// Readonly API to the supported langauges. diff --git a/src/Squidex/Modules/Api/Schemas/Models/CreateSchemaDto.cs b/src/Squidex/Controllers/Api/Schemas/Models/CreateSchemaDto.cs similarity index 92% rename from src/Squidex/Modules/Api/Schemas/Models/CreateSchemaDto.cs rename to src/Squidex/Controllers/Api/Schemas/Models/CreateSchemaDto.cs index 76d1191f8..adb3755a1 100644 --- a/src/Squidex/Modules/Api/Schemas/Models/CreateSchemaDto.cs +++ b/src/Squidex/Controllers/Api/Schemas/Models/CreateSchemaDto.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api.Schemas.Models +namespace Squidex.Controllers.Api.Schemas.Models { public class CreateSchemaDto { diff --git a/src/Squidex/Modules/Api/Schemas/Models/FieldDto.cs b/src/Squidex/Controllers/Api/Schemas/Models/FieldDto.cs similarity index 93% rename from src/Squidex/Modules/Api/Schemas/Models/FieldDto.cs rename to src/Squidex/Controllers/Api/Schemas/Models/FieldDto.cs index dc7d0ce58..dace217f0 100644 --- a/src/Squidex/Modules/Api/Schemas/Models/FieldDto.cs +++ b/src/Squidex/Controllers/Api/Schemas/Models/FieldDto.cs @@ -10,9 +10,9 @@ using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; using Newtonsoft.Json; using NJsonSchema.Converters; -using Squidex.Modules.Api.Schemas.Models.Fields; +using Squidex.Controllers.Api.Schemas.Models.Fields; -namespace Squidex.Modules.Api.Schemas.Models +namespace Squidex.Controllers.Api.Schemas.Models { [JsonConverter(typeof(JsonInheritanceConverter), "fieldType")] [KnownType(typeof(NumberField))] diff --git a/src/Squidex/Modules/Api/Schemas/Models/Fields/NumberField.cs b/src/Squidex/Controllers/Api/Schemas/Models/Fields/NumberField.cs similarity index 94% rename from src/Squidex/Modules/Api/Schemas/Models/Fields/NumberField.cs rename to src/Squidex/Controllers/Api/Schemas/Models/Fields/NumberField.cs index 97f247d34..a2290fe7f 100644 --- a/src/Squidex/Modules/Api/Schemas/Models/Fields/NumberField.cs +++ b/src/Squidex/Controllers/Api/Schemas/Models/Fields/NumberField.cs @@ -6,7 +6,7 @@ // All rights reserved. // ========================================================================== -namespace Squidex.Modules.Api.Schemas.Models.Fields +namespace Squidex.Controllers.Api.Schemas.Models.Fields { public class NumberField : FieldDto { diff --git a/src/Squidex/Modules/Api/Schemas/Models/Fields/StringField.cs b/src/Squidex/Controllers/Api/Schemas/Models/Fields/StringField.cs similarity index 95% rename from src/Squidex/Modules/Api/Schemas/Models/Fields/StringField.cs rename to src/Squidex/Controllers/Api/Schemas/Models/Fields/StringField.cs index 75760400c..f3516b5fa 100644 --- a/src/Squidex/Modules/Api/Schemas/Models/Fields/StringField.cs +++ b/src/Squidex/Controllers/Api/Schemas/Models/Fields/StringField.cs @@ -6,7 +6,7 @@ // All rights reserved. // ========================================================================== -namespace Squidex.Modules.Api.Schemas.Models.Fields +namespace Squidex.Controllers.Api.Schemas.Models.Fields { public sealed class StringField : FieldDto { diff --git a/src/Squidex/Modules/Api/Schemas/Models/SchemaDetailsDto.cs b/src/Squidex/Controllers/Api/Schemas/Models/SchemaDetailsDto.cs similarity index 97% rename from src/Squidex/Modules/Api/Schemas/Models/SchemaDetailsDto.cs rename to src/Squidex/Controllers/Api/Schemas/Models/SchemaDetailsDto.cs index 8bc362684..40579f11e 100644 --- a/src/Squidex/Modules/Api/Schemas/Models/SchemaDetailsDto.cs +++ b/src/Squidex/Controllers/Api/Schemas/Models/SchemaDetailsDto.cs @@ -10,7 +10,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api.Schemas.Models +namespace Squidex.Controllers.Api.Schemas.Models { public sealed class SchemaDetailsDto { diff --git a/src/Squidex/Modules/Api/Schemas/Models/SchemaDto.cs b/src/Squidex/Controllers/Api/Schemas/Models/SchemaDto.cs similarity index 95% rename from src/Squidex/Modules/Api/Schemas/Models/SchemaDto.cs rename to src/Squidex/Controllers/Api/Schemas/Models/SchemaDto.cs index 510181da6..7e200b942 100644 --- a/src/Squidex/Modules/Api/Schemas/Models/SchemaDto.cs +++ b/src/Squidex/Controllers/Api/Schemas/Models/SchemaDto.cs @@ -9,7 +9,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api.Schemas.Models +namespace Squidex.Controllers.Api.Schemas.Models { public class SchemaDto { diff --git a/src/Squidex/Modules/Api/Schemas/Models/UpdateSchemaDto.cs b/src/Squidex/Controllers/Api/Schemas/Models/UpdateSchemaDto.cs similarity index 93% rename from src/Squidex/Modules/Api/Schemas/Models/UpdateSchemaDto.cs rename to src/Squidex/Controllers/Api/Schemas/Models/UpdateSchemaDto.cs index 76d55a192..07919d47b 100644 --- a/src/Squidex/Modules/Api/Schemas/Models/UpdateSchemaDto.cs +++ b/src/Squidex/Controllers/Api/Schemas/Models/UpdateSchemaDto.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api.Schemas.Models +namespace Squidex.Controllers.Api.Schemas.Models { public class UpdateSchemaDto { diff --git a/src/Squidex/Modules/Api/Schemas/SchemaFieldsController.cs b/src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs similarity index 98% rename from src/Squidex/Modules/Api/Schemas/SchemaFieldsController.cs rename to src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs index 785a3d77b..1052db697 100644 --- a/src/Squidex/Modules/Api/Schemas/SchemaFieldsController.cs +++ b/src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs @@ -12,11 +12,11 @@ using Microsoft.AspNetCore.Mvc; using NSwag.Annotations; using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.Reflection; -using Squidex.Modules.Api.Schemas.Models; +using Squidex.Controllers.Api.Schemas.Models; using Squidex.Pipeline; using Squidex.Write.Schemas.Commands; -namespace Squidex.Modules.Api.Schemas +namespace Squidex.Controllers.Api.Schemas { /// /// Manages and retrieves information about schemas. diff --git a/src/Squidex/Modules/Api/Schemas/SchemasController.cs b/src/Squidex/Controllers/Api/Schemas/SchemasController.cs similarity index 98% rename from src/Squidex/Modules/Api/Schemas/SchemasController.cs rename to src/Squidex/Controllers/Api/Schemas/SchemasController.cs index 2aa1bb69d..0282e1682 100644 --- a/src/Squidex/Modules/Api/Schemas/SchemasController.cs +++ b/src/Squidex/Controllers/Api/Schemas/SchemasController.cs @@ -14,12 +14,12 @@ using Microsoft.AspNetCore.Mvc; using NSwag.Annotations; using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.Reflection; -using Squidex.Modules.Api.Schemas.Models; +using Squidex.Controllers.Api.Schemas.Models; using Squidex.Pipeline; using Squidex.Read.Schemas.Repositories; using Squidex.Write.Schemas.Commands; -namespace Squidex.Modules.Api.Schemas +namespace Squidex.Controllers.Api.Schemas { /// /// Manages and retrieves information about schemas. diff --git a/src/Squidex/Modules/Api/Users/Models/UserDto.cs b/src/Squidex/Controllers/Api/Users/Models/UserDto.cs similarity index 95% rename from src/Squidex/Modules/Api/Users/Models/UserDto.cs rename to src/Squidex/Controllers/Api/Users/Models/UserDto.cs index bb3b11db3..94b98b01a 100644 --- a/src/Squidex/Modules/Api/Users/Models/UserDto.cs +++ b/src/Squidex/Controllers/Api/Users/Models/UserDto.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations; -namespace Squidex.Modules.Api.Users.Models +namespace Squidex.Controllers.Api.Users.Models { public sealed class UserDto { diff --git a/src/Squidex/Modules/Api/Users/UsersController.cs b/src/Squidex/Controllers/Api/Users/UsersController.cs similarity index 96% rename from src/Squidex/Modules/Api/Users/UsersController.cs rename to src/Squidex/Controllers/Api/Users/UsersController.cs index 37a098e67..9b71cb7d3 100644 --- a/src/Squidex/Modules/Api/Users/UsersController.cs +++ b/src/Squidex/Controllers/Api/Users/UsersController.cs @@ -12,11 +12,11 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using NSwag.Annotations; using Squidex.Infrastructure.Reflection; -using Squidex.Modules.Api.Users.Models; +using Squidex.Controllers.Api.Users.Models; using Squidex.Pipeline; using Squidex.Read.Users.Repositories; -namespace Squidex.Modules.Api.Users +namespace Squidex.Controllers.Api.Users { /// /// Readonly API to retrieve information about squidex users. diff --git a/src/Squidex/Modules/ControllerBase.cs b/src/Squidex/Controllers/ControllerBase.cs similarity index 97% rename from src/Squidex/Modules/ControllerBase.cs rename to src/Squidex/Controllers/ControllerBase.cs index a3b1b9df3..195b57150 100644 --- a/src/Squidex/Modules/ControllerBase.cs +++ b/src/Squidex/Controllers/ControllerBase.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc; using Squidex.Infrastructure.CQRS.Commands; using Squidex.Pipeline; -namespace Squidex.Modules +namespace Squidex.Controllers { public abstract class ControllerBase : Controller { diff --git a/src/Squidex/Modules/UI/Account/AccountController.cs b/src/Squidex/Controllers/UI/Account/AccountController.cs similarity index 99% rename from src/Squidex/Modules/UI/Account/AccountController.cs rename to src/Squidex/Controllers/UI/Account/AccountController.cs index ba1dd0491..d184cc506 100644 --- a/src/Squidex/Modules/UI/Account/AccountController.cs +++ b/src/Squidex/Controllers/UI/Account/AccountController.cs @@ -20,7 +20,7 @@ using Squidex.Infrastructure.Security; // ReSharper disable RedundantIfElseBlock // ReSharper disable ConvertIfStatementToReturnStatement -namespace Squidex.Modules.UI.Account +namespace Squidex.Controllers.UI.Account { [SwaggerIgnore] public sealed class AccountController : Controller diff --git a/src/Squidex/Modules/UI/Account/ExternalProvider.cs b/src/Squidex/Controllers/UI/Account/ExternalProvider.cs similarity index 94% rename from src/Squidex/Modules/UI/Account/ExternalProvider.cs rename to src/Squidex/Controllers/UI/Account/ExternalProvider.cs index 4f985894b..2bbd37922 100644 --- a/src/Squidex/Modules/UI/Account/ExternalProvider.cs +++ b/src/Squidex/Controllers/UI/Account/ExternalProvider.cs @@ -5,7 +5,7 @@ // Copyright (c) Squidex Group // All rights reserved. // ========================================================================== -namespace Squidex.Modules.UI.Account +namespace Squidex.Controllers.UI.Account { public class ExternalProvider { diff --git a/src/Squidex/Modules/UI/Account/LoginVM.cs b/src/Squidex/Controllers/UI/Account/LoginVM.cs similarity index 92% rename from src/Squidex/Modules/UI/Account/LoginVM.cs rename to src/Squidex/Controllers/UI/Account/LoginVM.cs index 21f443cc2..cd08db172 100644 --- a/src/Squidex/Modules/UI/Account/LoginVM.cs +++ b/src/Squidex/Controllers/UI/Account/LoginVM.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; -namespace Squidex.Modules.UI.Account +namespace Squidex.Controllers.UI.Account { public class LoginVM { diff --git a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs index 6fb9e96c9..d96fc54d3 100644 --- a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs +++ b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs @@ -12,7 +12,7 @@ using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Squidex.Infrastructure; -using Squidex.Modules.Api; +using Squidex.Controllers.Api; // ReSharper disable InvertIf diff --git a/src/Squidex/Startup.cs b/src/Squidex/Startup.cs index 428f2639c..9889a2cea 100644 --- a/src/Squidex/Startup.cs +++ b/src/Squidex/Startup.cs @@ -18,12 +18,12 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Headers; -using Squidex.Configurations; -using Squidex.Configurations.Domain; -using Squidex.Configurations.EventStore; -using Squidex.Configurations.Identity; -using Squidex.Configurations.Swagger; -using Squidex.Configurations.Web; +using Squidex.Config; +using Squidex.Config.Domain; +using Squidex.Config.EventStore; +using Squidex.Config.Identity; +using Squidex.Config.Swagger; +using Squidex.Config.Web; using Squidex.Pipeline; using Squidex.Store.MongoDb; diff --git a/src/Squidex/Views/Account/Login.cshtml b/src/Squidex/Views/Account/Login.cshtml index c25327cde..464f828f2 100644 --- a/src/Squidex/Views/Account/Login.cshtml +++ b/src/Squidex/Views/Account/Login.cshtml @@ -1,7 +1,7 @@ @using System.Collections.Generic @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http.Authentication -@model Squidex.Modules.UI.Account.LoginVM +@model Squidex.Controllers.UI.Account.LoginVM