From d3a81e3ea33644571fe6ad022c54ca41e310d357 Mon Sep 17 00:00:00 2001
From: gdlcf88 <47396430@qq.com>
Date: Sat, 6 Jun 2020 22:15:21 +0800
Subject: [PATCH] Fixed namespaces

---
 .../EasyAbp.EShop.Baskets.Web.csproj                       | 1 +
 .../EasyAbp.EShop.Baskets.Web/Pages/Baskets/Index.cshtml   | 7 -------
 .../Pages/EShop/Baskets/Index.cshtml                       | 7 +++++++
 .../Pages/{ => EShop}/Baskets/Index.cshtml.cs              | 2 +-
 .../Pages/{ => EShop}/Baskets/_ViewImports.cshtml          | 0
 .../Pages/EShop/Orders/Index.cshtml                        | 2 +-
 .../Pages/EShop/Products/Index.cshtml                      | 2 +-
 .../Pages/EShop/Stores/Index.cshtml                        | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/Baskets/Index.cshtml
 create mode 100644 modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/EShop/Baskets/Index.cshtml
 rename modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/{ => EShop}/Baskets/Index.cshtml.cs (65%)
 rename modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/{ => EShop}/Baskets/_ViewImports.cshtml (100%)

diff --git a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/EasyAbp.EShop.Baskets.Web.csproj b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/EasyAbp.EShop.Baskets.Web.csproj
index 7cce32ba..465581d0 100644
--- a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/EasyAbp.EShop.Baskets.Web.csproj
+++ b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/EasyAbp.EShop.Baskets.Web.csproj
@@ -34,6 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Pages\EShop" />
     <Folder Include="wwwroot\" />
   </ItemGroup>
 
diff --git a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/Baskets/Index.cshtml b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/Baskets/Index.cshtml
deleted file mode 100644
index 0428578c..00000000
--- a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/Baskets/Index.cshtml
+++ /dev/null
@@ -1,7 +0,0 @@
-@page
-@inherits EasyAbp.EShop.Baskets.Web.Pages.BasketsPage
-@model EasyAbp.EShop.Baskets.Web.Pages.Baskets.IndexModel
-@{
-}
-<h1>Baskets</h1>
-<p>A sample page for the Baskets module.</p>
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/EShop/Baskets/Index.cshtml b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/EShop/Baskets/Index.cshtml
new file mode 100644
index 00000000..a7b05c38
--- /dev/null
+++ b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/EShop/Baskets/Index.cshtml
@@ -0,0 +1,7 @@
+@page
+@inherits EasyAbp.EShop.Baskets.Web.Pages.BasketsPage
+@model EasyAbp.EShop.Baskets.Web.Pages.EShop.Baskets.IndexModel
+@{
+}
+<h1>Baskets</h1>
+<p>A sample page for the Baskets module.</p>
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/Baskets/Index.cshtml.cs b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/EShop/Baskets/Index.cshtml.cs
similarity index 65%
rename from modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/Baskets/Index.cshtml.cs
rename to modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/EShop/Baskets/Index.cshtml.cs
index 5505cc89..532d3256 100644
--- a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/Baskets/Index.cshtml.cs
+++ b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/EShop/Baskets/Index.cshtml.cs
@@ -1,4 +1,4 @@
-namespace EasyAbp.EShop.Baskets.Web.Pages.Baskets
+namespace EasyAbp.EShop.Baskets.Web.Pages.EShop.Baskets
 {
     public class IndexModel : BasketsPageModel
     {
diff --git a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/Baskets/_ViewImports.cshtml b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/EShop/Baskets/_ViewImports.cshtml
similarity index 100%
rename from modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/Baskets/_ViewImports.cshtml
rename to modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/Pages/EShop/Baskets/_ViewImports.cshtml
diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Index.cshtml b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Index.cshtml
index 570cb962..5be644c2 100644
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Index.cshtml
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Index.cshtml
@@ -1,6 +1,6 @@
 @page
 @inherits EasyAbp.EShop.Orders.Web.Pages.OrdersPage
-@model EasyAbp.EShop.Orders.Web.Pages.Orders.IndexModel
+@model EasyAbp.EShop.Orders.Web.Pages.EShop.Orders.IndexModel
 @{
 }
 <h1>Orders</h1>
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Index.cshtml b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Index.cshtml
index ebd41f67..28686454 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Index.cshtml
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Index.cshtml
@@ -1,6 +1,6 @@
 @page
 @inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
-@model EasyAbp.EShop.Products.Web.Pages.Products.IndexModel
+@model EasyAbp.EShop.Products.Web.Pages.EShop.Products.IndexModel
 @{
 }
 <h1>Products</h1>
diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Index.cshtml b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Index.cshtml
index 17751cf2..f0a17332 100644
--- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Index.cshtml
+++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Index.cshtml
@@ -1,6 +1,6 @@
 @page
 @inherits EasyAbp.EShop.Stores.Web.Pages.StoresPage
-@model EasyAbp.EShop.Stores.Web.Pages.Stores.IndexModel
+@model EasyAbp.EShop.Stores.Web.Pages.EShop.Stores.IndexModel
 @{
 }
 <h1>Stores</h1>