Updated TODO. Remove bootstrap.js.

Author: tedkulp

TODO

@@ -1,19 +1,19 @@
 
 Todo:
-  ☐ Switch to Mobx
-  ☐ Redo config file layout
+  ✔ Switch to Mobx @done(19-04-01 06:56)
+  ✔ Redo config file layout @done(19-04-01 06:56)
     // What if we use nesting instead of named scenes? Does that give use more
     // flexibility?
     // What if we use x:y coords instead of nested array?  Would that make it
     // easier to read/use?
-    ☐ Rename some keys for consistency
-      ☐ keyBind -> bindKey
-      ☐ sceneSourceToggle -> toggleSource
-      ☐ globalSceneSourceToggle -> toggleSceneSource
-    ☐ This will make changes to layouts.js -- make sure it comes out clean
+    ✔ Rename some keys for consistency @done(19-04-01 06:56)
+      ✔ keyBind -> bindKey @done(19-04-01 06:56)
+      ✔ sceneSourceToggle -> toggleSource @done(19-04-01 06:56)
+      ✔ globalSceneSourceToggle -> toggleSceneSource @done(19-04-01 06:56)
+    ✔ This will make changes to layouts.js -- make sure it comes out clean @done(19-04-01 06:56)
     ☐ We want more flexibility on targets and modifiers -- not sure what that looks like yet
-  ☐ Redo bootstrap.js
-  ☐ Redo obs.js
+  ✔ Redo bootstrap.js (Just remove it) @done(19-04-01 07:42)
+  ✘ Redo obs.js @cancelled(19-04-01 06:57)
   ☐ Add handling for multiple zoom levels
     // What does this look like in the config file?
     // Could almost picture holding the momentary button and then having other

src/index.js

@@ -1,39 +1,32 @@
-import {
-  app,
-  BrowserWindow,
-  Tray,
-  Menu
-} from 'electron';
-import installExtension, {
-  REACT_DEVELOPER_TOOLS
-} from 'electron-devtools-installer';
-import {
-  enableLiveReload
-} from 'electron-compile';
+import { app, BrowserWindow, Tray, Menu } from 'electron';
+import installExtension, { REACT_DEVELOPER_TOOLS } from 'electron-devtools-installer';
+import { enableLiveReload } from 'electron-compile';
 
 import * as path from 'path';
 
-import {
-  reloadConfig
-} from './main/bootstrap';
+import { state } from './main/state';
+import { load } from './main/layouts';
+
+load();
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;
 
 const isDevMode = process.execPath.match(/[\\/]electron/);
 
-if (isDevMode) enableLiveReload({
-  strategy: 'react-hmr'
-});
+if (isDevMode)
+  enableLiveReload({
+    strategy: 'react-hmr'
+  });
 
 let tray = null;
 
 const createMainWindow = async () => {
   // Create the browser window.
   const window = new BrowserWindow({
     width: 1280,
-    height: 720,
+    height: 720
   });
 
   // and load the index.html of the app.
@@ -58,7 +51,8 @@ const createMainWindow = async () => {
 
 function createTray() {
   tray = new Tray(path.join(__dirname, '..', 'assets', 'icon.png'));
-  const contextMenu = Menu.buildFromTemplate([{
+  const contextMenu = Menu.buildFromTemplate([
+    {
       label: 'Settings',
       click() {
         createMainWindow();
@@ -67,15 +61,15 @@ function createTray() {
     {
       label: 'Reload Configuration',
       click() {
-        reloadConfig();
+        load();
       }
     },
     {
       label: 'Exit',
       click() {
         app.quit();
       }
-    },
+    }
   ]);
   tray.setToolTip('Deckish');
   tray.setContextMenu(contextMenu);