window visible and title tests

Author: StephWood

.eslintrc.js

@@ -81,45 +81,48 @@ module.exports = {
   ],
   rules: {
     "arrow-body-style": 0,
-    "react/jsx-filename-extension": 0,
+    "class-methods-use-this": 0,
     "comma-dangle": 0,
-    "no-use-before-define": 0,
-    "no-console": 0,
-    "func-names": 0,
-    "no-undef": 0,
-    "no-unused-vars": 0,
-    strict: 0,
     "dot-notation": 0,
+    "func-names": 0,
     "import/extensions": 0,
     "import/no-extraneous-dependencies": 0,
+    "import/no-unresolved": 0,
     "max-len": 0,
+    "no-console": 0,
+    "no-param-reassign": 0,
+    "no-plusplus": 0,
+    "no-restricted-syntax": 0,
+    "no-shadow": 0,
+    "no-undef": 0,
+    "no-unused-vars": 0,
+    "no-use-before-define": 0,
     "no-useless-constructor": 0,
     "no-underscore-dangle": 0,
+    "no-unused-expressions": 0,
+    "no-return-assign": 0,
     quotes: 0,
-    "react/prefer-stateless-function": 0,
-    "react/prop-types": 0,
+    "prefer-const": 1,
+    "prefer-destructuring": 0,
+    "prefer-template": 1,
     "react/destructuring-assignment": 0,
-    "react/no-array-index-key": 0,
-    "react/no-did-update-set-state": 0,
-    "no-restricted-syntax": 0,
     "react/forbid-prop-types": 0,
-    "react/no-access-state-in-setstate": 0,
+    "react/jsx-filename-extension": 0,
     "react/jsx-no-duplicate-props": 0,
-    "no-plusplus": 0,
-    "no-param-reassign": 0,
-    "no-unused-expressions": 0,
-    "import/no-unresolved": 0,
+    "react/no-access-state-in-setstate": 0,
+    "react/no-array-index-key": 0,
+    "react/no-did-update-set-state": 0,
     "react/no-unused-state": 0,
-    "no-shadow": 0,
-    "no-return-assign": 0,
-    "class-methods-use-this": 0,
-    "brace-style": [2, "stroustrup"],
+    "react/prefer-stateless-function": 0,
     "react/sort-comp": [
       2,
       {
         order: ["lifecycle", "everything-else", "rendering"],
       },
     ],
+    "react/prop-types": 0,
+    "spaced-comment": 0,
+    strict: 0,
   },
   // setting: {
   //   "import/parsers": {

main.js

@@ -10,37 +10,39 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0;
 // Import parts of electron to use
 // app - Control your application's event lifecycle
 // ipcMain - Communicate asynchronously from the main process to renderer processes
+
+// npm libraries
 const { app, BrowserWindow, TouchBar, ipcMain, dialog } = require("electron");
-const path = require("path");
-const url = require("url");
-const fs = require("fs");
 const {
   default: installExtension,
   REACT_DEVELOPER_TOOLS,
   REDUX_DEVTOOLS,
 } = require("electron-devtools-installer");
-
 // Import Auto-Updater- Swell will update itself
 const { autoUpdater } = require("electron-updater");
-const log = require("electron-log");
 // TouchBarButtons are our nav buttons(ex: Select All, Deselect All, Open Selected, Close Selected, Clear All)
 const { TouchBarButton, TouchBarSpacer } = TouchBar;
 
+const path = require("path");
+const url = require("url");
+const fs = require("fs");
+const log = require("electron-log");
+
 // basic http cookie parser
 const cookie = require("cookie");
 // node-fetch for the fetch request
 const fetch2 = require("node-fetch");
 
-  // require menu file
-  require("./menu/mainMenu");
-
 // GraphQL imports
 const { ApolloClient } = require("apollo-client");
 const gql = require("graphql-tag");
 const { InMemoryCache } = require("apollo-cache-inmemory");
 const { createHttpLink } = require("apollo-link-http");
 const { ApolloLink } = require("apollo-link");
 
+// require menu file
+require("./menu/mainMenu");
+
 // configure logging
 autoUpdater.logger = log;
 autoUpdater.logger.transports.file.level = "info";
@@ -127,23 +129,31 @@ const touchBar = new TouchBar([
   tbClearAllButton,
 ]);
 
-// Keep a reference for dev mode
-let dev = false;
-console.log("process.defaultApp ->", process.defaultApp);
-console.log("process.execPath -> ", process.execPath);
-if (
-  process.defaultApp ||
-  /[\\/]electron-prebuilt[\\/]/.test(process.execPath) ||
-  /[\\/]electron[\\/]/.test(process.execPath)
-) {
-  dev = true;
-}
-console.log(
-  "current regex test -> ",
-  /[\\/]electron-prebuilt[\\/]/.test(process.execPath)
-);
-if (dev) console.log("dev is TRUE");
-if (dev === false) console.log("dev is FALSE");
+// -----------------------------------------------
+// prod / dev mode determined by boolean 'isDev'
+// -----------------------------------------------
+
+let isDev;
+process.argv.includes("--noDevServer") ? (isDev = false) : (isDev = true);
+
+console.log("isDev->", isDev);
+// let isDev = false;
+// console.log("process.defaultApp ->", process.defaultApp);
+// console.log("process.execPath -> ", process.execPath);
+
+// if (
+//   process.defaultApp ||
+//   /[\\/]electron-prebuilt[\\/]/.test(process.execPath) ||
+//   /[\\/]electron[\\/]/.test(process.execPath)
+// ) {
+//   isDev = true;
+// }
+// console.log(
+//   "current regex test -> ",
+//   /[\\/]electron-prebuilt[\\/]/.test(process.execPath)
+// );
+// if (isDev) console.log("isDev is TRUE");
+// if (isDev === false) console.log("isDev is FALSE");
 // Temporary fix broken high-dpi scale factor on Windows (125% scaling)
 // info: https://github.com/electron/electron/issues/9691
 if (process.platform === "win32") {
@@ -152,6 +162,10 @@ if (process.platform === "win32") {
   app.commandLine.appendSwitch("force-device-scale-factor", "1");
 }
 
+/***********************************************
+ ******* createWindow function declaration ******
+ ***********************************************/
+
 function createWindow() {
   // Create the new browser window instance.
   mainWindow = new BrowserWindow({
@@ -171,7 +185,7 @@ function createWindow() {
     icon: `${__dirname}/src/assets/icons/64x64.png`,
   });
 
-  if (dev) {
+  if (isDev) {
     // If we are in developer mode Add React & Redux DevTools to Electon App
     installExtension(REACT_DEVELOPER_TOOLS)
       .then((name) => console.log(`Added Extension:  ${name}`))
@@ -185,7 +199,7 @@ function createWindow() {
   // and load the index.html of the app.
   let indexPath;
 
-  if (dev && process.argv.indexOf("--noDevServer") === -1) {
+  if (isDev && process.argv.indexOf("--noDevServer") === -1) {
     // if we are in dev mode load up 'http://localhost:8080/index.html'
     indexPath = url.format({
       protocol: "http:",
@@ -215,7 +229,7 @@ function createWindow() {
   mainWindow.once("ready-to-show", () => {
     mainWindow.show();
     // Open the DevTools automatically if developing
-    if (dev) {
+    if (isDev) {
       mainWindow.webContents.openDevTools();
     }
   });
@@ -233,13 +247,21 @@ function createWindow() {
   // moved require mainmenu to top
 }
 
-// This method will be called when Electron has finished
+/********* end of createWindow declaration ******/
+
+/****************************************
+ ************** EVENT LISTENERS **********
+ ****************************************/
+
+// app.on('ready') 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.
+
+// if in prod mode, checkForUpdates after the window is created
 app.on("ready", () => {
   // createLoadingScreen();
   createWindow();
-  if (!dev) {
+  if (!isDev) {
     autoUpdater.checkForUpdates();
   }
 });
@@ -264,7 +286,7 @@ const sendStatusToWindow = (text) => {
 
 ipcMain.on("check-for-update", () => {
   //listens to ipcRenderer in UpdatePopUpContainer.jsx
-  if (!dev) autoUpdater.checkForUpdates();
+  if (!isDev) autoUpdater.checkForUpdates();
 });
 // autoUpdater.on('checking-for-update', () => {
 // sendStatusToWindow('Checking for update...');
@@ -276,7 +298,7 @@ ipcMain.on("check-for-update", () => {
 //   sendStatusToWindow('Update not available.');
 // });
 autoUpdater.on("error", (err) => {
-  console.error(err);
+  console.error("autoUpdater error -> ", err);
   sendStatusToWindow(`Error in auto-updater`);
 });
 autoUpdater.on("download-progress", (progressObj) => {
@@ -316,7 +338,7 @@ app.on("activate", () => {
 
 // export collection ipc now promise-based
 ipcMain.on("export-collection", (event, args) => {
-  let content = JSON.stringify(args.collection);
+  const content = JSON.stringify(args.collection);
   dialog.showSaveDialog(null).then((resp) => {
     if (resp.filePath === undefined) {
       console.log("You didn't save the file");
@@ -326,7 +348,7 @@ ipcMain.on("export-collection", (event, args) => {
     // fileName is a string that contains the path and filename created in the save file dialog.
     fs.writeFile(resp.filePath, content, (err) => {
       if (err) {
-        console.log("An error ocurred creating the file " + err.message);
+        console.log("An error ocurred creating the file ", err.message);
       }
     });
   });
@@ -351,7 +373,7 @@ ipcMain.on("import-collection", (event, args) => {
     }
 
     // get first file path - not dynamic for multiple files
-    let filepath = fileNames.filePaths[0];
+    const filepath = fileNames.filePaths[0];
 
     // get file extension
     const ext = path.extname(filepath);
@@ -366,7 +388,7 @@ ipcMain.on("import-collection", (event, args) => {
 
     fs.readFile(filepath, "utf-8", (err, data) => {
       if (err) {
-        alert("An error ocurred reading the file :" + err.message);
+        alert("An error ocurred reading the file :", err.message);
         return;
       }
 
@@ -464,7 +486,7 @@ ipcMain.on("open-gql", (event, args) => {
     return forward(operation).map((response) => {
       const context = operation.getContext();
       const headers = context.response.headers.entries();
-      for (let headerItem of headers) {
+      for (const headerItem of headers) {
         const key = headerItem[0]
           .split("-")
           .map((item) => item[0].toUpperCase() + item.slice(1))

package.json

@@ -8,7 +8,7 @@
     "test": "jest",
     "test-mocha": "mocha",
     "prod": "webpack --mode production --config webpack.build.config.js && electron --noDevServer .",
-    "start": "webpack-dev-server --hot --host 0.0.0.0 --config=./webpack.dev.config.js --mode development",
+    "start": "webpack-dev-server --mode development --hot --host 0.0.0.0 --config=./webpack.dev.config.js ",
     "build": "webpack --config webpack.build.config.js --mode production",
     "server": "nodemon test-server/server.js",
     "package-mac": "electron-builder  build --x64 --mac",