From 5cf5b88b16489f3ee17b43b32c71d66e7c4dd522 Mon Sep 17 00:00:00 2001
From: librelad <librelad@digitalangels.vip>
Date: Sun, 31 May 2026 00:07:49 +0100
Subject: [PATCH] fix(webui): flatten redundant
 components/admin/config/icons/config/ + repair engine logos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The config-category icons sat at admin/config/icons/CONFIG/ — the inner config/
duplicates the subsystem name; they belong in the icons root. Moved all 6
(backup, features, general, network, security, webui) up to
components/admin/config/icons/ and updated the two consumers (config-manager.js
header icon, config-sidebar.js category icons).

Also fixed the backup-engine logos: scripts/backup/engines/{restic,kopia,borg}
.json pointed 'logo' at /icons/config/backup.svg — a path that 404'd on two
counts (missing the components/admin/config prefix AND the now-removed config/
nesting), so the engine-details modal logo silently hid. Repointed to the real
served path /components/admin/config/icons/backup.svg.

(Left the meaningful icon groupings alone — admin/system/icons/{cpu,os} and
apps/core/icons/vpn are vendor/OS/provider logo sets, not redundant nesting.
The backup engines borrowing an admin-config icon is a minor smell; a dedicated
backup-engine icon could replace it later if wanted.)

Signed-off-by: librelad <librelad@digitalangels.vip>
---
 .../components/admin/config/icons/{config => }/backup.svg       | 0
 .../components/admin/config/icons/{config => }/features.svg     | 0
 .../components/admin/config/icons/{config => }/general.svg      | 0
 .../components/admin/config/icons/{config => }/network.svg      | 0
 .../components/admin/config/icons/{config => }/security.svg     | 0
 .../components/admin/config/icons/{config => }/webui.svg        | 0
 .../frontend/components/admin/config/js/config-manager.js       | 2 +-
 .../frontend/components/admin/config/js/config-sidebar.js       | 2 +-
 scripts/backup/engines/borg.json                                | 2 +-
 scripts/backup/engines/kopia.json                               | 2 +-
 scripts/backup/engines/restic.json                              | 2 +-
 11 files changed, 5 insertions(+), 5 deletions(-)
 rename containers/libreportal/frontend/components/admin/config/icons/{config => }/backup.svg (100%)
 rename containers/libreportal/frontend/components/admin/config/icons/{config => }/features.svg (100%)
 rename containers/libreportal/frontend/components/admin/config/icons/{config => }/general.svg (100%)
 rename containers/libreportal/frontend/components/admin/config/icons/{config => }/network.svg (100%)
 rename containers/libreportal/frontend/components/admin/config/icons/{config => }/security.svg (100%)
 rename containers/libreportal/frontend/components/admin/config/icons/{config => }/webui.svg (100%)

diff --git a/containers/libreportal/frontend/components/admin/config/icons/config/backup.svg b/containers/libreportal/frontend/components/admin/config/icons/backup.svg
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config/icons/config/backup.svg
rename to containers/libreportal/frontend/components/admin/config/icons/backup.svg
diff --git a/containers/libreportal/frontend/components/admin/config/icons/config/features.svg b/containers/libreportal/frontend/components/admin/config/icons/features.svg
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config/icons/config/features.svg
rename to containers/libreportal/frontend/components/admin/config/icons/features.svg
diff --git a/containers/libreportal/frontend/components/admin/config/icons/config/general.svg b/containers/libreportal/frontend/components/admin/config/icons/general.svg
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config/icons/config/general.svg
rename to containers/libreportal/frontend/components/admin/config/icons/general.svg
diff --git a/containers/libreportal/frontend/components/admin/config/icons/config/network.svg b/containers/libreportal/frontend/components/admin/config/icons/network.svg
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config/icons/config/network.svg
rename to containers/libreportal/frontend/components/admin/config/icons/network.svg
diff --git a/containers/libreportal/frontend/components/admin/config/icons/config/security.svg b/containers/libreportal/frontend/components/admin/config/icons/security.svg
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config/icons/config/security.svg
rename to containers/libreportal/frontend/components/admin/config/icons/security.svg
diff --git a/containers/libreportal/frontend/components/admin/config/icons/config/webui.svg b/containers/libreportal/frontend/components/admin/config/icons/webui.svg
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config/icons/config/webui.svg
rename to containers/libreportal/frontend/components/admin/config/icons/webui.svg
diff --git a/containers/libreportal/frontend/components/admin/config/js/config-manager.js b/containers/libreportal/frontend/components/admin/config/js/config-manager.js
index 39f92be..1f9c683 100755
--- a/containers/libreportal/frontend/components/admin/config/js/config-manager.js
+++ b/containers/libreportal/frontend/components/admin/config/js/config-manager.js
@@ -216,7 +216,7 @@ if (typeof window.ConfigManager === 'undefined') {
           var catIcon = catMeta.icon || category;
           var headerHTML =
             '<div class="page-header config-page-header">' +
-              '<img class="page-header-icon" src="/components/admin/config/icons/config/' + catIcon + '.svg" alt="" onerror="this.style.display=\'none\'">' +
+              '<img class="page-header-icon" src="/components/admin/config/icons/' + catIcon + '.svg" alt="" onerror="this.style.display=\'none\'">' +
               '<div class="page-header-title">' +
                 '<div class="admin-breadcrumb">Config</div>' +
                 '<h1>' + catTitle + '</h1>' +
diff --git a/containers/libreportal/frontend/components/admin/config/js/config-sidebar.js b/containers/libreportal/frontend/components/admin/config/js/config-sidebar.js
index 8f6374c..ebc82bc 100755
--- a/containers/libreportal/frontend/components/admin/config/js/config-sidebar.js
+++ b/containers/libreportal/frontend/components/admin/config/js/config-sidebar.js
@@ -88,7 +88,7 @@ class ConfigSidebar {
       
       // Use correct icon from our new structure
       const iconName = category.icon || category.id;
-      const iconPath = '/components/admin/config/icons/config/' + iconName + '.svg';
+      const iconPath = '/components/admin/config/icons/' + iconName + '.svg';
       
       categoryItem.innerHTML = '<img src="' + iconPath + '" alt="' + category.title + '" style="width: 20px; height: 20px; margin-right: 8px;"/> ' + category.title;
       
diff --git a/scripts/backup/engines/borg.json b/scripts/backup/engines/borg.json
index bf783dd..e35bd49 100644
--- a/scripts/backup/engines/borg.json
+++ b/scripts/backup/engines/borg.json
@@ -2,7 +2,7 @@
   "id": "borg",
   "name": "BorgBackup",
   "tagline": "Encrypted, deduplicated, compressed — the original.",
-  "logo": "/icons/config/backup.svg",
+  "logo": "/components/admin/config/icons/backup.svg",
   "supported_types": ["local", "sftp"],
   "properties": [
     {"label": "Encryption",     "value": "AES-256-CTR + HMAC-SHA-256"},
diff --git a/scripts/backup/engines/kopia.json b/scripts/backup/engines/kopia.json
index 4822890..2e8808b 100644
--- a/scripts/backup/engines/kopia.json
+++ b/scripts/backup/engines/kopia.json
@@ -2,7 +2,7 @@
   "id": "kopia",
   "name": "Kopia",
   "tagline": "Modern fast backup with policies-as-data and built-in maintenance.",
-  "logo": "/icons/config/backup.svg",
+  "logo": "/components/admin/config/icons/backup.svg",
   "supported_types": ["local", "sftp"],
   "properties": [
     {"label": "Encryption",     "value": "AES-256-GCM or ChaCha20-Poly1305"},
diff --git a/scripts/backup/engines/restic.json b/scripts/backup/engines/restic.json
index e89b21d..60ac831 100644
--- a/scripts/backup/engines/restic.json
+++ b/scripts/backup/engines/restic.json
@@ -2,7 +2,7 @@
   "id": "restic",
   "name": "Restic",
   "tagline": "Modern encrypted backup with native deduplication.",
-  "logo": "/icons/config/backup.svg",
+  "logo": "/components/admin/config/icons/backup.svg",
   "supported_types": ["local", "sftp", "rest", "s3", "b2", "gs", "azure", "rclone"],
   "properties": [
     {"label": "Encryption",     "value": "AES-256-CTR + Poly1305-AES authentication"},