Merge branch 'develop' of github.com:SeriaWei/ZKEACMS into develop

# Conflicts: # src/EasyFrameWork/EasyFrameWork.csproj # src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj # src/ZKEACMS/ZKEACMS.csproj
SeriaWei · Nov 13, 2024 · 218d04b · 218d04b
2 parents 7710a1c + 9f29ffd
commit 218d04b
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 57 deletions.
diff --git a/src/EasyFrameWork/EasyFrameWork.csproj b/src/EasyFrameWork/EasyFrameWork.csproj
@@ -17,7 +17,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App"></FrameworkReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="3.1.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.1.1" />
     <PackageReference Include="FastExpressionCompiler" Version="4.2.2" />
     <PackageReference Include="IdGen" Version="3.0.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />

diff --git a/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj b/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj
@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
 		<ProjectReference Include="..\ZKEACMS\ZKEACMS.csproj">
 			<Private>false</Private>
 			<ExcludeAssets>runtime</ExcludeAssets>

diff --git a/src/ZKEACMS.WebHost/Views/Account/Forgotten.cshtml b/src/ZKEACMS.WebHost/Views/Account/Forgotten.cshtml
@@ -1,7 +1,8 @@
 @model ZKEACMS.Account.ForgottenViewModel
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Account/Login.cshtml b/src/ZKEACMS.WebHost/Views/Account/Login.cshtml
@@ -1,7 +1,8 @@
 @model ZKEACMS.Common.ViewModels.AdminSignViewModel
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Login").AtHead();
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Account/Reset.cshtml b/src/ZKEACMS.WebHost/Views/Account/Reset.cshtml
@@ -1,7 +1,8 @@
 @model ZKEACMS.Account.ResetViewModel
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Account/Sended.cshtml b/src/ZKEACMS.WebHost/Views/Account/Sended.cshtml
@@ -1,6 +1,7 @@
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
     string link = "~/";

diff --git a/src/ZKEACMS.WebHost/Views/Account/SignIn.cshtml b/src/ZKEACMS.WebHost/Views/Account/SignIn.cshtml
@@ -1,7 +1,8 @@
 @model ZKEACMS.Common.ViewModels.CustomerSignInViewModel
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
     var returnUrl = ViewBag.ReturnUrl ?? ViewContext.HttpContext.Request.Query["ReturnUrl"];

diff --git a/src/ZKEACMS.WebHost/Views/Account/SignUp.cshtml b/src/ZKEACMS.WebHost/Views/Account/SignUp.cshtml
@@ -1,7 +1,8 @@
 @model Easy.Modules.User.Models.UserEntity
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
     var returnUrl = ViewBag.ReturnUrl ?? ViewContext.HttpContext.Request.Query["ReturnUrl"];

diff --git a/src/ZKEACMS.WebHost/Views/Account/SignUpSuccess.cshtml b/src/ZKEACMS.WebHost/Views/Account/SignUpSuccess.cshtml
@@ -1,6 +1,7 @@
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml b/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml
@@ -1,6 +1,6 @@
 @{
     this.WorkContext().CurrentPage.Title = System.Net.HttpStatusCode.Forbidden.ToString();
-    Layout = Layouts.Generic;
+    Layout = Layouts.EmptyLayout;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
     <img src="~/images/error.png" />

diff --git a/src/ZKEACMS.WebHost/Views/Error/Index.cshtml b/src/ZKEACMS.WebHost/Views/Error/Index.cshtml
@@ -1,6 +1,6 @@
 @{
     this.WorkContext().CurrentPage.Title = ViewContext.HttpContext.Response.StatusCode.ToString();
-    Layout = Layouts.Generic;
+    Layout = Layouts.EmptyLayout;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
     <img src="~/images/error.png" />

diff --git a/src/ZKEACMS.WebHost/Views/Error/NotFound.cshtml b/src/ZKEACMS.WebHost/Views/Error/NotFound.cshtml
@@ -1,6 +1,6 @@
 @{
     this.WorkContext().CurrentPage.Title = System.Net.HttpStatusCode.NotFound.ToString();
-    Layout = Layouts.Generic;
+    Layout = Layouts.EmptyLayout;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
     <img src="~/images/error.png" />

diff --git a/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml b/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml
@@ -1,6 +1,6 @@
 @{
     this.WorkContext().CurrentPage.Title = System.Net.HttpStatusCode.NotFound.ToString();
-    Layout = Layouts.Generic;
+    Layout = Layouts.EmptyLayout;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
     <img src="~/images/error.png" />

diff --git a/src/ZKEACMS.WebHost/Views/Shared/_EmptyLayout.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_EmptyLayout.cshtml
@@ -6,9 +6,9 @@
     @await Html.PartialAsync("Partial.PageHeader")
 </head>
 <body>
-    <div>
+    <main>
         @RenderBody()
-    </div>
+    </main>
     @await Html.PartialAsync("Partial.PageFooter")
 </body>
 </html>
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_LayoutGeneric.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_LayoutGeneric.cshtml
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_LayoutNormal.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_LayoutNormal.cshtml
diff --git a/src/ZKEACMS/Constant.cs b/src/ZKEACMS/Constant.cs
@@ -33,14 +33,6 @@ public class Layouts
         /// </summary>
         public const string Default = "_Layout";
         /// <summary>
-        /// Layout with current theme and body with container.
-        /// </summary>
-        public const string NormalDefault = "_LayoutNormal";
-        /// <summary>
-        /// Layout with current theme
-        /// </summary>
-        public const string Generic = "_LayoutGeneric";
-        /// <summary>
         /// Layout for admin pop up modal
         /// </summary>
         public const string PopUp = "_PopUpLayout";

diff --git a/src/ZKEACMS/Controllers/AccountController.cs b/src/ZKEACMS/Controllers/AccountController.cs
@@ -23,7 +23,6 @@
 
 namespace ZKEACMS.Controllers
 {
-    [Themed]
     public class AccountController : Controller
     {
         private readonly IUserService _userService;

diff --git a/src/ZKEACMS/ZKEACMS.csproj b/src/ZKEACMS/ZKEACMS.csproj
@@ -28,7 +28,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Fluid.Core" Version="2.11.1" />
-		<PackageReference Include="HtmlAgilityPack" Version="1.11.67" />
+		<PackageReference Include="HtmlAgilityPack" Version="1.11.70" />
 		<PackageReference Include="HtmlSanitizer" Version="8.1.870" />
 		<PackageReference Include="LiteDB" Version="5.0.21" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />