From 4cd669c3d8698ea568eb2190c324fe7a110b283c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ak=C4=B1n=20Sabri=20=C3=87am?= <sabricam2016@gmail.com>
Date: Mon, 1 Jun 2020 02:02:23 +0300
Subject: [PATCH] refactored searchbox view component

---
 .../AbpPageSearchBoxViewComponent.cs          | 25 ++-----------------
 .../AbpPageSearchBox/Default.cshtml           |  7 +++---
 ....Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj |  4 ---
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs
index 127b86cc0e..e690d7d530 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs
@@ -5,30 +5,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag
 {
     public class AbpPageSearchBoxViewComponent : AbpViewComponent
     {
-        public string PlaceHolder { get; set; }
-
-        public async Task<IViewComponentResult> InvokeAsync(
-            string placeHolder,
-            string formClassName,
-            string textBoxClassName)
+        public async Task<IViewComponentResult> InvokeAsync()
         {
-            return await Task.FromResult(View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml",
-                new SearchBoxViewModel
-                {
-                    PlaceHolder = placeHolder,
-                    FormClassName = formClassName,
-                    TextBoxClassName = textBoxClassName
-                }));
-            ;
+            return await Task.FromResult(View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml"));
         }
     }
-
-    public class SearchBoxViewModel
-    {
-        public string PlaceHolder { get; set; }
-
-        public string FormClassName { get; set; }
-
-        public string TextBoxClassName { get; set; }
-    }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml
index e1cd8e5277..0e621f7936 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml
@@ -1,8 +1,7 @@
-@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox.SearchBoxViewModel
-
-<form method="post" class="@Model.FormClassName">
+
+<form method="post" class="searchForm">
     <div class="input-group">
-        <input class="form-control @Model.TextBoxClassName" placeholder="@Model.PlaceHolder"/>
+        <input class="form-control filterText" placeholder="Search"/>
         <div class="input-group-append">
             <abp-button button-type="Primary" type="submit">
                 <i class="fa fa-search" aria-hidden="true"></i>
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
index 755a71af48..7c4147bba5 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
@@ -40,8 +40,4 @@
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Widgets\Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="Pages\Shared\Components\AbpPageToolbar\AbpPageSearchBox\Default.cshtml" />
-  </ItemGroup>
-
 </Project>