Merge pull request #17 from RudyWeber/electronIntegration

feat(packaging): integrate the UI in the Electron Shell

.gitignore

@@ -1,3 +1,4 @@
 *.old
 *.log
+**/.DS_STORE
 /node_modules

package.json

@@ -15,6 +15,10 @@
         "postinstall": "lerna bootstrap",
         "start:ui": "cd packages/klingon-ui/ && npm start",
         "start:server": "cd packages/klingon-server/ && npm start",
-        "start:app": "electron klingon-ui/dist/"
+        "start:app": "KLINGON_ENV=DEV electron packages/klingon-app/",
+        "build:app:ui": "cd packages/klingon-ui/ && npm run build -- --bh . && cd - && cp -R ./packages/klingon-ui/dist ./packages/klingon-app/dist-ui", 
+        "package:app:osx": "npm run build:app:ui && cd ./packages/klingon-app/ && npm run package:osx",
+        "package:app:linux": "npm run build:app:ui && cd ./packages/klingon-app/ && npm run package:linux",
+        "package:app:win": "npm run build:app:ui && cd ./packages/klingon-app/ && npm run package:win"
     }
 }

packages/klingon-app/.gitignore

@@ -1 +1,3 @@
 node_modules
+dist-ui
+release-builds

packages/klingon-app/main.js

@@ -1,60 +1,40 @@
-const electron = require('electron')
-    // Module to control application life.
-const app = electron.app
-    // Module to create native browser window.
-const BrowserWindow = electron.BrowserWindow
+const electron = require('electron');
+const { app, BrowserWindow } = electron;
 
-const path = require('path')
-const url = require('url')
+const path = require('path');
+const url = require('url');
+const isDev = process.env.KLINGON_ENV === 'DEV';
 
 // 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
+let mainWindow;
 
 function createWindow() {
-    // Create the browser window.
-    mainWindow = new BrowserWindow({ width: 800, height: 600 })
-
-    // and load the index.html of the app.
-    mainWindow.loadURL(url.format({
-        pathname: path.join(__dirname, 'index.html'),
-        protocol: 'file:',
-        slashes: true
-    }))
-
-    // Open the DevTools.
-    // mainWindow.webContents.openDevTools()
-
-    // Emitted when the window is closed.
-    mainWindow.on('closed', function() {
-        // Dereference the window object, usually you would store windows
-        // in an array if your app supports multi windows, this is the time
-        // when you should delete the corresponding element.
-        mainWindow = null
-    })
+  let url = isDev ? 'http://localhost:4200' : `file://${__dirname}/dist-ui/index.html`;
+
+  mainWindow = new BrowserWindow({ width: 1024, height: 768 });
+
+  mainWindow.loadURL(url);
+
+  if (isDev) {
+    mainWindow.webContents.openDevTools();
+  }
+
+  mainWindow.on('closed', function() {
+    mainWindow = null;
+  });
 }
 
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
+app.on('ready', createWindow);
 
-// Quit when all windows are closed.
 app.on('window-all-closed', function() {
-    // On OS X it is common for applications and their menu bar
-    // to stay active until the user quits explicitly with Cmd + Q
-    if (process.platform !== 'darwin') {
-        app.quit()
-    }
-})
+  app.quit();
+});
 
 app.on('activate', function() {
-    // On OS X it's common to re-create a window in the app when the
-    // dock icon is clicked and there are no other windows open.
-    if (mainWindow === null) {
-        createWindow()
-    }
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
+  // On OS X it's common to re-create a window in the app when the
+  // dock icon is clicked and there are no other windows open.
+  if (mainWindow === null) {
+    createWindow();
+  }
+});