CmsKit - Public route contlict fix

modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs

@@ -63,9 +63,9 @@ namespace Volo.CmsKit.Public.Web
             {
                 Configure<RazorPagesOptions>(options =>
                 {
-                    options.Conventions.AddPageRoute("/CmsKit/Pages/Index", @"/pages/{slug:minlength(1)}");
+                    options.Conventions.AddPageRoute("/Public/CmsKit/Pages/Index", @"/pages/{slug:minlength(1)}");
-                    options.Conventions.AddPageRoute("/CmsKit/Blogs/Index", @"/blogs/{blogSlug:minlength(1)}");
+                    options.Conventions.AddPageRoute("/Public/CmsKit/Blogs/Index", @"/blogs/{blogSlug:minlength(1)}");
-                    options.Conventions.AddPageRoute("/CmsKit/Blogs/BlogPost", @"/blogs/{blogSlug}/{blogPostSlug}");
+                    options.Conventions.AddPageRoute("/Public/CmsKit/Blogs/BlogPost", @"/blogs/{blogSlug}/{blogPostSlug:minlength(1)}");
                 });
             }
         }

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml

@@ -2,7 +2,6 @@
 
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPost
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPostComment
-@using Volo.CmsKit.Public.Web.Pages.CmsKit.Blogs
 @using Volo.CmsKit.Public.Web.Pages
 @using Volo.Abp.GlobalFeatures
 @using Volo.CmsKit.GlobalFeatures
@@ -12,7 +11,7 @@
 
 @inherits CmsKitPublicPageBase
 
-@model BlogPostModel
+@model Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs.BlogPostModel
 
 @{
     PageLayout.Content.Title = Model.BlogPost.Title;

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs

@@ -10,7 +10,7 @@ using Volo.CmsKit.Blogs;
 using Volo.CmsKit.GlobalFeatures;
 using Volo.CmsKit.Public.Blogs;
 
-namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Blogs
+namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs
 {
     public class BlogPostModel : CmsKitPublicPageModelBase
     {

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml

@@ -1,10 +1,11 @@
 @page
 
 @using Volo.CmsKit.Public.Web.Pages
+@using Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs 
 
 @inherits CmsKitPublicPageBase
 
-@model Volo.CmsKit.Public.Web.Pages.CmsKit.Blogs.IndexModel
+@model IndexModel
 
 <abp-row id="blogs-container">
     @foreach (var blog in Model.Blogs.Items)

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml.cs → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml.cs

@@ -8,7 +8,7 @@ using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination;
 using Volo.CmsKit.Public.Blogs;
 
-namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Blogs
+namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs
 {
     public class IndexModel : CmsKitPublicPageModelBase
     {

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml

@@ -2,7 +2,7 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.CmsKit.Localization
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages
-@model Volo.CmsKit.Public.Web.Pages.CmsKit.Pages.IndexModel
+@model Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Pages.IndexModel
 @inject IHtmlLocalizer<CmsKitResource> L
 
 @await Component.InvokeAsync(typeof(DefaultPageViewComponent),

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using Volo.CmsKit.Public.Pages;
 using Volo.CmsKit.Web.Pages;
 
-namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Pages
+namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Pages
 {
     public class IndexModel : CommonPageModel
     {