From 8c3f269a52978510cc52d46f5e028486f186a861 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 18 Nov 2017 23:26:24 +0100 Subject: [PATCH] Files moved --- src/Squidex/AppServices.cs | 2 +- .../Api}/Config/Swagger/ScopesProcessor.cs | 3 ++- .../Api}/Config/Swagger/SwaggerExtensions.cs | 2 +- .../Api}/Config/Swagger/SwaggerServices.cs | 3 ++- .../Swagger/XmlResponseTypesProcessor.cs | 2 +- .../Api}/Config/Swagger/XmlTagProcessor.cs | 2 +- .../Api/{ => Controllers}/ApiController.cs | 0 .../Apps/AppClientsController.cs | 0 .../Apps/AppContributorsController.cs | 0 .../Apps/AppLanguagesController.cs | 0 .../{ => Controllers}/Apps/AppsController.cs | 0 .../Apps/Models/AddAppLanguageDto.cs | 0 .../Apps/Models/AppCreatedDto.cs | 0 .../{ => Controllers}/Apps/Models/AppDto.cs | 0 .../Apps/Models/AppLanguageDto.cs | 0 .../Apps/Models/AssignAppContributorDto.cs | 0 .../Apps/Models/ClientDto.cs | 0 .../Apps/Models/ContributorDto.cs | 0 .../Apps/Models/ContributorsDto.cs | 0 .../Apps/Models/CreateAppClientDto.cs | 0 .../Apps/Models/CreateAppDto.cs | 0 .../Apps/Models/UpdateAppClientDto.cs | 0 .../Apps/Models/UpdateAppLanguageDto.cs | 0 .../{ => Controllers}/Assets/AssetConfig.cs | 0 .../Assets/AssetContentController.cs | 0 .../Assets/AssetsController.cs | 0 .../Assets/Models/AssetCreatedDto.cs | 0 .../Assets/Models/AssetDto.cs | 0 .../Assets/Models/AssetReplacedDto.cs | 0 .../Assets/Models/AssetUpdateDto.cs | 0 .../Assets/Models/AssetsDto.cs | 0 .../Content/ContentSwaggerController.cs | 0 .../Content/ContentsController.cs | 0 .../Generator/SchemaSwaggerGenerator.cs | 0 .../Generator/SchemasSwaggerGenerator.cs | 0 .../Content/Models/AssetsDto.cs | 0 .../Content/Models/ContentDto.cs | 0 .../{ => Controllers}/Docs/DocsController.cs | 0 .../Areas/Api/{ => Controllers}/DocsVM.cs | 0 .../EventConsumersController.cs | 0 .../EventConsumers/Models/EventConsumerDto.cs | 0 .../History/HistoryController.cs | 0 .../History/Models/HistoryEventDto.cs | 0 .../JsonInheritanceConverter.cs | 0 .../Api/{ => Controllers}/LanguageDto.cs | 0 .../Languages/LanguagesController.cs | 0 .../{ => Controllers}/Ping/PingController.cs | 0 .../Plans/AppPlansController.cs | 0 .../Plans/Models/AppPlansDto.cs | 0 .../Plans/Models/ChangePlanDto.cs | 0 .../Plans/Models/PlanChangedDto.cs | 0 .../{ => Controllers}/Plans/Models/PlanDto.cs | 0 .../Rules/Models/Actions/WebhookActionDto.cs | 0 .../Models/Converters/RuleActionDtoFactory.cs | 0 .../Rules/Models/Converters/RuleConverter.cs | 0 .../Converters/RuleTriggerDtoFactory.cs | 0 .../Rules/Models/CreateRuleDto.cs | 0 .../Rules/Models/RuleActionDto.cs | 0 .../{ => Controllers}/Rules/Models/RuleDto.cs | 0 .../Rules/Models/RuleEventDto.cs | 0 .../Rules/Models/RuleEventsDto.cs | 0 .../Rules/Models/RuleTriggerDto.cs | 0 .../Triggers/ContentChangedTriggerDto.cs | 0 .../ContentChangedTriggerSchemaDto.cs | 0 .../Rules/Models/UpdateRuleDto.cs | 0 .../Rules/RulesController.cs | 0 .../Schemas/Models/AddFieldDto.cs | 0 .../Schemas/Models/ConfigureScriptsDto.cs | 0 .../Converters/FieldPropertiesDtoFactory.cs | 0 .../Models/Converters/SchemaConverter.cs | 0 .../Schemas/Models/CreateSchemaDto.cs | 0 .../Schemas/Models/CreateSchemaFieldDto.cs | 0 .../Schemas/Models/FieldDto.cs | 0 .../Schemas/Models/FieldPropertiesDto.cs | 0 .../Models/Fields/AssetsFieldPropertiesDto.cs | 0 .../Fields/BooleanFieldPropertiesDto.cs | 0 .../Fields/DateTimeFieldPropertiesDto.cs | 0 .../Fields/GeolocationFieldPropertiesDto.cs | 0 .../Models/Fields/JsonFieldPropertiesDto.cs | 0 .../Models/Fields/NumberFieldPropertiesDto.cs | 0 .../Fields/ReferencesFieldPropertiesDto.cs | 0 .../Models/Fields/StringFieldPropertiesDto.cs | 0 .../Models/Fields/TagsFieldPropertiesDto.cs | 0 .../Schemas/Models/ReorderFieldsDto.cs | 0 .../Schemas/Models/SchemaDetailsDto.cs | 0 .../Schemas/Models/SchemaDto.cs | 0 .../Schemas/Models/SchemaPropertiesDto.cs | 0 .../Schemas/Models/UpdateFieldDto.cs | 0 .../Schemas/Models/UpdateSchemaDto.cs | 0 .../Schemas/SchemaFieldsController.cs | 0 .../Schemas/SchemasController.cs | 0 .../Statistics/Models/CallsUsageDto.cs | 0 .../Statistics/Models/CurrentCallsDto.cs | 0 .../Statistics/Models/CurrentStorageDto.cs | 0 .../Statistics/Models/StorageUsageDto.cs | 0 .../Statistics/UsagesController.cs | 0 .../UI/Models/UIRegexSuggestionDto.cs | 0 .../UI/Models/UISettingsDto.cs | 0 .../Api/{ => Controllers}/UI/UIController.cs | 4 ++-- .../{ => Controllers}/Users/Assets/Avatar.png | Bin .../Users/Models/CreateUserDto.cs | 0 .../Users/Models/UpdateUserDto.cs | 0 .../Users/Models/UserCreatedDto.cs | 0 .../{ => Controllers}/Users/Models/UserDto.cs | 0 .../Users/Models/UsersDto.cs | 0 .../Users/UserManagementController.cs | 2 +- .../Users/UsersController.cs | 2 +- .../Api/Startup.cs} | 20 ++++++++++-------- .../Config/IdentityServerServices.cs | 1 - .../Controllers/Account/AccountController.cs | 1 - .../IdentityServer/Controllers/Extensions.cs | 1 - src/Squidex/Areas/OrleansDashboard/Startup.cs | 3 ++- src/Squidex/Areas/Portal/Startup.cs | 5 ++--- src/Squidex/Config/{Web => }/Constants.cs | 6 ++++-- src/Squidex/Config/Web/WebExtensions.cs | 8 +++++++ .../Pipeline/ApiExceptionFilterAttribute.cs | 1 - src/Squidex/Pipeline/Swagger/SwaggerHelper.cs | 1 - src/Squidex/Squidex.csproj | 6 +----- src/Squidex/WebStartup.cs | 19 ++--------------- .../Rules/RuleDomainObjectTests.cs | 1 - .../Schemas/Guards/GuardSchemaFieldTests.cs | 1 - 121 files changed, 42 insertions(+), 54 deletions(-) rename src/Squidex/{ => Areas/Api}/Config/Swagger/ScopesProcessor.cs (96%) rename src/Squidex/{ => Areas/Api}/Config/Swagger/SwaggerExtensions.cs (94%) rename src/Squidex/{ => Areas/Api}/Config/Swagger/SwaggerServices.cs (98%) rename src/Squidex/{ => Areas/Api}/Config/Swagger/XmlResponseTypesProcessor.cs (98%) rename src/Squidex/{ => Areas/Api}/Config/Swagger/XmlTagProcessor.cs (98%) rename src/Squidex/Areas/Api/{ => Controllers}/ApiController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/AppClientsController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/AppContributorsController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/AppLanguagesController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/AppsController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/AddAppLanguageDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/AppCreatedDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/AppDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/AppLanguageDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/AssignAppContributorDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/ClientDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/ContributorDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/ContributorsDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/CreateAppClientDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/CreateAppDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/UpdateAppClientDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Apps/Models/UpdateAppLanguageDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Assets/AssetConfig.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Assets/AssetContentController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Assets/AssetsController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Assets/Models/AssetCreatedDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Assets/Models/AssetDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Assets/Models/AssetReplacedDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Assets/Models/AssetUpdateDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Assets/Models/AssetsDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Content/ContentSwaggerController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Content/ContentsController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Content/Generator/SchemaSwaggerGenerator.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Content/Generator/SchemasSwaggerGenerator.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Content/Models/AssetsDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Content/Models/ContentDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Docs/DocsController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/DocsVM.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/EventConsumers/EventConsumersController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/EventConsumers/Models/EventConsumerDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/History/HistoryController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/History/Models/HistoryEventDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/JsonInheritanceConverter.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/LanguageDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Languages/LanguagesController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Ping/PingController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Plans/AppPlansController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Plans/Models/AppPlansDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Plans/Models/ChangePlanDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Plans/Models/PlanChangedDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Plans/Models/PlanDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/Actions/WebhookActionDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/Converters/RuleActionDtoFactory.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/Converters/RuleConverter.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/Converters/RuleTriggerDtoFactory.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/CreateRuleDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/RuleActionDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/RuleDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/RuleEventDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/RuleEventsDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/RuleTriggerDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/Triggers/ContentChangedTriggerDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/Triggers/ContentChangedTriggerSchemaDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/Models/UpdateRuleDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Rules/RulesController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/AddFieldDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/ConfigureScriptsDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Converters/SchemaConverter.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/CreateSchemaDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/CreateSchemaFieldDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/FieldDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/FieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Fields/BooleanFieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Fields/DateTimeFieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Fields/GeolocationFieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Fields/JsonFieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Fields/NumberFieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Fields/StringFieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/Fields/TagsFieldPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/ReorderFieldsDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/SchemaDetailsDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/SchemaDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/SchemaPropertiesDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/UpdateFieldDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/Models/UpdateSchemaDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/SchemaFieldsController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Schemas/SchemasController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Statistics/Models/CallsUsageDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Statistics/Models/CurrentCallsDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Statistics/Models/CurrentStorageDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Statistics/Models/StorageUsageDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Statistics/UsagesController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/UI/Models/UIRegexSuggestionDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/UI/Models/UISettingsDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/UI/UIController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Users/Assets/Avatar.png (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Users/Models/CreateUserDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Users/Models/UpdateUserDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Users/Models/UserCreatedDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Users/Models/UserDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Users/Models/UsersDto.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Users/UserManagementController.cs (100%) rename src/Squidex/Areas/Api/{ => Controllers}/Users/UsersController.cs (100%) rename src/Squidex/{Config/Web/WebpackExtensions.cs => Areas/Api/Startup.cs} (52%) rename src/Squidex/Config/{Web => }/Constants.cs (94%) diff --git a/src/Squidex/AppServices.cs b/src/Squidex/AppServices.cs index 52a582072..b005ceb21 100644 --- a/src/Squidex/AppServices.cs +++ b/src/Squidex/AppServices.cs @@ -8,11 +8,11 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Squidex.Areas.Api.Config.Swagger; using Squidex.Areas.IdentityServer.Config; using Squidex.Config; using Squidex.Config.Authentication; using Squidex.Config.Domain; -using Squidex.Config.Swagger; using Squidex.Config.Web; namespace Squidex diff --git a/src/Squidex/Config/Swagger/ScopesProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs similarity index 96% rename from src/Squidex/Config/Swagger/ScopesProcessor.cs rename to src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs index 57e9a3b2f..71c1f3a29 100644 --- a/src/Squidex/Config/Swagger/ScopesProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/ScopesProcessor.cs @@ -14,9 +14,10 @@ using Microsoft.AspNetCore.Authorization; using NSwag; using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; +using Squidex.Config; using Squidex.Infrastructure.Tasks; -namespace Squidex.Config.Swagger +namespace Squidex.Areas.Api.Config.Swagger { public class ScopesProcessor : IOperationProcessor { diff --git a/src/Squidex/Config/Swagger/SwaggerExtensions.cs b/src/Squidex/Areas/Api/Config/Swagger/SwaggerExtensions.cs similarity index 94% rename from src/Squidex/Config/Swagger/SwaggerExtensions.cs rename to src/Squidex/Areas/Api/Config/Swagger/SwaggerExtensions.cs index c15976c81..ce022db94 100644 --- a/src/Squidex/Config/Swagger/SwaggerExtensions.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/SwaggerExtensions.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using NSwag.AspNetCore; -namespace Squidex.Config.Swagger +namespace Squidex.Areas.Api.Config.Swagger { public static class SwaggerExtensions { diff --git a/src/Squidex/Config/Swagger/SwaggerServices.cs b/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs similarity index 98% rename from src/Squidex/Config/Swagger/SwaggerServices.cs rename to src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs index 5119fa2be..7adccca64 100644 --- a/src/Squidex/Config/Swagger/SwaggerServices.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/SwaggerServices.cs @@ -15,10 +15,11 @@ using NodaTime; using NSwag.AspNetCore; using NSwag.SwaggerGeneration.Processors.Security; using Squidex.Areas.Api.Controllers.Contents.Generator; +using Squidex.Config; using Squidex.Infrastructure; using Squidex.Pipeline.Swagger; -namespace Squidex.Config.Swagger +namespace Squidex.Areas.Api.Config.Swagger { public static class SwaggerServices { diff --git a/src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/XmlResponseTypesProcessor.cs similarity index 98% rename from src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs rename to src/Squidex/Areas/Api/Config/Swagger/XmlResponseTypesProcessor.cs index 6c239444f..c5c0f8dd3 100644 --- a/src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/XmlResponseTypesProcessor.cs @@ -17,7 +17,7 @@ using Squidex.Pipeline.Swagger; #pragma warning disable RECS0033 // Convert 'if' to '||' expression -namespace Squidex.Config.Swagger +namespace Squidex.Areas.Api.Config.Swagger { public sealed class XmlResponseTypesProcessor : IOperationProcessor { diff --git a/src/Squidex/Config/Swagger/XmlTagProcessor.cs b/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs similarity index 98% rename from src/Squidex/Config/Swagger/XmlTagProcessor.cs rename to src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs index 0e9b79f6e..93b24b7f2 100644 --- a/src/Squidex/Config/Swagger/XmlTagProcessor.cs +++ b/src/Squidex/Areas/Api/Config/Swagger/XmlTagProcessor.cs @@ -14,7 +14,7 @@ using NSwag.SwaggerGeneration.Processors; using NSwag.SwaggerGeneration.Processors.Contexts; using Squidex.Infrastructure.Tasks; -namespace Squidex.Config.Swagger +namespace Squidex.Areas.Api.Config.Swagger { public sealed class XmlTagProcessor : IOperationProcessor, IDocumentProcessor { diff --git a/src/Squidex/Areas/Api/ApiController.cs b/src/Squidex/Areas/Api/Controllers/ApiController.cs similarity index 100% rename from src/Squidex/Areas/Api/ApiController.cs rename to src/Squidex/Areas/Api/Controllers/ApiController.cs diff --git a/src/Squidex/Areas/Api/Apps/AppClientsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/AppClientsController.cs rename to src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs diff --git a/src/Squidex/Areas/Api/Apps/AppContributorsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/AppContributorsController.cs rename to src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs diff --git a/src/Squidex/Areas/Api/Apps/AppLanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/AppLanguagesController.cs rename to src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs diff --git a/src/Squidex/Areas/Api/Apps/AppsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/AppsController.cs rename to src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/AddAppLanguageDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/AddAppLanguageDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/AddAppLanguageDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/AddAppLanguageDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/AppCreatedDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/AppCreatedDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/AppCreatedDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/AppCreatedDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/AppDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/AppDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/AppLanguageDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/AppLanguageDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/AppLanguageDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/AppLanguageDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/AssignAppContributorDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/AssignAppContributorDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/AssignAppContributorDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/AssignAppContributorDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/ClientDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/ClientDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/ClientDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/ClientDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/ContributorDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/ContributorDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/ContributorDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/ContributorDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/ContributorsDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/ContributorsDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/ContributorsDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/ContributorsDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/CreateAppClientDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppClientDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/CreateAppClientDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppClientDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/CreateAppDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/CreateAppDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/UpdateAppClientDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateAppClientDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/UpdateAppClientDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateAppClientDto.cs diff --git a/src/Squidex/Areas/Api/Apps/Models/UpdateAppLanguageDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateAppLanguageDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Apps/Models/UpdateAppLanguageDto.cs rename to src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateAppLanguageDto.cs diff --git a/src/Squidex/Areas/Api/Assets/AssetConfig.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetConfig.cs similarity index 100% rename from src/Squidex/Areas/Api/Assets/AssetConfig.cs rename to src/Squidex/Areas/Api/Controllers/Assets/AssetConfig.cs diff --git a/src/Squidex/Areas/Api/Assets/AssetContentController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs similarity index 100% rename from src/Squidex/Areas/Api/Assets/AssetContentController.cs rename to src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs diff --git a/src/Squidex/Areas/Api/Assets/AssetsController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs similarity index 100% rename from src/Squidex/Areas/Api/Assets/AssetsController.cs rename to src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetCreatedDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetCreatedDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Assets/Models/AssetCreatedDto.cs rename to src/Squidex/Areas/Api/Controllers/Assets/Models/AssetCreatedDto.cs diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Assets/Models/AssetDto.cs rename to src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetReplacedDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetReplacedDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Assets/Models/AssetReplacedDto.cs rename to src/Squidex/Areas/Api/Controllers/Assets/Models/AssetReplacedDto.cs diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetUpdateDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetUpdateDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Assets/Models/AssetUpdateDto.cs rename to src/Squidex/Areas/Api/Controllers/Assets/Models/AssetUpdateDto.cs diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetsDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetsDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Assets/Models/AssetsDto.cs rename to src/Squidex/Areas/Api/Controllers/Assets/Models/AssetsDto.cs diff --git a/src/Squidex/Areas/Api/Content/ContentSwaggerController.cs b/src/Squidex/Areas/Api/Controllers/Content/ContentSwaggerController.cs similarity index 100% rename from src/Squidex/Areas/Api/Content/ContentSwaggerController.cs rename to src/Squidex/Areas/Api/Controllers/Content/ContentSwaggerController.cs diff --git a/src/Squidex/Areas/Api/Content/ContentsController.cs b/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs similarity index 100% rename from src/Squidex/Areas/Api/Content/ContentsController.cs rename to src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs diff --git a/src/Squidex/Areas/Api/Content/Generator/SchemaSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemaSwaggerGenerator.cs similarity index 100% rename from src/Squidex/Areas/Api/Content/Generator/SchemaSwaggerGenerator.cs rename to src/Squidex/Areas/Api/Controllers/Content/Generator/SchemaSwaggerGenerator.cs diff --git a/src/Squidex/Areas/Api/Content/Generator/SchemasSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemasSwaggerGenerator.cs similarity index 100% rename from src/Squidex/Areas/Api/Content/Generator/SchemasSwaggerGenerator.cs rename to src/Squidex/Areas/Api/Controllers/Content/Generator/SchemasSwaggerGenerator.cs diff --git a/src/Squidex/Areas/Api/Content/Models/AssetsDto.cs b/src/Squidex/Areas/Api/Controllers/Content/Models/AssetsDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Content/Models/AssetsDto.cs rename to src/Squidex/Areas/Api/Controllers/Content/Models/AssetsDto.cs diff --git a/src/Squidex/Areas/Api/Content/Models/ContentDto.cs b/src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Content/Models/ContentDto.cs rename to src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs diff --git a/src/Squidex/Areas/Api/Docs/DocsController.cs b/src/Squidex/Areas/Api/Controllers/Docs/DocsController.cs similarity index 100% rename from src/Squidex/Areas/Api/Docs/DocsController.cs rename to src/Squidex/Areas/Api/Controllers/Docs/DocsController.cs diff --git a/src/Squidex/Areas/Api/DocsVM.cs b/src/Squidex/Areas/Api/Controllers/DocsVM.cs similarity index 100% rename from src/Squidex/Areas/Api/DocsVM.cs rename to src/Squidex/Areas/Api/Controllers/DocsVM.cs diff --git a/src/Squidex/Areas/Api/EventConsumers/EventConsumersController.cs b/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs similarity index 100% rename from src/Squidex/Areas/Api/EventConsumers/EventConsumersController.cs rename to src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs diff --git a/src/Squidex/Areas/Api/EventConsumers/Models/EventConsumerDto.cs b/src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs similarity index 100% rename from src/Squidex/Areas/Api/EventConsumers/Models/EventConsumerDto.cs rename to src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs diff --git a/src/Squidex/Areas/Api/History/HistoryController.cs b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs similarity index 100% rename from src/Squidex/Areas/Api/History/HistoryController.cs rename to src/Squidex/Areas/Api/Controllers/History/HistoryController.cs diff --git a/src/Squidex/Areas/Api/History/Models/HistoryEventDto.cs b/src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs similarity index 100% rename from src/Squidex/Areas/Api/History/Models/HistoryEventDto.cs rename to src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs diff --git a/src/Squidex/Areas/Api/JsonInheritanceConverter.cs b/src/Squidex/Areas/Api/Controllers/JsonInheritanceConverter.cs similarity index 100% rename from src/Squidex/Areas/Api/JsonInheritanceConverter.cs rename to src/Squidex/Areas/Api/Controllers/JsonInheritanceConverter.cs diff --git a/src/Squidex/Areas/Api/LanguageDto.cs b/src/Squidex/Areas/Api/Controllers/LanguageDto.cs similarity index 100% rename from src/Squidex/Areas/Api/LanguageDto.cs rename to src/Squidex/Areas/Api/Controllers/LanguageDto.cs diff --git a/src/Squidex/Areas/Api/Languages/LanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs similarity index 100% rename from src/Squidex/Areas/Api/Languages/LanguagesController.cs rename to src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs diff --git a/src/Squidex/Areas/Api/Ping/PingController.cs b/src/Squidex/Areas/Api/Controllers/Ping/PingController.cs similarity index 100% rename from src/Squidex/Areas/Api/Ping/PingController.cs rename to src/Squidex/Areas/Api/Controllers/Ping/PingController.cs diff --git a/src/Squidex/Areas/Api/Plans/AppPlansController.cs b/src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs similarity index 100% rename from src/Squidex/Areas/Api/Plans/AppPlansController.cs rename to src/Squidex/Areas/Api/Controllers/Plans/AppPlansController.cs diff --git a/src/Squidex/Areas/Api/Plans/Models/AppPlansDto.cs b/src/Squidex/Areas/Api/Controllers/Plans/Models/AppPlansDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Plans/Models/AppPlansDto.cs rename to src/Squidex/Areas/Api/Controllers/Plans/Models/AppPlansDto.cs diff --git a/src/Squidex/Areas/Api/Plans/Models/ChangePlanDto.cs b/src/Squidex/Areas/Api/Controllers/Plans/Models/ChangePlanDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Plans/Models/ChangePlanDto.cs rename to src/Squidex/Areas/Api/Controllers/Plans/Models/ChangePlanDto.cs diff --git a/src/Squidex/Areas/Api/Plans/Models/PlanChangedDto.cs b/src/Squidex/Areas/Api/Controllers/Plans/Models/PlanChangedDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Plans/Models/PlanChangedDto.cs rename to src/Squidex/Areas/Api/Controllers/Plans/Models/PlanChangedDto.cs diff --git a/src/Squidex/Areas/Api/Plans/Models/PlanDto.cs b/src/Squidex/Areas/Api/Controllers/Plans/Models/PlanDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Plans/Models/PlanDto.cs rename to src/Squidex/Areas/Api/Controllers/Plans/Models/PlanDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/Actions/WebhookActionDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/Actions/WebhookActionDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/Actions/WebhookActionDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/Actions/WebhookActionDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/Converters/RuleActionDtoFactory.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleActionDtoFactory.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/Converters/RuleActionDtoFactory.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleActionDtoFactory.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/Converters/RuleConverter.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleConverter.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/Converters/RuleConverter.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleConverter.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/Converters/RuleTriggerDtoFactory.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleTriggerDtoFactory.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/Converters/RuleTriggerDtoFactory.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleTriggerDtoFactory.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/CreateRuleDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/CreateRuleDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/CreateRuleDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/CreateRuleDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleActionDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/RuleActionDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/RuleDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/RuleDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleEventDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/RuleEventDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleEventsDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventsDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/RuleEventsDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventsDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleTriggerDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/RuleTriggerDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/RuleTriggerDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/Triggers/ContentChangedTriggerDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/Triggers/ContentChangedTriggerDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerSchemaDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/Triggers/ContentChangedTriggerSchemaDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerSchemaDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/Triggers/ContentChangedTriggerSchemaDto.cs diff --git a/src/Squidex/Areas/Api/Rules/Models/UpdateRuleDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/UpdateRuleDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/Models/UpdateRuleDto.cs rename to src/Squidex/Areas/Api/Controllers/Rules/Models/UpdateRuleDto.cs diff --git a/src/Squidex/Areas/Api/Rules/RulesController.cs b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs similarity index 100% rename from src/Squidex/Areas/Api/Rules/RulesController.cs rename to src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/AddFieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/AddFieldDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/AddFieldDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/AddFieldDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/ConfigureScriptsDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/ConfigureScriptsDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/ConfigureScriptsDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/ConfigureScriptsDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Converters/SchemaConverter.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/SchemaConverter.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Converters/SchemaConverter.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/SchemaConverter.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/CreateSchemaDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaFieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaFieldDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/CreateSchemaFieldDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaFieldDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/FieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/FieldDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/FieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/FieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/BooleanFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/BooleanFieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Fields/BooleanFieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/BooleanFieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/DateTimeFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/DateTimeFieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Fields/DateTimeFieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/DateTimeFieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/GeolocationFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/GeolocationFieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Fields/GeolocationFieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/GeolocationFieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/JsonFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/JsonFieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Fields/JsonFieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/JsonFieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/NumberFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/NumberFieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Fields/NumberFieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/NumberFieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/StringFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/StringFieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Fields/StringFieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/StringFieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/TagsFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/TagsFieldPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/Fields/TagsFieldPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/TagsFieldPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/ReorderFieldsDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/ReorderFieldsDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/ReorderFieldsDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/ReorderFieldsDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/SchemaDetailsDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDetailsDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/SchemaDetailsDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDetailsDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/SchemaDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/SchemaDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/SchemaPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaPropertiesDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/SchemaPropertiesDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaPropertiesDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/UpdateFieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/UpdateFieldDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/UpdateFieldDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/UpdateFieldDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/Models/UpdateSchemaDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/UpdateSchemaDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/Models/UpdateSchemaDto.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/Models/UpdateSchemaDto.cs diff --git a/src/Squidex/Areas/Api/Schemas/SchemaFieldsController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/SchemaFieldsController.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs diff --git a/src/Squidex/Areas/Api/Schemas/SchemasController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs similarity index 100% rename from src/Squidex/Areas/Api/Schemas/SchemasController.cs rename to src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs diff --git a/src/Squidex/Areas/Api/Statistics/Models/CallsUsageDto.cs b/src/Squidex/Areas/Api/Controllers/Statistics/Models/CallsUsageDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Statistics/Models/CallsUsageDto.cs rename to src/Squidex/Areas/Api/Controllers/Statistics/Models/CallsUsageDto.cs diff --git a/src/Squidex/Areas/Api/Statistics/Models/CurrentCallsDto.cs b/src/Squidex/Areas/Api/Controllers/Statistics/Models/CurrentCallsDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Statistics/Models/CurrentCallsDto.cs rename to src/Squidex/Areas/Api/Controllers/Statistics/Models/CurrentCallsDto.cs diff --git a/src/Squidex/Areas/Api/Statistics/Models/CurrentStorageDto.cs b/src/Squidex/Areas/Api/Controllers/Statistics/Models/CurrentStorageDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Statistics/Models/CurrentStorageDto.cs rename to src/Squidex/Areas/Api/Controllers/Statistics/Models/CurrentStorageDto.cs diff --git a/src/Squidex/Areas/Api/Statistics/Models/StorageUsageDto.cs b/src/Squidex/Areas/Api/Controllers/Statistics/Models/StorageUsageDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Statistics/Models/StorageUsageDto.cs rename to src/Squidex/Areas/Api/Controllers/Statistics/Models/StorageUsageDto.cs diff --git a/src/Squidex/Areas/Api/Statistics/UsagesController.cs b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs similarity index 100% rename from src/Squidex/Areas/Api/Statistics/UsagesController.cs rename to src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs diff --git a/src/Squidex/Areas/Api/UI/Models/UIRegexSuggestionDto.cs b/src/Squidex/Areas/Api/Controllers/UI/Models/UIRegexSuggestionDto.cs similarity index 100% rename from src/Squidex/Areas/Api/UI/Models/UIRegexSuggestionDto.cs rename to src/Squidex/Areas/Api/Controllers/UI/Models/UIRegexSuggestionDto.cs diff --git a/src/Squidex/Areas/Api/UI/Models/UISettingsDto.cs b/src/Squidex/Areas/Api/Controllers/UI/Models/UISettingsDto.cs similarity index 100% rename from src/Squidex/Areas/Api/UI/Models/UISettingsDto.cs rename to src/Squidex/Areas/Api/Controllers/UI/Models/UISettingsDto.cs diff --git a/src/Squidex/Areas/Api/UI/UIController.cs b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs similarity index 100% rename from src/Squidex/Areas/Api/UI/UIController.cs rename to src/Squidex/Areas/Api/Controllers/UI/UIController.cs index e13cd0b64..ce0ce7018 100644 --- a/src/Squidex/Areas/Api/UI/UIController.cs +++ b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs @@ -11,10 +11,10 @@ using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using NSwag.Annotations; -using Squidex.Config; using Squidex.Areas.Api.Controllers.UI.Models; -using Squidex.Pipeline; +using Squidex.Config; using Squidex.Infrastructure.CQRS.Commands; +using Squidex.Pipeline; namespace Squidex.Areas.Api.Controllers.UI { diff --git a/src/Squidex/Areas/Api/Users/Assets/Avatar.png b/src/Squidex/Areas/Api/Controllers/Users/Assets/Avatar.png similarity index 100% rename from src/Squidex/Areas/Api/Users/Assets/Avatar.png rename to src/Squidex/Areas/Api/Controllers/Users/Assets/Avatar.png diff --git a/src/Squidex/Areas/Api/Users/Models/CreateUserDto.cs b/src/Squidex/Areas/Api/Controllers/Users/Models/CreateUserDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Users/Models/CreateUserDto.cs rename to src/Squidex/Areas/Api/Controllers/Users/Models/CreateUserDto.cs diff --git a/src/Squidex/Areas/Api/Users/Models/UpdateUserDto.cs b/src/Squidex/Areas/Api/Controllers/Users/Models/UpdateUserDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Users/Models/UpdateUserDto.cs rename to src/Squidex/Areas/Api/Controllers/Users/Models/UpdateUserDto.cs diff --git a/src/Squidex/Areas/Api/Users/Models/UserCreatedDto.cs b/src/Squidex/Areas/Api/Controllers/Users/Models/UserCreatedDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Users/Models/UserCreatedDto.cs rename to src/Squidex/Areas/Api/Controllers/Users/Models/UserCreatedDto.cs diff --git a/src/Squidex/Areas/Api/Users/Models/UserDto.cs b/src/Squidex/Areas/Api/Controllers/Users/Models/UserDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Users/Models/UserDto.cs rename to src/Squidex/Areas/Api/Controllers/Users/Models/UserDto.cs diff --git a/src/Squidex/Areas/Api/Users/Models/UsersDto.cs b/src/Squidex/Areas/Api/Controllers/Users/Models/UsersDto.cs similarity index 100% rename from src/Squidex/Areas/Api/Users/Models/UsersDto.cs rename to src/Squidex/Areas/Api/Controllers/Users/Models/UsersDto.cs diff --git a/src/Squidex/Areas/Api/Users/UserManagementController.cs b/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs similarity index 100% rename from src/Squidex/Areas/Api/Users/UserManagementController.cs rename to src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs index d28bdcf25..5593b3b2e 100644 --- a/src/Squidex/Areas/Api/Users/UserManagementController.cs +++ b/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs @@ -15,11 +15,11 @@ using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Users.Models; using Squidex.Domain.Users; using Squidex.Infrastructure; +using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Security; using Squidex.Pipeline; using Squidex.Shared.Users; -using Squidex.Infrastructure.CQRS.Commands; namespace Squidex.Areas.Api.Controllers.Users { diff --git a/src/Squidex/Areas/Api/Users/UsersController.cs b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs similarity index 100% rename from src/Squidex/Areas/Api/Users/UsersController.cs rename to src/Squidex/Areas/Api/Controllers/Users/UsersController.cs index 02b8c3814..9b8582e81 100644 --- a/src/Squidex/Areas/Api/Users/UsersController.cs +++ b/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs @@ -16,10 +16,10 @@ using Microsoft.AspNetCore.Mvc; using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Users.Models; using Squidex.Domain.Users; +using Squidex.Infrastructure.CQRS.Commands; using Squidex.Infrastructure.Reflection; using Squidex.Pipeline; using Squidex.Shared.Users; -using Squidex.Infrastructure.CQRS.Commands; namespace Squidex.Areas.Api.Controllers.Users { diff --git a/src/Squidex/Config/Web/WebpackExtensions.cs b/src/Squidex/Areas/Api/Startup.cs similarity index 52% rename from src/Squidex/Config/Web/WebpackExtensions.cs rename to src/Squidex/Areas/Api/Startup.cs index 7474d8f50..70f83f883 100644 --- a/src/Squidex/Config/Web/WebpackExtensions.cs +++ b/src/Squidex/Areas/Api/Startup.cs @@ -1,5 +1,5 @@ // ========================================================================== -// WebpackExtensions.cs +// Startup.cs // Squidex Headless CMS // ========================================================================== // Copyright (c) Squidex Group @@ -7,18 +7,20 @@ // ========================================================================== using Microsoft.AspNetCore.Builder; -using Squidex.Pipeline; +using Squidex.Areas.Api.Config.Swagger; +using Squidex.Config; -namespace Squidex.Config.Web +namespace Squidex.Areas.Api { - public static class WebpackExtensions + public static class Startup { - public static IApplicationBuilder UseMyTracking(this IApplicationBuilder app) + public static void ConfigureApi(this IApplicationBuilder app) { - app.UseMiddleware(); - app.UseMiddleware(); - - return app; + app.Map(Constants.ApiPrefix, appApi => + { + appApi.UseMySwagger(); + appApi.UseMvc(); + }); } } } diff --git a/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs b/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs index da8d7386c..3119727a9 100644 --- a/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs +++ b/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs @@ -15,7 +15,6 @@ using IdentityServer4.Stores; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection.Repositories; using Microsoft.AspNetCore.Identity; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Config; using Squidex.Domain.Users; diff --git a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs index 5827e960e..9cd2ff034 100644 --- a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs +++ b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs @@ -19,7 +19,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using NSwag.Annotations; using Squidex.Config; -using Squidex.Config.Authentication; using Squidex.Domain.Users; using Squidex.Infrastructure; using Squidex.Infrastructure.Log; diff --git a/src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs b/src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs index eb77494b2..09528a0b2 100644 --- a/src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs +++ b/src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs @@ -9,7 +9,6 @@ using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; -using Squidex.Domain.Users; using Squidex.Shared.Users; namespace Squidex.Areas.IdentityServer.Controllers diff --git a/src/Squidex/Areas/OrleansDashboard/Startup.cs b/src/Squidex/Areas/OrleansDashboard/Startup.cs index 381117424..788c90337 100644 --- a/src/Squidex/Areas/OrleansDashboard/Startup.cs +++ b/src/Squidex/Areas/OrleansDashboard/Startup.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Builder; using Orleans; using Squidex.Areas.OrleansDashboard.Middlewares; +using Squidex.Config; namespace Squidex.Areas.OrleansDashboard { @@ -16,7 +17,7 @@ namespace Squidex.Areas.OrleansDashboard { public static void ConfigureOrleansDashboard(this IApplicationBuilder app) { - app.Map("/orleans", orleansApp => + app.Map(Constants.OrleansPrefix, orleansApp => { orleansApp.UseAuthentication(); orleansApp.UseMiddleware(); diff --git a/src/Squidex/Areas/Portal/Startup.cs b/src/Squidex/Areas/Portal/Startup.cs index 17c2bcf6f..f7ccf7a48 100644 --- a/src/Squidex/Areas/Portal/Startup.cs +++ b/src/Squidex/Areas/Portal/Startup.cs @@ -7,9 +7,8 @@ // ========================================================================== using Microsoft.AspNetCore.Builder; -using Orleans; -using Squidex.Areas.OrleansDashboard.Middlewares; using Squidex.Areas.Portal.Middlewares; +using Squidex.Config; namespace Squidex.Areas.Portal { @@ -17,7 +16,7 @@ namespace Squidex.Areas.Portal { public static void ConfigurePortal(this IApplicationBuilder app) { - app.Map("/portal", orleansApp => + app.Map(Constants.PortalPrefix, orleansApp => { orleansApp.UseAuthentication(); orleansApp.UseMiddleware(); diff --git a/src/Squidex/Config/Web/Constants.cs b/src/Squidex/Config/Constants.cs similarity index 94% rename from src/Squidex/Config/Web/Constants.cs rename to src/Squidex/Config/Constants.cs index 80b4b505b..c2d018a74 100644 --- a/src/Squidex/Config/Web/Constants.cs +++ b/src/Squidex/Config/Constants.cs @@ -18,6 +18,10 @@ namespace Squidex.Config public static readonly string ApiScope = "squidex-api"; + public static readonly string PortalPrefix = "/prefix"; + + public static readonly string OrleansPrefix = "/orleans"; + public static readonly string RoleScope = "role"; public static readonly string ProfileScope = "squidex-profile"; @@ -29,7 +33,5 @@ namespace Squidex.Config public static readonly string InternalClientSecret = "squidex-internal".Sha256(); public static readonly string IdentityPrefix = "/identity-server"; - - public static readonly string OrleansPrefix = "/orleans"; } } diff --git a/src/Squidex/Config/Web/WebExtensions.cs b/src/Squidex/Config/Web/WebExtensions.cs index ac1657f94..70efe9aa1 100644 --- a/src/Squidex/Config/Web/WebExtensions.cs +++ b/src/Squidex/Config/Web/WebExtensions.cs @@ -14,6 +14,14 @@ namespace Squidex.Config.Web { public static class WebExtensions { + public static IApplicationBuilder UseMyTracking(this IApplicationBuilder app) + { + app.UseMiddleware(); + app.UseMiddleware(); + + return app; + } + public static void UseMyCors(this IApplicationBuilder app) { app.UseCors(builder => builder diff --git a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs index f28c06fa9..4e319b14b 100644 --- a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs +++ b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs @@ -11,7 +11,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Squidex.Areas.Api.Controllers; using Squidex.Infrastructure; namespace Squidex.Pipeline diff --git a/src/Squidex/Pipeline/Swagger/SwaggerHelper.cs b/src/Squidex/Pipeline/Swagger/SwaggerHelper.cs index 3d49bd437..56cdc5d68 100644 --- a/src/Squidex/Pipeline/Swagger/SwaggerHelper.cs +++ b/src/Squidex/Pipeline/Swagger/SwaggerHelper.cs @@ -17,7 +17,6 @@ using NJsonSchema; using NJsonSchema.Generation; using NSwag; using Squidex.Config; -using Squidex.Areas.Api.Controllers; using Squidex.Shared.Identity; namespace Squidex.Pipeline.Swagger diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index ff84675ef..a1e653f3b 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -13,7 +13,7 @@ - + @@ -82,10 +82,6 @@ - - - - <_DocumentationFile Include="$(DocumentationFile)" /> diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index fed638a66..7d90480e5 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -7,24 +7,19 @@ // ========================================================================== using System; -using System.Linq; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Squidex.Areas.Api; using Squidex.Areas.Frontend; using Squidex.Areas.IdentityServer; using Squidex.Areas.OrleansDashboard; using Squidex.Areas.Portal; -using Squidex.Config; using Squidex.Config.Domain; using Squidex.Config.Orleans; -using Squidex.Config.Swagger; using Squidex.Config.Web; -#pragma warning disable RECS0002 // Convert anonymous method to method group - namespace Squidex { public class WebStartup : IStartup @@ -53,22 +48,12 @@ namespace Squidex app.UseMyForwardingRules(); app.UseMyTracking(); - MapAndUseApi(app); - + app.ConfigureApi(); app.ConfigureOrleansDashboard(); app.ConfigurePortal(); app.ConfigureIdentityServer(); app.ConfigureFrontend(); } - - private void MapAndUseApi(IApplicationBuilder app) - { - app.Map(Constants.ApiPrefix, appApi => - { - appApi.UseMySwagger(); - appApi.UseMvc(); - }); - } } } diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Rules/RuleDomainObjectTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Rules/RuleDomainObjectTests.cs index dc2cce7f5..bcf2147a7 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Rules/RuleDomainObjectTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Rules/RuleDomainObjectTests.cs @@ -7,7 +7,6 @@ // ========================================================================== using System; -using System.Collections.Generic; using System.Collections.Immutable; using Squidex.Domain.Apps.Core.Rules; using Squidex.Domain.Apps.Core.Rules.Actions; diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaFieldTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaFieldTests.cs index b88c83903..19162a358 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaFieldTests.cs @@ -9,7 +9,6 @@ using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Write.Schemas.Commands; -using Squidex.Domain.Apps.Write.Schemas.Guards; using Squidex.Infrastructure; using Xunit;