Skip to content

Commit

Permalink
Updated logo and build options
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaBragg committed Jul 19, 2021
1 parent 9aa6657 commit c888d4e
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 3 deletions.
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"start": "electron-forge start",
"package": "electron-forge package",
"make": "electron-forge make",
"make-win": "electron-forge make -p win32",
"publish": "electron-forge publish",
"lint": "eslint src/**/*.ts src/**/*.tsx"
},
Expand Down Expand Up @@ -106,6 +107,7 @@
"path": "^0.12.7",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-select": "^4.3.1"
"react-select": "^4.3.1",
"update-electron-app": "^2.0.1"
}
}
}
8 changes: 7 additions & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ if (require('electron-squirrel-startup')) { // eslint-disable-line global-requir
app.quit();
}

// Requires code signing
// require('update-electron-app')({
// repo: 'JoshuaBragg/VoluMonitor',
// });

const createWindow = () => {
// Create the browser window.
const mainWindow = new BrowserWindow({
Expand All @@ -20,6 +25,7 @@ const createWindow = () => {
nodeIntegration: true,
contextIsolation: false,
},
icon: path.join(__dirname, 'static/images/VoluMonitorLogo256.png'),
});

mainWindow.removeMenu();
Expand All @@ -28,7 +34,7 @@ const createWindow = () => {
mainWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY);

// Open the DevTools.
mainWindow.webContents.openDevTools();
// mainWindow.webContents.openDevTools();

setupIPC(mainWindow);
};
Expand Down
Binary file added src/static/images/VoluMonitorLogo.ico
Binary file not shown.
Binary file added src/static/images/VoluMonitorLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/static/images/VoluMonitorLogo256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2113,6 +2113,11 @@ electron-installer-redhat@^3.2.0:
word-wrap "^1.2.3"
yargs "^16.0.2"

electron-is-dev@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
integrity sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4=

electron-notarize@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz#bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"
Expand Down Expand Up @@ -3110,6 +3115,13 @@ getpass@^0.1.1:
dependencies:
assert-plus "^1.0.0"

github-url-to-object@^4.0.4:
version "4.0.6"
resolved "https://registry.yarnpkg.com/github-url-to-object/-/github-url-to-object-4.0.6.tgz#5ea8701dc8c336b8d582dc3fa5bf964165c3b365"
integrity sha512-NaqbYHMUAlPcmWFdrAB7bcxrNIiiJWJe8s/2+iOc9vlcHlwHqSGrPk+Yi3nu6ebTwgsZEa7igz+NH2vEq3gYwQ==
dependencies:
is-url "^1.1.0"

glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
Expand Down Expand Up @@ -3784,6 +3796,11 @@ is-unicode-supported@^0.1.0:
resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==

is-url@^1.1.0, is-url@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==

is-utf8@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
Expand Down Expand Up @@ -6591,6 +6608,16 @@ [email protected], unpipe@~1.0.0:
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=

update-electron-app@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/update-electron-app/-/update-electron-app-2.0.1.tgz#229dbeb4534f51ec949e6a46ae1ac32f68a17eed"
integrity sha512-e4xEner89UZZaBGYJbYlMdL1uUrC0VjOsTAL2N4opPjzFtn+j7mdsJJsnyXZzUVeLY+8tuCX4XEsUM98oBHmZg==
dependencies:
electron-is-dev "^0.3.0"
github-url-to-object "^4.0.4"
is-url "^1.2.4"
ms "^2.1.1"

uri-js@^4.2.2:
version "4.4.1"
resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
Expand Down

0 comments on commit c888d4e

Please sign in to comment.