Update index.html, editor.js, editor.css, ua.lua

DispersiaRoleplay · DispersiaRoleplay · commit 97217b1f26d2 · 2025-09-13T18:56:40.000+03:00
diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -3,7 +3,7 @@ game 'gta5'
 lua54 'yes'
 author 'Kakarot'
 description 'Core resource for the framework, contains all the core functionality and features'
-version '2.0.0'
+version '2.0.1'
 
 shared_scripts {
     'shared/locale.lua',
diff --git a/html/css/editor.css b/html/css/editor.css
@@ -1,6 +1,8 @@
 @import url("styleguide.css");
 
 /* Editor container base */
+.hidden { display: none !important; }
+
 #editor-container {
     position: absolute;
     top: 50%;
diff --git a/html/index.html b/html/index.html
@@ -19,15 +19,15 @@
 
         <script type="module" src="js/app.js"></script>
         <script src="js/drawtext.js"></script>
-        <script src="js/editor.js"></script>
+        <script src="js/editor.js" defer></script>
     </head>
     <body>
         <div id="q-app" style="min-height: 100vh"></div>
         <div id="drawtext-container">
             <div id="text" class="text"></div>
         </div>
 
-        <div id="editor-container">
+        <div id="editor-container" class="hidden">
             <header>
                 <h1>QBCore Config Editor</h1>
                 <div class="controls">
diff --git a/html/js/editor.js b/html/js/editor.js
@@ -341,21 +341,28 @@ async function saveConfig(configData) {
     try {
         const res = await fetch(`https://${GetParentResourceName()}/saveConfig`, {
             method: "POST",
-            headers: {"Content-Type": "application/json"},
-            body: JSON.stringify({file: currentFile, data: configData}),
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ file: currentFile, data: configData }),
         });
-        const result = await res.json();
-        if (result === "ok") {
+
+        const raw = await res.text();
+        let result;
+        try { result = JSON.parse(raw); } catch { result = raw; }
+
+        if (result === "ok" || (result && result.status === "ok")) {
             allData[currentFile] = configData;
             console.log("Saved successfully!");
             closeModal();
             renderData();
-        } else throw new Error(result);
+        } else {
+            throw new Error(typeof result === "string" ? result : JSON.stringify(result));
+        }
     } catch (err) {
         console.error("Save failed.", err);
     }
 }
 
+
 // Modal close handlers
 function setupModalClose() {
     document.getElementById("close-modal-btn").onclick = closeModal;
@@ -365,6 +372,12 @@ function setupModalClose() {
     };
 }
 
+function closeEditorUI() {
+    const editor = document.getElementById("editor-container");
+    editor.classList.add("hidden");
+    fetch(`https://${GetParentResourceName()}/closeEditor`, { method: "POST" });
+}
+
 function closeModal() {
     document.getElementById("edit-modal").classList.add("hidden");
 }
@@ -382,27 +395,63 @@ function setupSearch() {
 // Keyboard shortcuts
 function setupKeyboard() {
     window.addEventListener("keydown", (e) => {
-        if (e.key === "Escape") closeModal();
+        if (e.key === "Escape") {
+            const modal = document.getElementById("edit-modal");
+            if (modal && !modal.classList.contains("hidden")) {
+                closeModal();
+            } else {
+                closeEditorUI();
+            }
+        }
     });
 }
 
+
 // Initialize UI
 window.addEventListener("DOMContentLoaded", () => {
     document.querySelectorAll(".file-list li").forEach((li) => {
         const file = li.dataset.file;
         li.addEventListener("click", () => selectFile(file, li));
     });
+
+    const closeBtn = document.getElementById("close-btn");
+    if (closeBtn) {
+        closeBtn.addEventListener("click", closeEditorUI);
+    }
+
+    const saveBtn = document.getElementById("save-btn");
+    if (saveBtn) {
+        saveBtn.addEventListener("click", () => {
+            if (!currentFile) return;
+            const data = allData[currentFile];
+            if (!data) return;
+            saveConfig(data);
+        });
+    }
+
     setupSearch();
     setupKeyboard();
 });
 
+
 // Listen for NUI messages and auto-select first file
 window.addEventListener("message", (event) => {
     if (event.data.action === "populateData") {
         allData = event.data.data;
+        document.getElementById("editor-container").classList.remove("hidden");
         if (!currentFile) {
             const firstLi = document.querySelector(".file-list li");
             if (firstLi) firstLi.click();
         }
     }
+    if (event.data.action === "closeEditor") {
+        closeEditorUI();
+    }
+});
+
+document.getElementById("close-btn").addEventListener("click", () => {
+    document.getElementById("editor-container").classList.add("hidden");
+    fetch(`https://${GetParentResourceName()}/closeEditor`, {
+        method: "POST"
+    });
 });
diff --git a/locale/ua.lua b/locale/ua.lua
@@ -123,9 +123,8 @@ local Translations = {
         },
     },
 }
-if GetConvar('qb_locale', 'en') == 'ua' then
-    Lang = Lang or Locale:new({
-        phrases = Translations,
-        warnOnMissing = true
-    })
-end
+
+Lang = Lang or Locale:new({
+    phrases = Translations,
+    warnOnMissing = true
+})
