From 524cee1bac5b077fefc63e2cea4043efaed714c4 Mon Sep 17 00:00:00 2001
From: MasterAcnolo <68693319+MasterAcnolo@users.noreply.github.com>
Date: Sat, 15 Aug 2026 21:31:07 +0200
Subject: [PATCH] refactor: topbar.js name and order. And remove
 'customconfiguration' declaration in index.html

---
 public/index.html       |  5 ++-
 public/script/topbar.js | 72 +++++++++++++++++++++--------------------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/public/index.html b/public/index.html
index 98c66a9..936009e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -56,9 +56,9 @@
                 <div class="setting-item" id="theme" style="margin-left: 32px;">
                     <div class="setting-info">
                         <div style="display: flex; align-items: center; gap: 10px;">
-                        <span class="setting-title">Thème</span>
+                        <span class="setting-title">Theme</span>
 
-                        <select id="themeSelect" data-key="theme" aria-label="Choisir le thème">
+                        <select id="themeSelect" data-key="theme" aria-label="Choose the theme">
 
                         </select>
                         <button id="refresh-themes-btn" title="Refresh themes" class="refresh-themes-btn">
@@ -306,7 +306,6 @@
     
     <!-- Scripts -->
     <script src="script/toast.js"></script>
-    <script src="script/customConfiguration.js"></script>
     <script src="script/clipboardPaste.js"></script>
     <script src="script/custompath.js"></script>
     <script src="script/settingsPanel.js"></script>
diff --git a/public/script/topbar.js b/public/script/topbar.js
index 8c4e496..c8ad591 100644
--- a/public/script/topbar.js
+++ b/public/script/topbar.js
@@ -5,53 +5,55 @@
  * This function is safe to call once DOM is ready.
  * It silently aborts if the API or elements are missing.
  */
-function setupTopbarListeners() {
+export function initTopBar() {
   const { topbarAPI } = window;
   if (!topbarAPI) return;
 
   const minBtn = document.getElementById("minimize-btn");
-  const maxBtn = document.getElementById("maximize-btn");
-  const closeBtn = document.getElementById("close-btn");
-  const devtoolsBtn = document.getElementById("devtools-btn");
-  const logsBtn = document.getElementById("logs-btn");
-  const websiteBtn = document.getElementById("website-btn");
-  const wikiBtn = document.getElementById("wiki-btn");
-  const workshopBtn = document.getElementById("workshop-btn");
-
   if (minBtn) minBtn.onclick = () => topbarAPI.minimize();
+
+  const maxBtn = document.getElementById("maximize-btn");
   if (maxBtn) maxBtn.onclick = () => topbarAPI.maximize();
+
+  const closeBtn = document.getElementById("close-btn");
   if (closeBtn) closeBtn.onclick = () => topbarAPI.close();
+  
+  const devtoolsBtn = document.getElementById("devtools-btn");
   if (devtoolsBtn) devtoolsBtn.onclick = () => topbarAPI.openDevTools();
+  
+  const logsBtn = document.getElementById("logs-btn");
   if (logsBtn) logsBtn.onclick = () => topbarAPI.openLogs();
+  
+  const websiteBtn = document.getElementById("website-btn");
   if (websiteBtn) websiteBtn.onclick = () => topbarAPI.openWebsite();
+  
+  const wikiBtn = document.getElementById("wiki-btn");
   if (wikiBtn) wikiBtn.onclick = () => topbarAPI.openWiki();
+  
+  const workshopBtn = document.getElementById("workshop-btn");
   if (workshopBtn) workshopBtn.onclick = () => topbarAPI.openWorkshop();
+
 }
 
-/**
- * Registers topbar event listeners after DOM is fully loaded.
- */
-document.addEventListener("DOMContentLoaded", setupTopbarListeners);
-
-/**
- * Applies UI layout adjustments depending on feature flags
- * provided by the Electron backend.
- *
- * Specifically handles:
- * - hiding custom topbar
- * - adjusting layout spacing
- * - repositioning theme switcher
- */
-(async function applyFeatureLayout() {
-  const features = await window.electronAPI.getFeatures();
-
-  if (!features.customTopBar) {
-    const topbar = document.getElementById("topbar");
-    const container = document.getElementById("container");
-    const themeSwitcher = document.getElementById("theme-switcher");
-
-    if (topbar) topbar.style.display = "none";
-    if (container) container.style.marginTop = "0";
-    if (themeSwitcher) themeSwitcher.style.top = "30px";
+async function attachListeners(){
+  try{
+    const featuresList = await window.electronAPI.getFeatures();
+  
+    if (!featuresList.customTopBar) {
+      const topbar = document.getElementById("topbar");
+      const container = document.getElementById("container");
+      const themeSwitcher = document.getElementById("theme-switcher");
+  
+      if (topbar) topbar.style.display = "none";
+      if (container) container.style.marginTop = "0";
+      if (themeSwitcher) themeSwitcher.style.top = "30px";
+    }
+    
+  } catch (error) {
+    console.error("Failed to load layout features for topbar:", error);
   }
-})();
\ No newline at end of file
+
+}
+
+initTopBar()
+document.addEventListener("DOMContentLoaded", attachListeners)
\ No newline at end of file