diff --git a/Application/Application.csproj b/Application/Application.csproj index 7e478c63..7eca5dcb 100644 --- a/Application/Application.csproj +++ b/Application/Application.csproj @@ -6,7 +6,7 @@ 2.2.2 false RaidMax.IW4MAdmin.Application - 2.2.5.1 + 2.2.5.2 RaidMax Forever None IW4MAdmin @@ -31,8 +31,8 @@ true true - 2.2.5.1 - 2.2.5.1 + 2.2.5.2 + 2.2.5.2 @@ -45,21 +45,6 @@ - - - True - True - IW4MAdmin.en-US.resx - - - - - - ResXFileCodeGenerator - IW4MAdmin.en-US.Designer.cs - - - Always diff --git a/Application/ApplicationManager.cs b/Application/ApplicationManager.cs index 4cae4cb5..68e245ba 100644 --- a/Application/ApplicationManager.cs +++ b/Application/ApplicationManager.cs @@ -594,7 +594,7 @@ namespace IW4MAdmin.Application public IList GetPluginAssemblies() { - return SharedLibraryCore.Plugins.PluginImporter.PluginAssemblies; + return SharedLibraryCore.Plugins.PluginImporter.PluginAssemblies.Union(SharedLibraryCore.Plugins.PluginImporter.Assemblies).ToList(); } public IPageList GetPageList() diff --git a/IW4MAdmin.sln b/IW4MAdmin.sln index 4f3dc013..6a109f9d 100644 --- a/IW4MAdmin.sln +++ b/IW4MAdmin.sln @@ -48,6 +48,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug EndProject Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "GameLogServer", "GameLogServer\GameLogServer.pyproj", "{42EFDA12-10D3-4C40-A210-9483520116BC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{A848FCF1-8527-4AA8-A1AA-50D29695C678}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatsWeb", "Plugins\Web\StatsWeb\StatsWeb.csproj", "{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -338,6 +342,30 @@ Global {42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x64.Build.0 = Release|Any CPU {42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x86.ActiveCfg = Release|Any CPU {42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x86.Build.0 = Release|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|x64.ActiveCfg = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|x64.Build.0 = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|x86.ActiveCfg = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|x86.Build.0 = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Any CPU.Build.0 = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|x64.ActiveCfg = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|x64.Build.0 = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|x86.ActiveCfg = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Prerelease|x86.Build.0 = Debug|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|Any CPU.Build.0 = Release|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|x64.ActiveCfg = Release|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|x64.Build.0 = Release|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|x86.ActiveCfg = Release|Any CPU + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -350,6 +378,8 @@ Global {B72DEBFB-9D48-4076-8FF5-1FD72A830845} = {26E8B310-269E-46D4-A612-24601F16065F} {6C706CE5-A206-4E46-8712-F8C48D526091} = {26E8B310-269E-46D4-A612-24601F16065F} {3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA} = {26E8B310-269E-46D4-A612-24601F16065F} + {A848FCF1-8527-4AA8-A1AA-50D29695C678} = {26E8B310-269E-46D4-A612-24601F16065F} + {776B348B-F818-4A0F-A625-D0AF8BAD3E9B} = {A848FCF1-8527-4AA8-A1AA-50D29695C678} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {84F8F8E0-1F73-41E0-BD8D-BB6676E2EE87} diff --git a/Plugins/Stats/Web/Controllers/StatsController.cs b/Plugins/Stats/Controllers/StatsController.cs similarity index 100% rename from Plugins/Stats/Web/Controllers/StatsController.cs rename to Plugins/Stats/Controllers/StatsController.cs diff --git a/Plugins/Stats/Web/Dtos/TopStatsInfo.cs b/Plugins/Stats/Dtos/TopStatsInfo.cs similarity index 100% rename from Plugins/Stats/Web/Dtos/TopStatsInfo.cs rename to Plugins/Stats/Dtos/TopStatsInfo.cs diff --git a/Plugins/Stats/Stats.csproj b/Plugins/Stats/Stats.csproj index 84280722..990171fc 100644 --- a/Plugins/Stats/Stats.csproj +++ b/Plugins/Stats/Stats.csproj @@ -15,12 +15,6 @@ Debug;Release;Prerelease - - - PreserveNewest - - - @@ -33,9 +27,4 @@ - - - - - diff --git a/Plugins/Stats/Web/wwwroot/images/icons/0_no-place/dds/menu_div_no_place.dds b/Plugins/Stats/Web/wwwroot/images/icons/0_no-place/dds/menu_div_no_place.dds deleted file mode 100644 index 62af07b1..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/0_no-place/dds/menu_div_no_place.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/0_no-place/dds/menu_div_no_place_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/0_no-place/dds/menu_div_no_place_64.dds deleted file mode 100644 index 592f42c8..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/0_no-place/dds/menu_div_no_place_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron.dds b/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron.dds deleted file mode 100644 index 5f1bc4d2..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_64.dds deleted file mode 100644 index 7a4c47cb..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub01.dds b/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub01.dds deleted file mode 100644 index 180c8217..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub01.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub01_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub01_64.dds deleted file mode 100644 index 61b54c4a..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub01_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub02.dds b/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub02.dds deleted file mode 100644 index e5ce688e..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub02.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub02_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub02_64.dds deleted file mode 100644 index 48da2cd8..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub02_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub03.dds b/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub03.dds deleted file mode 100644 index 204182d1..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub03.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub03_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub03_64.dds deleted file mode 100644 index 25847823..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/dds/menu_div_iron_sub03_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze.dds b/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze.dds deleted file mode 100644 index c2c4a760..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_64.dds deleted file mode 100644 index bf0710f8..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub01.dds b/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub01.dds deleted file mode 100644 index 2a6a56d8..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub01.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub01_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub01_64.dds deleted file mode 100644 index e1729d70..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub01_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub02.dds b/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub02.dds deleted file mode 100644 index d52d3af2..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub02.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub02_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub02_64.dds deleted file mode 100644 index e8c3ec97..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub02_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub03.dds b/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub03.dds deleted file mode 100644 index e61f4fe8..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub03.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub03_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub03_64.dds deleted file mode 100644 index c758ac83..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/dds/menu_div_bronze_sub03_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver.dds b/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver.dds deleted file mode 100644 index 202ac48c..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_64.dds deleted file mode 100644 index 80093e1e..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub01.dds b/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub01.dds deleted file mode 100644 index eceae447..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub01.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub01_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub01_64.dds deleted file mode 100644 index 1ea0d48c..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub01_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub02.dds b/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub02.dds deleted file mode 100644 index 1fd1e149..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub02.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub02_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub02_64.dds deleted file mode 100644 index dab4f1a9..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub02_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub03.dds b/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub03.dds deleted file mode 100644 index be41ccf6..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub03.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub03_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub03_64.dds deleted file mode 100644 index d9eb930e..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/dds/menu_div_silver_sub03_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold.dds b/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold.dds deleted file mode 100644 index 772bc370..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_64.dds deleted file mode 100644 index dcf3252a..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub01.dds b/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub01.dds deleted file mode 100644 index 8cb336e1..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub01.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub01_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub01_64.dds deleted file mode 100644 index b520c6cb..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub01_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub02.dds b/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub02.dds deleted file mode 100644 index 1966c2cc..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub02.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub02_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub02_64.dds deleted file mode 100644 index 0c3215dc..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub02_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub03.dds b/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub03.dds deleted file mode 100644 index ce7a3988..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub03.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub03_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub03_64.dds deleted file mode 100644 index b707b2af..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/dds/menu_div_gold_sub03_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum.dds b/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum.dds deleted file mode 100644 index 74603011..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_64.dds deleted file mode 100644 index ff2a37b4..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub01.dds b/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub01.dds deleted file mode 100644 index 2622aa29..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub01.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub01_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub01_64.dds deleted file mode 100644 index bdce4570..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub01_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub02.dds b/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub02.dds deleted file mode 100644 index 51fcd45f..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub02.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub02_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub02_64.dds deleted file mode 100644 index 275c0926..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub02_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub03.dds b/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub03.dds deleted file mode 100644 index 109d0319..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub03.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub03_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub03_64.dds deleted file mode 100644 index cb671b36..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/dds/menu_div_platinum_sub03_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro.dds b/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro.dds deleted file mode 100644 index 38884ba5..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_64.dds deleted file mode 100644 index ce319236..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub01.dds b/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub01.dds deleted file mode 100644 index c0f0449e..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub01.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub01_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub01_64.dds deleted file mode 100644 index 395411ab..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub01_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub02.dds b/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub02.dds deleted file mode 100644 index ffb3b9db..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub02.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub02_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub02_64.dds deleted file mode 100644 index 3f9a10c4..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub02_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub03.dds b/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub03.dds deleted file mode 100644 index 39b6bf83..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub03.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub03_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub03_64.dds deleted file mode 100644 index 265b4955..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/dds/menu_div_semipro_sub03_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro.dds b/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro.dds deleted file mode 100644 index 5721f81d..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_64.dds deleted file mode 100644 index a2e24086..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub01.dds b/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub01.dds deleted file mode 100644 index 1f362891..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub01.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub01_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub01_64.dds deleted file mode 100644 index 4090510a..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub01_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub02.dds b/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub02.dds deleted file mode 100644 index a59f2138..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub02.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub02_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub02_64.dds deleted file mode 100644 index 59fbaafc..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub02_64.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub03.dds b/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub03.dds deleted file mode 100644 index 6caa1079..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub03.dds and /dev/null differ diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub03_64.dds b/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub03_64.dds deleted file mode 100644 index 422c91f3..00000000 Binary files a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/dds/menu_div_pro_sub03_64.dds and /dev/null differ diff --git a/Plugins/Web/StatsWeb/StatsWeb.csproj b/Plugins/Web/StatsWeb/StatsWeb.csproj new file mode 100644 index 00000000..3bd7e4f4 --- /dev/null +++ b/Plugins/Web/StatsWeb/StatsWeb.csproj @@ -0,0 +1,32 @@ + + + netcoreapp2.2 + true + RazorSdk + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Stats/Web/Views/Stats/Index.cshtml b/Plugins/Web/StatsWeb/Views/Stats/Index.cshtml similarity index 53% rename from Plugins/Stats/Web/Views/Stats/Index.cshtml rename to Plugins/Web/StatsWeb/Views/Stats/Index.cshtml index 3d251ccb..34a1e030 100644 --- a/Plugins/Stats/Web/Views/Stats/Index.cshtml +++ b/Plugins/Web/StatsWeb/Views/Stats/Index.cshtml @@ -1,14 +1,14 @@ -@model List -

@ViewBag.Title

+@model List +

@ViewBag.Title

-
- @await Html.PartialAsync("_List", Model) -
+
+ @await Html.PartialAsync("_List", Model) +
- @section scripts { +@section scripts { - } +} diff --git a/Plugins/Stats/Web/Views/Stats/_List.cshtml b/Plugins/Web/StatsWeb/Views/Stats/_List.cshtml similarity index 95% rename from Plugins/Stats/Web/Views/Stats/_List.cshtml rename to Plugins/Web/StatsWeb/Views/Stats/_List.cshtml index 9bd53b4f..66588a0f 100644 --- a/Plugins/Stats/Web/Views/Stats/_List.cshtml +++ b/Plugins/Web/StatsWeb/Views/Stats/_List.cshtml @@ -1,4 +1,4 @@ -@model List +@model List @{ Layout = null; var loc = SharedLibraryCore.Utilities.CurrentLocalization.LocalizationIndex.Set; @@ -46,7 +46,7 @@ } — - @Html.ActionLink((string)stat.Name, "ProfileAsync", "Client", new { id = stat.ClientId }) + @Html.ActionLink(stat.Name, "ProfileAsync", "Client", new { id = stat.ClientId }) @stat.Performance @loc["PLUGINS_STATS_COMMANDS_PERFORMANCE"]
diff --git a/Plugins/Stats/Web/Views/Stats/_MessageContext.cshtml b/Plugins/Web/StatsWeb/Views/Stats/_MessageContext.cshtml similarity index 100% rename from Plugins/Stats/Web/Views/Stats/_MessageContext.cshtml rename to Plugins/Web/StatsWeb/Views/Stats/_MessageContext.cshtml diff --git a/Plugins/Stats/Web/Views/Stats/_PenaltyInfo.cshtml b/Plugins/Web/StatsWeb/Views/Stats/_PenaltyInfo.cshtml similarity index 94% rename from Plugins/Stats/Web/Views/Stats/_PenaltyInfo.cshtml rename to Plugins/Web/StatsWeb/Views/Stats/_PenaltyInfo.cshtml index a3059776..32bd8e82 100644 --- a/Plugins/Stats/Web/Views/Stats/_PenaltyInfo.cshtml +++ b/Plugins/Web/StatsWeb/Views/Stats/_PenaltyInfo.cshtml @@ -1,4 +1,4 @@ -@model IEnumerable +@model IEnumerable @{ Layout = null; } diff --git a/Plugins/Stats/Web/wwwroot/images/icons/0_no-place/menu_div_no_place.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/0_no-place/menu_div_no_place.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/0_no-place/menu_div_no_place.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/0_no-place/menu_div_no_place.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/0_no-place/menu_div_no_place_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/0_no-place/menu_div_no_place_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/0_no-place/menu_div_no_place_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/0_no-place/menu_div_no_place_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub01.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub01.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub01.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub01.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub01_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub01_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub01_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub01_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub02.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub02.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub02.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub02.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub02_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub02_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub02_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub02_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub03.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub03.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub03.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub03.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub03_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub03_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/1_iron/menu_div_iron_sub03_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/1_iron/menu_div_iron_sub03_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub01.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub01.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub01.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub01.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub01_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub01_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub01_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub01_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub02.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub02.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub02.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub02.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub02_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub02_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub02_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub02_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub03.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub03.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub03.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub03.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub03_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub03_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/3_silver/menu_div_silver_sub03_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/3_silver/menu_div_silver_sub03_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub01.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub01.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub01.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub01.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub01_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub01_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub01_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub01_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub02.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub02.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub02.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub02.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub02_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub02_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub02_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub02_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub03.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub03.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub03.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub03.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub03_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub03_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/4_gold/menu_div_gold_sub03_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/4_gold/menu_div_gold_sub03_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub01.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub01.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub01.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub01.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub01_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub01_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub01_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub01_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub02.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub02.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub02.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub02.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub02_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub02_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub02_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub02_64.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub03.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub03.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub03.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub03.png diff --git a/Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub03_64.png b/Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub03_64.png similarity index 100% rename from Plugins/Stats/Web/wwwroot/images/icons/7_pro/menu_div_pro_sub03_64.png rename to Plugins/Web/StatsWeb/wwwroot/images/icons/7_pro/menu_div_pro_sub03_64.png diff --git a/SharedLibraryCore/PluginImporter.cs b/SharedLibraryCore/PluginImporter.cs index fd89ac53..bbfd533f 100644 --- a/SharedLibraryCore/PluginImporter.cs +++ b/SharedLibraryCore/PluginImporter.cs @@ -12,6 +12,7 @@ namespace SharedLibraryCore.Plugins public static List ActiveCommands = new List(); public static List ActivePlugins = new List(); public static List PluginAssemblies = new List(); + public static List Assemblies = new List(); public static bool Load(IManager Manager) { @@ -58,6 +59,7 @@ namespace SharedLibraryCore.Plugins { if (Plugin != null) { + Assemblies.Add(Plugin); Type[] types = Plugin.GetTypes(); foreach (Type assemblyType in types) { diff --git a/WebfrontCore/Startup.cs b/WebfrontCore/Startup.cs index b216b4f8..0e663c4c 100644 --- a/WebfrontCore/Startup.cs +++ b/WebfrontCore/Startup.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using SharedLibraryCore.Database; -using System.Linq; using WebfrontCore.Middleware; namespace WebfrontCore @@ -30,15 +30,27 @@ namespace WebfrontCore public void ConfigureServices(IServiceCollection services) { // Add framework services. - var mvcBuilder = services.AddMvc(); + var mvcBuilder = services.AddMvc() + .ConfigureApplicationPartManager(_ => + { + foreach (var assembly in Program.Manager.GetPluginAssemblies()) + { + if (assembly.FullName.Contains("Views")) + { + _.ApplicationParts.Add(new CompiledRazorAssemblyPart(assembly)); + } + + else if (assembly.FullName.Contains("Web")) + { + _.ApplicationParts.Add(new AssemblyPart(assembly)); + } + } + }); foreach (var asm in Program.Manager.GetPluginAssemblies()) - mvcBuilder.AddApplicationPart(asm); - - services.Configure(o => { - o.ViewLocationFormats.Add("/Views/Plugins/{1}/{0}" + RazorViewEngine.ViewExtension); - }); + mvcBuilder.AddApplicationPart(asm); + } services.AddEntityFrameworkSqlite() .AddDbContext(); diff --git a/WebfrontCore/WebfrontCore.csproj b/WebfrontCore/WebfrontCore.csproj index 2697ce1f..79f2d369 100644 --- a/WebfrontCore/WebfrontCore.csproj +++ b/WebfrontCore/WebfrontCore.csproj @@ -3,7 +3,7 @@ netcoreapp2.2 2.2.2 - false + true true true 2.6 @@ -33,7 +33,6 @@ - @@ -44,6 +43,7 @@ +