From 3cb50635e559e362fec869b12768f111eea5f299 Mon Sep 17 00:00:00 2001
From: RaidMax <raidmax@live.com>
Date: Tue, 19 Apr 2022 22:34:35 -0500
Subject: [PATCH] small updates that got lost in last commit

---
 DeploymentFiles/deployment-pipeline.yml       |  1 +
 Plugins/Stats/Plugin.cs                       | 23 +++++++------------
 .../Controllers/Client/ClientController.cs    |  2 +-
 WebfrontCore/Views/Shared/_Layout.cshtml      |  2 +-
 WebfrontCore/WebfrontCore.csproj              | 11 +--------
 5 files changed, 12 insertions(+), 27 deletions(-)

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<IEnumerable<InformationResponse>> 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<IActionResult> 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 @@
         }
     </environment>
     <environment include="Production">
-        <link rel="stylesheet" href="~/dynamic/css/global.min.css?version=@ViewBag.Version"/>
+        <link rel="stylesheet" href="~/css/global.min.css?version=@ViewBag.Version"/>
     </environment>
     @await RenderSectionAsync("styles", false)
 </head>
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 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <TypeScriptToolsVersion>2.6</TypeScriptToolsVersion>
     <PackageId>RaidMax.IW4MAdmin.WebfrontCore</PackageId>
-    <Version>2.0.0</Version>
+    <Version>2022.0.0</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
@@ -31,15 +31,6 @@
     <LangVersion>Latest</LangVersion>
   </PropertyGroup>
   
-  <ItemGroup>
-    <None Include="bundleconfig.json" />
-    <None Include="compilerconfig.json" />
-    <None Remove="dotnet-bundle.exe" />
-    <None Remove="dotnet-bundle.dll" />
-    <None Remove="Newtonsoft.Json.dll" />
-    <None Remove="NUglify.dll" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Update="wwwroot\**\*.*" CopyToPublishDirectory="Never" />
     <Content Update="wwwroot\css\src\global.css" CopyToPublishDirectory="Never" />