fix reload on electron-client project

Author: Angelo Manganiello

electron-client/main.js

@@ -1,38 +1,66 @@
 const electron = require("electron"),
-  app = electron.app,
-  BrowserWindow = electron.BrowserWindow;
+app = electron.app,
+BrowserWindow = electron.BrowserWindow;
 
-require('electron-debug')({ enabled: true});
+require('electron-debug')({
+	enabled: true
+});
 let mainWindow;
+const fs = require('fs');
+let url = `${__dirname}/dist/index.html`;
+const globalShortcut = electron.globalShortcut;
 
 function createWindow() {
-  mainWindow = new BrowserWindow({
-    autoHideMenuBar: true,
-    width: 640,
-    height: 480,
-	webPreferences: {
-	nodeIntegration: false   }
-  });
-  mainWindow.loadURL(`file://${__dirname}/dist/index.html`);
-  //mainWindow.webContents.openDevTools();
-  mainWindow.on("closed", function() {
-    mainWindow = null;
-  });
+	mainWindow = new BrowserWindow({
+			autoHideMenuBar: true,
+			width: 640,
+			height: 480,
+			webPreferences: {
+				nodeIntegration: false
+			}
+		});
+	mainWindow.loadURL(url);
+	//mainWindow.webContents.openDevTools();
+	mainWindow.on("closed", function () {
+		mainWindow = null;
+	});
+
+	globalShortcut.register('f5', function () {
+		reloadPage();
+	});
+	globalShortcut.register('CommandOrControl+R', function () {
+		reloadPage();
+	});
+}
+
+function reloadPage() {
+	var currentURL = mainWindow.webContents.getURL();
+	let urlWithoutFileProtocol = currentURL.split('file:///');
+	currentURL = urlWithoutFileProtocol[1];
+	try {
+		if (fs.statSync(currentURL).isFile()) {
+			mainWindow.reload();
+		} else {
+			mainWindow.loadURL(url);
+		}
+	} catch (err) {
+		mainWindow.loadURL(url);
+	}
 }
 
 app.on("ready", createWindow);
-app.on("browser-window-created", function(e, window) {
-  window.setMenu(null);
+app.on("browser-window-created", function (e, window) {
+	window.setMenu(null);
 });
 
-app.on("window-all-closed", function() {
-  if (process.platform !== "darwin") {
-    app.quit();
-  }
+app.on("window-all-closed", function () {
+	if (process.platform !== "darwin") {
+		app.quit();
+	}
 });
 
-app.on("activate", function() {
-  if (mainWindow === null) {
-    createWindow();
-  }
+app.on("activate", function () {
+	if (mainWindow === null) {
+		createWindow();
+	}
 });

electron-client/yarn.lock

@@ -7,8 +7,8 @@
   resolved "http://artifactory-pro.au-sdc.com:8081/artifactory/api/npm/oneleo-repo-npm-virtual/7zip-bin/-/7zip-bin-4.0.2.tgz#6abbdc22f33cab742053777a26db2e25ca527179"
 
 "@types/node@^8.0.24":
-  version "8.10.22"
-  resolved "http://artifactory-pro.au-sdc.com:8081/artifactory/api/npm/oneleo-repo-npm-virtual/@types/node/-/node-8.10.22.tgz#c095d7c668908d48b95ae11fcc4a6d6b1c116a35"
+  version "8.10.23"
+  resolved "http://artifactory-pro.au-sdc.com:8081/artifactory/api/npm/oneleo-repo-npm-virtual/@types/node/-/node-8.10.23.tgz#e5ccfdafff42af5397c29669b6d7d65f7d629a00"
 
 abbrev@1:
   version "1.1.1"
@@ -217,8 +217,8 @@ braces@^1.8.2:
     repeat-element "^1.1.2"
 
 buffer-from@^1.0.0:
-  version "1.1.0"
-  resolved "http://artifactory-pro.au-sdc.com:8081/artifactory/api/npm/oneleo-repo-npm-virtual/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
+  version "1.1.1"
+  resolved "http://artifactory-pro.au-sdc.com:8081/artifactory/api/npm/oneleo-repo-npm-virtual/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
 
 [email protected]:
   version "4.2.1"