diff --git a/DeploymentFiles/deployment-pipeline.yml b/DeploymentFiles/deployment-pipeline.yml index 8e1a9691e..f144aeca2 100644 --- a/DeploymentFiles/deployment-pipeline.yml +++ b/DeploymentFiles/deployment-pipeline.yml @@ -75,6 +75,7 @@ steps: Write-Host 'Unzipping download' Expand-Archive -LiteralPath $(Build.Repository.LocalPath)\dotnet-bundle.zip -DestinationPath $(Build.Repository.LocalPath) Write-Host 'Executing dotnet-bundle' + $(Build.Repository.LocalPath)\dotnet-bundle.exe clean $(Build.Repository.LocalPath)\WebfrontCore\bundleconfig.json $(Build.Repository.LocalPath)\dotnet-bundle.exe $(Build.Repository.LocalPath)\WebfrontCore\bundleconfig.json failOnStderr: true workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore' diff --git a/Plugins/Stats/Plugin.cs b/Plugins/Stats/Plugin.cs index 4c2d00758..88fea4301 100644 --- a/Plugins/Stats/Plugin.cs +++ b/Plugins/Stats/Plugin.cs @@ -186,7 +186,7 @@ namespace IW4MAdmin.Plugins.Stats manager.GetPageList() .Pages.Add( Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_TOP_TEXT"], - "/Stats/TopPlayersAsync"); + "/Stats/TopPlayers"); // meta data info async Task> GetStats(ClientPaginationRequest request, CancellationToken token = default) @@ -301,8 +301,7 @@ namespace IW4MAdmin.Plugins.Stats Key = $"{Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_AC_METRIC"]} 1", Value = chestRatio.ToString(new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)) + '%', Type = MetaType.Information, - Column = 2, - Order = 0, + Order = 100, ToolTipText = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_TITLE_ACM1"], IsSensitive = true }, @@ -311,8 +310,7 @@ namespace IW4MAdmin.Plugins.Stats Key = $"{Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_AC_METRIC"]} 2", Value = abdomenRatio.ToString(new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)) + '%', Type = MetaType.Information, - Column = 2, - Order = 1, + Order = 101, ToolTipText = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_TITLE_ACM2"], IsSensitive = true }, @@ -321,8 +319,7 @@ namespace IW4MAdmin.Plugins.Stats Key = $"{Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_AC_METRIC"]} 3", Value = chestAbdomenRatio.ToString(new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)) + '%', Type = MetaType.Information, - Column = 2, - Order = 2, + Order = 102, ToolTipText = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_TITLE_ACM3"], IsSensitive = true }, @@ -331,8 +328,7 @@ namespace IW4MAdmin.Plugins.Stats Key = $"{Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_AC_METRIC"]} 4", Value = headRatio.ToString(new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)) + '%', Type = MetaType.Information, - Column = 2, - Order = 3, + Order = 103, ToolTipText = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_TITLE_ACM4"], IsSensitive = true }, @@ -342,8 +338,7 @@ namespace IW4MAdmin.Plugins.Stats // todo: make sure this is wrapped somewhere else Value = $"{Math.Round(((float)hitOffsetAverage), 4).ToString(new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName))}°", Type = MetaType.Information, - Column = 2, - Order = 4, + Order = 104, ToolTipText = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_TITLE_ACM5"], IsSensitive = true }, @@ -352,8 +347,7 @@ namespace IW4MAdmin.Plugins.Stats Key = $"{Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_AC_METRIC"]} 6", Value = Math.Round(maxStrain, 3).ToString(new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)), Type = MetaType.Information, - Column = 2, - Order = 5, + Order = 105, ToolTipText = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_TITLE_ACM6"], IsSensitive = true }, @@ -362,8 +356,7 @@ namespace IW4MAdmin.Plugins.Stats Key = $"{Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_AC_METRIC"]} 7", Value = Math.Round(averageSnapValue, 3).ToString(new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)), Type = MetaType.Information, - Column = 2, - Order = 6, + Order = 106, ToolTipText = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_TITLE_ACM7"], IsSensitive = true } diff --git a/WebfrontCore/Controllers/Client/ClientController.cs b/WebfrontCore/Controllers/Client/ClientController.cs index ca97a481e..710801b2d 100644 --- a/WebfrontCore/Controllers/Client/ClientController.cs +++ b/WebfrontCore/Controllers/Client/ClientController.cs @@ -35,7 +35,7 @@ namespace WebfrontCore.Controllers [Obsolete] public IActionResult ProfileAsync(int id, MetaType? metaFilterType, CancellationToken token = default) => RedirectToAction("Profile", "Client", new - { id, metaFilterType, token }); + { id, metaFilterType }); public async Task Profile(int id, MetaType? metaFilterType, CancellationToken token = default) { diff --git a/WebfrontCore/Views/Shared/_Layout.cshtml b/WebfrontCore/Views/Shared/_Layout.cshtml index 69908ecc2..3e18952c9 100644 --- a/WebfrontCore/Views/Shared/_Layout.cshtml +++ b/WebfrontCore/Views/Shared/_Layout.cshtml @@ -34,7 +34,7 @@ } - + @await RenderSectionAsync("styles", false) diff --git a/WebfrontCore/WebfrontCore.csproj b/WebfrontCore/WebfrontCore.csproj index 21a519c02..7631cbf33 100644 --- a/WebfrontCore/WebfrontCore.csproj +++ b/WebfrontCore/WebfrontCore.csproj @@ -8,7 +8,7 @@ true 2.6 RaidMax.IW4MAdmin.WebfrontCore - 2.0.0 + 2022.0.0 RaidMax Forever None IW4MAdmin @@ -31,15 +31,6 @@ Latest - - - - - - - - -