Changed loading of env variables

.env.example

@@ -0,0 +1,3 @@
+NAME=development
+DEBUG=true
+PROTONMAIL_LOGIN_URL=https://mail.protonmail.com/login

.gitignore

@@ -4,6 +4,7 @@ Thumbs.db
 *.log
 *.autogenerated
 .idea
+.env
 
 # ignore everything in 'app' folder what had been generated from 'src' folder
 /app/stylesheets

README.md

@@ -47,6 +47,7 @@ The installer is provided by *electon-builder* and processed through gulp thanks
 
 This will work on OS X, Linux, and Windows. You will need [NodeJS](https://nodejs.org) to run this app.
 - Install required packages: `$ npm install`
+- Copy .env.example to .env: `$ cp .env.example .env`
 - Run: `$ npm start`
 - Build Local: `$ npm run release-local`
 - Build and upload to github: `$ npm run release`

package.json

@@ -54,6 +54,7 @@
   },
   "devDependencies": {
     "chai": "^4.1.0",
+    "dotenv": "^4.0.0",
     "electron": "^1.6.2",
     "electron-builder": "^17.3.1",
     "electron-mocha": "^4.0.0",

src/background.js

@@ -6,26 +6,23 @@ import createWindow from './helpers/window';
 const Config = require('electron-config');
 const config = new Config();
 
-const env = require('./env');
 const appMenu = require('./menu');
 const tray = require('./tray');
 
 require('electron-dl')({saveAs: true});
 
-if (env.debug) {
+if (process.env.NAME !== 'TEST') {
+  require('dotenv').load();
+}
+
+if (process.env.DEBUG === 'true') {
 	require('electron-reload')(__dirname);
 	require('electron-debug')({enabled: true});
 }
 
 let mainWindow;
 let isQuitting = false;
 
-/*if (env.name !== 'production') {
-    var userDataPath = app.getPath('userData');
-    app.setPath('userData', userDataPath + ' (' + env.name + ')');
-}
-*/
-
 const isAlreadyRunning = app.makeSingleInstance(() => {
 	if (mainWindow) {
 		if (mainWindow.isMinimized()) {
@@ -126,7 +123,7 @@ app.on('ready', () => {
 			mainWindow.show();
 		}
 
-    if (env.debug) {
+    if (process.env.DEBUG === 'true') {
       mainWindow.openDevTools();
     }
 	});

src/sidebar.js

@@ -31,7 +31,7 @@ export class Sidebar {
         tabSettingsArray.map((savedtab, index) => {
           this.tabGroup.addTab({
             title: savedtab.title.substr(0, 1),
-            src: "https://mail.protonmail.com/login?",
+            src: process.env.PROTONMAIL_LOGIN_URL,
             visible: true,
             active: !index,
             ready: (tab) => {
@@ -40,21 +40,19 @@ export class Sidebar {
             }
           });
         });
-        config.set("SavedTabs", postSettingsArray);
+        settings.set("SavedTabs", postSettingsArray);
     }
 
     onTabRemoved(tab) {
-        const config = require('./config');
-
-        const tabSettingsArray = config.get('SavedTabs');
+        const tabSettingsArray = settings.get('SavedTabs', []);
 
-        for (var i = 0; i < tabSettingsArray.length; i++)
+        for (let i = 0; i < tabSettingsArray.length; i++)
             if (tabSettingsArray[i].id === tab.id) {
                 tabSettingsArray.splice(i, 1);
                 break;
             }
 
-        config.set("SavedTabs", tabSettingsArray);
+        settings.set("SavedTabs", tabSettingsArray);
     }
 
     addEventListenerForAddAccount() {
@@ -82,7 +80,7 @@ export class Sidebar {
 
         this.tabGroup.addTab({
             title: name.substr(0, 1),
-            src: "https://mail.protonmail.com/login?",
+            src: process.env.PROTONMAIL_LOGIN_URL,
             visible: true,
             active: true,
             ready: (tab) => {

tasks/build_app.js

@@ -31,11 +31,6 @@ gulp.task('sass', () => {
   .pipe(gulp.dest(destDir.path('stylesheets')));
 });
 
-gulp.task('environment', () => {
-  const configFile = `config/env_${utils.getEnvName()}.json`;
-  projectDir.copy(configFile, destDir.path('env.json'), { overwrite: true });
-});
-
 gulp.task('watch', () => {
   const beepOnError = (done) => {
     return (err) => {
@@ -54,4 +49,4 @@ gulp.task('watch', () => {
   }));
 });
 
-gulp.task('build', ['bundle', 'sass', 'environment']);
+gulp.task('build', ['bundle', 'sass']);

tasks/build_tests.js

@@ -21,7 +21,7 @@ const generateEntryFile = (dir, destFileName, filePattern) => {
   });
 };
 
-gulp.task('build-unit', ['environment'], () => {
+gulp.task('build-unit', () => {
   const srcDir = jetpack.cwd('src');
   const destDir = jetpack.cwd('app');
 

tasks/utils.js

@@ -1,9 +1,5 @@
 const argv = require('minimist')(process.argv);
 
-exports.getEnvName = () => {
-  return argv.env || 'development';
-};
-
 exports.beepSound = () => {
   process.stdout.write('\u0007');
 };