From dd4969f50435f45a3487603a2b87fe26adf22920 Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Tue, 2 Apr 2024 17:14:18 +0330 Subject: [PATCH] ... --- Back/Back.csproj | 1 + Back/Common/ExtentionMethods.cs | 3 +- Back/Controllers/BaseController.cs | 7 +- Back/Program.cs | 2 +- Back/Services/ServBase.cs | 12 +- {Back/Common => Shared}/DTOs/PagingDto.cs | 2 +- TaxPayerFull/Layout/Blog.razor | 5 +- .../{ItemBlog.razor => ItemBloginHome.razor} | 5 +- TaxPayerFull/Pages/BlogDetails.razor | 193 +++++++ TaxPayerFull/Pages/ListBlog.razor | 483 ++++-------------- TaxPayerFull/Program.cs | 4 +- 11 files changed, 315 insertions(+), 402 deletions(-) rename {Back/Common => Shared}/DTOs/PagingDto.cs (91%) rename TaxPayerFull/Layout/{ItemBlog.razor => ItemBloginHome.razor} (88%) create mode 100644 TaxPayerFull/Pages/BlogDetails.razor diff --git a/Back/Back.csproj b/Back/Back.csproj index 18e672f..4462681 100644 --- a/Back/Back.csproj +++ b/Back/Back.csproj @@ -24,6 +24,7 @@ + diff --git a/Back/Common/ExtentionMethods.cs b/Back/Common/ExtentionMethods.cs index 8d0b57e..54a6617 100644 --- a/Back/Common/ExtentionMethods.cs +++ b/Back/Common/ExtentionMethods.cs @@ -5,7 +5,8 @@ using System.Data; using System.Globalization; using System.Reflection; using System.Security.Cryptography; -using Back.Common.ViewModels; +using Shared.DTOs; + namespace Back.Common { diff --git a/Back/Controllers/BaseController.cs b/Back/Controllers/BaseController.cs index 7472719..9f6074e 100644 --- a/Back/Controllers/BaseController.cs +++ b/Back/Controllers/BaseController.cs @@ -20,8 +20,9 @@ namespace Back.Controllers [HttpGet("DateTimeServer")] public async Task> DateTimeServer() => Ok(DateTime.Now); - [HttpGet("LastBlog/{Count}")] - public async Task>> LastBlog(int Count) - => Ok(await _sBase.GetBlog(Count)); + [HttpGet("LastBlog")] + public async Task>> LastBlog(int PageIndex,int PageSize) + => Ok(await _sBase.GetBlog(PageIndex,PageSize)); + } } diff --git a/Back/Program.cs b/Back/Program.cs index d4de335..314735b 100644 --- a/Back/Program.cs +++ b/Back/Program.cs @@ -24,7 +24,7 @@ builder.Services.AddCors(options => options.AddPolicy(origins, policy => { - policy.WithOrigins("https://localhost:7224") + policy.WithOrigins("https://localhost:7224", "http://localhost:5107") .AllowAnyHeader() .AllowAnyMethod(); }); diff --git a/Back/Services/ServBase.cs b/Back/Services/ServBase.cs index c6de2fb..80ac982 100644 --- a/Back/Services/ServBase.cs +++ b/Back/Services/ServBase.cs @@ -1,4 +1,5 @@ -using Back.Data.Contracts; +using Back.Common; +using Back.Data.Contracts; using Back.Data.Models; using Microsoft.EntityFrameworkCore; using Shared.DTOs; @@ -25,17 +26,18 @@ namespace Back.Services PermissionID=x.PermissionID, }).ToListAsync(); } - public async Task> GetBlog(int count) + public async Task> GetBlog(int PageIndex, int PageSize) { - return await _repoBlog.Get(w=>w.Status).OrderByDescending(o=>o.ID).Take(count) + return await _repoBlog.Get(w=>w.Status).OrderByDescending(o=>o.ID) .Select(s=>new BlogDto { Title = s.Title, Date=s.Date, ID=s.ID, Photo=string.IsNullOrEmpty(s.Photo) ? "blog-grid-1.jpg" : s.Photo - }) - .ToListAsync(); + }).Paging(PageIndex, PageSize); ; } + + } } diff --git a/Back/Common/DTOs/PagingDto.cs b/Shared/DTOs/PagingDto.cs similarity index 91% rename from Back/Common/DTOs/PagingDto.cs rename to Shared/DTOs/PagingDto.cs index b32df4d..9ad52ac 100644 --- a/Back/Common/DTOs/PagingDto.cs +++ b/Shared/DTOs/PagingDto.cs @@ -1,4 +1,4 @@ -namespace Back.Common.ViewModels +namespace Shared.DTOs { public class PagingDto { diff --git a/TaxPayerFull/Layout/Blog.razor b/TaxPayerFull/Layout/Blog.razor index 96cb258..2de9249 100644 --- a/TaxPayerFull/Layout/Blog.razor +++ b/TaxPayerFull/Layout/Blog.razor @@ -13,7 +13,7 @@
@foreach (var item in items) { - + }
@@ -29,7 +29,8 @@ List items = new List(); protected override async Task OnInitializedAsync() { - items = await _hc.GetFromJsonAsync>("Base/LastBlog/3"); + var request = await _hc.GetFromJsonAsync>("Base/LastBlog?PageIndex=1&PageSize=3"); + items = request.list; await base.OnInitializedAsync(); } } diff --git a/TaxPayerFull/Layout/ItemBlog.razor b/TaxPayerFull/Layout/ItemBloginHome.razor similarity index 88% rename from TaxPayerFull/Layout/ItemBlog.razor rename to TaxPayerFull/Layout/ItemBloginHome.razor index bf7d6d6..9e51261 100644 --- a/TaxPayerFull/Layout/ItemBlog.razor +++ b/TaxPayerFull/Layout/ItemBloginHome.razor @@ -1,9 +1,9 @@ @using Shared.DTOs - +@inject NavigationManager Navigation
- +
@@ -33,4 +33,5 @@ @code { [Parameter] public BlogDto? Item { get; set; } + } diff --git a/TaxPayerFull/Pages/BlogDetails.razor b/TaxPayerFull/Pages/BlogDetails.razor new file mode 100644 index 0000000..a4a7d89 --- /dev/null +++ b/TaxPayerFull/Pages/BlogDetails.razor @@ -0,0 +1,193 @@ +@using Shared.DTOs +@inject HttpClient _hc +@layout BlogLayout +@page "/BlogDetails/{ItemID:int}" +دانشنامه + +
+ + + + + +
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+
+
+
+ +
+

تاریخ طراحی وب

+

+ لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ، و با استفاده از طراحان + گرافیک است، چاپگرها و متون بلکه روزنامه و مجله در ستون و سطرآنچنان که لازم است، و + برای شرایط فعلی تکنولوژی مورد نیاز، و کاربردهای متنوع با هدف بهبود ابزارهای کاربردی + می باشد، کتابهای +

+

+ لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ، و با استفاده از طراحان + گرافیک است، چاپگرها و متون بلکه روزنامه و مجله در ستون و سطرآنچنان که +

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

“تیم در سافت تک فوق العاده اختصاصی ، دانش و مفید است.

+ سقراط +
+
+
+ + + + + + +
+
+
+ +
+
+
+ + + + +
+ +@code { + [Parameter] + public int? ItemID { get; set; } + +} diff --git a/TaxPayerFull/Pages/ListBlog.razor b/TaxPayerFull/Pages/ListBlog.razor index 4519f66..633e2eb 100644 --- a/TaxPayerFull/Pages/ListBlog.razor +++ b/TaxPayerFull/Pages/ListBlog.razor @@ -1,400 +1,111 @@ -@layout BlogLayout +@using Shared.DTOs +@inject HttpClient _hc +@layout BlogLayout @page "/ListBlog" +@inject NavigationManager Navigation دانشنامه
- -
+ + @code { + [Parameter,SupplyParameterFromQuery] + public int? PageIndex { get; set; } + public Shared.DTOs.PagingDto? request { get; set; } + + protected override async Task OnParametersSetAsync() + { + if (PageIndex == null) PageIndex = 1; + request = await _hc.GetFromJsonAsync>($"Base/LastBlog?PageIndex={PageIndex ?? 1}&PageSize=6"); + await base.OnParametersSetAsync(); + } + } diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs index 65ce1af..27ef188 100644 --- a/TaxPayerFull/Program.cs +++ b/TaxPayerFull/Program.cs @@ -7,7 +7,9 @@ var builder = WebAssemblyHostBuilder.CreateDefault(args); builder.RootComponents.Add("#app"); builder.RootComponents.Add("head::after"); -builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") }); +//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") }); + +builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") }); CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir");