diff --git a/Makefile b/Makefile index 761068b..7e22a4d 100644 --- a/Makefile +++ b/Makefile @@ -66,6 +66,7 @@ desktop-package: desktop ## Build + package the desktop app (zip on macOS, tar mkdir -p "$$APP/Contents/MacOS"; \ mkdir -p "$$APP/Contents/Resources"; \ cp cmd/desktop/build/bin/oikos-desktop "$$APP/Contents/MacOS/oikos-desktop"; \ + cp cmd/desktop/icon.icns "$$APP/Contents/Resources/icon.icns"; \ sed 's/$$(VERSION)/0.1.0/' cmd/desktop/Info.plist.template > "$$APP/Contents/Info.plist"; \ cd cmd/desktop/build/bin && zip -r oikos-desktop-darwin-$$(uname -m).zip oikos-desktop.app ;; \ Linux) \ diff --git a/cmd/desktop/Info.plist.template b/cmd/desktop/Info.plist.template index 9b825b9..2254f19 100644 --- a/cmd/desktop/Info.plist.template +++ b/cmd/desktop/Info.plist.template @@ -8,6 +8,8 @@ oikos-desktop CFBundleIdentifier com.hubris.oikos-desktop + CFBundleIconFile + icon CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/cmd/desktop/icon.icns b/cmd/desktop/icon.icns new file mode 100644 index 0000000..f00b11f Binary files /dev/null and b/cmd/desktop/icon.icns differ diff --git a/web/src/pages/Config.svelte b/web/src/pages/Config.svelte index 3a5dc10..99df6e3 100644 --- a/web/src/pages/Config.svelte +++ b/web/src/pages/Config.svelte @@ -66,6 +66,7 @@ async function loginWithAuthentik() { error = '' oidcLoggingIn = true + setConfig({ apiUrl: apiUrl.trim(), token: '' }) try { await startLogin() } catch (e: any) {