Browse Source

Cleanup2 (#846)

* Blur hash.

* Cleanup

* More fixes.

* Remove some unused code.
pull/847/head
Sebastian Stehle 4 years ago
committed by GitHub
parent
commit
e8991f484f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs
  2. 1
      backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptExecutionContext.cs
  3. 34
      backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/DefaultDocumentWriter.cs
  4. 2
      backend/src/Squidex/Areas/IdentityServer/Views/Setup/Setup.cshtml
  5. 14
      backend/src/Squidex/Config/Domain/SerializationServices.cs
  6. 1
      backend/src/Squidex/Config/Web/WebServices.cs
  7. 8
      frontend/src/app/theme/_static.scss

2
backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs

@ -5,6 +5,7 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
using System.Diagnostics;
using Esprima; using Esprima;
using Jint; using Jint;
using Jint.Native; using Jint.Native;
@ -19,7 +20,6 @@ using Squidex.Infrastructure;
using Squidex.Infrastructure.Json.Objects; using Squidex.Infrastructure.Json.Objects;
using Squidex.Infrastructure.Translations; using Squidex.Infrastructure.Translations;
using Squidex.Infrastructure.Validation; using Squidex.Infrastructure.Validation;
using System.Diagnostics;
namespace Squidex.Domain.Apps.Core.Scripting namespace Squidex.Domain.Apps.Core.Scripting
{ {

1
backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptExecutionContext.cs

@ -8,7 +8,6 @@
using Jint; using Jint;
using Squidex.Infrastructure.Tasks; using Squidex.Infrastructure.Tasks;
using Squidex.Text; using Squidex.Text;
using System.Diagnostics;
namespace Squidex.Domain.Apps.Core.Scripting namespace Squidex.Domain.Apps.Core.Scripting
{ {

34
backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/DefaultDocumentWriter.cs

@ -1,34 +0,0 @@
// ==========================================================================
// Squidex Headless CMS
// ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschraenkt)
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
using GraphQL;
using Microsoft.AspNetCore.WebUtilities;
using Squidex.Infrastructure.Json;
namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
{
public sealed class DefaultDocumentWriter : IDocumentWriter
{
private readonly IJsonSerializer jsonSerializer;
public DefaultDocumentWriter(IJsonSerializer jsonSerializer)
{
this.jsonSerializer = jsonSerializer;
}
public async Task WriteAsync<T>(Stream stream, T value,
CancellationToken cancellationToken = default)
{
await using (var buffer = new FileBufferingWriteStream())
{
jsonSerializer.Serialize(value, buffer, true);
await buffer.DrainBufferAsync(stream, cancellationToken);
}
}
}
}

2
backend/src/Squidex/Areas/IdentityServer/Views/Setup/Setup.cshtml

@ -125,7 +125,7 @@
<small class="form-text text-muted mt-2 mb-2">@T.Get("setup.createUser.loginHint")</small> <small class="form-text text-muted mt-2 mb-2">@T.Get("setup.createUser.loginHint")</small>
<div class="mt-3"> <div class="mt-3">
<a class="btn btn-primary" asp-controller="Account" asp-action="Login"> <a class="btn btn-primary force-white" asp-controller="Account" asp-action="Login">
@T.Get("setup.createUser.loginLink") @T.Get("setup.createUser.loginLink")
</a> </a>
</div> </div>

14
backend/src/Squidex/Config/Domain/SerializationServices.cs

@ -22,7 +22,6 @@ using Squidex.Domain.Apps.Core.Rules;
using Squidex.Domain.Apps.Core.Rules.Json; using Squidex.Domain.Apps.Core.Rules.Json;
using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Domain.Apps.Core.Schemas.Json; using Squidex.Domain.Apps.Core.Schemas.Json;
using Squidex.Domain.Apps.Entities.Contents.GraphQL;
using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events;
using Squidex.Infrastructure; using Squidex.Infrastructure;
using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Json;
@ -31,7 +30,6 @@ using Squidex.Infrastructure.Json.Objects;
using Squidex.Infrastructure.Queries; using Squidex.Infrastructure.Queries;
using Squidex.Infrastructure.Queries.Json; using Squidex.Infrastructure.Queries.Json;
using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Reflection;
using ServiceLifetime = GraphQL.DI.ServiceLifetime;
namespace Squidex.Config.Domain namespace Squidex.Config.Domain
{ {
@ -124,17 +122,5 @@ namespace Squidex.Config.Domain
return builder; return builder;
} }
public static IGraphQLBuilder AddSquidexWriter(this IGraphQLBuilder builder)
{
builder.Register<IDocumentWriter>(c =>
{
var serializer = new NewtonsoftJsonSerializer(ConfigureJson(TypeNameHandling.None));
return new DefaultDocumentWriter(serializer);
}, ServiceLifetime.Singleton);
return builder;
}
} }
} }

1
backend/src/Squidex/Config/Web/WebServices.cs

@ -93,7 +93,6 @@ namespace Squidex.Config.Web
options.EnableMetrics = false; options.EnableMetrics = false;
}) })
.AddSchema<DummySchema>() .AddSchema<DummySchema>()
.AddSquidexWriter()
.AddSystemTextJson() .AddSystemTextJson()
.AddDataLoader(); .AddDataLoader();

8
frontend/src/app/theme/_static.scss

@ -188,6 +188,14 @@ noscript {
} }
} }
a {
&.force-white {
&:focus {
color: $color-white;
}
}
}
.login-container { .login-container {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;

Loading…
Cancel
Save