@@ -42,7 +45,7 @@
}
-@if (Model.HasPasswordAndExternal)
+@if (Model.HasExternalLogin && Model.HasPasswordAuth)
{
}
-
@T.Get("users.login.separator")
@@ -51,36 +54,36 @@
@if (Model.HasPasswordAuth)
{
- if (Model.IsLogin)
+ if (Model.IsLogin)
+ {
+ if (Model.IsFailed)
{
- if (Model.IsFailed)
- {
- @T.Get("users.login.error")
- }
+ @T.Get("users.login.error")
+ }
-
- }
- else
- {
- @T.Get("users.login.askAdmin")
- }
+
+
+ }
+ else
+ {
+ @T.Get("users.login.askAdmin")
+ }
}
@if (Model.IsLogin)
{
+
@@ -251,7 +252,7 @@
-
diff --git a/backend/src/Squidex/Areas/IdentityServer/Views/Setup/Setup.cshtml b/backend/src/Squidex/Areas/IdentityServer/Views/Setup/Setup.cshtml
new file mode 100644
index 000000000..69a853003
--- /dev/null
+++ b/backend/src/Squidex/Areas/IdentityServer/Views/Setup/Setup.cshtml
@@ -0,0 +1,201 @@
+@model Squidex.Areas.IdentityServer.Controllers.Setup.SetupVM
+
+@{
+ ViewBag.ThemeColor = "gray";
+ ViewBag.ThemeSize = "profile-lg";
+
+ ViewBag.Title = T.Get("setup.title");
+
+ void RenderValidation(string field)
+ {
+ @if (ViewContext.ViewData.ModelState[field]?.ValidationState == Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState.Invalid)
+ {
+
+ Html.ValidationMessage(field)
+
+ }
+ }
+
+ void RenderRuleAsSuccess(string message)
+ {
+
+
+ }
+
+ void RenderRuleAsCritical(string message)
+ {
+
+
+
+
+
+
+
+ @Html.Raw(message)
+
+
+
+ }
+
+ void RenderRuleAsWarning(string message)
+ {
+
+
+
+
+
+
+
+ @T.Get("common.critical"): @Html.Raw(message)
+
+
+
+ }
+}
+
+
+
+
+
+
+
+
+ @T.Get("common.warning"): @Html.Raw(message)
+
+
+
+
+
+ 
+
+ @T.Get("setup.hint")
+
+
+ +
+@T.Get("setup.headline")
+ +
+
+
+ @T.Get("setup.rules.headline")
+ + @if (Model.IsValidHttps) + { + RenderRuleAsSuccess(T.Get("setup.ruleHttps.success")); + } + else + { + RenderRuleAsCritical(T.Get("setup.ruleHttps.failure")); + } + + @if (Model.BaseUrlConfigured == Model.BaseUrlCurrent) + { + RenderRuleAsSuccess(T.Get("setup.ruleUrl.success")); + } + else + { + RenderRuleAsCritical(T.Get("setup.ruleUrl.failure", new { actual = Model.BaseUrlCurrent, configured = Model.BaseUrlConfigured })); + } + + @if (Model.EverybodyCanCreateApps) + { + RenderRuleAsWarning(T.Get("setup.ruleAppCreation.warningAdmins")); + } + else + { + RenderRuleAsWarning(T.Get("setup.ruleAppCreation.warningAll")); + } + + @if (Model.IsAssetStoreFtp) + { + RenderRuleAsWarning(T.Get("setup.ruleFtp.warning")); + } + + @if (Model.IsAssetStoreFile) + { + RenderRuleAsWarning(T.Get("setup.ruleFolder.warning")); + } ++ +
+
+ @T.Get("setup.createUser.headline")
+ + @if (Model.HasExternalLogin) + { +
+ @T.Get("setup.createUser.loginHint")
+
+
+
+ }
+
+ @if (Model.HasExternalLogin && Model.HasPasswordAuth)
+ {
+
+
+ }
+
+ @if (Model.HasPasswordAuth)
+ {
+ @T.Get("setup.createUser.separator")
+ @T.Get("setup.createUser.headlineCreate")
+ + @if (!string.IsNullOrWhiteSpace(Model.ErrorMessage)) + { +
+ @Model.ErrorMessage
+
+ }
+
+
+ }
+
+ @if (!Model.HasExternalLogin && !Model.HasPasswordAuth)
+ {
+
+ @T.Get("setup.createUser.failure")
+
+ }
+
+
+ @T.Get("setup.madeBy")
@T.Get("setup.madeByCopyright") + +
diff --git a/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml b/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
index 3b03dfa0b..437769bf1 100644
--- a/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
+++ b/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
@@ -17,8 +17,8 @@
@await RenderSectionAsync("header")
}
-
- @T.Get("setup.madeByCopyright") + +
+
+
@RenderBody()
diff --git a/backend/src/Squidex/Config/Web/WebServices.cs b/backend/src/Squidex/Config/Web/WebServices.cs
index 825ee67b6..748ea7eff 100644
--- a/backend/src/Squidex/Config/Web/WebServices.cs
+++ b/backend/src/Squidex/Config/Web/WebServices.cs
@@ -51,21 +51,9 @@ namespace Squidex.Config.Web
services.AddSingletonAs()
.AsSelf();
- services.AddSingletonAs()
- .AsSelf();
-
- services.AddSingletonAs()
- .AsSelf();
-
services.AddSingletonAs()
.AsSelf();
- services.AddSingletonAs()
- .AsSelf();
-
- services.AddSingletonAs()
- .AsSelf();
-
services.AddSingletonAs(c => translator)
.As();
diff --git a/backend/src/Squidex/Pipeline/Robots/RobotsTxtMiddleware.cs b/backend/src/Squidex/Pipeline/Robots/RobotsTxtMiddleware.cs
index 92ed64692..163c782e2 100644
--- a/backend/src/Squidex/Pipeline/Robots/RobotsTxtMiddleware.cs
+++ b/backend/src/Squidex/Pipeline/Robots/RobotsTxtMiddleware.cs
@@ -8,29 +8,28 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options;
-using Squidex.Infrastructure;
namespace Squidex.Pipeline.Robots
{
- public sealed class RobotsTxtMiddleware : IMiddleware
+ public sealed class RobotsTxtMiddleware
{
- private readonly RobotsTxtOptions robotsTxtOptions;
+ private readonly RequestDelegate next;
- public RobotsTxtMiddleware(IOptions robotsTxtOptions)
+ public RobotsTxtMiddleware(RequestDelegate next)
{
- Guard.NotNull(robotsTxtOptions, nameof(robotsTxtOptions));
-
- this.robotsTxtOptions = robotsTxtOptions.Value;
+ this.next = next;
}
- public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+ public async Task InvokeAsync(HttpContext context, IOptions robotsTxtOptions)
{
- if (CanServeRequest(context.Request) && !string.IsNullOrWhiteSpace(robotsTxtOptions.Text))
+ var text = robotsTxtOptions.Value.Text;
+
+ if (CanServeRequest(context.Request) && !string.IsNullOrWhiteSpace(text))
{
context.Response.ContentType = "text/plain";
context.Response.StatusCode = 200;
- await context.Response.WriteAsync(robotsTxtOptions.Text);
+ await context.Response.WriteAsync(text);
}
else
{
diff --git a/backend/src/Squidex/Pipeline/Squid/SquidMiddleware.cs b/backend/src/Squidex/Pipeline/Squid/SquidMiddleware.cs
index d129234cf..620baf2fd 100644
--- a/backend/src/Squidex/Pipeline/Squid/SquidMiddleware.cs
+++ b/backend/src/Squidex/Pipeline/Squid/SquidMiddleware.cs
@@ -15,7 +15,6 @@ namespace Squidex.Pipeline.Squid
{
public sealed class SquidMiddleware
{
- private readonly RequestDelegate next;
private readonly string squidHappyLG = LoadSvg("happy");
private readonly string squidHappySM = LoadSvg("happy-sm");
private readonly string squidSadLG = LoadSvg("sad");
@@ -23,76 +22,68 @@ namespace Squidex.Pipeline.Squid
public SquidMiddleware(RequestDelegate next)
{
- this.next = next;
}
public async Task InvokeAsync(HttpContext context)
{
var request = context.Request;
- if (request.Path.Equals("/squid.svg"))
- {
- var face = "sad";
-
- if (request.Query.TryGetValue("face", out var faceValue) && (faceValue == "sad" || faceValue == "happy"))
- {
- face = faceValue;
- }
+ var face = "sad";
- var isSad = face == "sad";
-
- var title = isSad ? "OH DAMN!" : "OH YEAH!";
-
- if (request.Query.TryGetValue("title", out var titleValue) && !string.IsNullOrWhiteSpace(titleValue))
- {
- title = titleValue;
- }
+ if (request.Query.TryGetValue("face", out var faceValue) && (faceValue == "sad" || faceValue == "happy"))
+ {
+ face = faceValue;
+ }
- var text = "text";
+ var isSad = face == "sad";
- if (request.Query.TryGetValue("text", out var textValue) && !string.IsNullOrWhiteSpace(textValue))
- {
- text = textValue;
- }
+ var title = isSad ? "OH DAMN!" : "OH YEAH!";
- var background = isSad ? "#F5F5F9" : "#4CC159";
-
- if (request.Query.TryGetValue("background", out var backgroundValue) && !string.IsNullOrWhiteSpace(backgroundValue))
- {
- background = backgroundValue;
- }
+ if (request.Query.TryGetValue("title", out var titleValue) && !string.IsNullOrWhiteSpace(titleValue))
+ {
+ title = titleValue;
+ }
- var isSmall = request.Query.TryGetValue("small", out _);
+ var text = "text";
- string svg;
+ if (request.Query.TryGetValue("text", out var textValue) && !string.IsNullOrWhiteSpace(textValue))
+ {
+ text = textValue;
+ }
- if (isSmall)
- {
- svg = isSad ? squidSadSM : squidHappySM;
- }
- else
- {
- svg = isSad ? squidSadLG : squidHappyLG;
- }
+ var background = isSad ? "#F5F5F9" : "#4CC159";
- var (l1, l2, l3) = SplitText(text);
+ if (request.Query.TryGetValue("background", out var backgroundValue) && !string.IsNullOrWhiteSpace(backgroundValue))
+ {
+ background = backgroundValue;
+ }
- svg = svg.Replace("{{TITLE}}", title.ToUpperInvariant());
- svg = svg.Replace("{{TEXT1}}", l1);
- svg = svg.Replace("{{TEXT2}}", l2);
- svg = svg.Replace("{{TEXT3}}", l3);
- svg = svg.Replace("[COLOR]", background);
+ var isSmall = request.Query.TryGetValue("small", out _);
- context.Response.StatusCode = 200;
- context.Response.ContentType = "image/svg+xml";
- context.Response.Headers["Cache-Control"] = "public, max-age=604800";
+ string svg;
- await context.Response.WriteAsync(svg);
+ if (isSmall)
+ {
+ svg = isSad ? squidSadSM : squidHappySM;
}
else
{
- await next(context);
+ svg = isSad ? squidSadLG : squidHappyLG;
}
+
+ var (l1, l2, l3) = SplitText(text);
+
+ svg = svg.Replace("{{TITLE}}", title.ToUpperInvariant());
+ svg = svg.Replace("{{TEXT1}}", l1);
+ svg = svg.Replace("{{TEXT2}}", l2);
+ svg = svg.Replace("{{TEXT3}}", l3);
+ svg = svg.Replace("[COLOR]", background);
+
+ context.Response.StatusCode = 200;
+ context.Response.ContentType = "image/svg+xml";
+ context.Response.Headers["Cache-Control"] = "public, max-age=604800";
+
+ await context.Response.WriteAsync(svg);
}
private static (string, string, string) SplitText(string text)
diff --git a/backend/tests/Squidex.Web.Tests/Pipeline/RequestExceptionMiddlewareTests.cs b/backend/tests/Squidex.Web.Tests/Pipeline/RequestExceptionMiddlewareTests.cs
index 2fb6f31a3..2339d07a3 100644
--- a/backend/tests/Squidex.Web.Tests/Pipeline/RequestExceptionMiddlewareTests.cs
+++ b/backend/tests/Squidex.Web.Tests/Pipeline/RequestExceptionMiddlewareTests.cs
@@ -24,7 +24,6 @@ namespace Squidex.Web.Pipeline
private readonly IHttpResponseFeature responseFeature = A.Fake();
private readonly HttpContext httpContext = new DefaultHttpContext();
private readonly RequestDelegate next;
- private readonly RequestExceptionMiddleware sut;
private bool isNextCalled;
public RequestExceptionMiddlewareTests()
@@ -37,8 +36,6 @@ namespace Squidex.Web.Pipeline
};
httpContext.Features.Set(responseFeature);
-
- sut = new RequestExceptionMiddleware(resultWriter, log);
}
[Fact]
@@ -46,7 +43,9 @@ namespace Squidex.Web.Pipeline
{
httpContext.Request.QueryString = new QueryString("?error=412");
- await sut.InvokeAsync(httpContext, next);
+ var sut = new RequestExceptionMiddleware(next);
+
+ await sut.InvokeAsync(httpContext, resultWriter, log);
Assert.False(isNextCalled);
@@ -60,7 +59,9 @@ namespace Squidex.Web.Pipeline
{
httpContext.Request.QueryString = new QueryString("?error=hello");
- await sut.InvokeAsync(httpContext, next);
+ var sut = new RequestExceptionMiddleware(next);
+
+ await sut.InvokeAsync(httpContext, resultWriter, log);
Assert.True(isNextCalled);
@@ -73,7 +74,9 @@ namespace Squidex.Web.Pipeline
{
httpContext.Request.QueryString = new QueryString("?error=99");
- await sut.InvokeAsync(httpContext, next);
+ var sut = new RequestExceptionMiddleware(next);
+
+ await sut.InvokeAsync(httpContext, resultWriter, log);
Assert.True(isNextCalled);
@@ -89,7 +92,9 @@ namespace Squidex.Web.Pipeline
throw new InvalidOperationException();
});
- await sut.InvokeAsync(httpContext, failingNext);
+ var sut = new RequestExceptionMiddleware(failingNext);
+
+ await sut.InvokeAsync(httpContext, resultWriter, log);
A.CallTo(() => resultWriter.ExecuteAsync(A._,
A.That.Matches(x => x.StatusCode == 500 && x.Value is ErrorDto)))
@@ -106,7 +111,9 @@ namespace Squidex.Web.Pipeline
throw ex;
});
- await sut.InvokeAsync(httpContext, failingNext);
+ var sut = new RequestExceptionMiddleware(failingNext);
+
+ await sut.InvokeAsync(httpContext, resultWriter, log);
A.CallTo(() => log.Log(SemanticLogLevel.Error, ex, A._))
.MustHaveHappened();
@@ -123,7 +130,9 @@ namespace Squidex.Web.Pipeline
throw new InvalidOperationException();
});
- await sut.InvokeAsync(httpContext, failingNext);
+ var sut = new RequestExceptionMiddleware(failingNext);
+
+ await sut.InvokeAsync(httpContext, resultWriter, log);
A.CallTo(() => resultWriter.ExecuteAsync(A._, A._))
.MustNotHaveHappened();
@@ -139,7 +148,9 @@ namespace Squidex.Web.Pipeline
return Task.CompletedTask;
});
- await sut.InvokeAsync(httpContext, failingNext);
+ var sut = new RequestExceptionMiddleware(failingNext);
+
+ await sut.InvokeAsync(httpContext, resultWriter, log);
A.CallTo(() => resultWriter.ExecuteAsync(A._,
A.That.Matches(x => x.StatusCode == 412 && x.Value is ErrorDto)))
@@ -159,7 +170,9 @@ namespace Squidex.Web.Pipeline
return Task.CompletedTask;
});
- await sut.InvokeAsync(httpContext, failingNext);
+ var sut = new RequestExceptionMiddleware(failingNext);
+
+ await sut.InvokeAsync(httpContext, resultWriter, log);
A.CallTo(() => resultWriter.ExecuteAsync(A._, A._))
.MustNotHaveHappened();
diff --git a/frontend/app/framework/angular/status-icon.component.html b/frontend/app/framework/angular/status-icon.component.html
index 92f203ff9..e93f30eb2 100644
--- a/frontend/app/framework/angular/status-icon.component.html
+++ b/frontend/app/framework/angular/status-icon.component.html
@@ -1,14 +1,14 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/frontend/app/framework/angular/status-icon.component.scss b/frontend/app/framework/angular/status-icon.component.scss
index 3ca50c75f..e69de29bb 100644
--- a/frontend/app/framework/angular/status-icon.component.scss
+++ b/frontend/app/framework/angular/status-icon.component.scss
@@ -1,28 +0,0 @@
-.status {
- & {
- background: $color-border;
- border: 0;
- color: $color-dark-foreground;
- display: inline-block;
- }
-
- &.sm {
- @include circle-icon(1.6rem);
- }
-
- &.lg {
- @include circle-icon(2.8rem);
- }
-
- &-pending {
- color: inherit;
- }
-
- &-failed {
- background: $color-theme-error;
- }
-
- &-success {
- background: $color-theme-green;
- }
-}
\ No newline at end of file
diff --git a/frontend/app/shell/pages/home/home-page.component.html b/frontend/app/shell/pages/home/home-page.component.html
index c42439d53..7604ef21f 100644
--- a/frontend/app/shell/pages/home/home-page.component.html
+++ b/frontend/app/shell/pages/home/home-page.component.html
@@ -17,7 +17,9 @@
-
- {{ 'start.madeBy' | sqxTranslate }}
{{ 'start.madeByCopyright' | sqxTranslate }} +
diff --git a/frontend/app/shell/pages/home/home-page.component.scss b/frontend/app/shell/pages/home/home-page.component.scss
index 6380c882c..b97f10ed3 100644
--- a/frontend/app/shell/pages/home/home-page.component.scss
+++ b/frontend/app/shell/pages/home/home-page.component.scss
@@ -34,13 +34,4 @@
&-element {
margin-top: 2rem;
}
-}
-
-.proudly-made {
- color: $color-text-decent;
- font-size: .9rem;
- font-style: normal;
- line-height: 1.5rem;
- margin: 2rem 6rem;
- text-align: center;
}
\ No newline at end of file
diff --git a/frontend/app/theme/_common.scss b/frontend/app/theme/_common.scss
index 482fe579c..028f9161a 100644
--- a/frontend/app/theme/_common.scss
+++ b/frontend/app/theme/_common.scss
@@ -215,6 +215,43 @@ body {
}
}
+//
+// Status Icon
+//
+.status-icon {
+ & {
+ @include circle-icon(2rem);
+ background: $color-border;
+ border: 0;
+ color: $color-dark-foreground;
+ display: inline-block;
+ }
+
+ &-sm {
+ @include circle-icon(1.6rem);
+ }
+
+ &-lg {
+ @include circle-icon(2.8rem);
+ }
+
+ &-pending {
+ color: inherit;
+ }
+
+ &-warning {
+ background: $color-theme-orange;
+ }
+
+ &-failed {
+ background: $color-theme-error;
+ }
+
+ &-success {
+ background: $color-theme-green;
+ }
+}
+
//
// Animations
//
diff --git a/frontend/app/theme/_static.scss b/frontend/app/theme/_static.scss
index 31238cec0..9b230bfb4 100644
--- a/frontend/app/theme/_static.scss
+++ b/frontend/app/theme/_static.scss
@@ -42,7 +42,7 @@ noscript {
}
&-section {
- margin-top: 2rem;
+ margin-top: 3rem;
}
&-section-sm {
{{ 'start.madeByCopyright' | sqxTranslate }} +
+
+ {{ 'start.madeBy' | sqxTranslate }}
{{ 'start.madeByCopyright' | sqxTranslate }} +
{{ 'start.madeByCopyright' | sqxTranslate }} +