diff --git a/Back/Controllers/BaseController.cs b/Back/Controllers/BaseController.cs index c519043..33e8da9 100644 --- a/Back/Controllers/BaseController.cs +++ b/Back/Controllers/BaseController.cs @@ -48,8 +48,8 @@ namespace Back.Controllers public async Task> DateTimeServer() => Ok(DateTime.Now); [HttpGet("LastBlog")] - public async Task>> LastBlog(int PageIndex, int PageSize,string? Tag) - => Ok(await _sBase.GetBlog(PageIndex, PageSize,Tag)); + public async Task>> LastBlog(int PageIndex, int PageSize,string? Tag, string? ItemSearch) + => Ok(await _sBase.GetBlog(PageIndex, PageSize,Tag, ItemSearch)); [HttpGet("GetBlogByID/{ID}")] public async Task> GetBlogByID(int ID) { diff --git a/Back/Services/ServBase.cs b/Back/Services/ServBase.cs index 60888d5..511a1dd 100644 --- a/Back/Services/ServBase.cs +++ b/Back/Services/ServBase.cs @@ -38,9 +38,11 @@ namespace Back.Services PermissionID=x.PermissionID, }).ToListAsync(); } - public async Task> GetBlog(int PageIndex, int PageSize,string? Tag) + public async Task> GetBlog(int PageIndex, int PageSize,string? Tag, string? ItemSearch) { var request = _repoBlog.Get(w => w.Status); + if (!string.IsNullOrEmpty(ItemSearch)) + request = request.Where(x => x.Tags.Contains(ItemSearch) || x.Title.Contains(ItemSearch) || x.Text.Contains(ItemSearch)); if (!string.IsNullOrEmpty(Tag)) request = request.Where(x => x.Tags.Contains(Tag)); diff --git a/TaxPayerFull/Layout/LBlogheader.razor b/TaxPayerFull/Layout/LBlogheader.razor index 7cfb318..d1e2ab0 100644 --- a/TaxPayerFull/Layout/LBlogheader.razor +++ b/TaxPayerFull/Layout/LBlogheader.razor @@ -15,11 +15,14 @@ + diff --git a/TaxPayerFull/Pages/BlogDetails.razor b/TaxPayerFull/Pages/BlogDetails.razor index 0f4ef60..dc03ee6 100644 --- a/TaxPayerFull/Pages/BlogDetails.razor +++ b/TaxPayerFull/Pages/BlogDetails.razor @@ -23,7 +23,9 @@ - + + +
@@ -31,7 +33,7 @@
-
+
@@ -105,7 +107,28 @@
+
+
+

جستوجو

+
+
+
+
+
+ + + +
+
+
+
+

پست های اخیر

@@ -165,7 +188,10 @@ @code { - + //meta tags + public string description { get; set; } + //--------------------- + public string strSearch { get; set; } [Parameter] public int? ItemID { get; set; } @@ -177,10 +203,10 @@ if (ItemID != null) { Item = await GetItems(); - // Item.Text = "

RTHH

"; - if (Item==null) + if (Item == null) Navigation.NavigateTo("/"); + else await GenerateTags(); } else @@ -198,14 +224,24 @@ } } @functions{ + public async Task SearchClick() + { + if (!string.IsNullOrEmpty(strSearch)) + Navigation.NavigateTo("/SearchBlog/" + strSearch); + } public async Task GetItems() { var response = await _hc.GetAsync($"Base/GetBlogByID/{ItemID}"); if (!response.IsSuccessStatusCode) - return null; - + return null; + return await response.Content.ReadFromJsonAsync(); } + public async Task GenerateTags() + { + + description = Item.Title; + } } diff --git a/TaxPayerFull/Pages/ListBlog.razor b/TaxPayerFull/Pages/ListBlog.razor index 477073d..433684d 100644 --- a/TaxPayerFull/Pages/ListBlog.razor +++ b/TaxPayerFull/Pages/ListBlog.razor @@ -3,6 +3,7 @@ @layout BlogLayout @page "/ListBlog" @page "/ListBlog/{Tag}" +@page "/SearchBlog/{itemSearch}" @inject NavigationManager Navigation دانشنامه
@@ -102,6 +103,8 @@ [Parameter] public string? Tag { get; set; } + [Parameter] + public string? itemSearch { get; set; } [Parameter,SupplyParameterFromQuery] public int? PageIndex { get; set; } @@ -111,7 +114,9 @@ { if (PageIndex == null) PageIndex = 1; string url = $"Base/LastBlog?PageIndex={PageIndex ?? 1}&PageSize=6"; - if (!string.IsNullOrEmpty(Tag)) url += $" &Tag={Tag}"; + + if (!string.IsNullOrEmpty(itemSearch)) url += $" &ItemSearch={itemSearch}"; + else if (!string.IsNullOrEmpty(Tag)) url += $" &Tag={Tag}"; request = await _hc.GetFromJsonAsync>(url); await base.OnParametersSetAsync(); }