nits, fixes

This commit is contained in:
Anton Bracke 2022-02-22 19:01:26 +01:00
parent e82de63b34
commit 454ee6cf4c
No known key found for this signature in database
GPG Key ID: B1222603899C6B25
8 changed files with 26 additions and 30 deletions

View File

@ -7,12 +7,6 @@ import settings from "./settings";
export async function updateAutoLaunch() {
let isAutoLaunchEnabled = settings.get("auto_launch_enabled");
// set default to enabled
if (isAutoLaunchEnabled === undefined) {
settings.set("auto_launch_enabled", true);
isAutoLaunchEnabled = true;
}
// Don't run this in development
if (electronIsDev) {
return;

View File

@ -44,7 +44,7 @@ export default () => {
settings.get("servers") || [
// TODO: remove this default server
{
_id: "1",
_id: `${Date.now()}-1`,
name: "WA Demo",
url: "https://play.staging.workadventu.re/@/tcm/workadventure/wa-village",
},

View File

@ -6,13 +6,27 @@ export type SettingsData = {
log_level: ElectronLog.LogLevel;
auto_launch_enabled: boolean;
servers: Server[];
shortcuts: Record<"mute_toggle" | "camera_toggle", string | null>;
shortcuts: Record<"mute_toggle" | "camera_toggle", string>;
};
let settings: SettingsData;
const defaultSettings: SettingsData = {
log_level: "info",
auto_launch_enabled: true,
servers: [],
shortcuts: {
mute_toggle: "",
camera_toggle: "",
},
};
async function init() {
settings = (await Settings.get()) as SettingsData;
let _settings = await Settings.get();
if (_settings !== undefined) {
_settings = defaultSettings;
}
settings = _settings as SettingsData;
}
function get(): SettingsData;

View File

@ -4,7 +4,7 @@ import { showAboutWindow } from "electron-util";
import * as autoUpdater from "./auto-updater";
import * as log from "./log";
import { getWindow } from "./window";
import { getAppView, getWindow } from "./window";
let tray: Tray | undefined;
@ -46,6 +46,13 @@ export function createTray() {
log.openLog();
},
},
{
label: "Open DevTools",
click() {
getWindow()?.webContents.openDevTools({ mode: "detach" });
getAppView()?.webContents.openDevTools({ mode: "detach" });
},
},
{
label: "About",
click() {

View File

@ -93,12 +93,6 @@ export async function createWindow() {
mainWindow.once("ready-to-show", () => {
mainWindow?.show();
if (electronIsDev) {
// appView?.webContents.openDevTools({
// mode: "detach",
// });
// mainWindow?.webContents.openDevTools({ mode: "detach" });
}
});
mainWindow.webContents.on("did-finish-load", () => {

View File

@ -41,15 +41,6 @@
}
main {
/* TODO */
background-color: #30343d;
/* background-color: #2b2f37; */
/* color: #62727c;
border: 1px solid #62727c; */
/* border-color: #e1e4e8;
color: #e1e4e8; */
}
</style>

View File

@ -21,10 +21,6 @@
return serverColors[i % serverColors.length];
}
selectedServer.subscribe((e) => {
console.log("selected server changed", e);
});
$: serverWithSelection = $servers.map((s) => ({ ...s, isSelected: $selectedServer === s._id }))
onMount(async () => {

View File

@ -19,7 +19,7 @@
});
async function saveShortcut(key: keyof SettingsData["shortcuts"], value: string) {
const shortcuts = get(settings)['shortcuts'] || { "camera_toggle": "", "mute_toggle": "" };
const shortcuts = get(settings)['shortcuts'];
shortcuts[key] = value;
settings.update((s) => ({ ...s, shortcuts }));
await api.saveSetting("shortcuts", shortcuts);