Merge pull request #181 from Sidekick-Poe/feature/remove-cheatsheets

Removed the cheatsheet module.

README.md

@@ -2,7 +2,7 @@
 
 [![Open Website](https://img.shields.io/badge/website-6b6ebe?style=flat-square)](https://sidekick-poe.github.io/) [![Download](https://img.shields.io/badge/download-00BCD4?style=flat-square)](https://sidekick-poe.github.io/) [![](https://img.shields.io/github/v/release/Sidekick-Poe/Sidekick?style=flat-square)](https://github.com/Sidekick-Poe/Sidekick/releases) [![](https://img.shields.io/github/downloads-pre/Sidekick-Poe/Sidekick/total?style=flat-square)](https://github.com/Sidekick-Poe/Sidekick/releases) [![](https://img.shields.io/discord/664252463188279300?color=%23738AD6&label=Discord&style=flat-square)](https://discord.gg/H4bg4GQ)
 
-A Path of Exile companion tool. Price check items, check for dangerous map modifiers, look at easily accessible cheatsheets, and more!
+A Path of Exile companion tool. Price check items, check for dangerous map modifiers, and more!
 
 [![Website](https://img.shields.io/badge/Website_and_Download-6b6ebe?style=for-the-badge)](https://sidekick-poe.github.io/)
 

Sidekick.sln

@@ -26,8 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1D8BF515
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sidekick.Mock", "src\Sidekick.Mock\Sidekick.Mock.csproj", "{1C2974D8-B04E-4BF5-8CD8-65A82EE89493}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sidekick.Modules.Cheatsheets", "src\Sidekick.Modules.Cheatsheets\Sidekick.Modules.Cheatsheets.csproj", "{1182B4D2-EFD9-4155-8021-1A44897D25D1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sidekick.Common.Blazor", "src\Sidekick.Common.Blazor\Sidekick.Common.Blazor.csproj", "{A78010BD-2B6B-4D13-A1A5-F90B1C395C1A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sidekick.Common", "src\Sidekick.Common\Sidekick.Common.csproj", "{484EAA27-27A0-4B0E-BA43-B5047D697CAE}"
@@ -48,8 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sidekick.Apis.Poe", "src\Si
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sidekick.Apis.PoePriceInfo", "src\Sidekick.Apis.PoePriceInfo\Sidekick.Apis.PoePriceInfo.csproj", "{8A13FFC9-5C43-4565-B24C-2F2F10BF5AA2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sidekick.Modules.About", "src\Sidekick.Modules.About\Sidekick.Modules.About.csproj", "{8E63B10C-109A-442B-81DE-1B7280988C0F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sidekick.Modules.Development", "src\Sidekick.Modules.Development\Sidekick.Modules.Development.csproj", "{10ECD152-C29C-4799-BF16-76CC33DA82F4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sidekick.Modules.Maps", "src\Sidekick.Modules.Maps\Sidekick.Modules.Maps.csproj", "{642D3141-6336-4424-A4D4-C97498615C3F}"
@@ -84,10 +80,6 @@ Global
 		{1C2974D8-B04E-4BF5-8CD8-65A82EE89493}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1C2974D8-B04E-4BF5-8CD8-65A82EE89493}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C2974D8-B04E-4BF5-8CD8-65A82EE89493}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1182B4D2-EFD9-4155-8021-1A44897D25D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1182B4D2-EFD9-4155-8021-1A44897D25D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1182B4D2-EFD9-4155-8021-1A44897D25D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1182B4D2-EFD9-4155-8021-1A44897D25D1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A78010BD-2B6B-4D13-A1A5-F90B1C395C1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A78010BD-2B6B-4D13-A1A5-F90B1C395C1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A78010BD-2B6B-4D13-A1A5-F90B1C395C1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -120,10 +112,6 @@ Global
 		{8A13FFC9-5C43-4565-B24C-2F2F10BF5AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A13FFC9-5C43-4565-B24C-2F2F10BF5AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A13FFC9-5C43-4565-B24C-2F2F10BF5AA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E63B10C-109A-442B-81DE-1B7280988C0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E63B10C-109A-442B-81DE-1B7280988C0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E63B10C-109A-442B-81DE-1B7280988C0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E63B10C-109A-442B-81DE-1B7280988C0F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10ECD152-C29C-4799-BF16-76CC33DA82F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10ECD152-C29C-4799-BF16-76CC33DA82F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10ECD152-C29C-4799-BF16-76CC33DA82F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -178,7 +166,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{1C2974D8-B04E-4BF5-8CD8-65A82EE89493} = {1D8BF515-81E9-4769-9B27-24DFB8D8BDCC}
-		{1182B4D2-EFD9-4155-8021-1A44897D25D1} = {BB6816F5-1413-4545-96FA-D31D2D9BF6B1}
 		{A78010BD-2B6B-4D13-A1A5-F90B1C395C1A} = {E4920CFB-0EED-44B1-AC8D-8F5ECBCB7788}
 		{484EAA27-27A0-4B0E-BA43-B5047D697CAE} = {E4920CFB-0EED-44B1-AC8D-8F5ECBCB7788}
 		{13179DD8-18ED-4BDC-B317-E7A6F45D363D} = {BB6816F5-1413-4545-96FA-D31D2D9BF6B1}
@@ -187,7 +174,6 @@ Global
 		{DF327715-65A1-4F16-A016-CE7A87E921E4} = {7285BD58-2544-44AA-8488-52EA8E55D239}
 		{D3311A5D-F921-4B5F-9EB1-6AEC5EAD72FF} = {7285BD58-2544-44AA-8488-52EA8E55D239}
 		{8A13FFC9-5C43-4565-B24C-2F2F10BF5AA2} = {7285BD58-2544-44AA-8488-52EA8E55D239}
-		{8E63B10C-109A-442B-81DE-1B7280988C0F} = {BB6816F5-1413-4545-96FA-D31D2D9BF6B1}
 		{10ECD152-C29C-4799-BF16-76CC33DA82F4} = {BB6816F5-1413-4545-96FA-D31D2D9BF6B1}
 		{642D3141-6336-4424-A4D4-C97498615C3F} = {BB6816F5-1413-4545-96FA-D31D2D9BF6B1}
 		{AD46F63E-E1AE-4E71-AC6B-B1947AFED1A3} = {BB6816F5-1413-4545-96FA-D31D2D9BF6B1}

src/Sidekick.Common.Blazor/Initialization/Initialization.razor.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Sidekick.Common.Blazor.Views;
+using Sidekick.Common.Browser;
 using Sidekick.Common.Initialization;
 using Sidekick.Common.Platform;
 using Sidekick.Common.Settings;
@@ -33,8 +34,11 @@ public partial class Initialization : SidekickView
         [Inject]
         private IServiceProvider ServiceProvider { get; set; } = null!;
 
-        private int Count { get; set; } = 0;
-        private int Completed { get; set; } = 0;
+        [Inject]
+        private IBrowserProvider BrowserProvider { get; set; } = null!;
+
+        private int Count { get; set; }
+        private int Completed { get; set; }
         private string? Step { get; set; }
         private int Percentage { get; set; }
         private bool Error { get; set; }
@@ -63,11 +67,13 @@ public async Task Handle()
                 foreach (var serviceType in Configuration.Value.InitializableServices)
                 {
                     var service = ServiceProvider.GetRequiredService(serviceType);
-                    if (service is IInitializableService initializableService)
+                    if (service is not IInitializableService initializableService)
                     {
-                        Logger.LogInformation($"[Initiazation] Initializing {initializableService.GetType().FullName}");
-                        await Run(initializableService.Initialize);
+                        continue;
                     }
+
+                    Logger.LogInformation($"[Initiazation] Initializing {initializableService.GetType().FullName}");
+                    await Run(initializableService.Initialize);
                 }
 
                 await Run(() => InitializeTray());
@@ -137,9 +143,12 @@ private void InitializeTray()
             menuItems.AddRange(new List<TrayMenuItem>()
             {
                 new (label: "Sidekick - " + FileVersionInfo.GetVersionInfo(GetType().Assembly.Location).ProductVersion),
-                new (label: "Cheatsheets", onClick: () => ViewLocator.Open("/cheatsheets")),
+                new (label: "Open the Website", onClick: () =>
+                {
+                    BrowserProvider.OpenSidekickWebsite();
+                    return Task.CompletedTask;
+                }),
                 new (label: "Wealth", onClick: () => ViewLocator.Open("/wealth")),
-                new (label: "About", onClick: () => ViewLocator.Open("/about")),
                 new (label: "Settings", onClick: () => ViewLocator.Open("/settings")),
                 new (label: "Exit", onClick: () => { ApplicationService.Shutdown(); return Task.CompletedTask; }),
             });

src/Sidekick.Common/ServiceCollectionExtensions.cs

@@ -29,7 +29,6 @@ public static IServiceCollection AddSidekickCommon(this IServiceCollection servi
             var settings = new Settings.Settings();
             configuration.Bind(settings);
             configuration.BindList(nameof(ISettings.Chat_Commands), settings.Chat_Commands);
-            configuration.BindList(nameof(ISettings.Cheatsheets_Pages), settings.Cheatsheets_Pages);
             services.AddTransient<ISettings>(_ => settings);
 
             services.AddSingleton<IBrowserProvider, BrowserProvider>();

src/Sidekick.Common/Settings/ISettings.cs

@@ -32,23 +32,11 @@ public interface ISettings
         string Map_Key_Check { get; }
         string Map_Dangerous_Regex { get; }
 
-        #region Cheatsheets
-
-        string Cheatsheets_Key_Open { get; }
-        string Cheatsheets_Selected { get; }
-        List<CheatsheetPage> Cheatsheets_Pages { get; }
-
-        #endregion Cheatsheets
-
         List<ChatSetting> Chat_Commands { get; }
 
-        #region Cheatsheets
-
         string Wiki_Key_Open { get; }
         WikiSetting Wiki_Preferred { get; }
 
-        #endregion Cheatsheets
-
         DateTimeOffset? PoeNinja_LastClear { get; }
         string Wealth_Key_Open { get; }
         string Current_Directory { get; }

src/Sidekick.Common/Settings/Settings.cs

@@ -11,22 +11,6 @@ public static List<ChatSetting> GetDefaultChatCommands() =>
             new ChatSetting("F9", "/exit", true),
         };
 
-        public static List<CheatsheetPage> GetDefaultCheatsheets() =>
-        new()
-        {
-            new CheatsheetPage("Wiki: Betrayal", "https://www.poewiki.net/wiki/Immortal_Syndicate"),
-            new CheatsheetPage("Wiki: Blight", "https://www.poewiki.net/wiki/Oil"),
-            new CheatsheetPage("Wiki: Delve", "https://www.poewiki.net/wiki/Delve"),
-            new CheatsheetPage("Wiki: Heist", "https://www.poewiki.net/wiki/Heist"),
-            new CheatsheetPage("Wiki: Incursion", "https://www.poewiki.net/wiki/Incursion_room"),
-            new CheatsheetPage("Wiki: Vendor Recipes", "https://www.poewiki.net/wiki/Vendor_recipe_system"),
-            new CheatsheetPage("Leveling", "https://poe-leveling.com/"),
-            new CheatsheetPage("Poe Labyrinth", "https://www.poelab.com/"),
-            new CheatsheetPage("Regex Tool", "https://poe.re/"),
-            new CheatsheetPage("Chromatic Calculator", "https://siveran.github.io/calc.html"),
-            new CheatsheetPage("Blight Anointments", "https://blight.raelys.com/"),
-        };
-
         public string Bearer_Token { get; set; } = "";
 
         public DateTimeOffset? Bearer_Expiration { get; set; } = null;
@@ -83,14 +67,6 @@ public static List<CheatsheetPage> GetDefaultCheatsheets() =>
 
         public List<ChatSetting> Chat_Commands { get; set; } = GetDefaultChatCommands();
 
-        #region Cheatsheets
-
-        public string Cheatsheets_Key_Open { get; set; } = "F6";
-        public string Cheatsheets_Selected { get; set; } = "betrayal";
-        public List<CheatsheetPage> Cheatsheets_Pages { get; set; } = GetDefaultCheatsheets();
-
-        #endregion Cheatsheets
-
         public DateTimeOffset? PoeNinja_LastClear { get; set; } = null;
 
         public string Current_Directory { get; set; } = "";

src/Sidekick.Electron/Program.cs

@@ -11,9 +11,7 @@
 using Sidekick.Common.Blazor.Views;
 using Sidekick.Common.Platform;
 using Sidekick.Electron;
-using Sidekick.Modules.About;
 using Sidekick.Modules.Chat;
-using Sidekick.Modules.Cheatsheets;
 using Sidekick.Modules.Development;
 using Sidekick.Modules.General;
 using Sidekick.Modules.Maps;
@@ -67,9 +65,7 @@
     .AddSidekickPoeWikiApi()
 
     // Modules
-    .AddSidekickAbout()
     .AddSidekickChat()
-    .AddSidekickCheatsheets()
     .AddSidekickDevelopment()
     .AddSidekickGeneral()
     .AddSidekickMaps()

src/Sidekick.Electron/Sidekick.Electron.csproj

@@ -21,9 +21,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Sidekick.Common.Platform\Sidekick.Common.Platform.csproj" />
     <ProjectReference Include="..\Sidekick.Mock\Sidekick.Mock.csproj" />
-    <ProjectReference Include="..\Sidekick.Modules.About\Sidekick.Modules.About.csproj" />
     <ProjectReference Include="..\Sidekick.Modules.Chat\Sidekick.Modules.Chat.csproj" />
-    <ProjectReference Include="..\Sidekick.Modules.Cheatsheets\Sidekick.Modules.Cheatsheets.csproj" />
     <ProjectReference Include="..\Sidekick.Modules.Development\Sidekick.Modules.Development.csproj" />
     <ProjectReference Include="..\Sidekick.Modules.General\Sidekick.Modules.General.csproj" />
     <ProjectReference Include="..\Sidekick.Modules.Maps\Sidekick.Modules.Maps.csproj" />