Merge pull request #108 from EasyAbp/move-widget

Move the widget to the `SettingUi` directory
EasyAbp · Feb 8, 2024 · 52a66dd · 52a66dd
2 parents c0c0551 + 17ddd5b
commit 52a66dd
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 9 deletions.
diff --git a/src/EasyAbp.Abp.SettingUi.Web/AbpSettingUiWebModule.cs b/src/EasyAbp.Abp.SettingUi.Web/AbpSettingUiWebModule.cs
@@ -1,4 +1,5 @@
 using EasyAbp.Abp.SettingUi.Web.Pages;
+using EasyAbp.Abp.SettingUi.Web.Settings;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
@@ -35,7 +36,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
             Configure<SettingManagementPageOptions>(options =>
             {
-                options.Contributors.Add(new SettingUiPageContributor());
+                options.Contributors.Add(new SettingUiSettingPageContributor());
             });
 
             Configure<AbpBundlingOptions>(options =>

diff --git a/...ingUi.Web/Pages/Components/Default.cshtml → ...Pages/Components/SettingUi/Default.cshtml b/...ingUi.Web/Pages/Components/Default.cshtml → ...Pages/Components/SettingUi/Default.cshtml
@@ -15,7 +15,7 @@
                 {
                     <div class="mb-3">
                         <label class="form-label" for="@settingHtmlInfo.Name">@settingHtmlInfo.DisplayName</label>
-                        @await Html.PartialAsync($"~/Pages/Components/Partials/_{settingHtmlInfo.Type.ToPascalCase()}.cshtml", settingHtmlInfo)
+                        @await Html.PartialAsync($"~/Pages/Components/SettingUi/Partials/_{settingHtmlInfo.Type.ToPascalCase()}.cshtml", settingHtmlInfo)
                     </div>
                 }
                 <hr class="my-3">

diff --git a/...ettingUi.Web/Pages/Components/Default.css → ...eb/Pages/Components/SettingUi/Default.css b/...ettingUi.Web/Pages/Components/Default.css → ...eb/Pages/Components/SettingUi/Default.css
diff --git a/...ages/Components/Partials/_Checkbox.cshtml → ...nents/SettingUi/Partials/_Checkbox.cshtml b/...ages/Components/Partials/_Checkbox.cshtml → ...nents/SettingUi/Partials/_Checkbox.cshtml
diff --git a/.../Pages/Components/Partials/_Number.cshtml → ...ponents/SettingUi/Partials/_Number.cshtml b/.../Pages/Components/Partials/_Number.cshtml → ...ponents/SettingUi/Partials/_Number.cshtml
diff --git a/.../Pages/Components/Partials/_Select.cshtml → ...ponents/SettingUi/Partials/_Select.cshtml b/.../Pages/Components/Partials/_Select.cshtml → ...ponents/SettingUi/Partials/_Select.cshtml
diff --git a/...eb/Pages/Components/Partials/_Text.cshtml → ...omponents/SettingUi/Partials/_Text.cshtml b/...eb/Pages/Components/Partials/_Text.cshtml → ...omponents/SettingUi/Partials/_Text.cshtml
diff --git a/.../Pages/Components/SettingViewComponent.cs → ...ponents/SettingUi/SettingViewComponent.cs b/.../Pages/Components/SettingViewComponent.cs → ...ponents/SettingUi/SettingViewComponent.cs
@@ -5,17 +5,16 @@
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
-using Volo.Abp.Data;
 
-namespace EasyAbp.Abp.SettingUi.Web.Pages.Components
+namespace EasyAbp.Abp.SettingUi.Web.Pages.Components.SettingUi
 {
-    [Widget(StyleFiles = new[] { "/Pages/Components/Default.css" })]
+    [Widget(StyleFiles = new[] { "/Pages/Components/SettingUi/Default.css" })]
     public class SettingViewComponent : AbpViewComponent
     {
         public IViewComponentResult Invoke(SettingGroup parameter)
         {
             var settingInfos = parameter.SettingInfos.Select(si => new SettingHtmlInfo(si));
-            return View("~/Pages/Components/Default.cshtml", settingInfos);
+            return View("~/Pages/Components/SettingUi/Default.cshtml", settingInfos);
         }
     }
 

diff --git a/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/SettingUi/_ViewImports.cshtml b/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/SettingUi/_ViewImports.cshtml
@@ -0,0 +1 @@
+@using EasyAbp.Abp.SettingUi.Web.Pages.Components.SettingUi
diff --git a/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/_ViewImports.cshtml b/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/_ViewImports.cshtml
diff --git a/...gUi.Web/Pages/SettingUiPageContributor.cs → ...ttings/SettingUiSettingPageContributor.cs b/...gUi.Web/Pages/SettingUiPageContributor.cs → ...ttings/SettingUiSettingPageContributor.cs
@@ -1,13 +1,14 @@
 using System.Threading.Tasks;
 using EasyAbp.Abp.SettingUi.Authorization;
 using EasyAbp.Abp.SettingUi.Web.Pages.Components;
+using EasyAbp.Abp.SettingUi.Web.Pages.Components.SettingUi;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.SettingManagement.Web.Pages.SettingManagement;
 
-namespace EasyAbp.Abp.SettingUi.Web.Pages
+namespace EasyAbp.Abp.SettingUi.Web.Settings
 {
-    public class SettingUiPageContributor : ISettingPageContributor
+    public class SettingUiSettingPageContributor : ISettingPageContributor
     {
         public async Task ConfigureAsync(SettingPageCreationContext context)
         {