From e52bafeb2059aae7627deb5327e925524ee0cab8 Mon Sep 17 00:00:00 2001
From: enisn <iletisim@enisnecipoglu.com>
Date: Mon, 1 Mar 2021 15:09:50 +0300
Subject: [PATCH] CmsKit - Public route contlict fix

---
 .../src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs     | 6 +++---
 .../Pages/{ => Public}/CmsKit/Blogs/BlogPost.cshtml         | 3 +--
 .../Pages/{ => Public}/CmsKit/Blogs/BlogPost.cshtml.cs      | 2 +-
 .../Pages/{ => Public}/CmsKit/Blogs/Index.cshtml            | 3 ++-
 .../Pages/{ => Public}/CmsKit/Blogs/Index.cshtml.cs         | 2 +-
 .../Pages/{ => Public}/CmsKit/Pages/Index.cshtml            | 2 +-
 .../Pages/{ => Public}/CmsKit/Pages/Index.cshtml.cs         | 2 +-
 .../Pages/{CmsKit => }/_ViewImports.cshtml                  | 0
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/{ => Public}/CmsKit/Blogs/BlogPost.cshtml (96%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/{ => Public}/CmsKit/Blogs/BlogPost.cshtml.cs (97%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/{ => Public}/CmsKit/Blogs/Index.cshtml (95%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/{ => Public}/CmsKit/Blogs/Index.cshtml.cs (95%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/{ => Public}/CmsKit/Pages/Index.cshtml (82%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/{ => Public}/CmsKit/Pages/Index.cshtml.cs (93%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/{CmsKit => }/_ViewImports.cshtml (100%)

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 28f5f66d5e..c8519b33f0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
+++ b/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("/CmsKit/Blogs/Index", @"/blogs/{blogSlug:minlength(1)}");
-                    options.Conventions.AddPageRoute("/CmsKit/Blogs/BlogPost", @"/blogs/{blogSlug}/{blogPostSlug}");
+                    options.Conventions.AddPageRoute("/Public/CmsKit/Pages/Index", @"/pages/{slug:minlength(1)}");
+                    options.Conventions.AddPageRoute("/Public/CmsKit/Blogs/Index", @"/blogs/{blogSlug:minlength(1)}");
+                    options.Conventions.AddPageRoute("/Public/CmsKit/Blogs/BlogPost", @"/blogs/{blogSlug}/{blogPostSlug:minlength(1)}");
                 });
             }
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
similarity index 96%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
index d19b66f409..abff0a475e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml
+++ b/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;
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs
similarity index 97%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs
index 896ca37d67..6683f02cc8 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs
+++ b/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
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml
similarity index 95%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml
index 9a3f805bf1..34f6a456d5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml
+++ b/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)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml.cs
similarity index 95%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml.cs
index 9f44d9beaa..eca0917d85 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml.cs
+++ b/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
     {
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/Public/CmsKit/Pages/Index.cshtml
similarity index 82%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml
index 4f4129b6d7..6060c00304 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/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),
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs
similarity index 93%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs
index 155a85d94f..2a30af8ae7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs
+++ b/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
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/_ViewImports.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/_ViewImports.cshtml
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/_ViewImports.cshtml
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/_ViewImports.cshtml