From e8991f484fe31a46b61350fe8de144018a2336eb Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Tue, 15 Feb 2022 07:53:40 +0100
Subject: [PATCH] Cleanup2 (#846)

* Blur hash.

* Cleanup

* More fixes.

* Remove some unused code.
---
 .../Scripting/JintScriptEngine.cs             |  2 +-
 .../Scripting/ScriptExecutionContext.cs       |  1 -
 .../Contents/GraphQL/DefaultDocumentWriter.cs | 34 -------------------
 .../IdentityServer/Views/Setup/Setup.cshtml   |  2 +-
 .../Config/Domain/SerializationServices.cs    | 14 --------
 backend/src/Squidex/Config/Web/WebServices.cs |  1 -
 frontend/src/app/theme/_static.scss           |  8 +++++
 7 files changed, 10 insertions(+), 52 deletions(-)
 delete mode 100644 backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/DefaultDocumentWriter.cs

diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs
index b827e29bc..2eef28679 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System.Diagnostics;
 using Esprima;
 using Jint;
 using Jint.Native;
@@ -19,7 +20,6 @@ using Squidex.Infrastructure;
 using Squidex.Infrastructure.Json.Objects;
 using Squidex.Infrastructure.Translations;
 using Squidex.Infrastructure.Validation;
-using System.Diagnostics;
 
 namespace Squidex.Domain.Apps.Core.Scripting
 {
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptExecutionContext.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptExecutionContext.cs
index 0e950e0fb..d2435fe98 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptExecutionContext.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptExecutionContext.cs
@@ -8,7 +8,6 @@
 using Jint;
 using Squidex.Infrastructure.Tasks;
 using Squidex.Text;
-using System.Diagnostics;
 
 namespace Squidex.Domain.Apps.Core.Scripting
 {
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/DefaultDocumentWriter.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/DefaultDocumentWriter.cs
deleted file mode 100644
index e6b70097b..000000000
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/DefaultDocumentWriter.cs
+++ /dev/null
@@ -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);
-            }
-        }
-    }
-}
diff --git a/backend/src/Squidex/Areas/IdentityServer/Views/Setup/Setup.cshtml b/backend/src/Squidex/Areas/IdentityServer/Views/Setup/Setup.cshtml
index 0f596bf2d..79f5cce10 100644
--- a/backend/src/Squidex/Areas/IdentityServer/Views/Setup/Setup.cshtml
+++ b/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>
 
             <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")
                 </a>
             </div>
diff --git a/backend/src/Squidex/Config/Domain/SerializationServices.cs b/backend/src/Squidex/Config/Domain/SerializationServices.cs
index 0ed68be46..acee6625f 100644
--- a/backend/src/Squidex/Config/Domain/SerializationServices.cs
+++ b/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.Schemas;
 using Squidex.Domain.Apps.Core.Schemas.Json;
-using Squidex.Domain.Apps.Entities.Contents.GraphQL;
 using Squidex.Domain.Apps.Events;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Json;
@@ -31,7 +30,6 @@ using Squidex.Infrastructure.Json.Objects;
 using Squidex.Infrastructure.Queries;
 using Squidex.Infrastructure.Queries.Json;
 using Squidex.Infrastructure.Reflection;
-using ServiceLifetime = GraphQL.DI.ServiceLifetime;
 
 namespace Squidex.Config.Domain
 {
@@ -124,17 +122,5 @@ namespace Squidex.Config.Domain
 
             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;
-        }
     }
 }
diff --git a/backend/src/Squidex/Config/Web/WebServices.cs b/backend/src/Squidex/Config/Web/WebServices.cs
index 8bf26abb8..17f89daa5 100644
--- a/backend/src/Squidex/Config/Web/WebServices.cs
+++ b/backend/src/Squidex/Config/Web/WebServices.cs
@@ -93,7 +93,6 @@ namespace Squidex.Config.Web
                     options.EnableMetrics = false;
                 })
                 .AddSchema<DummySchema>()
-                .AddSquidexWriter()
                 .AddSystemTextJson()
                 .AddDataLoader();
 
diff --git a/frontend/src/app/theme/_static.scss b/frontend/src/app/theme/_static.scss
index abe198d42..d3467aab4 100644
--- a/frontend/src/app/theme/_static.scss
+++ b/frontend/src/app/theme/_static.scss
@@ -188,6 +188,14 @@ noscript {
     }
 }
 
+a {
+    &.force-white {
+        &:focus {
+            color: $color-white;
+        }
+    }
+}
+
 .login-container {
     margin-left: auto;
     margin-right: auto;