move some options to package.json section

Author: Dave Conway-Jones

.gitignore

@@ -15,3 +15,4 @@ node_modules
 *.backup
 logs
 *.log
+yarn.lock

README.md

@@ -7,7 +7,9 @@ This is an Electron template to embed [Node-RED](https://nodered.org) with a Das
 
 This is not intended to be a useful tool as-is, but as a base for you to create your own versions. You will need to edit the `main.js` to suit your application and update the `package.json` file to include your own required nodes and dependencies.
 
-At the top of `main.js` are a couple of flags you can switch to turn off editing, allow loading of a different flow file (and save as), and add the worldmap to the menu. Again these are only there to show you possibilities. Have fun.
+There are several simple switches that can be set in the `NRelectron` section of
+the `package.json` file. More significant modifications will require modification
+of the `main.js` file. Have fun.
 
 ## Configuring the project for building
 
@@ -65,7 +67,7 @@ These can be changed by editing the build section of the `package.json` file, se
 Electron-builder has a pre-configured Docker image that can help you build cross platform
 images if you like Docker - again read [their docs](https://www.electron.build/multi-platform-build#build-electron-app-using-docker-on-a-local-machine).
 
-This is very useful if you need to build for Windows on a Mac as the electron-builder invokes wine which is only 32-bit and so can't be run under Catalina.
+This is very useful if you need to build for Windows on a Mac as the electron-builder invokes **wine** which is only 32-bit and so can't be run under Catalina.
 
 ## Developing and Testing - Running locally
 

main.js

@@ -1,26 +1,31 @@
 
 'use strict';
+const pkg = require('./package.json');
+let options;
+if (pkg.hasOwnProperty("NRelectron")) { options = pkg["NRelectron"] }
 
-// Some settings you can edit easily
-
-const editable = true;              // set this to false to create a run only application - no editor/no console
-const allowLoadSave = false;        // set to true to allow import and export of flow file
-const showMap = false;              // set to true to add Worldmap to the menu
-const kioskMode = false;            // set to true to start in kiosk mode
+// Some settings you can edit if you don't set them in package.json
+console.log(options)
+const editable = options.editable || true;       // set this to false to create a run only application - no editor/no console
+const allowLoadSave = options.allowLoadSave || false; // set to true to allow import and export of flow file
+const showMap = options.showMap || false;       // set to true to add Worldmap to the menu
+const kioskMode = options.kioskMode || false;     // set to true to start in kiosk mode
+let flowfile = options.flowFile || 'electronflow.json'; // default Flows file name - loaded at start
 
-let flowfile = 'electronflow.json'; // default Flows file name - loaded at start
 const urldash = "/ui/#/0";          // url for the dashboard page
 const urledit = "/red";             // url for the editor page
 const urlconsole = "/console.htm";  // url for the console page
 const urlmap = "/worldmap";         // url for the worldmap
 const nrIcon = "nodered.png"        // Icon for the app in root dir (usually 256x256)
-const urlStart = urldash;           // Start on this page
+let urlStart;                       // Start on this page
+if (options.start.toLowerCase() === "editor") { urlStart = urledit; }
+else if (options.start.toLowerCase() === "map") { urlStart = urlmap; }
+else { urlStart = urldash; }
 
 // TCP port to use
 //const listenPort = "18880";                           // fix it if you like
 const listenPort = parseInt(Math.random()*16383+49152)  // or random ephemeral port
 
-const pkg = require('./package.json');
 const os = require('os');
 const fs = require('fs');
 const url = require('url');
@@ -208,7 +213,7 @@ if (!allowLoadSave) { template[0].submenu.splice(0,2); }
 // Top and tail menu on Mac
 if (process.platform === 'darwin') { 
     template[0].submenu.unshift({ type: 'separator' });
-    template[0].submenu.unshift({ label: "About Node-RED", selector: "orderFrontStandardAboutPanel:" });
+    template[0].submenu.unshift({ label: "About "+options.productName||"Node-RED Electron", selector: "orderFrontStandardAboutPanel:" });
     template[0].submenu.unshift({ type: 'separator' });
     template[0].submenu.unshift({ type: 'separator' });
 }
@@ -337,15 +342,15 @@ function createWindow() {
     //     console.log("FINISHED LOAD",a);
     // });
 
-    mainWindow.webContents.on("new-window", function(e, url, frameName, disposition, options) {
+    mainWindow.webContents.on("new-window", function(e, url, frameName, disposition, option) {
         // if a child window opens... modify any other options such as width/height, etc
         // in this case make the child overlap the parent exactly...
         //console.log("NEW WINDOW",url);
         var w = mainWindow.getBounds();
-        options.x = w.x;
-        options.y = w.y;
-        options.width = w.width;
-        options.height = w.height;
+        option.x = w.x;
+        option.y = w.y;
+        option.width = w.width;
+        option.height = w.height;
     })
 
     mainWindow.on('closed', () => {
@@ -374,22 +379,22 @@ app.on('activate', function() {
     // dock icon is clicked and there are no other windows open.
     if (mainWindow === null) {
         createWindow();
-        mainWindow.loadURL("http://localhost:"+listenPort+urldash);
+        mainWindow.loadURL("http://localhost:"+listenPort+urlStart);
     }
 });
 
 if (process.platform === 'darwin') {   
     app.setAboutPanelOptions({
-        applicationName: pkg.productName,
-        version: pkg.version,
-        copyright: "Copyright © 2019, D Conway-Jones.",
+        applicationVersion: pkg.version,
+        version: pkg.dependencies["node-red"],
+        copyright: "Copyright © 2019, "+pkg.author.name,
         credits: "Node-RED and other components are copyright the JS Foundation and other contributors."
     });
 }
 
 // Start the Node-RED runtime, then load the inital dashboard page
 RED.start().then(function() {
     server.listen(listenPort,"localhost",function() {
-        mainWindow.loadURL("http://localhost:"+listenPort+urldash);
+        mainWindow.loadURL("http://localhost:"+listenPort+urlStart);
     });
 });

package.json

@@ -45,10 +45,19 @@
         "electron": "^7.1.1",
         "electron-builder": "^22.1.0"
     },
+    "NRelectron": {
+        "productName": "Node-RED Electron",
+        "editable": true,
+        "allowLoadSave": false,
+        "showMap": false,
+        "kioskMode": false, 
+        "flowFile": "electronflow.json",
+        "start": "dashboard"
+    },
     "build": {
         "npmRebuild": false,
         "appId": "com.electron.node-red",
-        "productName": "Node-RED",
+        "productName": "Node-RED Electron",
         "copyright": "Copyright © 2019 D.Conway-Jones",
         "mac": {
             "category": "public.app-category.developer-tools",