Browse Source

Namespaces fixed

pull/1/head
Sebastian 10 years ago
parent
commit
09074ba812
  1. 3
      src/Squidex/Config/Constants.cs
  2. 2
      src/Squidex/Config/Domain/InfrastructureModule.cs
  3. 2
      src/Squidex/Config/Domain/ReadModule.cs
  4. 2
      src/Squidex/Config/Domain/Serializers.cs
  5. 2
      src/Squidex/Config/Domain/WriteModule.cs
  6. 2
      src/Squidex/Config/EventStore/EventStoreModule.cs
  7. 2
      src/Squidex/Config/EventStore/EventStoreUsage.cs
  8. 2
      src/Squidex/Config/EventStore/MyEventStoreOptions.cs
  9. 0
      src/Squidex/Config/Identity/Cert/IdentityCert.snk
  10. 4
      src/Squidex/Config/Identity/IdentityServices.cs
  11. 2
      src/Squidex/Config/Identity/IdentityUsage.cs
  12. 2
      src/Squidex/Config/Identity/LazyClientStore.cs
  13. 2
      src/Squidex/Config/Identity/MyIdentityOptions.cs
  14. 4
      src/Squidex/Config/Identity/SwaggerIdentityUsage.cs
  15. 2
      src/Squidex/Config/MyUrlsOptions.cs
  16. 19
      src/Squidex/Config/Swagger/SwaggerUsage.cs
  17. 4
      src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs
  18. 2
      src/Squidex/Config/Swagger/XmlTagProcessor.cs
  19. 4
      src/Squidex/Config/Web/WebDependencies.cs
  20. 2
      src/Squidex/Config/Web/WebModule.cs
  21. 2
      src/Squidex/Config/Web/WebpackServices.cs
  22. 2
      src/Squidex/Config/Web/WebpackUsage.cs
  23. BIN
      src/Squidex/Configurations/Identity/Cert/IdentityCert.pfx
  24. 8
      src/Squidex/Controllers/Api/Apps/AppClientsController.cs
  25. 4
      src/Squidex/Controllers/Api/Apps/AppContributorsController.cs
  26. 6
      src/Squidex/Controllers/Api/Apps/AppController.cs
  27. 4
      src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs
  28. 2
      src/Squidex/Controllers/Api/Apps/Models/AppDto.cs
  29. 2
      src/Squidex/Controllers/Api/Apps/Models/AssignContributorDto.cs
  30. 2
      src/Squidex/Controllers/Api/Apps/Models/AttachClientDto.cs
  31. 2
      src/Squidex/Controllers/Api/Apps/Models/ClientDto.cs
  32. 2
      src/Squidex/Controllers/Api/Apps/Models/ConfigureLanguagesDto.cs
  33. 2
      src/Squidex/Controllers/Api/Apps/Models/ContributorDto.cs
  34. 2
      src/Squidex/Controllers/Api/Apps/Models/CreateAppDto.cs
  35. 2
      src/Squidex/Controllers/Api/Docs/DocsController.cs
  36. 2
      src/Squidex/Controllers/Api/EntityCreatedDto.cs
  37. 2
      src/Squidex/Controllers/Api/ErrorDto.cs
  38. 2
      src/Squidex/Controllers/Api/LanguageDto.cs
  39. 2
      src/Squidex/Controllers/Api/Languages/LanguagesController.cs
  40. 2
      src/Squidex/Controllers/Api/Schemas/Models/CreateSchemaDto.cs
  41. 4
      src/Squidex/Controllers/Api/Schemas/Models/FieldDto.cs
  42. 2
      src/Squidex/Controllers/Api/Schemas/Models/Fields/NumberField.cs
  43. 2
      src/Squidex/Controllers/Api/Schemas/Models/Fields/StringField.cs
  44. 2
      src/Squidex/Controllers/Api/Schemas/Models/SchemaDetailsDto.cs
  45. 2
      src/Squidex/Controllers/Api/Schemas/Models/SchemaDto.cs
  46. 2
      src/Squidex/Controllers/Api/Schemas/Models/UpdateSchemaDto.cs
  47. 4
      src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs
  48. 4
      src/Squidex/Controllers/Api/Schemas/SchemasController.cs
  49. 2
      src/Squidex/Controllers/Api/Users/Models/UserDto.cs
  50. 4
      src/Squidex/Controllers/Api/Users/UsersController.cs
  51. 2
      src/Squidex/Controllers/ControllerBase.cs
  52. 2
      src/Squidex/Controllers/UI/Account/AccountController.cs
  53. 2
      src/Squidex/Controllers/UI/Account/ExternalProvider.cs
  54. 2
      src/Squidex/Controllers/UI/Account/LoginVM.cs
  55. 2
      src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
  56. 12
      src/Squidex/Startup.cs
  57. 2
      src/Squidex/Views/Account/Login.cshtml

3
src/Squidex/Configurations/Constants.cs → 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
{

2
src/Squidex/Configurations/Domain/InfrastructureModule.cs → 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
{

2
src/Squidex/Configurations/Domain/ReadModule.cs → 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
{

2
src/Squidex/Configurations/Domain/Serializers.cs → 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
{

2
src/Squidex/Configurations/Domain/WriteModule.cs → 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
{

2
src/Squidex/Configurations/EventStore/EventStoreModule.cs → 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
{

2
src/Squidex/Configurations/EventStore/EventStoreUsage.cs → 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
{

2
src/Squidex/Configurations/EventStore/MyEventStoreOptions.cs → 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
{

0
src/Squidex/Configurations/Identity/Cert/IdentityCert.snk → src/Squidex/Config/Identity/Cert/IdentityCert.snk

4
src/Squidex/Configurations/Identity/IdentityServices.cs → 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];

2
src/Squidex/Configurations/Identity/IdentityUsage.cs → 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
{

2
src/Squidex/Configurations/Identity/LazyClientStore.cs → 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
{

2
src/Squidex/Configurations/Identity/MyIdentityOptions.cs → 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
{

4
src/Squidex/Configurations/Identity/SwaggerIdentityUsage.cs → 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)
{

2
src/Squidex/Configurations/MyUrlsOptions.cs → src/Squidex/Config/MyUrlsOptions.cs

@ -8,7 +8,7 @@
using System;
namespace Squidex.Configurations
namespace Squidex.Config
{
public sealed class MyUrlsOptions
{

19
src/Squidex/Configurations/Swagger/SwaggerUsage.cs → 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<IOptions<MyUrlsOptions>>().Value;

4
src/Squidex/Configurations/Swagger/XmlResponseTypesProcessor.cs → 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
{

2
src/Squidex/Configurations/Swagger/XmlTagProcessor.cs → 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
{

4
src/Squidex/Configurations/Web/WebDependencies.cs → 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
{

2
src/Squidex/Configurations/Web/WebModule.cs → 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
{

2
src/Squidex/Configurations/Web/WebpackServices.cs → 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
{

2
src/Squidex/Configurations/Web/WebpackUsage.cs → 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
{

BIN
src/Squidex/Configurations/Identity/Cert/IdentityCert.pfx

Binary file not shown.

8
src/Squidex/Modules/Api/Apps/AppClientsController.cs → 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
{
/// <summary>
/// Manages and configures apps.
@ -76,8 +76,8 @@ namespace Squidex.Modules.Api.Apps
/// 404 => App not found.
/// </returns>
/// <remarks>
/// 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.
/// </remarks>
[HttpPost]
[Route("apps/{app}/clients/")]

4
src/Squidex/Modules/Api/Apps/AppContributorsController.cs → 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
{
/// <summary>
/// Manages and configures apps.

6
src/Squidex/Modules/Api/Apps/AppController.cs → 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
{
/// <summary>
/// Manages and configures apps.
@ -78,7 +78,7 @@ namespace Squidex.Modules.Api.Apps
/// 409 => App name is already in use.
/// </returns>
/// <remarks>
/// 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.
/// </remarks>
[HttpPost]

4
src/Squidex/Modules/Api/Apps/AppLanguagesController.cs → 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
{
/// <summary>
/// Manages and configures apps.

2
src/Squidex/Modules/Api/Apps/Models/AppDto.cs → 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
{

2
src/Squidex/Modules/Api/Apps/Models/AssignContributorDto.cs → 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
{

2
src/Squidex/Modules/Api/Apps/Models/AttachClientDto.cs → 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
{

2
src/Squidex/Modules/Api/Apps/Models/ClientDto.cs → 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
{

2
src/Squidex/Modules/Api/Apps/Models/ConfigureLanguagesDto.cs → 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
{

2
src/Squidex/Modules/Api/Apps/Models/ContributorDto.cs → 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
{

2
src/Squidex/Modules/Api/Apps/Models/CreateAppDto.cs → 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
{

2
src/Squidex/Modules/Api/Docs/DocsController.cs → 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

2
src/Squidex/Modules/Api/EntityCreatedDto.cs → 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
{

2
src/Squidex/Modules/Api/ErrorDto.cs → 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
{

2
src/Squidex/Modules/Api/LanguageDto.cs → src/Squidex/Controllers/Api/LanguageDto.cs

@ -6,7 +6,7 @@
// All rights reserved.
// ==========================================================================
namespace Squidex.Modules.Api
namespace Squidex.Controllers.Api
{
public class LanguageDto
{

2
src/Squidex/Modules/Api/Languages/LanguagesController.cs → 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
{
/// <summary>
/// Readonly API to the supported langauges.

2
src/Squidex/Modules/Api/Schemas/Models/CreateSchemaDto.cs → 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
{

4
src/Squidex/Modules/Api/Schemas/Models/FieldDto.cs → 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))]

2
src/Squidex/Modules/Api/Schemas/Models/Fields/NumberField.cs → 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
{

2
src/Squidex/Modules/Api/Schemas/Models/Fields/StringField.cs → 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
{

2
src/Squidex/Modules/Api/Schemas/Models/SchemaDetailsDto.cs → 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
{

2
src/Squidex/Modules/Api/Schemas/Models/SchemaDto.cs → 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
{

2
src/Squidex/Modules/Api/Schemas/Models/UpdateSchemaDto.cs → 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
{

4
src/Squidex/Modules/Api/Schemas/SchemaFieldsController.cs → 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
{
/// <summary>
/// Manages and retrieves information about schemas.

4
src/Squidex/Modules/Api/Schemas/SchemasController.cs → 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
{
/// <summary>
/// Manages and retrieves information about schemas.

2
src/Squidex/Modules/Api/Users/Models/UserDto.cs → 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
{

4
src/Squidex/Modules/Api/Users/UsersController.cs → 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
{
/// <summary>
/// Readonly API to retrieve information about squidex users.

2
src/Squidex/Modules/ControllerBase.cs → 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
{

2
src/Squidex/Modules/UI/Account/AccountController.cs → 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

2
src/Squidex/Modules/UI/Account/ExternalProvider.cs → 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
{

2
src/Squidex/Modules/UI/Account/LoginVM.cs → 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
{

2
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

12
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;

2
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
<!DOCTYPE html>
<html>

Loading…
Cancel
Save