From 4f0e2794ecd0f40e434409f282f7132993bb72ba Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Mon, 24 May 2021 11:21:34 -0400 Subject: [PATCH] chore: Add windows icon in desktop --- ui/desktop/electron-app/config/cli.js | 4 ++-- ui/desktop/electron-app/config/forge.js | 7 ++++--- ui/desktop/electron-app/config/windows/icon.ico | Bin 0 -> 11211 bytes ui/desktop/electron-app/src/helpers/platform.js | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 ui/desktop/electron-app/config/windows/icon.ico diff --git a/ui/desktop/electron-app/config/cli.js b/ui/desktop/electron-app/config/cli.js index 3072f9e74..b85b7e59b 100644 --- a/ui/desktop/electron-app/config/cli.js +++ b/ui/desktop/electron-app/config/cli.js @@ -11,12 +11,12 @@ const artifactDestination = path.resolve(__dirname, '..', 'cli'); const downloadArtifact = (version) => { const archivePlatform = {}; // TODO: Support all available build machines - if (isMac) { + if (isMac()) { archivePlatform.name = 'darwin'; archivePlatform.arch = 'amd64'; } - if (isWindows) { + if (isWindows()) { archivePlatform.name = 'windows'; archivePlatform.arch = 'amd64'; } diff --git a/ui/desktop/electron-app/config/forge.js b/ui/desktop/electron-app/config/forge.js index 71dc5205e..848a587c8 100644 --- a/ui/desktop/electron-app/config/forge.js +++ b/ui/desktop/electron-app/config/forge.js @@ -32,8 +32,7 @@ const createConfig = () => { // Version if (config.RELEASE_VERSION) config.packagerConfig.version = config.RELEASE_VERSION; - - if (isMac) { + if (isMac()) { config.packagerConfig.icon = './config/macos/icon.icns'; config.packagerConfig.osxSign = { 'hardened-runtime': true, @@ -64,7 +63,9 @@ const createConfig = () => { }); } - if (isWindows) { + if (isWindows()) { + config.packagerConfig.icon = './config/windows/icon.ico'; + // Generate EXE file config.makers.push({ name: '@electron-forge/maker-squirrel', diff --git a/ui/desktop/electron-app/config/windows/icon.ico b/ui/desktop/electron-app/config/windows/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..7ca39ac083049b788f232b9f3afb6b9c2ea0933d GIT binary patch literal 11211 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 Boolean(os.type().match(/darwin/i)), + isMac: () => Boolean(os.type().match(/(darwin)/i)), isWindows: () => Boolean(os.type().match(/(windows)/i)), };