From df29327231c3b092757378c9514066b3f83d92e2 Mon Sep 17 00:00:00 2001 From: Mikhail Shabanov Date: Wed, 21 Jul 2021 15:44:14 +0200 Subject: [PATCH] feat: simple player layout --- .../Pages/PlayerInfoLayout.razor | 18 +++++-- .../Pages/PlayerInfoLayout.razor.css | 4 ++ .../Pages/PlayerInfoLayoutBase.cs | 5 ++ .../Pages/PlayerInfoOverview.razor | 54 ++++++++++++++++++- .../Resources/App.de.resx | 12 +++-- .../Resources/App.ru.resx | 6 +++ 6 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor.css diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor index 964bf42..46bfa0b 100644 --- a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor +++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor @@ -6,10 +6,20 @@ Style="width: 100%; margin-top: 10px;" /> @if (AccountInfo != null) { - @AccountInfo.Nickname @if (AccountInfo.ClanInfo != null) - { - [@AccountInfo.ClanInfo.Tag] - } +

+ @AccountInfo.Nickname @if (AccountInfo.ClanInfo != null) + { + [@AccountInfo.ClanInfo.Tag] + } +

+
+
+ @Localize["Created"]: @AccountInfo.CreatedAt.ToString("d") | @AccountInfo.CreatedAt.SinceTime(Localize) +
+
+ @Localize["Last battle"]: @AccountInfo.LastBattleTime.ToString("g") | @AccountInfo.LastBattleTime.SinceTime(Localize) +
+
diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor.css b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor.css new file mode 100644 index 0000000..af80559 --- /dev/null +++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor.css @@ -0,0 +1,4 @@ +dates-section { + margin-top: 10px; + margin-bottom: 10px; +} diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayoutBase.cs b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayoutBase.cs index 14ac072..567d59f 100644 --- a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayoutBase.cs +++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayoutBase.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Localization; using WotBlitzStatisticsPro.Blazor.GraphQl; using WotBlitzStatisticsPro.Blazor.Services; @@ -14,6 +15,10 @@ namespace WotBlitzStatisticsPro.Blazor.Pages [Inject] public ILocalStorageService LocalStorageService { get; set; } + [Inject] + public IStringLocalizer Localize { get; set; } + + [Parameter] public long AccountId { get; set; } diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoOverview.razor b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoOverview.razor index a1bad7d..5d977a4 100644 --- a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoOverview.razor +++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoOverview.razor @@ -1,6 +1,58 @@ -@AccountInfo.WinRate % +@using WotBlitzStatisticsPro.Blazor.Helpers +@inject IStringLocalizer Localize; + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
@Localize["Battles"]:@AccountInfo.Battles.ToString("N0")
@Localize["Win rate"]: + @AccountInfo.WinRate.ToString("N2")% +
+
@Localize["Wn7"]: + @AccountInfo.Wn7.ToString("N2") +
+
@Localize["Average Damage"]:@AccountInfo.AvgDamage.ToString("N0")
@Localize["Average XP"]:@AccountInfo.AvgXp.ToString("N0")
+
+
+ @if(MostRelevantTank != null) + { +

@MostRelevantTank.Name

+ } +
+
+ @code { [Parameter] public IAccount AccountInfo { get; set; } + + public ITank? MostRelevantTank; + + protected override void OnInitialized() + { + MostRelevantTank = AccountInfo?.Tanks?.Where(t => t.Battles > 50).OrderByDescending(t => t.Wn7).FirstOrDefault(); + } + } diff --git a/WotBlitzStatisticsPro.Blazor/Resources/App.de.resx b/WotBlitzStatisticsPro.Blazor/Resources/App.de.resx index 6403033..6715233 100644 --- a/WotBlitzStatisticsPro.Blazor/Resources/App.de.resx +++ b/WotBlitzStatisticsPro.Blazor/Resources/App.de.resx @@ -117,8 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Mittlerer Schaden + + + Mittlere EP + - Schlachten + Gefechte Abbrechen @@ -151,7 +157,7 @@ vor Stunden - Letzte Schlacht + Letzte Gefecht Anmelden mit WG.net-ID @@ -199,7 +205,7 @@ Willkommen bei der WOT Blitz statistics! - Gewinnrate + Sieg vor Jahren diff --git a/WotBlitzStatisticsPro.Blazor/Resources/App.ru.resx b/WotBlitzStatisticsPro.Blazor/Resources/App.ru.resx index 92da465..e4ef13a 100644 --- a/WotBlitzStatisticsPro.Blazor/Resources/App.ru.resx +++ b/WotBlitzStatisticsPro.Blazor/Resources/App.ru.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Средний урон + + + Средний опыт + Количество боёв