Skip to content

Tauri [Version 2.0] #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
terreng wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

Tauri [Version 2.0] #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4d4341c
Add Tauri
terreng Oct 14, 2022
5805aad
Call rust from js
terreng Oct 14, 2022
ba0be3e
Save and load config.json
terreng Oct 22, 2022
795c4ff
File picker dialog, quit button
terreng Oct 22, 2022
7fcd9e4
Keep running after all windows closed
terreng Oct 22, 2022
de1265b
Update index.html
terreng Oct 26, 2024
ef16422
update tauri
terreng Oct 26, 2024
f244b14
Update to Tauri 2.0
terreng Oct 26, 2024
0462b64
Update to Tauri 2.0
terreng Oct 26, 2024
420ebfd
Tauri implement new language handling
terreng Oct 26, 2024
d8354b4
run without dev server
terreng Oct 26, 2024
885bd17
Update index.html
terreng Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'">
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' ipc://localhost;">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="style.css">
<script>
const invoke = window.__TAURI__.core.invoke;
const listen = window.__TAURI__.event.listen;
const emit = window.__TAURI__.event.emit;
const dialog = window.__TAURI__.dialog;
</script>
</head>
<body style="visibility: hidden;" ondragenter="dragEnter(event)" ondragover="dragOver(event)" ondragleave="dragLeave(event)" ondrop="dragDrop(event)">

Expand All @@ -24,7 +30,7 @@
</div>

<div class="button_row" id="main_actions">
<div tabindex="0" class="button left" id="stop_and_quit_button" onclick="window.api.quit()" aria-label="{lang.stop_and_quit}" role="button">{lang.stop_and_quit}</div>
<div tabindex="0" class="button left" id="stop_and_quit_button" onclick="invoke('quit')" aria-label="{lang.stop_and_quit}" role="button">{lang.stop_and_quit}</div>
<div tabindex="0" class="button primary" onclick="addServer()" aria-label="{lang.new_server}" role="button">{lang.new_server}</div>
</div>

Expand Down
226 changes: 123 additions & 103 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,103 +10,112 @@ let lang;
let languages;
var language;

window.api.initipc((event, message) => {
if (message.type === "init") {
lang = message.lang;
languages = message.languages;
language = message.language;

document.body.innerHTML = document.body.innerHTML.replace(/{lang\.([\w.]+?)}/g, function(match) {if (!lang[match.substring(6, match.length-1)]) {console.warn("Couldn't find lang string: "+match.substring(6, match.length-1))}; return lang[match.substring(6, match.length-1)]});

document.getElementById("language").innerHTML = Array.from(Object.entries(languages)).map(function(a) {return '<option value="'+a[0]+'">'+a[1]+'</option>'}).join("");
document.getElementById("language").value = language;

document.documentElement.setAttribute("lang", language);

running_states = {
"stopped": {
"text": lang.state_stopped,
"list_color": "var(--status-gray)",
"edit_color": "var(--text-primary)"
},
"starting": {
"text": lang.state_starting,
"list_color": "var(--status-gray)",
"edit_color": "var(--text-primary)"
},
"running": {
"text": lang.state_running,
"list_color": "var(--status-green)",
"edit_color": "var(--status-green)"
},
"error": {
"text": lang.state_error,
"list_color": "var(--status-red)",
"edit_color": "var(--status-red)"
},
"unknown": {
"text": lang.state_starting,
"list_color": "var(--status-gray)",
"edit_color": "var(--text-primary)"
},
}
invoke('init').then(function(message) {
lang = message.lang;
languages = message.languages;
language = message.language;

document.body.innerHTML = document.body.innerHTML.replace(/{lang\.([\w.]+?)}/g, function(match) {if (!lang[match.substring(6, match.length-1)]) {console.warn("Couldn't find lang string: "+match.substring(6, match.length-1))}; return lang[match.substring(6, match.length-1)]});

document.getElementById("language").innerHTML = Array.from(Object.entries(languages)).map(function(a) {return '<option value="'+a[0]+'">'+a[1]+'</option>'}).join("");
document.getElementById("language").value = language;

document.documentElement.setAttribute("lang", language);

running_states = {
"stopped": {
"text": lang.state_stopped,
"list_color": "var(--status-gray)",
"edit_color": "var(--text-primary)"
},
"starting": {
"text": lang.state_starting,
"list_color": "var(--status-gray)",
"edit_color": "var(--text-primary)"
},
"running": {
"text": lang.state_running,
"list_color": "var(--status-green)",
"edit_color": "var(--status-green)"
},
"error": {
"text": lang.state_error,
"list_color": "var(--status-red)",
"edit_color": "var(--status-red)"
},
"unknown": {
"text": lang.state_starting,
"list_color": "var(--status-gray)",
"edit_color": "var(--text-primary)"
},
}

config = message.config;
ip = message.ip;
install_source = message.install_source;
plugins = message.plugins;
platform = message.platform;
document.getElementById("version_number").innerText = message.version;
if (config.background != null && config.updates != null) openMain();
else initWelcome();
document.getElementById("stop_and_quit_button").style.display = config.background ? "block" : "none";
document.body.style.visibility = "visible";
refreshPluginList();
if (platform == "darwin" || platform == "win32") {
if (platform == "darwin") {
document.querySelector("#tray").setAttribute("aria-label", lang.setting_tray_macos);
document.querySelector("#tray > .label").firstChild.textContent = lang.setting_tray_macos+" ";
} else {
document.querySelector("#tray").setAttribute("aria-label", lang.setting_tray_windows);
document.querySelector("#tray > .label").firstChild.textContent = lang.setting_tray_windows+" ";
}
config = message.config;
ip = message.ip;
install_source = message.install_source;
plugins = message.plugins;
platform = message.platform;
document.getElementById("version_number").innerText = message.version;
if (config.background != null && config.updates != null) openMain();
else initWelcome();
document.getElementById("stop_and_quit_button").style.display = config.background ? "block" : "none";
document.body.style.visibility = "visible";
refreshPluginList();
if (platform == "darwin" || platform == "win32") {
if (platform == "darwin") {
document.querySelector("#tray").setAttribute("aria-label", lang.setting_tray_macos);
document.querySelector("#tray > .label").firstChild.textContent = lang.setting_tray_macos+" ";
} else {
document.querySelector("#tray").style.display = "none";
}
} else if (message.type === "state") {
server_states = message.server_states;
updateRunningStates();
} else if (message.type === "update") {
ignore_update = message.version;
if (message.ignored !== true) {
document.getElementById("update_banner").style.display = "block";
document.getElementById("update_banner").href = message.url;
document.getElementById("update_banner_text").innerText = message.text || lang.update_available;
if (message.attributes.indexOf("high_priority") > -1) {
document.getElementById("update_banner").classList.add("high_priority");
} else {
document.getElementById("update_banner").classList.remove("high_priority");
}
document.querySelector("#tray").setAttribute("aria-label", lang.setting_tray_windows);
document.querySelector("#tray > .label").firstChild.textContent = lang.setting_tray_windows+" ";
}
document.getElementById("update_notice").style.display = "";
document.getElementById("update_notice").querySelector("a").href = message.url;
} else if (message.type === "ipchange") {
ip = message.ip;
updateOnIpChange();
} else if (message.type == "pluginschange") {
plugins = message.plugins;
refreshPluginList();
if (document.getElementById("server_container").style.display === "block") {
location.reload();
} else {
document.querySelector("#tray").style.display = "none";
}
})

listen('state', function(event) {
server_states = event.payload.server_states;
updateRunningStates();
})

listen('update', function(event) {
let message = event.payload;
ignore_update = message.version;
if (message.ignored !== true) {
document.getElementById("update_banner").style.display = "block";
document.getElementById("update_banner").href = message.url;
document.getElementById("update_banner_text").innerText = message.text || lang.update_available;
if (message.attributes.indexOf("high_priority") > -1) {
document.getElementById("update_banner").classList.add("high_priority");
} else {
document.getElementById("update_banner").classList.remove("high_priority");
}
} else if (message.type === "reload") {
}
document.getElementById("update_notice").style.display = "";
document.getElementById("update_notice").querySelector("a").href = message.url;
})

listen('ipchange', function(event) {
ip = event.payload.ip;
updateOnIpChange();
})

listen('pluginschange', function(event) {
plugins = event.payload.plugins;
refreshPluginList();
if (document.getElementById("server_container").style.display === "block") {
location.reload();
}
});
})

listen('reload', function(event) {
location.reload();
})

function ignoreUpdate() {
config.ignore_update = ignore_update;
window.api.saveconfig(config);
invoke("saveconfig", { "config": config });
document.getElementById("update_banner").style.display = "none";
}

Expand Down Expand Up @@ -253,7 +262,7 @@ function reorderDragEnd() {
config.servers.splice(dragging_index, 1);
config.servers.splice(last_hover_index, 0, temp);

window.api.saveconfig(config);
invoke("saveconfig", { "config": config });

renderServerList();
});
Expand Down Expand Up @@ -604,7 +613,7 @@ function submitAddServer() {
}
navigate("main");
renderServerList();
window.api.saveconfig(config);
invoke("saveconfig", { "config": config });
}

let pend_delete_server_id = false;
Expand All @@ -613,7 +622,7 @@ function confirmDeleteServer() {
config.servers.splice(pend_delete_server_id, 1);
navigate("main");
renderServerList();
window.api.saveconfig(config);
invoke("saveconfig", { "config": config });
hidePrompt();
}

Expand All @@ -640,7 +649,7 @@ function toggleServer(index,inedit) {
}
}
updateRunningStates();
window.api.saveconfig(config);
invoke("saveconfig", { "config": config });
}

function toggleEditServerRunning() {
Expand All @@ -662,7 +671,7 @@ function toggleRunInBk() {
config.background = true;
}
document.getElementById("stop_and_quit_button").style.display = config.background ? "block" : "none";
window.api.saveconfig(config);
invoke("saveconfig", { "config": config });
}

function toggleUpdates() {
Expand All @@ -682,7 +691,7 @@ function toggleUpdates() {
config.updates = true
delete config.ignore_update;
}
window.api.saveconfig(config);
invoke("saveconfig", { "config": config });
}

function toggleTray() {
Expand All @@ -695,17 +704,17 @@ function toggleTray() {
document.querySelector("#tray").setAttribute("aria-checked", "true");
config.tray = true
}
window.api.saveconfig(config);
invoke("saveconfig", { "config": config });
}

function themeChange() {
config.theme = document.querySelector("#theme").value;
window.api.saveconfig(config);
invoke("saveconfig", { "config": config });
}

function changeLang() {
config.language = document.querySelector("#language").value;
window.api.saveconfig(config, true);
invoke("saveconfig", { "config": config, reload: true });
}

function portValid() {
Expand Down Expand Up @@ -782,10 +791,21 @@ function updateCurrentPath() {
}

function chooseFolder() {
window.api.showPicker(current_path).then(function(chosen_path) {
if (chosen_path && chosen_path.length > 0) current_path = chosen_path[0];
updateCurrentPath();
})
var dialog_options = {
directory: true,
multiple: false
};

if (current_path) {
dialog_options.defaultPath = current_path;
}

dialog.open(dialog_options).then(function(selected) {
if (selected) {
current_path = selected;
updateCurrentPath();
}
});
}

function htmlescape(str) {
Expand Down Expand Up @@ -936,7 +956,7 @@ function initWelcome() {
config.background = false;
config.updates = true;
config.theme = "system";
window.api.saveconfig(config);
invoke("saveconfig", { "config": config });
navigate("welcome");
if (install_source === "macappstore") {
document.querySelector("#updates_welcome").style.display = "none";
Expand Down Expand Up @@ -1060,7 +1080,7 @@ function removePlugin(pluginid) {
}
}

window.api.saveconfig(config);
invoke("saveconfig", { "config": config });

hidePrompt();
}],[lang.cancel,"",hidePrompt]])
Expand Down
Loading