From 3079696b519429675884e0d3d4c9f98ebdb6b63a Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 19 Jul 2022 13:28:58 +1000 Subject: [PATCH 1/2] releases moved, so lets update the package.json Signed-off-by: Sven Dowideit --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 536b46f4..86f8e086 100644 --- a/package.json +++ b/package.json @@ -107,17 +107,17 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/electron-react-boilerplate/electron-react-boilerplate.git" + "url": "git+https://github.com/workbenchapp/solana-workbench" }, "author": { - "name": "Nathan LeClaire", + "name": "CryptoWorkbench inc", "email": "nathan@cryptoworkbench.io", - "url": "https://github.com/workbenchapp/solana-workbench-releases" + "url": "https://cryptoworkbench.io" }, "contributors": [], "license": "MIT", "bugs": { - "url": "https://github.com/workbenchapp/solana-workbench-releases" + "url": "https://github.com/workbenchapp/solana-workbench/issues" }, "keywords": [ "electron", @@ -130,7 +130,7 @@ "reload", "vite" ], - "homepage": "https://github.com/workbenchapp/solana-workbench-releases", + "homepage": "https://github.com/workbenchapp/solana-workbench", "devDependencies": { "@esbuild-plugins/node-globals-polyfill": "^0.1.1", "@iconify-json/mdi": "^1.1.20", From 628d57964493376a66d98af07bbb0e0a1b4bf17d Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 19 Jul 2022 14:18:04 +1000 Subject: [PATCH 2/2] use the name, url and version from package.json in the app Signed-off-by: Sven Dowideit --- src/main/const.ts | 4 +++- src/main/menu.ts | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/const.ts b/src/main/const.ts index 79e8adbc..67667a11 100644 --- a/src/main/const.ts +++ b/src/main/const.ts @@ -5,7 +5,9 @@ import util from 'util'; import { exec } from 'child_process'; import { app } from 'electron'; -const WORKBENCH_VERSION = '0.3.0'; +import packageJson from '../../package.json'; + +const WORKBENCH_VERSION = packageJson.version; const RESOURCES_PATH = app.isPackaged ? path.join(process.resourcesPath, 'assets') : path.join(__dirname, '..', '..', 'assets'); diff --git a/src/main/menu.ts b/src/main/menu.ts index 7f1257ab..46955f9e 100644 --- a/src/main/menu.ts +++ b/src/main/menu.ts @@ -6,6 +6,8 @@ import { MenuItemConstructorOptions, } from 'electron'; +import packageJson from '../../package.json'; + interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions { selector?: string; submenu?: DarwinMenuItemConstructorOptions[] | Menu; @@ -54,10 +56,10 @@ export default class MenuBuilder { buildDarwinTemplate(): MenuItemConstructorOptions[] { const subMenuAbout: DarwinMenuItemConstructorOptions = { - label: 'Solana Workbench', + label: `${packageJson.build.productName} ${packageJson.version}`, submenu: [ { - label: 'About Solana Workbench', + label: `About ${packageJson.build.productName}`, selector: 'orderFrontStandardAboutPanel:', }, { type: 'separator' }, @@ -157,11 +159,10 @@ export default class MenuBuilder { { label: 'Github', click() { - shell.openExternal( - 'https://github.com/workbenchapp/solana-workbench-releases' - ); + shell.openExternal(packageJson.homepage); }, }, + { label: `v${packageJson.version}` }, ], }; @@ -240,11 +241,10 @@ export default class MenuBuilder { { label: 'Github', click() { - shell.openExternal( - 'https://github.com/workbenchapp/solana-workbench-releases' - ); + shell.openExternal(packageJson.homepage); }, }, + { label: `v${packageJson.version}` }, ], }, ];