Skip to content

Commit

Permalink
Merge branch 'release/0.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Cavoj committed Jul 12, 2019
2 parents f6afdde + d69ceb2 commit 1ff1c43
Show file tree
Hide file tree
Showing 7 changed files with 763 additions and 686 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"license": "MIT",
"description": "Tray App for Hotel Process Manager",
"version": "0.3.1",
"version": "0.3.2",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.8.2",
"ansi2html": "^0.0.1",
Expand Down
5 changes: 3 additions & 2 deletions public/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ let activeLogsWindowServer = null;

if (process.platform === 'darwin') {
app.dock.hide();
} else {
Menu.setApplicationMenu(null);
}

Menu.setApplicationMenu(null);

app.on('ready', () => {
createTray();
createWindow();
Expand Down Expand Up @@ -118,6 +118,7 @@ const createLogWindow = () => {
preload: path.join(__dirname, 'preload.js'),
},
});

logsWindow.on('page-title-updated', (evt) => {
evt.preventDefault();
});
Expand Down
6 changes: 1 addition & 5 deletions src/__snapshots__/app.test.tsx.snap
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports['App matches the snapshot 1'] = `
ShallowWrapper {
"length": 1,
}
`;
exports[`App matches the snapshot 1`] = `ShallowWrapper {}`;
6 changes: 1 addition & 5 deletions src/components/__snapshots__/app-footer.test.tsx.snap
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports['AppFooter matches the snapshot 1'] = `
ShallowWrapper {
"length": 1,
}
`;
exports[`AppFooter matches the snapshot 1`] = `ShallowWrapper {}`;
12 changes: 2 additions & 10 deletions src/components/__snapshots__/server-item.test.tsx.snap
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports['ServerItem matches the snapshot when the server is running 1'] = `
ShallowWrapper {
"length": 1,
}
`;
exports[`ServerItem matches the snapshot when the server is running 1`] = `ShallowWrapper {}`;

exports['ServerItem matches the snapshot when the server is stopped 1'] = `
ShallowWrapper {
"length": 1,
}
`;
exports[`ServerItem matches the snapshot when the server is stopped 1`] = `ShallowWrapper {}`;
6 changes: 1 addition & 5 deletions src/components/__snapshots__/server-list.test.tsx.snap
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports['ServerList matches the snapshot 1'] = `
ShallowWrapper {
"length": 1,
}
`;
exports[`ServerList matches the snapshot 1`] = `ShallowWrapper {}`;
Loading

0 comments on commit 1ff1c43

Please sign in to comment.