refactor(KIAUH): full refactor of client and client-config installation

Signed-off-by: Dominik Willner <th33xitus@gmail.com>

kiauh/components/moonraker/menus/moonraker_remove_menu.py

@@ -29,7 +29,7 @@ class MoonrakerRemoveMenu(BaseMenu):
                 "3": self.toggle_remove_moonraker_env,
                 "4": self.toggle_remove_moonraker_polkit,
                 "5": self.toggle_delete_moonraker_logs,
-                "6": self.run_removal_process,
+                "c": self.run_removal_process,
             },
             footer_type=BACK_HELP_FOOTER,
         )
@@ -66,7 +66,7 @@ class MoonrakerRemoveMenu(BaseMenu):
             |  4) {o4} Remove Policy Kit Rules                       |
             |  5) {o5} Delete all Log-Files                          |
             |-------------------------------------------------------|
-            |  6) Continue                                          |
+            |  C) Continue                                          |
             """
         )[1:]
         print(menu, end="")

kiauh/components/moonraker/moonraker_setup.py

@@ -14,11 +14,11 @@ import sys
 from pathlib import Path
 from typing import List
 
+from components.webui_client import MAINSAIL_DIR
+from components.webui_client.client_utils import enable_mainsail_remotemode
 from kiauh import KIAUH_CFG
 from components.klipper.klipper import Klipper
 from components.klipper.klipper_dialogs import print_instance_overview
-from components.mainsail import MAINSAIL_DIR
-from components.mainsail.mainsail_utils import enable_mainsail_remotemode
 from components.moonraker import (
     EXIT_MOONRAKER_SETUP,
     DEFAULT_MOONRAKER_REPO_URL,

kiauh/components/moonraker/moonraker_utils.py

@@ -12,8 +12,6 @@
 import shutil
 from typing import Dict, Literal, List, Union
 
-from components.mainsail import MAINSAIL_DIR
-from components.mainsail.mainsail_utils import enable_mainsail_remotemode
 from components.moonraker import (
     DEFAULT_MOONRAKER_PORT,
     MODULE_PATH,
@@ -23,6 +21,8 @@ from components.moonraker import (
     MOONRAKER_DB_BACKUP_DIR,
 )
 from components.moonraker.moonraker import Moonraker
+from components.webui_client import MAINSAIL_DIR
+from components.webui_client.client_utils import enable_mainsail_remotemode
 from core.backup_manager.backup_manager import BackupManager
 from core.config_manager.config_manager import ConfigManager
 from core.instance_manager.instance_manager import InstanceManager