Restructuring the messy Main process a bit... attempts to improve Win32

jfrux · Nov 9, 2018 · a84a499 · a84a499
1 parent 8294c01
commit a84a499
Show file tree

Hide file tree

Showing 23 changed files with 476 additions and 271 deletions.
diff --git a/app/app.global.scss b/app/app.global.scss
@@ -43,7 +43,6 @@ body {
   flex-flow: wrap;
   position:fixed;
   background-color: #000;
-  z-index:1;
   // background: radial-gradient(619.87px at 50% 6.62%, #072339 0%, #051B2C 100%)!important;
   @import "styles/windows-top-bar";
   @import "styles/top-bar";

diff --git a/app/app.html b/app/app.html
@@ -25,7 +25,7 @@
     />
 
     <script src="http://localhost:8097"></script>
-    <style>
+    <!-- <style>
       body {
         margin: 0;
         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 @@
           text-align: center; }
         .loading_message span.line2 {
           color: rgba(255, 255, 255, 0.5); }
-    </style>
+    </style> -->
   </head>
   <body>
     <div id="root"></div>
-    <div class="loading_overlay">
+    <!-- <div class="loading_overlay">
       <span class="loading_indicator_wrap">
         <img
           class="circle"
@@ -115,7 +115,7 @@
       <div class="loading_message">
         <span class="line1">Loading Workbench</span>
       </div>
-    </div>
+    </div> -->
     <script>
       {
         const scripts = [];

diff --git a/app/background/updater.js b/app/background/updater.js
diff --git a/app/containers/App.js b/app/containers/App.js
@@ -5,7 +5,7 @@ import EonDetail from '../components/EonDetail';
 import * as NetworkConnectionActions from '../actions/network_connection_actions';
 import { library } from '@fortawesome/fontawesome-svg-core';
 import { fab } from '@fortawesome/free-brands-svg-icons';
-import notify from '../utils/notify';
+import rpc from '../rpc-client';
 import { faPause, faTimes, faPlay, faUndo, faCheck, faCircle, faQuestion, faSync, faChevronLeft, faChevronRight, faPlus } from '@fortawesome/free-solid-svg-icons';
 import { faGithub } from '@fortawesome/free-brands-svg-icons';
 import settings from 'electron-settings';
@@ -20,14 +20,13 @@ function mapDispatchToProps(dispatch) {
 class App extends React.Component {
   componentDidMount() {
     settings.watch("config",() => {
-
-      notify('Workbench config updated!');
+      rpc.emit('notify',{title:'Workbench config updated!', body: 'Reopen Workbench'});
     });
     settings.watch("keymaps",() => {
-      notify('Workbench keymaps updated!');
+      rpc.emit('notify',{title:'Workbench keymaps updated!', body: 'Reopen Workbench'});
     });
     settings.watch("eonSshKeyPath",() => {
-      notify('Workbench SSH Key Path updated!', 'Disconnect / reconnect to EON to use new key.');
+      rpc.emit('notify',{title:'Workbench SSH Key Path updated!', body: 'Reopen Workbench'});
     });
     this.props.setupNetworkEvents();
   }

diff --git a/app/contextmenu.js b/app/contextmenu.js
@@ -4,7 +4,7 @@ const { execCommand } = require('./commands');
 const separator = {type: 'separator'};
 const config = require('./settings');
 const { getDecoratedKeymaps } = require('./keymaps/decorators');
-const notify = require('./notify');
+const notify = require('./main/notify');
 
 const getCommandKeys = keymaps =>
   Object.keys(keymaps).reduce((commandKeys, command) => {