From c6a2556224bf38474126d781544bc00d82e7d962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Mon, 28 May 2018 23:04:15 +0300
Subject: [PATCH] Move error page to theme shared

---
 .../Pages/Error/Index.cshtml                                | 6 ++++--
 .../Pages/Error/Index.cshtml.cs                             | 2 +-
 .../Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj          | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)
 rename src/{Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic => Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared}/Pages/Error/Index.cshtml (85%)
 rename src/{Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic => Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared}/Pages/Error/Index.cshtml.cs (95%)

diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/Error/Index.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Error/Index.cshtml
similarity index 85%
rename from src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/Error/Index.cshtml
rename to src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Error/Index.cshtml
index 71bf8a08a6..d0ec9aa55e 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/Error/Index.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Error/Index.cshtml
@@ -1,7 +1,9 @@
 @page
+@using System.Linq
+@using System.Collections.Generic
 @using Localization.Resources.AbpUi
 @using Microsoft.AspNetCore.Mvc.Localization
-@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Pages.Error
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Error
 @model IndexModel
 @inject IHtmlLocalizer<AbpUiResource> L
 @{
@@ -15,7 +17,7 @@
 }
 
 <h1>
-   [@Model.HttpStatusCode] @errorMessage
+    [@Model.HttpStatusCode] @errorMessage
 </h1>
 
 <div>
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/Error/Index.cshtml.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Error/Index.cshtml.cs
similarity index 95%
rename from src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/Error/Index.cshtml.cs
rename to src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Error/Index.cshtml.cs
index 15f2fc9b1c..89dd97fdd6 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/Error/Index.cshtml.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Error/Index.cshtml.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 using Volo.Abp.Http;
 
-namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Pages.Error
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Error
 {
     public class IndexModel : PageModel
     {
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
index 2d0558bb8f..5273033f71 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
@@ -20,6 +20,10 @@
     <EmbeddedResource Include="Views\**\*.cshtml" />
     <EmbeddedResource Include="Areas\**\*.cshtml" />
   </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Remove="Pages\Error\Index.cshtml" />
+  </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.2" />