diff --git a/gui/index.html b/gui/index.html index ff2459bf..c9ee6fab 100644 --- a/gui/index.html +++ b/gui/index.html @@ -1,10 +1,13 @@ - + - + FreeDATA @@ -13,30 +16,25 @@ - - \ No newline at end of file + if (process.env["NODE_ENV"] == "production") { + console.log(walk(process.env["APPDIR"])); + console.log(walk(process.env["DIST"])); + console.log(walk(process.env["DIST_ELECTRON"])); + } else { + console.log("running in " + process.env["NODE_ENV"]); + } + diff --git a/gui/setup.md b/gui/setup.md index bb5f3989..7740ecf9 100644 --- a/gui/setup.md +++ b/gui/setup.md @@ -7,9 +7,8 @@ https://github.com/vuejs/create-vue https://vue-community.org/guide/ecosystem/desktop-apps.html#electron https://blog.logrocket.com/building-app-electron-vue/ - Folder structure dist-electron: Automatically compiled source from vite electron: Source code folder for Electron stuff -public: Public data -src: VueJS source code \ No newline at end of file +public: Public data +src: VueJS source code diff --git a/gui/src/js/deprecated_preload-chat.js b/gui/src/js/deprecated_preload-chat.js index b0b3ca75..312f2fb2 100644 --- a/gui/src/js/deprecated_preload-chat.js +++ b/gui/src/js/deprecated_preload-chat.js @@ -80,8 +80,6 @@ PouchDB.plugin(require("pouchdb-find")); //PouchDB.plugin(require('pouchdb-replication')); PouchDB.plugin(require("pouchdb-upsert")); - - var db = new PouchDB(chatDB); var users = new PouchDB(userDB); @@ -673,9 +671,6 @@ ipcRenderer.on("return-select-user-image", (event, arg) => { }); }); - - - ipcRenderer.on("action-update-transmission-status", (event, arg) => { var data = arg["data"][0]; @@ -1056,7 +1051,6 @@ update_chat = function (obj) { var attempt = obj.attempt; } - // add percent and bytes per minute if not existing //console.log(obj.percent) if (typeof obj.percent == "undefined") { @@ -1385,17 +1379,16 @@ update_chat = function (obj) { showOsPopUp("Message received from " + obj.dxcallsign, obj.msg); } - - // check if message is signed or not for adjusting icon - if(typeof obj.hmac_signed !== "undefined" && obj.hmac_signed !== "False"){ - console.log(hmac_signed) - var hmac_signed = ''; - } else { - - var hmac_signed = ''; - - } - + // check if message is signed or not for adjusting icon + if ( + typeof obj.hmac_signed !== "undefined" && + obj.hmac_signed !== "False" + ) { + console.log(hmac_signed); + var hmac_signed = ''; + } else { + var hmac_signed = ''; + } var new_message = `
@@ -1412,13 +1405,9 @@ update_chat = function (obj) {

- + - ${hmac_signed} + ${hmac_signed}
@@ -2902,8 +2891,6 @@ function clearUnreadMessages(dxcall) { .catch(function (err) { console.log(err); }); - - } //Have the operating system show a notification popup diff --git a/gui/src/js/deprecated_preload-main.js b/gui/src/js/deprecated_preload-main.js index 27e32275..074ca5b2 100644 --- a/gui/src/js/deprecated_preload-main.js +++ b/gui/src/js/deprecated_preload-main.js @@ -2,14 +2,11 @@ const path = require("path"); const { shell, clipboard } = require("electron"); const exec = require("child_process").spawn; - //import { useIpcRenderer } from '@vueuse/electron' //const ipcRenderer = useIpcRenderer() - //import * as bootstrap from 'bootstrap' - //require("./preload-chat.js"); //require("./preload-mesh.js"); //require("./preload-log.js"); @@ -17,7 +14,6 @@ const exec = require("child_process").spawn; //const daemon = require("./daemon.js"); //const sock = require("./sock.js"); - const fs = require("fs"); const FD = require("./freedata"); const { @@ -1649,7 +1645,6 @@ window.addEventListener("DOMContentLoaded", () => { ); }); - // stopTNC button clicked document.getElementById("stopTNC").addEventListener("click", () => { if (!confirm("Stop the TNC?")) return; @@ -1754,8 +1749,6 @@ window.addEventListener("DOMContentLoaded", () => { sock.disconnectARQ(); }); - - document.getElementById("thTime").addEventListener("click", () => { if (hslLastSort == 0 && hslLastSortDir == "asc") hslLastSortDir = "desc"; else hslLastSortDir = "asc"; @@ -2895,9 +2888,13 @@ ipcRenderer.on("action-update-unread-messages-main", (event, data) => { //Do something if (data == true) { document.getElementById("list-messages-list").classList.add("bg-warning"); - document.getElementById("list-messages-list").classList.remove("bg-secondary"); + document + .getElementById("list-messages-list") + .classList.remove("bg-secondary"); } else { - document.getElementById("list-messages-list").classList.remove("bg-warning"); + document + .getElementById("list-messages-list") + .classList.remove("bg-warning"); document.getElementById("list-messages-list").classList.add("bg-secondary"); } }); diff --git a/gui/src/styles.css b/gui/src/styles.css index 79ba714b..7c836d13 100644 --- a/gui/src/styles.css +++ b/gui/src/styles.css @@ -108,10 +108,10 @@ https://stackoverflow.com/a/9622873 /* default dark theme mods */ } .modal-backdrop { - background-color: transparent; + background-color: transparent; } .modal-backdrop.in { - filter: alpha(opacity=10); - opacity: .1 + filter: alpha(opacity=10); + opacity: 0.1; }