Merge branch 'master' of https://github.com/stratisproject/Breeze

Breeze.UI/main.ts

@@ -9,15 +9,14 @@ const path = require('path');
 const url = require('url');
 const os = require('os');
 
-// import { app, BrowserWindow, screen } from 'electron';
-// import * as path from 'path';
-
 let serve;
 const args = process.argv.slice(1);
 serve = args.some(val => val === "--serve");
 
 if (serve) {
-  require('electron-reload')(__dirname, {});
+  require('electron-reload')(__dirname, {
+    electron: require('${__dirname}/../../node_modules/electron')
+  });
 }
 
 // Keep a global reference of the window object, if you don't, the window will
@@ -29,16 +28,12 @@ function createWindow() {
   // Create the browser window.
   mainWindow = new BrowserWindow({width: 1200, height: 700, frame: true, minWidth: 1200, minHeight: 700, icon: "./assets/images/stratis-tray.png"});
 
-
-
    // and load the index.html of the app.
   mainWindow.loadURL(url.format({
     pathname: path.join(__dirname, '/index.html'),
     protocol: 'file:',
     slashes: true
   }));
-  // and load the index.html of the app.
-  // win.loadURL('file://' + __dirname + '/index.html');
 
   if (serve) {
     mainWindow.webContents.openDevTools();

Breeze.UI/package.json

@@ -2,7 +2,7 @@
   "name": "breeze-ui",
   "description": "Graphical User Interface for Breeze Wallet.",
   "version": "0.1.0",
-  "author":{
+  "author": {
     "name": "Pieterjan Vanhoof",
     "email": "pieterjan.vanhoof@stratisplatform.com"
   },
@@ -53,19 +53,19 @@
     "bootstrap": "^4.0.0-alpha.6",
     "core-js": "^2.4.1",
     "ngx-clipboard": "^8.0.2",
-    "rxjs": "^5.4.1",
+    "rxjs": "5.4.1",
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
     "@angular/cli": "^1.1.3",
     "@angular/compiler-cli": "^4.2.4",
     "@types/jasmine": "2.5.53",
-    "@types/node": "~8.0.3",
+    "@types/node": "~8.0.4",
     "autoprefixer": "^7.1.1",
     "codelyzer": "3.1.1",
     "concurrently": "^3.5.0",
     "copyfiles": "1.2.0",
-    "cross-env": "4.0.0",
+    "cross-env": "5.0.1",
     "css-loader": "^0.28.4",
     "cssnano": "^3.10.0",
     "electron": "^1.6.11",
@@ -75,6 +75,7 @@
     "extract-zip": "1.6.5",
     "file-loader": "^0.11.2",
     "html-loader": "0.4.5",
+    "html-webpack-plugin": "2.29.0",
     "istanbul-instrumenter-loader": "^2.0.0",
     "jasmine-core": "~2.6.4",
     "jasmine-spec-reporter": "~4.1.1",
@@ -101,7 +102,7 @@
     "stylus-loader": "^3.0.1",
     "ts-node": "~3.1.0",
     "tslint": "~5.4.3",
-    "typescript": "^2.3.4",
+    "typescript": "2.3.4",
     "url-loader": "^0.5.9",
     "webdriver-manager": "12.0.6",
     "webpack": "^3.0.0",

Breeze.UI/webpack.config.js

@@ -207,7 +207,7 @@ module.exports = {
     ],
     "aliasFields": [],
     "alias": { // WORKAROUND See. angular-cli/issues/5433
-      "environments": isProd ? path.resolve(__dirname, 'src/environments/index.prod.ts') : path.resolve(__dirname, 'src/environments/index.ts')
+      "environments": isProd ? path.resolve(__dirname, 'src/environments/environment.prod.ts') : path.resolve(__dirname, 'src/environments/environment.ts')
     },
     "modules": [
       "./node_modules"