From da2afb2fb70d6cc602ca6f85b839a018124c27ab Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Wed, 30 Jul 2025 21:58:31 +1000 Subject: [PATCH] code refactor --- front/php/templates/language/ar_ar.json | 1 + front/php/templates/language/ca_ca.json | 1 + front/php/templates/language/cs_cz.json | 1 + front/php/templates/language/de_de.json | 1 + front/php/templates/language/en_us.json | 1 + front/php/templates/language/es_es.json | 1 + front/php/templates/language/fr_fr.json | 1 + front/php/templates/language/it_it.json | 1 + front/php/templates/language/nb_no.json | 1 + front/php/templates/language/pl_pl.json | 1 + front/php/templates/language/pt_br.json | 1 + front/php/templates/language/ru_ru.json | 1 + front/php/templates/language/tr_tr.json | 1 + front/php/templates/language/uk_ua.json | 1 + front/php/templates/language/zh_cn.json | 1 + front/pluginsCore.php | 50 ++++++++++++------------- 16 files changed, 40 insertions(+), 25 deletions(-) diff --git a/front/php/templates/language/ar_ar.json b/front/php/templates/language/ar_ar.json index bae919de..a04f097e 100755 --- a/front/php/templates/language/ar_ar.json +++ b/front/php/templates/language/ar_ar.json @@ -309,6 +309,7 @@ "Gen_Filter": "تصفية", "Gen_Generate": "إنشاء", "Gen_LockedDB": "قاعدة البيانات مقفلة", + "Gen_NetworkMask": "", "Gen_Offline": "غير متصل", "Gen_Okay": "موافق", "Gen_Online": "متصل", diff --git a/front/php/templates/language/ca_ca.json b/front/php/templates/language/ca_ca.json index ea161a76..3f8b3bf5 100755 --- a/front/php/templates/language/ca_ca.json +++ b/front/php/templates/language/ca_ca.json @@ -309,6 +309,7 @@ "Gen_Filter": "Filtrar", "Gen_Generate": "Generar", "Gen_LockedDB": "ERROR - DB podria estar bloquejada - Fes servir F12 Eines desenvolupament -> Consola o provar-ho més tard.", + "Gen_NetworkMask": "", "Gen_Offline": "Fora de línia", "Gen_Okay": "Ok", "Gen_Online": "En línia", diff --git a/front/php/templates/language/cs_cz.json b/front/php/templates/language/cs_cz.json index e9f9b49d..455b828d 100755 --- a/front/php/templates/language/cs_cz.json +++ b/front/php/templates/language/cs_cz.json @@ -309,6 +309,7 @@ "Gen_Filter": "Filtr", "Gen_Generate": "Vygenerovat", "Gen_LockedDB": "CHYBA - Databáze je možná zamčená - Zkontrolujte F12 -> Nástroje pro vývojáře -> Konzole. nebo to zkuste později.", + "Gen_NetworkMask": "", "Gen_Offline": "Offline", "Gen_Okay": "Ok", "Gen_Online": "Online", diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json index 9b6dbe82..d2bd3bae 100755 --- a/front/php/templates/language/de_de.json +++ b/front/php/templates/language/de_de.json @@ -313,6 +313,7 @@ "Gen_Filter": "Filter", "Gen_Generate": "Generieren", "Gen_LockedDB": "ERROR - DB eventuell gesperrt - Nutze die Konsole in den Entwickler Werkzeugen (F12) zur Überprüfung oder probiere es später erneut.", + "Gen_NetworkMask": "", "Gen_Offline": "Offline", "Gen_Okay": "Ok", "Gen_Online": "Online", diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index a5e2b382..a5311e77 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -309,6 +309,7 @@ "Gen_Filter": "Filter", "Gen_Generate": "Generate", "Gen_LockedDB": "ERROR - DB might be locked - Check F12 Dev tools -> Console or try later.", + "Gen_NetworkMask": "Network mask", "Gen_Offline": "Offline", "Gen_Okay": "Ok", "Gen_Online": "Online", diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json index 02f288f6..f02b94d2 100755 --- a/front/php/templates/language/es_es.json +++ b/front/php/templates/language/es_es.json @@ -311,6 +311,7 @@ "Gen_Filter": "Filtro", "Gen_Generate": "Generar", "Gen_LockedDB": "Fallo - La base de datos puede estar bloqueada - Pulsa F1 -> Ajustes de desarrolladores -> Consola o prueba más tarde.", + "Gen_NetworkMask": "", "Gen_Offline": "Desconectado", "Gen_Okay": "Aceptar", "Gen_Online": "En linea", diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json index 3b59b730..7986b82f 100755 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -309,6 +309,7 @@ "Gen_Filter": "Filtrer", "Gen_Generate": "Générer", "Gen_LockedDB": "Erreur - La base de données est peut-être verrouillée - Vérifier avec les outils de dév via F12 -> Console ou essayer plus tard.", + "Gen_NetworkMask": "", "Gen_Offline": "Hors ligne", "Gen_Okay": "OK", "Gen_Online": "En ligne", diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json index 31597001..c6ebb49f 100755 --- a/front/php/templates/language/it_it.json +++ b/front/php/templates/language/it_it.json @@ -309,6 +309,7 @@ "Gen_Filter": "Filtro", "Gen_Generate": "Genera", "Gen_LockedDB": "ERRORE: il DB potrebbe essere bloccato, controlla F12 Strumenti di sviluppo -> Console o riprova più tardi.", + "Gen_NetworkMask": "", "Gen_Offline": "Offline", "Gen_Okay": "Ok", "Gen_Online": "Online", diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json index 35ea5f10..abbf97cd 100755 --- a/front/php/templates/language/nb_no.json +++ b/front/php/templates/language/nb_no.json @@ -309,6 +309,7 @@ "Gen_Filter": "Filter", "Gen_Generate": "", "Gen_LockedDB": "FEIL - DB kan være låst - Sjekk F12 Dev tools -> Konsoll eller prøv senere.", + "Gen_NetworkMask": "", "Gen_Offline": "Frakoblet", "Gen_Okay": "Ok", "Gen_Online": "", diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json index 8a864067..ea765521 100755 --- a/front/php/templates/language/pl_pl.json +++ b/front/php/templates/language/pl_pl.json @@ -309,6 +309,7 @@ "Gen_Filter": "Filtr", "Gen_Generate": "Wygeneruj", "Gen_LockedDB": "Błąd - Baza danych może być zablokowana - Sprawdź narzędzia deweloperskie F12 -> Konsola lub spróbuj później.", + "Gen_NetworkMask": "", "Gen_Offline": "Niedostępne", "Gen_Okay": "Ok", "Gen_Online": "Dostępne", diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json index 7f76c36e..3152c192 100755 --- a/front/php/templates/language/pt_br.json +++ b/front/php/templates/language/pt_br.json @@ -309,6 +309,7 @@ "Gen_Filter": "Filtro", "Gen_Generate": "Gerar", "Gen_LockedDB": "ERRO - O banco de dados pode estar bloqueado - Verifique F12 Ferramentas de desenvolvimento -> Console ou tente mais tarde.", + "Gen_NetworkMask": "", "Gen_Offline": "Offline", "Gen_Okay": "Ok", "Gen_Online": "Online", diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json index 9a2a63e5..e210b8a0 100755 --- a/front/php/templates/language/ru_ru.json +++ b/front/php/templates/language/ru_ru.json @@ -309,6 +309,7 @@ "Gen_Filter": "Фильтр", "Gen_Generate": "Генерировать", "Gen_LockedDB": "ОШИБКА - Возможно, база данных заблокирована. Проверьте инструменты разработчика F12 -> Консоль или повторите попытку позже.", + "Gen_NetworkMask": "", "Gen_Offline": "Оффлайн", "Gen_Okay": "OK", "Gen_Online": "Онлайн", diff --git a/front/php/templates/language/tr_tr.json b/front/php/templates/language/tr_tr.json index b63531ca..8d32c41e 100755 --- a/front/php/templates/language/tr_tr.json +++ b/front/php/templates/language/tr_tr.json @@ -309,6 +309,7 @@ "Gen_Filter": "Filtre", "Gen_Generate": "Oluştur", "Gen_LockedDB": "HATA - Veritabanı kilitlenmiş olabilir - F12 Geliştirici araçlarını -> Konsol kısmını kontrol edin veya daha sonra tekrar deneyin.", + "Gen_NetworkMask": "", "Gen_Offline": "Çevrimdışı", "Gen_Okay": "Tamam", "Gen_Online": "Çevrimiçi", diff --git a/front/php/templates/language/uk_ua.json b/front/php/templates/language/uk_ua.json index d751580f..f1a98685 100755 --- a/front/php/templates/language/uk_ua.json +++ b/front/php/templates/language/uk_ua.json @@ -309,6 +309,7 @@ "Gen_Filter": "Фільтр", "Gen_Generate": "Генерувати", "Gen_LockedDB": "ПОМИЛКА – БД може бути заблоковано – перевірте F12 Інструменти розробника -> Консоль або спробуйте пізніше.", + "Gen_NetworkMask": "", "Gen_Offline": "Офлайн", "Gen_Okay": "Гаразд", "Gen_Online": "Онлайн", diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json index 6db0efb9..7b77db3c 100755 --- a/front/php/templates/language/zh_cn.json +++ b/front/php/templates/language/zh_cn.json @@ -309,6 +309,7 @@ "Gen_Filter": "筛选", "Gen_Generate": "生成", "Gen_LockedDB": "错误 - DB 可能被锁定 - 检查 F12 开发工具 -> 控制台或稍后重试。", + "Gen_NetworkMask": "", "Gen_Offline": "离线", "Gen_Okay": "Ok", "Gen_Online": "在线", diff --git a/front/pluginsCore.php b/front/pluginsCore.php index 8211dd94..9366df31 100755 --- a/front/pluginsCore.php +++ b/front/pluginsCore.php @@ -261,36 +261,36 @@ pluginUnprocessedEvents = [] pluginObjects = [] pluginHistory = [] -function getData(){ - - console.log("Plugins getData called"); +async function getData() { + try { + showSpinner(); + console.log("Plugins getData called"); - // Show the loading spinner while generating - showSpinner(); + const [plugins, events, objects, history] = await Promise.all([ + fetchJson('plugins.json'), + fetchJson('table_plugins_events.json'), + fetchJson('table_plugins_objects.json'), + fetchJson('table_plugins_history.json') + ]); - $.get('php/server/query_json.php?file=plugins.json', function(res) { - - pluginDefinitions = res["data"]; + pluginDefinitions = plugins.data; + pluginUnprocessedEvents = events.data; + pluginObjects = objects.data; + pluginHistory = history.data; - $.get('php/server/query_json.php?file=table_plugins_events.json', function(res) { - - pluginUnprocessedEvents = res["data"]; - - $.get('php/server/query_json.php?file=table_plugins_objects.json', function(res) { - - pluginObjects = res["data"]; - - $.get('php/server/query_json.php?file=table_plugins_history.json', function(res) { - - pluginHistory = res["data"]; - - generateTabs() - }); - }); - }); - }); + generateTabs(); + } catch (err) { + console.error("Failed to load data", err); + } } +async function fetchJson(filename) { + const response = await fetch(`php/server/query_json.php?file=${filename}`); + if (!response.ok) throw new Error(`Failed to load ${filename}`); + return await response.json(); +} + + function generateTabs() { // Reset the tabs by clearing previous headers and content