Merge branch 'Geta:master' into fix/#37

Geta · Mar 23, 2024 · 4da1cf1 · 4da1cf1
2 parents 3b18e56 + 2ed3c5f
commit 4da1cf1
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 9 deletions.
diff --git a/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Administer.cshtml b/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Administer.cshtml
@@ -1,4 +1,4 @@
-@page
+@page "{handler?}"
 @model Geta.NotFoundHandler.Admin.Pages.Geta.NotFoundHandler.Admin.AdministerModel
 
 @await Component.InvokeAsync("Card", new { message = Model.Message, cardType = Model.CardType })

diff --git a/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Deleted.cshtml b/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Deleted.cshtml
@@ -1,4 +1,4 @@
-@page
+@page "{handler?}"
 @model Geta.NotFoundHandler.Admin.Pages.Geta.NotFoundHandler.Admin.DeletedModel
 
 @await Component.InvokeAsync("Card", new { message = Model.Message })

diff --git a/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Ignored.cshtml b/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Ignored.cshtml
@@ -1,4 +1,4 @@
-@page
+@page "{handler?}"
 @model Geta.NotFoundHandler.Admin.Pages.Geta.NotFoundHandler.Admin.IgnoredModel
 
 @await Component.InvokeAsync("Card", new { message = Model.Message })

diff --git a/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Index.cshtml b/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page "{handler?}"
 @using Geta.NotFoundHandler.Core.Redirects
 @model Geta.NotFoundHandler.Admin.Pages.Geta.NotFoundHandler.Admin.IndexModel
 

diff --git a/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Regex.cshtml b/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Regex.cshtml
@@ -1,4 +1,4 @@
-@page
+@page "{handler?}"
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @model Geta.NotFoundHandler.Admin.Areas.Geta.NotFoundHandler.Admin.RegexModel
 

diff --git a/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Shared/_Layout.cshtml b/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Shared/_Layout.cshtml
@@ -1,5 +1,8 @@
 @using System.Reflection
+@using Geta.NotFoundHandler.Infrastructure.Configuration;
 @using Microsoft.AspNetCore.Mvc.TagHelpers
+@using Microsoft.Extensions.Options;
+@inject IOptions<NotFoundHandlerOptions> options;
 @{
     var version = GetType().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
     version = version == null ? string.Empty : $"v{version}";
@@ -11,7 +14,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"]</title>
 
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+    <link href="@options.Value.BootstrapCssUrl" rel="stylesheet" integrity="@options.Value.BootstrapCssIntegrity" crossorigin="anonymous">
     <link href="/_content/GetaNotFoundHandlerAdmin/css/dashboard.css" rel="stylesheet">
 </head>
 <body>
@@ -87,8 +90,8 @@
     </div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/feather.min.js" integrity="sha256-7kKJWwCLNN8n5rT1MNUpVPkeLxbwe1EZU73jiLdssrI=" crossorigin="anonymous"></script>
+<script src="@options.Value.BootstrapJsUrl" integrity="@options.Value.BootstrapJsIntegrity" crossorigin="anonymous"></script>
+<script src="@options.Value.FeatherJsUrl" integrity="@options.Value.FeatherJsIntegrity" crossorigin="anonymous"></script>
 <script src="/_content/GetaNotFoundHandlerAdmin/js/dashboard.js"></script>
 @RenderSection("Scripts", required: false)
 </body>

diff --git a/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Suggestions.cshtml b/src/Geta.NotFoundHandler.Admin/Areas/GetaNotFoundHandlerAdmin/Pages/Suggestions.cshtml
@@ -1,4 +1,4 @@
-@page
+@page "{handler?}"
 @model Geta.NotFoundHandler.Admin.Pages.Geta.NotFoundHandler.Admin.SuggestionsModel
 
 @await Component.InvokeAsync("Card", new { message = Model.Message })

diff --git a/src/Geta.NotFoundHandler/Infrastructure/Configuration/NotFoundHandlerOptions.cs b/src/Geta.NotFoundHandler/Infrastructure/Configuration/NotFoundHandlerOptions.cs
@@ -21,6 +21,12 @@ public class NotFoundHandlerOptions
         public LoggerMode Logging { get; set; } = LoggerMode.On;
         public bool LogWithHostname { get; set; } = false;
         public string ConnectionString { get; private set; }
+        public string BootstrapJsUrl { get; set; } = "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js";
+        public string BootstrapJsIntegrity { get; set; } = "sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4";
+        public string BootstrapCssUrl { get; set; } = "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css";
+        public string BootstrapCssIntegrity { get; set; } = "sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65";
+        public string FeatherJsUrl { get; set; } = "https://cdn.jsdelivr.net/npm/[email protected]/dist/feather.min.js";
+        public string FeatherJsIntegrity { get; set; } = "sha256-7kKJWwCLNN8n5rT1MNUpVPkeLxbwe1EZU73jiLdssrI=";
 
         private readonly List<Type> _providers = new();
         public IEnumerable<Type> Providers => _providers;