setting-page: Update input styling.

I think it makes sense to hide this nav item since
we already have the big + button to trigger this in left-sidebar.
Might want to revist this in future.

WIP #340.

.editorconfig

@@ -2,7 +2,6 @@ root = true
 
 [*]
 indent_style = tab
-indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

.gitattributes

@@ -1,14 +1 @@
-* text=auto eol=lf
-
-*.gif binary
-*.jpg binary
-*.jpeg binary
-*.eot binary
-*.woff binary
-*.woff2 binary
-*.svg binary
-*.ttf binary
-*.png binary
-*.otf binary
-*.tif binary
-*.ogg binary
+* text=auto

.github/ISSUE_TEMPLATE.md

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,25 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
----
-
-**Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
-
-**To Reproduce**
-<!-- Clear steps to reproduce the issue. -->
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
-
-**Desktop (please complete the following information):**
- - Operating System: 
- <!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
- - Zulip Desktop Version:
-<!-- e.g. 5.2.0 --> 
-
-**Additional context**
-<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/custom.md

@@ -1,6 +0,0 @@
----
-name: Custom issue template
-about: Describe this issue template's purpose here.
----
-
-

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,16 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
----
-
-**Problem Description**
-<!-- Please add a clear and concise description of what the problem is. -->
-
-**Proposed Solution**
-<!-- Describe the solution you'd like in a clear and concise manner -->
-
-**Describe alternatives you've considered**
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-**Additional context**
-<!-- Add any other context or screenshots about the feature request here. -->

.github/workflows/node.js.yml

@@ -1,15 +0,0 @@
-name: Node.js CI
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: npm ci
-      - run: npm test

.gitignore

@@ -1,22 +1,12 @@
-# Dependency directory
-/node_modules/
+# Dependency directories
+node_modules/
 
 # npm cache directory
 .npm
 
-# transifexrc - if user prefers it to be in working tree
-.transifexrc
-
 # Compiled binary build directory
 dist/
 
-#snap generated files
-snap/parts
-snap/prime
-snap/snap
-snap/stage
-snap/*.snap
-
 # Logs
 logs
 *.log
@@ -36,9 +26,6 @@ yarn-error.log*
 config.gypi
 
 # Test generated files
-# tests/package.json
+tests/package.json
 
 .python-version
-
-# Ignore all the typescript compiled files
-app/**/*.js

.htmlhintrc

@@ -1,25 +0,0 @@
-{
-  "tagname-lowercase": true,
-  "attr-lowercase": true,
-  "attr-value-double-quotes": true,
-  "attr-value-not-empty": false,
-  "attr-no-duplication": true,
-  "doctype-first": true,
-  "tag-pair": true,
-  "empty-tag-not-self-closed": true,
-  "spec-char-escape": true,
-  "id-unique": true,
-  "src-not-empty": true,
-  "title-require": true,
-  "alt-require": false,
-  "doctype-html5": true,
-  "id-class-value": "dash",
-  "style-disabled": false,
-  "inline-style-disabled": false,
-  "inline-script-disabled": false,
-  "space-tab-mixed-disabled": "space4",
-  "id-class-ad-disabled": false,
-  "href-abs-or-rel": false,
-  "attr-unsafe-chars": true,
-  "head-script-disabled": true
-}

.mailmap

@@ -1,5 +0,0 @@
-Anders Kaseorg <anders@zulip.com> <anders@zulipchat.com>
-Rishi Gupta <rishig@zulip.com> <rishig@zulipchat.com>
-Rishi Gupta <rishig@zulip.com> <rishig@users.noreply.github.com>
-Tim Abbott <tabbott@zulip.com> <tabbott@zulipchat.com>
-Tim Abbott <tabbott@zulip.com> <tabbott@mit.edu>

.stylelintrc

@@ -1,67 +0,0 @@
-{
-    "rules": {
-        # Stylistic rules for CSS.
-        "function-comma-space-after": "always",
-        "function-comma-space-before": "never",
-        "function-max-empty-lines": 0,
-        "function-whitespace-after": "always",
-
-        "value-keyword-case": "lower",
-        "value-list-comma-newline-after": "always-multi-line",
-        "value-list-comma-space-after": "always-single-line",
-        "value-list-comma-space-before": "never",
-        "value-list-max-empty-lines": 0,
-
-        "unit-case": "lower",
-        "property-case": "lower",
-        "color-hex-case": "lower",
-
-        "declaration-bang-space-before": "always",
-        "declaration-colon-newline-after": "always-multi-line",
-        "declaration-colon-space-after": "always-single-line",
-        "declaration-colon-space-before": "never",
-        "declaration-block-semicolon-newline-after": "always",
-        "declaration-block-semicolon-space-before": "never",
-        "declaration-block-trailing-semicolon": "always",
-
-        "block-closing-brace-empty-line-before": "never",
-        "block-closing-brace-newline-after": "always",
-        "block-closing-brace-newline-before": "always",
-        "block-opening-brace-newline-after": "always",
-        "block-opening-brace-space-before": "always",
-
-        "selector-attribute-brackets-space-inside": "never",
-        "selector-attribute-operator-space-after": "never",
-        "selector-attribute-operator-space-before": "never",
-        "selector-combinator-space-after": "always",
-        "selector-combinator-space-before": "always",
-        "selector-descendant-combinator-no-non-space": true,
-        "selector-pseudo-class-parentheses-space-inside": "never",
-        "selector-pseudo-element-case": "lower",
-        "selector-pseudo-element-colon-notation": "double",
-        "selector-type-case": "lower",
-        "selector-list-comma-newline-after": "always",
-        "selector-list-comma-space-before": "never",
-
-        "media-feature-colon-space-after": "always",
-        "media-feature-colon-space-before": "never",
-        "media-feature-name-case": "lower",
-        "media-feature-parentheses-space-inside": "never",
-        "media-feature-range-operator-space-after": "always",
-        "media-feature-range-operator-space-before": "always",
-        "media-query-list-comma-newline-after": "always",
-        "media-query-list-comma-space-before": "never",
-
-        "at-rule-name-case": "lower",
-        "at-rule-name-space-after": "always",
-        "at-rule-semicolon-newline-after": "always",
-        "at-rule-semicolon-space-before": "never",
-
-        "comment-whitespace-inside": "always",
-        "indentation": 4,
-        
-        # Limit language features
-        "color-no-hex": true,
-        "color-named": "never",
-    }
-}

.travis.yml

@@ -0,0 +1,37 @@
+sudo: required
+dist: trusty
+
+os:
+- osx
+- linux
+
+addons:
+  apt:
+    packages:
+    - build-essential
+    - libxext-dev
+    - libxtst-dev
+    - libxkbfile-dev
+
+language: node_js
+node_js:
+- '6'
+
+before_install:
+  - ./scripts/travis-xvfb.sh
+  - npm install -g gulp
+  - npm install
+
+cache:
+  directories:
+  - node_modules
+  - app/node_modules
+
+script:
+- npm run travis
+notifications:
+  webhooks:
+    urls:
+      - https://zulip.org/zulipbot/travis
+    on_success: always
+    on_failure: always

.tx/config

@@ -1,9 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[zulip.desktopjson]
-file_filter = app/translations/<lang>.json
-minimum_perc = 0
-source_file = app/translations/en.json
-source_lang = en
-type = KEYVALUEJSON

CONTRIBUTING.md

@@ -2,20 +2,20 @@
 
 Thanks for taking the time to contribute!
 
-The following is a set of guidelines for contributing to Zulip's desktop Client. These are just guidelines, not rules, so use your best judgement and feel free to propose changes to this document in a pull request.
+The following is a set of guidelines for contributing to Zulip Electron Desktop Client. These are just guidelines, not rules, so use your best judgement and feel free to propose changes to this document in a pull request.
 
 ## Getting Started
 
-Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If you are new to Electron, please head over to [this](https://jlord.us/essential-electron) great article.
+Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If you are new to Electron, please head over to [this](http://jlord.us/essential-electron/) great article.
 
 ## Community
 
 * The whole Zulip documentation, such as setting up a development environment, setting up with the Zulip webapp project, and testing, can be read [here](https://zulip.readthedocs.io).
 
-* If you have any questions regarding zulip-desktop, open an [issue](https://github.com/zulip/zulip-desktop/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/16-desktop).
+* If you have any questions regarding zulip-electron, open an [issue](https://github.com/zulip/zulip-electron/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/electron).
 
 ## Issue
-Ensure the bug was not already reported by searching on GitHub under [issues](https://github.com/zulip/zulip-desktop/issues). If you're unable to find an open issue addressing the bug, open a [new issue](https://github.com/zulip/zulip-desktop/issues/new).
+Ensure the bug was not already reported by searching on GitHub under [issues](https://github.com/zulip/zulip-electron/issues). If you're unable to find an open issue addressing the bug, open a [new issue](https://github.com/zulip/zulip-electron/issues/new).
 
 The [zulipbot](https://github.com/zulip/zulipbot) helps to claim an issue by commenting the following in the comment section: "**@zulipbot** claim". **@zulipbot** will assign you to the issue and label the issue as **in progress**. For more details, check out [**@zulipbot**](https://github.com/zulip/zulipbot).
 
@@ -38,7 +38,7 @@ For example:
 
 
 ## Pull Requests
-Pull Requests are always welcome.
+Pull Requests are always welcome. 
 
 1. When you edit the code, please run `npm run test` to check the formatting of your code before you `git commit`.
 2. Ensure the PR description clearly describes the problem and solution. It should include:

README.md

@@ -1,37 +1,32 @@
 # Zulip Desktop Client
-[![Build Status](https://travis-ci.com/zulip/zulip-desktop.svg?branch=main)](https://travis-ci.com/github/zulip/zulip-desktop)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-desktop?branch=main&svg=true)](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/main)
+[![Build Status](https://travis-ci.org/zulip/zulip-electron.svg?branch=master)](https://travis-ci.org/zulip/zulip-electron)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-electron?branch=master&svg=true)](https://ci.appveyor.com/project/akashnimare/zulip-electron/branch/master)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
-[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://chat.zulip.org)
 
-Desktop client for Zulip. Available for Mac, Linux, and Windows.
+Desktop client for Zulip. Available for Mac, Linux and Windows.
 
-![screenshot](https://i.imgur.com/s1o6TRA.png)
-![screenshot](https://i.imgur.com/vekKnW4.png)
+<img src="http://i.imgur.com/ChzTq4F.png"/>
 
 # Download
-Please see the [installation guide](https://zulip.com/help/desktop-app-install-guide).
+Please see [installation guide](https://zulipchat.com/help/desktop-app-install-guide).
 
 # Features
-* Sign in to multiple organizations
-* Desktop notifications with inline reply
-* Tray/dock integration
-* Multi-language spell checker
-* Automatic updates
+* Sign in to multiple teams
+* Desktop Notifications with inline reply support
+* Multilanguage SpellChecker
+* OSX/Win/Linux installers
+* Automatic Updates (macOS/Windows/Linux)
+* Keyboard shortcuts
 
-# Reporting issues
-
-This desktop client shares most of its code with the Zulip webapp.
-Issues in an individual organization's Zulip window should be reported
-in the [Zulip server and webapp
-project](https://github.com/zulip/zulip/issues/new).  Other
-issues in the desktop app and its settings should be reported [in this
-project](https://github.com/zulip/zulip-desktop/issues/new).
+# Development
+Please see our [development guide](./development.md) to get started and run app locally.
 
 # Contribute
 
-First, join us on the [Zulip community server](https://zulip.readthedocs.io/en/latest/contributing/chat-zulip-org.html)!
-Also see our [contribution guidelines](./CONTRIBUTING.md) and our [development guide](./development.md).
+If you want to contribute please make sure to read [our documentation about contributing](./CONTRIBUTING.md) first.
+
+* [Issue Tracker](https://github.com/zulip/zulip-electron/issues)
+* [Source Code](https://github.com/zulip/zulip-electron/)
 
 # License
 Released under the [Apache-2.0](./LICENSE) license.

app/main/autoupdater.js

@@ -0,0 +1,59 @@
+'use strict';
+const { app, dialog } = require('electron');
+const { autoUpdater } = require('electron-updater');
+const isDev = require('electron-is-dev');
+
+const ConfigUtil = require('./../renderer/js/utils/config-util.js');
+
+function appUpdater() {
+	// Don't initiate auto-updates in development
+	if (isDev) {
+		return;
+	}
+
+	if (process.platform === 'linux' && !process.env.APPIMAGE) {
+		const { linuxUpdateNotification } = require('./linuxupdater');
+		linuxUpdateNotification();
+		return;
+	}
+
+	// Create Logs directory
+	const LogsDir = `${app.getPath('userData')}/Logs`;
+
+	// Log whats happening
+	const log = require('electron-log');
+
+	log.transports.file.file = `${LogsDir}/updates.log`;
+	log.transports.file.level = 'info';
+	autoUpdater.logger = log;
+
+	// Handle auto updates for beta/pre releases
+	autoUpdater.allowPrerelease = ConfigUtil.getConfigItem('betaUpdate') || false;
+
+	// Ask the user if update is available
+	// eslint-disable-next-line no-unused-vars
+	autoUpdater.on('update-downloaded', event => {
+		// Ask user to update the app
+		dialog.showMessageBox({
+			type: 'question',
+			buttons: ['Install and Relaunch', 'Install Later'],
+			defaultId: 0,
+			message: `A new update ${event.version} has been downloaded`,
+			detail: 'It will be installed the next time you restart the application'
+		}, response => {
+			if (response === 0) {
+				setTimeout(() => {
+					autoUpdater.quitAndInstall();
+					// force app to quit. This is just a workaround, ideally autoUpdater.quitAndInstall() should relaunch the app.
+					app.quit();
+				}, 1000);
+			}
+		});
+	});
+	// Init for updates
+	autoUpdater.checkForUpdates();
+}
+
+module.exports = {
+	appUpdater
+};

app/main/autoupdater.ts

@@ -1,111 +0,0 @@
-import {app, dialog, session} from 'electron';
-import util from 'util';
-
-import isDev from 'electron-is-dev';
-import log from 'electron-log';
-import {UpdateDownloadedEvent, UpdateInfo, autoUpdater} from 'electron-updater';
-
-import * as ConfigUtil from '../renderer/js/utils/config-util';
-import * as LinkUtil from '../renderer/js/utils/link-util';
-
-import {linuxUpdateNotification} from './linuxupdater';	// Required only in case of linux
-
-const sleep = util.promisify(setTimeout);
-
-export async function appUpdater(updateFromMenu = false): Promise<void> {
-	// Don't initiate auto-updates in development
-	if (isDev) {
-		return;
-	}
-
-	if (process.platform === 'linux' && !process.env.APPIMAGE) {
-		const ses = session.fromPartition('persist:webviewsession');
-		await linuxUpdateNotification(ses);
-		return;
-	}
-
-	let updateAvailable = false;
-
-	// Create Logs directory
-	const LogsDir = `${app.getPath('userData')}/Logs`;
-
-	// Log whats happening
-	log.transports.file.file = `${LogsDir}/updates.log`;
-	log.transports.file.level = 'info';
-	autoUpdater.logger = log;
-
-	// Handle auto updates for beta/pre releases
-	const isBetaUpdate = ConfigUtil.getConfigItem('betaUpdate');
-
-	autoUpdater.allowPrerelease = isBetaUpdate || false;
-
-	const eventsListenerRemove = ['update-available', 'update-not-available'];
-	autoUpdater.on('update-available', async (info: UpdateInfo) => {
-		if (updateFromMenu) {
-			updateAvailable = true;
-
-			// This is to prevent removal of 'update-downloaded' and 'error' event listener.
-			eventsListenerRemove.forEach(event => {
-				autoUpdater.removeAllListeners(event);
-			});
-
-			await dialog.showMessageBox({
-				message: `A new version ${info.version}, of Zulip Desktop is available`,
-				detail: 'The update will be downloaded in the background. You will be notified when it is ready to be installed.'
-			});
-		}
-	});
-
-	autoUpdater.on('update-not-available', async () => {
-		if (updateFromMenu) {
-			// Remove all autoUpdator listeners so that next time autoUpdator is manually called these
-			// listeners don't trigger multiple times.
-			autoUpdater.removeAllListeners();
-
-			await dialog.showMessageBox({
-				message: 'No updates available',
-				detail: `You are running the latest version of Zulip Desktop.\nVersion: ${app.getVersion()}`
-			});
-		}
-	});
-
-	autoUpdater.on('error', async (error: Error) => {
-		if (updateFromMenu) {
-			// Remove all autoUpdator listeners so that next time autoUpdator is manually called these
-			// listeners don't trigger multiple times.
-			autoUpdater.removeAllListeners();
-
-			const messageText = (updateAvailable) ? ('Unable to download the updates') : ('Unable to check for updates');
-			const {response} = await dialog.showMessageBox({
-				type: 'error',
-				buttons: ['Manual Download', 'Cancel'],
-				message: messageText,
-				detail: `Error: ${error.message}\n\nThe latest version of Zulip Desktop is available at -\nhttps://zulip.com/apps/.\n
-				Current Version: ${app.getVersion()}`
-			});
-			if (response === 0) {
-				await LinkUtil.openBrowser(new URL('https://zulip.com/apps/'));
-			}
-		}
-	});
-
-	// Ask the user if update is available
-	autoUpdater.on('update-downloaded', async (event: UpdateDownloadedEvent) => {
-		// Ask user to update the app
-		const {response} = await dialog.showMessageBox({
-			type: 'question',
-			buttons: ['Install and Relaunch', 'Install Later'],
-			defaultId: 0,
-			message: `A new update ${event.version} has been downloaded`,
-			detail: 'It will be installed the next time you restart the application'
-		});
-		if (response === 0) {
-			await sleep(1000);
-			autoUpdater.quitAndInstall();
-			// Force app to quit. This is just a workaround, ideally autoUpdater.quitAndInstall() should relaunch the app.
-			app.quit();
-		}
-	});
-	// Init for updates
-	await autoUpdater.checkForUpdates();
-}

app/main/crash-reporter.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const { crashReporter } = require('electron');
+
+const crashHandler = () => {
+	crashReporter.start({
+		productName: 'zulip-electron',
+		companyName: 'Kandra Labs, Inc.',
+		submitURL: 'https://zulip-sentry.herokuapp.com/crashreport',
+		autoSubmit: true
+	});
+};
+
+module.exports = {
+	crashHandler
+};

app/main/index.js

@@ -0,0 +1,238 @@
+'use strict';
+const path = require('path');
+const electron = require('electron');
+const windowStateKeeper = require('electron-window-state');
+const isDev = require('electron-is-dev');
+const appMenu = require('./menu');
+const { appUpdater } = require('./autoupdater');
+const { crashHandler } = require('./crash-reporter');
+
+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
+if (isDev) {
+	require('electron-debug')();
+}
+
+// Prevent window being garbage collected
+let mainWindow;
+let badgeCount;
+
+let isQuitting = false;
+
+// Load this url in main window
+const mainURL = 'file://' + path.join(__dirname, '../renderer', 'main.html');
+
+const isAlreadyRunning = app.makeSingleInstance(() => {
+	if (mainWindow) {
+		if (mainWindow.isMinimized()) {
+			mainWindow.restore();
+		}
+
+		mainWindow.show();
+	}
+});
+
+if (isAlreadyRunning) {
+	return app.quit();
+}
+
+const APP_ICON = path.join(__dirname, '../resources', 'Icon');
+
+const iconPath = () => {
+	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
+};
+
+function createMainWindow() {
+	// Load the previous state with fallback to defaults
+	const mainWindowState = windowStateKeeper({
+		defaultWidth: 1100,
+		defaultHeight: 720
+	});
+
+	// Let's keep the window position global so that we can access it in other process
+	global.mainWindowState = mainWindowState;
+
+	const win = new electron.BrowserWindow({
+		// This settings needs to be saved in config
+		title: 'Zulip',
+		icon: iconPath(),
+		x: mainWindowState.x,
+		y: mainWindowState.y,
+		width: mainWindowState.width,
+		height: mainWindowState.height,
+		minWidth: 300,
+		minHeight: 400,
+		webPreferences: {
+			plugins: true,
+			allowDisplayingInsecureContent: true,
+			nodeIntegration: true
+		},
+		show: false
+	});
+
+	win.on('focus', () => {
+		win.webContents.send('focus');
+	});
+
+	win.once('ready-to-show', () => {
+		if (ConfigUtil.getConfigItem('startMinimized')) {
+			win.minimize();
+		} else {
+			win.show();
+		}
+	});
+
+	win.loadURL(mainURL);
+
+	// Keep the app running in background on close event
+	win.on('close', e => {
+		if (!isQuitting) {
+			e.preventDefault();
+
+			if (process.platform === 'darwin') {
+				app.hide();
+			} else {
+				win.hide();
+			}
+		}
+	});
+
+	win.setTitle('Zulip');
+
+	win.on('enter-full-screen', () => {
+		win.webContents.send('enter-fullscreen');
+	});
+
+	win.on('leave-full-screen', () => {
+		win.webContents.send('leave-fullscreen');
+	});
+
+	//  To destroy tray icon when navigate to a new URL
+	win.webContents.on('will-navigate', e => {
+		if (e) {
+			win.webContents.send('destroytray');
+		}
+	});
+
+	// Let us register listeners on the window, so we can update the state
+	// automatically (the listeners will be removed when the window is closed)
+	// and restore the maximized or full screen state
+	mainWindowState.manage(win);
+
+	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();
+	callback(true);
+});
+
+app.on('activate', () => {
+	if (!mainWindow) {
+		mainWindow = createMainWindow();
+	}
+});
+
+app.on('ready', () => {
+	appMenu.setMenu({
+		tabs: []
+	});
+	mainWindow = createMainWindow();
+
+	const page = mainWindow.webContents;
+
+	page.on('dom-ready', () => {
+		if (ConfigUtil.getConfigItem('startMinimized')) {
+			mainWindow.minimize();
+		} else {
+			mainWindow.show();
+		}
+	});
+
+	page.once('did-frame-finish-load', () => {
+		// Initate auto-updates on MacOS and Windows
+		appUpdater();
+		crashHandler();
+	});
+
+	// Temporarily remove this event
+	// electron.powerMonitor.on('resume', () => {
+	// 	mainWindow.reload();
+	// 	page.send('destroytray');
+	// });
+
+	ipcMain.on('focus-app', () => {
+		mainWindow.show();
+	});
+
+	ipcMain.on('quit-app', () => {
+		app.quit();
+	});
+
+	// Reload full app not just webview, useful in debugging
+	ipcMain.on('reload-full-app', () => {
+		mainWindow.reload();
+		page.send('destroytray');
+	});
+
+	ipcMain.on('clear-app-settings', () => {
+		global.mainWindowState.unmanage(mainWindow);
+		app.relaunch();
+		app.exit();
+	});
+
+	ipcMain.on('toggle-app', () => {
+		if (mainWindow.isVisible()) {
+			mainWindow.hide();
+		} else {
+			mainWindow.show();
+		}
+	});
+
+	ipcMain.on('toggle-badge-option', () => {
+		BadgeSettings.updateBadge(badgeCount, mainWindow);
+	});
+
+	ipcMain.on('update-badge', (event, messageCount) => {
+		badgeCount = messageCount;
+		BadgeSettings.updateBadge(badgeCount, mainWindow);
+		page.send('tray', messageCount);
+	});
+
+	ipcMain.on('update-taskbar-icon', (event, data, text) => {
+		BadgeSettings.updateTaskbarIcon(data, text, mainWindow);
+	});
+
+	ipcMain.on('forward-message', (event, listener, ...params) => {
+		page.send(listener, ...params);
+	});
+
+	ipcMain.on('update-menu', (event, props) => {
+		appMenu.setMenu(props);
+	});
+
+	ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
+		setAutoLaunch(AutoLaunchValue);
+	});
+});
+
+app.on('before-quit', () => {
+	isQuitting = true;
+});
+
+// Send crash reports
+process.on('uncaughtException', err => {
+	console.error(err);
+	console.error(err.stack);
+});

app/main/index.ts

@@ -1,417 +0,0 @@
-
-import electron, {app, dialog, ipcMain, session} from 'electron';
-import fs from 'fs';
-import path from 'path';
-
-import windowStateKeeper from 'electron-window-state';
-
-import * as BadgeSettings from '../renderer/js/pages/preference/badge-settings';
-import * as ConfigUtil from '../renderer/js/utils/config-util';
-import * as ProxyUtil from '../renderer/js/utils/proxy-util';
-import {sentryInit} from '../renderer/js/utils/sentry-util';
-
-import {appUpdater} from './autoupdater';
-import * as AppMenu from './menu';
-import {_getServerSettings, _saveServerIcon, _isOnline} from './request';
-import {setAutoLaunch} from './startup';
-
-let mainWindowState: windowStateKeeper.State;
-
-// Prevent window being garbage collected
-let mainWindow: Electron.BrowserWindow;
-let badgeCount: number;
-
-let isQuitting = false;
-
-// Load this url in main window
-const mainURL = 'file://' + path.join(__dirname, '../renderer', 'main.html');
-
-const singleInstanceLock = app.requestSingleInstanceLock();
-if (singleInstanceLock) {
-	app.on('second-instance', () => {
-		if (mainWindow) {
-			if (mainWindow.isMinimized()) {
-				mainWindow.restore();
-			}
-
-			mainWindow.show();
-		}
-	});
-} else {
-	app.quit();
-}
-
-const rendererCallbacks = new Map();
-let nextRendererCallbackId = 0;
-
-ipcMain.on('renderer-callback', (event: Event, rendererCallbackId: number, ...args: any[]) => {
-	rendererCallbacks.get(rendererCallbackId)(...args);
-	rendererCallbacks.delete(rendererCallbackId);
-});
-
-function makeRendererCallback(callback: (...args: any[]) => void): number {
-	rendererCallbacks.set(nextRendererCallbackId, callback);
-	return nextRendererCallbackId++;
-}
-
-const APP_ICON = path.join(__dirname, '../resources', 'Icon');
-
-const iconPath = (): string => APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
-
-// Toggle the app window
-const toggleApp = (): void => {
-	if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
-		mainWindow.show();
-	} else {
-		mainWindow.hide();
-	}
-};
-
-function createMainWindow(): Electron.BrowserWindow {
-	// Load the previous state with fallback to defaults
-	mainWindowState = windowStateKeeper({
-		defaultWidth: 1100,
-		defaultHeight: 720,
-		path: `${app.getPath('userData')}/config`
-	});
-
-	const win = new electron.BrowserWindow({
-		// This settings needs to be saved in config
-		title: 'Zulip',
-		icon: iconPath(),
-		x: mainWindowState.x,
-		y: mainWindowState.y,
-		width: mainWindowState.width,
-		height: mainWindowState.height,
-		minWidth: 500,
-		minHeight: 400,
-		webPreferences: {
-			contextIsolation: false,
-			enableRemoteModule: true,
-			nodeIntegration: true,
-			partition: 'persist:webviewsession',
-			webviewTag: true
-		},
-		show: false
-	});
-
-	win.on('focus', () => {
-		win.webContents.send('focus');
-	});
-
-	(async () => win.loadURL(mainURL))();
-
-	// Keep the app running in background on close event
-	win.on('close', event => {
-		if (ConfigUtil.getConfigItem('quitOnClose')) {
-			app.quit();
-		}
-
-		if (!isQuitting) {
-			event.preventDefault();
-
-			if (process.platform === 'darwin') {
-				app.hide();
-			} else {
-				win.hide();
-			}
-		}
-	});
-
-	win.setTitle('Zulip');
-
-	win.on('enter-full-screen', () => {
-		win.webContents.send('enter-fullscreen');
-	});
-
-	win.on('leave-full-screen', () => {
-		win.webContents.send('leave-fullscreen');
-	});
-
-	//  To destroy tray icon when navigate to a new URL
-	win.webContents.on('will-navigate', event => {
-		if (event) {
-			win.webContents.send('destroytray');
-		}
-	});
-
-	// Let us register listeners on the window, so we can update the state
-	// automatically (the listeners will be removed when the window is closed)
-	// and restore the maximized or full screen state
-	mainWindowState.manage(win);
-
-	return win;
-}
-
-// Temporary fix for Electron render colors differently
-// More info here - https://github.com/electron/electron/issues/10732
-app.commandLine.appendSwitch('force-color-profile', 'srgb');
-
-// This event is only available on macOS. Triggers when you click on the dock icon.
-app.on('activate', () => {
-	if (mainWindow) {
-		// If there is already a window show it
-		mainWindow.show();
-	} else {
-		mainWindow = createMainWindow();
-	}
-});
-
-app.on('ready', () => {
-	const ses = session.fromPartition('persist:webviewsession');
-	ses.setUserAgent(`ZulipElectron/${app.getVersion()} ${ses.getUserAgent()}`);
-
-	ipcMain.on('set-spellcheck-langs', () => {
-		ses.setSpellCheckerLanguages(ConfigUtil.getConfigItem('spellcheckerLanguages'));
-	});
-	AppMenu.setMenu({
-		tabs: []
-	});
-	mainWindow = createMainWindow();
-
-	// Auto-hide menu bar on Windows + Linux
-	if (process.platform !== 'darwin') {
-		const shouldHideMenu = ConfigUtil.getConfigItem('autoHideMenubar') || false;
-		mainWindow.autoHideMenuBar = shouldHideMenu;
-		mainWindow.setMenuBarVisibility(!shouldHideMenu);
-	}
-
-	// Initialize sentry for main process
-	const errorReporting = ConfigUtil.getConfigItem('errorReporting');
-	if (errorReporting) {
-		sentryInit();
-	}
-
-	const isSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
-
-	if (isSystemProxy) {
-		(async () => ProxyUtil.resolveSystemProxy(mainWindow))();
-	}
-
-	const page = mainWindow.webContents;
-
-	page.on('dom-ready', () => {
-		if (ConfigUtil.getConfigItem('startMinimized')) {
-			mainWindow.hide();
-		} else {
-			mainWindow.show();
-		}
-	});
-
-	ipcMain.on('fetch-user-agent', event => {
-		event.returnValue = session.fromPartition('persist:webviewsession').getUserAgent();
-	});
-
-	ipcMain.handle('get-server-settings', async (event, domain: string) => _getServerSettings(domain, ses));
-
-	ipcMain.handle('save-server-icon', async (event, url: string) => _saveServerIcon(url, ses));
-
-	ipcMain.handle('is-online', async (event, url: string) => _isOnline(url, ses));
-
-	page.once('did-frame-finish-load', async () => {
-		// Initiate auto-updates on MacOS and Windows
-		if (ConfigUtil.getConfigItem('autoUpdate')) {
-			await appUpdater();
-		}
-	});
-
-	app.on('certificate-error', (
-		event: Event,
-		webContents: Electron.WebContents,
-		urlString: string,
-		error: string
-	) => {
-		const url = new URL(urlString);
-		dialog.showErrorBox(
-			'Certificate error',
-			`The server presented an invalid certificate for ${url.origin}:
-
-${error}`
-		);
-	});
-
-	page.session.setPermissionRequestHandler((webContents, permission, callback, details) => {
-		const {origin} = new URL(details.requestingUrl);
-		page.send('permission-request', {
-			webContentsId: webContents.id === mainWindow.webContents.id ?
-				null :
-				webContents.id,
-			origin,
-			permission
-		}, makeRendererCallback(callback));
-	});
-
-	// Temporarily remove this event
-	// electron.powerMonitor.on('resume', () => {
-	// 	mainWindow.reload();
-	// 	page.send('destroytray');
-	// });
-
-	ipcMain.on('focus-app', () => {
-		mainWindow.show();
-	});
-
-	ipcMain.on('quit-app', () => {
-		app.quit();
-	});
-
-	// Reload full app not just webview, useful in debugging
-	ipcMain.on('reload-full-app', () => {
-		mainWindow.reload();
-		page.send('destroytray');
-	});
-
-	ipcMain.on('clear-app-settings', () => {
-		mainWindowState.unmanage();
-		app.relaunch();
-		app.exit();
-	});
-
-	ipcMain.on('toggle-app', () => {
-		toggleApp();
-	});
-
-	ipcMain.on('toggle-badge-option', () => {
-		BadgeSettings.updateBadge(badgeCount, mainWindow);
-	});
-
-	ipcMain.on('toggle-menubar', (_event: Electron.IpcMainEvent, showMenubar: boolean) => {
-		mainWindow.autoHideMenuBar = showMenubar;
-		mainWindow.setMenuBarVisibility(!showMenubar);
-		page.send('toggle-autohide-menubar', showMenubar, true);
-	});
-
-	ipcMain.on('update-badge', (_event: Electron.IpcMainEvent, messageCount: number) => {
-		badgeCount = messageCount;
-		BadgeSettings.updateBadge(badgeCount, mainWindow);
-		page.send('tray', messageCount);
-	});
-
-	ipcMain.on('update-taskbar-icon', (_event: Electron.IpcMainEvent, data: string, text: string) => {
-		BadgeSettings.updateTaskbarIcon(data, text, mainWindow);
-	});
-
-	ipcMain.on('forward-message', (_event: Electron.IpcMainEvent, listener: string, ...parameters: unknown[]) => {
-		page.send(listener, ...parameters);
-	});
-
-	ipcMain.on('update-menu', (_event: Electron.IpcMainEvent, props: AppMenu.MenuProps) => {
-		AppMenu.setMenu(props);
-		const activeTab = props.tabs[props.activeTabIndex];
-		if (activeTab) {
-			mainWindow.setTitle(`Zulip - ${activeTab.webviewName}`);
-		}
-	});
-
-	ipcMain.on('toggleAutoLauncher', async (_event: Electron.IpcMainEvent, AutoLaunchValue: boolean) => {
-		await setAutoLaunch(AutoLaunchValue);
-	});
-
-	ipcMain.on('downloadFile', (_event: Electron.IpcMainEvent, url: string, downloadPath: string) => {
-		page.downloadURL(url);
-		page.session.once('will-download', async (_event: Event, item) => {
-			if (ConfigUtil.getConfigItem('promptDownload', false)) {
-				const showDialogOptions: electron.SaveDialogOptions = {
-					defaultPath: path.join(downloadPath, item.getFilename())
-				};
-				item.setSaveDialogOptions(showDialogOptions);
-			} else {
-				const getTimeStamp = (): number => {
-					const date = new Date();
-					return date.getTime();
-				};
-
-				const formatFile = (filePath: string): string => {
-					const fileExtension = path.extname(filePath);
-					const baseName = path.basename(filePath, fileExtension);
-					return `${baseName}-${getTimeStamp()}${fileExtension}`;
-				};
-
-				const filePath = path.join(downloadPath, item.getFilename());
-
-				// Update the name and path of the file if it already exists
-				const updatedFilePath = path.join(downloadPath, formatFile(filePath));
-				const setFilePath: string = fs.existsSync(filePath) ? updatedFilePath : filePath;
-				item.setSavePath(setFilePath);
-			}
-
-			const updatedListener = (_event: Event, state: string): void => {
-				switch (state) {
-					case 'interrupted': {
-						// Can interrupted to due to network error, cancel download then
-						console.log('Download interrupted, cancelling and fallback to dialog download.');
-						item.cancel();
-						break;
-					}
-
-					case 'progressing': {
-						if (item.isPaused()) {
-							item.cancel();
-						}
-
-						// This event can also be used to show progress in percentage in future.
-						break;
-					}
-
-					default: {
-						console.info('Unknown updated state of download item');
-					}
-				}
-			};
-
-			item.on('updated', updatedListener);
-			item.once('done', (_event: Event, state) => {
-				if (state === 'completed') {
-					page.send('downloadFileCompleted', item.getSavePath(), path.basename(item.getSavePath()));
-				} else {
-					console.log('Download failed state:', state);
-					page.send('downloadFileFailed', state);
-				}
-
-				// To stop item for listening to updated events of this file
-				item.removeListener('updated', updatedListener);
-			});
-		});
-	});
-
-	ipcMain.on('realm-name-changed', (_event: Electron.IpcMainEvent, serverURL: string, realmName: string) => {
-		page.send('update-realm-name', serverURL, realmName);
-	});
-
-	ipcMain.on('realm-icon-changed', (_event: Electron.IpcMainEvent, serverURL: string, iconURL: string) => {
-		page.send('update-realm-icon', serverURL, iconURL);
-	});
-
-	// Using event.sender.send instead of page.send here to
-	// make sure the value of errorReporting is sent only once on load.
-	ipcMain.on('error-reporting', (event: Electron.IpcMainEvent) => {
-		event.sender.send('error-reporting-val', errorReporting);
-	});
-
-	ipcMain.on('save-last-tab', (_event: Electron.IpcMainEvent, index: number) => {
-		ConfigUtil.setConfigItem('lastActiveTab', index);
-	});
-
-	// Update user idle status for each realm after every 15s
-	const idleCheckInterval = 15 * 1000; // 15 seconds
-	setInterval(() => {
-		// Set user idle if no activity in 1 second (idleThresholdSeconds)
-		const idleThresholdSeconds = 1; // 1 second
-		const idleState = electron.powerMonitor.getSystemIdleState(idleThresholdSeconds);
-		if (idleState === 'active') {
-			page.send('set-active');
-		} else {
-			page.send('set-idle');
-		}
-	}, idleCheckInterval);
-});
-
-app.on('before-quit', () => {
-	isQuitting = true;
-});
-
-// Send crash reports
-process.on('uncaughtException', error => {
-	console.error(error);
-	console.error(error.stack);
-});

app/main/linuxupdater.js

@@ -0,0 +1,42 @@
+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/linuxupdater.ts

@@ -1,45 +0,0 @@
-import {app, Notification, net} from 'electron';
-
-import getStream from 'get-stream';
-import * as semver from 'semver';
-
-import * as ConfigUtil from '../renderer/js/utils/config-util';
-import * as LinuxUpdateUtil from '../renderer/js/utils/linux-update-util';
-import Logger from '../renderer/js/utils/logger-util';
-
-import {fetchResponse} from './request';
-
-const logger = new Logger({
-	file: 'linux-update-util.log',
-	timestamp: true
-});
-
-export async function linuxUpdateNotification(session: Electron.session): Promise<void> {
-	let	url = 'https://api.github.com/repos/zulip/zulip-desktop/releases';
-	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
-
-	try {
-		const response = await fetchResponse(net.request({url, session}));
-		if (response.statusCode !== 200) {
-			logger.log('Linux update response status: ', response.statusCode);
-			return;
-		}
-
-		const data = JSON.parse(await getStream(response));
-		const latestVersion = ConfigUtil.getConfigItem('betaUpdate') ? data[0].tag_name : data.tag_name;
-		if (typeof latestVersion !== 'string') {
-			throw new TypeError('Expected string for 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);
-			}
-		}
-	} catch (error: unknown) {
-		logger.error('Linux update error.');
-		logger.error(error);
-	}
-}

app/main/menu.js

@@ -0,0 +1,415 @@
+'use strict';
+const os = require('os');
+const path = require('path');
+
+const { app, shell, BrowserWindow, Menu } = require('electron');
+
+const fs = require('fs-extra');
+
+const ConfigUtil = require(__dirname + '/../renderer/js/utils/config-util.js');
+
+const appName = app.getName();
+
+class AppMenu {
+	getHistorySubmenu() {
+		return [{
+			label: 'Back',
+			accelerator: process.platform === 'darwin' ? 'Command+Left' : 'Alt+Left',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('back');
+				}
+			}
+		}, {
+			label: 'Forward',
+			accelerator: process.platform === 'darwin' ? 'Command+Right' : 'Alt+Right',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('forward');
+				}
+			}
+		}];
+	}
+
+	getViewSubmenu() {
+		return [{
+			label: 'Reload',
+			accelerator: 'CommandOrControl+R',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('reload-current-viewer');
+				}
+			}
+		}, {
+			label: 'Hard Reload',
+			accelerator: 'CommandOrControl+Shift+R',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('hard-reload');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			role: 'togglefullscreen'
+		}, {
+			label: 'Zoom In',
+			accelerator: process.platform === 'darwin' ? 'Command+Plus' : 'Control+=',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('zoomIn');
+				}
+			}
+		}, {
+			label: 'Zoom Out',
+			accelerator: 'CommandOrControl+-',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('zoomOut');
+				}
+			}
+		}, {
+			label: 'Actual Size',
+			accelerator: 'CommandOrControl+0',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('zoomActualSize');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: 'Toggle Tray Icon',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					focusedWindow.webContents.send('toggletray');
+				}
+			}
+		}, {
+			label: 'Toggle Sidebar',
+			accelerator: 'CommandOrControl+S',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					const newValue = !ConfigUtil.getConfigItem('showSidebar');
+					focusedWindow.webContents.send('toggle-sidebar', newValue);
+					ConfigUtil.setConfigItem('showSidebar', newValue);
+				}
+			}
+		}, {
+			label: 'Toggle DevTools for Zulip App',
+			accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					focusedWindow.webContents.toggleDevTools();
+				}
+			}
+		}, {
+			label: 'Toggle DevTools for Active Tab',
+			accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('tab-devtools');
+				}
+			}
+		}];
+	}
+
+	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() {
+					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) {
+		const initialSubmenu = [{
+			role: 'minimize'
+		}, {
+			role: 'close'
+		}];
+
+		if (tabs.length > 0) {
+			const ShortcutKey = process.platform === 'darwin' ? 'Cmd' : 'Ctrl';
+			initialSubmenu.push({
+				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}`,
+					checked: tabs[i].props.index === activeTabIndex,
+					click(item, focusedWindow) {
+						if (focusedWindow) {
+							AppMenu.sendAction('switch-server-tab', tabs[i].props.index);
+						}
+					},
+					type: 'checkbox'
+				});
+			}
+		}
+
+		return initialSubmenu;
+	}
+
+	getDarwinTpl(props) {
+		const { tabs, activeTabIndex } = props;
+
+		return [{
+			label: `${app.getName()}`,
+			submenu: [{
+				label: 'About Zulip',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-about');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Desktop App Settings',
+				accelerator: 'Cmd+,',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-settings');
+					}
+				}
+			}, {
+				label: 'Keyboard Shortcuts',
+				accelerator: 'Cmd+Shift+K',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('shortcut');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Reset App Settings',
+				accelerator: 'Command+Shift+D',
+				click() {
+					AppMenu.resetAppSettings();
+				}
+			}, {
+				label: 'Log Out',
+				accelerator: 'Cmd+L',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('log-out');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				role: 'services',
+				submenu: []
+			}, {
+				type: 'separator'
+			}, {
+				role: 'hide'
+			}, {
+				role: 'hideothers'
+			}, {
+				role: 'unhide'
+			}, {
+				type: 'separator'
+			}, {
+				role: 'quit'
+			}]
+		}, {
+			label: 'Edit',
+			submenu: [{
+				role: 'undo'
+			}, {
+				role: 'redo'
+			}, {
+				type: 'separator'
+			}, {
+				role: 'cut'
+			}, {
+				role: 'copy'
+			}, {
+				role: 'paste'
+			}, {
+				role: 'pasteandmatchstyle'
+			}, {
+				role: 'delete'
+			}, {
+				role: 'selectall'
+			}]
+		}, {
+			label: 'View',
+			submenu: this.getViewSubmenu()
+		}, {
+			label: 'History',
+			submenu: this.getHistorySubmenu()
+		}, {
+			label: 'Window',
+			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
+		}, {
+			role: 'help',
+			submenu: this.getHelpSubmenu()
+		}];
+	}
+
+	getOtherTpl(props) {
+		const { tabs, activeTabIndex } = props;
+
+		return [{
+			label: 'File',
+			submenu: [{
+				label: 'About Zulip',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-about');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Desktop App Settings',
+				accelerator: 'Ctrl+,',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-settings');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Keyboard Shortcuts',
+				accelerator: 'Ctrl+Shift+K',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('shortcut');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Reset App Settings',
+				accelerator: 'Ctrl+Shift+D',
+				click() {
+					AppMenu.resetAppSettings();
+				}
+			}, {
+				label: 'Log Out',
+				accelerator: 'Ctrl+L',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('log-out');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				role: 'quit',
+				accelerator: 'Ctrl+Q'
+			}]
+		}, {
+			label: 'Edit',
+			submenu: [{
+				role: 'undo'
+			}, {
+				role: 'redo'
+			}, {
+				type: 'separator'
+			}, {
+				role: 'cut'
+			}, {
+				role: 'copy'
+			}, {
+				role: 'paste'
+			}, {
+				role: 'pasteandmatchstyle'
+			}, {
+				role: 'delete'
+			}, {
+				type: 'separator'
+			}, {
+				role: 'selectall'
+			}]
+		}, {
+			label: 'View',
+			submenu: this.getViewSubmenu()
+		}, {
+			label: 'History',
+			submenu: this.getHistorySubmenu()
+		}, {
+			label: 'Window',
+			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
+		}, {
+			role: 'help',
+			submenu: this.getHelpSubmenu()
+		}];
+	}
+
+	static sendAction(action, ...params) {
+		const win = BrowserWindow.getAllWindows()[0];
+
+		if (process.platform === 'darwin') {
+			win.restore();
+		}
+
+		win.webContents.send(action, ...params);
+	}
+
+	static resetAppSettings() {
+		// We save App's settings/configurations in following files
+		const settingFiles = ['window-state.json', 'domain.json', 'settings.json'];
+
+		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');
+					});
+				}
+			});
+		});
+	}
+
+	setMenu(props) {
+		const tpl = process.platform === 'darwin' ? this.getDarwinTpl(props) : this.getOtherTpl(props);
+		const menu = Menu.buildFromTemplate(tpl);
+		Menu.setApplicationMenu(menu);
+	}
+}
+
+module.exports = new AppMenu();

app/main/menu.ts

@@ -1,607 +0,0 @@
-import {app, shell, BrowserWindow, Menu} from 'electron';
-
-import AdmZip from 'adm-zip';
-
-import type {TabData} from '../renderer/js/main';
-import * as ConfigUtil from '../renderer/js/utils/config-util';
-import * as DNDUtil from '../renderer/js/utils/dnd-util';
-import * as LinkUtil from '../renderer/js/utils/link-util';
-import * as t from '../renderer/js/utils/translation-util';
-
-import {appUpdater} from './autoupdater';
-
-export interface MenuProps {
-	tabs: TabData[];
-	activeTabIndex?: number;
-	enableMenu?: boolean;
-}
-
-const appName = app.name;
-
-function getHistorySubmenu(enableMenu: boolean): Electron.MenuItemConstructorOptions[] {
-	return [{
-		label: t.__('Back'),
-		accelerator: process.platform === 'darwin' ? 'Command+Left' : 'Alt+Left',
-		enabled: enableMenu,
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('back');
-			}
-		}
-	}, {
-		label: t.__('Forward'),
-		accelerator: process.platform === 'darwin' ? 'Command+Right' : 'Alt+Right',
-		enabled: enableMenu,
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('forward');
-			}
-		}
-	}];
-}
-
-function getToolsSubmenu(): Electron.MenuItemConstructorOptions[] {
-	return [{
-		label: t.__('Check for Updates'),
-		async click() {
-			await checkForUpdate();
-		}
-	},
-	{
-		label: t.__('Release Notes'),
-		async click() {
-			await LinkUtil.openBrowser(new URL(`https://github.com/zulip/zulip-desktop/releases/tag/v${app.getVersion()}`));
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: t.__('Download App Logs'),
-		click() {
-			const zip = new AdmZip();
-			const date = new Date();
-			const dateString = date.toLocaleDateString().replace(/\//g, '-');
-
-			// Create a zip file of all the logs and config data
-			zip.addLocalFolder(`${app.getPath('appData')}/${appName}/Logs`);
-			zip.addLocalFolder(`${app.getPath('appData')}/${appName}/config`);
-
-			// Put the log file in downloads folder
-			const logFilePath = `${app.getPath('downloads')}/Zulip-logs-${dateString}.zip`;
-			zip.writeZip(logFilePath);
-
-			// Open and select the log file
-			shell.showItemInFolder(logFilePath);
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: t.__('Toggle DevTools for Zulip App'),
-		accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				focusedWindow.webContents.openDevTools({mode: 'undocked'});
-			}
-		}
-	},
-	{
-		label: t.__('Toggle DevTools for Active Tab'),
-		accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('tab-devtools');
-			}
-		}
-	}];
-}
-
-function getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
-	return [{
-		label: t.__('Reload'),
-		accelerator: 'CommandOrControl+R',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('reload-current-viewer');
-			}
-		}
-	}, {
-		label: t.__('Hard Reload'),
-		accelerator: 'CommandOrControl+Shift+R',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('hard-reload');
-			}
-		}
-	}, {
-		label: t.__('Hard Reload'),
-		visible: false,
-		accelerator: 'F5',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('hard-reload');
-			}
-		}
-	}, {
-		type: 'separator'
-	}, {
-		label: t.__('Toggle Full Screen'),
-		role: 'togglefullscreen'
-	}, {
-		label: t.__('Zoom In'),
-		accelerator: 'CommandOrControl+=',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomIn');
-			}
-		}
-	}, {
-		label: t.__('Zoom In'),
-		visible: false,
-		accelerator: 'CommandOrControl+Plus',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomIn');
-			}
-		}
-	}, {
-		label: t.__('Zoom In'),
-		visible: false,
-		accelerator: 'CommandOrControl+numadd',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomIn');
-			}
-		}
-	}, {
-		label: t.__('Zoom Out'),
-		accelerator: 'CommandOrControl+-',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomOut');
-			}
-		}
-	}, {
-		label: t.__('Zoom Out'),
-		visible: false,
-		accelerator: 'CommandOrControl+numsub',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomOut');
-			}
-		}
-	}, {
-		label: t.__('Actual Size'),
-		accelerator: 'CommandOrControl+0',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomActualSize');
-			}
-		}
-	}, {
-		label: t.__('Actual Size'),
-		visible: false,
-		accelerator: 'CommandOrControl+num0',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomActualSize');
-			}
-		}
-	}, {
-		type: 'separator'
-	}, {
-		label: t.__('Toggle Tray Icon'),
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				focusedWindow.webContents.send('toggletray');
-			}
-		}
-	}, {
-		label: t.__('Toggle Sidebar'),
-		accelerator: 'CommandOrControl+Shift+S',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				const newValue = !ConfigUtil.getConfigItem('showSidebar');
-				focusedWindow.webContents.send('toggle-sidebar', newValue);
-				ConfigUtil.setConfigItem('showSidebar', newValue);
-			}
-		}
-	}, {
-		label: t.__('Auto hide Menu bar'),
-		checked: ConfigUtil.getConfigItem('autoHideMenubar', false),
-		visible: process.platform !== 'darwin',
-		click(_item, focusedWindow) {
-			if (focusedWindow) {
-				const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
-				focusedWindow.autoHideMenuBar = newValue;
-				focusedWindow.setMenuBarVisibility(!newValue);
-				focusedWindow.webContents.send('toggle-autohide-menubar', newValue);
-				ConfigUtil.setConfigItem('autoHideMenubar', newValue);
-			}
-		},
-		type: 'checkbox'
-	}];
-}
-
-function getHelpSubmenu(): Electron.MenuItemConstructorOptions[] {
-	return [
-		{
-			label: `${appName + ' Desktop'} v${app.getVersion()}`,
-			enabled: false
-		},
-		{
-			label: t.__('About Zulip'),
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('open-about');
-				}
-			}
-		},
-		{
-			label: t.__('Help Center'),
-			click(focusedWindow) {
-				if (focusedWindow) {
-					sendAction('open-help');
-				}
-			}
-		},
-		{
-			label: t.__('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');
-				});
-			}
-		}
-	];
-}
-
-function getWindowSubmenu(tabs: TabData[], activeTabIndex: number): Electron.MenuItemConstructorOptions[] {
-	const initialSubmenu: Electron.MenuItemConstructorOptions[] = [{
-		label: t.__('Minimize'),
-		role: 'minimize'
-	}, {
-		label: t.__('Close'),
-		role: 'close'
-	}];
-
-	if (tabs.length > 0) {
-		const ShortcutKey = process.platform === 'darwin' ? 'Cmd' : 'Ctrl';
-		initialSubmenu.push({
-			type: 'separator'
-		});
-		tabs.forEach(tab => {
-			// Do not add functional tab settings to list of windows in menu bar
-			if (tab.role === 'function' && tab.name === 'Settings') {
-				return;
-			}
-
-			initialSubmenu.push({
-				label: tab.name,
-				accelerator: tab.role === 'function' ? '' : `${ShortcutKey} + ${tab.index + 1}`,
-				checked: tab.index === activeTabIndex,
-				click(_item, focusedWindow) {
-					if (focusedWindow) {
-						sendAction('switch-server-tab', tab.index);
-					}
-				},
-				type: 'checkbox'
-			});
-		});
-		initialSubmenu.push({
-			type: 'separator'
-		});
-		initialSubmenu.push({
-			label: t.__('Switch to Next Organization'),
-			accelerator: 'Ctrl+Tab',
-			enabled: tabs.length > 1,
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('switch-server-tab', getNextServer(tabs, activeTabIndex));
-				}
-			}
-		}, {
-			label: t.__('Switch to Previous Organization'),
-			accelerator: 'Ctrl+Shift+Tab',
-			enabled: tabs.length > 1,
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('switch-server-tab', getPreviousServer(tabs, activeTabIndex));
-				}
-			}
-		});
-	}
-
-	return initialSubmenu;
-}
-
-function getDarwinTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
-	const {tabs, activeTabIndex, enableMenu} = props;
-
-	return [{
-		label: app.name,
-		submenu: [{
-			label: t.__('Add Organization'),
-			accelerator: 'Cmd+Shift+N',
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('new-server');
-				}
-			}
-		}, {
-			label: t.__('Toggle Do Not Disturb'),
-			accelerator: 'Cmd+Shift+M',
-			click() {
-				const dndUtil = DNDUtil.toggle();
-				sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
-			}
-		}, {
-			label: t.__('Desktop Settings'),
-			accelerator: 'Cmd+,',
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('open-settings');
-				}
-			}
-		}, {
-			label: t.__('Keyboard Shortcuts'),
-			accelerator: 'Cmd+Shift+K',
-			enabled: enableMenu,
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('show-keyboard-shortcuts');
-				}
-			}
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Copy Zulip URL'),
-			accelerator: 'Cmd+Shift+C',
-			enabled: enableMenu,
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('copy-zulip-url');
-				}
-			}
-		}, {
-			label: t.__('Log Out of Organization'),
-			accelerator: 'Cmd+L',
-			enabled: enableMenu,
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('log-out');
-				}
-			}
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Services'),
-			role: 'services',
-			submenu: []
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Hide'),
-			role: 'hide'
-		}, {
-			label: t.__('Hide Others'),
-			role: 'hideOthers'
-		}, {
-			label: t.__('Unhide'),
-			role: 'unhide'
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Minimize'),
-			role: 'minimize'
-		}, {
-			label: t.__('Close'),
-			role: 'close'
-		}, {
-			label: t.__('Quit'),
-			role: 'quit'
-		}]
-	}, {
-		label: t.__('Edit'),
-		submenu: [{
-			label: t.__('Undo'),
-			role: 'undo'
-		}, {
-			label: t.__('Redo'),
-			role: 'redo'
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Cut'),
-			role: 'cut'
-		}, {
-			label: t.__('Copy'),
-			role: 'copy'
-		}, {
-			label: t.__('Paste'),
-			role: 'paste'
-		}, {
-			label: t.__('Paste and Match Style'),
-			role: 'pasteAndMatchStyle'
-		}, {
-			label: t.__('Select All'),
-			role: 'selectAll'
-		}]
-	}, {
-		label: t.__('View'),
-		submenu: getViewSubmenu()
-	}, {
-		label: t.__('History'),
-		submenu: getHistorySubmenu(enableMenu)
-	}, {
-		label: t.__('Window'),
-		submenu: getWindowSubmenu(tabs, activeTabIndex)
-	}, {
-		label: t.__('Tools'),
-		submenu: getToolsSubmenu()
-	}, {
-		label: t.__('Help'),
-		role: 'help',
-		submenu: getHelpSubmenu()
-	}];
-}
-
-function getOtherTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
-	const {tabs, activeTabIndex, enableMenu} = props;
-	return [{
-		label: t.__('File'),
-		submenu: [{
-			label: t.__('Add Organization'),
-			accelerator: 'Ctrl+Shift+N',
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('new-server');
-				}
-			}
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Toggle Do Not Disturb'),
-			accelerator: 'Ctrl+Shift+M',
-			click() {
-				const dndUtil = DNDUtil.toggle();
-				sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
-			}
-		}, {
-			label: t.__('Desktop Settings'),
-			accelerator: 'Ctrl+,',
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('open-settings');
-				}
-			}
-		}, {
-			label: t.__('Keyboard Shortcuts'),
-			accelerator: 'Ctrl+Shift+K',
-			enabled: enableMenu,
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('show-keyboard-shortcuts');
-				}
-			}
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Copy Zulip URL'),
-			accelerator: 'Ctrl+Shift+C',
-			enabled: enableMenu,
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('copy-zulip-url');
-				}
-			}
-		}, {
-			label: t.__('Log Out of Organization'),
-			accelerator: 'Ctrl+L',
-			enabled: enableMenu,
-			click(_item, focusedWindow) {
-				if (focusedWindow) {
-					sendAction('log-out');
-				}
-			}
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Minimize'),
-			role: 'minimize'
-		}, {
-			label: t.__('Close'),
-			role: 'close'
-		}, {
-			label: t.__('Quit'),
-			role: 'quit',
-			accelerator: 'Ctrl+Q'
-		}]
-	}, {
-		label: t.__('Edit'),
-		submenu: [{
-			label: t.__('Undo'),
-			role: 'undo'
-		}, {
-			label: t.__('Redo'),
-			role: 'redo'
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Cut'),
-			role: 'cut'
-		}, {
-			label: t.__('Copy'),
-			role: 'copy'
-		}, {
-			label: t.__('Paste'),
-			role: 'paste'
-		}, {
-			label: t.__('Paste and Match Style'),
-			role: 'pasteAndMatchStyle'
-		}, {
-			type: 'separator'
-		}, {
-			label: t.__('Select All'),
-			role: 'selectAll'
-		}]
-	}, {
-		label: t.__('View'),
-		submenu: getViewSubmenu()
-	}, {
-		label: t.__('History'),
-		submenu: getHistorySubmenu(enableMenu)
-	}, {
-		label: t.__('Window'),
-		submenu: getWindowSubmenu(tabs, activeTabIndex)
-	}, {
-		label: t.__('Tools'),
-		submenu: getToolsSubmenu()
-	}, {
-		label: t.__('Help'),
-		role: 'help',
-		submenu: getHelpSubmenu()
-	}];
-}
-
-function sendAction(action: string, ...parameters: unknown[]): void {
-	const win = BrowserWindow.getAllWindows()[0];
-
-	if (process.platform === 'darwin') {
-		win.restore();
-	}
-
-	win.webContents.send(action, ...parameters);
-}
-
-async function checkForUpdate(): Promise<void> {
-	await appUpdater(true);
-}
-
-function getNextServer(tabs: TabData[], activeTabIndex: number): number {
-	do {
-		activeTabIndex = (activeTabIndex + 1) % tabs.length;
-	}
-	while (tabs[activeTabIndex].role !== 'server');
-
-	return activeTabIndex;
-}
-
-function getPreviousServer(tabs: TabData[], activeTabIndex: number): number {
-	do {
-		activeTabIndex = (activeTabIndex - 1 + tabs.length) % tabs.length;
-	}
-	while (tabs[activeTabIndex].role !== 'server');
-
-	return activeTabIndex;
-}
-
-export function setMenu(props: MenuProps): void {
-	const tpl = process.platform === 'darwin' ? getDarwinTpl(props) : getOtherTpl(props);
-	const menu = Menu.buildFromTemplate(tpl);
-	Menu.setApplicationMenu(menu);
-}

app/main/request.ts

@@ -1,114 +0,0 @@
-import {ClientRequest, IncomingMessage, app, net} from 'electron';
-import fs from 'fs';
-import path from 'path';
-import stream from 'stream';
-import util from 'util';
-
-import getStream from 'get-stream';
-
-import {ServerConf} from '../renderer/js/utils/domain-util';
-import Logger from '../renderer/js/utils/logger-util';
-import * as Messages from '../resources/messages';
-
-export async function fetchResponse(request: ClientRequest): Promise<IncomingMessage> {
-	return new Promise((resolve, reject) => {
-		request.on('response', resolve);
-		request.on('abort', () => {
-			reject(new Error('Request aborted'));
-		});
-		request.on('error', reject);
-		request.end();
-	});
-}
-
-const pipeline = util.promisify(stream.pipeline);
-
-/* Request: domain-util */
-
-const defaultIconUrl = '../renderer/img/icon.png';
-
-const logger = new Logger({
-	file: 'domain-util.log',
-	timestamp: true
-});
-
-const generateFilePath = (url: string): string => {
-	const dir = `${app.getPath('userData')}/server-icons`;
-	const extension = path.extname(url).split('?')[0];
-
-	let hash = 5381;
-	let {length} = url;
-
-	while (length) {
-		hash = (hash * 33) ^ url.charCodeAt(--length);
-	}
-
-	// Create 'server-icons' directory if not existed
-	if (!fs.existsSync(dir)) {
-		fs.mkdirSync(dir);
-	}
-
-	return `${dir}/${hash >>> 0}${extension}`;
-};
-
-export const _getServerSettings = async (domain: string, session: Electron.session): Promise<ServerConf> => {
-	const response = await fetchResponse(net.request({
-		url: domain + '/api/v1/server_settings',
-		session
-	}));
-	if (response.statusCode !== 200) {
-		throw new Error(Messages.invalidZulipServerError(domain));
-	}
-
-	const {realm_name, realm_uri, realm_icon} = JSON.parse(await getStream(response));
-	if (
-		typeof realm_name !== 'string' ||
-			typeof realm_uri !== 'string' ||
-			typeof realm_icon !== 'string'
-	) {
-		throw new TypeError(Messages.noOrgsError(domain));
-	}
-
-	return {
-		// Some Zulip Servers use absolute URL for server icon whereas others use relative URL
-		// Following check handles both the cases
-		icon: realm_icon.startsWith('/') ? realm_uri + realm_icon : realm_icon,
-		url: realm_uri,
-		alias: realm_name
-	};
-};
-
-export const _saveServerIcon = async (url: string, session: Electron.session): Promise<string> => {
-	try {
-		const response = await fetchResponse(net.request({url, session}));
-		if (response.statusCode !== 200) {
-			logger.log('Could not get server icon.');
-			return defaultIconUrl;
-		}
-
-		const filePath = generateFilePath(url);
-		await pipeline(response, fs.createWriteStream(filePath));
-		return filePath;
-	} catch (error: unknown) {
-		logger.log('Could not get server icon.');
-		logger.log(error);
-		logger.reportSentry(error);
-		return defaultIconUrl;
-	}
-};
-
-/* Request: reconnect-util */
-
-export const _isOnline = async (url: string, session: Electron.session): Promise<boolean> => {
-	try {
-		const response = await fetchResponse(net.request({
-			url: `${url}/static/favicon.ico`,
-			session
-		}));
-		const isValidResponse = response.statusCode >= 200 && response.statusCode < 400;
-		return isValidResponse;
-	} catch (error: unknown) {
-		logger.log(error);
-		return false;
-	}
-};

app/main/startup.js

@@ -0,0 +1,34 @@
+'use strict';
+const { app } = require('electron');
+const AutoLaunch = require('auto-launch');
+const isDev = require('electron-is-dev');
+const ConfigUtil = require('./../renderer/js/utils/config-util.js');
+
+const setAutoLaunch = AutoLaunchValue => {
+	// Don't run this in development
+	if (isDev) {
+		return;
+	}
+
+	// On Mac, work around a bug in auto-launch where it opens a Terminal window
+	// See https://github.com/Teamwork/node-auto-launch/issues/28#issuecomment-222194437
+
+	const appPath = process.platform === 'darwin' ? app.getPath('exe').replace(/\.app\/Content.*/, '.app') : undefined; // Use the default
+
+	const ZulipAutoLauncher = new AutoLaunch({
+		name: 'Zulip',
+		path: appPath,
+		isHidden: false
+	});
+	const autoLaunchOption = ConfigUtil.getConfigItem('startAtLogin', AutoLaunchValue);
+
+	if (autoLaunchOption) {
+		ZulipAutoLauncher.enable();
+	} else {
+		ZulipAutoLauncher.disable();
+	}
+};
+
+module.exports = {
+	setAutoLaunch
+};

app/main/startup.ts

@@ -1,29 +0,0 @@
-import {app} from 'electron';
-
-import AutoLaunch from 'auto-launch';
-import isDev from 'electron-is-dev';
-
-import * as ConfigUtil from '../renderer/js/utils/config-util';
-
-export const setAutoLaunch = async (AutoLaunchValue: boolean): Promise<void> => {
-	// Don't run this in development
-	if (isDev) {
-		return;
-	}
-
-	const autoLaunchOption = ConfigUtil.getConfigItem('startAtLogin', AutoLaunchValue);
-
-	// `setLoginItemSettings` doesn't support linux
-	if (process.platform === 'linux') {
-		const ZulipAutoLauncher = new AutoLaunch({
-			name: 'Zulip',
-			isHidden: false
-		});
-		await (autoLaunchOption ? ZulipAutoLauncher.enable() : ZulipAutoLauncher.disable());
-	} else {
-		app.setLoginItemSettings({
-			openAtLogin: autoLaunchOption,
-			openAsHidden: false
-		});
-	}
-};

app/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "zulip",
+  "productName": "Zulip",
+  "version": "1.8.2",
+  "description": "Zulip Desktop App",
+  "license": "Apache-2.0",
+  "copyright": "Kandra Labs, Inc.",
+  "author": {
+    "name": "Kandra Labs, Inc.",
+    "email": "support@zulipchat.com"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zulip/zulip-electron.git"
+  },
+  "bugs": {
+    "url": "https://github.com/zulip/zulip-electron/issues"
+  },
+  "main": "main/index.js",
+  "keywords": [
+    "Zulip",
+    "Group Chat app",
+    "electron-app",
+    "electron",
+    "Desktop app",
+    "InstantMessaging"
+  ],
+  "dependencies": {
+    "auto-launch": "5.0.1",
+    "electron-is-dev": "0.3.0",
+    "electron-log": "2.2.7",
+    "electron-spellchecker": "1.1.2",
+    "electron-updater": "2.18.2",
+    "electron-window-state": "4.1.1",
+    "is-online": "7.0.0",
+    "node-json-db": "0.7.3",
+    "request": "2.81.0",
+    "semver": "5.4.1",
+    "wurl": "2.5.0"
+  },
+  "optionalDependencies": {
+    "node-mac-notifier": "0.0.13"
+  }
+}

app/renderer/about.html

@@ -1,32 +1,45 @@
 <!DOCTYPE html>
 <html lang="en">
+	<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>
+			</p>
+			<p class="detail license">
+				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>
 
-    <head>
-        <meta charset="UTF-8">
-        <link rel="stylesheet" href="css/about.css">
-        <title>Zulip - About</title>
-    </head>
+	const { app } = require('electron').remote;
+	const { shell } = require('electron');
+	const version_tag = document.querySelector('#version');
+	version_tag.innerHTML = 'v' + app.getVersion();
 
-    <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 href="https://zulip.com" target="_blank" rel="noopener noreferrer">Zulip</a>
-                </p>
-                <p class="detail license">
-                    Available under the
-                    <a href="https://github.com/zulip/zulip-desktop/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">Apache 2.0 License</a>
-                </p>
-            </div>
-        </div>
-        <script>
-
-            const { app } = require('electron').remote;
-            const version_tag = document.querySelector('#version');
-            version_tag.textContent = 'v' + app.getVersion();
-        </script>
-    </body>
+	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>
+	</body>
 </html>

app/renderer/css/about.css

@@ -1,66 +1,82 @@
 body {
-    background: rgba(250, 250, 250, 1.000);
-    font-family: menu, "Helvetica Neue", sans-serif;
-    -webkit-font-smoothing: subpixel-antialiased;
+	background: #fafafa;
+	font-family: menu, "Helvetica Neue", sans-serif;
+	-webkit-font-smoothing: subpixel-antialiased;
 }
 
 .logo {
-    display: block;
-    margin: -40px auto;
+	display: block;
+	margin: -40px auto;
 }
 
 #version {
-    color: rgba(68, 67, 67, 1.000);
-    font-size: 1.3em;
-    padding-top: 40px;
+	color: #444343;
+	font-size: 1.3em;
+	padding-top: 40px;
 }
 
 .about {
-    margin: 25vh auto;
-    height: 25vh;
-    text-align: center;
+	margin: 25vh auto;
+	height: 25vh;
+	text-align: center;
 }
 
 .about p {
-    font-size: 20px;
-    color: rgba(0, 0, 0, 0.62);
+	font-size: 20px;
+	color: rgba(0, 0, 0, 0.62);
 }
 
 .about img {
-    width: 150px;
+	width: 150px;
 }
 
 .detail {
-    text-align: center;
+	text-align: center;
 }
 
 .detail.maintainer {
-    font-size: 1.2em;
-    font-weight: 500;
+	font-size: 1.2em;
+	font-weight: 500;
 }
 
 .detail.license {
-    font-size: 0.8em;
+	font-size: 0.8em;
 }
 
 .maintenance-info {
-    cursor: pointer;
-    position: absolute;
-    width: 100%;
-    left: 0px;
-    color: rgba(68, 68, 68, 1.000);
+	cursor: pointer;
+	position: absolute;
+	width: 100%;
+	left: 0px;
+	color: #444;
 }
 
 .maintenance-info p {
-    margin: 0;
-    font-size: 1em;
-    width: 100%;
+	margin: 0;
+	font-size: 1em;
+	width: 100%;
+}
+
+.maintenance-info .bug {
+	display: inline-block;
+	padding: 8px 15px;
+	margin-top: 30px;
+	text-decoration: none;
+	background-color: #52c2af;
+	color: #fff;
+	border-radius: 4px;
+
+	transition: background-color 0.2s ease;
+}
+
+.maintenance-info .bug:hover {
+	background-color: #32a692;
 }
 
 p.detail a {
-    color: rgba(53, 95, 76, 1.000);
+	color: #355f4c;
 }
 
 p.detail a:hover {
-    text-decoration: underline;
+	text-decoration: underline;
 }

app/renderer/css/feedback.css

@@ -1,19 +0,0 @@
-:host {
-    --button-color: rgb(69, 166, 149);
-}
-
-button:hover,
-button:focus {
-    border-color: var(--button-color);
-    color: var(--button-color);
-}
-  
-button:active {
-    background-color: rgb(241, 241, 241);
-    color: var(--button-color);
-}
-
-button {
-    background-color: var(--button-color);
-    border-color: var(--button-color);
-}

app/renderer/css/main.css

@@ -13,10 +13,13 @@ body {
 #content {
     display: flex;
     height: 100%;
+    background: #fff url(../img/ic_loading.gif) no-repeat;
+    background-size: 60px 60px;
+    background-position: center;
 }
 
 .toggle-sidebar {
-    background: rgba(34, 44, 49, 1.000);
+    background: #222c31;
     width: 54px;
     padding: 27px 0 20px 0;
     justify-content: space-between;
@@ -42,28 +45,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: rgba(169, 169, 169, 1.000);
-    outline: 1px solid rgba(169, 169, 169, 1.000);
-}
-
 @font-face {
     font-family: 'Material Icons';
     font-style: normal;
@@ -119,12 +100,12 @@ body {
 }
 
 .action-button i {
-    color: rgba(108, 133, 146, 1.000);
+    color: #6c8592;
     font-size: 28px;
 }
 
 .action-button:hover i {
-    color: rgba(152, 169, 179, 1.000);
+    color: #98a9b3;
 }
 
 .action-button.disable {
@@ -136,22 +117,22 @@ body {
 }
 
 .action-button.disable:hover i {
-    color: rgba(108, 133, 146, 1.000);
+    color: #6c8592;
 }
 
 .action-button.active {
     /* background-color: rgba(255, 255, 255, 0.25); */
-    background-color: rgba(239, 239, 239, 1.000);
+    background-color: #efefef;
     opacity: 0.9;
     padding-right: 14px;
 }
 
 .action-button.active i {
-    color: rgba(28, 38, 43, 1.000);
+    color: #1c262b;
 }
 
 .tab:first-child {
-    margin-top: 9px;
+    margin-top: 8px;
 }
 
 .tab {
@@ -165,33 +146,25 @@ body {
 }
 
 .tab .server-icons {
-    width: 35px;
+    border-radius: 50%;
+    width: 30px;
+    padding: 3px;
+    height: 30px;
     vertical-align: top;
-    border-radius: 4px;
 }
 
 .tab .server-tab {
     width: 100%;
     height: 35px;
     position: relative;
-    margin-top: 5px;
+    margin: 5px 0 2px 0;
     z-index: 11;
     line-height: 31px;
-    color: rgba(238, 238, 238, 1.000);
+    color: #eee;
     text-align: center;
     overflow: hidden;
     opacity: 0.6;
-    padding: 6px 0;
-}
-
-.server-tab .alt-icon {
-    font-family: Verdana;
-    font-weight: 600;
-    font-size: 22px;
-    border: 2px solid rgba(34, 44, 49, 1.000);
-    margin-left: 17%;
-    width: 35px;
-    border-radius: 4px;
+    padding: 2px 0;
 }
 
 .tab .server-tab:hover {
@@ -216,7 +189,7 @@ body {
 
 .tab.active .server-tab {
     opacity: 1;
-    background-color: rgba(100, 132, 120, 1.000);
+    background-color: #648478;
 }
 
 .tab .server-tab-badge.active {
@@ -224,7 +197,7 @@ body {
     min-width: 11px;
     padding: 0 3px;
     height: 17px;
-    background-color: rgba(244, 67, 54, 1.000);
+    background-color: #f44336;
     font-size: 10px;
     font-family: sans-serif;
     position: absolute;
@@ -232,7 +205,7 @@ body {
     z-index: 15;
     top: 6px;
     float: right;
-    color: rgba(255, 255, 255, 1.000);
+    color: #fff;
     text-align: center;
     line-height: 17px;
     display: block;
@@ -260,25 +233,13 @@ body {
 }
 
 .tab .server-tab-shortcut {
-    color: rgba(100, 132, 120, 1.000);
+    color: #648478;
     font-size: 12px;
     text-align: center;
     font-family: sans-serif;
     margin-bottom: 5px;
 }
 
-.refresh {
-    animation: rotate-loader 1s linear infinite;
-}
-
-@keyframes rotate-loader {
-    from {
-        transform: rotate(0);
-    }
-    to {
-        transform: rotate(-360deg);
-    }
-}
 
 /*******************
   *   Webview Area  *
@@ -290,25 +251,6 @@ body {
     width: 100%;
 }
 
-/* Pseudo element for loading indicator */
-#webviews-container::before {
-    content: "";
-    position: absolute;
-    z-index: 1;
-    background: rgba(255, 255, 255, 1.000) 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; */
     flex-grow: 1;
@@ -340,34 +282,30 @@ webview.focus {
 
 /* Tooltip styling */
 
-#loading-tooltip,
-#dnd-tooltip,
 #back-tooltip,
 #reload-tooltip,
 #setting-tooltip {
     font-family: sans-serif;
-    background: rgba(34, 44, 49, 1.000);
+    background: #222c31;
     margin-left: 48px;
     padding: 6px 8px;
     position: absolute;
     margin-top: 0px;
     z-index: 1000;
-    color: rgba(255, 255, 255, 1.000);
+    color: white;
     border-radius: 4px;
     text-align: center;
     width: 55px;
     font-size: 14px;
 }
 
-#loading-tooltip::after,
-#dnd-tooltip::after,
-#back-tooltip::after,
-#reload-tooltip::after,
-#setting-tooltip::after {
+#back-tooltip:after,
+#reload-tooltip:after,
+#setting-tooltip:after {
     content: " ";
     border-top: 8px solid transparent;
     border-bottom: 8px solid transparent;
-    border-right: 8px solid rgba(34, 44, 49, 1.000);
+    border-right: 8px solid #222c31;
     position: absolute;
     top: 7px;
     right: 68px;
@@ -376,25 +314,25 @@ webview.focus {
 #add-server-tooltip,
 .server-tooltip {
     font-family: 'arial';
-    background: rgba(34, 44, 49, 1.000);
+    background: #222c31;
     left: 56px;
     padding: 10px 20px;
     position: fixed;
-    margin-top: 11px;
+    margin-top: 8px;
     z-index: 5000 !important;
-    color: rgba(255, 255, 255, 1.000);
+    color: #fff;
     border-radius: 4px;
     text-align: center;
     width: max-content;
     font-size: 14px;
 }
 
-#add-server-tooltip::after,
-.server-tooltip::after {
+#add-server-tooltip:after,
+.server-tooltip:after {
     content: " ";
     border-top: 8px solid transparent;
     border-bottom: 8px solid transparent;
-    border-right: 8px solid rgba(34, 44, 49, 1.000);
+    border-right: 8px solid #222c31;
     position: absolute;
     top: 10px;
     left: -5px;
@@ -406,14 +344,14 @@ webview.focus {
     position: absolute;
     width: 24px;
     height: 24px;
-    background: rgba(34, 44, 49, 1.000);
+    background: #222c31;
     border-radius: 20px;
     cursor: pointer;
-    box-shadow: rgba(153, 153, 153, 1.000) 1px 1px;
+    box-shadow: #999 1px 1px;
 }
 
 #collapse-button i {
-    color: rgba(239, 239, 239, 1.000);
+    color: #efefef;
 }
 
 #main-container {
@@ -434,8 +372,8 @@ webview.focus {
 
 .popup .popuptext {
     visibility: hidden;
-    background-color: rgba(85, 85, 85, 1.000);
-    color: rgba(255, 255, 255, 1.000);
+    background-color: #555;
+    color: #fff;
     text-align: center;
     border-radius: 6px;
     padding: 9px 0;
@@ -465,26 +403,3 @@ webview.focus {
         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/network.css

@@ -1,11 +1,10 @@
-html,
-body {
+html, body {
     margin: 0;
     cursor: default;
     font-size: 14px;
-    color: rgba(51, 51, 51, 1.000);
-    background: rgba(255, 255, 255, 1.000);
-    user-select: none;
+    color: #333;
+    background: #fff;
+    user-select:none;
 }
 
 #content {
@@ -17,43 +16,27 @@ body {
 }
 
 #title {
-    text-align: left;
     font-size: 24px;
     font-weight: bold;
     margin: 20px 0;
 }
 
-#subtitle {
-    font-size: 20px;
-    text-align: left;
-    margin: 12px 0;
-}
-
 #description {
-    text-align: left;
     font-size: 16px;
-    list-style-position: inside;
 }
 
 #reconnect {
-    float: left;
-}
-
-#settings {
-    margin-left: 116px;
-}
-
-.button {
     font-size: 16px;
-    background: rgba(0, 150, 136, 1.000);
-    color: rgba(255, 255, 255, 1.000);
-    width: 96px;
+    background: #009688;
+    color: #fff;
+    width: 84px;
     height: 32px;
     border-radius: 5px;
     line-height: 32px;
+    margin: 20px auto 0;
     cursor: pointer;
 }
 
-.button:hover {
+#reconnect:hover {
     opacity: 0.8;
 }

app/renderer/css/preference.css

@@ -7,25 +7,23 @@ body {
     font-family: menu, "Helvetica Neue", sans-serif;
     -webkit-font-smoothing: antialiased;
     font-size: 14px;
-    background: rgba(239, 239, 239, 1.000);
-    letter-spacing: -.08px;
-    line-height: 18px;
-    color: rgba(139, 142, 143, 1.000);
+    color: #333;
+    background: #efefef;
 }
 
 kbd {
     display: inline-block;
-    border: 1px solid rgba(204, 204, 204, 1.000);
-    border-radius: 4px;
+    border: 1px solid #ccc;
+    border-radius: 3px;
     font-size: 15px;
     font-family: Courier New, Courier, monospace;
     font-weight: bold;
     white-space: nowrap;
-    background-color: rgba(247, 247, 247, 1.000);
-    color: rgba(51, 51, 51, 1.000);
+    background-color: #f7f7f7;
+    color: #333;
     margin: 0 0.1em;
     padding: 0.3em 0.8em;
-    text-shadow: 0 1px 0 rgba(255, 255, 255, 1.000);
+    text-shadow: 0 1px 0 #fff;
     line-height: 1.4;
 }
 
@@ -33,7 +31,7 @@ table,
 th,
 td {
     border-collapse: collapse;
-    color: rgba(56, 52, 48, 1.000);
+    color: #383430;
 }
 
 table {
@@ -43,11 +41,11 @@ table {
 }
 
 table tr:nth-child(even) {
-    background-color: rgba(250, 250, 250, 1.000);
+    background-color: #fafafa;
 }
 
 table tr:nth-child(odd) {
-    background-color: rgba(255, 255, 255, 1.000);
+    background-color: #fff;
 }
 
 td {
@@ -103,7 +101,7 @@ td:nth-child(odd) {
     display: flex;
     flex-direction: column;
     font-size: 16px;
-    background: rgba(242, 242, 242, 1.000);
+    background: #f2f2f2;
 }
 
 #nav-container {
@@ -111,19 +109,19 @@ td:nth-child(odd) {
 }
 
 .nav {
-    padding: 7px 0;
-    color: rgba(153, 153, 153, 1.000);
+    padding: 5px 0;
+    color: #999;
     cursor: pointer;
 }
 
 .nav.active {
-    color: rgba(78, 191, 172, 1.000);
+    color: #4ebfac;
     cursor: default;
     position: relative;
 }
 
 .nav.active::before {
-    background: rgba(70, 78, 90, 1.000);
+    background: #464e5a;
     width: 3px;
     height: 18px;
     position: absolute;
@@ -139,7 +137,7 @@ td:nth-child(odd) {
 
 #settings-header {
     font-size: 22px;
-    color: rgba(34, 44, 49, 1.000);
+    color: #222c31;
     font-weight: bold;
     text-transform: uppercase;
 }
@@ -159,70 +157,40 @@ td:nth-child(odd) {
 
 .title {
     font-weight: 500;
-    color: rgba(34, 44, 49, 1.000);
+    color: #222c31;
 }
 
 .page-title {
-    color: rgba(34, 44, 49, 1.000);
+    color: #222c31;
     font-size: 15px;
     font-weight: bold;
     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;
-    color: rgba(97, 97, 97, 1.000);
+    color: #616161;
 }
 
 img.server-info-icon {
     width: 36px;
     height: 36px;
-    padding: 4px 4px 4px 10px;
-    cursor: pointer;
-    vertical-align: middle;
+    padding: 4px;
 }
 
 .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 {
@@ -230,10 +198,6 @@ img.server-info-icon {
     cursor: pointer;
 }
 
-.server-url-info {
-    margin-right: 10px;
-}
-
 .setting-input-key {
     font-size: 14px;
     height: 27px;
@@ -247,30 +211,26 @@ img.server-info-icon {
 .setting-input-value {
     flex-grow: 1;
     font-size: 14px;
-    border-radius: 4px;
+    border-radius: 3px;
     padding: 13px;
-    border: rgba(237, 237, 237, 1.000) 2px solid;
+    border: #ededed 2px solid;
     outline-width: 0;
     background: transparent;
     max-width: 450px;
 }
 
 .setting-input-value:focus {
-    border: rgba(78, 191, 172, 1.000) 2px solid;
+    border: #4EBFAC 2px solid;
 }
 
-.invalid-input-value:focus {
-    border: rgba(239, 83, 80, 1) 2px solid;
-}
-
-.manual-proxy-block {
-    width: 96%;
+.setting-block {
+    width: 100%;
 }
 
 .actions-container {
     display: flex;
     font-size: 14px;
-    color: rgba(35, 93, 58, 1.000);
+    color: #235d3a;
     vertical-align: middle;
     margin: 10px 0;
     flex-wrap: wrap;
@@ -291,7 +251,6 @@ img.server-info-icon {
 
 .settings-pane {
     flex-grow: 1;
-    min-width: 550px;
 }
 
 .action:hover {
@@ -303,7 +262,7 @@ img.server-info-icon {
 }
 
 .action.disabled {
-    color: rgba(153, 153, 153, 1.000);
+    color: #999;
 }
 
 .settings-card {
@@ -311,12 +270,13 @@ img.server-info-icon {
     flex-wrap: wrap;
     padding: 12px 30px;
     margin: 10px 0 20px 0;
-    background: rgba(255, 255, 255, 1.000);
-    width: 80%;
+    background: #fff;
+    width: 70%;
     transition: all 0.2s;
 }
 
 .settings-card:hover {
+    border-left: 8px solid #bcbcbc;
     box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 0px 0px rgba(0, 0, 0, 0.12);
 }
 
@@ -326,59 +286,25 @@ img.server-info-icon {
 }
 
 .red {
-    color: rgb(240, 148, 148);
-    background: rgba(255, 255, 255, 1.000);
-    border-radius: 4px;
-    display: inline-block;
-    border: 2px solid rgb(240, 148, 148);
-    padding: 10px;
-    width: 100px;
-    cursor: pointer;
-    font-size: 1rem;
-    font-weight: bold;
-    transition: background-color 0.2s ease;
-    text-decoration: none;
-    text-align: center;
+    color: #ffffff;
+    background: #ef5350;
+    padding: 3px;
+    padding-right: 10px;
+    padding-left: 10px;
 }
 
-.red:hover {
-    background-color: rgb(240, 148, 148);
-    color: rgba(255, 255, 255, 1.000);
-}
-
-.green {
-    color: rgba(255, 255, 255, 1.000);
-    background: rgba(78, 191, 172, 1.000);
-    border-radius: 4px;
-    display: inline-block;
-    border: none;
-    padding: 10px;
-    width: 100px;
-    cursor: pointer;
-    font-size: 1rem;
-    font-weight: bold;
-    transition: background-color 0.2s ease;
-    text-decoration: none;
-    text-align: center;
-}
-
-.green:hover {
-    background-color: rgba(60, 159, 141, 1.000);
-    color: rgba(255, 255, 255, 1.000);
-}
-
-.w-150 {
-    width: 150px;
-}
-
-.w-250 {
-    width: 250px;
+.blue {
+    color: #ffffff;
+    background: #4EBFAC;
+    padding: 3px;
+    padding-right: 10px;
+    padding-left: 10px;
 }
 
 .grey {
-    color: rgba(158, 158, 158, 1.000);
-    background: rgba(250, 250, 250, 1.000);
-    border: 1px solid rgba(158, 158, 158, 1.000);
+    color: #9E9E9E;
+    background: #FAFAFA;
+    border: 1px solid #9E9E9E;
 }
 
 .setting-row {
@@ -389,37 +315,41 @@ img.server-info-icon {
     margin: 6px;
 }
 
-#note {
-    font-size: 10px;
-}
-
 .code {
     font-family: Courier New, Courier, monospace;
 }
 
 i.open-tab-button {
-    padding-left: 5px;
-    font-size: 19px;
+    padding: 0 5px;
+    font-size: 18px;
     cursor: pointer;
 }
 
-#css-delete-action {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    box-sizing: border-box;
-
-    /*
-        .action class will add extra margin to right which
-        we don't want for a button; the extra margin is intended for radio buttons
-    */
-    margin-right: 0px;
+.reset-data-button,
+.custom-css-button {
+    display: inline-block;
+    border: none;
+    padding: 10px;
+    width: 120px;
+    cursor: pointer;
+    font-size: 13px;
+    transition: background-color 0.2s ease;
+    text-decoration: none;
 }
 
-.selected-css-path,
-.download-folder-path {
-    background: rgba(238, 238, 238, 1.000);
-    padding: 5px 10px;
+.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%;
@@ -431,11 +361,7 @@ i.open-tab-button {
 }
 
 #server-info-container {
-    /* min-height: calc(100% - 260px); */
-}
-
-#new-org-button {
-    margin: 30px 0px 30px 0px;
+    min-height: calc(100% - 260px);
 }
 
 #create-organization-container {
@@ -458,7 +384,7 @@ i.open-tab-button {
     visibility: hidden;
 }
 
-.toggle + label {
+.toggle+label {
     display: block;
     position: relative;
     cursor: pointer;
@@ -466,21 +392,16 @@ i.open-tab-button {
     user-select: none;
 }
 
-.disallowed:hover {
-    background-color: rgba(241, 241, 241, 1.000);
-    cursor: not-allowed;
-}
-
-input.toggle-round + label {
+input.toggle-round+label {
     padding: 2px;
     width: 50px;
     height: 25px;
-    background-color: rgba(221, 221, 221, 1.000);
+    background-color: #dddddd;
     border-radius: 25px;
 }
 
-input.toggle-round + label::before,
-input.toggle-round + label::after {
+input.toggle-round+label:before,
+input.toggle-round+label:after {
     display: block;
     position: absolute;
     top: 2px;
@@ -489,34 +410,28 @@ input.toggle-round + label::after {
     content: "";
 }
 
-input.toggle-round + label::before {
-    background-color: rgba(241, 241, 241, 1.000);
+input.toggle-round+label:before {
+    right: 2px;
+    background-color: #f1f1f1;
     border-radius: 25px;
-    top: 0;
-    right: 0px;
-    left: 0px;
-    bottom: 0px;
 }
 
-input.toggle-round + label::after {
+input.toggle-round+label:after {
     width: 25px;
     height: 25px;
-    background-color: rgba(255, 255, 255, 1.000);
+    background-color: #fff;
     border-radius: 100%;
 }
 
-input.toggle-round:checked + label::before {
-    background-color: rgba(78, 191, 172, 1.000);
-    top: 0;
-    right: 0px;
-    left: 0px;
-    bottom: 0px;
+input.toggle-round:checked+label:before {
+    background-color: #4EBFAC;
 }
 
-input.toggle-round:checked + label::after {
+input.toggle-round:checked+label:after {
     margin-left: 25px;
 }
 
+
 /*  Add new server modal */
 
 .add-server-modal {
@@ -530,17 +445,17 @@ input.toggle-round:checked + label::after {
     width: 100%;
     height: 100%;
     /* background: rgba(61, 64, 67, 15); */
-    background: linear-gradient(35deg, rgba(0, 59, 82, 1.000), rgba(69, 181, 155, 1.000));
-    overflow: auto;
+    background: linear-gradient(35deg, #003b52, #45b59b);
 }
 
+
 /* Modal Content */
 
 .modal-container {
-    background-color: rgba(244, 247, 248, 1.000);
+    background-color: #f4f7f8;
     margin: auto;
     padding: 57px;
-    border: rgba(218, 225, 227, 1.000) 1px solid;
+    border: #dae1e3 1px solid;
     width: 550px;
     height: 370px;
     border-radius: 4px;
@@ -553,14 +468,15 @@ input.toggle-round:checked + label::after {
 
 .divider {
     margin-bottom: 30px;
+    margin-right: 10px;
     margin-top: 30px;
-    color: rgba(125, 135, 138, 1.000);
+    color: #7d878a;
 }
 
 .divider hr {
-    margin-left: 8px;
-    margin-right: 8px;
-    width: 44%;
+    margin-left: auto;
+    margin-right: auto;
+    width: 45%;
 }
 
 .left {
@@ -576,117 +492,31 @@ input.toggle-round:checked + label::after {
     text-align: center;
     align-items: center;
     padding-top: 13px;
-    margin-left: -5px;
 }
 
-.server-center button {
+.server-center span {
     font-weight: bold;
     font-size: 1.1rem;
+    padding: 10px;
     margin: auto;
     align-items: center;
     text-align: center;
-    color: rgba(255, 255, 255, 1.000);
-    background: rgba(78, 191, 172, 1.000);
-    border-color: none;
-    border: none;
-    width: 98%;
-    height: 46px;
-    border-radius: 4px;
-    cursor: pointer;
 }
 
-.server-center button:hover {
-    background: rgba(50, 149, 136, 1.000);
+.server-center .blue {
+    border-radius: 3px;
 }
 
-.server-center button:focus {
-    background: rgba(50, 149, 136, 1.000);
+.server-center .blue:hover {
+    border-right: 2px solid #309085;
+    border-bottom: 2px solid #309085;
 }
 
-.certificates-card {
-    width: 80%;
-}
-
-.certificate-input {
-    width: 100%;
-    margin-top: 10px;
-    display: inline-flex;
-}
-
-.certificate-input div {
-    align-self: center;
-}
-
-.certificate-input .setting-input-value {
-    margin-left: 10px;
-    max-width: 100%;
-}
-
-.tip {
-    background: none;
-    padding: 0;
-}
-
-.tip:hover {
-    box-shadow: none;
-}
-
-.md-14 {
-    font-size: 14px;
-    vertical-align: middle;
-    padding-right: 6px;
-}
-
-#open-hotkeys-link {
-    text-decoration: underline;
-    cursor: pointer;
-}
-
-.server-network-option {
-    font-weight: bold;
-    font-size: 1.1rem;
-    margin-top: 10px;
-    padding-top: 15px;
-    align-items: center;
-    text-align: center;
-    color: rgb(78, 191, 172);
-    width: 98%;
-    height: 46px;
-    cursor: pointer;
-}
-
-i.open-network-button {
-    font-size: 16px;
-    cursor: pointer;
-    padding-left: 5px;
-    position: absolute;
-}
 
 /* responsive grid */
-@media (min-width: 500px) and (max-width: 720px) {
-    #new-server-container {
-        padding-left: 0px;
-        width: 60vw;
-        padding-right: 4vh;
-    }
-    .page-title {
-        width: 60vw;
-    }
-}
-
-@media (max-width: 500px) {
-    #new-server-container {
-        padding-left: 0px;
-        width: 54%;
-    }
-    .page-title {
-        width: 54%;
-    }
-}
 
 @media (max-width: 650px) {
-    .selected-css-path,
-    .download-folder-path {
+    .selected-css-path {
         margin-right: 15px;
     }
     #css-delete-action {
@@ -703,51 +533,10 @@ i.open-network-button {
         padding: 40px;
         min-width: 300px;
     }
-    .server-center button {
-        margin-right: -12px;
-        width: 100%;
+    .server-center .blue {
+        margin-right: 1px;
     }
-    .divider {
-        margin-right: -8px;
+    #new-server-container {
+        padding-left: 0px;
     }
-    .divider hr {
-        margin-left: 6px;
-        margin-right: 6px;
-        width: 43%;
-    }
-}
-
-@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;
-    }
-}
-
-.lang-menu {
-    font-size: 13px;
-    font-weight: bold;
-    background: rgba(78, 191, 172, 1.000);
-    width: 100px;
-    height: 38px;
-    color: rgba(255, 255, 255, 1.000);
-    border-color: rgba(0, 0, 0, 0);
-}
+}

app/renderer/css/preload.css

@@ -1,9 +1,9 @@
 /* Override css rules */
 
-.portico-wrap > .header {
+.portico-wrap>.header {
     display: none;
 }
 
-.portico-container > .footer {
+.portico-container>.footer {
     display: none;
 }

app/renderer/js/clipboard-decrypter.ts

@@ -1,82 +0,0 @@
-import crypto from 'crypto';
-import {clipboard} from 'electron';
-
-// This helper is exposed via electron_bridge for use in the social
-// login flow.
-//
-// It consists of a key and a promised token.  The in-app page sends
-// the key to the server, and opens the user’s browser to a page where
-// they can log in and get a token encrypted to that key.  When the
-// user copies the encrypted token from their browser to the
-// clipboard, we decrypt it and resolve the promise.  The in-app page
-// then uses the decrypted token to log the user in within the app.
-//
-// The encryption is authenticated (AES-GCM) to guarantee that we
-// don’t leak anything from the user’s clipboard other than the token
-// intended for us.
-
-export class ClipboardDecrypterImpl implements ClipboardDecrypter {
-	version: number;
-	key: Uint8Array;
-	pasted: Promise<string>;
-
-	constructor(_: number) {
-		// At this time, the only version is 1.
-		this.version = 1;
-		this.key = crypto.randomBytes(32);
-		this.pasted = new Promise(resolve => {
-			let interval: NodeJS.Timeout | null = null;
-			const startPolling = () => {
-				if (interval === null) {
-					interval = setInterval(poll, 1000);
-				}
-
-				poll();
-			};
-
-			const stopPolling = () => {
-				if (interval !== null) {
-					clearInterval(interval);
-					interval = null;
-				}
-			};
-
-			const poll = () => {
-				let plaintext;
-
-				try {
-					const data = Buffer.from(clipboard.readText(), 'hex');
-					const iv = data.slice(0, 12);
-					const ciphertext = data.slice(12, -16);
-					const authTag = data.slice(-16);
-					const decipher = crypto.createDecipheriv(
-						'aes-256-gcm',
-						this.key,
-						iv,
-						{authTagLength: 16}
-					);
-					decipher.setAuthTag(authTag);
-					plaintext =
-						decipher.update(ciphertext, undefined, 'utf8') +
-						decipher.final('utf8');
-				} catch {
-					// If the parsing or decryption failed in any way,
-					// the correct token hasn’t been copied yet; try
-					// again next time.
-					return;
-				}
-
-				window.removeEventListener('focus', startPolling);
-				window.removeEventListener('blur', stopPolling);
-				stopPolling();
-				resolve(plaintext);
-			};
-
-			window.addEventListener('focus', startPolling);
-			window.addEventListener('blur', stopPolling);
-			if (document.hasFocus()) {
-				startPolling();
-			}
-		});
-	}
-}

app/renderer/js/components/base.js

@@ -0,0 +1,11 @@
+'use strict';
+
+class BaseComponent {
+	generateNodeFromTemplate(template) {
+		const wrapper = document.createElement('div');
+		wrapper.innerHTML = template;
+		return wrapper.firstElementChild;
+	}
+}
+
+module.exports = BaseComponent;

app/renderer/js/components/base.ts

@@ -1,7 +0,0 @@
-export default class BaseComponent {
-	generateNodeFromHTML(html: string): Element | null {
-		const wrapper = document.createElement('div');
-		wrapper.innerHTML = html;
-		return wrapper.firstElementChild;
-	}
-}

app/renderer/js/components/context-menu.ts

@@ -1,115 +0,0 @@
-import {remote, ContextMenuParams} from 'electron';
-
-import * as t from '../utils/translation-util';
-
-const {clipboard, Menu} = remote;
-
-export const contextMenu = (webContents: Electron.WebContents, event: Event, props: ContextMenuParams) => {
-	const isText = props.selectionText !== '';
-	const isLink = props.linkURL !== '';
-	const linkURL = isLink ? new URL(props.linkURL) : undefined;
-	const isEmailAddress = isLink ? linkURL.protocol === 'mailto:' : undefined;
-
-	const makeSuggestion = (suggestion: string) => ({
-		label: suggestion,
-		visible: true,
-		async click() {
-			await webContents.insertText(suggestion);
-		}
-	});
-
-	let menuTemplate: Electron.MenuItemConstructorOptions[] = [{
-		label: t.__('Add to Dictionary'),
-		visible: props.isEditable && isText && props.misspelledWord.length > 0,
-		click(_item) {
-			webContents.session.addWordToSpellCheckerDictionary(props.misspelledWord);
-		}
-	}, {
-		type: 'separator',
-		visible: props.isEditable && isText && props.misspelledWord.length > 0
-	}, {
-		label: `${t.__('Look Up')} "${props.selectionText}"`,
-		visible: process.platform === 'darwin' && isText,
-		click(_item) {
-			webContents.showDefinitionForSelection();
-		}
-	}, {
-		type: 'separator',
-		visible: process.platform === 'darwin' && isText
-	}, {
-		label: t.__('Cut'),
-		visible: isText,
-		enabled: props.isEditable,
-		accelerator: 'CommandOrControl+X',
-		click(_item) {
-			webContents.cut();
-		}
-	}, {
-		label: t.__('Copy'),
-		accelerator: 'CommandOrControl+C',
-		enabled: props.editFlags.canCopy,
-		click(_item) {
-			webContents.copy();
-		}
-	}, {
-		label: t.__('Paste'), // Bug: Paste replaces text
-		accelerator: 'CommandOrControl+V',
-		enabled: props.isEditable,
-		click() {
-			webContents.paste();
-		}
-	}, {
-		type: 'separator'
-	}, {
-		label: isEmailAddress ? t.__('Copy Email Address') : t.__('Copy Link'),
-		visible: isLink,
-		click(_item) {
-			clipboard.write({
-				bookmark: props.linkText,
-				text: isEmailAddress ? linkURL.pathname : props.linkURL
-			});
-		}
-	}, {
-		label: t.__('Copy Image'),
-		visible: props.mediaType === 'image',
-		click(_item) {
-			webContents.copyImageAt(props.x, props.y);
-		}
-	}, {
-		label: t.__('Copy Image URL'),
-		visible: props.mediaType === 'image',
-		click(_item) {
-			clipboard.write({
-				bookmark: props.srcURL,
-				text: props.srcURL
-			});
-		}
-	}, {
-		type: 'separator',
-		visible: isLink || props.mediaType === 'image'
-	}, {
-		label: t.__('Services'),
-		visible: process.platform === 'darwin',
-		role: 'services'
-	}];
-
-	if (props.misspelledWord) {
-		if (props.dictionarySuggestions.length > 0) {
-			const suggestions: Electron.MenuItemConstructorOptions[] = props.dictionarySuggestions.map((suggestion: string) => makeSuggestion(suggestion));
-			menuTemplate = suggestions.concat(menuTemplate);
-		} else {
-			menuTemplate.unshift({
-				label: t.__('No Suggestion Found'),
-				enabled: false
-			});
-		}
-	}
-	// Hide the invisible separators on Linux and Windows
-	// Electron has a bug which ignores visible: false parameter for separator menuitems. So we remove them here.
-	// https://github.com/electron/electron/issues/5869
-	// https://github.com/electron/electron/issues/6906
-
-	const filteredMenuTemplate = menuTemplate.filter(menuItem => menuItem.visible ?? true);
-	const menu = Menu.buildFromTemplate(filteredMenuTemplate);
-	menu.popup();
-};

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

@@ -0,0 +1,44 @@
+'use strict';
+
+const Tab = require(__dirname + '/../components/tab.js');
+
+class FunctionalTab extends Tab {
+	template() {
+		return `<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
+					<div class="server-tab-badge close-button">
+						<i class="material-icons">close</i>
+					</div>
+					<div class="server-tab">
+						<i class="material-icons">${this.props.materialIcon}</i>
+					</div>
+				</div>`;
+	}
+
+	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();
+		}
+	}
+
+	registerListeners() {
+		super.registerListeners();
+
+		this.$el.addEventListener('mouseover', () => {
+			this.$closeButton.classList.add('active');
+		});
+
+		this.$el.addEventListener('mouseout', () => {
+			this.$closeButton.classList.remove('active');
+		});
+
+		this.$closeButton.addEventListener('click', e => {
+			this.props.onDestroy();
+			e.stopPropagation();
+		});
+	}
+}
+
+module.exports = FunctionalTab;

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

@@ -1,51 +0,0 @@
-import {htmlEscape} from 'escape-goat';
-
-import Tab, {TabProps} from './tab';
-
-export default class FunctionalTab extends Tab {
-	$closeButton: Element;
-
-	constructor(props: TabProps) {
-		super(props);
-		this.init();
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-			<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
-				<div class="server-tab-badge close-button">
-					<i class="material-icons">close</i>
-				</div>
-				<div class="server-tab">
-					<i class="material-icons">${this.props.materialIcon}</i>
-				</div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.$el = this.generateNodeFromHTML(this.templateHTML());
-		if (this.props.name !== 'Settings') {
-			this.props.$root.append(this.$el);
-			this.$closeButton = this.$el.querySelectorAll('.server-tab-badge')[0];
-			this.registerListeners();
-		}
-	}
-
-	registerListeners(): void {
-		super.registerListeners();
-
-		this.$el.addEventListener('mouseover', () => {
-			this.$closeButton.classList.add('active');
-		});
-
-		this.$el.addEventListener('mouseout', () => {
-			this.$closeButton.classList.remove('active');
-		});
-
-		this.$closeButton.addEventListener('click', (event: Event) => {
-			this.props.onDestroy();
-			event.stopPropagation();
-		});
-	}
-}

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

@@ -1,61 +0,0 @@
-import {ipcRenderer, remote} from 'electron';
-
-import * as ConfigUtil from '../utils/config-util';
-import * as LinkUtil from '../utils/link-util';
-
-import type WebView from './webview';
-
-const {shell, app} = remote;
-
-const dingSound = new Audio('../resources/sounds/ding.ogg');
-
-export default function handleExternalLink(this: WebView, event: Electron.NewWindowEvent): void {
-	event.preventDefault();
-
-	const url = new URL(event.url);
-	const downloadPath = ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`);
-
-	if (LinkUtil.isUploadsUrl(this.props.url, url)) {
-		ipcRenderer.send('downloadFile', url.href, downloadPath);
-		ipcRenderer.once('downloadFileCompleted', async (_event: Event, filePath: string, fileName: string) => {
-			const downloadNotification = new Notification('Download Complete', {
-				body: `Click to show ${fileName} in folder`,
-				silent: true // We'll play our own sound - ding.ogg
-			});
-
-			downloadNotification.addEventListener('click', () => {
-				// Reveal file in download folder
-				shell.showItemInFolder(filePath);
-			});
-			ipcRenderer.removeAllListeners('downloadFileFailed');
-
-			// Play sound to indicate download complete
-			if (!ConfigUtil.getConfigItem('silent')) {
-				await dingSound.play();
-			}
-		});
-
-		ipcRenderer.once('downloadFileFailed', (_event: Event, state: string) => {
-			// Automatic download failed, so show save dialog prompt and download
-			// through webview
-			// Only do this if it is the automatic download, otherwise show an error (so we aren't showing two save
-			// prompts right after each other)
-			// Check that the download is not cancelled by user
-			if (state !== 'cancelled') {
-				if (ConfigUtil.getConfigItem('promptDownload', false)) {
-					// We need to create a "new Notification" to display it, but just `Notification(...)` on its own
-					// doesn't work
-					new Notification('Download Complete', { // eslint-disable-line no-new
-						body: 'Download failed'
-					});
-				} else {
-					this.$el.downloadURL(url.href);
-				}
-			}
-
-			ipcRenderer.removeAllListeners('downloadFileCompleted');
-		});
-	} else {
-		(async () => LinkUtil.openBrowser(url))();
-	}
-}

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

@@ -0,0 +1,60 @@
+'use strict';
+
+const Tab = require(__dirname + '/../components/tab.js');
+const SystemUtil = require(__dirname + '/../utils/system-util.js');
+
+const {ipcRenderer} = require('electron');
+
+class ServerTab extends Tab {
+	template() {
+		return `<div class="tab" data-tab-id="${this.props.tabIndex}">
+					<div class="server-tooltip" style="display:none"></div>
+					<div class="server-tab-badge"></div>
+					<div class="server-tab">
+					<img class="server-icons" src='${this.props.icon}'/>
+					</div>
+					<div class="server-tab-shortcut">${this.generateShortcutText()}</div>
+				</div>`;
+	}
+
+	init() {
+		super.init();
+
+		this.$badge = this.$el.getElementsByClassName('server-tab-badge')[0];
+	}
+
+	updateBadge(count) {
+		if (count > 0) {
+			const formattedCount = count > 999 ? '1K+' : count;
+
+			this.$badge.innerHTML = formattedCount;
+			this.$badge.classList.add('active');
+		} else {
+			this.$badge.classList.remove('active');
+		}
+	}
+
+	generateShortcutText() {
+		// Only provide shortcuts for server [0..10]
+		if (this.props.index >= 10) {
+			return '';
+		}
+
+		const shownIndex = this.props.index + 1;
+
+		let shortcutText = '';
+
+		if (SystemUtil.getOS() === 'Mac') {
+			shortcutText = `⌘ ${shownIndex}`;
+		} else {
+			shortcutText = `Ctrl+${shownIndex}`;
+		}
+
+		// Array index == Shown index - 1
+		ipcRenderer.send('switch-server-tab', shownIndex - 1);
+
+		return shortcutText;
+	}
+}
+
+module.exports = ServerTab;

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

@@ -1,64 +0,0 @@
-import {ipcRenderer} from 'electron';
-
-import {htmlEscape} from 'escape-goat';
-
-import * as SystemUtil from '../utils/system-util';
-
-import Tab, {TabProps} from './tab';
-
-export default class ServerTab extends Tab {
-	$badge: Element;
-
-	constructor(props: TabProps) {
-		super(props);
-		this.init();
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-			<div class="tab" data-tab-id="${this.props.tabIndex}">
-				<div class="server-tooltip" style="display:none">${this.props.name}</div>
-				<div class="server-tab-badge"></div>
-				<div class="server-tab">
-					<img class="server-icons" src="${this.props.icon}"/>
-				</div>
-				<div class="server-tab-shortcut">${this.generateShortcutText()}</div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.$el = this.generateNodeFromHTML(this.templateHTML());
-		this.props.$root.append(this.$el);
-		this.registerListeners();
-		this.$badge = this.$el.querySelectorAll('.server-tab-badge')[0];
-	}
-
-	updateBadge(count: number): void {
-		if (count > 0) {
-			const formattedCount = count > 999 ? '1K+' : count.toString();
-			this.$badge.textContent = formattedCount;
-			this.$badge.classList.add('active');
-		} else {
-			this.$badge.classList.remove('active');
-		}
-	}
-
-	generateShortcutText(): string {
-		// Only provide shortcuts for server [0..10]
-		if (this.props.index >= 10) {
-			return '';
-		}
-
-		const shownIndex = this.props.index + 1;
-
-		let shortcutText = '';
-
-		shortcutText = SystemUtil.getOS() === 'Mac' ? `⌘ ${shownIndex}` : `Ctrl+${shownIndex}`;
-
-		// Array index == Shown index - 1
-		ipcRenderer.send('switch-server-tab', shownIndex - 1);
-
-		return shortcutText;
-	}
-}

app/renderer/js/components/tab.js

@@ -0,0 +1,48 @@
+'use strict';
+
+const BaseComponent = require(__dirname + '/../components/base.js');
+
+class Tab extends BaseComponent {
+	constructor(props) {
+		super();
+
+		this.props = props;
+		this.webview = this.props.webview;
+
+		this.init();
+	}
+
+	init() {
+		this.$el = this.generateNodeFromTemplate(this.template());
+		this.props.$root.appendChild(this.$el);
+
+		this.registerListeners();
+	}
+
+	registerListeners() {
+		this.$el.addEventListener('click', this.props.onClick);
+		this.$el.addEventListener('mouseover', this.props.onHover);
+		this.$el.addEventListener('mouseout', this.props.onHoverOut);
+	}
+
+	isLoading() {
+		return this.webview.isLoading;
+	}
+
+	activate() {
+		this.$el.classList.add('active');
+		this.webview.load();
+	}
+
+	deactivate() {
+		this.$el.classList.remove('active');
+		this.webview.hide();
+	}
+
+	destroy() {
+		this.$el.parentNode.removeChild(this.$el);
+		this.webview.$el.parentNode.removeChild(this.webview.$el);
+	}
+}
+
+module.exports = Tab;

app/renderer/js/components/tab.ts

@@ -1,54 +0,0 @@
-import BaseComponent from './base';
-import WebView from './webview';
-
-export interface TabProps {
-	role: string;
-	icon?: string;
-	name: string;
-	$root: Element;
-	onClick: () => void;
-	index: number;
-	tabIndex: number;
-	onHover?: () => void;
-	onHoverOut?: () => void;
-	webview: WebView;
-	materialIcon?: string;
-	onDestroy?: () => void;
-}
-
-export default class Tab extends BaseComponent {
-	props: TabProps;
-	webview: WebView;
-	$el: Element;
-	constructor(props: TabProps) {
-		super();
-
-		this.props = props;
-		this.webview = this.props.webview;
-	}
-
-	registerListeners(): void {
-		this.$el.addEventListener('click', this.props.onClick);
-		this.$el.addEventListener('mouseover', this.props.onHover);
-		this.$el.addEventListener('mouseout', this.props.onHoverOut);
-	}
-
-	showNetworkError(): void {
-		this.webview.forceLoad();
-	}
-
-	activate(): void {
-		this.$el.classList.add('active');
-		this.webview.load();
-	}
-
-	deactivate(): void {
-		this.$el.classList.remove('active');
-		this.webview.hide();
-	}
-
-	destroy(): void {
-		this.$el.remove();
-		this.webview.$el.remove();
-	}
-}

app/renderer/js/components/webview.js

@@ -0,0 +1,241 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+
+const DomainUtil = require(__dirname + '/../utils/domain-util.js');
+const ConfigUtil = require(__dirname + '/../utils/config-util.js');
+const SystemUtil = require(__dirname + '/../utils/system-util.js');
+const LinkUtil = require(__dirname + '/../utils/link-util.js');
+const { shell, app, dialog } = require('electron').remote;
+
+const BaseComponent = require(__dirname + '/../components/base.js');
+
+const shouldSilentWebview = ConfigUtil.getConfigItem('silent');
+class WebView extends BaseComponent {
+	constructor(props) {
+		super();
+
+		this.props = props;
+
+		this.zoomFactor = 1.0;
+		this.loading = false;
+		this.badgeCount = 0;
+		this.customCSS = ConfigUtil.getConfigItem('customCSS');
+	}
+
+	template() {
+		return `<webview
+					class="disabled"
+					data-tab-id="${this.props.tabIndex}"
+					src="${this.props.url}"
+					${this.props.nodeIntegration ? 'nodeIntegration' : ''}
+					disablewebsecurity
+					${this.props.preload ? 'preload="js/preload.js"' : ''}
+					partition="persist:webviewsession"
+					webpreferences="allowRunningInsecureContent, javascript=yes">
+				</webview>`;
+	}
+
+	init() {
+		this.$el = this.generateNodeFromTemplate(this.template());
+		this.props.$root.appendChild(this.$el);
+
+		this.registerListeners();
+	}
+
+	registerListeners() {
+		this.$el.addEventListener('new-window', event => {
+			const { url } = event;
+			const domainPrefix = DomainUtil.getDomain(this.props.index).url;
+
+			if (LinkUtil.isInternal(domainPrefix, url) || url === (domainPrefix + '/')) {
+				event.preventDefault();
+				this.$el.loadURL(url);
+			} else {
+				event.preventDefault();
+				shell.openExternal(url);
+			}
+		});
+
+		if (shouldSilentWebview) {
+			this.$el.addEventListener('dom-ready', () => {
+				this.$el.setAudioMuted(true);
+			});
+		}
+
+		this.$el.addEventListener('page-title-updated', event => {
+			const { title } = event;
+			this.badgeCount = this.getBadgeCount(title);
+			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
+			// https://chat.zulip.org/static/images/favicon/favicon-pms.png
+			if (favicons[0].indexOf('favicon-pms') > 0 && process.platform === 'darwin') {
+				// This api is only supported on macOS
+				app.dock.setBadge('●');
+			}
+		});
+
+		this.$el.addEventListener('dom-ready', () => {
+			if (this.props.role === 'server') {
+				this.$el.classList.add('onload');
+			}
+			this.show();
+		});
+
+		this.$el.addEventListener('did-fail-load', event => {
+			const { errorDescription } = event;
+			const hasConnectivityErr = (SystemUtil.connectivityERR.indexOf(errorDescription) >= 0);
+			if (hasConnectivityErr) {
+				console.error('error', errorDescription);
+				this.props.onNetworkError();
+			}
+		});
+
+		this.$el.addEventListener('did-start-loading', () => {
+			let userAgent = SystemUtil.getUserAgent();
+			if (!userAgent) {
+				SystemUtil.setUserAgent(this.$el.getUserAgent());
+				userAgent = SystemUtil.getUserAgent();
+			}
+			this.$el.setUserAgent(userAgent);
+		});
+	}
+
+	getBadgeCount(title) {
+		const messageCountInTitle = (/\(([0-9]+)\)/).exec(title);
+		return messageCountInTitle ? Number(messageCountInTitle[1]) : 0;
+	}
+
+	show() {
+		// Do not show WebView if another tab was selected and this tab should be in background.
+		if (!this.props.isActive()) {
+			return;
+		}
+
+		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() {
+		// focus Webview and it's contents when Window regain focus.
+		const webContents = this.$el.getWebContents();
+		if (webContents && !webContents.isFocused()) {
+			this.$el.focus();
+			webContents.focus();
+		}
+	}
+
+	hide() {
+		this.$el.classList.add('disabled');
+		this.$el.classList.remove('active');
+	}
+
+	load() {
+		if (this.$el) {
+			this.show();
+		} else {
+			this.init();
+		}
+	}
+
+	zoomIn() {
+		this.zoomFactor += 0.1;
+		this.$el.setZoomFactor(this.zoomFactor);
+	}
+
+	zoomOut() {
+		this.zoomFactor -= 0.1;
+		this.$el.setZoomFactor(this.zoomFactor);
+	}
+
+	zoomActualSize() {
+		this.zoomFactor = 1.0;
+		this.$el.setZoomFactor(this.zoomFactor);
+	}
+
+	logOut() {
+		this.$el.executeJavaScript('logout()');
+	}
+
+	showShortcut() {
+		this.$el.executeJavaScript('shortcut()');
+	}
+
+	openDevTools() {
+		this.$el.openDevTools();
+	}
+
+	back() {
+		if (this.$el.canGoBack()) {
+			this.$el.goBack();
+		}
+	}
+
+	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();
+		}
+	}
+
+	reload() {
+		this.hide();
+		this.$el.reload();
+	}
+
+	send(...param) {
+		this.$el.send(...param);
+	}
+}
+
+module.exports = WebView;

app/renderer/js/components/webview.ts

@@ -1,317 +0,0 @@
-import {ipcRenderer, remote} from 'electron';
-import fs from 'fs';
-import path from 'path';
-
-import {htmlEscape} from 'escape-goat';
-
-import * as ConfigUtil from '../utils/config-util';
-import * as SystemUtil from '../utils/system-util';
-
-import BaseComponent from './base';
-import {contextMenu} from './context-menu';
-import handleExternalLink from './handle-external-link';
-
-const {app, dialog} = remote;
-
-const shouldSilentWebview = ConfigUtil.getConfigItem('silent');
-
-interface WebViewProps {
-	$root: Element;
-	index: number;
-	tabIndex: number;
-	url: string;
-	role: string;
-	name: string;
-	isActive: () => boolean;
-	switchLoading: (loading: boolean, url: string) => void;
-	onNetworkError: (index: number) => void;
-	nodeIntegration: boolean;
-	preload: boolean;
-	onTitleChange: () => void;
-	hasPermission?: (origin: string, permission: string) => boolean;
-}
-
-export default class WebView extends BaseComponent {
-	props: WebViewProps;
-	zoomFactor: number;
-	badgeCount: number;
-	loading: boolean;
-	customCSS: string;
-	$webviewsContainer: DOMTokenList;
-	$el: Electron.WebviewTag;
-	domReady?: Promise<void>;
-
-	constructor(props: WebViewProps) {
-		super();
-
-		this.props = props;
-		this.zoomFactor = 1;
-		this.loading = true;
-		this.badgeCount = 0;
-		this.customCSS = ConfigUtil.getConfigItem('customCSS');
-		this.$webviewsContainer = document.querySelector('#webviews-container').classList;
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-			<webview
-				class="disabled"
-				data-tab-id="${this.props.tabIndex}"
-				src="${this.props.url}"
-				` + (this.props.nodeIntegration ? 'nodeIntegration' : '') + htmlEscape`
-				` + (this.props.preload ? 'preload="js/preload.js"' : '') + htmlEscape`
-				partition="persist:webviewsession"
-				name="${this.props.name}"
-				webpreferences="
-					contextIsolation=${!this.props.nodeIntegration},
-					spellcheck=${Boolean(ConfigUtil.getConfigItem('enableSpellchecker'))}
-				">
-			</webview>
-		`;
-	}
-
-	init(): void {
-		this.$el = this.generateNodeFromHTML(this.templateHTML()) as Electron.WebviewTag;
-		this.domReady = new Promise(resolve => {
-			this.$el.addEventListener('dom-ready', () => {
-				resolve();
-			}, true);
-		});
-		this.props.$root.append(this.$el);
-
-		this.registerListeners();
-	}
-
-	registerListeners(): void {
-		this.$el.addEventListener('new-window', event => {
-			handleExternalLink.call(this, event);
-		});
-
-		if (shouldSilentWebview) {
-			this.$el.addEventListener('dom-ready', () => {
-				this.$el.setAudioMuted(true);
-			});
-		}
-
-		this.$el.addEventListener('page-title-updated', event => {
-			const {title} = event;
-			this.badgeCount = this.getBadgeCount(title);
-			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
-			// https://chat.zulip.org/static/images/favicon/favicon-pms.png
-			if (favicons[0].indexOf('favicon-pms') > 0 && process.platform === 'darwin') {
-				// This api is only supported on macOS
-				app.dock.setBadge('●');
-				// Bounce the dock
-				if (ConfigUtil.getConfigItem('dockBouncing')) {
-					app.dock.bounce();
-				}
-			}
-		});
-
-		this.$el.addEventListener('dom-ready', () => {
-			const webContents = remote.webContents.fromId(this.$el.getWebContentsId());
-			webContents.addListener('context-menu', (event, menuParameters) => {
-				contextMenu(webContents, event, menuParameters);
-			});
-
-			if (this.props.role === 'server') {
-				this.$el.classList.add('onload');
-			}
-
-			this.loading = false;
-			this.props.switchLoading(false, this.props.url);
-			this.show();
-
-			// Refocus text boxes after reload
-			// Remove when upstream issue https://github.com/electron/electron/issues/14474 is fixed
-			this.$el.blur();
-			this.$el.focus();
-		});
-
-		this.$el.addEventListener('did-fail-load', event => {
-			const {errorDescription} = event;
-			const hasConnectivityError = SystemUtil.connectivityERR.includes(errorDescription);
-			if (hasConnectivityError) {
-				console.error('error', errorDescription);
-				if (!this.props.url.includes('network.html')) {
-					this.props.onNetworkError(this.props.index);
-				}
-			}
-		});
-
-		this.$el.addEventListener('did-start-loading', () => {
-			const isSettingPage = this.props.url.includes('renderer/preference.html');
-			if (!isSettingPage) {
-				this.props.switchLoading(true, this.props.url);
-			}
-		});
-
-		this.$el.addEventListener('did-stop-loading', () => {
-			this.props.switchLoading(false, this.props.url);
-		});
-	}
-
-	getBadgeCount(title: string): number {
-		const messageCountInTitle = (/\((\d+)\)/).exec(title);
-		return messageCountInTitle ? Number(messageCountInTitle[1]) : 0;
-	}
-
-	showNotificationSettings(): void {
-		ipcRenderer.sendTo(this.$el.getWebContentsId(), 'show-notification-settings');
-	}
-
-	show(): void {
-		// Do not show WebView if another tab was selected and this tab should be in background.
-		if (!this.props.isActive()) {
-			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.props.onTitleChange();
-		// Injecting preload css in webview to override some css rules
-		(async () => 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 errorMessage = 'The custom css previously set is deleted!';
-				dialog.showErrorBox('custom css file deleted!', errorMessage);
-				return;
-			}
-
-			(async () => this.$el.insertCSS(fs.readFileSync(path.resolve(__dirname, this.customCSS), 'utf8')))();
-		}
-	}
-
-	focus(): void {
-		// Focus Webview and it's contents when Window regain focus.
-		const webContents = remote.webContents.fromId(this.$el.getWebContentsId());
-		// HACK: webContents.isFocused() seems to be true even without the element
-		// being in focus. So, we check against `document.activeElement`.
-		if (webContents && this.$el !== document.activeElement) {
-			// HACK: Looks like blur needs to be called on the previously focused
-			// element to transfer focus correctly, in Electron v3.0.10
-			// See https://github.com/electron/electron/issues/15718
-			(document.activeElement as HTMLElement).blur();
-			this.$el.focus();
-			webContents.focus();
-		}
-	}
-
-	hide(): void {
-		this.$el.classList.add('disabled');
-		this.$el.classList.remove('active');
-	}
-
-	load(): void {
-		if (this.$el) {
-			this.show();
-		} else {
-			this.init();
-		}
-	}
-
-	zoomIn(): void {
-		this.zoomFactor += 0.1;
-		this.$el.setZoomFactor(this.zoomFactor);
-	}
-
-	zoomOut(): void {
-		this.zoomFactor -= 0.1;
-		this.$el.setZoomFactor(this.zoomFactor);
-	}
-
-	zoomActualSize(): void {
-		this.zoomFactor = 1;
-		this.$el.setZoomFactor(this.zoomFactor);
-	}
-
-	logOut(): void {
-		ipcRenderer.sendTo(this.$el.getWebContentsId(), 'logout');
-	}
-
-	showKeyboardShortcuts(): void {
-		ipcRenderer.sendTo(this.$el.getWebContentsId(), 'show-keyboard-shortcuts');
-	}
-
-	openDevTools(): void {
-		this.$el.openDevTools();
-	}
-
-	back(): void {
-		if (this.$el.canGoBack()) {
-			this.$el.goBack();
-			this.focus();
-		}
-	}
-
-	canGoBackButton(): void {
-		const $backButton = document.querySelector('#actions-container #back-action');
-		if (this.$el.canGoBack()) {
-			$backButton.classList.remove('disable');
-		} else {
-			$backButton.classList.add('disable');
-		}
-	}
-
-	forward(): void {
-		if (this.$el.canGoForward()) {
-			this.$el.goForward();
-		}
-	}
-
-	reload(): void {
-		this.hide();
-		// Shows the loading indicator till the webview is reloaded
-		this.$webviewsContainer.remove('loaded');
-		this.loading = true;
-		this.props.switchLoading(true, this.props.url);
-		this.$el.reload();
-	}
-
-	forceLoad(): void {
-		this.init();
-	}
-
-	async send(channel: string, ...parameters: unknown[]): Promise<void> {
-		await this.domReady;
-		await this.$el.send(channel, ...parameters);
-	}
-}

app/renderer/js/electron-bridge.ts

@@ -1,92 +0,0 @@
-import {ipcRenderer} from 'electron';
-import {EventEmitter} from 'events';
-
-import isDev from 'electron-is-dev';
-
-import {ClipboardDecrypterImpl} from './clipboard-decrypter';
-import {NotificationData, newNotification} from './notification';
-
-type ListenerType = ((...args: any[]) => void);
-
-let notificationReplySupported = false;
-// Indicates if the user is idle or not
-let idle = false;
-// Indicates the time at which user was last active
-let lastActive = Date.now();
-
-export const bridgeEvents = new EventEmitter();
-
-const electron_bridge: ElectronBridge = {
-	send_event: (eventName: string | symbol, ...args: unknown[]): boolean =>
-		bridgeEvents.emit(eventName, ...args),
-
-	on_event: (eventName: string, listener: ListenerType): void => {
-		bridgeEvents.on(eventName, listener);
-	},
-
-	new_notification: (
-		title: string,
-		options: NotificationOptions | undefined,
-		dispatch: (type: string, eventInit: EventInit) => boolean
-	): NotificationData =>
-		newNotification(title, options, dispatch),
-
-	get_idle_on_system: (): boolean => idle,
-
-	get_last_active_on_system: (): number => lastActive,
-
-	get_send_notification_reply_message_supported: (): boolean =>
-		notificationReplySupported,
-
-	set_send_notification_reply_message_supported: (value: boolean): void => {
-		notificationReplySupported = value;
-	},
-
-	decrypt_clipboard: (version: number): ClipboardDecrypterImpl =>
-		new ClipboardDecrypterImpl(version)
-};
-
-bridgeEvents.on('total_unread_count', (...args) => {
-	ipcRenderer.send('unread-count', ...args);
-});
-
-bridgeEvents.on('realm_name', realmName => {
-	const serverURL = location.origin;
-	ipcRenderer.send('realm-name-changed', serverURL, realmName);
-});
-
-bridgeEvents.on('realm_icon_url', (iconURL: unknown) => {
-	if (typeof iconURL !== 'string') {
-		throw new TypeError('Expected string for iconURL');
-	}
-
-	const serverURL = location.origin;
-	iconURL = iconURL.includes('http') ? iconURL : `${serverURL}${iconURL}`;
-	ipcRenderer.send('realm-icon-changed', serverURL, iconURL);
-});
-
-// Set user as active and update the time of last activity
-ipcRenderer.on('set-active', () => {
-	if (isDev) {
-		console.log('active');
-	}
-
-	idle = false;
-	lastActive = Date.now();
-});
-
-// Set user as idle and time of last activity is left unchanged
-ipcRenderer.on('set-idle', () => {
-	if (isDev) {
-		console.log('idle');
-	}
-
-	idle = true;
-});
-
-// This follows node's idiomatic implementation of event
-// emitters to make event handling more simpler instead of using
-// functions zulip side will emit event using ElectronBrigde.send_event
-// which is alias of .emit and on this side we can handle the data by adding
-// a listener for the event.
-export default electron_bridge;

app/renderer/js/feedback.ts

@@ -1,50 +0,0 @@
-import {remote} from 'electron';
-import fs from 'fs';
-import path from 'path';
-
-import SendFeedback from '@electron-elements/send-feedback';
-
-const {app} = remote;
-
-customElements.define('send-feedback', SendFeedback);
-export const sendFeedback: SendFeedback = document.querySelector('send-feedback');
-export const feedbackHolder = sendFeedback.parentElement;
-
-// Make the button color match zulip app's theme
-sendFeedback.customStylesheet = 'css/feedback.css';
-
-// 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: 'support@zulip.com'
-});
-
-feedbackHolder.addEventListener('click', (event: Event) => {
-	// Only remove the class if the grey out faded
-	// part is clicked and not the feedback element itself
-	if (event.target === event.currentTarget) {
-		feedbackHolder.classList.remove('show');
-	}
-});
-
-sendFeedback.addEventListener('feedback-submitted', () => {
-	setTimeout(() => {
-		feedbackHolder.classList.remove('show');
-	}, 1000);
-});
-
-sendFeedback.addEventListener('feedback-cancelled', () => {
-	feedbackHolder.classList.remove('show');
-});
-
-const dataDir = app.getPath('userData');
-const logsDir = path.join(dataDir, '/Logs');
-sendFeedback.logs.push(...fs.readdirSync(logsDir).map(file => path.join(logsDir, file)));

app/renderer/js/injected.ts

@@ -1,105 +0,0 @@
-'use strict';
-
-interface CompatElectronBridge extends ElectronBridge {
-	readonly idle_on_system: boolean;
-	readonly last_active_on_system: number;
-	send_notification_reply_message_supported: boolean;
-}
-
-(() => {
-	const zulipWindow = window as typeof window & {
-		electron_bridge: CompatElectronBridge;
-		raw_electron_bridge: ElectronBridge;
-	};
-
-	const electron_bridge: CompatElectronBridge = {
-		...zulipWindow.raw_electron_bridge,
-
-		get idle_on_system(): boolean {
-			return this.get_idle_on_system();
-		},
-
-		get last_active_on_system(): number {
-			return this.get_last_active_on_system();
-		},
-
-		get send_notification_reply_message_supported(): boolean {
-			return this.get_send_notification_reply_message_supported();
-		},
-
-		set send_notification_reply_message_supported(value: boolean) {
-			this.set_send_notification_reply_message_supported(value);
-		}
-	};
-
-	zulipWindow.electron_bridge = electron_bridge;
-
-	function attributeListener<T extends EventTarget>(type: string): PropertyDescriptor {
-		const symbol = Symbol('on' + type);
-
-		function listener(this: T, ev: Event): void {
-			if ((this as any)[symbol].call(this, ev) === false) {
-				ev.preventDefault();
-			}
-		}
-
-		return {
-			configurable: true,
-			enumerable: true,
-			get(this: T) {
-				return (this as any)[symbol];
-			},
-			set(this: T, value: unknown) {
-				if (typeof value === 'function') {
-					if (!(symbol in this)) {
-						this.addEventListener(type, listener);
-					}
-
-					(this as any)[symbol] = value;
-				} else if (symbol in this) {
-					this.removeEventListener(type, listener);
-					delete (this as any)[symbol];
-				}
-			}
-		};
-	}
-
-	const NativeNotification = Notification;
-
-	class InjectedNotification extends EventTarget {
-		constructor(title: string, options?: NotificationOptions) {
-			super();
-			Object.assign(
-				this,
-				electron_bridge.new_notification(title, options, (type: string, eventInit: EventInit) =>
-					this.dispatchEvent(new Event(type, eventInit))
-				)
-			);
-		}
-
-		static get maxActions(): number {
-			return NativeNotification.maxActions;
-		}
-
-		static get permission(): NotificationPermission {
-			return NativeNotification.permission;
-		}
-
-		static async requestPermission(callback?: NotificationPermissionCallback): Promise<NotificationPermission> {
-			if (callback) {
-				callback(await Promise.resolve(NativeNotification.permission));
-			}
-
-			return NativeNotification.permission;
-		}
-	}
-
-	Object.defineProperties(InjectedNotification.prototype, {
-		onclick: attributeListener('click'),
-		onclose: attributeListener('close'),
-		onerror: attributeListener('error'),
-		onshow: attributeListener('show')
-	});
-
-	window.Notification = InjectedNotification as any;
-})();

app/renderer/js/main.js

@@ -0,0 +1,524 @@
+'use strict';
+
+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 ReconnectUtil = require(__dirname + '/js/utils/reconnect-util.js');
+
+class ServerManagerView {
+	constructor() {
+		this.$addServerButton = document.getElementById('add-tab');
+		this.$tabsContainer = document.getElementById('tabs-container');
+
+		const $actionsContainer = document.getElementById('actions-container');
+		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.$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.$sidebar = document.getElementById('sidebar');
+
+		this.$fullscreenPopup = document.getElementById('fullscreen-popup');
+		this.$fullscreenEscapeKey = process.platform === 'darwin' ? '^⌘F' : 'F11';
+		this.$fullscreenPopup.innerHTML = `Press ${this.$fullscreenEscapeKey} to exit full screen`;
+
+		this.activeTabIndex = -1;
+		this.tabs = [];
+		this.functionalTabs = {};
+		this.tabIndex = 0;
+	}
+
+	init() {
+		this.loadProxy().then(() => {
+			this.initSidebar();
+			this.initTabs();
+			this.initActions();
+			this.registerIpcs();
+			this.initDefaultSettings();
+		});
+	}
+
+	loadProxy() {
+		return new Promise(resolve => {
+			const proxyEnabled = ConfigUtil.getConfigItem('useProxy', false);
+			if (proxyEnabled) {
+				session.fromPartition('persist:webviewsession').setProxy({
+					pacScript: ConfigUtil.getConfigItem('proxyPAC', ''),
+					proxyRules: ConfigUtil.getConfigItem('proxyRules', ''),
+					proxyBypassRules: ConfigUtil.getConfigItem('proxyBypass', '')
+				}, resolve);
+			} else {
+				session.fromPartition('persist:webviewsession').setProxy({
+					pacScript: '',
+					proxyRules: '',
+					proxyBypassRules: ''
+				}, resolve);
+			}
+		});
+	}
+
+	// Settings are initialized only when user clicks on General/Server/Network section settings
+	// In case, user doesn't visit these section, those values set to be null automatically
+	// This will make sure the default settings are correctly set to either true or false
+	initDefaultSettings() {
+		// Default settings which should be respected
+		const settingOptions = {
+			trayIcon: true,
+			useProxy: false,
+			showSidebar: true,
+			badgeOption: true,
+			startAtLogin: false,
+			startMinimized: false,
+			enableSpellchecker: true,
+			showNotification: true,
+			betaUpdate: false,
+			silent: false,
+			lastActiveTab: 0
+		};
+
+		// Platform specific settings
+
+		if (process.platform === 'win32') {
+			// Only available on Windows
+			settingOptions.flashTaskbarOnMessage = true;
+		}
+
+		for (const i in settingOptions) {
+			if (ConfigUtil.getConfigItem(i) === null) {
+				ConfigUtil.setConfigItem(i, settingOptions[i]);
+			}
+		}
+	}
+
+	initSidebar() {
+		const showSidebar = ConfigUtil.getConfigItem('showSidebar', true);
+		this.toggleSidebar(showSidebar);
+	}
+
+	initTabs() {
+		const servers = DomainUtil.getDomains();
+		if (servers.length > 0) {
+			for (let i = 0; i < servers.length; i++) {
+				this.initServer(servers[i], i);
+				DomainUtil.updateSavedServer(servers[i].url, i);
+				this.activateTab(i);
+			}
+			// 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');
+		}
+	}
+
+	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: () => {
+					return index === this.activeTabIndex;
+				},
+				onNetworkError: this.openNetworkTroubleshooting.bind(this),
+				onTitleChange: this.updateBadge.bind(this),
+				nodeIntegration: false,
+				preload: true
+			})
+		}));
+	}
+
+	initActions() {
+		this.$reloadButton.addEventListener('click', () => {
+			this.tabs[this.activeTabIndex].webview.reload();
+		});
+		this.$addServerButton.addEventListener('click', () => {
+			this.openSettings('AddServer');
+		});
+		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);
+		this.sidebarHoverEvent(this.$settingsButton, this.$settingsTooltip);
+		this.sidebarHoverEvent(this.$reloadButton, this.$reloadTooltip);
+		this.sidebarHoverEvent(this.$backButton, this.$backTooltip);
+	}
+
+	getTabIndex() {
+		const currentIndex = this.tabIndex;
+		this.tabIndex++;
+		return currentIndex;
+	}
+
+	sidebarHoverEvent(SidebarButton, SidebarTooltip) {
+		SidebarButton.addEventListener('mouseover', () => {
+			SidebarTooltip.removeAttribute('style');
+		});
+		SidebarButton.addEventListener('mouseout', () => {
+			SidebarTooltip.style.display = 'none';
+		});
+	}
+
+	onHover(index, serverName) {
+		this.$serverIconTooltip[index].innerHTML = serverName;
+		this.$serverIconTooltip[index].removeAttribute('style');
+	}
+
+	onHoverOut(index) {
+		this.$serverIconTooltip[index].style.display = 'none';
+	}
+
+	openFunctionalTab(tabProps) {
+		if (this.functionalTabs[tabProps.name] !== undefined) {
+			this.activateTab(this.functionalTabs[tabProps.name]);
+			return;
+		}
+
+		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: () => {
+					return this.functionalTabs[tabProps.name] === this.activeTabIndex;
+				},
+				onNetworkError: this.openNetworkTroubleshooting.bind(this),
+				onTitleChange: this.updateBadge.bind(this),
+				nodeIntegration: true,
+				preload: false
+			})
+		}));
+		this.activateTab(this.functionalTabs[tabProps.name]);
+	}
+
+	openSettings(nav = 'General') {
+		this.openFunctionalTab({
+			name: 'Settings',
+			materialIcon: 'settings',
+			url: `file://${__dirname}/preference.html#${nav}`
+		});
+		this.$settingsButton.classList.add('active');
+		this.tabs[this.functionalTabs.Settings].webview.send('switch-settings-nav', nav);
+	}
+
+	openAbout() {
+		this.openFunctionalTab({
+			name: 'About',
+			materialIcon: 'sentiment_very_satisfied',
+			url: `file://${__dirname}/about.html`
+		});
+	}
+
+	openNetworkTroubleshooting() {
+		this.openFunctionalTab({
+			name: 'Network Troubleshooting',
+			materialIcon: 'network_check',
+			url: `file://${__dirname}/network.html`
+		});
+	}
+
+	activateLastTab(index) {
+		// Open last active tab
+		ConfigUtil.setConfigItem('lastActiveTab', index);
+		// Open all the tabs in background
+		this.activateTab(index);
+	}
+
+	activateTab(index, hideOldTab = true) {
+		if (!this.tabs[index]) {
+			return;
+		}
+
+		if (this.activeTabIndex !== -1) {
+			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();
+
+		ipcRenderer.send('update-menu', {
+			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('toogle-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();
+					});
+				}
+			});
+		});
+	}
+
+	destroyTab(name, index) {
+		if (this.tabs[index].webview.loading) {
+			return;
+		}
+
+		this.tabs[index].destroy();
+
+		delete this.tabs[index];
+		delete this.functionalTabs[name];
+
+		// Issue #188: If the functional tab was not focused, do not activate another tab.
+		if (this.activeTabIndex === index) {
+			this.activateTab(0, false);
+		}
+	}
+
+	destroyView() {
+		// Clear global variables
+		this.activeTabIndex = -1;
+		this.tabs = [];
+		this.functionalTabs = {};
+
+		// Clear DOM elements
+		this.$tabsContainer.innerHTML = '';
+		this.$webviewsContainer.innerHTML = '';
+	}
+
+	reloadView() {
+		// Save and remember the index of last active tab so that we can use it later
+		const lastActiveTab = this.tabs[this.activeTabIndex].props.index;
+		ConfigUtil.setConfigItem('lastActiveTab', lastActiveTab);
+
+		// Destroy the current view and re-initiate it
+		this.destroyView();
+		this.initTabs();
+	}
+
+	// This will trigger when pressed CTRL/CMD + R [WIP]
+	// It won't reload the current view properly when you add/delete a server.
+	reloadCurrentView() {
+		this.$reloadButton.click();
+	}
+
+	updateBadge() {
+		let messageCountAll = 0;
+		for (let i = 0; i < this.tabs.length; i++) {
+			if (this.tabs[i] && this.tabs[i].updateBadge) {
+				const count = this.tabs[i].webview.badgeCount;
+				messageCountAll += count;
+				this.tabs[i].updateBadge(count);
+			}
+		}
+
+		ipcRenderer.send('update-badge', messageCountAll);
+	}
+
+	toggleSidebar(show) {
+		if (show) {
+			this.$sidebar.classList.remove('sidebar-hide');
+		} else {
+			this.$sidebar.classList.add('sidebar-hide');
+		}
+	}
+
+	registerIpcs() {
+		const webviewListeners = {
+			'webview-reload': 'reload',
+			back: 'back',
+			focus: 'focus',
+			forward: 'forward',
+			zoomIn: 'zoomIn',
+			zoomOut: 'zoomOut',
+			zoomActualSize: 'zoomActualSize',
+			'log-out': 'logOut',
+			shortcut: 'showShortcut',
+			'tab-devtools': 'openDevTools'
+		};
+
+		for (const key in webviewListeners) {
+			ipcRenderer.on(key, () => {
+				const activeWebview = this.tabs[this.activeTabIndex].webview;
+				if (activeWebview) {
+					activeWebview[webviewListeners[key]]();
+				}
+			});
+		}
+
+		ipcRenderer.on('open-settings', (event, settingNav) => {
+			this.openSettings(settingNav);
+		});
+
+		ipcRenderer.on('open-about', this.openAbout.bind(this));
+
+		ipcRenderer.on('reload-viewer', this.reloadView.bind(this, this.tabs[this.activeTabIndex].props.index));
+
+		ipcRenderer.on('reload-current-viewer', this.reloadCurrentView.bind(this));
+
+		ipcRenderer.on('hard-reload', () => {
+			ipcRenderer.send('reload-full-app');
+		});
+
+		ipcRenderer.on('clear-app-data', () => {
+			ipcRenderer.send('clear-app-settings');
+		});
+
+		ipcRenderer.on('switch-server-tab', (event, index) => {
+			this.activateLastTab(index);
+		});
+
+		ipcRenderer.on('reload-proxy', (event, showAlert) => {
+			this.loadProxy().then(() => {
+				if (showAlert) {
+					alert('Proxy settings saved!');
+				}
+			});
+		});
+
+		ipcRenderer.on('toggle-sidebar', (event, show) => {
+			this.toggleSidebar(show);
+		});
+
+		ipcRenderer.on('enter-fullscreen', () => {
+			this.$fullscreenPopup.classList.add('show');
+			this.$fullscreenPopup.classList.remove('hidden');
+		});
+
+		ipcRenderer.on('leave-fullscreen', () => {
+			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) {
+				const canvas = document.createElement('canvas');
+				canvas.height = 128;
+				canvas.width = 128;
+				canvas.style.letterSpacing = '-5px';
+				const ctx = canvas.getContext('2d');
+				ctx.fillStyle = '#f42020';
+				ctx.beginPath();
+				ctx.ellipse(64, 64, 64, 64, 0, 0, 2 * Math.PI);
+				ctx.fill();
+				ctx.textAlign = 'center';
+				ctx.fillStyle = 'white';
+				if (messageCount > 99) {
+					ctx.font = '65px Helvetica';
+					ctx.fillText('99+', 64, 85);
+				} else if (messageCount < 10) {
+					ctx.font = '90px Helvetica';
+					ctx.fillText(String(Math.min(99, messageCount)), 64, 96);
+				} else {
+					ctx.font = '85px Helvetica';
+					ctx.fillText(String(Math.min(99, messageCount)), 64, 90);
+				}
+				return canvas;
+			}
+			ipcRenderer.send('update-taskbar-icon', createOverlayIcon(messageCount).toDataURL(), String(messageCount));
+		});
+	}
+}
+
+window.onload = () => {
+	const serverManagerView = new ServerManagerView();
+	const reconnectUtil = new ReconnectUtil(serverManagerView);
+	serverManagerView.init();
+	window.addEventListener('online', () => {
+		reconnectUtil.pollInternetAndReload();
+	});
+
+	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/darwin-notifications.js

@@ -0,0 +1,100 @@
+'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

@@ -0,0 +1,31 @@
+'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/default-notification.ts

@@ -1,29 +0,0 @@
-import {ipcRenderer} from 'electron';
-
-import * as ConfigUtil from '../utils/config-util';
-
-import {focusCurrentServer} from './helpers';
-
-const NativeNotification = window.Notification;
-export default class BaseNotification extends NativeNotification {
-	constructor(title: string, options: NotificationOptions) {
-		options.silent = true;
-		super(title, options);
-
-		this.addEventListener('click', () => {
-			// Focus to the server who sent the
-			// notification if not focused already
-			focusCurrentServer();
-			ipcRenderer.send('focus-app');
-		});
-	}
-
-	static async requestPermission(): Promise<NotificationPermission> {
-		return this.permission;
-	}
-
-	// Override default Notification permission
-	static get permission(): NotificationPermission {
-		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
-	}
-}

app/renderer/js/notification/helpers.js

@@ -0,0 +1,149 @@
+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/helpers.ts

@@ -1,14 +0,0 @@
-import {remote} from 'electron';
-
-// Do not change this
-export const appId = 'org.zulip.zulip-electron';
-
-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
-export function focusCurrentServer(): void {
-	currentWindow.webContents.send('focus-webview-with-id', webContentsId);
-}

app/renderer/js/notification/index.js

@@ -0,0 +1,27 @@
+'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/notification/index.ts

@@ -1,65 +0,0 @@
-import {remote} from 'electron';
-
-import DefaultNotification from './default-notification';
-import {appId} from './helpers';
-
-const {app} = remote;
-
-// 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);
-
-export interface NotificationData {
-	close: () => void;
-	title: string;
-	dir: NotificationDirection;
-	lang: string;
-	body: string;
-	tag: string;
-	image: string;
-	icon: string;
-	badge: string;
-	vibrate: readonly number[];
-	timestamp: number;
-	renotify: boolean;
-	silent: boolean;
-	requireInteraction: boolean;
-	data: unknown;
-	actions: readonly NotificationAction[];
-}
-
-export function newNotification(
-	title: string,
-	options: NotificationOptions | undefined,
-	dispatch: (type: string, eventInit: EventInit) => boolean
-): NotificationData {
-	const notification = new DefaultNotification(title, options);
-	for (const type of ['click', 'close', 'error', 'show']) {
-		notification.addEventListener(type, (ev: Event) => {
-			if (!dispatch(type, ev)) {
-				ev.preventDefault();
-			}
-		});
-	}
-
-	return {
-		close: () => {
-			notification.close();
-		},
-		title: notification.title,
-		dir: notification.dir,
-		lang: notification.lang,
-		body: notification.body,
-		tag: notification.tag,
-		image: notification.image,
-		icon: notification.icon,
-		badge: notification.badge,
-		vibrate: notification.vibrate,
-		timestamp: notification.timestamp,
-		renotify: notification.renotify,
-		silent: notification.silent,
-		requireInteraction: notification.requireInteraction,
-		data: notification.data,
-		actions: notification.actions
-	};
-}

app/renderer/js/pages/network.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const {ipcRenderer} = require('electron');
+
+class NetworkTroubleshootingView {
+	constructor() {
+		this.$reconnectButton = document.getElementById('reconnect');
+	}
+
+	init() {
+		this.$reconnectButton.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'reload-viewer');
+		});
+	}
+}
+
+window.onload = () => {
+	const networkTroubleshootingView = new NetworkTroubleshootingView();
+	networkTroubleshootingView.init();
+};

app/renderer/js/pages/network.ts

@@ -1,10 +0,0 @@
-import {ipcRenderer} from 'electron';
-
-export function init($reconnectButton: Element, $settingsButton: Element): void {
-	$reconnectButton.addEventListener('click', () => {
-		ipcRenderer.send('forward-message', 'reload-viewer');
-	});
-	$settingsButton.addEventListener('click', () => {
-		ipcRenderer.send('forward-message', 'open-settings');
-	});
-}

app/renderer/js/pages/preference/badge-settings.js

@@ -0,0 +1,63 @@
+'use strict';
+const electron = require('electron');
+const { app } = require('electron');
+
+const ConfigUtil = require(__dirname + '/../../utils/config-util.js');
+
+let instance = null;
+
+class BadgeSettings {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		return instance;
+	}
+
+	showBadgeCount(messageCount, mainWindow) {
+		if (process.platform === 'darwin') {
+			app.setBadgeCount(messageCount);
+		}
+		if (process.platform === 'win32') {
+			this.updateOverlayIcon(messageCount, mainWindow);
+		}
+	}
+
+	hideBadgeCount(mainWindow) {
+		if (process.platform === 'darwin') {
+			app.setBadgeCount(0);
+		}
+		if (process.platform === 'win32') {
+			mainWindow.setOverlayIcon(null, '');
+		}
+	}
+
+	updateBadge(badgeCount, mainWindow) {
+		if (ConfigUtil.getConfigItem('badgeOption', true)) {
+			this.showBadgeCount(badgeCount, mainWindow);
+		} else {
+			this.hideBadgeCount(mainWindow);
+		}
+	}
+
+	updateOverlayIcon(messageCount, mainWindow) {
+		if (!mainWindow.isFocused()) {
+			mainWindow.flashFrame(ConfigUtil.getConfigItem('flashTaskbarOnMessage'));
+		}
+		if (messageCount === 0) {
+			mainWindow.setOverlayIcon(null, '');
+		} else {
+			mainWindow.webContents.send('render-taskbar-icon', messageCount);
+		}
+	}
+
+	updateTaskbarIcon(data, text, mainWindow) {
+		const img = electron.nativeImage.createFromDataURL(data);
+		mainWindow.setOverlayIcon(img, text);
+	}
+}
+
+module.exports = new BadgeSettings();

app/renderer/js/pages/preference/badge-settings.ts

@@ -1,44 +0,0 @@
-import electron, {app} from 'electron';
-
-import * as ConfigUtil from '../../utils/config-util';
-
-function showBadgeCount(messageCount: number, mainWindow: electron.BrowserWindow): void {
-	if (process.platform === 'win32') {
-		updateOverlayIcon(messageCount, mainWindow);
-	} else {
-		app.badgeCount = messageCount;
-	}
-}
-
-function hideBadgeCount(mainWindow: electron.BrowserWindow): void {
-	if (process.platform === 'win32') {
-		mainWindow.setOverlayIcon(null, '');
-	} else {
-		app.badgeCount = 0;
-	}
-}
-
-export function updateBadge(badgeCount: number, mainWindow: electron.BrowserWindow): void {
-	if (ConfigUtil.getConfigItem('badgeOption', true)) {
-		showBadgeCount(badgeCount, mainWindow);
-	} else {
-		hideBadgeCount(mainWindow);
-	}
-}
-
-function updateOverlayIcon(messageCount: number, mainWindow: electron.BrowserWindow): void {
-	if (!mainWindow.isFocused()) {
-		mainWindow.flashFrame(ConfigUtil.getConfigItem('flashTaskbarOnMessage'));
-	}
-
-	if (messageCount === 0) {
-		mainWindow.setOverlayIcon(null, '');
-	} else {
-		mainWindow.webContents.send('render-taskbar-icon', messageCount);
-	}
-}
-
-export function updateTaskbarIcon(data: string, text: string, mainWindow: electron.BrowserWindow): void {
-	const img = electron.nativeImage.createFromDataURL(data);
-	mainWindow.setOverlayIcon(img, text);
-}

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

@@ -0,0 +1,46 @@
+'use strict';
+
+const {ipcRenderer} = require('electron');
+
+const BaseComponent = require(__dirname + '/../../components/base.js');
+
+class BaseSection extends BaseComponent {
+	generateSettingOption(props) {
+		const {$element, value, clickHandler} = props;
+
+		$element.innerHTML = '';
+
+		const $optionControl = this.generateNodeFromTemplate(this.generateOptionTemplate(value));
+		$element.appendChild($optionControl);
+
+		$optionControl.addEventListener('click', clickHandler);
+	}
+
+	generateOptionTemplate(settingOption) {
+		if (settingOption) {
+			return `
+				<div class="action">
+					<div class="switch">
+					  <input class="toggle toggle-round" type="checkbox" checked>
+					  <label></label>
+					</div>
+				</div>
+			`;
+		} else {
+			return `
+				<div class="action">
+					<div class="switch">
+					  <input class="toggle toggle-round" type="checkbox">
+					  <label></label>
+					</div>
+				</div>
+			`;
+		}
+	}
+
+	reloadApp() {
+		ipcRenderer.send('forward-message', 'reload-viewer');
+	}
+}
+
+module.exports = BaseSection;

app/renderer/js/pages/preference/base-section.ts

@@ -1,66 +0,0 @@
-import {ipcRenderer} from 'electron';
-
-import {htmlEscape} from 'escape-goat';
-
-import BaseComponent from '../../components/base';
-
-interface BaseSectionProps {
-	$element: HTMLElement;
-	disabled?: boolean;
-	value: boolean;
-	clickHandler: () => void;
-}
-
-export default class BaseSection extends BaseComponent {
-	generateSettingOption(props: BaseSectionProps): void {
-		const {$element, disabled, value, clickHandler} = props;
-
-		$element.textContent = '';
-
-		const $optionControl = this.generateNodeFromHTML(this.generateOptionHTML(value, disabled));
-		$element.append($optionControl);
-
-		if (!disabled) {
-			$optionControl.addEventListener('click', clickHandler);
-		}
-	}
-
-	generateOptionHTML(settingOption: boolean, disabled?: boolean): string {
-		const labelHTML = disabled ? '<label class="disallowed" title="Setting locked by system administrator."></label>' : '<label></label>';
-		if (settingOption) {
-			return htmlEscape`
-				<div class="action">
-					<div class="switch">
-						<input class="toggle toggle-round" type="checkbox" checked disabled>
-						` + labelHTML + htmlEscape`
-					</div>
-				</div>
-			`;
-		}
-
-		return htmlEscape`
-			<div class="action">
-				<div class="switch">
-					<input class="toggle toggle-round" type="checkbox">
-					` + labelHTML + htmlEscape`
-				</div>
-			</div>
-		`;
-	}
-
-	/* A method that in future can be used to create dropdown menus using <select> <option> tags.
-		it needs an object which has ``key: value`` pairs and will return a string that can be appended to HTML
-	*/
-	generateSelectHTML(options: Record<string, string>, className?: string, idName?: string): string {
-		let html = htmlEscape`<select class="${className}" id="${idName}">\n`;
-		Object.keys(options).forEach(key => {
-			html += htmlEscape`<option name="${key}" value="${key}">${options[key]}</option>\n`;
-		});
-		html += '</select>';
-		return html;
-	}
-
-	reloadApp(): void {
-		ipcRenderer.send('forward-message', 'reload-viewer');
-	}
-}

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

@@ -0,0 +1,51 @@
+'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/connected-org-section.ts

@@ -1,80 +0,0 @@
-import {ipcRenderer} from 'electron';
-
-import {htmlEscape} from 'escape-goat';
-
-import * as DomainUtil from '../../utils/domain-util';
-import * as t from '../../utils/translation-util';
-
-import BaseSection from './base-section';
-import FindAccounts from './find-accounts';
-import ServerInfoForm from './server-info-form';
-
-interface ConnectedOrgSectionProps {
-	$root: Element;
-}
-
-export default class ConnectedOrgSection extends BaseSection {
-	props: ConnectedOrgSectionProps;
-	$serverInfoContainer: Element | null;
-	$existingServers: Element | null;
-	$newOrgButton: HTMLButtonElement | null;
-	$findAccountsContainer: Element | null;
-	constructor(props: ConnectedOrgSectionProps) {
-		super();
-		this.props = props;
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-			<div class="settings-pane" id="server-settings-pane">
-				<div class="page-title">${t.__('Connected organizations')}</div>
-				<div class="title" id="existing-servers">${t.__('All the connected orgnizations will appear here.')}</div>
-				<div id="server-info-container"></div>
-				<div id="new-org-button"><button class="green sea w-250">${t.__('Connect to another organization')}</button></div>
-				<div class="page-title">${t.__('Find accounts by email')}</div>
-				<div id="find-accounts-container"></div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.initServers();
-	}
-
-	initServers(): void {
-		this.props.$root.textContent = '';
-
-		const servers = DomainUtil.getDomains();
-		this.props.$root.innerHTML = this.templateHTML();
-
-		this.$serverInfoContainer = document.querySelector('#server-info-container');
-		this.$existingServers = document.querySelector('#existing-servers');
-		this.$newOrgButton = document.querySelector('#new-org-button');
-		this.$findAccountsContainer = document.querySelector('#find-accounts-container');
-
-		const noServerText = t.__('All the connected orgnizations will appear here');
-		// Show noServerText if no servers are there otherwise hide it
-		this.$existingServers.textContent = servers.length === 0 ? noServerText : '';
-
-		for (const [i, server] of servers.entries()) {
-			new ServerInfoForm({
-				$root: this.$serverInfoContainer,
-				server,
-				index: i,
-				onChange: this.reloadApp
-			}).init();
-		}
-
-		this.$newOrgButton.addEventListener('click', () => {
-			ipcRenderer.send('forward-message', 'open-org-tab');
-		});
-
-		this.initFindAccounts();
-	}
-
-	initFindAccounts(): void {
-		new FindAccounts({
-			$root: this.$findAccountsContainer
-		}).init();
-	}
-}

app/renderer/js/pages/preference/find-accounts.ts

@@ -1,80 +0,0 @@
-import {htmlEscape} from 'escape-goat';
-
-import BaseComponent from '../../components/base';
-import * as LinkUtil from '../../utils/link-util';
-import * as t from '../../utils/translation-util';
-
-interface FindAccountsProps {
-	$root: Element;
-}
-
-export default class FindAccounts extends BaseComponent {
-	props: FindAccountsProps;
-	$findAccounts: Element | null;
-	$findAccountsButton: Element | null;
-	$serverUrlField: HTMLInputElement | null;
-	constructor(props: FindAccountsProps) {
-		super();
-		this.props = props;
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-			<div class="settings-card certificate-card">
-				<div class="certificate-input">
-					<div>${t.__('Organization URL')}</div>
-					<input class="setting-input-value" value="zulipchat.com"/>
-				</div>
-				<div class="certificate-input">
-					<button class="green w-150" id="find-accounts-button">${t.__('Find accounts')}</button>
-				</div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.$findAccounts = this.generateNodeFromHTML(this.templateHTML());
-		this.props.$root.append(this.$findAccounts);
-		this.$findAccountsButton = this.$findAccounts.querySelector('#find-accounts-button');
-		this.$serverUrlField = this.$findAccounts.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
-		this.initListeners();
-	}
-
-	async findAccounts(url: string): Promise<void> {
-		if (!url) {
-			return;
-		}
-
-		if (!url.startsWith('http')) {
-			url = 'https://' + url;
-		}
-
-		await LinkUtil.openBrowser(new URL('/accounts/find', url));
-	}
-
-	initListeners(): void {
-		this.$findAccountsButton.addEventListener('click', async () => {
-			await this.findAccounts(this.$serverUrlField.value);
-		});
-
-		this.$serverUrlField.addEventListener('click', () => {
-			if (this.$serverUrlField.value === 'zulipchat.com') {
-				this.$serverUrlField.setSelectionRange(0, 0);
-			}
-		});
-
-		this.$serverUrlField.addEventListener('keypress', async event => {
-			if (event.key === 'Enter') {
-				await this.findAccounts(this.$serverUrlField.value);
-			}
-		});
-
-		this.$serverUrlField.addEventListener('input', () => {
-			if (this.$serverUrlField.value) {
-				this.$serverUrlField.classList.remove('invalid-input-value');
-			} else {
-				this.$serverUrlField.classList.add('invalid-input-value');
-			}
-		});
-	}
-}

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

@@ -0,0 +1,315 @@
+'use strict';
+const path = require('path');
+const { ipcRenderer, remote } = require('electron');
+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');
+
+class GeneralSection extends BaseSection {
+	constructor(props) {
+		super();
+		this.props = props;
+	}
+
+	template() {
+		return `
+            <div class="settings-pane">
+                <div class="title">Appearance</div>
+                <div id="appearance-option-settings" class="settings-card">
+					<div class="setting-row" id="tray-option">
+						<div class="setting-description">Show app icon in system tray</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="sidebar-option">
+						<div class="setting-description">Show sidebar (<span class="code">Cmd Or Ctrl+S</span>)</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="badge-option">
+						<div class="setting-description">Show app unread badge</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="flash-taskbar-option" style= "display:${process.platform === 'win32' ? '' : 'none'}">
+						<div class="setting-description">Flash taskbar on new message</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">Desktop Notification</div>
+				<div class="settings-card">
+					<div class="setting-row" id="show-notification-option">
+						<div class="setting-description">Show Desktop Notifications</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="silent-option">
+						<div class="setting-description">Mute all sounds from Zulip</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">App Updates</div>
+                <div class="settings-card">
+					<div class="setting-row" id="betaupdate-option">
+						<div class="setting-description">Get beta updates</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">Functionality</div>
+                <div class="settings-card">
+					<div class="setting-row" id="startAtLogin-option">
+						<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>
+				<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">
+					<div class="setting-row" id="resetdata-option">
+						<div class="setting-description">This will delete all application data including all added accounts and preferences
+						</div>
+						<button class="reset-data-button blue">Reset App Data</button>
+					</div>
+				</div>
+            </div>
+		`;
+	}
+
+	init() {
+		this.props.$root.innerHTML = this.template();
+		this.updateTrayOption();
+		this.updateBadgeOption();
+		this.updateSilentOption();
+		this.updateUpdateOption();
+		this.updateSidebarOption();
+		this.updateStartAtLoginOption();
+		this.updateResetDataOption();
+		this.showDesktopNotification();
+		this.enableSpellchecker();
+		this.minimizeOnStart();
+		this.addCustomCSS();
+		this.showCustomCSSPath();
+		this.removeCustomCSS();
+
+		// Platform specific settings
+		// Flashing taskbar on Windows
+		if (process.platform === 'win32') {
+			this.updateFlashTaskbar();
+		}
+	}
+
+	updateTrayOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#tray-option .setting-control'),
+			value: ConfigUtil.getConfigItem('trayIcon', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('trayIcon');
+				ConfigUtil.setConfigItem('trayIcon', newValue);
+				ipcRenderer.send('forward-message', 'toggletray');
+				this.updateTrayOption();
+			}
+		});
+	}
+
+	updateBadgeOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#badge-option .setting-control'),
+			value: ConfigUtil.getConfigItem('badgeOption', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('badgeOption');
+				ConfigUtil.setConfigItem('badgeOption', newValue);
+				ipcRenderer.send('toggle-badge-option', newValue);
+				this.updateBadgeOption();
+			}
+		});
+	}
+
+	updateFlashTaskbar() {
+		this.generateSettingOption({
+			$element: document.querySelector('#flash-taskbar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('flashTaskbarOnMessage', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('flashTaskbarOnMessage');
+				ConfigUtil.setConfigItem('flashTaskbarOnMessage', newValue);
+				this.updateFlashTaskbar();
+			}
+		});
+	}
+
+	updateUpdateOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#betaupdate-option .setting-control'),
+			value: ConfigUtil.getConfigItem('betaUpdate', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('betaUpdate');
+				ConfigUtil.setConfigItem('betaUpdate', newValue);
+				this.updateUpdateOption();
+			}
+		});
+	}
+
+	updateSilentOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#silent-option .setting-control'),
+			value: ConfigUtil.getConfigItem('silent', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('silent', true);
+				ConfigUtil.setConfigItem('silent', newValue);
+				this.updateSilentOption();
+				currentBrowserWindow.send('toogle-silent', newValue);
+			}
+		});
+	}
+
+	showDesktopNotification() {
+		this.generateSettingOption({
+			$element: document.querySelector('#show-notification-option .setting-control'),
+			value: ConfigUtil.getConfigItem('showNotification', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('showNotification', true);
+				ConfigUtil.setConfigItem('showNotification', newValue);
+				this.showDesktopNotification();
+			}
+		});
+	}
+
+	updateSidebarOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#sidebar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('showSidebar', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('showSidebar');
+				ConfigUtil.setConfigItem('showSidebar', newValue);
+				ipcRenderer.send('forward-message', 'toggle-sidebar', newValue);
+				this.updateSidebarOption();
+			}
+		});
+	}
+
+	updateStartAtLoginOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#startAtLogin-option .setting-control'),
+			value: ConfigUtil.getConfigItem('startAtLogin', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('startAtLogin');
+				ConfigUtil.setConfigItem('startAtLogin', newValue);
+				ipcRenderer.send('toggleAutoLauncher', newValue);
+				this.updateStartAtLoginOption();
+			}
+		});
+	}
+
+	enableSpellchecker() {
+		this.generateSettingOption({
+			$element: document.querySelector('#enable-spellchecker-option .setting-control'),
+			value: ConfigUtil.getConfigItem('enableSpellchecker', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('enableSpellchecker');
+				ConfigUtil.setConfigItem('enableSpellchecker', newValue);
+				this.enableSpellchecker();
+			}
+		});
+	}
+
+	clearAppDataDialog() {
+		const clearAppDataMessage = 'By clicking proceed you will be removing all added accounts and preferences from Zulip. When the application restarts, it will be as if you are starting Zulip for the first time.';
+		const getAppPath = path.join(app.getPath('appData'), app.getName());
+
+		dialog.showMessageBox({
+			type: 'warning',
+			buttons: ['YES', 'NO'],
+			defaultId: 0,
+			message: 'Are you sure',
+			detail: clearAppDataMessage
+		}, response => {
+			if (response === 0) {
+				fs.remove(getAppPath);
+				setTimeout(() => ipcRenderer.send('forward-message', 'hard-reload'), 1000);
+			}
+		});
+	}
+
+	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', () => {
+			this.clearAppDataDialog();
+		});
+	}
+
+	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/general-section.ts

@@ -1,585 +0,0 @@
-import {ipcRenderer, remote, OpenDialogOptions} from 'electron';
-import fs from 'fs';
-import path from 'path';
-
-import Tagify from '@yaireo/tagify';
-import {htmlEscape} from 'escape-goat';
-import ISO6391 from 'iso-639-1';
-
-import supportedLocales from '../../../../translations/supported-locales.json';
-import * as ConfigUtil from '../../utils/config-util';
-import * as EnterpriseUtil from '../../utils/enterprise-util';
-import * as t from '../../utils/translation-util';
-
-import BaseSection from './base-section';
-
-const {app, dialog, session} = remote;
-const currentBrowserWindow = remote.getCurrentWindow();
-
-interface GeneralSectionProps {
-	$root: Element;
-}
-
-export default class GeneralSection extends BaseSection {
-	props: GeneralSectionProps;
-	constructor(props: GeneralSectionProps) {
-		super();
-		this.props = props;
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-            <div class="settings-pane">
-                <div class="title">${t.__('Appearance')}</div>
-                <div id="appearance-option-settings" class="settings-card">
-					<div class="setting-row" id="tray-option">
-						<div class="setting-description">${t.__('Show app icon in system tray')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="menubar-option" style= "display:${process.platform === 'darwin' ? 'none' : ''}">
-						<div class="setting-description">${t.__('Auto hide menu bar (Press Alt key to display)')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="sidebar-option">
-						<div class="setting-description">${t.__('Show sidebar')} (<span class="code">${process.platform === 'darwin' ? 'Cmd+Shift+S' : 'Ctrl+Shift+S'}</span>)</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="badge-option">
-						<div class="setting-description">${t.__('Show app unread badge')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="dock-bounce-option" style= "display:${process.platform === 'darwin' ? '' : 'none'}">
-						<div class="setting-description">${t.__('Bounce dock on new private message')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="flash-taskbar-option" style= "display:${process.platform === 'win32' ? '' : 'none'}">
-						<div class="setting-description">${t.__('Flash taskbar on new message')}</div>
-						<div class="setting-control"></div>
-					</div>
-				</div>
-				<div class="title">${t.__('Desktop Notifications')}</div>
-				<div class="settings-card">
-					<div class="setting-row" id="show-notification-option">
-						<div class="setting-description">${t.__('Show desktop notifications')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="silent-option">
-						<div class="setting-description">${t.__('Mute all sounds from Zulip')}</div>
-						<div class="setting-control"></div>
-					</div>
-				</div>
-				<div class="title">${t.__('App Updates')}</div>
-				<div class="settings-card">
-				<div class="setting-row" id="autoupdate-option">
-						<div class="setting-description">${t.__('Enable auto updates')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="betaupdate-option">
-						<div class="setting-description">${t.__('Get beta updates')}</div>
-						<div class="setting-control"></div>
-					</div>
-				</div>
-				<div class="title">${t.__('Functionality')}</div>
-                <div class="settings-card">
-					<div class="setting-row" id="startAtLogin-option">
-						<div class="setting-description">${t.__('Start app at login')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="start-minimize-option">
-						<div class="setting-description">${t.__('Always start minimized')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="quitOnClose-option">
-						<div class="setting-description">${t.__('Quit when the window is closed')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="enable-spellchecker-option">
-						<div class="setting-description">${t.__('Enable spellchecker (requires restart)')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="spellcheck-langs" style= "display:${process.platform === 'darwin' ? 'none' : ''}"></div>
-					<div class="setting-row" id="note"></div>
-				</div>
-
-				<div class="title">${t.__('Advanced')}</div>
-				<div class="settings-card">
-
-					<div class="setting-row" id="enable-error-reporting">
-						<div class="setting-description">${t.__('Enable error reporting (requires restart)')}</div>
-						<div class="setting-control"></div>
-					</div>
-
-					<div class="setting-row" id="app-language">
-						<div class="setting-description">${t.__('App language (requires restart)')}</div>
-						<div  id="lang-div" class="lang-div"></div>
-					</div>
-
-					<div class="setting-row" id="add-custom-css">
-						<div class="setting-description">
-							${t.__('Add custom CSS')}
-						</div>
-						<button class="custom-css-button green">${t.__('Upload')}</button>
-					</div>
-					<div class="setting-row" id="remove-custom-css">
-						<div class="setting-description">
-							<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigString('customCSS', '')}</div>
-						</div>
-						<div class="action red" id="css-delete-action">
-							<i class="material-icons">indeterminate_check_box</i>
-							<span>${t.__('Delete')}</span>
-						</div>
-					</div>
-					<div class="setting-row" id="download-folder">
-						<div class="setting-description">
-							${t.__('Default download location')}
-						</div>
-						<button class="download-folder-button green">${t.__('Change')}</button>
-					</div>
-					<div class="setting-row">
-						<div class="setting-description">
-							<div class="download-folder-path">${ConfigUtil.getConfigString('downloadsPath', app.getPath('downloads'))}</div>
-						</div>
-					</div>
-					<div class="setting-row" id="prompt-download">
-						<div class="setting-description">${t.__('Ask where to save files before downloading')}</div>
-						<div class="setting-control"></div>
-					</div>
-				</div>
-				<div class="title">${t.__('Factory Reset Data')}</div>
-                <div class="settings-card">
-					<div class="setting-row" id="factory-reset-option">
-						<div class="setting-description">${t.__('Reset the application, thus deleting all the connected organizations and accounts.')}
-						</div>
-						<button class="factory-reset-button red w-150">${t.__('Factory Reset')}</button>
-					</div>
-				</div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.props.$root.innerHTML = this.templateHTML();
-		this.updateTrayOption();
-		this.updateBadgeOption();
-		this.updateSilentOption();
-		this.autoUpdateOption();
-		this.betaUpdateOption();
-		this.updateSidebarOption();
-		this.updateStartAtLoginOption();
-		this.factoryReset();
-		this.showDesktopNotification();
-		this.enableSpellchecker();
-		this.minimizeOnStart();
-		this.addCustomCSS();
-		this.showCustomCSSPath();
-		this.removeCustomCSS();
-		this.downloadFolder();
-		this.updateQuitOnCloseOption();
-		this.updatePromptDownloadOption();
-		this.enableErrorReporting();
-		this.setLocale();
-		this.initSpellChecker();
-
-		// Platform specific settings
-
-		// Flashing taskbar on Windows
-		if (process.platform === 'win32') {
-			this.updateFlashTaskbar();
-		}
-
-		// Dock bounce on macOS
-		if (process.platform === 'darwin') {
-			this.updateDockBouncing();
-		}
-
-		// Auto hide menubar on Windows and Linux
-		if (process.platform !== 'darwin') {
-			this.updateMenubarOption();
-		}
-	}
-
-	updateTrayOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#tray-option .setting-control'),
-			value: ConfigUtil.getConfigItem('trayIcon', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('trayIcon');
-				ConfigUtil.setConfigItem('trayIcon', newValue);
-				ipcRenderer.send('forward-message', 'toggletray');
-				this.updateTrayOption();
-			}
-		});
-	}
-
-	updateMenubarOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#menubar-option .setting-control'),
-			value: ConfigUtil.getConfigItem('autoHideMenubar', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
-				ConfigUtil.setConfigItem('autoHideMenubar', newValue);
-				ipcRenderer.send('toggle-menubar', newValue);
-				this.updateMenubarOption();
-			}
-		});
-	}
-
-	updateBadgeOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#badge-option .setting-control'),
-			value: ConfigUtil.getConfigItem('badgeOption', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('badgeOption');
-				ConfigUtil.setConfigItem('badgeOption', newValue);
-				ipcRenderer.send('toggle-badge-option', newValue);
-				this.updateBadgeOption();
-			}
-		});
-	}
-
-	updateDockBouncing(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#dock-bounce-option .setting-control'),
-			value: ConfigUtil.getConfigItem('dockBouncing', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('dockBouncing');
-				ConfigUtil.setConfigItem('dockBouncing', newValue);
-				this.updateDockBouncing();
-			}
-		});
-	}
-
-	updateFlashTaskbar(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#flash-taskbar-option .setting-control'),
-			value: ConfigUtil.getConfigItem('flashTaskbarOnMessage', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('flashTaskbarOnMessage');
-				ConfigUtil.setConfigItem('flashTaskbarOnMessage', newValue);
-				this.updateFlashTaskbar();
-			}
-		});
-	}
-
-	autoUpdateOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#autoupdate-option .setting-control'),
-			disabled: EnterpriseUtil.configItemExists('autoUpdate'),
-			value: ConfigUtil.getConfigItem('autoUpdate', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('autoUpdate');
-				ConfigUtil.setConfigItem('autoUpdate', newValue);
-				if (!newValue) {
-					ConfigUtil.setConfigItem('betaUpdate', false);
-					this.betaUpdateOption();
-				}
-
-				this.autoUpdateOption();
-			}
-		});
-	}
-
-	betaUpdateOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#betaupdate-option .setting-control'),
-			value: ConfigUtil.getConfigItem('betaUpdate', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('betaUpdate');
-				if (ConfigUtil.getConfigItem('autoUpdate')) {
-					ConfigUtil.setConfigItem('betaUpdate', newValue);
-					this.betaUpdateOption();
-				}
-			}
-		});
-	}
-
-	updateSilentOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#silent-option .setting-control'),
-			value: ConfigUtil.getConfigItem('silent', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('silent', true);
-				ConfigUtil.setConfigItem('silent', newValue);
-				this.updateSilentOption();
-				currentBrowserWindow.webContents.send('toggle-silent', newValue);
-			}
-		});
-	}
-
-	showDesktopNotification(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#show-notification-option .setting-control'),
-			value: ConfigUtil.getConfigItem('showNotification', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('showNotification', true);
-				ConfigUtil.setConfigItem('showNotification', newValue);
-				this.showDesktopNotification();
-			}
-		});
-	}
-
-	updateSidebarOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#sidebar-option .setting-control'),
-			value: ConfigUtil.getConfigItem('showSidebar', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('showSidebar');
-				ConfigUtil.setConfigItem('showSidebar', newValue);
-				ipcRenderer.send('forward-message', 'toggle-sidebar', newValue);
-				this.updateSidebarOption();
-			}
-		});
-	}
-
-	updateStartAtLoginOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#startAtLogin-option .setting-control'),
-			value: ConfigUtil.getConfigItem('startAtLogin', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('startAtLogin');
-				ConfigUtil.setConfigItem('startAtLogin', newValue);
-				ipcRenderer.send('toggleAutoLauncher', newValue);
-				this.updateStartAtLoginOption();
-			}
-		});
-	}
-
-	updateQuitOnCloseOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#quitOnClose-option .setting-control'),
-			value: ConfigUtil.getConfigItem('quitOnClose', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('quitOnClose');
-				ConfigUtil.setConfigItem('quitOnClose', newValue);
-				this.updateQuitOnCloseOption();
-			}
-		});
-	}
-
-	enableSpellchecker(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#enable-spellchecker-option .setting-control'),
-			value: ConfigUtil.getConfigItem('enableSpellchecker', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('enableSpellchecker');
-				ConfigUtil.setConfigItem('enableSpellchecker', newValue);
-				this.enableSpellchecker();
-				const spellcheckerLanguageInput: HTMLElement = document.querySelector('#spellcheck-langs');
-				const spellcheckerNote: HTMLElement = document.querySelector('#note');
-				spellcheckerLanguageInput.style.display = spellcheckerLanguageInput.style.display === 'none' ? '' : 'none';
-				spellcheckerNote.style.display = spellcheckerNote.style.display === 'none' ? '' : 'none';
-			}
-		});
-	}
-
-	enableErrorReporting(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#enable-error-reporting .setting-control'),
-			value: ConfigUtil.getConfigItem('errorReporting', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('errorReporting');
-				ConfigUtil.setConfigItem('errorReporting', newValue);
-				this.enableErrorReporting();
-			}
-		});
-	}
-
-	async customCssDialog(): Promise<void> {
-		const showDialogOptions: OpenDialogOptions = {
-			title: 'Select file',
-			properties: ['openFile'],
-			filters: [{name: 'CSS file', extensions: ['css']}]
-		};
-
-		const {filePaths, canceled} = await dialog.showOpenDialog(showDialogOptions);
-		if (!canceled) {
-			ConfigUtil.setConfigItem('customCSS', filePaths[0]);
-			ipcRenderer.send('forward-message', 'hard-reload');
-		}
-	}
-
-	setLocale(): void {
-		const langDiv: HTMLSelectElement = document.querySelector('.lang-div');
-		const langListHTML = this.generateSelectHTML(supportedLocales, 'lang-menu');
-		langDiv.innerHTML += langListHTML;
-		// `langMenu` is the select-option dropdown menu formed after executing the previous command
-		const langMenu: HTMLSelectElement = document.querySelector('.lang-menu');
-
-		// The next three lines set the selected language visible on the dropdown button
-		let language = ConfigUtil.getConfigItem('appLanguage');
-		language = language && langMenu.options.namedItem(language) ? language : 'en';
-		langMenu.options.namedItem(language).selected = true;
-
-		langMenu.addEventListener('change', (event: Event) => {
-			ConfigUtil.setConfigItem('appLanguage', (event.target as HTMLSelectElement).value);
-		});
-	}
-
-	minimizeOnStart(): void {
-		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(): void {
-		const customCSSButton = document.querySelector('#add-custom-css .custom-css-button');
-		customCSSButton.addEventListener('click', async () => {
-			await this.customCssDialog();
-		});
-	}
-
-	showCustomCSSPath(): void {
-		if (!ConfigUtil.getConfigItem('customCSS')) {
-			const cssPATH: HTMLElement = document.querySelector('#remove-custom-css');
-			cssPATH.style.display = 'none';
-		}
-	}
-
-	removeCustomCSS(): void {
-		const removeCSSButton = document.querySelector('#css-delete-action');
-		removeCSSButton.addEventListener('click', () => {
-			ConfigUtil.setConfigItem('customCSS', '');
-			ipcRenderer.send('forward-message', 'hard-reload');
-		});
-	}
-
-	async downloadFolderDialog(): Promise<void> {
-		const showDialogOptions: OpenDialogOptions = {
-			title: 'Select Download Location',
-			properties: ['openDirectory']
-		};
-
-		const {filePaths, canceled} = await dialog.showOpenDialog(showDialogOptions);
-		if (!canceled) {
-			ConfigUtil.setConfigItem('downloadsPath', filePaths[0]);
-			const downloadFolderPath: HTMLElement = document.querySelector('.download-folder-path');
-			downloadFolderPath.textContent = filePaths[0];
-		}
-	}
-
-	downloadFolder(): void {
-		const downloadFolder = document.querySelector('#download-folder .download-folder-button');
-		downloadFolder.addEventListener('click', async () => {
-			await this.downloadFolderDialog();
-		});
-	}
-
-	updatePromptDownloadOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#prompt-download .setting-control'),
-			value: ConfigUtil.getConfigItem('promptDownload', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('promptDownload');
-				ConfigUtil.setConfigItem('promptDownload', newValue);
-				this.updatePromptDownloadOption();
-			}
-		});
-	}
-
-	async factoryResetSettings(): Promise<void> {
-		const clearAppDataMessage = 'When the application restarts, it will be as if you have just downloaded Zulip app.';
-		const getAppPath = path.join(app.getPath('appData'), app.name);
-
-		const {response} = await dialog.showMessageBox({
-			type: 'warning',
-			buttons: ['YES', 'NO'],
-			defaultId: 0,
-			message: 'Are you sure?',
-			detail: clearAppDataMessage
-		});
-		if (response === 0) {
-			await fs.promises.rmdir(getAppPath, {recursive: true});
-			setTimeout(() => {
-				ipcRenderer.send('clear-app-settings');
-			}, 1000);
-		}
-	}
-
-	factoryReset(): void {
-		const factoryResetButton = document.querySelector('#factory-reset-option .factory-reset-button');
-		factoryResetButton.addEventListener('click', async () => {
-			await this.factoryResetSettings();
-		});
-	}
-
-	initSpellChecker(): void {
-		// The elctron API is a no-op on macOS and macOS default spellchecker is used.
-		if (process.platform === 'darwin') {
-			const note: HTMLElement = document.querySelector('#note');
-			note.append(t.__('On macOS, the OS spellchecker is used.'));
-			note.append(document.createElement('br'));
-			note.append(t.__('Change the language from System Preferences → Keyboard → Text → Spelling.'));
-		} else {
-			const note: HTMLElement = document.querySelector('#note');
-			note.append(t.__('You can select a maximum of 3 languages for spellchecking.'));
-			const spellDiv: HTMLElement = document.querySelector('#spellcheck-langs');
-			spellDiv.innerHTML += htmlEscape`
-				<div class="setting-description">${t.__('Spellchecker Languages')}</div>
-				<input name='spellcheck' placeholder='Enter Languages'>`;
-
-			const availableLanguages = session.fromPartition('persist:webviewsession').availableSpellCheckerLanguages;
-			let languagePairs: Map<string, string> = new Map();
-			availableLanguages.forEach((l: string) => {
-				if (ISO6391.validate(l)) {
-					languagePairs.set(ISO6391.getName(l), l);
-				}
-			});
-
-			// Manually set names for languages not available in ISO6391
-			languagePairs.set('English (AU)', 'en-AU');
-			languagePairs.set('English (CA)', 'en-CA');
-			languagePairs.set('English (GB)', 'en-GB');
-			languagePairs.set('English (US)', 'en-US');
-			languagePairs.set('Spanish (Latin America)', 'es-419');
-			languagePairs.set('Spanish (Argentina)', 'es-AR');
-			languagePairs.set('Spanish (Mexico)', 'es-MX');
-			languagePairs.set('Spanish (US)', 'es-US');
-			languagePairs.set('Portuguese (Brazil)', 'pt-BR');
-			languagePairs.set('Portuguese (Portugal)', 'pt-PT');
-			languagePairs.set('Serbo-Croatian', 'sh');
-
-			languagePairs = new Map([...languagePairs].sort((a, b) => ((a[0] < b[0]) ? -1 : 1)));
-
-			const tagField: HTMLElement = document.querySelector('input[name=spellcheck]');
-			const tagify = new Tagify(tagField, {
-				whitelist: [...languagePairs.keys()],
-				enforceWhitelist: true,
-				maxTags: 3,
-				dropdown: {
-					enabled: 0,
-					maxItems: Number.POSITIVE_INFINITY,
-					closeOnSelect: false,
-					highlightFirst: true
-				}
-			});
-
-			const configuredLanguages: string[] = ConfigUtil.getConfigItem('spellcheckerLanguages').map((code: string) => [...languagePairs].find(pair => (pair[1] === code))[0]);
-			tagify.addTags(configuredLanguages);
-
-			tagField.addEventListener('change', event => {
-				if ((event.target as HTMLInputElement).value.length === 0) {
-					ConfigUtil.setConfigItem('spellcheckerLanguages', []);
-					ipcRenderer.send('set-spellcheck-langs');
-				} else {
-					const spellLangs: string[] = [...JSON.parse((event.target as HTMLInputElement).value).values()].map(elt => languagePairs.get(elt.value));
-					ConfigUtil.setConfigItem('spellcheckerLanguages', spellLangs);
-					ipcRenderer.send('set-spellcheck-langs');
-				}
-			});
-		}
-
-		// Do not display the spellchecker input and note if it is disabled
-		if (!ConfigUtil.getConfigItem('enableSpellchecker')) {
-			const spellcheckerLanguageInput: HTMLElement = document.querySelector('#spellcheck-langs');
-			const spellcheckerNote: HTMLElement = document.querySelector('#note');
-			spellcheckerLanguageInput.style.display = 'none';
-			spellcheckerNote.style.display = 'none';
-		}
-	}
-}

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

@@ -0,0 +1,67 @@
+'use strict';
+
+const BaseComponent = require(__dirname + '/../../components/base.js');
+
+class PreferenceNav extends BaseComponent {
+	constructor(props) {
+		super();
+
+		this.props = props;
+
+		this.navItems = ['General', 'Network', 'AddServer', 'Organizations', 'Shortcuts'];
+
+		this.init();
+	}
+
+	template() {
+		let navItemsTemplate = '';
+		for (const navItem of this.navItems) {
+			navItemsTemplate += `<div class="nav" id="nav-${navItem}">${navItem}</div>`;
+		}
+
+		return `
+			<div>
+				<div id="settings-header">Settings</div>
+				<div id="nav-container">${navItemsTemplate}</div>
+			</div>
+		`;
+	}
+
+	init() {
+		this.$el = this.generateNodeFromTemplate(this.template());
+		this.props.$root.appendChild(this.$el);
+
+		this.registerListeners();
+	}
+
+	registerListeners() {
+		for (const navItem of this.navItems) {
+			const $item = document.getElementById(`nav-${navItem}`);
+			$item.addEventListener('click', () => {
+				this.props.onItemSelected(navItem);
+			});
+		}
+	}
+
+	select(navItemToSelect) {
+		for (const navItem of this.navItems) {
+			if (navItem === navItemToSelect) {
+				this.activate(navItem);
+			} else {
+				this.deactivate(navItem);
+			}
+		}
+	}
+
+	activate(navItem) {
+		const $item = document.getElementById(`nav-${navItem}`);
+		$item.classList.add('active');
+	}
+
+	deactivate(navItem) {
+		const $item = document.getElementById(`nav-${navItem}`);
+		$item.classList.remove('active');
+	}
+}
+
+module.exports = PreferenceNav;

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

@@ -1,70 +0,0 @@
-import {htmlEscape} from 'escape-goat';
-
-import BaseComponent from '../../components/base';
-import * as t from '../../utils/translation-util';
-
-interface PreferenceNavProps {
-	$root: Element;
-	onItemSelected: (navItem: string) => void;
-}
-
-export default class PreferenceNav extends BaseComponent {
-	props: PreferenceNavProps;
-	navItems: string[];
-	$el: Element;
-	constructor(props: PreferenceNavProps) {
-		super();
-		this.props = props;
-		this.navItems = ['General', 'Network', 'AddServer', 'Organizations', 'Shortcuts'];
-		this.init();
-	}
-
-	templateHTML(): string {
-		let navItemsHTML = '';
-		for (const navItem of this.navItems) {
-			navItemsHTML += htmlEscape`<div class="nav" id="nav-${navItem}">${t.__(navItem)}</div>`;
-		}
-
-		return htmlEscape`
-			<div>
-				<div id="settings-header">${t.__('Settings')}</div>
-				<div id="nav-container">` + navItemsHTML + htmlEscape`</div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.$el = this.generateNodeFromHTML(this.templateHTML());
-		this.props.$root.append(this.$el);
-		this.registerListeners();
-	}
-
-	registerListeners(): void {
-		for (const navItem of this.navItems) {
-			const $item = document.querySelector(`#nav-${CSS.escape(navItem)}`);
-			$item.addEventListener('click', () => {
-				this.props.onItemSelected(navItem);
-			});
-		}
-	}
-
-	select(navItemToSelect: string): void {
-		for (const navItem of this.navItems) {
-			if (navItem === navItemToSelect) {
-				this.activate(navItem);
-			} else {
-				this.deactivate(navItem);
-			}
-		}
-	}
-
-	activate(navItem: string): void {
-		const $item = document.querySelector(`#nav-${CSS.escape(navItem)}`);
-		$item.classList.add('active');
-	}
-
-	deactivate(navItem: string): void {
-		const $item = document.querySelector(`#nav-${CSS.escape(navItem)}`);
-		$item.classList.remove('active');
-	}
-}

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

@@ -0,0 +1,102 @@
+'use strict';
+
+const {ipcRenderer} = require('electron');
+
+const BaseSection = require(__dirname + '/base-section.js');
+const ConfigUtil = require(__dirname + '/../../utils/config-util.js');
+
+class NetworkSection extends BaseSection {
+	constructor(props) {
+		super();
+		this.props = props;
+	}
+
+	template() {
+		return `
+            <div class="settings-pane">
+                <div class="title">Proxy</div>
+                <div id="appearance-option-settings" class="settings-card">
+					<div class="setting-row" id="use-proxy-option">
+						<div class="setting-description">Connect servers through a proxy</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-block">
+						<div class="setting-row" id="proxy-pac-option">
+							<span class="setting-input-key">PAC script</span>
+							<input class="setting-input-value" placeholder="e.g. foobar.com/pacfile.js"/>
+						</div>
+						<div class="setting-row" id="proxy-rules-option">
+							<span class="setting-input-key">Proxy rules</span>
+							<input class="setting-input-value" placeholder="e.g. http=foopy:80;ftp=foopy2"/>
+						</div>
+						<div class="setting-row" id="proxy-bypass-option">
+							<span class="setting-input-key">Proxy bypass rules</span>
+							<input class="setting-input-value" placeholder="e.g. foobar.com"/>
+						</div>
+						<div class="setting-row">
+							<div class="action blue" id="proxy-save-action">
+								<i class="material-icons">check_box</i>
+								<span>Save</span>
+							</div>
+						</div>
+					</div>
+				</div>
+            </div>
+		`;
+	}
+
+	init() {
+		this.props.$root.innerHTML = this.template();
+		this.$proxyPAC = document.querySelector('#proxy-pac-option .setting-input-value');
+		this.$proxyRules = document.querySelector('#proxy-rules-option .setting-input-value');
+		this.$proxyBypass = document.querySelector('#proxy-bypass-option .setting-input-value');
+		this.$proxySaveAction = document.getElementById('proxy-save-action');
+		this.$settingBlock = this.props.$root.querySelector('.setting-block');
+		this.initProxyOption();
+
+		this.$proxyPAC.value = ConfigUtil.getConfigItem('proxyPAC', '');
+		this.$proxyRules.value = ConfigUtil.getConfigItem('proxyRules', '');
+		this.$proxyBypass.value = ConfigUtil.getConfigItem('proxyBypass', '');
+
+		this.$proxySaveAction.addEventListener('click', () => {
+			ConfigUtil.setConfigItem('proxyPAC', this.$proxyPAC.value);
+			ConfigUtil.setConfigItem('proxyRules', this.$proxyRules.value);
+			ConfigUtil.setConfigItem('proxyBypass', this.$proxyBypass.value);
+
+			ipcRenderer.send('forward-message', 'reload-proxy', true);
+		});
+	}
+
+	initProxyOption() {
+		const proxyEnabled = ConfigUtil.getConfigItem('useProxy', false);
+		this.toggleProxySettings(proxyEnabled);
+		this.updateProxyOption();
+	}
+
+	toggleProxySettings(option) {
+		if (option) {
+			this.$settingBlock.classList.remove('hidden');
+		} else {
+			this.$settingBlock.classList.add('hidden');
+		}
+	}
+
+	updateProxyOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#use-proxy-option .setting-control'),
+			value: ConfigUtil.getConfigItem('useProxy', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('useProxy');
+				ConfigUtil.setConfigItem('useProxy', newValue);
+				this.toggleProxySettings(newValue);
+				if (newValue === false) {
+					// Reload proxy if the proxy is turned off
+					ipcRenderer.send('forward-message', 'reload-proxy', false);
+				}
+				this.updateProxyOption();
+			}
+		});
+	}
+}
+
+module.exports = NetworkSection;

app/renderer/js/pages/preference/network-section.ts

@@ -1,141 +0,0 @@
-import {ipcRenderer} from 'electron';
-
-import {htmlEscape} from 'escape-goat';
-
-import * as ConfigUtil from '../../utils/config-util';
-import * as t from '../../utils/translation-util';
-
-import BaseSection from './base-section';
-
-interface NetworkSectionProps {
-	$root: Element;
-}
-
-export default class NetworkSection extends BaseSection {
-	props: NetworkSectionProps;
-	$proxyPAC: HTMLInputElement;
-	$proxyRules: HTMLInputElement;
-	$proxyBypass: HTMLInputElement;
-	$proxySaveAction: Element;
-	$manualProxyBlock: Element;
-	constructor(props: NetworkSectionProps) {
-		super();
-		this.props = props;
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-            <div class="settings-pane">
-                <div class="title">${t.__('Proxy')}</div>
-                <div id="appearance-option-settings" class="settings-card">
-					<div class="setting-row" id="use-system-settings">
-						<div class="setting-description">${t.__('Use system proxy settings (requires restart)')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="use-manual-settings">
-						<div class="setting-description">${t.__('Manual proxy configuration')}</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="manual-proxy-block">
-						<div class="setting-row" id="proxy-pac-option">
-							<span class="setting-input-key">PAC ${t.__('script')}</span>
-							<input class="setting-input-value" placeholder="e.g. foobar.com/pacfile.js"/>
-						</div>
-						<div class="setting-row" id="proxy-rules-option">
-							<span class="setting-input-key">${t.__('Proxy rules')}</span>
-							<input class="setting-input-value" placeholder="e.g. http=foopy:80;ftp=foopy2"/>
-						</div>
-						<div class="setting-row" id="proxy-bypass-option">
-							<span class="setting-input-key">${t.__('Proxy bypass rules')}</span>
-							<input class="setting-input-value" placeholder="e.g. foobar.com"/>
-						</div>
-						<div class="setting-row">
-							<div class="action green" id="proxy-save-action">
-								<span>${t.__('Save')}</span>
-							</div>
-						</div>
-					</div>
-				</div>
-            </div>
-		`;
-	}
-
-	init(): void {
-		this.props.$root.innerHTML = this.templateHTML();
-		this.$proxyPAC = document.querySelector('#proxy-pac-option .setting-input-value');
-		this.$proxyRules = document.querySelector('#proxy-rules-option .setting-input-value');
-		this.$proxyBypass = document.querySelector('#proxy-bypass-option .setting-input-value');
-		this.$proxySaveAction = document.querySelector('#proxy-save-action');
-		this.$manualProxyBlock = this.props.$root.querySelector('.manual-proxy-block');
-		this.initProxyOption();
-
-		this.$proxyPAC.value = ConfigUtil.getConfigItem('proxyPAC', '');
-		this.$proxyRules.value = ConfigUtil.getConfigItem('proxyRules', '');
-		this.$proxyBypass.value = ConfigUtil.getConfigItem('proxyBypass', '');
-
-		this.$proxySaveAction.addEventListener('click', () => {
-			ConfigUtil.setConfigItem('proxyPAC', this.$proxyPAC.value);
-			ConfigUtil.setConfigItem('proxyRules', this.$proxyRules.value);
-			ConfigUtil.setConfigItem('proxyBypass', this.$proxyBypass.value);
-
-			ipcRenderer.send('forward-message', 'reload-proxy', true);
-		});
-	}
-
-	initProxyOption(): void {
-		const manualProxyEnabled = ConfigUtil.getConfigItem('useManualProxy', false);
-		this.toggleManualProxySettings(manualProxyEnabled);
-
-		this.updateProxyOption();
-	}
-
-	toggleManualProxySettings(option: boolean): void {
-		if (option) {
-			this.$manualProxyBlock.classList.remove('hidden');
-		} else {
-			this.$manualProxyBlock.classList.add('hidden');
-		}
-	}
-
-	updateProxyOption(): void {
-		this.generateSettingOption({
-			$element: document.querySelector('#use-system-settings .setting-control'),
-			value: ConfigUtil.getConfigItem('useSystemProxy', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('useSystemProxy');
-				const manualProxyValue = ConfigUtil.getConfigItem('useManualProxy');
-				if (manualProxyValue && newValue) {
-					ConfigUtil.setConfigItem('useManualProxy', !manualProxyValue);
-					this.toggleManualProxySettings(!manualProxyValue);
-				}
-
-				if (!newValue) {
-					// Remove proxy system proxy settings
-					ConfigUtil.setConfigItem('proxyRules', '');
-					ipcRenderer.send('forward-message', 'reload-proxy', false);
-				}
-
-				ConfigUtil.setConfigItem('useSystemProxy', newValue);
-				this.updateProxyOption();
-			}
-		});
-		this.generateSettingOption({
-			$element: document.querySelector('#use-manual-settings .setting-control'),
-			value: ConfigUtil.getConfigItem('useManualProxy', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('useManualProxy');
-				const systemProxyValue = ConfigUtil.getConfigItem('useSystemProxy');
-				this.toggleManualProxySettings(newValue);
-				if (systemProxyValue && newValue) {
-					ConfigUtil.setConfigItem('useSystemProxy', !systemProxyValue);
-				}
-
-				ConfigUtil.setConfigItem('proxyRules', '');
-				ConfigUtil.setConfigItem('useManualProxy', newValue);
-				// Reload app only when turning manual proxy off, hence !newValue
-				ipcRenderer.send('forward-message', 'reload-proxy', !newValue);
-				this.updateProxyOption();
-			}
-		});
-	}
-}

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

@@ -0,0 +1,90 @@
+'use strict';
+
+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) {
+		super();
+		this.props = props;
+	}
+
+	template() {
+		return `
+			<div class="server-input-container">
+				<div class="title">Organization URL</div>
+				<div class="server-info-row">
+					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or chat.your-organization.com"/>
+				</div>
+				<div class="server-center">
+					<div class="action blue server-save-action">
+						<span id="connect">Connect</span>
+					</div>
+				</div>
+				<div class="server-center">
+				<div class="divider">
+					<hr class="left"/>OR<hr class="right" />
+				</div>
+				</div>
+				<div class="server-center">
+				<div class="action blue server-save-action">
+					<span id="open-create-org-link">Create a new organization</span>
+			</div>
+					</div>
+			</div>
+		`;
+	}
+
+	init() {
+		this.initForm();
+		this.initActions();
+	}
+
+	initForm() {
+		this.$newServerForm = this.generateNodeFromTemplate(this.template());
+		this.$saveServerButton = this.$newServerForm.getElementsByClassName('server-save-action')[0];
+
+		this.props.$root.innerHTML = '';
+		this.props.$root.appendChild(this.$newServerForm);
+
+		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0];
+	}
+
+	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/beta/';
+		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
+		externalCreateNewOrgEl.addEventListener('click', () => {
+			shell.openExternal(link);
+		});
+	}
+
+	initActions() {
+		this.$saveServerButton.addEventListener('click', () => {
+			this.submitFormHandler();
+		});
+		this.$newServerUrl.addEventListener('keypress', event => {
+			const EnterkeyCode = event.keyCode;
+			// Submit form when Enter key is pressed
+			if (EnterkeyCode === 13) {
+				this.submitFormHandler();
+			}
+		});
+		// open create new org link in default browser
+		this.openCreateNewOrgExternalLink();
+	}
+}
+
+module.exports = NewServerForm;

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

@@ -1,116 +0,0 @@
-import {ipcRenderer, remote} from 'electron';
-
-import {htmlEscape} from 'escape-goat';
-
-import BaseComponent from '../../components/base';
-import * as DomainUtil from '../../utils/domain-util';
-import * as LinkUtil from '../../utils/link-util';
-import * as t from '../../utils/translation-util';
-
-const {dialog} = remote;
-
-interface NewServerFormProps {
-	$root: Element;
-	onChange: () => void;
-}
-
-export default class NewServerForm extends BaseComponent {
-	props: NewServerFormProps;
-	$newServerForm: Element;
-	$saveServerButton: HTMLButtonElement;
-	$newServerUrl: HTMLInputElement;
-	constructor(props: NewServerFormProps) {
-		super();
-		this.props = props;
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-			<div class="server-input-container">
-				<div class="title">${t.__('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">
-					<button id="connect">${t.__('Connect')}</button>
-				</div>
-				<div class="server-center">
-					<div class="divider">
-						<hr class="left"/>${t.__('OR')}<hr class="right" />
-					</div>
-				</div>
-				<div class="server-center">
-					<button id="open-create-org-link">${t.__('Create a new organization')}</button>
-				</div>
-				<div class="server-center">
-					<div class="server-network-option">
-						<span id="open-network-settings">${t.__('Network and Proxy Settings')}</span>
-						<i class="material-icons open-network-button">open_in_new</i>
-					</div>
-				</div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.initForm();
-		this.initActions();
-	}
-
-	initForm(): void {
-		this.$newServerForm = this.generateNodeFromHTML(this.templateHTML());
-		this.$saveServerButton = this.$newServerForm.querySelector('#connect');
-		this.props.$root.textContent = '';
-		this.props.$root.append(this.$newServerForm);
-		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
-	}
-
-	async submitFormHandler(): Promise<void> {
-		this.$saveServerButton.textContent = 'Connecting...';
-		let serverConf;
-		try {
-			serverConf = await DomainUtil.checkDomain(this.$newServerUrl.value.trim());
-		} catch (error: unknown) {
-			this.$saveServerButton.textContent = 'Connect';
-			await dialog.showMessageBox({
-				type: 'error',
-				message: error instanceof Error ?
-					`${error.name}: ${error.message}` : 'Unknown error',
-				buttons: ['OK']
-			});
-			return;
-		}
-
-		await DomainUtil.addDomain(serverConf);
-		this.props.onChange();
-	}
-
-	openCreateNewOrgExternalLink(): void {
-		const link = 'https://zulip.com/new/';
-		const externalCreateNewOrgElement = document.querySelector('#open-create-org-link');
-		externalCreateNewOrgElement.addEventListener('click', async () => {
-			await LinkUtil.openBrowser(new URL(link));
-		});
-	}
-
-	networkSettingsLink(): void {
-		const networkSettingsId = document.querySelectorAll('.server-network-option')[0];
-		networkSettingsId.addEventListener('click', () => {
-			ipcRenderer.send('forward-message', 'open-network-settings');
-		});
-	}
-
-	initActions(): void {
-		this.$saveServerButton.addEventListener('click', async () => {
-			await this.submitFormHandler();
-		});
-		this.$newServerUrl.addEventListener('keypress', async event => {
-			if (event.key === 'Enter') {
-				await this.submitFormHandler();
-			}
-		});
-		// Open create new org link in default browser
-		this.openCreateNewOrgExternalLink();
-		this.networkSettingsLink();
-	}
-}

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

@@ -0,0 +1,106 @@
+'use strict';
+
+const BaseComponent = require(__dirname + '/js/components/base.js');
+const { ipcRenderer } = require('electron');
+
+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 {
+	constructor() {
+		super();
+
+		this.$sidebarContainer = document.getElementById('sidebar');
+		this.$settingsContainer = document.getElementById('settings-container');
+	}
+
+	init() {
+		this.nav = new Nav({
+			$root: this.$sidebarContainer,
+			onItemSelected: this.handleNavigation.bind(this)
+		});
+
+		this.setDefaultView();
+		this.registerIpcs();
+	}
+
+	setDefaultView() {
+		let nav = 'General';
+		const hasTag = window.location.hash;
+		if (hasTag) {
+			nav = hasTag.substring(1);
+		}
+		this.handleNavigation(nav);
+	}
+
+	handleNavigation(navItem) {
+		this.nav.select(navItem);
+		switch (navItem) {
+			case 'AddServer': {
+				this.section = new ServersSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			case 'General': {
+				this.section = new GeneralSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			case 'Organizations': {
+				this.section = new ConnectedOrgSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			case 'Network': {
+				this.section = new NetworkSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			case 'Shortcuts': {
+				this.section = new ShortcutsSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			default: break;
+		}
+		this.section.init();
+		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);
+		});
+	}
+}
+
+window.onload = () => {
+	const preferenceView = new PreferenceView();
+	preferenceView.init();
+};

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

@@ -1,131 +0,0 @@
-import {ipcRenderer} from 'electron';
-
-import BaseComponent from '../../components/base';
-import type {DNDSettings} from '../../utils/dnd-util';
-
-import ConnectedOrgSection from './connected-org-section';
-import GeneralSection from './general-section';
-import Nav from './nav';
-import NetworkSection from './network-section';
-import ServersSection from './servers-section';
-import ShortcutsSection from './shortcuts-section';
-
-type Section = ServersSection | GeneralSection | NetworkSection | ConnectedOrgSection | ShortcutsSection;
-
-export default class PreferenceView extends BaseComponent {
-	$sidebarContainer: Element;
-	$settingsContainer: Element;
-	nav: Nav;
-	section: Section;
-	constructor() {
-		super();
-		this.$sidebarContainer = document.querySelector('#sidebar');
-		this.$settingsContainer = document.querySelector('#settings-container');
-	}
-
-	init(): void {
-		this.nav = new Nav({
-			$root: this.$sidebarContainer,
-			onItemSelected: this.handleNavigation.bind(this)
-		});
-
-		this.setDefaultView();
-		this.registerIpcs();
-	}
-
-	setDefaultView(): void {
-		let nav = 'General';
-		const hasTag = window.location.hash;
-		if (hasTag) {
-			nav = hasTag.slice(1);
-		}
-
-		this.handleNavigation(nav);
-	}
-
-	handleNavigation(navItem: string): void {
-		this.nav.select(navItem);
-		switch (navItem) {
-			case 'AddServer': {
-				this.section = new ServersSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
-
-			case 'General': {
-				this.section = new GeneralSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
-
-			case 'Organizations': {
-				this.section = new ConnectedOrgSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
-
-			case 'Network': {
-				this.section = new NetworkSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
-
-			case 'Shortcuts': {
-				this.section = new ShortcutsSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
-
-			default: break;
-		}
-
-		this.section.init();
-		window.location.hash = `#${navItem}`;
-	}
-
-	// Handle toggling and reflect changes in preference page
-	handleToggle(elementName: string, state: boolean): void {
-		const inputSelector = `#${elementName} .action .switch input`;
-		const input: HTMLInputElement = document.querySelector(inputSelector);
-		if (input) {
-			input.checked = state;
-		}
-	}
-
-	registerIpcs(): void {
-		ipcRenderer.on('switch-settings-nav', (_event: Event, navItem: string) => {
-			this.handleNavigation(navItem);
-		});
-
-		ipcRenderer.on('toggle-sidebar-setting', (_event: Event, state: boolean) => {
-			this.handleToggle('sidebar-option', state);
-		});
-
-		ipcRenderer.on('toggle-menubar-setting', (_event: Event, state: boolean) => {
-			this.handleToggle('menubar-option', state);
-		});
-
-		ipcRenderer.on('toggletray', (_event: Event, state: boolean) => {
-			this.handleToggle('tray-option', state);
-		});
-
-		ipcRenderer.on('toggle-dnd', (_event: Event, _state: boolean, newSettings: DNDSettings) => {
-			this.handleToggle('show-notification-option', newSettings.showNotification);
-			this.handleToggle('silent-option', newSettings.silent);
-
-			if (process.platform === 'win32') {
-				this.handleToggle('flash-taskbar-option', newSettings.flashTaskbarOnMessage);
-			}
-		});
-	}
-}
-
-window.addEventListener('load', () => {
-	const preferenceView = new PreferenceView();
-	preferenceView.init();
-});

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

@@ -0,0 +1,77 @@
+'use strict';
+const { dialog } = require('electron').remote;
+const { ipcRenderer } = require('electron');
+
+const BaseComponent = require(__dirname + '/../../components/base.js');
+const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+
+class ServerInfoForm extends BaseComponent {
+	constructor(props) {
+		super();
+		this.props = props;
+	}
+
+	template() {
+		return `
+			<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 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">
+							<i class="material-icons">indeterminate_check_box</i>
+							<span>Delete</span>
+						</div>
+					</div>
+				</div>
+			</div>
+		`;
+	}
+
+	init() {
+		this.initForm();
+		this.initActions();
+	}
+
+	initForm() {
+		this.$serverInfoForm = this.generateNodeFromTemplate(this.template());
+		this.$serverInfoAlias = this.$serverInfoForm.getElementsByClassName('server-info-alias')[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);
+	}
+
+	initActions() {
+		this.$deleteServerButton.addEventListener('click', () => {
+			dialog.showMessageBox({
+				type: 'warning',
+				buttons: ['YES', 'NO'],
+				defaultId: 0,
+				message: 'Are you sure you want to disconnect this organization?'
+			}, response => {
+				if (response === 0) {
+					DomainUtil.removeDomain(this.props.index);
+					this.props.onChange(this.props.index);
+				}
+			});
+		});
+
+		this.$openServerButton.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
+		});
+
+		this.$serverInfoAlias.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
+		});
+	}
+}
+
+module.exports = ServerInfoForm;

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

@@ -1,99 +0,0 @@
-import {remote, ipcRenderer} from 'electron';
-
-import {htmlEscape} from 'escape-goat';
-
-import * as Messages from '../../../../resources/messages';
-import BaseComponent from '../../components/base';
-import * as DomainUtil from '../../utils/domain-util';
-import * as t from '../../utils/translation-util';
-
-const {dialog} = remote;
-
-interface ServerInfoFormProps {
-	$root: Element;
-	server: DomainUtil.ServerConf;
-	index: number;
-	onChange: () => void;
-}
-
-export default class ServerInfoForm extends BaseComponent {
-	props: ServerInfoFormProps;
-	$serverInfoForm: Element;
-	$serverInfoAlias: Element;
-	$serverIcon: Element;
-	$deleteServerButton: Element;
-	$openServerButton: Element;
-	constructor(props: ServerInfoFormProps) {
-		super();
-		this.props = props;
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-			<div class="settings-card">
-				<div class="server-info-left">
-					<img class="server-info-icon" src="${this.props.server.icon}"/>
-					<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>
-					<div class="server-info-row">
-						<div class="action red server-delete-action">
-							<span>${t.__('Disconnect')}</span>
-						</div>
-					</div>
-				</div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.initForm();
-		this.initActions();
-	}
-
-	initForm(): void {
-		this.$serverInfoForm = this.generateNodeFromHTML(this.templateHTML());
-		this.$serverInfoAlias = this.$serverInfoForm.querySelectorAll('.server-info-alias')[0];
-		this.$serverIcon = this.$serverInfoForm.querySelectorAll('.server-info-icon')[0];
-		this.$deleteServerButton = this.$serverInfoForm.querySelectorAll('.server-delete-action')[0];
-		this.$openServerButton = this.$serverInfoForm.querySelectorAll('.open-tab-button')[0];
-		this.props.$root.append(this.$serverInfoForm);
-	}
-
-	initActions(): void {
-		this.$deleteServerButton.addEventListener('click', async () => {
-			const {response} = await dialog.showMessageBox({
-				type: 'warning',
-				buttons: [t.__('YES'), t.__('NO')],
-				defaultId: 0,
-				message: t.__('Are you sure you want to disconnect this organization?')
-			});
-			if (response === 0) {
-				if (DomainUtil.removeDomain(this.props.index)) {
-					ipcRenderer.send('reload-full-app');
-				} else {
-					const {title, content} = Messages.orgRemovalError(DomainUtil.getDomain(this.props.index).url);
-					dialog.showErrorBox(title, content);
-				}
-			}
-		});
-
-		this.$openServerButton.addEventListener('click', () => {
-			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
-		});
-
-		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);
-		});
-	}
-}

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

@@ -0,0 +1,46 @@
+'use strict';
+
+const BaseSection = require(__dirname + '/base-section.js');
+const NewServerForm = require(__dirname + '/new-server-form.js');
+
+class ServersSection extends BaseSection {
+	constructor(props) {
+		super();
+		this.props = props;
+	}
+
+	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>
+		</div>
+		`;
+	}
+
+	init() {
+		this.initServers();
+	}
+
+	initServers() {
+		this.props.$root.innerHTML = '';
+
+		this.props.$root.innerHTML = this.template();
+		this.$newServerContainer = document.getElementById('new-server-container');
+
+		this.initNewServerForm();
+	}
+
+	initNewServerForm() {
+		new NewServerForm({
+			$root: this.$newServerContainer,
+			onChange: this.reloadApp
+		}).init();
+	}
+}
+
+module.exports = ServersSection;

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

@@ -1,52 +0,0 @@
-import {htmlEscape} from 'escape-goat';
-
-import * as t from '../../utils/translation-util';
-
-import BaseSection from './base-section';
-import NewServerForm from './new-server-form';
-
-interface ServersSectionProps {
-	$root: Element;
-}
-
-export default class ServersSection extends BaseSection {
-	props: ServersSectionProps;
-	$newServerContainer: Element;
-	constructor(props: ServersSectionProps) {
-		super();
-		this.props = props;
-	}
-
-	templateHTML(): string {
-		return htmlEscape`
-			<div class="add-server-modal">
-				<div class="modal-container">
-					<div class="settings-pane" id="server-settings-pane">
-						<div class="page-title">${t.__('Add a Zulip organization')}</div>
-						<div id="new-server-container"></div>
-					</div>
-				</div>
-			</div>
-		`;
-	}
-
-	init(): void {
-		this.initServers();
-	}
-
-	initServers(): void {
-		this.props.$root.textContent = '';
-
-		this.props.$root.innerHTML = this.templateHTML();
-		this.$newServerContainer = document.querySelector('#new-server-container');
-
-		this.initNewServerForm();
-	}
-
-	initNewServerForm(): void {
-		new NewServerForm({
-			$root: this.$newServerContainer,
-			onChange: this.reloadApp
-		}).init();
-	}
-}

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

@@ -0,0 +1,311 @@
+'use strict';
+
+const BaseSection = require(__dirname + '/base-section.js');
+
+class ShortcutsSection extends BaseSection {
+	constructor(props) {
+		super();
+		this.props = props;
+	}
+
+	templateMac() {
+		const userOSKey = '⌘';
+
+		return `
+            <div class="settings-pane">
+              <div class="title">Application Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>,</kbd></td>
+                    <td>Settings</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>K</kbd></td>
+                    <td>Keyboard Shortcuts</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>D</kbd></td>
+                    <td>Reset App Settings</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>L</kbd></td>
+                    <td>Log Out</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>H</kbd></td>
+                    <td>Hide Zulip</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>H</kbd></td>
+                    <td>Hide Others</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>Q</kbd></td>
+                    <td>Quit Zulip</td>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+              <div class="title">Edit Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>Z</kbd></td>
+                    <td>Undo</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>Z</kbd></td>
+                    <td>Redo</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>X</kbd></td>
+                    <td>Cut</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>C</kbd></td>
+                    <td>Copy</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>V</kbd></td>
+                    <td>Paste</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>V</kbd></td>
+                    <td>Paste and Match Style</td>
+                  </tr>
+                  <tr>
+                    <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>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+              <div class="title">View Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>R</kbd></td>
+                    <td>Reload</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>R</kbd></td>
+                    <td>Hard Reload</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Control</kbd><kbd>${userOSKey}</kbd><kbd>F</kbd></td>
+                    <td>Enter Full Screen</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>+</kbd></td>
+                    <td>Zoom In</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>-</kbd></td>
+                    <td>Zoom Out</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>0</kbd></td>
+                    <td>Actual Size</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>S</kbd></td>
+                    <td>Toggle Sidebar</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>I</kbd></td>
+                    <td>Toggle DevTools for Zulip App</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>U</kbd></td>
+                    <td>Toggle DevTools for Active Tab</td>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+              <div class="title">History Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>←</kbd></td>
+                    <td>Back</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>→</kbd></td>
+                    <td>Forward</td>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+              <div class="title">Window Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>M</kbd></td>
+                    <td>Minimize</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd><kbd>W</kbd></td>
+                    <td>Close</td>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+            </div>
+		`;
+	}
+
+	templateWinLin() {
+		const userOSKey = 'Ctrl';
+
+		return `
+            <div class="settings-pane">
+              <div class="title">Application Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>,</kbd></td>
+                    <td>Settings</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>K</kbd></td>
+                    <td>Keyboard Shortcuts</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>L</kbd></td>
+                    <td>Log Out</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Q</kbd></td>
+                    <td>Quit Zulip</td>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+              <div class="title">Edit Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Z</kbd></td>
+                    <td>Undo</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Y</kbd></td>
+                    <td>Redo</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>X</kbd></td>
+                    <td>Cut</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>C</kbd></td>
+                    <td>Copy</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>V</kbd></td>
+                    <td>Paste</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>V</kbd></td>
+                    <td>Paste and Match Style</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>A</kbd></td>
+                    <td>Select All</td>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+              <div class="title">View Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>R</kbd></td>
+                    <td>Reload</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>R</kbd></td>
+                    <td>Hard Reload</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>F11</kbd></td>
+                    <td>Toggle Full Screen</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>=</kbd></td>
+                    <td>Zoom In</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>-</kbd></td>
+                    <td>Zoom Out</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>0</kbd></td>
+                    <td>Actual Size</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>S</kbd></td>
+                    <td>Toggle Sidebar</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>I</kbd></td>
+                    <td>Toggle DevTools for Zulip App</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>U</kbd></td>
+                    <td>Toggle DevTools for Active Tab</td>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+              <div class="title">History Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>Alt</kbd> + <kbd>←</kbd></td>
+                    <td>Back</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Alt</kbd> + <kbd>→</kbd></td>
+                    <td>Forward</td>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+              <div class="title">Window Shortcuts</div>
+              <div class="settings-card">
+                <table>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>M</kbd></td>
+                    <td>Minimize</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>W</kbd></td>
+                    <td>Close</td>
+                  </tr>
+                </table>
+                <div class="setting-control"></div>
+              </div>
+            </div>
+		`;
+	}
+
+	init() {
+		this.props.$root.innerHTML = (process.platform === 'darwin') ?
+			this.templateMac() : this.templateWinLin();
+	}
+}
+
+module.exports = ShortcutsSection;

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

@@ -1,240 +0,0 @@
-import {htmlEscape} from 'escape-goat';
-
-import * as LinkUtil from '../../utils/link-util';
-import * as t from '../../utils/translation-util';
-
-import BaseSection from './base-section';
-
-interface ShortcutsSectionProps {
-	$root: Element;
-}
-
-export default class ShortcutsSection extends BaseSection {
-	props: ShortcutsSectionProps;
-	constructor(props: ShortcutsSectionProps) {
-		super();
-		this.props = props;
-	}
-
-	// eslint-disable-next-line complexity
-	templateHTML(): string {
-		const cmdOrCtrl = process.platform === 'darwin' ? '⌘' : 'Ctrl';
-
-		return htmlEscape`
-						<div class="settings-pane">
-						<div class="settings-card tip"><p><b><i class="material-icons md-14">settings</i>${t.__('Tip')}:  </b>${t.__('These desktop app shortcuts extend the Zulip webapp\'s')} <span id="open-hotkeys-link"> ${t.__('keyboard shortcuts')}</span>.</p></div>
-							<div class="title">${t.__('Application Shortcuts')}</div>
-							<div class="settings-card">
-								<table>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>,</kbd></td>
-										<td>${t.__('Settings')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>K</kbd></td>
-										<td>${t.__('Keyboard Shortcuts')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>Shift</kbd> + <kbd>M</kbd></td>
-										<td>${t.__('Toggle Do Not Disturb')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Shift</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>M</kbd></td>
-										<td>${t.__('Toggle Do Not Disturb')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Shift</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>D</kbd></td>
-										<td>${t.__('Reset App Settings')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>L</kbd></td>
-										<td>${t.__('Log Out')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>H</kbd></td>
-										<td>${t.__('Hide Zulip')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Option</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>H</kbd></td>
-										<td>${t.__('Hide Others')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>Q</kbd></td>
-										<td>${t.__('Quit Zulip')}</td>
-									</tr>
-								</table>
-								<div class="setting-control"></div>
-							</div>
-							<div class="title">${t.__('Edit Shortcuts')}</div>
-							<div class="settings-card">
-								<table>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>Z</kbd></td>
-										<td>${t.__('Undo')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Shift</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>Z</kbd></td>
-										<td>${t.__('Redo')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>Y</kbd></td>
-										<td>${t.__('Redo')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>X</kbd></td>
-										<td>${t.__('Cut')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>C</kbd></td>
-										<td>${t.__('Copy')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>V</kbd></td>
-										<td>${t.__('Paste')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>Shift</kbd> + <kbd>V</kbd></td>
-										<td>${t.__('Paste and Match Style')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Shift</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>V</kbd></td>
-										<td>${t.__('Paste and Match Style')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>A</kbd></td>
-										<td>${t.__('Select All')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Control</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>Space</kbd></td>
-										<td>${t.__('Emoji & Symbols')}</td>
-									</tr>
-								</table>
-								<div class="setting-control"></div>
-							</div>
-							<div class="title">${t.__('View Shortcuts')}</div>
-							<div class="settings-card">
-								<table>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>R</kbd></td>
-										<td>${t.__('Reload')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>Shift</kbd> + <kbd>R</kbd></td>
-										<td>${t.__('Hard Reload')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Shift</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>R</kbd></td>
-										<td>${t.__('Hard Reload')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>F11</kbd></td>
-										<td>${t.__('Toggle Full Screen')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Control</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>F</kbd></td>
-										<td>${t.__('Enter Full Screen')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>+</kbd></td>
-										<td>${t.__('Zoom In')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>=</kbd></td>
-										<td>${t.__('Zoom In')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>-</kbd></td>
-										<td>${t.__('Zoom Out')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>0</kbd></td>
-										<td>${t.__('Actual Size')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd></td>
-										<td>${t.__('Toggle Sidebar')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Shift</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>S</kbd></td>
-										<td>${t.__('Toggle Sidebar')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Option</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>I</kbd></td>
-										<td>${t.__('Toggle DevTools for Zulip App')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>Shift</kbd> + <kbd>I</kbd></td>
-										<td>${t.__('Toggle DevTools for Zulip App')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>Option</kbd> + <kbd>${cmdOrCtrl}</kbd> + <kbd>U</kbd></td>
-										<td>${t.__('Toggle DevTools for Active Tab')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>Shift</kbd> + <kbd>U</kbd></td>
-										<td>${t.__('Toggle DevTools for Active Tab')}</td>
-									</tr>
-									<tr>
-										<td><kbd>Ctrl</kbd> + <kbd>Tab</kbd></td>
-										<td>${t.__('Switch to Next Organization')}</td>
-									</tr>
-									<tr>
-										<td><kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd></td>
-										<td>${t.__('Switch to Previous Organization')}</td>
-									</tr>
-								</table>
-								<div class="setting-control"></div>
-							</div>
-							<div class="title">${t.__('History Shortcuts')}</div>
-							<div class="settings-card">
-								<table>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>←</kbd></td>
-										<td>${t.__('Back')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>Alt</kbd> + <kbd>←</kbd></td>
-										<td>${t.__('Back')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? '' : 'hidden'}>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>→</kbd></td>
-										<td>${t.__('Forward')}</td>
-									</tr>
-									<tr ${process.platform === 'darwin' ? 'hidden' : ''}>
-										<td><kbd>Alt</kbd> + <kbd>→</kbd></td>
-										<td>${t.__('Forward')}</td>
-									</tr>
-								</table>
-								<div class="setting-control"></div>
-							</div>
-							<div class="title">${t.__('Window Shortcuts')}</div>
-							<div class="settings-card">
-								<table>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>M</kbd></td>
-										<td>${t.__('Minimize')}</td>
-									</tr>
-									<tr>
-										<td><kbd>${cmdOrCtrl}</kbd> + <kbd>W</kbd></td>
-										<td>${t.__('Close')}</td>
-									</tr>
-								</table>
-								<div class="setting-control"></div>
-							</div>
-						</div>
-		`;
-	}
-
-	openHotkeysExternalLink(): void {
-		const link = 'https://zulip.com/help/keyboard-shortcuts';
-		const externalCreateNewOrgElement = document.querySelector('#open-hotkeys-link');
-		externalCreateNewOrgElement.addEventListener('click', async () => {
-			await LinkUtil.openBrowser(new URL(link));
-		});
-	}
-
-	init(): void {
-		this.props.$root.innerHTML = this.templateHTML();
-		this.openHotkeysExternalLink();
-	}
-}

app/renderer/js/preload.js

@@ -0,0 +1,62 @@
+'use strict';
+
+const { ipcRenderer } = require('electron');
+const SetupSpellChecker = require('./spellchecker');
+
+const ConfigUtil = require(__dirname + '/utils/config-util.js');
+
+// eslint-disable-next-line import/no-unassigned-import
+require('./notification');
+
+const logout = () => {
+	// Create the menu for the below
+	document.querySelector('.dropdown-toggle').click();
+
+	const nodes = document.querySelectorAll('.dropdown-menu li:last-child a');
+	nodes[nodes.length - 1].click();
+};
+
+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') {
+		node.click();
+	} else {
+		// Atleast click the dropdown
+		document.querySelector('.dropdown-toggle').click();
+	}
+};
+
+process.once('loaded', () => {
+	global.logout = logout;
+	global.shortcut = shortcut;
+});
+
+// To prevent failing this script on linux we need to load it after the document loaded
+document.addEventListener('DOMContentLoaded', () => {
+	// Get the default language of the server
+	const serverLanguage = page_params.default_language; // eslint-disable-line no-undef, camelcase
+
+	if (serverLanguage) {
+		// Set spellcheker language
+		ConfigUtil.setConfigItem('spellcheckerLanguage', serverLanguage);
+		// Init spellchecker
+		SetupSpellChecker.init();
+	}
+
+	// redirect users to network troubleshooting page
+	const getRestartButton = document.querySelector('.restart_get_events_button');
+	if (getRestartButton) {
+		getRestartButton.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'reload-viewer');
+		});
+	}
+});
+
+// Clean up spellchecker events after you navigate away from this page;
+// otherwise, you may experience errors
+window.addEventListener('beforeunload', () => {
+	SetupSpellChecker.unsubscribeSpellChecker();
+});
+

app/renderer/js/preload.ts

@@ -1,71 +0,0 @@
-import {contextBridge, ipcRenderer, webFrame} from 'electron';
-import fs from 'fs';
-
-import electron_bridge, {bridgeEvents} from './electron-bridge';
-import * as NetworkError from './pages/network';
-
-contextBridge.exposeInMainWorld('raw_electron_bridge', electron_bridge);
-
-ipcRenderer.on('logout', () => {
-	if (bridgeEvents.emit('logout')) {
-		return;
-	}
-
-	// Create the menu for the below
-	const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
-	dropdown.click();
-
-	const nodes: NodeListOf<HTMLElement> = document.querySelectorAll('.dropdown-menu li:last-child a');
-	nodes[nodes.length - 1].click();
-});
-
-ipcRenderer.on('show-keyboard-shortcuts', () => {
-	if (bridgeEvents.emit('show-keyboard-shortcuts')) {
-		return;
-	}
-
-	// Create the menu for the below
-	const node: HTMLElement = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
-	// Additional check
-	if (node.textContent.trim().toLowerCase() === 'keyboard shortcuts (?)') {
-		node.click();
-	} else {
-		// Atleast click the dropdown
-		const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
-		dropdown.click();
-	}
-});
-
-ipcRenderer.on('show-notification-settings', () => {
-	if (bridgeEvents.emit('show-notification-settings')) {
-		return;
-	}
-
-	// Create the menu for the below
-	const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
-	dropdown.click();
-
-	const nodes: NodeListOf<HTMLElement> = document.querySelectorAll('.dropdown-menu li a');
-	nodes[2].click();
-
-	const notificationItem: NodeListOf<HTMLElement> = document.querySelectorAll('.normal-settings-list li div');
-
-	// Wait until the notification dom element shows up
-	setTimeout(() => {
-		notificationItem[2].click();
-	}, 100);
-});
-
-window.addEventListener('load', (event: any): void => {
-	if (!event.target.URL.includes('app/renderer/network.html')) {
-		return;
-	}
-
-	const $reconnectButton = document.querySelector('#reconnect');
-	const $settingsButton = document.querySelector('#settings');
-	NetworkError.init($reconnectButton, $settingsButton);
-});
-
-(async () => webFrame.executeJavaScript(
-	fs.readFileSync(require.resolve('./injected'), 'utf8')
-))();

app/renderer/js/spellchecker.js

@@ -0,0 +1,56 @@
+'use strict';
+
+const { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } = require('electron-spellchecker');
+
+const ConfigUtil = require(__dirname + '/utils/config-util.js');
+
+class SetupSpellChecker {
+	init() {
+		if (ConfigUtil.getConfigItem('enableSpellchecker')) {
+			this.enableSpellChecker();
+		}
+		this.enableContextMenu();
+	}
+
+	enableSpellChecker() {
+		try {
+			this.SpellCheckHandler = new SpellCheckHandler();
+		} catch (err) {
+			console.log(err);
+		}
+	}
+
+	enableContextMenu() {
+		if (this.SpellCheckHandler) {
+			this.SpellCheckHandler.attachToInput();
+
+			const userLanguage = ConfigUtil.getConfigItem('spellcheckerLanguage');
+
+			// eslint-disable-next-line no-unused-expressions
+			process.platform === 'darwin' ?
+				// On macOS, spellchecker fails to auto-detect the lanugage user is typing in
+				// that's why we need to mention it explicitly
+				this.SpellCheckHandler.switchLanguage(userLanguage) :
+				// On Linux and Windows, spellchecker can automatically detects the language the user is typing in
+				// and silently switches on the fly; thus we can start off as US English
+				this.SpellCheckHandler.switchLanguage('en-US');
+		}
+
+		const contextMenuBuilder = new ContextMenuBuilder(this.SpellCheckHandler);
+		this.contextMenuListener = new ContextMenuListener(info => {
+			contextMenuBuilder.showPopupMenu(info);
+		});
+	}
+
+	unsubscribeSpellChecker() {
+		// eslint-disable-next-line no-undef
+		if (this.SpellCheckHandler) {
+			this.SpellCheckHandler.unsubscribe();
+		}
+		if (this.contextMenuListener) {
+			this.contextMenuListener.unsubscribe();
+		}
+	}
+}
+
+module.exports = new SetupSpellChecker();

app/renderer/js/tray.js

@@ -0,0 +1,229 @@
+'use strict';
+const path = require('path');
+
+const electron = require('electron');
+
+const {ipcRenderer, remote} = electron;
+
+const {Tray, Menu, nativeImage, BrowserWindow} = remote;
+
+const APP_ICON = path.join(__dirname, '../../resources/tray', 'tray');
+
+const ConfigUtil = require(__dirname + '/utils/config-util.js');
+
+const iconPath = () => {
+	if (process.platform === 'linux') {
+		return APP_ICON + 'linux.png';
+	}
+	return APP_ICON + (process.platform === 'win32' ? 'win.ico' : 'osx.png');
+};
+
+let unread = 0;
+
+const trayIconSize = () => {
+	switch (process.platform) {
+		case 'darwin':
+			return 20;
+		case 'win32':
+			return 100;
+		case 'linux':
+			return 100;
+		default: return 80;
+	}
+};
+
+//  Default config for Icon we might make it OS specific if needed like the size
+const config = {
+	pixelRatio: window.devicePixelRatio,
+	unreadCount: 0,
+	showUnreadCount: true,
+	unreadColor: '#000000',
+	readColor: '#000000',
+	unreadBackgroundColor: '#B9FEEA',
+	readBackgroundColor: '#B9FEEA',
+	size: trayIconSize(),
+	thick: process.platform === 'win32'
+};
+
+const renderCanvas = function (arg) {
+	config.unreadCount = arg;
+
+	return new Promise(resolve => {
+		const SIZE = config.size * config.pixelRatio;
+		const PADDING = SIZE * 0.05;
+		const CENTER = SIZE / 2;
+		const HAS_COUNT = config.showUnreadCount && config.unreadCount;
+		const color = config.unreadCount ? config.unreadColor : config.readColor;
+		const backgroundColor = config.unreadCount ? config.unreadBackgroundColor : config.readBackgroundColor;
+
+		const canvas = document.createElement('canvas');
+		canvas.width = SIZE;
+		canvas.height = SIZE;
+		const ctx = canvas.getContext('2d');
+
+		// Circle
+		// If (!config.thick || config.thick && HAS_COUNT) {
+		ctx.beginPath();
+		ctx.arc(CENTER, CENTER, (SIZE / 2) - PADDING, 0, 2 * Math.PI, false);
+		ctx.fillStyle = backgroundColor;
+		ctx.fill();
+		ctx.lineWidth = SIZE / (config.thick ? 10 : 20);
+		ctx.strokeStyle = backgroundColor;
+		ctx.stroke();
+		// Count or Icon
+		if (HAS_COUNT) {
+			ctx.fillStyle = color;
+			ctx.textAlign = 'center';
+			if (config.unreadCount > 99) {
+				ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.4}px Helvetica`;
+				ctx.fillText('99+', CENTER, CENTER + (SIZE * 0.15));
+			} else if (config.unreadCount < 10) {
+				ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.5}px Helvetica`;
+				ctx.fillText(config.unreadCount, CENTER, CENTER + (SIZE * 0.20));
+			} else {
+				ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.5}px Helvetica`;
+				ctx.fillText(config.unreadCount, CENTER, CENTER + (SIZE * 0.15));
+			}
+
+			resolve(canvas);
+		}
+	});
+};
+/**
+ * Renders the tray icon as a native image
+ * @param arg: Unread count
+ * @return the native image
+ */
+const renderNativeImage = function (arg) {
+	return Promise.resolve()
+		.then(() => renderCanvas(arg))
+		.then(canvas => {
+			const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPng();
+			return Promise.resolve(nativeImage.createFromBuffer(pngData, config.pixelRatio));
+		});
+};
+
+function sendAction(action) {
+	const win = BrowserWindow.getAllWindows()[0];
+
+	if (process.platform === 'darwin') {
+		win.restore();
+	}
+
+	win.webContents.send(action);
+}
+
+const createTray = function () {
+	window.tray = new Tray(iconPath());
+	const contextMenu = Menu.buildFromTemplate([{
+		label: 'About',
+		click() {
+			// We need to focus the main window first
+			ipcRenderer.send('focus-app');
+			sendAction('open-about');
+		}
+	},
+	{
+		type: 'separator'
+	},
+	{
+		label: 'Focus',
+		click() {
+			ipcRenderer.send('focus-app');
+		}
+	},
+	{
+		type: 'separator'
+	},
+	{
+		label: 'Settings',
+		click() {
+			ipcRenderer.send('focus-app');
+			sendAction('open-settings');
+		}
+	},
+	{
+		type: 'separator'
+	},
+	{
+		label: 'Quit',
+		click() {
+			ipcRenderer.send('quit-app');
+		}
+	}
+	]);
+	window.tray.setContextMenu(contextMenu);
+	window.tray.on('click', () => {
+		// Click event only works on Windows
+		if (process.platform === 'win32') {
+			ipcRenderer.send('toggle-app');
+		}
+	});
+};
+
+ipcRenderer.on('destroytray', event => {
+	if (!window.tray) {
+		return;
+	}
+
+	window.tray.destroy();
+	if (window.tray.isDestroyed()) {
+		window.tray = null;
+	} else {
+		throw new Error('Tray icon not properly destroyed.');
+	}
+
+	return event;
+});
+
+ipcRenderer.on('tray', (event, arg) => {
+	if (!window.tray) {
+		return;
+	}
+	// We don't want to create tray from unread messages on macOS since it already has dock badges.
+	if (process.platform === 'linux' || process.platform === 'win32') {
+		if (arg === 0) {
+			unread = arg;
+			window.tray.setImage(iconPath());
+			window.tray.setToolTip('No unread messages');
+		} else {
+			unread = arg;
+			renderNativeImage(arg).then(image => {
+				window.tray.setImage(image);
+				window.tray.setToolTip(arg + ' unread messages');
+			});
+		}
+	}
+});
+
+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 => {
+				window.tray.setImage(image);
+				window.tray.setToolTip(unread + ' unread messages');
+			});
+		}
+		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);
+
+if (ConfigUtil.getConfigItem('trayIcon', true)) {
+	createTray();
+}

app/renderer/js/tray.ts

@@ -1,226 +0,0 @@
-import {ipcRenderer, remote, WebviewTag, NativeImage} from 'electron';
-import path from 'path';
-
-import * as ConfigUtil from './utils/config-util';
-
-const {Tray, Menu, nativeImage, BrowserWindow} = remote;
-
-let tray: Electron.Tray;
-
-const ICON_DIR = '../../resources/tray';
-
-const TRAY_SUFFIX = 'tray';
-
-const APP_ICON = path.join(__dirname, ICON_DIR, TRAY_SUFFIX);
-
-const iconPath = (): string => {
-	if (process.platform === 'linux') {
-		return APP_ICON + 'linux.png';
-	}
-
-	return APP_ICON + (process.platform === 'win32' ? 'win.ico' : 'macOSTemplate.png');
-};
-
-const winUnreadTrayIconPath = (): string => APP_ICON + 'unread.ico';
-
-let unread = 0;
-
-const trayIconSize = (): number => {
-	switch (process.platform) {
-		case 'darwin':
-			return 20;
-		case 'win32':
-			return 100;
-		case 'linux':
-			return 100;
-		default: return 80;
-	}
-};
-
-//  Default config for Icon we might make it OS specific if needed like the size
-const config = {
-	pixelRatio: window.devicePixelRatio,
-	unreadCount: 0,
-	showUnreadCount: true,
-	unreadColor: '#000000',
-	readColor: '#000000',
-	unreadBackgroundColor: '#B9FEEA',
-	readBackgroundColor: '#B9FEEA',
-	size: trayIconSize(),
-	thick: process.platform === 'win32'
-};
-
-const renderCanvas = function (arg: number): HTMLCanvasElement {
-	config.unreadCount = arg;
-
-	const SIZE = config.size * config.pixelRatio;
-	const PADDING = SIZE * 0.05;
-	const CENTER = SIZE / 2;
-	const HAS_COUNT = config.showUnreadCount && config.unreadCount;
-	const color = config.unreadCount ? config.unreadColor : config.readColor;
-	const backgroundColor = config.unreadCount ? config.unreadBackgroundColor : config.readBackgroundColor;
-
-	const canvas = document.createElement('canvas');
-	canvas.width = SIZE;
-	canvas.height = SIZE;
-	const ctx = canvas.getContext('2d');
-
-	// Circle
-	// If (!config.thick || config.thick && HAS_COUNT) {
-	ctx.beginPath();
-	ctx.arc(CENTER, CENTER, (SIZE / 2) - PADDING, 0, 2 * Math.PI, false);
-	ctx.fillStyle = backgroundColor;
-	ctx.fill();
-	ctx.lineWidth = SIZE / (config.thick ? 10 : 20);
-	ctx.strokeStyle = backgroundColor;
-	ctx.stroke();
-	// Count or Icon
-	if (HAS_COUNT) {
-		ctx.fillStyle = color;
-		ctx.textAlign = 'center';
-		if (config.unreadCount > 99) {
-			ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.4}px Helvetica`;
-			ctx.fillText('99+', CENTER, CENTER + (SIZE * 0.15));
-		} else if (config.unreadCount < 10) {
-			ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.5}px Helvetica`;
-			ctx.fillText(String(config.unreadCount), CENTER, CENTER + (SIZE * 0.2));
-		} else {
-			ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.5}px Helvetica`;
-			ctx.fillText(String(config.unreadCount), CENTER, CENTER + (SIZE * 0.15));
-		}
-	}
-
-	return canvas;
-};
-
-/**
- * Renders the tray icon as a native image
- * @param arg: Unread count
- * @return the native image
- */
-const renderNativeImage = function (arg: number): NativeImage {
-	if (process.platform === 'win32') {
-		return nativeImage.createFromPath(winUnreadTrayIconPath());
-	}
-
-	const canvas = renderCanvas(arg);
-	const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPNG();
-	return nativeImage.createFromBuffer(pngData, {
-		scaleFactor: config.pixelRatio
-	});
-};
-
-function sendAction(action: string): void {
-	const win = BrowserWindow.getAllWindows()[0];
-
-	if (process.platform === 'darwin') {
-		win.restore();
-	}
-
-	win.webContents.send(action);
-}
-
-const createTray = function (): void {
-	const contextMenu = Menu.buildFromTemplate([
-		{
-			label: 'Zulip',
-			click() {
-				ipcRenderer.send('focus-app');
-			}
-		},
-		{
-			label: 'Settings',
-			click() {
-				ipcRenderer.send('focus-app');
-				sendAction('open-settings');
-			}
-		},
-		{
-			type: 'separator'
-		},
-		{
-			label: 'Quit',
-			click() {
-				ipcRenderer.send('quit-app');
-			}
-		}
-	]);
-	tray = new Tray(iconPath());
-	tray.setContextMenu(contextMenu);
-	if (process.platform === 'linux' || process.platform === 'win32') {
-		tray.on('click', () => {
-			ipcRenderer.send('toggle-app');
-		});
-	}
-};
-
-ipcRenderer.on('destroytray', (event: Event): Event => {
-	if (!tray) {
-		return undefined;
-	}
-
-	tray.destroy();
-	if (tray.isDestroyed()) {
-		tray = null;
-	} else {
-		throw new Error('Tray icon not properly destroyed.');
-	}
-
-	return event;
-});
-
-ipcRenderer.on('tray', (_event: Event, arg: number): void => {
-	if (!tray) {
-		return;
-	}
-
-	// We don't want to create tray from unread messages on macOS since it already has dock badges.
-	if (process.platform === 'linux' || process.platform === 'win32') {
-		if (arg === 0) {
-			unread = arg;
-			tray.setImage(iconPath());
-			tray.setToolTip('No unread messages');
-		} else {
-			unread = arg;
-			const image = renderNativeImage(arg);
-			tray.setImage(image);
-			tray.setToolTip(`${arg} unread messages`);
-		}
-	}
-});
-
-function toggleTray(): void {
-	let state;
-	if (tray) {
-		state = false;
-		tray.destroy();
-		if (tray.isDestroyed()) {
-			tray = null;
-		}
-
-		ConfigUtil.setConfigItem('trayIcon', false);
-	} else {
-		state = true;
-		createTray();
-		if (process.platform === 'linux' || process.platform === 'win32') {
-			const image = renderNativeImage(unread);
-			tray.setImage(image);
-			tray.setToolTip(`${unread} unread messages`);
-		}
-
-		ConfigUtil.setConfigItem('trayIcon', true);
-	}
-
-	const selector = 'webview:not([class*=disabled])';
-	const webview: WebviewTag = document.querySelector(selector);
-	const webContents = remote.webContents.fromId(webview.getWebContentsId());
-	webContents.send('toggletray', state);
-}
-
-ipcRenderer.on('toggletray', toggleTray);
-
-if (ConfigUtil.getConfigItem('trayIcon', true)) {
-	createTray();
-}
-
-export {};

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

@@ -0,0 +1,82 @@
+'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;
+} else {
+	const electron = require('electron');
+	dialog = electron.dialog;
+	app = electron.app;
+}
+
+class ConfigUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		this.reloadDB();
+		return instance;
+	}
+
+	getConfigItem(key, defaultValue = null) {
+		this.reloadDB();
+		const value = this.db.getData('/')[key];
+		if (value === undefined) {
+			this.setConfigItem(key, defaultValue);
+			return defaultValue;
+		} else {
+			return value;
+		}
+	}
+
+	setConfigItem(key, value) {
+		this.db.push(`/${key}`, value, true);
+		this.reloadDB();
+	}
+
+	removeConfigItem(key) {
+		this.db.delete(`/${key}`);
+		this.reloadDB();
+	}
+
+	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);
+	}
+}
+
+module.exports = new ConfigUtil();

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

@@ -1,106 +0,0 @@
-import electron from 'electron';
-import fs from 'fs';
-import path from 'path';
-
-import {JsonDB} from 'node-json-db';
-
-import * as EnterpriseUtil from './enterprise-util';
-import Logger from './logger-util';
-
-const logger = new Logger({
-	file: 'config-util.log',
-	timestamp: true
-});
-
-let dialog: Electron.Dialog = null;
-let app: Electron.App = null;
-
-/* To make the util runnable in both main and renderer process */
-if (process.type === 'renderer') {
-	const {remote} = electron;
-	dialog = remote.dialog;
-	app = remote.app;
-} else {
-	dialog = electron.dialog;
-	app = electron.app;
-}
-
-let db: JsonDB;
-
-reloadDB();
-
-export function getConfigItem(key: string, defaultValue: unknown = null): any {
-	try {
-		db.reload();
-	} catch (error: unknown) {
-		logger.error('Error while reloading settings.json: ');
-		logger.error(error);
-	}
-
-	const value = db.getData('/')[key];
-	if (value === undefined) {
-		setConfigItem(key, defaultValue);
-		return defaultValue;
-	}
-
-	return value;
-}
-
-export function getConfigString(key: string, defaultValue: string): string {
-	const value = getConfigItem(key, defaultValue);
-	if (typeof value === 'string') {
-		return value;
-	}
-
-	setConfigItem(key, defaultValue);
-	return defaultValue;
-}
-
-// This function returns whether a key exists in the configuration file (settings.json)
-export function isConfigItemExists(key: string): boolean {
-	try {
-		db.reload();
-	} catch (error: unknown) {
-		logger.error('Error while reloading settings.json: ');
-		logger.error(error);
-	}
-
-	const value = db.getData('/')[key];
-	return (value !== undefined);
-}
-
-export function setConfigItem(key: string, value: unknown, override? : boolean): void {
-	if (EnterpriseUtil.configItemExists(key) && !override) {
-		// If item is in global config and we're not trying to override
-		return;
-	}
-
-	db.push(`/${key}`, value, true);
-	db.save();
-}
-
-export function removeConfigItem(key: string): void {
-	db.delete(`/${key}`);
-	db.save();
-}
-
-function reloadDB(): void {
-	const settingsJsonPath = path.join(app.getPath('userData'), '/config/settings.json');
-	try {
-		const file = fs.readFileSync(settingsJsonPath, 'utf8');
-		JSON.parse(file);
-	} catch (error: unknown) {
-		if (fs.existsSync(settingsJsonPath)) {
-			fs.unlinkSync(settingsJsonPath);
-			dialog.showErrorBox(
-				'Error saving settings',
-				'We encountered an error while saving the settings.'
-			);
-			logger.error('Error while JSON parsing settings.json: ');
-			logger.error(error);
-			logger.reportSentry(error);
-		}
-	}
-
-	db = new JsonDB(settingsJsonPath, true, true);
-}

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

@@ -0,0 +1,31 @@
+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/default-util.ts

@@ -1,60 +0,0 @@
-import electron from 'electron';
-import fs from 'fs';
-
-const app = process.type === 'renderer' ? electron.remote.app : electron.app;
-let setupCompleted = false;
-
-const zulipDir = app.getPath('userData');
-const logDir = `${zulipDir}/Logs/`;
-const configDir = `${zulipDir}/config/`;
-export const initSetUp = (): void => {
-	// 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);
-		}
-
-		// Migrate config files from app data folder to config folder inside app
-		// data folder. This will be done once when a user updates to the new version.
-		if (!fs.existsSync(configDir)) {
-			fs.mkdirSync(configDir);
-			const domainJson = `${zulipDir}/domain.json`;
-			const settingsJson = `${zulipDir}/settings.json`;
-			const updatesJson = `${zulipDir}/updates.json`;
-			const windowStateJson = `${zulipDir}/window-state.json`;
-			const configData = [
-				{
-					path: domainJson,
-					fileName: 'domain.json'
-				},
-				{
-					path: settingsJson,
-					fileName: 'settings.json'
-				},
-				{
-					path: updatesJson,
-					fileName: 'updates.json'
-				}
-			];
-			configData.forEach(data => {
-				if (fs.existsSync(data.path)) {
-					fs.copyFileSync(data.path, configDir + data.fileName);
-					fs.unlinkSync(data.path);
-				}
-			});
-			// `window-state.json` is only deleted not moved, as the electron-window-state
-			// package will recreate the file in the config folder.
-			if (fs.existsSync(windowStateJson)) {
-				fs.unlinkSync(windowStateJson);
-			}
-		}
-
-		setupCompleted = true;
-	}
-};

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

@@ -1,48 +0,0 @@
-import * as ConfigUtil from './config-util';
-
-type SettingName = 'showNotification' | 'silent' | 'flashTaskbarOnMessage';
-
-export interface DNDSettings {
-	showNotification?: boolean;
-	silent?: boolean;
-	flashTaskbarOnMessage?: boolean;
-}
-
-interface Toggle {
-	dnd: boolean;
-	newSettings: DNDSettings;
-}
-
-export function toggle(): Toggle {
-	const dnd = !ConfigUtil.getConfigItem('dnd', false);
-	const dndSettingList: SettingName[] = ['showNotification', 'silent'];
-	if (process.platform === 'win32') {
-		dndSettingList.push('flashTaskbarOnMessage');
-	}
-
-	let newSettings: DNDSettings;
-	if (dnd) {
-		const oldSettings: DNDSettings = {};
-		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};
-}

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

@@ -0,0 +1,286 @@
+'use strict';
+
+const { app, dialog } = require('electron').remote;
+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;
+
+const defaultIconUrl = '../renderer/img/icon.png';
+
+class DomainUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		this.reloadDB();
+		// Migrate from old schema
+		if (this.db.getData('/').domain) {
+			this.addDomain({
+				alias: 'Zulip',
+				url: this.db.getData('/domain')
+			});
+			this.db.delete('/domain');
+		}
+
+		return instance;
+	}
+
+	getDomains() {
+		this.reloadDB();
+		if (this.db.getData('/').domains === undefined) {
+			return [];
+		} else {
+			return this.db.getData('/domains');
+		}
+	}
+
+	getDomain(index) {
+		this.reloadDB();
+		return this.db.getData(`/domains[${index}]`);
+	}
+
+	updateDomain(index, server) {
+		this.reloadDB();
+		this.db.push(`/domains[${index}]`, server, true);
+	}
+
+	addDomain(server) {
+		return new Promise(resolve => {
+			if (server.icon) {
+				this.saveServerIcon(server.icon).then(localIconUrl => {
+					server.icon = localIconUrl;
+					this.db.push('/domains[]', server, true);
+					this.reloadDB();
+					resolve();
+				});
+			} else {
+				server.icon = defaultIconUrl;
+				this.db.push('/domains[]', server, true);
+				this.reloadDB();
+				resolve();
+			}
+		});
+	}
+
+	removeDomains() {
+		this.db.delete('/domains');
+		this.reloadDB();
+	}
+
+	removeDomain(index) {
+		this.db.delete(`/domains[${index}]`);
+		this.reloadDB();
+	}
+
+	// Check if domain is already added
+	duplicateDomain(domain) {
+		domain = this.formatUrl(domain);
+		const servers = this.getDomains();
+		for (const i in servers) {
+			if (servers[i].url === domain) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	checkDomain(domain, silent = false) {
+		if (!silent && this.duplicateDomain(domain)) {
+			// Do not check duplicate in silent mode
+			return Promise.reject('This server has been added.');
+		}
+
+		domain = this.formatUrl(domain);
+
+		const checkDomain = domain + '/static/audio/zulip.ogg';
+
+		const serverConf = {
+			icon: defaultIconUrl,
+			url: domain,
+			alias: domain
+		};
+
+		return new Promise((resolve, reject) => {
+			request(checkDomain, (error, response) => {
+				const certsError =
+					[
+						'Error: self signed certificate',
+						'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) {
+					// Correct
+					this.getServerSettings(domain).then(serverSettings => {
+						resolve(serverSettings);
+					}, () => {
+						resolve(serverConf);
+					});
+				} else if (domain.indexOf(whitelistDomains) >= 0 || certsError.indexOf(error.toString()) >= 0) {
+					if (silent) {
+						this.getServerSettings(domain).then(serverSettings => {
+							resolve(serverSettings);
+						}, () => {
+							resolve(serverConf);
+						});
+					} else {
+						const certErrorMessage = `Do you trust certificate from ${domain}? \n ${error}`;
+						const certErrorDetail = `The server you're connecting to is either someone impersonating the Zulip server you entered, or the server you're trying to connect to is configured in an insecure way.
+						\n Unless you have a good reason to believe otherwise, you should not proceed.
+						\n You can click here if you'd like to proceed with the connection.`;
+
+						dialog.showMessageBox({
+							type: 'warning',
+							buttons: ['Yes', 'No'],
+							defaultId: 0,
+							message: certErrorMessage,
+							detail: certErrorDetail
+						}, response => {
+							if (response === 0) {
+								this.getServerSettings(domain).then(serverSettings => {
+									resolve(serverSettings);
+								}, () => {
+									resolve(serverConf);
+								});
+							} else {
+								reject('Untrusted Certificate.');
+							}
+						});
+					}
+				} 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`;
+					reject(invalidZulipServerError);
+				}
+			});
+		});
+	}
+
+	getServerSettings(domain) {
+		const serverSettingsUrl = domain + '/api/v1/server_settings';
+		return new Promise((resolve, reject) => {
+			request(serverSettingsUrl, (error, response) => {
+				if (!error && response.statusCode === 200) {
+					const data = JSON.parse(response.body);
+					if (data.hasOwnProperty('realm_icon') && data.realm_icon) {
+						resolve({
+							// Some Zulip Servers use absolute URL for server icon whereas others use relative URL
+							// Following check handles both the cases
+							icon: data.realm_icon.startsWith('/') ? data.realm_uri + data.realm_icon : data.realm_icon,
+							url: data.realm_uri,
+							alias: data.realm_name
+						});
+					}
+				} else {
+					reject('Zulip server version < 1.6.');
+				}
+			});
+		});
+	}
+
+	saveServerIcon(url) {
+		// The save will always succeed. If url is invalid, downgrade to default icon.
+		return new Promise(resolve => {
+			const filePath = this.generateFilePath(url);
+			const file = fs.createWriteStream(filePath);
+			try {
+				request(url).on('response', response => {
+					response.on('error', err => {
+						console.log(err);
+						resolve(defaultIconUrl);
+					});
+					response.pipe(file).on('finish', () => {
+						resolve(filePath);
+					});
+				}).on('error', err => {
+					console.log(err);
+					resolve(defaultIconUrl);
+				});
+			} catch (err) {
+				console.log(err);
+				resolve(defaultIconUrl);
+			}
+		});
+	}
+
+	updateSavedServer(url, index) {
+		// Does not promise successful update
+		this.checkDomain(url, true).then(newServerConf => {
+			this.saveServerIcon(newServerConf.icon).then(localIconUrl => {
+				newServerConf.icon = localIconUrl;
+				this.updateDomain(index, newServerConf);
+				this.reloadDB();
+			});
+		});
+	}
+
+	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);
+	}
+
+	generateFilePath(url) {
+		const dir = `${app.getPath('userData')}/server-icons`;
+		const extension = path.extname(url).split('?')[0];
+
+		let hash = 5381;
+		let len = url.length;
+
+		while (len) {
+			hash = (hash * 33) ^ url.charCodeAt(--len);
+		}
+
+		// Create 'server-icons' directory if not existed
+		if (!fs.existsSync(dir)) {
+			fs.mkdirSync(dir);
+		}
+
+		return `${dir}/${hash >>> 0}${extension}`;
+	}
+
+	formatUrl(domain) {
+		const hasPrefix = (domain.indexOf('http') === 0);
+		if (hasPrefix) {
+			return domain;
+		} else {
+			return (domain.indexOf('localhost:') >= 0) ? `http://${domain}` : `https://${domain}`;
+		}
+	}
+}
+
+module.exports = new DomainUtil();