Use code from library.

4 years ago · 467dec4d63
3 changed files with 4 additions and 12 deletions
--- a/backend/src/Squidex/Areas/Api/Views/Shared/Docs.cshtml
+++ b/backend/src/Squidex/Areas/Api/Views/Shared/Docs.cshtml
@ -9,6 +9,8 @@
 <head>
    <title>API Docs</title>
    
+    <base href="~/">
+
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1">

--- a/backend/src/Squidex/Areas/Frontend/Startup.cs
+++ b/backend/src/Squidex/Areas/Frontend/Startup.cs
@ -42,7 +42,7 @@ namespace Squidex.Areas.Frontend
                builder.UseMiddleware<SetupMiddleware>();
            });

-            app.UseWhen(c => c.IsHtmlPath(), builder =>
+            app.UseWhen(c => c.IsSpaFile() || c.IsHtmlPath(), builder =>
            {
                // Adjust the base for all potential html files.
                builder.UseHtmlTransform(new HtmlTransformOptions
@ -107,15 +107,5 @@ namespace Squidex.Areas.Frontend
        {
            return context.Request.Path.StartsWithSegments("/ws", StringComparison.OrdinalIgnoreCase);
        }
-
-        private static bool IsHtmlPath(this HttpContext context)
-        {
-            return context.IsSpaFile() || context.IsHtml();
-        }
-
-        private static bool IsHtml(this HttpContext context)
-        {
-            return context.Request.Path.Value?.Contains(".html", StringComparison.OrdinalIgnoreCase) == true;
-        }
    }
 }
--- a/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
+++ b/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <base href="/">
+    <base href="~/">

    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">