Skip to content

Commit a84a499

Browse files
committed
Restructuring the messy Main process a bit... attempts to improve Win32
1 parent 8294c01 commit a84a499

23 files changed

+476
-271
lines changed

app/app.global.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ body {
4343
flex-flow: wrap;
4444
position:fixed;
4545
background-color: #000;
46-
z-index:1;
4746
// background: radial-gradient(619.87px at 50% 6.62%, #072339 0%, #051B2C 100%)!important;
4847
@import "styles/windows-top-bar";
4948
@import "styles/top-bar";

app/app.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/>
2626

2727
<script src="http://localhost:8097"></script>
28-
<style>
28+
<!-- <style>
2929
body {
3030
margin: 0;
3131
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
@@ -102,11 +102,11 @@
102102
text-align: center; }
103103
.loading_message span.line2 {
104104
color: rgba(255, 255, 255, 0.5); }
105-
</style>
105+
</style> -->
106106
</head>
107107
<body>
108108
<div id="root"></div>
109-
<div class="loading_overlay">
109+
<!-- <div class="loading_overlay">
110110
<span class="loading_indicator_wrap">
111111
<img
112112
class="circle"
@@ -115,7 +115,7 @@
115115
<div class="loading_message">
116116
<span class="line1">Loading Workbench</span>
117117
</div>
118-
</div>
118+
</div> -->
119119
<script>
120120
{
121121
const scripts = [];

app/background/updater.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

app/containers/App.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import EonDetail from '../components/EonDetail';
55
import * as NetworkConnectionActions from '../actions/network_connection_actions';
66
import { library } from '@fortawesome/fontawesome-svg-core';
77
import { fab } from '@fortawesome/free-brands-svg-icons';
8-
import notify from '../utils/notify';
8+
import rpc from '../rpc-client';
99
import { faPause, faTimes, faPlay, faUndo, faCheck, faCircle, faQuestion, faSync, faChevronLeft, faChevronRight, faPlus } from '@fortawesome/free-solid-svg-icons';
1010
import { faGithub } from '@fortawesome/free-brands-svg-icons';
1111
import settings from 'electron-settings';
@@ -20,14 +20,13 @@ function mapDispatchToProps(dispatch) {
2020
class App extends React.Component {
2121
componentDidMount() {
2222
settings.watch("config",() => {
23-
24-
notify('Workbench config updated!');
23+
rpc.emit('notify',{title:'Workbench config updated!', body: 'Reopen Workbench'});
2524
});
2625
settings.watch("keymaps",() => {
27-
notify('Workbench keymaps updated!');
26+
rpc.emit('notify',{title:'Workbench keymaps updated!', body: 'Reopen Workbench'});
2827
});
2928
settings.watch("eonSshKeyPath",() => {
30-
notify('Workbench SSH Key Path updated!', 'Disconnect / reconnect to EON to use new key.');
29+
rpc.emit('notify',{title:'Workbench SSH Key Path updated!', body: 'Reopen Workbench'});
3130
});
3231
this.props.setupNetworkEvents();
3332
}

app/contextmenu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const { execCommand } = require('./commands');
44
const separator = {type: 'separator'};
55
const config = require('./settings');
66
const { getDecoratedKeymaps } = require('./keymaps/decorators');
7-
const notify = require('./notify');
7+
const notify = require('./main/notify');
88

99
const getCommandKeys = keymaps =>
1010
Object.keys(keymaps).reduce((commandKeys, command) => {

0 commit comments

Comments
 (0)