From 5809e343b46572e2ebdcca39d61fb54847777a6c Mon Sep 17 00:00:00 2001
From: Ilkay Ilknur <ilkay@ilkayilknur.com>
Date: Tue, 2 Feb 2021 11:36:07 +0300
Subject: [PATCH] add catch-all route for pages and do not handle root.

---
 .../src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs      | 5 ++++-
 .../Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
index 7833e6aa3e..953102aa79 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
@@ -55,12 +55,15 @@ namespace Volo.CmsKit.Public.Web
             {
                 options.AddMaps<CmsKitPublicWebModule>(validate: true);
             });
+        }
 
+        public override void PostConfigureServices(ServiceConfigurationContext context)
+        {
             Configure<RazorPagesOptions>(options =>
             {
                 if (GlobalFeatureManager.Instance.IsEnabled<PagesFeature>())
                 {
-                    options.Conventions.AddPageRoute("/CmsKit/Pages/Index", @"/{pageUrl}");
+                    options.Conventions.AddPageRoute("/CmsKit/Pages/Index", @"{*pageUrl:minlength(1)}");
                 }
             });
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml
index c31edaaba8..73c7637b01 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml
@@ -1,4 +1,4 @@
-@page "{pageUrl}"
+@page "{*pageUrl}"
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.CmsKit.Localization
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages