test: set default language for spellchecker

.github/ISSUE_TEMPLATE.md

@@ -1,8 +0,0 @@
----
-<!-- Please Include: -->
-- **Operating System**:
-  - [ ] Windows
-  - [ ] Linux/Ubutnu
-  - [ ] macOS
-- **Clear steps to reproduce the issue**:
-- **Relevant error messages and/or screenshots**:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +0,0 @@
----
-<!--
-Remove the fields that are not appropriate
-Please include:
--->
-
-**What's this PR do?**
-
-**Any background context you want to provide?**
-
-**Screenshots?**
-
-**You have tested this PR on:**
-  - [ ] Windows
-  - [ ] Linux/Ubuntu
-  - [ ] macOS

.gitignore

@@ -7,13 +7,6 @@ node_modules/
 # Compiled binary build directory
 dist/
 
-#snap generated files
-snap/parts
-snap/prime
-snap/snap
-snap/stage
-snap/*.snap
-
 # Logs
 logs
 *.log
@@ -33,6 +26,7 @@ yarn-error.log*
 config.gypi
 
 # Test generated files
-tests/package.json
+tests/e2e/package.json
+coverage
 
 .python-version

ISSUE_TEMPLATE.md

@@ -0,0 +1,7 @@
+---
+Please include: 
+- `Operating System`
+- `Clear steps to reproduce the issue`
+- `Relevant error messages and/or screenshots`
+
+

README.md

@@ -12,12 +12,19 @@ Please see [installation guide](https://zulipchat.com/help/desktop-app-install-g
 
 # Features
 * Sign in to multiple teams
-* Desktop Notifications with inline reply support
-* Multilanguage SpellChecker
+* Native desktop Notifications
+* SpellChecker
 * OSX/Win/Linux installers
-* Automatic Updates (macOS/Windows/Linux)
+* Automatic Updates (macOS/Windows)
 * Keyboard shortcuts
 
+Description            | Keys
+-----------------------| -----------------------
+Default shortcuts      | <kbd>Cmd/Ctrl</kbd> <kbd>k</kbd>
+Manage Zulip Servers    | <kbd>Cmd/Ctrl</kbd> <kbd>,</kbd>
+Back                   | <kbd>Cmd/Ctrl</kbd> <kbd>[</kbd>
+Forward                | <kbd>Cmd/Ctrl</kbd> <kbd>]</kbd>
+
 # Development
 Please see our [development guide](./development.md) to get started and run app locally.
 

app/main/autoupdater.js

@@ -1,4 +1,5 @@
 'use strict';
+const fs = require('fs');
 const { app, dialog } = require('electron');
 const { autoUpdater } = require('electron-updater');
 const isDev = require('electron-is-dev');
@@ -11,15 +12,13 @@ function appUpdater() {
 		return;
 	}
 
-	if (process.platform === 'linux' && !process.env.APPIMAGE) {
-		const { linuxUpdateNotification } = require('./linuxupdater');
-		linuxUpdateNotification();
-		return;
-	}
-
 	// Create Logs directory
 	const LogsDir = `${app.getPath('userData')}/Logs`;
 
+	if (!fs.existsSync(LogsDir)) {
+		fs.mkdirSync(LogsDir);
+	}
+
 	// Log whats happening
 	const log = require('electron-log');
 

app/main/crash-reporter.js

@@ -7,7 +7,7 @@ const crashHandler = () => {
 		productName: 'zulip-electron',
 		companyName: 'Kandra Labs, Inc.',
 		submitURL: 'https://zulip-sentry.herokuapp.com/crashreport',
-		uploadToServer: true
+		autoSubmit: true
 	});
 };
 

app/main/index.js

@@ -12,7 +12,6 @@ const { setAutoLaunch } = require('./startup');
 const { app, ipcMain } = electron;
 
 const BadgeSettings = require('./../renderer/js/pages/preference/badge-settings.js');
-const ConfigUtil = require('./../renderer/js/utils/config-util.js');
 
 // Adds debug features like hotkeys for triggering dev tools and reload
 // in development mode
@@ -52,8 +51,8 @@ const iconPath = () => {
 function createMainWindow() {
 	// Load the previous state with fallback to defaults
 	const mainWindowState = windowStateKeeper({
-		defaultWidth: 1100,
-		defaultHeight: 720
+		defaultWidth: 1000,
+		defaultHeight: 600
 	});
 
 	// Let's keep the window position global so that we can access it in other process
@@ -71,6 +70,7 @@ function createMainWindow() {
 		minHeight: 400,
 		webPreferences: {
 			plugins: true,
+			allowDisplayingInsecureContent: true,
 			nodeIntegration: true
 		},
 		show: false
@@ -81,11 +81,7 @@ function createMainWindow() {
 	});
 
 	win.once('ready-to-show', () => {
-		if (ConfigUtil.getConfigItem('startMinimized')) {
-			win.minimize();
-		} else {
-			win.show();
-		}
+		win.show();
 	});
 
 	win.loadURL(mainURL);
@@ -128,9 +124,6 @@ function createMainWindow() {
 	return win;
 }
 
-// Decrease load on GPU (experimental)
-app.disableHardwareAcceleration();
-
 // eslint-disable-next-line max-params
 app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
 	event.preventDefault();
@@ -152,11 +145,7 @@ app.on('ready', () => {
 	const page = mainWindow.webContents;
 
 	page.on('dom-ready', () => {
-		if (ConfigUtil.getConfigItem('startMinimized')) {
-			mainWindow.minimize();
-		} else {
-			mainWindow.show();
-		}
+		mainWindow.show();
 	});
 
 	page.once('did-frame-finish-load', () => {
@@ -165,11 +154,9 @@ app.on('ready', () => {
 		crashHandler();
 	});
 
-	// Temporarily remove this event
-	// electron.powerMonitor.on('resume', () => {
-	// 	mainWindow.reload();
-	// 	page.send('destroytray');
-	// });
+	electron.powerMonitor.on('resume', () => {
+		page.send('reload-viewer');
+	});
 
 	ipcMain.on('focus-app', () => {
 		mainWindow.show();
@@ -221,6 +208,11 @@ app.on('ready', () => {
 		appMenu.setMenu(props);
 	});
 
+	ipcMain.on('register-server-tab-shortcut', (event, index) => {
+		// Array index == Shown index - 1
+		page.send('switch-server-tab', index - 1);
+	});
+
 	ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
 		setAutoLaunch(AutoLaunchValue);
 	});

app/main/linuxupdater.js

@@ -1,42 +0,0 @@
-const { app } = require('electron');
-const { Notification } = require('electron');
-
-const request = require('request');
-const semver = require('semver');
-const ConfigUtil = require('../renderer/js/utils/config-util');
-const LinuxUpdateUtil = require('../renderer/js/utils/linux-update-util');
-
-function linuxUpdateNotification() {
-	let	url = 'https://api.github.com/repos/zulip/zulip-electron/releases';
-	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
-
-	const options = {
-		url,
-		headers: {'User-Agent': 'request'}
-	};
-
-	request(options, (error, response, body) => {
-		if (error) {
-			console.log('Error:', error);
-			return;
-		}
-		if (response.statusCode < 400) {
-			const data = JSON.parse(body);
-			const latestVersion = ConfigUtil.getConfigItem('betaUpdate') ? data[0].tag_name : data.tag_name;
-
-			if (semver.gt(latestVersion, app.getVersion())) {
-				const notified = LinuxUpdateUtil.getUpdateItem(latestVersion);
-				if (notified === null) {
-					new Notification({title: 'Zulip Update', body: 'A new version ' + latestVersion + ' is available. Please update using your package manager.'}).show();
-					LinuxUpdateUtil.setUpdateItem(latestVersion, true);
-				}
-			}
-		} else {
-			console.log('Status:', response.statusCode);
-		}
-	});
-}
-
-module.exports = {
-	linuxUpdateNotification
-};

app/main/menu.js

@@ -1,12 +1,12 @@
 'use strict';
+const os = require('os');
 const path = require('path');
 
-const { app, shell, BrowserWindow, Menu, dialog } = require('electron');
+const { app, shell, BrowserWindow, Menu } = require('electron');
 
 const fs = require('fs-extra');
 
 const ConfigUtil = require(__dirname + '/../renderer/js/utils/config-util.js');
-const DNDUtil = require(__dirname + '/../renderer/js/utils/dnd-util.js');
 
 const appName = app.getName();
 
@@ -54,7 +54,7 @@ class AppMenu {
 			role: 'togglefullscreen'
 		}, {
 			label: 'Zoom In',
-			accelerator: process.platform === 'darwin' ? 'Command+Plus' : 'Control+=',
+			accelerator: 'CommandOrControl+=',
 			click(item, focusedWindow) {
 				if (focusedWindow) {
 					AppMenu.sendAction('zoomIn');
@@ -87,7 +87,7 @@ class AppMenu {
 			}
 		}, {
 			label: 'Toggle Sidebar',
-			accelerator: 'CommandOrControl+Shift+S',
+			accelerator: 'CommandOrControl+S',
 			click(item, focusedWindow) {
 				if (focusedWindow) {
 					const newValue = !ConfigUtil.getConfigItem('showSidebar');
@@ -115,37 +115,26 @@ class AppMenu {
 	}
 
 	getHelpSubmenu() {
-		return [
-			{
-				label: `${appName + ' Desktop-'} v${app.getVersion()}`,
-				enabled: false
-			},
-			{
-				label: `What's New...`,
-				click() {
-					shell.openExternal(`https://github.com/zulip/zulip-electron/releases/tag/v${app.getVersion()}`);
-				}
-			},
-			{
-				label: `${appName} Help`,
-				click() {
-					shell.openExternal('https://zulipchat.com/help/');
-				}
-			}, {
-				label: 'Show App Logs',
-				click() {
-					shell.openItem(app.getPath('userData'));
-				}
-			}, {
-				label: 'Report an Issue...',
-				click() {
-          // the goal is to notify the main.html BrowserWindow
-          // which may not be the focused window.
-					BrowserWindow.getAllWindows().forEach(window => {
-						window.webContents.send('open-feedback-modal');
-					});
-				}
-			}];
+		return [{
+			label: `${appName} Website`,
+			click() {
+				shell.openExternal('https://zulipchat.com/help/');
+			}
+		}, {
+			label: `${appName + 'Desktop'} - ${app.getVersion()}`,
+			enabled: false
+		}, {
+			label: 'Report an Issue...',
+			click() {
+				const body = `
+					<!-- Please succinctly describe your issue and steps to reproduce it. -->
+					-
+					${app.getName()} ${app.getVersion()}
+					Electron ${process.versions.electron}
+					${process.platform} ${process.arch} ${os.release()}`;
+				shell.openExternal(`https://github.com/zulip/zulip-electron/issues/new?body=${encodeURIComponent(body)}`);
+			}
+		}];
 	}
 
 	getWindowSubmenu(tabs, activeTabIndex) {
@@ -161,11 +150,6 @@ class AppMenu {
 				type: 'separator'
 			});
 			for (let i = 0; i < tabs.length; i++) {
-				// Do not add functional tab settings to list of windows in menu bar
-				if (tabs[i].props.role === 'function' && tabs[i].webview.props.name === 'Settings') {
-					continue;
-				}
-
 				initialSubmenu.push({
 					label: tabs[i].webview.props.name,
 					accelerator: tabs[i].props.role === 'function' ? '' : `${ShortcutKey} + ${tabs[i].props.index + 1}`,
@@ -175,7 +159,7 @@ class AppMenu {
 							AppMenu.sendAction('switch-server-tab', tabs[i].props.index);
 						}
 					},
-					type: 'checkbox'
+					type: 'radio'
 				});
 			}
 		}
@@ -198,7 +182,7 @@ class AppMenu {
 			}, {
 				type: 'separator'
 			}, {
-				label: 'Desktop App Settings',
+				label: 'Settings',
 				accelerator: 'Cmd+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
@@ -207,7 +191,7 @@ class AppMenu {
 				}
 			}, {
 				label: 'Keyboard Shortcuts',
-				accelerator: 'Cmd+Shift+K',
+				accelerator: 'Cmd+K',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
@@ -215,13 +199,6 @@ class AppMenu {
 				}
 			}, {
 				type: 'separator'
-			}, {
-				label: 'Toggle Do Not Disturb',
-				accelerator: 'Command+Shift+M',
-				click() {
-					const dndUtil = DNDUtil.toggle();
-					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
-				}
 			}, {
 				label: 'Reset App Settings',
 				accelerator: 'Command+Shift+D',
@@ -305,7 +282,7 @@ class AppMenu {
 			}, {
 				type: 'separator'
 			}, {
-				label: 'Desktop App Settings',
+				label: 'Settings',
 				accelerator: 'Ctrl+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
@@ -316,7 +293,7 @@ class AppMenu {
 				type: 'separator'
 			}, {
 				label: 'Keyboard Shortcuts',
-				accelerator: 'Ctrl+Shift+K',
+				accelerator: 'Ctrl+K',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
@@ -324,13 +301,6 @@ class AppMenu {
 				}
 			}, {
 				type: 'separator'
-			}, {
-				label: 'Toggle Do Not Disturb',
-				accelerator: 'Ctrl+Shift+M',
-				click() {
-					const dndUtil = DNDUtil.toggle();
-					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
-				}
 			}, {
 				label: 'Reset App Settings',
 				accelerator: 'Ctrl+Shift+D',
@@ -400,32 +370,20 @@ class AppMenu {
 	}
 
 	static resetAppSettings() {
-		const resetAppSettingsMessage = 'By proceeding you will be removing all connected organizations and preferences from Zulip.';
-
 		// We save App's settings/configurations in following files
 		const settingFiles = ['window-state.json', 'domain.json', 'settings.json'];
 
-		dialog.showMessageBox({
-			type: 'warning',
-			buttons: ['YES', 'NO'],
-			defaultId: 0,
-			message: 'Are you sure?',
-			detail: resetAppSettingsMessage
-		}, response => {
-			if (response === 0) {
-				settingFiles.forEach(settingFileName => {
-					const getSettingFilesPath = path.join(app.getPath('appData'), appName, settingFileName);
-					fs.access(getSettingFilesPath, error => {
-						if (error) {
-							console.log(error);
-						} else {
-							fs.unlink(getSettingFilesPath, () => {
-								AppMenu.sendAction('clear-app-data');
-							});
-						}
+		settingFiles.forEach(settingFileName => {
+			const getSettingFilesPath = path.join(app.getPath('appData'), appName, settingFileName);
+			fs.access(getSettingFilesPath, error => {
+				if (error) {
+					console.log(error);
+				} else {
+					fs.unlink(getSettingFilesPath, () => {
+						AppMenu.sendAction('clear-app-data');
 					});
-				});
-			}
+				}
+			});
 		});
 	}
 

app/package-lock.json

@@ -0,0 +1,904 @@
+{
+  "name": "zulip",
+  "version": "1.7.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@paulcbetts/cld": {
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/@paulcbetts/cld/-/cld-2.4.6.tgz",
+      "integrity": "sha1-qZL2vEPKshKsLESIpnHPMC+LYuc=",
+      "requires": {
+        "glob": "5.0.15",
+        "nan": "2.8.0",
+        "rimraf": "2.6.2",
+        "underscore": "1.8.3"
+      }
+    },
+    "@paulcbetts/spellchecker": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@paulcbetts/spellchecker/-/spellchecker-4.0.6.tgz",
+      "integrity": "sha512-9lhLEvWfAB00n2oOM/S08sna9AuFk+b+bPk8ficpSa2X0Ll40PahMwfFS3G54nqQBIFFZgTPrhoHtCLAao0xmg==",
+      "requires": {
+        "nan": "2.8.0"
+      }
+    },
+    "ajv": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "requires": {
+        "co": "4.6.0",
+        "json-stable-stringify": "1.0.1"
+      }
+    },
+    "applescript": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/applescript/-/applescript-1.0.0.tgz",
+      "integrity": "sha1-u4evVoytA0pOSMS9r2Bno6JwExc="
+    },
+    "argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "auto-launch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/auto-launch/-/auto-launch-5.0.1.tgz",
+      "integrity": "sha1-IBWoowOEq+Dn+Yy9yoFFzxVHU64=",
+      "requires": {
+        "applescript": "1.0.0",
+        "mkdirp": "0.5.1",
+        "path-is-absolute": "1.0.1",
+        "untildify": "3.0.2",
+        "winreg": "1.2.2"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "bcp47": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/bcp47/-/bcp47-1.1.2.tgz",
+      "integrity": "sha1-NUvjMH/9CEM6ePXh4glYRfifx/4="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
+    },
+    "bluebird-lst": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.5.tgz",
+      "integrity": "sha512-Ey0bDNys5qpYPhZ/oQ9vOEvD0TYQDTILMXWP2iGfvMg7rSDde+oV4aQQgqRH+CvBFNz2BSDQnPGMUl6LKBUUQA==",
+      "requires": {
+        "bluebird": "3.5.1"
+      }
+    },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "builder-util-runtime": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-3.2.0.tgz",
+      "integrity": "sha512-VRvyyLiZZSBjcUTqEsHlBJSK0s6uVQChO7kbmVeU6QmSJ7TtsotNQELO6lbahwZMAQ4Z/haCKhlLBDdhW+3aqA==",
+      "requires": {
+        "bluebird-lst": "1.0.5",
+        "debug": "3.1.0",
+        "fs-extra-p": "4.4.4",
+        "sax": "1.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "requires": {
+        "boom": "2.10.1"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "electron-is-dev": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz",
+      "integrity": "sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4="
+    },
+    "electron-log": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-2.2.7.tgz",
+      "integrity": "sha512-pRfRn53MQGJ9L1+aC0VFcps0Uo5NM4RYsdvIdnjiV6J+krMr4cgBZ/DDA3kjNsr0D0kzo2WKpMgn2fAVra99rg=="
+    },
+    "electron-remote": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/electron-remote/-/electron-remote-1.2.0.tgz",
+      "integrity": "sha512-Fo2wnwK2tzd81Ux4pfNhz9DwHBoooZahdWBqOh9HtESYh2jrcsjc6FAibIu2oIOk71T1USyC7OBcqE8BZw3FGQ==",
+      "requires": {
+        "debug": "2.6.9",
+        "hashids": "1.1.4",
+        "lodash.get": "4.4.2",
+        "pify": "2.3.0",
+        "rxjs": "5.5.2",
+        "xmlhttprequest": "1.8.0"
+      }
+    },
+    "electron-spellchecker": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/electron-spellchecker/-/electron-spellchecker-1.1.2.tgz",
+      "integrity": "sha512-AdzD/Q82Svk9EDTc65vRr271UPLVIxsruKJM0iwqxEG9Y/CogNhEAJz/asV0BFWom4tpdB6cHcLbYePb11Musw==",
+      "requires": {
+        "@paulcbetts/cld": "2.4.6",
+        "@paulcbetts/spellchecker": "4.0.6",
+        "bcp47": "1.1.2",
+        "debug": "2.6.9",
+        "electron-remote": "1.2.0",
+        "keyboard-layout": "2.0.13",
+        "lru-cache": "4.1.1",
+        "mkdirp": "0.5.1",
+        "pify": "2.3.0",
+        "rxjs": "5.5.2",
+        "rxjs-serial-subscription": "0.1.1",
+        "spawn-rx": "2.0.12"
+      }
+    },
+    "electron-updater": {
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-2.16.2.tgz",
+      "integrity": "sha512-gv1kezjdXR6sw266aTzfs7HgPO5vaf5TsBFh7kMi47JABAIJSO3n+U79pSBperPVtGdqWQ4WfM6+2irrFvYXLw==",
+      "requires": {
+        "bluebird-lst": "1.0.5",
+        "builder-util-runtime": "3.2.0",
+        "electron-is-dev": "0.3.0",
+        "fs-extra-p": "4.4.4",
+        "js-yaml": "3.10.0",
+        "lazy-val": "1.0.2",
+        "lodash.isequal": "4.5.0",
+        "semver": "5.4.1",
+        "source-map-support": "0.5.0"
+      }
+    },
+    "electron-window-state": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-4.1.1.tgz",
+      "integrity": "sha1-azT9wxs4UU3+yLfI97XUrdtnYy0=",
+      "requires": {
+        "deep-equal": "1.0.1",
+        "jsonfile": "2.4.0",
+        "mkdirp": "0.5.1"
+      },
+      "dependencies": {
+        "jsonfile": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+          "requires": {
+            "graceful-fs": "4.1.11"
+          }
+        }
+      }
+    },
+    "esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
+    },
+    "event-kit": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.4.0.tgz",
+      "integrity": "sha512-ZXd9jxUoc/f/zdLdR3OUcCzT84WnpaNWefquLyE125akIC90sDs8S3T/qihliuVsaj7Osc0z8lLL2fjooE9Z4A=="
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "fs-extra": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
+      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.1"
+      }
+    },
+    "fs-extra-p": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.4.4.tgz",
+      "integrity": "sha512-zHsMNJWhXD184QfHKEIFSQSgAFNV7v9J+Nt2XpaLZp2nTz6WxZNV+R4G2uYeGeLTMaKvUZiqGKrH/4iFCupcUA==",
+      "requires": {
+        "bluebird-lst": "1.0.5",
+        "fs-extra": "4.0.2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+      "requires": {
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "har-schema": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+    },
+    "har-validator": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "requires": {
+        "ajv": "4.11.8",
+        "har-schema": "1.0.5"
+      }
+    },
+    "hashids": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/hashids/-/hashids-1.1.4.tgz",
+      "integrity": "sha512-U/fnTE3edW0AV92ZI/BfEluMZuVcu3MDOopsN7jS+HqDYcarQo8rXQiWlsBlm0uX48/taYSdxRsfzh2HRg5Z6w=="
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+    },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "requires": {
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "js-yaml": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "keyboard-layout": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz",
+      "integrity": "sha512-WxVc3bBITttHozSyEYPsyr5rN2KQuXtEaXMlQfQjEze1JrkLw30yH/bcNn1IGx48b+tdOdybpnq++JFLU2FaZg==",
+      "requires": {
+        "event-kit": "2.4.0",
+        "nan": "2.8.0"
+      }
+    },
+    "lazy-val": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.2.tgz",
+      "integrity": "sha512-2BaSu6qVnicKdWQPysrffZVFAKcPcZQ/q2YyeSjAxWaJlvCvKSrkcvsSHlleeIfA//fW2goTcYDTy2cBLN7+PQ=="
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
+    },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+    },
+    "lru-cache": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "mime-db": {
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+    },
+    "mime-types": {
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+      "requires": {
+        "mime-db": "1.30.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "1.1.8"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "nan": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
+      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo="
+    },
+    "node-json-db": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/node-json-db/-/node-json-db-0.7.3.tgz",
+      "integrity": "sha1-v2Mf9NTPQhHL3/5srmqq/m7lTN8=",
+      "requires": {
+        "mkdirp": "0.5.1"
+      }
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "performance-now": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
+    "qs": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+    },
+    "request": {
+      "version": "2.81.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "requires": {
+        "aws-sign2": "0.6.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.1.4",
+        "har-validator": "4.2.1",
+        "hawk": "3.1.3",
+        "http-signature": "1.1.1",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "performance-now": "0.2.0",
+        "qs": "6.4.0",
+        "safe-buffer": "5.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "requires": {
+        "glob": "7.1.2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "rxjs": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+      "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
+      "requires": {
+        "symbol-observable": "1.1.0"
+      }
+    },
+    "rxjs-serial-subscription": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/rxjs-serial-subscription/-/rxjs-serial-subscription-0.1.1.tgz",
+      "integrity": "sha1-pCsdsL8QlLCSMRkeJ3jKP8+e0Uc=",
+      "requires": {
+        "rxjs": "5.5.2"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-support": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz",
+      "integrity": "sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==",
+      "requires": {
+        "source-map": "0.6.1"
+      }
+    },
+    "spawn-rx": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.12.tgz",
+      "integrity": "sha512-gOPXiQQFQ9lTOLuys0iMn3jfxxv9c7zzwhbYLOEbQGvEShHVJ5sSR1oD3Daj88os7jKArDYT7rbOKdvNhe7iEg==",
+      "requires": {
+        "debug": "2.6.9",
+        "lodash.assign": "4.2.0",
+        "rxjs": "5.5.2"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+    },
+    "symbol-observable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
+      "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
+    },
+    "tough-cookie": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
+    "underscore": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+    },
+    "universalify": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
+    },
+    "untildify": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz",
+      "integrity": "sha1-fx8wIFWz/qDz6B3HjrNnZstl4/E="
+    },
+    "uuid": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "winreg": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.2.tgz",
+      "integrity": "sha1-hQmvo7ccW70RCm18YkfsZ3NsWY8="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "wurl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/wurl/-/wurl-2.5.0.tgz",
+      "integrity": "sha1-g7qrSEi5hmnSFISg/NmjSrpXKOk="
+    },
+    "xmlhttprequest": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    }
+  }
+}

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "2.2.0-beta",
+  "version": "1.7.0",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
   "copyright": "Kandra Labs, Inc.",
@@ -26,20 +26,14 @@
     "InstantMessaging"
   ],
   "dependencies": {
-    "@electron-elements/send-feedback": "1.0.7",
-    "auto-launch": "5.0.5",
+    "auto-launch": "5.0.1",
     "electron-is-dev": "0.3.0",
-    "electron-log": "2.2.14",
+    "electron-log": "2.2.7",
     "electron-spellchecker": "1.1.2",
-    "electron-updater": "2.21.10",
     "electron-window-state": "4.1.1",
-    "is-online": "7.0.0",
+    "electron-updater": "2.16.2",
     "node-json-db": "0.7.3",
-    "request": "2.85.0",
-    "semver": "5.4.1",
+    "request": "2.81.0",
     "wurl": "2.5.0"
-  },
-  "optionalDependencies": {
-    "node-mac-notifier": "0.1.0"
   }
 }

app/renderer/about.html

@@ -1,50 +1,45 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-	<meta charset="UTF-8">
-	<link rel="stylesheet" href="css/about.css">
-</head>
-
-<body>
+	<head>
+		<meta charset="UTF-8">
+		<link rel="stylesheet" href="css/about.css">
+	</head>
+	<body>
 	<div class="about">
 		<img class="logo" src="../resources/zulip.png" />
 		<p class="detail" id="version">v?.?.?</p>
 		<div class="maintenance-info">
 			<p class="detail maintainer">
-				Maintained by
-				<a onclick="linkInBrowser('website')">Zulip</a>
+				Maintained by <a onclick="linkInBrowser('website')">Zulip</a>
 			</p>
 			<p class="detail license">
-				Available under the
-				<a onclick="linkInBrowser('license')">Apache 2.0 License</a>
+				Available under the <a onclick="linkInBrowser('license')">Apache 2.0 License</a>
 			</p>
 			<a class="bug" onclick="linkInBrowser('bug')" href="#">Found bug?</a>
 		</div>
 	</div>
 	<script>
 
-		const { app } = require('electron').remote;
-		const { shell } = require('electron');
-		const version_tag = document.querySelector('#version');
-		version_tag.innerHTML = 'v' + app.getVersion();
+	const { app } = require('electron').remote;
+	const { shell } = require('electron');
+	const version_tag = document.querySelector('#version');
+	version_tag.innerHTML = 'v' + app.getVersion();
 
-		function linkInBrowser(type) {
-			let url;
-			switch (type) {
-				case 'website':
-					url = "https://zulipchat.com";
-					break;
-				case 'license':
-					url = "https://github.com/zulip/zulip-electron/blob/master/LICENSE";
-					break;
-				default:
-					url = 'https://github.com/zulip/zulip-electron/issues/new?body=' +
-						'%3C!--Please%20describe%20your%20issue%20and%20steps%20to%20reproduce%20it.--%3E';
-			}
-			shell.openExternal(url);
+	function linkInBrowser(type) {
+		let url;
+		switch (type) {
+			case 'website': 
+				url = "https://zulipchat.com";
+				break;
+			case 'license': 
+				url = "https://github.com/zulip/zulip-electron/blob/master/LICENSE";
+				break;
+			default:
+				url = 'https://github.com/zulip/zulip-electron/issues/new?body=' + 
+				      '%3C!--Please%20describe%20your%20issue%20and%20steps%20to%20reproduce%20it.--%3E';
 		}
+		shell.openExternal(url);
+	}
 	</script>
-	<script>require('./js/shared/preventdrag.js')</script>
-</body>
+	</body>
 </html>

app/renderer/css/main.css

@@ -13,6 +13,9 @@ body {
 #content {
     display: flex;
     height: 100%;
+    background: #eee url(../img/ic_loading.gif) no-repeat;
+    background-size: 60px 60px;
+    background-position: center;
 }
 
 .toggle-sidebar {
@@ -25,7 +28,6 @@ body {
     -webkit-app-region: drag;
     overflow: hidden;
     transition: all 0.5s ease;
-    z-index: 2;
 }
 
 .toggle-sidebar div {
@@ -42,28 +44,6 @@ body {
     transition: all 0.6s ease-out;
 }
 
-#view-controls-container {
-	height: calc(100% - 208px);
-	overflow-y: hidden;
-}
-
-#view-controls-container:hover {
-	overflow-y: overlay;
-}
-
-#view-controls-container::-webkit-scrollbar {
-	width: 4px;
-}
-
-#view-controls-container::-webkit-scrollbar-track {
-    box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-}
-
-#view-controls-container::-webkit-scrollbar-thumb {
-  background-color: darkgrey;
-  outline: 1px solid slategrey;
-}
-
 @font-face {
     font-family: 'Material Icons';
     font-style: normal;
@@ -101,17 +81,11 @@ body {
     text-rendering: optimizeLegibility;
 }
 
-#actions-container {
-    display: flex;
-    flex-direction: column;
-    position: fixed;
-    bottom: 0;
-}
-
 .action-button {
     display: flex;
     flex-direction: column;
-    padding: 12px;
+    align-items: center;
+    padding: 10px;
 }
 
 .action-button:hover {
@@ -127,29 +101,6 @@ body {
     color: #98a9b3;
 }
 
-.action-button.disable {
-    opacity: 0.6;
-}
-
-.action-button.disable:hover {
-    cursor: not-allowed;
-}
-
-.action-button.disable:hover i {
-    color: #6c8592;
-}
-
-.action-button.active {
-    /* background-color: rgba(255, 255, 255, 0.25); */
-    background-color: #efefef;
-    opacity: 0.9;
-    padding-right: 14px;
-}
-
-.action-button.active i {
-    color: #1c262b;
-}
-
 .tab:first-child {
     margin-top: 8px;
 }
@@ -270,63 +221,36 @@ body {
     width: 100%;
 }
 
-/*Pseudo element for loading indicator*/
-#webviews-container::before {
-    content: "";
-    position: absolute;
-    z-index: 1;
-    background: #fff url(../img/ic_loading.gif) no-repeat;
-    background-size: 60px 60px;
-    background-position: center;
-    width: 100%;
-    height: 100%;
-}
-
-/*When the active webview is loaded*/
-#webviews-container.loaded::before {
-    opacity: 0;
-    z-index: -1;
-    visibility: hidden;
-}
-
 webview {
-    /* transition: opacity 0.3s ease-in; */
+    opacity: 1;
+    transition: opacity 0.3s ease-in;
     flex-grow: 1;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
 }
 
 webview.onload {
     transition: opacity 1s cubic-bezier(0.95, 0.05, 0.795, 0.035);
 }
 
-webview.active {
-    opacity: 1;
-    z-index: 1;
-    visibility: visible;
-}
-
 webview.disabled {
+    flex: 0 1;
+    height: 0;
+    width: 0;
     opacity: 0;
+    transition: opacity 0.3s ease-out;
 }
 
-webview.focus {
+webview:focus {
     outline: 0px solid transparent;
 }
 
+
 /* Tooltip styling */
 
-#dnd-tooltip,
-#back-tooltip,
 #reload-tooltip,
 #setting-tooltip {
     font-family: sans-serif;
     background: #222c31;
-    margin-left: 48px;
+    margin-left: 68px;
     padding: 6px 8px;
     position: absolute;
     margin-top: 0px;
@@ -338,8 +262,6 @@ webview.focus {
     font-size: 14px;
 }
 
-#dnd-tooltip:after,
-#back-tooltip:after,
 #reload-tooltip:after,
 #setting-tooltip:after {
     content: " ";
@@ -399,8 +321,6 @@ webview.focus {
     height: 100%;
     width: 100%;
     position: relative;
-    flex-grow: 1;
-    flex-basis: 0px;
 }
 
 .hidden {
@@ -442,27 +362,4 @@ webview.focus {
         overflow: hidden;
         opacity: 1;
     }
-}
-
-send-feedback {
-  width: 60%;
-  height: 85%;
-}
-
-#feedback-modal {
-  display: none;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(68, 67, 67, 0.81);
-  align-items: center;
-  justify-content: center;
-  z-index: 2;
-  transition: all 1s ease-out;
-}
-
-#feedback-modal.show {
-  display: flex;
-}
+}

app/renderer/css/preference.css

@@ -12,19 +12,16 @@ body {
 }
 
 kbd {
-    display: inline-block;
+    padding: 0.3em 0.8em;
     border: 1px solid #ccc;
-    border-radius: 3px;
     font-size: 15px;
     font-family: Courier New, Courier, monospace;
+    background-color: #383430;
+    color: #ededed;
+    display: inline-block;
+    margin: 0 0.1em;
     font-weight: bold;
     white-space: nowrap;
-    background-color: #f7f7f7;
-    color: #333;
-    margin: 0 0.1em;
-    padding: 0.3em 0.8em;
-    text-shadow: 0 1px 0 #fff;
-    line-height: 1.4;
 }
 
 table,
@@ -41,11 +38,11 @@ table {
 }
 
 table tr:nth-child(even) {
-    background-color: #fafafa;
+    background-color: #f7eee6;
 }
 
 table tr:nth-child(odd) {
-    background-color: #fff;
+    background-color: #fff8ef;
 }
 
 td {
@@ -95,13 +92,11 @@ td:nth-child(odd) {
 }
 
 #sidebar {
-    width: 150px;
-    min-width: 100px;
-    padding: 30px 30px 30px 35px;
+    width: 80px;
+    padding: 30px;
     display: flex;
     flex-direction: column;
     font-size: 16px;
-    background: #f2f2f2;
 }
 
 #nav-container {
@@ -115,7 +110,7 @@ td:nth-child(odd) {
 }
 
 .nav.active {
-    color: #4ebfac;
+    color: #464e5a;
     cursor: default;
     position: relative;
 }
@@ -123,19 +118,12 @@ td:nth-child(odd) {
 .nav.active::before {
     background: #464e5a;
     width: 3px;
-    height: 18px;
+    height: 16px;
     position: absolute;
     left: -8px;
     content: '';
 }
 
-
-/* We don't want to show this in nav item since we have the + button for adding an Organization */
-
-#nav-AddServer {
-    display: none;
-}
-
 #settings-header {
     font-size: 22px;
     color: #222c31;
@@ -151,12 +139,12 @@ td:nth-child(odd) {
 }
 
 #new-server-container {
-    padding-left: 42px;
-    padding-top: 25px;
-    margin-right: 16px;
+    opacity: 1;
+    transition: opacity 0.3s;
 }
 
 .title {
+    padding: 4px 0 6px 0;
     font-weight: 500;
     color: #222c31;
 }
@@ -168,16 +156,6 @@ td:nth-child(odd) {
     padding: 4px 0 6px 0;
 }
 
-.add-server-info-row {
-    display: flex;
-    margin: 8px 0 0 0;
-}
-
-.add-server-info-right {
-    flex-grow: 1;
-    margin-top: 10px;
-}
-
 .sub-title {
     padding: 4px 0 6px 0;
     font-weight: bold;
@@ -188,40 +166,20 @@ img.server-info-icon {
     width: 36px;
     height: 36px;
     padding: 4px;
-    cursor: pointer;
-    vertical-align: middle;
 }
 
 .server-info-left {
-    margin: 4px 20px 0 0;
-    min-width: 40%;
+    margin: 10px 20px 0 0;
 }
 
 .server-info-right {
-    margin-top: 4px;
-    width: 55%;
-    display: flex;
-    align-items: baseline;
-    justify-content: space-between;
     flex-grow: 1;
+    margin-right: 10px;
 }
 
 .server-info-row {
-    display: inline-block;
-    margin: 5px 0 0 0;
-}
-
-.server-info-left .server-info-row {
-    display: inline-flex;
-    align-items: inherit;
-    vertical-align: -2px;
-    position: relative;
-}
-
-.server-url {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+    display: flex;
+    margin: 8px 0 0 0;
 }
 
 .server-info-alias {
@@ -229,10 +187,6 @@ img.server-info-icon {
     cursor: pointer;
 }
 
-.server-url-info {
-    margin-right: 10px;
-}
-
 .setting-input-key {
     font-size: 14px;
     height: 27px;
@@ -246,16 +200,18 @@ img.server-info-icon {
 .setting-input-value {
     flex-grow: 1;
     font-size: 14px;
+    height: 22px;
     border-radius: 3px;
-    padding: 13px;
+    padding: 7px;
     border: #ededed 2px solid;
     outline-width: 0;
     background: transparent;
-    max-width: 450px;
+    max-width: 500px;
 }
 
 .setting-input-value:focus {
-    border: #4EBFAC 2px solid;
+    border: #7cb980 2px solid;
+    border-radius: 3px;
 }
 
 .setting-block {
@@ -307,11 +263,7 @@ img.server-info-icon {
     margin: 10px 0 20px 0;
     background: #fff;
     width: 70%;
-    transition: all 0.2s;
-}
-
-.settings-card:hover {
-    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 0px 0px rgba(0, 0, 0, 0.12);
+    border-left: 8px solid #bcbcbc;
 }
 
 .hidden {
@@ -320,15 +272,11 @@ img.server-info-icon {
 }
 
 .red {
-    color: #ef5350;
-    padding: 8px;
-    border: rgba(239, 83, 80, 0.5) solid 1px;
-}
-
-.red:hover {
-    color: #e63431;
-    border: rgba(239, 83, 80, 0.7) solid 1px;
-    ;
+    color: #ffffff;
+    background: #ef5350;
+    padding: 3px;
+    padding-right: 10px;
+    padding-left: 10px;
 }
 
 .blue {
@@ -358,13 +306,12 @@ img.server-info-icon {
 }
 
 i.open-tab-button {
-    padding-left: 2px;
-    font-size: 19px;
+    padding: 0 5px;
+    font-size: 18px;
     cursor: pointer;
 }
 
-.reset-data-button,
-.custom-css-button {
+.reset-data-button {
     display: inline-block;
     border: none;
     padding: 10px;
@@ -375,35 +322,19 @@ i.open-tab-button {
     text-decoration: none;
 }
 
-.css-delete-action {
-    margin-bottom: 10px;
-}
-
 .reset-data-button:hover {
     background-color: #3c9f8d;
     color: #fff;
 }
 
-.selected-css-path {
-    background: #eeeeee;
-    padding: 10px;
-    margin-top: 10px;
-    margin-right: 10px;
-    display: flex;
-    width: 90%;
-    justify-content: space-between;
-}
-
-#remove-custom-css {
-    align-items: flex-end;
-}
-
 #server-info-container {
-    min-height: calc(100% - 260px);
+    min-height: calc(100% - 235px);
 }
 
 #create-organization-container {
     font-size: 1.15em;
+    position: fixed;
+    bottom: 15px;
 }
 
 #create-organization-container i {
@@ -412,10 +343,17 @@ i.open-tab-button {
 }
 
 #open-create-org-link {
+    color: #666;
     cursor: pointer;
     text-decoration: none;
 }
 
+#open-create-org-link:hover {
+    color: #005580;
+    ;
+    text-decoration: underline;
+}
+
 .toggle {
     position: absolute;
     margin-left: -9999px;
@@ -452,6 +390,7 @@ input.toggle-round+label:before {
     right: 2px;
     background-color: #f1f1f1;
     border-radius: 25px;
+    transition: background 0.4s;
 }
 
 input.toggle-round+label:after {
@@ -459,6 +398,7 @@ input.toggle-round+label:after {
     height: 25px;
     background-color: #fff;
     border-radius: 100%;
+    transition: margin 0.4s;
 }
 
 input.toggle-round:checked+label:before {
@@ -467,157 +407,4 @@ input.toggle-round:checked+label:before {
 
 input.toggle-round:checked+label:after {
     margin-left: 25px;
-}
-
-
-/*  Add new server modal */
-
-.add-server-modal {
-    display: block;
-    position: fixed;
-    z-index: 1;
-    padding-top: 15vh;
-    left: 0;
-    top: 0;
-    margin: auto;
-    width: 100%;
-    height: 100%;
-    /* background: rgba(61, 64, 67, 15); */
-    background: linear-gradient(35deg, #003b52, #45b59b);
-    overflow: auto;
-}
-
-
-/* Modal Content */
-
-.modal-container {
-    background-color: #f4f7f8;
-    margin: auto;
-    padding: 57px;
-    border: #dae1e3 1px solid;
-    width: 550px;
-    height: 370px;
-    border-radius: 4px;
-}
-
-.add-server-modal .page-title {
-    text-align: center;
-    font-size: 1.6rem;
-}
-
-.divider {
-    margin-bottom: 30px;
-    margin-top: 30px;
-    color: #7d878a;
-}
-
-.divider hr {
-    margin-left: 8px;
-    margin-right: 8px;
-    width: 44%;
-}
-
-.left {
-    float: left;
-}
-
-.right {
-    float: right;
-}
-
-.server-center {
-    width: 100%;
-    text-align: center;
-    align-items: center;
-    padding-top: 13px;
-    margin-left: -5px;
-}
-
-.server-center button {
-    font-weight: bold;
-    font-size: 1.1rem;
-    margin: auto;
-    align-items: center;
-    text-align: center;
-    color: #fff;
-    background: #4EBFAC;
-    border-color: none;
-    border: none;
-    width: 98%;
-    height: 46px;
-    border-radius: 3px;
-    cursor: pointer;
-}
-
-.server-center button:hover {
-    background: #329588;
-}
-
-.server-center button:focus {
-    background: #329588;
-}
-
-
-/* responsive grid */
-
-@media (max-width: 650px) {
-    .selected-css-path {
-        margin-right: 15px;
-    }
-    #css-delete-action {
-        margin-left: 10px;
-    }
-    #css-delete-action span {
-        display: none;
-    }
-}
-
-@media (max-width: 720px) {
-    .modal-container {
-        width: 60vw;
-        padding: 40px;
-        min-width: 300px;
-    }
-    .server-center button {
-        margin-right: -12px;
-        width: 100%;
-    }
-    .divider {
-        margin-right: -8px;
-    }
-    .divider hr {
-        margin-left: 6px;
-        margin-right: 6px;
-        width: 43%;
-    }
-    #new-server-container {
-        padding-left: 0px;
-    }
-}
-
-@media (max-width: 600px) {
-    .divider {
-        margin-left: 4%;
-    }
-    .divider hr {
-        margin-left: 2px;
-        margin-right: 2px;
-        width: 40%;
-    }
-}
-
-@media (max-width: 900px) {
-    .settings-card {
-        flex-direction: column;
-        align-items: center;
-    }
-
-    .server-info-right {
-        flex-direction: column;
-        align-items: center;
-    }
-
-    .action {
-        margin-top: 10px;
-    }
-}
+}

app/renderer/js/components/functional-tab.js

@@ -4,7 +4,7 @@ const Tab = require(__dirname + '/../components/tab.js');
 
 class FunctionalTab extends Tab {
 	template() {
-		return `<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
+		return `<div class="tab functional-tab">
 					<div class="server-tab-badge close-button">
 						<i class="material-icons">close</i>
 					</div>
@@ -16,11 +16,10 @@ class FunctionalTab extends Tab {
 
 	init() {
 		this.$el = this.generateNodeFromTemplate(this.template());
-		if (this.props.name !== 'Settings') {
-			this.props.$root.appendChild(this.$el);
-			this.$closeButton = this.$el.getElementsByClassName('server-tab-badge')[0];
-			this.registerListeners();
-		}
+		this.props.$root.appendChild(this.$el);
+
+		this.$closeButton = this.$el.getElementsByClassName('server-tab-badge')[0];
+		this.registerListeners();
 	}
 
 	registerListeners() {

app/renderer/js/components/handle-external-link.js

@@ -1,35 +0,0 @@
-const { shell } = require('electron').remote;
-const LinkUtil = require('../utils/link-util');
-const DomainUtil = require('../utils/domain-util');
-
-function handleExternalLink(event) {
-	const { url } = event;
-	const domainPrefix = DomainUtil.getDomain(this.props.index).url;
-
-  // Whitelist URLs which are allowed to be opened in the app
-	const {
-    isInternalUrl: isWhiteListURL,
-    isUploadsUrl: isUploadsURL
-  } = LinkUtil.isInternal(domainPrefix, url);
-
-	if (isWhiteListURL) {
-		event.preventDefault();
-
-    // download txt, pdf, mp3, mp4 etc.. by using downloadURL in the
-    // main process which allows the user to save the files to their desktop
-    // and not trigger webview reload while image in webview will
-    // do nothing and will not save it
-		if (!LinkUtil.isImage(url) && isUploadsURL) {
-			this.$el.downloadURL(url);
-			return;
-		}
-
-    // open internal urls inside the current webview.
-		this.$el.loadURL(url);
-	} else {
-		event.preventDefault();
-		shell.openExternal(url);
-	}
-}
-
-module.exports = handleExternalLink;

app/renderer/js/components/server-tab.js

@@ -7,7 +7,7 @@ const {ipcRenderer} = require('electron');
 
 class ServerTab extends Tab {
 	template() {
-		return `<div class="tab" data-tab-id="${this.props.tabIndex}">
+		return `<div class="tab">
 					<div class="server-tooltip" style="display:none"></div>
 					<div class="server-tab-badge"></div>
 					<div class="server-tab">
@@ -50,8 +50,7 @@ class ServerTab extends Tab {
 			shortcutText = `Ctrl+${shownIndex}`;
 		}
 
-		// Array index == Shown index - 1
-		ipcRenderer.send('switch-server-tab', shownIndex - 1);
+		ipcRenderer.send('register-server-tab-shortcut', shownIndex);
 
 		return shortcutText;
 	}

app/renderer/js/components/webview.js

@@ -3,14 +3,13 @@
 const path = require('path');
 const fs = require('fs');
 
-const ConfigUtil = require(__dirname + '/../utils/config-util.js');
+const DomainUtil = require(__dirname + '/../utils/domain-util.js');
 const SystemUtil = require(__dirname + '/../utils/system-util.js');
-const { app, dialog } = require('electron').remote;
+const LinkUtil = require(__dirname + '/../utils/link-util.js');
+const { shell, app } = require('electron').remote;
 
 const BaseComponent = require(__dirname + '/../components/base.js');
-const handleExternalLink = require(__dirname + '/../components/handle-external-link.js');
 
-const shouldSilentWebview = ConfigUtil.getConfigItem('silent');
 class WebView extends BaseComponent {
 	constructor(props) {
 		super();
@@ -18,16 +17,13 @@ class WebView extends BaseComponent {
 		this.props = props;
 
 		this.zoomFactor = 1.0;
-		this.loading = true;
+		this.loading = false;
 		this.badgeCount = 0;
-		this.customCSS = ConfigUtil.getConfigItem('customCSS');
-		this.$webviewsContainer = document.querySelector('#webviews-container').classList;
 	}
 
 	template() {
 		return `<webview
 					class="disabled"
-					data-tab-id="${this.props.tabIndex}"
 					src="${this.props.url}"
 					${this.props.nodeIntegration ? 'nodeIntegration' : ''}
 					disablewebsecurity
@@ -46,14 +42,17 @@ class WebView extends BaseComponent {
 
 	registerListeners() {
 		this.$el.addEventListener('new-window', event => {
-			handleExternalLink.call(this, event);
-		});
+			const { url } = event;
+			const domainPrefix = DomainUtil.getDomain(this.props.index).url;
 
-		if (shouldSilentWebview) {
-			this.$el.addEventListener('dom-ready', () => {
-				this.$el.setAudioMuted(true);
-			});
-		}
+			if (LinkUtil.isInternal(domainPrefix, url) || url === (domainPrefix + '/')) {
+				event.preventDefault();
+				this.$el.loadURL(url);
+			} else {
+				event.preventDefault();
+				shell.openExternal(url);
+			}
+		});
 
 		this.$el.addEventListener('page-title-updated', event => {
 			const { title } = event;
@@ -61,18 +60,6 @@ class WebView extends BaseComponent {
 			this.props.onTitleChange();
 		});
 
-		this.$el.addEventListener('did-navigate-in-page', event => {
-			const isSettingPage = event.url.includes('renderer/preference.html');
-			if (isSettingPage) {
-				return;
-			}
-			this.canGoBackButton();
-		});
-
-		this.$el.addEventListener('did-navigate', () => {
-			this.canGoBackButton();
-		});
-
 		this.$el.addEventListener('page-favicon-updated', event => {
 			const { favicons } = event;
 			// This returns a string of favicons URL. If there is a PM counts in unread messages then the URL would be like
@@ -87,7 +74,6 @@ class WebView extends BaseComponent {
 			if (this.props.role === 'server') {
 				this.$el.classList.add('onload');
 			}
-			this.loading = false;
 			this.show();
 		});
 
@@ -121,39 +107,17 @@ class WebView extends BaseComponent {
 			return;
 		}
 
-		// To show or hide the loading indicator in the the active tab
-		if (this.loading) {
-			this.$webviewsContainer.remove('loaded');
-		} else {
-			this.$webviewsContainer.add('loaded');
-		}
-
 		this.$el.classList.remove('disabled');
-		this.$el.classList.add('active');
 		setTimeout(() => {
 			if (this.props.role === 'server') {
 				this.$el.classList.remove('onload');
 			}
 		}, 1000);
 		this.focus();
+		this.loading = false;
 		this.props.onTitleChange();
 		// Injecting preload css in webview to override some css rules
 		this.$el.insertCSS(fs.readFileSync(path.join(__dirname, '/../../css/preload.css'), 'utf8'));
-
-		// get customCSS again from config util to avoid warning user again
-		this.customCSS = ConfigUtil.getConfigItem('customCSS');
-		if (this.customCSS) {
-			if (!fs.existsSync(this.customCSS)) {
-				this.customCSS = null;
-				ConfigUtil.setConfigItem('customCSS', null);
-
-				const errMsg = 'The custom css previously set is deleted!';
-				dialog.showErrorBox('custom css file deleted!', errMsg);
-				return;
-			}
-
-			this.$el.insertCSS(fs.readFileSync(path.resolve(__dirname, this.customCSS), 'utf8'));
-		}
 	}
 
 	focus() {
@@ -167,7 +131,6 @@ class WebView extends BaseComponent {
 
 	hide() {
 		this.$el.classList.add('disabled');
-		this.$el.classList.remove('active');
 	}
 
 	load() {
@@ -211,15 +174,6 @@ class WebView extends BaseComponent {
 		}
 	}
 
-	canGoBackButton() {
-		const $backButton = document.querySelector('#actions-container #back-action');
-		if (this.$el.canGoBack()) {
-			$backButton.classList.remove('disable');
-		} else {
-			$backButton.classList.add('disable');
-		}
-	}
-
 	forward() {
 		if (this.$el.canGoForward()) {
 			this.$el.goForward();
@@ -228,9 +182,6 @@ class WebView extends BaseComponent {
 
 	reload() {
 		this.hide();
-		// Shows the loading indicator till the webview is reloaded
-		this.$webviewsContainer.remove('loaded');
-		this.loading = true;
 		this.$el.reload();
 	}
 

app/renderer/js/console.js

@@ -0,0 +1,69 @@
+const NodeConsole = require('console').Console;
+const fs = require('fs');
+
+const { app } = require('electron').remote;
+const isDev = require('electron-is-dev');
+
+const browserConsole = console;
+const logDir = `${app.getPath('userData')}/Logs`;
+if (!fs.existsSync(logDir)) {
+	fs.mkdirSync(logDir);
+}
+
+function customConsole(opts, type, ...args) {
+	const { nodeConsole, timestamp } = opts;
+	if (timestamp) {
+		args.unshift(timestamp());
+	}
+
+	if (!isDev) {
+		const nodeConsoleLog = nodeConsole[type] || nodeConsole.log;
+		nodeConsoleLog.apply(null, args);
+	}
+	browserConsole[type].apply(null, args);
+}
+
+function getTimestamp() {
+	const date = new Date();
+	const timestamp =
+		`${date.getMonth()}/${date.getDate()} ` +
+		`${date.getMinutes()}:${date.getSeconds()}`;
+	return timestamp;
+}
+
+function setConsoleProto(type) {
+	Object.defineProperty(this, type, {
+		value(...args) {
+			const { timestamp, nodeConsole } = this;
+			const opts = {
+				timestamp,
+				nodeConsole
+			};
+			customConsole.apply(null, [].concat(opts, type, args));
+		}
+	});
+}
+
+class Console {
+	constructor(opts = {}) {
+		let { timestamp, file } = opts;
+		file = `${logDir}/${file || 'console.log'}`;
+		if (timestamp === true) {
+			timestamp = getTimestamp;
+		}
+
+		const fileStream = fs.createWriteStream(file);
+		const nodeConsole = new NodeConsole(fileStream);
+		this.nodeConsole = nodeConsole;
+		this.timestamp = timestamp;
+		this.setUpConsole();
+	}
+
+	setUpConsole() {
+		for (const type in browserConsole) {
+			setConsoleProto.call(this, type);
+		}
+	}
+}
+
+module.exports = Console;

app/renderer/js/feedback.js

@@ -1,62 +0,0 @@
-const { app } = require('electron').remote;
-const path = require('path');
-const fs = require('fs');
-const SendFeedback = require('@electron-elements/send-feedback');
-
-// make the button color match zulip app's theme
-SendFeedback.customStyles = `
-button:hover, button:focus {
-  border-color: #4EBFAC;
-  color: #4EBFAC;
-}
-
-button:active {
-  background-color: #f1f1f1;
-  color: #4EBFAC;
-}
-
-button {
-  background-color: #4EBFAC;
-  border-color: #4EBFAC;
-}
-`;
-
-customElements.define('send-feedback', SendFeedback);
-const sendFeedback = document.querySelector('send-feedback');
-const feedbackHolder = sendFeedback.parentElement;
-
-// customize the fields of custom elements
-sendFeedback.title = 'Report Issue';
-sendFeedback.titleLabel = 'Issue title:';
-sendFeedback.titlePlaceholder = 'Enter issue title';
-sendFeedback.textareaLabel = 'Describe the issue:';
-sendFeedback.textareaPlaceholder = 'Succinctly describe your issue and steps to reproduce it...';
-sendFeedback.buttonLabel = 'Report Issue';
-sendFeedback.loaderSuccessText = '';
-
-sendFeedback.useReporter('emailReporter', {
-	email: 'akash@zulipchat.com'
-});
-
-feedbackHolder.addEventListener('click', e => {
-  // only remove the class if the grey out faded
-  // part is clicked and not the feedback element itself
-	if (e.target === e.currentTarget) {
-		feedbackHolder.classList.remove('show');
-	}
-});
-
-sendFeedback.addEventListener('feedback-submitted', () => {
-	setTimeout(() => {
-		feedbackHolder.classList.remove('show');
-	}, 1000);
-});
-
-const dataDir = app.getPath('userData');
-const logsDir = path.join(dataDir, '/Logs');
-sendFeedback.logs.push(...fs.readdirSync(logsDir).map(file => path.join(logsDir, file)));
-
-module.exports = {
-	feedbackHolder,
-	sendFeedback
-};

app/renderer/js/main.js

@@ -1,19 +1,15 @@
 'use strict';
 
+require(__dirname + '/js/tray.js');
 const { ipcRenderer, remote } = require('electron');
-const isDev = require('electron-is-dev');
 
 const { session } = remote;
 
-require(__dirname + '/js/tray.js');
 const DomainUtil = require(__dirname + '/js/utils/domain-util.js');
 const WebView = require(__dirname + '/js/components/webview.js');
 const ServerTab = require(__dirname + '/js/components/server-tab.js');
 const FunctionalTab = require(__dirname + '/js/components/functional-tab.js');
 const ConfigUtil = require(__dirname + '/js/utils/config-util.js');
-const DNDUtil = require(__dirname + '/js/utils/dnd-util.js');
-const ReconnectUtil = require(__dirname + '/js/utils/reconnect-util.js');
-const { feedbackHolder } = require(__dirname + '/js/feedback.js');
 
 class ServerManagerView {
 	constructor() {
@@ -24,15 +20,11 @@ class ServerManagerView {
 		this.$reloadButton = $actionsContainer.querySelector('#reload-action');
 		this.$settingsButton = $actionsContainer.querySelector('#settings-action');
 		this.$webviewsContainer = document.getElementById('webviews-container');
-		this.$backButton = $actionsContainer.querySelector('#back-action');
-		this.$dndButton = $actionsContainer.querySelector('#dnd-action');
 
 		this.$addServerTooltip = document.getElementById('add-server-tooltip');
 		this.$reloadTooltip = $actionsContainer.querySelector('#reload-tooltip');
 		this.$settingsTooltip = $actionsContainer.querySelector('#setting-tooltip');
 		this.$serverIconTooltip = document.getElementsByClassName('server-tooltip');
-		this.$backTooltip = $actionsContainer.querySelector('#back-tooltip');
-		this.$dndTooltip = $actionsContainer.querySelector('#dnd-tooltip');
 
 		this.$sidebar = document.getElementById('sidebar');
 
@@ -43,7 +35,6 @@ class ServerManagerView {
 		this.activeTabIndex = -1;
 		this.tabs = [];
 		this.functionalTabs = {};
-		this.tabIndex = 0;
 	}
 
 	init() {
@@ -86,27 +77,13 @@ class ServerManagerView {
 			showSidebar: true,
 			badgeOption: true,
 			startAtLogin: false,
-			startMinimized: false,
 			enableSpellchecker: true,
 			showNotification: true,
 			betaUpdate: false,
 			silent: false,
-			lastActiveTab: 0,
-			dnd: false,
-			dndPreviousSettings: {
-				showNotification: true,
-				silent: false
-			}
+			lastActiveTab: 0
 		};
 
-		// Platform specific settings
-
-		if (process.platform === 'win32') {
-			// Only available on Windows
-			settingOptions.flashTaskbarOnMessage = true;
-			settingOptions.dndPreviousSettings.flashTaskbarOnMessage = true;
-		}
-
 		for (const i in settingOptions) {
 			if (ConfigUtil.getConfigItem(i) === null) {
 				ConfigUtil.setConfigItem(i, settingOptions[i]);
@@ -129,28 +106,23 @@ class ServerManagerView {
 			}
 			// Open last active tab
 			this.activateTab(ConfigUtil.getConfigItem('lastActiveTab'));
-			// Remove focus from the settings icon at sidebar bottom
-			this.$settingsButton.classList.remove('active');
 		} else {
-			this.openSettings('AddServer');
+			this.openSettings('Servers');
 		}
 	}
 
 	initServer(server, index) {
-		const tabIndex = this.getTabIndex();
 		this.tabs.push(new ServerTab({
 			role: 'server',
 			icon: server.icon,
 			$root: this.$tabsContainer,
 			onClick: this.activateLastTab.bind(this, index),
 			index,
-			tabIndex,
 			onHover: this.onHover.bind(this, index, server.alias),
 			onHoverOut: this.onHoverOut.bind(this, index),
 			webview: new WebView({
 				$root: this.$webviewsContainer,
 				index,
-				tabIndex,
 				url: server.url,
 				name: server.alias,
 				isActive: () => {
@@ -165,60 +137,24 @@ class ServerManagerView {
 	}
 
 	initActions() {
-		this.initDNDButton();
-		this.$dndButton.addEventListener('click', () => {
-			const dndUtil = DNDUtil.toggle();
-			ipcRenderer.send('forward-message', 'toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
-		});
 		this.$reloadButton.addEventListener('click', () => {
 			this.tabs[this.activeTabIndex].webview.reload();
 		});
 		this.$addServerButton.addEventListener('click', () => {
-			this.openSettings('AddServer');
+			this.openSettings('Servers');
 		});
 		this.$settingsButton.addEventListener('click', () => {
 			this.openSettings('General');
 		});
-		this.$backButton.addEventListener('click', () => {
-			this.tabs[this.activeTabIndex].webview.back();
-		});
 
-		const $serverImgs = document.querySelectorAll('.server-icons');
-		$serverImgs.forEach($serverImg => {
-			$serverImg.addEventListener('error', () => {
-				$serverImg.src = 'img/icon.png';
-			});
-		});
-
-		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip, true);
+		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip);
 		this.sidebarHoverEvent(this.$settingsButton, this.$settingsTooltip);
 		this.sidebarHoverEvent(this.$reloadButton, this.$reloadTooltip);
-		this.sidebarHoverEvent(this.$backButton, this.$backTooltip);
-		this.sidebarHoverEvent(this.$dndButton, this.$dndTooltip);
 	}
 
-	initDNDButton() {
-		const dnd = ConfigUtil.getConfigItem('dnd', false);
-		this.toggleDNDButton(dnd);
-	}
-
-	getTabIndex() {
-		const currentIndex = this.tabIndex;
-		this.tabIndex++;
-		return currentIndex;
-	}
-
-	sidebarHoverEvent(SidebarButton, SidebarTooltip, addServer = false) {
+	sidebarHoverEvent(SidebarButton, SidebarTooltip) {
 		SidebarButton.addEventListener('mouseover', () => {
 			SidebarTooltip.removeAttribute('style');
-			// To handle position of add server tooltip due to scrolling of list of organizations
-			// This could not be handled using CSS, hence the top of the tooltip is made same
-			// as that of its parent element.
-			// This needs to handled only for the add server tooltip and not others.
-			if (addServer) {
-				const { top } = SidebarButton.getBoundingClientRect();
-				SidebarTooltip.style.top = top + 'px';
-			}
 		});
 		SidebarButton.addEventListener('mouseout', () => {
 			SidebarTooltip.style.display = 'none';
@@ -228,11 +164,6 @@ class ServerManagerView {
 	onHover(index, serverName) {
 		this.$serverIconTooltip[index].innerHTML = serverName;
 		this.$serverIconTooltip[index].removeAttribute('style');
-		// To handle position of servers' tooltip due to scrolling of list of organizations
-		// This could not be handled using CSS, hence the top of the tooltip is made same
-		// as that of its parent element.
-		const { top } = this.$serverIconTooltip[index].parentElement.getBoundingClientRect();
-		this.$serverIconTooltip[index].style.top = top + 'px';
 	}
 
 	onHoverOut(index) {
@@ -247,20 +178,16 @@ class ServerManagerView {
 
 		this.functionalTabs[tabProps.name] = this.tabs.length;
 
-		const tabIndex = this.getTabIndex();
 		this.tabs.push(new FunctionalTab({
 			role: 'function',
 			materialIcon: tabProps.materialIcon,
-			name: tabProps.name,
 			$root: this.$tabsContainer,
 			index: this.functionalTabs[tabProps.name],
-			tabIndex,
 			onClick: this.activateTab.bind(this, this.functionalTabs[tabProps.name]),
 			onDestroy: this.destroyTab.bind(this, tabProps.name, this.functionalTabs[tabProps.name]),
 			webview: new WebView({
 				$root: this.$webviewsContainer,
 				index: this.functionalTabs[tabProps.name],
-				tabIndex,
 				url: tabProps.url,
 				name: tabProps.name,
 				isActive: () => {
@@ -272,9 +199,7 @@ class ServerManagerView {
 				preload: false
 			})
 		}));
-		// To show loading indicator the first time a functional tab is opened, indicator is
-		// closed when the functional tab DOM is ready, handled in webview.js
-		this.$webviewsContainer.classList.remove('loaded');
+
 		this.activateTab(this.functionalTabs[tabProps.name]);
 	}
 
@@ -284,7 +209,6 @@ class ServerManagerView {
 			materialIcon: 'settings',
 			url: `file://${__dirname}/preference.html#${nav}`
 		});
-		this.$settingsButton.classList.add('active');
 		this.tabs[this.functionalTabs.Settings].webview.send('switch-settings-nav', nav);
 	}
 
@@ -305,10 +229,10 @@ class ServerManagerView {
 	}
 
 	activateLastTab(index) {
-		// Open all the tabs in background, also activate the tab based on the index
-		this.activateTab(index);
-		// Save last active tab
+		// Open last active tab
 		ConfigUtil.setConfigItem('lastActiveTab', index);
+		// Open all the tabs in background
+		this.activateTab(index);
 	}
 
 	activateTab(index, hideOldTab = true) {
@@ -320,19 +244,10 @@ class ServerManagerView {
 			if (this.activeTabIndex === index) {
 				return;
 			} else if (hideOldTab) {
-				// If old tab is functional tab Settings, remove focus from the settings icon at sidebar bottom
-				if (this.tabs[this.activeTabIndex].props.role === 'function' && this.tabs[this.activeTabIndex].props.name === 'Settings') {
-					this.$settingsButton.classList.remove('active');
-				}
 				this.tabs[this.activeTabIndex].deactivate();
 			}
 		}
 
-		try {
-			this.tabs[index].webview.canGoBackButton();
-		} catch (err) {
-		}
-
 		this.activeTabIndex = index;
 		this.tabs[index].activate();
 
@@ -340,36 +255,6 @@ class ServerManagerView {
 			tabs: this.tabs,
 			activeTabIndex: this.activeTabIndex
 		});
-
-		ipcRenderer.on('toggle-sidebar', (event, state) => {
-			const selector = 'webview:not([class*=disabled])';
-			const webview = document.querySelector(selector);
-			const webContents = webview.getWebContents();
-			webContents.send('toggle-sidebar', state);
-		});
-
-		ipcRenderer.on('toggle-silent', (event, state) => {
-			const webviews = document.querySelectorAll('webview');
-			webviews.forEach(webview => {
-				try {
-					webview.setAudioMuted(state);
-				} catch (err) {
-					// webview is not ready yet
-					webview.addEventListener('dom-ready', () => {
-						webview.isAudioMuted();
-					});
-				}
-			});
-		});
-
-		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
-			this.toggleDNDButton(state);
-			ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent);
-			const selector = 'webview:not([class*=disabled])';
-			const webview = document.querySelector(selector);
-			const webContents = webview.getWebContents();
-			webContents.send('toggle-dnd', state, newSettings);
-		});
 	}
 
 	destroyTab(name, index) {
@@ -389,9 +274,6 @@ class ServerManagerView {
 	}
 
 	destroyView() {
-		// Show loading indicator
-		this.$webviewsContainer.classList.remove('loaded');
-
 		// Clear global variables
 		this.activeTabIndex = -1;
 		this.tabs = [];
@@ -439,12 +321,6 @@ class ServerManagerView {
 		}
 	}
 
-	// Toggles the dnd button icon.
-	toggleDNDButton(alert) {
-		this.$dndTooltip.textContent = (alert ? 'Turn Off' : 'Enable') + ' Do Not Disturb';
-		this.$dndButton.querySelector('i').textContent = alert ? 'notifications_off' : 'notifications';
-	}
-
 	registerIpcs() {
 		const webviewListeners = {
 			'webview-reload': 'reload',
@@ -487,7 +363,7 @@ class ServerManagerView {
 		});
 
 		ipcRenderer.on('switch-server-tab', (event, index) => {
-			this.activateLastTab(index);
+			this.activateTab(index);
 		});
 
 		ipcRenderer.on('reload-proxy', (event, showAlert) => {
@@ -511,18 +387,6 @@ class ServerManagerView {
 			this.$fullscreenPopup.classList.remove('show');
 		});
 
-		ipcRenderer.on('focus-webview-with-id', (event, webviewId) => {
-			const webviews = document.querySelectorAll('webview');
-			webviews.forEach(webview => {
-				const currentId = webview.getWebContents().id;
-				const tabId = webview.getAttribute('data-tab-id');
-				const concurrentTab = document.querySelector(`div[data-tab-id="${tabId}"]`);
-				if (currentId === webviewId) {
-					concurrentTab.click();
-				}
-			});
-		});
-
 		ipcRenderer.on('render-taskbar-icon', (event, messageCount) => {
 			// Create a canvas from unread messagecounts
 			function createOverlayIcon(messageCount) {
@@ -551,33 +415,14 @@ class ServerManagerView {
 			}
 			ipcRenderer.send('update-taskbar-icon', createOverlayIcon(messageCount).toDataURL(), String(messageCount));
 		});
-
-		ipcRenderer.on('open-feedback-modal', () => {
-			feedbackHolder.classList.add('show');
-		});
 	}
 }
 
 window.onload = () => {
 	const serverManagerView = new ServerManagerView();
-	const reconnectUtil = new ReconnectUtil(serverManagerView);
 	serverManagerView.init();
+
 	window.addEventListener('online', () => {
-		reconnectUtil.pollInternetAndReload();
+		serverManagerView.reloadView();
 	});
-
-	window.addEventListener('offline', () => {
-		reconnectUtil.clearState();
-		console.log('No internet connection, you are offline.');
-	});
-
-	// only start electron-connect (auto reload on change) when its ran
-	// from `npm run dev` or `gulp dev` and not from `npm start` when
-	// app is started `npm start` main process's proces.argv will have
-	// `--no-electron-connect`
-	const mainProcessArgv = remote.getGlobal('process').argv;
-	if (isDev && !mainProcessArgv.includes('--no-electron-connect')) {
-		const electronConnect = require('electron-connect');
-		electronConnect.client.create();
-	}
 };

app/renderer/js/notification.js

@@ -0,0 +1,30 @@
+'use strict';
+
+const { remote } = require('electron');
+
+const ConfigUtil = require(__dirname + '/utils/config-util.js');
+
+const app = remote.app;
+
+// From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid
+// On windows 8 we have to explicitly set the appUserModelId otherwise notification won't work.
+app.setAppUserModelId('org.zulip.zulip-electron');
+
+const NativeNotification = window.Notification;
+
+class baseNotification extends NativeNotification {
+	constructor(title, opts) {
+		opts.silent = ConfigUtil.getConfigItem('silent') || false;
+		super(title, opts);
+	}
+	static requestPermission() {
+		return; // eslint-disable-line no-useless-return
+	}
+	// Override default Notification permission
+	static get permission() {
+		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
+	}
+}
+
+window.Notification = baseNotification;
+

app/renderer/js/notification/darwin-notifications.js

@@ -1,100 +0,0 @@
-'use strict';
-
-const { ipcRenderer } = require('electron');
-const url = require('url');
-const MacNotifier = require('node-mac-notifier');
-const ConfigUtil = require('../utils/config-util');
-const {
-	appId, customReply, focusCurrentServer, parseReply, setupReply
-} = require('./helpers');
-
-let replyHandler;
-let clickHandler;
-class DarwinNotification {
-	constructor(title, opts) {
-		const silent = ConfigUtil.getConfigItem('silent') || false;
-		const { host, protocol } = location;
-		const { icon } = opts;
-		const profilePic = url.resolve(`${protocol}//${host}`, icon);
-
-		this.tag = opts.tag;
-		const notification = new MacNotifier(title, Object.assign(opts, {
-			bundleId: appId,
-			canReply: true,
-			silent,
-			icon: profilePic
-		}));
-
-		notification.addEventListener('click', () => {
-			// focus to the server who sent the
-			// notification if not focused already
-			if (clickHandler) {
-				clickHandler();
-			}
-
-			focusCurrentServer();
-			ipcRenderer.send('focus-app');
-		});
-
-		notification.addEventListener('reply', this.notificationHandler);
-	}
-
-	static requestPermission() {
-		return; // eslint-disable-line no-useless-return
-	}
-
-	// Override default Notification permission
-	static get permission() {
-		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
-	}
-
-	set onreply(handler) {
-		replyHandler = handler;
-	}
-
-	get onreply() {
-		return replyHandler;
-	}
-
-	set onclick(handler) {
-		clickHandler = handler;
-	}
-
-	get onclick() {
-		return clickHandler;
-	}
-
-	// not something that is common or
-	// used by zulip server but added to be
-	// future proff.
-	addEventListener(event, handler) {
-		if (event === 'click') {
-			clickHandler = handler;
-		}
-
-		if (event === 'reply') {
-			replyHandler = handler;
-		}
-	}
-
-	notificationHandler({ response }) {
-		response = parseReply(response);
-		focusCurrentServer();
-		setupReply(this.tag);
-
-		if (replyHandler) {
-			replyHandler(response);
-			return;
-		}
-
-		customReply(response);
-	}
-
-	// method specific to notification api
-	// used by zulip
-	close() {
-		return; // eslint-disable-line no-useless-return
-	}
-}
-
-module.exports = DarwinNotification;

app/renderer/js/notification/default-notification.js

@@ -1,31 +0,0 @@
-'use strict';
-
-const { ipcRenderer } = require('electron');
-const ConfigUtil = require('../utils/config-util');
-const { focusCurrentServer } = require('./helpers');
-
-const NativeNotification = window.Notification;
-class BaseNotification extends NativeNotification {
-	constructor(title, opts) {
-		opts.silent = true;
-		super(title, opts);
-
-		this.addEventListener('click', () => {
-			// focus to the server who sent the
-			// notification if not focused already
-			focusCurrentServer();
-			ipcRenderer.send('focus-app');
-		});
-	}
-
-	static requestPermission() {
-		return; // eslint-disable-line no-useless-return
-	}
-
-	// Override default Notification permission
-	static get permission() {
-		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
-	}
-}
-
-module.exports = BaseNotification;

app/renderer/js/notification/helpers.js

@@ -1,149 +0,0 @@
-const { remote } = require('electron');
-
-// Do not change this
-const appId = 'org.zulip.zulip-electron';
-
-const botsList = [];
-let botsListLoaded = false;
-
-// this function load list of bots from the server
-// sync=True for a synchronous getJSON request
-// in case botsList isn't already completely loaded when required in parseRely
-function loadBots(sync = false) {
-	const { $ } = window;
-	botsList.length = 0;
-	if (sync) {
-		$.ajaxSetup({async: false});
-	}
-	$.getJSON('/json/users')
-		.done(data => {
-			const members = data.members;
-			members.forEach(membersRow => {
-				if (membersRow.is_bot) {
-					const bot = `@${membersRow.full_name}`;
-					const mention = `@**${bot.replace(/^@/, '')}**`;
-					botsList.push([bot, mention]);
-				}
-			});
-			botsListLoaded = true;
-		})
-		.fail(error => {
-			console.log('Request failed: ', error.responseText);
-			console.log('Request status: ', error.statusText);
-		});
-	if (sync) {
-		$.ajaxSetup({async: true});
-	}
-}
-
-function checkElements(...elements) {
-	let status = true;
-	elements.forEach(element => {
-		if (element === null || element === undefined) {
-			status = false;
-		}
-	});
-	return status;
-}
-
-function customReply(reply) {
-	// server does not support notification reply yet.
-	const buttonSelector = '.messagebox #send_controls button[type=submit]';
-	const messageboxSelector = '.selected_message .messagebox .messagebox-border .messagebox-content';
-	const textarea = document.querySelector('#compose-textarea');
-	const messagebox = document.querySelector(messageboxSelector);
-	const sendButton = document.querySelector(buttonSelector);
-
-	// sanity check for old server versions
-	const elementsExists = checkElements(textarea, messagebox, sendButton);
-	if (!elementsExists) {
-		return;
-	}
-
-	textarea.value = reply;
-	messagebox.click();
-	sendButton.click();
-}
-
-const currentWindow = remote.getCurrentWindow();
-const webContents = remote.getCurrentWebContents();
-const webContentsId = webContents.id;
-
-// this function will focus the server that sent
-// the notification. Main function implemented in main.js
-function focusCurrentServer() {
-	currentWindow.send('focus-webview-with-id', webContentsId);
-}
-// this function parses the reply from to notification
-// making it easier to reply from notification eg
-// @username in reply will be converted to @**username**
-// #stream in reply will be converted to #**stream**
-// bot mentions are not yet supported
-function parseReply(reply) {
-	const usersDiv = document.querySelectorAll('#user_presences li');
-	const streamHolder = document.querySelectorAll('#stream_filters li');
-	const users = [];
-	const streams = [];
-
-	usersDiv.forEach(userRow => {
-		const anchor = userRow.querySelector('span a');
-		if (anchor !== null) {
-			const user = `@${anchor.textContent.trim()}`;
-			const mention = `@**${user.replace(/^@/, '')}**`;
-			users.push([user, mention]);
-		}
-	});
-
-	streamHolder.forEach(stream => {
-		const streamAnchor = stream.querySelector('div a');
-		if (streamAnchor !== null) {
-			const streamName = `#${streamAnchor.textContent.trim()}`;
-			const streamMention = `#**${streamName.replace(/^#/, '')}**`;
-			streams.push([streamName, streamMention]);
-		}
-	});
-
-	users.forEach(([user, mention]) => {
-		if (reply.includes(user)) {
-			const regex = new RegExp(user, 'g');
-			reply = reply.replace(regex, mention);
-		}
-	});
-
-	streams.forEach(([stream, streamMention]) => {
-		const regex = new RegExp(stream, 'g');
-		reply = reply.replace(regex, streamMention);
-	});
-
-	// If botsList isn't completely loaded yet, make a synchronous getJSON request for list
-	if (botsListLoaded === false) {
-		loadBots(true);
-	}
-
-	// Iterate for every bot name and replace in reply
-	// @botname with @**botname**
-	botsList.forEach(([bot, mention]) => {
-		if (reply.includes(bot)) {
-			const regex = new RegExp(bot, 'g');
-			reply = reply.replace(regex, mention);
-		}
-	});
-
-	reply = reply.replace(/\\n/, '\n');
-	return reply;
-}
-
-function setupReply(id) {
-	const { narrow } = window;
-	narrow.by_subject(id, { trigger: 'notification' });
-}
-
-module.exports = {
-	appId,
-	checkElements,
-	customReply,
-	parseReply,
-	setupReply,
-	focusCurrentServer,
-	loadBots
-};

app/renderer/js/notification/index.js

@@ -1,27 +0,0 @@
-'use strict';
-
-const {
-  remote: { app }
-} = require('electron');
-
-const DefaultNotification = require('./default-notification');
-const { appId, loadBots } = require('./helpers');
-
-// From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid
-// On windows 8 we have to explicitly set the appUserModelId otherwise notification won't work.
-app.setAppUserModelId(appId);
-
-window.Notification = DefaultNotification;
-
-if (process.platform === 'darwin') {
-	const DarwinNotification = require('./darwin-notifications');
-	window.Notification = DarwinNotification;
-}
-
-window.addEventListener('load', () => {
-	// Call this function only when user is logged in
-	// eslint-disable-next-line no-undef, camelcase
-	if (page_params.realm_uri) {
-		loadBots();
-	}
-});

app/renderer/js/pages/preference/connected-org-section.js

@@ -1,51 +0,0 @@
-'use strict';
-
-const BaseSection = require(__dirname + '/base-section.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-const ServerInfoForm = require(__dirname + '/server-info-form.js');
-
-class ConnectedOrgSection extends BaseSection {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-			<div class="settings-pane" id="server-settings-pane">
-				<div class="page-title">Connected organizations</div>
-				<div class="title" id="existing-servers">All the connected orgnizations will appear here.</div>
-				<div id="server-info-container"></div>
-			</div>
-		`;
-	}
-
-	init() {
-		this.initServers();
-	}
-
-	initServers() {
-		this.props.$root.innerHTML = '';
-
-		const servers = DomainUtil.getDomains();
-		this.props.$root.innerHTML = this.template();
-		this.$serverInfoContainer = document.getElementById('server-info-container');
-		this.$existingServers = document.getElementById('existing-servers');
-
-		const noServerText = 'All the connected orgnizations will appear here';
-		// Show noServerText if no servers are there otherwise hide it
-		this.$existingServers.innerHTML = servers.length === 0 ? noServerText : '';
-
-		for (let i = 0; i < servers.length; i++) {
-			new ServerInfoForm({
-				$root: this.$serverInfoContainer,
-				server: servers[i],
-				index: i,
-				onChange: this.reloadApp
-			}).init();
-		}
-	}
-
-}
-
-module.exports = ConnectedOrgSection;

app/renderer/js/pages/preference/create-new-org.js

@@ -0,0 +1,37 @@
+'use strict';
+
+const BaseComponent = require(__dirname + '/../../components/base.js');
+const shell = require('electron').shell;
+
+class CreateOrganziation extends BaseComponent {
+	constructor(props) {
+		super();
+		this.props = props;
+	}
+
+	template() {
+		return `
+			<div class="setting-row">
+				<div class="setting-description">
+					<span id="open-create-org-link">Or create a new organization on zulipchat.com<i class="material-icons open-tab-button">open_in_new</i></span>
+				</div>
+				<div class="setting-control"></div>
+			</div>
+		`;
+	}
+
+	init() {
+		this.props.$root.innerHTML = this.template();
+		this.openCreateNewOrgExternalLink();
+	}
+
+	openCreateNewOrgExternalLink() {
+		const link = 'https://zulipchat.com/beta/';
+		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
+		externalCreateNewOrgEl.addEventListener('click', () => {
+			shell.openExternal(link);
+		});
+	}
+}
+
+module.exports = CreateOrganziation;

app/renderer/js/pages/preference/general-section.js

@@ -1,10 +1,11 @@
 'use strict';
 const path = require('path');
-const { ipcRenderer, remote } = require('electron');
+
+const { ipcRenderer } = require('electron');
+const { app, dialog } = require('electron').remote;
+
 const fs = require('fs-extra');
 
-const { app, dialog } = remote;
-const currentBrowserWindow = remote.getCurrentWindow();
 const BaseSection = require(__dirname + '/base-section.js');
 const ConfigUtil = require(__dirname + '/../../utils/config-util.js');
 
@@ -60,32 +61,10 @@ class GeneralSection extends BaseSection {
 						<div class="setting-description">Start app at login</div>
 						<div class="setting-control"></div>
 					</div>
-					<div class="setting-row" id="start-minimize-option">
-						<div class="setting-description">Always start minimized</div>
-						<div class="setting-control"></div>
-					</div>
 					<div class="setting-row" id="enable-spellchecker-option">
-						<div class="setting-description">Enable Spellchecker (requires restart)</div>
-						<div class="setting-control"></div>
-					</div>
+					<div class="setting-description">Enable Spellchecker (requires restart)</div>
+					<div class="setting-control"></div>
 				</div>
-				<div class="title">Add custom CSS</div>
-				<div class="settings-card">
-					<div class="setting-row" id="add-custom-css">
-						<div class="setting-description">
-							This will inject the selected css stylesheet in all the added accounts
-						</div>
-						<button class="custom-css-button blue">Add</button>
-					</div>
-					<div class="setting-row" id="remove-custom-css">
-						<div class="setting-description">
-							<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigItem('customCSS')}</div>
-						</div>
-						<div class="action red" id="css-delete-action">
-							<i class="material-icons">indeterminate_check_box</i>
-							<span>Delete</span>
-						</div>
-					</div>
 				</div>
 				<div class="title">Reset Application Data</div>
                 <div class="settings-card">
@@ -110,10 +89,6 @@ class GeneralSection extends BaseSection {
 		this.updateResetDataOption();
 		this.showDesktopNotification();
 		this.enableSpellchecker();
-		this.minimizeOnStart();
-		this.addCustomCSS();
-		this.showCustomCSSPath();
-		this.removeCustomCSS();
 
 		// Platform specific settings
 		// Flashing taskbar on Windows
@@ -180,7 +155,6 @@ class GeneralSection extends BaseSection {
 				const newValue = !ConfigUtil.getConfigItem('silent', true);
 				ConfigUtil.setConfigItem('silent', newValue);
 				this.updateSilentOption();
-				currentBrowserWindow.send('toggle-silent', newValue);
 			}
 		});
 	}
@@ -253,22 +227,6 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	customCssDialog() {
-		const showDialogOptions = {
-			title: 'Select file',
-			defaultId: 1,
-			properties: ['openFile'],
-			filters: [{ name: 'CSS file', extensions: ['css'] }]
-		};
-
-		dialog.showOpenDialog(showDialogOptions, selectedFile => {
-			if (selectedFile) {
-				ConfigUtil.setConfigItem('customCSS', selectedFile[0]);
-				ipcRenderer.send('forward-message', 'hard-reload');
-			}
-		});
-	}
-
 	updateResetDataOption() {
 		const resetDataButton = document.querySelector('#resetdata-option .reset-data-button');
 		resetDataButton.addEventListener('click', () => {
@@ -276,40 +234,6 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	minimizeOnStart() {
-		this.generateSettingOption({
-			$element: document.querySelector('#start-minimize-option .setting-control'),
-			value: ConfigUtil.getConfigItem('startMinimized', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('startMinimized');
-				ConfigUtil.setConfigItem('startMinimized', newValue);
-				this.minimizeOnStart();
-			}
-		});
-	}
-
-	addCustomCSS() {
-		const customCSSButton = document.querySelector('#add-custom-css .custom-css-button');
-		customCSSButton.addEventListener('click', () => {
-			this.customCssDialog();
-		});
-	}
-
-	showCustomCSSPath() {
-		if (!ConfigUtil.getConfigItem('customCSS')) {
-			const cssPATH = document.getElementById('remove-custom-css');
-			cssPATH.style.display = 'none';
-		}
-	}
-
-	removeCustomCSS() {
-		const removeCSSButton = document.getElementById('css-delete-action');
-		removeCSSButton.addEventListener('click', () => {
-			ConfigUtil.setConfigItem('customCSS');
-			ipcRenderer.send('forward-message', 'hard-reload');
-		});
-	}
-
 }
 
 module.exports = GeneralSection;

app/renderer/js/pages/preference/nav.js

@@ -8,7 +8,7 @@ class PreferenceNav extends BaseComponent {
 
 		this.props = props;
 
-		this.navItems = ['General', 'Network', 'AddServer', 'Organizations', 'Shortcuts'];
+		this.navItems = ['General', 'Network', 'Servers', 'Shortcuts'];
 
 		this.init();
 	}

app/renderer/js/pages/preference/new-server-form.js

@@ -2,7 +2,6 @@
 
 const BaseComponent = require(__dirname + '/../../components/base.js');
 const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-const shell = require('electron').shell;
 
 class NewServerForm extends BaseComponent {
 	constructor(props) {
@@ -12,26 +11,19 @@ class NewServerForm extends BaseComponent {
 
 	template() {
 		return `
-			<div class="server-input-container">
-				<div class="title">Organization URL</div>
-				<div class="add-server-info-row">
-					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
-				</div>
-				<div class="server-center">
-					<div class="server-save-action">
-						<button id="connect">Connect</button>
+			<div class="settings-card">
+				<div class="server-info-right">
+					<div class="title">URL of your Zulip organization</div>
+					<div class="server-info-row">
+						<input class="setting-input-value" autofocus placeholder="acme.zulipchat.com"/>
+					</div>
+					<div class="server-info-row">
+						<div class="action blue server-save-action">
+							<i class="material-icons">add_box</i>
+							<span>Add</span>
+						</div>
 					</div>
 				</div>
-				<div class="server-center">
-				<div class="divider">
-					<hr class="left"/>OR<hr class="right" />
-				</div>
-				</div>
-				<div class="server-center">
-				<div class="server-save-action">
-					<button id="open-create-org-link">Create a new organization</button>
-			</div>
-					</div>
 			</div>
 		`;
 	}
@@ -51,25 +43,15 @@ class NewServerForm extends BaseComponent {
 	}
 
 	submitFormHandler() {
-		this.$saveServerButton.children[0].innerHTML = 'Connecting...';
 		DomainUtil.checkDomain(this.$newServerUrl.value).then(serverConf => {
 			DomainUtil.addDomain(serverConf).then(() => {
 				this.props.onChange(this.props.index);
 			});
 		}, errorMessage => {
-			this.$saveServerButton.children[0].innerHTML = 'Connect';
 			alert(errorMessage);
 		});
 	}
 
-	openCreateNewOrgExternalLink() {
-		const link = 'https://zulipchat.com/new/';
-		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
-		externalCreateNewOrgEl.addEventListener('click', () => {
-			shell.openExternal(link);
-		});
-	}
-
 	initActions() {
 		this.$saveServerButton.addEventListener('click', () => {
 			this.submitFormHandler();
@@ -81,8 +63,6 @@ class NewServerForm extends BaseComponent {
 				this.submitFormHandler();
 			}
 		});
-		// open create new org link in default browser
-		this.openCreateNewOrgExternalLink();
 	}
 }
 

app/renderer/js/pages/preference/preference.js

@@ -7,7 +7,6 @@ const Nav = require(__dirname + '/js/pages/preference/nav.js');
 const ServersSection = require(__dirname + '/js/pages/preference/servers-section.js');
 const GeneralSection = require(__dirname + '/js/pages/preference/general-section.js');
 const NetworkSection = require(__dirname + '/js/pages/preference/network-section.js');
-const ConnectedOrgSection = require(__dirname + '/js/pages/preference/connected-org-section.js');
 const ShortcutsSection = require(__dirname + '/js/pages/preference/shortcuts-section.js');
 
 class PreferenceView extends BaseComponent {
@@ -40,7 +39,7 @@ class PreferenceView extends BaseComponent {
 	handleNavigation(navItem) {
 		this.nav.select(navItem);
 		switch (navItem) {
-			case 'AddServer': {
+			case 'Servers': {
 				this.section = new ServersSection({
 					$root: this.$settingsContainer
 				});
@@ -52,12 +51,6 @@ class PreferenceView extends BaseComponent {
 				});
 				break;
 			}
-			case 'Organizations': {
-				this.section = new ConnectedOrgSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
 			case 'Network': {
 				this.section = new NetworkSection({
 					$root: this.$settingsContainer
@@ -76,36 +69,10 @@ class PreferenceView extends BaseComponent {
 		window.location.hash = `#${navItem}`;
 	}
 
-	// Handle toggling and reflect changes in preference page
-	handleToggle(elementName, state) {
-		const inputSelector = `#${elementName} .action .switch input`;
-		const input = document.querySelector(inputSelector);
-		if (input) {
-			input.checked = state;
-		}
-	}
-
 	registerIpcs() {
 		ipcRenderer.on('switch-settings-nav', (event, navItem) => {
 			this.handleNavigation(navItem);
 		});
-
-		ipcRenderer.on('toggle-sidebar', (event, state) => {
-			this.handleToggle('sidebar-option', state);
-		});
-
-		ipcRenderer.on('toggletray', (event, state) => {
-			this.handleToggle('tray-option', state);
-		});
-
-		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
-			this.handleToggle('show-notification-option', newSettings.showNotification);
-			this.handleToggle('silent-option', newSettings.silent);
-
-			if (process.platform === 'win32') {
-				this.handleToggle('flash-taskbar-option', newSettings.flashTaskbarOnMessage);
-			}
-		});
 	}
 }
 

app/renderer/js/pages/preference/server-info-form.js

@@ -1,6 +1,6 @@
 'use strict';
-const { dialog } = require('electron').remote;
-const { ipcRenderer } = require('electron');
+const {dialog} = require('electron').remote;
+const {ipcRenderer} = require('electron');
 
 const BaseComponent = require(__dirname + '/../../components/base.js');
 const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
@@ -16,18 +16,19 @@ class ServerInfoForm extends BaseComponent {
 			<div class="settings-card">
 				<div class="server-info-left">
 					<img class="server-info-icon" src="${this.props.server.icon}"/>
+				</div>
+				<div class="server-info-right">
 					<div class="server-info-row">
 						<span class="server-info-alias">${this.props.server.alias}</span>
 						<i class="material-icons open-tab-button">open_in_new</i>
 					</div>
-				</div>
-				<div class="server-info-right">
-					<div class="server-info-row server-url">
-						<span class="server-url-info" title="${this.props.server.url}">${this.props.server.url}</span>
+					<div class="server-info-row">
+						<input class="setting-input-value" disabled value="${this.props.server.url}"/>
 					</div>
 					<div class="server-info-row">
 						<div class="action red server-delete-action">
-							<span>Disconnect</span>
+							<i class="material-icons">indeterminate_check_box</i>
+							<span>Delete</span>
 						</div>
 					</div>
 				</div>
@@ -43,7 +44,6 @@ class ServerInfoForm extends BaseComponent {
 	initForm() {
 		this.$serverInfoForm = this.generateNodeFromTemplate(this.template());
 		this.$serverInfoAlias = this.$serverInfoForm.getElementsByClassName('server-info-alias')[0];
-		this.$serverIcon = this.$serverInfoForm.getElementsByClassName('server-info-icon')[0];
 		this.$deleteServerButton = this.$serverInfoForm.getElementsByClassName('server-delete-action')[0];
 		this.$openServerButton = this.$serverInfoForm.getElementsByClassName('open-tab-button')[0];
 		this.props.$root.appendChild(this.$serverInfoForm);
@@ -55,7 +55,7 @@ class ServerInfoForm extends BaseComponent {
 				type: 'warning',
 				buttons: ['YES', 'NO'],
 				defaultId: 0,
-				message: 'Are you sure you want to disconnect this organization?'
+				message: 'Are you sure you want to delete this server?'
 			}, response => {
 				if (response === 0) {
 					DomainUtil.removeDomain(this.props.index);
@@ -71,12 +71,7 @@ class ServerInfoForm extends BaseComponent {
 		this.$serverInfoAlias.addEventListener('click', () => {
 			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
 		});
-
-		this.$serverIcon.addEventListener('click', () => {
-			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
-		});
 	}
-
 }
 
 module.exports = ServerInfoForm;

app/renderer/js/pages/preference/servers-section.js

@@ -1,7 +1,10 @@
 'use strict';
 
 const BaseSection = require(__dirname + '/base-section.js');
+const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+const ServerInfoForm = require(__dirname + '/server-info-form.js');
 const NewServerForm = require(__dirname + '/new-server-form.js');
+const CreateOrganziation = require(__dirname + '/create-new-org.js');
 
 class ServersSection extends BaseSection {
 	constructor(props) {
@@ -11,14 +14,13 @@ class ServersSection extends BaseSection {
 
 	template() {
 		return `
-		<div class="add-server-modal">
-			<div class="modal-container">
-				<div class="settings-pane" id="server-settings-pane">
-					<div class="page-title">Add a Zulip organization</div>
-					<div id="new-server-container"></div>
-				</div>
+			<div class="settings-pane" id="server-settings-pane">
+				<div class="page-title">Register or login to a Zulip organization to get started</div>
+				<div id="new-server-container"></div>
+				<div class="title" id="existing-servers"></div>
+				<div id="server-info-container"></div>
+				<div id="create-organization-container"></div>
 			</div>
-		</div>
 		`;
 	}
 
@@ -29,10 +31,35 @@ class ServersSection extends BaseSection {
 	initServers() {
 		this.props.$root.innerHTML = '';
 
+		const servers = DomainUtil.getDomains();
 		this.props.$root.innerHTML = this.template();
+		this.$serverInfoContainer = document.getElementById('server-info-container');
+		this.$existingServers = document.getElementById('existing-servers');
 		this.$newServerContainer = document.getElementById('new-server-container');
+		this.$newServerButton = document.getElementById('new-server-action');
 
+		this.$serverInfoContainer.innerHTML = servers.length ? '' : '';
+		// Show Existing servers if servers are there otherwise hide it
+		this.$existingServers.innerHTML = servers.length === 0 ? '' : 'Existing organizations';
 		this.initNewServerForm();
+
+		this.$createOrganizationContainer = document.getElementById('create-organization-container');
+		this.initCreateNewOrganization();
+
+		for (let i = 0; i < servers.length; i++) {
+			new ServerInfoForm({
+				$root: this.$serverInfoContainer,
+				server: servers[i],
+				index: i,
+				onChange: this.reloadApp
+			}).init();
+		}
+	}
+
+	initCreateNewOrganization() {
+		new CreateOrganziation({
+			$root: this.$createOrganizationContainer
+		}).init();
 	}
 
 	initNewServerForm() {

app/renderer/js/pages/preference/shortcuts-section.js

@@ -23,10 +23,6 @@ class ShortcutsSection extends BaseSection {
                   <tr>
                     <td><kbd>${userOSKey}</kbd><kbd>K</kbd></td>
                     <td>Keyboard Shortcuts</td>
-                  </tr>
-									<tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>M</kbd></td>
-                    <td>Toggle Do Not Disturb</td>
                   </tr>
                   <tr>
                     <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>D</kbd></td>
@@ -82,6 +78,14 @@ class ShortcutsSection extends BaseSection {
                     <td><kbd>${userOSKey}</kbd><kbd>A</kbd></td>
                     <td>Select All</td>
                   </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>F</kbd></td>
+                    <td>Find</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>G</kbd></td>
+                    <td>Find Next</td>
+                  </tr>
                   <tr>
                     <td><kbd>Control</kbd><kbd>${userOSKey}</kbd><kbd>Space</kbd></td>
                     <td>Emoji & Symbols</td>
@@ -105,7 +109,7 @@ class ShortcutsSection extends BaseSection {
                     <td>Enter Full Screen</td>
                   </tr>
                   <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>+</kbd></td>
+                    <td><kbd>${userOSKey}</kbd><kbd>=</kbd></td>
                     <td>Zoom In</td>
                   </tr>
                   <tr>
@@ -117,7 +121,7 @@ class ShortcutsSection extends BaseSection {
                     <td>Actual Size</td>
                   </tr>
                   <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd></td>
+                    <td><kbd>${userOSKey}</kbd><kbd>S</kbd></td>
                     <td>Toggle Sidebar</td>
                   </tr>
                   <tr>
@@ -178,10 +182,6 @@ class ShortcutsSection extends BaseSection {
                   <tr>
                     <td><kbd>${userOSKey}</kbd> + <kbd>K</kbd></td>
                     <td>Keyboard Shortcuts</td>
-                  </tr>
-									<tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>M</kbd></td>
-                    <td>Toggle Do Not Disturb</td>
                   </tr>
                   <tr>
                     <td><kbd>${userOSKey}</kbd> + <kbd>L</kbd></td>
@@ -256,7 +256,7 @@ class ShortcutsSection extends BaseSection {
                     <td>Actual Size</td>
                   </tr>
                   <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd></td>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>S</kbd></td>
                     <td>Toggle Sidebar</td>
                   </tr>
                   <tr>

app/renderer/js/preload.js

@@ -4,14 +4,10 @@ const { ipcRenderer } = require('electron');
 const SetupSpellChecker = require('./spellchecker');
 
 const ConfigUtil = require(__dirname + '/utils/config-util.js');
-const LinkUtil = require(__dirname + '/utils/link-util.js');
 
 // eslint-disable-next-line import/no-unassigned-import
 require('./notification');
 
-// Prevent drag and drop event in main process which prevents remote code executaion
-require(__dirname + '/shared/preventdrag.js');
-
 const logout = () => {
 	// Create the menu for the below
 	document.querySelector('.dropdown-toggle').click();
@@ -24,7 +20,7 @@ const shortcut = () => {
 	// Create the menu for the below
 	const node = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
 	// Additional check
-	if (node.text.trim().toLowerCase() === 'keyboard shortcuts (?)') {
+	if (node.text.trim().toLowerCase() === 'keyboard shortcuts') {
 		node.click();
 	} else {
 		// Atleast click the dropdown
@@ -56,24 +52,6 @@ document.addEventListener('DOMContentLoaded', () => {
 			ipcRenderer.send('forward-message', 'reload-viewer');
 		});
 	}
-
-	// Open image attachment link in the lightbox instead of opening in the default browser
-	const { $, lightbox } = window;
-
-	$('#main_div').on('click', '.message_content p a', function (e) {
-		const url = $(this).attr('href');
-
-		if (LinkUtil.isImage(url)) {
-			const $img = $(this).parent().siblings('.message_inline_image').find('img');
-
-			// prevent the image link from opening in a new page.
-			e.preventDefault();
-			// prevent the message compose dialog from happening.
-			e.stopPropagation();
-
-			lightbox.open($img);
-		}
-	});
 });
 
 // Clean up spellchecker events after you navigate away from this page;
@@ -82,10 +60,3 @@ window.addEventListener('beforeunload', () => {
 	SetupSpellChecker.unsubscribeSpellChecker();
 });
 
-// electron's globalShortcut can cause unexpected results
-// so adding the reload shortcut in the old-school way
-document.addEventListener('keydown', event => {
-	if (event.code === 'F5') {
-		ipcRenderer.send('forward-message', 'hard-reload');
-	}
-});

app/renderer/js/shared/preventdrag.js

@@ -1,17 +0,0 @@
-'use strict';
-
-// This is a security fix. Following function prevents drag and drop event in the app
-// so that attackers can't execute any remote code within the app
-// It doesn't affect the compose box so that users can still
-// use drag and drop event to share files etc
-
-const preventDragAndDrop = () => {
-	const preventEvents = ['dragover', 'drop'];
-	preventEvents.forEach(dragEvents => {
-		document.addEventListener(dragEvents, event => {
-			event.preventDefault();
-		});
-	});
-};
-
-preventDragAndDrop();

app/renderer/js/tray.js

@@ -98,7 +98,7 @@ const renderNativeImage = function (arg) {
 	return Promise.resolve()
 		.then(() => renderCanvas(arg))
 		.then(canvas => {
-			const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPNG();
+			const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPng();
 			return Promise.resolve(nativeImage.createFromBuffer(pngData, config.pixelRatio));
 		});
 };
@@ -197,16 +197,13 @@ ipcRenderer.on('tray', (event, arg) => {
 });
 
 function toggleTray() {
-	let state;
 	if (window.tray) {
-		state = false;
 		window.tray.destroy();
 		if (window.tray.isDestroyed()) {
 			window.tray = null;
 		}
 		ConfigUtil.setConfigItem('trayIcon', false);
 	} else {
-		state = true;
 		createTray();
 		if (process.platform === 'linux' || process.platform === 'win32') {
 			renderNativeImage(unread).then(image => {
@@ -216,10 +213,6 @@ function toggleTray() {
 		}
 		ConfigUtil.setConfigItem('trayIcon', true);
 	}
-	const selector = 'webview:not([class*=disabled])';
-	const webview = document.querySelector(selector);
-	const webContents = webview.getWebContents();
-	webContents.send('toggletray', state);
 }
 
 ipcRenderer.on('toggletray', toggleTray);

app/renderer/js/utils/config-util.js

@@ -1,29 +1,16 @@
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
 const process = require('process');
 const JsonDB = require('node-json-db');
-const Logger = require('./logger-util');
-
-const logger = new Logger({
-	file: 'config-util.log',
-	timestamp: true
-});
 
 let instance = null;
-let dialog = null;
 let app = null;
 
 /* To make the util runnable in both main and renderer process */
 if (process.type === 'renderer') {
-	const remote = require('electron').remote;
-	dialog = remote.dialog;
-	app = remote.app;
+	app = require('electron').remote.app;
 } else {
-	const electron = require('electron');
-	dialog = electron.dialog;
-	app = electron.app;
+	app = require('electron').app;
 }
 
 class ConfigUtil {
@@ -60,22 +47,7 @@ class ConfigUtil {
 	}
 
 	reloadDB() {
-		const settingsJsonPath = path.join(app.getPath('userData'), '/settings.json');
-		try {
-			const file = fs.readFileSync(settingsJsonPath, 'utf8');
-			JSON.parse(file);
-		} catch (err) {
-			if (fs.existsSync(settingsJsonPath)) {
-				fs.unlinkSync(settingsJsonPath);
-				dialog.showErrorBox(
-					'Error saving settings',
-					'We encountered error while saving current settings.'
-				);
-				logger.error('Error while JSON parsing settings.json: ');
-				logger.error(err);
-			}
-		}
-		this.db = new JsonDB(settingsJsonPath, true, true);
+		this.db = new JsonDB(app.getPath('userData') + '/settings.json', true, true);
 	}
 }
 

app/renderer/js/utils/default-util.js

@@ -1,31 +0,0 @@
-const fs = require('fs');
-
-let app = null;
-let setupCompleted = false;
-if (process.type === 'renderer') {
-	app = require('electron').remote.app;
-} else {
-	app = require('electron').app;
-}
-
-const zulipDir = app.getPath('userData');
-const logDir = `${zulipDir}/Logs/`;
-const initSetUp = () => {
-	// if it is the first time the app is running
-	// create zulip dir in userData folder to
-	// avoid errors
-	if (!setupCompleted) {
-		if (!fs.existsSync(zulipDir)) {
-			fs.mkdirSync(zulipDir);
-		}
-
-		if (!fs.existsSync(logDir)) {
-			fs.mkdirSync(logDir);
-		}
-		setupCompleted = true;
-	}
-};
-
-module.exports = {
-	initSetUp
-};

app/renderer/js/utils/dnd-util.js

@@ -1,41 +0,0 @@
-'use strict';
-
-const ConfigUtil = require(__dirname + '/config-util.js');
-
-function toggle() {
-	const dnd = !ConfigUtil.getConfigItem('dnd', false);
-	const dndSettingList = ['showNotification', 'silent'];
-	if (process.platform === 'win32') {
-		dndSettingList.push('flashTaskbarOnMessage');
-	}
-
-	let newSettings;
-	if (dnd) {
-		const oldSettings = {};
-		newSettings = {};
-
-		// Iterate through the dndSettingList.
-		for (const settingName of dndSettingList) {
-			// Store the current value of setting.
-			oldSettings[settingName] = ConfigUtil.getConfigItem(settingName);
-			// New value of setting.
-			newSettings[settingName] = (settingName === 'silent');
-		}
-
-		// Store old value in oldSettings.
-		ConfigUtil.setConfigItem('dndPreviousSettings', oldSettings);
-	} else {
-		newSettings = ConfigUtil.getConfigItem('dndPreviousSettings');
-	}
-
-	for (const settingName of dndSettingList) {
-		ConfigUtil.setConfigItem(settingName, newSettings[settingName]);
-	}
-
-	ConfigUtil.setConfigItem('dnd', dnd);
-	return {dnd, newSettings};
-}
-
-module.exports = {
-	toggle
-};

app/renderer/js/utils/domain-util.js

@@ -5,12 +5,6 @@ const fs = require('fs');
 const path = require('path');
 const JsonDB = require('node-json-db');
 const request = require('request');
-const Logger = require('./logger-util');
-
-const logger = new Logger({
-	file: `domain-util.log`,
-	timestamp: true
-});
 
 let instance = null;
 
@@ -99,7 +93,8 @@ class DomainUtil {
 	checkDomain(domain, silent = false) {
 		if (!silent && this.duplicateDomain(domain)) {
 			// Do not check duplicate in silent mode
-			return Promise.reject('This server has been added.');
+			alert('This server has been added.');
+			return;
 		}
 
 		domain = this.formatUrl(domain);
@@ -120,16 +115,11 @@ class DomainUtil {
 						'Error: unable to verify the first certificate',
 						'Error: unable to get local issuer certificate'
 					];
-
 				// If the domain contains following strings we just bypass the server
 				const whitelistDomains = [
 					'zulipdev.org'
 				];
-
-				// make sure that error is a error or string not undefined
-				// so validation does not throw error.
-				error = error || '';
-				if (!error && response.statusCode < 400) {
+				if (!error && response.statusCode !== 404) {
 					// Correct
 					this.getServerSettings(domain).then(serverSettings => {
 						resolve(serverSettings);
@@ -169,7 +159,7 @@ class DomainUtil {
 					}
 				} else {
 					const invalidZulipServerError = `${domain} does not appear to be a valid Zulip server. Make sure that \
-					\n(1) you can connect to that URL in a web browser and \n (2) if you need a proxy to connect to the Internet, that you've configured your proxy in the Network settings \n (3) its a zulip server`;
+					\n(1) you can connect to that URL in a web browser and \n (2) if you need a proxy to connect to the Internet, that you've configured your proxy in the Network settings`;
 					reject(invalidZulipServerError);
 				}
 			});
@@ -235,23 +225,7 @@ class DomainUtil {
 	}
 
 	reloadDB() {
-		const domainJsonPath = path.join(app.getPath('userData'), '/domain.json');
-		try {
-			const file = fs.readFileSync(domainJsonPath, 'utf8');
-			JSON.parse(file);
-		} catch (err) {
-			if (fs.existsSync(domainJsonPath)) {
-				fs.unlinkSync(domainJsonPath);
-				dialog.showErrorBox(
-					'Error saving new organization',
-					'There seems to be error while saving new organization, ' +
-					'you may have to re-add your previous organizations back.'
-				);
-				logger.error('Error while JSON parsing domain.json: ');
-				logger.error(err);
-			}
-		}
-		this.db = new JsonDB(domainJsonPath, true, true);
+		this.db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
 	}
 
 	generateFilePath(url) {

app/renderer/js/utils/link-util.js

@@ -19,20 +19,7 @@ class LinkUtil {
 		const currentDomain = wurl('hostname', currentUrl);
 		const newDomain = wurl('hostname', newUrl);
 
-		const sameDomainUrl = (currentDomain === newDomain || newUrl === currentUrl + '/');
-		const isUploadsUrl = newUrl.includes(currentUrl + '/user_uploads/');
-		const isInternalUrl = newUrl.includes('/#narrow') || isUploadsUrl;
-
-		return {
-			isInternalUrl: sameDomainUrl && isInternalUrl,
-			isUploadsUrl
-		};
-	}
-
-	isImage(url) {
-		// test for images extension as well as urls like .png?s=100
-		const isImageUrl = /\.(bmp|gif|jpg|jpeg|png|webp)\?*.*$/i;
-		return isImageUrl.test(url);
+		return (currentDomain === newDomain) && newUrl.includes('/#narrow');
 	}
 }
 

app/renderer/js/utils/linux-update-util.js

@@ -1,74 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const process = require('process');
-const remote =
-	process.type === 'renderer' ? require('electron').remote : require('electron');
-const JsonDB = require('node-json-db');
-const Logger = require('./logger-util');
-
-const logger = new Logger({
-	file: 'linux-update-util.log',
-	timestamp: true
-});
-
-/* To make the util runnable in both main and renderer process */
-const { dialog, app } = remote;
-
-let instance = null;
-
-class LinuxUpdateUtil {
-	constructor() {
-		if (instance) {
-			return instance;
-		} else {
-			instance = this;
-		}
-
-		this.reloadDB();
-		return instance;
-	}
-
-	getUpdateItem(key, defaultValue = null) {
-		this.reloadDB();
-		const value = this.db.getData('/')[key];
-		if (value === undefined) {
-			this.setUpdateItem(key, defaultValue);
-			return defaultValue;
-		} else {
-			return value;
-		}
-	}
-
-	setUpdateItem(key, value) {
-		this.db.push(`/${key}`, value, true);
-		this.reloadDB();
-	}
-
-	removeUpdateItem(key) {
-		this.db.delete(`/${key}`);
-		this.reloadDB();
-	}
-
-	reloadDB() {
-		const linuxUpdateJsonPath = path.join(app.getPath('userData'), '/updates.json');
-		try {
-			const file = fs.readFileSync(linuxUpdateJsonPath, 'utf8');
-			JSON.parse(file);
-		} catch (err) {
-			if (fs.existsSync(linuxUpdateJsonPath)) {
-				fs.unlinkSync(linuxUpdateJsonPath);
-				dialog.showErrorBox(
-					'Error saving update notifications.',
-					'We encountered error while saving update notifications.'
-				);
-				logger.error('Error while JSON parsing updates.json: ');
-				logger.error(err);
-			}
-		}
-		this.db = new JsonDB(linuxUpdateJsonPath, true, true);
-	}
-}
-
-module.exports = new LinuxUpdateUtil();

app/renderer/js/utils/logger-util.js

@@ -1,87 +0,0 @@
-const NodeConsole = require('console').Console;
-const fs = require('fs');
-const isDev = require('electron-is-dev');
-const { initSetUp } = require('./default-util');
-
-initSetUp();
-let app = null;
-if (process.type === 'renderer') {
-	app = require('electron').remote.app;
-} else {
-	app = require('electron').app;
-}
-
-const browserConsole = console;
-const logDir = `${app.getPath('userData')}/Logs`;
-
-class Logger {
-	constructor(opts = {}) {
-		let {
-			timestamp = true,
-			file = 'console.log',
-			level = true,
-			logInDevMode = false
-		} = opts;
-
-		file = `${logDir}/${file}`;
-		if (timestamp === true) {
-			timestamp = this.getTimestamp;
-		}
-
-		const fileStream = fs.createWriteStream(file, { flags: 'a' });
-		const nodeConsole = new NodeConsole(fileStream);
-
-		this.nodeConsole = nodeConsole;
-		this.timestamp = timestamp;
-		this.level = level;
-		this.logInDevMode = logInDevMode;
-		this.setUpConsole();
-	}
-
-	_log(type, ...args) {
-		const {
-			nodeConsole, timestamp, level, logInDevMode
-		} = this;
-		let nodeConsoleLog;
-
-		/* eslint-disable no-fallthrough */
-		switch (true) {
-			case typeof timestamp === 'function':
-				args.unshift(timestamp() + ' |\t');
-
-			case (level !== false):
-				args.unshift(type.toUpperCase() + ' |');
-
-			case isDev || logInDevMode:
-				nodeConsoleLog = nodeConsole[type] || nodeConsole.log;
-				nodeConsoleLog.apply(null, args);
-
-			default: break;
-		}
-		/* eslint-enable no-fallthrough */
-
-		browserConsole[type].apply(null, args);
-	}
-
-	setUpConsole() {
-		for (const type in browserConsole) {
-			this.setupConsoleMethod(type);
-		}
-	}
-
-	setupConsoleMethod(type) {
-		this[type] = (...args) => {
-			this._log(type, ...args);
-		};
-	}
-
-	getTimestamp() {
-		const date = new Date();
-		const timestamp =
-			`${date.getMonth()}/${date.getDate()} ` +
-			`${date.getMinutes()}:${date.getSeconds()}`;
-		return timestamp;
-	}
-}
-
-module.exports = Logger;

app/renderer/js/utils/reconnect-util.js

@@ -1,54 +0,0 @@
-const isOnline = require('is-online');
-
-class ReconnectUtil {
-	constructor(serverManagerView) {
-		this.serverManagerView = serverManagerView;
-		this.alreadyReloaded = false;
-	}
-
-	clearState() {
-		this.alreadyReloaded = false;
-	}
-
-	pollInternetAndReload() {
-		const pollInterval = setInterval(() => {
-			this._checkAndReload()
-				.then(status => {
-					if (status) {
-						this.alreadyReloaded = true;
-						clearInterval(pollInterval);
-					}
-				});
-		}, 1500);
-	}
-
-	_checkAndReload() {
-		return new Promise(resolve => {
-			if (!this.alreadyReloaded) { // eslint-disable-line no-negated-condition
-				isOnline()
-					.then(online => {
-						if (online) {
-							if (!this.alreadyReloaded) {
-								this.serverManagerView.reloadView();
-							}
-							console.log('You\'re back online.');
-							return resolve(true);
-						}
-
-						console.log('There is no internet connection, try checking network cables, modem and router.');
-						const errMsgHolder = document.querySelector('#description');
-						if (errMsgHolder) {
-							errMsgHolder.innerHTML = `
-										<div>You internet connection does't seem to work properly!</div>
-										</div>Verify that it works and then click try again.</div>`;
-						}
-						return resolve(false);
-					});
-			} else {
-				return resolve(true);
-			}
-		});
-	}
-}
-
-module.exports = ReconnectUtil;

app/renderer/main.html

@@ -24,18 +24,10 @@
       </div>
     </div>
     <div id="actions-container">
-      <div class="action-button" id="dnd-action">
-        <i class="material-icons md-48">notifications</i>
-        <span id="dnd-tooltip" style="display:none">Do Not Disturb</span>
-      </div>
       <div class="action-button" id="reload-action">
         <i class="material-icons md-48">refresh</i>
         <span id="reload-tooltip" style="display:none">Reload</span>
       </div>
-      <div class="action-button disable" id="back-action">
-        <i class="material-icons md-48">arrow_back</i>
-        <span id="back-tooltip" style="display:none">Go Back</span>
-      </div>
       <div class="action-button" id="settings-action">
         <i class="material-icons md-48">settings</i>
         <span id="setting-tooltip" style="display:none">Settings</span>
@@ -46,11 +38,7 @@
     <div id="webviews-container"></div>
   </div>
   </div>
-
-  <div id="feedback-modal">
-    <send-feedback></send-feedback>
-  </div>
 </body>
 <script src="js/main.js"></script>
-<script>require('./js/shared/preventdrag.js')</script>
-</html>
+
+</html>

app/renderer/network.html

@@ -17,6 +17,5 @@
       <div id="reconnect">Try now</div>
     </div>
   </body>
-  <script src="js/pages/network.js"></script>
-  <script>require('./js/shared/preventdrag.js')</script>
+  <script src="js/pages/network.js"></script>  
 </html>

app/renderer/preference.html

@@ -13,5 +13,4 @@
     </div>
   </body>
   <script src="js/pages/preference/preference.js"></script>
-  <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/translations/bg.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "За Зулип",
-	"Actual Size": "Реален размер",
-	"Back": "обратно",
-	"Close": "Близо",
-	"Copy": "копие",
-	"Cut": "Разрез",
-	"Delete": "Изтрий",
-	"Desktop App Settings": "Настройки за настолни приложения",
-	"Edit": "редактиране",
-	"File": "досие",
-	"Forward": "напред",
-	"Hard Reload": "Трудно презареждане",
-	"Help": "Помогне",
-	"History": "история",
-	"Keyboard Shortcuts": "Комбинация от клавиши",
-	"Log Out": "Излез от профила си",
-	"Minimize": "Минимизиране",
-	"Paste": "паста",
-	"Paste and Match Style": "Поставяне и съвпадение на стила",
-	"Quit": "напускам",
-	"Redo": "ремонтирам",
-	"Reload": "Презареди",
-	"Report an issue...": "Подаване на сигнал за проблем ...",
-	"Reset App Settings": "Нулирайте настройките на приложението",
-	"Select All": "Избери всички",
-	"Show App Logs": "Показване на регистрационните файлове на приложения",
-	"Toggle DevTools for Active Tab": "Превключете DevTools за активен раздел",
-	"Toggle DevTools for Zulip App": "Превключете DevTools за Zulip App",
-	"Toggle Full Screen": "Превключване на цял екран",
-	"Toggle Sidebar": "Превключване на страничната лента",
-	"Toggle Tray Icon": "Превключване на иконата на тавата",
-	"Undo": "премахвам",
-	"View": "изглед",
-	"Window": "прозорец",
-	"Zoom In": "Увеличавам",
-	"Zoom Out": "Отдалечавам",
-	"Zulip Help": "Помощ за Zulip"
-}

app/translations/cs.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "O společnosti Zulip",
-	"Actual Size": "Aktuální velikost",
-	"Back": "Zadní",
-	"Close": "Zavřít",
-	"Copy": "kopírovat",
-	"Cut": "Střih",
-	"Delete": "Vymazat",
-	"Desktop App Settings": "Nastavení aplikace Desktop",
-	"Edit": "Upravit",
-	"File": "Soubor",
-	"Forward": "Vpřed",
-	"Hard Reload": "Hard Reload",
-	"Help": "Pomoc",
-	"History": "Dějiny",
-	"Keyboard Shortcuts": "Klávesové zkratky",
-	"Log Out": "Odhlásit se",
-	"Minimize": "Minimalizujte",
-	"Paste": "Vložit",
-	"Paste and Match Style": "Vložit a přizpůsobit styl",
-	"Quit": "Přestat",
-	"Redo": "Předělat",
-	"Reload": "Znovu načíst",
-	"Report an issue...": "Nahlásit problém...",
-	"Reset App Settings": "Obnovit nastavení aplikace",
-	"Select All": "Vybrat vše",
-	"Show App Logs": "Zobrazit protokoly aplikace",
-	"Toggle DevTools for Active Tab": "Přepínač DevTools pro aktivní kartu",
-	"Toggle DevTools for Zulip App": "Přepnout nástroj DevTools pro aplikaci Zulip App",
-	"Toggle Full Screen": "Přepnout na celou obrazovku",
-	"Toggle Sidebar": "Přepnout postranní panel",
-	"Toggle Tray Icon": "Přepnout ikonu zásobníku",
-	"Undo": "vrátit",
-	"View": "Pohled",
-	"Window": "Okno",
-	"Zoom In": "Přiblížit",
-	"Zoom Out": "Oddálit",
-	"Zulip Help": "Zulip Nápověda"
-}

app/translations/de.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "Über Zulip",
-	"Actual Size": "Tatsächliche Größe",
-	"Back": "Zurück",
-	"Close": "Schließen",
-	"Copy": "Kopieren",
-	"Cut": "Schnitt",
-	"Delete": "Löschen",
-	"Desktop App Settings": "Desktop App Einstellungen",
-	"Edit": "Bearbeiten",
-	"File": "Datei",
-	"Forward": "Nach vorne",
-	"Hard Reload": "Hard Reload",
-	"Help": "Hilfe",
-	"History": "Geschichte",
-	"Keyboard Shortcuts": "Tastatürkürzel",
-	"Log Out": "Ausloggen",
-	"Minimize": "Minimieren",
-	"Paste": "Einfügen",
-	"Paste and Match Style": "Einfügen und Anpassen von Stilen",
-	"Quit": "Verlassen",
-	"Redo": "Wiederholen",
-	"Reload": "Neu laden",
-	"Report an issue...": "Ein Problem melden...",
-	"Reset App Settings": "App-Einstellungen zurücksetzen",
-	"Select All": "Wählen Sie Alle",
-	"Show App Logs": "App-Logs anzeigen",
-	"Toggle DevTools for Active Tab": "Schalten Sie DevTools für Active Tab ein",
-	"Toggle DevTools for Zulip App": "Umschalt DevTools für Zulip App",
-	"Toggle Full Screen": "Vollbild umschalten",
-	"Toggle Sidebar": "Toggle Seitenleiste",
-	"Toggle Tray Icon": "Toggle Tray-Symbol",
-	"Undo": "Rückgängig machen",
-	"View": "Aussicht",
-	"Window": "Fenster",
-	"Zoom In": "Hineinzoomen",
-	"Zoom Out": "Rauszoomen",
-	"Zulip Help": "Zulip Hilfe"
-}

app/translations/en.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "About Zulip",
-	"Actual Size": "Actual Size",
-	"Back": "Back",
-	"Close": "Close",
-	"Copy": "Copy",
-	"Cut": "Cut",
-	"Delete": "Delete",
-	"Desktop App Settings": "Desktop App Settings",
-	"Edit": "Edit",
-	"File": "File",
-	"Forward": "Forward",
-	"Hard Reload": "Hard Reload",
-	"Help": "Help",
-	"History": "History",
-	"Keyboard Shortcuts": "Keyboard Shortcuts",
-	"Log Out": "Log Out",
-	"Minimize": "Minimize",
-	"Paste": "Paste",
-	"Paste and Match Style": "Paste and Match Style",
-	"Quit": "Quit",
-	"Redo": "Redo",
-	"Reload": "Reload",
-	"Report an issue...": "Report an issue...",
-	"Reset App Settings": "Reset App Settings",
-	"Select All": "Select All",
-	"Show App Logs": "Show App Logs",
-	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
-	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
-	"Toggle Full Screen": "Toggle Full Screen",
-	"Toggle Sidebar": "Toggle Sidebar",
-	"Toggle Tray Icon": "Toggle Tray Icon",
-	"Undo": "Undo",
-	"View": "View",
-	"Window": "Window",
-	"Zoom In": "Zoom In",
-	"Zoom Out": "Zoom Out",
-	"Zulip Help": "Zulip Help"
-}

app/translations/es.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "Acerca de Zulip",
-	"Actual Size": "Tamaño real",
-	"Back": "Espalda",
-	"Close": "Cerca",
-	"Copy": "Dupdo",
-	"Cut": "Cortar",
-	"Delete": "Borrar",
-	"Desktop App Settings": "Configuración de la aplicación de escritorio",
-	"Edit": "Editar",
-	"File": "Archivo",
-	"Forward": "Adelante",
-	"Hard Reload": "Recargar duro",
-	"Help": "Ayuda",
-	"History": "Historia",
-	"Keyboard Shortcuts": "Atajos de teclado",
-	"Log Out": "Cerrar sesión",
-	"Minimize": "Minimizar",
-	"Paste": "Pegar",
-	"Paste and Match Style": "Pegar y combinar estilo",
-	"Quit": "Dejar",
-	"Redo": "Rehacer",
-	"Reload": "Recargar",
-	"Report an issue...": "Reportar un problema...",
-	"Reset App Settings": "Restablecer configuraciones",
-	"Select All": "Seleccionar todo",
-	"Show App Logs": "Mostrar registros de aplicaciones",
-	"Toggle DevTools for Active Tab": "Alternar DevTools para Active Tab",
-	"Toggle DevTools for Zulip App": "Alternar DevTools para la aplicación Zulip",
-	"Toggle Full Screen": "Alternar pantalla completa",
-	"Toggle Sidebar": "Alternar barra lateral",
-	"Toggle Tray Icon": "Alternar el icono de la bandeja",
-	"Undo": "Deshacer",
-	"View": "Ver",
-	"Window": "Ventana",
-	"Zoom In": "Acercarse",
-	"Zoom Out": "Disminuir el zoom",
-	"Zulip Help": "Ayuda de Zulip"
-}

app/translations/fr.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "À propos de Zulip",
-	"Actual Size": "Taille actuelle",
-	"Back": "Arrière",
-	"Close": "Fermer",
-	"Copy": "Copie",
-	"Cut": "Couper",
-	"Delete": "Effacer",
-	"Desktop App Settings": "Paramètres de l'application de bureau",
-	"Edit": "modifier",
-	"File": "Fichier",
-	"Forward": "Vers l'avant",
-	"Hard Reload": "Rechargement dur",
-	"Help": "Aidez-moi",
-	"History": "Histoire",
-	"Keyboard Shortcuts": "Raccourcis clavier",
-	"Log Out": "Connectez - Out",
-	"Minimize": "Minimiser",
-	"Paste": "Coller",
-	"Paste and Match Style": "Coller et assortir le style",
-	"Quit": "Quitter",
-	"Redo": "Refaire",
-	"Reload": "Recharger",
-	"Report an issue...": "Signaler un problème...",
-	"Reset App Settings": "Réinitialiser les paramètres",
-	"Select All": "Tout sélectionner",
-	"Show App Logs": "Afficher les journaux d'applications",
-	"Toggle DevTools for Active Tab": "Basculer DevTools pour l'onglet actif",
-	"Toggle DevTools for Zulip App": "Basculer DevTools pour l'application Zulip",
-	"Toggle Full Screen": "Basculer en plein écran",
-	"Toggle Sidebar": "Basculer la barre latérale",
-	"Toggle Tray Icon": "Toggle Tray Icône",
-	"Undo": "annuler",
-	"View": "Vue",
-	"Window": "Fenêtre",
-	"Zoom In": "Agrandir",
-	"Zoom Out": "Dézoomer",
-	"Zulip Help": "Aide Zulip"
-}

app/translations/hi.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "Zulip के बारे में",
-	"Actual Size": "वास्तविक आकार",
-	"Back": "वापस",
-	"Close": "बंद करे",
-	"Copy": "प्रतिलिपि",
-	"Cut": "कट गया",
-	"Delete": "हटाना",
-	"Desktop App Settings": "डेस्कटॉप ऐप सेटिंग्स",
-	"Edit": "संपादित करें",
-	"File": "फ़ाइल",
-	"Forward": "आगे",
-	"Hard Reload": "कठिन पुन: लोड करें",
-	"Help": "मदद",
-	"History": "इतिहास",
-	"Keyboard Shortcuts": "कुंजीपटल अल्प मार्ग",
-	"Log Out": "लोग आउट",
-	"Minimize": "छोटा करना",
-	"Paste": "चिपकाएं",
-	"Paste and Match Style": "चिपकाएं और शैली का मिलान करें",
-	"Quit": "छोड़ना",
-	"Redo": "फिर से करना",
-	"Reload": "सीमा से अधिक लादना",
-	"Report an issue...": "मामले की रिपोर्ट करें...",
-	"Reset App Settings": "ऐप सेटिंग्स रीसेट करें",
-	"Select All": "सभी का चयन करे",
-	"Show App Logs": "ऐप लॉग दिखाएं",
-	"Toggle DevTools for Active Tab": "सक्रिय टैब के लिए DevTools टॉगल करें",
-	"Toggle DevTools for Zulip App": "Zulip ऐप के लिए DevTools टॉगल करें",
-	"Toggle Full Screen": "पूर्णस्क्रीन चालू करें",
-	"Toggle Sidebar": "साइडबार टॉगल करें",
-	"Toggle Tray Icon": "ट्रे आइकन टॉगल करें",
-	"Undo": "पूर्ववत करें",
-	"View": "राय",
-	"Window": "खिड़की",
-	"Zoom In": "ज़ूम इन",
-	"Zoom Out": "ज़ूम आउट",
-	"Zulip Help": "Zulip सहायता"
-}

app/translations/hu.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "A Zulipról",
-	"Actual Size": "Valódi méret",
-	"Back": "Hát",
-	"Close": "Bezárás",
-	"Copy": "Másolat",
-	"Cut": "Vágott",
-	"Delete": "Töröl",
-	"Desktop App Settings": "Asztali alkalmazások beállításai",
-	"Edit": "szerkesztése",
-	"File": "fájl",
-	"Forward": "Előre",
-	"Hard Reload": "Hard Reload",
-	"Help": "Segítség",
-	"History": "Történelem",
-	"Keyboard Shortcuts": "Gyorsbillentyűket",
-	"Log Out": "Kijelentkezés",
-	"Minimize": "Kis méret",
-	"Paste": "Paszta",
-	"Paste and Match Style": "Beillesztés és stílusok illesztése",
-	"Quit": "quit",
-	"Redo": "Újra",
-	"Reload": "Reload",
-	"Report an issue...": "Hibajelentés ...",
-	"Reset App Settings": "Az alkalmazás beállításainak visszaállítása",
-	"Select All": "Mindet kiválaszt",
-	"Show App Logs": "Alkalmazásnaplók megjelenítése",
-	"Toggle DevTools for Active Tab": "A DevTools aktiválása az Aktív laphoz",
-	"Toggle DevTools for Zulip App": "Kapcsolja a DevTools-ot a Zulip App-hoz",
-	"Toggle Full Screen": "Teljes képernyőre váltás",
-	"Toggle Sidebar": "Oldalsáv átkapcsolása",
-	"Toggle Tray Icon": "Tálcaikon átkapcsolása",
-	"Undo": "kibont",
-	"View": "Kilátás",
-	"Window": "Ablak",
-	"Zoom In": "Nagyítás",
-	"Zoom Out": "Kicsinyítés",
-	"Zulip Help": "Zulip Súgó"
-}

app/translations/id.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "Tentang Zulip",
-	"Actual Size": "Ukuran sebenarnya",
-	"Back": "Kembali",
-	"Close": "Dekat",
-	"Copy": "Salinan",
-	"Cut": "Memotong",
-	"Delete": "Menghapus",
-	"Desktop App Settings": "Setelan Aplikasi Desktop",
-	"Edit": "Edit",
-	"File": "Mengajukan",
-	"Forward": "Meneruskan",
-	"Hard Reload": "Hard Reload",
-	"Help": "Membantu",
-	"History": "Sejarah",
-	"Keyboard Shortcuts": "Cara pintas keyboard",
-	"Log Out": "Keluar",
-	"Minimize": "Memperkecil",
-	"Paste": "Pasta",
-	"Paste and Match Style": "Tempel dan Cocokkan Gaya",
-	"Quit": "Berhenti",
-	"Redo": "Mengulangi",
-	"Reload": "Reload",
-	"Report an issue...": "Laporkan masalah ...",
-	"Reset App Settings": "Setel ulang Pengaturan Aplikasi",
-	"Select All": "Pilih Semua",
-	"Show App Logs": "Tampilkan log aplikasi",
-	"Toggle DevTools for Active Tab": "Toggle DevTools untuk Tab Aktif",
-	"Toggle DevTools for Zulip App": "Toggle DevTools untuk Aplikasi Zulip",
-	"Toggle Full Screen": "Toggle Full Screen",
-	"Toggle Sidebar": "Toggle Sidebar",
-	"Toggle Tray Icon": "Toggle Tray Icon",
-	"Undo": "Membuka",
-	"View": "Melihat",
-	"Window": "Jendela",
-	"Zoom In": "Perbesar",
-	"Zoom Out": "Zoom Out",
-	"Zulip Help": "Zulip Help"
-}

app/translations/ja.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "チューリップについて",
-	"Actual Size": "実際のサイズ",
-	"Back": "バック",
-	"Close": "閉じる",
-	"Copy": "コピー",
-	"Cut": "カット",
-	"Delete": "削除",
-	"Desktop App Settings": "デスクトップアプリケーションの設定",
-	"Edit": "編集",
-	"File": "ファイル",
-	"Forward": "フォワード",
-	"Hard Reload": "ハードリロード",
-	"Help": "助けて",
-	"History": "歴史",
-	"Keyboard Shortcuts": "キーボードショートカット",
-	"Log Out": "ログアウト",
-	"Minimize": "最小化する",
-	"Paste": "ペースト",
-	"Paste and Match Style": "スタイルの貼り付けと一致",
-	"Quit": "終了する",
-	"Redo": "やり直し",
-	"Reload": "リロード",
-	"Report an issue...": "問題を報告する...",
-	"Reset App Settings": "アプリの設定をリセットする",
-	"Select All": "すべて選択",
-	"Show App Logs": "アプリケーションログを表示する",
-	"Toggle DevTools for Active Tab": "DevTools for Activeタブを切り替える",
-	"Toggle DevTools for Zulip App": "Zulip AppのDevToolsの切り替え",
-	"Toggle Full Screen": "フルスクリーン切り替え",
-	"Toggle Sidebar": "サイドバーの切り替え",
-	"Toggle Tray Icon": "トレイアイコンを切り替える",
-	"Undo": "元に戻す",
-	"View": "ビュー",
-	"Window": "窓",
-	"Zoom In": "ズームイン",
-	"Zoom Out": "ズームアウトする",
-	"Zulip Help": "チューリップヘルプ"
-}

app/translations/ko.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "튤립 소개",
-	"Actual Size": "실제 크기",
-	"Back": "뒤로",
-	"Close": "닫기",
-	"Copy": "부",
-	"Cut": "절단",
-	"Delete": "지우다",
-	"Desktop App Settings": "데스크톱 앱 설정",
-	"Edit": "편집하다",
-	"File": "파일",
-	"Forward": "앞으로",
-	"Hard Reload": "하드 다시로드",
-	"Help": "도움",
-	"History": "역사",
-	"Keyboard Shortcuts": "키보드 단축키",
-	"Log Out": "로그 아웃",
-	"Minimize": "최소화",
-	"Paste": "풀",
-	"Paste and Match Style": "붙여 넣기 및 스타일 일치",
-	"Quit": "떠나다",
-	"Redo": "다시 하다",
-	"Reload": "다시로드",
-	"Report an issue...": "문제 신고 ...",
-	"Reset App Settings": "앱 설정 재설정",
-	"Select All": "모두 선택",
-	"Show App Logs": "앱 로그 표시",
-	"Toggle DevTools for Active Tab": "DevTools for Active Tab 토글",
-	"Toggle DevTools for Zulip App": "Zulip App 용 DevTools 토글",
-	"Toggle Full Screen": "전체 화면 토글",
-	"Toggle Sidebar": "사이드 바 전환",
-	"Toggle Tray Icon": "트레이 아이콘 토글",
-	"Undo": "끄르다",
-	"View": "전망",
-	"Window": "창문",
-	"Zoom In": "확대",
-	"Zoom Out": "축소",
-	"Zulip Help": "튤립 도움말"
-}

app/translations/ml.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "സുലിപ്",
-	"Actual Size": "യഥാർത്ഥ വലുപ്പം",
-	"Back": "തിരികെ",
-	"Close": "അടയ്ക്കുക",
-	"Copy": "പകർത്തുക",
-	"Cut": "മുറിക്കുക",
-	"Delete": "ഇല്ലാതാക്കുക",
-	"Desktop App Settings": "ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങൾ",
-	"Edit": "എഡിറ്റുചെയ്യുക",
-	"File": "ഫയൽ",
-	"Forward": "മുന്നോട്ട്",
-	"Hard Reload": "ഹാർഡ് റീലോഡ്",
-	"Help": "സഹായിക്കൂ",
-	"History": "ചരിത്രം",
-	"Keyboard Shortcuts": "കീബോർഡ് കുറുക്കുവഴികൾ",
-	"Log Out": "ലോഗ് ഔട്ട്",
-	"Minimize": "ചെറുതാക്കുക",
-	"Paste": "പേസ്റ്റ്",
-	"Paste and Match Style": "ശൈലി ഒട്ടിക്കുകയും പൊരുത്തപ്പെടുത്തുകയും ചെയ്യുക",
-	"Quit": "പുറത്തുകടക്കുക",
-	"Redo": "വീണ്ടും ചെയ്യുക",
-	"Reload": "വീണ്ടും ലോഡുചെയ്യുക",
-	"Report an issue...": "ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക ...",
-	"Reset App Settings": "അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങൾ പുനഃസജ്ജമാക്കുക",
-	"Select All": "എല്ലാം തിരഞ്ഞെടുക്കുക",
-	"Show App Logs": "അപ്ലിക്കേഷൻ ലോഗുകൾ കാണിക്കുക",
-	"Toggle DevTools for Active Tab": "സജീവ ടാബിനായി DevTools ടോഗിൾ ചെയ്യുക",
-	"Toggle DevTools for Zulip App": "സുലിപ്പ് ആപ്ലിക്കേഷനായി DevTools ടോഗിൾ ചെയ്യുക",
-	"Toggle Full Screen": "പൂർണ്ണ സ്ക്രീൻ ടോഗിൾ ചെയ്യുക",
-	"Toggle Sidebar": "സൈഡ്ബാർ ടോഗിൾ ചെയ്യുക",
-	"Toggle Tray Icon": "ട്രേ ഐക്കൺ ടോഗിൾ ചെയ്യുക",
-	"Undo": "പഴയപടിയാക്കുക",
-	"View": "കാണുക",
-	"Window": "ജാലകം",
-	"Zoom In": "വലുതാക്കുക",
-	"Zoom Out": "സൂം ഔട്ട്",
-	"Zulip Help": "സുലിപ്പ് സഹായം"
-}

app/translations/nl.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "Over Zulip",
-	"Actual Size": "Daadwerkelijke grootte",
-	"Back": "Terug",
-	"Close": "Dichtbij",
-	"Copy": "Kopiëren",
-	"Cut": "Besnoeiing",
-	"Delete": "Verwijder",
-	"Desktop App Settings": "Desktop-app-instellingen",
-	"Edit": "Bewerk",
-	"File": "het dossier",
-	"Forward": "Vooruit",
-	"Hard Reload": "Moeilijke herladen",
-	"Help": "Helpen",
-	"History": "Geschiedenis",
-	"Keyboard Shortcuts": "Toetsenbord sneltoetsen",
-	"Log Out": "Uitloggen",
-	"Minimize": "verkleinen",
-	"Paste": "Plakken",
-	"Paste and Match Style": "Plak en match stijl",
-	"Quit": "ophouden",
-	"Redo": "Opnieuw doen",
-	"Reload": "vernieuwen",
-	"Report an issue...": "Een probleem melden...",
-	"Reset App Settings": "App-instellingen opnieuw instellen",
-	"Select All": "Selecteer alles",
-	"Show App Logs": "App-logs weergeven",
-	"Toggle DevTools for Active Tab": "DevTools voor actieve tabblad omschakelen",
-	"Toggle DevTools for Zulip App": "DevTools voor Zulip-app omschakelen",
-	"Toggle Full Screen": "Volledig scherm activeren",
-	"Toggle Sidebar": "Zijbalk verschuiven",
-	"Toggle Tray Icon": "Pictogram Lade wisselen",
-	"Undo": "ongedaan maken",
-	"View": "Uitzicht",
-	"Window": "Venster",
-	"Zoom In": "In zoomen",
-	"Zoom Out": "Uitzoomen",
-	"Zulip Help": "Zulip Help"
-}

app/translations/pl.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "O Zulip",
-	"Actual Size": "Rzeczywisty rozmiar",
-	"Back": "Plecy",
-	"Close": "Blisko",
-	"Copy": "Kopiuj",
-	"Cut": "Ciąć",
-	"Delete": "Kasować",
-	"Desktop App Settings": "Ustawienia aplikacji na komputer",
-	"Edit": "Edytować",
-	"File": "Plik",
-	"Forward": "Naprzód",
-	"Hard Reload": "Trudne przeładowanie",
-	"Help": "Wsparcie",
-	"History": "Historia",
-	"Keyboard Shortcuts": "Skróty klawiszowe",
-	"Log Out": "Wyloguj",
-	"Minimize": "Zminimalizować",
-	"Paste": "Pasta",
-	"Paste and Match Style": "Wklej i dopasuj styl",
-	"Quit": "Porzucić",
-	"Redo": "Przerobić",
-	"Reload": "Przeładować",
-	"Report an issue...": "Zgłoś problem...",
-	"Reset App Settings": "Zresetuj ustawienia aplikacji",
-	"Select All": "Zaznacz wszystko",
-	"Show App Logs": "Pokaż dzienniki aplikacji",
-	"Toggle DevTools for Active Tab": "Przełącz DevTools dla Active Tab",
-	"Toggle DevTools for Zulip App": "Przełącz DevTools dla aplikacji Zulip",
-	"Toggle Full Screen": "Przełącz tryb pełnoekranowy",
-	"Toggle Sidebar": "Przełącz boczny pasek",
-	"Toggle Tray Icon": "Przełącz ikonę tacy",
-	"Undo": "Cofnij",
-	"View": "Widok",
-	"Window": "Okno",
-	"Zoom In": "Zbliżenie",
-	"Zoom Out": "Pomniejsz",
-	"Zulip Help": "Zulip Help"
-}

app/translations/pt.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "Sobre Zulip",
-	"Actual Size": "Tamanho atual",
-	"Back": "Costas",
-	"Close": "Fechar",
-	"Copy": "cópia de",
-	"Cut": "Cortar",
-	"Delete": "Excluir",
-	"Desktop App Settings": "Configurações da aplicação Desktop",
-	"Edit": "Editar",
-	"File": "Arquivo",
-	"Forward": "frente",
-	"Hard Reload": "Hard Recargar",
-	"Help": "Socorro",
-	"History": "História",
-	"Keyboard Shortcuts": "Atalhos do teclado",
-	"Log Out": "Sair",
-	"Minimize": "Minimizar",
-	"Paste": "Colar",
-	"Paste and Match Style": "Estilo de colar e combinar",
-	"Quit": "Sair",
-	"Redo": "Refazer",
-	"Reload": "recarregar",
-	"Report an issue...": "Relatar um problema ...",
-	"Reset App Settings": "Redefinir as configurações da aplicação",
-	"Select All": "Selecionar tudo",
-	"Show App Logs": "Mostrar logs de aplicativos",
-	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
-	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
-	"Toggle Full Screen": "Alternar para o modo tela cheia",
-	"Toggle Sidebar": "Toggle Sidebar",
-	"Toggle Tray Icon": "Ícone Toggle Tray",
-	"Undo": "Desfazer",
-	"View": "Visão",
-	"Window": "Janela",
-	"Zoom In": "Mais Zoom",
-	"Zoom Out": "Reduzir o zoom",
-	"Zulip Help": "Zulip Help"
-}

app/translations/ru.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "О пользователе Zulip",
-	"Actual Size": "Фактический размер",
-	"Back": "назад",
-	"Close": "Закрыть",
-	"Copy": "копия",
-	"Cut": "Порез",
-	"Delete": "Удалить",
-	"Desktop App Settings": "Настройки настольных приложений",
-	"Edit": "редактировать",
-	"File": "файл",
-	"Forward": "Вперед",
-	"Hard Reload": "Hard Reload",
-	"Help": "Помогите",
-	"History": "история",
-	"Keyboard Shortcuts": "Горячие клавиши",
-	"Log Out": "Выйти",
-	"Minimize": "Минимизировать",
-	"Paste": "Вставить",
-	"Paste and Match Style": "Стиль вставки и совпадения",
-	"Quit": "Уволиться",
-	"Redo": "переделывать",
-	"Reload": "перезагружать",
-	"Report an issue...": "Сообщить о проблеме...",
-	"Reset App Settings": "Сбросить настройки приложения",
-	"Select All": "Выбрать все",
-	"Show App Logs": "Показать журналы приложений",
-	"Toggle DevTools for Active Tab": "Toggle DevTools для активной вкладки",
-	"Toggle DevTools for Zulip App": "Toggle DevTools для приложения Zulip",
-	"Toggle Full Screen": "Включить полноэкранный режим",
-	"Toggle Sidebar": "Переключить боковую панель",
-	"Toggle Tray Icon": "Иконка Toggle Tray",
-	"Undo": "расстегивать",
-	"View": "Посмотреть",
-	"Window": "Окно",
-	"Zoom In": "Приблизить",
-	"Zoom Out": "Уменьшить",
-	"Zulip Help": "Zulip Help"
-}

app/translations/sr.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "О Зулипу",
-	"Actual Size": "Стварна величина",
-	"Back": "Назад",
-	"Close": "Близу",
-	"Copy": "Копирај",
-	"Cut": "Цут",
-	"Delete": "Избриши",
-	"Desktop App Settings": "Подешавања за десктоп апликације",
-	"Edit": "Уредити",
-	"File": "Филе",
-	"Forward": "Напријед",
-	"Hard Reload": "Хард Релоад",
-	"Help": "Помоћ",
-	"History": "Историја",
-	"Keyboard Shortcuts": "Пречице на тастатури",
-	"Log Out": "Одјавити се",
-	"Minimize": "Минимизирај",
-	"Paste": "Пасте",
-	"Paste and Match Style": "Пасте и Матцх Стиле",
-	"Quit": "Одустати",
-	"Redo": "Поново",
-	"Reload": "Освежи",
-	"Report an issue...": "Пријавите проблем...",
-	"Reset App Settings": "Поново поставите подешавања апликације",
-	"Select All": "Изабери све",
-	"Show App Logs": "Прикажи евиденције апликација",
-	"Toggle DevTools for Active Tab": "Пребаците ДевТоолс за Ацтиве Таб",
-	"Toggle DevTools for Zulip App": "Пребаците ДевТоолс за Зулип Апп",
-	"Toggle Full Screen": "Пребаците цео екран",
-	"Toggle Sidebar": "Пребаците бочну траку",
-	"Toggle Tray Icon": "Тоггле Траи Ицон",
-	"Undo": "Ундо",
-	"View": "Поглед",
-	"Window": "Прозор",
-	"Zoom In": "Увеличати",
-	"Zoom Out": "Зумирај",
-	"Zulip Help": "Зулип Хелп"
-}

app/translations/ta.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "ஜுலிப் பற்றி",
-	"Actual Size": "உண்மையான அளவு",
-	"Back": "மீண்டும்",
-	"Close": "நெருக்கமான",
-	"Copy": "நகல்",
-	"Cut": "வெட்டு",
-	"Delete": "அழி",
-	"Desktop App Settings": "டெஸ்க்டாப் பயன்பாட்டு அமைப்புகள்",
-	"Edit": "தொகு",
-	"File": "கோப்பு",
-	"Forward": "முன்னோக்கி",
-	"Hard Reload": "கடினமாக மீண்டும் ஏற்றவும்",
-	"Help": "உதவி",
-	"History": "வரலாறு",
-	"Keyboard Shortcuts": "விசைப்பலகை குறுக்குவழிகள்",
-	"Log Out": "வெளியேறு",
-	"Minimize": "குறைத்தல்",
-	"Paste": "ஒட்டு",
-	"Paste and Match Style": "உடை ஒட்டு மற்றும் பொருந்தும்",
-	"Quit": "விட்டுவிட",
-	"Redo": "மீண்டும் செய்",
-	"Reload": "ஏற்றவும்",
-	"Report an issue...": "சிக்கலைப் புகார ...",
-	"Reset App Settings": "பயன்பாட்டு அமைப்புகளை மீட்டமைக்கவும்",
-	"Select All": "அனைத்தையும் தெரிவுசெய்",
-	"Show App Logs": "பயன்பாட்டு பதிவுகள் காட்டு",
-	"Toggle DevTools for Active Tab": "செயலில் தாவலுக்கு DevTools ஐ மாற்று",
-	"Toggle DevTools for Zulip App": "Zulip பயன்பாட்டிற்கான DevTools ஐ மாற்று",
-	"Toggle Full Screen": "மாற்று முழுத்திரை",
-	"Toggle Sidebar": "பக்கப்பட்டி மாறு",
-	"Toggle Tray Icon": "ட்ரே ஐகானை மாற்று",
-	"Undo": "செயல்தவிர்",
-	"View": "காண்க",
-	"Window": "ஜன்னல்",
-	"Zoom In": "பெரிதாக்க",
-	"Zoom Out": "பெரிதாக்குக",
-	"Zulip Help": "Zulip உதவி"
-}

app/translations/tr.json

@@ -1,39 +0,0 @@
-{
-	"About Zulip": "Zulip Hakkinda",
-	"Actual Size": "Gerçek boyutu",
-	"Back": "Geri",
-	"Close": "Kapat",
-	"Copy": "kopya",
-	"Cut": "Kesmek",
-	"Delete": "silmek",
-	"Desktop App Settings": "Masaüstü Uygulama Ayarları",
-	"Edit": "Düzenle",
-	"File": "Dosya",
-	"Forward": "ileri",
-	"Hard Reload": "Sert Yeniden Yükle",
-	"Help": "yardım et",
-	"History": "Tarihçe",
-	"Keyboard Shortcuts": "Klavye kısayolları",
-	"Log Out": "Çıkış Yap",
-	"Minimize": "küçültmek",
-	"Paste": "Yapıştırmak",
-	"Paste and Match Style": "Stili Yapıştır ve Eşleştir",
-	"Quit": "çıkmak",
-	"Redo": "yeniden yapmak",
-	"Reload": "Tekrar yükle",
-	"Report an issue...": "Bir sorun bildir ...",
-	"Reset App Settings": "Uygulama Ayarlarını Sıfırla",
-	"Select All": "Hepsini seç",
-	"Show App Logs": "Uygulama Günlüğlerini Göster",
-	"Toggle DevTools for Active Tab": "Aktif Sekme İçin DevTools'a Geçiş Yap",
-	"Toggle DevTools for Zulip App": "Zulip App için DevTools'a Geçiş Yap",
-	"Toggle Full Screen": "Tam ekrana geç",
-	"Toggle Sidebar": "Kenar Çubuğunu Aç / Kapat",
-	"Toggle Tray Icon": "Tepsi Simgesini Aç / Kapat",
-	"Undo": "Geri alma",
-	"View": "Görünüm",
-	"Window": "pencere",
-	"Zoom In": "Yakınlaştır",
-	"Zoom Out": "Uzaklaştır",
-	"Zulip Help": "Zulip Yardımı"
-}

appveyor.yml

@@ -6,7 +6,7 @@ os: Previous Visual Studio 2015
 
 cache:
   - node_modules
-  
+
 install:
   - ps: Install-Product node 6 x64
   - git reset --hard HEAD
@@ -20,5 +20,4 @@ install:
 build: off
 
 test_script:
-  - npm run test
-  - npm run test-e2e
+  - npm run test-all

development.md

@@ -15,7 +15,6 @@ To build and run the app from source, you'll need the following:
 * [Python](https://www.python.org/downloads/release/python-2713/)
   (v2.7.x recommended)
 * A C++ compiler compatible with C++11
-* Linux users also need [Snapcraft](https://snapcraft.io/)
 * Development headers for the libXext, libXtst, and libxkbfile libraries
 
 ### Debian/Ubuntu and friends
@@ -26,7 +25,7 @@ manager (see [here][nodesource-install] for more on the first command):
 
 ```sh
 $ curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
-$ sudo apt install git nodejs python build-essential snapcraft libxext-dev libxtst-dev libxkbfile-dev libgconf-2-4
+$ sudo apt install git nodejs python build-essential libxext-dev libxtst-dev libxkbfile-dev
 ```
 
 [nodesource-install]: https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions
@@ -77,7 +76,7 @@ This command will produce distributable packages or installers for the
 operating system you're running on:
 * on Windows, a Windows installer file
 * on macOS, a `.dmg` file
-* on Linux, a plain `.zip` file as well as a `.deb` file, `.snap` file and an
+* on Linux, a plain `.zip` file as well as a `.deb` file and an
   `AppImage` file.
 To generate all three types, you will need all three operating
 systems.

gulpfile.js

@@ -14,7 +14,7 @@ gulp.task('dev', () => {
   // Reload renderer process
 	gulp.watch('app/renderer/css/*.css', ['reload:renderer']);
 	gulp.watch('app/renderer/*.html', ['reload:renderer']);
-	gulp.watch('app/renderer/js/**/*.js', ['reload:renderer']);
+	gulp.watch('app/renderer/js/*.js', ['reload:renderer']);
 });
 
 gulp.task('restart:browser', done => {
@@ -30,7 +30,7 @@ gulp.task('reload:renderer', done => {
 });
 
 gulp.task('test-e2e', () => {
-	return gulp.src('tests/*.js')
+	return gulp.src('tests/e2e/*.js')
 	.pipe(tape({
 		reporter: tapColorize()
 	}));

karma.conf.js

@@ -0,0 +1,21 @@
+module.exports = function (config) {
+	config.set({
+		basePath: '',
+		frameworks: ['jasmine'],
+		browsers: ['Electron'],
+		preprocessors: {
+			'**/*.js': ['electron']
+		},
+		files: [
+			{pattern: './karma.shim.js', watched: true, included: true, served: true},
+			{pattern: './tests/unit/*.js', watched: true, included: true, served: true},
+			{pattern: './app/renderer/**/*.js', watched: true, included: false, served: true}
+		],
+		reporters: ['mocha'],
+		client: {
+			captureConsole: true,
+			useIframe: false
+		},
+		singleRun: true
+	});
+};

karma.shim.js

@@ -0,0 +1,5 @@
+window.require = window.parent.require;
+window.process = window.parent.process;
+window.__dirname = window.parent.__dirname;
+require('module').globalPaths.push('./node_modules');
+require('module').globalPaths.push('./app/renderer');

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "2.2.0-beta",
+  "version": "1.7.0",
   "main": "./app/main",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
@@ -17,24 +17,22 @@
   "bugs": {
     "url": "https://github.com/zulip/zulip-electron/issues"
   },
-  "engines": {
-    "node": ">=6.0.0"
-  },
   "scripts": {
-    "start": "electron app --disable-http-cache --no-electron-connect",
-    "reinstall": "node ./tools/reinstall-node-modules.js",
+    "start": "electron app --disable-http-cache",
+    "reinstall": "rm -rf node_modules; rm -rf app/node_modules; npm install",
     "postinstall": "electron-builder install-app-deps",
-    "test": "xo",
+    "lint": "xo",
     "test-e2e": "gulp test-e2e",
-    "dev": "gulp dev & nodemon --watch app/main --watch app/renderer --exec 'npm test' -e html,css,js",
+    "test-unit": "karma start karma.conf.js",
+    "test-all": "xo && npm run test-unit && npm run test-e2e",
+    "dev": "gulp dev",
     "pack": "electron-builder --dir",
     "dist": "electron-builder",
     "mas": "electron-builder --mac mas",
-    "travis": "cd ./scripts && ./travis-build-test.sh",
-    "build-locales": "node tools/locale-helper"
+    "travis": "cd ./scripts && ./travis-build-test.sh"
   },
   "pre-commit": [
-    "test"
+    "lint"
   ],
   "build": {
     "appId": "org.zulip.zulip-electron",
@@ -46,8 +44,7 @@
     ],
     "copyright": "©2017 Kandra Labs, Inc.",
     "mac": {
-      "category": "public.app-category.productivity",
-      "artifactName": "${productName}-${version}-${arch}.${ext}"
+      "category": "public.app-category.productivity"
     },
     "linux": {
       "category": "Chat;GNOME;GTK;Network;InstantMessaging",
@@ -56,41 +53,32 @@
       "target": [
         "deb",
         "zip",
-        "AppImage",
-        "snap"
+        "AppImage"
       ],
-      "maintainer": "Akash Nimare <svnitakash@gmail.com>",
-      "artifactName": "${productName}-${version}-${arch}.${ext}"
+      "maintainer": "Akash Nimare <svnitakash@gmail.com>"
     },
     "deb": {
       "synopsis": "Zulip Desktop App",
       "afterInstall": "./scripts/debian-add-repo.sh",
       "afterRemove": "./scripts/debian-uninstaller.sh"
     },
-    "snap": {
-      "synopsis": "Zulip Desktop App"
-    },
     "dmg": {
       "background": "build/appdmg.png",
       "icon": "build/icon.icns",
-      "iconSize": 100,
+      "iconSize": 128,
       "contents": [
         {
           "x": 380,
-          "y": 280,
+          "y": 240,
           "type": "link",
           "path": "/Applications"
         },
         {
-          "x": 110,
-          "y": 280,
+          "x": 122,
+          "y": 240,
           "type": "file"
         }
-      ],
-      "window": {
-          "width": 500,
-          "height": 500
-      }
+      ]
     },
     "win": {
       "target": [
@@ -123,19 +111,24 @@
     "assert": "1.4.1",
     "cp-file": "^5.0.0",
     "devtron": "1.4.0",
-    "electron": "2.0.0",
-    "electron-builder": "20.11.1",
+    "electron-builder": "19.46.4",
+    "electron": "1.7.9",
     "electron-connect": "0.6.2",
     "electron-debug": "1.4.0",
-    "google-translate-api": "2.3.0",
     "gulp": "3.9.1",
     "gulp-tape": "0.0.9",
     "is-ci": "^1.0.10",
-    "nodemon": "^1.14.11",
+    "jasmine": "^2.8.0",
+    "karma": "^1.7.1",
+    "karma-electron": "^5.2.2",
+    "karma-electron-launcher": "^0.2.0",
+    "karma-jasmine": "^1.1.0",
+    "karma-mocha-reporter": "^2.2.5",
     "pre-commit": "1.2.2",
-    "spectron": "3.8.0",
+    "spectron": "3.7.2",
     "tap-colorize": "^1.2.0",
     "tape": "^4.8.0",
+    "watchify": "^3.9.0",
     "xo": "0.18.2"
   },
   "xo": {
@@ -152,11 +145,7 @@
         "rules": {
           "max-lines": [
             "warn",
-            {
-              "max": 500,
-              "skipBlankLines": true,
-              "skipComments": true
-            }
+            500
           ],
           "no-warning-comments": 0,
           "object-curly-spacing": 0,
@@ -173,8 +162,8 @@
       }
     ],
     "ignore": [
-      "tests/*.js",
-      "tools/locale-helper/*.js"
+      "tests/e2e/*.js",
+      "tests/unit/*"
     ],
     "envs": [
       "node",
@@ -182,4 +171,4 @@
       "mocha"
     ]
   }
-}
+}

scripts/debian-add-repo.sh

@@ -2,10 +2,6 @@
 
 # This script runs when user install the debian package
 
-# Link to the binary
-ln -sf '/opt/${productFilename}/${executable}' '/usr/local/bin/${executable}';
-echo 'Successfully added /opt/${productFilename}/${executable} to /usr/local/bin/${executable}'
-
 # Install apt repository source list if it does not exist
 if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep zulip.list; then
     sudo apt-key adv --keyserver pool.sks-keyservers.net --recv 69AD12704E71A4803DCA3A682424BE5AE9BD10D9

scripts/debian-uninstaller.sh

@@ -28,8 +28,4 @@ appDirectory=/home/$getSudoUser/.config/Zulip/;
 
 if [ -d $appDirectory ]; then
     sudo rm -rf $appDirectory;
-fi
-
-# Delete the link to the binary
-echo 'Removing binary link'
-sudo rm -f '/usr/local/bin/${executable}';
+fi

scripts/travis-build-test.sh

@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-# exit script if fails
-set -e;
-
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     export {no_proxy,NO_PROXY}="127.0.0.1,localhost"
     export DISPLAY=:99.0
@@ -13,8 +10,14 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     xdpyinfo | grep dimensions
 fi
 
-npm run test
-
+# macOS
+# Run all the tests
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    npm run test-e2e
+    npm run test-all
+fi
+
+# Linux
+# Only run linting test on Linux
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    npm run lint
 fi

snap/snapcraft.yaml

@@ -1,37 +0,0 @@
-name: zulip
-version: 2.0.0
-summary: Zulip Desktop Client for Linux
-description: Zulip combines the immediacy of Slack with an email threading model. With Zulip, you can catch up on important conversations while ignoring irrelevant ones.
-confinement: strict
-grade: stable
-icon: snap/gui/icon.png
-apps:
-  zulip:
-    command: env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/zulip
-    plugs:
-      - desktop
-      - desktop-legacy
-      - home
-      - x11
-      - unity7
-      - browser-support
-      - network
-      - gsettings
-      - pulseaudio
-      - opengl
-parts:
-  app:
-    plugin: dump
-    stage-packages:
-      - libasound2
-      - libgconf2-4
-      - libnotify4
-      - libnspr4
-      - libnss3
-      - libpcre3
-      - libpulse0
-      - libxss1
-      - libxtst6
-    source: dist/linux-unpacked
-    after:
-      - desktop-gtk2

tests/e2e/index.js

@@ -7,7 +7,7 @@ test('app runs', function (t) {
   const app = setup.createApp()
   setup.waitForLoad(app, t)
     .then(() => app.client.windowByIndex(1)) // focus on webview
-    .then(() => app.client.waitForExist('//*[@id="connect"]')) // id of the connect button
+    .then(() => app.client.waitForExist('//*[@id="new-server-container"]/div/div/div[2]/input'))
     .then(() => setup.endTest(app, t),
           (err) => setup.endTest(app, t, err || 'error'))
 })

tests/e2e/setup.js

@@ -22,7 +22,7 @@ module.exports = {
 function createApp (t) {
   generateTestAppPackageJson()
   return new Application({
-    path: path.join(__dirname, '..', 'node_modules', '.bin',
+    path: path.join(__dirname,'..', '..', 'node_modules', '.bin',
       'electron' + (process.platform === 'win32' ? '.cmd' : '')),
     args: [path.join(__dirname)], // Ensure this dir has a package.json file with a 'main' entry piont
     env: {NODE_ENV: 'test'},
@@ -34,9 +34,9 @@ function createApp (t) {
 // Reads app package.json and updates the productName to config.TEST_APP_PRODUCT_NAME 
 // We do this so that the app integration doesn't doesn't share the same appDataDir as the dev application
 function generateTestAppPackageJson () {
-  let packageJson = require(path.join(__dirname, '../package.json'))
+  let packageJson = require(path.join(__dirname, '..', '..', 'package.json'))
   packageJson.productName = config.TEST_APP_PRODUCT_NAME
-  packageJson.main = '../app/main'
+  packageJson.main = '../../app/main'
 
   const testPackageJsonPath = path.join(__dirname, 'package.json')
   fs.writeFileSync(testPackageJsonPath, JSON.stringify(packageJson, null, ' '), 'utf-8')

tests/test-new-organization.js

@@ -1,17 +0,0 @@
-const test = require('tape')
-const setup = require('./setup')
-
-// Create new org link should open in the default browser [WIP]
-
-test('new-org-link', function (t) {
-  t.timeoutAfter(50e3)
-  setup.resetTestDataDir()
-  const app = setup.createApp()
-  setup.waitForLoad(app, t)
-    .then(() => app.client.windowByIndex(1)) // focus on webview
-    .then(() => app.client.click('#open-create-org-link')) // Click on new org link button
-    .then(() => setup.wait(5000))
-    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
-})
-

tests/unit/test-spellchecker.js

@@ -0,0 +1,20 @@
+const ConfigUtil = require('js/utils/config-util.js');
+const SetupSpellChecker = require('js/spellchecker')
+
+describe('test spell checker', function () {
+  // enable spellchecker settings
+  ConfigUtil.setConfigItem('enableSpellchecker', true);
+  ConfigUtil.setConfigItem('spellcheckerLanguage', 'en');
+
+  SetupSpellChecker.init()  // re-initialize after setting update
+
+  const spellCheckHandler = SetupSpellChecker.SpellCheckHandler
+
+  it('mark misspelled word', function () {
+    expect(spellCheckHandler.isMisspelled('helpe')).toBe(true)
+  })
+
+  it('verify properly spelled word', function () {
+    expect(spellCheckHandler.isMisspelled('help')).toBe(false)
+  })
+})

tools/fetch-pull-request

@@ -1,16 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-if ! git diff-index --quiet HEAD; then
-    set +x
-    echo "There are uncommitted changes:"
-    git status --short
-    echo "Doing nothing to avoid losing your work."
-    exit 1
-fi
-request_id="$1"
-remote=${2:-"upstream"}
-git fetch "$remote" "pull/$request_id/head"
-git checkout -B "review-original-${request_id}"
-git reset --hard FETCH_HEAD

tools/fetch-pull-request.cmd

@@ -1,23 +0,0 @@
-@echo off
-git diff-index --quiet HEAD
-if %ERRORLEVEL% NEQ 0 (
-    echo "There are uncommitted changes:"
-    git status --short
-    echo "Doing nothing to avoid losing your work."
-    exit /B 1
-)
-
-if "%~1"=="" (
-    echo "Error you must specify the PR number"
-)
-
-if "%~2"=="" ( 
-    set remote="upstream"
-) else (
-    set remote=%2
-)
-
-set request_id="%1"
-git fetch "%remote%" "pull/%request_id%/head"
-git checkout -B "review-%request_id%"
-git reset --hard FETCH_HEAD

tools/fetch-rebase-pull-request

@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-if ! git diff-index --quiet HEAD; then
-    set +x
-    echo "There are uncommitted changes:"
-    git status --short
-    echo "Doing nothing to avoid losing your work."
-    exit 1
-fi
-request_id="$1"
-remote=${2:-"upstream"}
-git fetch "$remote" "pull/$request_id/head"
-git checkout -B "review-${request_id}" $remote/master
-git reset --hard FETCH_HEAD
-git pull --rebase

tools/fetch-rebase-pull-request.cmd

@@ -1,24 +0,0 @@
-@echo off
-git diff-index --quiet HEAD
-if %errorlevel% neq 0 (
-    echo "There are uncommitted changes:"
-    git status --short
-    echo "Doing nothing to avoid losing your work."
-    exit \B 1
-)
-
-if "%~1"=="" (
-    echo "Error you must specify the PR number"
-)
-
-if "%~2"=="" ( 
-    set remote="upstream"
-) else (
-    set remote=%2
-)
-
-set request_id="%1"
-git fetch "%remote%" "pull/%request_id%/head"
-git checkout -B "review-%request_id%" %remote%/master
-git reset --hard FETCH_HEAD
-git pull --rebase

tools/locale-helper/index.js

@@ -1,30 +0,0 @@
-const translate = require('google-translate-api');
-const path = require('path');
-const fs = require('fs');
-
-const translationDir = path.resolve(__dirname, '../../app/translations');
-
-function writeJSON(file, data) {
-    const filePath = path.resolve(translationDir, file);
-    fs.writeFileSync(filePath, `${JSON.stringify(data, null, '\t')}\n`, 'utf8');
-}
-
-const { phrases } = require('./locale-template');
-const supportedLocales = require('./supported-locales');
-
-phrases.sort();
-for (let locale in supportedLocales) {
-    console.log(`fetching translation for: ${supportedLocales[locale]} - ${locale}..`);
-    translate(phrases.join('\n'), { to: locale })
-        .then(res => {
-            const localeFile = `${locale}.json`;
-            const translatedText = res.text.split('\n');
-            const translationJSON = {};
-            phrases.forEach((phrase, index) => {
-               translationJSON[phrase] = translatedText[index];
-            });
-
-            writeJSON(localeFile, translationJSON);
-            console.log(`create: ${localeFile}`);
-        });
-}

tools/locale-helper/locale-template.json

@@ -1,41 +0,0 @@
-{
-	"phrases": [
-		"About Zulip",
-		"Actual Size",
-		"Back",
-		"Close",
-		"Copy",
-		"Cut",
-		"Delete",
-		"Desktop App Settings",
-		"Edit",
-		"File",
-		"Forward",
-		"Hard Reload",
-		"Help",
-		"History",
-		"Keyboard Shortcuts",
-		"Log Out",
-		"Minimize",
-		"Paste",
-		"Paste and Match Style",
-		"Quit",
-		"Redo",
-		"Reload",
-		"Report an issue...",
-		"Reset App Settings",
-		"Select All",
-		"Show App Logs",
-		"Toggle DevTools for Active Tab",
-		"Toggle DevTools for Zulip App",
-		"Toggle Full Screen",
-		"Toggle Sidebar",
-		"Toggle Tray Icon",
-		"Undo",
-		"View",
-		"Window",
-		"Zoom In",
-		"Zoom Out",
-		"Zulip Help"
-	]
-}

tools/locale-helper/supported-locales.js

@@ -1,21 +0,0 @@
-module.exports = {
-    "de": "Deutsch",
-    "pl": "polski",
-    "en": "English",
-    "cs": "česky",
-    "hi": "Hindi",
-    "ru": "Русский",
-    "id": "Indonesia",
-    "bg": "български",
-    "hu": "Magyar",
-    "sr": "српски",
-    "ml": "Malayalam",
-    "ta": "தமிழ்",
-    "nl": "Nederlands",
-    "ja": "日本語",
-    "pt": "Português",
-    "tr": "Türkçe",
-    "es": "español",
-    "ko": "한국어",
-    "fr": "français"
-};

tools/reinstall-node-modules

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-echo "Removing node_modules and app/node_modules"
-rm -rf node_modules
-rm -rf app/node_modules
-
-echo "node_modules removed reinstalling npm packages"
-npm i

tools/reinstall-node-modules.cmd

@@ -1,8 +0,0 @@
-@echo off
-
-echo "Removing node_modules and app/node_modules"
-rmdir /s /q node_modules
-rmdir /s /q app/node_modules
-
-echo "node_modules removed reinstalling npm packages"
-npm i

tools/reinstall-node-modules.js

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-const {exec} = require('child_process');
-const path = require('path');
-
-const isWindows = process.platform === 'win32';
-const command = path.join(__dirname, `reinstall-node-modules${isWindows ? '.cmd' : ''}`);
-
-const proc = exec(command, error => {
-	if (error) {
-		console.error(error);
-	}
-});
-
-proc.stdout.on('data', data => console.log(data.toString()));
-proc.stderr.on('data', data => console.error(data.toString()));
-proc.on('exit', code => {
-	process.exit(code);
-});