Skip to content

Commit

Permalink
👍 Fixed issue where compiling showed a blank screen
Browse files Browse the repository at this point in the history
  • Loading branch information
kierandrewett committed May 9, 2019
1 parent 3d04314 commit dba684b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion electron-builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"output": "dist",
"buildResources": "static/app-icons"
},
"files": ["build/**/*", "package.json", "filters"],
"files": ["build/**/*", "package.json", "filters", "static/app-icons"],
"publish": "github",
"nsis": {
"oneClick": false,
Expand Down
8 changes: 3 additions & 5 deletions src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ app.on('ready', () => {
appWindow.webContents.goBack();
});

tray = new Tray(resolve(app.getAppPath(), 'src/shared/resources/icons/logo.png'))
tray = new Tray(resolve(app.getAppPath(), 'static/app-icons/logo.png'))
const contextMenu = Menu.buildFromTemplate([
{ label: `Dot ${app.getVersion()}`, type: 'normal', enabled: false, icon: resolve(app.getAppPath(), 'src/shared/resources/icons/tray-icon.png') },
{ label: `Dot ${app.getVersion()}`, type: 'normal', enabled: false, icon: resolve(app.getAppPath(), 'static/app-icons/tray-icon.png') },
{ type: 'separator' },
{ label: 'History', type: 'normal' },
{ label: 'Bookmarks', type: 'normal' },
{ label: 'Settings', type: 'normal' },
{ type: 'separator' },
{ label: `Quit Dot ${app.getVersion()}`, type: 'normal', role: 'quit', icon: resolve(app.getAppPath(), 'src/shared/resources/icons/tray-close.png') },
{ label: `Quit Dot ${app.getVersion()}`, type: 'normal', role: 'quit', icon: resolve(app.getAppPath(), 'static/app-icons/tray-close.png') },
])
tray.setToolTip(`Dot ${app.getVersion()}`)
tray.setContextMenu(contextMenu)
Expand All @@ -127,8 +127,6 @@ app.on('ready', () => {

appWindow = new AppWindow();

appWindow.webContents.loadURL('http://localhost:4444/app.html');

autoUpdater.on('update-downloaded', ({ version }) => {
appWindow.webContents.send('update-available', version);
});
Expand Down
Binary file added static/app-icons/tray-close.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 static/app-icons/tray-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit dba684b

Please sign in to comment.